Filter Persistence: Dashboards Grid

modxcms · Jan 31, 2023 · c7fd92b · c7fd92b
1 parent 2850cc0
commit c7fd92b
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 89 deletions.
diff --git a/core/src/Revolution/Processors/System/Dashboard/GetList.php b/core/src/Revolution/Processors/System/Dashboard/GetList.php
@@ -39,8 +39,10 @@ public function prepareQueryAfterCount(xPDOQuery $c)
     {
         $query = $this->getProperty('query');
         if (!empty($query)) {
-            $c->where(['modDashboard.name:LIKE' => '%' . $query . '%']);
-            $c->orCondition(['modDashboard.description:LIKE' => '%' . $query . '%']);
+            $c->where([
+                'modDashboard.name:LIKE' => '%' . $query . '%',
+                'OR:modDashboard.description:LIKE' => '%' . $query . '%',
+            ]);
         }
         $userGroup = $this->getProperty('usergroup', false);
         if (!empty($userGroup)) {

diff --git a/manager/assets/modext/widgets/system/modx.panel.dashboards.js b/manager/assets/modext/widgets/system/modx.panel.dashboards.js
@@ -36,14 +36,7 @@ MODx.panel.Dashboards = function(config) {
                 ,cls: 'main-wrapper'
                 ,preventRender: true
             }]
-        }],{
-            stateful: true
-            ,stateId: 'modx-dashboards-tabpanel'
-            ,stateEvents: ['tabchange']
-            ,getState:function() {
-                return {activeTab:this.items.indexOf(this.getActiveTab())};
-            }
-        })]
+        }])]
     });
     MODx.panel.Dashboards.superclass.constructor.call(this,config);
 };
@@ -63,9 +56,15 @@ MODx.grid.Dashboards = function(config) {
     Ext.applyIf(config,{
         url: MODx.config.connector_url
         ,baseParams: {
-            action: 'System/Dashboard/GetList'
+            action: 'System/Dashboard/GetList',
+            usergroup: MODx.request.usergroup || null
         }
-        ,fields: ['id','name','description','cls']
+        ,fields: [
+            'id',
+            'name',
+            'description',
+            'cls'
+        ]
         ,paging: true
         ,autosave: true
         ,save_action: 'System/Dashboard/UpdateFromGrid'
@@ -94,65 +93,41 @@ MODx.grid.Dashboards = function(config) {
             ,sortable: false
             ,editor: { xtype: 'textarea' }
         }]
-        ,tbar: [{
-            text: _('create')
-            ,cls:'primary-button'
-            ,handler: this.createDashboard
-            ,scope: this
-        },{
-            text: _('bulk_actions')
-            ,menu: [{
-                text: _('selected_remove')
-                ,handler: this.removeSelected
+        ,tbar: [
+            {
+                text: _('create')
+                ,cls:'primary-button'
+                ,handler: this.createDashboard
                 ,scope: this
-            }]
-        },'->',{
-            xtype: 'modx-combo-usergroup'
-            ,name: 'usergroup'
-            ,id: 'modx-user-filter-usergroup'
-            ,itemId: 'usergroup'
-            ,emptyText: _('user_group_filter')+'...'
-            ,baseParams: {
-                action: 'Security/Group/GetList'
-                ,addAll: true
-            }
-            ,value: ''
-            ,width: 200
-            ,listeners: {
-                'select': {fn:this.filterUsergroup,scope:this}
-            }
-        },{
-            xtype: 'textfield'
-            ,name: 'search'
-            ,id: 'modx-dashboard-search'
-            ,cls: 'x-form-filter'
-            ,emptyText: _('search')
-            ,listeners: {
-                'change': {fn: this.search, scope: this}
-                ,'render': {fn: function(cmp) {
-                    new Ext.KeyMap(cmp.getEl(), {
-                        key: Ext.EventObject.ENTER
-                        ,fn: function() {
-                            this.fireEvent('change',this.getValue());
-                            this.blur();
-                            return true;}
-                        ,scope: cmp
-                    });
-                },scope:this}
-            }
-        },{
-            xtype: 'button'
-            ,text: _('filter_clear')
-            ,id: 'modx-filter-clear'
-            ,cls: 'x-form-filter-clear'
-            ,listeners: {
-                'click': {fn: this.clearFilter, scope: this},
-                'mouseout': { fn: function(evt){
-                    this.removeClass('x-btn-focus');
+            },{
+                text: _('bulk_actions')
+                ,menu: [{
+                    text: _('selected_remove')
+                    ,handler: this.removeSelected
+                    ,scope: this
+                }]
+            },'->',{
+                xtype: 'modx-combo-usergroup'
+                ,itemId: 'filter-usergroup'
+                ,emptyText: _('user_group_filter')
+                ,baseParams: {
+                    action: 'Security/Group/GetList'
+                    ,addAll: true
                 }
+                ,value: MODx.request.usergroup || null
+                ,width: 200
+                ,listeners: {
+                    select: {
+                        fn: function (cmp, record, selectedIndex) {
+                            this.applyGridFilter(cmp, 'usergroup');
+                        },
+                        scope: this
+                    }
                 }
-            }
-        }]
+            },
+            this.getQueryFilterField(),
+            this.getClearFiltersButton('filter-usergroup, filter-query')
+        ]
     });
     MODx.grid.Dashboards.superclass.constructor.call(this,config);
 };
@@ -252,26 +227,5 @@ Ext.extend(MODx.grid.Dashboards,MODx.grid.Grid,{
         return true;
     }
 
-    ,filterUsergroup: function(cb,nv,ov) {
-        this.getStore().baseParams.usergroup = Ext.isEmpty(nv) || Ext.isObject(nv) ? cb.getValue() : nv;
-        this.getBottomToolbar().changePage(1);
-        return true;
-    }
-
-    ,search: function(tf,newValue,oldValue) {
-        var nv = newValue || tf;
-        this.getStore().baseParams.query = Ext.isEmpty(nv) || Ext.isObject(nv) ? '' : nv;
-        this.getBottomToolbar().changePage(1);
-        return true;
-    }
-
-    ,clearFilter: function() {
-        this.getStore().baseParams = {
-            action: 'System/Dashboard/GetList'
-        };
-        Ext.getCmp('modx-dashboard-search').reset();
-        Ext.getCmp('modx-user-filter-usergroup').reset();
-        this.getBottomToolbar().changePage(1);
-    }
 });
 Ext.reg('modx-grid-dashboards',MODx.grid.Dashboards);