Remove timeline application (#3971) (#4169)

* Remove timeline application In this PR, we made the following changes: First of all, clean out some advanced settings specific to timeline application and tests. * Remove timelion:default_rows: This setting defines the default number of rows that a new Timelion sheet should have. * Remove timelion:default_rows: This setting defines the default number of columns that a new Timelion sheet should have. * Remove timelion:showTutorial. Second, remove src/plugin/timeline completely and modify timeline vis. Third, remove all the functional tests related to timeline application. Issue resolve #3519 #3593 Signed-off-by: ananzh <[email protected]> --------- Signed-off-by: Anan Zhuang <[email protected]> Signed-off-by: ananzh <[email protected]> (cherry picked from commit ec41f59) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · May 30, 2023 · fee8fd0 · fee8fd0
1 parent 80b0cc9
commit fee8fd0
Show file tree

Hide file tree

Showing 120 changed files with 27 additions and 7,415 deletions.
diff --git a/.i18nrc.json b/.i18nrc.json
@@ -48,7 +48,7 @@
       "src/plugins/telemetry_management_section"
     ],
     "tileMap": "src/plugins/tile_map",
-    "timeline": ["src/plugins/timeline", "src/plugins/vis_type_timeline"],
+    "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/cypress/integration/with-security/check_advanced_settings.js b/cypress/integration/with-security/check_advanced_settings.js
@@ -25,13 +25,6 @@ describe('verify the advanced settings are saved', () => {
       .should('eq', 'true');
   });
 
-  it('the Timeline default columns field is set to 4', () => {
-    cy.get('[data-test-subj="advancedSetting-editField-timeline:default_columns"]').should(
-      'have.value',
-      4
-    );
-  });
-
   it('the Timeline Maximum buckets field is set to 4', () => {
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').should(
       'have.value',

diff --git a/cypress/integration/with-security/helpers/generate_data.js b/cypress/integration/with-security/helpers/generate_data.js
@@ -31,9 +31,6 @@ describe('Generating BWC test data with security', () => {
   it('adds advanced settings', () => {
     miscUtils.visitPage('app/management/opensearch-dashboards/settings');
     cy.get('[data-test-subj="advancedSetting-editField-theme:darkMode"]').click();
-    cy.get('[data-test-subj="advancedSetting-editField-timeline:default_columns"]').type(
-      '{selectAll}4'
-    );
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').type(
       '{selectAll}4'
     );

diff --git a/cypress/integration/without-security/check_advanced_settings.js b/cypress/integration/without-security/check_advanced_settings.js
@@ -18,13 +18,6 @@ describe('verify the advanced settings are saved', () => {
       .should('eq', 'true');
   });
 
-  it('the Timeline default columns field is set to 4', () => {
-    cy.get('[data-test-subj="advancedSetting-editField-timeline:default_columns"]').should(
-      'have.value',
-      4
-    );
-  });
-
   it('the Timeline Maximum buckets field is set to 4', () => {
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').should(
       'have.value',

diff --git a/cypress/integration/without-security/helpers/generate_data.js b/cypress/integration/without-security/helpers/generate_data.js
@@ -14,9 +14,6 @@ describe('Generating BWC test data without security', () => {
   it('adds advanced settings', () => {
     miscUtils.visitPage('app/management/opensearch-dashboards/settings');
     cy.get('[data-test-subj="advancedSetting-editField-theme:darkMode"]').click();
-    cy.get('[data-test-subj="advancedSetting-editField-timeline:default_columns"]').type(
-      '{selectAll}4'
-    );
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').type(
       '{selectAll}4'
     );

diff --git a/package.json b/package.json
@@ -348,7 +348,6 @@
     "angular-mocks": "^1.8.2",
     "angular-recursion": "^1.0.5",
     "angular-route": "^1.8.0",
-    "angular-sortable-view": "^0.0.17",
     "archiver": "^5.3.0",
     "axe-core": "^4.0.2",
     "babel-eslint": "^10.0.3",

diff --git a/packages/osd-optimizer/limits.yml b/packages/osd-optimizer/limits.yml
@@ -74,7 +74,6 @@ pageLoadAssetSize:
   telemetry: 91832
   telemetryManagementSection: 52443
   tileMap: 65337
-  timeline: 29920
   transform: 41151
   triggersActionsUi: 170145
   uiActions: 95074

diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
@@ -421,7 +421,6 @@ export class DocLinksService {
           visualize: {
             // https://opensearch.org/docs/latest/dashboards/visualize/viz-index/
             guide: `${OPENSEARCH_WEBSITE_DOCS}visualize/viz-index/`,
-            timelineDeprecation: `${OPENSEARCH_WEBSITE_DOCS}`,
           },
         },
         noDocumentation: {
@@ -571,7 +570,6 @@ export class DocLinksService {
           reIndex: {
             rethrottle: `${OPENSEARCH_WEBSITE_DOCS}`,
           },
-          timelineDeprecation: `${OPENSEARCH_WEBSITE_DOCS}`,
           apmServer: `${OPENSEARCH_WEBSITE_DOCS}`,
           tutorial: {
             loadDataTutorial: `${OPENSEARCH_WEBSITE_DOCS}`,
@@ -919,7 +917,6 @@ export interface DocLinksStart {
       readonly reIndex: {
         readonly rethrottle: string;
       };
-      readonly timelineDeprecation: string;
       readonly apmServer: string;
       readonly tutorial: {
         readonly loadDataTutorial: string;

diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker
@@ -135,7 +135,6 @@ opensearch_dashboards_vars=(
     tilemap.options.minZoom
     tilemap.options.subdomains
     tilemap.url
-    timeline.enabled
     vega.enableExternalUrls
     apm_oss.apmAgentConfigurationIndex
     apm_oss.indexPattern

diff --git a/...gins/opensearch_dashboards_usage_collection/server/collectors/application_usage/schema.ts b/...gins/opensearch_dashboards_usage_collection/server/collectors/application_usage/schema.ts
@@ -69,6 +69,5 @@ 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,
   visualize: commonSchema,
 };
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
@@ -47,11 +47,8 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
   'timelion:max_buckets': { type: 'long' },
   'timelion:es.timefield': { type: 'keyword' },
   'timelion:min_interval': { type: 'keyword' },
-  'timelion:default_rows': { type: 'long' },
-  'timelion:default_columns': { type: 'long' },
   'timelion:quandl.key': { type: 'keyword' },
   'timelion:es.default_index': { type: 'keyword' },
-  'timelion:showTutorial': { type: 'boolean' },
   'securitySolution:timeDefaults': { type: 'keyword' },
   'securitySolution:defaultAnomalyScore': { type: 'long' },
   'securitySolution:defaultIndex': { type: 'keyword' }, // it's an array

diff --git a/..._usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.test.ts b/..._usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.test.ts
@@ -41,7 +41,6 @@ describe('getSavedObjectsCounts', () => {
       search: { total: 0 },
       index_pattern: { total: 0 },
       graph_workspace: { total: 0 },
-      timelion_sheet: { total: 0 },
     });
   });
 
@@ -51,7 +50,6 @@ describe('getSavedObjectsCounts', () => {
         types: {
           buckets: [
             { key: 'dashboard', doc_count: 1 },
-            { key: 'timelion-sheet', doc_count: 2 },
             { key: 'index-pattern', value: 2 }, // Malformed on purpose
             { key: 'graph_workspace', doc_count: 3 }, // already snake_cased
           ],
@@ -66,7 +64,6 @@ describe('getSavedObjectsCounts', () => {
       search: { total: 0 },
       index_pattern: { total: 0 },
       graph_workspace: { total: 3 },
-      timelion_sheet: { total: 2 },
     });
   });
 });
diff --git a/...oards_usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.ts b/...oards_usage_collection/server/collectors/opensearch_dashboards/get_saved_object_counts.ts
@@ -40,22 +40,14 @@
 import { snakeCase } from 'lodash';
 import { LegacyAPICaller } from 'opensearch-dashboards/server';
 
-const TYPES = [
-  'dashboard',
-  'visualization',
-  'search',
-  'index-pattern',
-  'graph-workspace',
-  'timelion-sheet',
-];
+const TYPES = ['dashboard', 'visualization', 'search', 'index-pattern', 'graph-workspace'];
 
 export interface OpenSearchDashboardsSavedObjectCounts {
   dashboard: { total: number };
   visualization: { total: number };
   search: { total: number };
   index_pattern: { total: number };
   graph_workspace: { total: number };
-  timelion_sheet: { total: number };
 }
 
 export async function getSavedObjectsCounts(

diff --git a/...nsearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/index.test.ts b/...nsearch_dashboards_usage_collection/server/collectors/opensearch_dashboards/index.test.ts
@@ -64,7 +64,6 @@ describe('telemetry_opensearch_dashboards', () => {
       search: { total: 0 },
       index_pattern: { total: 0 },
       graph_workspace: { total: 0 },
-      timelion_sheet: { total: 0 },
     });
   });
 
@@ -76,7 +75,6 @@ describe('telemetry_opensearch_dashboards', () => {
       search: { total: 0 },
       index_pattern: { total: 0 },
       graph_workspace: { total: 0 },
-      timelion_sheet: { total: 0 },
     };
 
     expect(collector.formatForBulkUpload!(resultFromFetch)).toStrictEqual({

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
@@ -50,7 +50,6 @@ const uiMetricFromDataPluginSchema: MakeSchemaFrom<UIMetricUsage> = {
   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,
   visualize: commonSchema,
 };
 

diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
@@ -252,34 +252,6 @@
             }
           }
         },
-        "timeline": {
-          "properties": {
-            "clicks_total": {
-              "type": "long"
-            },
-            "clicks_7_days": {
-              "type": "long"
-            },
-            "clicks_30_days": {
-              "type": "long"
-            },
-            "clicks_90_days": {
-              "type": "long"
-            },
-            "minutes_on_screen_total": {
-              "type": "float"
-            },
-            "minutes_on_screen_7_days": {
-              "type": "float"
-            },
-            "minutes_on_screen_30_days": {
-              "type": "float"
-            },
-            "minutes_on_screen_90_days": {
-              "type": "float"
-            }
-          }
-        },
         "visualize": {
           "properties": {
             "clicks_total": {
@@ -1342,13 +1314,6 @@
               "type": "long"
             }
           }
-        },
-        "timeline_sheet": {
-          "properties": {
-            "total": {
-              "type": "long"
-            }
-          }
         }
       }
     },
@@ -1393,21 +1358,12 @@
         "timeline:min_interval": {
           "type": "keyword"
         },
-        "timeline:default_rows": {
-          "type": "long"
-        },
-        "timeline:default_columns": {
-          "type": "long"
-        },
         "timeline:quandl.key": {
           "type": "keyword"
         },
         "timeline:es.default_index": {
           "type": "keyword"
         },
-        "timeline:showTutorial": {
-          "type": "boolean"
-        },
         "securitySolution:timeDefaults": {
           "type": "keyword"
         },
@@ -1937,19 +1893,6 @@
             }
           }
         },
-        "timeline": {
-          "type": "array",
-          "items": {
-            "properties": {
-              "key": {
-                "type": "keyword"
-              },
-              "value": {
-                "type": "long"
-              }
-            }
-          }
-        },
         "csm": {
           "type": "array",
           "items": {

diff --git a/src/plugins/timeline/README.md b/src/plugins/timeline/README.md
diff --git a/src/plugins/timeline/opensearch_dashboards.json b/src/plugins/timeline/opensearch_dashboards.json
diff --git a/src/plugins/timeline/public/_app.scss b/src/plugins/timeline/public/_app.scss
diff --git a/src/plugins/timeline/public/_base.scss b/src/plugins/timeline/public/_base.scss