Adjust the user grid

matdave · matdave · commit d186f326ae63 · 2024-01-18T10:41:13.000-06:00
diff --git a/assets/components/twilio/js/mgr/helpers/combo.js b/assets/components/twilio/js/mgr/helpers/combo.js
@@ -0,0 +1,53 @@
+twilio.combo.UserActive = function (config) {
+    config = config || {};
+    Ext.applyIf(config, {
+        store: new Ext.data.SimpleStore({
+            fields: ["l", "v"],
+            data: [
+                ["All", ""],
+                ["Active", 1],
+                ["Inactive", 0],
+            ],
+        }),
+        displayField: 'l',
+        valueField: 'v',
+        emptyText: _('twilio.user.activefilter.empty'),
+        mode: "local",
+        triggerAction: "all",
+        editable: false,
+        selectOnFocus: false,
+        preventRender: true,
+        forceSelection: true,
+        enableKeyEvents: true,
+    });
+    twilio.combo.UserActive.superclass.constructor.call(this, config);
+}
+Ext.extend(twilio.combo.UserActive, MODx.combo.ComboBox);
+Ext.reg('twilio-combo-user-active', twilio.combo.UserActive);
+
+twilio.combo.Use2fa = function (config) {
+    config = config || {};
+    Ext.applyIf(config, {
+        store: new Ext.data.SimpleStore({
+            fields: ["l", "v"],
+            data: [
+                ["All", ""],
+                ["Enabled", 1],
+                ["Disabled", 0],
+            ],
+        }),
+        displayField: 'l',
+        valueField: 'v',
+        emptyText: _('twilio.users.totp_value'),
+        mode: "local",
+        triggerAction: "all",
+        editable: false,
+        selectOnFocus: false,
+        preventRender: true,
+        forceSelection: true,
+        enableKeyEvents: true,
+    });
+    twilio.combo.Use2fa.superclass.constructor.call(this, config);
+}
+Ext.extend(twilio.combo.Use2fa, MODx.combo.ComboBox);
+Ext.reg('twilio-combo-use-2FA', twilio.combo.Use2fa);
diff --git a/assets/components/twilio/js/mgr/widgets/users.grid.js b/assets/components/twilio/js/mgr/widgets/users.grid.js
@@ -21,7 +21,21 @@ twilio.grid.Users = function (config) {
         baseParams: {
             action: 'users/getlist'
         }
-        ,fields: ['id','username', 'profile_fullname', 'profile_email', 'totp_value', 'totp_status']
+        ,fields: ['id',
+            'username',
+            'active',
+            'add_groups',
+            'primary_group',
+            'primary_group_name',
+            'primary_group_role',
+            'profile_blocked',
+            'profile_comment',
+            'profile_email',
+            'profile_fullname',
+            'profile_lastlogin',
+            'totp_value',
+            'totp_status'
+        ]
         ,sm: this.sm
         ,autoHeight: true
         ,paging: true
@@ -41,17 +55,71 @@ twilio.grid.Users = function (config) {
             ,sortable: true
             ,hidden: false
         },{
-            header: _('twilio.users.fullname')
+            header: _('active')
+            ,dataIndex: 'active'
+            ,width: 100
+            ,sortable: true
+            ,hidden: true
+            ,renderer: this.rendYesNo
+        },{
+            header: _('user_block')
+            ,dataIndex: 'profile_blocked'
+            ,width: 100
+            ,sortable: true
+            ,hidden: true
+            ,renderer: this.rendYesNo
+        },{
+            header: _('user_full_name')
             ,dataIndex: 'profile_fullname'
             ,width: 200
             ,sortable: true
             ,hidden: false
         },{
-            header: _('twilio.users.email')
+            header: _('email')
             ,dataIndex: 'profile_email'
             ,width: 200
             ,sortable: true
             ,hidden: false
+        },{
+            header: _('primary_group')
+            ,dataIndex: 'primary_group_name'
+            ,width: 200
+            ,sortable: true
+            ,hidden: false
+            ,renderer: function(value, metaData, record, rowIndex, colIndex, store) {
+                return value + ' (' + record.data.primary_group_role + ')';
+            }
+        },{
+            header: _('twilio.users.additional_groups')
+            ,dataIndex: 'add_groups'
+            ,width: 200
+            ,sortable: true
+            ,hidden: false
+            ,renderer: function(value, metaData, record, rowIndex, colIndex, store) {
+                var groupNames = []
+                Ext.each(value, function (group, index) {
+                    groupNames.push(group.name + ' (' + group.role + ')');
+                });
+                return groupNames.join(', ');
+            }
+        },{
+            header: _('role')
+            ,dataIndex: 'primary_group_role'
+            ,width: 200
+            ,sortable: false
+            ,hidden: true
+        },{
+            header: _('comment')
+            ,dataIndex: 'profile_comment'
+            ,width: 200
+            ,sortable: false
+            ,hidden: true
+        },{
+            header: _('user_prevlogin')
+            ,dataIndex: 'profile_lastlogin'
+            ,width: 200
+            ,sortable: false
+            ,hidden: false
         }, {
             header: _('twilio.users.totp_value')
             ,dataIndex: 'totp_value'
@@ -286,12 +354,23 @@ Ext.extend(twilio.grid.Users, MODx.grid.Grid, {
     getSelectedAsList: function () {
         return this.selectedRecords.join();
     },
-
-    search: function (tf, newValue, oldValue) {
-        var nv = newValue || tf;
-        this.getStore().baseParams.search = Ext.isEmpty(nv) || Ext.isObject(nv) ? '' : nv;
+    filterSearch: function (comp, search) {
+        var s = this.getStore();
+        s.baseParams[comp.filterName] = search;
         this.getBottomToolbar().changePage(1);
-        return true;
+    },
+    filterCombo: function (combo, record) {
+        var s = this.getStore();
+        s.baseParams[combo.filterName] = record.data[combo.valueField];
+        this.getBottomToolbar().changePage(1);
+    },
+    exportFilters: function (comp, search) {
+        var s = this.getStore();
+        var filters = "export=true&HTTP_MODAUTH=" + MODx.siteId;
+        Object.keys(s.baseParams).forEach((key) => {
+            filters += "&" + key + "=" + s.baseParams[key];
+        });
+        window.location = this.config.url + "?" + filters;
     },
     getTbar: function (config) {
         var tbar = [];
@@ -324,28 +403,47 @@ Ext.extend(twilio.grid.Users, MODx.grid.Grid, {
                     handler: this.disableTotp,
                 }
                 ]
+            },{
+                text: _("twilio.users.export"),
+                handler: this.exportFilters,
+                scope: this,
             },'->',{
+                xtype: 'twilio-combo-use-2FA',
+                name: '2fa',
+                scope: this,
+                filterName: "2fa",
+                listeners: {
+                    select: this.filterCombo,
+                    scope: this
+                }
+            },{
+                xtype: 'twilio-combo-user-active',
+                name: 'active',
+                scope: this,
+                filterName: "active",
+                listeners: {
+                    select: this.filterCombo,
+                    scope: this
+                }
+
+            },{
                 xtype: 'textfield',
                 emptyText: _('search_ellipsis'),
                 id: 'twilio-filter-search',
+                filterName: "search",
                 listeners: {
-                    change: {
-                        fn: this.search,
-                        scope: this
-                    },
+                    change: this.filterSearch,
+                    scope: this,
                     render: {
                         fn: function (cmp) {
                             new Ext.KeyMap(cmp.getEl(), {
                                 key: Ext.EventObject.ENTER,
-                                fn: function () {
-                                    this.blur();
-                                    return true;
-                                },
-                                scope: cmp
+                                fn: this.blur,
+                                scope: cmp,
                             });
                         },
-                        scope:this
-                    }
+                        scope: this,
+                    },
                 }
             }]);
 
diff --git a/core/components/twilio/controllers/users.class.php b/core/components/twilio/controllers/users.class.php
@@ -13,6 +13,7 @@ public function getPageTitle()
     }
     public function loadCustomCssJs()
     {
+        $this->addJavascript($this->twilio->getOption('jsUrl') . 'mgr/helpers/combo.js?v=' . $this->version);
         $this->addJavascript($this->twilio->getOption('jsUrl') . 'mgr/widgets/users.grid.js?v=' . $this->version);
         $this->addJavascript($this->twilio->getOption('jsUrl') . 'mgr/widgets/users.panel.js?v=' . $this->version);
         $this->addLastJavascript($this->twilio->getOption('jsUrl') . 'mgr/sections/users.js?v=' . $this->version);
diff --git a/core/components/twilio/index.class.php b/core/components/twilio/index.class.php
@@ -8,6 +8,11 @@ public function checkPermissions()
         return true;
     }
 
+    public function getLanguageTopics()
+    {
+        return array('twilio:default', 'user');
+    }
+
     public function initialize()
     {
         $corePath = $this->modx->getOption(
@@ -27,6 +32,7 @@ public function initialize()
                 'core_path' => $corePath
             )
         );
+        $this->modx->lexicon->load('twilio:default');
         $this->addJavascript($this->twilio->getOption('jsUrl') . 'mgr/twilio.js');
         $user = $this->modx->user;
         $profile = $user->getOne('Profile');
@@ -43,9 +49,4 @@ public function initialize()
         });
         </script>');
     }
-
-    public function getLanguageTopics()
-    {
-        return array('twilio:default');
-    }
 }
diff --git a/core/components/twilio/lexicon/en/default.inc.php b/core/components/twilio/lexicon/en/default.inc.php
@@ -24,6 +24,7 @@
 $_lang['twilio.users.username'] = 'Username';
 $_lang['twilio.users.fullname'] = 'Full Name';
 $_lang['twilio.users.email'] = 'Email';
+$_lang['twilio.users.additional_groups'] = 'Additional Groups';
 $_lang['twilio.users.totp_status'] = '2FA Status';
 $_lang['twilio.users.totp_value'] = 'Use 2FA';
 $_lang['twilio.users.enable_totp'] = 'Enable 2FA';
@@ -38,6 +39,8 @@
 $_lang['twilio.users.totp_status_verified'] = 'Verified';
 $_lang['twilio.users.totp_status_unverified'] = 'Awaiting Verification';
 $_lang['twilio.users.with-selected'] = 'With Selected';
+$_lang['twilio.users.export'] = 'Export';
+$_lang['twilio.user.activefilter.empty'] = 'User Status';
 // Settings
 $_lang['setting_twilio.account_sid'] = 'Account SID';
 $_lang['setting_twilio.account_sid_desc'] = 'Found under Account Info here https://console.twilio.com/';
diff --git a/core/components/twilio/processors/users/getlist.class.php b/core/components/twilio/processors/users/getlist.class.php

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public function getPageTitle()`
`13`	`13`	`}`
`14`	`14`	`public function loadCustomCssJs()`
`15`	`15`	`{`
	`16`	`+ $this->addJavascript($this->twilio->getOption('jsUrl') . 'mgr/helpers/combo.js?v=' . $this->version);`
`16`	`17`	`$this->addJavascript($this->twilio->getOption('jsUrl') . 'mgr/widgets/users.grid.js?v=' . $this->version);`
`17`	`18`	`$this->addJavascript($this->twilio->getOption('jsUrl') . 'mgr/widgets/users.panel.js?v=' . $this->version);`
`18`	`19`	`$this->addLastJavascript($this->twilio->getOption('jsUrl') . 'mgr/sections/users.js?v=' . $this->version);`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,11 @@ public function checkPermissions()`
`8`	`8`	`return true;`
`9`	`9`	`}`
`10`	`10`
	`11`	`+ public function getLanguageTopics()`
	`12`	`+ {`
	`13`	`+ return array('twilio:default', 'user');`
	`14`	`+ }`
	`15`	`+`
`11`	`16`	`public function initialize()`
`12`	`17`	`{`
`13`	`18`	`$corePath = $this->modx->getOption(`
`@@ -27,6 +32,7 @@ public function initialize()`
`27`	`32`	`'core_path' => $corePath`
`28`	`33`	`)`
`29`	`34`	`);`
	`35`	`+ $this->modx->lexicon->load('twilio:default');`
`30`	`36`	`$this->addJavascript($this->twilio->getOption('jsUrl') . 'mgr/twilio.js');`
`31`	`37`	`$user = $this->modx->user;`
`32`	`38`	`$profile = $user->getOne('Profile');`
`@@ -43,9 +49,4 @@ public function initialize()`
`43`	`49`	`});`
`44`	`50`	`</script>');`
`45`	`51`	`}`
`46`		`-`
`47`		`- public function getLanguageTopics()`
`48`		`- {`
`49`		`- return array('twilio:default');`
`50`		`- }`
`51`	`52`	`}`