-
-
Notifications
You must be signed in to change notification settings - Fork 529
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix grouping grid sorting in ACL grids (#16529)
### What does it do? Adds new grouping logic to ACL GetList processors and config props in the corresponding Ext grid classes. ### Why is it needed? Aside from the Settings grid,* other grouping grids (such as the ACL ones) neither group properly, nor sort within groups properly. ### How to test 1. Rebuild may be necessary and compress_js must be off. 2. Create a variety of ACL entries so there are at least a few main items to group (this is the Minimum Role, which is what all ACLs are grouped by as a default [can be changed in the column menu]), and a few entries within those groups (meaning you'll need multiple contexts, namespaces, resource groups, media sources, and element categories created ahead of time to assign these roles to). 3. Verify that items are grouped as expected. 4. Verify that sorting on each column works as expected. ### Related issue(s)/PR(s) No related issue. * The settings grid does not group correctly if the grouping field is changed. That will be addressed in a different PR. --------- Co-authored-by: Jim Graham <info@sparkmediagroup.com> Co-authored-by: Jason Coward <jason@opengeek.com>
- Loading branch information
1 parent
46d232e
commit 23d8965
Showing
15 changed files
with
323 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,58 @@ | ||
module.exports = { | ||
env: { | ||
browser: true, | ||
es2021: true, | ||
es2021: true | ||
}, | ||
extends: [ | ||
'eslint:recommended', | ||
'airbnb-base', | ||
'airbnb-base' | ||
], | ||
globals: { | ||
MODx: 'readonly', | ||
Ext: 'readonly', | ||
_: 'readonly', | ||
_: 'readonly' | ||
}, | ||
ignorePatterns: [ | ||
'manager/assets/modext/workspace/workspace.panel.js', | ||
'manager/assets/ext3/**/*.js', | ||
'manager/assets/fileapi/**/*.js', | ||
'manager/assets/lib/**/*.js', | ||
'manager/assets/modext/modx.jsgrps-min.js', | ||
|
||
'setup/assets/js/ext-core.js', | ||
'setup/assets/js/ext-core-debug.js', | ||
], | ||
overrides: [ | ||
'setup/assets/js/ext-core-debug.js' | ||
], | ||
overrides: [], | ||
parserOptions: { | ||
ecmaVersion: 'latest', | ||
ecmaVersion: 'latest' | ||
}, | ||
rules: { | ||
// TODO Enable rules gradually | ||
indent: 0, | ||
quotes: ['error', 'single'], | ||
semi: 0, | ||
'space-before-function-paren': 0, | ||
'comma-dangle': 0, | ||
'prefer-arrow-callback': 0, | ||
'space-before-blocks': 0, | ||
'object-shorthand': 0, | ||
}, | ||
} | ||
'arrow-parens': ['error', 'as-needed'], | ||
'comma-dangle': ['error', 'never'], | ||
'consistent-return': 0, | ||
curly: ['error', 'all'], | ||
eqeqeq: ['error', 'smart'], | ||
'func-names': ['warn', 'as-needed'], | ||
indent: ['error', 4, { | ||
VariableDeclarator: 'first', | ||
SwitchCase: 1 | ||
}], | ||
'max-len': ['warn', { | ||
code: 140, | ||
ignoreComments: true | ||
}], | ||
'no-continue': 'warn', | ||
'no-new': 'warn', | ||
'no-param-reassign': 'warn', | ||
'no-plusplus': ['error', { | ||
allowForLoopAfterthoughts: true | ||
}], | ||
'no-underscore-dangle': 'warn', | ||
'no-unused-vars': ['error', { args: 'none' }], | ||
'no-use-before-define': ['error', 'nofunc'], | ||
'object-shorthand': ['error', 'consistent'], | ||
'one-var': ['error', 'consecutive'], | ||
'prefer-arrow-callback': 'warn', | ||
'prefer-rest-params': 'warn', | ||
'semi-style': ['warn', 'last'], | ||
'space-before-function-paren': ['error', 'never'] | ||
} | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.