diff --git a/.eslintignore b/.eslintignore index a0191720ac3b..ec733bfa1f77 100644 --- a/.eslintignore +++ b/.eslintignore @@ -19,7 +19,7 @@ target /src/core/lib/osd_internal_native_observable /src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken /src/plugins/data/common/opensearch_query/kuery/ast/_generated_/** -/src/plugins/vis_type_timelion/public/_generated_/** +/src/plugins/vis_type_timeline/public/_generated_/** # package overrides /packages/elastic-eslint-config-kibana diff --git a/.i18nrc.json b/.i18nrc.json index 8a0cea55f08a..71c7970affa4 100644 --- a/.i18nrc.json +++ b/.i18nrc.json @@ -47,7 +47,7 @@ "src/plugins/telemetry_management_section" ], "tileMap": "src/plugins/tile_map", - "timelion": ["src/plugins/timelion", "src/plugins/vis_type_timelion"], + "timeline": ["src/plugins/timeline", "src/plugins/vis_type_timeline"], "uiActions": "src/plugins/ui_actions", "visDefaultEditor": "src/plugins/vis_default_editor", "visTypeMarkdown": "src/plugins/vis_type_markdown", diff --git a/.sass-lint.yml b/.sass-lint.yml index 5fac9858dd62..a90c0e67d755 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -2,7 +2,7 @@ files: include: - 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss' - 'src/plugins/index_pattern_management/**/*.s+(a|c)ss' - - 'src/plugins/timelion/**/*.s+(a|c)ss' + - 'src/plugins/timeline/**/*.s+(a|c)ss' - 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss' - 'src/plugins/vis_type_vega/**/*.s+(a|c)ss' - 'src/plugins/vis_type_xy/**/*.s+(a|c)ss' diff --git a/packages/kbn-release-notes/src/release_notes_config.ts b/packages/kbn-release-notes/src/release_notes_config.ts index 2dec420d8612..b4a6250a52e0 100644 --- a/packages/kbn-release-notes/src/release_notes_config.ts +++ b/packages/kbn-release-notes/src/release_notes_config.ts @@ -173,7 +173,7 @@ export const AREAS: Area[] = [ { title: 'Visualizations', labels: [ - 'Feature:Timelion', + 'Feature:Timeline', 'Feature:TSVB', 'Feature:Coordinate Map', 'Feature:Region Map', diff --git a/packages/osd-optimizer/limits.yml b/packages/osd-optimizer/limits.yml index 544c128c76ce..4d8906c4de5c 100644 --- a/packages/osd-optimizer/limits.yml +++ b/packages/osd-optimizer/limits.yml @@ -75,7 +75,7 @@ pageLoadAssetSize: telemetry: 91832 telemetryManagementSection: 52443 tileMap: 65337 - timelion: 29920 + timeline: 29920 transform: 41151 triggersActionsUi: 170145 uiActions: 95074 @@ -90,7 +90,7 @@ pageLoadAssetSize: visTypeMetric: 42790 visTypeTable: 95078 visTypeTagcloud: 37575 - visTypeTimelion: 51933 + visTypeTimeline: 51933 visTypeTimeseries: 155347 visTypeVega: 153861 visTypeVislib: 242982 diff --git a/packages/osd-ui-framework/src/components/button/_button.scss b/packages/osd-ui-framework/src/components/button/_button.scss index 4a15a71328fa..9766e01d2ef4 100644 --- a/packages/osd-ui-framework/src/components/button/_button.scss +++ b/packages/osd-ui-framework/src/components/button/_button.scss @@ -164,7 +164,7 @@ /** * 1. Override Bootstrap. - * 2. Override either Bootstrap or Timelion styles. + * 2. Override either Bootstrap or Timeline styles. */ .kuiButton--hollow { color: $kuiLinkColor !important; /* 2 */ diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts index 626f5f645fa0..39ec623f4b54 100644 --- a/src/core/public/doc_links/doc_links_service.ts +++ b/src/core/public/doc_links/doc_links_service.ts @@ -134,7 +134,7 @@ export class DocLinksService { }, visualize: { guide: `${OPENSEARCH_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html`, - timelionDeprecation: `${OPENSEARCH_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html#timelion-deprecation`, + timelineDeprecation: `${OPENSEARCH_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html#timeline-deprecation`, }, }, }); diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker index d4f679824b7f..4b9d6db65091 100755 --- a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker +++ b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker @@ -132,7 +132,7 @@ kibana_vars=( tilemap.options.minZoom tilemap.options.subdomains tilemap.url - timelion.enabled + timeline.enabled vega.enableExternalUrls xpack.actions.proxyUrl xpack.apm.enabled 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 index 17ab089b5243..9c75e9bb705c 100644 --- 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 @@ -25,8 +25,8 @@ const names: Record = { general: i18n.translate('advancedSettings.categoryNames.generalLabel', { defaultMessage: 'General', }), - timelion: i18n.translate('advancedSettings.categoryNames.timelionLabel', { - defaultMessage: 'Timelion', + timeline: i18n.translate('advancedSettings.categoryNames.timelineLabel', { + defaultMessage: 'Timeline', }), notifications: i18n.translate('advancedSettings.categoryNames.notificationsLabel', { defaultMessage: 'Notifications', diff --git a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/application_usage/schema.ts b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/application_usage/schema.ts index 46e14376d67e..1c80f7b48ce1 100644 --- a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/application_usage/schema.ts +++ b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/application_usage/schema.ts @@ -58,7 +58,7 @@ export const applicationUsageSchema = { opensearch_dashboards: commonSchema, // It's a forward app so we'll likely never report it management: commonSchema, short_url_redirect: commonSchema, // It's a forward app so we'll likely never report it - timelion: commonSchema, + timeline: commonSchema, visualize: commonSchema, // X-Pack diff --git a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/management/schema.ts b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/management/schema.ts index 8d8332cca427..443ef6d1bded 100644 --- a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/management/schema.ts +++ b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/management/schema.ts @@ -32,15 +32,15 @@ export const stackManagementSchema: MakeSchemaFrom = { 'securitySolution:ipReputationLinks': { type: 'text' }, 'csv:separator': { type: 'keyword' }, 'visualization:tileMap:WMSdefaults': { type: 'text' }, - 'timelion:target_buckets': { type: 'long' }, - 'timelion:max_buckets': { type: 'long' }, - 'timelion:opensearch.timefield': { type: 'keyword' }, - 'timelion:min_interval': { type: 'keyword' }, - 'timelion:default_rows': { type: 'long' }, - 'timelion:default_columns': { type: 'long' }, - 'timelion:quandl.key': { type: 'keyword' }, - 'timelion:opensearch.default_index': { type: 'keyword' }, - 'timelion:showTutorial': { type: 'boolean' }, + 'timeline:target_buckets': { type: 'long' }, + 'timeline:max_buckets': { type: 'long' }, + 'timeline:opensearch.timefield': { type: 'keyword' }, + 'timeline:min_interval': { type: 'keyword' }, + 'timeline:default_rows': { type: 'long' }, + 'timeline:default_columns': { type: 'long' }, + 'timeline:quandl.key': { type: 'keyword' }, + 'timeline:opensearch.default_index': { type: 'keyword' }, + 'timeline:showTutorial': { type: 'boolean' }, 'securitySolution:timeDefaults': { type: 'keyword' }, 'securitySolution:defaultAnomalyScore': { type: 'long' }, 'securitySolution:defaultIndex': { type: 'keyword' }, // it's an array diff --git a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.test.ts b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.test.ts index 24491180dede..1ee318d3890b 100644 --- a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.test.ts +++ b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.test.ts @@ -30,7 +30,7 @@ describe('getSavedObjectsCounts', () => { search: { total: 0 }, index_pattern: { total: 0 }, graph_workspace: { total: 0 }, - timelion_sheet: { total: 0 }, + timeline_sheet: { total: 0 }, }); }); @@ -40,7 +40,7 @@ describe('getSavedObjectsCounts', () => { types: { buckets: [ { key: 'dashboard', doc_count: 1 }, - { key: 'timelion-sheet', doc_count: 2 }, + { key: 'timeline-sheet', doc_count: 2 }, { key: 'index-pattern', value: 2 }, // Malformed on purpose { key: 'graph_workspace', doc_count: 3 }, // already snake_cased ], @@ -55,7 +55,7 @@ describe('getSavedObjectsCounts', () => { search: { total: 0 }, index_pattern: { total: 0 }, graph_workspace: { total: 3 }, - timelion_sheet: { total: 2 }, + timeline_sheet: { total: 2 }, }); }); }); diff --git a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.ts b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.ts index 46c57056cb1c..780d6b0b65ca 100644 --- a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.ts +++ b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.ts @@ -35,7 +35,7 @@ const TYPES = [ 'search', 'index-pattern', 'graph-workspace', - 'timelion-sheet', + 'timeline-sheet', ]; export interface OpenSearchDashboardsSavedObjectCounts { @@ -44,7 +44,7 @@ export interface OpenSearchDashboardsSavedObjectCounts { search: { total: number }; index_pattern: { total: number }; graph_workspace: { total: number }; - timelion_sheet: { total: number }; + timeline_sheet: { total: number }; } export async function getSavedObjectsCounts( diff --git a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/index.test.ts b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/index.test.ts index 5455f710b02a..66092accca36 100644 --- a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/index.test.ts +++ b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/index.test.ts @@ -53,7 +53,7 @@ describe('telemetry_opensearch_dashboards', () => { search: { total: 0 }, index_pattern: { total: 0 }, graph_workspace: { total: 0 }, - timelion_sheet: { total: 0 }, + timeline_sheet: { total: 0 }, }); }); @@ -65,7 +65,7 @@ describe('telemetry_opensearch_dashboards', () => { search: { total: 0 }, index_pattern: { total: 0 }, graph_workspace: { total: 0 }, - timelion_sheet: { total: 0 }, + timeline_sheet: { total: 0 }, }; expect(collector.formatForBulkUpload!(resultFromFetch)).toStrictEqual({ diff --git a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/opensearch_dashboards_usage_collector.ts b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/opensearch_dashboards_usage_collector.ts index aaf45b7fe018..38c2d91093fe 100644 --- a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/opensearch_dashboards_usage_collector.ts +++ b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/opensearch_dashboards_usage_collector.ts @@ -48,7 +48,7 @@ export function getOpenSearchDashboardsUsageCollector( search: { total: { type: 'long' } }, index_pattern: { total: { type: 'long' } }, graph_workspace: { total: { type: 'long' } }, - timelion_sheet: { total: { type: 'long' } }, + timeline_sheet: { total: { type: 'long' } }, }, async fetch(callCluster) { const { diff --git a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/ui_metric/schema.ts b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/ui_metric/schema.ts index c62998c1ee62..3f9896857729 100644 --- a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/ui_metric/schema.ts +++ b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/ui_metric/schema.ts @@ -38,7 +38,7 @@ const uiMetricFromDataPluginSchema: MakeSchemaFrom = { opensearch_dashboards: commonSchema, // It's a forward app so we'll likely never report it management: commonSchema, short_url_redirect: commonSchema, // It's a forward app so we'll likely never report it - timelion: commonSchema, + timeline: commonSchema, visualize: commonSchema, // X-Pack diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json index d215a397df8e..435b709e67c9 100644 --- a/src/plugins/telemetry/schema/oss_plugins.json +++ b/src/plugins/telemetry/schema/oss_plugins.json @@ -252,7 +252,7 @@ } } }, - "timelion": { + "timeline": { "properties": { "clicks_total": { "type": "long" @@ -1343,7 +1343,7 @@ } } }, - "timelion_sheet": { + "timeline_sheet": { "properties": { "total": { "type": "long" @@ -1381,31 +1381,31 @@ "visualization:tileMap:WMSdefaults": { "type": "text" }, - "timelion:target_buckets": { + "timeline:target_buckets": { "type": "long" }, - "timelion:max_buckets": { + "timeline:max_buckets": { "type": "long" }, - "timelion:opensearch.timefield": { + "timeline:opensearch.timefield": { "type": "keyword" }, - "timelion:min_interval": { + "timeline:min_interval": { "type": "keyword" }, - "timelion:default_rows": { + "timeline:default_rows": { "type": "long" }, - "timelion:default_columns": { + "timeline:default_columns": { "type": "long" }, - "timelion:quandl.key": { + "timeline:quandl.key": { "type": "keyword" }, - "timelion:opensearch.default_index": { + "timeline:opensearch.default_index": { "type": "keyword" }, - "timelion:showTutorial": { + "timeline:showTutorial": { "type": "boolean" }, "securitySolution:timeDefaults": { @@ -1937,7 +1937,7 @@ } } }, - "timelion": { + "timeline": { "type": "array", "items": { "properties": { diff --git a/src/plugins/timeline/README.md b/src/plugins/timeline/README.md new file mode 100644 index 000000000000..22ed15ebf5c6 --- /dev/null +++ b/src/plugins/timeline/README.md @@ -0,0 +1,2 @@ +Contains the deprecated timeline application. For the timeline visualization, +which also contains the timeline APIs and backend, look at the vis_type_timeline plugin. diff --git a/src/plugins/timelion/opensearch_dashboards.json b/src/plugins/timeline/opensearch_dashboards.json similarity index 82% rename from src/plugins/timelion/opensearch_dashboards.json rename to src/plugins/timeline/opensearch_dashboards.json index ec4c7a9b6b9f..73cfbd3ee086 100644 --- a/src/plugins/timelion/opensearch_dashboards.json +++ b/src/plugins/timeline/opensearch_dashboards.json @@ -1,5 +1,5 @@ { - "id": "timelion", + "id": "timeline", "version": "opensearchDashboards", "ui": true, "server": true, @@ -7,13 +7,13 @@ "opensearchDashboardsLegacy", "opensearchDashboardsUtils", "savedObjects", - "visTypeTimelion" + "visTypeTimeline" ], "requiredPlugins": [ "visualizations", "data", "navigation", - "visTypeTimelion", + "visTypeTimeline", "opensearchDashboardsLegacy" ] } diff --git a/src/plugins/timelion/public/_app.scss b/src/plugins/timeline/public/_app.scss similarity index 100% rename from src/plugins/timelion/public/_app.scss rename to src/plugins/timeline/public/_app.scss diff --git a/src/plugins/timelion/public/_base.scss b/src/plugins/timeline/public/_base.scss similarity index 100% rename from src/plugins/timelion/public/_base.scss rename to src/plugins/timeline/public/_base.scss diff --git a/src/plugins/timelion/public/app.js b/src/plugins/timeline/public/app.js similarity index 79% rename from src/plugins/timelion/public/app.js rename to src/plugins/timeline/public/app.js index d1fc3946c2b4..2cdcb7d7a54e 100644 --- a/src/plugins/timelion/public/app.js +++ b/src/plugins/timeline/public/app.js @@ -35,29 +35,29 @@ import { registerListenEventListener, watchMultiDecorator, } from '../../opensearch_dashboards_legacy/public'; -import { getTimezone } from '../../vis_type_timelion/public'; +import { getTimezone } from '../../vis_type_timeline/public'; import { initCellsDirective } from './directives/cells/cells'; import { initFullscreenDirective } from './directives/fullscreen/fullscreen'; import { initFixedElementDirective } from './directives/fixed_element'; -import { initTimelionLoadSheetDirective } from './directives/timelion_load_sheet'; -import { initTimelionHelpDirective } from './directives/timelion_help/timelion_help'; -import { initTimelionSaveSheetDirective } from './directives/timelion_save_sheet'; -import { initTimelionOptionsSheetDirective } from './directives/timelion_options_sheet'; +import { initTimelineLoadSheetDirective } from './directives/timeline_load_sheet'; +import { initTimelineHelpDirective } from './directives/timeline_help/timeline_help'; +import { initTimelineSaveSheetDirective } from './directives/timeline_save_sheet'; +import { initTimelineOptionsSheetDirective } from './directives/timeline_options_sheet'; import { initSavedObjectSaveAsCheckBoxDirective } from './directives/saved_object_save_as_checkbox'; import { initSavedObjectFinderDirective } from './directives/saved_object_finder'; -import { initTimelionTabsDirective } from './components/timelionhelp_tabs_directive'; -import { initTimelionTDeprecationDirective } from './components/timelion_deprecation_directive'; +import { initTimelineTabsDirective } from './components/timelinehelp_tabs_directive'; +import { initTimelineTDeprecationDirective } from './components/timeline_deprecation_directive'; import { initInputFocusDirective } from './directives/input_focus'; import { Chart } from './directives/chart/chart'; -import { TimelionInterval } from './directives/timelion_interval/timelion_interval'; -import { timelionExpInput } from './directives/timelion_expression_input'; -import { TimelionExpressionSuggestions } from './directives/timelion_expression_suggestions/timelion_expression_suggestions'; +import { TimelineInterval } from './directives/timeline_interval/timeline_interval'; +import { timelineExpInput } from './directives/timeline_expression_input'; +import { TimelineExpressionSuggestions } from './directives/timeline_expression_suggestions/timeline_expression_suggestions'; import { initSavedSheetService } from './services/saved_sheets'; -import { initTimelionAppState } from './timelion_app_state'; +import { initTimelineAppState } from './timeline_app_state'; import rootTemplate from './index.html'; -export function initTimelionApp(app, deps) { +export function initTimelineApp(app, deps) { app.run(registerListenEventListener); const savedSheetLoader = initSavedSheetService(app, deps); @@ -73,42 +73,42 @@ export function initTimelionApp(app, deps) { app.config(watchMultiDecorator); app - .controller('TimelionVisController', function ($scope) { - $scope.$on('timelionChartRendered', (event) => { + .controller('TimelineVisController', function ($scope) { + $scope.$on('timelineChartRendered', (event) => { event.stopPropagation(); $scope.renderComplete(); }); }) - .constant('timelionPanels', deps.timelionPanels) + .constant('timelinePanels', deps.timelinePanels) .directive('chart', Chart) - .directive('timelionInterval', TimelionInterval) - .directive('timelionExpressionSuggestions', TimelionExpressionSuggestions) - .directive('timelionExpressionInput', timelionExpInput(deps)); + .directive('timelineInterval', TimelineInterval) + .directive('timelineExpressionSuggestions', TimelineExpressionSuggestions) + .directive('timelineExpressionInput', timelineExpInput(deps)); - initTimelionHelpDirective(app); + initTimelineHelpDirective(app); initInputFocusDirective(app); - initTimelionTabsDirective(app, deps); - initTimelionTDeprecationDirective(app, deps); + initTimelineTabsDirective(app, deps); + initTimelineTDeprecationDirective(app, deps); initSavedObjectFinderDirective(app, savedSheetLoader, deps.core.uiSettings); initSavedObjectSaveAsCheckBoxDirective(app); initCellsDirective(app); initFixedElementDirective(app); initFullscreenDirective(app); - initTimelionSaveSheetDirective(app); - initTimelionLoadSheetDirective(app); - initTimelionOptionsSheetDirective(app); + initTimelineSaveSheetDirective(app); + initTimelineLoadSheetDirective(app); + initTimelineOptionsSheetDirective(app); - const location = 'Timelion'; + const location = 'Timeline'; - app.directive('timelionApp', function () { + app.directive('timelineApp', function () { return { restrict: 'E', - controllerAs: 'timelionApp', - controller: timelionController, + controllerAs: 'timelineApp', + controller: timelineController, }; }); - function timelionController( + function timelineController( $http, $route, $routeParams, @@ -119,14 +119,14 @@ export function initTimelionApp(app, deps) { ) { // Keeping this at app scope allows us to keep the current page when the user // switches to say, the timepicker. - $scope.page = deps.core.uiSettings.get('timelion:showTutorial', true) ? 1 : 0; + $scope.page = deps.core.uiSettings.get('timeline:showTutorial', true) ? 1 : 0; $scope.setPage = (page) => ($scope.page = page); const timefilter = deps.plugins.data.query.timefilter.timefilter; timefilter.enableAutoRefreshSelector(); timefilter.enableTimeRangeSelector(); - deps.core.chrome.docTitle.change('Timelion - OpenSearch Dashboards'); + deps.core.chrome.docTitle.change('Timeline - OpenSearch Dashboards'); // starts syncing `_g` portion of url with query services const { stop: stopSyncingQueryServiceStateWithUrl } = syncQueryStateWithUrl( @@ -138,15 +138,15 @@ export function initTimelionApp(app, deps) { function getStateDefaults() { return { - sheet: savedSheet.timelion_sheet, + sheet: savedSheet.timeline_sheet, selected: 0, - columns: savedSheet.timelion_columns, - rows: savedSheet.timelion_rows, - interval: savedSheet.timelion_interval, + columns: savedSheet.timeline_columns, + rows: savedSheet.timeline_rows, + interval: savedSheet.timeline_interval, }; } - const { stateContainer, stopStateSync } = initTimelionAppState({ + const { stateContainer, stopStateSync } = initTimelineAppState({ stateDefaults: getStateDefaults(), osdUrlStateStorage, }); @@ -163,7 +163,7 @@ export function initTimelionApp(app, deps) { $scope.topNavMenu = getTopNavMenu(); $timeout(function () { - if (deps.core.uiSettings.get('timelion:showTutorial', true)) { + if (deps.core.uiSettings.get('timeline:showTutorial', true)) { $scope.toggleMenu('showHelp'); } }, 0); @@ -173,53 +173,53 @@ export function initTimelionApp(app, deps) { function getTopNavMenu() { const newSheetAction = { id: 'new', - label: i18n.translate('timelion.topNavMenu.newSheetButtonLabel', { + label: i18n.translate('timeline.topNavMenu.newSheetButtonLabel', { defaultMessage: 'New', }), - description: i18n.translate('timelion.topNavMenu.newSheetButtonAriaLabel', { + description: i18n.translate('timeline.topNavMenu.newSheetButtonAriaLabel', { defaultMessage: 'New Sheet', }), run: function () { history.push('/'); $route.reload(); }, - testId: 'timelionNewButton', + testId: 'timelineNewButton', }; const addSheetAction = { id: 'add', - label: i18n.translate('timelion.topNavMenu.addChartButtonLabel', { + label: i18n.translate('timeline.topNavMenu.addChartButtonLabel', { defaultMessage: 'Add', }), - description: i18n.translate('timelion.topNavMenu.addChartButtonAriaLabel', { + description: i18n.translate('timeline.topNavMenu.addChartButtonAriaLabel', { defaultMessage: 'Add a chart', }), run: function () { $scope.$evalAsync(() => $scope.newCell()); }, - testId: 'timelionAddChartButton', + testId: 'timelineAddChartButton', }; const saveSheetAction = { id: 'save', - label: i18n.translate('timelion.topNavMenu.saveSheetButtonLabel', { + label: i18n.translate('timeline.topNavMenu.saveSheetButtonLabel', { defaultMessage: 'Save', }), - description: i18n.translate('timelion.topNavMenu.saveSheetButtonAriaLabel', { + description: i18n.translate('timeline.topNavMenu.saveSheetButtonAriaLabel', { defaultMessage: 'Save Sheet', }), run: () => { $scope.$evalAsync(() => $scope.toggleMenu('showSave')); }, - testId: 'timelionSaveButton', + testId: 'timelineSaveButton', }; const deleteSheetAction = { id: 'delete', - label: i18n.translate('timelion.topNavMenu.deleteSheetButtonLabel', { + label: i18n.translate('timeline.topNavMenu.deleteSheetButtonLabel', { defaultMessage: 'Delete', }), - description: i18n.translate('timelion.topNavMenu.deleteSheetButtonAriaLabel', { + description: i18n.translate('timeline.topNavMenu.deleteSheetButtonAriaLabel', { defaultMessage: 'Delete current sheet', }), disableButton: function () { @@ -232,7 +232,7 @@ export function initTimelionApp(app, deps) { .delete() .then(() => { deps.core.notifications.toasts.addSuccess( - i18n.translate('timelion.topNavMenu.delete.modal.successNotificationText', { + i18n.translate('timeline.topNavMenu.delete.modal.successNotificationText', { defaultMessage: `Deleted '{title}'`, values: { title }, }) @@ -244,13 +244,13 @@ export function initTimelionApp(app, deps) { const confirmModalOptions = { confirmButtonText: i18n.translate( - 'timelion.topNavMenu.delete.modal.confirmButtonLabel', + 'timeline.topNavMenu.delete.modal.confirmButtonLabel', { defaultMessage: 'Delete', } ), - title: i18n.translate('timelion.topNavMenu.delete.modalTitle', { - defaultMessage: `Delete Timelion sheet '{title}'?`, + title: i18n.translate('timeline.topNavMenu.delete.modalTitle', { + defaultMessage: `Delete Timeline sheet '{title}'?`, values: { title }, }), }; @@ -258,7 +258,7 @@ export function initTimelionApp(app, deps) { $scope.$evalAsync(() => { deps.core.overlays .openConfirm( - i18n.translate('timelion.topNavMenu.delete.modal.warningText', { + i18n.translate('timeline.topNavMenu.delete.modal.warningText', { defaultMessage: `You can't recover deleted sheets.`, }), confirmModalOptions @@ -270,52 +270,52 @@ export function initTimelionApp(app, deps) { }); }); }, - testId: 'timelionDeleteButton', + testId: 'timelineDeleteButton', }; const openSheetAction = { id: 'open', - label: i18n.translate('timelion.topNavMenu.openSheetButtonLabel', { + label: i18n.translate('timeline.topNavMenu.openSheetButtonLabel', { defaultMessage: 'Open', }), - description: i18n.translate('timelion.topNavMenu.openSheetButtonAriaLabel', { + description: i18n.translate('timeline.topNavMenu.openSheetButtonAriaLabel', { defaultMessage: 'Open Sheet', }), run: () => { $scope.$evalAsync(() => $scope.toggleMenu('showLoad')); }, - testId: 'timelionOpenButton', + testId: 'timelineOpenButton', }; const optionsAction = { id: 'options', - label: i18n.translate('timelion.topNavMenu.optionsButtonLabel', { + label: i18n.translate('timeline.topNavMenu.optionsButtonLabel', { defaultMessage: 'Options', }), - description: i18n.translate('timelion.topNavMenu.optionsButtonAriaLabel', { + description: i18n.translate('timeline.topNavMenu.optionsButtonAriaLabel', { defaultMessage: 'Options', }), run: () => { $scope.$evalAsync(() => $scope.toggleMenu('showOptions')); }, - testId: 'timelionOptionsButton', + testId: 'timelineOptionsButton', }; const helpAction = { id: 'help', - label: i18n.translate('timelion.topNavMenu.helpButtonLabel', { + label: i18n.translate('timeline.topNavMenu.helpButtonLabel', { defaultMessage: 'Help', }), - description: i18n.translate('timelion.topNavMenu.helpButtonAriaLabel', { + description: i18n.translate('timeline.topNavMenu.helpButtonAriaLabel', { defaultMessage: 'Help', }), run: () => { $scope.$evalAsync(() => $scope.toggleMenu('showHelp')); }, - testId: 'timelionDocsButton', + testId: 'timelineDocsButton', }; - if (deps.core.application.capabilities.timelion.save) { + if (deps.core.application.capabilities.timeline.save) { return [ newSheetAction, addSheetAction, @@ -374,7 +374,7 @@ export function initTimelionApp(app, deps) { state: _.cloneDeep(stateContainer.getState()), search: $scope.search, dontShowHelp: function () { - deps.core.uiSettings.set('timelion:showTutorial', false); + deps.core.uiSettings.set('timeline:showTutorial', false); $scope.setPage(0); $scope.closeMenus(); }, @@ -527,7 +527,7 @@ export function initTimelionApp(app, deps) { const timeRangeBounds = timefilter.getBounds(); const httpResult = $http - .post('../api/timelion/run', { + .post('../api/timeline/run', { sheet: state.sheet, time: _.assignIn( { @@ -563,8 +563,8 @@ export function initTimelionApp(app, deps) { const err = new Error(resp.message); err.stack = resp.stack; deps.core.notifications.toasts.addError(err, { - title: i18n.translate('timelion.searchErrorTitle', { - defaultMessage: 'Timelion request error', + title: i18n.translate('timeline.searchErrorTitle', { + defaultMessage: 'Timeline request error', }), }); }); @@ -574,18 +574,18 @@ export function initTimelionApp(app, deps) { function saveSheet() { const state = stateContainer.getState(); - savedSheet.timelion_sheet = state.sheet; - savedSheet.timelion_interval = state.interval; - savedSheet.timelion_columns = state.columns; - savedSheet.timelion_rows = state.rows; + savedSheet.timeline_sheet = state.sheet; + savedSheet.timeline_interval = state.interval; + savedSheet.timeline_columns = state.columns; + savedSheet.timeline_rows = state.rows; savedSheet.save().then(function (id) { if (id) { deps.core.notifications.toasts.addSuccess({ - title: i18n.translate('timelion.saveSheet.successNotificationText', { + title: i18n.translate('timeline.saveSheet.successNotificationText', { defaultMessage: `Saved sheet '{title}'`, values: { title: savedSheet.title }, }), - 'data-test-subj': 'timelionSaveSuccessToast', + 'data-test-subj': 'timelineSaveSuccessToast', }); if (savedSheet.id !== $routeParams.id) { @@ -596,7 +596,7 @@ export function initTimelionApp(app, deps) { } async function saveExpression(title) { - const vis = await deps.plugins.visualizations.createVis('timelion', { + const vis = await deps.plugins.visualizations.createVis('timeline', { title, params: { expression: $scope.state.sheet[$scope.state.selected], @@ -609,7 +609,7 @@ export function initTimelionApp(app, deps) { const id = await visSavedObject.save(); if (id) { deps.core.notifications.toasts.addSuccess( - i18n.translate('timelion.saveExpression.successNotificationText', { + i18n.translate('timeline.saveExpression.successNotificationText', { defaultMessage: `Saved expression '{title}'`, values: { title: state.title }, }) @@ -630,16 +630,16 @@ export function initTimelionApp(app, deps) { $route.current.params.id ? getSavedSheetBreadcrumbs : getCreateBreadcrumbs ), badge: () => { - if (deps.core.application.capabilities.timelion.save) { + if (deps.core.application.capabilities.timeline.save) { return undefined; } return { - text: i18n.translate('timelion.badge.readOnly.text', { + text: i18n.translate('timeline.badge.readOnly.text', { defaultMessage: 'Read only', }), - tooltip: i18n.translate('timelion.badge.readOnly.tooltip', { - defaultMessage: 'Unable to save Timelion sheets', + tooltip: i18n.translate('timeline.badge.readOnly.tooltip', { + defaultMessage: 'Unable to save Timeline sheets', }), iconType: 'glasses', }; diff --git a/src/plugins/timelion/public/application.ts b/src/plugins/timeline/public/application.ts similarity index 79% rename from src/plugins/timelion/public/application.ts rename to src/plugins/timeline/public/application.ts index 0739daeb319c..8e41938c8001 100644 --- a/src/plugins/timelion/public/application.ts +++ b/src/plugins/timeline/public/application.ts @@ -41,22 +41,22 @@ import { createTopNavDirective, createTopNavHelper, } from '../../opensearch_dashboards_legacy/public'; -import { TimelionPluginDependencies } from './plugin'; +import { TimelinePluginDependencies } from './plugin'; import { DataPublicPluginStart } from '../../data/public'; // @ts-ignore -import { initTimelionApp } from './app'; +import { initTimelineApp } from './app'; export interface RenderDeps { pluginInitializerContext: PluginInitializerContext; mountParams: AppMountParameters; core: CoreStart; - plugins: TimelionPluginDependencies; - timelionPanels: Map; + plugins: TimelinePluginDependencies; + timelinePanels: Map; } -export interface TimelionVisualizationDependencies { +export interface TimelineVisualizationDependencies { uiSettings: IUiSettingsClient; - timelionPanels: Map; + timelinePanels: Map; data: DataPublicPluginStart; $rootScope: any; $compile: any; @@ -73,33 +73,33 @@ export const renderApp = (deps: RenderDeps) => { { core: deps.core, env: deps.pluginInitializerContext.env }, true ); - initTimelionApp(angularModuleInstance, deps); + initTimelineApp(angularModuleInstance, deps); } - const $injector = mountTimelionApp(deps.mountParams.appBasePath, deps.mountParams.element, deps); + const $injector = mountTimelineApp(deps.mountParams.appBasePath, deps.mountParams.element, deps); return () => { $injector.get('$rootScope').$destroy(); }; }; -function registerPanels(dependencies: TimelionVisualizationDependencies) { +function registerPanels(dependencies: TimelineVisualizationDependencies) { const timeChartPanel: Panel = getTimeChart(dependencies); - dependencies.timelionPanels.set(timeChartPanel.name, timeChartPanel); + dependencies.timelinePanels.set(timeChartPanel.name, timeChartPanel); } -const mainTemplate = (basePath: string) => `
+const mainTemplate = (basePath: string) => `
`; -const moduleName = 'app/timelion'; +const moduleName = 'app/timeline'; const thirdPartyAngularDependencies = ['ngSanitize', 'ngRoute', 'react', 'angular-sortable-view']; -function mountTimelionApp(appBasePath: string, element: HTMLElement, deps: RenderDeps) { +function mountTimelineApp(appBasePath: string, element: HTMLElement, deps: RenderDeps) { const mountpoint = document.createElement('div'); - mountpoint.setAttribute('class', 'timelionAppContainer'); + mountpoint.setAttribute('class', 'timelineAppContainer'); // eslint-disable-next-line no-unsanitized/property mountpoint.innerHTML = mainTemplate(appBasePath); // bootstrap angular into detached element and attach it later to @@ -108,7 +108,7 @@ function mountTimelionApp(appBasePath: string, element: HTMLElement, deps: Rende registerPanels({ uiSettings: deps.core.uiSettings, - timelionPanels: deps.timelionPanels, + timelinePanels: deps.timelinePanels, data: deps.plugins.data, $rootScope: $injector.get('$rootScope'), $compile: $injector.get('$compile'), @@ -124,29 +124,29 @@ function createLocalAngularModule(deps: RenderDeps) { const dashboardAngularModule = angular.module(moduleName, [ ...thirdPartyAngularDependencies, - 'app/timelion/TopNav', - 'app/timelion/I18n', - 'app/timelion/icon', + 'app/timeline/TopNav', + 'app/timeline/I18n', + 'app/timeline/icon', ]); return dashboardAngularModule; } function createLocalIconModule() { angular - .module('app/timelion/icon', ['react']) + .module('app/timeline/icon', ['react']) .directive('icon', (reactDirective) => reactDirective(EuiIcon)); } -function createLocalTopNavModule(navigation: TimelionPluginDependencies['navigation']) { +function createLocalTopNavModule(navigation: TimelinePluginDependencies['navigation']) { angular - .module('app/timelion/TopNav', ['react']) + .module('app/timeline/TopNav', ['react']) .directive('osdTopNav', createTopNavDirective) .directive('osdTopNavHelper', createTopNavHelper(navigation.ui)); } function createLocalI18nModule() { angular - .module('app/timelion/I18n', []) + .module('app/timeline/I18n', []) .provider('i18n', I18nProvider) .filter('i18n', i18nFilter) .directive('i18nId', i18nDirective); diff --git a/src/plugins/timelion/public/breadcrumbs.js b/src/plugins/timeline/public/breadcrumbs.js similarity index 89% rename from src/plugins/timelion/public/breadcrumbs.js rename to src/plugins/timeline/public/breadcrumbs.js index b4d94e3e3fff..795464044dbe 100644 --- a/src/plugins/timelion/public/breadcrumbs.js +++ b/src/plugins/timeline/public/breadcrumbs.js @@ -20,8 +20,8 @@ import { i18n } from '@osd/i18n'; const ROOT_BREADCRUMB = { - text: i18n.translate('timelion.breadcrumbs.root', { - defaultMessage: 'Timelion', + text: i18n.translate('timeline.breadcrumbs.root', { + defaultMessage: 'Timeline', }), href: '#', }; @@ -30,7 +30,7 @@ export function getCreateBreadcrumbs() { return [ ROOT_BREADCRUMB, { - text: i18n.translate('timelion.breadcrumbs.create', { + text: i18n.translate('timeline.breadcrumbs.create', { defaultMessage: 'Create', }), }, diff --git a/src/plugins/timelion/public/components/timelion_deprecation.tsx b/src/plugins/timeline/public/components/timeline_deprecation.tsx similarity index 74% rename from src/plugins/timelion/public/components/timelion_deprecation.tsx rename to src/plugins/timeline/public/components/timeline_deprecation.tsx index 9ed317957252..5a83de12d1ed 100644 --- a/src/plugins/timelion/public/components/timelion_deprecation.tsx +++ b/src/plugins/timeline/public/components/timeline_deprecation.tsx @@ -21,20 +21,20 @@ import { EuiSpacer, EuiCallOut, EuiLink } from '@elastic/eui'; import React from 'react'; import { DocLinksStart } from '../../../../core/public'; -export const TimelionDeprecation = ({ links }: DocLinksStart) => { - const timelionDeprecationLink = links.visualize.timelionDeprecation; +export const TimelineDeprecation = ({ links }: DocLinksStart) => { + const timelineDeprecationLink = links.visualize.timelineDeprecation; return ( <> + timelineDeprecationLink: ( + diff --git a/src/plugins/timelion/public/components/timelion_deprecation_directive.js b/src/plugins/timeline/public/components/timeline_deprecation_directive.js similarity index 81% rename from src/plugins/timelion/public/components/timelion_deprecation_directive.js rename to src/plugins/timeline/public/components/timeline_deprecation_directive.js index 6a38161c7d40..f3908511e8d2 100644 --- a/src/plugins/timelion/public/components/timelion_deprecation_directive.js +++ b/src/plugins/timeline/public/components/timeline_deprecation_directive.js @@ -17,15 +17,15 @@ * under the License. */ import React from 'react'; -import { TimelionDeprecation } from './timelion_deprecation'; +import { TimelineDeprecation } from './timeline_deprecation'; -export function initTimelionTDeprecationDirective(app, deps) { - app.directive('timelionDeprecation', function (reactDirective) { +export function initTimelineTDeprecationDirective(app, deps) { + app.directive('timelineDeprecation', function (reactDirective) { return reactDirective( () => { return ( - + ); }, diff --git a/src/plugins/timelion/public/components/timelionhelp_tabs.js b/src/plugins/timeline/public/components/timelinehelp_tabs.js similarity index 89% rename from src/plugins/timelion/public/components/timelionhelp_tabs.js rename to src/plugins/timeline/public/components/timelinehelp_tabs.js index 7ee412d5ec1f..ea1cd2e1e70c 100644 --- a/src/plugins/timelion/public/components/timelionhelp_tabs.js +++ b/src/plugins/timeline/public/components/timelinehelp_tabs.js @@ -28,7 +28,7 @@ function handleClick(activateTab, tabName) { activateTab(tabName); } -export function TimelionHelpTabs(props) { +export function TimelineHelpTabs(props) { return ( handleClick(props.activateTab, 'funcref')} > @@ -45,7 +45,7 @@ export function TimelionHelpTabs(props) { onClick={() => handleClick(props.activateTab, 'keyboardtips')} > @@ -53,7 +53,7 @@ export function TimelionHelpTabs(props) { ); } -TimelionHelpTabs.propTypes = { +TimelineHelpTabs.propTypes = { activeTab: PropTypes.string, activateTab: PropTypes.func, }; diff --git a/src/plugins/timelion/public/components/timelionhelp_tabs_directive.js b/src/plugins/timeline/public/components/timelinehelp_tabs_directive.js similarity index 84% rename from src/plugins/timelion/public/components/timelionhelp_tabs_directive.js rename to src/plugins/timeline/public/components/timelinehelp_tabs_directive.js index 67e0d595314f..fbcc699926d4 100644 --- a/src/plugins/timelion/public/components/timelionhelp_tabs_directive.js +++ b/src/plugins/timeline/public/components/timelinehelp_tabs_directive.js @@ -18,15 +18,15 @@ */ import React from 'react'; -import { TimelionHelpTabs } from './timelionhelp_tabs'; +import { TimelineHelpTabs } from './timelinehelp_tabs'; -export function initTimelionTabsDirective(app, deps) { - app.directive('timelionHelpTabs', function (reactDirective) { +export function initTimelineTabsDirective(app, deps) { + app.directive('timelineHelpTabs', function (reactDirective) { return reactDirective( (props) => { return ( - + ); }, diff --git a/src/plugins/timelion/public/directives/_form.scss b/src/plugins/timeline/public/directives/_form.scss similarity index 100% rename from src/plugins/timelion/public/directives/_form.scss rename to src/plugins/timeline/public/directives/_form.scss diff --git a/src/plugins/timeline/public/directives/_index.scss b/src/plugins/timeline/public/directives/_index.scss new file mode 100644 index 000000000000..d49b498910b8 --- /dev/null +++ b/src/plugins/timeline/public/directives/_index.scss @@ -0,0 +1,8 @@ +@import './timeline_expression_input'; +@import './cells/index'; +@import './timeline_expression_suggestions/index'; +@import './timeline_help/index'; +@import './timeline_interval/index'; +@import './saved_object_finder'; +@import './form'; + diff --git a/src/plugins/timelion/public/directives/_saved_object_finder.scss b/src/plugins/timeline/public/directives/_saved_object_finder.scss similarity index 100% rename from src/plugins/timelion/public/directives/_saved_object_finder.scss rename to src/plugins/timeline/public/directives/_saved_object_finder.scss diff --git a/src/plugins/timelion/public/directives/_timelion_expression_input.scss b/src/plugins/timeline/public/directives/_timeline_expression_input.scss similarity index 100% rename from src/plugins/timelion/public/directives/_timelion_expression_input.scss rename to src/plugins/timeline/public/directives/_timeline_expression_input.scss diff --git a/src/plugins/timelion/public/directives/cells/_cells.scss b/src/plugins/timeline/public/directives/cells/_cells.scss similarity index 100% rename from src/plugins/timelion/public/directives/cells/_cells.scss rename to src/plugins/timeline/public/directives/cells/_cells.scss diff --git a/src/plugins/timelion/public/directives/cells/_index.scss b/src/plugins/timeline/public/directives/cells/_index.scss similarity index 100% rename from src/plugins/timelion/public/directives/cells/_index.scss rename to src/plugins/timeline/public/directives/cells/_index.scss diff --git a/src/plugins/timelion/public/directives/cells/cells.html b/src/plugins/timeline/public/directives/cells/cells.html similarity index 75% rename from src/plugins/timelion/public/directives/cells/cells.html rename to src/plugins/timeline/public/directives/cells/cells.html index e7bfe2a5da70..de30655b620f 100644 --- a/src/plugins/timelion/public/directives/cells/cells.html +++ b/src/plugins/timeline/public/directives/cells/cells.html @@ -6,11 +6,11 @@
@@ -21,18 +21,18 @@ diff --git a/src/plugins/timelion/public/directives/cells/cells.js b/src/plugins/timeline/public/directives/cells/cells.js similarity index 91% rename from src/plugins/timelion/public/directives/cells/cells.js rename to src/plugins/timeline/public/directives/cells/cells.js index 36a1e80dd470..59cf985887d5 100644 --- a/src/plugins/timelion/public/directives/cells/cells.js +++ b/src/plugins/timeline/public/directives/cells/cells.js @@ -18,14 +18,14 @@ */ import { move } from './collection'; -import { initTimelionGridDirective } from '../timelion_grid'; +import { initTimelineGridDirective } from '../timeline_grid'; import html from './cells.html'; export function initCellsDirective(app) { - initTimelionGridDirective(app); + initTimelineGridDirective(app); - app.directive('timelionCells', function () { + app.directive('timelineCells', function () { return { restrict: 'E', scope: { diff --git a/src/plugins/timelion/public/directives/cells/collection.ts b/src/plugins/timeline/public/directives/cells/collection.ts similarity index 100% rename from src/plugins/timelion/public/directives/cells/collection.ts rename to src/plugins/timeline/public/directives/cells/collection.ts diff --git a/src/plugins/timelion/public/directives/chart/chart.js b/src/plugins/timeline/public/directives/chart/chart.js similarity index 92% rename from src/plugins/timelion/public/directives/chart/chart.js rename to src/plugins/timeline/public/directives/chart/chart.js index f4813d2777d9..233b9d8a84ed 100644 --- a/src/plugins/timelion/public/directives/chart/chart.js +++ b/src/plugins/timeline/public/directives/chart/chart.js @@ -19,7 +19,7 @@ import { i18n } from '@osd/i18n'; -export function Chart(timelionPanels) { +export function Chart(timelinePanels) { return { restrict: 'A', scope: { @@ -40,11 +40,11 @@ export function Chart(timelionPanels) { type: 'timechart', }; - const panelSchema = timelionPanels.get($scope.seriesList.render.type); + const panelSchema = timelinePanels.get($scope.seriesList.render.type); if (!panelSchema) { $elem.text( - i18n.translate('timelion.chart.seriesList.noSchemaWarning', { + i18n.translate('timeline.chart.seriesList.noSchemaWarning', { defaultMessage: 'No such panel type: {renderType}', values: { renderType: $scope.seriesList.render.type }, }) diff --git a/src/plugins/timelion/public/directives/fixed_element.js b/src/plugins/timeline/public/directives/fixed_element.js similarity index 100% rename from src/plugins/timelion/public/directives/fixed_element.js rename to src/plugins/timeline/public/directives/fixed_element.js diff --git a/src/plugins/timelion/public/directives/fullscreen/fullscreen.html b/src/plugins/timeline/public/directives/fullscreen/fullscreen.html similarity index 65% rename from src/plugins/timelion/public/directives/fullscreen/fullscreen.html rename to src/plugins/timeline/public/directives/fullscreen/fullscreen.html index 194596ba79d0..9b5332a84a8c 100644 --- a/src/plugins/timelion/public/directives/fullscreen/fullscreen.html +++ b/src/plugins/timeline/public/directives/fullscreen/fullscreen.html @@ -1,12 +1,12 @@ -
+
diff --git a/src/plugins/timelion/public/directives/fullscreen/fullscreen.js b/src/plugins/timeline/public/directives/fullscreen/fullscreen.js similarity index 95% rename from src/plugins/timelion/public/directives/fullscreen/fullscreen.js rename to src/plugins/timeline/public/directives/fullscreen/fullscreen.js index 371a9e9b3630..2ac66c39f0a4 100644 --- a/src/plugins/timelion/public/directives/fullscreen/fullscreen.js +++ b/src/plugins/timeline/public/directives/fullscreen/fullscreen.js @@ -20,7 +20,7 @@ import html from './fullscreen.html'; export function initFullscreenDirective(app) { - app.directive('timelionFullscreen', function () { + app.directive('timelineFullscreen', function () { return { restrict: 'E', scope: { diff --git a/src/plugins/timelion/public/directives/input_focus.js b/src/plugins/timeline/public/directives/input_focus.js similarity index 100% rename from src/plugins/timelion/public/directives/input_focus.js rename to src/plugins/timeline/public/directives/input_focus.js diff --git a/src/plugins/timelion/public/directives/key_map.ts b/src/plugins/timeline/public/directives/key_map.ts similarity index 100% rename from src/plugins/timelion/public/directives/key_map.ts rename to src/plugins/timeline/public/directives/key_map.ts diff --git a/src/plugins/timelion/public/directives/saved_object_finder.html b/src/plugins/timeline/public/directives/saved_object_finder.html similarity index 88% rename from src/plugins/timelion/public/directives/saved_object_finder.html rename to src/plugins/timeline/public/directives/saved_object_finder.html index dc3ce40cfcae..79e6121f458c 100644 --- a/src/plugins/timelion/public/directives/saved_object_finder.html +++ b/src/plugins/timeline/public/directives/saved_object_finder.html @@ -23,7 +23,7 @@

@@ -33,7 +33,7 @@ ng-if="onAddNew" ng-click="onAddNew()" data-test-subj="addNewSavedObjectLink" - i18n-id="timelion.savedObjectFinder.addNewItemButtonLabel" + i18n-id="timeline.savedObjectFinder.addNewItemButtonLabel" i18n-default-message="Add new {item}" i18n-values="{item: finder.properties.noun}" i18n-description="{item} can be a type of object in OpenSearch Dashboards, like 'visualization', 'dashboard', etc" @@ -43,7 +43,7 @@ class="kuiButton kuiButton--secondary" ng-if="!useLocalManagement" ng-click="finder.manageObjects(finder.properties.name)" - i18n-id="timelion.savedObjectFinder.manageItemsButtonLabel" + i18n-id="timeline.savedObjectFinder.manageItemsButtonLabel" i18n-default-message="Manage {items}" i18n-values="{items: finder.properties.nouns}" i18n-description="{items} can be a type of object in OpenSearch Dashboards, like 'visualizations', 'dashboards', etc" @@ -64,11 +64,11 @@ aria-live="assertive" > @@ -108,7 +108,7 @@ class="list-group-item list-group-no-results" ng-if="finder.hits.length === 0" > -