Skip to content

Commit bef4374

Browse files
maryia-lapatasulemanofelasticmachine
authored
[Vis] Move Timelion Vis to vis_type_timelion (#52069) (#55174)
* Deangularize timelion vis * Refactoring * Fix path * Update timelion_controller.ts * Remove unused deps * Create vis_type_timelion * Create ChartComponent * Render chart in react * Reactify timelion editor * Change translation ids * Use hooks * Add @types/pegjs into renovate.json5 * Add validation, add hover suggestions * Style fixes * Change plugin setup, use kibana context * Update * Fix ticks * Fix plotselected listener * Fix plothover handler * Add TS for options * Update TS * Restructuring * Change plugin start * Remove vis from timelion plugin * Rename class * Mock services * Fix other comments * Remove duplicate files * Convert test to jest * Remove kibana_services from timelion * Delete visualize_app.ts.~LOCAL * Refactoring * Fix TS * Refactoring, TS * Import eui variables * Import styling constants * Move react components to vis_type_timelion * Fix TS * Move ui imports to legacy_imports.ts * Move chain.peg to vis_type_timelion * Fix path * Use KibanaContext instead kibana_services.ts * Refactoring * Refactoring * Add @types/flot * Fix issue with hovered series color * Update renovate.json5 * Pass timelionPanels as dependencies * Move common folder to vis_type_timelion * Move back tick_formatters.ts * Rename styles file * Refactoring * Update _index.scss * Move to_milliseconds to common * Revert yaxes formatting * Refactoring * Refactoring * Use Panel directly * Refactoring of to_milliseconds.ts Co-authored-by: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
1 parent 825e93b commit bef4374

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1104
-228
lines changed

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/moc
1616
/src/legacy/core_plugins/console/public/webpackShims
1717
/src/legacy/core_plugins/console/public/tests/webpackShims
1818
/src/legacy/ui/public/utils/decode_geo_hash.js
19-
/src/legacy/core_plugins/timelion/public/webpackShims/jquery.flot.*
19+
/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
2020
/src/core/lib/kbn_internal_native_observable
2121
/packages/*/target
2222
/packages/eslint-config-kibana

.i18nrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"statusPage": "src/legacy/core_plugins/status_page",
3434
"telemetry": "src/legacy/core_plugins/telemetry",
3535
"tileMap": "src/legacy/core_plugins/tile_map",
36-
"timelion": "src/legacy/core_plugins/timelion",
36+
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion"],
3737
"uiActions": "src/plugins/ui_actions",
3838
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
3939
"visTypeMetric": "src/legacy/core_plugins/vis_type_metric",

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
"@kbn/test-subj-selector": "0.2.1",
134134
"@kbn/ui-framework": "1.0.0",
135135
"@kbn/ui-shared-deps": "1.0.0",
136+
"@types/flot": "^0.0.31",
136137
"@types/json-stable-stringify": "^1.0.32",
137138
"@types/lodash.clonedeep": "^4.5.4",
138139
"@types/node-forge": "^0.9.0",

renovate.json5

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,14 @@
372372
'@types/fetch-mock',
373373
],
374374
},
375+
{
376+
groupSlug: 'flot',
377+
groupName: 'flot related packages',
378+
packageNames: [
379+
'flot',
380+
'@types/flot',
381+
],
382+
},
375383
{
376384
groupSlug: 'getopts',
377385
groupName: 'getopts related packages',

src/legacy/core_plugins/timelion/public/app.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ document.title = 'Timelion - Kibana';
5959

6060
const app = require('ui/modules').get('apps/timelion', []);
6161

62-
require('./vis');
63-
6462
require('ui/routes').enable();
6563

6664
require('ui/routes').when('/:id?', {

src/legacy/core_plugins/timelion/public/directives/__tests__/timelion_expression_input_helpers.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@
1919

2020
import expect from '@kbn/expect';
2121
import PEG from 'pegjs';
22-
import grammar from 'raw-loader!../../chain.peg';
22+
import grammar from 'raw-loader!../../../../vis_type_timelion/public/chain.peg';
2323
import { SUGGESTION_TYPE, suggest } from '../timelion_expression_input_helpers';
24-
import { getArgValueSuggestions } from '../../services/arg_value_suggestions';
25-
import { setIndexPatterns, setSavedObjectsClient } from '../../services/plugin_services';
24+
import { getArgValueSuggestions } from '../../../../vis_type_timelion/public/helpers/arg_value_suggestions';
25+
import {
26+
setIndexPatterns,
27+
setSavedObjectsClient,
28+
} from '../../../../vis_type_timelion/public/helpers/plugin_services';
2629

2730
describe('Timelion expression suggestions', () => {
2831
setIndexPatterns({});
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@import './timelion_expression_input';
22
@import './cells/index';
3-
@import './chart/index';
43
@import './timelion_expression_suggestions/index';
54
@import './timelion_help/index';
65
@import './timelion_interval/index';

src/legacy/core_plugins/timelion/public/directives/chart/_index.scss

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import _ from 'lodash';
4444
import $ from 'jquery';
4545
import PEG from 'pegjs';
46-
import grammar from 'raw-loader!../chain.peg';
46+
import grammar from 'raw-loader!../../../vis_type_timelion/public/chain.peg';
4747
import timelionExpressionInputTemplate from './timelion_expression_input.html';
4848
import {
4949
SUGGESTION_TYPE,
@@ -52,7 +52,7 @@ import {
5252
insertAtLocation,
5353
} from './timelion_expression_input_helpers';
5454
import { comboBoxKeyCodes } from '@elastic/eui';
55-
import { getArgValueSuggestions } from '../services/arg_value_suggestions';
55+
import { getArgValueSuggestions } from '../../../vis_type_timelion/public/helpers/arg_value_suggestions';
5656

5757
const Parser = PEG.generate(grammar);
5858

src/legacy/core_plugins/timelion/public/index.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@
1111
// timChart__legend-isLoading
1212

1313
@import './app';
14-
@import './components/index';
1514
@import './directives/index';
16-
@import './vis/index';

0 commit comments

Comments
 (0)