From f422140f36f0345206742e1d8235057bc757d568 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Wed, 10 Mar 2021 02:01:39 +0000 Subject: [PATCH] [Rename] saved-objects-management plugin Signed-off-by: Kawika Avilla --- ...kibana.json => opensearch_dashboards.json} | 4 +- .../saved_objects_management/public/index.ts | 2 +- .../public/lib/create_field_list.ts | 10 ++--- .../public/lib/find_objects.ts | 4 +- .../public/lib/get_allowed_types.ts | 2 +- .../public/lib/get_relationships.ts | 2 +- .../public/lib/get_saved_object_counts.ts | 2 +- .../public/lib/in_app_url.test.ts | 4 +- .../public/lib/in_app_url.ts | 2 +- .../public/lib/resolve_import_errors.ts | 2 +- .../public/lib/resolve_saved_objects.test.ts | 8 ++-- .../public/lib/resolve_saved_objects.ts | 4 +- .../management_section/mount_section.tsx | 6 +-- .../object_view/components/field.test.tsx | 2 +- .../object_view/components/field.tsx | 2 +- .../object_view/components/form.tsx | 4 +- .../object_view/components/header.test.tsx | 2 +- .../object_view/components/header.tsx | 2 +- .../object_view/components/intro.test.tsx | 2 +- .../object_view/components/intro.tsx | 2 +- .../components/not_found_errors.test.tsx | 2 +- .../components/not_found_errors.tsx | 2 +- .../object_view/saved_object_view.tsx | 6 +-- .../saved_objects_table.test.tsx.snap | 12 +++--- .../__snapshots__/relationships.test.tsx.snap | 24 ++++++------ .../__snapshots__/table.test.tsx.snap | 12 +++--- .../objects_table/components/flyout.tsx | 6 +-- .../objects_table/components/header.tsx | 2 +- .../components/import_mode_control.tsx | 2 +- .../components/import_summary.tsx | 6 +-- .../components/overwrite_modal.tsx | 2 +- .../components/relationships.test.tsx | 38 +++++++++---------- .../components/relationships.tsx | 4 +- .../objects_table/components/table.test.tsx | 12 +++--- .../objects_table/components/table.tsx | 4 +- .../saved_objects_table.test.tsx | 16 ++++---- .../objects_table/saved_objects_table.tsx | 8 ++-- .../saved_objects_edition_page.tsx | 2 +- .../saved_objects_table_page.tsx | 2 +- .../saved_objects_management/public/plugin.ts | 8 ++-- .../server/routes/find.ts | 4 +- .../server/routes/get.ts | 4 +- .../server/routes/get_allowed_types.ts | 2 +- .../server/routes/index.test.ts | 12 +++--- .../server/routes/relationships.ts | 4 +- .../server/routes/scroll_count.ts | 4 +- .../server/routes/scroll_export.ts | 4 +- 47 files changed, 136 insertions(+), 136 deletions(-) rename src/plugins/saved_objects_management/{kibana.json => opensearch_dashboards.json} (70%) diff --git a/src/plugins/saved_objects_management/kibana.json b/src/plugins/saved_objects_management/opensearch_dashboards.json similarity index 70% rename from src/plugins/saved_objects_management/kibana.json rename to src/plugins/saved_objects_management/opensearch_dashboards.json index a7a8f11034b7..deca4778e34c 100644 --- a/src/plugins/saved_objects_management/kibana.json +++ b/src/plugins/saved_objects_management/opensearch_dashboards.json @@ -1,10 +1,10 @@ { "id": "savedObjectsManagement", - "version": "kibana", + "version": "opensearchDashboards", "server": true, "ui": true, "requiredPlugins": ["management", "data"], "optionalPlugins": ["dashboard", "visualizations", "discover", "home"], "extraPublicDirs": ["public/lib"], - "requiredBundles": ["kibanaReact", "home"] + "requiredBundles": ["opensearchDashboardsReact", "home"] } diff --git a/src/plugins/saved_objects_management/public/index.ts b/src/plugins/saved_objects_management/public/index.ts index c85d66c0ac38..27e4dba4600d 100644 --- a/src/plugins/saved_objects_management/public/index.ts +++ b/src/plugins/saved_objects_management/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializerContext } from 'kibana/public'; +import { PluginInitializerContext } from 'opensearch-dashboards/public'; import { SavedObjectsManagementPlugin } from './plugin'; export { SavedObjectsManagementPluginSetup, SavedObjectsManagementPluginStart } from './plugin'; diff --git a/src/plugins/saved_objects_management/public/lib/create_field_list.ts b/src/plugins/saved_objects_management/public/lib/create_field_list.ts index dcfb44d8a522..e9d2fc946a5f 100644 --- a/src/plugins/saved_objects_management/public/lib/create_field_list.ts +++ b/src/plugins/saved_objects_management/public/lib/create_field_list.ts @@ -19,7 +19,7 @@ import { forOwn, keyBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash'; import { SimpleSavedObject } from '../../../../core/public'; -import { castEsToKbnFieldTypeName } from '../../../data/public'; +import { castOpenSearchToOsdFieldTypeName } from '../../../data/public'; import { ObjectField } from '../management_section/types'; import { SavedObjectLoader } from '../../../saved_objects/public'; @@ -95,13 +95,13 @@ const addFieldsFromClass = function ( ) { const fieldMap = keyBy(fields, 'name'); - forOwn(Class.mapping, (esType, name) => { + forOwn(Class.mapping, (opensearchType, name) => { if (!name || fieldMap[name]) { return; } const getFieldTypeFromEsType = () => { - switch (castEsToKbnFieldTypeName(esType)) { + switch (castOpenSearchToOsdFieldTypeName(opensearchType)) { case 'string': return 'text'; case 'number': @@ -120,9 +120,9 @@ const addFieldsFromClass = function ( }); }); - if (Class.searchSource && !fieldMap['kibanaSavedObjectMeta.searchSourceJSON']) { + if (Class.searchSource && !fieldMap['opensearchDashboardsSavedObjectMeta.searchSourceJSON']) { fields.push({ - name: 'kibanaSavedObjectMeta.searchSourceJSON', + name: 'opensearchDashboardsSavedObjectMeta.searchSourceJSON', type: 'json', value: '{}', }); diff --git a/src/plugins/saved_objects_management/public/lib/find_objects.ts b/src/plugins/saved_objects_management/public/lib/find_objects.ts index 530dcc4648d8..a8720fe7709b 100644 --- a/src/plugins/saved_objects_management/public/lib/find_objects.ts +++ b/src/plugins/saved_objects_management/public/lib/find_objects.ts @@ -33,7 +33,7 @@ export async function findObjects( findOptions: SavedObjectsFindOptions ): Promise { const response = await http.get>( - '/api/kibana/management/saved_objects/_find', + '/api/opensearch-dashboards/management/saved_objects/_find', { query: findOptions as Record, } @@ -48,6 +48,6 @@ export async function findObject( id: string ): Promise { return await http.get( - `/api/kibana/management/saved_objects/${encodeURIComponent(type)}/${encodeURIComponent(id)}` + `/api/opensearch-dashboards/management/saved_objects/${encodeURIComponent(type)}/${encodeURIComponent(id)}` ); } diff --git a/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts b/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts index 7d952ebf2ca1..be7ca68bdee6 100644 --- a/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts +++ b/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts @@ -25,7 +25,7 @@ interface GetAllowedTypesResponse { export async function getAllowedTypes(http: HttpStart) { const response = await http.get( - '/api/kibana/management/saved_objects/_allowed_types' + '/api/opensearch-dashboards/management/saved_objects/_allowed_types' ); return response.types; } diff --git a/src/plugins/saved_objects_management/public/lib/get_relationships.ts b/src/plugins/saved_objects_management/public/lib/get_relationships.ts index bf2e651aa659..3df9a9a47ee6 100644 --- a/src/plugins/saved_objects_management/public/lib/get_relationships.ts +++ b/src/plugins/saved_objects_management/public/lib/get_relationships.ts @@ -27,7 +27,7 @@ export async function getRelationships( id: string, savedObjectTypes: string[] ): Promise { - const url = `/api/kibana/management/saved_objects/relationships/${encodeURIComponent( + const url = `/api/opensearch-dashboards/management/saved_objects/relationships/${encodeURIComponent( type )}/${encodeURIComponent(id)}`; try { diff --git a/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts b/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts index dcf59142e73e..a68b611c5b9f 100644 --- a/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts +++ b/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts @@ -25,7 +25,7 @@ export async function getSavedObjectCounts( searchString?: string ): Promise> { return await http.post>( - `/api/kibana/management/saved_objects/scroll/counts`, + `/api/opensearch-dashboards/management/saved_objects/scroll/counts`, { body: JSON.stringify({ typesToInclude, searchString }) } ); } diff --git a/src/plugins/saved_objects_management/public/lib/in_app_url.test.ts b/src/plugins/saved_objects_management/public/lib/in_app_url.test.ts index e83952e82c95..06f3f204df04 100644 --- a/src/plugins/saved_objects_management/public/lib/in_app_url.test.ts +++ b/src/plugins/saved_objects_management/public/lib/in_app_url.test.ts @@ -69,7 +69,7 @@ describe('canViewInApp', () => { it('should handle index patterns', () => { let uiCapabilities = createCapabilities({ management: { - kibana: { + opensearchDashboards: { indexPatterns: true, }, }, @@ -80,7 +80,7 @@ describe('canViewInApp', () => { uiCapabilities = createCapabilities({ management: { - kibana: { + opensearchDashboards: { indexPatterns: false, }, }, diff --git a/src/plugins/saved_objects_management/public/lib/in_app_url.ts b/src/plugins/saved_objects_management/public/lib/in_app_url.ts index 0fcf52cba254..97df02af6ee7 100644 --- a/src/plugins/saved_objects_management/public/lib/in_app_url.ts +++ b/src/plugins/saved_objects_management/public/lib/in_app_url.ts @@ -30,7 +30,7 @@ export function canViewInApp(uiCapabilities: Capabilities, type: string): boolea case 'index-pattern': case 'index-patterns': case 'indexPatterns': - return uiCapabilities.management.kibana.indexPatterns as boolean; + return uiCapabilities.management.opensearchDashboards.indexPatterns as boolean; case 'dashboard': case 'dashboards': return uiCapabilities.dashboard.show as boolean; diff --git a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts index 3084d40b63be..e620f3005014 100644 --- a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts +++ b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts @@ -24,7 +24,7 @@ import { SavedObjectsImportResponse, SavedObjectsImportAmbiguousConflictError, } from 'src/core/public'; -import { Required } from '@kbn/utility-types'; +import { Required } from '@osd/utility-types'; import { FailedImport, ProcessedImportResponse } from './process_import_response'; // the HTTP route requires type and ID; all other field are optional diff --git a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.test.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.test.ts index f98b1762511f..272d5d63f37e 100644 --- a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.test.ts +++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.test.ts @@ -257,7 +257,7 @@ describe('resolveSavedObjects', () => { }, doc: { _source: { - kibanaSavedObjectMeta: { + opensearchDashboardsSavedObjectMeta: { searchSourceJSON: JSON.stringify({ index: '1', }), @@ -271,7 +271,7 @@ describe('resolveSavedObjects', () => { }, doc: { _source: { - kibanaSavedObjectMeta: { + opensearchDashboardsSavedObjectMeta: { searchSourceJSON: JSON.stringify({ index: '3', }), @@ -319,7 +319,7 @@ describe('resolveSavedObjects', () => { }, doc: { _source: { - kibanaSavedObjectMeta: { + opensearchDashboardsSavedObjectMeta: { searchSourceJSON: JSON.stringify({ index: '1', filter: [{ meta: { index: 'filterIndex' } }], @@ -334,7 +334,7 @@ describe('resolveSavedObjects', () => { }, doc: { _source: { - kibanaSavedObjectMeta: { + opensearchDashboardsSavedObjectMeta: { searchSourceJSON: JSON.stringify({ index: '3', }), diff --git a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts index eb95c213e680..043b53e0acac 100644 --- a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts +++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts @@ -17,7 +17,7 @@ * under the License. */ -import { i18n } from '@kbn/i18n'; +import { i18n } from '@osd/i18n'; import { cloneDeep } from 'lodash'; import { OverlayStart, SavedObjectReference } from 'src/core/public'; import { SavedObject, SavedObjectLoader } from '../../../saved_objects/public'; @@ -176,7 +176,7 @@ export async function resolveIndexPatternConflicts( for (const { obj, doc } of conflictedIndexPatterns) { const serializedSearchSource = JSON.parse( - doc._source.kibanaSavedObjectMeta?.searchSourceJSON || '{}' + doc._source.opensearchDashboardsSavedObjectMeta?.searchSourceJSON || '{}' ); const oldIndexId = serializedSearchSource.index; let allResolved = true; diff --git a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx index 09e9ac29d664..5040afc06a6c 100644 --- a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx +++ b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx @@ -20,8 +20,8 @@ import React, { lazy, Suspense } from 'react'; import ReactDOM from 'react-dom'; import { Router, Switch, Route } from 'react-router-dom'; -import { I18nProvider } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; +import { I18nProvider } from '@osd/i18n/react'; +import { i18n } from '@osd/i18n'; import { EuiLoadingSpinner } from '@elastic/eui'; import { CoreSetup } from 'src/core/public'; import { ManagementAppMountParams } from '../../../management/public'; @@ -59,7 +59,7 @@ export const mountManagementSection = async ({ const capabilities = coreStart.application.capabilities; const RedirectToHomeIfUnauthorized: React.FunctionComponent = ({ children }) => { - const allowed = capabilities?.management?.kibana?.objects ?? false; + const allowed = capabilities?.management?.opensearchDashboards?.objects ?? false; if (!allowed) { coreStart.application.navigateToApp('home'); diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/field.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/field.test.tsx index 051c666f7820..3e9cfb9fc191 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/components/field.test.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/field.test.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { mount } from 'enzyme'; -import { I18nProvider } from '@kbn/i18n/react'; +import { I18nProvider } from '@osd/i18n/react'; import { Field } from './field'; import { FieldState, FieldType } from '../../types'; diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/field.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/field.tsx index 50358c17e058..f7892b4f498e 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/components/field.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/field.tsx @@ -19,7 +19,7 @@ import React, { PureComponent } from 'react'; import { EuiFieldNumber, EuiFieldText, EuiFormRow, EuiSwitch, EuiCodeEditor } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { FormattedMessage } from '@osd/i18n/react'; import { FieldState, FieldType } from '../../types'; interface FieldProps { diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx index adf54297c313..b1250434bac8 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx @@ -28,8 +28,8 @@ import { } from '@elastic/eui'; import { set } from '@elastic/safer-lodash-set'; import { cloneDeep } from 'lodash'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { i18n } from '@osd/i18n'; +import { FormattedMessage } from '@osd/i18n/react'; import { SimpleSavedObject, SavedObjectsClientContract } from '../../../../../../core/public'; import { SavedObjectLoader } from '../../../../../saved_objects/public'; import { Field } from './field'; diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/header.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/header.test.tsx index ccd2df3c5594..dba08d64d0e1 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/components/header.test.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/header.test.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { mount } from 'enzyme'; -import { I18nProvider } from '@kbn/i18n/react'; +import { I18nProvider } from '@osd/i18n/react'; import { Header } from './header'; describe('Intro component', () => { diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/header.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/header.tsx index 305d953c4990..ef42aae08a6e 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/components/header.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/header.tsx @@ -26,7 +26,7 @@ import { EuiPageContentHeader, EuiPageContentHeaderSection, } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { FormattedMessage } from '@osd/i18n/react'; interface HeaderProps { canEdit: boolean; diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.test.tsx index d154c2b6f762..accfc0d99094 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.test.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.test.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { mount } from 'enzyme'; -import { I18nProvider } from '@kbn/i18n/react'; +import { I18nProvider } from '@osd/i18n/react'; import { Intro } from './intro'; describe('Intro component', () => { diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx index 920a5fcbcb02..d194abed2612 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { EuiCallOut } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { FormattedMessage } from '@osd/i18n/react'; export const Intro = () => { return ( diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx index 58cdf05ba37d..3e490267ccb9 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { mount } from 'enzyme'; -import { I18nProvider } from '@kbn/i18n/react'; +import { I18nProvider } from '@osd/i18n/react'; import { NotFoundErrors } from './not_found_errors'; describe('NotFoundErrors component', () => { diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx index 1a63f7eaf481..163dfd525e5b 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { EuiCallOut } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { FormattedMessage } from '@osd/i18n/react'; interface NotFoundErrors { type: string; diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx index 1572ef916470..fef580b180b4 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx @@ -18,7 +18,7 @@ */ import React, { Component } from 'react'; -import { i18n } from '@kbn/i18n'; +import { i18n } from '@osd/i18n'; import { EuiSpacer, EuiPageContent } from '@elastic/eui'; import { Capabilities, @@ -138,7 +138,7 @@ export class SavedObjectEdition extends Component< const confirmed = await overlays.openConfirm( i18n.translate('savedObjectsManagement.deleteConfirm.modalDescription', { - defaultMessage: 'This action permanently removes the object from Kibana.', + defaultMessage: 'This action permanently removes the object from OpenSearch Dashboards.', }), { confirmButtonText: i18n.translate( @@ -150,7 +150,7 @@ export class SavedObjectEdition extends Component< title: i18n.translate('savedObjectsManagement.deleteConfirm.modalTitle', { defaultMessage: `Delete '{title}'?`, values: { - title: object?.attributes?.title || 'saved Kibana object', + title: object?.attributes?.title || 'saved OpenSearch Dashboards object', }, }), buttonColor: 'danger', diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap index 139f9f2e8703..a86362994a6b 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap @@ -306,11 +306,11 @@ exports[`SavedObjectsTable should render normally 1`] = ` Object { "id": "1", "meta": Object { - "editUrl": "#/management/kibana/indexPatterns/patterns/1", + "editUrl": "#/management/opensearch-dashboards/indexPatterns/patterns/1", "icon": "indexPatternApp", "inAppUrl": Object { - "path": "/management/kibana/indexPatterns/patterns/1", - "uiCapabilitiesPath": "management.kibana.indexPatterns", + "path": "/management/opensearch-dashboards/indexPatterns/patterns/1", + "uiCapabilitiesPath": "management.opensearchDashboards.indexPatterns", }, "title": "MyIndexPattern*", }, @@ -319,7 +319,7 @@ exports[`SavedObjectsTable should render normally 1`] = ` Object { "id": "2", "meta": Object { - "editUrl": "/management/kibana/objects/savedSearches/2", + "editUrl": "/management/opensearch-dashboards/objects/savedSearches/2", "icon": "search", "inAppUrl": Object { "path": "/discover/2", @@ -332,7 +332,7 @@ exports[`SavedObjectsTable should render normally 1`] = ` Object { "id": "3", "meta": Object { - "editUrl": "/management/kibana/objects/savedDashboards/3", + "editUrl": "/management/opensearch-dashboards/objects/savedDashboards/3", "icon": "dashboardApp", "inAppUrl": Object { "path": "/dashboard/3", @@ -345,7 +345,7 @@ exports[`SavedObjectsTable should render normally 1`] = ` Object { "id": "4", "meta": Object { - "editUrl": "/management/kibana/objects/savedVisualizations/4", + "editUrl": "/management/opensearch-dashboards/objects/savedVisualizations/4", "icon": "visualizeApp", "inAppUrl": Object { "path": "/edit/4", diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap index 15e5cb89b622..f62f47a92366 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap @@ -85,7 +85,7 @@ exports[`Relationships should render dashboards normally 1`] = ` Object { "id": "1", "meta": Object { - "editUrl": "/management/kibana/objects/savedVisualizations/1", + "editUrl": "/management/opensearch-dashboards/objects/savedVisualizations/1", "icon": "visualizeApp", "inAppUrl": Object { "path": "/app/visualize#/edit/1", @@ -99,7 +99,7 @@ exports[`Relationships should render dashboards normally 1`] = ` Object { "id": "2", "meta": Object { - "editUrl": "/management/kibana/objects/savedVisualizations/2", + "editUrl": "/management/opensearch-dashboards/objects/savedVisualizations/2", "icon": "visualizeApp", "inAppUrl": Object { "path": "/app/visualize#/edit/2", @@ -288,7 +288,7 @@ exports[`Relationships should render index patterns normally 1`] = ` Object { "id": "1", "meta": Object { - "editUrl": "/management/kibana/objects/savedSearches/1", + "editUrl": "/management/opensearch-dashboards/objects/savedSearches/1", "icon": "search", "inAppUrl": Object { "path": "/app/discover#//1", @@ -302,7 +302,7 @@ exports[`Relationships should render index patterns normally 1`] = ` Object { "id": "2", "meta": Object { - "editUrl": "/management/kibana/objects/savedVisualizations/2", + "editUrl": "/management/opensearch-dashboards/objects/savedVisualizations/2", "icon": "visualizeApp", "inAppUrl": Object { "path": "/app/visualize#/edit/2", @@ -452,11 +452,11 @@ exports[`Relationships should render searches normally 1`] = ` Object { "id": "1", "meta": Object { - "editUrl": "/management/kibana/indexPatterns/patterns/1", + "editUrl": "/management/opensearch-dashboards/indexPatterns/patterns/1", "icon": "indexPatternApp", "inAppUrl": Object { - "path": "/app/management/kibana/indexPatterns/patterns/1", - "uiCapabilitiesPath": "management.kibana.indexPatterns", + "path": "/app/management/opensearch-dashboards/indexPatterns/patterns/1", + "uiCapabilitiesPath": "management.opensearchDashboards.indexPatterns", }, "title": "My Index Pattern", }, @@ -466,7 +466,7 @@ exports[`Relationships should render searches normally 1`] = ` Object { "id": "2", "meta": Object { - "editUrl": "/management/kibana/objects/savedVisualizations/2", + "editUrl": "/management/opensearch-dashboards/objects/savedVisualizations/2", "icon": "visualizeApp", "inAppUrl": Object { "path": "/app/visualize#/edit/2", @@ -616,10 +616,10 @@ exports[`Relationships should render visualizations normally 1`] = ` Object { "id": "1", "meta": Object { - "editUrl": "/management/kibana/objects/savedDashboards/1", + "editUrl": "/management/opensearch-dashboards/objects/savedDashboards/1", "icon": "dashboardApp", "inAppUrl": Object { - "path": "/app/kibana#/dashboard/1", + "path": "/app/opensearch-dashboards#/dashboard/1", "uiCapabilitiesPath": "dashboard.show", }, "title": "My Dashboard 1", @@ -630,10 +630,10 @@ exports[`Relationships should render visualizations normally 1`] = ` Object { "id": "2", "meta": Object { - "editUrl": "/management/kibana/objects/savedDashboards/2", + "editUrl": "/management/opensearch-dashboards/objects/savedDashboards/2", "icon": "dashboardApp", "inAppUrl": Object { - "path": "/app/kibana#/dashboard/2", + "path": "/app/opensearch-dashboards#/dashboard/2", "uiCapabilitiesPath": "dashboard.show", }, "title": "My Dashboard 2", diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap index 67bbb46cfb60..e020bfcf2bd7 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap @@ -175,11 +175,11 @@ exports[`Table prevents saved objects from being deleted 1`] = ` "attributes": Object {}, "id": "1", "meta": Object { - "editUrl": "#/management/kibana/indexPatterns/patterns/1", + "editUrl": "#/management/opensearch-dashboards/indexPatterns/patterns/1", "icon": "indexPatternApp", "inAppUrl": Object { - "path": "/management/kibana/indexPatterns/patterns/1", - "uiCapabilitiesPath": "management.kibana.indexPatterns", + "path": "/management/opensearch-dashboards/indexPatterns/patterns/1", + "uiCapabilitiesPath": "management.opensearchDashboards.indexPatterns", }, "title": "MyIndexPattern*", }, @@ -391,11 +391,11 @@ exports[`Table should render normally 1`] = ` "attributes": Object {}, "id": "1", "meta": Object { - "editUrl": "#/management/kibana/indexPatterns/patterns/1", + "editUrl": "#/management/opensearch-dashboards/indexPatterns/patterns/1", "icon": "indexPatternApp", "inAppUrl": Object { - "path": "/management/kibana/indexPatterns/patterns/1", - "uiCapabilitiesPath": "management.kibana.indexPatterns", + "path": "/management/opensearch-dashboards/indexPatterns/patterns/1", + "uiCapabilitiesPath": "management.opensearchDashboards.indexPatterns", }, "title": "MyIndexPattern*", }, diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx index 65e3b3f34351..5a854b718993 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx @@ -40,8 +40,8 @@ import { EuiSpacer, EuiLink, } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { i18n } from '@osd/i18n'; +import { FormattedMessage } from '@osd/i18n/react'; import { OverlayStart, HttpStart } from 'src/core/public'; import { IndexPatternsContract, @@ -289,7 +289,7 @@ export class Flyout extends Component { .map((doc) => ({ ...doc, // The server assumes that documents with no migrationVersion are up to date. - // That assumption enables Kibana and other API consumers to not have to build + // That assumption enables OpenSearch Dashboards and other API consumers to not have to build // up migrationVersion prior to creating new objects. But it means that imports // need to set migrationVersion to something other than undefined, so that imported // docs are not seen as automatically up-to-date. diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx index 582801c7b995..2fe1676fa1ab 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx @@ -27,7 +27,7 @@ import { EuiTextColor, EuiButtonEmpty, } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { FormattedMessage } from '@osd/i18n/react'; export const Header = ({ onExportAll, diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx index 4000d620465a..b6ae7d7fdb32 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx @@ -29,7 +29,7 @@ import { EuiFlexItem, EuiIconTip, } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; +import { i18n } from '@osd/i18n'; export interface ImportModeControlProps { initialValues: ImportMode; diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx index e2ce3c3695b1..52b5fdd027ea 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx @@ -31,9 +31,9 @@ import { EuiTitle, EuiSpacer, } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { SavedObjectsImportSuccess } from 'kibana/public'; +import { i18n } from '@osd/i18n'; +import { FormattedMessage } from '@osd/i18n/react'; +import { SavedObjectsImportSuccess } from 'opensearch-dashboards/public'; import { FailedImport } from '../../..'; import { getDefaultTitle, getSavedObjectLabel } from '../../../lib'; diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx index bf27d407fbe9..e2ec5416a458 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx @@ -25,7 +25,7 @@ import { EuiText, EuiSuperSelect, } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; +import { i18n } from '@osd/i18n'; import moment from 'moment'; import { FailedImportConflict } from '../../../lib/resolve_import_errors'; import { getDefaultTitle } from '../../../lib'; diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx index ead273897307..760944fa6f6c 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx @@ -42,7 +42,7 @@ describe('Relationships', () => { id: '1', relationship: 'parent', meta: { - editUrl: '/management/kibana/objects/savedSearches/1', + editUrl: '/management/opensearch-dashboards/objects/savedSearches/1', icon: 'search', inAppUrl: { path: '/app/discover#//1', @@ -56,7 +56,7 @@ describe('Relationships', () => { id: '2', relationship: 'parent', meta: { - editUrl: '/management/kibana/objects/savedVisualizations/2', + editUrl: '/management/opensearch-dashboards/objects/savedVisualizations/2', icon: 'visualizeApp', inAppUrl: { path: '/app/visualize#/edit/2', @@ -74,10 +74,10 @@ describe('Relationships', () => { meta: { title: 'MyIndexPattern*', icon: 'indexPatternApp', - editUrl: '#/management/kibana/indexPatterns/patterns/1', + editUrl: '#/management/opensearch-dashboards/indexPatterns/patterns/1', inAppUrl: { - path: '/management/kibana/indexPatterns/patterns/1', - uiCapabilitiesPath: 'management.kibana.indexPatterns', + path: '/management/opensearch-dashboards/indexPatterns/patterns/1', + uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns', }, }, }, @@ -109,11 +109,11 @@ describe('Relationships', () => { id: '1', relationship: 'child', meta: { - editUrl: '/management/kibana/indexPatterns/patterns/1', + editUrl: '/management/opensearch-dashboards/indexPatterns/patterns/1', icon: 'indexPatternApp', inAppUrl: { - path: '/app/management/kibana/indexPatterns/patterns/1', - uiCapabilitiesPath: 'management.kibana.indexPatterns', + path: '/app/management/opensearch-dashboards/indexPatterns/patterns/1', + uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns', }, title: 'My Index Pattern', }, @@ -123,7 +123,7 @@ describe('Relationships', () => { id: '2', relationship: 'parent', meta: { - editUrl: '/management/kibana/objects/savedVisualizations/2', + editUrl: '/management/opensearch-dashboards/objects/savedVisualizations/2', icon: 'visualizeApp', inAppUrl: { path: '/app/visualize#/edit/2', @@ -141,7 +141,7 @@ describe('Relationships', () => { meta: { title: 'MySearch', icon: 'search', - editUrl: '/management/kibana/objects/savedSearches/1', + editUrl: '/management/opensearch-dashboards/objects/savedSearches/1', inAppUrl: { path: '/discover/1', uiCapabilitiesPath: 'discover.show', @@ -176,10 +176,10 @@ describe('Relationships', () => { id: '1', relationship: 'parent', meta: { - editUrl: '/management/kibana/objects/savedDashboards/1', + editUrl: '/management/opensearch-dashboards/objects/savedDashboards/1', icon: 'dashboardApp', inAppUrl: { - path: '/app/kibana#/dashboard/1', + path: '/app/opensearch-dashboards#/dashboard/1', uiCapabilitiesPath: 'dashboard.show', }, title: 'My Dashboard 1', @@ -190,10 +190,10 @@ describe('Relationships', () => { id: '2', relationship: 'parent', meta: { - editUrl: '/management/kibana/objects/savedDashboards/2', + editUrl: '/management/opensearch-dashboards/objects/savedDashboards/2', icon: 'dashboardApp', inAppUrl: { - path: '/app/kibana#/dashboard/2', + path: '/app/opensearch-dashboards#/dashboard/2', uiCapabilitiesPath: 'dashboard.show', }, title: 'My Dashboard 2', @@ -208,7 +208,7 @@ describe('Relationships', () => { meta: { title: 'MyViz', icon: 'visualizeApp', - editUrl: '/management/kibana/objects/savedVisualizations/1', + editUrl: '/management/opensearch-dashboards/objects/savedVisualizations/1', inAppUrl: { path: '/edit/1', uiCapabilitiesPath: 'visualize.show', @@ -243,7 +243,7 @@ describe('Relationships', () => { id: '1', relationship: 'child', meta: { - editUrl: '/management/kibana/objects/savedVisualizations/1', + editUrl: '/management/opensearch-dashboards/objects/savedVisualizations/1', icon: 'visualizeApp', inAppUrl: { path: '/app/visualize#/edit/1', @@ -257,7 +257,7 @@ describe('Relationships', () => { id: '2', relationship: 'child', meta: { - editUrl: '/management/kibana/objects/savedVisualizations/2', + editUrl: '/management/opensearch-dashboards/objects/savedVisualizations/2', icon: 'visualizeApp', inAppUrl: { path: '/app/visualize#/edit/2', @@ -275,7 +275,7 @@ describe('Relationships', () => { meta: { title: 'MyDashboard', icon: 'dashboardApp', - editUrl: '/management/kibana/objects/savedDashboards/1', + editUrl: '/management/opensearch-dashboards/objects/savedDashboards/1', inAppUrl: { path: '/dashboard/1', uiCapabilitiesPath: 'dashboard.show', @@ -315,7 +315,7 @@ describe('Relationships', () => { meta: { title: 'MyDashboard', icon: 'dashboardApp', - editUrl: '/management/kibana/objects/savedDashboards/1', + editUrl: '/management/opensearch-dashboards/objects/savedDashboards/1', inAppUrl: { path: '/dashboard/1', uiCapabilitiesPath: 'dashboard.show', diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx index 194733433ce2..3d36d5775656 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx @@ -33,8 +33,8 @@ import { EuiSpacer, } from '@elastic/eui'; import { SearchFilterConfig } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { i18n } from '@osd/i18n'; +import { FormattedMessage } from '@osd/i18n/react'; import { IBasePath } from 'src/core/public'; import { getDefaultTitle, getSavedObjectLabel } from '../../../lib'; import { SavedObjectWithMetadata, SavedObjectRelation } from '../../../types'; diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx index 7733a587ca9a..aec88e0073c8 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx @@ -40,10 +40,10 @@ const defaultProps: TableProps = { meta: { title: `MyIndexPattern*`, icon: 'indexPatternApp', - editUrl: '#/management/kibana/indexPatterns/patterns/1', + editUrl: '#/management/opensearch-dashboards/indexPatterns/patterns/1', inAppUrl: { - path: '/management/kibana/indexPatterns/patterns/1', - uiCapabilitiesPath: 'management.kibana.indexPatterns', + path: '/management/opensearch-dashboards/indexPatterns/patterns/1', + uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns', }, }, }, @@ -68,10 +68,10 @@ const defaultProps: TableProps = { meta: { title: `MyIndexPattern*`, icon: 'indexPatternApp', - editUrl: '#/management/kibana/indexPatterns/patterns/1', + editUrl: '#/management/opensearch-dashboards/indexPatterns/patterns/1', inAppUrl: { - path: '/management/kibana/indexPatterns/patterns/1', - uiCapabilitiesPath: 'management.kibana.indexPatterns', + path: '/management/opensearch-dashboards/indexPatterns/patterns/1', + uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns', }, }, }, diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx index 0ce7e6e38962..f41f4367f60e 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx @@ -35,8 +35,8 @@ import { EuiTableFieldDataColumnType, EuiTableActionsColumnType, } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { i18n } from '@osd/i18n'; +import { FormattedMessage } from '@osd/i18n/react'; import { getDefaultTitle, getSavedObjectLabel } from '../../../lib'; import { SavedObjectWithMetadata } from '../../../types'; import { diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx index 11455469a963..f610b27359b7 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx @@ -157,10 +157,10 @@ describe('SavedObjectsTable', () => { meta: { title: `MyIndexPattern*`, icon: 'indexPatternApp', - editUrl: '#/management/kibana/indexPatterns/patterns/1', + editUrl: '#/management/opensearch-dashboards/indexPatterns/patterns/1', inAppUrl: { - path: '/management/kibana/indexPatterns/patterns/1', - uiCapabilitiesPath: 'management.kibana.indexPatterns', + path: '/management/opensearch-dashboards/indexPatterns/patterns/1', + uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns', }, }, }, @@ -170,7 +170,7 @@ describe('SavedObjectsTable', () => { meta: { title: `MySearch`, icon: 'search', - editUrl: '/management/kibana/objects/savedSearches/2', + editUrl: '/management/opensearch-dashboards/objects/savedSearches/2', inAppUrl: { path: '/discover/2', uiCapabilitiesPath: 'discover.show', @@ -183,7 +183,7 @@ describe('SavedObjectsTable', () => { meta: { title: `MyDashboard`, icon: 'dashboardApp', - editUrl: '/management/kibana/objects/savedDashboards/3', + editUrl: '/management/opensearch-dashboards/objects/savedDashboards/3', inAppUrl: { path: '/dashboard/3', uiCapabilitiesPath: 'dashboard.show', @@ -196,7 +196,7 @@ describe('SavedObjectsTable', () => { meta: { title: `MyViz`, icon: 'visualizeApp', - editUrl: '/management/kibana/objects/savedVisualizations/4', + editUrl: '/management/opensearch-dashboards/objects/savedVisualizations/4', inAppUrl: { path: '/edit/4', uiCapabilitiesPath: 'visualize.show', @@ -445,7 +445,7 @@ describe('SavedObjectsTable', () => { meta: { title: `MySearch`, icon: 'search', - editUrl: '/management/kibana/objects/savedSearches/2', + editUrl: '/management/opensearch-dashboards/objects/savedSearches/2', inAppUrl: { path: '/discover/2', uiCapabilitiesPath: 'discover.show', @@ -460,7 +460,7 @@ describe('SavedObjectsTable', () => { type: 'search', meta: { title: 'MySearch', - editUrl: '/management/kibana/objects/savedSearches/2', + editUrl: '/management/opensearch-dashboards/objects/savedSearches/2', icon: 'search', inAppUrl: { path: '/discover/2', diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx index 5011c0299abe..6b98de689ccb 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx @@ -45,8 +45,8 @@ import { EuiFlexGroup, EuiFlexItem, } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { i18n } from '@osd/i18n'; +import { FormattedMessage } from '@osd/i18n/react'; import { SavedObjectsClientContract, SavedObjectsFindOptions, @@ -55,7 +55,7 @@ import { NotificationsStart, ApplicationStart, } from 'src/core/public'; -import { RedirectAppLinks } from '../../../../kibana_react/public'; +import { RedirectAppLinks } from '../../../../opensearch_dashboards_react/public'; import { IndexPatternsContract } from '../../../../data/public'; import { parseQuery, @@ -499,7 +499,7 @@ export class SavedObjectsTable extends Component { router.get( { - path: '/api/kibana/management/saved_objects/_find', + path: '/api/opensearch-dashboards/management/saved_objects/_find', validate: { query: schema.object({ perPage: schema.number({ min: 0, defaultValue: 20 }), diff --git a/src/plugins/saved_objects_management/server/routes/get.ts b/src/plugins/saved_objects_management/server/routes/get.ts index a2c12a397052..7daaf8f4a690 100644 --- a/src/plugins/saved_objects_management/server/routes/get.ts +++ b/src/plugins/saved_objects_management/server/routes/get.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '@kbn/config-schema'; +import { schema } from '@osd/config-schema'; import { IRouter } from 'src/core/server'; import { injectMetaAttributes } from '../lib'; import { ISavedObjectsManagement } from '../services'; @@ -28,7 +28,7 @@ export const registerGetRoute = ( ) => { router.get( { - path: '/api/kibana/management/saved_objects/{type}/{id}', + path: '/api/opensearch-dashboards/management/saved_objects/{type}/{id}', validate: { params: schema.object({ type: schema.string(), diff --git a/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts b/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts index 2d15dde48a4e..723c0e3dabd3 100644 --- a/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts +++ b/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts @@ -22,7 +22,7 @@ import { IRouter } from 'src/core/server'; export const registerGetAllowedTypesRoute = (router: IRouter) => { router.get( { - path: '/api/kibana/management/saved_objects/_allowed_types', + path: '/api/opensearch-dashboards/management/saved_objects/_allowed_types', validate: false, }, async (context, req, res) => { diff --git a/src/plugins/saved_objects_management/server/routes/index.test.ts b/src/plugins/saved_objects_management/server/routes/index.test.ts index b39262f0c8b3..b8c5091595a6 100644 --- a/src/plugins/saved_objects_management/server/routes/index.test.ts +++ b/src/plugins/saved_objects_management/server/routes/index.test.ts @@ -39,37 +39,37 @@ describe('registerRoutes', () => { expect(router.get).toHaveBeenCalledWith( expect.objectContaining({ - path: '/api/kibana/management/saved_objects/_find', + path: '/api/opensearch-dashboards/management/saved_objects/_find', }), expect.any(Function) ); expect(router.get).toHaveBeenCalledWith( expect.objectContaining({ - path: '/api/kibana/management/saved_objects/{type}/{id}', + path: '/api/opensearch-dashboards/management/saved_objects/{type}/{id}', }), expect.any(Function) ); expect(router.get).toHaveBeenCalledWith( expect.objectContaining({ - path: '/api/kibana/management/saved_objects/relationships/{type}/{id}', + path: '/api/opensearch-dashboards/management/saved_objects/relationships/{type}/{id}', }), expect.any(Function) ); expect(router.get).toHaveBeenCalledWith( expect.objectContaining({ - path: '/api/kibana/management/saved_objects/_allowed_types', + path: '/api/opensearch-dashboards/management/saved_objects/_allowed_types', }), expect.any(Function) ); expect(router.post).toHaveBeenCalledWith( expect.objectContaining({ - path: '/api/kibana/management/saved_objects/scroll/counts', + path: '/api/opensearch-dashboards/management/saved_objects/scroll/counts', }), expect.any(Function) ); expect(router.post).toHaveBeenCalledWith( expect.objectContaining({ - path: '/api/kibana/management/saved_objects/scroll/export', + path: '/api/opensearch-dashboards/management/saved_objects/scroll/export', }), expect.any(Function) ); diff --git a/src/plugins/saved_objects_management/server/routes/relationships.ts b/src/plugins/saved_objects_management/server/routes/relationships.ts index c9001deb9123..05725dc620c4 100644 --- a/src/plugins/saved_objects_management/server/routes/relationships.ts +++ b/src/plugins/saved_objects_management/server/routes/relationships.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '@kbn/config-schema'; +import { schema } from '@osd/config-schema'; import { IRouter } from 'src/core/server'; import { findRelationships } from '../lib'; import { ISavedObjectsManagement } from '../services'; @@ -28,7 +28,7 @@ export const registerRelationshipsRoute = ( ) => { router.get( { - path: '/api/kibana/management/saved_objects/relationships/{type}/{id}', + path: '/api/opensearch-dashboards/management/saved_objects/relationships/{type}/{id}', validate: { params: schema.object({ type: schema.string(), diff --git a/src/plugins/saved_objects_management/server/routes/scroll_count.ts b/src/plugins/saved_objects_management/server/routes/scroll_count.ts index 58ba90d84779..1c86fbc7a82d 100644 --- a/src/plugins/saved_objects_management/server/routes/scroll_count.ts +++ b/src/plugins/saved_objects_management/server/routes/scroll_count.ts @@ -17,14 +17,14 @@ * under the License. */ -import { schema } from '@kbn/config-schema'; +import { schema } from '@osd/config-schema'; import { IRouter, SavedObjectsFindOptions } from 'src/core/server'; import { findAll } from '../lib'; export const registerScrollForCountRoute = (router: IRouter) => { router.post( { - path: '/api/kibana/management/saved_objects/scroll/counts', + path: '/api/opensearch-dashboards/management/saved_objects/scroll/counts', validate: { body: schema.object({ typesToInclude: schema.arrayOf(schema.string()), diff --git a/src/plugins/saved_objects_management/server/routes/scroll_export.ts b/src/plugins/saved_objects_management/server/routes/scroll_export.ts index a1534a1d5544..29a5c8b022b4 100644 --- a/src/plugins/saved_objects_management/server/routes/scroll_export.ts +++ b/src/plugins/saved_objects_management/server/routes/scroll_export.ts @@ -17,14 +17,14 @@ * under the License. */ -import { schema } from '@kbn/config-schema'; +import { schema } from '@osd/config-schema'; import { IRouter } from 'src/core/server'; import { findAll } from '../lib'; export const registerScrollForExportRoute = (router: IRouter) => { router.post( { - path: '/api/kibana/management/saved_objects/scroll/export', + path: '/api/opensearch-dashboards/management/saved_objects/scroll/export', validate: { body: schema.object({ typesToInclude: schema.arrayOf(schema.string()),