Skip to content

feat(manager): Remove deprecated toolbar filter ids in SettingsGrid #16976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ibochkarev wants to merge 1 commit into
base: 3.x
Choose a base branch
from
+10 −26
Open

feat(manager): Remove deprecated toolbar filter ids in SettingsGrid #16976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 10 additions & 26 deletions manager/assets/modext/widgets/core/modx.grid.settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,8 @@ MODx.grid.SettingsGrid = function(config = {}) {
config.tbar.push(
'->',
{
/**
* @deprecated use of id config property deprecated in 3.0, to be removed in 3.1
*
* To access this combo in the future, get a reference to the topToolbar and use
* the getComponent method ( e.g., [gridObj].getTopToolbar().getComponent([itemId]) )
*
* Also, itemId to be renamed 'filter-namespace' in 3.1
*/
xtype: 'modx-combo-namespace'
,id: 'modx-filter-namespace'
,itemId: 'filter-ns'
,itemId: 'filter-namespace'
,emptyText: _('namespace_filter')
,typeAhead: true
,minChars: 2
Expand Down Expand Up @@ -99,14 +90,7 @@ MODx.grid.SettingsGrid = function(config = {}) {
}
},
{
/**
* @deprecated use of id config property deprecated in 3.0, to be removed in 3.1
*
* To access this combo in the future, get a reference to the topToolbar and use
* the getComponent method ( e.g., [gridObj].getTopToolbar().getComponent([itemId]) )
*/
xtype: 'modx-combo-area'
,id: 'modx-filter-area'
,itemId: 'filter-area'
,emptyText: _('area_filter')
,value: this.areaFilterValue
Expand All @@ -127,7 +111,7 @@ MODx.grid.SettingsGrid = function(config = {}) {
,listeners: {
select: {
fn: function(cmp, record, selectedIndex) {
this.updateDependentFilter('filter-ns', 'area', record.data.v);
this.updateDependentFilter('filter-namespace', 'area', record.data.v);
this.applyGridFilter(cmp, 'area');
},
scope: this
Expand All @@ -139,7 +123,7 @@ MODx.grid.SettingsGrid = function(config = {}) {
if (newValue === '') {
cmp.setValue(null);
}
this.updateDependentFilter('filter-ns', 'area', newValue);
this.updateDependentFilter('filter-namespace', 'area', newValue);
this.applyGridFilter(cmp, 'area');
},
scope: this
Expand All @@ -148,8 +132,8 @@ MODx.grid.SettingsGrid = function(config = {}) {
},
this.getQueryFilterField(`filter-query:${queryValue}`),
this.getClearFiltersButton(
'filter-ns:, filter-area:, filter-query',
'filter-area:namespace, filter-ns:area'
'filter-namespace:, filter-area:, filter-query',
'filter-area:namespace, filter-namespace:area'
)
);

Expand Down Expand Up @@ -284,7 +268,7 @@ MODx.grid.SettingsGrid = function(config = {}) {
this.addEvents('createSetting', 'updateSetting');

const gridFilterData = [
{ filterId: 'filter-ns', dependentParams: ['area'] },
{ filterId: 'filter-namespace', dependentParams: ['area'] },
{ filterId: 'filter-area', dependentParams: ['namespace'] }
];

Expand Down Expand Up @@ -531,7 +515,7 @@ MODx.window.CreateSetting = function(config = {}) {
,fieldLabel: _('namespace')
,name: 'namespace'
,id: 'modx-cs-namespace'
,value: config.grid.getTopToolbar().getComponent('filter-ns').getValue()
,value: config.grid.getFilterComponent('filter-namespace').getValue()
,anchor: '100%'
},{
xtype: 'label'
Expand All @@ -545,7 +529,7 @@ MODx.window.CreateSetting = function(config = {}) {
,name: 'area'
,id: 'modx-cs-area'
,anchor: '100%'
,value: config.grid.getTopToolbar().getComponent('filter-area').getValue()
,value: config.grid.getFilterComponent('filter-area').getValue()
},{
xtype: 'label'
,forId: 'modx-cs-area'
Expand All @@ -567,8 +551,8 @@ MODx.window.CreateSetting = function(config = {}) {
this.on('show',function() {
this.reset();
this.setValues({
namespace: config.grid.getTopToolbar().getComponent('filter-ns').value
,area: config.grid.getTopToolbar().getComponent('filter-area').value
namespace: config.grid.getFilterComponent('filter-namespace').value
,area: config.grid.getFilterComponent('filter-area').value
});
},this);
};
Expand Down
Loading