(
});
$rootScope.$on('$routeChangeSuccess', () => {
+ if (isDummyWrapperRoute($route)) {
+ return;
+ }
const current = $route.current || {};
if (helpExtensionSetSinceRouteChange || (current.$$route && current.$$route.redirectTo)) {
diff --git a/src/legacy/ui/public/styles/_legacy/_base.scss b/src/legacy/ui/public/styles/_legacy/_base.scss
index aad90a99ac3576..0fcfb515c7c90b 100644
--- a/src/legacy/ui/public/styles/_legacy/_base.scss
+++ b/src/legacy/ui/public/styles/_legacy/_base.scss
@@ -4,13 +4,14 @@
input.ng-invalid,
textarea.ng-invalid,
select.ng-invalid {
- &.ng-dirty, &.ng-touched {
+ &.ng-dirty,
+ &.ng-touched {
border-color: $euiColorDanger !important;
}
}
-input[type="radio"],
-input[type="checkbox"],
+input[type='radio'],
+input[type='checkbox'],
.radio,
.radio-inline,
.checkbox,
@@ -18,7 +19,7 @@ input[type="checkbox"],
&[disabled],
fieldset[disabled] & {
cursor: default;
- opacity: .8;
+ opacity: 0.8;
}
}
@@ -27,7 +28,7 @@ input[type="checkbox"],
align-items: center;
padding-left: 0 !important;
- input[type="checkbox"] {
+ input[type='checkbox'] {
float: none;
margin: 0 $euiSizeXS;
position: static;
@@ -95,7 +96,6 @@ input[type="checkbox"],
}
}
-
// Too overused in many places to be moved elsewhere
.page-row {
@@ -114,7 +114,7 @@ input[type="checkbox"],
// state. This is useful when you've already hand crafted your own
// focus states in Kibana.
:focus {
- &:not([class^="eui"]):not(.kbn-resetFocusState) {
+ &:not([class^='eui']):not(.kbn-resetFocusState) {
@include euiFocusRing;
}
}
@@ -122,7 +122,8 @@ input[type="checkbox"],
// A neccessary hack so that the above focus policy doesn't polute some EUI
// entrenched inputs.
.euiComboBox {
- input:focus {
+ // :not() specificity needed to override the above
+ input:not([class^='eui']):focus {
animation: none !important;
}
}
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx
index 6d3b5fc4e63557..528914f4fd006b 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx
@@ -26,7 +26,9 @@ import {
EuiDraggable,
EuiSpacer,
EuiPanel,
+ EuiFormErrorText,
} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
import { AggConfig } from '../../../../agg_types/agg_config';
import { aggGroupNamesMap, AggGroupNames } from '../agg_groups';
@@ -80,7 +82,15 @@ function DefaultEditorAggGroup({
const [aggsState, setAggsState] = useReducer(aggGroupReducer, group, initAggsState);
- const isGroupValid = Object.values(aggsState).every(item => item.valid);
+ const bucketsError =
+ lastParentPipelineAggTitle && groupName === AggGroupNames.Buckets && !group.length
+ ? i18n.translate('common.ui.aggTypes.buckets.mustHaveBucketErrorMessage', {
+ defaultMessage: 'Add a bucket with "Date Histogram" or "Histogram" aggregation.',
+ description: 'Date Histogram and Histogram should not be translated',
+ })
+ : undefined;
+
+ const isGroupValid = !bucketsError && Object.values(aggsState).every(item => item.valid);
const isAllAggsTouched = isInvalidAggsTouched(aggsState);
const isMetricAggregationDisabled = useMemo(
() => groupName === AggGroupNames.Metrics && getEnabledMetricAggsCount(group) === 1,
@@ -144,6 +154,12 @@ function DefaultEditorAggGroup({
{groupNameLabel}
+ {bucketsError && (
+ <>
+
{bucketsError}
+
+
+ )}
<>
{group.map((agg: AggConfig, index: number) => (
diff --git a/src/legacy/ui/public/vis/vis_filters/brush_event.js b/src/legacy/ui/public/vis/vis_filters/brush_event.js
index 90cbaf7c048ee2..17ab302a20cb16 100644
--- a/src/legacy/ui/public/vis/vis_filters/brush_event.js
+++ b/src/legacy/ui/public/vis/vis_filters/brush_event.js
@@ -19,7 +19,7 @@
import _ from 'lodash';
import moment from 'moment';
-import { buildRangeFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../plugins/data/public';
export function onBrushEvent(event) {
const isNumber = event.data.ordered;
@@ -56,7 +56,7 @@ export function onBrushEvent(event) {
};
}
- const newFilter = buildRangeFilter(
+ const newFilter = esFilters.buildRangeFilter(
field,
range,
indexPattern,
diff --git a/src/legacy/ui/public/vis/vis_filters/vis_filters.js b/src/legacy/ui/public/vis/vis_filters/vis_filters.js
index 9343585fa9508c..e879d040125f11 100644
--- a/src/legacy/ui/public/vis/vis_filters/vis_filters.js
+++ b/src/legacy/ui/public/vis/vis_filters/vis_filters.js
@@ -20,8 +20,8 @@
import _ from 'lodash';
import { pushFilterBarFilters } from '../push_filters';
import { onBrushEvent } from './brush_event';
-import { uniqFilters } from '../../../../../plugins/data/public';
-import { toggleFilterNegated } from '@kbn/es-query';
+import { uniqFilters, esFilters } from '../../../../../plugins/data/public';
+
/**
* For terms aggregations on `__other__` buckets, this assembles a list of applicable filter
* terms based on a specific cell in the tabified data.
@@ -94,7 +94,7 @@ const createFiltersFromEvent = (event) => {
if (filter) {
filter.forEach(f => {
if (event.negate) {
- f = toggleFilterNegated(f);
+ f = esFilters.toggleFilterNegated(f);
}
filters.push(f);
});
diff --git a/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts b/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts
index bb9f5832ac4e5f..fb16e095b34187 100644
--- a/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts
+++ b/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts
@@ -22,7 +22,6 @@ import { debounce, forEach, get, isEqual } from 'lodash';
import * as Rx from 'rxjs';
import { share } from 'rxjs/operators';
import { i18n } from '@kbn/i18n';
-import { Filter } from '@kbn/es-query';
import { toastNotifications } from 'ui/notify';
// @ts-ignore untyped dependency
import { AggConfigs } from 'ui/agg_types/agg_configs';
@@ -44,6 +43,7 @@ import { VisFiltersProvider } from '../../vis/vis_filters';
import { PipelineDataLoader } from './pipeline_data_loader';
import { visualizationLoader } from './visualization_loader';
import { Query } from '../../../../core_plugins/data/public';
+import { esFilters } from '../../../../../plugins/data/public';
import { DataAdapter, RequestAdapter } from '../../inspector/adapters';
@@ -67,7 +67,7 @@ export interface RequestHandlerParams {
aggs: AggConfigs;
timeRange?: TimeRange;
query?: Query;
- filters?: Filter[];
+ filters?: esFilters.Filter[];
forceFetch: boolean;
queryFilter: QueryFilter;
uiState?: PersistedState;
diff --git a/src/legacy/ui/public/visualize/loader/types.ts b/src/legacy/ui/public/visualize/loader/types.ts
index 87183d839e6373..525ec35834ecde 100644
--- a/src/legacy/ui/public/visualize/loader/types.ts
+++ b/src/legacy/ui/public/visualize/loader/types.ts
@@ -17,7 +17,6 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
import { TimeRange } from 'src/plugins/data/public';
import { Query } from 'src/legacy/core_plugins/data/public';
import { SavedObject } from 'ui/saved_objects/saved_object';
@@ -26,6 +25,7 @@ import { SearchSource } from '../../courier';
import { PersistedState } from '../../persisted_state';
import { AppState } from '../../state_management/app_state';
import { Vis } from '../../vis';
+import { esFilters } from '../../../../../plugins/data/public';
export interface VisSavedObject extends SavedObject {
vis: Vis;
@@ -68,7 +68,7 @@ export interface VisualizeLoaderParams {
/**
* Specifies the filters that should be applied to that visualization.
*/
- filters?: Filter[];
+ filters?: esFilters.Filter[];
/**
* The query that should apply to that visualization.
*/
diff --git a/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts b/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts
index ec612f7dd03735..9f3aa190917d73 100644
--- a/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts
+++ b/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts
@@ -22,13 +22,13 @@ import { get } from 'lodash';
import { toastNotifications } from 'ui/notify';
import { AggConfig } from 'ui/vis';
-import { Filter } from '@kbn/es-query';
import { Query } from 'src/legacy/core_plugins/data/public';
import { timefilter } from 'ui/timefilter';
import { Vis } from '../../../vis';
+import { esFilters } from '../../../../../../plugins/data/public';
interface QueryGeohashBoundsParams {
- filters?: Filter[];
+ filters?: esFilters.Filter[];
query?: Query;
}
@@ -76,7 +76,7 @@ export async function queryGeohashBounds(vis: Vis, params: QueryGeohashBoundsPar
const useTimeFilter = !!indexPattern.timeFieldName;
if (useTimeFilter) {
const filter = timefilter.createFilter(indexPattern);
- if (filter) activeFilters.push((filter as any) as Filter);
+ if (filter) activeFilters.push((filter as any) as esFilters.Filter);
}
return activeFilters;
});
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/kibana.json b/src/plugins/dashboard_embeddable_container/kibana.json
similarity index 90%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/kibana.json
rename to src/plugins/dashboard_embeddable_container/kibana.json
index 417168ba61dd94..aab23316f606c0 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/kibana.json
+++ b/src/plugins/dashboard_embeddable_container/kibana.json
@@ -4,7 +4,7 @@
"requiredPlugins": [
"embeddable",
"inspector",
- "ui_actions"
+ "uiActions"
],
"server": false,
"ui": true
diff --git a/src/plugins/dashboard_embeddable_container/public/_index.scss b/src/plugins/dashboard_embeddable_container/public/_index.scss
new file mode 100644
index 00000000000000..ccb8299072fb76
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/_index.scss
@@ -0,0 +1,5 @@
+@import '../../embeddable/public/variables';
+
+@import './embeddable/grid/index';
+@import './embeddable/panel/index';
+@import './embeddable/viewport/index';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.test.tsx b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx
similarity index 97%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.test.tsx
rename to src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx
index 0fa34817bee862..f8c05170e8f672 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.test.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
-import { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_api';
+import { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_plugin';
import { ExpandPanelAction } from './expand_panel_action';
import { DashboardContainer } from '../embeddable';
import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
@@ -27,7 +27,7 @@ import {
ContactCardEmbeddable,
ContactCardEmbeddableInput,
ContactCardEmbeddableOutput,
-} from '../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
+} from '../embeddable_plugin_test_samples';
import { DashboardOptions } from '../embeddable/dashboard_container_factory';
const embeddableFactories = new Map();
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.tsx b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.tsx
similarity index 93%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.tsx
rename to src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.tsx
index f05d0b0efc2ee1..68f68f8a53bccd 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.tsx
@@ -18,12 +18,9 @@
*/
import { i18n } from '@kbn/i18n';
-import { IEmbeddable } from '../../../../../../embeddable_api/public/np_ready/public';
+import { IEmbeddable } from '../embeddable_plugin';
+import { IAction, IncompatibleActionError } from '../ui_actions_plugin';
import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable';
-import {
- IAction,
- IncompatibleActionError,
-} from '../../../../../../../../../src/plugins/ui_actions/public';
export const EXPAND_PANEL_ACTION = 'togglePanel';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts b/src/plugins/dashboard_embeddable_container/public/actions/index.ts
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts
rename to src/plugins/dashboard_embeddable_container/public/actions/index.ts
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/open_replace_panel_flyout.tsx b/src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx
similarity index 78%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/open_replace_panel_flyout.tsx
rename to src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx
index b6652caf3ab837..cb354375e7a683 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/open_replace_panel_flyout.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx
@@ -17,26 +17,32 @@
* under the License.
*/
import React from 'react';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '../../../../core/public';
import { ReplacePanelFlyout } from './replace_panel_flyout';
-
import {
IEmbeddable,
EmbeddableInput,
EmbeddableOutput,
-} from '../../../../../../embeddable_api/public/np_ready/public';
-
-import { IContainer } from '../../../../../../embeddable_api/public/np_ready/public';
-import { NotificationsStart } from '../../../../../../../../core/public';
+ Start as EmbeddableStart,
+ IContainer,
+} from '../embeddable_plugin';
export async function openReplacePanelFlyout(options: {
embeddable: IContainer;
core: CoreStart;
savedObjectFinder: React.ComponentType;
- notifications: NotificationsStart;
+ notifications: CoreStart['notifications'];
panelToRemove: IEmbeddable;
+ getEmbeddableFactories: EmbeddableStart['getEmbeddableFactories'];
}) {
- const { embeddable, core, panelToRemove, savedObjectFinder, notifications } = options;
+ const {
+ embeddable,
+ core,
+ panelToRemove,
+ savedObjectFinder,
+ notifications,
+ getEmbeddableFactories,
+ } = options;
const flyoutSession = core.overlays.openFlyout(
,
{
'data-test-subj': 'replacePanelFlyout',
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.test.tsx b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx
similarity index 83%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.test.tsx
rename to src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx
index e1d2e3609570c0..de29e1dec85a86 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.test.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
-import { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_api';
+import { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_plugin';
import { ReplacePanelAction } from './replace_panel_action';
import { DashboardContainer } from '../embeddable';
import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
@@ -27,7 +27,7 @@ import {
ContactCardEmbeddable,
ContactCardEmbeddableInput,
ContactCardEmbeddableOutput,
-} from '../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
+} from '../embeddable_plugin_test_samples';
import { DashboardOptions } from '../embeddable/dashboard_container_factory';
const embeddableFactories = new Map();
@@ -35,6 +35,7 @@ embeddableFactories.set(
CONTACT_CARD_EMBEDDABLE,
new ContactCardEmbeddableFactory({} as any, (() => null) as any, {} as any)
);
+const getEmbeddableFactories = () => embeddableFactories.values();
let container: DashboardContainer;
let embeddable: ContactCardEmbeddable;
@@ -82,7 +83,12 @@ test('Executes the replace panel action', async () => {
let core: any;
let SavedObjectFinder: any;
let notifications: any;
- const action = new ReplacePanelAction(core, SavedObjectFinder, notifications);
+ const action = new ReplacePanelAction(
+ core,
+ SavedObjectFinder,
+ notifications,
+ getEmbeddableFactories
+ );
action.execute({ embeddable });
});
@@ -90,7 +96,12 @@ test('Is not compatible when embeddable is not in a dashboard container', async
let core: any;
let SavedObjectFinder: any;
let notifications: any;
- const action = new ReplacePanelAction(core, SavedObjectFinder, notifications);
+ const action = new ReplacePanelAction(
+ core,
+ SavedObjectFinder,
+ notifications,
+ getEmbeddableFactories
+ );
expect(
await action.isCompatible({
embeddable: new ContactCardEmbeddable(
@@ -105,7 +116,12 @@ test('Execute throws an error when called with an embeddable not in a parent', a
let core: any;
let SavedObjectFinder: any;
let notifications: any;
- const action = new ReplacePanelAction(core, SavedObjectFinder, notifications);
+ const action = new ReplacePanelAction(
+ core,
+ SavedObjectFinder,
+ notifications,
+ getEmbeddableFactories
+ );
async function check() {
await action.execute({ embeddable: container });
}
@@ -116,7 +132,12 @@ test('Returns title', async () => {
let core: any;
let SavedObjectFinder: any;
let notifications: any;
- const action = new ReplacePanelAction(core, SavedObjectFinder, notifications);
+ const action = new ReplacePanelAction(
+ core,
+ SavedObjectFinder,
+ notifications,
+ getEmbeddableFactories
+ );
expect(action.getDisplayName({ embeddable })).toBeDefined();
});
@@ -124,6 +145,11 @@ test('Returns an icon', async () => {
let core: any;
let SavedObjectFinder: any;
let notifications: any;
- const action = new ReplacePanelAction(core, SavedObjectFinder, notifications);
+ const action = new ReplacePanelAction(
+ core,
+ SavedObjectFinder,
+ notifications,
+ getEmbeddableFactories
+ );
expect(action.getIconType({ embeddable })).toBeDefined();
});
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.tsx b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.tsx
similarity index 87%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.tsx
rename to src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.tsx
index f36efc498b15f1..f6d2fcbcd57fd4 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_action.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.tsx
@@ -18,15 +18,10 @@
*/
import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'src/core/public';
-
-import { IEmbeddable, ViewMode } from '../../../../../../embeddable_api/public/np_ready/public';
+import { CoreStart } from '../../../../core/public';
+import { IEmbeddable, ViewMode, Start as EmbeddableStart } from '../embeddable_plugin';
import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable';
-import {
- IAction,
- IncompatibleActionError,
-} from '../../../../../../../../plugins/ui_actions/public';
-import { NotificationsStart } from '../../../../../../../../core/public';
+import { IAction, IncompatibleActionError } from '../ui_actions_plugin';
import { openReplacePanelFlyout } from './open_replace_panel_flyout';
export const REPLACE_PANEL_ACTION = 'replacePanel';
@@ -47,7 +42,8 @@ export class ReplacePanelAction implements IAction {
constructor(
private core: CoreStart,
private savedobjectfinder: React.ComponentType,
- private notifications: NotificationsStart
+ private notifications: CoreStart['notifications'],
+ private getEmbeddableFactories: EmbeddableStart['getEmbeddableFactories']
) {}
public getDisplayName({ embeddable }: ActionContext) {
@@ -89,6 +85,7 @@ export class ReplacePanelAction implements IAction {
savedObjectFinder: this.savedobjectfinder,
notifications: this.notifications,
panelToRemove: view,
+ getEmbeddableFactories: this.getEmbeddableFactories,
});
}
}
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_flyout.tsx b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_flyout.tsx
similarity index 90%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_flyout.tsx
rename to src/plugins/dashboard_embeddable_container/public/actions/replace_panel_flyout.tsx
index 0e738556372ce0..02e5f45fae3bd6 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/replace_panel_flyout.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_flyout.tsx
@@ -19,10 +19,6 @@
import { i18n } from '@kbn/i18n';
import React from 'react';
-
-import { NotificationsStart } from 'src/core/public';
-import { DashboardPanelState } from 'src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public';
-
import {
EuiFlyout,
EuiFlyoutBody,
@@ -30,15 +26,15 @@ import {
EuiTitle,
EuiGlobalToastListToast as Toast,
} from '@elastic/eui';
-
-import { IContainer } from '../../../../../../embeddable_api/public/np_ready/public';
+import { DashboardPanelState } from '../embeddable';
+import { NotificationsStart } from '../../../../core/public';
import {
+ IContainer,
IEmbeddable,
EmbeddableInput,
EmbeddableOutput,
-} from '../../../../../../embeddable_api/public/np_ready/public';
-
-import { start } from '../../../../../../embeddable_api/public/np_ready/public/legacy';
+ Start as EmbeddableStart,
+} from '../embeddable_plugin';
interface Props {
container: IContainer;
@@ -46,6 +42,7 @@ interface Props {
onClose: () => void;
notifications: NotificationsStart;
panelToRemove: IEmbeddable;
+ getEmbeddableFactories: EmbeddableStart['getEmbeddableFactories'];
}
export class ReplacePanelFlyout extends React.Component {
@@ -117,7 +114,7 @@ export class ReplacePanelFlyout extends React.Component {
defaultMessage: 'No matching objects found.',
}
)}
- savedObjectMetaData={[...start.getEmbeddableFactories()]
+ savedObjectMetaData={[...this.props.getEmbeddableFactories()]
.filter(
embeddableFactory =>
Boolean(embeddableFactory.savedObjectMetaData) && !embeddableFactory.isContainerType
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants.ts
similarity index 94%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants.ts
index 941ddd3c5efecf..34cd8d42a11880 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants.ts
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants.ts
@@ -21,3 +21,4 @@ export const DASHBOARD_GRID_COLUMN_COUNT = 48;
export const DASHBOARD_GRID_HEIGHT = 20;
export const DEFAULT_PANEL_WIDTH = DASHBOARD_GRID_COLUMN_COUNT / 2;
export const DEFAULT_PANEL_HEIGHT = 15;
+export const DASHBOARD_CONTAINER_TYPE = 'dashboard';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.test.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.test.tsx
similarity index 97%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.test.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.test.tsx
index 06bc696b95193d..770c46c62e42f6 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.test.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.test.tsx
@@ -20,7 +20,7 @@
// @ts-ignore
import { findTestSubject } from '@elastic/eui/lib/test';
import { nextTick } from 'test_utils/enzyme_helpers';
-import { isErrorEmbeddable, ViewMode, EmbeddableFactory } from '../embeddable_api';
+import { isErrorEmbeddable, ViewMode, EmbeddableFactory } from '../embeddable_plugin';
import { DashboardContainer, DashboardContainerOptions } from './dashboard_container';
import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
import {
@@ -29,7 +29,7 @@ import {
ContactCardEmbeddableInput,
ContactCardEmbeddable,
ContactCardEmbeddableOutput,
-} from '../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
+} from '../embeddable_plugin_test_samples';
const options: DashboardContainerOptions = {
application: {} as any,
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.tsx
similarity index 83%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.tsx
index 919995f544960d..8b258f35584388 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.tsx
@@ -20,9 +20,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { I18nProvider } from '@kbn/i18n/react';
-import { Filter } from '@kbn/es-query';
-import { RefreshInterval, TimeRange } from 'src/plugins/data/public';
-import { IUiActionsStart } from '../../../../../../../../plugins/ui_actions/public';
+import { RefreshInterval, TimeRange, Query } from '../../../data/public';
+import { CoreStart } from '../../../../core/public';
+import { IUiActionsStart } from '../ui_actions_plugin';
import {
Container,
ContainerInput,
@@ -30,24 +30,23 @@ import {
ViewMode,
EmbeddableFactory,
IEmbeddable,
-} from '../../../../../../embeddable_api/public/np_ready/public';
-import { DASHBOARD_CONTAINER_TYPE } from './dashboard_container_factory';
+ Start as EmbeddableStartContract,
+} from '../embeddable_plugin';
+import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants';
import { createPanelState } from './panel';
import { DashboardPanelState } from './types';
import { DashboardViewport } from './viewport/dashboard_viewport';
-import { Query } from '../../../../../../data/public';
-import { CoreStart } from '../../../../../../../../core/public';
-import { Start as InspectorStartContract } from '../../../../../../../../plugins/inspector/public';
-import { Start as EmbeddableStartContract } from '../../../../../../embeddable_api/public/np_ready/public';
+import { Start as InspectorStartContract } from '../../../inspector/public';
+import { esFilters } from '../../../../plugins/data/public';
import {
+ KibanaContextProvider,
KibanaReactContext,
KibanaReactContextValue,
- KibanaContextProvider,
-} from '../../../../../../../../plugins/kibana_react/public';
+} from '../../../kibana_react/public';
export interface DashboardContainerInput extends ContainerInput {
viewMode: ViewMode;
- filters: Filter[];
+ filters: esFilters.Filter[];
query: Query;
timeRange: TimeRange;
refreshConfig?: RefreshInterval;
@@ -66,7 +65,7 @@ interface IndexSignature {
}
export interface InheritedChildInput extends IndexSignature {
- filters: Filter[];
+ filters: esFilters.Filter[];
query: Query;
timeRange: TimeRange;
refreshConfig?: RefreshInterval;
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container_factory.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx
similarity index 91%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container_factory.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx
index 29ce9bcb0da2e8..c8a2837fd77d0b 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container_factory.ts
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx
@@ -18,17 +18,21 @@
*/
import { i18n } from '@kbn/i18n';
-import { SavedObjectAttributes } from '../../../../../../../../core/server';
+import { SavedObjectAttributes } from '../../../../core/public';
import { SavedObjectMetaData } from '../types';
-import { ContainerOutput, EmbeddableFactory, ErrorEmbeddable, Container } from '../embeddable_api';
+import {
+ ContainerOutput,
+ EmbeddableFactory,
+ ErrorEmbeddable,
+ Container,
+} from '../embeddable_plugin';
import {
DashboardContainer,
DashboardContainerInput,
DashboardContainerOptions,
} from './dashboard_container';
import { DashboardCapabilities } from '../types';
-
-export const DASHBOARD_CONTAINER_TYPE = 'dashboard';
+import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants';
export interface DashboardOptions extends DashboardContainerOptions {
savedObjectMetaData?: SavedObjectMetaData;
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_dashboard_grid.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/_dashboard_grid.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_dashboard_grid.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/_dashboard_grid.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_index.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_index.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/_index.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.test.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.test.tsx
similarity index 96%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.test.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.test.tsx
index 386aae9ddcf78e..e4338dc89153d3 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.test.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.test.tsx
@@ -23,15 +23,15 @@ import sizeMe from 'react-sizeme';
import React from 'react';
import { nextTick, mountWithIntl } from 'test_utils/enzyme_helpers';
import { skip } from 'rxjs/operators';
-import { EmbeddableFactory, GetEmbeddableFactory } from '../../embeddable_api';
+import { EmbeddableFactory, GetEmbeddableFactory } from '../../embeddable_plugin';
import { DashboardGrid, DashboardGridProps } from './dashboard_grid';
import { DashboardContainer, DashboardContainerOptions } from '../dashboard_container';
import { getSampleDashboardInput } from '../../test_helpers';
import {
CONTACT_CARD_EMBEDDABLE,
ContactCardEmbeddableFactory,
-} from '../../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
-import { KibanaContextProvider } from '../../../../../../../../../plugins/kibana_react/public';
+} from '../../embeddable_plugin_test_samples';
+import { KibanaContextProvider } from '../../../../kibana_react/public';
let dashboardContainer: DashboardContainer | undefined;
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.tsx
similarity index 95%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.tsx
index 291bef15641f36..40db43427339d9 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.tsx
@@ -20,19 +20,21 @@
import 'react-grid-layout/css/styles.css';
import 'react-resizable/css/styles.css';
+// @ts-ignore
+import sizeMe from 'react-sizeme';
+
import { injectI18n } from '@kbn/i18n/react';
import classNames from 'classnames';
import _ from 'lodash';
import React from 'react';
import { Subscription } from 'rxjs';
import ReactGridLayout, { Layout } from 'react-grid-layout';
-// @ts-ignore
-import sizeMe from 'react-sizeme';
-import { ViewMode, EmbeddableChildPanel } from '../../embeddable_api';
+import { ViewMode, EmbeddableChildPanel } from '../../embeddable_plugin';
import { DASHBOARD_GRID_COLUMN_COUNT, DASHBOARD_GRID_HEIGHT } from '../dashboard_constants';
-import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container';
import { DashboardPanelState, GridData } from '../types';
-import { withKibana } from '../../../../../../../../../plugins/kibana_react/public';
+import { withKibana } from '../../../../kibana_react/public';
+import { DashboardContainerInput } from '../dashboard_container';
+import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container';
let lastValidGridSize = 0;
@@ -174,16 +176,18 @@ class DashboardGridUi extends React.Component {
isLayoutInvalid,
});
- this.subscription = this.props.container.getInput$().subscribe(input => {
- if (this.mounted) {
- this.setState({
- panels: input.panels,
- viewMode: input.viewMode,
- useMargins: input.useMargins,
- expandedPanelId: input.expandedPanelId,
- });
- }
- });
+ this.subscription = this.props.container
+ .getInput$()
+ .subscribe((input: DashboardContainerInput) => {
+ if (this.mounted) {
+ this.setState({
+ panels: input.panels,
+ viewMode: input.viewMode,
+ useMargins: input.useMargins,
+ expandedPanelId: input.expandedPanelId,
+ });
+ }
+ });
}
public componentWillUnmount() {
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/index.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/index.ts
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/index.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/index.ts
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/index.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/index.ts
similarity index 91%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/index.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/index.ts
index 2a6a56e3300bcb..58bfd5eedefcb1 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/index.ts
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/index.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-export { DASHBOARD_CONTAINER_TYPE, DashboardContainerFactory } from './dashboard_container_factory';
+export { DashboardContainerFactory } from './dashboard_container_factory';
export { DashboardContainer, DashboardContainerInput } from './dashboard_container';
export { createPanelState } from './panel';
@@ -27,4 +27,5 @@ export {
DASHBOARD_GRID_COLUMN_COUNT,
DEFAULT_PANEL_HEIGHT,
DEFAULT_PANEL_WIDTH,
+ DASHBOARD_CONTAINER_TYPE,
} from './dashboard_constants';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_dashboard_panel.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/_dashboard_panel.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_dashboard_panel.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/_dashboard_panel.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_index.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_index.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/_index.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.test.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.test.ts
similarity index 93%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.test.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.test.ts
index e66a25831577c6..8889f4dc275447 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.test.ts
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.test.ts
@@ -20,9 +20,8 @@
import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../dashboard_constants';
import { DashboardPanelState } from '../types';
import { createPanelState } from './create_panel_state';
-import { EmbeddableInput } from '../../embeddable_api';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { CONTACT_CARD_EMBEDDABLE } from '../../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
+import { EmbeddableInput } from '../../embeddable_plugin';
+import { CONTACT_CARD_EMBEDDABLE } from '../../embeddable_plugin_test_samples';
interface TestInput extends EmbeddableInput {
test: string;
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.ts
similarity index 98%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.ts
index 4f3de4a9b2bfb8..7139cddf02b336 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.ts
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.ts
@@ -18,7 +18,7 @@
*/
import _ from 'lodash';
-import { PanelState, EmbeddableInput } from '../../embeddable_api';
+import { PanelState, EmbeddableInput } from '../../embeddable_plugin';
import {
DASHBOARD_GRID_COLUMN_COUNT,
DEFAULT_PANEL_HEIGHT,
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/index.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/index.ts
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/index.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/index.ts
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/types.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/types.ts
similarity index 94%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/types.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/types.ts
index 6e5257f0d1ee0b..480d03552ca68e 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/types.ts
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/types.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { PanelState, EmbeddableInput } from '../embeddable_api';
+import { PanelState, EmbeddableInput } from '../embeddable_plugin';
export type PanelId = string;
export type SavedObjectId = string;
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_dashboard_viewport.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_dashboard_viewport.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_dashboard_viewport.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_dashboard_viewport.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_index.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_index.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_index.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.test.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.test.tsx
similarity index 95%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.test.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.test.tsx
index 01bde21f91d3b7..7b83407bf8063c 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.test.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.test.tsx
@@ -24,15 +24,15 @@ import { skip } from 'rxjs/operators';
import { mount } from 'enzyme';
import { I18nProvider } from '@kbn/i18n/react';
import { nextTick } from 'test_utils/enzyme_helpers';
-import { EmbeddableFactory } from '../../embeddable_api';
+import { EmbeddableFactory } from '../../embeddable_plugin';
import { DashboardViewport, DashboardViewportProps } from './dashboard_viewport';
import { DashboardContainer, DashboardContainerOptions } from '../dashboard_container';
import { getSampleDashboardInput } from '../../test_helpers';
import {
CONTACT_CARD_EMBEDDABLE,
ContactCardEmbeddableFactory,
-} from '../../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
-import { KibanaContextProvider } from '../../../../../../../../../plugins/kibana_react/public';
+} from '../../embeddable_plugin_test_samples';
+import { KibanaContextProvider } from '../../../../../plugins/kibana_react/public';
let dashboardContainer: DashboardContainer | undefined;
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.tsx
similarity index 95%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.tsx
index 59accb225238be..13407e5e33725a 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.tsx
@@ -19,10 +19,10 @@
import React from 'react';
import { Subscription } from 'rxjs';
-import { PanelState } from '../../embeddable_api';
+import { PanelState } from '../../embeddable_plugin';
import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container';
import { DashboardGrid } from '../grid';
-import { context } from '../../../../../../../../../plugins/kibana_react/public';
+import { context } from '../../../../kibana_react/public';
export interface DashboardViewportProps {
container: DashboardContainer;
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable_api.ts b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin.ts
similarity index 91%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable_api.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable_plugin.ts
index 17911b908d3b3f..30c0ec49751416 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable_api.ts
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin.ts
@@ -17,4 +17,4 @@
* under the License.
*/
-export * from '../../../../../embeddable_api/public/np_ready/public';
+export * from '../../../plugins/embeddable/public';
diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable_plugin_test_samples.ts b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin_test_samples.ts
new file mode 100644
index 00000000000000..0e49a94278dfc9
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin_test_samples.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// eslint-disable-next-line
+export * from '../../../plugins/embeddable/public/lib/test_samples';
diff --git a/src/plugins/dashboard_embeddable_container/public/index.ts b/src/plugins/dashboard_embeddable_container/public/index.ts
new file mode 100644
index 00000000000000..73597525105dba
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/index.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from '../../../core/public';
+import { DashboardEmbeddableContainerPublicPlugin } from './plugin';
+
+export * from './types';
+export * from './actions';
+export * from './embeddable';
+
+export function plugin(initializerContext: PluginInitializerContext) {
+ return new DashboardEmbeddableContainerPublicPlugin(initializerContext);
+}
+
+export { DashboardEmbeddableContainerPublicPlugin as Plugin };
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/plugin.ts b/src/plugins/dashboard_embeddable_container/public/plugin.tsx
similarity index 61%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/plugin.ts
rename to src/plugins/dashboard_embeddable_container/public/plugin.tsx
index bb18d109b0de73..eadf70a36416a6 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/plugin.ts
+++ b/src/plugins/dashboard_embeddable_container/public/plugin.tsx
@@ -17,11 +17,21 @@
* under the License.
*/
+/* eslint-disable max-classes-per-file */
+
+import * as React from 'react';
import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import { IUiActionsSetup, IUiActionsStart } from '../../../../../../plugins/ui_actions/public';
-import { CONTEXT_MENU_TRIGGER, Plugin as EmbeddablePlugin } from './lib/embeddable_api';
-import { ExpandPanelAction, ReplacePanelAction, DashboardContainerFactory } from './lib';
-import { Start as InspectorStartContract } from '../../../../../../plugins/inspector/public';
+import { IUiActionsSetup, IUiActionsStart } from '../../../plugins/ui_actions/public';
+import { CONTEXT_MENU_TRIGGER, Plugin as EmbeddablePlugin } from './embeddable_plugin';
+import { ExpandPanelAction, ReplacePanelAction } from '.';
+import { DashboardContainerFactory } from './embeddable/dashboard_container_factory';
+import { Start as InspectorStartContract } from '../../../plugins/inspector/public';
+import {
+ SavedObjectFinder as SavedObjectFinderUi,
+ SavedObjectFinderProps,
+ ExitFullScreenButton as ExitFullScreenButtonUi,
+ ExitFullScreenButtonProps,
+} from '../../../plugins/kibana_react/public';
interface SetupDependencies {
embeddable: ReturnType;
@@ -32,10 +42,6 @@ interface StartDependencies {
embeddable: ReturnType;
inspector: InspectorStartContract;
uiActions: IUiActionsStart;
- __LEGACY: {
- SavedObjectFinder: React.ComponentType;
- ExitFullScreenButton: React.ComponentType;
- };
}
export type Setup = void;
@@ -53,12 +59,35 @@ export class DashboardEmbeddableContainerPublicPlugin
public start(core: CoreStart, plugins: StartDependencies): Start {
const { application, notifications, overlays } = core;
- const { embeddable, inspector, __LEGACY, uiActions } = plugins;
+ const { embeddable, inspector, uiActions } = plugins;
+
+ const SavedObjectFinder: React.FC<
+ Exclude
+ > = props => (
+
+ );
+
+ const useHideChrome = () => {
+ React.useEffect(() => {
+ core.chrome.setIsVisible(false);
+ return () => core.chrome.setIsVisible(true);
+ }, []);
+ };
+
+ const ExitFullScreenButton: React.FC = props => {
+ useHideChrome();
+ return ;
+ };
const changeViewAction = new ReplacePanelAction(
core,
- __LEGACY.SavedObjectFinder,
- notifications
+ SavedObjectFinder,
+ notifications,
+ plugins.embeddable.getEmbeddableFactories
);
uiActions.registerAction(changeViewAction);
uiActions.attachAction(CONTEXT_MENU_TRIGGER, changeViewAction.id);
@@ -69,8 +98,8 @@ export class DashboardEmbeddableContainerPublicPlugin
overlays,
embeddable,
inspector,
- SavedObjectFinder: __LEGACY.SavedObjectFinder,
- ExitFullScreenButton: __LEGACY.ExitFullScreenButton,
+ SavedObjectFinder,
+ ExitFullScreenButton,
uiActions,
});
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/get_sample_dashboard_input.ts b/src/plugins/dashboard_embeddable_container/public/test_helpers/get_sample_dashboard_input.ts
similarity index 96%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/get_sample_dashboard_input.ts
rename to src/plugins/dashboard_embeddable_container/public/test_helpers/get_sample_dashboard_input.ts
index 98eb0636f9aad7..09478d8e8af354 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/get_sample_dashboard_input.ts
+++ b/src/plugins/dashboard_embeddable_container/public/test_helpers/get_sample_dashboard_input.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { ViewMode, EmbeddableInput } from '../embeddable_api';
+import { ViewMode, EmbeddableInput } from '../embeddable_plugin';
import { DashboardContainerInput, DashboardPanelState } from '../embeddable';
export function getSampleDashboardInput(
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/index.ts b/src/plugins/dashboard_embeddable_container/public/test_helpers/index.ts
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/index.ts
rename to src/plugins/dashboard_embeddable_container/public/test_helpers/index.ts
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/tests/dashboard_container.test.tsx b/src/plugins/dashboard_embeddable_container/public/tests/dashboard_container.test.tsx
similarity index 83%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/tests/dashboard_container.test.tsx
rename to src/plugins/dashboard_embeddable_container/public/tests/dashboard_container.test.tsx
index 6cf409581b76d0..6a3b69af60d6b3 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/tests/dashboard_container.test.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/tests/dashboard_container.test.tsx
@@ -23,28 +23,24 @@ import React from 'react';
import { mount } from 'enzyme';
import { nextTick } from 'test_utils/enzyme_helpers';
import { I18nProvider } from '@kbn/i18n/react';
-import { ViewMode, CONTEXT_MENU_TRIGGER, EmbeddablePanel } from '../lib/embeddable_api';
-import {
- DashboardContainer,
- DashboardContainerOptions,
-} from '../lib/embeddable/dashboard_container';
-import { getSampleDashboardInput } from '../lib/test_helpers';
+import { ViewMode, CONTEXT_MENU_TRIGGER, EmbeddablePanel } from '../embeddable_plugin';
+import { DashboardContainer, DashboardContainerOptions } from '../embeddable/dashboard_container';
+import { getSampleDashboardInput } from '../test_helpers';
import {
CONTACT_CARD_EMBEDDABLE,
ContactCardEmbeddableFactory,
-} from '../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
-import {
ContactCardEmbeddableInput,
ContactCardEmbeddable,
ContactCardEmbeddableOutput,
-} from '../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
-import { embeddablePluginMock } from '../../../../../embeddable_api/public/np_ready/public/mocks';
-import { createEditModeAction } from '../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
+ createEditModeAction,
+} from '../embeddable_plugin_test_samples';
+// eslint-disable-next-line
+import { embeddablePluginMock } from '../../../embeddable/public/mocks';
// eslint-disable-next-line
-import { inspectorPluginMock } from '../../../../../../../plugins/inspector/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../plugins/kibana_react/public';
+import { inspectorPluginMock } from '../../../inspector/public/mocks';
+import { KibanaContextProvider } from '../../../kibana_react/public';
// eslint-disable-next-line
-import { uiActionsPluginMock } from 'src/plugins/ui_actions/public/mocks';
+import { uiActionsPluginMock } from '../../../ui_actions/public/mocks';
test('DashboardContainer in edit mode shows edit mode actions', async () => {
const inspector = inspectorPluginMock.createStartContract();
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/types.ts b/src/plugins/dashboard_embeddable_container/public/types.ts
similarity index 95%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/types.ts
rename to src/plugins/dashboard_embeddable_container/public/types.ts
index f729573b01dc9e..9c2d6c0ab388de 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/types.ts
+++ b/src/plugins/dashboard_embeddable_container/public/types.ts
@@ -18,10 +18,7 @@
*/
import { IconType } from '@elastic/eui';
-import {
- SavedObject as SavedObjectType,
- SavedObjectAttributes,
-} from '../../../../../../../core/server';
+import { SavedObject as SavedObjectType, SavedObjectAttributes } from '../../../core/public';
export interface DashboardCapabilities {
showWriteControls: boolean;
diff --git a/src/plugins/dashboard_embeddable_container/public/ui_actions_plugin.ts b/src/plugins/dashboard_embeddable_container/public/ui_actions_plugin.ts
new file mode 100644
index 00000000000000..c8778025e77132
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/ui_actions_plugin.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from '../../../plugins/ui_actions/public';
diff --git a/src/plugins/data/common/es_query/__tests__/fields_mock.ts b/src/plugins/data/common/es_query/__tests__/fields_mock.ts
new file mode 100644
index 00000000000000..83fdf588af00c8
--- /dev/null
+++ b/src/plugins/data/common/es_query/__tests__/fields_mock.ts
@@ -0,0 +1,320 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const fields = [
+ {
+ name: 'bytes',
+ type: 'number',
+ esTypes: ['long'],
+ count: 10,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'ssl',
+ type: 'boolean',
+ esTypes: ['boolean'],
+ count: 20,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: '@timestamp',
+ type: 'date',
+ esTypes: ['date'],
+ count: 30,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'time',
+ type: 'date',
+ esTypes: ['date'],
+ count: 30,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: '@tags',
+ type: 'string',
+ esTypes: ['keyword'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'utc_time',
+ type: 'date',
+ esTypes: ['date'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'phpmemory',
+ type: 'number',
+ esTypes: ['integer'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'ip',
+ type: 'ip',
+ esTypes: ['ip'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'request_body',
+ type: 'attachment',
+ esTypes: ['attachment'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'point',
+ type: 'geo_point',
+ esTypes: ['geo_point'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'area',
+ type: 'geo_shape',
+ esTypes: ['geo_shape'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'hashed',
+ type: 'murmur3',
+ esTypes: ['murmur3'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: false,
+ readFromDocValues: false,
+ },
+ {
+ name: 'geo.coordinates',
+ type: 'geo_point',
+ esTypes: ['geo_point'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'extension',
+ type: 'string',
+ esTypes: ['keyword'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'machine.os',
+ type: 'string',
+ esTypes: ['text'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'machine.os.raw',
+ type: 'string',
+ esTypes: ['keyword'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ subType: { multi: { parent: 'machine.os' } },
+ },
+ {
+ name: 'geo.src',
+ type: 'string',
+ esTypes: ['keyword'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: '_id',
+ type: 'string',
+ esTypes: ['_id'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: '_type',
+ type: 'string',
+ esTypes: ['_type'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: '_source',
+ type: '_source',
+ esTypes: ['_source'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'non-filterable',
+ type: 'string',
+ esTypes: ['text'],
+ count: 0,
+ scripted: false,
+ searchable: false,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'non-sortable',
+ type: 'string',
+ esTypes: ['text'],
+ count: 0,
+ scripted: false,
+ searchable: false,
+ aggregatable: false,
+ readFromDocValues: false,
+ },
+ {
+ name: 'custom_user_field',
+ type: 'conflict',
+ esTypes: ['long', 'text'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'script string',
+ type: 'string',
+ count: 0,
+ scripted: true,
+ script: "'i am a string'",
+ lang: 'expression',
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'script number',
+ type: 'number',
+ count: 0,
+ scripted: true,
+ script: '1234',
+ lang: 'expression',
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'script date',
+ type: 'date',
+ count: 0,
+ scripted: true,
+ script: '1234',
+ lang: 'painless',
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'script murmur3',
+ type: 'murmur3',
+ count: 0,
+ scripted: true,
+ script: '1234',
+ lang: 'expression',
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'nestedField.child',
+ type: 'string',
+ esTypes: ['text'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: false,
+ readFromDocValues: false,
+ subType: { nested: { path: 'nestedField' } },
+ },
+ {
+ name: 'nestedField.nestedChild.doublyNestedChild',
+ type: 'string',
+ esTypes: ['text'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: false,
+ readFromDocValues: false,
+ subType: { nested: { path: 'nestedField.nestedChild' } },
+ },
+];
+
+export const getField = (name: string) => fields.find(field => field.name === name);
diff --git a/packages/kbn-es-query/src/filters/lib/custom_filter.ts b/src/plugins/data/common/es_query/filters/custom_filter.ts
similarity index 100%
rename from packages/kbn-es-query/src/filters/lib/custom_filter.ts
rename to src/plugins/data/common/es_query/filters/custom_filter.ts
diff --git a/packages/kbn-es-query/src/filters/lib/exists_filter.ts b/src/plugins/data/common/es_query/filters/exists_filter.ts
similarity index 81%
rename from packages/kbn-es-query/src/filters/lib/exists_filter.ts
rename to src/plugins/data/common/es_query/filters/exists_filter.ts
index 5843c25c43cffd..9125048e5f6cd0 100644
--- a/packages/kbn-es-query/src/filters/lib/exists_filter.ts
+++ b/src/plugins/data/common/es_query/filters/exists_filter.ts
@@ -18,6 +18,7 @@
*/
import { Filter, FilterMeta } from './meta_filter';
+import { IndexPattern, Field } from './types';
export type ExistsFilterMeta = FilterMeta;
@@ -31,3 +32,14 @@ export type ExistsFilter = Filter & {
};
export const isExistsFilter = (filter: any): filter is ExistsFilter => filter && filter.exists;
+
+export const buildExistsFilter = (field: Field, indexPattern: IndexPattern) => {
+ return {
+ meta: {
+ index: indexPattern.id,
+ },
+ exists: {
+ field: field.name,
+ },
+ } as ExistsFilter;
+};
diff --git a/packages/kbn-es-query/src/filters/lib/geo_bounding_box_filter.ts b/src/plugins/data/common/es_query/filters/geo_bounding_box_filter.ts
similarity index 100%
rename from packages/kbn-es-query/src/filters/lib/geo_bounding_box_filter.ts
rename to src/plugins/data/common/es_query/filters/geo_bounding_box_filter.ts
diff --git a/packages/kbn-es-query/src/filters/lib/geo_polygon_filter.ts b/src/plugins/data/common/es_query/filters/geo_polygon_filter.ts
similarity index 100%
rename from packages/kbn-es-query/src/filters/lib/geo_polygon_filter.ts
rename to src/plugins/data/common/es_query/filters/geo_polygon_filter.ts
diff --git a/src/plugins/data/common/es_query/filters/index.ts b/src/plugins/data/common/es_query/filters/index.ts
new file mode 100644
index 00000000000000..e28ce9ba74975c
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/index.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './custom_filter';
+export * from './exists_filter';
+export * from './geo_bounding_box_filter';
+export * from './geo_polygon_filter';
+export * from './match_all_filter';
+export * from './meta_filter';
+export * from './missing_filter';
+export * from './phrase_filter';
+export * from './phrases_filter';
+export * from './query_string_filter';
+export * from './range_filter';
+
+export * from './types';
diff --git a/packages/kbn-es-query/src/filters/lib/match_all_filter.ts b/src/plugins/data/common/es_query/filters/match_all_filter.ts
similarity index 100%
rename from packages/kbn-es-query/src/filters/lib/match_all_filter.ts
rename to src/plugins/data/common/es_query/filters/match_all_filter.ts
diff --git a/packages/kbn-es-query/src/filters/lib/meta_filter.ts b/src/plugins/data/common/es_query/filters/meta_filter.ts
similarity index 75%
rename from packages/kbn-es-query/src/filters/lib/meta_filter.ts
rename to src/plugins/data/common/es_query/filters/meta_filter.ts
index 8f6aef782cea24..9adfdc4eedcb33 100644
--- a/packages/kbn-es-query/src/filters/lib/meta_filter.ts
+++ b/src/plugins/data/common/es_query/filters/meta_filter.ts
@@ -55,7 +55,7 @@ export interface LatLon {
lon: number;
}
-export function buildEmptyFilter(isPinned: boolean, index?: string): Filter {
+export const buildEmptyFilter = (isPinned: boolean, index?: string): Filter => {
const meta: FilterMeta = {
disabled: false,
negate: false,
@@ -65,43 +65,43 @@ export function buildEmptyFilter(isPinned: boolean, index?: string): Filter {
const $state: FilterState = {
store: isPinned ? FilterStateStore.GLOBAL_STATE : FilterStateStore.APP_STATE,
};
+
return { meta, $state };
-}
+};
-export function isFilterPinned(filter: Filter) {
+export const isFilterPinned = (filter: Filter) => {
return filter.$state && filter.$state.store === FilterStateStore.GLOBAL_STATE;
-}
+};
-export function toggleFilterDisabled(filter: Filter) {
+export const toggleFilterDisabled = (filter: Filter) => {
const disabled = !filter.meta.disabled;
const meta = { ...filter.meta, disabled };
+
return { ...filter, meta };
-}
+};
-export function toggleFilterNegated(filter: Filter) {
+export const toggleFilterNegated = (filter: Filter) => {
const negate = !filter.meta.negate;
const meta = { ...filter.meta, negate };
+
return { ...filter, meta };
-}
+};
-export function toggleFilterPinned(filter: Filter) {
+export const toggleFilterPinned = (filter: Filter) => {
const store = isFilterPinned(filter) ? FilterStateStore.APP_STATE : FilterStateStore.GLOBAL_STATE;
const $state = { ...filter.$state, store };
+
return { ...filter, $state };
-}
+};
-export function enableFilter(filter: Filter) {
- return !filter.meta.disabled ? filter : toggleFilterDisabled(filter);
-}
+export const enableFilter = (filter: Filter) =>
+ !filter.meta.disabled ? filter : toggleFilterDisabled(filter);
-export function disableFilter(filter: Filter) {
- return filter.meta.disabled ? filter : toggleFilterDisabled(filter);
-}
+export const disableFilter = (filter: Filter) =>
+ filter.meta.disabled ? filter : toggleFilterDisabled(filter);
-export function pinFilter(filter: Filter) {
- return isFilterPinned(filter) ? filter : toggleFilterPinned(filter);
-}
+export const pinFilter = (filter: Filter) =>
+ isFilterPinned(filter) ? filter : toggleFilterPinned(filter);
-export function unpinFilter(filter: Filter) {
- return !isFilterPinned(filter) ? filter : toggleFilterPinned(filter);
-}
+export const unpinFilter = (filter: Filter) =>
+ !isFilterPinned(filter) ? filter : toggleFilterPinned(filter);
diff --git a/packages/kbn-es-query/src/filters/lib/missing_filter.ts b/src/plugins/data/common/es_query/filters/missing_filter.ts
similarity index 100%
rename from packages/kbn-es-query/src/filters/lib/missing_filter.ts
rename to src/plugins/data/common/es_query/filters/missing_filter.ts
diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.test.ts b/src/plugins/data/common/es_query/filters/phrase_filter.test.ts
new file mode 100644
index 00000000000000..ec13e28c583d18
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/phrase_filter.test.ts
@@ -0,0 +1,97 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { buildInlineScriptForPhraseFilter, buildPhraseFilter } from './phrase_filter';
+import { IndexPattern } from './types';
+import { getField } from '../__tests__/fields_mock';
+
+describe('Phrase filter builder', () => {
+ let indexPattern: IndexPattern;
+
+ beforeEach(() => {
+ indexPattern = {
+ id: 'id',
+ };
+ });
+
+ it('should be a function', () => {
+ expect(typeof buildPhraseFilter).toBe('function');
+ });
+
+ it('should return a match query filter when passed a standard field', () => {
+ const field = getField('bytes');
+
+ expect(buildPhraseFilter(field, 5, indexPattern)).toEqual({
+ meta: {
+ index: 'id',
+ },
+ query: {
+ match_phrase: {
+ bytes: 5,
+ },
+ },
+ });
+ });
+
+ it('should return a script filter when passed a scripted field', () => {
+ const field = getField('script number');
+
+ expect(buildPhraseFilter(field, 5, indexPattern)).toEqual({
+ meta: {
+ index: 'id',
+ field: 'script number',
+ },
+ script: {
+ script: {
+ lang: 'expression',
+ params: {
+ value: 5,
+ },
+ source: '(1234) == value',
+ },
+ },
+ });
+ });
+});
+
+describe('buildInlineScriptForPhraseFilter', () => {
+ it('should wrap painless scripts in a lambda', () => {
+ const field = {
+ lang: 'painless',
+ script: 'return foo;',
+ };
+
+ const expected =
+ `boolean compare(Supplier s, def v) {return s.get() == v;}` +
+ `compare(() -> { return foo; }, params.value);`;
+
+ expect(buildInlineScriptForPhraseFilter(field)).toBe(expected);
+ });
+
+ it('should create a simple comparison for other langs', () => {
+ const field = {
+ lang: 'expression',
+ script: 'doc[bytes].value',
+ };
+
+ const expected = `(doc[bytes].value) == value`;
+
+ expect(buildInlineScriptForPhraseFilter(field)).toBe(expected);
+ });
+});
diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.ts b/src/plugins/data/common/es_query/filters/phrase_filter.ts
new file mode 100644
index 00000000000000..15c5c9d4ad2e6d
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/phrase_filter.ts
@@ -0,0 +1,144 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { get, isPlainObject } from 'lodash';
+import { Filter, FilterMeta } from './meta_filter';
+import { IndexPattern, Field } from './types';
+
+export type PhraseFilterMeta = FilterMeta & {
+ params?: {
+ query: string; // The unformatted value
+ };
+ script?: {
+ script: {
+ source?: any;
+ lang?: string;
+ params: any;
+ };
+ };
+ field?: any;
+ index?: any;
+};
+
+export type PhraseFilter = Filter & {
+ meta: PhraseFilterMeta;
+};
+
+type PhraseFilterValue = string | number | boolean;
+
+export const isPhraseFilter = (filter: any): filter is PhraseFilter => {
+ const isMatchPhraseQuery = filter && filter.query && filter.query.match_phrase;
+
+ const isDeprecatedMatchPhraseQuery =
+ filter &&
+ filter.query &&
+ filter.query.match &&
+ Object.values(filter.query.match).find((params: any) => params.type === 'phrase');
+
+ return !!(isMatchPhraseQuery || isDeprecatedMatchPhraseQuery);
+};
+
+export const isScriptedPhraseFilter = (filter: any): filter is PhraseFilter =>
+ Boolean(get(filter, 'script.script.params.value'));
+
+export const getPhraseFilterField = (filter: PhraseFilter) => {
+ const queryConfig = filter.query.match_phrase || filter.query.match;
+ return Object.keys(queryConfig)[0];
+};
+
+export const getPhraseFilterValue = (filter: PhraseFilter): PhraseFilterValue => {
+ const queryConfig = filter.query.match_phrase || filter.query.match;
+ const queryValue = Object.values(queryConfig)[0] as any;
+ return isPlainObject(queryValue) ? queryValue.query : queryValue;
+};
+
+export const buildPhraseFilter = (
+ field: Field,
+ value: any,
+ indexPattern: IndexPattern
+): PhraseFilter => {
+ const convertedValue = getConvertedValueForField(field, value);
+
+ if (field.scripted) {
+ return {
+ meta: { index: indexPattern.id, field: field.name } as PhraseFilterMeta,
+ script: getPhraseScript(field, value),
+ } as PhraseFilter;
+ } else {
+ return {
+ meta: { index: indexPattern.id },
+ query: {
+ match_phrase: {
+ [field.name]: convertedValue,
+ },
+ },
+ } as PhraseFilter;
+ }
+};
+
+export const getPhraseScript = (field: Field, value: string) => {
+ const convertedValue = getConvertedValueForField(field, value);
+ const script = buildInlineScriptForPhraseFilter(field);
+
+ return {
+ script: {
+ source: script,
+ lang: field.lang,
+ params: {
+ value: convertedValue,
+ },
+ },
+ };
+};
+
+// See https://github.com/elastic/elasticsearch/issues/20941 and https://github.com/elastic/kibana/issues/8677
+// and https://github.com/elastic/elasticsearch/pull/22201
+// for the reason behind this change. Aggs now return boolean buckets with a key of 1 or 0.
+export const getConvertedValueForField = (field: Field, value: any) => {
+ if (typeof value !== 'boolean' && field.type === 'boolean') {
+ if ([1, 'true'].includes(value)) {
+ return true;
+ } else if ([0, 'false'].includes(value)) {
+ return false;
+ } else {
+ throw new Error(`${value} is not a valid boolean value for boolean field ${field.name}`);
+ }
+ }
+ return value;
+};
+
+/**
+ * Takes a scripted field and returns an inline script appropriate for use in a script query.
+ * Handles lucene expression and Painless scripts. Other langs aren't guaranteed to generate valid
+ * scripts.
+ *
+ * @param {object} scriptedField A Field object representing a scripted field
+ * @returns {string} The inline script string
+ */
+export const buildInlineScriptForPhraseFilter = (scriptedField: any) => {
+ // We must wrap painless scripts in a lambda in case they're more than a simple expression
+ if (scriptedField.lang === 'painless') {
+ return (
+ `boolean compare(Supplier s, def v) {return s.get() == v;}` +
+ `compare(() -> { ${scriptedField.script} }, params.value);`
+ );
+ } else {
+ return `(${scriptedField.script}) == value`;
+ }
+};
diff --git a/packages/kbn-es-query/src/filters/phrases.js b/src/plugins/data/common/es_query/filters/phrases_filter.ts
similarity index 51%
rename from packages/kbn-es-query/src/filters/phrases.js
rename to src/plugins/data/common/es_query/filters/phrases_filter.ts
index f02b3763f37bb7..e4606695c0f6a5 100644
--- a/packages/kbn-es-query/src/filters/phrases.js
+++ b/src/plugins/data/common/es_query/filters/phrases_filter.ts
@@ -17,47 +17,54 @@
* under the License.
*/
-import { getPhraseScript } from './phrase';
+import { Filter, FilterMeta } from './meta_filter';
+import { Field, IndexPattern } from './types';
+import { getPhraseScript } from './phrase_filter';
+
+export type PhrasesFilterMeta = FilterMeta & {
+ params: string[]; // The unformatted values
+ field?: string;
+};
+
+export type PhrasesFilter = Filter & {
+ meta: PhrasesFilterMeta;
+};
+
+export const isPhrasesFilter = (filter: any): filter is PhrasesFilter =>
+ filter && filter.meta.type === 'phrases';
// Creates a filter where the given field matches one or more of the given values
// params should be an array of values
-export function buildPhrasesFilter(field, params, indexPattern) {
+export const buildPhrasesFilter = (field: Field, params: any, indexPattern: IndexPattern) => {
const index = indexPattern.id;
const type = 'phrases';
const key = field.name;
- const value = params
- .map(value => format(field, value))
- .join(', ');
- const filter = {
- meta: { index, type, key, value, params }
- };
+ const format = (f: Field, value: any) =>
+ f && f.format && f.format.convert ? f.format.convert(value) : value;
+
+ const value = params.map((v: any) => format(field, v)).join(', ');
let should;
if (field.scripted) {
- should = params.map((value) => ({
- script: getPhraseScript(field, value)
+ should = params.map((v: any) => ({
+ script: getPhraseScript(field, v),
}));
} else {
- should = params.map((value) => ({
+ should = params.map((v: any) => ({
match_phrase: {
- [field.name]: value
- }
+ [field.name]: v,
+ },
}));
}
- filter.query = {
- bool: {
- should,
- minimum_should_match: 1
- }
- };
-
- return filter;
-}
-
-function format(field, value) {
- return field && field.format && field.format.convert
- ? field.format.convert(value)
- : value;
-}
+ return {
+ meta: { index, type, key, value, params },
+ query: {
+ bool: {
+ should,
+ minimum_should_match: 1,
+ },
+ },
+ } as PhrasesFilter;
+};
diff --git a/src/plugins/data/common/es_query/filters/query_string_filter.test.ts b/src/plugins/data/common/es_query/filters/query_string_filter.test.ts
new file mode 100644
index 00000000000000..839e4f6359257e
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/query_string_filter.test.ts
@@ -0,0 +1,47 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { buildQueryFilter } from './query_string_filter';
+import { IndexPattern } from './types';
+
+describe('Phrase filter builder', () => {
+ let indexPattern: IndexPattern;
+
+ beforeEach(() => {
+ indexPattern = {
+ id: 'id',
+ };
+ });
+
+ it('should be a function', () => {
+ expect(typeof buildQueryFilter).toBe('function');
+ });
+
+ it('should return a query filter when passed a standard field', () => {
+ expect(buildQueryFilter({ foo: 'bar' }, indexPattern.id, '')).toEqual({
+ meta: {
+ alias: '',
+ index: 'id',
+ },
+ query: {
+ foo: 'bar',
+ },
+ });
+ });
+});
diff --git a/packages/kbn-es-query/src/filters/lib/query_string_filter.ts b/src/plugins/data/common/es_query/filters/query_string_filter.ts
similarity index 78%
rename from packages/kbn-es-query/src/filters/lib/query_string_filter.ts
rename to src/plugins/data/common/es_query/filters/query_string_filter.ts
index 3b3b97fafba9bc..901dc724aa4e49 100644
--- a/packages/kbn-es-query/src/filters/lib/query_string_filter.ts
+++ b/src/plugins/data/common/es_query/filters/query_string_filter.ts
@@ -18,6 +18,7 @@
*/
import { Filter, FilterMeta } from './meta_filter';
+import { IndexPattern } from './types';
export type QueryStringFilterMeta = FilterMeta;
@@ -32,3 +33,17 @@ export type QueryStringFilter = Filter & {
export const isQueryStringFilter = (filter: any): filter is QueryStringFilter =>
filter && filter.query && filter.query.query_string;
+
+// Creates a filter corresponding to a raw Elasticsearch query DSL object
+export const buildQueryFilter = (
+ query: QueryStringFilter['query'],
+ index: IndexPattern,
+ alias: string
+) =>
+ ({
+ query,
+ meta: {
+ index,
+ alias,
+ },
+ } as QueryStringFilter);
diff --git a/src/plugins/data/common/es_query/filters/range_filter.test.ts b/src/plugins/data/common/es_query/filters/range_filter.test.ts
new file mode 100644
index 00000000000000..9008dc2a672944
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/range_filter.test.ts
@@ -0,0 +1,174 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { each } from 'lodash';
+import { buildRangeFilter, RangeFilter } from './range_filter';
+import { IndexPattern, Field } from './types';
+import { getField } from '../__tests__/fields_mock';
+
+describe('Range filter builder', () => {
+ let indexPattern: IndexPattern;
+
+ beforeEach(() => {
+ indexPattern = {
+ id: 'id',
+ };
+ });
+
+ it('should be a function', () => {
+ expect(typeof buildRangeFilter).toBe('function');
+ });
+
+ it('should return a range filter when passed a standard field', () => {
+ const field = getField('bytes');
+
+ expect(buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern)).toEqual({
+ meta: {
+ index: 'id',
+ params: {},
+ },
+ range: {
+ bytes: {
+ gte: 1,
+ lte: 3,
+ },
+ },
+ });
+ });
+
+ it('should return a script filter when passed a scripted field', () => {
+ const field = getField('script number');
+
+ expect(buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern)).toEqual({
+ meta: {
+ field: 'script number',
+ index: 'id',
+ params: {},
+ },
+ script: {
+ script: {
+ lang: 'expression',
+ source: '(' + field!.script + ')>=gte && (' + field!.script + ')<=lte',
+ params: {
+ value: '>=1 <=3',
+ gte: 1,
+ lte: 3,
+ },
+ },
+ },
+ });
+ });
+
+ it('should wrap painless scripts in comparator lambdas', () => {
+ const field = getField('script date');
+ const expected =
+ `boolean gte(Supplier s, def v) {return !s.get().toInstant().isBefore(Instant.parse(v))} ` +
+ `boolean lte(Supplier s, def v) {return !s.get().toInstant().isAfter(Instant.parse(v))}` +
+ `gte(() -> { ${field!.script} }, params.gte) && ` +
+ `lte(() -> { ${field!.script} }, params.lte)`;
+
+ const rangeFilter = buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern);
+
+ expect(rangeFilter.script!.script.source).toBe(expected);
+ });
+
+ it('should throw an error when gte and gt, or lte and lt are both passed', () => {
+ const field = getField('script number');
+
+ expect(() => {
+ buildRangeFilter(field, { gte: 1, gt: 3 }, indexPattern);
+ }).toThrowError();
+
+ expect(() => {
+ buildRangeFilter(field, { lte: 1, lt: 3 }, indexPattern);
+ }).toThrowError();
+ });
+
+ it('to use the right operator for each of gte, gt, lt and lte', () => {
+ const field = getField('script number');
+
+ each({ gte: '>=', gt: '>', lte: '<=', lt: '<' }, (operator: string, key: any) => {
+ const params = {
+ [key]: 5,
+ };
+
+ const filter = buildRangeFilter(field, params, indexPattern);
+ const script = filter.script!.script;
+
+ expect(script.source).toBe('(' + field!.script + ')' + operator + key);
+ expect(script.params[key]).toBe(5);
+ expect(script.params.value).toBe(operator + 5);
+ });
+ });
+
+ describe('when given params where one side is infinite', () => {
+ let field: Field;
+ let filter: RangeFilter;
+
+ beforeEach(() => {
+ field = getField('script number');
+ filter = buildRangeFilter(field, { gte: 0, lt: Infinity }, indexPattern);
+ });
+
+ describe('returned filter', () => {
+ it('is a script filter', () => {
+ expect(filter).toHaveProperty('script');
+ });
+
+ it('contain a param for the finite side', () => {
+ expect(filter.script!.script.params).toHaveProperty('gte', 0);
+ });
+
+ it('does not contain a param for the infinite side', () => {
+ expect(filter.script!.script.params).not.toHaveProperty('lt');
+ });
+
+ it('does not contain a script condition for the infinite side', () => {
+ const script = field!.script;
+
+ expect(filter.script!.script.source).toEqual(`(${script})>=gte`);
+ });
+ });
+ });
+
+ describe('when given params where both sides are infinite', () => {
+ let field: Field;
+ let filter: RangeFilter;
+
+ beforeEach(() => {
+ field = getField('script number');
+ filter = buildRangeFilter(field, { gte: -Infinity, lt: Infinity }, indexPattern);
+ });
+
+ describe('returned filter', () => {
+ it('is a match_all filter', () => {
+ expect(filter).not.toHaveProperty('script');
+ expect(filter).toHaveProperty('match_all');
+ });
+
+ it('does not contain params', () => {
+ expect(filter).not.toHaveProperty('params');
+ });
+
+ it('meta field is set to field name', () => {
+ expect(filter.meta.field).toEqual('script number');
+ });
+ });
+ });
+});
diff --git a/packages/kbn-es-query/src/filters/range.js b/src/plugins/data/common/es_query/filters/range_filter.ts
similarity index 51%
rename from packages/kbn-es-query/src/filters/range.js
rename to src/plugins/data/common/es_query/filters/range_filter.ts
index 357f9209c50de3..d7931f191e52b1 100644
--- a/packages/kbn-es-query/src/filters/range.js
+++ b/src/plugins/data/common/es_query/filters/range_filter.ts
@@ -16,9 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
+import { map, reduce, mapValues, get, keys, pick } from 'lodash';
+import { Filter, FilterMeta } from './meta_filter';
+import { Field, IndexPattern } from './types';
-import _ from 'lodash';
const OPERANDS_IN_RANGE = 2;
+
const operators = {
gt: '>',
gte: '>=',
@@ -39,33 +42,85 @@ const dateComparators = {
lt: 'boolean lt(Supplier s, def v) {return s.get().toInstant().isBefore(Instant.parse(v))}',
};
-function formatValue(field, params) {
- return _.map(params, (val, key) => operators[key] + format(field, val)).join(' ');
+export interface RangeFilterParams {
+ from?: number | string;
+ to?: number | string;
+ gt?: number | string;
+ lt?: number | string;
+ gte?: number | string;
+ lte?: number | string;
+ format?: string;
}
+const hasRangeKeys = (params: RangeFilterParams) =>
+ Boolean(
+ keys(params).find((key: string) => ['gte', 'gt', 'lte', 'lt', 'from', 'to'].includes(key))
+ );
+
+export type RangeFilterMeta = FilterMeta & {
+ params: RangeFilterParams;
+ field?: any;
+ formattedValue?: string;
+};
+
+export type RangeFilter = Filter & {
+ meta: RangeFilterMeta;
+ script?: {
+ script: {
+ params: any;
+ lang: string;
+ source: any;
+ };
+ };
+ match_all?: any;
+ range: { [key: string]: RangeFilterParams };
+};
+
+export const isRangeFilter = (filter: any): filter is RangeFilter => filter && filter.range;
+
+export const isScriptedRangeFilter = (filter: any): filter is RangeFilter => {
+ const params: RangeFilterParams = get(filter, 'script.script.params', {});
+
+ return hasRangeKeys(params);
+};
+
+const formatValue = (field: Field, params: any[]) =>
+ map(params, (val: any, key: string) => get(operators, key) + format(field, val)).join(' ');
+
+const format = (field: Field, value: any) =>
+ field && field.format && field.format.convert ? field.format.convert(value) : value;
+
// Creates a filter where the value for the given field is in the given range
// params should be an object containing `lt`, `lte`, `gt`, and/or `gte`
-export function buildRangeFilter(field, params, indexPattern, formattedValue) {
- const filter = { meta: { index: indexPattern.id } };
- if (formattedValue) filter.meta.formattedValue = formattedValue;
+export const buildRangeFilter = (
+ field: Field,
+ params: RangeFilterParams,
+ indexPattern: IndexPattern,
+ formattedValue?: string
+): RangeFilter => {
+ const filter: any = { meta: { index: indexPattern.id, params: {} } };
+
+ if (formattedValue) {
+ filter.meta.formattedValue = formattedValue;
+ }
- params = _.mapValues(params, (value) => {
- return (field.type === 'number') ? parseFloat(value) : value;
- });
+ params = mapValues(params, value => (field.type === 'number' ? parseFloat(value) : value));
if ('gte' in params && 'gt' in params) throw new Error('gte and gt are mutually exclusive');
if ('lte' in params && 'lt' in params) throw new Error('lte and lt are mutually exclusive');
- const totalInfinite = ['gt', 'lt'].reduce((totalInfinite, op) => {
+ const totalInfinite = ['gt', 'lt'].reduce((acc: number, op: any) => {
const key = op in params ? op : `${op}e`;
- const isInfinite = Math.abs(params[key]) === Infinity;
+ const isInfinite = Math.abs(get(params, key)) === Infinity;
if (isInfinite) {
- totalInfinite++;
+ acc++;
+
+ // @ts-ignore
delete params[key];
}
- return totalInfinite;
+ return acc;
}, 0);
if (totalInfinite === OPERANDS_IN_RANGE) {
@@ -81,25 +136,29 @@ export function buildRangeFilter(field, params, indexPattern, formattedValue) {
filter.range[field.name] = params;
}
- return filter;
-}
+ return filter as RangeFilter;
+};
-export function getRangeScript(field, params) {
- const knownParams = _.pick(params, (val, key) => {
- return key in operators;
- });
- let script = _.map(knownParams, function (val, key) {
- return '(' + field.script + ')' + operators[key] + key;
- }).join(' && ');
+export const getRangeScript = (field: IndexPattern, params: RangeFilterParams) => {
+ const knownParams = pick(params, (val, key: any) => key in operators);
+ let script = map(
+ knownParams,
+ (val: any, key: string) => '(' + field.script + ')' + get(operators, key) + key
+ ).join(' && ');
// We must wrap painless scripts in a lambda in case they're more than a simple expression
if (field.lang === 'painless') {
const comp = field.type === 'date' ? dateComparators : comparators;
- const currentComparators = _.reduce(knownParams, (acc, val, key) => acc.concat(comp[key]), []).join(' ');
+ const currentComparators = reduce(
+ knownParams,
+ (acc, val, key) => acc.concat(get(comp, key)),
+ []
+ ).join(' ');
- const comparisons = _.map(knownParams, function (val, key) {
- return `${key}(() -> { ${field.script} }, params.${key})`;
- }).join(' && ');
+ const comparisons = map(
+ knownParams,
+ (val, key) => `${key}(() -> { ${field.script} }, params.${key})`
+ ).join(' && ');
script = `${currentComparators}${comparisons}`;
}
@@ -108,14 +167,7 @@ export function getRangeScript(field, params) {
script: {
source: script,
params: knownParams,
- lang: field.lang
- }
+ lang: field.lang,
+ },
};
-}
-
-function format(field, value) {
- return field && field.format && field.format.convert
- ? field.format.convert(value)
- : value;
-}
-
+};
diff --git a/src/plugins/data/common/es_query/filters/types.ts b/src/plugins/data/common/es_query/filters/types.ts
new file mode 100644
index 00000000000000..28147350619995
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/types.ts
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ExistsFilter } from './exists_filter';
+import { GeoBoundingBoxFilter } from './geo_bounding_box_filter';
+import { GeoPolygonFilter } from './geo_polygon_filter';
+import { PhrasesFilter } from './phrases_filter';
+import { PhraseFilter } from './phrase_filter';
+import { RangeFilter } from './range_filter';
+import { MatchAllFilter } from './match_all_filter';
+import { MissingFilter } from './missing_filter';
+
+// Any filter associated with a field (used in the filter bar/editor)
+export type FieldFilter =
+ | ExistsFilter
+ | GeoBoundingBoxFilter
+ | GeoPolygonFilter
+ | PhraseFilter
+ | PhrasesFilter
+ | RangeFilter
+ | MatchAllFilter
+ | MissingFilter;
+
+export enum FILTERS {
+ CUSTOM = 'custom',
+ PHRASES = 'phrases',
+ PHRASE = 'phrase',
+ EXISTS = 'exists',
+ MATCH_ALL = 'match_all',
+ MISSING = 'missing',
+ QUERY_STRING = 'query_string',
+ RANGE = 'range',
+ GEO_BOUNDING_BOX = 'geo_bounding_box',
+ GEO_POLYGON = 'geo_polygon',
+}
+
+// We can't import the real types from the data plugin, so need to either duplicate
+// them here or figure out another solution, perhaps housing them in this package
+// will be replaces after Fieds / IndexPattern will be moved into new platform
+export type Field = any;
+export type IndexPattern = any;
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/index.ts b/src/plugins/data/common/es_query/index.ts
similarity index 90%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/index.ts
rename to src/plugins/data/common/es_query/index.ts
index 03ba836462c608..88e14a43cfaae2 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/index.ts
+++ b/src/plugins/data/common/es_query/index.ts
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
+import * as esFilters from './filters';
-export * from './types';
-export * from './actions';
-export * from './embeddable';
+export { esFilters };
diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts
index dca7897bd2766c..42b5a03fcc926a 100644
--- a/src/plugins/data/common/index.ts
+++ b/src/plugins/data/common/index.ts
@@ -20,5 +20,6 @@
export * from './query';
export * from './field_formats';
export * from './kbn_field_types';
+export * from './es_query';
export * from './types';
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 51f26a4bd7f319..32153df69f3678 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -34,5 +34,4 @@ export * from './types';
export { IRequestTypesMap, IResponseTypesMap } from './search';
export * from './search';
-
export * from './query';
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
index 5092e9e55c2b48..5bee3f7d104283 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
@@ -21,10 +21,10 @@ import _ from 'lodash';
import sinon from 'sinon';
import { Subscription } from 'rxjs';
-import { Filter, FilterStateStore } from '@kbn/es-query';
import { FilterManager } from './filter_manager';
import { getFilter } from './test_helpers/get_stub_filter';
import { getFiltersArray } from './test_helpers/get_filters_array';
+import { esFilters } from '../../../common/es_query';
import { coreMock } from '../../../../../core/public/mocks';
const setupMock = coreMock.createSetup();
@@ -39,7 +39,7 @@ describe('filter_manager', () => {
let updateListener: sinon.SinonSpy;
let filterManager: FilterManager;
- let readyFilters: Filter[];
+ let readyFilters: esFilters.Filter[];
beforeEach(() => {
updateListener = sinon.stub();
@@ -82,7 +82,7 @@ describe('filter_manager', () => {
test('app state should be set', async () => {
updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
- const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
+ const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
filterManager.setFilters([f1]);
expect(filterManager.getAppFilters()).toHaveLength(1);
expect(filterManager.getGlobalFilters()).toHaveLength(0);
@@ -96,7 +96,7 @@ describe('filter_manager', () => {
test('global state should be set', async () => {
updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
filterManager.setFilters([f1]);
expect(filterManager.getAppFilters()).toHaveLength(0);
expect(filterManager.getGlobalFilters()).toHaveLength(1);
@@ -110,8 +110,8 @@ describe('filter_manager', () => {
test('both states should be set', async () => {
updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
- const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
filterManager.setFilters([f1, f2]);
expect(filterManager.getAppFilters()).toHaveLength(1);
expect(filterManager.getGlobalFilters()).toHaveLength(1);
@@ -128,8 +128,8 @@ describe('filter_manager', () => {
test('set state should override previous state', async () => {
updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
- const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
filterManager.setFilters([f1]);
filterManager.setFilters([f2]);
@@ -150,7 +150,7 @@ describe('filter_manager', () => {
test('changing a disabled filter should fire only update event', async function() {
const updateStub = jest.fn();
const fetchStub = jest.fn();
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, true, false, 'age', 34);
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, true, false, 'age', 34);
filterManager.setFilters([f1]);
@@ -175,7 +175,7 @@ describe('filter_manager', () => {
describe('add filters', () => {
test('app state should accept a single filter', async function() {
updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
- const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
+ const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
filterManager.addFilters(f1);
const appFilters = filterManager.getAppFilters();
expect(appFilters).toHaveLength(1);
@@ -185,8 +185,8 @@ describe('filter_manager', () => {
});
test('app state should accept array', async () => {
- const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
- const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'female');
+ const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+ const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'female');
filterManager.addFilters([f1]);
filterManager.addFilters([f2]);
const appFilters = filterManager.getAppFilters();
@@ -197,7 +197,7 @@ describe('filter_manager', () => {
test('global state should accept a single filer', async () => {
updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
filterManager.addFilters(f1);
expect(filterManager.getAppFilters()).toHaveLength(0);
const globalFilters = filterManager.getGlobalFilters();
@@ -207,8 +207,14 @@ describe('filter_manager', () => {
});
test('global state should be accept array', async () => {
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
- const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'gender', 'female');
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f2 = getFilter(
+ esFilters.FilterStateStore.GLOBAL_STATE,
+ false,
+ false,
+ 'gender',
+ 'female'
+ );
filterManager.addFilters([f1, f2]);
expect(filterManager.getAppFilters()).toHaveLength(0);
const globalFilters = filterManager.getGlobalFilters();
@@ -218,8 +224,14 @@ describe('filter_manager', () => {
test('add multiple filters at once', async () => {
updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
- const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'gender', 'female');
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f2 = getFilter(
+ esFilters.FilterStateStore.GLOBAL_STATE,
+ false,
+ false,
+ 'gender',
+ 'female'
+ );
filterManager.addFilters([f1, f2]);
expect(filterManager.getAppFilters()).toHaveLength(0);
expect(filterManager.getGlobalFilters()).toHaveLength(2);
@@ -228,8 +240,8 @@ describe('filter_manager', () => {
test('add same filter to global and app', async () => {
updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
- const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
filterManager.addFilters([f1, f2]);
// FILTER SHOULD BE ADDED ONLY ONCE, TO GLOBAL
@@ -240,8 +252,8 @@ describe('filter_manager', () => {
test('add same filter with different values to global and app', async () => {
updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
- const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+ const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
filterManager.addFilters([f1, f2]);
// FILTER SHOULD BE ADDED TWICE
@@ -251,7 +263,7 @@ describe('filter_manager', () => {
});
test('add filter with no state, and force pin', async () => {
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
f1.$state = undefined;
filterManager.addFilters([f1], true);
@@ -260,12 +272,12 @@ describe('filter_manager', () => {
const f1Output = filterManager.getFilters()[0];
expect(f1Output.$state).toBeDefined();
if (f1Output.$state) {
- expect(f1Output.$state.store).toBe(FilterStateStore.GLOBAL_STATE);
+ expect(f1Output.$state.store).toBe(esFilters.FilterStateStore.GLOBAL_STATE);
}
});
test('add filter with no state, and dont force pin', async () => {
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
f1.$state = undefined;
filterManager.addFilters([f1], false);
@@ -274,7 +286,7 @@ describe('filter_manager', () => {
const f1Output = filterManager.getFilters()[0];
expect(f1Output.$state).toBeDefined();
if (f1Output.$state) {
- expect(f1Output.$state.store).toBe(FilterStateStore.APP_STATE);
+ expect(f1Output.$state.store).toBe(esFilters.FilterStateStore.APP_STATE);
}
});
@@ -286,11 +298,11 @@ describe('filter_manager', () => {
// global filters should be listed first
let res = filterManager.getFilters();
expect(res).toHaveLength(2);
- expect(res[0].$state && res[0].$state.store).toEqual(FilterStateStore.GLOBAL_STATE);
+ expect(res[0].$state && res[0].$state.store).toEqual(esFilters.FilterStateStore.GLOBAL_STATE);
expect(res[0].meta.disabled).toEqual(filters[1].meta.disabled);
expect(res[0].query).toEqual(filters[1].query);
- expect(res[1].$state && res[1].$state.store).toEqual(FilterStateStore.APP_STATE);
+ expect(res[1].$state && res[1].$state.store).toEqual(esFilters.FilterStateStore.APP_STATE);
expect(res[1].meta.disabled).toEqual(filters[0].meta.disabled);
expect(res[1].query).toEqual(filters[0].query);
@@ -310,7 +322,7 @@ describe('filter_manager', () => {
const res = filterManager.getFilters();
expect(res).toHaveLength(3);
_.each(res, function(filter) {
- expect(filter.$state && filter.$state.store).toBe(FilterStateStore.GLOBAL_STATE);
+ expect(filter.$state && filter.$state.store).toBe(esFilters.FilterStateStore.GLOBAL_STATE);
});
});
@@ -393,7 +405,7 @@ describe('filter_manager', () => {
});
test('should de-dupe global filters being set', async () => {
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
const f2 = _.cloneDeep(f1);
filterManager.setFilters([f1, f2]);
expect(filterManager.getAppFilters()).toHaveLength(0);
@@ -402,7 +414,7 @@ describe('filter_manager', () => {
});
test('should de-dupe app filters being set', async () => {
- const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
+ const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
const f2 = _.cloneDeep(f1);
filterManager.setFilters([f1, f2]);
expect(filterManager.getAppFilters()).toHaveLength(1);
@@ -417,7 +429,7 @@ describe('filter_manager', () => {
const appFilter = _.cloneDeep(readyFilters[idx]);
appFilter.meta.negate = true;
appFilter.$state = {
- store: FilterStateStore.APP_STATE,
+ store: esFilters.FilterStateStore.APP_STATE,
};
filterManager.addFilters(appFilter);
const res = filterManager.getFilters();
@@ -434,7 +446,7 @@ describe('filter_manager', () => {
const appFilter = _.cloneDeep(readyFilters[1]);
appFilter.meta.negate = true;
appFilter.$state = {
- store: FilterStateStore.APP_STATE,
+ store: esFilters.FilterStateStore.APP_STATE,
};
filterManager.addFilters(appFilter, false);
@@ -443,7 +455,7 @@ describe('filter_manager', () => {
expect(res).toHaveLength(3);
expect(
res.filter(function(filter) {
- return filter.$state && filter.$state.store === FilterStateStore.GLOBAL_STATE;
+ return filter.$state && filter.$state.store === esFilters.FilterStateStore.GLOBAL_STATE;
}).length
).toBe(3);
});
@@ -496,8 +508,8 @@ describe('filter_manager', () => {
});
test('remove on full should clean and fire events', async () => {
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
- const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
filterManager.setFilters([f1, f2]);
updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
@@ -507,9 +519,9 @@ describe('filter_manager', () => {
});
test('remove non existing filter should do nothing and not fire events', async () => {
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
- const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
- const f3 = getFilter(FilterStateStore.APP_STATE, false, false, 'country', 'US');
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
+ const f3 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'country', 'US');
filterManager.setFilters([f1, f2]);
expect(filterManager.getFilters()).toHaveLength(2);
@@ -520,9 +532,9 @@ describe('filter_manager', () => {
});
test('remove existing filter should remove and fire events', async () => {
- const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
- const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
- const f3 = getFilter(FilterStateStore.APP_STATE, false, false, 'country', 'US');
+ const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+ const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
+ const f3 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'country', 'US');
filterManager.setFilters([f1, f2, f3]);
expect(filterManager.getFilters()).toHaveLength(3);
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts
index 66b65a40926cb7..f691398fb91d3e 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts
@@ -17,8 +17,6 @@
* under the License.
*/
-import { Filter, isFilterPinned, FilterStateStore } from '@kbn/es-query';
-
import _ from 'lodash';
import { Subject } from 'rxjs';
@@ -29,9 +27,10 @@ import { mapAndFlattenFilters } from './lib/map_and_flatten_filters';
import { uniqFilters } from './lib/uniq_filters';
import { onlyDisabledFiltersChanged } from './lib/only_disabled';
import { PartitionedFilters } from './types';
+import { esFilters } from '../../../common/es_query';
export class FilterManager {
- private filters: Filter[] = [];
+ private filters: esFilters.Filter[] = [];
private updated$: Subject = new Subject();
private fetch$: Subject = new Subject();
private uiSettings: UiSettingsClientContract;
@@ -40,7 +39,7 @@ export class FilterManager {
this.uiSettings = uiSettings;
}
- private mergeIncomingFilters(partitionedFilters: PartitionedFilters): Filter[] {
+ private mergeIncomingFilters(partitionedFilters: PartitionedFilters): esFilters.Filter[] {
const globalFilters = partitionedFilters.globalFilters;
const appFilters = partitionedFilters.appFilters;
@@ -61,23 +60,26 @@ export class FilterManager {
return FilterManager.mergeFilters(appFilters, globalFilters);
}
- private static mergeFilters(appFilters: Filter[], globalFilters: Filter[]): Filter[] {
+ private static mergeFilters(
+ appFilters: esFilters.Filter[],
+ globalFilters: esFilters.Filter[]
+ ): esFilters.Filter[] {
return uniqFilters(appFilters.reverse().concat(globalFilters.reverse())).reverse();
}
- private static partitionFilters(filters: Filter[]): PartitionedFilters {
- const [globalFilters, appFilters] = _.partition(filters, isFilterPinned);
+ private static partitionFilters(filters: esFilters.Filter[]): PartitionedFilters {
+ const [globalFilters, appFilters] = _.partition(filters, esFilters.isFilterPinned);
return {
globalFilters,
appFilters,
};
}
- private handleStateUpdate(newFilters: Filter[]) {
+ private handleStateUpdate(newFilters: esFilters.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
+ newFilters.sort(({ $state: a }: esFilters.Filter, { $state: b }: esFilters.Filter): number => {
+ return a!.store === esFilters.FilterStateStore.GLOBAL_STATE &&
+ b!.store !== esFilters.FilterStateStore.GLOBAL_STATE
? -1
: 1;
});
@@ -124,7 +126,7 @@ export class FilterManager {
/* Setters */
- public addFilters(filters: Filter[] | Filter, pinFilterStatus?: boolean) {
+ public addFilters(filters: esFilters.Filter[] | esFilters.Filter, pinFilterStatus?: boolean) {
if (!Array.isArray(filters)) {
filters = [filters];
}
@@ -139,7 +141,10 @@ export class FilterManager {
// Set the store of all filters. For now.
// In the future, all filters should come in with filter state store already set.
- const store = pinFilterStatus ? FilterStateStore.GLOBAL_STATE : FilterStateStore.APP_STATE;
+ const store = pinFilterStatus
+ ? esFilters.FilterStateStore.GLOBAL_STATE
+ : esFilters.FilterStateStore.APP_STATE;
+
FilterManager.setFiltersStore(filters, store);
const mappedFilters = mapAndFlattenFilters(filters);
@@ -154,14 +159,14 @@ export class FilterManager {
this.handleStateUpdate(newFilters);
}
- public setFilters(newFilters: Filter[]) {
+ public setFilters(newFilters: esFilters.Filter[]) {
const mappedFilters = mapAndFlattenFilters(newFilters);
const newPartitionedFilters = FilterManager.partitionFilters(mappedFilters);
const mergedFilters = this.mergeIncomingFilters(newPartitionedFilters);
this.handleStateUpdate(mergedFilters);
}
- public removeFilter(filter: Filter) {
+ public removeFilter(filter: esFilters.Filter) {
const filterIndex = _.findIndex(this.filters, item => {
return _.isEqual(item.meta, filter.meta) && _.isEqual(item.query, filter.query);
});
@@ -177,8 +182,8 @@ export class FilterManager {
this.setFilters([]);
}
- public static setFiltersStore(filters: Filter[], store: FilterStateStore) {
- _.map(filters, (filter: Filter) => {
+ public static setFiltersStore(filters: esFilters.Filter[], store: esFilters.FilterStateStore) {
+ _.map(filters, (filter: esFilters.Filter) => {
// Override status only for filters that didn't have state in the first place.
if (filter.$state === undefined) {
filter.$state = { store };
diff --git a/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts
index e8244feb988b6e..6bde6b528d07bd 100644
--- a/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts
@@ -16,42 +16,48 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { buildQueryFilter, buildEmptyFilter, FilterStateStore } from '@kbn/es-query';
+
import { compareFilters } from './compare_filters';
+import { esFilters } from '../../../../common/es_query';
describe('filter manager utilities', () => {
describe('compare filters', () => {
test('should compare filters', () => {
- const f1 = buildQueryFilter(
+ const f1 = esFilters.buildQueryFilter(
{ _type: { match: { query: 'apache', type: 'phrase' } } },
- 'index'
+ 'index',
+ ''
);
- const f2 = buildEmptyFilter(true);
+ const f2 = esFilters.buildEmptyFilter(true);
expect(compareFilters(f1, f2)).toBeFalsy();
});
test('should compare duplicates', () => {
- const f1 = buildQueryFilter(
+ const f1 = esFilters.buildQueryFilter(
{ _type: { match: { query: 'apache', type: 'phrase' } } },
- 'index'
+ 'index',
+ ''
);
- const f2 = buildQueryFilter(
+ const f2 = esFilters.buildQueryFilter(
{ _type: { match: { query: 'apache', type: 'phrase' } } },
- 'index'
+ 'index',
+ ''
);
expect(compareFilters(f1, f2)).toBeTruthy();
});
test('should compare duplicates, ignoring meta attributes', () => {
- const f1 = buildQueryFilter(
+ const f1 = esFilters.buildQueryFilter(
{ _type: { match: { query: 'apache', type: 'phrase' } } },
- 'index1'
+ 'index1',
+ ''
);
- const f2 = buildQueryFilter(
+ const f2 = esFilters.buildQueryFilter(
{ _type: { match: { query: 'apache', type: 'phrase' } } },
- 'index2'
+ 'index2',
+ ''
);
expect(compareFilters(f1, f2)).toBeTruthy();
@@ -59,12 +65,20 @@ describe('filter manager utilities', () => {
test('should compare duplicates, ignoring $state attributes', () => {
const f1 = {
- $state: { store: FilterStateStore.APP_STATE },
- ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
+ $state: { store: esFilters.FilterStateStore.APP_STATE },
+ ...esFilters.buildQueryFilter(
+ { _type: { match: { query: 'apache', type: 'phrase' } } },
+ 'index',
+ ''
+ ),
};
const f2 = {
- $state: { store: FilterStateStore.GLOBAL_STATE },
- ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
+ $state: { store: esFilters.FilterStateStore.GLOBAL_STATE },
+ ...esFilters.buildQueryFilter(
+ { _type: { match: { query: 'apache', type: 'phrase' } } },
+ 'index',
+ ''
+ ),
};
expect(compareFilters(f1, f2)).toBeTruthy();
diff --git a/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts b/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts
index 44bc333ae2b4fb..2a7cbe6e3303b5 100644
--- a/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts
@@ -17,8 +17,8 @@
* under the License.
*/
-import { Filter, FilterMeta } from '@kbn/es-query';
import { defaults, isEqual, omit } from 'lodash';
+import { esFilters } from '../../../../common/es_query';
/**
* Compare two filters to see if they match
@@ -29,10 +29,14 @@ import { defaults, isEqual, omit } from 'lodash';
*
* @returns {bool} Filters are the same
*/
-export const compareFilters = (first: Filter, second: Filter, comparatorOptions: any = {}) => {
+export const compareFilters = (
+ first: esFilters.Filter,
+ second: esFilters.Filter,
+ comparatorOptions: any = {}
+) => {
let comparators: any = {};
- const mapFilter = (filter: Filter) => {
- const cleaned: FilterMeta = omit(filter, excludedAttributes);
+ const mapFilter = (filter: esFilters.Filter) => {
+ const cleaned: esFilters.FilterMeta = omit(filter, excludedAttributes);
if (comparators.negate) cleaned.negate = filter.meta && Boolean(filter.meta.negate);
if (comparators.disabled) cleaned.disabled = filter.meta && Boolean(filter.meta.disabled);
diff --git a/src/plugins/data/public/query/filter_manager/lib/dedup_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.test.ts
index 75bd9d5dfbd81a..9b493add0886c6 100644
--- a/src/plugins/data/public/query/filter_manager/lib/dedup_filters.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.test.ts
@@ -17,19 +17,27 @@
* under the License.
*/
-import { Filter, buildRangeFilter, FilterStateStore, buildQueryFilter } from '@kbn/es-query';
import { dedupFilters } from './dedup_filters';
+import { esFilters } from '../../../../common/es_query';
describe('filter manager utilities', () => {
describe('dedupFilters(existing, filters)', () => {
test('should return only filters which are not in the existing', () => {
- const existing: Filter[] = [
- buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index'),
- buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
+ const existing: esFilters.Filter[] = [
+ esFilters.buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index', ''),
+ esFilters.buildQueryFilter(
+ { match: { _term: { query: 'apache', type: 'phrase' } } },
+ 'index',
+ ''
+ ),
];
- const filters: Filter[] = [
- buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index'),
- buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
+ const filters: esFilters.Filter[] = [
+ esFilters.buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index', ''),
+ esFilters.buildQueryFilter(
+ { match: { _term: { query: 'apache', type: 'phrase' } } },
+ 'index',
+ ''
+ ),
];
const results = dedupFilters(existing, filters);
@@ -38,16 +46,24 @@ describe('filter manager utilities', () => {
});
test('should ignore the disabled attribute when comparing ', () => {
- const existing: Filter[] = [
- buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index'),
+ const existing: esFilters.Filter[] = [
+ esFilters.buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index', ''),
{
- ...buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
+ ...esFilters.buildQueryFilter(
+ { match: { _term: { query: 'apache', type: 'phrase' } } },
+ 'index1',
+ ''
+ ),
meta: { disabled: true, negate: false, alias: null },
},
];
- const filters: Filter[] = [
- buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index'),
- buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
+ const filters: esFilters.Filter[] = [
+ esFilters.buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index', ''),
+ esFilters.buildQueryFilter(
+ { match: { _term: { query: 'apache', type: 'phrase' } } },
+ 'index1',
+ ''
+ ),
];
const results = dedupFilters(existing, filters);
@@ -56,18 +72,26 @@ describe('filter manager utilities', () => {
});
test('should ignore $state attribute', () => {
- const existing: Filter[] = [
- buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index'),
+ const existing: esFilters.Filter[] = [
+ esFilters.buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index', ''),
{
- ...buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
- $state: { store: FilterStateStore.APP_STATE },
+ ...esFilters.buildQueryFilter(
+ { match: { _term: { query: 'apache', type: 'phrase' } } },
+ 'index',
+ ''
+ ),
+ $state: { store: esFilters.FilterStateStore.APP_STATE },
},
];
- const filters: Filter[] = [
- buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index'),
+ const filters: esFilters.Filter[] = [
+ esFilters.buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index', ''),
{
- ...buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
- $state: { store: FilterStateStore.GLOBAL_STATE },
+ ...esFilters.buildQueryFilter(
+ { match: { _term: { query: 'apache', type: 'phrase' } } },
+ 'index',
+ ''
+ ),
+ $state: { store: esFilters.FilterStateStore.GLOBAL_STATE },
},
];
const results = dedupFilters(existing, filters);
diff --git a/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts
index 9565cbd80b7791..6d6f49cb5e8338 100644
--- a/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts
@@ -17,9 +17,9 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
import { filter, find } from 'lodash';
import { compareFilters } from './compare_filters';
+import { esFilters } from '../../../../../../plugins/data/public';
/**
* Combine 2 filter collections, removing duplicates
@@ -31,8 +31,8 @@ import { compareFilters } from './compare_filters';
* @returns {object} An array of filters that were not in existing
*/
export const dedupFilters = (
- existingFilters: Filter[],
- filters: Filter[],
+ existingFilters: esFilters.Filter[],
+ filters: esFilters.Filter[],
comparatorOptions: any = {}
) => {
if (!Array.isArray(filters)) {
@@ -41,8 +41,8 @@ export const dedupFilters = (
return filter(
filters,
- (f: Filter) =>
- !find(existingFilters, (existingFilter: Filter) =>
+ (f: esFilters.Filter) =>
+ !find(existingFilters, (existingFilter: esFilters.Filter) =>
compareFilters(existingFilter, f, comparatorOptions)
)
);
diff --git a/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts
index c0c509634aba2c..dfe3a093c66146 100644
--- a/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts
@@ -18,8 +18,8 @@
*/
import sinon from 'sinon';
-import { Filter, buildEmptyFilter } from '@kbn/es-query';
import { generateMappingChain } from './generate_mapping_chain';
+import { esFilters } from '../../../../../../plugins/data/public';
describe('filter manager utilities', () => {
let mapping: any;
@@ -32,7 +32,7 @@ describe('filter manager utilities', () => {
describe('generateMappingChain()', () => {
test('should create a chaining function which calls the next function if the error is thrown', async () => {
- const filter: Filter = buildEmptyFilter(true);
+ const filter = esFilters.buildEmptyFilter(true);
mapping.throws(filter);
next.returns('good');
@@ -45,7 +45,7 @@ describe('filter manager utilities', () => {
});
test('should create a chaining function which DOES NOT call the next function if the result is returned', async () => {
- const filter: Filter = buildEmptyFilter(true);
+ const filter = esFilters.buildEmptyFilter(true);
mapping.returns('good');
next.returns('bad');
@@ -57,7 +57,7 @@ describe('filter manager utilities', () => {
});
test('should resolve result for the mapping function', async () => {
- const filter: Filter = buildEmptyFilter(true);
+ const filter = esFilters.buildEmptyFilter(true);
mapping.returns({ key: 'test', value: 'example' });
@@ -70,7 +70,7 @@ describe('filter manager utilities', () => {
test('should call the mapping function with the argument to the chain', async () => {
// @ts-ignore
- const filter: Filter = { test: 'example' };
+ const filter: esFilters.Filter = { test: 'example' };
mapping.returns({ key: 'test', value: 'example' });
@@ -84,7 +84,7 @@ describe('filter manager utilities', () => {
});
test('should resolve result for the next function', async () => {
- const filter: Filter = buildEmptyFilter(true);
+ const filter = esFilters.buildEmptyFilter(true);
mapping.throws(filter);
next.returns({ key: 'test', value: 'example' });
@@ -98,7 +98,7 @@ describe('filter manager utilities', () => {
});
test('should throw an error if no functions match', async done => {
- const filter: Filter = buildEmptyFilter(true);
+ const filter = esFilters.buildEmptyFilter(true);
mapping.throws(filter);
diff --git a/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts
index 760270edd7170a..b6764389e0db9f 100644
--- a/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
const noop = () => {
throw new Error('No mappings have been found for filter.');
};
export const generateMappingChain = (fn: Function, next: Function = noop) => {
- return (filter: Filter) => {
+ return (filter: esFilters.Filter) => {
try {
return fn(filter);
} catch (result) {
diff --git a/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts
index fce2aa0373ebe8..9a0d0d93698f69 100644
--- a/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts
@@ -17,14 +17,14 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
import { mapAndFlattenFilters } from './map_and_flatten_filters';
+import { esFilters } from '../../../../../data/public';
describe('filter manager utilities', () => {
describe('mapAndFlattenFilters()', () => {
let filters: unknown;
- function getDisplayName(filter: Filter) {
+ function getDisplayName(filter: esFilters.Filter) {
return typeof filter.meta.value === 'function' ? filter.meta.value() : filter.meta.value;
}
@@ -45,7 +45,7 @@ describe('filter manager utilities', () => {
});
test('should map and flatten the filters', () => {
- const results = mapAndFlattenFilters(filters as Filter[]);
+ const results = mapAndFlattenFilters(filters as esFilters.Filter[]);
expect(results).toHaveLength(5);
expect(results[0]).toHaveProperty('meta');
diff --git a/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts
index b350c3957b142d..5326d59f3e32b6 100644
--- a/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts
@@ -18,9 +18,9 @@
*/
import { compact, flatten } from 'lodash';
-import { Filter } from '@kbn/es-query';
import { mapFilter } from './map_filter';
+import { esFilters } from '../../../../../data/public';
-export const mapAndFlattenFilters = (filters: Filter[]) => {
- return compact(flatten(filters)).map((item: Filter) => mapFilter(item));
+export const mapAndFlattenFilters = (filters: esFilters.Filter[]) => {
+ return compact(flatten(filters)).map((item: esFilters.Filter) => mapFilter(item));
};
diff --git a/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts b/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts
index c1d4ebfd3f7fc8..0d115125451eea 100644
--- a/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts
@@ -17,11 +17,11 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
import { mapFilter } from './map_filter';
+import { esFilters } from '../../../../../data/public';
describe('filter manager utilities', () => {
- function getDisplayName(filter: Filter) {
+ function getDisplayName(filter: esFilters.Filter) {
return typeof filter.meta.value === 'function' ? filter.meta.value() : filter.meta.value;
}
@@ -31,7 +31,7 @@ describe('filter manager utilities', () => {
meta: { index: 'logstash-*' },
query: { match: { _type: { query: 'apache', type: 'phrase' } } },
};
- const after = mapFilter(before as Filter);
+ const after = mapFilter(before as esFilters.Filter);
expect(after).toHaveProperty('meta');
expect(after.meta).toHaveProperty('key', '_type');
@@ -43,7 +43,7 @@ describe('filter manager utilities', () => {
test('should map exists filters', async () => {
const before: any = { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } };
- const after = mapFilter(before as Filter);
+ const after = mapFilter(before as esFilters.Filter);
expect(after).toHaveProperty('meta');
expect(after.meta).toHaveProperty('key', '@timestamp');
@@ -55,7 +55,7 @@ describe('filter manager utilities', () => {
test('should map missing filters', async () => {
const before: any = { meta: { index: 'logstash-*' }, missing: { field: '@timestamp' } };
- const after = mapFilter(before as Filter);
+ const after = mapFilter(before as esFilters.Filter);
expect(after).toHaveProperty('meta');
expect(after.meta).toHaveProperty('key', '@timestamp');
@@ -67,7 +67,7 @@ describe('filter manager utilities', () => {
test('should map json filter', async () => {
const before: any = { meta: { index: 'logstash-*' }, query: { match_all: {} } };
- const after = mapFilter(before as Filter);
+ const after = mapFilter(before as esFilters.Filter);
expect(after).toHaveProperty('meta');
expect(after.meta).toHaveProperty('key', 'query');
@@ -81,7 +81,7 @@ describe('filter manager utilities', () => {
const before: any = { meta: { index: 'logstash-*' } };
try {
- mapFilter(before as Filter);
+ mapFilter(before as esFilters.Filter);
} catch (e) {
expect(e).toBeInstanceOf(Error);
expect(e.message).toBe('No mappings have been found for filter.');
diff --git a/src/plugins/data/public/query/filter_manager/lib/map_filter.ts b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts
index cda9591e40b33e..2dc855caabfd36 100644
--- a/src/plugins/data/public/query/filter_manager/lib/map_filter.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts
@@ -17,7 +17,6 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
import { reduceRight } from 'lodash';
import { mapMatchAll } from './mappers/map_match_all';
@@ -31,8 +30,9 @@ import { mapGeoBoundingBox } from './mappers/map_geo_bounding_box';
import { mapGeoPolygon } from './mappers/map_geo_polygon';
import { mapDefault } from './mappers/map_default';
import { generateMappingChain } from './generate_mapping_chain';
+import { esFilters } from '../../../../../data/public';
-export function mapFilter(filter: Filter) {
+export function mapFilter(filter: esFilters.Filter) {
/** Mappers **/
// Each mapper is a simple promise function that test if the mapper can
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts
index acb6e89711033d..f10766901e5b7b 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { CustomFilter, buildEmptyFilter, buildQueryFilter } from '@kbn/es-query';
+
import { mapDefault } from './map_default';
+import { esFilters } from '../../../../../common/es_query';
describe('filter manager utilities', () => {
describe('mapDefault()', () => {
test('should return the key and value for matching filters', async () => {
- const filter: CustomFilter = buildQueryFilter({ match_all: {} }, 'index');
+ const filter = esFilters.buildQueryFilter({ match_all: {} }, 'index', '');
const result = mapDefault(filter);
expect(result).toHaveProperty('key', 'query');
@@ -30,7 +31,7 @@ describe('filter manager utilities', () => {
});
test('should return undefined if there is no valid key', async () => {
- const filter = buildEmptyFilter(true) as CustomFilter;
+ const filter = esFilters.buildEmptyFilter(true);
try {
mapDefault(filter);
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts
index 70c191879c22e9..fd84c5c742589b 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts
@@ -17,15 +17,15 @@
* under the License.
*/
-import { Filter, FILTERS } from '@kbn/es-query';
import { find, keys, get } from 'lodash';
+import { esFilters } from '../../../../../common/es_query';
-export const mapDefault = (filter: Filter) => {
+export const mapDefault = (filter: esFilters.Filter) => {
const metaProperty = /(^\$|meta)/;
const key = find(keys(filter), item => !item.match(metaProperty));
if (key) {
- const type = FILTERS.CUSTOM;
+ const type = esFilters.FILTERS.CUSTOM;
const value = JSON.stringify(get(filter, key, {}));
return { type, key, value };
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.test.ts
index c352d3e2b9a734..ff0ed4f4e4d94a 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.test.ts
@@ -16,14 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { ExistsFilter, buildEmptyFilter, buildExistsFilter } from '@kbn/es-query';
+
import { mapExists } from './map_exists';
import { mapQueryString } from './map_query_string';
+import { esFilters } from '../../../../../common/es_query';
describe('filter manager utilities', () => {
describe('mapExists()', () => {
test('should return the key and value for matching filters', async () => {
- const filter: ExistsFilter = buildExistsFilter({ name: '_type' }, 'index');
+ const filter = esFilters.buildExistsFilter({ name: '_type' }, 'index');
const result = mapExists(filter);
expect(result).toHaveProperty('key', '_type');
@@ -31,7 +32,7 @@ describe('filter manager utilities', () => {
});
test('should return undefined for none matching', async done => {
- const filter = buildEmptyFilter(true) as ExistsFilter;
+ const filter = esFilters.buildEmptyFilter(true);
try {
mapQueryString(filter);
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts
index d539219a1ca24e..63665bdd88ccbe 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts
@@ -17,14 +17,14 @@
* under the License.
*/
-import { Filter, isExistsFilter, FILTERS } from '@kbn/es-query';
import { get } from 'lodash';
+import { esFilters } from '../../../../../common/es_query';
-export const mapExists = (filter: Filter) => {
- if (isExistsFilter(filter)) {
+export const mapExists = (filter: esFilters.Filter) => {
+ if (esFilters.isExistsFilter(filter)) {
return {
- type: FILTERS.EXISTS,
- value: FILTERS.EXISTS,
+ type: esFilters.FILTERS.EXISTS,
+ value: esFilters.FILTERS.EXISTS,
key: get(filter, 'exists.field'),
};
}
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts
index c3c99e6f6c4a37..5fca4a652bad88 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts
@@ -18,7 +18,7 @@
*/
import { mapGeoBoundingBox } from './map_geo_bounding_box';
-import { Filter, GeoBoundingBoxFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
describe('filter manager utilities', () => {
describe('mapGeoBoundingBox()', () => {
@@ -34,7 +34,7 @@ describe('filter manager utilities', () => {
bottom_right: { lat: 15, lon: 20 },
},
},
- } as GeoBoundingBoxFilter;
+ } as esFilters.GeoBoundingBoxFilter;
const result = mapGeoBoundingBox(filter);
@@ -63,7 +63,8 @@ describe('filter manager utilities', () => {
bottom_right: { lat: 15, lon: 20 },
},
},
- } as GeoBoundingBoxFilter;
+ } as esFilters.GeoBoundingBoxFilter;
+
const result = mapGeoBoundingBox(filter);
expect(result).toHaveProperty('key', 'point');
@@ -82,7 +83,7 @@ describe('filter manager utilities', () => {
const filter = {
meta: { index: 'logstash-*' },
query: { query_string: { query: 'foo:bar' } },
- } as Filter;
+ } as esFilters.Filter;
try {
mapGeoBoundingBox(filter);
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts
index 1f9b8cd842509b..091e9a3f34000a 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts
@@ -16,16 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-import {
- GeoBoundingBoxFilter,
- Filter,
- FILTERS,
- isGeoBoundingBoxFilter,
- FilterValueFormatter,
-} from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
const getFormattedValueFn = (params: any) => {
- return (formatter?: FilterValueFormatter) => {
+ return (formatter?: esFilters.FilterValueFormatter) => {
const corners = formatter
? {
topLeft: formatter.convert(params.top_left),
@@ -40,20 +34,20 @@ const getFormattedValueFn = (params: any) => {
};
};
-const getParams = (filter: GeoBoundingBoxFilter) => {
+const getParams = (filter: esFilters.GeoBoundingBoxFilter) => {
const key = Object.keys(filter.geo_bounding_box).filter(k => k !== 'ignore_unmapped')[0];
const params = filter.geo_bounding_box[key];
return {
key,
params,
- type: FILTERS.GEO_BOUNDING_BOX,
+ type: esFilters.FILTERS.GEO_BOUNDING_BOX,
value: getFormattedValueFn(params),
};
};
-export const mapGeoBoundingBox = (filter: Filter) => {
- if (!isGeoBoundingBoxFilter(filter)) {
+export const mapGeoBoundingBox = (filter: esFilters.Filter) => {
+ if (!esFilters.isGeoBoundingBoxFilter(filter)) {
throw filter;
}
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts
index ee4f9b295d682d..3afa3891a24bb8 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts
@@ -16,23 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
+
import { mapGeoPolygon } from './map_geo_polygon';
-import { GeoPolygonFilter, Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
describe('filter manager utilities', () => {
- describe('mapGeoPolygon()', () => {
- test('should return the key and value for matching filters with bounds', async () => {
- const filter = {
- meta: {
- index: 'logstash-*',
- },
- geo_polygon: {
- point: {
- points: [{ lat: 5, lon: 10 }, { lat: 15, lon: 20 }],
- },
+ let filter: esFilters.GeoPolygonFilter;
+
+ beforeEach(() => {
+ filter = {
+ meta: {
+ index: 'logstash-*',
+ },
+ geo_polygon: {
+ point: {
+ points: [{ lat: 5, lon: 10 }, { lat: 15, lon: 20 }],
},
- } as GeoPolygonFilter;
+ },
+ } as esFilters.GeoPolygonFilter;
+ });
+ describe('mapGeoPolygon()', () => {
+ test('should return the key and value for matching filters with bounds', async () => {
const result = mapGeoPolygon(filter);
expect(result).toHaveProperty('key', 'point');
@@ -48,17 +53,6 @@ describe('filter manager utilities', () => {
});
test('should return the key and value even when using ignore_unmapped', async () => {
- const filter = {
- meta: {
- index: 'logstash-*',
- },
- geo_polygon: {
- ignore_unmapped: true,
- point: {
- points: [{ lat: 5, lon: 10 }, { lat: 15, lon: 20 }],
- },
- },
- } as GeoPolygonFilter;
const result = mapGeoPolygon(filter);
expect(result).toHaveProperty('key', 'point');
@@ -74,15 +68,15 @@ describe('filter manager utilities', () => {
});
test('should return undefined for none matching', async done => {
- const filter = {
+ const wrongFilter = {
meta: { index: 'logstash-*' },
query: { query_string: { query: 'foo:bar' } },
- } as Filter;
+ } as esFilters.Filter;
try {
- mapGeoPolygon(filter);
+ mapGeoPolygon(wrongFilter);
} catch (e) {
- expect(e).toBe(filter);
+ expect(e).toBe(wrongFilter);
done();
}
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts
index 03ce4130d0c972..a7881b4a145a19 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts
@@ -16,38 +16,33 @@
* specific language governing permissions and limitations
* under the License.
*/
-import {
- GeoPolygonFilter,
- Filter,
- FILTERS,
- isGeoPolygonFilter,
- FilterValueFormatter,
-} from '@kbn/es-query';
+
+import { esFilters } from '../../../../../common/es_query';
const POINTS_SEPARATOR = ', ';
const getFormattedValueFn = (points: string[]) => {
- return (formatter?: FilterValueFormatter) => {
+ return (formatter?: esFilters.FilterValueFormatter) => {
return points
.map((point: string) => (formatter ? formatter.convert(point) : JSON.stringify(point)))
.join(POINTS_SEPARATOR);
};
};
-function getParams(filter: GeoPolygonFilter) {
+function getParams(filter: esFilters.GeoPolygonFilter) {
const key = Object.keys(filter.geo_polygon).filter(k => k !== 'ignore_unmapped')[0];
const params = filter.geo_polygon[key];
return {
key,
params,
- type: FILTERS.GEO_POLYGON,
+ type: esFilters.FILTERS.GEO_POLYGON,
value: getFormattedValueFn(params.points || []),
};
}
-export function mapGeoPolygon(filter: Filter) {
- if (!isGeoPolygonFilter(filter)) {
+export function mapGeoPolygon(filter: esFilters.Filter) {
+ if (!esFilters.isGeoPolygonFilter(filter)) {
throw filter;
}
return getParams(filter);
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts
index 2f0641598a2ce3..4fc6d0b4924141 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { MatchAllFilter } from '@kbn/es-query';
+
import { mapMatchAll } from './map_match_all';
+import { esFilters } from '../../../../../common/es_query';
describe('filter_manager/lib', () => {
describe('mapMatchAll()', () => {
- let filter: MatchAllFilter;
+ let filter: esFilters.MatchAllFilter;
beforeEach(() => {
filter = {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts
index a1387e6dbe4574..4e93b1d41e9a82 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { Filter, FILTERS, isMatchAllFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
-export const mapMatchAll = (filter: Filter) => {
- if (isMatchAllFilter(filter)) {
+export const mapMatchAll = (filter: esFilters.Filter) => {
+ if (esFilters.isMatchAllFilter(filter)) {
return {
- type: FILTERS.MATCH_ALL,
+ type: esFilters.FILTERS.MATCH_ALL,
key: filter.meta.field,
value: filter.meta.formattedValue || 'all',
};
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts
index ca23f25826906b..1847eb37ca42ff 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts
@@ -16,15 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { MissingFilter, buildEmptyFilter, ExistsFilter } from '@kbn/es-query';
+
import { mapMissing } from './map_missing';
+import { esFilters } from '../../../../../common/es_query';
describe('filter manager utilities', () => {
describe('mapMissing()', () => {
test('should return the key and value for matching filters', async () => {
- const filter: MissingFilter = {
+ const filter: esFilters.MissingFilter = {
missing: { field: '_type' },
- ...buildEmptyFilter(true),
+ ...esFilters.buildEmptyFilter(true),
};
const result = mapMissing(filter);
@@ -33,7 +34,7 @@ describe('filter manager utilities', () => {
});
test('should return undefined for none matching', async done => {
- const filter = buildEmptyFilter(true) as ExistsFilter;
+ const filter = esFilters.buildEmptyFilter(true);
try {
mapMissing(filter);
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts
index 861a84ed616468..51dee89ad884b2 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { Filter, FILTERS, isMissingFilter } from '@kbn/es-query';
-export const mapMissing = (filter: Filter) => {
- if (isMissingFilter(filter)) {
+import { esFilters } from '../../../../../common/es_query';
+
+export const mapMissing = (filter: esFilters.Filter) => {
+ if (esFilters.isMissingFilter(filter)) {
return {
- type: FILTERS.MISSING,
- value: FILTERS.MISSING,
+ type: esFilters.FILTERS.MISSING,
+ value: esFilters.FILTERS.MISSING,
key: filter.missing.field,
};
}
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts
index c95a2529add149..05372d37264b06 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import { mapPhrase } from './map_phrase';
-import { PhraseFilter, Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
describe('filter manager utilities', () => {
describe('mapPhrase()', () => {
@@ -25,11 +25,13 @@ describe('filter manager utilities', () => {
const filter = {
meta: { index: 'logstash-*' },
query: { match: { _type: { query: 'apache', type: 'phrase' } } },
- } as PhraseFilter;
+ } as esFilters.PhraseFilter;
+
const result = mapPhrase(filter);
expect(result).toHaveProperty('value');
expect(result).toHaveProperty('key', '_type');
+
if (result.value) {
const displayName = result.value();
expect(displayName).toBe('apache');
@@ -40,7 +42,7 @@ describe('filter manager utilities', () => {
const filter = {
meta: { index: 'logstash-*' },
query: { query_string: { query: 'foo:bar' } },
- } as Filter;
+ } as esFilters.Filter;
try {
mapPhrase(filter);
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts
index efa348c9ad3206..b6e9c2007db970 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts
@@ -18,45 +18,36 @@
*/
import { get } from 'lodash';
-import {
- PhraseFilter,
- Filter,
- FILTERS,
- isPhraseFilter,
- isScriptedPhraseFilter,
- getPhraseFilterField,
- getPhraseFilterValue,
- FilterValueFormatter,
-} from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
-const getScriptedPhraseValue = (filter: PhraseFilter) =>
+const getScriptedPhraseValue = (filter: esFilters.PhraseFilter) =>
get(filter, ['script', 'script', 'params', 'value']);
const getFormattedValueFn = (value: any) => {
- return (formatter?: FilterValueFormatter) => {
+ return (formatter?: esFilters.FilterValueFormatter) => {
return formatter ? formatter.convert(value) : value;
};
};
-const getParams = (filter: PhraseFilter) => {
+const getParams = (filter: esFilters.PhraseFilter) => {
const scriptedPhraseValue = getScriptedPhraseValue(filter);
const isScriptedFilter = Boolean(scriptedPhraseValue);
- const key = isScriptedFilter ? filter.meta.field || '' : getPhraseFilterField(filter);
- const query = scriptedPhraseValue || getPhraseFilterValue(filter);
+ const key = isScriptedFilter ? filter.meta.field || '' : esFilters.getPhraseFilterField(filter);
+ const query = scriptedPhraseValue || esFilters.getPhraseFilterValue(filter);
const params = { query };
return {
key,
params,
- type: FILTERS.PHRASE,
+ type: esFilters.FILTERS.PHRASE,
value: getFormattedValueFn(query),
};
};
-export const isMapPhraseFilter = (filter: any): filter is PhraseFilter =>
- isPhraseFilter(filter) || isScriptedPhraseFilter(filter);
+export const isMapPhraseFilter = (filter: any): filter is esFilters.PhraseFilter =>
+ esFilters.isPhraseFilter(filter) || esFilters.isScriptedPhraseFilter(filter);
-export const mapPhrase = (filter: Filter) => {
+export const mapPhrase = (filter: esFilters.Filter) => {
if (!isMapPhraseFilter(filter)) {
throw filter;
}
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
index c17ff11d49fd4a..7240d87d02b5ab 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
@@ -17,10 +17,10 @@
* under the License.
*/
-import { Filter, isPhrasesFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
-export const mapPhrases = (filter: Filter) => {
- if (!isPhrasesFilter(filter)) {
+export const mapPhrases = (filter: esFilters.Filter) => {
+ if (!esFilters.isPhrasesFilter(filter)) {
throw filter;
}
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts
index 4b1a5d39c405da..c60e7d3454fe0f 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts
@@ -17,27 +17,28 @@
* under the License.
*/
-import { QueryStringFilter, buildQueryFilter, buildEmptyFilter } from '@kbn/es-query';
import { mapQueryString } from './map_query_string';
+import { esFilters } from '../../../../../common/es_query';
describe('filter manager utilities', () => {
describe('mapQueryString()', () => {
test('should return the key and value for matching filters', async () => {
- const filter: QueryStringFilter = buildQueryFilter(
+ const filter = esFilters.buildQueryFilter(
{ query_string: { query: 'foo:bar' } },
- 'index'
+ 'index',
+ ''
);
- const result = mapQueryString(filter);
+ const result = mapQueryString(filter as esFilters.Filter);
expect(result).toHaveProperty('key', 'query');
expect(result).toHaveProperty('value', 'foo:bar');
});
test('should return undefined for none matching', async done => {
- const filter = buildEmptyFilter(true) as QueryStringFilter;
+ const filter = esFilters.buildEmptyFilter(true);
try {
- mapQueryString(filter);
+ mapQueryString(filter as esFilters.Filter);
} catch (e) {
expect(e).toBe(filter);
done();
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts
index 94da8074edd04d..20c3555639a3ed 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { Filter, FILTERS, isQueryStringFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
-export const mapQueryString = (filter: Filter) => {
- if (isQueryStringFilter(filter)) {
+export const mapQueryString = (filter: esFilters.Filter) => {
+ if (esFilters.isQueryStringFilter(filter)) {
return {
- type: FILTERS.QUERY_STRING,
+ type: esFilters.FILTERS.QUERY_STRING,
key: 'query',
value: filter.query.query_string.query,
};
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts
index 12d2919e2d47b6..c0d5773d6f2c14 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts
@@ -18,30 +18,15 @@
*/
import { mapRange } from './map_range';
-import { RangeFilter, Filter, FilterMeta } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
describe('filter manager utilities', () => {
describe('mapRange()', () => {
test('should return the key and value for matching filters with gt/lt', async () => {
const filter = {
- meta: { index: 'logstash-*' } as FilterMeta,
+ meta: { index: 'logstash-*' } as esFilters.FilterMeta,
range: { bytes: { lt: 2048, gt: 1024 } },
- } as RangeFilter;
- const result = mapRange(filter);
-
- expect(result).toHaveProperty('key', 'bytes');
- expect(result).toHaveProperty('value');
- if (result.value) {
- const displayName = result.value();
- expect(displayName).toBe('1024 to 2048');
- }
- });
-
- test('should return the key and value for matching filters with gte/lte', async () => {
- const filter = {
- meta: { index: 'logstash-*' } as FilterMeta,
- range: { bytes: { lte: 2048, gte: 1024 } },
- } as RangeFilter;
+ } as esFilters.RangeFilter;
const result = mapRange(filter);
expect(result).toHaveProperty('key', 'bytes');
@@ -56,7 +41,7 @@ describe('filter manager utilities', () => {
const filter = {
meta: { index: 'logstash-*' },
query: { query_string: { query: 'foo:bar' } },
- } as Filter;
+ } as esFilters.Filter;
try {
mapRange(filter);
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts
index 76f9d3621e1717..51fb970f5f03ea 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts
@@ -17,18 +17,11 @@
* under the License.
*/
-import {
- Filter,
- RangeFilter,
- FILTERS,
- isRangeFilter,
- isScriptedRangeFilter,
- FilterValueFormatter,
-} from '@kbn/es-query';
import { get, has } from 'lodash';
+import { esFilters } from '../../../../../common/es_query';
const getFormattedValueFn = (left: any, right: any) => {
- return (formatter?: FilterValueFormatter) => {
+ return (formatter?: esFilters.FilterValueFormatter) => {
let displayValue = `${left} to ${right}`;
if (formatter) {
const convert = formatter.getConverterFor('text');
@@ -38,11 +31,12 @@ const getFormattedValueFn = (left: any, right: any) => {
};
};
-const getFirstRangeKey = (filter: RangeFilter) => filter.range && Object.keys(filter.range)[0];
-const getRangeByKey = (filter: RangeFilter, key: string) => get(filter, ['range', key]);
+const getFirstRangeKey = (filter: esFilters.RangeFilter) =>
+ filter.range && Object.keys(filter.range)[0];
+const getRangeByKey = (filter: esFilters.RangeFilter, key: string) => get(filter, ['range', key]);
-function getParams(filter: RangeFilter) {
- const isScriptedRange = isScriptedRangeFilter(filter);
+function getParams(filter: esFilters.RangeFilter) {
+ const isScriptedRange = esFilters.isScriptedRangeFilter(filter);
const key: string = (isScriptedRange ? filter.meta.field : getFirstRangeKey(filter)) || '';
const params: any = isScriptedRange
? get(filter, 'script.script.params')
@@ -56,13 +50,13 @@ function getParams(filter: RangeFilter) {
const value = getFormattedValueFn(left, right);
- return { type: FILTERS.RANGE, key, value, params };
+ return { type: esFilters.FILTERS.RANGE, key, value, params };
}
-export const isMapRangeFilter = (filter: any): filter is RangeFilter =>
- isRangeFilter(filter) || isScriptedRangeFilter(filter);
+export const isMapRangeFilter = (filter: any): filter is esFilters.RangeFilter =>
+ esFilters.isRangeFilter(filter) || esFilters.isScriptedRangeFilter(filter);
-export const mapRange = (filter: Filter) => {
+export const mapRange = (filter: esFilters.Filter) => {
if (!isMapRangeFilter(filter)) {
throw filter;
}
diff --git a/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts b/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts
index 3fedcf97a625ac..b9731797c9ee36 100644
--- a/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts
@@ -17,8 +17,8 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
import { onlyDisabledFiltersChanged } from './only_disabled';
+import { esFilters } from '../../../../../data/public';
describe('filter manager utilities', () => {
describe('onlyDisabledFiltersChanged()', () => {
@@ -27,20 +27,20 @@ describe('filter manager utilities', () => {
{ meta: { disabled: true } },
{ meta: { disabled: true } },
{ meta: { disabled: true } },
- ] as Filter[];
- const newFilters = [{ meta: { disabled: true } }] as Filter[];
+ ] as esFilters.Filter[];
+ const newFilters = [{ meta: { disabled: true } }] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(true);
});
test('should return false if there are no old filters', () => {
- const newFilters = [{ meta: { disabled: false } }] as Filter[];
+ const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(newFilters, undefined)).toBe(false);
});
test('should return false if there are no new filters', () => {
- const filters = [{ meta: { disabled: false } }] as Filter[];
+ const filters = [{ meta: { disabled: false } }] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(undefined, filters)).toBe(false);
});
@@ -50,8 +50,8 @@ describe('filter manager utilities', () => {
{ meta: { disabled: false } },
{ meta: { disabled: false } },
{ meta: { disabled: false } },
- ] as Filter[];
- const newFilters = [{ meta: { disabled: false } }] as Filter[];
+ ] as esFilters.Filter[];
+ const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
});
@@ -61,8 +61,8 @@ describe('filter manager utilities', () => {
{ meta: { disabled: true } },
{ meta: { disabled: true } },
{ meta: { disabled: true } },
- ] as Filter[];
- const newFilters = [{ meta: { disabled: false } }] as Filter[];
+ ] as esFilters.Filter[];
+ const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
});
@@ -72,8 +72,8 @@ describe('filter manager utilities', () => {
{ meta: { disabled: false } },
{ meta: { disabled: false } },
{ meta: { disabled: false } },
- ] as Filter[];
- const newFilters = [{ meta: { disabled: true } }] as Filter[];
+ ] as esFilters.Filter[];
+ const newFilters = [{ meta: { disabled: true } }] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
});
@@ -83,8 +83,8 @@ describe('filter manager utilities', () => {
{ meta: { disabled: true } },
{ meta: { disabled: true } },
{ meta: { disabled: true } },
- ] as Filter[];
- const newFilters = [] as Filter[];
+ ] as esFilters.Filter[];
+ const newFilters = [] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(true);
});
@@ -94,8 +94,8 @@ describe('filter manager utilities', () => {
{ meta: { disabled: false } },
{ meta: { disabled: false } },
{ meta: { disabled: false } },
- ] as Filter[];
- const newFilters = [] as Filter[];
+ ] as esFilters.Filter[];
+ const newFilters = [] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
});
@@ -104,11 +104,11 @@ describe('filter manager utilities', () => {
const filters = [
{ meta: { disabled: true, negate: false } },
{ meta: { disabled: true, negate: false } },
- ] as Filter[];
+ ] as esFilters.Filter[];
const newFilters = [
{ meta: { disabled: true, negate: true } },
{ meta: { disabled: true, negate: true } },
- ] as Filter[];
+ ] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(true);
});
@@ -118,8 +118,8 @@ describe('filter manager utilities', () => {
{ meta: { disabled: false } },
{ meta: { disabled: false } },
{ meta: { disabled: true } },
- ] as Filter[];
- const newFilters = [{ meta: { disabled: false } }] as Filter[];
+ ] as esFilters.Filter[];
+ const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
});
@@ -129,15 +129,15 @@ describe('filter manager utilities', () => {
{ meta: { disabled: true } },
{ meta: { disabled: false } },
{ meta: { disabled: true } },
- ] as Filter[];
- const newFilters = [] as Filter[];
+ ] as esFilters.Filter[];
+ const newFilters = [] as esFilters.Filter[];
expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
});
test('should not throw with null filters', () => {
- const filters = [null, { meta: { disabled: true } }] as Filter[];
- const newFilters = [] as Filter[];
+ const filters = [null, { meta: { disabled: true } }] as esFilters.Filter[];
+ const newFilters = [] as esFilters.Filter[];
expect(() => {
onlyDisabledFiltersChanged(newFilters, filters);
diff --git a/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts b/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts
index 9c0b5f43acb3ef..0fb6894a297a1f 100644
--- a/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts
@@ -17,17 +17,20 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
import { filter, isEqual } from 'lodash';
+import { esFilters } from '../../../../../../plugins/data/public';
-const isEnabled = (f: Filter) => f && f.meta && !f.meta.disabled;
+const isEnabled = (f: esFilters.Filter) => f && f.meta && !f.meta.disabled;
/**
* Checks to see if only disabled filters have been changed
*
* @returns {bool} Only disabled filters
*/
-export const onlyDisabledFiltersChanged = (newFilters?: Filter[], oldFilters?: Filter[]) => {
+export const onlyDisabledFiltersChanged = (
+ newFilters?: esFilters.Filter[],
+ oldFilters?: esFilters.Filter[]
+) => {
// If it's the same - compare only enabled filters
const newEnabledFilters = filter(newFilters || [], isEnabled);
const oldEnabledFilters = filter(oldFilters || [], isEnabled);
diff --git a/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts
index 86f059913cd96a..08eeabc1497e3c 100644
--- a/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts
@@ -16,15 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { Filter, buildQueryFilter, FilterStateStore } from '@kbn/es-query';
+
import { uniqFilters } from './uniq_filters';
+import { esFilters } from '../../../../../data/public';
describe('filter manager utilities', () => {
describe('niqFilter', () => {
test('should filter out dups', () => {
- const before: Filter[] = [
- buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
- buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
+ const before: esFilters.Filter[] = [
+ esFilters.buildQueryFilter(
+ { _type: { match: { query: 'apache', type: 'phrase' } } },
+ 'index',
+ ''
+ ),
+ esFilters.buildQueryFilter(
+ { _type: { match: { query: 'apache', type: 'phrase' } } },
+ 'index',
+ ''
+ ),
];
const results = uniqFilters(before);
@@ -32,9 +41,17 @@ describe('filter manager utilities', () => {
});
test('should filter out duplicates, ignoring meta attributes', () => {
- const before: Filter[] = [
- buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index1'),
- buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index2'),
+ const before: esFilters.Filter[] = [
+ esFilters.buildQueryFilter(
+ { _type: { match: { query: 'apache', type: 'phrase' } } },
+ 'index1',
+ ''
+ ),
+ esFilters.buildQueryFilter(
+ { _type: { match: { query: 'apache', type: 'phrase' } } },
+ 'index2',
+ ''
+ ),
];
const results = uniqFilters(before);
@@ -42,14 +59,22 @@ describe('filter manager utilities', () => {
});
test('should filter out duplicates, ignoring $state attributes', () => {
- const before: Filter[] = [
+ const before: esFilters.Filter[] = [
{
- $state: { store: FilterStateStore.APP_STATE },
- ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
+ $state: { store: esFilters.FilterStateStore.APP_STATE },
+ ...esFilters.buildQueryFilter(
+ { _type: { match: { query: 'apache', type: 'phrase' } } },
+ 'index',
+ ''
+ ),
},
{
- $state: { store: FilterStateStore.GLOBAL_STATE },
- ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
+ $state: { store: esFilters.FilterStateStore.GLOBAL_STATE },
+ ...esFilters.buildQueryFilter(
+ { _type: { match: { query: 'apache', type: 'phrase' } } },
+ 'index',
+ ''
+ ),
},
];
const results = uniqFilters(before);
diff --git a/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts
index 12e793253371e7..e96c52e6db3dec 100644
--- a/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { Filter } from '@kbn/es-query';
import { each, union } from 'lodash';
import { dedupFilters } from './dedup_filters';
+import { esFilters } from '../../../../../data/public';
/**
* Remove duplicate filters from an array of filters
@@ -28,10 +28,10 @@ import { dedupFilters } from './dedup_filters';
* @returns {object} The original filters array with duplicates removed
*/
-export const uniqFilters = (filters: Filter[], comparatorOptions: any = {}) => {
- let results: Filter[] = [];
+export const uniqFilters = (filters: esFilters.Filter[], comparatorOptions: any = {}) => {
+ let results: esFilters.Filter[] = [];
- each(filters, (filter: Filter) => {
+ each(filters, (filter: esFilters.Filter) => {
results = union(results, dedupFilters(results, [filter]), comparatorOptions);
});
diff --git a/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts b/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts
index 27f627b477c359..aa047647c57516 100644
--- a/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts
+++ b/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts
@@ -17,9 +17,9 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
-export function getFiltersArray(): Filter[] {
+export function getFiltersArray(): esFilters.Filter[] {
return [
{
query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
diff --git a/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts b/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts
index 20d9e236f49be8..adc72c961b08bb 100644
--- a/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts
+++ b/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts
@@ -17,15 +17,15 @@
* under the License.
*/
-import { Filter, FilterStateStore } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
export function getFilter(
- store: FilterStateStore,
+ store: esFilters.FilterStateStore,
disabled: boolean,
negated: boolean,
queryKey: string,
queryValue: any
-): Filter {
+): esFilters.Filter {
return {
$state: {
store,
diff --git a/src/plugins/data/public/query/filter_manager/types.ts b/src/plugins/data/public/query/filter_manager/types.ts
index e74b48b722cc45..0b3dbca2d6e0a6 100644
--- a/src/plugins/data/public/query/filter_manager/types.ts
+++ b/src/plugins/data/public/query/filter_manager/types.ts
@@ -17,9 +17,9 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../plugins/data/public';
export interface PartitionedFilters {
- globalFilters: Filter[];
- appFilters: Filter[];
+ globalFilters: esFilters.Filter[];
+ appFilters: esFilters.Filter[];
}
diff --git a/src/plugins/data/public/query/index.tsx b/src/plugins/data/public/query/index.tsx
index 44b371b6adf192..42647b9d98201d 100644
--- a/src/plugins/data/public/query/index.tsx
+++ b/src/plugins/data/public/query/index.tsx
@@ -18,5 +18,4 @@
*/
export * from './query_service';
-
export * from './filter_manager';
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index df933167cee255..f0b6117b928cd8 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -25,6 +25,11 @@ export function plugin(initializerContext: PluginInitializerContext) {
}
export { DataServerPlugin as Plugin };
+export {
+ IndexPatternsFetcher,
+ FieldDescriptor,
+ shouldReadFieldFromDocValues,
+} from './index_patterns';
export * from './search';
diff --git a/src/plugins/data/server/index_patterns/fetcher/index.ts b/src/plugins/data/server/index_patterns/fetcher/index.ts
new file mode 100644
index 00000000000000..19306696885dbe
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/fetcher/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './index_patterns_fetcher';
+export { shouldReadFieldFromDocValues } from './lib';
diff --git a/src/legacy/server/index_patterns/service/index_patterns_service.ts b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts
similarity index 98%
rename from src/legacy/server/index_patterns/service/index_patterns_service.ts
rename to src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts
index 62cf51828a4cc2..5f1493a49ab7de 100644
--- a/src/legacy/server/index_patterns/service/index_patterns_service.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts
@@ -36,7 +36,7 @@ interface FieldSubType {
nested?: { path: string };
}
-export class IndexPatternsService {
+export class IndexPatternsFetcher {
private _callDataCluster: APICaller;
constructor(callDataCluster: APICaller) {
diff --git a/src/legacy/server/index_patterns/service/lib/errors.ts b/src/plugins/data/server/index_patterns/fetcher/lib/errors.ts
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/errors.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/errors.ts
diff --git a/src/legacy/server/index_patterns/service/lib/es_api.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.test.js
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/es_api.test.js
rename to src/plugins/data/server/index_patterns/fetcher/lib/es_api.test.js
diff --git a/src/legacy/server/index_patterns/service/lib/es_api.ts b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
similarity index 99%
rename from src/legacy/server/index_patterns/service/lib/es_api.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
index 63c1824784dbdd..92b64fafddd665 100644
--- a/src/legacy/server/index_patterns/service/lib/es_api.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
@@ -18,7 +18,6 @@
*/
import { APICaller } from 'src/core/server';
-// @ts-ignore
import { convertEsError } from './errors';
import { FieldCapsResponse } from './field_capabilities';
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/__fixtures__/es_field_caps_response.json b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/__fixtures__/es_field_caps_response.json
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.test.js
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
similarity index 97%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
index 05e8d591f13a9e..c275fb714088e9 100644
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
@@ -23,7 +23,7 @@ import { APICaller } from 'src/core/server';
import { callFieldCapsApi } from '../es_api';
import { FieldCapsResponse, readFieldCapsResponse } from './field_caps_response';
import { mergeOverrides } from './overrides';
-import { FieldDescriptor } from '../../index_patterns_service';
+import { FieldDescriptor } from '../../index_patterns_fetcher';
export function concatIfUniq(arr: T[], value: T) {
return arr.includes(value) ? arr : arr.concat(value);
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
similarity index 99%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.test.js
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
index c0a5492aaba360..cf4af615b95779 100644
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.test.js
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
@@ -24,7 +24,7 @@ import sinon from 'sinon';
import * as shouldReadFieldFromDocValuesNS from './should_read_field_from_doc_values';
import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values';
-import { getKbnFieldType } from '../../../../../../plugins/data/common';
+import { getKbnFieldType } from '../../../../../../data/common';
import { readFieldCapsResponse } from './field_caps_response';
import esResponse from './__fixtures__/es_field_caps_response.json';
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
similarity index 98%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
index 19288014de297a..06eb30db0b24bb 100644
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -18,9 +18,9 @@
*/
import { uniq } from 'lodash';
-import { FieldDescriptor } from '../..';
+import { castEsToKbnFieldTypeName } from '../../../../../common';
import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values';
-import { castEsToKbnFieldTypeName } from '../../../../../../plugins/data/common';
+import { FieldDescriptor } from '../../../fetcher';
interface FieldCapObject {
type: string;
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/index.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/index.ts
similarity index 91%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/index.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/index.ts
index 8ac42255577841..6a541aff564714 100644
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/index.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/index.ts
@@ -19,3 +19,4 @@
export { getFieldCapabilities } from './field_capabilities';
export { FieldCapsResponse } from './field_caps_response';
+export { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values';
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/overrides.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts
similarity index 95%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/overrides.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts
index 6310bf02e4430d..518bfeccac01ab 100644
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/overrides.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts
@@ -18,7 +18,7 @@
*/
import { merge } from 'lodash';
-import { FieldDescriptor } from '../../index_patterns_service';
+import { FieldDescriptor } from '../../index_patterns_fetcher';
const OVERRIDES: Record> = {
_source: { type: '_source' },
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts
diff --git a/src/legacy/server/index_patterns/service/lib/index.ts b/src/plugins/data/server/index_patterns/fetcher/lib/index.ts
similarity index 90%
rename from src/legacy/server/index_patterns/service/lib/index.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/index.ts
index cd239b3753aa31..20e74d2b1a579d 100644
--- a/src/legacy/server/index_patterns/service/lib/index.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/index.ts
@@ -17,8 +17,6 @@
* under the License.
*/
-export { getFieldCapabilities } from './field_capabilities';
-// @ts-ignore
+export { getFieldCapabilities, shouldReadFieldFromDocValues } from './field_capabilities';
export { resolveTimePattern } from './resolve_time_pattern';
-// @ts-ignore
export { createNoMatchingIndicesError } from './errors';
diff --git a/src/legacy/server/index_patterns/service/lib/resolve_time_pattern.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/resolve_time_pattern.test.js
rename to src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js
diff --git a/src/legacy/server/index_patterns/service/lib/resolve_time_pattern.ts b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/resolve_time_pattern.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
diff --git a/src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.test.ts b/src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.test.ts
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.test.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.test.ts
diff --git a/src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.ts b/src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.ts
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.mocks.ts b/src/plugins/data/server/index_patterns/index.ts
similarity index 83%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.mocks.ts
rename to src/plugins/data/server/index_patterns/index.ts
index 04c99a1547ba93..6937fa22c4e5d1 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.mocks.ts
+++ b/src/plugins/data/server/index_patterns/index.ts
@@ -17,10 +17,5 @@
* under the License.
*/
-export const settingsGet = jest.fn();
-
-jest.doMock('ui/chrome', () => ({
- getUiSettingsClient: () => ({
- get: settingsGet,
- }),
-}));
+export { IndexPatternsFetcher, FieldDescriptor, shouldReadFieldFromDocValues } from './fetcher';
+export { IndexPatternsService } from './index_patterns_service';
diff --git a/packages/kbn-es-query/src/filters/query.js b/src/plugins/data/server/index_patterns/index_patterns_service.ts
similarity index 72%
rename from packages/kbn-es-query/src/filters/query.js
rename to src/plugins/data/server/index_patterns/index_patterns_service.ts
index ded877231bf67e..30d199c0e522e4 100644
--- a/packages/kbn-es-query/src/filters/query.js
+++ b/src/plugins/data/server/index_patterns/index_patterns_service.ts
@@ -17,18 +17,14 @@
* under the License.
*/
-// Creates a filter corresponding to a raw Elasticsearch query DSL object
-export function buildQueryFilter(query, index, alias) {
- const filter = {
- query: query,
- meta: {
- index,
- }
- };
+import { CoreSetup } from 'kibana/server';
+import { Plugin } from '../../../../core/server';
+import { registerRoutes } from './routes';
- if (alias) {
- filter.meta.alias = alias;
+export class IndexPatternsService implements Plugin {
+ public setup({ http, elasticsearch }: CoreSetup) {
+ registerRoutes(http, elasticsearch);
}
- return filter;
+ public start() {}
}
diff --git a/src/legacy/server/index_patterns/routes.ts b/src/plugins/data/server/index_patterns/routes.ts
similarity index 90%
rename from src/legacy/server/index_patterns/routes.ts
rename to src/plugins/data/server/index_patterns/routes.ts
index fb78b94e0f77f4..7975e923e219bd 100644
--- a/src/legacy/server/index_patterns/routes.ts
+++ b/src/plugins/data/server/index_patterns/routes.ts
@@ -25,18 +25,18 @@ import {
RequestHandlerContext,
APICaller,
CallAPIOptions,
-} from '../../../core/server';
-import { IndexPatternsService } from './service';
+} from '../../../../core/server';
+import { IndexPatternsFetcher } from './fetcher';
-export function registerRoutes(core: CoreSetup) {
- const getIndexPatternsService = async (request: KibanaRequest): Promise => {
- const client = await core.elasticsearch.dataClient$.pipe(first()).toPromise();
+export function registerRoutes(http: CoreSetup['http'], elasticsearch: CoreSetup['elasticsearch']) {
+ const getIndexPatternsService = async (request: KibanaRequest): Promise => {
+ const client = await elasticsearch.dataClient$.pipe(first()).toPromise();
const callCluster: APICaller = (
endpoint: string,
params?: Record,
options?: CallAPIOptions
) => client.asScoped(request).callAsCurrentUser(endpoint, params, options);
- return new Promise(resolve => resolve(new IndexPatternsService(callCluster)));
+ return new Promise(resolve => resolve(new IndexPatternsFetcher(callCluster)));
};
const parseMetaFields = (metaFields: string | string[]) => {
@@ -49,7 +49,7 @@ export function registerRoutes(core: CoreSetup) {
return parsedFields;
};
- const router = core.http.createRouter();
+ const router = http.createRouter();
router.get(
{
path: '/api/index_patterns/_fields_for_wildcard',
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index 9cf08b0702e9e0..e81250e653ebd3 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -18,19 +18,21 @@
*/
import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/server';
+import { IndexPatternsService } from './index_patterns';
import { ISearchSetup } from './search';
import { SearchService } from './search/search_service';
export interface DataPluginSetup {
search: ISearchSetup;
}
-
export class DataServerPlugin implements Plugin {
private readonly searchService: SearchService;
+ private readonly indexPatterns = new IndexPatternsService();
constructor(initializerContext: PluginInitializerContext) {
this.searchService = new SearchService(initializerContext);
}
public setup(core: CoreSetup) {
+ this.indexPatterns.setup(core);
return {
search: this.searchService.setup(core),
};
diff --git a/src/plugins/embeddable/public/_index.scss b/src/plugins/embeddable/public/_index.scss
new file mode 100644
index 00000000000000..ed80b3f9983e52
--- /dev/null
+++ b/src/plugins/embeddable/public/_index.scss
@@ -0,0 +1,3 @@
+@import './variables';
+@import './lib/panel/index';
+@import './lib/panel/panel_header/index';
diff --git a/src/legacy/core_plugins/embeddable_api/public/_variables.scss b/src/plugins/embeddable/public/_variables.scss
similarity index 100%
rename from src/legacy/core_plugins/embeddable_api/public/_variables.scss
rename to src/plugins/embeddable/public/_variables.scss
diff --git a/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts b/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts
index 99cfb2ea13d07b..e2592b70397f33 100644
--- a/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts
+++ b/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts
@@ -18,16 +18,16 @@
*/
import { i18n } from '@kbn/i18n';
-import { Filter } from '@kbn/es-query';
import { IAction, createAction, IncompatibleActionError } from '../ui_actions';
import { IEmbeddable, EmbeddableInput } from '../embeddables';
+import { esFilters } from '../../../../../plugins/data/public';
export const APPLY_FILTER_ACTION = 'APPLY_FILTER_ACTION';
-type RootEmbeddable = IEmbeddable;
+type RootEmbeddable = IEmbeddable;
interface ActionContext {
embeddable: IEmbeddable;
- filters: Filter[];
+ filters: esFilters.Filter[];
}
async function isCompatible(context: ActionContext) {
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
index 802be5bf1282ec..47113ffc59561c 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
@@ -20,7 +20,6 @@
import { ViewMode, EmbeddableOutput, isErrorEmbeddable } from '../../../../';
import { AddPanelAction } from './add_panel_action';
import { EmbeddableFactory } from '../../../../embeddables';
-import { Filter, FilterStateStore } from '@kbn/es-query';
import {
FILTERABLE_EMBEDDABLE,
FilterableEmbeddable,
@@ -32,6 +31,7 @@ import { GetEmbeddableFactory } from '../../../../types';
// eslint-disable-next-line
import { coreMock } from '../../../../../../../../core/public/mocks';
import { ContactCardEmbeddable } from '../../../../test_samples';
+import { esFilters } from '../../../../../../../../plugins/data/public';
const embeddableFactories = new Map();
embeddableFactories.set(FILTERABLE_EMBEDDABLE, new FilterableEmbeddableFactory());
@@ -51,8 +51,8 @@ beforeEach(async () => {
() => null
);
- const derivedFilter: Filter = {
- $state: { store: FilterStateStore.APP_STATE },
+ const derivedFilter: esFilters.Filter = {
+ $state: { store: esFilters.FilterStateStore.APP_STATE },
meta: { disabled: false, alias: 'name', negate: false },
query: { match: {} },
};
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
index 550f9706a634b5..8d9beec940acc0 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
@@ -28,7 +28,6 @@ import {
} from '../../../test_samples';
// eslint-disable-next-line
import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks';
-import { FilterStateStore } from '@kbn/es-query';
import {
EmbeddableFactory,
EmbeddableOutput,
@@ -37,6 +36,7 @@ import {
} from '../../../embeddables';
import { GetEmbeddableFactory } from '../../../types';
import { of } from '../../../../tests/helpers';
+import { esFilters } from '../../../../../../../plugins/data/public';
const setup = async () => {
const embeddableFactories = new Map();
@@ -48,7 +48,7 @@ const setup = async () => {
panels: {},
filters: [
{
- $state: { store: FilterStateStore.APP_STATE },
+ $state: { store: esFilters.FilterStateStore.APP_STATE },
meta: { disabled: false, alias: 'name', negate: false },
query: { match: {} },
},
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
index 22e3be89f1ae93..684a8c45a4e890 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
@@ -17,7 +17,6 @@
* under the License.
*/
-import { Filter, FilterStateStore } from '@kbn/es-query';
import { EmbeddableOutput, isErrorEmbeddable } from '../../../';
import { RemovePanelAction } from './remove_panel_action';
import { EmbeddableFactory } from '../../../embeddables';
@@ -30,6 +29,7 @@ import { FilterableEmbeddableFactory } from '../../../test_samples/embeddables/f
import { FilterableContainer } from '../../../test_samples/embeddables/filterable_container';
import { GetEmbeddableFactory, ViewMode } from '../../../types';
import { ContactCardEmbeddable } from '../../../test_samples/embeddables/contact_card/contact_card_embeddable';
+import { esFilters } from '../../../../../../../plugins/data/public';
const embeddableFactories = new Map();
embeddableFactories.set(FILTERABLE_EMBEDDABLE, new FilterableEmbeddableFactory());
@@ -39,8 +39,8 @@ let container: FilterableContainer;
let embeddable: FilterableEmbeddable;
beforeEach(async () => {
- const derivedFilter: Filter = {
- $state: { store: FilterStateStore.APP_STATE },
+ const derivedFilter: esFilters.Filter = {
+ $state: { store: esFilters.FilterStateStore.APP_STATE },
meta: { disabled: false, alias: 'name', negate: false },
query: { match: {} },
};
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx
index eaef8048a6fbff..de708b778c3c7c 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx
@@ -16,14 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { Filter } from '@kbn/es-query';
+
import { Container, ContainerInput } from '../../containers';
import { GetEmbeddableFactory } from '../../types';
+import { esFilters } from '../../../../../data/public';
export const FILTERABLE_CONTAINER = 'FILTERABLE_CONTAINER';
export interface FilterableContainerInput extends ContainerInput {
- filters: Filter[];
+ filters: esFilters.Filter[];
}
/**
@@ -33,7 +34,7 @@ export interface FilterableContainerInput extends ContainerInput {
*/
// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
export type InheritedChildrenInput = {
- filters: Filter[];
+ filters: esFilters.Filter[];
id?: string;
};
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx
index f6885ca25b437a..56aa7688f37a69 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx
@@ -17,14 +17,14 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
import { IContainer } from '../../containers';
import { EmbeddableOutput, EmbeddableInput, Embeddable } from '../../embeddables';
+import { esFilters } from '../../../../../data/public';
export const FILTERABLE_EMBEDDABLE = 'FILTERABLE_EMBEDDABLE';
export interface FilterableEmbeddableInput extends EmbeddableInput {
- filters: Filter[];
+ filters: esFilters.Filter[];
}
export class FilterableEmbeddable extends Embeddable {
diff --git a/src/plugins/embeddable/public/tests/apply_filter_action.test.ts b/src/plugins/embeddable/public/tests/apply_filter_action.test.ts
index 52500acc3dc59d..0721acb1a1fba9 100644
--- a/src/plugins/embeddable/public/tests/apply_filter_action.test.ts
+++ b/src/plugins/embeddable/public/tests/apply_filter_action.test.ts
@@ -32,7 +32,7 @@ import {
} from '../lib/test_samples';
// eslint-disable-next-line
import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks';
-import { FilterStateStore } from '@kbn/es-query';
+import { esFilters } from '../../../../plugins/data/public';
test('ApplyFilterAction applies the filter to the root of the container tree', async () => {
const { doStart } = testPlugin();
@@ -76,7 +76,7 @@ test('ApplyFilterAction applies the filter to the root of the container tree', a
}
const filter: any = {
- $state: { store: FilterStateStore.APP_STATE },
+ $state: { store: esFilters.FilterStateStore.APP_STATE },
meta: {
disabled: false,
negate: false,
diff --git a/src/plugins/embeddable/public/tests/container.test.ts b/src/plugins/embeddable/public/tests/container.test.ts
index 3bdbcbad857d65..f97c26a41b901b 100644
--- a/src/plugins/embeddable/public/tests/container.test.ts
+++ b/src/plugins/embeddable/public/tests/container.test.ts
@@ -26,7 +26,6 @@ import {
FILTERABLE_EMBEDDABLE,
} from '../lib/test_samples/embeddables/filterable_embeddable';
import { ERROR_EMBEDDABLE_TYPE } from '../lib/embeddables/error_embeddable';
-import { Filter, FilterStateStore } from '@kbn/es-query';
import { FilterableEmbeddableFactory } from '../lib/test_samples/embeddables/filterable_embeddable_factory';
import { CONTACT_CARD_EMBEDDABLE } from '../lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory';
import { SlowContactCardEmbeddableFactory } from '../lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory';
@@ -46,6 +45,7 @@ import {
import { coreMock } from '../../../../core/public/mocks';
import { testPlugin } from './test_plugin';
import { of } from './helpers';
+import { esFilters } from '../../../../plugins/data/public';
async function creatHelloWorldContainerAndEmbeddable(
containerInput: ContainerInput = { id: 'hello', panels: {} },
@@ -437,8 +437,8 @@ test('Test nested reactions', async done => {
test('Explicit embeddable input mapped to undefined will default to inherited', async () => {
const { start } = await creatHelloWorldContainerAndEmbeddable();
- const derivedFilter: Filter = {
- $state: { store: FilterStateStore.APP_STATE },
+ const derivedFilter: esFilters.Filter = {
+ $state: { store: esFilters.FilterStateStore.APP_STATE },
meta: { disabled: false, alias: 'name', negate: false },
query: { match: {} },
};
diff --git a/src/plugins/embeddable/public/tests/explicit_input.test.ts b/src/plugins/embeddable/public/tests/explicit_input.test.ts
index 6cde7bdc48ba17..47c4b0944cef22 100644
--- a/src/plugins/embeddable/public/tests/explicit_input.test.ts
+++ b/src/plugins/embeddable/public/tests/explicit_input.test.ts
@@ -18,7 +18,6 @@
*/
import { skip } from 'rxjs/operators';
-import { Filter, FilterStateStore } from '@kbn/es-query';
import { testPlugin } from './test_plugin';
import {
FILTERABLE_EMBEDDABLE,
@@ -34,6 +33,7 @@ import { isErrorEmbeddable } from '../lib';
import { HelloWorldContainer } from '../lib/test_samples/embeddables/hello_world_container';
// eslint-disable-next-line
import { coreMock } from '../../../../core/public/mocks';
+import { esFilters } from '../../../../plugins/data/public';
const { setup, doStart, coreStart, uiActions } = testPlugin(
coreMock.createSetup(),
@@ -50,8 +50,8 @@ setup.registerEmbeddableFactory(CONTACT_CARD_EMBEDDABLE, factory);
setup.registerEmbeddableFactory(HELLO_WORLD_EMBEDDABLE_TYPE, new HelloWorldEmbeddableFactory());
test('Explicit embeddable input mapped to undefined will default to inherited', async () => {
- const derivedFilter: Filter = {
- $state: { store: FilterStateStore.APP_STATE },
+ const derivedFilter: esFilters.Filter = {
+ $state: { store: esFilters.FilterStateStore.APP_STATE },
meta: { disabled: false, alias: 'name', negate: false },
query: { match: {} },
};
diff --git a/src/plugins/expressions/public/expression_types/kibana_context.ts b/src/plugins/expressions/public/expression_types/kibana_context.ts
index 174517abc2c053..bcf8e2853dec88 100644
--- a/src/plugins/expressions/public/expression_types/kibana_context.ts
+++ b/src/plugins/expressions/public/expression_types/kibana_context.ts
@@ -17,8 +17,7 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
-import { TimeRange, Query } from 'src/plugins/data/public';
+import { TimeRange, Query, esFilters } from 'src/plugins/data/public';
const name = 'kibana_context';
export type KIBANA_CONTEXT_NAME = 'kibana_context';
@@ -26,7 +25,7 @@ export type KIBANA_CONTEXT_NAME = 'kibana_context';
export interface KibanaContext {
type: typeof name;
query?: Query | Query[];
- filters?: Filter[];
+ filters?: esFilters.Filter[];
timeRange?: TimeRange;
}
diff --git a/src/plugins/expressions/public/types/index.ts b/src/plugins/expressions/public/types/index.ts
index 2adb0d77941599..2d66216a9770ba 100644
--- a/src/plugins/expressions/public/types/index.ts
+++ b/src/plugins/expressions/public/types/index.ts
@@ -17,13 +17,13 @@
* under the License.
*/
-import { Filter } from '@kbn/es-query';
import { ExpressionInterpret } from '../interpreter_provider';
import { TimeRange } from '../../../data/public';
import { Adapters } from '../../../inspector/public';
import { Query } from '../../../data/public';
import { ExpressionAST } from '../../../expressions/public';
import { ExpressionArgAST } from '../../../../plugins/expressions/public';
+import { esFilters } from '../../../../plugins/data/public';
export { ArgumentType } from './arguments';
export {
@@ -76,7 +76,7 @@ export type Context = object;
export interface SearchContext {
type: 'kibana_context';
- filters?: Filter[];
+ filters?: esFilters.Filter[];
query?: Query;
timeRange?: TimeRange;
}
diff --git a/src/plugins/kibana_react/public/context/context.test.tsx b/src/plugins/kibana_react/public/context/context.test.tsx
index d7dce3f69239dd..4008daf69f25d4 100644
--- a/src/plugins/kibana_react/public/context/context.test.tsx
+++ b/src/plugins/kibana_react/public/context/context.test.tsx
@@ -21,7 +21,7 @@ import * as React from 'react';
import * as ReactDOM from 'react-dom';
import { context, createKibanaReactContext, useKibana, KibanaContextProvider } from './context';
import { coreMock, overlayServiceMock } from '../../../../core/public/mocks';
-import { CoreStart } from './types';
+import { CoreStart } from '../../../../core/public';
let container: HTMLDivElement | null;
diff --git a/src/plugins/kibana_react/public/context/types.ts b/src/plugins/kibana_react/public/context/types.ts
index 1906bb808ea87b..35e6349bfca87c 100644
--- a/src/plugins/kibana_react/public/context/types.ts
+++ b/src/plugins/kibana_react/public/context/types.ts
@@ -22,8 +22,6 @@ import { CoreStart } from '../../../../core/public';
import { KibanaReactOverlays } from '../overlays';
import { KibanaReactNotifications } from '../notifications';
-export { CoreStart };
-
export type KibanaServices = Partial;
export interface KibanaReactContextValue {
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
index 81d514ca4d466d..a880d3c6cf87c3 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
@@ -24,11 +24,11 @@ import { EuiScreenReaderOnly, keyCodes } from '@elastic/eui';
// @ts-ignore
import { KuiButton } from '@kbn/ui-framework/components';
-interface Props {
+export interface ExitFullScreenButtonProps {
onExitFullScreenMode: () => void;
}
-class ExitFullScreenButtonUi extends PureComponent {
+class ExitFullScreenButtonUi extends PureComponent {
public onKeyDown = (e: KeyboardEvent) => {
if (e.keyCode === keyCodes.ESCAPE) {
this.props.onExitFullScreenMode();
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx
index a965fd776e0c29..130ac1e980eee3 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx
@@ -17,4 +17,4 @@
* under the License.
*/
-export { ExitFullScreenButton } from './exit_full_screen_button';
+export { ExitFullScreenButton, ExitFullScreenButtonProps } from './exit_full_screen_button';
diff --git a/src/plugins/kibana_react/public/overlays/types.ts b/src/plugins/kibana_react/public/overlays/types.ts
index 6a1fb25ca14835..0108d8eaba6cc9 100644
--- a/src/plugins/kibana_react/public/overlays/types.ts
+++ b/src/plugins/kibana_react/public/overlays/types.ts
@@ -18,7 +18,7 @@
*/
import * as React from 'react';
-import { CoreStart } from '../context/types';
+import { CoreStart } from '../../../../core/public';
export interface KibanaReactOverlays {
openFlyout: (
diff --git a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
index fbea5d613f60ca..c65d4289587670 100644
--- a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
+++ b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
@@ -104,7 +104,7 @@ interface SavedObjectFinderInitialPageSize extends BaseSavedObjectFinder {
initialPageSize?: 5 | 10 | 15 | 25;
fixedPageSize?: undefined;
}
-type SavedObjectFinderProps = {
+export type SavedObjectFinderProps = {
savedObjects: CoreStart['savedObjects'];
uiSettings: CoreStart['uiSettings'];
} & (SavedObjectFinderFixedPage | SavedObjectFinderInitialPageSize);
diff --git a/test/accessibility/apps/discover.ts b/test/accessibility/apps/discover.ts
new file mode 100644
index 00000000000000..e3f73ad4bcaf86
--- /dev/null
+++ b/test/accessibility/apps/discover.ts
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+const FROM_TIME = '2015-09-19 06:31:44.000';
+const TO_TIME = '2015-09-23 18:31:44.000';
+
+export default function({ getService, getPageObjects }: FtrProviderContext) {
+ const PageObjects = getPageObjects(['common', 'timePicker']);
+ const a11y = getService('a11y');
+ const esArchiver = getService('esArchiver');
+ const kibanaServer = getService('kibanaServer');
+
+ describe('Discover', () => {
+ before(async () => {
+ await esArchiver.load('discover');
+ await esArchiver.loadIfNeeded('logstash_functional');
+ await kibanaServer.uiSettings.update({
+ defaultIndex: 'logstash-*',
+ });
+ await PageObjects.common.navigateToApp('discover');
+ await PageObjects.timePicker.setAbsoluteRange(FROM_TIME, TO_TIME);
+ });
+
+ it('main view', async () => {
+ await a11y.testAppSnapshot();
+ });
+ });
+}
diff --git a/test/accessibility/apps/home.ts b/test/accessibility/apps/home.ts
new file mode 100644
index 00000000000000..4df4d5f42c93d8
--- /dev/null
+++ b/test/accessibility/apps/home.ts
@@ -0,0 +1,35 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function({ getService, getPageObjects }: FtrProviderContext) {
+ const PageObjects = getPageObjects(['common']);
+ const a11y = getService('a11y');
+
+ describe('Kibana Home', () => {
+ before(async () => {
+ await PageObjects.common.navigateToApp('home');
+ });
+
+ it('Kibana Home view', async () => {
+ await a11y.testAppSnapshot();
+ });
+ });
+}
diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts
new file mode 100644
index 00000000000000..842f4ecbafa9ef
--- /dev/null
+++ b/test/accessibility/apps/management.ts
@@ -0,0 +1,55 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function({ getService, getPageObjects }: FtrProviderContext) {
+ const PageObjects = getPageObjects(['common', 'settings']);
+ const a11y = getService('a11y');
+
+ describe('Management', () => {
+ before(async () => {
+ await PageObjects.common.navigateToApp('settings');
+ });
+
+ it('main view', async () => {
+ await a11y.testAppSnapshot();
+ });
+
+ it('index pattern page', async () => {
+ await PageObjects.settings.clickKibanaIndexPatterns();
+ await a11y.testAppSnapshot();
+ });
+
+ it('Single indexpattern view', async () => {
+ await PageObjects.settings.clickIndexPatternLogstash();
+ await a11y.testAppSnapshot();
+ });
+
+ it('Saved objects view', async () => {
+ await PageObjects.settings.clickKibanaSavedObjects();
+ await a11y.testAppSnapshot();
+ });
+
+ it('Advanced settings', async () => {
+ await PageObjects.settings.clickKibanaSettings();
+ await a11y.testAppSnapshot();
+ });
+ });
+}
diff --git a/packages/kbn-es-query/src/filters/exists.js b/test/accessibility/config.ts
similarity index 58%
rename from packages/kbn-es-query/src/filters/exists.js
rename to test/accessibility/config.ts
index 0c82279fb44176..d73a73820a1172 100644
--- a/packages/kbn-es-query/src/filters/exists.js
+++ b/test/accessibility/config.ts
@@ -17,14 +17,26 @@
* under the License.
*/
-// Creates a filter where the given field exists
-export function buildExistsFilter(field, indexPattern) {
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { services } from './services';
+import { pageObjects } from './page_objects';
+
+export default async function({ readConfigFile }: FtrConfigProviderContext) {
+ const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
+
return {
- meta: {
- index: indexPattern.id
+ ...functionalConfig.getAll(),
+
+ testFiles: [
+ require.resolve('./apps/discover'),
+ require.resolve('./apps/management'),
+ require.resolve('./apps/home'),
+ ],
+ pageObjects,
+ services,
+
+ junit: {
+ reportName: 'Accessibility Tests',
},
- exists: {
- field: field.name
- }
};
}
diff --git a/test/api_integration/services/chance.js b/test/accessibility/ftr_provider_context.d.ts
similarity index 76%
rename from test/api_integration/services/chance.js
rename to test/accessibility/ftr_provider_context.d.ts
index 3c5d9dc704aae0..22df3b16150a43 100644
--- a/test/api_integration/services/chance.js
+++ b/test/accessibility/ftr_provider_context.d.ts
@@ -17,13 +17,9 @@
* under the License.
*/
-import Chance from 'chance';
+import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
-export function ChanceProvider({ getService }) {
- const log = getService('log');
+import { pageObjects } from './page_objects';
+import { services } from './services';
- const seed = Date.now();
- log.debug('randomness seed: %j', seed);
-
- return new Chance(seed);
-}
+export type FtrProviderContext = GenericFtrProviderContext;
diff --git a/test/accessibility/page_objects.ts b/test/accessibility/page_objects.ts
new file mode 100644
index 00000000000000..151b6b34781b84
--- /dev/null
+++ b/test/accessibility/page_objects.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { pageObjects } from '../functional/page_objects';
diff --git a/test/accessibility/services/a11y/a11y.ts b/test/accessibility/services/a11y/a11y.ts
new file mode 100644
index 00000000000000..7adfe7ebfcc7d7
--- /dev/null
+++ b/test/accessibility/services/a11y/a11y.ts
@@ -0,0 +1,130 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import chalk from 'chalk';
+import testSubjectToCss from '@kbn/test-subj-selector';
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { AxeReport, printResult } from './axe_report';
+// @ts-ignore JS that is run in browser as is
+import { analyzeWithAxe, analyzeWithAxeWithClient } from './analyze_with_axe';
+
+interface AxeContext {
+ include?: string[];
+ exclude?: string[][];
+}
+
+interface TestOptions {
+ excludeTestSubj?: string | string[];
+}
+
+export const normalizeResult = (report: any) => {
+ if (report.error) {
+ throw report.error;
+ }
+
+ return report.result as false | AxeReport;
+};
+
+export function A11yProvider({ getService }: FtrProviderContext) {
+ const browser = getService('browser');
+ const Wd = getService('__webdriver__');
+ const log = getService('log');
+
+ /**
+ * Accessibility testing service using the Axe (https://www.deque.com/axe/)
+ * toolset to validate a11y rules similar to ESLint. In order to test against
+ * the rules we must load up the UI and feed a full HTML snapshot into Axe.
+ */
+ return new (class Accessibility {
+ public async testAppSnapshot(options: TestOptions = {}) {
+ const context = this.getAxeContext(true, options.excludeTestSubj);
+ const report = await this.captureAxeReport(context);
+ await this.testAxeReport(report);
+ }
+
+ public async testGlobalSnapshot(options: TestOptions = {}) {
+ const context = this.getAxeContext(false, options.excludeTestSubj);
+ const report = await this.captureAxeReport(context);
+ await this.testAxeReport(report);
+ }
+
+ private getAxeContext(global: boolean, excludeTestSubj?: string | string[]): AxeContext {
+ return {
+ include: global ? undefined : [testSubjectToCss('appA11yRoot')],
+ exclude: ([] as string[])
+ .concat(excludeTestSubj || [])
+ .map(ts => [testSubjectToCss(ts)])
+ .concat([['.ace_scrollbar']]),
+ };
+ }
+
+ private testAxeReport(report: AxeReport) {
+ const errorMsgs = [];
+
+ for (const result of report.incomplete) {
+ // these items require human review and can't be definitively validated
+ log.warning(printResult(chalk.yellow('UNABLE TO VALIDATE'), result));
+ }
+
+ for (const result of report.violations) {
+ errorMsgs.push(printResult(chalk.red('VIOLATION'), result));
+ }
+
+ if (errorMsgs.length) {
+ throw new Error(`a11y report:\n${errorMsgs.join('\n')}`);
+ }
+ }
+
+ private async captureAxeReport(context: AxeContext): Promise {
+ const axeOptions = {
+ reporter: 'v2',
+ runOnly: ['wcag2a', 'wcag2aa'],
+ rules: {
+ 'color-contrast': {
+ enabled: false,
+ },
+ },
+ };
+
+ await (Wd.driver.manage() as any).setTimeouts({
+ ...(await (Wd.driver.manage() as any).getTimeouts()),
+ script: 600000,
+ });
+
+ const report = normalizeResult(
+ await browser.executeAsync(analyzeWithAxe, context, axeOptions)
+ );
+
+ if (report !== false) {
+ return report;
+ }
+
+ const withClientReport = normalizeResult(
+ await browser.executeAsync(analyzeWithAxeWithClient, context, axeOptions)
+ );
+
+ if (withClientReport === false) {
+ throw new Error('Attempted to analyze with axe but failed to load axe client');
+ }
+
+ return withClientReport;
+ }
+ })();
+}
diff --git a/test/accessibility/services/a11y/analyze_with_axe.js b/test/accessibility/services/a11y/analyze_with_axe.js
new file mode 100644
index 00000000000000..5cba55a29f8a4d
--- /dev/null
+++ b/test/accessibility/services/a11y/analyze_with_axe.js
@@ -0,0 +1,39 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { readFileSync } from 'fs';
+
+export function analyzeWithAxe(context, options, callback) {
+ Promise.resolve()
+ .then(() => {
+ if (window.axe) {
+ return window.axe.run(context, options);
+ }
+
+ // return a false report to trigger analyzeWithAxeWithClient
+ return false;
+ })
+ .then(result => callback({ result }), error => callback({ error }));
+}
+
+export const analyzeWithAxeWithClient = `
+ ${readFileSync(require.resolve('axe-core/axe.js'), 'utf8')}
+
+ return (${analyzeWithAxe.toString()}).apply(null, arguments);
+`;
diff --git a/test/accessibility/services/a11y/axe_report.ts b/test/accessibility/services/a11y/axe_report.ts
new file mode 100644
index 00000000000000..ba1e8c739079da
--- /dev/null
+++ b/test/accessibility/services/a11y/axe_report.ts
@@ -0,0 +1,69 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+type AxeImpact = 'minor' | 'moderate' | 'serious' | 'critical';
+
+type AxeRelatedNodes = Array<{
+ data: any;
+ id: string;
+ impact: AxeImpact;
+ message: string;
+ relatedNodes: [];
+}>;
+
+export interface AxeResult {
+ /* Rule description */
+ description: string;
+ /* rule title/error message */
+ help: string;
+ /* documentation url */
+ helpUrl: string;
+ /* rule id */
+ id: string;
+ /* severity level */
+ impact?: AxeImpact;
+ /* tags used to group rules */
+ tags: string[];
+ /* nodes grouped in this result */
+ nodes: Array<{
+ all: AxeRelatedNodes;
+ any: AxeRelatedNodes;
+ none: AxeRelatedNodes;
+
+ html: string;
+ impact: AxeImpact;
+ target: string[];
+ }>;
+}
+
+export type AxeResultGroup = AxeResult[];
+
+export interface AxeReport {
+ inapplicable: AxeResultGroup;
+ passes: AxeResultGroup;
+ incomplete: AxeResultGroup;
+ violations: AxeResultGroup;
+}
+
+export const printResult = (title: string, result: AxeResult) => `
+${title}
+ [${result.id}]: ${result.description}
+ Help: ${result.helpUrl}
+ Elements:
+ - ${result.nodes.map(node => node.target).join('\n - ')}`;
diff --git a/src/legacy/server/index_patterns/service/index.ts b/test/accessibility/services/a11y/index.ts
similarity index 95%
rename from src/legacy/server/index_patterns/service/index.ts
rename to test/accessibility/services/a11y/index.ts
index 496c4ba7b5b6f1..7baa17c1eafa33 100644
--- a/src/legacy/server/index_patterns/service/index.ts
+++ b/test/accessibility/services/a11y/index.ts
@@ -17,4 +17,4 @@
* under the License.
*/
-export * from './index_patterns_service';
+export { A11yProvider } from './a11y';
diff --git a/test/accessibility/services/index.ts b/test/accessibility/services/index.ts
new file mode 100644
index 00000000000000..98d1628732f5c8
--- /dev/null
+++ b/test/accessibility/services/index.ts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { services as kibanaFunctionalServices } from '../../functional/services';
+import { A11yProvider } from './a11y';
+
+export const services = {
+ ...kibanaFunctionalServices,
+ a11y: A11yProvider,
+};
diff --git a/test/api_integration/apis/core/index.js b/test/api_integration/apis/core/index.js
index e5da4e4730662f..d617b2ad073511 100644
--- a/test/api_integration/apis/core/index.js
+++ b/test/api_integration/apis/core/index.js
@@ -16,45 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-import expect from '@kbn/expect';
export default function ({ getService }) {
const supertest = getService('supertest');
- describe('core', () => {
- describe('request context', () => {
- it('provides access to elasticsearch', async () => (
- await supertest
- .get('/requestcontext/elasticsearch')
- .expect(200, 'Elasticsearch: true')
- ));
+ describe('core request context', () => {
+ it('provides access to elasticsearch', async () => (
+ await supertest
+ .get('/requestcontext/elasticsearch')
+ .expect(200, 'Elasticsearch: true')
+ ));
- it('provides access to SavedObjects client', async () => (
- await supertest
- .get('/requestcontext/savedobjectsclient')
- .expect(200, 'SavedObjects client: {"page":1,"per_page":20,"total":0,"saved_objects":[]}')
- ));
- });
-
- describe('compression', () => {
- it(`uses compression when there isn't a referer`, async () => {
- await supertest
- .get('/app/kibana')
- .set('accept-encoding', 'gzip')
- .then(response => {
- expect(response.headers).to.have.property('content-encoding', 'gzip');
- });
- });
-
- it(`doesn't use compression when there is a referer`, async () => {
- await supertest
- .get('/app/kibana')
- .set('accept-encoding', 'gzip')
- .set('referer', 'https://www.google.com')
- .then(response => {
- expect(response.headers).not.to.have.property('content-encoding');
- });
- });
- });
+ it('provides access to SavedObjects client', async () => (
+ await supertest
+ .get('/requestcontext/savedobjectsclient')
+ .expect(200, 'SavedObjects client: {"page":1,"per_page":20,"total":0,"saved_objects":[]}')
+ ));
});
}
diff --git a/test/api_integration/apis/index.js b/test/api_integration/apis/index.js
index de36ee678b10ed..9f2672959390ce 100644
--- a/test/api_integration/apis/index.js
+++ b/test/api_integration/apis/index.js
@@ -34,6 +34,5 @@ export default function ({ loadTestFile }) {
loadTestFile(require.resolve('./status'));
loadTestFile(require.resolve('./stats'));
loadTestFile(require.resolve('./ui_metric'));
- loadTestFile(require.resolve('./core'));
});
}
diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js
index 7e04e3f7204d71..4e50b965211c29 100644
--- a/test/api_integration/apis/index_patterns/es_errors/errors.js
+++ b/test/api_integration/apis/index_patterns/es_errors/errors.js
@@ -26,7 +26,7 @@ import {
createNoMatchingIndicesError,
isNoMatchingIndicesError,
convertEsError
-} from '../../../../../src/legacy/server/index_patterns/service/lib/errors';
+} from '../../../../../src/plugins/data/server/index_patterns/fetcher/lib/errors';
import {
getIndexNotFoundError,
diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js
index 37916d3bee3759..2bd574d669e20e 100644
--- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js
+++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js
@@ -20,7 +20,7 @@
export default function ({ getService }) {
const esArchiver = getService('esArchiver');
const supertest = getService('supertest');
- const chance = getService('chance');
+ const randomness = getService('randomness');
describe('params', () => {
before(() => esArchiver.load('index_patterns/basic_index'));
@@ -63,8 +63,8 @@ export default function ({ getService }) {
supertest
.get('/api/index_patterns/_fields_for_wildcard')
.query({
- pattern: chance.word(),
- [chance.word()]: chance.word(),
+ pattern: randomness.word(),
+ [randomness.word()]: randomness.word(),
})
.expect(400));
});
diff --git a/test/api_integration/services/index.ts b/test/api_integration/services/index.ts
index d0fcd94a6a2047..573450cae534a4 100644
--- a/test/api_integration/services/index.ts
+++ b/test/api_integration/services/index.ts
@@ -22,14 +22,11 @@ import { services as commonServices } from '../../common/services';
// @ts-ignore not TS yet
import { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest';
-// @ts-ignore not TS yet
-import { ChanceProvider } from './chance';
-
export const services = {
es: commonServices.es,
esArchiver: commonServices.esArchiver,
retry: commonServices.retry,
supertest: KibanaSupertestProvider,
esSupertest: ElasticsearchSupertestProvider,
- chance: ChanceProvider,
+ randomness: commonServices.randomness,
};
diff --git a/test/common/services/index.ts b/test/common/services/index.ts
index 47d93d811e3f6b..225aacc1c98958 100644
--- a/test/common/services/index.ts
+++ b/test/common/services/index.ts
@@ -21,10 +21,12 @@ import { LegacyEsProvider } from './legacy_es';
import { EsArchiverProvider } from './es_archiver';
import { KibanaServerProvider } from './kibana_server';
import { RetryProvider } from './retry';
+import { RandomnessProvider } from './randomness';
export const services = {
es: LegacyEsProvider,
esArchiver: EsArchiverProvider,
kibanaServer: KibanaServerProvider,
retry: RetryProvider,
+ randomness: RandomnessProvider,
};
diff --git a/test/common/services/randomness.ts b/test/common/services/randomness.ts
new file mode 100644
index 00000000000000..2a49703e92c58a
--- /dev/null
+++ b/test/common/services/randomness.ts
@@ -0,0 +1,89 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Chance from 'chance';
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+interface CharOptions {
+ pool?: string;
+ alpha?: boolean;
+ numeric?: boolean;
+ symbols?: boolean;
+ casing?: 'lower' | 'upper';
+}
+
+interface StringOptions extends CharOptions {
+ length?: number;
+}
+
+interface NumberOptions {
+ min?: number;
+ max?: number;
+}
+
+export function RandomnessProvider({ getService }: FtrProviderContext) {
+ const log = getService('log');
+
+ const seed = Date.now();
+ log.debug('randomness seed: %j', seed);
+
+ const chance = new Chance(seed);
+
+ return new (class RandomnessService {
+ /**
+ * Generate a random natural number
+ *
+ * range: 0 to 9007199254740991
+ *
+ */
+ naturalNumber(options?: NumberOptions) {
+ return chance.natural(options);
+ }
+
+ /**
+ * Generate a random integer
+ */
+ integer(options?: NumberOptions) {
+ return chance.integer(options);
+ }
+
+ /**
+ * Generate a random number, defaults to at least 4 and no more than 8 syllables
+ */
+ word(options: { syllables?: number } = {}) {
+ const { syllables = this.naturalNumber({ min: 4, max: 8 }) } = options;
+
+ return chance.word({
+ syllables,
+ });
+ }
+
+ /**
+ * Generate a random string, defaults to at least 8 and no more than 15 alpha-numeric characters
+ */
+ string(options: StringOptions = {}) {
+ return chance.string({
+ length: this.naturalNumber({ min: 8, max: 15 }),
+ ...(options.pool === 'undefined' ? { alpha: true, numeric: true, symbols: false } : {}),
+ ...options,
+ });
+ }
+ })();
+}
diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js
index 6dfef4c54c66b5..b9ad47e428e829 100644
--- a/test/functional/apps/dashboard/dashboard_state.js
+++ b/test/functional/apps/dashboard/dashboard_state.js
@@ -24,7 +24,7 @@ import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME } from '../../page_objects/dash
// eslint-disable-next-line
import {
DEFAULT_PANEL_WIDTH
-} from '../../../../src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants';
+} from '../../../../src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants';
export default function ({ getService, getPageObjects }) {
const PageObjects = getPageObjects(['dashboard', 'visualize', 'header', 'discover']);
diff --git a/test/functional/page_objects/discover_page.js b/test/functional/page_objects/discover_page.js
index 4654b85f9c7c45..8d12b2117a2149 100644
--- a/test/functional/page_objects/discover_page.js
+++ b/test/functional/page_objects/discover_page.js
@@ -283,19 +283,13 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
}
async openSidebarFieldFilter() {
- const fieldFilterFormExists = await testSubjects.exists('discoverFieldFilter');
- if (!fieldFilterFormExists) {
- await testSubjects.click('toggleFieldFilterButton');
- await testSubjects.existOrFail('discoverFieldFilter');
- }
+ await testSubjects.click('toggleFieldFilterButton');
+ await testSubjects.existOrFail('filterSelectionPanel');
}
async closeSidebarFieldFilter() {
- const fieldFilterFormExists = await testSubjects.exists('discoverFieldFilter');
- if (fieldFilterFormExists) {
- await testSubjects.click('toggleFieldFilterButton');
- await testSubjects.missingOrFail('discoverFieldFilter', { allowHidden: true });
- }
+ await testSubjects.click('toggleFieldFilterButton');
+ await testSubjects.missingOrFail('filterSelectionPanel', { allowHidden: true });
}
}
diff --git a/test/functional/services/browser.ts b/test/functional/services/browser.ts
index 4060e3dd7800f2..97e02958f3787f 100644
--- a/test/functional/services/browser.ts
+++ b/test/functional/services/browser.ts
@@ -461,10 +461,7 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
);
}
- public async executeAsync(
- fn: string | ((...args: A) => R),
- ...args: A
- ): Promise {
+ public async executeAsync(fn: string | ((...args: any[]) => R), ...args: any[]): Promise {
return await driver.executeAsyncScript(
fn,
...cloneDeep(args, arg => {
diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts
index 5ebec6bde6ebbd..201354fff48efa 100644
--- a/test/functional/services/remote/webdriver.ts
+++ b/test/functional/services/remote/webdriver.ts
@@ -75,13 +75,23 @@ async function attemptToCreateCommand(
case 'chrome': {
const chromeCapabilities = Capabilities.chrome();
const chromeOptions = [
- 'disable-translate',
- 'new-window',
+ // Disables the sandbox for all process types that are normally sandboxed.
'no-sandbox',
+ // Launches URL in new browser window.
+ 'new-window',
+ // By default, file:// URIs cannot read other file:// URIs. This is an override for developers who need the old behavior for testing.
'allow-file-access-from-files',
+ // Use fake device for Media Stream to replace actual camera and microphone.
'use-fake-device-for-media-stream',
+ // Bypass the media stream infobar by selecting the default device for media streams (e.g. WebRTC). Works with --use-fake-device-for-media-stream.
'use-fake-ui-for-media-stream',
];
+ if (process.platform === 'linux') {
+ // The /dev/shm partition is too small in certain VM environments, causing
+ // Chrome to fail or crash. Use this flag to work-around this issue
+ // (a temporary directory will always be used to create anonymous shared memory files).
+ chromeOptions.push('disable-dev-shm-usage');
+ }
if (headlessBrowser === '1') {
// Use --disable-gpu to avoid an error from a missing Mesa library, as per
// See: https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
diff --git a/test/scripts/jenkins_accessibility.sh b/test/scripts/jenkins_accessibility.sh
new file mode 100755
index 00000000000000..0b3d8dc3f85c23
--- /dev/null
+++ b/test/scripts/jenkins_accessibility.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [[ -n "$IS_PIPELINE_JOB" ]] ; then
+ source src/dev/ci_setup/setup_env.sh
+fi
+
+export TEST_BROWSER_HEADLESS=1
+
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+ yarn run grunt functionalTests:ensureAllTestsInCiGroup;
+ node scripts/build --debug --oss;
+else
+ installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
+ destDir=${installDir}-${CI_WORKER_NUMBER}
+ cp -R "$installDir" "$destDir"
+
+ export KIBANA_INSTALL_DIR="$destDir"
+fi
+
+checks-reporter-with-killswitch "Kibana accessibility tests" \
+ node scripts/functional_tests \
+ --debug --bail \
+ --kibana-install-dir "$installDir" \
+ --config test/accessibility/config.ts;
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
index 274cca695b5357..c6bddb69aa5709 100755
--- a/test/scripts/jenkins_ci_group.sh
+++ b/test/scripts/jenkins_ci_group.sh
@@ -1,12 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
-
-export TEST_BROWSER_HEADLESS=1
+source test/scripts/jenkins_test_setup.sh
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
yarn run grunt functionalTests:ensureAllTestsInCiGroup;
diff --git a/test/scripts/jenkins_firefox_smoke.sh b/test/scripts/jenkins_firefox_smoke.sh
index 69cedc9657340b..9a31f5f43d2242 100755
--- a/test/scripts/jenkins_firefox_smoke.sh
+++ b/test/scripts/jenkins_firefox_smoke.sh
@@ -1,10 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
+source test/scripts/jenkins_test_setup.sh
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
node scripts/build --debug --oss;
diff --git a/test/scripts/jenkins_test_setup.sh b/test/scripts/jenkins_test_setup.sh
new file mode 100644
index 00000000000000..e2dd0bc276bb64
--- /dev/null
+++ b/test/scripts/jenkins_test_setup.sh
@@ -0,0 +1,20 @@
+set -e
+
+function post_work() {
+ set +e
+ if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+ node "$KIBANA_DIR/scripts/report_failed_tests"
+ fi
+
+ if [[ -z "$REMOVE_KIBANA_INSTALL_DIR" && -z "$KIBANA_INSTALL_DIR" && -d "$KIBANA_INSTALL_DIR" ]]; then
+ rm -rf "$REMOVE_KIBANA_INSTALL_DIR"
+ fi
+}
+
+trap 'post_work' EXIT
+
+export TEST_BROWSER_HEADLESS=1
+
+if [[ -n "$IS_PIPELINE_JOB" ]] ; then
+ source src/dev/ci_setup/setup_env.sh
+fi
diff --git a/test/scripts/jenkins_visual_regression.sh b/test/scripts/jenkins_visual_regression.sh
index fdda24423d977a..9ca1c0f08d2c94 100755
--- a/test/scripts/jenkins_visual_regression.sh
+++ b/test/scripts/jenkins_visual_regression.sh
@@ -1,11 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
-
+source test/scripts/jenkins_test_setup.sh
source "$KIBANA_DIR/src/dev/ci_setup/setup_percy.sh"
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
@@ -22,8 +17,6 @@ else
export KIBANA_INSTALL_DIR="$destDir"
fi
-export TEST_BROWSER_HEADLESS=1
-
checks-reporter-with-killswitch "Kibana visual regression tests" \
yarn run percy exec -t 500 \
node scripts/functional_tests \
diff --git a/test/scripts/jenkins_xpack_accessibility.sh b/test/scripts/jenkins_xpack_accessibility.sh
new file mode 100755
index 00000000000000..af813c3c40f841
--- /dev/null
+++ b/test/scripts/jenkins_xpack_accessibility.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [[ -n "$IS_PIPELINE_JOB" ]] ; then
+ source src/dev/ci_setup/setup_env.sh
+fi
+
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+ echo " -> building and extracting default Kibana distributable for use in functional tests"
+ node scripts/build --debug --no-oss
+
+ linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
+ installDir="$PARENT_DIR/install/kibana"
+
+ mkdir -p "$installDir"
+ tar -xzf "$linuxBuild" -C "$installDir" --strip=1
+
+ export KIBANA_INSTALL_DIR="$installDir"
+else
+ installDir="$PARENT_DIR/install/kibana"
+ destDir="${installDir}-${CI_WORKER_NUMBER}"
+ cp -R "$installDir" "$destDir"
+
+ export KIBANA_INSTALL_DIR="$destDir"
+fi
+
+export TEST_BROWSER_HEADLESS=1
+cd "$XPACK_DIR"
+
+checks-reporter-with-killswitch "X-Pack accessibility tests" \
+ node scripts/functional_tests \
+ --debug --bail \
+ --kibana-install-dir "$installDir" \
+ --config test/accessibility/config.ts;
diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
index 0b9666b33decab..fba05f8f252d76 100755
--- a/test/scripts/jenkins_xpack_ci_group.sh
+++ b/test/scripts/jenkins_xpack_ci_group.sh
@@ -1,12 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
-
-export TEST_BROWSER_HEADLESS=1
+source test/scripts/jenkins_test_setup.sh
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
echo " -> Ensuring all functional tests are in a ciGroup"
diff --git a/test/scripts/jenkins_xpack_firefox_smoke.sh b/test/scripts/jenkins_xpack_firefox_smoke.sh
index 18ed468de1317a..43220459bcb97d 100755
--- a/test/scripts/jenkins_xpack_firefox_smoke.sh
+++ b/test/scripts/jenkins_xpack_firefox_smoke.sh
@@ -1,10 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
+source test/scripts/jenkins_test_setup.sh
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
node scripts/build --debug --no-oss;
@@ -21,8 +17,6 @@ else
export KIBANA_INSTALL_DIR="$destDir"
fi
-export TEST_BROWSER_HEADLESS=1
-
cd "$XPACK_DIR"
checks-reporter-with-killswitch "X-Pack firefox smoke test" \
diff --git a/test/scripts/jenkins_xpack_visual_regression.sh b/test/scripts/jenkins_xpack_visual_regression.sh
index 0f3275d45f13b2..5699f9e5ee7c14 100755
--- a/test/scripts/jenkins_xpack_visual_regression.sh
+++ b/test/scripts/jenkins_xpack_visual_regression.sh
@@ -1,11 +1,6 @@
#!/usr/bin/env bash
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
- source src/dev/ci_setup/setup_env.sh
-fi
-
+source test/scripts/jenkins_test_setup.sh
source "$KIBANA_DIR/src/dev/ci_setup/setup_percy.sh"
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
@@ -23,8 +18,6 @@ else
export KIBANA_INSTALL_DIR="$destDir"
fi
-export TEST_BROWSER_HEADLESS=1
-
cd "$XPACK_DIR"
checks-reporter-with-killswitch "X-Pack visual regression tests" \
diff --git a/test/visual_regression/tests/discover/chart_visualization.js b/test/visual_regression/tests/discover/chart_visualization.js
index 5467f2d3eaa145..4e1d9bf643cf6d 100644
--- a/test/visual_regression/tests/discover/chart_visualization.js
+++ b/test/visual_regression/tests/discover/chart_visualization.js
@@ -29,6 +29,7 @@ export default function ({ getService, getPageObjects }) {
const visualTesting = getService('visualTesting');
const defaultSettings = {
defaultIndex: 'logstash-*',
+ 'discover:sampleSize': 1
};
describe('discover', function describeIndexTests() {
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index 0ee50c0caa3402..6d0da2f0b693d3 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -34,6 +34,7 @@
"xpack.server": "legacy/server",
"xpack.snapshotRestore": "legacy/plugins/snapshot_restore",
"xpack.spaces": ["legacy/plugins/spaces", "plugins/spaces"],
+ "xpack.taskManager": "legacy/plugins/task_manager",
"xpack.transform": "legacy/plugins/transform",
"xpack.upgradeAssistant": "legacy/plugins/upgrade_assistant",
"xpack.uptime": "legacy/plugins/uptime",
diff --git a/x-pack/legacy/plugins/actions/index.ts b/x-pack/legacy/plugins/actions/index.ts
index 7c4dd9f73c11f4..a58c936c637492 100644
--- a/x-pack/legacy/plugins/actions/index.ts
+++ b/x-pack/legacy/plugins/actions/index.ts
@@ -22,10 +22,10 @@ export function actions(kibana: any) {
return new kibana.Plugin({
id: 'actions',
configPrefix: 'xpack.actions',
- require: ['kibana', 'elasticsearch', 'task_manager', 'encrypted_saved_objects'],
+ require: ['kibana', 'elasticsearch', 'task_manager', 'encryptedSavedObjects'],
isEnabled(config: Legacy.KibanaConfig) {
return (
- config.get('xpack.encrypted_saved_objects.enabled') === true &&
+ config.get('xpack.encryptedSavedObjects.enabled') === true &&
config.get('xpack.actions.enabled') === true &&
config.get('xpack.task_manager.enabled') === true
);
diff --git a/x-pack/legacy/plugins/actions/server/actions_client.test.ts b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
index b4940b23ba61c9..933b7b0b239b68 100644
--- a/x-pack/legacy/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
@@ -11,9 +11,14 @@ import { ActionsClient } from './actions_client';
import { ExecutorType } from './types';
import { ActionExecutor, TaskRunnerFactory } from './lib';
import { taskManagerMock } from '../../task_manager/task_manager.mock';
-import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import {
+ elasticsearchServiceMock,
+ savedObjectsClientMock,
+} from '../../../../../src/core/server/mocks';
+const defaultKibanaIndex = '.kibana';
const savedObjectsClient = savedObjectsClientMock.create();
+const scopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
const mockTaskManager = taskManagerMock.create();
@@ -22,11 +27,22 @@ const actionTypeRegistryParams = {
taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),
};
+let actionsClient: ActionsClient;
+let actionTypeRegistry: ActionTypeRegistry;
const executor: ExecutorType = async options => {
return { status: 'ok' };
};
-beforeEach(() => jest.resetAllMocks());
+beforeEach(() => {
+ jest.resetAllMocks();
+ actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
+ actionsClient = new ActionsClient({
+ actionTypeRegistry,
+ savedObjectsClient,
+ scopedClusterClient,
+ defaultKibanaIndex,
+ });
+});
describe('create()', () => {
test('creates an action with all given properties', async () => {
@@ -40,16 +56,11 @@ describe('create()', () => {
},
references: [],
};
- const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
actionTypeRegistry.register({
id: 'my-action-type',
name: 'My action type',
executor,
});
- const actionsClient = new ActionsClient({
- actionTypeRegistry,
- savedObjectsClient,
- });
savedObjectsClient.create.mockResolvedValueOnce(savedObjectCreateResult);
const result = await actionsClient.create({
action: {
@@ -80,11 +91,6 @@ describe('create()', () => {
});
test('validates config', async () => {
- const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
- const actionsClient = new ActionsClient({
- actionTypeRegistry,
- savedObjectsClient,
- });
actionTypeRegistry.register({
id: 'my-action-type',
name: 'My action type',
@@ -110,11 +116,6 @@ describe('create()', () => {
});
test(`throws an error when an action type doesn't exist`, async () => {
- const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
- const actionsClient = new ActionsClient({
- actionTypeRegistry,
- savedObjectsClient,
- });
await expect(
actionsClient.create({
action: {
@@ -130,16 +131,11 @@ describe('create()', () => {
});
test('encrypts action type options unless specified not to', async () => {
- const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
actionTypeRegistry.register({
id: 'my-action-type',
name: 'My action type',
executor,
});
- const actionsClient = new ActionsClient({
- actionTypeRegistry,
- savedObjectsClient,
- });
savedObjectsClient.create.mockResolvedValueOnce({
id: '1',
type: 'type',
@@ -198,11 +194,6 @@ describe('create()', () => {
describe('get()', () => {
test('calls savedObjectsClient with id', async () => {
- const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
- const actionsClient = new ActionsClient({
- actionTypeRegistry,
- savedObjectsClient,
- });
savedObjectsClient.get.mockResolvedValueOnce({
id: '1',
type: 'type',
@@ -242,12 +233,12 @@ describe('find()', () => {
},
],
};
- const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
- const actionsClient = new ActionsClient({
- actionTypeRegistry,
- savedObjectsClient,
- });
savedObjectsClient.find.mockResolvedValueOnce(expectedResult);
+ scopedClusterClient.callAsInternalUser.mockResolvedValueOnce({
+ aggregations: {
+ '1': { doc_count: 6 },
+ },
+ });
const result = await actionsClient.find({});
expect(result).toEqual({
total: 1,
@@ -259,6 +250,7 @@ describe('find()', () => {
config: {
foo: 'bar',
},
+ referencedByCount: 6,
},
],
});
@@ -276,11 +268,6 @@ describe('find()', () => {
describe('delete()', () => {
test('calls savedObjectsClient with id', async () => {
const expectedResult = Symbol();
- const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
- const actionsClient = new ActionsClient({
- actionTypeRegistry,
- savedObjectsClient,
- });
savedObjectsClient.delete.mockResolvedValueOnce(expectedResult);
const result = await actionsClient.delete({ id: '1' });
expect(result).toEqual(expectedResult);
@@ -296,16 +283,11 @@ describe('delete()', () => {
describe('update()', () => {
test('updates an action with all given properties', async () => {
- const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
actionTypeRegistry.register({
id: 'my-action-type',
name: 'My action type',
executor,
});
- const actionsClient = new ActionsClient({
- actionTypeRegistry,
- savedObjectsClient,
- });
savedObjectsClient.get.mockResolvedValueOnce({
id: '1',
type: 'action',
@@ -362,11 +344,6 @@ describe('update()', () => {
});
test('validates config', async () => {
- const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
- const actionsClient = new ActionsClient({
- actionTypeRegistry,
- savedObjectsClient,
- });
actionTypeRegistry.register({
id: 'my-action-type',
name: 'My action type',
@@ -400,16 +377,11 @@ describe('update()', () => {
});
test('encrypts action type options unless specified not to', async () => {
- const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
actionTypeRegistry.register({
id: 'my-action-type',
name: 'My action type',
executor,
});
- const actionsClient = new ActionsClient({
- actionTypeRegistry,
- savedObjectsClient,
- });
savedObjectsClient.get.mockResolvedValueOnce({
id: 'my-action',
type: 'action',
diff --git a/x-pack/legacy/plugins/actions/server/actions_client.ts b/x-pack/legacy/plugins/actions/server/actions_client.ts
index 823cb55abaf5e7..1e4135bd0d66fd 100644
--- a/x-pack/legacy/plugins/actions/server/actions_client.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_client.ts
@@ -4,10 +4,16 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { SavedObjectsClientContract, SavedObjectAttributes, SavedObject } from 'src/core/server';
+import {
+ IScopedClusterClient,
+ SavedObjectsClientContract,
+ SavedObjectAttributes,
+ SavedObject,
+} from 'src/core/server';
+
import { ActionTypeRegistry } from './action_type_registry';
import { validateConfig, validateSecrets } from './lib';
-import { ActionResult } from './types';
+import { ActionResult, FindActionResult, RawAction } from './types';
interface ActionUpdate extends SavedObjectAttributes {
description: string;
@@ -44,10 +50,12 @@ interface FindResult {
page: number;
perPage: number;
total: number;
- data: ActionResult[];
+ data: FindActionResult[];
}
interface ConstructorOptions {
+ defaultKibanaIndex: string;
+ scopedClusterClient: IScopedClusterClient;
actionTypeRegistry: ActionTypeRegistry;
savedObjectsClient: SavedObjectsClientContract;
}
@@ -58,12 +66,21 @@ interface UpdateOptions {
}
export class ActionsClient {
+ private readonly defaultKibanaIndex: string;
+ private readonly scopedClusterClient: IScopedClusterClient;
private readonly savedObjectsClient: SavedObjectsClientContract;
private readonly actionTypeRegistry: ActionTypeRegistry;
- constructor({ actionTypeRegistry, savedObjectsClient }: ConstructorOptions) {
+ constructor({
+ actionTypeRegistry,
+ defaultKibanaIndex,
+ scopedClusterClient,
+ savedObjectsClient,
+ }: ConstructorOptions) {
this.actionTypeRegistry = actionTypeRegistry;
this.savedObjectsClient = savedObjectsClient;
+ this.scopedClusterClient = scopedClusterClient;
+ this.defaultKibanaIndex = defaultKibanaIndex;
}
/**
@@ -134,16 +151,22 @@ export class ActionsClient {
* Find actions
*/
public async find({ options = {} }: FindOptions): Promise {
- const findResult = await this.savedObjectsClient.find({
+ const findResult = await this.savedObjectsClient.find({
...options,
type: 'action',
});
+ const data = await injectExtraFindData(
+ this.defaultKibanaIndex,
+ this.scopedClusterClient,
+ findResult.saved_objects.map(actionFromSavedObject)
+ );
+
return {
page: findResult.page,
perPage: findResult.per_page,
total: findResult.total,
- data: findResult.saved_objects.map(actionFromSavedObject),
+ data,
};
}
@@ -155,9 +178,64 @@ export class ActionsClient {
}
}
-function actionFromSavedObject(savedObject: SavedObject) {
+function actionFromSavedObject(savedObject: SavedObject): ActionResult {
return {
id: savedObject.id,
...savedObject.attributes,
};
}
+
+async function injectExtraFindData(
+ defaultKibanaIndex: string,
+ scopedClusterClient: IScopedClusterClient,
+ actionResults: ActionResult[]
+): Promise {
+ const aggs: Record = {};
+ for (const actionResult of actionResults) {
+ aggs[actionResult.id] = {
+ filter: {
+ bool: {
+ must: {
+ nested: {
+ path: 'references',
+ query: {
+ bool: {
+ filter: {
+ bool: {
+ must: [
+ {
+ term: {
+ 'references.id': actionResult.id,
+ },
+ },
+ {
+ term: {
+ 'references.type': 'action',
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ };
+ }
+ const aggregationResult = await scopedClusterClient.callAsInternalUser('search', {
+ index: defaultKibanaIndex,
+ body: {
+ aggs,
+ size: 0,
+ query: {
+ match_all: {},
+ },
+ },
+ });
+ return actionResults.map(actionResult => ({
+ ...actionResult,
+ referencedByCount: aggregationResult.aggregations[actionResult.id].doc_count,
+ }));
+}
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts
index c891f3bf218e7d..256463251315d8 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts
@@ -8,16 +8,15 @@
// Which is basically the Haskel equivalent of Rust/ML/Scala's Result
// I'll reach out to other's in Kibana to see if we can merge these into one type
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type Ok = {
+export interface Ok {
tag: 'ok';
value: T;
-};
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type Err = {
+}
+
+export interface Err {
tag: 'err';
error: E;
-};
+}
export type Result = Ok | Err;
export function asOk(value: T): Ok {
diff --git a/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts b/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts
index c724717bef9eb8..5ed67ae82b0ce5 100644
--- a/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts
@@ -8,7 +8,7 @@ import Hapi from 'hapi';
import { schema } from '@kbn/config-schema';
import { ActionExecutor } from './action_executor';
import { actionTypeRegistryMock } from '../action_type_registry.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
import {
savedObjectsClientMock,
loggingServiceMock,
@@ -24,7 +24,7 @@ function getServices() {
callCluster: jest.fn(),
};
}
-const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create();
+const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
const actionTypeRegistry = actionTypeRegistryMock.create();
const executeParams = {
diff --git a/x-pack/legacy/plugins/actions/server/lib/action_executor.ts b/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
index aef389262f884d..b7d4ea96ea0f88 100644
--- a/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
@@ -5,7 +5,7 @@
*/
import Hapi from 'hapi';
-import { EncryptedSavedObjectsStartContract } from '../shim';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../../spaces';
import { Logger } from '../../../../../../src/core/server';
import { validateParams, validateConfig, validateSecrets } from './validate_with_schema';
diff --git a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
index 6411bc7462c9f2..3e71725713070d 100644
--- a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
@@ -11,7 +11,7 @@ import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
import { TaskRunnerFactory } from './task_runner_factory';
import { actionTypeRegistryMock } from '../action_type_registry.mock';
import { actionExecutorMock } from './action_executor.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
import {
savedObjectsClientMock,
loggingServiceMock,
@@ -19,7 +19,7 @@ import {
const spaceIdToNamespace = jest.fn();
const actionTypeRegistry = actionTypeRegistryMock.create();
-const mockedEncryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create();
+const mockedEncryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
const mockedActionExecutor = actionExecutorMock.create();
let fakeTimer: sinon.SinonFakeTimers;
diff --git a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts
index efe9ce7fa8be5f..c0cca22b2c3eba 100644
--- a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts
@@ -7,7 +7,7 @@
import { ActionExecutorContract } from './action_executor';
import { ExecutorError } from './executor_error';
import { RunContext } from '../../../task_manager';
-import { EncryptedSavedObjectsStartContract } from '../shim';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
import { ActionTaskParams, GetBasePathFunction, SpaceIdToNamespaceFunction } from '../types';
export interface TaskRunnerContext {
diff --git a/x-pack/legacy/plugins/actions/server/plugin.ts b/x-pack/legacy/plugins/actions/server/plugin.ts
index 618c1d120c37ae..26b65b1a1689a6 100644
--- a/x-pack/legacy/plugins/actions/server/plugin.ts
+++ b/x-pack/legacy/plugins/actions/server/plugin.ts
@@ -22,6 +22,7 @@ import {
ActionsCoreStart,
ActionsPluginsSetup,
ActionsPluginsStart,
+ KibanaConfig,
} from './shim';
import {
createActionRoute,
@@ -44,6 +45,7 @@ export interface PluginStartContract {
}
export class Plugin {
+ private readonly kibana$: Observable;
private readonly config$: Observable;
private readonly logger: Logger;
private serverBasePath?: string;
@@ -51,10 +53,12 @@ export class Plugin {
private taskRunnerFactory?: TaskRunnerFactory;
private actionTypeRegistry?: ActionTypeRegistry;
private actionExecutor?: ActionExecutor;
+ private defaultKibanaIndex?: string;
constructor(initializerContext: ActionsPluginInitializerContext) {
this.logger = initializerContext.logger.get('plugins', 'alerting');
this.config$ = initializerContext.config.create();
+ this.kibana$ = initializerContext.config.kibana$;
}
public async setup(
@@ -63,6 +67,7 @@ export class Plugin {
): Promise {
const config = await this.config$.pipe(first()).toPromise();
this.adminClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
+ this.defaultKibanaIndex = (await this.kibana$.pipe(first()).toPromise()).index;
plugins.xpack_main.registerFeature({
id: 'actions',
@@ -92,12 +97,12 @@ export class Plugin {
// - `secrets` properties will be encrypted
// - `config` will be included in AAD
// - everything else excluded from AAD
- plugins.encrypted_saved_objects.registerType({
+ plugins.encryptedSavedObjects.registerType({
type: 'action',
attributesToEncrypt: new Set(['secrets']),
attributesToExcludeFromAAD: new Set(['description']),
});
- plugins.encrypted_saved_objects.registerType({
+ plugins.encryptedSavedObjects.registerType({
type: 'action_task_params',
attributesToEncrypt: new Set(['apiKey']),
});
@@ -141,6 +146,7 @@ export class Plugin {
adminClient,
serverBasePath,
taskRunnerFactory,
+ defaultKibanaIndex,
} = this;
function getServices(request: any): Services {
@@ -163,11 +169,11 @@ export class Plugin {
logger,
spaces: plugins.spaces,
getServices,
- encryptedSavedObjectsPlugin: plugins.encrypted_saved_objects,
+ encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
actionTypeRegistry: actionTypeRegistry!,
});
taskRunnerFactory!.initialize({
- encryptedSavedObjectsPlugin: plugins.encrypted_saved_objects,
+ encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
getBasePath,
spaceIdToNamespace,
});
@@ -186,6 +192,8 @@ export class Plugin {
return new ActionsClient({
savedObjectsClient,
actionTypeRegistry: actionTypeRegistry!,
+ defaultKibanaIndex: defaultKibanaIndex!,
+ scopedClusterClient: adminClient!.asScoped(request),
});
},
};
diff --git a/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts b/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts
index 7f2341c1aa010e..23356cedb3ab8c 100644
--- a/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts
+++ b/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts
@@ -8,7 +8,7 @@ import Hapi from 'hapi';
import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
import { actionsClientMock } from '../actions_client.mock';
import { actionTypeRegistryMock } from '../action_type_registry.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
const defaultConfig = {
'kibana.index': '.kibana',
@@ -22,7 +22,8 @@ export function createMockServer(config: Record = defaultConfig) {
const actionsClient = actionsClientMock.create();
const actionTypeRegistry = actionTypeRegistryMock.create();
const savedObjectsClient = savedObjectsClientMock.create();
- const encryptedSavedObjects = encryptedSavedObjectsMock.create();
+ const encryptedSavedObjectsSetup = encryptedSavedObjectsMock.createSetup();
+ const encryptedSavedObjectsStart = encryptedSavedObjectsMock.createStart();
server.config = () => {
return {
@@ -49,21 +50,16 @@ export function createMockServer(config: Record = defaultConfig) {
},
});
- server.register({
- name: 'encrypted_saved_objects',
- register(pluginServer: Hapi.Server) {
- pluginServer.expose('isEncryptionError', encryptedSavedObjects.isEncryptionError);
- pluginServer.expose('registerType', encryptedSavedObjects.registerType);
- pluginServer.expose(
- 'getDecryptedAsInternalUser',
- encryptedSavedObjects.getDecryptedAsInternalUser
- );
- },
- });
-
server.decorate('request', 'getSavedObjectsClient', () => savedObjectsClient);
server.decorate('request', 'getActionsClient', () => actionsClient);
server.decorate('request', 'getBasePath', () => '/s/my-space');
- return { server, savedObjectsClient, actionsClient, actionTypeRegistry, encryptedSavedObjects };
+ return {
+ server,
+ savedObjectsClient,
+ actionsClient,
+ actionTypeRegistry,
+ encryptedSavedObjectsSetup,
+ encryptedSavedObjectsStart,
+ };
}
diff --git a/x-pack/legacy/plugins/actions/server/shim.ts b/x-pack/legacy/plugins/actions/server/shim.ts
index c457a40a78b679..0da6b84f2cc691 100644
--- a/x-pack/legacy/plugins/actions/server/shim.ts
+++ b/x-pack/legacy/plugins/actions/server/shim.ts
@@ -12,7 +12,10 @@ import { TaskManager } from '../../task_manager';
import { XPackMainPlugin } from '../../xpack_main/xpack_main';
import KbnServer from '../../../../../src/legacy/server/kbn_server';
import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
-import { EncryptedSavedObjectsPlugin } from '../../encrypted_saved_objects';
+import {
+ PluginSetupContract as EncryptedSavedObjectsSetupContract,
+ PluginStartContract as EncryptedSavedObjectsStartContract,
+} from '../../../../plugins/encrypted_saved_objects/server';
import { PluginSetupContract as SecurityPlugin } from '../../../../plugins/security/server';
import {
CoreSetup,
@@ -24,13 +27,16 @@ import {
// due to being marked as dependencies
interface Plugins extends Hapi.PluginProperties {
task_manager: TaskManager;
- encrypted_saved_objects: EncryptedSavedObjectsPlugin;
}
export interface Server extends Legacy.Server {
plugins: Plugins;
}
+export interface KibanaConfig {
+ index: string;
+}
+
/**
* Shim what we're thinking setup and start contracts will look like
*/
@@ -38,15 +44,10 @@ export type TaskManagerStartContract = Pick;
export type SecurityPluginSetupContract = Pick;
export type SecurityPluginStartContract = Pick;
-export type EncryptedSavedObjectsSetupContract = Pick;
export type TaskManagerSetupContract = Pick<
TaskManager,
'addMiddleware' | 'registerTaskDefinitions'
>;
-export type EncryptedSavedObjectsStartContract = Pick<
- EncryptedSavedObjectsPlugin,
- 'isEncryptionError' | 'getDecryptedAsInternalUser'
->;
/**
* New platform interfaces
@@ -54,6 +55,7 @@ export type EncryptedSavedObjectsStartContract = Pick<
export interface ActionsPluginInitializerContext {
logger: LoggerFactory;
config: {
+ kibana$: Rx.Observable;
create(): Rx.Observable;
};
}
@@ -73,12 +75,12 @@ export interface ActionsPluginsSetup {
security?: SecurityPluginSetupContract;
task_manager: TaskManagerSetupContract;
xpack_main: XPackMainPluginSetupContract;
- encrypted_saved_objects: EncryptedSavedObjectsSetupContract;
+ encryptedSavedObjects: EncryptedSavedObjectsSetupContract;
}
export interface ActionsPluginsStart {
security?: SecurityPluginStartContract;
spaces: () => SpacesPluginStartContract | undefined;
- encrypted_saved_objects: EncryptedSavedObjectsStartContract;
+ encryptedSavedObjects: EncryptedSavedObjectsStartContract;
task_manager: TaskManagerStartContract;
}
@@ -101,6 +103,9 @@ export function shim(
const initializerContext: ActionsPluginInitializerContext = {
logger: newPlatform.coreContext.logger,
config: {
+ kibana$: Rx.of({
+ index: server.config().get('kibana.index'),
+ }),
create() {
return Rx.of({
enabled: server.config().get('xpack.actions.enabled') as boolean,
@@ -126,7 +131,8 @@ export function shim(
security: newPlatform.setup.plugins.security as SecurityPluginSetupContract | undefined,
task_manager: server.plugins.task_manager,
xpack_main: server.plugins.xpack_main,
- encrypted_saved_objects: server.plugins.encrypted_saved_objects,
+ encryptedSavedObjects: newPlatform.setup.plugins
+ .encryptedSavedObjects as EncryptedSavedObjectsSetupContract,
};
const pluginsStart: ActionsPluginsStart = {
@@ -134,7 +140,8 @@ export function shim(
// TODO: Currently a function because it's an optional dependency that
// initializes after this function is called
spaces: () => server.plugins.spaces,
- encrypted_saved_objects: server.plugins.encrypted_saved_objects,
+ encryptedSavedObjects: newPlatform.start.plugins
+ .encryptedSavedObjects as EncryptedSavedObjectsStartContract,
task_manager: server.plugins.task_manager,
};
diff --git a/x-pack/legacy/plugins/actions/server/types.ts b/x-pack/legacy/plugins/actions/server/types.ts
index 9db89aea1b38d5..1ee5022338a465 100644
--- a/x-pack/legacy/plugins/actions/server/types.ts
+++ b/x-pack/legacy/plugins/actions/server/types.ts
@@ -45,6 +45,10 @@ export interface ActionResult {
config: Record;
}
+export interface FindActionResult extends ActionResult {
+ referencedByCount: number;
+}
+
// the result returned from an action type executor function
export interface ActionTypeExecutorResult {
status: 'ok' | 'error';
diff --git a/x-pack/legacy/plugins/alerting/README.md b/x-pack/legacy/plugins/alerting/README.md
index ffe3185328abdb..1b90cb78d870c1 100644
--- a/x-pack/legacy/plugins/alerting/README.md
+++ b/x-pack/legacy/plugins/alerting/README.md
@@ -198,6 +198,7 @@ Payload:
|Property|Description|Type|
|---|---|---|
|enabled|Indicate if you want the alert to start executing on an interval basis after it has been created.|boolean|
+|name|A name to reference and search in the future.|string|
|alertTypeId|The id value of the alert type you want to call when the alert is scheduled to execute.|string|
|interval|The interval in seconds, minutes, hours or days the alert should execute. Example: `10s`, `5m`, `1h`, `1d`.|string|
|alertTypeParams|The parameters to pass in to the alert type executor `params` value. This will also validate against the alert type params validator if defined.|object|
@@ -242,6 +243,7 @@ Payload:
|Property|Description|Type|
|---|---|---|
|interval|The interval in seconds, minutes, hours or days the alert should execute. Example: `10s`, `5m`, `1h`, `1d`.|string|
+|name|A name to reference and search in the future.|string|
|alertTypeParams|The parameters to pass in to the alert type executor `params` value. This will also validate against the alert type params validator if defined.|object|
|actions|Array of the following:
- `group` (string): We support grouping actions in the scenario of escalations or different types of alert instances. If you don't need this, feel free to use `default` as a value.
- `id` (string): The id of the action saved object to execute.
- `params` (object): There map to the `params` the action type will receive. In order to help apply context to strings, we handle them as mustache templates and pass in a default set of context. (see templating actions).|array|
diff --git a/x-pack/legacy/plugins/alerting/index.ts b/x-pack/legacy/plugins/alerting/index.ts
index 22db92baa8d28c..b3e33f782688c2 100644
--- a/x-pack/legacy/plugins/alerting/index.ts
+++ b/x-pack/legacy/plugins/alerting/index.ts
@@ -22,12 +22,12 @@ export function alerting(kibana: any) {
return new kibana.Plugin({
id: 'alerting',
configPrefix: 'xpack.alerting',
- require: ['kibana', 'elasticsearch', 'actions', 'task_manager', 'encrypted_saved_objects'],
+ require: ['kibana', 'elasticsearch', 'actions', 'task_manager', 'encryptedSavedObjects'],
isEnabled(config: Legacy.KibanaConfig) {
return (
config.get('xpack.alerting.enabled') === true &&
config.get('xpack.actions.enabled') === true &&
- config.get('xpack.encrypted_saved_objects.enabled') === true &&
+ config.get('xpack.encryptedSavedObjects.enabled') === true &&
config.get('xpack.task_manager.enabled') === true
);
},
diff --git a/x-pack/legacy/plugins/alerting/mappings.json b/x-pack/legacy/plugins/alerting/mappings.json
index bc648e874cfa4c..ff60ccc98cbaa6 100644
--- a/x-pack/legacy/plugins/alerting/mappings.json
+++ b/x-pack/legacy/plugins/alerting/mappings.json
@@ -4,6 +4,9 @@
"enabled": {
"type": "boolean"
},
+ "name": {
+ "type": "text"
+ },
"alertTypeId": {
"type": "keyword"
},
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
index 093f5f7484004b..99af7db2ef8d75 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
@@ -43,6 +43,7 @@ const mockedDate = new Date('2019-02-12T21:01:22.479Z');
function getMockData(overwrites: Record = {}) {
return {
enabled: true,
+ name: 'abc',
alertTypeId: '123',
interval: '10s',
throttle: null,
@@ -172,6 +173,7 @@ describe('create()', () => {
"interval": "10s",
"muteAll": false,
"mutedInstanceIds": Array [],
+ "name": "abc",
"throttle": null,
"updatedBy": "elastic",
}
@@ -504,6 +506,7 @@ describe('create()', () => {
},
],
alertTypeId: '123',
+ name: 'abc',
alertTypeParams: { bar: true },
apiKey: Buffer.from('123:abc').toString('base64'),
apiKeyOwner: 'elastic',
@@ -1173,6 +1176,7 @@ describe('update()', () => {
id: '1',
data: {
interval: '10s',
+ name: 'abc',
alertTypeParams: {
bar: true,
},
@@ -1230,6 +1234,7 @@ describe('update()', () => {
"apiKeyOwner": null,
"enabled": true,
"interval": "10s",
+ "name": "abc",
"scheduledTaskId": "task-123",
"updatedBy": "elastic",
}
@@ -1304,6 +1309,7 @@ describe('update()', () => {
id: '1',
data: {
interval: '10s',
+ name: 'abc',
alertTypeParams: {
bar: true,
},
@@ -1362,6 +1368,7 @@ describe('update()', () => {
"apiKeyOwner": "elastic",
"enabled": true,
"interval": "10s",
+ "name": "abc",
"scheduledTaskId": "task-123",
"updatedBy": "elastic",
}
@@ -1406,6 +1413,7 @@ describe('update()', () => {
id: '1',
data: {
interval: '10s',
+ name: 'abc',
alertTypeParams: {
bar: true,
},
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
index 39d0277ff53b3c..b92af43a1f1c63 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
@@ -72,6 +72,7 @@ interface CreateOptions {
interface UpdateOptions {
id: string;
data: {
+ name: string;
interval: string;
actions: AlertAction[];
alertTypeParams: Record;
diff --git a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts
index 23591692bca1f5..dcc74ed9488cea 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
import { AlertExecutorOptions } from '../types';
import { ConcreteTaskInstance } from '../../../task_manager';
import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
import {
savedObjectsClientMock,
loggingServiceMock,
@@ -52,7 +52,7 @@ beforeAll(() => {
afterAll(() => fakeTimer.restore());
const savedObjectsClient = savedObjectsClientMock.create();
-const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create();
+const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
const services = {
log: jest.fn(),
callCluster: jest.fn(),
diff --git a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts
index ca11dc8533996d..0c6bd1b4a777a3 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts
@@ -11,7 +11,7 @@ import { createAlertInstanceFactory } from './create_alert_instance_factory';
import { AlertInstance } from './alert_instance';
import { getNextRunAt } from './get_next_run_at';
import { validateAlertTypeParams } from './validate_alert_type_params';
-import { EncryptedSavedObjectsStartContract } from '../shim';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
import { PluginStartContract as ActionsPluginStartContract } from '../../../actions';
import {
AlertType,
diff --git a/x-pack/legacy/plugins/alerting/server/plugin.ts b/x-pack/legacy/plugins/alerting/server/plugin.ts
index d6c6d5907e7ac4..c50bc795757f3e 100644
--- a/x-pack/legacy/plugins/alerting/server/plugin.ts
+++ b/x-pack/legacy/plugins/alerting/server/plugin.ts
@@ -85,7 +85,7 @@ export class Plugin {
});
// Encrypted attributes
- plugins.encrypted_saved_objects.registerType({
+ plugins.encryptedSavedObjects.registerType({
type: 'alert',
attributesToEncrypt: new Set(['apiKey']),
attributesToExcludeFromAAD: new Set([
@@ -147,7 +147,7 @@ export class Plugin {
};
},
executeAction: plugins.actions.execute,
- encryptedSavedObjectsPlugin: plugins.encrypted_saved_objects,
+ encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
spaceIdToNamespace(spaceId?: string): string | undefined {
const spacesPlugin = plugins.spaces();
return spacesPlugin && spaceId ? spacesPlugin.spaceIdToNamespace(spaceId) : undefined;
diff --git a/x-pack/legacy/plugins/alerting/server/routes/create.test.ts b/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
index 3751aa968b3de8..bd153150849c8a 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
@@ -12,6 +12,7 @@ server.route(createAlertRoute);
const mockedAlert = {
alertTypeId: '1',
+ name: 'abc',
interval: '10s',
alertTypeParams: {
bar: true,
@@ -44,24 +45,25 @@ test('creates an alert with proper parameters', async () => {
expect(statusCode).toBe(200);
const response = JSON.parse(payload);
expect(response).toMatchInlineSnapshot(`
+ Object {
+ "actions": Array [
Object {
- "actions": Array [
- Object {
- "group": "default",
- "id": "2",
- "params": Object {
- "foo": true,
- },
- },
- ],
- "alertTypeId": "1",
- "alertTypeParams": Object {
- "bar": true,
+ "group": "default",
+ "id": "2",
+ "params": Object {
+ "foo": true,
},
- "id": "123",
- "interval": "10s",
- }
- `);
+ },
+ ],
+ "alertTypeId": "1",
+ "alertTypeParams": Object {
+ "bar": true,
+ },
+ "id": "123",
+ "interval": "10s",
+ "name": "abc",
+ }
+ `);
expect(alertsClient.create).toHaveBeenCalledTimes(1);
expect(alertsClient.create.mock.calls[0]).toMatchInlineSnapshot(`
Array [
@@ -82,6 +84,7 @@ test('creates an alert with proper parameters', async () => {
},
"enabled": true,
"interval": "10s",
+ "name": "abc",
"throttle": null,
},
},
@@ -107,6 +110,7 @@ test('creates an alert with proper parameters', async () => {
},
"enabled": true,
"interval": "10s",
+ "name": "abc",
"throttle": null,
},
},
diff --git a/x-pack/legacy/plugins/alerting/server/routes/create.ts b/x-pack/legacy/plugins/alerting/server/routes/create.ts
index 984153d81e0f86..14f72b0041e76f 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/create.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/create.ts
@@ -12,6 +12,7 @@ import { getDurationSchema } from '../lib';
interface ScheduleRequest extends Hapi.Request {
payload: {
enabled: boolean;
+ name: string;
alertTypeId: string;
interval: string;
actions: AlertAction[];
@@ -32,6 +33,7 @@ export const createAlertRoute = {
payload: Joi.object()
.keys({
enabled: Joi.boolean().default(true),
+ name: Joi.string().required(),
alertTypeId: Joi.string().required(),
throttle: getDurationSchema().default(null),
interval: getDurationSchema().required(),
diff --git a/x-pack/legacy/plugins/alerting/server/routes/update.test.ts b/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
index 9e4f18fa1b40d2..2237d8245097c0 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
@@ -36,6 +36,7 @@ test('calls the update function with proper parameters', async () => {
url: '/api/alert/1',
payload: {
throttle: null,
+ name: 'abc',
interval: '12s',
alertTypeParams: {
otherField: false,
@@ -75,6 +76,7 @@ test('calls the update function with proper parameters', async () => {
"otherField": false,
},
"interval": "12s",
+ "name": "abc",
"throttle": null,
},
"id": "1",
diff --git a/x-pack/legacy/plugins/alerting/server/routes/update.ts b/x-pack/legacy/plugins/alerting/server/routes/update.ts
index 2b95b7bc340542..09362295ae73bd 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/update.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/update.ts
@@ -15,6 +15,7 @@ interface UpdateRequest extends Hapi.Request {
};
payload: {
alertTypeId: string;
+ name: string;
interval: string;
actions: AlertAction[];
alertTypeParams: Record;
@@ -36,6 +37,7 @@ export const updateAlertRoute = {
throttle: getDurationSchema()
.required()
.allow(null),
+ name: Joi.string().required(),
interval: getDurationSchema().required(),
alertTypeParams: Joi.object().required(),
actions: Joi.array()
diff --git a/x-pack/legacy/plugins/alerting/server/shim.ts b/x-pack/legacy/plugins/alerting/server/shim.ts
index c977fda451df18..d86eab2038095d 100644
--- a/x-pack/legacy/plugins/alerting/server/shim.ts
+++ b/x-pack/legacy/plugins/alerting/server/shim.ts
@@ -10,7 +10,10 @@ import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
import { TaskManager } from '../../task_manager';
import { XPackMainPlugin } from '../../xpack_main/xpack_main';
import KbnServer from '../../../../../src/legacy/server/kbn_server';
-import { EncryptedSavedObjectsPlugin } from '../../encrypted_saved_objects';
+import {
+ PluginSetupContract as EncryptedSavedObjectsSetupContract,
+ PluginStartContract as EncryptedSavedObjectsStartContract,
+} from '../../../../plugins/encrypted_saved_objects/server';
import { PluginSetupContract as SecurityPlugin } from '../../../../plugins/security/server';
import {
CoreSetup,
@@ -28,7 +31,6 @@ import {
interface Plugins extends Hapi.PluginProperties {
actions: ActionsPlugin;
task_manager: TaskManager;
- encrypted_saved_objects: EncryptedSavedObjectsPlugin;
}
export interface Server extends Legacy.Server {
@@ -41,16 +43,11 @@ export interface Server extends Legacy.Server {
export type TaskManagerStartContract = Pick;
export type SecurityPluginSetupContract = Pick;
export type SecurityPluginStartContract = Pick;
-export type EncryptedSavedObjectsSetupContract = Pick;
export type XPackMainPluginSetupContract = Pick;
export type TaskManagerSetupContract = Pick<
TaskManager,
'addMiddleware' | 'registerTaskDefinitions'
>;
-export type EncryptedSavedObjectsStartContract = Pick<
- EncryptedSavedObjectsPlugin,
- 'isEncryptionError' | 'getDecryptedAsInternalUser'
->;
/**
* New platform interfaces
@@ -75,13 +72,13 @@ export interface AlertingPluginsSetup {
task_manager: TaskManagerSetupContract;
actions: ActionsPluginSetupContract;
xpack_main: XPackMainPluginSetupContract;
- encrypted_saved_objects: EncryptedSavedObjectsSetupContract;
+ encryptedSavedObjects: EncryptedSavedObjectsSetupContract;
}
export interface AlertingPluginsStart {
actions: ActionsPluginStartContract;
security?: SecurityPluginStartContract;
spaces: () => SpacesPluginStartContract | undefined;
- encrypted_saved_objects: EncryptedSavedObjectsStartContract;
+ encryptedSavedObjects: EncryptedSavedObjectsStartContract;
task_manager: TaskManagerStartContract;
}
@@ -122,7 +119,8 @@ export function shim(
task_manager: server.plugins.task_manager,
actions: server.plugins.actions.setup,
xpack_main: server.plugins.xpack_main,
- encrypted_saved_objects: server.plugins.encrypted_saved_objects,
+ encryptedSavedObjects: newPlatform.setup.plugins
+ .encryptedSavedObjects as EncryptedSavedObjectsSetupContract,
};
const pluginsStart: AlertingPluginsStart = {
@@ -131,7 +129,8 @@ export function shim(
// TODO: Currently a function because it's an optional dependency that
// initializes after this function is called
spaces: () => server.plugins.spaces,
- encrypted_saved_objects: server.plugins.encrypted_saved_objects,
+ encryptedSavedObjects: newPlatform.start.plugins
+ .encryptedSavedObjects as EncryptedSavedObjectsStartContract,
task_manager: server.plugins.task_manager,
};
diff --git a/x-pack/legacy/plugins/alerting/server/types.ts b/x-pack/legacy/plugins/alerting/server/types.ts
index 3c71412da2c899..94b81c9e1b576d 100644
--- a/x-pack/legacy/plugins/alerting/server/types.ts
+++ b/x-pack/legacy/plugins/alerting/server/types.ts
@@ -60,6 +60,7 @@ export interface RawAlertAction extends SavedObjectAttributes {
export interface Alert {
enabled: boolean;
+ name: string;
alertTypeId: string;
interval: string;
actions: AlertAction[];
@@ -76,6 +77,7 @@ export interface Alert {
export interface RawAlert extends SavedObjectAttributes {
enabled: boolean;
+ name: string;
alertTypeId: string;
interval: string;
actions: RawAlertAction[];
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx b/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx
index 0c1d20d65b7b9f..cfbe8b1edbd719 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx
@@ -12,11 +12,10 @@ import {
RouteProps,
withRouter
} from 'react-router-dom';
-import { StringMap } from '../../../../typings/common';
import { RouteName } from './route_config/route_names';
type LocationMatch = Pick<
- RouteComponentProps>,
+ RouteComponentProps>,
'location' | 'match'
>;
@@ -75,7 +74,7 @@ export function getBreadcrumb({
return null;
}
- const match = matchPath>(currentPath, route);
+ const match = matchPath>(currentPath, route);
if (match) {
return parse({
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts
index 4d6c3f4c116c96..c7860b81a7b1ec 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts
@@ -7,7 +7,6 @@
import { isArray, isObject, isString } from 'lodash';
import mustache from 'mustache';
import uuid from 'uuid';
-import { StringMap } from '../../../../../../typings/common';
// @ts-ignore
import * as rest from '../../../../../services/rest/watcher';
import { createErrorGroupWatch } from '../createErrorGroupWatch';
@@ -85,8 +84,11 @@ describe('createErrorGroupWatch', () => {
});
// Recursively iterate a nested structure and render strings as mustache templates
-type InputOutput = string | string[] | StringMap;
-function renderMustache(input: InputOutput, ctx: StringMap): InputOutput {
+type InputOutput = string | string[] | Record;
+function renderMustache(
+ input: InputOutput,
+ ctx: Record
+): InputOutput {
if (isString(input)) {
return mustache.render(input, {
ctx,
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts
index 2617fef6de1d2b..e7d06403b8f8e1 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts
@@ -17,7 +17,6 @@ import {
PROCESSOR_EVENT,
SERVICE_NAME
} from '../../../../../common/elasticsearch_fieldnames';
-import { StringMap } from '../../../../../typings/common';
// @ts-ignore
import { createWatch } from '../../../../services/rest/watcher';
@@ -50,8 +49,8 @@ interface Arguments {
interface Actions {
log_error: { logging: { text: string } };
- slack_webhook?: StringMap;
- email?: StringMap;
+ slack_webhook?: Record;
+ email?: Record;
}
export async function createErrorGroupWatch({
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
index 8fab7da377eb2c..67957ae76b1f10 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
@@ -22,7 +22,6 @@ import {
import { useFetcher } from '../../../../hooks/useFetcher';
import { useCallApmApi } from '../../../../hooks/useCallApmApi';
import { APMClient } from '../../../../services/rest/createCallApmApi';
-import { StringMap } from '../../../../../typings/common';
import { useKibanaCore } from '../../../../../../observability/public';
const APM_INDEX_LABELS = [
@@ -79,7 +78,7 @@ async function saveApmIndices({
apmIndices
}: {
callApmApi: APMClient;
- apmIndices: StringMap;
+ apmIndices: Record;
}) {
await callApmApi({
method: 'POST',
@@ -95,7 +94,7 @@ export function ApmIndices() {
notifications: { toasts }
} = useKibanaCore();
- const [apmIndices, setApmIndices] = useState>({});
+ const [apmIndices, setApmIndices] = useState>({});
const [isSaving, setIsSaving] = useState(false);
const callApmApiFromHook = useCallApmApi();
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
index cc7697c1d89647..10f59e237ba7fd 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
@@ -17,7 +17,6 @@ import {
} from 'lodash';
import { idx } from '@kbn/elastic-idx';
import { TraceAPIResponse } from '../../../../../../../../server/lib/traces/get_trace';
-import { StringMap } from '../../../../../../../../typings/common';
import { Span } from '../../../../../../../../typings/es_schemas/ui/Span';
import { Transaction } from '../../../../../../../../typings/es_schemas/ui/Transaction';
@@ -191,7 +190,7 @@ function getServices(items: IWaterfallItem[]) {
return uniq(serviceNames);
}
-export type IServiceColors = StringMap;
+export type IServiceColors = Record;
function getServiceColors(services: string[]) {
const assignedColors = [
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx
index 7f9d3c9f9f3b37..ed931191cfb963 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx
@@ -6,10 +6,9 @@
import { EuiProgress } from '@elastic/eui';
import React from 'react';
-import { StringMap } from '../../../../typings/common';
// TODO: extend from EUI's EuiProgress prop interface
-export interface ImpactBarProps extends StringMap {
+export interface ImpactBarProps extends Record {
value: number;
max?: number;
}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts b/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts
index b6caa47d1ae663..357ea23d522a01 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts
@@ -6,13 +6,12 @@
import qs from 'querystring';
import { LocalUIFilterName } from '../../../../server/lib/ui_filters/local_ui_filters/config';
-import { StringMap } from '../../../../typings/common';
export function toQuery(search?: string): APMQueryParamsRaw {
return search ? qs.parse(search.slice(1)) : {};
}
-export function fromQuery(query: StringMap) {
+export function fromQuery(query: Record) {
return qs.stringify(query, undefined, undefined, {
encodeURIComponent: (value: string) => {
return encodeURIComponent(value).replace(/%3A/g, ':');
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx
index 0f5fcceea3d200..29a8528295dd78 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx
@@ -8,7 +8,6 @@ import { EuiBasicTable } from '@elastic/eui';
import { sortByOrder } from 'lodash';
import React, { useMemo, useCallback, ReactNode } from 'react';
import { idx } from '@kbn/elastic-idx';
-import { StringMap } from '../../../../typings/common';
import { useUrlParams } from '../../../hooks/useUrlParams';
import { history } from '../../../utils/history';
import { fromQuery, toQuery } from '../Links/url_helpers';
@@ -16,7 +15,7 @@ import { fromQuery, toQuery } from '../Links/url_helpers';
// TODO: this should really be imported from EUI
export interface ITableColumn {
name: ReactNode;
- actions?: StringMap[];
+ actions?: Array>;
field?: string;
dataType?: string;
align?: string;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts
index 0605c7dc8b02ac..dc815145db4ade 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts
@@ -7,7 +7,8 @@
import { getTimezoneOffsetInMs } from './getTimezoneOffsetInMs';
import moment from 'moment-timezone';
-describe('getTimezoneOffsetInMs', () => {
+// FAILING: https://github.com/elastic/kibana/issues/50005
+describe.skip('getTimezoneOffsetInMs', () => {
describe('when no default timezone is set', () => {
it('guesses the timezone', () => {
const guess = jest.fn(() => 'Etc/UTC');
diff --git a/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts b/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts
index 4b65190d8ef222..b15231e89365a3 100644
--- a/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts
+++ b/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts
@@ -11,7 +11,6 @@ import mean from 'lodash.mean';
import { rgba } from 'polished';
import { TimeSeriesAPIResponse } from '../../server/lib/transactions/charts';
import { ApmTimeSeriesResponse } from '../../server/lib/transactions/charts/get_timeseries_data/transform';
-import { StringMap } from '../../typings/common';
import {
Coordinate,
RectCoordinate,
@@ -192,7 +191,7 @@ function getColorByKey(keys: string[]) {
const assignedColors = ['HTTP 2xx', 'HTTP 3xx', 'HTTP 4xx', 'HTTP 5xx'];
const unknownKeys = difference(keys, assignedColors);
- const unassignedColors: StringMap = zipObject(unknownKeys, [
+ const unassignedColors: Record = zipObject(unknownKeys, [
theme.euiColorVis1,
theme.euiColorVis3,
theme.euiColorVis4,
diff --git a/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts b/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts
index abe44a0fb39345..83e8f020e25291 100644
--- a/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts
+++ b/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts
@@ -4,10 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { StringMap } from '../../../typings/common';
-
export class SessionStorageMock {
- private store: StringMap = {};
+ private store: Record = {};
public clear() {
this.store = {};
diff --git a/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts b/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts
index 146376665a0e69..95e283cd67709d 100644
--- a/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts
+++ b/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts
@@ -5,7 +5,6 @@
*/
import { HttpServiceBase } from 'kibana/public';
-import { StringMap } from '../../../typings/common';
import { callApi } from './callApi';
export interface LicenseApiResponse {
@@ -13,11 +12,11 @@ export interface LicenseApiResponse {
is_active: boolean;
};
features: {
- beats_management?: StringMap;
- graph?: StringMap;
- grokdebugger?: StringMap;
- index_management?: StringMap;
- logstash?: StringMap;
+ beats_management?: Record;
+ graph?: Record;
+ grokdebugger?: Record;
+ index_management?: Record;
+ logstash?: Record;
ml?: {
is_available: boolean;
license_type: number;
@@ -25,12 +24,12 @@ export interface LicenseApiResponse {
enable_links: boolean;
show_links: boolean;
};
- reporting?: StringMap;
- rollup?: StringMap;
- searchprofiler?: StringMap;
- security?: StringMap;
- spaces?: StringMap;
- tilemap?: StringMap;
+ reporting?: Record;
+ rollup?: Record;
+ searchprofiler?: Record;
+ security?: Record;
+ spaces?: Record;
+ tilemap?: Record;
watcher?: {
is_available: boolean;
enable_links: boolean;
diff --git a/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts b/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts
index db1ed490eb7f20..130a7b52ea33be 100644
--- a/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts
+++ b/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts
@@ -5,8 +5,6 @@
*/
import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { StringMap } from '../../typings/common';
-
const { euiColorDarkShade, euiColorWarning } = theme;
export const errorColor = '#c23c2b';
@@ -14,7 +12,7 @@ export const neutralColor = euiColorDarkShade;
export const successColor = '#327a42';
export const warningColor = euiColorWarning;
-const httpStatusCodeColors: StringMap = {
+const httpStatusCodeColors: Record = {
1: neutralColor,
2: successColor,
3: neutralColor,
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
index 84c52b895f20d2..ee41599454dd69 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
@@ -14,7 +14,6 @@ import {
import { Legacy } from 'kibana';
import { cloneDeep, has, isString, set, pick } from 'lodash';
import { OBSERVER_VERSION_MAJOR } from '../../../common/elasticsearch_fieldnames';
-import { StringMap, Omit } from '../../../typings/common';
import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
import {
ESSearchResponse,
@@ -95,7 +94,7 @@ interface APMOptions {
export function getESClient(req: Legacy.Request) {
const cluster = req.server.plugins.elasticsearch.getCluster('data');
- const query = req.query as StringMap;
+ const query = req.query as Record;
return {
search: async <
diff --git a/x-pack/legacy/plugins/apm/server/lib/index_pattern/getKueryBarIndexPattern.ts b/x-pack/legacy/plugins/apm/server/lib/index_pattern/getKueryBarIndexPattern.ts
index 33d404009ae204..a5ba4573cfd58a 100644
--- a/x-pack/legacy/plugins/apm/server/lib/index_pattern/getKueryBarIndexPattern.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/index_pattern/getKueryBarIndexPattern.ts
@@ -7,7 +7,7 @@
import { Legacy } from 'kibana';
import { StaticIndexPattern } from 'ui/index_patterns';
import { APICaller } from 'src/core/server';
-import { IndexPatternsService } from '../../../../../../../src/legacy/server/index_patterns/service';
+import { IndexPatternsFetcher } from '../../../../../../../src/plugins/data/server';
import { Setup } from '../helpers/setup_request';
export const getKueryBarIndexPattern = async ({
@@ -21,7 +21,7 @@ export const getKueryBarIndexPattern = async ({
}) => {
const { indices } = setup;
- const indexPatternsService = new IndexPatternsService(
+ const indexPatternsFetcher = new IndexPatternsFetcher(
(...rest: Parameters) =>
request.server.plugins.elasticsearch
.getCluster('data')
@@ -40,7 +40,7 @@ export const getKueryBarIndexPattern = async ({
const configuredIndices = indexNames.map(name => indicesMap[name]);
- const fields = await indexPatternsService.getFieldsForWildcard({
+ const fields = await indexPatternsFetcher.getFieldsForWildcard({
pattern: configuredIndices
});
diff --git a/x-pack/legacy/plugins/apm/typings/common.ts b/x-pack/legacy/plugins/apm/typings/common.ts
index cfe6c9c572dc40..2fafceb32209c1 100644
--- a/x-pack/legacy/plugins/apm/typings/common.ts
+++ b/x-pack/legacy/plugins/apm/typings/common.ts
@@ -4,10 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export interface StringMap {
- [key: string]: T;
-}
-
// Allow unknown properties in an object
export type AllowUnknownProperties = T extends Array
? Array>
@@ -24,9 +20,3 @@ export type PromiseReturnType = Func extends (
) => Promise
? Value
: Func;
-
-export type IndexAsString