tqt
/
Ghost-Admin
mirror of https://github.com/TryGhost/Ghost-Admin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed default member filter to "Name is" 

refs https://github.com/TryGhost/Team/issues/1408

- "Name" is the first filter in the list and has a basic value type so it makes sense to make it the default compared to label
This commit is contained in:
Kevin Ansfield 2022-03-09 16:52:51 +00:00
parent cef00156ef
commit 54eb037e3f
1 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/components/members/filter.js
View File

@ -141,14 +141,23 @@ export default class MembersFilter extends Component {
@service settings;
@service store;
@tracked filters = new TrackedArray([
new Filter({
type: 'label',
relation: 'is',
value: [],
relationOptions: FILTER_RELATIONS_OPTIONS.label
})
]);
@tracked filters = this.feature.membersContainsFilters
? new TrackedArray([
new Filter({
type: 'name',
relation: 'is',
value: '',
relationOptions: FILTER_RELATIONS_OPTIONS.name
})
])
: new TrackedArray([
new Filter({
type: 'label',
relation: 'is',
value: [],
relationOptions: FILTER_RELATIONS_OPTIONS.label
})
]);
availableFilterRelationsOptions = FILTER_RELATIONS_OPTIONS;
availableFilterValueOptions = FILTER_VALUE_OPTIONS;
@ -195,12 +204,21 @@ export default class MembersFilter extends Component {
@action
addFilter() {
this.filters.push(new Filter({
type: 'label',
relation: 'is',
value: [],
relationOptions: FILTER_RELATIONS_OPTIONS.label
}));
if (this.feature.membersContainsFilters) {
this.filters.push(new Filter({
type: 'name',
relation: 'is',
value: '',
relationOptions: FILTER_RELATIONS_OPTIONS.name
}));
} else {
this.filters.push(new Filter({
type: 'label',
relation: 'is',
value: [],
relationOptions: FILTER_RELATIONS_OPTIONS.label
}));
}
this.applySoftFilter();
}
@ -483,14 +501,25 @@ export default class MembersFilter extends Component {
@action
resetFilter() {
this.filters = new TrackedArray([
new Filter({
const filters = [];
if (this.feature.membersContainsFilters) {
filters.push(new Filter({
type: 'name',
relation: 'is',
value: '',
relationOptions: FILTER_RELATIONS_OPTIONS.name
}));
} else {
filters.push(new Filter({
type: 'label',
relation: 'is',
value: [],
relationOptions: FILTER_RELATIONS_OPTIONS.label
})
]);
}));
}
this.filters = new TrackedArray(filters);
this.args.onResetFilter();
}