github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Dashboard] [Controls] Fix bug when combining filters (#134606)

Browse source 
* Combine filter arrays directly to prevent overwriting

* Add Jest tests
This commit is contained in:
Hannah Mudge 2022-06-17 13:38:59 -06:00 • committed by GitHub
parent 961b47a08b
commit 4406ff3b60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 94 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

92
src/plugins/dashboard/public/application/lib/dashboard_control_group.test.ts Normal file
View file

@ -0,0 +1,92 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
import { mockControlGroupInput } from '@kbn/controls-plugin/common/mocks';
import { ControlGroupContainer } from '@kbn/controls-plugin/public/control_group/embeddable/control_group_container';
import { Filter } from '@kbn/es-query';
import { combineDashboardFiltersWithControlGroupFilters } from './dashboard_control_group';
jest.mock('@kbn/controls-plugin/public/control_group/embeddable/control_group_container');
const testFilter1: Filter = {
meta: {
key: 'testfield',
alias: null,
disabled: false,
negate: false,
},
query: { match_phrase: { testfield: 'hello' } },
};
const testFilter2: Filter = {
meta: {
key: 'testfield',
alias: null,
disabled: false,
negate: false,
},
query: { match_phrase: { testfield: 'guten tag' } },
};
const testFilter3: Filter = {
meta: {
key: 'testfield',
alias: null,
disabled: false,
negate: false,
},
query: {
bool: {
should: {
0: { match_phrase: { testfield: 'hola' } },
1: { match_phrase: { testfield: 'bonjour' } },
},
},
},
};
const mockControlGroupContainer = new ControlGroupContainer(mockControlGroupInput());
describe('Test dashboard control group', () => {
describe('Combine dashboard filters with control group filters test', () => {
it('Combined filter pills do not get overwritten', async () => {
const dashboardFilterPills = [testFilter1, testFilter2];
mockControlGroupContainer.getOutput = jest.fn().mockReturnValue({ filters: [] });
const combinedFilters = combineDashboardFiltersWithControlGroupFilters(
dashboardFilterPills,
mockControlGroupContainer
);
expect(combinedFilters).toEqual(dashboardFilterPills);
});
it('Combined control filters do not get overwritten', async () => {
const controlGroupFilters = [testFilter1, testFilter2];
mockControlGroupContainer.getOutput = jest
.fn()
.mockReturnValue({ filters: controlGroupFilters });
const combinedFilters = combineDashboardFiltersWithControlGroupFilters(
[] as Filter[],
mockControlGroupContainer
);
expect(combinedFilters).toEqual(controlGroupFilters);
});
it('Combined dashboard filter pills and control filters do not get overwritten', async () => {
const dashboardFilterPills = [testFilter1, testFilter2];
const controlGroupFilters = [testFilter3];
mockControlGroupContainer.getOutput = jest
.fn()
.mockReturnValue({ filters: controlGroupFilters });
const combinedFilters = combineDashboardFiltersWithControlGroupFilters(
dashboardFilterPills,
mockControlGroupContainer
);
expect(combinedFilters).toEqual(dashboardFilterPills.concat(controlGroupFilters));
});
});
});

20
src/plugins/dashboard/public/application/lib/dashboard_control_group.ts
View file

@ -186,22 +186,6 @@ export const deserializeControlGroupFromDashboardSavedObject = (
export const combineDashboardFiltersWithControlGroupFilters = (
dashboardFilters: Filter[],
controlGroup: ControlGroupContainer
) => {
const dashboardFiltersByKey = dashboardFilters.reduce(
(acc: { [key: string]: Filter }, current) => {
const key = current.meta.key;
if (key) acc[key] = current;
return acc;
},
{}
);
const controlGroupFiltersByKey = controlGroup
.getOutput()
.filters?.reduce((acc: { [key: string]: Filter }, current) => {
const key = current.meta.key;
if (key) acc[key] = current;
return acc;
}, {});
const finalFilters = { ...dashboardFiltersByKey, ...(controlGroupFiltersByKey ?? {}) };
return Object.values(finalFilters);
): Filter[] => {
return [...dashboardFilters, ...(controlGroup.getOutput().filters ?? [])];
};