Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NP] Visualize #62294

Merged
merged 20 commits into from
Apr 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ae8c4df
Move visualize plugin to np
sulemanof Apr 2, 2020
2ce021c
Refactor plugin services
sulemanof Apr 2, 2020
b36a750
Merge remote-tracking branch 'upstream/master' into np/visualize
sulemanof Apr 2, 2020
2a5e63f
Clean up
sulemanof Apr 2, 2020
03143d7
Merge remote-tracking branch 'upstream/master' into np/visualize
sulemanof Apr 8, 2020
325de83
Remove legacy style usage
sulemanof Apr 8, 2020
dbd1946
Fix style imports
sulemanof Apr 8, 2020
aa27888
Fix timelion_options context provider
sulemanof Apr 8, 2020
a7edd02
Fix translations
sulemanof Apr 8, 2020
38c8d67
Change codeowners for visualize
sulemanof Apr 8, 2020
4daf88c
Import styles in legacy for BWC in Browser tests
sulemanof Apr 9, 2020
d1b51a0
Merge remote-tracking branch 'upstream/master' into np/visualize
sulemanof Apr 9, 2020
00f29d8
Merge remote-tracking branch 'upstream/master' into np/visualize
sulemanof Apr 9, 2020
004e312
Merge branch 'master' into np/visualize
elasticmachine Apr 10, 2020
941d82a
Merge branch 'master' into np/visualize
elasticmachine Apr 13, 2020
bdb058e
Merge remote-tracking branch 'upstream/master' into np/visualize
sulemanof Apr 15, 2020
381c1c6
Get rid of embeddable dependency
sulemanof Apr 15, 2020
ceff449
Merge branch 'np/visualize' of github.com:sulemanof/kibana into np/vi…
sulemanof Apr 15, 2020
99c6607
Merge remote-tracking branch 'upstream/master' into np/visualize
sulemanof Apr 16, 2020
3edbc08
Merge remote-tracking branch 'upstream/master' into np/visualize
sulemanof Apr 16, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
/src/legacy/server/sample_data/ @elastic/kibana-app
/src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
/src/legacy/core_plugins/kibana/public/visualize/ @elastic/kibana-app
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
Expand All @@ -18,6 +17,7 @@
/src/plugins/timelion/ @elastic/kibana-app
/src/plugins/dashboard/ @elastic/kibana-app
/src/plugins/discover/ @elastic/kibana-app
/src/plugins/visualize/ @elastic/kibana-app
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
/src/plugins/vis_type_metric/ @elastic/kibana-app

Expand Down
3 changes: 2 additions & 1 deletion .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
"visualizations": "src/plugins/visualizations"
"visualizations": "src/plugins/visualizations",
"visualize": "src/plugins/visualize"
},
"exclude": [
"src/legacy/ui/ui_render/ui_render_mixin.js"
Expand Down
6 changes: 1 addition & 5 deletions src/legacy/core_plugins/kibana/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@ export default function(kibana) {
},

uiExports: {
hacks: [
'plugins/kibana/discover/legacy',
'plugins/kibana/dev_tools',
'plugins/kibana/visualize/legacy',
],
hacks: ['plugins/kibana/discover/legacy', 'plugins/kibana/dev_tools'],
app: {
id: 'kibana',
title: 'Kibana',
Expand Down
6 changes: 4 additions & 2 deletions src/legacy/core_plugins/kibana/public/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
// Discover styles
@import 'discover/index';

// Visualize styles
@import './visualize/index';
// Visualization styles are imported here for running karma Browser tests
// should be somehow included through the "visualizations" plugin initialization
@import '../../../../plugins/visualizations/public/index';

// Has to come after visualize because of some
// bad cascading in the Editor layout
@import '../../../../plugins/maps_legacy/public/index';
Expand Down
1 change: 0 additions & 1 deletion src/legacy/core_plugins/kibana/public/kibana.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import 'uiExports/interpreter';

import 'ui/autoload/all';
import './discover/legacy';
import './visualize/legacy';
import './management';
import './dev_tools';
import { showAppRedirectNotification } from '../../../../plugins/kibana_legacy/public';
Expand Down
5 changes: 0 additions & 5 deletions src/legacy/core_plugins/kibana/public/visualize/_index.scss

This file was deleted.

28 changes: 0 additions & 28 deletions src/legacy/core_plugins/kibana/public/visualize/legacy.ts

This file was deleted.

36 changes: 0 additions & 36 deletions src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
import { VisParams } from './timelion_vis_fn';
import { TimelionInterval, TimelionExpressionInput } from './components';

function TimelionOptions({ stateParams, setValue, setValidity }: VisOptionsProps<VisParams>) {
export type TimelionOptionsProps = VisOptionsProps<VisParams>;

function TimelionOptions({ stateParams, setValue, setValidity }: TimelionOptionsProps) {
const setInterval = useCallback((value: VisParams['interval']) => setValue('interval', value), [
setValue,
]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { KibanaContextProvider } from '../../../../plugins/kibana_react/public';
import { DefaultEditorSize } from '../../../../plugins/vis_default_editor/public';
import { getTimelionRequestHandler } from './helpers/timelion_request_handler';
import { TimelionVisComponent, TimelionVisComponentProp } from './components';
import { TimelionOptions } from './timelion_options';
import { TimelionOptions, TimelionOptionsProps } from './timelion_options';
import { TimelionVisDependencies } from './plugin';

export const TIMELION_VIS_NAME = 'timelion';
Expand Down Expand Up @@ -53,7 +53,11 @@ export function getTimelionVisDefinition(dependencies: TimelionVisDependencies)
),
},
editorConfig: {
optionsTemplate: TimelionOptions,
optionsTemplate: (props: TimelionOptionsProps) => (
<KibanaContextProvider services={{ ...dependencies }}>
<TimelionOptions {...props} />
</KibanaContextProvider>
),
defaultSize: DefaultEditorSize.MEDIUM,
},
requestHandler: timelionRequestHandler,
Expand Down
6 changes: 0 additions & 6 deletions src/legacy/ui/public/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,3 @@
@import './field_editor/index';
@import './style_compile/index';
@import '../../../plugins/management/public/components/index';

// The following are prefixed with "vis"

// Can't import vis folder here because of cascading issues, it's imported in core_plugins/kibana
// @import './vis/index';
@import './visualize/index';
1 change: 0 additions & 1 deletion src/legacy/ui/public/visualize/_index.scss

This file was deleted.

2 changes: 1 addition & 1 deletion src/plugins/vis_default_editor/public/default_editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import React, { useEffect, useRef, useState, useCallback } from 'react';

import { EditorRenderProps } from 'src/legacy/core_plugins/kibana/public/visualize/np_ready/types';
import { EditorRenderProps } from 'src/plugins/visualize/public';
import { PanelsContainer, Panel } from '../../kibana_react/public';

import './vis_type_agg_filter';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
import { i18n } from '@kbn/i18n';
import { EventEmitter } from 'events';

import { EditorRenderProps } from 'src/legacy/core_plugins/kibana/public/visualize/np_ready/types';
import { EditorRenderProps } from 'src/plugins/visualize/public';
import { Vis, VisualizeEmbeddableContract } from 'src/plugins/visualizations/public';
import { Storage } from '../../kibana_utils/public';
import { KibanaContextProvider } from '../../kibana_react/public';
Expand Down
1 change: 1 addition & 0 deletions src/plugins/visualizations/public/index.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
@import 'wizard/index';
@import 'embeddable/index';
@import 'components/index';
17 changes: 17 additions & 0 deletions src/plugins/visualize/kibana.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"id": "visualize",
"version": "kibana",
"server": false,
"ui": true,
"requiredPlugins": [
"data",
"kibanaLegacy",
"navigation",
"savedObjects",
"visualizations"
],
"optionalPlugins": [
"home",
"share"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,18 @@
* under the License.
*/

import './index.scss';

import angular, { IModule } from 'angular';
import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';

import { AppMountContext } from 'kibana/public';
import { configureAppAngularModule } from '../legacy_imports';
import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../plugins/navigation/public';
import { NavigationPublicPluginStart as NavigationStart } from 'src/plugins/navigation/public';
import {
configureAppAngularModule,
createTopNavDirective,
createTopNavHelper,
} from '../../../../../../plugins/kibana_legacy/public';
} from '../../../kibana_legacy/public';

// @ts-ignore
import { initVisualizeApp } from './legacy_app';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { VisualizeConstants } from './visualize_constants';
export function getLandingBreadcrumbs() {
return [
{
text: i18n.translate('kbn.visualize.listing.breadcrumb', {
text: i18n.translate('visualize.listing.breadcrumb', {
defaultMessage: 'Visualize',
}),
href: `#${VisualizeConstants.LANDING_PAGE_PATH}`,
Expand All @@ -36,7 +36,7 @@ export function getWizardStep1Breadcrumbs() {
return [
...getLandingBreadcrumbs(),
{
text: i18n.translate('kbn.visualize.wizard.step1Breadcrumb', {
text: i18n.translate('visualize.wizard.step1Breadcrumb', {
defaultMessage: 'Create',
}),
},
Expand All @@ -47,7 +47,7 @@ export function getWizardStep2Breadcrumbs() {
return [
...getLandingBreadcrumbs(),
{
text: i18n.translate('kbn.visualize.wizard.step2Breadcrumb', {
text: i18n.translate('visualize.wizard.step2Breadcrumb', {
defaultMessage: 'Create',
}),
},
Expand All @@ -58,7 +58,7 @@ export function getCreateBreadcrumbs() {
return [
...getLandingBreadcrumbs(),
{
text: i18n.translate('kbn.visualize.editor.createBreadcrumb', {
text: i18n.translate('visualize.editor.createBreadcrumb', {
defaultMessage: 'Create',
}),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@

<h1
class="euiScreenReaderOnly"
i18n-id="kbn.visualize.pageHeading"
i18n-id="visualize.pageHeading"
i18n-default-message="{chartName} {chartType} visualization"
i18n-values="{
chartName: savedVis.title,
Expand Down
Loading