Hide searchForrm on after search

examples/demo/src/config.router.js

@@ -20,6 +20,7 @@ angular.module('app')
     stateHelperProvider.state(freshRouterStates)
 
     stateHelperInit(freshMenu)
+    console.log("freshMenu", freshMenu)
     appState.sideMenuConfig = freshMenu
 
     // $stateProvider.state({

examples/demo/src/pages/batchList/edit/editCtrl.js

@@ -1,7 +1,7 @@
 import BaseEditCtrl from 'angle-grinder/src/ng/gridz/list/BaseEditCtrl'
 // import appState from 'angle-grinder/src/tools/AppState'
 import _ from 'lodash'
-import appConfigApi from 'angle-grinder/src/dataApi/AppConfigApi'
+import appConfigApi from '@yakit/core/stores/AppConfigApi'
 
 export default class EditCtrl extends BaseEditCtrl {
   vm = {}

examples/demo/src/svelteDataList/customer/RestGrid.svelte

@@ -20,5 +20,7 @@
 
 <p>dataApi is {dataApi.key}</p>
 <p>foo is {foo}</p>
+<a href="/foo" class="link nav">WTF</a>
+<a href="https://www.google.com/" class="link nav">google</a>
 
 <Gridz {dataApi} {ctx}/>

examples/demo/src/svelteDataList/simple/QuickFilter.svelte

@@ -0,0 +1,41 @@
+<!--
+  Wraps the jqGrid and adds the toolbar and search form
+ -->
+<script>
+  import {ButtonToggleGroup} from '@yakit/svelte/index'
+
+  let activeKey
+  let activeState
+
+  let schema = [
+    { key: 'PA', label: 'Payments'},
+    { key: 'IN', label: 'Invoices'},
+    { key: 'MEM', label: 'Memos'}
+  ]
+
+  let states = [
+    { key: '0', label: 'Open'},
+    { key: '1', label: 'Closed'}
+  ]
+
+  function onToggle(event){
+    let item = event.detail
+    console.log("onToggle", item)
+    console.log("activeKey/activeState", activeKey, activeState)
+  }
+
+</script>
+
+<div class='quick-filter'>
+  <ButtonToggleGroup bind:activeKey {schema} on:click={onToggle}/>
+</div>
+<div class='quick-filter'>
+  <ButtonToggleGroup bind:activeKey={activeState} schema={states} on:click={onToggle}/>
+</div>
+
+<style>
+  .quick-filter :global(.button7) {
+    height: 30px;
+    text-transform:initial;
+  }
+</style>

examples/demo/src/svelteDataList/simple/SimpleGrid.svelte

@@ -2,6 +2,7 @@
 <script>
   import { Gridz } from '@yakit/svelte/index'
   import sessionStores from '~/store/sessionServices'
+  import QuickFilter from './QuickFilter.svelte'
 
   let gridOptions = {
     colModel: [
@@ -52,7 +53,8 @@
       },
       state:{
         input: 'select',
-        selectOptions:{
+        options:{
+          isMulti: false,
           isValueObject: true,
           data:[{id:0, name: 'Open'}, {id:1, name: 'Closed'}]
         }
@@ -61,7 +63,7 @@
     column3:{
       customer:{
         input: 'select',
-        selectOptions:{
+        options:{
           dataApi:{
             key:'customer'
           }
@@ -80,5 +82,5 @@
 
 </script>
 
-<Gridz {dataApi} {ctx} />
+<Gridz {dataApi} {ctx} {QuickFilter}/>
 <!-- <JqGrid {ctx}/> -->

src/gridz/GridDataApiCtrl.js

@@ -170,6 +170,11 @@ export default class GridDataApiCtrl {
     return this.jqGridEl.jqGrid('resetSelection')
   }
 
+  selectRow(selRowId) {
+    this.clearSelection()
+    return this.jqGridEl.jqGrid('setSelection', selRowId)
+  }
+
   // Returns an array with data of the requested id = rowid.
   // The returned array is of type name:value, where the name is
   // a name from colModel and the value from the associated column in that row.
@@ -184,9 +189,7 @@ export default class GridDataApiCtrl {
   }
 
   updateFooter(data) {
-    setTimeout(_ => {
-      this.getGridEl().footerData('set', data)
-    })
+    if(this.jqGridEl) this.jqGridEl.footerData('set', data)
   }
 
   // Populates the grid with the given data.
@@ -316,7 +319,7 @@ export default class GridDataApiCtrl {
   // The syntax of data array is: {name1:value1,name2: value2...}
   // where the name is the name of the column as described in the colModel
   // and the value is the new value.
-  updateRow(id, data, emptyMissingCells) {
+  updateRow(id, data, emptyMissingCells = false) {
     if (emptyMissingCells == null) { emptyMissingCells = true }
     const flatData = flattenObject(data)
 
@@ -422,7 +425,7 @@ export default class GridDataApiCtrl {
     return this.reload()
   }
 
-  saveRow(id, data) {
+  addOrUpdateRow(id, data) {
     if (this.hasRow(id)) {
       return this.updateRow(id, data)
     } else {
@@ -518,7 +521,6 @@ export default class GridDataApiCtrl {
       if(!_.isEmpty(q)){
         p.q = q
       }
-      Log.debug("gridLoader search " + this.dataApi.key, p)
       const data = await this.dataApi.search(p)
       // this.addJSONData(data)
     } catch (er) {

src/gridz/jq.formatters.js

@@ -29,14 +29,13 @@ $.extend($.fn.fmatter, {
   /** for the Svelte popovers */
   editPopoverLink(cellVal, options, rowdata) {
     // console.log("editPopoverLink", cellVal, options, rowdata)
+    if (!cellVal) return ''
     const ident = rowdata['id']
     const popoverId = `#${options.gid}-popover-edit`
     return `<a class="editPopoverLink popover-open" href="#" data-id="${ident}" data-popover="${popoverId}">${cellVal}</a>`
   },
 
   gridLink(cellVal, options, rowdata) {
-    Log.debug("gridLink options", options)
-    Log.debug("gridLink rowdata", rowdata)
     const id = rowdata.id
     return `<a class="gridLink" href="#" >${cellVal}</a>`
   },

src/gridz/makeListDataCtrl.js

@@ -2,7 +2,7 @@
 // import _ from 'lodash'
 import { get, writable } from 'svelte/store';
 import { isEmpty, cloneDeep, isFunction, merge } from '@yakit/core/dash'
-import appConfigApi from '../dataApi/AppConfigApi'
+import appConfigApi from '@yakit/core/stores/AppConfigApi'
 import toast from '@yakit/ui/growl'
 import Swal from '@yakit/ui/swal'
 
@@ -13,7 +13,7 @@ const makeListDataCtrl = (opts) => {
   let defaultToolbarOpts = {
     selectedButtons: {
       bulkUpdate: { icon: 'edit_note', tooltip: 'Bulk Update' },
-      xlsExport: { icon: 'mdi-microsoft-excel', tooltip: 'Export to Excel' }
+      xlsExport: { icon: 'view_module', label: 'Export to Excel' }
     },
     leftButtons: {
       create: { icon: 'add_box', tooltip: 'Create New' }
@@ -62,12 +62,16 @@ const makeListDataCtrl = (opts) => {
       //if ctx toolbar option were passed in with context
       if(ctx.toolbarOptions) merge(tbopts, ctx.toolbarOptions)
       // setup search form show based on if searchForm is configured
-      if (ctx.searchForm === undefined) {
+      if (ctx.searchForm === undefined || gopts.searchFormEnabled == false) {
         gopts.showSearchForm = false
         ctx.state.showSearchForm = false
         tbopts.searchFormButton.class = 'hidden'
       }
 
+      if (ctx.editForm === undefined || gopts.createEnabled == false) {
+        tbopts.leftButtons.create.class = 'hidden'
+      }
+
       if (ctx.bulkUpdateForm === undefined) {
         tbopts.selectedButtons.bulkUpdate.class = 'hidden'
       }
@@ -112,7 +116,9 @@ const makeListDataCtrl = (opts) => {
       }
     },
 
+    // Fires for common actions, will fall back to ctx.toobarHandler if nothing exists
     fireToolbarAction(btnItem, event) {
+      console.log("listDataCtrl fireToolbarAction", btnItem, event)
       switch (btnItem.key) {
         case 'create':
           return ctrl.create()
@@ -123,7 +129,11 @@ const makeListDataCtrl = (opts) => {
         case 'delete':
           return ctrl.deleteSelected()
         default:
-          if (isFunction(ctrl[btnItem.key])) {
+          if(ctrl.ctx.toolbarHandler){
+            return ctrl.ctx.toolbarHandler(btnItem, event)
+          }
+          //FIXME this is kind of dangerous and should be removes and use ctx.toolbarHandler
+          else if (isFunction(ctrl[btnItem.key])) {
             return ctrl[btnItem.key](btnItem, event)
           }
       }

src/ng/common/directives/index.js

@@ -13,5 +13,4 @@ import './sideMenu'
 import './tagInput'
 import './perfect-scrollbar'
 import './maxlength'
-import './empty-links'
 import './letter-icon'

src/ng/gridz/list-ds/ListDataApiCtrl.js

@@ -6,7 +6,7 @@ import { isEmpty } from '@yakit/core/dash'
 import EditModalCtrl from './EditModalCtrl'
 import BulkUpdateModalCtrl from './BulkUpdateModalCtrl'
 import { argsMerge } from '../../utils/classUtils'
-import appConfigApi from '../../../dataApi/AppConfigApi'
+import appConfigApi from '@yakit/core/stores/AppConfigApi'
 import toast from '@yakit/ui/growl'
 //import Swal from '../../../tools/swal'
 

src/ng/gridz/list-ds/makeNgListDataCtrl.js

@@ -41,7 +41,7 @@ const makeNgListDataCtrl = (ctrl) => {
       )
       modInst.result
         .then(editedVm => {
-          isUpdate ? ctrl.getGridCtrl().updateRow(editedVm.id, editedVm) : ctrl.getGridCtrl().addRow(editedVm.id, editedVm)
+          isUpdate ? ctrl.getGridCtrl().addOrUpdateRow(editedVm.id, editedVm) : ctrl.getGridCtrl().addRow(editedVm.id, editedVm)
         })
         .catch(() => {
           console.log('Modal dismissed at: ' + new Date())

src/ng/gridz/list/BaseEditCtrl.js

@@ -1,7 +1,7 @@
 // import _ from 'lodash'
 
 import { argsMerge } from '../../utils/classUtils'
-import appConfigApi from '../../../dataApi/AppConfigApi'
+import appConfigApi from '@yakit/core/stores/AppConfigApi'
 import _ from 'lodash'
 
 export default class EditModalCtrl {

src/ng/gridz/list/BaseListCtrl.js

@@ -3,7 +3,7 @@ import _ from 'lodash'
 import EditModalCtrl from './EditModalCtrl'
 import BulkUpdateModalCtrl from './BulkUpdateModalCtrl'
 import { argsMerge } from '../../utils/classUtils'
-import appConfigApi from '../../../dataApi/AppConfigApi'
+import appConfigApi from '@yakit/core/stores/AppConfigApi'
 import toast from '@yakit/ui/growl'
 // import { transformOptions } from '../../controls/formly/helpers'
 

src/ng/sidenav/ag-sidenav.html

@@ -23,7 +23,7 @@
   <div class="sidenav-nav sidenav-list">
 
     <script type="text/ng-template" id="menuItemTree">
-      <a href="{{$ctrl.hasChildren(mitem) ? '' : (mitem.children ? mitem.children[0].name : mitem.name)}}" class="item-content"
+      <a href="{{$ctrl.hasChildren(mitem) ? '' : mitem.href}}" class="item-content nav"
          ng-click="$ctrl.itemClick(mitem, $event)">
         <span class="icon" ng-if="mitem.data.icon">
           <i class="{{mitem.data.icon}}"></i>

src/ng/sidenav/ag-sidenav.js

@@ -88,7 +88,7 @@ class controller {
         // it has no children, its a ui-router link
         // if not fixed then close (minimize) on click
         if (!this.isFixed) minimizeSidenav()
-        appState.$state.go(mitem.children ? mitem.children[0].name : mitem.name)
+        // appState.$state.go(mitem.children ? mitem.children[0].name : mitem.name)
       }
     }
   }