@@ -134,9 +148,12 @@ export const VisualizeEditorCommon = ({
/>
)}
{visInstance?.vis?.type?.stage === 'experimental' &&
}
- {!hasHeatmapLegacyhartsEnabled &&
- isSplitChart &&
- visInstance?.vis.type.name === 'heatmap' &&
}
+ {!hasLegacyChartsEnabled && isSplitChart && chartNeedsWarning && chartToken && chartName && (
+
+ )}
{visInstance?.vis?.type?.getInfoMessage?.(visInstance.vis)}
{getLegacyUrlConflictCallout()}
{visInstance && (
diff --git a/src/plugins/visualizations/public/visualize_app/constants.ts b/src/plugins/visualizations/public/visualize_app/constants.ts
new file mode 100644
index 00000000000000..fd256cb5bbb864
--- /dev/null
+++ b/src/plugins/visualizations/public/visualize_app/constants.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export const NEW_HEATMAP_CHARTS_LIBRARY = 'visualization:visualize:legacyHeatmapChartsLibrary';
+export const NEW_GAUGE_CHARTS_LIBRARY = 'visualization:visualize:legacyGaugeChartsLibrary';
diff --git a/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts b/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts
new file mode 100644
index 00000000000000..d40f15aa08657a
--- /dev/null
+++ b/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { $Values } from '@kbn/utility-types';
+import { AggConfigs } from '../../../../data/common';
+import { NEW_HEATMAP_CHARTS_LIBRARY, NEW_GAUGE_CHARTS_LIBRARY } from '../constants';
+
+export const CHARTS_WITHOUT_SMALL_MULTIPLES = {
+ heatmap: 'heatmap',
+ gauge: 'gauge',
+} as const;
+
+export type CHARTS_WITHOUT_SMALL_MULTIPLES = $Values
;
+
+export const CHARTS_CONFIG_TOKENS = {
+ [CHARTS_WITHOUT_SMALL_MULTIPLES.heatmap]: NEW_HEATMAP_CHARTS_LIBRARY,
+ [CHARTS_WITHOUT_SMALL_MULTIPLES.gauge]: NEW_GAUGE_CHARTS_LIBRARY,
+} as const;
+
+export const isSplitChart = (chartType: string | undefined, aggs?: AggConfigs) => {
+ const defaultIsSplitChart = () => aggs?.aggs.some((agg) => agg.schema === 'split');
+
+ const knownCheckers = {
+ [CHARTS_WITHOUT_SMALL_MULTIPLES.heatmap]: defaultIsSplitChart,
+ [CHARTS_WITHOUT_SMALL_MULTIPLES.gauge]: () => aggs?.aggs.some((agg) => agg.schema === 'group'),
+ };
+
+ return (knownCheckers[chartType as CHARTS_WITHOUT_SMALL_MULTIPLES] ?? defaultIsSplitChart)();
+};
diff --git a/test/api_integration/apis/custom_integration/integrations.ts b/test/api_integration/apis/custom_integration/integrations.ts
index 4d3915f5f22946..c49aefe91925f8 100644
--- a/test/api_integration/apis/custom_integration/integrations.ts
+++ b/test/api_integration/apis/custom_integration/integrations.ts
@@ -22,7 +22,7 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.body).to.be.an('array');
- expect(resp.body.length).to.be(35);
+ expect(resp.body.length).to.be(36);
// Test for sample data card
expect(resp.body.findIndex((c: { id: string }) => c.id === 'sample_data_all')).to.be.above(
diff --git a/test/common/services/security/test_user.ts b/test/common/services/security/test_user.ts
index 1161e7b493f419..7c4751220fa1f1 100644
--- a/test/common/services/security/test_user.ts
+++ b/test/common/services/security/test_user.ts
@@ -40,29 +40,33 @@ export class TestUser extends FtrService {
super(ctx);
}
- async restoreDefaults(shouldRefreshBrowser: boolean = true) {
- if (this.enabled) {
- await this.setRoles(this.config.get('security.defaultRoles'), shouldRefreshBrowser);
+ async restoreDefaults(options?: { skipBrowserRefresh?: boolean }) {
+ if (!this.enabled) {
+ return;
}
+
+ await this.setRoles(this.config.get('security.defaultRoles'), options);
}
- async setRoles(roles: string[], shouldRefreshBrowser: boolean = true) {
- if (this.enabled) {
- this.log.debug(`set roles = ${roles}`);
- await this.user.create(TEST_USER_NAME, {
- password: TEST_USER_PASSWORD,
- roles,
- full_name: 'test user',
- });
-
- if (this.browser && this.testSubjects && shouldRefreshBrowser) {
- if (await this.testSubjects.exists('kibanaChrome', { allowHidden: true })) {
- await this.browser.refresh();
- // accept alert if it pops up
- const alert = await this.browser.getAlert();
- await alert?.accept();
- await this.testSubjects.find('kibanaChrome', this.config.get('timeouts.find') * 10);
- }
+ async setRoles(roles: string[], options?: { skipBrowserRefresh?: boolean }) {
+ if (!this.enabled) {
+ return;
+ }
+
+ this.log.debug(`set roles = ${roles}`);
+ await this.user.create(TEST_USER_NAME, {
+ password: TEST_USER_PASSWORD,
+ roles,
+ full_name: 'test user',
+ });
+
+ if (this.browser && this.testSubjects && !options?.skipBrowserRefresh) {
+ if (await this.testSubjects.exists('kibanaChrome', { allowHidden: true })) {
+ await this.browser.refresh();
+ // accept alert if it pops up
+ const alert = await this.browser.getAlert();
+ await alert?.accept();
+ await this.testSubjects.find('kibanaChrome', this.config.get('timeouts.find') * 10);
}
}
}
diff --git a/test/functional/apps/console/_autocomplete.ts b/test/functional/apps/console/_autocomplete.ts
index 1ba4bcaa76b365..cd17244b1f4983 100644
--- a/test/functional/apps/console/_autocomplete.ts
+++ b/test/functional/apps/console/_autocomplete.ts
@@ -13,24 +13,25 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const log = getService('log');
const PageObjects = getPageObjects(['common', 'console']);
- // Failing: See https://github.com/elastic/kibana/issues/126421
- describe.skip('console autocomplete feature', function describeIndexTests() {
+ describe('console autocomplete feature', function describeIndexTests() {
this.tags('includeFirefox');
before(async () => {
log.debug('navigateTo console');
await PageObjects.common.navigateToApp('console');
// Ensure that the text area can be interacted with
await PageObjects.console.dismissTutorial();
+ await PageObjects.console.clearTextArea();
});
it('should provide basic auto-complete functionality', async () => {
await PageObjects.console.enterRequest();
+ await PageObjects.console.enterText(`{\n\t"query": {`);
+ await PageObjects.console.pressEnter();
await PageObjects.console.promptAutocomplete();
expect(PageObjects.console.isAutocompleteVisible()).to.be.eql(true);
});
- // FLAKY: https://github.com/elastic/kibana/issues/126414
- describe.skip('with a missing comma in query', () => {
+ describe('with a missing comma in query', () => {
const LINE_NUMBER = 4;
beforeEach(async () => {
await PageObjects.console.clearTextArea();
diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.ts b/test/functional/apps/dashboard/create_and_add_embeddables.ts
index e18e66f3a49923..1390a7517cdbf8 100644
--- a/test/functional/apps/dashboard/create_and_add_embeddables.ts
+++ b/test/functional/apps/dashboard/create_and_add_embeddables.ts
@@ -26,12 +26,24 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await kibanaServer.uiSettings.replace({
defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
});
+ });
+
+ it('ensure toolbar popover closes on add', async () => {
await PageObjects.common.navigateToApp('dashboard');
- await PageObjects.dashboard.preserveCrossAppState();
- await PageObjects.dashboard.loadSavedDashboard('few panels');
+ await PageObjects.dashboard.clickNewDashboard();
+ await PageObjects.dashboard.switchToEditMode();
+ await dashboardAddPanel.clickEditorMenuButton();
+ await dashboardAddPanel.clickAddNewEmbeddableLink('LOG_STREAM_EMBEDDABLE');
+ await dashboardAddPanel.expectEditorMenuClosed();
});
describe('add new visualization link', () => {
+ before(async () => {
+ await PageObjects.common.navigateToApp('dashboard');
+ await PageObjects.dashboard.preserveCrossAppState();
+ await PageObjects.dashboard.loadSavedDashboard('few panels');
+ });
+
it('adds new visualization via the top nav link', async () => {
const originalPanelCount = await PageObjects.dashboard.getPanelCount();
await PageObjects.dashboard.switchToEditMode();
diff --git a/test/functional/apps/discover/_huge_fields.ts b/test/functional/apps/discover/_huge_fields.ts
index 24b10e1df04956..3cca75234675bc 100644
--- a/test/functional/apps/discover/_huge_fields.ts
+++ b/test/functional/apps/discover/_huge_fields.ts
@@ -18,7 +18,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
describe('test large number of fields in sidebar', function () {
before(async function () {
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/huge_fields');
- await security.testUser.setRoles(['kibana_admin', 'test_testhuge_reader'], false);
+ await security.testUser.setRoles(['kibana_admin', 'test_testhuge_reader'], {
+ skipBrowserRefresh: true,
+ });
await kibanaServer.uiSettings.update({
'timepicker:timeDefaults': `{ "from": "2016-10-05T00:00:00", "to": "2016-10-06T00:00:00"}`,
});
diff --git a/test/functional/apps/management/_scripted_fields_filter.js b/test/functional/apps/management/_scripted_fields_filter.js
index 117b8747c5a0a8..abae9a300994dc 100644
--- a/test/functional/apps/management/_scripted_fields_filter.js
+++ b/test/functional/apps/management/_scripted_fields_filter.js
@@ -16,8 +16,7 @@ export default function ({ getService, getPageObjects }) {
const esArchiver = getService('esArchiver');
const PageObjects = getPageObjects(['settings']);
- // FLAKY: https://github.com/elastic/kibana/issues/126027
- describe.skip('filter scripted fields', function describeIndexTests() {
+ describe('filter scripted fields', function describeIndexTests() {
before(async function () {
// delete .kibana index and then wait for Kibana to re-create it
await browser.setWindowSize(1200, 800);
@@ -67,6 +66,7 @@ export default function ({ getService, getPageObjects }) {
expect(lang).to.be('painless');
}
});
+
await PageObjects.settings.clearScriptedFieldLanguageFilter('painless');
await PageObjects.settings.setScriptedFieldLanguageFilter('expression');
diff --git a/test/functional/apps/visualize/_tsvb_chart.ts b/test/functional/apps/visualize/_tsvb_chart.ts
index 4080ca2a0ba75d..ec3852b309d3f7 100644
--- a/test/functional/apps/visualize/_tsvb_chart.ts
+++ b/test/functional/apps/visualize/_tsvb_chart.ts
@@ -34,7 +34,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
beforeEach(async () => {
await security.testUser.setRoles(
['kibana_admin', 'test_logstash_reader', 'kibana_sample_admin'],
- false
+ { skipBrowserRefresh: true }
);
await visualize.navigateToNewVisualization();
await visualize.clickVisualBuilder();
diff --git a/test/functional/page_objects/console_page.ts b/test/functional/page_objects/console_page.ts
index e6450480bbb023..32c859cc1aed9e 100644
--- a/test/functional/page_objects/console_page.ts
+++ b/test/functional/page_objects/console_page.ts
@@ -85,8 +85,8 @@ export class ConsolePageObject extends FtrService {
public async promptAutocomplete() {
const textArea = await this.testSubjects.find('console-textarea');
- // There should be autocomplete for this on all license levels
- await textArea.pressKeys([Key.CONTROL, Key.SPACE]);
+ await textArea.clickMouseButton();
+ await textArea.type('b');
await this.retry.waitFor('autocomplete to be visible', () => this.isAutocompleteVisible());
}
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index b1e4aa823821b7..70cdbea7fa8970 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -288,7 +288,10 @@ export class SettingsPageObject extends FtrService {
}
async setScriptedFieldLanguageFilter(language: string) {
- await this.testSubjects.clickWhenNotDisabled('scriptedFieldLanguageFilterDropdown');
+ await this.retry.try(async () => {
+ await this.testSubjects.clickWhenNotDisabled('scriptedFieldLanguageFilterDropdown');
+ return await this.find.byCssSelector('div.euiPopover__panel-isOpen');
+ });
await this.testSubjects.existOrFail('scriptedFieldLanguageFilterDropdown-popover');
await this.testSubjects.existOrFail(`scriptedFieldLanguageFilterDropdown-option-${language}`);
await this.testSubjects.click(`scriptedFieldLanguageFilterDropdown-option-${language}`);
diff --git a/test/functional/services/dashboard/add_panel.ts b/test/functional/services/dashboard/add_panel.ts
index 43ab1f966bc9a0..e42c221a494759 100644
--- a/test/functional/services/dashboard/add_panel.ts
+++ b/test/functional/services/dashboard/add_panel.ts
@@ -46,6 +46,11 @@ export class DashboardAddPanelService extends FtrService {
async clickEditorMenuButton() {
this.log.debug('DashboardAddPanel.clickEditorMenuButton');
await this.testSubjects.click('dashboardEditorMenuButton');
+ await this.testSubjects.existOrFail('dashboardEditorContextMenu');
+ }
+
+ async expectEditorMenuClosed() {
+ await this.testSubjects.missingOrFail('dashboardEditorContextMenu');
}
async clickAggBasedVisualizations() {
diff --git a/test/package/Vagrantfile b/test/package/Vagrantfile
index 34c29eb2cefe71..58fdd55734184d 100644
--- a/test/package/Vagrantfile
+++ b/test/package/Vagrantfile
@@ -2,6 +2,9 @@ Vagrant.configure("2") do |config|
config.vm.synced_folder '../../target/', '/packages'
config.vm.define "deb" do |deb|
+ deb.vm.provider :virtualbox do |vb|
+ vb.memory = 2048
+ end
deb.vm.box = 'elastic/debian-9-x86_64'
deb.vm.provision "ansible" do |ansible|
ansible.playbook = "deb.yml"
@@ -10,6 +13,9 @@ Vagrant.configure("2") do |config|
end
config.vm.define "rpm" do |rpm|
+ rpm.vm.provider :virtualbox do |vb|
+ vb.memory = 2048
+ end
rpm.vm.box = 'elastic/centos-7-x86_64'
rpm.vm.provision "ansible" do |ansible|
ansible.playbook = "rpm.yml"
@@ -18,6 +24,9 @@ Vagrant.configure("2") do |config|
end
config.vm.define "docker" do |docker|
+ docker.vm.provider :virtualbox do |vb|
+ vb.memory = 2048
+ end
docker.vm.box = 'elastic/ubuntu-18.04-x86_64'
docker.vm.provision "ansible" do |ansible|
ansible.playbook = "docker.yml"
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index c48041c1e18839..dfe34988c4d270 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -52,6 +52,7 @@
"xpack.security": "plugins/security",
"xpack.server": "legacy/server",
"xpack.securitySolution": "plugins/security_solution",
+ "xpack.sessionView": "plugins/session_view",
"xpack.snapshotRestore": "plugins/snapshot_restore",
"xpack.spaces": "plugins/spaces",
"xpack.savedObjectsTagging": ["plugins/saved_objects_tagging"],
diff --git a/x-pack/plugins/actions/server/feature.ts b/x-pack/plugins/actions/server/feature.ts
index c6265a17b122e0..ecb2e0e0b9ea3c 100644
--- a/x-pack/plugins/actions/server/feature.ts
+++ b/x-pack/plugins/actions/server/feature.ts
@@ -13,6 +13,12 @@ import {
} from './constants/saved_objects';
import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+/**
+ * The order of appearance in the feature privilege page
+ * under the management section.
+ */
+const FEATURE_ORDER = 3000;
+
export const ACTIONS_FEATURE = {
id: 'actions',
name: i18n.translate('xpack.actions.featureRegistry.actionsFeatureName', {
@@ -20,6 +26,7 @@ export const ACTIONS_FEATURE = {
}),
category: DEFAULT_APP_CATEGORIES.management,
app: [],
+ order: FEATURE_ORDER,
management: {
insightsAndAlerting: ['triggersActions'],
},
diff --git a/x-pack/plugins/alerting/common/alert.ts b/x-pack/plugins/alerting/common/alert.ts
index 35058aa343b1a1..da916ee7ed98aa 100644
--- a/x-pack/plugins/alerting/common/alert.ts
+++ b/x-pack/plugins/alerting/common/alert.ts
@@ -63,6 +63,13 @@ export interface AlertAggregations {
ruleMutedStatus: { muted: number; unmuted: number };
}
+export interface MappedParamsProperties {
+ risk_score?: number;
+ severity?: string;
+}
+
+export type MappedParams = SavedObjectAttributes & MappedParamsProperties;
+
export interface Alert {
id: string;
enabled: boolean;
@@ -73,6 +80,7 @@ export interface Alert {
schedule: IntervalSchedule;
actions: AlertAction[];
params: Params;
+ mapped_params?: MappedParams;
scheduledTaskId?: string;
createdBy: string | null;
updatedBy: string | null;
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.test.ts b/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.test.ts
new file mode 100644
index 00000000000000..d8618d0ed6c210
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.test.ts
@@ -0,0 +1,131 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { fromKueryExpression } from '@kbn/es-query';
+import {
+ getMappedParams,
+ getModifiedFilter,
+ getModifiedField,
+ getModifiedSearchFields,
+ getModifiedSearch,
+ getModifiedValue,
+ modifyFilterKueryNode,
+} from './mapped_params_utils';
+
+describe('getModifiedParams', () => {
+ it('converts params to mapped params', () => {
+ const params = {
+ riskScore: 42,
+ severity: 'medium',
+ a: 'test',
+ b: 'test',
+ c: 'test,',
+ };
+
+ expect(getMappedParams(params)).toEqual({
+ risk_score: 42,
+ severity: '40-medium',
+ });
+ });
+
+ it('returns empty mapped params if nothing exists in the input params', () => {
+ const params = {
+ a: 'test',
+ b: 'test',
+ c: 'test',
+ };
+
+ expect(getMappedParams(params)).toEqual({});
+ });
+});
+
+describe('getModifiedFilter', () => {
+ it('converts params filters to mapped params filters', () => {
+ // Make sure it works for both camel and snake case params
+ const filter = 'alert.attributes.params.risk_score: 45';
+
+ expect(getModifiedFilter(filter)).toEqual('alert.attributes.mapped_params.risk_score: 45');
+ });
+});
+
+describe('getModifiedField', () => {
+ it('converts sort field to mapped params sort field', () => {
+ expect(getModifiedField('params.risk_score')).toEqual('mapped_params.risk_score');
+ expect(getModifiedField('params.riskScore')).toEqual('mapped_params.risk_score');
+ expect(getModifiedField('params.invalid')).toEqual('params.invalid');
+ });
+});
+
+describe('getModifiedSearchFields', () => {
+ it('converts a list of params search fields to mapped param search fields', () => {
+ const searchFields = [
+ 'params.risk_score',
+ 'params.riskScore',
+ 'params.severity',
+ 'params.invalid',
+ 'invalid',
+ ];
+
+ expect(getModifiedSearchFields(searchFields)).toEqual([
+ 'mapped_params.risk_score',
+ 'mapped_params.risk_score',
+ 'mapped_params.severity',
+ 'params.invalid',
+ 'invalid',
+ ]);
+ });
+});
+
+describe('getModifiedSearch', () => {
+ it('converts the search value depending on the search field', () => {
+ const searchFields = ['params.severity', 'another'];
+
+ expect(getModifiedSearch(searchFields, 'medium')).toEqual('40-medium');
+ expect(getModifiedSearch(searchFields, 'something else')).toEqual('something else');
+ expect(getModifiedSearch('params.risk_score', 'something else')).toEqual('something else');
+ expect(getModifiedSearch('mapped_params.severity', 'medium')).toEqual('40-medium');
+ });
+});
+
+describe('getModifiedValue', () => {
+ it('converts severity strings to sortable strings', () => {
+ expect(getModifiedValue('severity', 'low')).toEqual('20-low');
+ expect(getModifiedValue('severity', 'medium')).toEqual('40-medium');
+ expect(getModifiedValue('severity', 'high')).toEqual('60-high');
+ expect(getModifiedValue('severity', 'critical')).toEqual('80-critical');
+ });
+});
+
+describe('modifyFilterKueryNode', () => {
+ it('modifies the resulting kuery node AST filter for alert params', () => {
+ const astFilter = fromKueryExpression(
+ 'alert.attributes.name: "Rule I" and alert.attributes.tags: "fast" and alert.attributes.params.severity > medium'
+ );
+
+ expect(astFilter.arguments[2].arguments[0]).toEqual({
+ type: 'literal',
+ value: 'alert.attributes.params.severity',
+ });
+
+ expect(astFilter.arguments[2].arguments[2]).toEqual({
+ type: 'literal',
+ value: 'medium',
+ });
+
+ modifyFilterKueryNode({ astFilter });
+
+ expect(astFilter.arguments[2].arguments[0]).toEqual({
+ type: 'literal',
+ value: 'alert.attributes.mapped_params.severity',
+ });
+
+ expect(astFilter.arguments[2].arguments[2]).toEqual({
+ type: 'literal',
+ value: '40-medium',
+ });
+ });
+});
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts b/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts
new file mode 100644
index 00000000000000..b4d82990654c25
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts
@@ -0,0 +1,172 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { snakeCase } from 'lodash';
+import { AlertTypeParams, MappedParams, MappedParamsProperties } from '../../types';
+import { SavedObjectAttribute } from '../../../../../../src/core/server';
+import {
+ iterateFilterKureyNode,
+ IterateFilterKureyNodeParams,
+ IterateActionProps,
+ getFieldNameAttribute,
+} from './validate_attributes';
+
+export const MAPPED_PARAMS_PROPERTIES: Array = [
+ 'risk_score',
+ 'severity',
+];
+
+const SEVERITY_MAP: Record = {
+ low: '20-low',
+ medium: '40-medium',
+ high: '60-high',
+ critical: '80-critical',
+};
+
+/**
+ * Returns the mapped_params object when given a params object.
+ * The function will match params present in MAPPED_PARAMS_PROPERTIES and
+ * return an empty object if nothing is matched.
+ */
+export const getMappedParams = (params: AlertTypeParams) => {
+ return Object.entries(params).reduce((result, [key, value]) => {
+ const snakeCaseKey = snakeCase(key);
+
+ if (MAPPED_PARAMS_PROPERTIES.includes(snakeCaseKey as keyof MappedParamsProperties)) {
+ result[snakeCaseKey] = getModifiedValue(
+ snakeCaseKey,
+ value as string
+ ) as SavedObjectAttribute;
+ }
+
+ return result;
+ }, {});
+};
+
+/**
+ * Returns a string of the filter, but with params replaced with mapped_params.
+ * This function will check both camel and snake case to make sure we're consistent
+ * with the naming
+ *
+ * i.e.: 'alerts.attributes.params.riskScore' -> 'alerts.attributes.mapped_params.risk_score'
+ */
+export const getModifiedFilter = (filter: string) => {
+ return filter.replace('.params.', '.mapped_params.');
+};
+
+/**
+ * Returns modified field with mapped_params instead of params.
+ *
+ * i.e.: 'params.riskScore' -> 'mapped_params.risk_score'
+ */
+export const getModifiedField = (field: string | undefined) => {
+ if (!field) {
+ return field;
+ }
+
+ const sortFieldToReplace = `${snakeCase(field.replace('params.', ''))}`;
+
+ if (MAPPED_PARAMS_PROPERTIES.includes(sortFieldToReplace as keyof MappedParamsProperties)) {
+ return `mapped_params.${sortFieldToReplace}`;
+ }
+
+ return field;
+};
+
+/**
+ * Returns modified search fields with mapped_params instead of params.
+ *
+ * i.e.:
+ * [
+ * 'params.riskScore',
+ * 'params.severity',
+ * ]
+ * ->
+ * [
+ * 'mapped_params.riskScore',
+ * 'mapped_params.severity',
+ * ]
+ */
+export const getModifiedSearchFields = (searchFields: string[] | undefined) => {
+ if (!searchFields) {
+ return searchFields;
+ }
+
+ return searchFields.reduce((result, field) => {
+ const modifiedField = getModifiedField(field);
+ if (modifiedField) {
+ return [...result, modifiedField];
+ }
+ return result;
+ }, []);
+};
+
+export const getModifiedValue = (key: string, value: string) => {
+ if (key === 'severity') {
+ return SEVERITY_MAP[value] || '';
+ }
+ return value;
+};
+
+export const getModifiedSearch = (searchFields: string | string[] | undefined, value: string) => {
+ if (!searchFields) {
+ return value;
+ }
+
+ const fieldNames = Array.isArray(searchFields) ? searchFields : [searchFields];
+
+ const modifiedSearchValues = fieldNames.map((fieldName) => {
+ const firstAttribute = getFieldNameAttribute(fieldName, [
+ 'alert',
+ 'attributes',
+ 'params',
+ 'mapped_params',
+ ]);
+ return getModifiedValue(firstAttribute, value);
+ });
+
+ return modifiedSearchValues.find((search) => search !== value) || value;
+};
+
+export const modifyFilterKueryNode = ({
+ astFilter,
+ hasNestedKey = false,
+ nestedKeys,
+ storeValue,
+ path = 'arguments',
+}: IterateFilterKureyNodeParams) => {
+ const action = ({ index, ast, fieldName, localFieldName }: IterateActionProps) => {
+ // First index, assuming ast value is the attribute name
+ if (index === 0) {
+ const firstAttribute = getFieldNameAttribute(fieldName, ['alert', 'attributes']);
+ // Replace the ast.value for params to mapped_params
+ if (firstAttribute === 'params') {
+ ast.value = getModifiedFilter(ast.value);
+ }
+ }
+
+ // Subsequent indices, assuming ast value is the filtering value
+ else {
+ const firstAttribute = getFieldNameAttribute(localFieldName, ['alert', 'attributes']);
+
+ // Replace the ast.value for params value to the modified mapped_params value
+ if (firstAttribute === 'params' && ast.value) {
+ const attribute = getFieldNameAttribute(localFieldName, ['alert', 'attributes', 'params']);
+ ast.value = getModifiedValue(attribute, ast.value);
+ }
+ }
+ };
+
+ iterateFilterKureyNode({
+ astFilter,
+ hasNestedKey,
+ nestedKeys,
+ storeValue,
+ path,
+ action,
+ });
+};
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/validate_attributes.test.ts b/x-pack/plugins/alerting/server/rules_client/lib/validate_attributes.test.ts
index 652c30ff380c55..1777a36d80a2f1 100644
--- a/x-pack/plugins/alerting/server/rules_client/lib/validate_attributes.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/lib/validate_attributes.test.ts
@@ -13,7 +13,7 @@ import {
} from './validate_attributes';
describe('Validate attributes', () => {
- const excludedFieldNames = ['monitoring'];
+ const excludedFieldNames = ['monitoring', 'mapped_params'];
describe('validateSortField', () => {
test('should NOT throw an error, when sort field is not part of the field to exclude', () => {
expect(() => validateSortField('name.keyword', excludedFieldNames)).not.toThrow();
@@ -86,6 +86,17 @@ describe('Validate attributes', () => {
).not.toThrow();
});
+ test('should NOT throw an error, when filter contains params with validate properties', () => {
+ expect(() =>
+ validateFilterKueryNode({
+ astFilter: esKuery.fromKueryExpression(
+ 'alert.attributes.name: "Rule I" and alert.attributes.tags: "fast" and alert.attributes.params.risk_score > 50'
+ ),
+ excludedFieldNames,
+ })
+ ).not.toThrow();
+ });
+
test('should throw an error, when filter contains the field to exclude', () => {
expect(() =>
validateFilterKueryNode({
@@ -111,5 +122,18 @@ describe('Validate attributes', () => {
`"Filter is not supported on this field alert.attributes.actions"`
);
});
+
+ test('should throw an error, when filtering contains a property that is not valid', () => {
+ expect(() =>
+ validateFilterKueryNode({
+ astFilter: esKuery.fromKueryExpression(
+ 'alert.attributes.name: "Rule I" and alert.attributes.tags: "fast" and alert.attributes.mapped_params.risk_score > 50'
+ ),
+ excludedFieldNames,
+ })
+ ).toThrowErrorMatchingInlineSnapshot(
+ `"Filter is not supported on this field alert.attributes.mapped_params.risk_score"`
+ );
+ });
});
});
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/validate_attributes.ts b/x-pack/plugins/alerting/server/rules_client/lib/validate_attributes.ts
index fa65f4c2f0999b..ad17ede1b99adc 100644
--- a/x-pack/plugins/alerting/server/rules_client/lib/validate_attributes.ts
+++ b/x-pack/plugins/alerting/server/rules_client/lib/validate_attributes.ts
@@ -7,11 +7,18 @@
import { KueryNode } from '@kbn/es-query';
import { get, isEmpty } from 'lodash';
-
import mappings from '../../saved_objects/mappings.json';
const astFunctionType = ['is', 'range', 'nested'];
+export const getFieldNameAttribute = (fieldName: string, attributesToIgnore: string[]) => {
+ const fieldNameSplit = (fieldName || '')
+ .split('.')
+ .filter((fn: string) => !attributesToIgnore.includes(fn));
+
+ return fieldNameSplit.length > 0 ? fieldNameSplit[0] : '';
+};
+
export const validateOperationOnAttributes = (
astFilter: KueryNode | null,
sortField: string | undefined,
@@ -44,28 +51,41 @@ export const validateSearchFields = (searchFields: string[], excludedFieldNames:
}
};
-interface ValidateFilterKueryNodeParams {
+export interface IterateActionProps {
+ ast: KueryNode;
+ index: number;
+ fieldName: string;
+ localFieldName: string;
+}
+
+export interface IterateFilterKureyNodeParams {
astFilter: KueryNode;
- excludedFieldNames: string[];
hasNestedKey?: boolean;
nestedKeys?: string;
storeValue?: boolean;
path?: string;
+ action?: (props: IterateActionProps) => void;
}
-export const validateFilterKueryNode = ({
+export interface ValidateFilterKueryNodeParams extends IterateFilterKureyNodeParams {
+ excludedFieldNames: string[];
+}
+
+export const iterateFilterKureyNode = ({
astFilter,
- excludedFieldNames,
hasNestedKey = false,
nestedKeys,
storeValue,
path = 'arguments',
-}: ValidateFilterKueryNodeParams) => {
+ action = () => {},
+}: IterateFilterKureyNodeParams) => {
let localStoreValue = storeValue;
let localNestedKeys: string | undefined;
+ let localFieldName: string = '';
if (localStoreValue === undefined) {
localStoreValue = astFilter.type === 'function' && astFunctionType.includes(astFilter.function);
}
+
astFilter.arguments.forEach((ast: KueryNode, index: number) => {
if (hasNestedKey && ast.type === 'literal' && ast.value != null) {
localNestedKeys = ast.value;
@@ -80,25 +100,56 @@ export const validateFilterKueryNode = ({
if (ast.arguments) {
const myPath = `${path}.${index}`;
- validateFilterKueryNode({
+ iterateFilterKureyNode({
astFilter: ast,
- excludedFieldNames,
storeValue: ast.type === 'function' && astFunctionType.includes(ast.function),
path: `${myPath}.arguments`,
hasNestedKey: ast.type === 'function' && ast.function === 'nested',
nestedKeys: localNestedKeys || nestedKeys,
+ action,
});
}
- if (localStoreValue && index === 0) {
+ if (localStoreValue) {
const fieldName = nestedKeys != null ? `${nestedKeys}.${ast.value}` : ast.value;
- const fieldNameSplit = fieldName
- .split('.')
- .filter((fn: string) => !['alert', 'attributes'].includes(fn));
- const firstAttribute = fieldNameSplit.length > 0 ? fieldNameSplit[0] : '';
+
+ if (index === 0) {
+ localFieldName = fieldName;
+ }
+
+ action({
+ ast,
+ index,
+ fieldName,
+ localFieldName,
+ });
+ }
+ });
+};
+
+export const validateFilterKueryNode = ({
+ astFilter,
+ excludedFieldNames,
+ hasNestedKey = false,
+ nestedKeys,
+ storeValue,
+ path = 'arguments',
+}: ValidateFilterKueryNodeParams) => {
+ const action = ({ index, fieldName }: IterateActionProps) => {
+ if (index === 0) {
+ const firstAttribute = getFieldNameAttribute(fieldName, ['alert', 'attributes']);
if (excludedFieldNames.includes(firstAttribute)) {
throw new Error(`Filter is not supported on this field ${fieldName}`);
}
}
+ };
+
+ iterateFilterKureyNode({
+ astFilter,
+ hasNestedKey,
+ nestedKeys,
+ storeValue,
+ path,
+ action,
});
};
diff --git a/x-pack/plugins/alerting/server/rules_client/rules_client.ts b/x-pack/plugins/alerting/server/rules_client/rules_client.ts
index 6d3ffc822a626d..86f0d3becdce77 100644
--- a/x-pack/plugins/alerting/server/rules_client/rules_client.ts
+++ b/x-pack/plugins/alerting/server/rules_client/rules_client.ts
@@ -78,6 +78,13 @@ import { Alert } from '../alert';
import { EVENT_LOG_ACTIONS } from '../plugin';
import { createAlertEventLogRecordObject } from '../lib/create_alert_event_log_record_object';
import { getDefaultRuleMonitoring } from '../task_runner/task_runner';
+import {
+ getMappedParams,
+ getModifiedField,
+ getModifiedSearchFields,
+ getModifiedSearch,
+ modifyFilterKueryNode,
+} from './lib/mapped_params_utils';
export interface RegistryAlertTypeWithAuth extends RegistryRuleType {
authorizedConsumers: string[];
@@ -251,7 +258,10 @@ export class RulesClient {
private readonly kibanaVersion!: PluginInitializerContext['env']['packageInfo']['version'];
private readonly auditLogger?: AuditLogger;
private readonly eventLogger?: IEventLogger;
- private readonly fieldsToExcludeFromPublicApi: Array = ['monitoring'];
+ private readonly fieldsToExcludeFromPublicApi: Array = [
+ 'monitoring',
+ 'mapped_params',
+ ];
constructor({
ruleTypeRegistry,
@@ -371,6 +381,12 @@ export class RulesClient {
monitoring: getDefaultRuleMonitoring(),
};
+ const mappedParams = getMappedParams(updatedParams);
+
+ if (Object.keys(mappedParams).length) {
+ rawRule.mapped_params = mappedParams;
+ }
+
this.auditLogger?.log(
ruleAuditEvent({
action: RuleAuditAction.CREATE,
@@ -634,9 +650,10 @@ export class RulesClient {
);
throw error;
}
+
const { filter: authorizationFilter, ensureRuleTypeIsAuthorized } = authorizationTuple;
const filterKueryNode = options.filter ? esKuery.fromKueryExpression(options.filter) : null;
- const sortField = mapSortField(options.sortField);
+ let sortField = mapSortField(options.sortField);
if (excludeFromPublicApi) {
try {
validateOperationOnAttributes(
@@ -650,6 +667,24 @@ export class RulesClient {
}
}
+ sortField = mapSortField(getModifiedField(options.sortField));
+
+ // Generate new modified search and search fields, translating certain params properties
+ // to mapped_params. Thus, allowing for sort/search/filtering on params.
+ // We do the modifcation after the validate check to make sure the public API does not
+ // use the mapped_params in their queries.
+ options = {
+ ...options,
+ ...(options.searchFields && { searchFields: getModifiedSearchFields(options.searchFields) }),
+ ...(options.search && { search: getModifiedSearch(options.searchFields, options.search) }),
+ };
+
+ // Modifies kuery node AST to translate params filter and the filter value to mapped_params.
+ // This translation is done in place, and therefore is not a pure function.
+ if (filterKueryNode) {
+ modifyFilterKueryNode({ astFilter: filterKueryNode });
+ }
+
const {
page,
per_page: perPage,
@@ -1027,6 +1062,13 @@ export class RulesClient {
updatedBy: username,
updatedAt: new Date().toISOString(),
});
+
+ const mappedParams = getMappedParams(updatedParams);
+
+ if (Object.keys(mappedParams).length) {
+ createAttributes.mapped_params = mappedParams;
+ }
+
try {
updatedObject = await this.unsecuredSavedObjectsClient.create(
'alert',
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts
index 6ccc640dcc1351..8cecb47f23a886 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts
@@ -1878,6 +1878,167 @@ describe('create()', () => {
`);
});
+ test('should create alerts with mapped_params', async () => {
+ const data = getMockData({
+ params: {
+ bar: true,
+ risk_score: 42,
+ severity: 'low',
+ },
+ });
+
+ const createdAttributes = {
+ ...data,
+ alertTypeId: '123',
+ schedule: { interval: '10s' },
+ params: {
+ bar: true,
+ risk_score: 42,
+ severity: 'low',
+ },
+ createdAt: '2019-02-12T21:01:22.479Z',
+ createdBy: 'elastic',
+ updatedBy: 'elastic',
+ updatedAt: '2019-02-12T21:01:22.479Z',
+ muteAll: false,
+ mutedInstanceIds: [],
+ actions: [
+ {
+ group: 'default',
+ actionRef: 'action_0',
+ actionTypeId: 'test',
+ params: {
+ foo: true,
+ },
+ },
+ ],
+ };
+ unsecuredSavedObjectsClient.create.mockResolvedValueOnce({
+ id: '123',
+ type: 'alert',
+ attributes: createdAttributes,
+ references: [
+ {
+ name: 'action_0',
+ type: 'action',
+ id: '1',
+ },
+ ],
+ });
+
+ const result = await rulesClient.create({ data });
+
+ expect(unsecuredSavedObjectsClient.create).toHaveBeenCalledWith(
+ 'alert',
+ {
+ enabled: true,
+ name: 'abc',
+ tags: ['foo'],
+ alertTypeId: '123',
+ consumer: 'bar',
+ schedule: {
+ interval: '1m',
+ },
+ throttle: null,
+ notifyWhen: 'onActiveAlert',
+ params: {
+ bar: true,
+ risk_score: 42,
+ severity: 'low',
+ },
+ actions: [
+ {
+ group: 'default',
+ params: {
+ foo: true,
+ },
+ actionRef: 'action_0',
+ actionTypeId: 'test',
+ },
+ ],
+ apiKeyOwner: null,
+ apiKey: null,
+ legacyId: null,
+ createdBy: 'elastic',
+ updatedBy: 'elastic',
+ createdAt: '2019-02-12T21:01:22.479Z',
+ updatedAt: '2019-02-12T21:01:22.479Z',
+ muteAll: false,
+ mutedInstanceIds: [],
+ executionStatus: {
+ status: 'pending',
+ lastExecutionDate: '2019-02-12T21:01:22.479Z',
+ error: null,
+ },
+ monitoring: {
+ execution: {
+ history: [],
+ calculated_metrics: {
+ success_ratio: 0,
+ },
+ },
+ },
+ mapped_params: {
+ risk_score: 42,
+ severity: '20-low',
+ },
+ meta: {
+ versionApiKeyLastmodified: 'v8.0.0',
+ },
+ },
+ {
+ references: [
+ {
+ id: '1',
+ name: 'action_0',
+ type: 'action',
+ },
+ ],
+ id: 'mock-saved-object-id',
+ }
+ );
+
+ expect(result).toMatchInlineSnapshot(`
+ Object {
+ "actions": Array [
+ Object {
+ "actionTypeId": "test",
+ "group": "default",
+ "id": "1",
+ "params": Object {
+ "foo": true,
+ },
+ },
+ ],
+ "alertTypeId": "123",
+ "consumer": "bar",
+ "createdAt": 2019-02-12T21:01:22.479Z,
+ "createdBy": "elastic",
+ "enabled": true,
+ "id": "123",
+ "muteAll": false,
+ "mutedInstanceIds": Array [],
+ "name": "abc",
+ "notifyWhen": null,
+ "params": Object {
+ "bar": true,
+ "risk_score": 42,
+ "severity": "low",
+ },
+ "schedule": Object {
+ "interval": "10s",
+ },
+ "scheduledTaskId": "task-123",
+ "tags": Array [
+ "foo",
+ ],
+ "throttle": null,
+ "updatedAt": 2019-02-12T21:01:22.479Z,
+ "updatedBy": "elastic",
+ }
+ `);
+ });
+
test('should validate params', async () => {
const data = getMockData();
ruleTypeRegistry.get.mockReturnValue({
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
index 60aac3f266e785..bd382faa6d6cb0 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
@@ -290,6 +290,37 @@ describe('find()', () => {
expect(jest.requireMock('../lib/map_sort_field').mapSortField).toHaveBeenCalledWith('name');
});
+ test('should translate filter/sort/search on params to mapped_params', async () => {
+ const filter = esKuery.fromKueryExpression(
+ '((alert.attributes.alertTypeId:myType and alert.attributes.consumer:myApp) or (alert.attributes.alertTypeId:myOtherType and alert.attributes.consumer:myApp) or (alert.attributes.alertTypeId:myOtherType and alert.attributes.consumer:myOtherApp))'
+ );
+ authorization.getFindAuthorizationFilter.mockResolvedValue({
+ filter,
+ ensureRuleTypeIsAuthorized() {},
+ });
+
+ const rulesClient = new RulesClient(rulesClientParams);
+ await rulesClient.find({
+ options: {
+ sortField: 'params.risk_score',
+ searchFields: ['params.risk_score', 'params.severity'],
+ filter: 'alert.attributes.params.risk_score > 50',
+ },
+ excludeFromPublicApi: true,
+ });
+
+ const findCallParams = unsecuredSavedObjectsClient.find.mock.calls[0][0];
+
+ expect(findCallParams.searchFields).toEqual([
+ 'mapped_params.risk_score',
+ 'mapped_params.severity',
+ ]);
+
+ expect(findCallParams.filter.arguments[0].arguments[0].value).toEqual(
+ 'alert.attributes.mapped_params.risk_score'
+ );
+ });
+
test('should call useSavedObjectReferences.injectReferences if defined for rule type', async () => {
jest.resetAllMocks();
authorization.getFindAuthorizationFilter.mockResolvedValue({
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
index 1def4b7d60f4e1..be2f859ac96b3f 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
@@ -252,6 +252,8 @@ describe('update()', () => {
tags: ['foo'],
params: {
bar: true,
+ risk_score: 40,
+ severity: 'low',
},
throttle: null,
notifyWhen: 'onActiveAlert',
@@ -362,6 +364,10 @@ describe('update()', () => {
"apiKeyOwner": null,
"consumer": "myApp",
"enabled": true,
+ "mapped_params": Object {
+ "risk_score": 40,
+ "severity": "20-low",
+ },
"meta": Object {
"versionApiKeyLastmodified": "v7.10.0",
},
@@ -369,6 +375,8 @@ describe('update()', () => {
"notifyWhen": "onActiveAlert",
"params": Object {
"bar": true,
+ "risk_score": 40,
+ "severity": "low",
},
"schedule": Object {
"interval": "1m",
diff --git a/x-pack/plugins/alerting/server/saved_objects/mappings.json b/x-pack/plugins/alerting/server/saved_objects/mappings.json
index d6ebd25d4af375..e6eedced78914a 100644
--- a/x-pack/plugins/alerting/server/saved_objects/mappings.json
+++ b/x-pack/plugins/alerting/server/saved_objects/mappings.json
@@ -53,6 +53,16 @@
"type": "flattened",
"ignore_above": 4096
},
+ "mapped_params": {
+ "properties": {
+ "risk_score": {
+ "type": "float"
+ },
+ "severity": {
+ "type": "keyword"
+ }
+ }
+ },
"scheduledTaskId": {
"type": "keyword"
},
@@ -155,6 +165,10 @@
}
}
}
+ },
+ "snoozeEndTime": {
+ "type": "date",
+ "format": "strict_date_time"
}
}
}
diff --git a/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts b/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts
index 1d7d3d2a362a99..28b1f599f9575a 100644
--- a/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts
@@ -2229,6 +2229,30 @@ describe('successful migrations', () => {
);
});
+ describe('8.2.0', () => {
+ test('migrates params to mapped_params', () => {
+ const migration820 = getMigrations(encryptedSavedObjectsSetup, isPreconfigured)['8.2.0'];
+ const alert = getMockData(
+ {
+ params: {
+ risk_score: 60,
+ severity: 'high',
+ foo: 'bar',
+ },
+ alertTypeId: 'siem.signals',
+ },
+ true
+ );
+
+ const migratedAlert820 = migration820(alert, migrationContext);
+
+ expect(migratedAlert820.attributes.mapped_params).toEqual({
+ risk_score: 60,
+ severity: '60-high',
+ });
+ });
+ });
+
describe('Metrics Inventory Threshold rule', () => {
test('Migrates incorrect action group spelling', () => {
const migration800 = getMigrations(encryptedSavedObjectsSetup, isPreconfigured)['8.0.0'];
diff --git a/x-pack/plugins/alerting/server/saved_objects/migrations.ts b/x-pack/plugins/alerting/server/saved_objects/migrations.ts
index 6e6c886d91b531..09d505aec0f0c4 100644
--- a/x-pack/plugins/alerting/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/migrations.ts
@@ -21,6 +21,7 @@ import { RawRule, RawAlertAction } from '../types';
import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
import type { IsMigrationNeededPredicate } from '../../../encrypted_saved_objects/server';
import { extractRefsFromGeoContainmentAlert } from './geo_containment/migrations';
+import { getMappedParams } from '../../server/rules_client/lib/mapped_params_utils';
const SIEM_APP_ID = 'securitySolution';
const SIEM_SERVER_APP_ID = 'siem';
@@ -145,6 +146,12 @@ export function getMigrations(
pipeMigrations(addSecuritySolutionAADRuleTypeTags)
);
+ const migrationRules820 = createEsoMigration(
+ encryptedSavedObjects,
+ (doc: SavedObjectUnsanitizedDoc): doc is SavedObjectUnsanitizedDoc => true,
+ pipeMigrations(addMappedParams)
+ );
+
return {
'7.10.0': executeMigrationWithErrorHandling(migrationWhenRBACWasIntroduced, '7.10.0'),
'7.11.0': executeMigrationWithErrorHandling(migrationAlertUpdatedAtAndNotifyWhen, '7.11.0'),
@@ -155,6 +162,7 @@ export function getMigrations(
'7.16.0': executeMigrationWithErrorHandling(migrateRules716, '7.16.0'),
'8.0.0': executeMigrationWithErrorHandling(migrationRules800, '8.0.0'),
'8.0.1': executeMigrationWithErrorHandling(migrationRules801, '8.0.1'),
+ '8.2.0': executeMigrationWithErrorHandling(migrationRules820, '8.2.0'),
};
}
@@ -822,6 +830,28 @@ function fixInventoryThresholdGroupId(
}
}
+function addMappedParams(
+ doc: SavedObjectUnsanitizedDoc
+): SavedObjectUnsanitizedDoc {
+ const {
+ attributes: { params },
+ } = doc;
+
+ const mappedParams = getMappedParams(params);
+
+ if (Object.keys(mappedParams).length) {
+ return {
+ ...doc,
+ attributes: {
+ ...doc.attributes,
+ mapped_params: mappedParams,
+ },
+ };
+ }
+
+ return doc;
+}
+
function getCorrespondingAction(
actions: SavedObjectAttribute,
connectorRef: string
diff --git a/x-pack/plugins/alerting/server/types.ts b/x-pack/plugins/alerting/server/types.ts
index 1642cc13d4dec8..6b06f7efe30660 100644
--- a/x-pack/plugins/alerting/server/types.ts
+++ b/x-pack/plugins/alerting/server/types.ts
@@ -40,6 +40,7 @@ import {
ActionVariable,
SanitizedRuleConfig,
RuleMonitoring,
+ MappedParams,
} from '../common';
import { LicenseType } from '../../licensing/server';
import { IAbortableClusterClient } from './lib/create_abortable_es_client_factory';
@@ -236,6 +237,7 @@ export interface RawRule extends SavedObjectAttributes {
schedule: SavedObjectAttributes;
actions: RawAlertAction[];
params: SavedObjectAttributes;
+ mapped_params?: MappedParams;
scheduledTaskId?: string | null;
createdBy: string | null;
updatedBy: string | null;
@@ -250,6 +252,7 @@ export interface RawRule extends SavedObjectAttributes {
meta?: AlertMeta;
executionStatus: RawRuleExecutionStatus;
monitoring?: RuleMonitoring;
+ snoozeEndTime?: string;
}
export type AlertInfoParams = Pick<
diff --git a/x-pack/plugins/apm/common/environment_filter_values.ts b/x-pack/plugins/apm/common/environment_filter_values.ts
index f0bd386f36de89..ddd1ffd9b8d451 100644
--- a/x-pack/plugins/apm/common/environment_filter_values.ts
+++ b/x-pack/plugins/apm/common/environment_filter_values.ts
@@ -12,6 +12,13 @@ import { Environment } from './environment_rt';
const ENVIRONMENT_ALL_VALUE = 'ENVIRONMENT_ALL' as const;
const ENVIRONMENT_NOT_DEFINED_VALUE = 'ENVIRONMENT_NOT_DEFINED' as const;
+export const allOptionText = i18n.translate(
+ 'xpack.apm.filter.environment.allLabel',
+ {
+ defaultMessage: 'All',
+ }
+);
+
export function getEnvironmentLabel(environment: string) {
if (!environment || environment === ENVIRONMENT_NOT_DEFINED_VALUE) {
return i18n.translate('xpack.apm.filter.environment.notDefinedLabel', {
@@ -20,19 +27,24 @@ export function getEnvironmentLabel(environment: string) {
}
if (environment === ENVIRONMENT_ALL_VALUE) {
- return i18n.translate('xpack.apm.filter.environment.allLabel', {
- defaultMessage: 'All',
- });
+ return allOptionText;
}
return environment;
}
-export const ENVIRONMENT_ALL = {
+// #TODO Once we replace the select dropdown we can remove it
+// EuiSelect > EuiSelectOption accepts text attribute
+export const ENVIRONMENT_ALL_SELECT_OPTION = {
value: ENVIRONMENT_ALL_VALUE,
text: getEnvironmentLabel(ENVIRONMENT_ALL_VALUE),
};
+export const ENVIRONMENT_ALL = {
+ value: ENVIRONMENT_ALL_VALUE,
+ label: getEnvironmentLabel(ENVIRONMENT_ALL_VALUE),
+};
+
export const ENVIRONMENT_NOT_DEFINED = {
value: ENVIRONMENT_NOT_DEFINED_VALUE,
text: getEnvironmentLabel(ENVIRONMENT_NOT_DEFINED_VALUE),
diff --git a/x-pack/plugins/apm/public/components/alerting/fields.tsx b/x-pack/plugins/apm/public/components/alerting/fields.tsx
index 171953ea522eb4..4abbd97d98db46 100644
--- a/x-pack/plugins/apm/public/components/alerting/fields.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/fields.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { EuiComboBoxOptionOption, EuiFieldNumber } from '@elastic/eui';
+import { EuiFieldNumber } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
import {
@@ -16,22 +16,11 @@ import {
import {
ENVIRONMENT_ALL,
getEnvironmentLabel,
+ allOptionText,
} from '../../../common/environment_filter_values';
import { SuggestionsSelect } from '../shared/suggestions_select';
import { PopoverExpression } from './service_alert_trigger/popover_expression';
-const allOptionText = i18n.translate('xpack.apm.alerting.fields.allOption', {
- defaultMessage: 'All',
-});
-const allOption: EuiComboBoxOptionOption = {
- label: allOptionText,
- value: allOptionText,
-};
-const environmentAllOption: EuiComboBoxOptionOption = {
- label: ENVIRONMENT_ALL.text,
- value: ENVIRONMENT_ALL.value,
-};
-
export function ServiceField({
allowAll = true,
currentValue,
@@ -43,13 +32,13 @@ export function ServiceField({
}) {
return (
+
>;
+ isDisabled: boolean;
value?: string;
- disabled: boolean;
- onChange: (event: React.ChangeEvent) => void;
+ onChange: (value?: string) => void;
}
export function FormRowSelect({
@@ -30,10 +30,25 @@ export function FormRowSelect({
fieldLabel,
isLoading,
options,
- value,
- disabled,
+ isDisabled,
onChange,
}: Props) {
+ const [selectedOptions, setSelected] = useState<
+ Array> | undefined
+ >([]);
+
+ const handleOnChange = (
+ nextSelectedOptions: Array>
+ ) => {
+ const [selectedOption] = nextSelectedOptions;
+ setSelected(nextSelectedOptions);
+ onChange(selectedOption.value);
+ };
+
+ useEffect(() => {
+ setSelected(undefined);
+ }, [isLoading]);
+
return (
-
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx
new file mode 100644
index 00000000000000..f3f680ff4a9ffa
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiDescribedFormGroup, EuiFormRow } from '@elastic/eui';
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { SuggestionsSelect } from '../../../../../shared/suggestions_select';
+import { ENVIRONMENT_ALL } from '../../../../../../../common/environment_filter_values';
+
+interface Props {
+ title: string;
+ field: string;
+ description: string;
+ fieldLabel: string;
+ value?: string;
+ allowAll?: boolean;
+ onChange: (value?: string) => void;
+}
+
+export function FormRowSuggestionsSelect({
+ title,
+ field,
+ description,
+ fieldLabel,
+ value,
+ allowAll = true,
+ onChange,
+}: Props) {
+ return (
+ {title}}
+ description={description}
+ >
+
+
+
+
+ );
+}
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx
index 6f141a0ad8d566..9f8d3ca1318b56 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx
@@ -18,7 +18,8 @@ import {
import { useFetcher, FETCH_STATUS } from '../../../../../../hooks/use_fetcher';
import { FormRowSelect } from './form_row_select';
import { APMLink } from '../../../../../shared/links/apm/apm_link';
-
+import { FormRowSuggestionsSelect } from './form_row_suggestions_select';
+import { SERVICE_NAME } from '../../../../../../../common/elasticsearch_fieldnames';
interface Props {
newConfig: AgentConfigurationIntake;
setNewConfig: React.Dispatch>;
@@ -26,17 +27,6 @@ interface Props {
}
export function ServicePage({ newConfig, setNewConfig, onClickNext }: Props) {
- const { data: serviceNamesData, status: serviceNamesStatus } = useFetcher(
- (callApmApi) => {
- return callApmApi('GET /api/apm/settings/agent-configuration/services', {
- isCachable: true,
- });
- },
- [],
- { preservePreviousData: false }
- );
- const serviceNames = serviceNamesData?.serviceNames ?? [];
-
const { data: environmentsData, status: environmentsStatus } = useFetcher(
(callApmApi) => {
if (newConfig.service.name) {
@@ -81,14 +71,10 @@ export function ServicePage({ newConfig, setNewConfig, onClickNext }: Props) {
{ defaultMessage: 'already configured' }
);
- const serviceNameOptions = serviceNames.map((name) => ({
- text: getOptionLabel(name),
- value: name,
- }));
const environmentOptions = environments.map(
({ name, alreadyConfigured }) => ({
disabled: alreadyConfigured,
- text: `${getOptionLabel(name)} ${
+ label: `${getOptionLabel(name)} ${
alreadyConfigured ? `(${ALREADY_CONFIGURED_TRANSLATED})` : ''
}`,
value: name,
@@ -98,7 +84,7 @@ export function ServicePage({ newConfig, setNewConfig, onClickNext }: Props) {
return (
<>
{/* Service name options */}
- {
- e.preventDefault();
- const name = e.target.value;
+ onChange={(name) => {
setNewConfig((prev) => ({
...prev,
service: { name, environment: '' },
}));
}}
/>
-
{/* Environment options */}
{
- e.preventDefault();
- const environment = e.target.value;
+ onChange={(environment) => {
setNewConfig((prev) => ({
...prev,
service: { name: prev.service.name, environment },
}));
}}
/>
-
-
{/* Cancel button */}
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/filters_section.tsx b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/filters_section.tsx
index 3ef8697cde8d98..3b1438b4dddb04 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/filters_section.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/filters_section.tsx
@@ -7,7 +7,6 @@
import {
EuiButtonEmpty,
- EuiFieldText,
EuiFlexGroup,
EuiFlexItem,
EuiSelect,
@@ -27,6 +26,7 @@ import {
FILTER_SELECT_OPTIONS,
getSelectOptions,
} from './helper';
+import { SuggestionsSelect } from '../../../../shared/suggestions_select';
export function FiltersSection({
filters,
@@ -117,15 +117,17 @@ export function FiltersSection({
/>
- onChangeFilter(key, e.target.value, idx)}
- value={value}
+ onChange={(selectedValue) =>
+ onChangeFilter(key, selectedValue as string, idx)
+ }
+ defaultValue={value}
isInvalid={!isEmpty(key) && isEmpty(value)}
/>
diff --git a/x-pack/plugins/apm/public/components/shared/environment_filter/index.tsx b/x-pack/plugins/apm/public/components/shared/environment_filter/index.tsx
index 64d137cae0c27e..9a3d677b3f0788 100644
--- a/x-pack/plugins/apm/public/components/shared/environment_filter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/environment_filter/index.tsx
@@ -11,7 +11,7 @@ import { History } from 'history';
import React from 'react';
import { useHistory, useLocation } from 'react-router-dom';
import {
- ENVIRONMENT_ALL,
+ ENVIRONMENT_ALL_SELECT_OPTION,
ENVIRONMENT_NOT_DEFINED,
} from '../../../../common/environment_filter_values';
import { fromQuery, toQuery } from '../links/url_helpers';
@@ -51,7 +51,7 @@ function getOptions(environments: string[]) {
}));
return [
- ENVIRONMENT_ALL,
+ ENVIRONMENT_ALL_SELECT_OPTION,
...(environments.includes(ENVIRONMENT_NOT_DEFINED.value)
? [ENVIRONMENT_NOT_DEFINED]
: []),
diff --git a/x-pack/plugins/apm/public/components/shared/suggestions_select/index.tsx b/x-pack/plugins/apm/public/components/shared/suggestions_select/index.tsx
index 2d735ec4ea7083..8b8907af4bc215 100644
--- a/x-pack/plugins/apm/public/components/shared/suggestions_select/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/suggestions_select/index.tsx
@@ -6,17 +6,20 @@
*/
import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
-import { debounce } from 'lodash';
+import { throttle } from 'lodash';
import React, { useCallback, useState } from 'react';
import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
interface SuggestionsSelectProps {
allOption?: EuiComboBoxOptionOption;
- customOptionText: string;
+ customOptionText?: string;
defaultValue?: string;
field: string;
onChange: (value?: string) => void;
+ isClearable?: boolean;
+ isInvalid?: boolean;
placeholder: string;
+ dataTestSubj?: string;
}
export function SuggestionsSelect({
@@ -26,13 +29,12 @@ export function SuggestionsSelect({
field,
onChange,
placeholder,
+ isInvalid,
+ dataTestSubj,
+ isClearable = true,
}: SuggestionsSelectProps) {
- const allowAll = !!allOption;
let defaultOption: EuiComboBoxOptionOption | undefined;
- if (allowAll && !defaultValue) {
- defaultOption = allOption;
- }
if (defaultValue) {
defaultOption = { label: defaultValue, value: defaultValue };
}
@@ -57,6 +59,11 @@ export function SuggestionsSelect({
const handleChange = useCallback(
(changedOptions: Array>) => {
setSelectedOptions(changedOptions);
+
+ if (changedOptions.length === 0) {
+ onChange('');
+ }
+
if (changedOptions.length === 1) {
onChange(
changedOptions[0].value
@@ -91,17 +98,19 @@ export function SuggestionsSelect({
return (
);
}
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx
index 851472cfedabe4..f2919fc12cad6a 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx
@@ -375,8 +375,12 @@ describe('TransactionActionMenu component', () => {
const getFilterKeyValue = (key: string) => {
return {
[(component.getAllByText(key)[0] as HTMLOptionElement).text]: (
- component.getAllByTestId(`${key}.value`)[0] as HTMLInputElement
- ).value,
+ component
+ .getByTestId(`${key}.value`)
+ .querySelector(
+ '[data-test-subj="comboBoxInput"] span'
+ ) as HTMLSpanElement
+ ).textContent,
};
};
expect(getFilterKeyValue('service.name')).toEqual({
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/routes/settings/agent_configuration/__snapshots__/queries.test.ts.snap
index b6b4f2208d04f5..6009dd3ad7b969 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/__snapshots__/queries.test.ts.snap
@@ -148,31 +148,6 @@ Object {
}
`;
-exports[`agent configuration queries getServiceNames fetches service names 1`] = `
-Object {
- "apm": Object {
- "events": Array [
- "transaction",
- "error",
- "metric",
- ],
- },
- "body": Object {
- "aggs": Object {
- "services": Object {
- "terms": Object {
- "field": "service.name",
- "min_doc_count": 0,
- "size": 50,
- },
- },
- },
- "size": 0,
- "timeout": "1ms",
- },
-}
-`;
-
exports[`agent configuration queries listConfigurations fetches configurations 1`] = `
Object {
"index": "myIndex",
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/get_service_names.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/get_service_names.ts
deleted file mode 100644
index 18e359c5b94259..00000000000000
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/get_service_names.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { ProcessorEvent } from '../../../../common/processor_event';
-import { Setup } from '../../../lib/helpers/setup_request';
-import { SERVICE_NAME } from '../../../../common/elasticsearch_fieldnames';
-import { ALL_OPTION_VALUE } from '../../../../common/agent_configuration/all_option';
-import { getProcessorEventForTransactions } from '../../../lib/helpers/transactions';
-
-export async function getServiceNames({
- setup,
- searchAggregatedTransactions,
- size,
-}: {
- setup: Setup;
- searchAggregatedTransactions: boolean;
- size: number;
-}) {
- const { apmEventClient } = setup;
-
- const params = {
- apm: {
- events: [
- getProcessorEventForTransactions(searchAggregatedTransactions),
- ProcessorEvent.error,
- ProcessorEvent.metric,
- ],
- },
- body: {
- timeout: '1ms',
- size: 0,
- aggs: {
- services: {
- terms: {
- field: SERVICE_NAME,
- min_doc_count: 0,
- size,
- },
- },
- },
- },
- };
-
- const resp = await apmEventClient.search(
- 'get_service_names_for_agent_config',
- params
- );
- const serviceNames =
- resp.aggregations?.services.buckets
- .map((bucket) => bucket.key as string)
- .sort() || [];
- return [ALL_OPTION_VALUE, ...serviceNames];
-}
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/queries.test.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/queries.test.ts
index 4ffc8ed98184bb..49a97c1ca4f774 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/queries.test.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/queries.test.ts
@@ -6,7 +6,6 @@
*/
import { getExistingEnvironmentsForService } from './get_environments/get_existing_environments_for_service';
-import { getServiceNames } from './get_service_names';
import { listConfigurations } from './list_configurations';
import { searchConfigurations } from './search_configurations';
import {
@@ -52,20 +51,6 @@ describe('agent configuration queries', () => {
});
});
- describe('getServiceNames', () => {
- it('fetches service names', async () => {
- mock = await inspectSearchParams((setup) =>
- getServiceNames({
- setup,
- searchAggregatedTransactions: false,
- size: 50,
- })
- );
-
- expect(mock.params).toMatchSnapshot();
- });
- });
-
describe('listConfigurations', () => {
it('fetches configurations', async () => {
mock = await inspectSearchParams((setup) =>
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts
index 53a55cc1b99b42..f2cfbe857ba48c 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts
@@ -10,7 +10,6 @@ import Boom from '@hapi/boom';
import { toBooleanRt } from '@kbn/io-ts-utils';
import { maxSuggestions } from '../../../../../observability/common';
import { setupRequest } from '../../../lib/helpers/setup_request';
-import { getServiceNames } from './get_service_names';
import { createOrUpdateConfiguration } from './create_or_update_configuration';
import { searchConfigurations } from './search_configurations';
import { findExactConfiguration } from './find_exact_configuration';
@@ -256,33 +255,6 @@ const agentConfigurationSearchRoute = createApmServerRoute({
* Utility endpoints (not documented as part of the public API)
*/
-// get list of services
-const listAgentConfigurationServicesRoute = createApmServerRoute({
- endpoint: 'GET /api/apm/settings/agent-configuration/services',
- options: { tags: ['access:apm'] },
- handler: async (resources): Promise<{ serviceNames: string[] }> => {
- const setup = await setupRequest(resources);
- const { start, end } = resources.params.query;
- const searchAggregatedTransactions = await getSearchAggregatedTransactions({
- apmEventClient: setup.apmEventClient,
- config: setup.config,
- kuery: '',
- start,
- end,
- });
- const size = await resources.context.core.uiSettings.client.get(
- maxSuggestions
- );
- const serviceNames = await getServiceNames({
- searchAggregatedTransactions,
- setup,
- size,
- });
-
- return { serviceNames };
- },
-});
-
// get environments for service
const listAgentConfigurationEnvironmentsRoute = createApmServerRoute({
endpoint: 'GET /api/apm/settings/agent-configuration/environments',
@@ -342,7 +314,6 @@ export const agentConfigurationRouteRepository = {
...deleteAgentConfigurationRoute,
...createOrUpdateAgentConfigurationRoute,
...agentConfigurationSearchRoute,
- ...listAgentConfigurationServicesRoute,
...listAgentConfigurationEnvironmentsRoute,
...agentConfigurationAgentNameRoute,
};
diff --git a/x-pack/plugins/cases/common/constants.ts b/x-pack/plugins/cases/common/constants.ts
index c57b40dbcf0024..0f3fd6345a672f 100644
--- a/x-pack/plugins/cases/common/constants.ts
+++ b/x-pack/plugins/cases/common/constants.ts
@@ -7,16 +7,33 @@
import { ConnectorTypes } from './api';
import { CasesContextFeatures } from './ui/types';
-export const DEFAULT_DATE_FORMAT = 'dateFormat';
-export const DEFAULT_DATE_FORMAT_TZ = 'dateFormat:tz';
+export const DEFAULT_DATE_FORMAT = 'dateFormat' as const;
+export const DEFAULT_DATE_FORMAT_TZ = 'dateFormat:tz' as const;
-export const APP_ID = 'cases';
+/**
+ * Application
+ */
+
+export const APP_ID = 'cases' as const;
+export const FEATURE_ID = 'generalCases' as const;
+export const APP_OWNER = 'cases' as const;
+export const APP_PATH = '/app/management/insightsAndAlerting/cases' as const;
+/**
+ * The main Cases application is in the stack management under the
+ * Alerts and Insights section. To do that, Cases registers to the management
+ * application. This constant holds the application ID of the management plugin
+ */
+export const STACK_APP_ID = 'management' as const;
+
+/**
+ * Saved objects
+ */
-export const CASE_SAVED_OBJECT = 'cases';
-export const CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT = 'cases-connector-mappings';
-export const CASE_USER_ACTION_SAVED_OBJECT = 'cases-user-actions';
-export const CASE_COMMENT_SAVED_OBJECT = 'cases-comments';
-export const CASE_CONFIGURE_SAVED_OBJECT = 'cases-configure';
+export const CASE_SAVED_OBJECT = 'cases' as const;
+export const CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT = 'cases-connector-mappings' as const;
+export const CASE_USER_ACTION_SAVED_OBJECT = 'cases-user-actions' as const;
+export const CASE_COMMENT_SAVED_OBJECT = 'cases-comments' as const;
+export const CASE_CONFIGURE_SAVED_OBJECT = 'cases-configure' as const;
/**
* If more values are added here please also add them here: x-pack/test/cases_api_integration/common/fixtures/plugins
@@ -33,32 +50,32 @@ export const SAVED_OBJECT_TYPES = [
* Case routes
*/
-export const CASES_URL = '/api/cases';
-export const CASE_DETAILS_URL = `${CASES_URL}/{case_id}`;
-export const CASE_CONFIGURE_URL = `${CASES_URL}/configure`;
-export const CASE_CONFIGURE_DETAILS_URL = `${CASES_URL}/configure/{configuration_id}`;
-export const CASE_CONFIGURE_CONNECTORS_URL = `${CASE_CONFIGURE_URL}/connectors`;
+export const CASES_URL = '/api/cases' as const;
+export const CASE_DETAILS_URL = `${CASES_URL}/{case_id}` as const;
+export const CASE_CONFIGURE_URL = `${CASES_URL}/configure` as const;
+export const CASE_CONFIGURE_DETAILS_URL = `${CASES_URL}/configure/{configuration_id}` as const;
+export const CASE_CONFIGURE_CONNECTORS_URL = `${CASE_CONFIGURE_URL}/connectors` as const;
-export const CASE_COMMENTS_URL = `${CASE_DETAILS_URL}/comments`;
-export const CASE_COMMENT_DETAILS_URL = `${CASE_DETAILS_URL}/comments/{comment_id}`;
-export const CASE_PUSH_URL = `${CASE_DETAILS_URL}/connector/{connector_id}/_push`;
-export const CASE_REPORTERS_URL = `${CASES_URL}/reporters`;
-export const CASE_STATUS_URL = `${CASES_URL}/status`;
-export const CASE_TAGS_URL = `${CASES_URL}/tags`;
-export const CASE_USER_ACTIONS_URL = `${CASE_DETAILS_URL}/user_actions`;
+export const CASE_COMMENTS_URL = `${CASE_DETAILS_URL}/comments` as const;
+export const CASE_COMMENT_DETAILS_URL = `${CASE_DETAILS_URL}/comments/{comment_id}` as const;
+export const CASE_PUSH_URL = `${CASE_DETAILS_URL}/connector/{connector_id}/_push` as const;
+export const CASE_REPORTERS_URL = `${CASES_URL}/reporters` as const;
+export const CASE_STATUS_URL = `${CASES_URL}/status` as const;
+export const CASE_TAGS_URL = `${CASES_URL}/tags` as const;
+export const CASE_USER_ACTIONS_URL = `${CASE_DETAILS_URL}/user_actions` as const;
-export const CASE_ALERTS_URL = `${CASES_URL}/alerts/{alert_id}`;
-export const CASE_DETAILS_ALERTS_URL = `${CASE_DETAILS_URL}/alerts`;
+export const CASE_ALERTS_URL = `${CASES_URL}/alerts/{alert_id}` as const;
+export const CASE_DETAILS_ALERTS_URL = `${CASE_DETAILS_URL}/alerts` as const;
-export const CASE_METRICS_DETAILS_URL = `${CASES_URL}/metrics/{case_id}`;
+export const CASE_METRICS_DETAILS_URL = `${CASES_URL}/metrics/{case_id}` as const;
/**
* Action routes
*/
-export const ACTION_URL = '/api/actions';
-export const ACTION_TYPES_URL = `${ACTION_URL}/connector_types`;
-export const CONNECTORS_URL = `${ACTION_URL}/connectors`;
+export const ACTION_URL = '/api/actions' as const;
+export const ACTION_TYPES_URL = `${ACTION_URL}/connector_types` as const;
+export const CONNECTORS_URL = `${ACTION_URL}/connectors` as const;
export const SUPPORTED_CONNECTORS = [
`${ConnectorTypes.serviceNowITSM}`,
@@ -71,10 +88,10 @@ export const SUPPORTED_CONNECTORS = [
/**
* Alerts
*/
-export const MAX_ALERTS_PER_CASE = 5000;
+export const MAX_ALERTS_PER_CASE = 5000 as const;
-export const SECURITY_SOLUTION_OWNER = 'securitySolution';
-export const OBSERVABILITY_OWNER = 'observability';
+export const SECURITY_SOLUTION_OWNER = 'securitySolution' as const;
+export const OBSERVABILITY_OWNER = 'observability' as const;
export const OWNER_INFO = {
[SECURITY_SOLUTION_OWNER]: {
@@ -85,16 +102,16 @@ export const OWNER_INFO = {
label: 'Observability',
iconType: 'logoObservability',
},
-};
+} as const;
-export const MAX_DOCS_PER_PAGE = 10000;
-export const MAX_CONCURRENT_SEARCHES = 10;
+export const MAX_DOCS_PER_PAGE = 10000 as const;
+export const MAX_CONCURRENT_SEARCHES = 10 as const;
/**
* Validation
*/
-export const MAX_TITLE_LENGTH = 64;
+export const MAX_TITLE_LENGTH = 64 as const;
/**
* Cases features
diff --git a/x-pack/plugins/cases/kibana.json b/x-pack/plugins/cases/kibana.json
index 170ac2a96aaa8d..c96372b57593db 100644
--- a/x-pack/plugins/cases/kibana.json
+++ b/x-pack/plugins/cases/kibana.json
@@ -10,8 +10,10 @@
"id":"cases",
"kibanaVersion":"kibana",
"optionalPlugins":[
+ "home",
"security",
"spaces",
+ "features",
"usageCollection"
],
"owner":{
@@ -20,14 +22,18 @@
},
"requiredPlugins":[
"actions",
+ "data",
+ "embeddable",
"esUiShared",
"lens",
"features",
"kibanaReact",
"kibanaUtils",
- "triggersActionsUi"
+ "triggersActionsUi",
+ "management"
],
"requiredBundles": [
+ "home",
"savedObjects"
],
"server":true,
diff --git a/x-pack/plugins/cases/public/application.tsx b/x-pack/plugins/cases/public/application.tsx
new file mode 100644
index 00000000000000..a528fa2376dbb5
--- /dev/null
+++ b/x-pack/plugins/cases/public/application.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Router } from 'react-router-dom';
+import { I18nProvider } from '@kbn/i18n-react';
+import { EuiErrorBoundary } from '@elastic/eui';
+
+import {
+ KibanaContextProvider,
+ KibanaThemeProvider,
+ useUiSetting$,
+} from '../../../../src/plugins/kibana_react/public';
+import { EuiThemeProvider as StyledComponentsThemeProvider } from '../../../../src/plugins/kibana_react/common';
+import { RenderAppProps } from './types';
+import { CasesApp } from './components/app';
+
+export const renderApp = (deps: RenderAppProps) => {
+ const { mountParams } = deps;
+ const { element } = mountParams;
+
+ ReactDOM.render(, element);
+
+ return () => {
+ ReactDOM.unmountComponentAtNode(element);
+ };
+};
+
+const CasesAppWithContext = () => {
+ const [darkMode] = useUiSetting$('theme:darkMode');
+
+ return (
+
+
+
+ );
+};
+
+CasesAppWithContext.displayName = 'CasesAppWithContext';
+
+export const App: React.FC<{ deps: RenderAppProps }> = ({ deps }) => {
+ const { mountParams, coreStart, pluginsStart, storage, kibanaVersion } = deps;
+ const { history, theme$ } = mountParams;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+App.displayName = 'App';
diff --git a/x-pack/plugins/cases/public/common/hooks.test.tsx b/x-pack/plugins/cases/public/common/hooks.test.tsx
new file mode 100644
index 00000000000000..f122d3312a6435
--- /dev/null
+++ b/x-pack/plugins/cases/public/common/hooks.test.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+
+import { TestProviders } from '../common/mock';
+import { useIsMainApplication } from './hooks';
+import { useApplication } from '../components/cases_context/use_application';
+
+jest.mock('../components/cases_context/use_application');
+
+const useApplicationMock = useApplication as jest.Mock;
+
+describe('hooks', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ useApplicationMock.mockReturnValue({ appId: 'management', appTitle: 'Management' });
+ });
+
+ describe('useIsMainApplication', () => {
+ it('returns true if it is the main application', () => {
+ const { result } = renderHook(() => useIsMainApplication(), {
+ wrapper: ({ children }) => {children},
+ });
+
+ expect(result.current).toBe(true);
+ });
+
+ it('returns false if it is not the main application', () => {
+ useApplicationMock.mockReturnValue({ appId: 'testAppId', appTitle: 'Test app' });
+ const { result } = renderHook(() => useIsMainApplication(), {
+ wrapper: ({ children }) => {children},
+ });
+
+ expect(result.current).toBe(false);
+ });
+ });
+});
diff --git a/x-pack/plugins/cases/public/common/hooks.ts b/x-pack/plugins/cases/public/common/hooks.ts
new file mode 100644
index 00000000000000..f65b56fecfd848
--- /dev/null
+++ b/x-pack/plugins/cases/public/common/hooks.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { STACK_APP_ID } from '../../common/constants';
+import { useCasesContext } from '../components/cases_context/use_cases_context';
+
+export const useIsMainApplication = () => {
+ const { appId } = useCasesContext();
+
+ return appId === STACK_APP_ID;
+};
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts b/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
index 08eb2ebf3df7a6..bf81e92af92bd7 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
@@ -10,7 +10,11 @@ import moment from 'moment-timezone';
import { useCallback, useEffect, useState } from 'react';
import { i18n } from '@kbn/i18n';
-import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_TZ } from '../../../../common/constants';
+import {
+ FEATURE_ID,
+ DEFAULT_DATE_FORMAT,
+ DEFAULT_DATE_FORMAT_TZ,
+} from '../../../../common/constants';
import { AuthenticatedUser } from '../../../../../security/common/model';
import { convertToCamelCase } from '../../../containers/utils';
import { StartServices } from '../../../types';
@@ -155,3 +159,17 @@ export const useNavigation = (appId: string) => {
const { getAppUrl } = useAppUrl(appId);
return { navigateTo, getAppUrl };
};
+
+/**
+ * Returns the capabilities of the main cases application
+ *
+ */
+export const useApplicationCapabilities = (): { crud: boolean; read: boolean } => {
+ const capabilities = useKibana().services.application.capabilities;
+ const casesCapabilities = capabilities[FEATURE_ID];
+
+ return {
+ crud: !!casesCapabilities?.crud_cases,
+ read: !!casesCapabilities?.read_cases,
+ };
+};
diff --git a/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx b/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
index 96e34d6c69cc99..cd6cf13e7256da 100644
--- a/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
+++ b/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
@@ -8,6 +8,7 @@
import React from 'react';
import { act, renderHook } from '@testing-library/react-hooks';
+import { APP_ID } from '../../../common/constants';
import { useNavigation } from '../../common/lib/kibana';
import { TestProviders } from '../../common/mock';
import {
@@ -33,9 +34,12 @@ describe('hooks', () => {
describe('useCasesNavigation', () => {
it('it calls getAppUrl with correct arguments', () => {
- const { result } = renderHook(() => useCasesNavigation(CasesDeepLinkId.cases), {
- wrapper: ({ children }) => {children},
- });
+ const { result } = renderHook(
+ () => useCasesNavigation({ deepLinkId: CasesDeepLinkId.cases }),
+ {
+ wrapper: ({ children }) => {children},
+ }
+ );
const [getCasesUrl] = result.current;
@@ -43,20 +47,23 @@ describe('hooks', () => {
getCasesUrl(false);
});
- expect(getAppUrl).toHaveBeenCalledWith({ absolute: false, deepLinkId: 'cases' });
+ expect(getAppUrl).toHaveBeenCalledWith({ absolute: false, deepLinkId: APP_ID });
});
it('it calls navigateToAllCases with correct arguments', () => {
- const { result } = renderHook(() => useCasesNavigation(CasesDeepLinkId.cases), {
- wrapper: ({ children }) => {children},
- });
+ const { result } = renderHook(
+ () => useCasesNavigation({ deepLinkId: CasesDeepLinkId.cases }),
+ {
+ wrapper: ({ children }) => {children},
+ }
+ );
const [, navigateToCases] = result.current;
act(() => {
navigateToCases();
});
- expect(navigateTo).toHaveBeenCalledWith({ deepLinkId: 'cases' });
+ expect(navigateTo).toHaveBeenCalledWith({ deepLinkId: APP_ID });
});
});
@@ -70,7 +77,7 @@ describe('hooks', () => {
result.current.getAllCasesUrl(false);
});
- expect(getAppUrl).toHaveBeenCalledWith({ absolute: false, deepLinkId: 'cases' });
+ expect(getAppUrl).toHaveBeenCalledWith({ absolute: false, path: '/', deepLinkId: APP_ID });
});
it('it calls navigateToAllCases with correct arguments', () => {
@@ -82,7 +89,7 @@ describe('hooks', () => {
result.current.navigateToAllCases();
});
- expect(navigateTo).toHaveBeenCalledWith({ deepLinkId: 'cases' });
+ expect(navigateTo).toHaveBeenCalledWith({ path: '/', deepLinkId: APP_ID });
});
});
@@ -96,7 +103,11 @@ describe('hooks', () => {
result.current.getCreateCaseUrl(false);
});
- expect(getAppUrl).toHaveBeenCalledWith({ absolute: false, deepLinkId: 'cases_create' });
+ expect(getAppUrl).toHaveBeenCalledWith({
+ absolute: false,
+ path: '/create',
+ deepLinkId: APP_ID,
+ });
});
it('it calls navigateToAllCases with correct arguments', () => {
@@ -108,7 +119,7 @@ describe('hooks', () => {
result.current.navigateToCreateCase();
});
- expect(navigateTo).toHaveBeenCalledWith({ deepLinkId: 'cases_create' });
+ expect(navigateTo).toHaveBeenCalledWith({ deepLinkId: APP_ID, path: '/create' });
});
});
@@ -122,7 +133,11 @@ describe('hooks', () => {
result.current.getConfigureCasesUrl(false);
});
- expect(getAppUrl).toHaveBeenCalledWith({ absolute: false, deepLinkId: 'cases_configure' });
+ expect(getAppUrl).toHaveBeenCalledWith({
+ absolute: false,
+ path: '/configure',
+ deepLinkId: APP_ID,
+ });
});
it('it calls navigateToAllCases with correct arguments', () => {
@@ -134,7 +149,7 @@ describe('hooks', () => {
result.current.navigateToConfigureCases();
});
- expect(navigateTo).toHaveBeenCalledWith({ deepLinkId: 'cases_configure' });
+ expect(navigateTo).toHaveBeenCalledWith({ path: '/configure', deepLinkId: APP_ID });
});
});
@@ -150,7 +165,7 @@ describe('hooks', () => {
expect(getAppUrl).toHaveBeenCalledWith({
absolute: false,
- deepLinkId: 'cases',
+ deepLinkId: APP_ID,
path: '/test',
});
});
@@ -164,7 +179,7 @@ describe('hooks', () => {
result.current.navigateToCaseView({ detailName: 'test' });
});
- expect(navigateTo).toHaveBeenCalledWith({ deepLinkId: 'cases', path: '/test' });
+ expect(navigateTo).toHaveBeenCalledWith({ deepLinkId: APP_ID, path: '/test' });
});
});
});
diff --git a/x-pack/plugins/cases/public/common/navigation/hooks.ts b/x-pack/plugins/cases/public/common/navigation/hooks.ts
index b6dcae1c0c1ce0..c5488b40607959 100644
--- a/x-pack/plugins/cases/public/common/navigation/hooks.ts
+++ b/x-pack/plugins/cases/public/common/navigation/hooks.ts
@@ -7,10 +7,17 @@
import { useCallback } from 'react';
import { useParams } from 'react-router-dom';
+
+import { APP_ID } from '../../../common/constants';
import { useNavigation } from '../lib/kibana';
import { useCasesContext } from '../../components/cases_context/use_cases_context';
-import { CasesDeepLinkId, ICasesDeepLinkId } from './deep_links';
-import { CaseViewPathParams, generateCaseViewPath } from './paths';
+import { ICasesDeepLinkId } from './deep_links';
+import {
+ CASES_CONFIGURE_PATH,
+ CASES_CREATE_PATH,
+ CaseViewPathParams,
+ generateCaseViewPath,
+} from './paths';
export const useCaseViewParams = () => useParams();
@@ -18,34 +25,60 @@ type GetCasesUrl = (absolute?: boolean) => string;
type NavigateToCases = () => void;
type UseCasesNavigation = [GetCasesUrl, NavigateToCases];
-export const useCasesNavigation = (deepLinkId: ICasesDeepLinkId): UseCasesNavigation => {
+export const useCasesNavigation = ({
+ path,
+ deepLinkId,
+}: {
+ path?: string;
+ deepLinkId?: ICasesDeepLinkId;
+}): UseCasesNavigation => {
const { appId } = useCasesContext();
const { navigateTo, getAppUrl } = useNavigation(appId);
const getCasesUrl = useCallback(
- (absolute) => getAppUrl({ deepLinkId, absolute }),
- [getAppUrl, deepLinkId]
+ (absolute) => getAppUrl({ path, deepLinkId, absolute }),
+ [getAppUrl, deepLinkId, path]
);
const navigateToCases = useCallback(
- () => navigateTo({ deepLinkId }),
- [navigateTo, deepLinkId]
+ () => navigateTo({ path, deepLinkId }),
+ [navigateTo, deepLinkId, path]
);
return [getCasesUrl, navigateToCases];
};
+/**
+ * Cases can be either be part of a solution or a standalone application
+ * The standalone application is registered from the cases plugin and is called
+ * the main application. The main application uses paths and the solutions
+ * deep links.
+ */
+const navigationMapping = {
+ all: { path: '/' },
+ create: { path: CASES_CREATE_PATH },
+ configure: { path: CASES_CONFIGURE_PATH },
+};
+
export const useAllCasesNavigation = () => {
- const [getAllCasesUrl, navigateToAllCases] = useCasesNavigation(CasesDeepLinkId.cases);
+ const [getAllCasesUrl, navigateToAllCases] = useCasesNavigation({
+ path: navigationMapping.all.path,
+ deepLinkId: APP_ID,
+ });
+
return { getAllCasesUrl, navigateToAllCases };
};
export const useCreateCaseNavigation = () => {
- const [getCreateCaseUrl, navigateToCreateCase] = useCasesNavigation(CasesDeepLinkId.casesCreate);
+ const [getCreateCaseUrl, navigateToCreateCase] = useCasesNavigation({
+ path: navigationMapping.create.path,
+ deepLinkId: APP_ID,
+ });
return { getCreateCaseUrl, navigateToCreateCase };
};
export const useConfigureCasesNavigation = () => {
- const [getConfigureCasesUrl, navigateToConfigureCases] = useCasesNavigation(
- CasesDeepLinkId.casesConfigure
- );
+ const [getConfigureCasesUrl, navigateToConfigureCases] = useCasesNavigation({
+ path: navigationMapping.configure.path,
+ deepLinkId: APP_ID,
+ });
return { getConfigureCasesUrl, navigateToConfigureCases };
};
@@ -55,19 +88,25 @@ type NavigateToCaseView = (pathParams: CaseViewPathParams) => void;
export const useCaseViewNavigation = () => {
const { appId } = useCasesContext();
const { navigateTo, getAppUrl } = useNavigation(appId);
+ const deepLinkId = APP_ID;
+
const getCaseViewUrl = useCallback(
(pathParams, absolute) =>
getAppUrl({
- deepLinkId: CasesDeepLinkId.cases,
+ deepLinkId,
absolute,
path: generateCaseViewPath(pathParams),
}),
- [getAppUrl]
+ [deepLinkId, getAppUrl]
);
+
const navigateToCaseView = useCallback(
(pathParams) =>
- navigateTo({ deepLinkId: CasesDeepLinkId.cases, path: generateCaseViewPath(pathParams) }),
- [navigateTo]
+ navigateTo({
+ deepLinkId,
+ path: generateCaseViewPath(pathParams),
+ }),
+ [navigateTo, deepLinkId]
);
return { getCaseViewUrl, navigateToCaseView };
};
diff --git a/x-pack/plugins/cases/public/common/navigation/paths.test.ts b/x-pack/plugins/cases/public/common/navigation/paths.test.ts
index a3fa042042a2d5..3750dc4d12eb9b 100644
--- a/x-pack/plugins/cases/public/common/navigation/paths.test.ts
+++ b/x-pack/plugins/cases/public/common/navigation/paths.test.ts
@@ -18,24 +18,40 @@ describe('Paths', () => {
it('returns the correct path', () => {
expect(getCreateCasePath('test')).toBe('test/create');
});
+
+ it('normalize the path correctly', () => {
+ expect(getCreateCasePath('//test//page')).toBe('/test/page/create');
+ });
});
describe('getCasesConfigurePath', () => {
it('returns the correct path', () => {
expect(getCasesConfigurePath('test')).toBe('test/configure');
});
+
+ it('normalize the path correctly', () => {
+ expect(getCasesConfigurePath('//test//page')).toBe('/test/page/configure');
+ });
});
describe('getCaseViewPath', () => {
it('returns the correct path', () => {
expect(getCaseViewPath('test')).toBe('test/:detailName');
});
+
+ it('normalize the path correctly', () => {
+ expect(getCaseViewPath('//test//page')).toBe('/test/page/:detailName');
+ });
});
describe('getCaseViewWithCommentPath', () => {
it('returns the correct path', () => {
expect(getCaseViewWithCommentPath('test')).toBe('test/:detailName/:commentId');
});
+
+ it('normalize the path correctly', () => {
+ expect(getCaseViewWithCommentPath('//test//page')).toBe('/test/page/:detailName/:commentId');
+ });
});
describe('generateCaseViewPath', () => {
diff --git a/x-pack/plugins/cases/public/common/navigation/paths.ts b/x-pack/plugins/cases/public/common/navigation/paths.ts
index 1cd7a99630b857..a8660b5cf63ab2 100644
--- a/x-pack/plugins/cases/public/common/navigation/paths.ts
+++ b/x-pack/plugins/cases/public/common/navigation/paths.ts
@@ -18,12 +18,16 @@ export const CASES_CONFIGURE_PATH = '/configure' as const;
export const CASE_VIEW_PATH = '/:detailName' as const;
export const CASE_VIEW_COMMENT_PATH = `${CASE_VIEW_PATH}/:commentId` as const;
-export const getCreateCasePath = (casesBasePath: string) => `${casesBasePath}${CASES_CREATE_PATH}`;
+const normalizePath = (path: string): string => path.replaceAll('//', '/');
+
+export const getCreateCasePath = (casesBasePath: string) =>
+ normalizePath(`${casesBasePath}${CASES_CREATE_PATH}`);
export const getCasesConfigurePath = (casesBasePath: string) =>
- `${casesBasePath}${CASES_CONFIGURE_PATH}`;
-export const getCaseViewPath = (casesBasePath: string) => `${casesBasePath}${CASE_VIEW_PATH}`;
+ normalizePath(`${casesBasePath}${CASES_CONFIGURE_PATH}`);
+export const getCaseViewPath = (casesBasePath: string) =>
+ normalizePath(`${casesBasePath}${CASE_VIEW_PATH}`);
export const getCaseViewWithCommentPath = (casesBasePath: string) =>
- `${casesBasePath}${CASE_VIEW_COMMENT_PATH}`;
+ normalizePath(`${casesBasePath}${CASE_VIEW_COMMENT_PATH}`);
export const generateCaseViewPath = (params: CaseViewPathParams): string => {
const { commentId } = params;
@@ -31,7 +35,7 @@ export const generateCaseViewPath = (params: CaseViewPathParams): string => {
const pathParams = params as unknown as { [paramName: string]: string };
if (commentId) {
- return generatePath(CASE_VIEW_COMMENT_PATH, pathParams);
+ return normalizePath(generatePath(CASE_VIEW_COMMENT_PATH, pathParams));
}
- return generatePath(CASE_VIEW_PATH, pathParams);
+ return normalizePath(generatePath(CASE_VIEW_PATH, pathParams));
};
diff --git a/x-pack/plugins/cases/public/common/translations.ts b/x-pack/plugins/cases/public/common/translations.ts
index 046eb67d38b248..61554f5191dc83 100644
--- a/x-pack/plugins/cases/public/common/translations.ts
+++ b/x-pack/plugins/cases/public/common/translations.ts
@@ -268,3 +268,11 @@ export const CASE_SUCCESS_SYNC_TEXT = i18n.translate('xpack.cases.actions.caseSu
export const VIEW_CASE = i18n.translate('xpack.cases.actions.viewCase', {
defaultMessage: 'View Case',
});
+
+export const APP_TITLE = i18n.translate('xpack.cases.common.appTitle', {
+ defaultMessage: 'Cases',
+});
+
+export const APP_DESC = i18n.translate('xpack.cases.common.appDescription', {
+ defaultMessage: 'Open and track issues, push information to third party systems.',
+});
diff --git a/x-pack/plugins/cases/public/components/app/index.tsx b/x-pack/plugins/cases/public/components/app/index.tsx
index 0ac336adb94a91..bf3dbcf1dc95b3 100644
--- a/x-pack/plugins/cases/public/components/app/index.tsx
+++ b/x-pack/plugins/cases/public/components/app/index.tsx
@@ -5,9 +5,33 @@
* 2.0.
*/
-import { CasesRoutes } from './routes';
+import React from 'react';
+import { APP_OWNER } from '../../../common/constants';
+import { useApplicationCapabilities } from '../../common/lib/kibana';
+
+import { getCasesLazy } from '../../methods';
+import { Wrapper } from '../wrappers';
import { CasesRoutesProps } from './types';
export type CasesProps = CasesRoutesProps;
-// eslint-disable-next-line import/no-default-export
-export { CasesRoutes as default };
+
+const CasesAppComponent: React.FC = () => {
+ const userCapabilities = useApplicationCapabilities();
+
+ return (
+
+ {getCasesLazy({
+ owner: [APP_OWNER],
+ useFetchAlertData: () => [false, {}],
+ userCanCrud: userCapabilities.crud,
+ basePath: '/',
+ features: { alerts: { sync: false } },
+ releasePhase: 'experimental',
+ })}
+
+ );
+};
+
+CasesAppComponent.displayName = 'CasesApp';
+
+export const CasesApp = React.memo(CasesAppComponent);
diff --git a/x-pack/plugins/cases/public/components/app/routes.tsx b/x-pack/plugins/cases/public/components/app/routes.tsx
index 6222c413a11674..6fc87f691b2a22 100644
--- a/x-pack/plugins/cases/public/components/app/routes.tsx
+++ b/x-pack/plugins/cases/public/components/app/routes.tsx
@@ -91,3 +91,5 @@ const CasesRoutesComponent: React.FC = ({
CasesRoutesComponent.displayName = 'CasesRoutes';
export const CasesRoutes = React.memo(CasesRoutesComponent);
+// eslint-disable-next-line import/no-default-export
+export { CasesRoutes as default };
diff --git a/x-pack/plugins/cases/public/components/app/translations.ts b/x-pack/plugins/cases/public/components/app/translations.ts
index 6796f0e03aa77b..4958ce4358c1c5 100644
--- a/x-pack/plugins/cases/public/components/app/translations.ts
+++ b/x-pack/plugins/cases/public/components/app/translations.ts
@@ -7,21 +7,6 @@
import { i18n } from '@kbn/i18n';
-export const NO_PRIVILEGES_MSG = (pageName: string) =>
- i18n.translate('xpack.cases.noPrivileges.message', {
- values: { pageName },
- defaultMessage:
- 'To view {pageName} page, you must update privileges. For more information, contact your Kibana administrator.',
- });
-
-export const NO_PRIVILEGES_TITLE = i18n.translate('xpack.cases.noPrivileges.title', {
- defaultMessage: 'Privileges required',
-});
-
-export const NO_PRIVILEGES_BUTTON = i18n.translate('xpack.cases.noPrivileges.button', {
- defaultMessage: 'Back to Cases',
-});
-
export const CREATE_CASE_PAGE_NAME = i18n.translate('xpack.cases.createCase', {
defaultMessage: 'Create Case',
});
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
index 5179aed6518b5e..2105618ae03151 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
@@ -36,6 +36,7 @@ import type { EmbeddablePackageState } from '../../../../../../../../src/plugins
import { SavedObjectFinderUi } from './saved_objects_finder';
import { useLensDraftComment } from './use_lens_draft_comment';
import { VISUALIZATION } from './translations';
+import { useIsMainApplication } from '../../../../common/hooks';
const BetaBadgeWrapper = styled.span`
display: inline-flex;
@@ -84,6 +85,7 @@ const LensEditorComponent: LensEuiMarkdownEditorUiPlugin['editor'] = ({
const { draftComment, clearDraftComment } = useLensDraftComment();
const commentEditorContext = useContext(CommentEditorContext);
const markdownContext = useContext(EuiMarkdownContext);
+ const isMainApplication = useIsMainApplication();
const handleClose = useCallback(() => {
if (currentAppId) {
@@ -126,8 +128,11 @@ const LensEditorComponent: LensEuiMarkdownEditorUiPlugin['editor'] = ({
);
const originatingPath = useMemo(
- () => `${location.pathname}${location.search}`,
- [location.pathname, location.search]
+ () =>
+ isMainApplication
+ ? `/insightsAndAlerting/cases${location.pathname}${location.search}`
+ : `${location.pathname}${location.search}`,
+ [isMainApplication, location.pathname, location.search]
);
const handleCreateInLensClick = useCallback(() => {
diff --git a/x-pack/plugins/cases/public/components/utils.ts b/x-pack/plugins/cases/public/components/utils.ts
index 1fafe5afe6990e..5ff675a31ce613 100644
--- a/x-pack/plugins/cases/public/components/utils.ts
+++ b/x-pack/plugins/cases/public/components/utils.ts
@@ -8,7 +8,7 @@
import { IconType } from '@elastic/eui';
import { ConnectorTypes } from '../../common/api';
import { FieldConfig, ValidationConfig } from '../common/shared_imports';
-import { StartPlugins } from '../types';
+import { CasesPluginStart } from '../types';
import { connectorValidator as swimlaneConnectorValidator } from './connectors/swimlane/validator';
import { connectorValidator as servicenowConnectorValidator } from './connectors/servicenow/validator';
import { CaseActionConnector } from './types';
@@ -48,7 +48,7 @@ export const getConnectorsFormValidators = ({
});
export const getConnectorIcon = (
- triggersActionsUi: StartPlugins['triggersActionsUi'],
+ triggersActionsUi: CasesPluginStart['triggersActionsUi'],
type?: string
): IconType => {
/**
diff --git a/x-pack/plugins/cases/public/components/wrappers/index.tsx b/x-pack/plugins/cases/public/components/wrappers/index.tsx
index 7a3d611413be65..d412ef34451b28 100644
--- a/x-pack/plugins/cases/public/components/wrappers/index.tsx
+++ b/x-pack/plugins/cases/public/components/wrappers/index.tsx
@@ -27,3 +27,8 @@ export const ContentWrapper = styled.div`
padding: ${theme.eui.paddingSizes.l} 0 ${gutterTimeline} 0;
`};
`;
+
+export const Wrapper = styled.div`
+ display: flex;
+ flex-direction: column;
+`;
diff --git a/x-pack/plugins/cases/public/methods/get_cases.tsx b/x-pack/plugins/cases/public/methods/get_cases.tsx
index 3c1d3294d38ce0..8acb61326902b0 100644
--- a/x-pack/plugins/cases/public/methods/get_cases.tsx
+++ b/x-pack/plugins/cases/public/methods/get_cases.tsx
@@ -12,7 +12,8 @@ import { CasesProvider, CasesContextProps } from '../components/cases_context';
export type GetCasesProps = CasesProps & CasesContextProps;
-const CasesLazy: React.FC = lazy(() => import('../components/app'));
+const CasesRoutesLazy: React.FC = lazy(() => import('../components/app/routes'));
+
export const getCasesLazy = ({
owner,
userCanCrud,
@@ -29,7 +30,7 @@ export const getCasesLazy = ({
}: GetCasesProps) => (
}>
- {
- private kibanaVersion: string;
+export class CasesUiPlugin
+ implements Plugin
+{
+ private readonly kibanaVersion: string;
+ private readonly storage = new Storage(localStorage);
constructor(private readonly initializerContext: PluginInitializerContext) {
this.kibanaVersion = initializerContext.env.packageInfo.version;
}
- public setup(core: CoreSetup, plugins: SetupPlugins) {}
- public start(core: CoreStart, plugins: StartPlugins): CasesUiStart {
+ public setup(core: CoreSetup, plugins: CasesPluginSetup) {
+ const kibanaVersion = this.kibanaVersion;
+ const storage = this.storage;
+
+ if (plugins.home) {
+ plugins.home.featureCatalogue.register({
+ id: APP_ID,
+ title: APP_TITLE,
+ description: APP_DESC,
+ icon: 'watchesApp',
+ path: APP_PATH,
+ showOnHomePage: false,
+ category: FeatureCatalogueCategory.ADMIN,
+ });
+ }
+
+ plugins.management.sections.section.insightsAndAlerting.registerApp({
+ id: APP_ID,
+ title: APP_TITLE,
+ order: 0,
+ async mount(params: ManagementAppMountParams) {
+ const [coreStart, pluginsStart] = (await core.getStartServices()) as [
+ CoreStart,
+ CasesPluginStart,
+ unknown
+ ];
+
+ const { renderApp } = await import('./application');
+
+ return renderApp({
+ mountParams: params,
+ coreStart,
+ pluginsStart,
+ storage,
+ kibanaVersion,
+ });
+ },
+ });
+
+ // Return methods that should be available to other plugins
+ return {};
+ }
+
+ public start(core: CoreStart, plugins: CasesPluginStart): CasesUiStart {
const config = this.initializerContext.config.get();
KibanaServices.init({ ...core, ...plugins, kibanaVersion: this.kibanaVersion, config });
return {
diff --git a/x-pack/plugins/cases/public/types.ts b/x-pack/plugins/cases/public/types.ts
index b2198aad50911b..c756a5f73a0a73 100644
--- a/x-pack/plugins/cases/public/types.ts
+++ b/x-pack/plugins/cases/public/types.ts
@@ -10,6 +10,12 @@ import { ReactElement, ReactNode } from 'react';
import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
import type { Storage } from '../../../../src/plugins/kibana_utils/public';
+import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
+import {
+ ManagementSetup,
+ ManagementAppMountParams,
+} from '../../../../src/plugins/management/public';
+import { FeaturesPluginStart } from '../..//features/public';
import type { LensPublicStart } from '../../lens/public';
import type { SecurityPluginSetup } from '../../security/public';
import type { SpacesPluginStart } from '../../spaces/public';
@@ -18,6 +24,7 @@ import { CommentRequestAlertType, CommentRequestUserType } from '../common/api';
import { UseCasesAddToExistingCaseModal } from './components/all_cases/selector_modal/use_cases_add_to_existing_case_modal';
import { CreateCaseFlyoutProps } from './components/create/flyout';
import { UseCasesAddToNewCaseFlyout } from './components/create/flyout/use_cases_add_to_new_case_flyout';
+
import type {
CasesOwners,
GetAllCasesSelectorModalProps,
@@ -28,16 +35,19 @@ import type {
import { GetCasesContextProps } from './methods/get_cases_context';
import { getRuleIdFromEvent } from './methods/get_rule_id_from_event';
-export interface SetupPlugins {
+export interface CasesPluginSetup {
security: SecurityPluginSetup;
+ management: ManagementSetup;
+ home?: HomePublicPluginSetup;
}
-export interface StartPlugins {
+export interface CasesPluginStart {
data: DataPublicPluginStart;
embeddable: EmbeddableStart;
lens: LensPublicStart;
storage: Storage;
triggersActionsUi: TriggersActionsStart;
+ features: FeaturesPluginStart;
spaces?: SpacesPluginStart;
}
@@ -48,10 +58,18 @@ export interface StartPlugins {
*/
export type StartServices = CoreStart &
- StartPlugins & {
+ CasesPluginStart & {
security: SecurityPluginSetup;
};
+export interface RenderAppProps {
+ mountParams: ManagementAppMountParams;
+ coreStart: CoreStart;
+ pluginsStart: CasesPluginStart;
+ storage: Storage;
+ kibanaVersion: string;
+}
+
export interface CasesUiStart {
/**
* Returns an object denoting the current user's ability to read and crud cases.
diff --git a/x-pack/plugins/cases/server/client/cases/push.ts b/x-pack/plugins/cases/server/client/cases/push.ts
index 112fd6ef2c04cd..06b0922cacc475 100644
--- a/x-pack/plugins/cases/server/client/cases/push.ts
+++ b/x-pack/plugins/cases/server/client/cases/push.ts
@@ -16,6 +16,7 @@ import {
ExternalServiceResponse,
CasesConfigureAttributes,
ActionTypes,
+ OWNER_FIELD,
} from '../../../common/api';
import { createIncident, getCommentContextFromAttributes } from './utils';
@@ -25,6 +26,7 @@ import { CasesClient, CasesClientArgs, CasesClientInternal } from '..';
import { Operations } from '../../authorization';
import { casesConnectors } from '../../connectors';
import { getAlerts } from '../alerts/get';
+import { buildFilter } from '../utils';
/**
* Returns true if the case should be closed based on the configuration settings.
@@ -139,12 +141,19 @@ export const push = async (
/* End of push to external service */
+ const ownerFilter = buildFilter({
+ filters: theCase.owner,
+ field: OWNER_FIELD,
+ operator: 'or',
+ type: Operations.findConfigurations.savedObjectType,
+ });
+
/* Start of update case with push information */
const [myCase, myCaseConfigure, comments] = await Promise.all([
caseService.getCase({
id: caseId,
}),
- caseConfigureService.find({ unsecuredSavedObjectsClient }),
+ caseConfigureService.find({ unsecuredSavedObjectsClient, options: { filter: ownerFilter } }),
caseService.getAllCaseComments({
id: caseId,
options: {
diff --git a/x-pack/plugins/cases/server/features.ts b/x-pack/plugins/cases/server/features.ts
new file mode 100644
index 00000000000000..33a3315b7d9d3f
--- /dev/null
+++ b/x-pack/plugins/cases/server/features.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+import { KibanaFeatureConfig } from '../../features/common';
+import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+
+import { APP_ID, FEATURE_ID } from '../common/constants';
+
+/**
+ * The order of appearance in the feature privilege page
+ * under the management section. Cases should be under
+ * the Actions and Connectors feature
+ */
+
+const FEATURE_ORDER = 3100;
+
+export const getCasesKibanaFeature = (): KibanaFeatureConfig => ({
+ id: FEATURE_ID,
+ name: i18n.translate('xpack.cases.features.casesFeatureName', {
+ defaultMessage: 'Cases',
+ }),
+ category: DEFAULT_APP_CATEGORIES.management,
+ app: [],
+ order: FEATURE_ORDER,
+ management: {
+ insightsAndAlerting: [APP_ID],
+ },
+ cases: [APP_ID],
+ privileges: {
+ all: {
+ cases: {
+ all: [APP_ID],
+ },
+ management: {
+ insightsAndAlerting: [APP_ID],
+ },
+ savedObject: {
+ all: [],
+ read: [],
+ },
+ ui: ['crud_cases', 'read_cases'],
+ },
+ read: {
+ cases: {
+ read: [APP_ID],
+ },
+ management: {
+ insightsAndAlerting: [APP_ID],
+ },
+ savedObject: {
+ all: [],
+ read: [],
+ },
+ ui: ['read_cases'],
+ },
+ },
+});
diff --git a/x-pack/plugins/cases/server/plugin.ts b/x-pack/plugins/cases/server/plugin.ts
index e6c4faac939389..9d2915491c4469 100644
--- a/x-pack/plugins/cases/server/plugin.ts
+++ b/x-pack/plugins/cases/server/plugin.ts
@@ -28,14 +28,19 @@ import { CasesClient } from './client';
import type { CasesRequestHandlerContext } from './types';
import { CasesClientFactory } from './client/factory';
import { SpacesPluginStart } from '../../spaces/server';
-import { PluginStartContract as FeaturesPluginStart } from '../../features/server';
+import {
+ PluginStartContract as FeaturesPluginStart,
+ PluginSetupContract as FeaturesPluginSetup,
+} from '../../features/server';
import { LensServerPluginSetup } from '../../lens/server';
+import { getCasesKibanaFeature } from './features';
import { registerRoutes } from './routes/api/register_routes';
import { getExternalRoutes } from './routes/api/get_external_routes';
export interface PluginsSetup {
actions: ActionsPluginSetup;
lens: LensServerPluginSetup;
+ features: FeaturesPluginSetup;
usageCollection?: UsageCollectionSetup;
security?: SecurityPluginSetup;
}
@@ -77,6 +82,8 @@ export class CasePlugin {
this.securityPluginSetup = plugins.security;
this.lensEmbeddableFactory = plugins.lens.lensEmbeddableFactory;
+ plugins.features.registerKibanaFeature(getCasesKibanaFeature());
+
core.savedObjects.registerType(
createCaseCommentSavedObjectType({
migrationDeps: {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx
index 0fa106fda1c8fa..085baae19899d0 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx
@@ -54,7 +54,8 @@ const getFakeFindings = (): CspFinding & { id: string } => ({
type TableProps = PropsOf;
-describe('', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/126664
+describe.skip('', () => {
it('renders the zero state when status success and data has a length of zero ', async () => {
const props: TableProps = {
status: 'success',
diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts
index f84668068f413a..7a6203c994f4d9 100644
--- a/x-pack/plugins/enterprise_search/common/constants.ts
+++ b/x-pack/plugins/enterprise_search/common/constants.ts
@@ -7,21 +7,37 @@
import { i18n } from '@kbn/i18n';
-export const ENTERPRISE_SEARCH_PLUGIN = {
+export const ENTERPRISE_SEARCH_OVERVIEW_PLUGIN = {
ID: 'enterpriseSearch',
- NAME: i18n.translate('xpack.enterpriseSearch.productName', {
+ NAME: i18n.translate('xpack.enterpriseSearch.overview.productName', {
defaultMessage: 'Enterprise Search',
}),
- NAV_TITLE: i18n.translate('xpack.enterpriseSearch.navTitle', {
+ NAV_TITLE: i18n.translate('xpack.enterpriseSearch.overview.navTitle', {
defaultMessage: 'Overview',
}),
- DESCRIPTION: i18n.translate('xpack.enterpriseSearch.FeatureCatalogue.description', {
+ DESCRIPTION: i18n.translate('xpack.enterpriseSearch.overview.description', {
defaultMessage: 'Create search experiences with a refined set of APIs and tools.',
}),
URL: '/app/enterprise_search/overview',
LOGO: 'logoEnterpriseSearch',
};
+export const ENTERPRISE_SEARCH_CONTENT_PLUGIN = {
+ ID: 'enterpriseSearchContent',
+ NAME: i18n.translate('xpack.enterpriseSearch.content.productName', {
+ defaultMessage: 'Enterprise Search',
+ }),
+ NAV_TITLE: i18n.translate('xpack.enterpriseSearch.content.navTitle', {
+ defaultMessage: 'Content',
+ }),
+ DESCRIPTION: i18n.translate('xpack.enterpriseSearch.content.description', {
+ defaultMessage:
+ 'Enterprise search offers a number of ways to easily make your data searchable. Choose from the web crawler, Elasticsearch indices, API, direct uploads, or thrid party connectors.', // TODO: Make sure this content is correct.
+ }),
+ URL: '/app/enterprise_search/content',
+ LOGO: 'logoEnterpriseSearch',
+};
+
export const APP_SEARCH_PLUGIN = {
ID: 'appSearch',
NAME: i18n.translate('xpack.enterpriseSearch.appSearch.productName', {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx
index dce56a05f8f8cc..c2b40a2c0aa084 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx
@@ -14,7 +14,7 @@ import React from 'react';
import { shallow } from 'enzyme';
-import { EnterpriseSearchPageTemplate } from '../../../../shared/layout';
+import { EnterpriseSearchPageTemplateWrapper } from '../../../../shared/layout';
import { rerender } from '../../../../test_helpers';
jest.mock('./curation_logic', () => ({ CurationLogic: jest.fn() }));
@@ -55,7 +55,7 @@ describe('Curation', () => {
setMockValues({ dataLoading: true });
const wrapper = shallow();
- expect(wrapper.is(EnterpriseSearchPageTemplate)).toBe(true);
+ expect(wrapper.is(EnterpriseSearchPageTemplateWrapper)).toBe(true);
});
it('renders a view for automated curations', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.tsx
index d1b0f43d976a8a..1c49c077e7a6aa 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.tsx
@@ -10,7 +10,7 @@ import { useParams } from 'react-router-dom';
import { useValues, useActions } from 'kea';
-import { EnterpriseSearchPageTemplate } from '../../../../shared/layout';
+import { EnterpriseSearchPageTemplateWrapper } from '../../../../shared/layout';
import { AutomatedCuration } from './automated_curation';
import { CurationLogic } from './curation_logic';
@@ -26,7 +26,7 @@ export const Curation: React.FC = () => {
}, [curationId]);
if (dataLoading) {
- return ;
+ return ;
}
return isAutomated ? : ;
};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.test.tsx
index 8f47d5f1c46444..b26cc00379f34d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.test.tsx
@@ -14,7 +14,7 @@ import React from 'react';
import { shallow } from 'enzyme';
import { SetAppSearchChrome } from '../../../shared/kibana_chrome';
-import { EnterpriseSearchPageTemplate } from '../../../shared/layout';
+import { EnterpriseSearchPageTemplateWrapper } from '../../../shared/layout';
import { SendAppSearchTelemetry } from '../../../shared/telemetry';
import { AppSearchPageTemplate } from './page_template';
@@ -27,7 +27,7 @@ describe('AppSearchPageTemplate', () => {
);
- expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplate);
+ expect(wrapper.type()).toEqual(EnterpriseSearchPageTemplateWrapper);
expect(wrapper.prop('solutionNav')).toEqual({ name: 'App Search', items: [] });
expect(wrapper.find('.hello').text()).toEqual('world');
});
@@ -35,7 +35,9 @@ describe('AppSearchPageTemplate', () => {
describe('page chrome', () => {
it('takes a breadcrumb array & renders a product-specific page chrome', () => {
const wrapper = shallow();
- const setPageChrome = wrapper.find(EnterpriseSearchPageTemplate).prop('setPageChrome') as any;
+ const setPageChrome = wrapper
+ .find(EnterpriseSearchPageTemplateWrapper)
+ .prop('setPageChrome') as any;
expect(setPageChrome.type).toEqual(SetAppSearchChrome);
expect(setPageChrome.props.trail).toEqual(['Some page']);
@@ -51,7 +53,7 @@ describe('AppSearchPageTemplate', () => {
});
});
- it('passes down any ...pageTemplateProps that EnterpriseSearchPageTemplate accepts', () => {
+ it('passes down any ...pageTemplateProps that EnterpriseSearchPageTemplateWrapper accepts', () => {
const wrapper = shallow(
{
/>
);
- expect(wrapper.find(EnterpriseSearchPageTemplate).prop('pageHeader')!.pageTitle).toEqual(
+ expect(wrapper.find(EnterpriseSearchPageTemplateWrapper).prop('pageHeader')!.pageTitle).toEqual(
'hello world'
);
- expect(wrapper.find(EnterpriseSearchPageTemplate).prop('isLoading')).toEqual(false);
- expect(wrapper.find(EnterpriseSearchPageTemplate).prop('emptyState')).toEqual();
+ expect(wrapper.find(EnterpriseSearchPageTemplateWrapper).prop('isLoading')).toEqual(false);
+ expect(wrapper.find(EnterpriseSearchPageTemplateWrapper).prop('emptyState')).toEqual();
});
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.tsx
index 31f2eb3215e05a..d336bcc6a4c5fb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/page_template.tsx
@@ -9,7 +9,7 @@ import React from 'react';
import { APP_SEARCH_PLUGIN } from '../../../../../common/constants';
import { SetAppSearchChrome } from '../../../shared/kibana_chrome';
-import { EnterpriseSearchPageTemplate, PageTemplateProps } from '../../../shared/layout';
+import { EnterpriseSearchPageTemplateWrapper, PageTemplateProps } from '../../../shared/layout';
import { SendAppSearchTelemetry } from '../../../shared/telemetry';
import { useAppSearchNav } from './nav';
@@ -21,7 +21,7 @@ export const AppSearchPageTemplate: React.FC = ({
...pageTemplateProps
}) => {
return (
- = ({
>
{pageViewTelemetry && }
{children}
-
+
);
};
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/app_search.png b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/assets/app_search.png
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/app_search.png
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/assets/app_search.png
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/workplace_search.png b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/assets/workplace_search.png
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/assets/workplace_search.png
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/assets/workplace_search.png
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/error_connecting/error_connecting.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/error_connecting/error_connecting.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/error_connecting/error_connecting.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/error_connecting/error_connecting.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/error_connecting/index.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/error_connecting/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/constants.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/constants.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/constants.ts
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/constants.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/index.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/index.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.scss b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.scss
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.scss
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.scss
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/index.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/lock_light.svg b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/lock_light.svg
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/lock_light.svg
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/lock_light.svg
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/assets/getting_started.png b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/assets/getting_started.png
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/assets/getting_started.png
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/assets/getting_started.png
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/index.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.tsx
similarity index 93%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.tsx
index 1a25d1a7a8d1e2..c8889320bb3464 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.tsx
@@ -11,7 +11,7 @@ import { EuiSpacer, EuiTitle, EuiText } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
-import { ENTERPRISE_SEARCH_PLUGIN } from '../../../../../common/constants';
+import { ENTERPRISE_SEARCH_OVERVIEW_PLUGIN } from '../../../../../common/constants';
import { SetEnterpriseSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
import { SetupGuideLayout, SETUP_GUIDE_TITLE } from '../../../shared/setup_guide';
import { SendEnterpriseSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
@@ -20,7 +20,7 @@ import GettingStarted from './assets/getting_started.png';
export const SetupGuide: React.FC = () => (
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide_cta.scss b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.scss
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide_cta.scss
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.scss
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide_cta.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide_cta.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide_cta.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/setup_guide/setup_guide_cta.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/trial_callout/index.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/trial_callout/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/trial_callout/trial_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/trial_callout/trial_callout.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/trial_callout/trial_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/trial_callout/trial_callout.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/constants.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/constants.ts
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/constants.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress.json b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/cypress.json
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress.json
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/cypress.json
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/integration/overview.spec.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/cypress/integration/overview.spec.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/integration/overview.spec.ts
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/cypress/integration/overview.spec.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/tsconfig.json b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/cypress/tsconfig.json
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/tsconfig.json
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/cypress/tsconfig.json
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx
similarity index 87%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx
index 4aef227582d318..e5d883ee819f77 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx
@@ -18,15 +18,15 @@ import { ErrorConnecting } from './components/error_connecting';
import { ProductSelector } from './components/product_selector';
import { SetupGuide } from './components/setup_guide';
-import { EnterpriseSearch } from './';
+import { EnterpriseSearchOverview } from './';
-describe('EnterpriseSearch', () => {
+describe('EnterpriseSearchOverview', () => {
it('renders the Setup Guide and Product Selector', () => {
setMockValues({
errorConnectingMessage: '',
config: { host: 'localhost' },
});
- const wrapper = shallow();
+ const wrapper = shallow();
expect(wrapper.find(SetupGuide)).toHaveLength(1);
expect(wrapper.find(ProductSelector)).toHaveLength(1);
@@ -37,7 +37,7 @@ describe('EnterpriseSearch', () => {
errorConnectingMessage: '502 Bad Gateway',
config: { host: 'localhost' },
});
- const wrapper = shallow();
+ const wrapper = shallow();
expect(wrapper.find(VersionMismatchPage)).toHaveLength(0);
const errorConnecting = wrapper.find(ErrorConnecting);
@@ -61,7 +61,7 @@ describe('EnterpriseSearch', () => {
config: { host: 'localhost' },
});
const wrapper = shallow(
-
+
);
expect(wrapper.find(VersionMismatchPage)).toHaveLength(1);
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.tsx
similarity index 96%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.tsx
index 5f1c7b5072be23..ca4b91d0e03b97 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.tsx
@@ -21,7 +21,7 @@ import { ProductSelector } from './components/product_selector';
import { SetupGuide } from './components/setup_guide';
import { ROOT_PATH, SETUP_GUIDE_PATH } from './routes';
-export const EnterpriseSearch: React.FC = ({
+export const EnterpriseSearchOverview: React.FC = ({
access = {},
workplaceSearch,
enterpriseSearchVersion,
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/routes.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/routes.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/enterprise_search/routes.ts
rename to x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/routes.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
index 356a3c26b910e9..cb47dfe124780e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
@@ -15,7 +15,7 @@ import { licensingMock } from '../../../licensing/public/mocks';
import { securityMock } from '../../../security/public/mocks';
import { AppSearch } from './app_search';
-import { EnterpriseSearch } from './enterprise_search';
+import { EnterpriseSearchOverview } from './enterprise_search_overview';
import { KibanaLogic } from './shared/kibana';
import { WorkplaceSearch } from './workplace_search';
@@ -62,8 +62,8 @@ describe('renderApp', () => {
describe('Enterprise Search apps', () => {
afterEach(() => unmount());
- it('renders EnterpriseSearch', () => {
- mount(EnterpriseSearch);
+ it('renders EnterpriseSearchOverview', () => {
+ mount(EnterpriseSearchOverview);
expect(mockContainer.querySelector('.kbnPageTemplate')).not.toBeNull();
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.ts
index 5855dc6990f6a7..8864600475c122 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.ts
@@ -10,7 +10,7 @@ import { useValues } from 'kea';
import { EuiBreadcrumb } from '@elastic/eui';
import {
- ENTERPRISE_SEARCH_PLUGIN,
+ ENTERPRISE_SEARCH_OVERVIEW_PLUGIN,
APP_SEARCH_PLUGIN,
WORKPLACE_SEARCH_PLUGIN,
} from '../../../../common/constants';
@@ -97,8 +97,8 @@ export const useEuiBreadcrumbs = (breadcrumbs: Breadcrumbs): EuiBreadcrumb[] =>
export const useEnterpriseSearchBreadcrumbs = (breadcrumbs: Breadcrumbs = []) =>
useEuiBreadcrumbs([
{
- text: ENTERPRISE_SEARCH_PLUGIN.NAME,
- path: ENTERPRISE_SEARCH_PLUGIN.URL,
+ text: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.NAME,
+ path: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.URL,
shouldNotCreateHref: true,
},
...breadcrumbs,
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.ts
index 650aa00d1801d9..8b91b7e57a7813 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.ts
@@ -6,7 +6,7 @@
*/
import {
- ENTERPRISE_SEARCH_PLUGIN,
+ ENTERPRISE_SEARCH_OVERVIEW_PLUGIN,
APP_SEARCH_PLUGIN,
WORKPLACE_SEARCH_PLUGIN,
} from '../../../../common/constants';
@@ -30,7 +30,7 @@ export const generateTitle = (pages: Title) => pages.join(' - ');
*/
export const enterpriseSearchTitle = (page: Title = []) =>
- generateTitle([...page, ENTERPRISE_SEARCH_PLUGIN.NAME]);
+ generateTitle([...page, ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.NAME]);
export const appSearchTitle = (page: Title = []) =>
generateTitle([...page, APP_SEARCH_PLUGIN.NAME]);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts
index 79919e925c625e..790d72943a1bc8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/index.ts
@@ -6,5 +6,5 @@
*/
export type { PageTemplateProps } from './page_template';
-export { EnterpriseSearchPageTemplate } from './page_template';
+export { EnterpriseSearchPageTemplateWrapper } from './page_template';
export { generateNavLink } from './nav_link_helpers';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
index 8d480b69b3fe53..22c976dfa7638f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
@@ -17,25 +17,25 @@ import { KibanaPageTemplate } from '../../../../../../../src/plugins/kibana_reac
import { FlashMessages } from '../flash_messages';
import { Loading } from '../loading';
-import { EnterpriseSearchPageTemplate } from './page_template';
+import { EnterpriseSearchPageTemplateWrapper } from './page_template';
-describe('EnterpriseSearchPageTemplate', () => {
+describe('EnterpriseSearchPageTemplateWrapper', () => {
beforeEach(() => {
jest.clearAllMocks();
setMockValues({ readOnlyMode: false });
});
it('renders', () => {
- const wrapper = shallow();
+ const wrapper = shallow();
expect(wrapper.type()).toEqual(KibanaPageTemplate);
});
it('renders children', () => {
const wrapper = shallow(
-
+
world
-
+
);
expect(wrapper.find('.hello').text()).toEqual('world');
@@ -44,9 +44,9 @@ describe('EnterpriseSearchPageTemplate', () => {
describe('loading state', () => {
it('renders a loading icon in place of children', () => {
const wrapper = shallow(
-
+
-
+
);
expect(wrapper.find(Loading).exists()).toBe(true);
@@ -55,9 +55,9 @@ describe('EnterpriseSearchPageTemplate', () => {
it('renders children & does not render a loading icon when the page is done loading', () => {
const wrapper = shallow(
-
+
-
+
);
expect(wrapper.find(Loading).exists()).toBe(false);
@@ -68,12 +68,12 @@ describe('EnterpriseSearchPageTemplate', () => {
describe('empty state', () => {
it('renders a custom empty state in place of children', () => {
const wrapper = shallow(
- Nothing here yet!