;
- name: string;
-}
-
-const MIN_DEFAULT_LINES_COUNT = 6;
-const MAX_DEFAULT_LINES_COUNT = 30;
-
-export const FieldCodeEditor = ({
- value,
- onChange,
- type,
- isReadOnly,
- a11yProps,
- name,
-}: FieldCodeEditorProps) => {
- // setting editor height based on lines height and count to stretch and fit its content
- const setEditorCalculatedHeight = useCallback(
- (editor: monaco.editor.IStandaloneCodeEditor) => {
- const editorElement = editor.getDomNode();
-
- if (!editorElement) {
- return;
- }
-
- const lineHeight = editor.getOption(monaco.editor.EditorOption.lineHeight);
- let lineCount = editor.getModel()?.getLineCount() || MIN_DEFAULT_LINES_COUNT;
- if (lineCount < MIN_DEFAULT_LINES_COUNT) {
- lineCount = MIN_DEFAULT_LINES_COUNT;
- } else if (lineCount > MAX_DEFAULT_LINES_COUNT) {
- lineCount = MAX_DEFAULT_LINES_COUNT;
- }
- const height = lineHeight * lineCount;
-
- editorElement.id = name;
- editorElement.style.height = `${height}px`;
- editor.layout();
- },
- [name]
- );
-
- const trimEditorBlankLines = useCallback((editor: monaco.editor.IStandaloneCodeEditor) => {
- const editorModel = editor.getModel();
-
- if (!editorModel) {
- return;
- }
- const trimmedValue = editorModel.getValue().trim();
- editorModel.setValue(trimmedValue);
- }, []);
-
- const editorDidMount = useCallback(
- (editor) => {
- setEditorCalculatedHeight(editor);
-
- editor.onDidChangeModelContent(() => {
- setEditorCalculatedHeight(editor);
- });
-
- editor.onDidBlurEditorWidget(() => {
- trimEditorBlankLines(editor);
- });
- },
- [setEditorCalculatedHeight, trimEditorBlankLines]
- );
-
- return (
-
- );
-};
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap b/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
deleted file mode 100644
index 064269f885cca..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
+++ /dev/null
@@ -1,1077 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Form should not render no settings message when instructed not to 1`] = `
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- General
-
-
-
-
-
-
-
-
-
- ,
- "settingsCount": -1,
- }
- }
- />
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- Dashboard
-
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- X-pack
-
-
-
-
-
-
-
-
-
- ,
- "settingsCount": 9,
- }
- }
- />
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
-
-
-`;
-
-exports[`Form should render no settings message when there are no settings 1`] = `
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- General
-
-
-
-
-
-
-
-
-
- ,
- "settingsCount": -1,
- }
- }
- />
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- Dashboard
-
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- X-pack
-
-
-
-
-
-
-
-
-
- ,
- "settingsCount": 9,
- }
- }
- />
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
-
-
-`;
-
-exports[`Form should render normally 1`] = `
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- General
-
-
-
-
-
-
-
-
-
- ,
- "settingsCount": -1,
- }
- }
- />
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- Dashboard
-
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- X-pack
-
-
-
-
-
-
-
-
-
- ,
- "settingsCount": 9,
- }
- }
- />
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
-
-
-`;
-
-exports[`Form should render read-only when saving is disabled 1`] = `
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- General
-
-
-
-
-
-
-
-
-
- ,
- "settingsCount": -1,
- }
- }
- />
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- Dashboard
-
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
- <_EuiSplitPanelOuter
- hasBorder={true}
- >
- <_EuiSplitPanelInner
- color="subdued"
- >
-
-
-
-
- X-pack
-
-
-
-
-
-
-
-
-
- ,
- "settingsCount": 9,
- }
- }
- />
-
-
-
-
- <_EuiSplitPanelInner>
-
-
-
-
-
-
-`;
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx b/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
deleted file mode 100644
index 4deb1b9c24d1d..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
+++ /dev/null
@@ -1,321 +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 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 React from 'react';
-import { shallowWithI18nProvider, mountWithI18nProvider } from '@kbn/test-jest-helpers';
-import { findTestSubject } from '@elastic/eui/lib/test';
-
-import { UiSettingsType } from '@kbn/core/public';
-import { themeServiceMock, notificationServiceMock } from '@kbn/core/public/mocks';
-import { SettingsChanges } from '../../types';
-import { Form } from './form';
-
-jest.mock('../field', () => ({
- Field: () => {
- return 'field';
- },
-}));
-
-beforeAll(() => {
- const localStorage: Record = {
- 'core.chrome.isLocked': true,
- };
-
- Object.defineProperty(window, 'localStorage', {
- value: {
- getItem: (key: string) => {
- return localStorage[key] || null;
- },
- },
- writable: true,
- });
-});
-
-afterAll(() => {
- delete (window as any).localStorage;
-});
-
-const defaults = {
- requiresPageReload: false,
- readOnly: false,
- value: 'value',
- description: 'description',
- isOverridden: false,
- type: 'string' as UiSettingsType,
- isCustom: false,
- defVal: 'defVal',
-};
-
-const settings = {
- dashboard: [
- {
- ...defaults,
- name: 'dashboard:test:setting',
- ariaName: 'dashboard test setting',
- displayName: 'Dashboard test setting',
- category: ['dashboard'],
- requiresPageReload: true,
- },
- ],
- general: [
- {
- ...defaults,
- name: 'general:test:date',
- ariaName: 'general test date',
- displayName: 'Test date',
- description: 'bar',
- category: ['general'],
- },
- {
- ...defaults,
- name: 'setting:test',
- ariaName: 'setting test',
- displayName: 'Test setting',
- description: 'foo',
- category: ['general'],
- },
- {
- ...defaults,
- name: 'general:test:array',
- ariaName: 'array test',
- displayName: 'Test array setting',
- description: 'array foo',
- type: 'array' as UiSettingsType,
- category: ['general'],
- defVal: ['test'],
- },
- ],
- 'x-pack': [
- {
- ...defaults,
- name: 'xpack:test:setting',
- ariaName: 'xpack test setting',
- displayName: 'X-Pack test setting',
- category: ['x-pack'],
- description: 'bar',
- },
- ],
-};
-
-const categories = ['general', 'dashboard', 'hiddenCategory', 'x-pack'];
-const categoryCounts = {
- general: 2,
- dashboard: 1,
- 'x-pack': 10,
-};
-const save = jest.fn((changes: SettingsChanges) => Promise.resolve([true]));
-
-const clearQuery = () => {};
-
-describe('Form', () => {
- it('should render normally', async () => {
- const component = shallowWithI18nProvider(
-
- );
-
- expect(component).toMatchSnapshot();
- });
-
- it('should render read-only when saving is disabled', async () => {
- const component = shallowWithI18nProvider(
-
- );
-
- expect(component).toMatchSnapshot();
- });
-
- it('should render no settings message when there are no settings', async () => {
- const component = shallowWithI18nProvider(
-
- );
-
- expect(component).toMatchSnapshot();
- });
-
- it('should not render no settings message when instructed not to', async () => {
- const component = shallowWithI18nProvider(
-
- );
-
- expect(component).toMatchSnapshot();
- });
-
- it('should hide bottom bar when clicking on the cancel changes button', async () => {
- const wrapper = mountWithI18nProvider(
-
- );
- (wrapper.instance() as Form).setState({
- unsavedChanges: {
- 'dashboard:test:setting': {
- value: 'changedValue',
- },
- },
- });
- const updated = wrapper.update();
- expect(updated.exists('[data-test-subj="advancedSetting-bottomBar"]')).toEqual(true);
- await findTestSubject(updated, `advancedSetting-cancelButton`).simulate('click');
- updated.update();
- expect(updated.exists('[data-test-subj="advancedSetting-bottomBar"]')).toEqual(false);
- });
-
- it('should show a reload toast when saving setting requiring a page reload', async () => {
- const toasts = notificationServiceMock.createStartContract().toasts;
- const wrapper = mountWithI18nProvider(
-
- );
- (wrapper.instance() as Form).setState({
- unsavedChanges: {
- 'dashboard:test:setting': {
- value: 'changedValue',
- },
- },
- });
- const updated = wrapper.update();
-
- findTestSubject(updated, `advancedSetting-saveButton`).simulate('click');
- expect(save).toHaveBeenCalled();
- await save({ 'dashboard:test:setting': 'changedValue' });
- expect(toasts.add).toHaveBeenCalledWith(
- expect.objectContaining({
- title: expect.stringContaining(
- 'One or more settings require you to reload the page to take effect.'
- ),
- })
- );
- });
-
- it('should save an array typed field when user provides an empty string correctly', async () => {
- const wrapper = mountWithI18nProvider(
-
- );
-
- (wrapper.instance() as Form).setState({
- unsavedChanges: {
- 'general:test:array': {
- value: '',
- },
- },
- });
-
- findTestSubject(wrapper.update(), `advancedSetting-saveButton`).simulate('click');
- expect(save).toHaveBeenCalledWith({ 'general:test:array': [] });
- });
-
- it('should save an array typed field when user provides a comma separated string correctly', async () => {
- const wrapper = mountWithI18nProvider(
-
- );
-
- (wrapper.instance() as Form).setState({
- unsavedChanges: {
- 'general:test:array': {
- value: 'test1, test2',
- },
- },
- });
-
- findTestSubject(wrapper.update(), `advancedSetting-saveButton`).simulate('click');
- expect(save).toHaveBeenCalledWith({ 'general:test:array': ['test1', 'test2'] });
- });
-});
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/form.tsx b/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
deleted file mode 100644
index e45af3c98cce6..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
+++ /dev/null
@@ -1,432 +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 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 React, { PureComponent, Fragment } from 'react';
-
-import {
- EuiFlexGroup,
- EuiFlexItem,
- EuiSplitPanel,
- EuiLink,
- EuiCallOut,
- EuiSpacer,
- EuiText,
- EuiBottomBar,
- EuiButton,
- EuiToolTip,
- EuiButtonEmpty,
- EuiTitle,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { isEmpty } from 'lodash';
-import { i18n } from '@kbn/i18n';
-import { UiCounterMetricType } from '@kbn/analytics';
-import { KibanaThemeProvider, toMountPoint } from '@kbn/kibana-react-plugin/public';
-import { DocLinksStart, ThemeServiceStart, ToastsStart } from '@kbn/core/public';
-
-import { getCategoryName } from '../../lib';
-import { Field, getEditableValue } from '../field';
-import { FieldSetting, SettingsChanges, FieldState } from '../../types';
-
-type Category = string;
-
-interface FormProps {
- settings: Record;
- visibleSettings: Record;
- categories: Category[];
- categoryCounts: Record;
- clearQuery: () => void;
- save: (changes: SettingsChanges) => Promise;
- showNoResultsMessage: boolean;
- enableSaving: boolean;
- docLinks: DocLinksStart['links'];
- toasts: ToastsStart;
- theme: ThemeServiceStart['theme$'];
- trackUiMetric?: (metricType: UiCounterMetricType, eventName: string | string[]) => void;
- queryText?: string;
-}
-
-interface FormState {
- unsavedChanges: {
- [key: string]: FieldState;
- };
- loading: boolean;
-}
-
-export class Form extends PureComponent {
- state: FormState = {
- unsavedChanges: {},
- loading: false,
- };
-
- setLoading(loading: boolean) {
- this.setState({
- loading,
- });
- }
-
- getSettingByKey = (key: string): FieldSetting | undefined => {
- return Object.values(this.props.settings)
- .flat()
- .find((el) => el.name === key);
- };
-
- getCountOfUnsavedChanges = (): number => {
- return Object.keys(this.state.unsavedChanges).length;
- };
-
- getCountOfHiddenUnsavedChanges = (): number => {
- const shownSettings = Object.values(this.props.visibleSettings)
- .flat()
- .map((setting) => setting.name);
- return Object.keys(this.state.unsavedChanges).filter((key) => !shownSettings.includes(key))
- .length;
- };
-
- areChangesInvalid = (): boolean => {
- const { unsavedChanges } = this.state;
- return Object.values(unsavedChanges).some(({ isInvalid }) => isInvalid);
- };
-
- handleChange = (key: string, change: FieldState) => {
- const setting = this.getSettingByKey(key);
- if (!setting) {
- return;
- }
- const { type, defVal, value } = setting;
- const savedValue = getEditableValue(type, value, defVal);
- if (change.value === savedValue) {
- return this.clearChange(key);
- }
- this.setState({
- unsavedChanges: {
- ...this.state.unsavedChanges,
- [key]: change,
- },
- });
- };
-
- clearChange = (key: string) => {
- if (!this.state.unsavedChanges[key]) {
- return;
- }
- const unsavedChanges = { ...this.state.unsavedChanges };
- delete unsavedChanges[key];
-
- this.setState({
- unsavedChanges,
- });
- };
-
- clearAllUnsaved = () => {
- this.setState({ unsavedChanges: {} });
- };
-
- saveAll = async () => {
- this.setLoading(true);
- const { unsavedChanges } = this.state;
-
- if (isEmpty(unsavedChanges)) {
- return;
- }
- const configToSave: SettingsChanges = {};
- let requiresReload = false;
-
- Object.entries(unsavedChanges).forEach(([name, { value }]) => {
- const setting = this.getSettingByKey(name);
- if (!setting) {
- return;
- }
- const { defVal, type, requiresPageReload, metric } = setting;
- let valueToSave = value;
- let equalsToDefault = false;
- switch (type) {
- case 'array':
- valueToSave = valueToSave.trim();
- valueToSave =
- valueToSave === '' ? [] : valueToSave.split(',').map((val: string) => val.trim());
- equalsToDefault = valueToSave.join(',') === (defVal as string[]).join(',');
- break;
- case 'json':
- const isArray = Array.isArray(JSON.parse((defVal as string) || '{}'));
- valueToSave = valueToSave.trim();
- valueToSave = valueToSave || (isArray ? '[]' : '{}');
- case 'boolean':
- if (metric && this.props.trackUiMetric) {
- const metricName = valueToSave ? `${metric.name}_on` : `${metric.name}_off`;
- this.props.trackUiMetric(metric.type, metricName);
- }
- default:
- equalsToDefault = valueToSave === defVal;
- }
- if (requiresPageReload) {
- requiresReload = true;
- }
- configToSave[name] = equalsToDefault ? null : valueToSave;
- });
-
- try {
- await this.props.save(configToSave);
- this.clearAllUnsaved();
- if (requiresReload) {
- this.renderPageReloadToast();
- }
- } catch (e) {
- this.props.toasts.addDanger(
- i18n.translate('advancedSettings.form.saveErrorMessage', {
- defaultMessage: 'Unable to save',
- })
- );
- }
- this.setLoading(false);
- };
-
- renderPageReloadToast = () => {
- this.props.toasts.add({
- title: i18n.translate('advancedSettings.form.requiresPageReloadToastDescription', {
- defaultMessage: 'One or more settings require you to reload the page to take effect.',
- }),
- toastLifeTimeMs: 15000,
- text: toMountPoint(
-
-
-
- window.location.reload()}
- data-test-subj="windowReloadButton"
- >
- {i18n.translate('advancedSettings.form.requiresPageReloadToastButtonLabel', {
- defaultMessage: 'Reload page',
- })}
-
-
-
-
- ),
- color: 'success',
- });
- };
-
- renderClearQueryLink(totalSettings: number, currentSettings: number) {
- const { clearQuery } = this.props;
-
- if (totalSettings !== currentSettings) {
- return (
-
-
-
-
-
-
-
- ),
- }}
- />
-
-
- );
- }
-
- return null;
- }
-
- renderCategory(category: Category, settings: FieldSetting[], totalSettings: number) {
- return (
-
-
-
-
-
-
- {getCategoryName(category)}
-
-
- {this.renderClearQueryLink(totalSettings, settings.length)}
-
-
-
- {settings.map((setting) => {
- return (
-
- );
- })}
-
-
-
-
- );
- }
-
- maybeRenderNoSettings(clearQuery: FormProps['clearQuery']) {
- if (this.props.showNoResultsMessage) {
- return (
-
-
-
-
- ),
- queryText: {this.props.queryText},
- }}
- />
-
- }
- />
- );
- }
- return null;
- }
-
- renderCountOfUnsaved = () => {
- const unsavedCount = this.getCountOfUnsavedChanges();
- const hiddenUnsavedCount = this.getCountOfHiddenUnsavedChanges();
- return (
-
-
-
- );
- };
-
- renderBottomBar = () => {
- const areChangesInvalid = this.areChangesInvalid();
- return (
-
-
-
- {this.renderCountOfUnsaved()}
-
-
-
-
- {i18n.translate('advancedSettings.form.cancelButtonLabel', {
- defaultMessage: 'Cancel changes',
- })}
-
-
-
-
-
- {i18n.translate('advancedSettings.form.saveButtonLabel', {
- defaultMessage: 'Save changes',
- })}
-
-
-
-
-
- );
- };
-
- render() {
- const { unsavedChanges } = this.state;
- const { visibleSettings, categories, categoryCounts, clearQuery } = this.props;
- const currentCategories: Category[] = [];
- const hasUnsavedChanges = !isEmpty(unsavedChanges);
-
- if (hasUnsavedChanges) {
- document.body.classList.add('kbnBody--mgtAdvancedSettingsHasBottomBar');
- } else {
- document.body.classList.remove('kbnBody--mgtAdvancedSettingsHasBottomBar');
- }
-
- categories.forEach((category) => {
- if (visibleSettings[category] && visibleSettings[category].length) {
- currentCategories.push(category);
- }
- });
-
- return (
-
-
- {currentCategories.length
- ? currentCategories.map((category) => {
- return this.renderCategory(
- category,
- visibleSettings[category],
- categoryCounts[category]
- );
- })
- : this.maybeRenderNoSettings(clearQuery)}
-
- {hasUnsavedChanges && this.renderBottomBar()}
-
- );
- }
-}
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/index.ts b/src/plugins/advanced_settings/public/management_app/components/form/index.ts
deleted file mode 100644
index 5d218b01b0eaa..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/components/form/index.ts
+++ /dev/null
@@ -1,9 +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 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 { Form } from './form';
diff --git a/src/plugins/advanced_settings/public/management_app/components/search/__snapshots__/search.test.tsx.snap b/src/plugins/advanced_settings/public/management_app/components/search/__snapshots__/search.test.tsx.snap
deleted file mode 100644
index 24f8729cafee1..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/components/search/__snapshots__/search.test.tsx.snap
+++ /dev/null
@@ -1,63 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Search should render normally 1`] = `
-
-
-
-`;
diff --git a/src/plugins/advanced_settings/public/management_app/components/search/index.ts b/src/plugins/advanced_settings/public/management_app/components/search/index.ts
deleted file mode 100644
index a9abed56dbb27..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/components/search/index.ts
+++ /dev/null
@@ -1,9 +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 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 { Search } from './search';
diff --git a/src/plugins/advanced_settings/public/management_app/components/search/search.test.tsx b/src/plugins/advanced_settings/public/management_app/components/search/search.test.tsx
deleted file mode 100644
index cef5978945bc8..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/components/search/search.test.tsx
+++ /dev/null
@@ -1,63 +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 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 React from 'react';
-import { shallowWithI18nProvider, mountWithI18nProvider } from '@kbn/test-jest-helpers';
-
-import { findTestSubject } from '@elastic/eui/lib/test';
-
-import { Query } from '@elastic/eui';
-import { Search } from './search';
-
-const query = Query.parse('');
-const categories = ['general', 'dashboard', 'hiddenCategory', 'x-pack'];
-
-describe('Search', () => {
- it('should render normally', async () => {
- const onQueryChange = () => {};
- const component = shallowWithI18nProvider(
-
- );
-
- expect(component).toMatchSnapshot();
- });
-
- it('should call parent function when query is changed', async () => {
- // This test is brittle as it knows about implementation details
- // (EuiFieldSearch uses onKeyup instead of onChange to handle input)
- const onQueryChange = jest.fn();
- const component = mountWithI18nProvider(
-
- );
- findTestSubject(component, 'settingsSearchBar').simulate('keyup', {
- target: { value: 'new filter' },
- });
- expect(onQueryChange).toHaveBeenCalledTimes(1);
- });
-
- it('should handle query parse error', async () => {
- const onQueryChangeMock = jest.fn();
- const component = mountWithI18nProvider(
-
- );
-
- const searchBar = findTestSubject(component, 'settingsSearchBar');
-
- // Send invalid query
- searchBar.simulate('keyup', { target: { value: '?' } });
- expect(onQueryChangeMock).toHaveBeenCalledTimes(0);
- expect(component.state().isSearchTextValid).toBe(false);
-
- onQueryChangeMock.mockReset();
-
- // Send valid query to ensure component can recover from invalid query
- searchBar.simulate('keyup', { target: { value: 'dateFormat' } });
- expect(onQueryChangeMock).toHaveBeenCalledTimes(1);
- expect(component.state().isSearchTextValid).toBe(true);
- });
-});
diff --git a/src/plugins/advanced_settings/public/management_app/components/search/search.tsx b/src/plugins/advanced_settings/public/management_app/components/search/search.tsx
deleted file mode 100644
index 8805c9cc7eed9..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/components/search/search.tsx
+++ /dev/null
@@ -1,100 +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 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 React, { Fragment, PureComponent } from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiSearchBar, EuiFormErrorText, Query } from '@elastic/eui';
-
-import { getCategoryName } from '../../lib';
-
-export const CATEGORY_FIELD = 'category';
-
-interface SearchProps {
- categories: string[];
- query: Query;
- onQueryChange: ({ query }: { query: Query }) => void;
-}
-
-export const parseErrorMsg = i18n.translate(
- 'advancedSettings.searchBar.unableToParseQueryErrorMessage',
- { defaultMessage: 'Unable to parse query' }
-);
-
-export class Search extends PureComponent {
- private categories: Array<{ value: string; name: string }> = [];
-
- constructor(props: SearchProps) {
- super(props);
- const { categories } = props;
- this.categories = categories.map((category) => {
- return {
- value: category,
- name: getCategoryName(category),
- };
- });
- }
-
- state = {
- isSearchTextValid: true,
- parseErrorMessage: null,
- };
-
- onChange = ({ query, error }: { query: Query | null; error: { message: string } | null }) => {
- if (error) {
- this.setState({
- isSearchTextValid: false,
- parseErrorMessage: error.message,
- });
- return;
- }
-
- this.setState({
- isSearchTextValid: true,
- parseErrorMessage: null,
- });
- this.props.onQueryChange({ query: query! });
- };
-
- render() {
- const { query } = this.props;
-
- const box = {
- incremental: true,
- 'data-test-subj': 'settingsSearchBar',
- 'aria-label': i18n.translate('advancedSettings.searchBarAriaLabel', {
- defaultMessage: 'Search advanced settings',
- }), // hack until EuiSearchBar is fixed
- };
-
- const filters = [
- {
- type: 'field_value_selection' as const,
- field: CATEGORY_FIELD,
- name: i18n.translate('advancedSettings.categorySearchLabel', {
- defaultMessage: 'Category',
- }),
- multiSelect: 'or' as const,
- options: this.categories,
- },
- ];
-
- let queryParseError;
- if (!this.state.isSearchTextValid) {
- queryParseError = (
- {`${parseErrorMsg}. ${this.state.parseErrorMessage}`}
- );
- }
-
- return (
-
-
- {queryParseError}
-
- );
- }
-}
diff --git a/src/plugins/advanced_settings/public/management_app/i18n_texts.ts b/src/plugins/advanced_settings/public/management_app/i18n_texts.ts
deleted file mode 100644
index 5267e4baa8029..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/i18n_texts.ts
+++ /dev/null
@@ -1,35 +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 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 { i18n } from '@kbn/i18n';
-
-export const i18nTexts = {
- defaultSpaceTabTitle: i18n.translate('advancedSettings.spaceSettingsTabTitle', {
- defaultMessage: 'Space Settings',
- }),
- defaultSpaceCalloutTitle: i18n.translate('advancedSettings.defaultSpaceCalloutTitle', {
- defaultMessage: 'Changes will affect the current space.',
- }),
- defaultSpaceCalloutSubtitle: i18n.translate('advancedSettings.defaultSpaceCalloutSubtitle', {
- defaultMessage:
- 'Changes will only be applied to the current space. These settings are intended for advanced users, as improper configurations may adversely affect aspects of Kibana.',
- }),
- globalTabTitle: i18n.translate('advancedSettings.globalSettingsTabTitle', {
- defaultMessage: 'Global Settings',
- }),
- globalCalloutTitle: i18n.translate('advancedSettings.globalCalloutTitle', {
- defaultMessage: 'Changes will affect all user settings across all spaces',
- }),
- globalCalloutSubtitle: i18n.translate('advancedSettings.globalCalloutSubtitle', {
- defaultMessage:
- 'Changes will be applied to all users across all spaces. This includes both native Kibana users and single-sign on users.',
- }),
- advancedSettingsTitle: i18n.translate('advancedSettings.advancedSettingsLabel', {
- defaultMessage: 'Advanced Settings',
- }),
-};
diff --git a/src/plugins/advanced_settings/public/management_app/index.scss b/src/plugins/advanced_settings/public/management_app/index.scss
deleted file mode 100644
index 5f473c519dda6..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './advanced_settings';
diff --git a/src/plugins/advanced_settings/public/management_app/lib/default_category.ts b/src/plugins/advanced_settings/public/management_app/lib/default_category.ts
deleted file mode 100644
index c6fb7839662da..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/default_category.ts
+++ /dev/null
@@ -1,9 +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 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 DEFAULT_CATEGORY = 'general';
diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.test.ts b/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.test.ts
deleted file mode 100644
index 739485959b316..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.test.ts
+++ /dev/null
@@ -1,36 +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 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 expect from '@kbn/expect';
-import { getAriaName } from './get_aria_name';
-
-describe('Settings', function () {
- describe('Advanced', function () {
- describe('getAriaName(name)', function () {
- it('should return a space delimited lower-case string with no special characters', function () {
- expect(getAriaName('xPack:defaultAdminEmail')).to.be('x pack default admin email');
- expect(getAriaName('doc_table:highlight')).to.be('doc table highlight');
- expect(getAriaName('foo')).to.be('foo');
- });
-
- it('should return an empty string if passed undefined or null', function () {
- expect(getAriaName()).to.be('');
- expect(getAriaName(undefined)).to.be('');
- });
-
- it('should preserve category string', function () {
- expect(getAriaName('xPack:fooBar:foo_bar_baz category:(general)')).to.be(
- 'x pack foo bar foo bar baz category:(general)'
- );
- expect(getAriaName('xPack:fooBar:foo_bar_baz category:(general or discover)')).to.be(
- 'x pack foo bar foo bar baz category:(general or discover)'
- );
- });
- });
- });
-});
diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts b/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts
deleted file mode 100644
index 5e3ff394dd255..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts
+++ /dev/null
@@ -1,53 +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 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 { words } from 'lodash';
-
-import { Query } from '@elastic/eui';
-
-import { CATEGORY_FIELD } from '../components/search/search';
-
-const mapWords = (name?: string): string =>
- words(name ?? '')
- .map((word) => word.toLowerCase())
- .join(' ');
-
-/**
- * @name {string} the name of the configuration object
- * @returns {string} a space delimited, lowercase string with
- * special characters removed.
- *
- * Examples:
- * - `xPack:fooBar:foo_bar_baz` -> `x pack foo bar foo bar baz`
- * - `xPack:fooBar:foo_bar_baz category:(general)` -> `x pack foo bar foo bar baz category:(general)`
- */
-export function getAriaName(name?: string) {
- if (!name) {
- return '';
- }
-
- const query = Query.parse(name);
-
- if (query.hasOrFieldClause(CATEGORY_FIELD)) {
- const categories = query.getOrFieldClause(CATEGORY_FIELD);
- const termValue = mapWords(query.removeOrFieldClauses(CATEGORY_FIELD).text);
-
- if (!categories || !Array.isArray(categories.value)) {
- return termValue;
- }
-
- let categoriesQuery = Query.parse('');
- categories.value.forEach((v) => {
- categoriesQuery = categoriesQuery.addOrFieldValue(CATEGORY_FIELD, v);
- });
-
- return `${termValue} ${categoriesQuery.text}`;
- }
-
- return mapWords(name);
-}
diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_category_name.test.ts b/src/plugins/advanced_settings/public/management_app/lib/get_category_name.test.ts
deleted file mode 100644
index 22fe8f7a378a5..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/get_category_name.test.ts
+++ /dev/null
@@ -1,25 +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 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 expect from '@kbn/expect';
-import { getCategoryName } from './get_category_name';
-
-describe('Settings', function () {
- describe('Advanced', function () {
- describe('getCategoryName(category)', function () {
- it('should capitalize unknown category', function () {
- expect(getCategoryName('elasticsearch')).to.be('Elasticsearch');
- });
-
- it('should return empty string for no category', function () {
- expect(getCategoryName()).to.be('');
- expect(getCategoryName('')).to.be('');
- });
- });
- });
-});
diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_category_name.ts b/src/plugins/advanced_settings/public/management_app/lib/get_category_name.ts
deleted file mode 100644
index 7341104bf2abb..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/get_category_name.ts
+++ /dev/null
@@ -1,54 +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 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 { i18n } from '@kbn/i18n';
-
-const upperFirst = (str = '') => str.replace(/^./, (strng) => strng.toUpperCase());
-
-const names: Record = {
- general: i18n.translate('advancedSettings.categoryNames.generalLabel', {
- defaultMessage: 'General',
- }),
- machineLearning: i18n.translate('advancedSettings.categoryNames.machineLearningLabel', {
- defaultMessage: 'Machine Learning',
- }),
- observability: i18n.translate('advancedSettings.categoryNames.observabilityLabel', {
- defaultMessage: 'Observability',
- }),
- timelion: i18n.translate('advancedSettings.categoryNames.timelionLabel', {
- defaultMessage: 'Timelion',
- }),
- notifications: i18n.translate('advancedSettings.categoryNames.notificationsLabel', {
- defaultMessage: 'Notifications',
- }),
- visualizations: i18n.translate('advancedSettings.categoryNames.visualizationsLabel', {
- defaultMessage: 'Visualizations',
- }),
- discover: i18n.translate('advancedSettings.categoryNames.discoverLabel', {
- defaultMessage: 'Discover',
- }),
- dashboard: i18n.translate('advancedSettings.categoryNames.dashboardLabel', {
- defaultMessage: 'Dashboard',
- }),
- reporting: i18n.translate('advancedSettings.categoryNames.reportingLabel', {
- defaultMessage: 'Reporting',
- }),
- search: i18n.translate('advancedSettings.categoryNames.searchLabel', {
- defaultMessage: 'Search',
- }),
- securitySolution: i18n.translate('advancedSettings.categoryNames.securitySolutionLabel', {
- defaultMessage: 'Security Solution',
- }),
- enterpriseSearch: i18n.translate('advancedSettings.categoryNames.enterpriseSearchLabel', {
- defaultMessage: 'Enterprise Search',
- }),
-};
-
-export function getCategoryName(category?: string) {
- return category ? names[category] || upperFirst(category) : '';
-}
diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_val_type.test.ts b/src/plugins/advanced_settings/public/management_app/lib/get_val_type.test.ts
deleted file mode 100644
index 308f471620e56..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/get_val_type.test.ts
+++ /dev/null
@@ -1,39 +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 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 expect from '@kbn/expect';
-import { getValType } from './get_val_type';
-
-describe('Settings', function () {
- describe('Advanced', function () {
- describe('getValType(def, val)', function () {
- it('should return the explicitly defined type of a setting', function () {
- expect(getValType({ type: 'string' })).to.be('string');
- expect(getValType({ type: 'json' })).to.be('json');
- expect(getValType({ type: 'string', value: 5 })).to.be('string');
- });
-
- it('should return array if the value is an Array and there is no defined type', function () {
- expect(getValType({ type: 'string' }, [1, 2, 3])).to.be('string');
- expect(getValType({ type: 'json', value: [1, 2, 3] })).to.be('json');
-
- expect(getValType({ value: 'someString' }, [1, 2, 3])).to.be('array');
- expect(getValType({ value: [1, 2, 3] }, 'someString')).to.be('array');
- });
-
- it('should return the type of the default value if there is no type and it is not an array', function () {
- expect(getValType({ value: 'someString' })).to.be('string');
- expect(getValType({ value: 'someString' }, 42)).to.be('string');
- });
-
- it('should return the type of the value if the default value is null', function () {
- expect(getValType({ value: null }, 'someString')).to.be('string');
- });
- });
- });
-});
diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts b/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts
deleted file mode 100644
index eeee280f826ae..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts
+++ /dev/null
@@ -1,40 +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 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.
- */
-
-/**
- * @param {object} advanced setting definition object
- * @param {?} current value of the setting
- * @returns {string} the type to use for determining the display and editor
- */
-
-import { UiSettingsType } from '@kbn/core/public';
-import { FieldSetting } from '../types';
-
-export function getValType(def: Partial, value?: any): UiSettingsType {
- if (def.type) {
- return def.type;
- }
-
- if (Array.isArray(value) || Array.isArray(def.value)) {
- return 'array';
- }
-
- const typeofVal = def.value != null ? typeof def.value : typeof value;
-
- if (typeofVal === 'bigint') {
- return 'number';
- }
-
- if (typeofVal === 'symbol' || typeofVal === 'object' || typeofVal === 'function') {
- throw new Error(
- `incompatible UiSettingsType: '${def.name}' type ${typeofVal} | ${JSON.stringify(def)}`
- );
- }
-
- return typeofVal;
-}
diff --git a/src/plugins/advanced_settings/public/management_app/lib/index.ts b/src/plugins/advanced_settings/public/management_app/lib/index.ts
deleted file mode 100644
index 7b812f031a8b7..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/index.ts
+++ /dev/null
@@ -1,14 +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 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 { isDefaultValue } from './is_default_value';
-export { toEditableConfig } from './to_editable_config';
-export { getCategoryName } from './get_category_name';
-export { DEFAULT_CATEGORY } from './default_category';
-export { getAriaName } from './get_aria_name';
-export { fieldSorter } from './sort_fields';
diff --git a/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts b/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts
deleted file mode 100644
index 4828ea957718d..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts
+++ /dev/null
@@ -1,76 +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 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 expect from '@kbn/expect';
-import { isDefaultValue } from './is_default_value';
-import { UiSettingsType } from '@kbn/core/public';
-
-describe('Settings', function () {
- describe('Advanced', function () {
- describe('getCategoryName(category)', function () {
- describe('when given a setting definition object', function () {
- const setting = {
- isCustom: false,
- value: 'value',
- defVal: 'defaultValue',
- displayName: 'displayName',
- name: 'name',
- ariaName: 'ariaName',
- description: 'description',
- requiresPageReload: false,
- type: 'string' as UiSettingsType,
- isOverridden: false,
- readOnly: false,
- options: [],
- optionLabels: { option: 'label' },
- category: ['category'],
- validation: { regex: /regexString/, message: 'validation description' },
- };
-
- describe('that is custom', function () {
- it('should return true', function () {
- expect(isDefaultValue({ ...setting, isCustom: true })).to.be(true);
- });
- });
-
- describe('without a value', function () {
- it('should return false for empty string but true for undefined', function () {
- expect(isDefaultValue({ ...setting, value: undefined })).to.be(true);
- expect(isDefaultValue({ ...setting, value: '' })).to.be(false);
- });
- });
-
- describe('with a value that is the same as the default value', function () {
- it('should return true', function () {
- expect(isDefaultValue({ ...setting, value: 'defaultValue' })).to.be(true);
- expect(isDefaultValue({ ...setting, value: [], defVal: [] })).to.be(true);
- expect(
- isDefaultValue({ ...setting, value: '{"foo":"bar"}', defVal: '{"foo":"bar"}' })
- ).to.be(true);
- expect(isDefaultValue({ ...setting, value: 123, defVal: 123 })).to.be(true);
- expect(isDefaultValue({ ...setting, value: 456, defVal: '456' })).to.be(true);
- expect(isDefaultValue({ ...setting, value: false, defVal: false })).to.be(true);
- });
- });
-
- describe('with a value that is different than the default value', function () {
- it('should return false', function () {
- expect(isDefaultValue({ ...setting })).to.be(false);
- expect(isDefaultValue({ ...setting, value: [1], defVal: [2] })).to.be(false);
- expect(
- isDefaultValue({ ...setting, value: '{"foo":"bar"}', defVal: '{"foo2":"bar2"}' })
- ).to.be(false);
- expect(isDefaultValue({ ...setting, value: 123, defVal: 1234 })).to.be(false);
- expect(isDefaultValue({ ...setting, value: 456, defVal: '4567' })).to.be(false);
- expect(isDefaultValue({ ...setting, value: true, defVal: false })).to.be(false);
- });
- });
- });
- });
- });
-});
diff --git a/src/plugins/advanced_settings/public/management_app/lib/sort_fields.test.ts b/src/plugins/advanced_settings/public/management_app/lib/sort_fields.test.ts
deleted file mode 100644
index ae2d6c609ac60..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/sort_fields.test.ts
+++ /dev/null
@@ -1,56 +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 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 { FieldSetting } from '../types';
-import { fieldSorter } from './sort_fields';
-
-const createField = (parts: Partial): FieldSetting => ({
- displayName: 'displayName',
- name: 'field',
- value: 'value',
- requiresPageReload: false,
- type: 'string',
- category: [],
- ariaName: 'ariaName',
- isOverridden: false,
- defVal: 'defVal',
- isCustom: false,
- ...parts,
-});
-
-describe('fieldSorter', () => {
- it('sort fields based on their `order` field if present on both', () => {
- const fieldA = createField({ order: 3 });
- const fieldB = createField({ order: 1 });
- const fieldC = createField({ order: 2 });
-
- expect([fieldA, fieldB, fieldC].sort(fieldSorter)).toEqual([fieldB, fieldC, fieldA]);
- });
- it('fields with order defined are ordered first', () => {
- const fieldA = createField({ order: 2 });
- const fieldB = createField({ order: undefined });
- const fieldC = createField({ order: 1 });
-
- expect([fieldA, fieldB, fieldC].sort(fieldSorter)).toEqual([fieldC, fieldA, fieldB]);
- });
- it('sorts by `name` when fields have the same `order`', () => {
- const fieldA = createField({ order: 2, name: 'B' });
- const fieldB = createField({ order: 1 });
- const fieldC = createField({ order: 2, name: 'A' });
-
- expect([fieldA, fieldB, fieldC].sort(fieldSorter)).toEqual([fieldB, fieldC, fieldA]);
- });
-
- it('sorts by `name` when fields have no `order`', () => {
- const fieldA = createField({ order: undefined, name: 'B' });
- const fieldB = createField({ order: undefined, name: 'A' });
- const fieldC = createField({ order: 1 });
-
- expect([fieldA, fieldB, fieldC].sort(fieldSorter)).toEqual([fieldC, fieldB, fieldA]);
- });
-});
diff --git a/src/plugins/advanced_settings/public/management_app/lib/sort_fields.ts b/src/plugins/advanced_settings/public/management_app/lib/sort_fields.ts
deleted file mode 100644
index 90bfa18d2198e..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/sort_fields.ts
+++ /dev/null
@@ -1,31 +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 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 { Comparators } from '@elastic/eui';
-import { FieldSetting } from '../types';
-
-const cmp = Comparators.default('asc');
-
-export const fieldSorter = (a: FieldSetting, b: FieldSetting): number => {
- const aOrder = a.order !== undefined;
- const bOrder = b.order !== undefined;
-
- if (aOrder && bOrder) {
- if (a.order === b.order) {
- return cmp(a.name, b.name);
- }
- return cmp(a.order, b.order);
- }
- if (aOrder) {
- return -1;
- }
- if (bOrder) {
- return 1;
- }
- return cmp(a.name, b.name);
-};
diff --git a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts b/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts
deleted file mode 100644
index 7de174d409b55..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts
+++ /dev/null
@@ -1,106 +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 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 { PublicUiSettingsParams } from '@kbn/core/public';
-import expect from '@kbn/expect';
-import { toEditableConfig } from './to_editable_config';
-
-const defDefault = {
- isOverridden: true,
-};
-
-function invoke({
- def = defDefault,
- name = 'woah',
- value = 'forreal',
-}: {
- def?: PublicUiSettingsParams & { isOverridden?: boolean };
- name?: string;
- value?: any;
-}) {
- return toEditableConfig({ def, name, value, isCustom: def === defDefault, isOverridden: true });
-}
-
-describe('Settings', function () {
- describe('Advanced', function () {
- describe('toEditableConfig(def, name, value)', function () {
- it('sets name', function () {
- expect(invoke({ name: 'who' }).name).to.equal('who');
- });
-
- it('sets value', function () {
- expect(invoke({ value: 'what' }).value).to.equal('what');
- });
-
- it('sets type', function () {
- expect(invoke({ value: 'what' }).type).to.be('string');
- expect(invoke({ value: 0 }).type).to.be('number');
- expect(invoke({ value: [] }).type).to.be('array');
- });
-
- describe('when given a setting definition object', function () {
- let def: PublicUiSettingsParams & { isOverridden?: boolean };
- beforeEach(function () {
- def = {
- value: 'the original',
- description: 'the one and only',
- options: ['all the options'],
- };
- });
-
- it('is not marked as custom', function () {
- expect(invoke({ def }).isCustom).to.be(false);
- });
-
- it('sets a default value', function () {
- expect(invoke({ def }).defVal).to.equal(def.value);
- });
-
- it('sets a description', function () {
- expect(invoke({ def }).description).to.equal(def.description);
- });
-
- it('sets options', function () {
- expect(invoke({ def }).options).to.equal(def.options);
- });
-
- describe('that contains a type', function () {
- it('sets that type', function () {
- def.type = 'string';
- expect(invoke({ def }).type).to.equal(def.type);
- });
- });
-
- describe('that contains a value of type array', function () {
- it('sets type to array', function () {
- def.value = [];
- expect(invoke({ def }).type).to.equal('array');
- });
- });
- });
-
- describe('when not given a setting definition object', function () {
- it('is marked as custom', function () {
- expect(invoke({}).isCustom).to.be(true);
- });
-
- it('sets defVal to undefined', function () {
- expect(invoke({}).defVal).to.be(undefined);
- });
-
- it('sets description to undefined', function () {
- expect(invoke({}).description).to.be(undefined);
- });
-
- it('sets options to undefined', function () {
- expect(invoke({}).options).to.be(undefined);
- });
- });
- });
- });
-});
diff --git a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts b/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts
deleted file mode 100644
index b7a08888bb76a..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts
+++ /dev/null
@@ -1,59 +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 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 { PublicUiSettingsParams, UserProvidedValues, SavedObjectAttribute } from '@kbn/core/public';
-import { FieldSetting } from '../types';
-import { getValType } from './get_val_type';
-import { getAriaName } from './get_aria_name';
-import { DEFAULT_CATEGORY } from './default_category';
-
-/**
- * @param {object} advanced setting definition object
- * @param {object} name of setting
- * @param {object} current value of setting
- * @returns {object} the editable config object
- */
-export function toEditableConfig({
- def,
- name,
- value,
- isCustom,
- isOverridden,
-}: {
- def: PublicUiSettingsParams & UserProvidedValues;
- name: string;
- value: SavedObjectAttribute;
- isCustom: boolean;
- isOverridden: boolean;
-}) {
- if (!def) {
- def = {};
- }
-
- const conf: FieldSetting = {
- name,
- displayName: def.name || name,
- ariaName: def.name || getAriaName(name),
- value,
- category: def.category && def.category.length ? def.category : [DEFAULT_CATEGORY],
- isCustom,
- isOverridden,
- readOnly: !!def.readonly,
- defVal: def.value,
- type: getValType(def, value),
- description: def.description,
- deprecation: def.deprecation,
- options: def.options,
- optionLabels: def.optionLabels,
- order: def.order,
- requiresPageReload: !!def.requiresPageReload,
- metric: def.metric,
- };
-
- return conf;
-}
diff --git a/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx b/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx
deleted file mode 100644
index d41f1f1cacfe4..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx
+++ /dev/null
@@ -1,109 +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 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 React from 'react';
-import ReactDOM from 'react-dom';
-import { Redirect, RouteChildrenProps } from 'react-router-dom';
-import { Router, Routes, Route } from '@kbn/shared-ux-router';
-
-import { i18n } from '@kbn/i18n';
-
-import { LocationDescriptor } from 'history';
-import { url } from '@kbn/kibana-utils-plugin/public';
-import { ManagementAppMountParams } from '@kbn/management-plugin/public';
-import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
-import { StartServicesAccessor } from '@kbn/core/public';
-import type { SectionRegistryStart } from '@kbn/management-settings-section-registry';
-import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
-
-import { QUERY } from './advanced_settings';
-import { Settings } from './settings';
-
-import './index.scss';
-
-const title = i18n.translate('advancedSettings.advancedSettingsLabel', {
- defaultMessage: 'Advanced Settings',
-});
-const crumb = [{ text: title }];
-
-const readOnlyBadge = {
- text: i18n.translate('advancedSettings.badge.readOnly.text', {
- defaultMessage: 'Read only',
- }),
- tooltip: i18n.translate('advancedSettings.badge.readOnly.tooltip', {
- defaultMessage: 'Unable to save advanced settings',
- }),
- iconType: 'glasses',
-};
-
-type RedirectUrlProps = RouteChildrenProps<{ [QUERY]: string }>;
-
-const redirectUrl = ({ match, location }: RedirectUrlProps): LocationDescriptor => {
- const search = url.addQueryParam(location.search, QUERY, match?.params[QUERY]);
-
- return {
- pathname: '/',
- search,
- };
-};
-
-export async function mountManagementSection(
- getStartServices: StartServicesAccessor,
- params: ManagementAppMountParams,
- sectionRegistry: SectionRegistryStart,
- usageCollection?: UsageCollectionSetup
-) {
- params.setBreadcrumbs(crumb);
- const [{ settings, notifications, docLinks, application, chrome, i18n: i18nStart, theme }] =
- await getStartServices();
-
- const { advancedSettings, globalSettings } = application.capabilities;
- const canSaveAdvancedSettings = advancedSettings.save as boolean;
- const canSaveGlobalSettings = globalSettings.save as boolean;
- const canShowGlobalSettings = globalSettings.show as boolean;
- const trackUiMetric = usageCollection?.reportUiCounter.bind(usageCollection, 'advanced_settings');
- if (!canSaveAdvancedSettings || (!canSaveGlobalSettings && canShowGlobalSettings)) {
- chrome.setBadge(readOnlyBadge);
- }
-
- chrome.docTitle.change(title);
-
- ReactDOM.render(
-
-
-
- {/* TODO: remove route param (`query`) in 7.13 */}
-
- {(props: RedirectUrlProps) => }
-
-
-
-
-
-
- ,
- params.element
- );
- return () => {
- chrome.docTitle.reset();
- ReactDOM.unmountComponentAtNode(params.element);
- };
-}
diff --git a/src/plugins/advanced_settings/public/management_app/settings.test.tsx b/src/plugins/advanced_settings/public/management_app/settings.test.tsx
deleted file mode 100644
index a98b29922af1a..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/settings.test.tsx
+++ /dev/null
@@ -1,376 +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 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 React from 'react';
-import { Observable } from 'rxjs';
-import { ReactWrapper } from 'enzyme';
-import { mountWithI18nProvider } from '@kbn/test-jest-helpers';
-import dedent from 'dedent';
-import { PublicUiSettingsParams, UserProvidedValues, UiSettingsType } from '@kbn/core/public';
-import { settingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
-
-import { FieldSetting } from './types';
-import { Settings } from './settings';
-import {
- notificationServiceMock,
- docLinksServiceMock,
- themeServiceMock,
-} from '@kbn/core/public/mocks';
-import { SectionRegistry } from '@kbn/management-settings-section-registry';
-import { Search } from './components/search';
-import { EuiTab } from '@elastic/eui';
-
-jest.mock('./components/field', () => ({
- Field: () => {
- return 'field';
- },
-}));
-
-jest.mock('./components/call_outs', () => ({
- CallOuts: () => {
- return 'callOuts';
- },
-}));
-
-jest.mock('./components/search', () => ({
- Search: () => {
- return 'search';
- },
-}));
-
-function mockConfig() {
- const defaultConfig: Partial = {
- displayName: 'defaultName',
- requiresPageReload: false,
- isOverridden: false,
- ariaName: 'ariaName',
- readOnly: false,
- isCustom: false,
- defVal: 'defVal',
- type: 'string' as UiSettingsType,
- category: ['category'],
- };
-
- const config = {
- set: (key: string, value: any) => Promise.resolve(true),
- remove: (key: string) => Promise.resolve(true),
- isCustom: (key: string) => false,
- isOverridden: (key: string) => Boolean(config.getAll()[key].isOverridden),
- getRegistered: () => ({} as Readonly>),
- getUpdate$: () =>
- new Observable<{
- key: string;
- newValue: any;
- oldValue: any;
- }>(),
- isDeclared: (key: string) => true,
- isDefault: (key: string) => true,
-
- getSaved$: () =>
- new Observable<{
- key: string;
- newValue: any;
- oldValue: any;
- }>(),
-
- getUpdateErrors$: () => new Observable(),
- get: (key: string, defaultOverride?: any): any => config.getAll()[key] || defaultOverride,
- get$: (key: string) => new Observable(config.get(key)),
- getAll: (): Readonly> => {
- return {
- 'test:array:setting': {
- ...defaultConfig,
- value: ['default_value'],
- name: 'Test array setting',
- description: 'Description for Test array setting',
- category: ['elasticsearch'],
- },
- 'test:boolean:setting': {
- ...defaultConfig,
- value: true,
- name: 'Test boolean setting',
- description: 'Description for Test boolean setting',
- category: ['elasticsearch'],
- },
- 'test:image:setting': {
- ...defaultConfig,
- value: null,
- name: 'Test image setting',
- description: 'Description for Test image setting',
- type: 'image',
- },
- 'test:json:setting': {
- ...defaultConfig,
- value: '{"foo": "bar"}',
- name: 'Test json setting',
- description: 'Description for Test json setting',
- type: 'json',
- },
- 'test:markdown:setting': {
- ...defaultConfig,
- value: '',
- name: 'Test markdown setting',
- description: 'Description for Test markdown setting',
- type: 'markdown',
- },
- 'test:number:setting': {
- ...defaultConfig,
- value: 5,
- name: 'Test number setting',
- description: 'Description for Test number setting',
- },
- 'test:select:setting': {
- ...defaultConfig,
- value: 'orange',
- name: 'Test select setting',
- description: 'Description for Test select setting',
- type: 'select',
- options: ['apple', 'orange', 'banana'],
- },
- 'test:string:setting': {
- ...defaultConfig,
- ...{
- value: null,
- name: 'Test string setting',
- description: 'Description for Test string setting',
- type: 'string',
- isCustom: true,
- },
- },
- 'test:readonlystring:setting': {
- ...defaultConfig,
- ...{
- value: null,
- name: 'Test readonly string setting',
- description: 'Description for Test readonly string setting',
- type: 'string',
- readOnly: true,
- },
- },
- 'test:customstring:setting': {
- ...defaultConfig,
- ...{
- value: null,
- name: 'Test custom string setting',
- description: 'Description for Test custom string setting',
- type: 'string',
- isCustom: true,
- },
- },
- 'test:isOverridden:string': {
- ...defaultConfig,
- isOverridden: true,
- value: 'foo',
- name: 'An overridden string',
- description: 'Description for overridden string',
- type: 'string',
- },
- 'test:isOverridden:number': {
- ...defaultConfig,
- isOverridden: true,
- value: 1234,
- name: 'An overridden number',
- description: 'Description for overridden number',
- type: 'number',
- },
- 'test:isOverridden:json': {
- ...defaultConfig,
- isOverridden: true,
- value: dedent`
- {
- "foo": "bar"
- }
- `,
- name: 'An overridden json',
- description: 'Description for overridden json',
- type: 'json',
- },
- 'test:isOverridden:select': {
- ...defaultConfig,
- isOverridden: true,
- value: 'orange',
- name: 'Test overridden select setting',
- description: 'Description for overridden select setting',
- type: 'select',
- options: ['apple', 'orange', 'banana'],
- },
- };
- },
- validateValue: (key: string, value: any) =>
- Promise.resolve({ successfulValidation: true, valid: true }),
- };
- return {
- core: {
- settings: {
- client: config,
- globalClient: settingsServiceMock.createStartContract().globalClient,
- },
- },
- plugins: {
- advancedSettings: {
- componentRegistry: {
- get: () => {
- const foo: React.ComponentType = () => Hello
;
- foo.displayName = 'foo_component';
- return foo;
- },
- componentType: {
- PAGE_TITLE_COMPONENT: 'page_title_component',
- PAGE_SUBTITLE_COMPONENT: 'page_subtitle_component',
- },
- },
- },
- },
- };
-}
-
-describe('Settings', () => {
- const defaultQuery = 'test:string:setting';
- const mockHistory = {
- listen: jest.fn(),
- } as any;
- const locationSpy = jest.spyOn(window, 'location', 'get');
-
- afterAll(() => {
- locationSpy.mockRestore();
- });
-
- const mockQuery = (query = defaultQuery) => {
- locationSpy.mockImplementation(
- () =>
- ({
- search: `?query=${query}`,
- } as any)
- );
- };
-
- it('should render specific setting if given setting key', async () => {
- mockQuery();
- const component = mountWithI18nProvider(
-
- );
-
- expect(
- component
- .find('Field')
- .filterWhere(
- (n: ReactWrapper) => (n.prop('setting') as Record).name === defaultQuery
- )
- ).toHaveLength(1);
- });
-
- it('should not render a custom setting', async () => {
- // The manual mock for the uiSettings client returns false for isConfig, override that
- const uiSettings = mockConfig().core.settings.client;
- uiSettings.isCustom = (key) => true;
-
- const customSettingQuery = 'test:customstring:setting';
- mockQuery(customSettingQuery);
- const component = mountWithI18nProvider(
-
- );
-
- expect(component.find('Field')).not.toBeNull();
- expect(
- component
- .find('Field')
- .filterWhere(
- (n: ReactWrapper) =>
- (n.prop('setting') as Record).name === customSettingQuery
- )
- ).toEqual({});
- });
-
- it('should render read-only when saving is disabled', async () => {
- mockQuery();
- const component = mountWithI18nProvider(
-
- );
-
- expect(component.find('Field')).not.toBeNull();
- expect(
- component
- .find('Field')
- .filterWhere(
- (n: ReactWrapper) => (n.prop('setting') as Record).name === defaultQuery
- )
- .prop('enableSaving')
- ).toBe(false);
- });
-
- it('should render unfiltered with query parsing error', async () => {
- const badQuery = 'category:(accessibility))';
- mockQuery(badQuery);
- const { toasts } = notificationServiceMock.createStartContract();
-
- const component = mountWithI18nProvider(
-
- );
-
- expect(toasts.addWarning).toHaveBeenCalledTimes(1);
- expect(component.find(Search).prop('query').text).toEqual('');
- });
-
- it('does not render global settings if show is set to false', async () => {
- const badQuery = 'category:(accessibility))';
- mockQuery(badQuery);
- const { toasts } = notificationServiceMock.createStartContract();
-
- const component = mountWithI18nProvider(
-
- );
-
- expect(component.find(EuiTab).length).toEqual(1);
- expect(component.find(EuiTab).at(0).text()).toEqual('Space Settings');
- });
-});
diff --git a/src/plugins/advanced_settings/public/management_app/settings.tsx b/src/plugins/advanced_settings/public/management_app/settings.tsx
deleted file mode 100644
index ae5837a97cbec..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/settings.tsx
+++ /dev/null
@@ -1,369 +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 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 React, { useState, useCallback, useMemo } from 'react';
-import useEffectOnce from 'react-use/lib/useEffectOnce';
-import {
- EuiSpacer,
- Query,
- EuiNotificationBadge,
- EuiTab,
- EuiTabs,
- EuiFlexGroup,
- EuiFlexItem,
- EuiText,
-} from '@elastic/eui';
-import { ScopedHistory } from '@kbn/core-application-browser';
-import { SettingsStart } from '@kbn/core-ui-settings-browser';
-import { DocLinksStart } from '@kbn/core-doc-links-browser';
-import { ToastsStart } from '@kbn/core-notifications-browser';
-import { ThemeServiceStart } from '@kbn/core-theme-browser';
-import { UiCounterMetricType } from '@kbn/analytics';
-import { url } from '@kbn/kibana-utils-plugin/common';
-import { parse } from 'query-string';
-import { UiSettingsScope } from '@kbn/core-ui-settings-common';
-import type { SectionRegistryStart } from '@kbn/management-settings-section-registry';
-import type { RegistryEntry } from '@kbn/management-settings-section-registry';
-import { mapConfig, mapSettings, initCategoryCounts, initCategories } from './settings_helper';
-import { parseErrorMsg } from './components/search/search';
-import { AdvancedSettings, QUERY } from './advanced_settings';
-import { Search } from './components/search';
-import { FieldSetting } from './types';
-import { i18nTexts } from './i18n_texts';
-import { getAriaName } from './lib';
-
-interface AdvancedSettingsState {
- query: Query;
- filteredSettings: Record>;
- filteredSections: {
- global: RegistryEntry[];
- space: RegistryEntry[];
- };
-}
-
-export type GroupedSettings = Record;
-
-interface Props {
- history: ScopedHistory;
- enableSaving: Record;
- enableShowing: Record;
- settingsService: SettingsStart;
- docLinks: DocLinksStart['links'];
- toasts: ToastsStart;
- theme: ThemeServiceStart['theme$'];
- sectionRegistry: SectionRegistryStart;
- trackUiMetric?: (metricType: UiCounterMetricType, eventName: string | string[]) => void;
-}
-
-const SPACE_SETTINGS_ID = 'space-settings';
-const GLOBAL_SETTINGS_ID = 'global-settings';
-
-export const Settings = (props: Props) => {
- const { sectionRegistry, history, settingsService, enableSaving, enableShowing, ...rest } = props;
- const uiSettings = settingsService.client;
- const globalUiSettings = settingsService.globalClient;
-
- const [settings, setSettings] = useState(mapConfig(uiSettings));
- const [globalSettings, setGlobalSettings] = useState(mapConfig(globalUiSettings));
-
- const [groupedSettings, setGroupedSettings] = useState>({
- namespace: mapSettings(settings),
- global: mapSettings(globalSettings),
- });
-
- const [categoryCounts, setCategoryCounts] = useState<
- Record>
- >({
- namespace: initCategoryCounts(groupedSettings.namespace),
- global: initCategoryCounts(groupedSettings.global),
- });
-
- const [categories, setCategories] = useState>({
- namespace: initCategories(groupedSettings.namespace),
- global: initCategories(groupedSettings.global),
- });
-
- const [queryState, setQueryState] = useState({
- filteredSettings: {
- global: {},
- namespace: {},
- },
- filteredSections: {
- global: sectionRegistry.getGlobalSections(),
- space: sectionRegistry.getSpacesSections(),
- },
- query: Query.parse(''),
- });
-
- const setTimeoutCallback = () => {
- const { hash } = window.location;
- const id = hash.replace('#', '');
- const element = document.getElementById(id);
-
- let globalNavOffset = 0;
-
- const globalNavBars = document
- .getElementById('globalHeaderBars')
- ?.getElementsByClassName('euiHeader');
-
- if (globalNavBars) {
- Array.from(globalNavBars).forEach((navBar) => {
- globalNavOffset += (navBar as HTMLDivElement).offsetHeight;
- });
- }
-
- if (element) {
- element.scrollIntoView();
- window.scrollBy(0, -globalNavOffset); // offsets scroll by height of the global nav
- }
- };
-
- useEffectOnce(() => {
- setQueryState(getQueryState(undefined, true));
-
- const subscription = (mappedSettings: FieldSetting[], scope: UiSettingsScope) => {
- const grouped = { ...groupedSettings };
- grouped[scope] = mapSettings(mappedSettings);
- setGroupedSettings(grouped);
-
- const updatedCategories = { ...categories };
- updatedCategories[scope] = initCategories(groupedSettings[scope]);
- setCategories(updatedCategories);
-
- const updatedCategoryCounts = { ...categoryCounts };
- updatedCategoryCounts[scope] = initCategoryCounts(groupedSettings[scope]);
- setCategoryCounts(updatedCategoryCounts);
- const updatedQueryState = { ...getQueryState(undefined, true) };
- updatedQueryState.filteredSettings[scope] = mapSettings(
- Query.execute(updatedQueryState.query, mappedSettings)
- );
- setQueryState(updatedQueryState);
- };
-
- const uiSettingsSubscription = uiSettings.getUpdate$().subscribe(() => {
- const updatedSettings = mapConfig(uiSettings);
- setSettings(updatedSettings);
- subscription(updatedSettings, 'namespace');
- });
- const globalUiSettingsSubscription = globalUiSettings.getUpdate$().subscribe(() => {
- const mappedSettings = mapConfig(globalUiSettings);
- setGlobalSettings(mappedSettings);
- subscription(mappedSettings, 'global');
- });
- if (window.location.hash !== '') {
- setTimeout(() => setTimeoutCallback(), 0);
- }
- const unregister = history.listen(({ search }) => {
- setQueryState(getQueryState(search));
- });
- return () => {
- unregister();
- uiSettingsSubscription.unsubscribe();
- globalUiSettingsSubscription.unsubscribe();
- };
- });
-
- const setUrlQuery = useCallback(
- (query: string = '') => {
- const search = url.addQueryParam(window.location.search, QUERY, query);
-
- history.push({
- pathname: '', // remove any route query param
- search,
- });
- },
- [history]
- );
-
- const searchCategories = useMemo(() => {
- return categories.global.concat(categories.namespace);
- }, [categories.global, categories.namespace]);
-
- const callOutTitle = (scope: UiSettingsScope) => {
- if (scope === 'namespace') {
- return i18nTexts.defaultSpaceCalloutTitle;
- }
- return i18nTexts.globalCalloutTitle;
- };
-
- const callOutSubtitle = (scope: UiSettingsScope) => {
- if (scope === 'namespace') {
- return i18nTexts.defaultSpaceCalloutSubtitle;
- }
- return i18nTexts.globalCalloutSubtitle;
- };
-
- const getClientForScope = (scope: UiSettingsScope) => {
- if (scope === 'namespace') {
- return uiSettings;
- }
- return globalUiSettings;
- };
-
- const renderAdvancedSettings = (scope: UiSettingsScope) => {
- return (
- setUrlQuery('')}
- noResults={
- queryState.filteredSections.global.length + queryState.filteredSections.space.length === 0
- }
- queryText={queryState.query.text}
- callOutTitle={callOutTitle(scope)}
- callOutSubtitle={callOutSubtitle(scope)}
- settingsService={settingsService}
- uiSettingsClient={getClientForScope(scope)}
- enableSaving={enableSaving[scope]}
- {...rest}
- />
- );
- };
-
- const tabs = [
- {
- id: SPACE_SETTINGS_ID,
- name: i18nTexts.defaultSpaceTabTitle,
- append:
- queryState.query.text !== '' ? (
-
- {Object.keys(queryState.filteredSettings.namespace).length +
- queryState.filteredSections.space.length}
-
- ) : null,
- content: renderAdvancedSettings('namespace'),
- },
- ];
- if (enableShowing.global) {
- tabs.push({
- id: GLOBAL_SETTINGS_ID,
- name: i18nTexts.globalTabTitle,
- append:
- queryState.query.text !== '' ? (
-
- {Object.keys(queryState.filteredSettings.global).length +
- queryState.filteredSections.global.length}
-
- ) : null,
- content: renderAdvancedSettings('global'),
- });
- }
-
- const [selectedTabId, setSelectedTabId] = useState(SPACE_SETTINGS_ID);
-
- const selectedTabContent = tabs.find((obj) => obj.id === selectedTabId)?.content;
-
- const onSelectedTabChanged = (id: string) => {
- setSelectedTabId(id);
- };
-
- const renderTabs = () => {
- return tabs.map((tab, index) => (
- onSelectedTabChanged(tab.id)}
- isSelected={tab.id === selectedTabId}
- append={tab.append}
- >
- {tab.name}
-
- ));
- };
-
- const getQuery = (queryString: string, initialQuery = false): Query => {
- try {
- const query = initialQuery ? getAriaName(queryString) : queryString ?? '';
- return Query.parse(query);
- } catch ({ message }) {
- props.toasts.addWarning({
- title: parseErrorMsg,
- text: message,
- });
- return Query.parse('');
- }
- };
-
- const getQueryText = (search?: string): string => {
- const queryParams = parse(search ?? window.location.search) ?? {};
- return (queryParams[QUERY] as string) ?? '';
- };
-
- const getQueryState = (search?: string, initialQuery = false): AdvancedSettingsState => {
- const queryString = getQueryText(search);
- const query = getQuery(queryString, initialQuery);
- const filteredSettings = {
- namespace: mapSettings(Query.execute(query, settings)),
- global: mapSettings(Query.execute(query, globalSettings)),
- };
-
- return {
- query,
- filteredSettings,
- filteredSections: {
- global: sectionRegistry
- .getGlobalSections()
- .filter(({ queryMatch }) => queryMatch(query.text)),
- space: sectionRegistry
- .getSpacesSections()
- .filter(({ queryMatch }) => queryMatch(query.text)),
- },
- };
- };
-
- const onQueryChange = useCallback(
- ({ query }: { query: Query }) => {
- setUrlQuery(query.text);
- },
- [setUrlQuery]
- );
-
- const PageTitle = (
-
- {i18nTexts.advancedSettingsTitle}
-
- );
-
- const mapSections = (entries: RegistryEntry[]) =>
- entries.map(({ Component, queryMatch }, index) => {
- if (queryMatch(queryState.query.text)) {
- return (
-
- );
- }
- return null;
- });
-
- return (
-
-
- {PageTitle}
-
-
-
-
-
- {renderTabs()}
- {selectedTabContent}
- {selectedTabId === SPACE_SETTINGS_ID ? (
- <>{mapSections(queryState.filteredSections.space)}
- ) : (
- <>{mapSections(queryState.filteredSections.global)}
- )}
-
- );
-};
diff --git a/src/plugins/advanced_settings/public/management_app/settings_helper.test.ts b/src/plugins/advanced_settings/public/management_app/settings_helper.test.ts
deleted file mode 100644
index e4aaab4bb3054..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/settings_helper.test.ts
+++ /dev/null
@@ -1,155 +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 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 { UiSettingsType, UserProvidedValues } from '@kbn/core-ui-settings-common';
-import { PublicUiSettingsParams } from '@kbn/core/public';
-import { Observable } from 'rxjs';
-import { FieldSetting } from './types';
-import { mapConfig, mapSettings, initCategoryCounts, initCategories } from './settings_helper';
-
-describe('Settings Helper', () => {
- const defaultConfig: Partial = {
- displayName: 'defaultName',
- requiresPageReload: false,
- isOverridden: false,
- ariaName: 'ariaName',
- readOnly: false,
- isCustom: false,
- defVal: 'defVal',
- type: 'string' as UiSettingsType,
- category: ['category'],
- };
-
- const arraySetting = {
- 'test:array:setting': {
- ...defaultConfig,
- value: ['default_value'],
- name: 'Test array setting',
- description: 'Description for Test array setting',
- category: ['elasticsearch'],
- },
- };
-
- const booleanSetting = {
- 'test:boolean:setting': {
- ...defaultConfig,
- value: true,
- name: 'Test boolean setting',
- description: 'Description for Test boolean setting',
- category: ['elasticsearch'],
- },
- };
-
- const imageSetting = {
- 'test:image:setting': {
- ...defaultConfig,
- value: null,
- name: 'Test image setting',
- description: 'Description for Test image setting',
- type: 'image' as UiSettingsType,
- },
- };
-
- const arrayFieldSetting = {
- ariaName: 'Test array setting',
- category: ['elasticsearch'],
- defVal: ['default_value'],
- description: 'Description for Test array setting',
- displayName: 'Test array setting',
- isCustom: false,
- isOverridden: false,
- name: 'test:array:setting',
- readOnly: false,
- requiresPageReload: false,
- type: 'string' as UiSettingsType,
- };
-
- const booleanFieldSetting = {
- ariaName: 'Test boolean setting',
- category: ['elasticsearch'],
- defVal: true,
- description: 'Description for Test boolean setting',
- displayName: 'Test boolean setting',
- isCustom: false,
- isOverridden: false,
- name: 'test:boolean:setting',
- readOnly: false,
- requiresPageReload: false,
- type: 'string' as UiSettingsType,
- };
-
- const imageFieldSetting = {
- ariaName: 'Test image setting',
- category: ['category'],
- defVal: null,
- description: 'Description for Test image setting',
- displayName: 'Test image setting',
- isCustom: false,
- isOverridden: false,
- name: 'test:image:setting',
- readOnly: false,
- requiresPageReload: false,
- type: 'image' as UiSettingsType,
- };
-
- const config = {
- set: (key: string, value: any) => Promise.resolve(true),
- remove: (key: string) => Promise.resolve(true),
- isCustom: (key: string) => false,
- isOverridden: (key: string) => Boolean(config.getAll()[key].isOverridden),
- getRegistered: () => ({} as Readonly>),
- getUpdate$: () =>
- new Observable<{
- key: string;
- newValue: any;
- oldValue: any;
- }>(),
- isDeclared: (key: string) => true,
- isDefault: (key: string) => true,
-
- getSaved$: () =>
- new Observable<{
- key: string;
- newValue: any;
- oldValue: any;
- }>(),
-
- getUpdateErrors$: () => new Observable(),
- get: (key: string, defaultOverride?: any): any => config.getAll()[key] || defaultOverride,
- get$: (key: string) => new Observable(config.get(key)),
- getAll: (): Readonly> => {
- return {
- ...arraySetting,
- ...booleanSetting,
- ...imageSetting,
- };
- },
- validateValue: (key: string, value: any) =>
- Promise.resolve({ successfulValidation: true, valid: true }),
- };
-
- it('mapConfig', () => {
- expect(mapConfig(config)).toEqual([arrayFieldSetting, booleanFieldSetting, imageFieldSetting]);
- });
-
- it('mapSettings, initCategoryCounts and initCategories', () => {
- const fieldSetting1: FieldSetting = { ...arrayFieldSetting, value: ['a', 'b', 'c'] };
- const fieldSetting2: FieldSetting = { ...booleanFieldSetting, value: false };
- const fieldSetting3: FieldSetting = { ...imageFieldSetting, value: 'imageSrc' };
- const mapped = mapSettings([fieldSetting1, fieldSetting2, fieldSetting3]);
- expect(Object.keys(mapped).sort()).toEqual(['category', 'elasticsearch'].sort());
- expect(mapped.category.length).toEqual(1);
- expect(mapped.elasticsearch.length).toEqual(2);
-
- const categoryCounts = initCategoryCounts(mapped);
- expect(categoryCounts).toEqual({ category: 1, elasticsearch: 2 });
-
- const categories = initCategories(mapped);
- expect(categories).toEqual(['category', 'elasticsearch']);
- });
-});
diff --git a/src/plugins/advanced_settings/public/management_app/settings_helper.ts b/src/plugins/advanced_settings/public/management_app/settings_helper.ts
deleted file mode 100644
index 15921f2dd77c4..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/settings_helper.ts
+++ /dev/null
@@ -1,56 +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 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 { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
-import { DEFAULT_CATEGORY, fieldSorter, toEditableConfig } from './lib';
-import { FieldSetting } from './types';
-import { GroupedSettings } from './settings';
-
-export const mapConfig = (config: IUiSettingsClient) => {
- const all = config.getAll();
- return Object.entries(all)
- .map(([settingId, settingDef]) => {
- return toEditableConfig({
- def: settingDef,
- name: settingId,
- value: settingDef.userValue,
- isCustom: config.isCustom(settingId),
- isOverridden: config.isOverridden(settingId),
- });
- })
- .filter((c) => !c.readOnly)
- .filter((c) => !c.isCustom) // hide any settings that aren't explicitly registered by enabled plugins.
- .sort(fieldSorter);
-};
-
-export const mapSettings = (fieldSettings: FieldSetting[]) => {
- // Group settings by category
- return fieldSettings.reduce((grouped: GroupedSettings, setting) => {
- // We will want to change this logic when we put each category on its
- // own page aka allowing a setting to be included in multiple categories.
- const category = setting.category[0];
- (grouped[category] = grouped[category] || []).push(setting);
- return grouped;
- }, {});
-};
-
-export const initCategoryCounts = (grouped: GroupedSettings) => {
- return Object.keys(grouped).reduce((counts: Record, category: string) => {
- counts[category] = grouped[category].length;
- return counts;
- }, {});
-};
-
-export const initCategories = (grouped: GroupedSettings) => {
- return Object.keys(grouped).sort((a, b) => {
- if (a === DEFAULT_CATEGORY) return -1;
- if (b === DEFAULT_CATEGORY) return 1;
- if (a > b) return 1;
- return a === b ? 0 : -1;
- });
-};
diff --git a/src/plugins/advanced_settings/public/management_app/types.ts b/src/plugins/advanced_settings/public/management_app/types.ts
deleted file mode 100644
index 9ee0d7811cd30..0000000000000
--- a/src/plugins/advanced_settings/public/management_app/types.ts
+++ /dev/null
@@ -1,51 +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 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 type { ReactElement } from 'react';
-import { UiCounterMetricType } from '@kbn/analytics';
-import { UiSettingsType } from '@kbn/core/public';
-
-export interface FieldSetting {
- displayName: string;
- name: string;
- value: unknown;
- description?: string | ReactElement;
- options?: string[] | number[];
- optionLabels?: Record;
- requiresPageReload: boolean;
- type: UiSettingsType;
- category: string[];
- ariaName: string;
- isOverridden: boolean;
- defVal: unknown;
- isCustom: boolean;
- readOnly?: boolean;
- order?: number;
- deprecation?: {
- message: string;
- docLinksKey: string;
- };
- metric?: {
- type: UiCounterMetricType;
- name: string;
- };
-}
-
-// until eui searchbar and query are typed
-
-export interface SettingsChanges {
- [key: string]: any;
-}
-
-export interface FieldState {
- value?: any;
- changeImage?: boolean;
- loading?: boolean;
- isInvalid?: boolean;
- error?: string | null;
-}
diff --git a/src/plugins/advanced_settings/public/mocks.ts b/src/plugins/advanced_settings/public/mocks.ts
deleted file mode 100644
index 00e50b6672e07..0000000000000
--- a/src/plugins/advanced_settings/public/mocks.ts
+++ /dev/null
@@ -1,26 +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 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 type {
- SectionRegistrySetup,
- SectionRegistryStart,
-} from '@kbn/management-settings-section-registry';
-
-const addGlobalSection = jest.fn();
-const addSpaceSection = jest.fn();
-const getGlobalSections = jest.fn();
-const getSpacesSections = jest.fn();
-
-export const advancedSettingsMock = {
- createSetupContract(): SectionRegistrySetup {
- return { addGlobalSection, addSpaceSection };
- },
- createStartContract(): SectionRegistryStart {
- return { getGlobalSections, getSpacesSections };
- },
-};
diff --git a/src/plugins/advanced_settings/public/plugin.ts b/src/plugins/advanced_settings/public/plugin.tsx
similarity index 65%
rename from src/plugins/advanced_settings/public/plugin.ts
rename to src/plugins/advanced_settings/public/plugin.tsx
index f47993c1bb452..aca337c70ceac 100644
--- a/src/plugins/advanced_settings/public/plugin.ts
+++ b/src/plugins/advanced_settings/public/plugin.tsx
@@ -9,10 +9,20 @@
import { i18n } from '@kbn/i18n';
import { CoreSetup, Plugin } from '@kbn/core/public';
import { SectionRegistry } from '@kbn/management-settings-section-registry';
+import ReactDOM from 'react-dom';
+import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
+import React from 'react';
+import { withSuspense } from '@kbn/shared-ux-utility';
import { AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup } from './types';
const { setup: sectionRegistrySetup, start: sectionRegistryStart } = new SectionRegistry();
+const LazyKibanaSettingsApplication = React.lazy(async () => ({
+ default: (await import('@kbn/management-settings-application')).KibanaSettingsApplication,
+}));
+
+const KibanaSettingsApplication = withSuspense(LazyKibanaSettingsApplication);
+
const title = i18n.translate('advancedSettings.advancedSettingsLabel', {
defaultMessage: 'Advanced Settings',
});
@@ -30,16 +40,21 @@ export class AdvancedSettingsPlugin
id: 'settings',
title,
order: 3,
- async mount(params) {
- const { mountManagementSection } = await import(
- './management_app/mount_management_section'
- );
- return mountManagementSection(
- core.getStartServices,
- params,
- sectionRegistryStart,
- usageCollection
+ async mount({ element, setBreadcrumbs, history }) {
+ const [coreStart] = await core.getStartServices();
+ setBreadcrumbs([{ text: title }]);
+
+ ReactDOM.render(
+
+
+ ,
+ element
);
+ return () => {
+ ReactDOM.unmountComponentAtNode(element);
+ };
},
});
diff --git a/src/plugins/advanced_settings/server/capabilities_provider.ts b/src/plugins/advanced_settings/server/capabilities_provider.ts
index 760d6f418201b..06f86cce3239a 100644
--- a/src/plugins/advanced_settings/server/capabilities_provider.ts
+++ b/src/plugins/advanced_settings/server/capabilities_provider.ts
@@ -6,13 +6,15 @@
* Side Public License, v 1.
*/
-export const capabilitiesProvider = () => ({
+import { AdvancedSettingsConfig } from './config';
+
+export const capabilitiesProvider = (config: AdvancedSettingsConfig) => ({
globalSettings: {
- show: true,
+ show: config.globalSettingsEnabled,
save: true,
},
advancedSettings: {
- show: true,
+ show: config.advancedSettingsEnabled,
save: true,
},
});
diff --git a/src/plugins/advanced_settings/server/config.ts b/src/plugins/advanced_settings/server/config.ts
index ea4950d3f11cc..dadb03cb7d6b4 100644
--- a/src/plugins/advanced_settings/server/config.ts
+++ b/src/plugins/advanced_settings/server/config.ts
@@ -10,7 +10,8 @@ import { schema, TypeOf } from '@kbn/config-schema';
import { PluginConfigDescriptor } from '@kbn/core-plugins-server';
const configSchema = schema.object({
- enabled: schema.boolean({ defaultValue: true }),
+ globalSettingsEnabled: schema.boolean({ defaultValue: true }),
+ advancedSettingsEnabled: schema.boolean({ defaultValue: true }),
});
export type AdvancedSettingsConfig = TypeOf;
diff --git a/src/plugins/advanced_settings/server/plugin.ts b/src/plugins/advanced_settings/server/plugin.ts
index 8d100ee2e26b2..aa46c6aba6ebe 100644
--- a/src/plugins/advanced_settings/server/plugin.ts
+++ b/src/plugins/advanced_settings/server/plugin.ts
@@ -7,19 +7,23 @@
*/
import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
+
import { capabilitiesProvider } from './capabilities_provider';
+import { AdvancedSettingsConfig } from './config';
export class AdvancedSettingsServerPlugin implements Plugin {
private readonly logger: Logger;
+ private readonly config: AdvancedSettingsConfig;
constructor(initializerContext: PluginInitializerContext) {
this.logger = initializerContext.logger.get();
+ this.config = initializerContext.config.get();
}
public setup(core: CoreSetup) {
this.logger.debug('advancedSettings: Setup');
- core.capabilities.registerProvider(capabilitiesProvider);
+ core.capabilities.registerProvider(() => capabilitiesProvider(this.config));
return {};
}
diff --git a/src/plugins/advanced_settings/tsconfig.json b/src/plugins/advanced_settings/tsconfig.json
index 9db3f75e007f6..547e82d64c73c 100644
--- a/src/plugins/advanced_settings/tsconfig.json
+++ b/src/plugins/advanced_settings/tsconfig.json
@@ -12,28 +12,13 @@
"@kbn/management-plugin",
"@kbn/home-plugin",
"@kbn/usage-collection-plugin",
- "@kbn/kibana-react-plugin",
"@kbn/i18n",
- "@kbn/test-jest-helpers",
- "@kbn/analytics",
- "@kbn/kibana-utils-plugin",
- "@kbn/i18n-react",
- "@kbn/expect",
- "@kbn/monaco",
- "@kbn/shared-ux-router",
- "@kbn/core-ui-settings-browser-mocks",
- "@kbn/core-application-browser",
- "@kbn/core-ui-settings-browser",
- "@kbn/core-doc-links-browser",
- "@kbn/core-notifications-browser",
- "@kbn/core-theme-browser",
- "@kbn/core-ui-settings-common",
"@kbn/config-schema",
"@kbn/core-plugins-server",
"@kbn/management-settings-section-registry",
"@kbn/react-kibana-context-render",
- "@kbn/code-editor",
- "@kbn/code-editor-mock",
+ "@kbn/shared-ux-utility",
+ "@kbn/management-settings-application",
],
"exclude": [
"target/**/*",
diff --git a/src/plugins/management/public/plugin.tsx b/src/plugins/management/public/plugin.tsx
index ee0668d0b9c7a..f3df5201cae7e 100644
--- a/src/plugins/management/public/plugin.tsx
+++ b/src/plugins/management/public/plugin.tsx
@@ -6,8 +6,6 @@
* Side Public License, v 1.
*/
-import React from 'react';
-import ReactDOM from 'react-dom';
import { i18n as kbnI18n } from '@kbn/i18n';
import { BehaviorSubject } from 'rxjs';
import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
@@ -25,8 +23,6 @@ import {
AppNavLinkStatus,
AppDeepLink,
} from '@kbn/core/public';
-import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
-import { withSuspense } from '@kbn/shared-ux-utility';
import { ConfigSchema, ManagementSetup, ManagementStart, NavigationCardsSubject } from './types';
import { MANAGEMENT_APP_ID } from '../common/contants';
@@ -47,12 +43,6 @@ interface ManagementStartDependencies {
serverless?: ServerlessPluginStart;
}
-const LazyKibanaSettingsApplication = React.lazy(async () => ({
- default: (await import('@kbn/management-settings-application')).KibanaSettingsApplication,
-}));
-
-const KibanaSettingsApplication = withSuspense(LazyKibanaSettingsApplication);
-
export class ManagementPlugin
implements
Plugin<
@@ -176,33 +166,6 @@ export class ManagementPlugin
});
}
- // Register the Settings app only if in serverless, until we integrate the SettingsApplication into the Advanced settings plugin
- // Otherwise, it will be double registered from the Advanced settings plugin
- if (plugins.serverless) {
- const title = kbnI18n.translate('management.settings.settingsLabel', {
- defaultMessage: 'Advanced Settings',
- });
-
- this.managementSections.definedSections.kibana.registerApp({
- id: 'settings',
- title,
- order: 3,
- async mount({ element, setBreadcrumbs, history }) {
- setBreadcrumbs([{ text: title }]);
-
- ReactDOM.render(
-
-
- ,
- element
- );
- return () => {
- ReactDOM.unmountComponentAtNode(element);
- };
- },
- });
- }
-
return {
setIsSidebarEnabled: (isSidebarEnabled: boolean) =>
this.isSidebarEnabled$.next(isSidebarEnabled),
diff --git a/src/plugins/management/tsconfig.json b/src/plugins/management/tsconfig.json
index acbf33fc46abc..df0a876b4b3c4 100644
--- a/src/plugins/management/tsconfig.json
+++ b/src/plugins/management/tsconfig.json
@@ -25,10 +25,7 @@
"@kbn/test-jest-helpers",
"@kbn/config-schema",
"@kbn/serverless",
- "@kbn/management-settings-application",
- "@kbn/react-kibana-context-render",
- "@kbn/shared-ux-utility",
- "@kbn/shared-ux-error-boundary"
+ "@kbn/shared-ux-error-boundary",
],
"exclude": [
"target/**/*"
diff --git a/test/functional/apps/management/data_views/_cache.ts b/test/functional/apps/management/data_views/_cache.ts
index 447e44052bb8d..764dd99d20252 100644
--- a/test/functional/apps/management/data_views/_cache.ts
+++ b/test/functional/apps/management/data_views/_cache.ts
@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
const PageObjects = getPageObjects(['settings', 'common', 'header']);
- const find = getService('find');
+ const testSubjects = getService('testSubjects');
describe('Data view field caps cache advanced setting', async function () {
before(async () => {
@@ -19,8 +19,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.settings.clickKibanaSettings();
});
it('should have cache setting', async () => {
- const cacheSetting = await find.byCssSelector('#data_views\\:cache_max_age-group');
- expect(cacheSetting).to.not.be(undefined);
+ expect(
+ await testSubjects.exists('management-settings-editField-data_views:cache_max_age')
+ ).to.be(true);
});
});
}
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index 2d85b6f662665..5e8fddb626efd 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -39,7 +39,7 @@ export class SettingsPageObject extends FtrService {
async clickKibanaGlobalSettings() {
await this.testSubjects.click('settings');
await this.header.waitUntilLoadingHasFinished();
- await this.testSubjects.click('advancedSettingsTab-global-settings');
+ await this.testSubjects.click('settings-tab-global-settings');
}
async clickKibanaSavedObjects() {
@@ -73,21 +73,24 @@ export class SettingsPageObject extends FtrService {
async getAdvancedSettings(propertyName: string) {
this.log.debug('in getAdvancedSettings');
return await this.testSubjects.getAttribute(
- `advancedSetting-editField-${propertyName}`,
+ `management-settings-editField-${propertyName}`,
'value'
);
}
async expectDisabledAdvancedSetting(propertyName: string) {
expect(
- await this.testSubjects.getAttribute(`advancedSetting-editField-${propertyName}`, 'disabled')
+ await this.testSubjects.getAttribute(
+ `management-settings-editField-${propertyName}`,
+ 'disabled'
+ )
).to.eql('true');
}
async getAdvancedSettingCheckbox(propertyName: string) {
this.log.debug('in getAdvancedSettingCheckbox');
return await this.testSubjects.getAttribute(
- `advancedSetting-editField-${propertyName}`,
+ `management-settings-editField-${propertyName}`,
'checked'
);
}
@@ -95,37 +98,37 @@ export class SettingsPageObject extends FtrService {
async getAdvancedSettingAriaCheckbox(propertyName: string) {
this.log.debug('in getAdvancedSettingAriaCheckbox');
return await this.testSubjects.getAttribute(
- `advancedSetting-editField-${propertyName}`,
+ `management-settings-editField-${propertyName}`,
'aria-checked'
);
}
async clearAdvancedSettings(propertyName: string) {
- await this.testSubjects.click(`advancedSetting-resetField-${propertyName}`);
+ await this.testSubjects.click(`management-settings-resetField-${propertyName}`);
await this.header.waitUntilLoadingHasFinished();
- await this.testSubjects.click(`advancedSetting-saveButton`);
+ await this.testSubjects.click(`settings-save-button`);
await this.header.waitUntilLoadingHasFinished();
}
async setAdvancedSettingsSelect(propertyName: string, propertyValue: string) {
await this.find.clickByCssSelector(
- `[data-test-subj="advancedSetting-editField-${propertyName}"] option[value="${propertyValue}"]`
+ `[data-test-subj="management-settings-editField-${propertyName}"] option[value="${propertyValue}"]`
);
await this.header.waitUntilLoadingHasFinished();
- await this.testSubjects.click(`advancedSetting-saveButton`);
+ await this.testSubjects.click(`settings-save-button`);
await this.header.waitUntilLoadingHasFinished();
}
async setAdvancedSettingsInput(propertyName: string, propertyValue: string) {
- const input = await this.testSubjects.find(`advancedSetting-editField-${propertyName}`);
+ const input = await this.testSubjects.find(`management-settings-editField-${propertyName}`);
await input.clearValue();
await input.type(propertyValue);
- await this.testSubjects.click(`advancedSetting-saveButton`);
+ await this.testSubjects.click(`settings-save-button`);
await this.header.waitUntilLoadingHasFinished();
}
async setAdvancedSettingsTextArea(propertyName: string, propertyValue: string) {
- const wrapper = await this.testSubjects.find(`advancedSetting-editField-${propertyName}`);
+ const wrapper = await this.testSubjects.find(`management-settings-editField-${propertyName}`);
const textarea = await wrapper.findByTagName('textarea');
await textarea.focus();
// only way to properly replace the value of the ace editor is via the JS api
@@ -133,17 +136,17 @@ export class SettingsPageObject extends FtrService {
(editor: string, value: string) => {
return (window as any).ace.edit(editor).setValue(value);
},
- `advancedSetting-editField-${propertyName}-editor`,
+ `management-settings-editField-${propertyName}-editor`,
propertyValue
);
- await this.testSubjects.click(`advancedSetting-saveButton`);
+ await this.testSubjects.click(`settings-save-button`);
await this.header.waitUntilLoadingHasFinished();
}
async setAdvancedSettingsImage(propertyName: string, path: string) {
- const input = await this.testSubjects.find(`advancedSetting-editField-${propertyName}`);
+ const input = await this.testSubjects.find(`management-settings-editField-${propertyName}`);
await input.type(path);
- await this.testSubjects.click(`advancedSetting-saveButton`);
+ await this.testSubjects.click(`settings-save-button`);
await this.header.waitUntilLoadingHasFinished();
}
@@ -155,9 +158,9 @@ export class SettingsPageObject extends FtrService {
if (curValue === (value ? 'true' : 'false')) return;
}
- await this.testSubjects.click(`advancedSetting-editField-${propertyName}`);
+ await this.testSubjects.click(`management-settings-editField-${propertyName}`);
await this.header.waitUntilLoadingHasFinished();
- await this.testSubjects.click(`advancedSetting-saveButton`);
+ await this.testSubjects.click(`settings-save-button`);
await this.header.waitUntilLoadingHasFinished();
}
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 0155d9d1de5f2..63b76a5cb04ac 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -76,64 +76,6 @@
}
},
"messages": {
- "advancedSettings.field.changeImageLinkAriaLabel": "Modifier {ariaName}",
- "advancedSettings.field.defaultValueText": "Par défaut : {value}",
- "advancedSettings.field.defaultValueTypeJsonText": "Par défaut : {value}",
- "advancedSettings.field.deprecationClickAreaLabel": "Cliquez ici pour afficher la documentation de déclassement pour {settingName}.",
- "advancedSettings.field.resetToDefaultLinkAriaLabel": "Réinitialiser {ariaName} à la valeur par défaut",
- "advancedSettings.form.countOfSettingsChanged": "{unsavedCount} {unsavedCount, plural, one {paramètre} many {les paramètres d''index suivants déclassés ?} other {paramètres}} non enregistré(s){hiddenCount, plural, =0 {} one {, # masqué} many {, # masqués} other {, # masqués}}",
- "advancedSettings.form.noSearchResultText": "Aucun paramètre trouvé pour {queryText} {clearSearch}",
- "advancedSettings.form.searchResultText": "Les termes de la recherche masquent {settingsCount} paramètres {clearSearch}",
- "advancedSettings.voiceAnnouncement.noSearchResultScreenReaderMessage": "Il {optionLenght, plural, one {y a # option} many {y a # options} other {y a # options}} dans {sectionLenght, plural, one {# section} many {# sections} other {# sections}}",
- "advancedSettings.voiceAnnouncement.searchResultScreenReaderMessage": "Vous avez recherché {query}. Il {optionLenght, plural, one {y a # option} many {y a # options} other {y a # options}} dans {sectionLenght, plural, one {# section} many {# sections} other {# sections}}",
- "advancedSettings.advancedSettingsLabel": "Paramètres avancés",
- "advancedSettings.badge.readOnly.text": "Lecture seule",
- "advancedSettings.badge.readOnly.tooltip": "Impossible d’enregistrer les paramètres avancés",
- "advancedSettings.callOutCautionDescription": "Soyez prudent, ces paramètres sont destinés aux utilisateurs très avancés uniquement. Toute modification est susceptible d’entraîner des dommages importants à Kibana. Certains de ces paramètres peuvent être non documentés, non compatibles ou en version d'évaluation technique. Lorsqu’un champ dispose d’une valeur par défaut, le laisser vide entraîne l’application de cette valeur par défaut, ce qui peut ne pas être acceptable compte tenu d’autres directives de configuration. Toute suppression d'un paramètre personnalisé de la configuration de Kibana est définitive.",
- "advancedSettings.callOutCautionTitle": "Attention : toute action est susceptible de provoquer des dommages.",
- "advancedSettings.categoryNames.dashboardLabel": "Tableau de bord",
- "advancedSettings.categoryNames.discoverLabel": "Découverte",
- "advancedSettings.categoryNames.enterpriseSearchLabel": "Enterprise Search",
- "advancedSettings.categoryNames.generalLabel": "Général",
- "advancedSettings.categoryNames.machineLearningLabel": "Machine Learning",
- "advancedSettings.categoryNames.notificationsLabel": "Notifications",
- "advancedSettings.categoryNames.observabilityLabel": "Observabilité",
- "advancedSettings.categoryNames.reportingLabel": "Reporting",
- "advancedSettings.categoryNames.searchLabel": "Recherche",
- "advancedSettings.categoryNames.securitySolutionLabel": "Solution de sécurité",
- "advancedSettings.categoryNames.timelionLabel": "Timelion",
- "advancedSettings.categoryNames.visualizationsLabel": "Visualisations",
- "advancedSettings.categorySearchLabel": "Catégorie",
- "advancedSettings.defaultSpaceCalloutSubtitle": "Les modifications seront uniquement appliquées à l'espace actuel. Ces paramètres sont destinés aux utilisateurs avancés, car des configurations incorrectes peuvent avoir une incidence négative sur des aspects de Kibana.",
- "advancedSettings.defaultSpaceCalloutTitle": "Les modifications affecteront l'espace actuel.",
- "advancedSettings.featureCatalogueTitle": "Personnalisez votre expérience Kibana : modifiez le format de date, activez le mode sombre, et bien plus encore.",
- "advancedSettings.field.changeImageLinkText": "Modifier l'image",
- "advancedSettings.field.codeEditorSyntaxErrorMessage": "Syntaxe JSON non valide",
- "advancedSettings.field.customSettingAriaLabel": "Paramètre personnalisé",
- "advancedSettings.field.customSettingTooltip": "Paramètre personnalisé",
- "advancedSettings.field.helpText": "Ce paramètre est défini par le serveur Kibana et ne peut pas être modifié.",
- "advancedSettings.field.imageChangeErrorMessage": "Impossible d’enregistrer l'image",
- "advancedSettings.field.invalidIconLabel": "Non valide",
- "advancedSettings.field.offLabel": "Désactivé",
- "advancedSettings.field.onLabel": "Activé",
- "advancedSettings.field.resetToDefaultLinkText": "Réinitialiser à la valeur par défaut",
- "advancedSettings.field.settingIsUnsaved": "Le paramètre n'est actuellement pas enregistré.",
- "advancedSettings.field.unsavedIconLabel": "Non enregistré",
- "advancedSettings.form.cancelButtonLabel": "Annuler les modifications",
- "advancedSettings.form.clearNoSearchResultText": "(effacer la recherche)",
- "advancedSettings.form.clearSearchResultText": "(effacer la recherche)",
- "advancedSettings.form.requiresPageReloadToastButtonLabel": "Actualiser la page",
- "advancedSettings.form.requiresPageReloadToastDescription": "Un ou plusieurs paramètres nécessitent d’actualiser la page pour pouvoir prendre effet.",
- "advancedSettings.form.saveButtonLabel": "Enregistrer les modifications",
- "advancedSettings.form.saveButtonTooltipWithInvalidChanges": "Corrigez les paramètres non valides avant d'enregistrer.",
- "advancedSettings.form.saveErrorMessage": "Enregistrement impossible",
- "advancedSettings.globalCalloutSubtitle": "Les modifications seront appliquées à tous les utilisateurs dans l'ensemble des espaces. Cela inclut les utilisateurs Kibana natifs et les utilisateurs qui se connectent via l'authentification unique.",
- "advancedSettings.globalCalloutTitle": "Les modifications auront une incidence sur tous les paramètres utilisateur dans l'ensemble des espaces",
- "advancedSettings.globalSettingsTabTitle": "Paramètres généraux",
- "advancedSettings.searchBar.unableToParseQueryErrorMessage": "Impossible d'analyser la requête",
- "advancedSettings.searchBarAriaLabel": "Rechercher dans les paramètres avancés",
- "advancedSettings.spaceSettingsTabTitle": "Paramètres de l'espace",
- "advancedSettings.voiceAnnouncement.ariaLabel": "Informations de résultat des paramètres avancés",
"autocomplete.conflictIndicesWarning.index.description": "{name} ({count} index)",
"autocomplete.customOptionText": "Ajouter {searchValuePlaceholder} comme champ personnalisé",
"autocomplete.conflictIndicesWarning.description": "Ce champ est défini avec différents types dans les index suivants ou il n'est pas mappé, ce qui peut entraîner des résultats inattendus lors des requêtes.",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 6ec1330d0b14e..5ac0b945b1173 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -76,64 +76,6 @@
}
},
"messages": {
- "advancedSettings.field.changeImageLinkAriaLabel": "{ariaName}の変更",
- "advancedSettings.field.defaultValueText": "デフォルト：{value}",
- "advancedSettings.field.defaultValueTypeJsonText": "デフォルト：{value}",
- "advancedSettings.field.deprecationClickAreaLabel": "クリックすると{settingName}のサポート終了に関するドキュメントが表示されます。",
- "advancedSettings.field.resetToDefaultLinkAriaLabel": "{ariaName}をデフォルトにリセット",
- "advancedSettings.form.countOfSettingsChanged": "{unsavedCount}個の保存されていない{unsavedCount, plural, other {設定}}{hiddenCount, plural, =0 {} other {、#個が非表示です}}",
- "advancedSettings.form.noSearchResultText": "{queryText}{clearSearch}の設定が見つかりません",
- "advancedSettings.form.searchResultText": "検索用語により、{settingsCount}件の設定{clearSearch}が非表示になっています",
- "advancedSettings.voiceAnnouncement.noSearchResultScreenReaderMessage": "{sectionLenght, plural, other {#個のセクション}}に{optionLenght, plural, other {#個のオプションがあります}}",
- "advancedSettings.voiceAnnouncement.searchResultScreenReaderMessage": "{query}を検索しました。{sectionLenght, plural, other {#個のセクション}}に{optionLenght, plural, other {#個のオプションがあります}}",
- "advancedSettings.advancedSettingsLabel": "高度な設定",
- "advancedSettings.badge.readOnly.text": "読み取り専用",
- "advancedSettings.badge.readOnly.tooltip": "高度な設定を保存できません",
- "advancedSettings.callOutCautionDescription": "これらの設定は特に上級のユーザー向けなのでご注意ください。ここでの変更は Kibana の重要な部分に不具合を生じさせる可能性があります。これらの設定は非公開、サポート対象外、またはテクニカルプレビュー中の場合があります。フィールドにデフォルト値がある場合、そのフィールドを未入力のままにするとデフォルトに戻り、他の構成で許容されないことがあります。カスタム設定を削除すると、Kibana の構成から永久に削除されます。",
- "advancedSettings.callOutCautionTitle": "注意：不具合につながる可能性があります",
- "advancedSettings.categoryNames.dashboardLabel": "ダッシュボード",
- "advancedSettings.categoryNames.discoverLabel": "Discover",
- "advancedSettings.categoryNames.enterpriseSearchLabel": "エンタープライズ サーチ",
- "advancedSettings.categoryNames.generalLabel": "一般",
- "advancedSettings.categoryNames.machineLearningLabel": "機械学習",
- "advancedSettings.categoryNames.notificationsLabel": "通知",
- "advancedSettings.categoryNames.observabilityLabel": "Observability",
- "advancedSettings.categoryNames.reportingLabel": "レポート",
- "advancedSettings.categoryNames.searchLabel": "検索",
- "advancedSettings.categoryNames.securitySolutionLabel": "セキュリティソリューション",
- "advancedSettings.categoryNames.timelionLabel": "Timelion",
- "advancedSettings.categoryNames.visualizationsLabel": "ビジュアライゼーション",
- "advancedSettings.categorySearchLabel": "カテゴリー",
- "advancedSettings.defaultSpaceCalloutSubtitle": "変更は現在のスペースにのみ適用されます。これらの設定は上級ユーザー向けです。構成が正しくない場合は、Kibanaの動作に悪影響を及ぼすおそれがあります。",
- "advancedSettings.defaultSpaceCalloutTitle": "変更は現在のスペースに影響します。",
- "advancedSettings.featureCatalogueTitle": "日付形式の変更、ダークモードの有効化など、Kibanaエクスペリエンスをカスタマイズします。",
- "advancedSettings.field.changeImageLinkText": "画像を変更",
- "advancedSettings.field.codeEditorSyntaxErrorMessage": "無効な JSON 構文",
- "advancedSettings.field.customSettingAriaLabel": "カスタム設定",
- "advancedSettings.field.customSettingTooltip": "カスタム設定",
- "advancedSettings.field.helpText": "この設定は Kibana サーバーにより上書きされ、変更することはできません。",
- "advancedSettings.field.imageChangeErrorMessage": "画像を保存できませんでした",
- "advancedSettings.field.invalidIconLabel": "無効",
- "advancedSettings.field.offLabel": "オフ",
- "advancedSettings.field.onLabel": "オン",
- "advancedSettings.field.resetToDefaultLinkText": "デフォルトにリセット",
- "advancedSettings.field.settingIsUnsaved": "設定は現在保存されていません。",
- "advancedSettings.field.unsavedIconLabel": "未保存",
- "advancedSettings.form.cancelButtonLabel": "変更をキャンセル",
- "advancedSettings.form.clearNoSearchResultText": "（検索結果を消去）",
- "advancedSettings.form.clearSearchResultText": "（検索結果を消去）",
- "advancedSettings.form.requiresPageReloadToastButtonLabel": "ページを再読み込み",
- "advancedSettings.form.requiresPageReloadToastDescription": "設定を有効にするためにページの再読み込みが必要です。",
- "advancedSettings.form.saveButtonLabel": "変更を保存",
- "advancedSettings.form.saveButtonTooltipWithInvalidChanges": "保存前に無効な設定を修正してください。",
- "advancedSettings.form.saveErrorMessage": "を保存できませんでした",
- "advancedSettings.globalCalloutSubtitle": "変更はすべてのスペースのすべてのユーザーに適用されます。これにはネイティブKibanaユーザーとシングルサインオンユーザーの両方が含まれます。",
- "advancedSettings.globalCalloutTitle": "変更はすべてのスペースのすべてのユーザー設定に影響します",
- "advancedSettings.globalSettingsTabTitle": "グローバル設定",
- "advancedSettings.searchBar.unableToParseQueryErrorMessage": "クエリをパースできません",
- "advancedSettings.searchBarAriaLabel": "高度な設定を検索",
- "advancedSettings.spaceSettingsTabTitle": "スペース設定",
- "advancedSettings.voiceAnnouncement.ariaLabel": "詳細設定結果情報",
"autocomplete.conflictIndicesWarning.index.description": "{name}（{count}個のインデックス）",
"autocomplete.customOptionText": "{searchValuePlaceholder}をカスタムフィールドとして追加",
"autocomplete.conflictIndicesWarning.description": "このフィールドは、次のインデックスで別の型として定義されているか、マッピングされていません。これにより、予期しないクエリ結果になる場合があります。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index ba48546d7999e..eeb98e4c894a1 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -76,64 +76,6 @@
}
},
"messages": {
- "advancedSettings.field.changeImageLinkAriaLabel": "更改 {ariaName}",
- "advancedSettings.field.defaultValueText": "默认值：{value}",
- "advancedSettings.field.defaultValueTypeJsonText": "默认值：{value}",
- "advancedSettings.field.deprecationClickAreaLabel": "单击以查看 {settingName} 的过时文档。",
- "advancedSettings.field.resetToDefaultLinkAriaLabel": "将 {ariaName} 重置为默认值",
- "advancedSettings.form.countOfSettingsChanged": "{unsavedCount} 个未保存{unsavedCount, plural, other {设置}}{hiddenCount, plural, =0 {} other {，# 个已隐藏}}",
- "advancedSettings.form.noSearchResultText": "未找到 {queryText} 的设置{clearSearch}",
- "advancedSettings.form.searchResultText": "搜索词隐藏了 {settingsCount} 个设置{clearSearch}",
- "advancedSettings.voiceAnnouncement.noSearchResultScreenReaderMessage": "{sectionLenght, plural, other {# 个部分}}中有 {optionLenght, plural, other {# 个选项}}",
- "advancedSettings.voiceAnnouncement.searchResultScreenReaderMessage": "您已搜索 {query}。{sectionLenght, plural, other {# 个部分}}中有 {optionLenght, plural, other {# 个选项}}",
- "advancedSettings.advancedSettingsLabel": "高级设置",
- "advancedSettings.badge.readOnly.text": "只读",
- "advancedSettings.badge.readOnly.tooltip": "无法保存高级设置",
- "advancedSettings.callOutCautionDescription": "此处请谨慎操作，这些设置仅供高级用户使用。您在这里所做的更改可能使 Kibana 的大部分功能出现问题。这些设置有一部分可能未在文档中说明、不受支持或处于技术预览状态。如果字段有默认值，将字段留空会将其设置为默认值，其他配置指令可能不接受其默认值。删除定制设置会将其从 Kibana 的配置中永久删除。",
- "advancedSettings.callOutCautionTitle": "注意：在这里您可能会使问题出现",
- "advancedSettings.categoryNames.dashboardLabel": "仪表板",
- "advancedSettings.categoryNames.discoverLabel": "Discover",
- "advancedSettings.categoryNames.enterpriseSearchLabel": "Enterprise Search",
- "advancedSettings.categoryNames.generalLabel": "常规",
- "advancedSettings.categoryNames.machineLearningLabel": "Machine Learning",
- "advancedSettings.categoryNames.notificationsLabel": "通知",
- "advancedSettings.categoryNames.observabilityLabel": "Observability",
- "advancedSettings.categoryNames.reportingLabel": "报告",
- "advancedSettings.categoryNames.searchLabel": "搜索",
- "advancedSettings.categoryNames.securitySolutionLabel": "安全解决方案",
- "advancedSettings.categoryNames.timelionLabel": "Timelion",
- "advancedSettings.categoryNames.visualizationsLabel": "可视化",
- "advancedSettings.categorySearchLabel": "类别",
- "advancedSettings.defaultSpaceCalloutSubtitle": "将仅对当前工作区应用更改。这些设置适用于高级用户，因为配置错误可能会对 Kibana 的某些方面造成负面影响。",
- "advancedSettings.defaultSpaceCalloutTitle": "更改将影响当前工作区。",
- "advancedSettings.featureCatalogueTitle": "定制您的 Kibana 体验 — 更改日期格式、打开深色模式，等等。",
- "advancedSettings.field.changeImageLinkText": "更改图片",
- "advancedSettings.field.codeEditorSyntaxErrorMessage": "JSON 语法无效",
- "advancedSettings.field.customSettingAriaLabel": "定制设置",
- "advancedSettings.field.customSettingTooltip": "定制设置",
- "advancedSettings.field.helpText": "此设置已由 Kibana 服务器覆盖，无法更改。",
- "advancedSettings.field.imageChangeErrorMessage": "图片无法保存",
- "advancedSettings.field.invalidIconLabel": "无效",
- "advancedSettings.field.offLabel": "关闭",
- "advancedSettings.field.onLabel": "开启",
- "advancedSettings.field.resetToDefaultLinkText": "重置为默认值",
- "advancedSettings.field.settingIsUnsaved": "设备当前未保存。",
- "advancedSettings.field.unsavedIconLabel": "未保存",
- "advancedSettings.form.cancelButtonLabel": "取消更改",
- "advancedSettings.form.clearNoSearchResultText": "（清除搜索）",
- "advancedSettings.form.clearSearchResultText": "（清除搜索）",
- "advancedSettings.form.requiresPageReloadToastButtonLabel": "重新加载页面",
- "advancedSettings.form.requiresPageReloadToastDescription": "一个或多个设置需要您重新加载页面才能生效。",
- "advancedSettings.form.saveButtonLabel": "保存更改",
- "advancedSettings.form.saveButtonTooltipWithInvalidChanges": "保存前请修复无效的设置。",
- "advancedSettings.form.saveErrorMessage": "无法保存",
- "advancedSettings.globalCalloutSubtitle": "将对所有工作区的所有用户应用更改。这包括本机 Kibana 用户和单点登录用户。",
- "advancedSettings.globalCalloutTitle": "更改将影响所有工作区的所有用户设置",
- "advancedSettings.globalSettingsTabTitle": "常规设置",
- "advancedSettings.searchBar.unableToParseQueryErrorMessage": "无法解析查询",
- "advancedSettings.searchBarAriaLabel": "搜索高级设置",
- "advancedSettings.spaceSettingsTabTitle": "工作区设置",
- "advancedSettings.voiceAnnouncement.ariaLabel": "“高级设置”的结果信息",
"autocomplete.conflictIndicesWarning.index.description": "{name}（{count} 个索引）",
"autocomplete.customOptionText": "将 {searchValuePlaceholder} 添加为字段",
"autocomplete.conflictIndicesWarning.description": "此字段在以下索引中定义为不同类型或未映射。这可能导致意外的查询结果。",
diff --git a/x-pack/test/accessibility/apps/group1/advanced_settings.ts b/x-pack/test/accessibility/apps/group1/advanced_settings.ts
index 44899932302ba..4515105d7557c 100644
--- a/x-pack/test/accessibility/apps/group1/advanced_settings.ts
+++ b/x-pack/test/accessibility/apps/group1/advanced_settings.ts
@@ -40,21 +40,21 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
// clicking on the toggle button
it('adv settings - toggle ', async () => {
- await testSubjects.click('advancedSetting-editField-csv:quoteValues');
+ await testSubjects.click('management-settings-editField-csv:quoteValues');
await toasts.dismissAllToasts();
await a11y.testAppSnapshot();
});
// clicking on editor panel
it('adv settings - edit ', async () => {
- await testSubjects.click('advancedSetting-editField-csv:separator');
+ await testSubjects.click('management-settings-editField-csv:separator');
await toasts.dismissAllToasts();
await a11y.testAppSnapshot();
});
// clicking on save button
it('adv settings - save', async () => {
- await testSubjects.click('advancedSetting-saveButton');
+ await testSubjects.click('settings-save-button');
await toasts.dismissAllToasts();
await a11y.testAppSnapshot();
});
diff --git a/x-pack/test/security_solution_cypress/cypress/screens/sourcerer.ts b/x-pack/test/security_solution_cypress/cypress/screens/sourcerer.ts
index 591df4117d0a6..450d1aa484b5d 100644
--- a/x-pack/test/security_solution_cypress/cypress/screens/sourcerer.ts
+++ b/x-pack/test/security_solution_cypress/cypress/screens/sourcerer.ts
@@ -15,7 +15,7 @@ export const SOURCERER = {
badgeAlerts: '[data-test-subj="sourcerer-alerts-badge"]',
badgeAlertsOption: '[data-test-subj="security-alerts-option-badge"]',
siemDefaultIndexInput:
- '[data-test-subj="advancedSetting-editField-securitySolution:defaultIndex"]',
+ '[data-test-subj="management-settings-editField-securitySolution:defaultIndex"]',
popoverTitle: '[data-test-subj="sourcerer-title"]',
resetButton: 'button[data-test-subj="sourcerer-reset"]',
saveButton: 'button[data-test-subj="sourcerer-save"]',
diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/sourcerer.ts b/x-pack/test/security_solution_cypress/cypress/tasks/sourcerer.ts
index a534fb3e6d3d8..2bf56c1bd7c66 100644
--- a/x-pack/test/security_solution_cypress/cypress/tasks/sourcerer.ts
+++ b/x-pack/test/security_solution_cypress/cypress/tasks/sourcerer.ts
@@ -96,7 +96,7 @@ export const resetSourcerer = () => {
export const clickAlertCheckbox = () => cy.get(SOURCERER.alertCheckbox).check({ force: true });
export const addIndexToDefault = (index: string) => {
- visitWithTimeRange(`/app/management/kibana/settings?query=category:(securitySolution)`);
+ visitWithTimeRange(`/app/management/kibana/settings?query=categories:(securitySolution)`);
cy.get(SOURCERER.siemDefaultIndexInput)
.invoke('val')
.then((patterns) => {
@@ -107,8 +107,8 @@ export const addIndexToDefault = (index: string) => {
}
});
- cy.get('button[data-test-subj="advancedSetting-saveButton"]').click();
- cy.get('button[data-test-subj="windowReloadButton"]').click();
+ cy.get('button[data-test-subj="settings-save-button"]').click();
+ cy.get('button[data-test-subj="pageReloadButton"]').click();
visitWithTimeRange(hostsUrl('allHosts'));
});
};
diff --git a/x-pack/test_serverless/functional/test_suites/common/management/data_views/_cache.ts b/x-pack/test_serverless/functional/test_suites/common/management/data_views/_cache.ts
index 3050ef2456fbf..f7ae8fbe2cd6e 100644
--- a/x-pack/test_serverless/functional/test_suites/common/management/data_views/_cache.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/management/data_views/_cache.ts
@@ -18,7 +18,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should not have cache setting', async () => {
await testSubjects.missingOrFail(
- 'advancedSetting-editField-data_views\\:cache_max_age-group'
+ 'management-settings-editField-data_views\\:cache_max_age-group'
);
});
});