Skip to content

Commit

Permalink
[7.4] Fix disco filters #2 (elastic#50061) (elastic#50123)
Browse files Browse the repository at this point in the history
* backport disco-filters

* add await
  • Loading branch information
Liza Katz authored Nov 11, 2019
1 parent b2e95c2 commit 74b845d
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,16 @@ describe('filter_manager', () => {
expect(appStateStub.filters.length).toBe(1);
});

test('app state should accept array', async () => {
test('app state should accept array and preserve order', async () => {
const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'female');

await filterManager.addFilters([f1]);
await filterManager.addFilters([f2]);
expect(filterManager.getAppFilters()).toHaveLength(2);
const appFilters = filterManager.getAppFilters();
expect(appFilters).toHaveLength(2);
expect(appFilters).toEqual([f1, f2]);
expect(filterManager.getGlobalFilters()).toHaveLength(0);
expect(appStateStub.filters.length).toBe(2);
});

test('global state should accept a single filer', async () => {
Expand All @@ -260,13 +262,33 @@ describe('filter_manager', () => {
expect(globalStateStub.filters.length).toBe(1);
});

test('global state should be accept array', async () => {
test('global state should be accept array and preserve order', async () => {
const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'gender', 'female');

await filterManager.addFilters([f1, f2]);
expect(filterManager.getAppFilters()).toHaveLength(0);
expect(filterManager.getGlobalFilters()).toHaveLength(2);
expect(globalStateStub.filters.length).toBe(2);
const globalFilters = filterManager.getGlobalFilters();
expect(globalFilters).toHaveLength(2);
expect(globalFilters).toEqual([f1, f2]);
});

test('mixed filters: global filters should stay in the beginning', async () => {
const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'female');
await filterManager.addFilters([f1, f2]);
const filters = filterManager.getFilters();
expect(filters).toHaveLength(2);
expect(filters).toEqual([f1, f2]);
});

test('mixed filters: global filters should move to the beginning', async () => {
const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'gender', 'female');
await filterManager.addFilters([f1, f2]);
const filters = filterManager.getFilters();
expect(filters).toHaveLength(2);
expect(filters).toEqual([f2, f1]);
});

test('add multiple filters at once', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,14 @@ export class FilterManager {
private handleStateUpdate(newFilters: Filter[]) {
// global filters should always be first
newFilters.sort(({ $state: a }: Filter, { $state: b }: Filter): number => {
return a!.store === FilterStateStore.GLOBAL_STATE &&
b!.store !== FilterStateStore.GLOBAL_STATE
? -1
: 1;
if (a!.store === b!.store) {
return 0;
} else {
return a!.store === FilterStateStore.GLOBAL_STATE &&
b!.store !== FilterStateStore.GLOBAL_STATE
? -1
: 1;
}
});

const filtersUpdated = !_.isEqual(this.filters, newFilters);
Expand Down

0 comments on commit 74b845d

Please sign in to comment.