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

🐛 Fixed mismatched operator in member filters after changing filter type 

closes https://github.com/TryGhost/Team/issues/1384

- when setting the filter type, change the filter's relation/operator to match the filter type's first operator so the filter string and the UI are in sync
This commit is contained in:
Kevin Ansfield 2022-02-22 10:08:16 +00:00
parent cd00b39071
commit 57f17503b3
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,6 +339,7 @@ export default class MembersFilter extends Component {
if (filterToEdit) {
filterToEdit.type = newType;
filterToEdit.relationOptions = this.availableFilterRelationsOptions[newType];
filterToEdit.relation = filterToEdit.relationOptions[0].name;
filterToEdit.value = defaultValue;
}

32
tests/acceptance/members/filter-test.js
View File

@ -621,6 +621,38 @@ describe('Acceptance: Members filtering', function () {
expect(currentURL()).to.equal('/members');
expect(find('[data-test-button="members-filter-actions"] span'), 'filter button').to.not.have.class('gh-btn-label-green');
});
it('resets filter operator when changing filter type', async function () {
// BUG: changing the filter type was not resetting the filter operator
// meaning you could have an "is-greater" operator applied to an
// "is/is-not" filter type
this.server.createList('member', 3, {subscriptions: [{status: 'active'}]});
this.server.createList('member', 4, {emailCount: 10});
await visit('/members');
expect(findAll('[data-test-list="members-list-item"]').length, '# of initial member rows')
.to.equal(7);
await click('[data-test-button="members-filter-actions"]');
const filter = '[data-test-members-filter="0"]';
await fillIn(`${filter} [data-test-select="members-filter"]`, 'email_count');
await fillIn(`${filter} [data-test-select="members-filter-operator"]`, 'is-greater');
await fillIn(`${filter} [data-test-input="members-filter-value"]`, '9');
await blur(`${filter} [data-test-input="members-filter-value"]`);
expect(findAll('[data-test-list="members-list-item"]').length, '# of members after email_count filter')
.to.equal(4);
await fillIn(`${filter} [data-test-select="members-filter"]`, 'subscriptions.status');
expect(find(`${filter} [data-test-select="members-filter-operator"]`)).to.have.value('is');
expect(findAll('[data-test-list="members-list-item"]').length, '# of members after email_count filter')
.to.equal(3);
});
});
describe('search', function () {