Skip to content

Commit 2773f12

Browse files
boktorbbkavilla
authored andcommitted
Rename advanced settings (#37) (#68)
Signed-off-by: Bishoy Boktor <boktorbb@amazon.com>
1 parent 9cc4ce0 commit 2773f12

21 files changed

+40
-40
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"id": "advancedSettings",
3-
"version": "kibana",
3+
"version": "opensearchDashboards",
44
"server": true,
55
"ui": true,
66
"requiredPlugins": ["management"],
77
"optionalPlugins": ["home"],
8-
"requiredBundles": ["kibanaReact", "home"]
8+
"requiredBundles": ["opensearchDashboardsReact", "home"]
99
}

src/plugins/advanced_settings/public/component_registry/page_title/page_title.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import React from 'react';
2121
import { EuiText } from '@elastic/eui';
22-
import { FormattedMessage } from '@kbn/i18n/react';
22+
import { FormattedMessage } from '@osd/i18n/react';
2323

2424
export const PageTitle = () => {
2525
return (

src/plugins/advanced_settings/public/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
import React from 'react';
21-
import { PluginInitializerContext } from 'kibana/public';
21+
import { PluginInitializerContext } from 'opensearch-dashboards/public';
2222
import { AdvancedSettingsPlugin } from './plugin';
2323
export { AdvancedSettingsSetup, AdvancedSettingsStart } from './types';
2424
export { ComponentRegistry } from './component_registry';

src/plugins/advanced_settings/public/management_app/_advanced_settings.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@
6565
width: 100%;
6666
}
6767

68-
.kbnBody--mgtAdvancedSettingsHasBottomBar .mgtPage__body {
68+
.osdBody--mgtAdvancedSettingsHasBottomBar .mgtPage__body {
6969
padding-bottom: $euiSizeXL * 2;
7070
}

src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ function mockConfig() {
9696
value: ['default_value'],
9797
name: 'Test array setting',
9898
description: 'Description for Test array setting',
99-
category: ['elasticsearch'],
99+
category: ['opensearch'],
100100
},
101101
'test:boolean:setting': {
102102
...defaultConfig,
103103
value: true,
104104
name: 'Test boolean setting',
105105
description: 'Description for Test boolean setting',
106-
category: ['elasticsearch'],
106+
category: ['opensearch'],
107107
},
108108
'test:image:setting': {
109109
...defaultConfig,

src/plugins/advanced_settings/public/management_app/components/advanced_settings_voice_announcement/advanced_settings_voice_announcement.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
*/
3939

4040
import React, { Component } from 'react';
41-
import { FormattedMessage } from '@kbn/i18n/react';
41+
import { FormattedMessage } from '@osd/i18n/react';
4242
import { EuiScreenReaderOnly, EuiDelayRender } from '@elastic/eui';
43-
import { i18n } from '@kbn/i18n';
43+
import { i18n } from '@osd/i18n';
4444
import { FieldSetting } from '../../types';
4545

4646
interface Props {

src/plugins/advanced_settings/public/management_app/components/call_outs/call_outs.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import React from 'react';
2121

2222
import { EuiCallOut } from '@elastic/eui';
23-
import { FormattedMessage } from '@kbn/i18n/react';
23+
import { FormattedMessage } from '@osd/i18n/react';
2424

2525
export const CallOuts = () => {
2626
return (
@@ -39,11 +39,11 @@ export const CallOuts = () => {
3939
<FormattedMessage
4040
id="advancedSettings.callOutCautionDescription"
4141
defaultMessage="Be careful in here, these settings are for very advanced users only.
42-
Tweaks you make here can break large portions of Kibana.
42+
Tweaks you make here can break large portions of OpenSearch Dashboards.
4343
Some of these settings may be undocumented, unsupported or experimental.
4444
If a field has a default value, blanking the field will reset it to its default which may be
4545
unacceptable given other configuration directives.
46-
Deleting a custom setting will permanently remove it from Kibana's config."
46+
Deleting a custom setting will permanently remove it from OpenSearch Dashboards's config."
4747
/>
4848
</p>
4949
</EuiCallOut>

src/plugins/advanced_settings/public/management_app/components/field/field.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
import React from 'react';
21-
import { I18nProvider } from '@kbn/i18n/react';
21+
import { I18nProvider } from '@osd/i18n/react';
2222
import { shallowWithI18nProvider, mountWithI18nProvider } from 'test_utils/enzyme_helpers';
2323
import { mount, ReactWrapper } from 'enzyme';
2424
import { FieldSetting } from '../../types';

src/plugins/advanced_settings/public/management_app/components/field/field.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import {
4545
EuiSwitchEvent,
4646
EuiToolTip,
4747
} from '@elastic/eui';
48-
import { i18n } from '@kbn/i18n';
49-
import { FormattedMessage } from '@kbn/i18n/react';
48+
import { i18n } from '@osd/i18n';
49+
import { FormattedMessage } from '@osd/i18n/react';
5050
import { FieldSetting, FieldState } from '../../types';
5151
import { isDefaultValue } from '../../lib';
5252
import {
@@ -428,7 +428,7 @@ export class Field extends PureComponent<FieldProps> {
428428
<EuiText size="xs">
429429
<FormattedMessage
430430
id="advancedSettings.field.helpText"
431-
defaultMessage="This setting is overridden by the Kibana server and can not be changed."
431+
defaultMessage="This setting is overridden by the OpenSearch Dashboards server and can not be changed."
432432
/>
433433
</EuiText>
434434
);

src/plugins/advanced_settings/public/management_app/components/form/form.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ import {
3333
EuiToolTip,
3434
EuiButtonEmpty,
3535
} from '@elastic/eui';
36-
import { FormattedMessage } from '@kbn/i18n/react';
36+
import { FormattedMessage } from '@osd/i18n/react';
3737
import { isEmpty } from 'lodash';
38-
import { i18n } from '@kbn/i18n';
39-
import { toMountPoint } from '../../../../../kibana_react/public';
38+
import { i18n } from '@osd/i18n';
39+
import { toMountPoint } from '../../../../../opensearch_dashboards_react/public';
4040
import { DocLinksStart, ToastsStart } from '../../../../../../core/public';
4141

4242
import { getCategoryName } from '../../lib';
@@ -391,9 +391,9 @@ export class Form extends PureComponent<FormProps> {
391391
const hasUnsavedChanges = !isEmpty(unsavedChanges);
392392

393393
if (hasUnsavedChanges) {
394-
document.body.classList.add('kbnBody--mgtAdvancedSettingsHasBottomBar');
394+
document.body.classList.add('osdBody--mgtAdvancedSettingsHasBottomBar');
395395
} else {
396-
document.body.classList.remove('kbnBody--mgtAdvancedSettingsHasBottomBar');
396+
document.body.classList.remove('osdBody--mgtAdvancedSettingsHasBottomBar');
397397
}
398398

399399
categories.forEach((category) => {

src/plugins/advanced_settings/public/management_app/components/search/search.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
import React, { Fragment, PureComponent } from 'react';
21-
import { i18n } from '@kbn/i18n';
21+
import { i18n } from '@osd/i18n';
2222
import { EuiSearchBar, EuiFormErrorText, Query } from '@elastic/eui';
2323

2424
import { getCategoryName } from '../../lib';

src/plugins/advanced_settings/public/management_app/lib/get_aria_name.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
import expect from '@kbn/expect';
20+
import expect from '@osd/expect';
2121
import { getAriaName } from './get_aria_name';
2222

2323
describe('Settings', function () {

src/plugins/advanced_settings/public/management_app/lib/get_category_name.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
* under the License.
1818
*/
1919

20-
import expect from '@kbn/expect';
20+
import expect from '@osd/expect';
2121
import { getCategoryName } from './get_category_name';
2222

2323
describe('Settings', function () {
2424
describe('Advanced', function () {
2525
describe('getCategoryName(category)', function () {
2626
it('should capitalize unknown category', function () {
27-
expect(getCategoryName('elasticsearch')).to.be('Elasticsearch');
27+
expect(getCategoryName('opensearch')).to.be('OpenSearch');
2828
});
2929

3030
it('should return empty string for no category', function () {

src/plugins/advanced_settings/public/management_app/lib/get_category_name.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
import { i18n } from '@kbn/i18n';
20+
import { i18n } from '@osd/i18n';
2121

2222
const upperFirst = (str = '') => str.replace(/^./, (strng) => strng.toUpperCase());
2323

src/plugins/advanced_settings/public/management_app/lib/get_val_type.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
import expect from '@kbn/expect';
20+
import expect from '@osd/expect';
2121
import { getValType } from './get_val_type';
2222

2323
describe('Settings', function () {

src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
import expect from '@kbn/expect';
20+
import expect from '@osd/expect';
2121
import { isDefaultValue } from './is_default_value';
2222
import { UiSettingsType } from '../../../../../core/public';
2323

src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
import { PublicUiSettingsParams, StringValidationRegex } from 'src/core/public';
21-
import expect from '@kbn/expect';
21+
import expect from '@osd/expect';
2222
import { toEditableConfig } from './to_editable_config';
2323

2424
const defDefault = {

src/plugins/advanced_settings/public/management_app/mount_management_section.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import React from 'react';
2121
import ReactDOM from 'react-dom';
2222
import { Router, Switch, Route } from 'react-router-dom';
2323

24-
import { i18n } from '@kbn/i18n';
25-
import { I18nProvider } from '@kbn/i18n/react';
24+
import { i18n } from '@osd/i18n';
25+
import { I18nProvider } from '@osd/i18n/react';
2626
import { StartServicesAccessor } from 'src/core/public';
2727

2828
import { AdvancedSettings } from './advanced_settings';

src/plugins/advanced_settings/public/plugin.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
import { i18n } from '@kbn/i18n';
20-
import { CoreSetup, Plugin } from 'kibana/public';
19+
import { i18n } from '@osd/i18n';
20+
import { CoreSetup, Plugin } from 'opensearch-dashboards/public';
2121
import { FeatureCatalogueCategory } from '../../home/public';
2222
import { ComponentRegistry } from './component_registry';
2323
import { AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup } from './types';
@@ -31,9 +31,9 @@ const title = i18n.translate('advancedSettings.advancedSettingsLabel', {
3131
export class AdvancedSettingsPlugin
3232
implements Plugin<AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup> {
3333
public setup(core: CoreSetup, { management, home }: AdvancedSettingsPluginSetup) {
34-
const kibanaSection = management.sections.section.kibana;
34+
const opensearchDashboardsSection = management.sections.section.opensearchDashboards;
3535

36-
kibanaSection.registerApp({
36+
opensearchDashboardsSection.registerApp({
3737
id: 'settings',
3838
title,
3939
order: 3,
@@ -51,10 +51,10 @@ export class AdvancedSettingsPlugin
5151
title,
5252
description: i18n.translate('advancedSettings.featureCatalogueTitle', {
5353
defaultMessage:
54-
'Customize your Kibana experience — change the date format, turn on dark mode, and more.',
54+
'Customize your OpenSearch Dashboards experience — change the date format, turn on dark mode, and more.',
5555
}),
5656
icon: 'gear',
57-
path: '/app/management/kibana/settings',
57+
path: '/app/management/opensearch-dashboards/settings',
5858
showOnHomePage: false,
5959
category: FeatureCatalogueCategory.ADMIN,
6060
});

src/plugins/advanced_settings/server/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
import { PluginInitializerContext } from 'kibana/server';
20+
import { PluginInitializerContext } from 'opensearch-dashboards/server';
2121
import { AdvancedSettingsServerPlugin } from './plugin';
2222

2323
export const plugin = (initContext: PluginInitializerContext) =>

src/plugins/advanced_settings/server/plugin.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
20+
import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'opensearch-dashboards/server';
2121
import { capabilitiesProvider } from './capabilities_provider';
2222

2323
export class AdvancedSettingsServerPlugin implements Plugin<object, object> {
@@ -40,5 +40,5 @@ export class AdvancedSettingsServerPlugin implements Plugin<object, object> {
4040
return {};
4141
}
4242

43-
public stop() {}
43+
public stop() { }
4444
}

0 commit comments

Comments
 (0)