Skip to content

Commit

Permalink
Remove timeline application
Browse files Browse the repository at this point in the history
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
opensearch-project#3519
opensearch-project#3593

Signed-off-by: Anan Zhuang <[email protected]>
  • Loading branch information
ananzh committed May 23, 2023
1 parent e737790 commit 20bcec8
Show file tree
Hide file tree
Showing 121 changed files with 28 additions and 7,443 deletions.
2 changes: 1 addition & 1 deletion .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bump `styled-components` from 5.3.5 to 5.3.9 ([#3678](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3678))
- Bump `js-yaml` from 3.14.0 to 4.1.0 ([#3770](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3770))
- Bump `oui` from `1.0.0` to `1.1.1` ([#3884](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3884))
- Remove timeline application ([#3971](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3971))

### 🪛 Refactoring

Expand Down
7 changes: 0 additions & 7 deletions cypress/integration/with-security/check_advanced_settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 0 additions & 3 deletions cypress/integration/with-security/helpers/generate_data.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 0 additions & 3 deletions cypress/integration/without-security/helpers/generate_data.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
);
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,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",
Expand Down
1 change: 0 additions & 1 deletion packages/osd-optimizer/limits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ pageLoadAssetSize:
telemetry: 91832
telemetryManagementSection: 52443
tileMap: 65337
timeline: 29920
transform: 41151
triggersActionsUi: 170145
uiActions: 95074
Expand Down
3 changes: 0 additions & 3 deletions src/core/public/doc_links/doc_links_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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}`,
Expand Down Expand Up @@ -919,7 +917,6 @@ export interface DocLinksStart {
readonly reIndex: {
readonly rethrottle: string;
};
readonly timelineDeprecation: string;
readonly apmServer: string;
readonly tutorial: {
readonly loadDataTutorial: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ describe('getSavedObjectsCounts', () => {
search: { total: 0 },
index_pattern: { total: 0 },
graph_workspace: { total: 0 },
timelion_sheet: { total: 0 },
});
});

Expand All @@ -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
],
Expand All @@ -66,7 +64,6 @@ describe('getSavedObjectsCounts', () => {
search: { total: 0 },
index_pattern: { total: 0 },
graph_workspace: { total: 3 },
timelion_sheet: { total: 2 },
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ describe('telemetry_opensearch_dashboards', () => {
search: { total: 0 },
index_pattern: { total: 0 },
graph_workspace: { total: 0 },
timelion_sheet: { total: 0 },
});
});

Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down
57 changes: 0 additions & 57 deletions src/plugins/telemetry/schema/oss_plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -1342,13 +1314,6 @@
"type": "long"
}
}
},
"timeline_sheet": {
"properties": {
"total": {
"type": "long"
}
}
}
}
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -1937,19 +1893,6 @@
}
}
},
"timeline": {
"type": "array",
"items": {
"properties": {
"key": {
"type": "keyword"
},
"value": {
"type": "long"
}
}
}
},
"csm": {
"type": "array",
"items": {
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/timeline/README.md

This file was deleted.

19 changes: 0 additions & 19 deletions src/plugins/timeline/opensearch_dashboards.json

This file was deleted.

21 changes: 0 additions & 21 deletions src/plugins/timeline/public/_app.scss

This file was deleted.

18 changes: 0 additions & 18 deletions src/plugins/timeline/public/_base.scss

This file was deleted.

Loading

0 comments on commit 20bcec8

Please sign in to comment.