From f22b2d74dcf764c07a65de2a8f9bcbcfeaa2335e Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Thu, 11 Mar 2021 11:45:13 -0800 Subject: [PATCH] [Rename] timelion plugin (#163) Signed-off-by: Kawika Avilla --- ...kibana.json => opensearch_dashboards.json} | 8 ++--- src/plugins/timelion/public/app.js | 18 +++++------ src/plugins/timelion/public/application.ts | 10 +++---- src/plugins/timelion/public/breadcrumbs.js | 2 +- .../components/timelion_deprecation.tsx | 2 +- .../public/components/timelionhelp_tabs.js | 2 +- .../public/directives/cells/cells.html | 2 +- .../timelion/public/directives/chart/chart.js | 2 +- .../directives/saved_object_finder.html | 6 ++-- .../public/directives/saved_object_finder.js | 4 +-- .../saved_object_save_as_checkbox.html | 2 +- .../timelion_help/timelion_help.html | 30 +++++++++---------- .../directives/timelion_help/timelion_help.js | 16 +++++----- src/plugins/timelion/public/index.html | 4 +-- src/plugins/timelion/public/index.ts | 2 +- src/plugins/timelion/public/panels/panel.ts | 2 +- .../public/panels/timechart/schema.ts | 2 +- .../timelion/public/partials/save_sheet.html | 8 ++--- src/plugins/timelion/public/plugin.ts | 14 ++++----- .../timelion/public/services/_saved_sheet.ts | 6 ++-- .../timelion/public/timelion_app_state.ts | 12 ++++---- src/plugins/timelion/server/config.ts | 2 +- src/plugins/timelion/server/plugin.ts | 4 +-- .../server/saved_objects/timelion_sheet.ts | 4 +-- 24 files changed, 82 insertions(+), 82 deletions(-) rename src/plugins/timelion/{kibana.json => opensearch_dashboards.json} (62%) diff --git a/src/plugins/timelion/kibana.json b/src/plugins/timelion/opensearch_dashboards.json similarity index 62% rename from src/plugins/timelion/kibana.json rename to src/plugins/timelion/opensearch_dashboards.json index d8c709d867a3..ec4c7a9b6b9f 100644 --- a/src/plugins/timelion/kibana.json +++ b/src/plugins/timelion/opensearch_dashboards.json @@ -1,11 +1,11 @@ { "id": "timelion", - "version": "kibana", + "version": "opensearchDashboards", "ui": true, "server": true, "requiredBundles": [ - "kibanaLegacy", - "kibanaUtils", + "opensearchDashboardsLegacy", + "opensearchDashboardsUtils", "savedObjects", "visTypeTimelion" ], @@ -14,6 +14,6 @@ "data", "navigation", "visTypeTimelion", - "kibanaLegacy" + "opensearchDashboardsLegacy" ] } diff --git a/src/plugins/timelion/public/app.js b/src/plugins/timelion/public/app.js index 40fffe7a5a06..8d5e2ebf68ef 100644 --- a/src/plugins/timelion/public/app.js +++ b/src/plugins/timelion/public/app.js @@ -19,11 +19,11 @@ import _ from 'lodash'; -import { i18n } from '@kbn/i18n'; +import { i18n } from '@osd/i18n'; import { createHashHistory } from 'history'; -import { createKbnUrlStateStorage, withNotifyOnErrors } from '../../kibana_utils/public'; +import { createOsdUrlStateStorage, withNotifyOnErrors } from '../../opensearch_dashboards_utils/public'; import { syncQueryStateWithUrl } from '../../data/public'; import { getSavedSheetBreadcrumbs, getCreateBreadcrumbs } from './breadcrumbs'; @@ -31,7 +31,7 @@ import { addFatalError, registerListenEventListener, watchMultiDecorator, -} from '../../kibana_legacy/public'; +} from '../../opensearch_dashboards_legacy/public'; import { getTimezone } from '../../vis_type_timelion/public'; import { initCellsDirective } from './directives/cells/cells'; import { initFullscreenDirective } from './directives/fullscreen/fullscreen'; @@ -60,8 +60,8 @@ export function initTimelionApp(app, deps) { const savedSheetLoader = initSavedSheetService(app, deps); app.factory('history', () => createHashHistory()); - app.factory('kbnUrlStateStorage', (history) => - createKbnUrlStateStorage({ + app.factory('osdUrlStateStorage', (history) => + createOsdUrlStateStorage({ history, useHash: deps.core.uiSettings.get('state:storeInSessionStorage'), ...withNotifyOnErrors(deps.core.notifications.toasts), @@ -112,7 +112,7 @@ export function initTimelionApp(app, deps) { $scope, $timeout, history, - kbnUrlStateStorage + osdUrlStateStorage ) { // Keeping this at app scope allows us to keep the current page when the user // switches to say, the timepicker. @@ -123,12 +123,12 @@ export function initTimelionApp(app, deps) { timefilter.enableAutoRefreshSelector(); timefilter.enableTimeRangeSelector(); - deps.core.chrome.docTitle.change('Timelion - Kibana'); + deps.core.chrome.docTitle.change('Timelion - OpenSearch Dashboards'); // starts syncing `_g` portion of url with query services const { stop: stopSyncingQueryServiceStateWithUrl } = syncQueryStateWithUrl( deps.plugins.data.query, - kbnUrlStateStorage + osdUrlStateStorage ); const savedSheet = $route.current.locals.savedSheet; @@ -145,7 +145,7 @@ export function initTimelionApp(app, deps) { const { stateContainer, stopStateSync } = initTimelionAppState({ stateDefaults: getStateDefaults(), - kbnUrlStateStorage, + osdUrlStateStorage, }); $scope.state = _.cloneDeep(stateContainer.getState()); diff --git a/src/plugins/timelion/public/application.ts b/src/plugins/timelion/public/application.ts index a4963ee6b1b0..0739daeb319c 100644 --- a/src/plugins/timelion/public/application.ts +++ b/src/plugins/timelion/public/application.ts @@ -26,13 +26,13 @@ import 'angular-sanitize'; // required for ngRoute import 'angular-route'; import 'angular-sortable-view'; -import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular'; +import { i18nDirective, i18nFilter, I18nProvider } from '@osd/i18n/angular'; import { IUiSettingsClient, CoreStart, PluginInitializerContext, AppMountParameters, -} from 'kibana/public'; +} from 'opensearch-dashboards/public'; import { getTimeChart } from './panels/timechart/timechart'; import { Panel } from './panels/panel'; @@ -40,7 +40,7 @@ import { configureAppAngularModule, createTopNavDirective, createTopNavHelper, -} from '../../kibana_legacy/public'; +} from '../../opensearch_dashboards_legacy/public'; import { TimelionPluginDependencies } from './plugin'; import { DataPublicPluginStart } from '../../data/public'; // @ts-ignore @@ -140,8 +140,8 @@ function createLocalIconModule() { function createLocalTopNavModule(navigation: TimelionPluginDependencies['navigation']) { angular .module('app/timelion/TopNav', ['react']) - .directive('kbnTopNav', createTopNavDirective) - .directive('kbnTopNavHelper', createTopNavHelper(navigation.ui)); + .directive('osdTopNav', createTopNavDirective) + .directive('osdTopNavHelper', createTopNavHelper(navigation.ui)); } function createLocalI18nModule() { diff --git a/src/plugins/timelion/public/breadcrumbs.js b/src/plugins/timelion/public/breadcrumbs.js index 9758e23127b2..b4d94e3e3fff 100644 --- a/src/plugins/timelion/public/breadcrumbs.js +++ b/src/plugins/timelion/public/breadcrumbs.js @@ -17,7 +17,7 @@ * under the License. */ -import { i18n } from '@kbn/i18n'; +import { i18n } from '@osd/i18n'; const ROOT_BREADCRUMB = { text: i18n.translate('timelion.breadcrumbs.root', { diff --git a/src/plugins/timelion/public/components/timelion_deprecation.tsx b/src/plugins/timelion/public/components/timelion_deprecation.tsx index f9f04d350457..9ed317957252 100644 --- a/src/plugins/timelion/public/components/timelion_deprecation.tsx +++ b/src/plugins/timelion/public/components/timelion_deprecation.tsx @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { FormattedMessage } from '@kbn/i18n/react'; +import { FormattedMessage } from '@osd/i18n/react'; import { EuiSpacer, EuiCallOut, EuiLink } from '@elastic/eui'; import React from 'react'; import { DocLinksStart } from '../../../../core/public'; diff --git a/src/plugins/timelion/public/components/timelionhelp_tabs.js b/src/plugins/timelion/public/components/timelionhelp_tabs.js index 7939afce412e..7ee412d5ec1f 100644 --- a/src/plugins/timelion/public/components/timelionhelp_tabs.js +++ b/src/plugins/timelion/public/components/timelionhelp_tabs.js @@ -22,7 +22,7 @@ import React from 'react'; import { EuiTabs, EuiTab } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { FormattedMessage } from '@osd/i18n/react'; function handleClick(activateTab, tabName) { activateTab(tabName); diff --git a/src/plugins/timelion/public/directives/cells/cells.html b/src/plugins/timelion/public/directives/cells/cells.html index 6be1b089d2de..e7bfe2a5da70 100644 --- a/src/plugins/timelion/public/directives/cells/cells.html +++ b/src/plugins/timelion/public/directives/cells/cells.html @@ -9,7 +9,7 @@ timelion-grid timelion-grid-rows="state.rows" ng-click="onSelect($index)" ng-class="{active: $index === state.selected}" - kbn-accessible-click + osd-accessible-click aria-label="Timelion chart {{$index + 1}}" aria-current="{{$index === state.selected}}" > diff --git a/src/plugins/timelion/public/directives/chart/chart.js b/src/plugins/timelion/public/directives/chart/chart.js index 14bd3281a683..f4813d2777d9 100644 --- a/src/plugins/timelion/public/directives/chart/chart.js +++ b/src/plugins/timelion/public/directives/chart/chart.js @@ -17,7 +17,7 @@ * under the License. */ -import { i18n } from '@kbn/i18n'; +import { i18n } from '@osd/i18n'; export function Chart(timelionPanels) { return { diff --git a/src/plugins/timelion/public/directives/saved_object_finder.html b/src/plugins/timelion/public/directives/saved_object_finder.html index ad148801c03a..dc3ce40cfcae 100644 --- a/src/plugins/timelion/public/directives/saved_object_finder.html +++ b/src/plugins/timelion/public/directives/saved_object_finder.html @@ -36,7 +36,7 @@ i18n-id="timelion.savedObjectFinder.addNewItemButtonLabel" i18n-default-message="Add new {item}" i18n-values="{item: finder.properties.noun}" - i18n-description="{item} can be a type of object in Kibana, like 'visualization', 'dashboard', etc" + i18n-description="{item} can be a type of object in OpenSearch Dashboards, like 'visualization', 'dashboard', etc" > @@ -111,7 +111,7 @@

diff --git a/src/plugins/timelion/public/directives/saved_object_finder.js b/src/plugins/timelion/public/directives/saved_object_finder.js index 88f1b78cd3da..e32f59601c34 100644 --- a/src/plugins/timelion/public/directives/saved_object_finder.js +++ b/src/plugins/timelion/public/directives/saved_object_finder.js @@ -24,7 +24,7 @@ import { keyMap } from './key_map'; import { PaginateControlsDirectiveProvider, PaginateDirectiveProvider, -} from '../../../kibana_legacy/public'; +} from '../../../opensearch_dashboards_legacy/public'; import { PER_PAGE_SETTING } from '../../../saved_objects/public'; import { VISUALIZE_ENABLE_LABS_SETTING } from '../../../visualizations/public'; @@ -263,7 +263,7 @@ export function initSavedObjectFinderDirective(app, savedSheetLoader, uiSettings }; self.manageObjects = function (type) { - $location.url('/management/kibana/objects?_a=' + rison.encode({ tab: type })); + $location.url('/management/opensearch-dashboards/objects?_a=' + rison.encode({ tab: type })); }; self.hitCountNoun = function () { diff --git a/src/plugins/timelion/public/directives/saved_object_save_as_checkbox.html b/src/plugins/timelion/public/directives/saved_object_save_as_checkbox.html index 5adce4286010..61d79a0b6506 100644 --- a/src/plugins/timelion/public/directives/saved_object_save_as_checkbox.html +++ b/src/plugins/timelion/public/directives/saved_object_save_as_checkbox.html @@ -3,7 +3,7 @@ ng-hide="!savedObject.isTitleChanged() || savedObject.copyOnSave" class="kuiLocalDropdownWarning kuiVerticalRhythmSmall" i18n-id="timelion.savedObjects.howToSaveAsNewDescription" - i18n-default-message="In previous versions of Kibana, changing the name of a {savedObjectName} would make a copy with the new name. Use the 'Save as a new {savedObjectName}' checkbox to do this now." + i18n-default-message="In previous versions of OpenSearch Dashboards, changing the name of a {savedObjectName} would make a copy with the new name. Use the 'Save as a new {savedObjectName}' checkbox to do this now." i18n-values="{ savedObjectName: savedObject.getDisplayName() }" i18n-description="'Save as a new {savedObjectName}' refers to timelion.savedObjects.saveAsNewLabel and should be the same text." > diff --git a/src/plugins/timelion/public/directives/timelion_help/timelion_help.html b/src/plugins/timelion/public/directives/timelion_help/timelion_help.html index bd43f36ba862..7e5c9baf77a8 100644 --- a/src/plugins/timelion/public/directives/timelion_help/timelion_help.html +++ b/src/plugins/timelion/public/directives/timelion_help/timelion_help.html @@ -14,7 +14,7 @@ Timelion at your disposal. Timelion lets you compare, combine, and combobulate datasets across multiple datasources with one easy-to-master expression syntax. This tutorial focuses on - Elasticsearch, but you'll quickly discover that what you learn here + OpenSearch, but you'll quickly discover that what you learn here applies to any datasource Timelion supports." i18n-values="{ html_emphasizedEverything: '' + translations.emphasizedEverythingText + '' }" >

@@ -90,7 +90,7 @@

@@ -242,11 +242,11 @@

.

@@ -641,7 +641,7 @@ ng-click="functions.details = (functions.details === function.name ? null : function.name)" - kbn-accessible-click + osd-accessible-click > .{{function.name}}() {{function.help}} diff --git a/src/plugins/timelion/public/directives/timelion_help/timelion_help.js b/src/plugins/timelion/public/directives/timelion_help/timelion_help.js index 27f29f3a740b..367adc35b6af 100644 --- a/src/plugins/timelion/public/directives/timelion_help/timelion_help.js +++ b/src/plugins/timelion/public/directives/timelion_help/timelion_help.js @@ -18,7 +18,7 @@ */ import template from './timelion_help.html'; -import { i18n } from '@kbn/i18n'; +import { i18n } from '@osd/i18n'; import _ from 'lodash'; import moment from 'moment'; @@ -65,19 +65,19 @@ export function initTimelionHelpDirective(app) { notValidAdvancedSettingsPath: i18n.translate( 'timelion.help.configuration.notValid.advancedSettingsPathText', { - defaultMessage: 'Management / Kibana / Advanced Settings', + defaultMessage: 'Management / OpenSearch Dashboards / Advanced Settings', } ), validAdvancedSettingsPath: i18n.translate( 'timelion.help.configuration.valid.advancedSettingsPathText', { - defaultMessage: 'Management/Kibana/Advanced Settings', + defaultMessage: 'Management/OpenSearch Dashboards/Advanced Settings', } ), esAsteriskQueryDescription: i18n.translate( 'timelion.help.querying.esAsteriskQueryDescriptionText', { - defaultMessage: 'hey Elasticsearch, find everything in my default index', + defaultMessage: 'hey OpenSearch, find everything in my default index', } ), esIndexQueryDescription: i18n.translate( @@ -116,7 +116,7 @@ export function initTimelionHelpDirective(app) { }; getFunctions(); - checkElasticsearch(); + checkOpenSearch(); } function getFunctions() { @@ -124,14 +124,14 @@ export function initTimelionHelpDirective(app) { $scope.functions.list = resp.data; }); } - $scope.recheckElasticsearch = function () { + $scope.recheckOpenSearch = function () { $scope.es.valid = null; - checkElasticsearch().then(function (valid) { + checkOpenSearch().then(function (valid) { if (!valid) $scope.es.invalidCount++; }); }; - function checkElasticsearch() { + function checkOpenSearch() { return $http.get('../api/timelion/validate/es').then(function (resp) { if (resp.data.ok) { $scope.es.valid = true; diff --git a/src/plugins/timelion/public/index.html b/src/plugins/timelion/public/index.html index 0cf64287a3bd..27d95f8a8a81 100644 --- a/src/plugins/timelion/public/index.html +++ b/src/plugins/timelion/public/index.html @@ -11,7 +11,7 @@ - - +
diff --git a/src/plugins/timelion/public/index.ts b/src/plugins/timelion/public/index.ts index 6b4213588465..4c2b196b1ca7 100644 --- a/src/plugins/timelion/public/index.ts +++ b/src/plugins/timelion/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializerContext } from 'kibana/public'; +import { PluginInitializerContext } from 'opensearch-dashboards/public'; import { TimelionPlugin as Plugin } from './plugin'; export function plugin(initializerContext: PluginInitializerContext) { diff --git a/src/plugins/timelion/public/panels/panel.ts b/src/plugins/timelion/public/panels/panel.ts index 3512cd96a959..cc4030cf5991 100644 --- a/src/plugins/timelion/public/panels/panel.ts +++ b/src/plugins/timelion/public/panels/panel.ts @@ -17,7 +17,7 @@ * under the License. */ -import { i18n } from '@kbn/i18n'; +import { i18n } from '@osd/i18n'; interface PanelConfig { help?: string; diff --git a/src/plugins/timelion/public/panels/timechart/schema.ts b/src/plugins/timelion/public/panels/timechart/schema.ts index d874f0d32c9d..081a577b6a31 100644 --- a/src/plugins/timelion/public/panels/timechart/schema.ts +++ b/src/plugins/timelion/public/panels/timechart/schema.ts @@ -105,7 +105,7 @@ export function timechartFn(dependencies: TimelionVisualizationDependencies) { const numberSpan = document.createElement('span'); wrapperSpan.setAttribute('class', 'ngLegendValue'); - wrapperSpan.setAttribute('kbn-accessible-click', ''); + wrapperSpan.setAttribute('osd-accessible-click', ''); wrapperSpan.setAttribute('ng-click', `toggleSeries(${series._id})`); wrapperSpan.setAttribute('ng-focus', `focusSeries(${series._id})`); wrapperSpan.setAttribute('ng-mouseover', `highlightSeries(${series._id})`); diff --git a/src/plugins/timelion/public/partials/save_sheet.html b/src/plugins/timelion/public/partials/save_sheet.html index a0e0727f3ec8..0e1656e0b34e 100644 --- a/src/plugins/timelion/public/partials/save_sheet.html +++ b/src/plugins/timelion/public/partials/save_sheet.html @@ -9,7 +9,7 @@ class="list-group-item-text" i18n-id="timelion.topNavMenu.save.saveEntireSheetDescription" i18n-default-message="You want this option if you mostly use Timelion expressions from within - the Timelion app and don't need to add Timelion charts to Kibana + the Timelion app and don't need to add Timelion charts to OpenSearch Dashboards dashboards. You may also want this if you make use of references to other panels." >

@@ -53,14 +53,14 @@

{ ) { const timelionPanels: Map = new Map(); - const { appMounted, appUnMounted, stop: stopUrlTracker } = createKbnUrlTracker({ + const { appMounted, appUnMounted, stop: stopUrlTracker } = createOsdUrlTracker({ baseUrl: core.http.basePath.prepend('/app/timelion'), defaultSubUrl: '#/', storageKey: `lastUrl:${core.http.basePath.get()}:timelion`, @@ -76,7 +76,7 @@ export class TimelionPlugin implements Plugin { toastNotifications: core.notifications.toasts, stateParams: [ { - kbnUrlKey: '_g', + osdUrlKey: '_g', stateUpdate$: data.query.state$.pipe( filter( ({ changes }) => !!(changes.globalFilters || changes.time || changes.refreshInterval) @@ -102,7 +102,7 @@ export class TimelionPlugin implements Plugin { order: 8000, defaultPath: '#/', euiIconType: 'logoKibana', - category: DEFAULT_APP_CATEGORIES.kibana, + category: DEFAULT_APP_CATEGORIES.opensearchDashboards, navLinkStatus: visTypeTimelion.isUiEnabled === false ? AppNavLinkStatus.hidden : AppNavLinkStatus.default, mount: async (params: AppMountParameters) => { @@ -133,8 +133,8 @@ export class TimelionPlugin implements Plugin { }); } - public start(core: CoreStart, { kibanaLegacy }: { kibanaLegacy: KibanaLegacyStart }) { - kibanaLegacy.loadFontAwesome(); + public start(core: CoreStart, { opensearchDashboardsLegacy }: { opensearchDashboardsLegacy: OpenSearchDashboardsLegacyStart }) { + opensearchDashboardsLegacy.loadFontAwesome(); } public stop(): void { diff --git a/src/plugins/timelion/public/services/_saved_sheet.ts b/src/plugins/timelion/public/services/_saved_sheet.ts index 0958cce86012..0d2a69e145d9 100644 --- a/src/plugins/timelion/public/services/_saved_sheet.ts +++ b/src/plugins/timelion/public/services/_saved_sheet.ts @@ -17,12 +17,12 @@ * under the License. */ -import { IUiSettingsClient } from 'kibana/public'; -import { createSavedObjectClass, SavedObjectKibanaServices } from '../../../saved_objects/public'; +import { IUiSettingsClient } from 'opensearch-dashboards/public'; +import { createSavedObjectClass, SavedObjectOpenSearchDashboardsServices } from '../../../saved_objects/public'; // Used only by the savedSheets service, usually no reason to change this export function createSavedSheetClass( - services: SavedObjectKibanaServices, + services: SavedObjectOpenSearchDashboardsServices, config: IUiSettingsClient ) { const SavedObjectClass = createSavedObjectClass(services); diff --git a/src/plugins/timelion/public/timelion_app_state.ts b/src/plugins/timelion/public/timelion_app_state.ts index 43382adbf8f8..889c6e6aa7cd 100644 --- a/src/plugins/timelion/public/timelion_app_state.ts +++ b/src/plugins/timelion/public/timelion_app_state.ts @@ -17,19 +17,19 @@ * under the License. */ -import { createStateContainer, syncState, IKbnUrlStateStorage } from '../../kibana_utils/public'; +import { createStateContainer, syncState, IOsdUrlStateStorage } from '../../opensearch_dashboards_utils/public'; import { TimelionAppState, TimelionAppStateTransitions } from './types'; const STATE_STORAGE_KEY = '_a'; interface Arguments { - kbnUrlStateStorage: IKbnUrlStateStorage; + osdUrlStateStorage: IOsdUrlStateStorage; stateDefaults: TimelionAppState; } -export function initTimelionAppState({ stateDefaults, kbnUrlStateStorage }: Arguments) { - const urlState = kbnUrlStateStorage.get(STATE_STORAGE_KEY); +export function initTimelionAppState({ stateDefaults, osdUrlStateStorage }: Arguments) { + const urlState = osdUrlStateStorage.get(STATE_STORAGE_KEY); const initialState = { ...stateDefaults, ...urlState, @@ -42,7 +42,7 @@ export function initTimelionAppState({ stateDefaults, kbnUrlStateStorage }: Argu we update the state format at all and want to handle BWC, we must not only migrate the data stored with saved vis, but also any old state in the url. */ - kbnUrlStateStorage.set(STATE_STORAGE_KEY, initialState, { replace: true }); + osdUrlStateStorage.set(STATE_STORAGE_KEY, initialState, { replace: true }); const stateContainer = createStateContainer( initialState, @@ -63,7 +63,7 @@ export function initTimelionAppState({ stateDefaults, kbnUrlStateStorage }: Argu } }, }, - stateStorage: kbnUrlStateStorage, + stateStorage: osdUrlStateStorage, }); // start syncing the appState with the ('_a') url diff --git a/src/plugins/timelion/server/config.ts b/src/plugins/timelion/server/config.ts index 16e559761e9a..dbb44a0dda26 100644 --- a/src/plugins/timelion/server/config.ts +++ b/src/plugins/timelion/server/config.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema, TypeOf } from '@kbn/config-schema'; +import { schema, TypeOf } from '@osd/config-schema'; export const configSchema = { schema: schema.object({ diff --git a/src/plugins/timelion/server/plugin.ts b/src/plugins/timelion/server/plugin.ts index d5a5ec4640d4..94d5b5d590c8 100644 --- a/src/plugins/timelion/server/plugin.ts +++ b/src/plugins/timelion/server/plugin.ts @@ -18,8 +18,8 @@ */ import { CoreSetup, CoreStart, Plugin, PluginInitializerContext, Logger } from 'src/core/server'; -import { i18n } from '@kbn/i18n'; -import { schema } from '@kbn/config-schema'; +import { i18n } from '@osd/i18n'; +import { schema } from '@osd/config-schema'; import { TimelionConfigType } from './config'; import { timelionSheetSavedObjectType } from './saved_objects'; diff --git a/src/plugins/timelion/server/saved_objects/timelion_sheet.ts b/src/plugins/timelion/server/saved_objects/timelion_sheet.ts index 6a46217c3e61..e06c9902f585 100644 --- a/src/plugins/timelion/server/saved_objects/timelion_sheet.ts +++ b/src/plugins/timelion/server/saved_objects/timelion_sheet.ts @@ -17,7 +17,7 @@ * under the License. */ -import { SavedObjectsType } from 'kibana/server'; +import { SavedObjectsType } from 'opensearch-dashboards/server'; export const timelionSheetSavedObjectType: SavedObjectsType = { name: 'timelion-sheet', @@ -27,7 +27,7 @@ export const timelionSheetSavedObjectType: SavedObjectsType = { properties: { description: { type: 'text' }, hits: { type: 'integer' }, - kibanaSavedObjectMeta: { + opensearchDashboardsSavedObjectMeta: { properties: { searchSourceJSON: { type: 'text' }, },