Merge remote-tracking branch 'upstream/master' into 62624

.github/CODEOWNERS

@@ -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
@@ -18,8 +17,10 @@
 /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
+/src/plugins/vis_type_markdown/ @elastic/kibana-app
 
 # Core UI
 # Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon

.i18nrc.json

@@ -46,15 +46,16 @@
     "timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
     "uiActions": "src/plugins/ui_actions",
     "visDefaultEditor": "src/plugins/vis_default_editor",
-    "visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
+    "visTypeMarkdown": "src/plugins/vis_type_markdown",
     "visTypeMetric": "src/plugins/vis_type_metric",
     "visTypeTable": "src/legacy/core_plugins/vis_type_table",
     "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
     "visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
     "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"

package.json

@@ -377,7 +377,7 @@
     "@types/recompose": "^0.30.6",
     "@types/redux-actions": "^2.6.1",
     "@types/request": "^2.48.2",
-    "@types/selenium-webdriver": "^4.0.5",
+    "@types/selenium-webdriver": "^4.0.9",
     "@types/semver": "^5.5.0",
     "@types/sinon": "^7.0.13",
     "@types/strip-ansi": "^3.0.0",
@@ -463,6 +463,7 @@
     "load-grunt-config": "^3.0.1",
     "mocha": "^7.1.1",
     "mock-http-server": "1.3.0",
+    "ms-chromium-edge-driver": "^0.2.3",
     "multistream": "^2.1.1",
     "murmurhash3js": "3.0.1",
     "mutation-observer": "^1.0.3",
@@ -481,7 +482,7 @@
     "react-textarea-autosize": "^7.1.2",
     "regenerate": "^1.4.0",
     "sass-lint": "^1.12.1",
-    "selenium-webdriver": "^4.0.0-alpha.5",
+    "selenium-webdriver": "^4.0.0-alpha.7",
     "simple-git": "1.116.0",
     "simplebar-react": "^2.1.0",
     "sinon": "^7.4.2",

packages/kbn-test/src/functional_test_runner/lib/config/schema.ts

@@ -136,7 +136,7 @@ export const schema = Joi.object()
     browser: Joi.object()
       .keys({
         type: Joi.string()
-          .valid('chrome', 'firefox', 'ie')
+          .valid('chrome', 'firefox', 'ie', 'msedge')
           .default('chrome'),
 
         logPollingMs: Joi.number().default(100),

src/legacy/core_plugins/kibana/index.js

@@ -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',

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

@@ -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';

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

@@ -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';

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

@@ -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,
   ]);

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

@@ -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';
@@ -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,

src/legacy/ui/public/_index.scss

@@ -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';

src/plugins/vis_default_editor/public/components/controls/components/number_list/utils.ts

@@ -92,7 +92,7 @@ function validateValueUnique(
     isDuplicate: false,
   };
 
-  if (inputValue && list.indexOf(inputValue) !== index) {
+  if (inputValue !== EMPTY_STRING && list.indexOf(inputValue) !== index) {
     result.isDuplicate = true;
     result.error = i18n.translate(
       'visDefaultEditor.controls.numberList.duplicateValueErrorMessage',

src/plugins/vis_default_editor/public/default_editor.tsx

@@ -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';

src/plugins/vis_default_editor/public/default_editor_controller.tsx

@@ -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';

src/legacy/core_plugins/kibana/public/visualize/legacy.ts → src/plugins/vis_type_markdown/config.ts

@@ -17,12 +17,10 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
-import { npSetup, npStart } from 'ui/new_platform';
-import { plugin } from './index';
+import { schema, TypeOf } from '@kbn/config-schema';
 
-const instance = plugin({
-  env: npSetup.plugins.kibanaLegacy.env,
-} as PluginInitializerContext);
-instance.setup(npSetup.core, npSetup.plugins);
-instance.start(npStart.core, npStart.plugins);
+export const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: true }),
+});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;

src/plugins/vis_type_markdown/kibana.json

@@ -0,0 +1,7 @@
+{
+    "id": "visTypeMarkdown",
+    "version": "kibana",
+    "ui": true,
+    "server": true,
+    "requiredPlugins": ["expressions", "visualizations"]
+}

src/legacy/core_plugins/vis_type_markdown/public/index.scss → src/plugins/vis_type_markdown/public/index.scss

@@ -1,5 +1,3 @@
-@import 'src/legacy/ui/public/styles/styling_constants';
-
 // Prefix all styles with "mkd" to avoid conflicts.
 // Examples
 //   mkdChart

src/legacy/core_plugins/vis_type_markdown/public/index.ts → src/plugins/vis_type_markdown/public/index.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from '../../../../core/public';
+import { PluginInitializerContext } from '../../../core/public';
 import { MarkdownPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {

src/legacy/core_plugins/vis_type_markdown/public/markdown_fn.test.ts → src/plugins/vis_type_markdown/public/markdown_fn.test.ts

@@ -17,8 +17,7 @@
  * under the License.
  */
 
-// eslint-disable-next-line
-import { functionWrapper } from '../../../../plugins/expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
 import { createMarkdownVisFn } from './markdown_fn';
 
 describe('interpreter/functions#markdown', () => {

src/legacy/core_plugins/vis_type_markdown/public/markdown_fn.ts → src/plugins/vis_type_markdown/public/markdown_fn.ts

@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Render } from '../../../../plugins/expressions/public';
+import { ExpressionFunctionDefinition, Render } from '../../expressions/public';
 import { Arguments, MarkdownVisParams } from './types';
 
 interface RenderValue {

src/legacy/core_plugins/vis_type_markdown/public/markdown_vis.ts → src/plugins/vis_type_markdown/public/markdown_vis.ts

@@ -22,7 +22,7 @@ import { i18n } from '@kbn/i18n';
 import { MarkdownVisWrapper } from './markdown_vis_controller';
 import { MarkdownOptions } from './markdown_options';
 import { SettingsOptions } from './settings_options';
-import { DefaultEditorSize } from '../../../../plugins/vis_default_editor/public';
+import { DefaultEditorSize } from '../../vis_default_editor/public';
 
 export const markdownVisDefinition = {
   name: 'markdown',

src/legacy/core_plugins/vis_type_markdown/public/markdown_vis_controller.tsx → src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx

@@ -18,7 +18,7 @@
  */
 
 import React from 'react';
-import { Markdown } from '../../../../plugins/kibana_react/public';
+import { Markdown } from '../../kibana_react/public';
 import { MarkdownVisParams } from './types';
 
 interface MarkdownVisComponentProps extends MarkdownVisParams {

src/legacy/core_plugins/vis_type_markdown/public/plugin.ts → src/plugins/vis_type_markdown/public/plugin.ts

@@ -17,12 +17,15 @@
  * under the License.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
-import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
+import { VisualizationsSetup } from '../../visualizations/public';
 
 import { markdownVisDefinition } from './markdown_vis';
 import { createMarkdownVisFn } from './markdown_fn';
+import { ConfigSchema } from '../config';
+
+import './index.scss';
 
 /** @internal */
 export interface MarkdownPluginSetupDependencies {
@@ -32,9 +35,9 @@ export interface MarkdownPluginSetupDependencies {
 
 /** @internal */
 export class MarkdownPlugin implements Plugin<void, void> {
-  initializerContext: PluginInitializerContext;
+  initializerContext: PluginInitializerContext<ConfigSchema>;
 
-  constructor(initializerContext: PluginInitializerContext) {
+  constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
     this.initializerContext = initializerContext;
   }
 

src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx → src/plugins/vis_type_markdown/public/settings_options.tsx

@@ -22,7 +22,7 @@ import { EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
-import { RangeOption, SwitchOption } from '../../../../plugins/charts/public';
+import { RangeOption, SwitchOption } from '../../charts/public';
 import { MarkdownVisParams } from './types';
 
 function SettingsOptions({ stateParams, setValue }: VisOptionsProps<MarkdownVisParams>) {