Skip to content

Commit 688d556

Browse files
Merge branch 'master' into maps/vector_tiles_boiler
2 parents f0abe33 + 6bbcabc commit 688d556

Some content is hidden

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

67 files changed

+299
-443
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/src/legacy/server/sample_data/ @elastic/kibana-app
1010
/src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
1111
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
12-
/src/legacy/core_plugins/kibana/public/visualize/ @elastic/kibana-app
1312
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
1413
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
1514
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
@@ -18,8 +17,10 @@
1817
/src/plugins/timelion/ @elastic/kibana-app
1918
/src/plugins/dashboard/ @elastic/kibana-app
2019
/src/plugins/discover/ @elastic/kibana-app
20+
/src/plugins/visualize/ @elastic/kibana-app
2121
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
2222
/src/plugins/vis_type_metric/ @elastic/kibana-app
23+
/src/plugins/vis_type_markdown/ @elastic/kibana-app
2324

2425
# Core UI
2526
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon

.i18nrc.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,16 @@
4646
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
4747
"uiActions": "src/plugins/ui_actions",
4848
"visDefaultEditor": "src/plugins/vis_default_editor",
49-
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
49+
"visTypeMarkdown": "src/plugins/vis_type_markdown",
5050
"visTypeMetric": "src/plugins/vis_type_metric",
5151
"visTypeTable": "src/legacy/core_plugins/vis_type_table",
5252
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
5353
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
5454
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
5555
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
5656
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
57-
"visualizations": "src/plugins/visualizations"
57+
"visualizations": "src/plugins/visualizations",
58+
"visualize": "src/plugins/visualize"
5859
},
5960
"exclude": [
6061
"src/legacy/ui/ui_render/ui_render_mixin.js"

src/legacy/core_plugins/kibana/index.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ export default function(kibana) {
5454
},
5555

5656
uiExports: {
57-
hacks: [
58-
'plugins/kibana/discover/legacy',
59-
'plugins/kibana/dev_tools',
60-
'plugins/kibana/visualize/legacy',
61-
],
57+
hacks: ['plugins/kibana/discover/legacy', 'plugins/kibana/dev_tools'],
6258
app: {
6359
id: 'kibana',
6460
title: 'Kibana',

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
// Discover styles
1414
@import 'discover/index';
1515

16-
// Visualize styles
17-
@import './visualize/index';
16+
// Visualization styles are imported here for running karma Browser tests
17+
// should be somehow included through the "visualizations" plugin initialization
18+
@import '../../../../plugins/visualizations/public/index';
19+
1820
// Has to come after visualize because of some
1921
// bad cascading in the Editor layout
2022
@import '../../../../plugins/maps_legacy/public/index';

src/legacy/core_plugins/kibana/public/kibana.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import 'uiExports/interpreter';
4343

4444
import 'ui/autoload/all';
4545
import './discover/legacy';
46-
import './visualize/legacy';
4746
import './management';
4847
import './dev_tools';
4948
import { showAppRedirectNotification } from '../../../../plugins/kibana_legacy/public';

src/legacy/core_plugins/kibana/public/visualize/_index.scss

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/legacy/core_plugins/vis_type_markdown/index.ts

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/legacy/core_plugins/vis_type_markdown/package.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/legacy/core_plugins/vis_type_timelion/public/timelion_options.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
2424
import { VisParams } from './timelion_vis_fn';
2525
import { TimelionInterval, TimelionExpressionInput } from './components';
2626

27-
function TimelionOptions({ stateParams, setValue, setValidity }: VisOptionsProps<VisParams>) {
27+
export type TimelionOptionsProps = VisOptionsProps<VisParams>;
28+
29+
function TimelionOptions({ stateParams, setValue, setValidity }: TimelionOptionsProps) {
2830
const setInterval = useCallback((value: VisParams['interval']) => setValue('interval', value), [
2931
setValue,
3032
]);

0 commit comments

Comments
 (0)