Combine visualizations and visualize plugins

.i18nrc.json

@@ -73,7 +73,6 @@
     "visTypePie": "src/plugins/vis_types/pie",
     "visTypeHeatmap": "src/plugins/vis_types/heatmap",
     "visualizations": "src/plugins/visualizations",
-    "visualize": "src/plugins/visualize",
     "apmOss": "src/plugins/apm_oss",
     "usageCollection": "src/plugins/usage_collection"
   },

docs/developer/plugin-list.asciidoc

@@ -330,10 +330,6 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/visualize[visualize]
-|WARNING: Missing README.
-
-
 |===
 
 [discrete]

packages/kbn-optimizer/limits.yml

@@ -71,7 +71,6 @@ pageLoadAssetSize:
   visTypeVislib: 242838
   visTypeXy: 113478
   visualizations: 90000
-  visualize: 57431
   watcher: 43598
   runtimeFields: 41752
   stackAlerts: 29684

src/plugins/vis_default_editor/kibana.json

@@ -2,7 +2,7 @@
   "id": "visDefaultEditor",
   "version": "kibana",
   "ui": true,
-  "optionalPlugins": ["visualize"],
+  "optionalPlugins": ["visualizations"],
   "requiredBundles": ["kibanaUtils", "kibanaReact", "data", "fieldFormats", "discover", "esUiShared"],
   "owner": {
     "name": "Vis Editors",

src/plugins/vis_default_editor/public/default_editor.tsx

@@ -13,8 +13,11 @@ import React, { useEffect, useRef, useState, useCallback } from 'react';
 import { EventEmitter } from 'events';
 import { EuiResizableContainer } from '@elastic/eui';
 
-import { Vis, VisualizeEmbeddableContract } from 'src/plugins/visualizations/public';
-import { EditorRenderProps } from 'src/plugins/visualize/public';
+import {
+  Vis,
+  VisualizeEmbeddableContract,
+  EditorRenderProps,
+} from 'src/plugins/visualizations/public';
 import { KibanaContextProvider } from '../../kibana_react/public';
 import { Storage } from '../../kibana_utils/public';
 

src/plugins/vis_default_editor/public/default_editor_controller.tsx

@@ -12,7 +12,7 @@ import { EventEmitter } from 'events';
 import { EuiErrorBoundary, EuiLoadingChart } from '@elastic/eui';
 
 import { Vis, VisualizeEmbeddableContract } from 'src/plugins/visualizations/public';
-import { IEditorController, EditorRenderProps } from 'src/plugins/visualize/public';
+import { IEditorController, EditorRenderProps } from 'src/plugins/visualizations/public';
 import { KibanaThemeProvider } from '../../kibana_react/public';
 import { getTheme } from './services';
 

src/plugins/vis_default_editor/public/plugin.ts

@@ -8,21 +8,21 @@
 
 import { CoreSetup, Plugin } from 'kibana/public';
 
-import { VisualizePluginSetup } from '../../visualize/public';
 import { DefaultEditorController } from './default_editor_controller';
 import { setTheme } from './services';
+import type { VisualizationsSetup } from '../../visualizations/public';
 
 export interface VisDefaultEditorSetupDependencies {
-  visualize: VisualizePluginSetup;
+  visualizations: VisualizationsSetup;
 }
 
 export class VisDefaultEditorPlugin
   implements Plugin<void, void, VisDefaultEditorSetupDependencies, {}>
 {
-  public setup(core: CoreSetup, { visualize }: VisDefaultEditorSetupDependencies) {
+  public setup(core: CoreSetup, { visualizations }: VisDefaultEditorSetupDependencies) {
     setTheme(core.theme);
-    if (visualize) {
-      visualize.visEditorsRegistry.registerDefault(DefaultEditorController);
+    if (visualizations) {
+      visualizations.visEditorsRegistry.registerDefault(DefaultEditorController);
     }
   }
 

src/plugins/vis_default_editor/tsconfig.json

@@ -12,7 +12,8 @@
   "references": [
     { "path": "../../core/tsconfig.json" },
     { "path": "../data/tsconfig.json" },
-    { "path": "../visualize/tsconfig.json" },
+    { "path": "../visualizations/tsconfig.json" },
+    { "path": "../discover/tsconfig.json" },
     { "path": "../kibana_utils/tsconfig.json" },
     { "path": "../kibana_react/tsconfig.json" },
     { "path": "../field_formats/tsconfig.json" }

src/plugins/vis_types/timeseries/kibana.json

@@ -4,7 +4,7 @@
   "kibanaVersion": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["charts", "data", "expressions", "visualizations", "visualize"],
+  "requiredPlugins": ["charts", "data", "expressions", "visualizations"],
   "optionalPlugins": ["home","usageCollection"],
   "requiredBundles": ["kibanaUtils", "kibanaReact", "fieldFormats"],
   "owner": {

src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx

@@ -32,7 +32,7 @@ import { fetchFields, VisFields } from '../lib/fetch_fields';
 import { getDataStart, getCoreStart } from '../../services';
 import type { TimeseriesVisParams } from '../../types';
 import { UseIndexPatternModeCallout } from './use_index_patter_mode_callout';
-import type { EditorRenderProps } from '../../../../../visualize/public';
+import type { EditorRenderProps } from '../../../../../visualizations/public';
 
 const VIS_STATE_DEBOUNCE_DELAY = 200;
 const APP_NAME = 'VisEditor';

src/plugins/vis_types/timeseries/public/application/editor_controller.tsx

@@ -9,9 +9,12 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import type { EventEmitter } from 'events';
-import type { Vis, VisualizeEmbeddableContract } from 'src/plugins/visualizations/public';
-import type { IEditorController, EditorRenderProps } from 'src/plugins/visualize/public';
-
+import type {
+  Vis,
+  VisualizeEmbeddableContract,
+  IEditorController,
+  EditorRenderProps,
+} from 'src/plugins/visualizations/public';
 import { getUISettings, getI18n, getCoreStart } from '../services';
 import { VisEditor } from './components/vis_editor_lazy';
 import type { TimeseriesVisParams } from '../types';

src/plugins/vis_types/timeseries/public/plugin.ts

@@ -9,7 +9,6 @@
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
 import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
 import { VisualizationsSetup } from '../../../visualizations/public';
-import { VisualizePluginSetup } from '../../../visualize/public';
 import { EditorController, TSVB_EDITOR_NAME } from './application/editor_controller';
 
 import { createMetricsFn } from './metrics_fn';
@@ -30,7 +29,6 @@ import { getTimeseriesVisRenderer } from './timeseries_vis_renderer';
 export interface MetricsPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
   visualizations: VisualizationsSetup;
-  visualize: VisualizePluginSetup;
 }
 
 /** @internal */
@@ -47,11 +45,8 @@ export class MetricsPlugin implements Plugin<void, void> {
     this.initializerContext = initializerContext;
   }
 
-  public setup(
-    core: CoreSetup,
-    { expressions, visualizations, visualize }: MetricsPluginSetupDependencies
-  ) {
-    visualize.visEditorsRegistry.register(TSVB_EDITOR_NAME, EditorController);
+  public setup(core: CoreSetup, { expressions, visualizations }: MetricsPluginSetupDependencies) {
+    visualizations.visEditorsRegistry.register(TSVB_EDITOR_NAME, EditorController);
     expressions.registerFunction(createMetricsFn);
     expressions.registerRenderer(
       getTimeseriesVisRenderer({

src/plugins/vis_types/timeseries/tsconfig.json

@@ -18,7 +18,7 @@
     { "path": "../../data/tsconfig.json" },
     { "path": "../../expressions/tsconfig.json" },
     { "path": "../../visualizations/tsconfig.json" },
-    { "path": "../../visualize/tsconfig.json" },
+    { "path": "../../dashboard/tsconfig.json" },
     { "path": "../../kibana_utils/tsconfig.json" },
     { "path": "../../kibana_react/tsconfig.json" },
     { "path": "../../usage_collection/tsconfig.json" },

src/plugins/visualizations/common/constants.ts

@@ -8,3 +8,19 @@
 
 export const VISUALIZE_ENABLE_LABS_SETTING = 'visualize:enableLabs';
 export const VISUALIZE_EMBEDDABLE_TYPE = 'visualization';
+
+export const STATE_STORAGE_KEY = '_a';
+export const GLOBAL_STATE_STORAGE_KEY = '_g';
+
+export const APP_NAME = 'visualize';
+
+export const VisualizeConstants = {
+  VISUALIZE_BASE_PATH: '/app/visualize',
+  LANDING_PAGE_PATH: '/',
+  WIZARD_STEP_1_PAGE_PATH: '/new',
+  WIZARD_STEP_2_PAGE_PATH: '/new/configure',
+  CREATE_PATH: '/create',
+  EDIT_PATH: '/edit',
+  EDIT_BY_VALUE_PATH: '/edit_by_value',
+  APP_ID: 'visualize',
+};

src/plugins/visualize/common/locator.ts → src/plugins/visualizations/common/locator.ts

@@ -17,7 +17,7 @@ import type { LocatorDefinition, LocatorPublic } from 'src/plugins/share/common'
 import { isFilterPinned } from '../../data/common';
 import { url } from '../../kibana_utils/common';
 import { GLOBAL_STATE_STORAGE_KEY, STATE_STORAGE_KEY, VisualizeConstants } from './constants';
-import { PureVisState } from './types';
+import type { SavedVisState } from './types';
 
 const removeEmptyKeys = (o: Record<string, Serializable>): Record<string, Serializable> =>
   omitBy(o, (v) => v == null);
@@ -59,7 +59,7 @@ export type VisualizeLocatorParams = {
    *
    * @note This is required to navigate to "create" page (i.e., when no `visId` has been provided).
    */
-  vis?: PureVisState;
+  vis?: SavedVisState;
 
   /**
    * Whether this visualization is linked a saved search.

src/plugins/visualizations/kibana.json

@@ -7,12 +7,15 @@
     "data",
     "expressions",
     "uiActions",
+    "urlForwarding",
+    "navigation",
     "embeddable",
     "inspector",
-    "savedObjects"
+    "savedObjects",
+    "presentationUtil"
   ],
-  "optionalPlugins": ["usageCollection", "spaces", "savedObjectsTaggingOss"],
-  "requiredBundles": ["kibanaUtils", "discover", "kibanaReact"],
+  "optionalPlugins": [ "home", "share", "usageCollection", "spaces", "savedObjectsTaggingOss"],
+  "requiredBundles": ["kibanaUtils", "discover", "kibanaReact", "home"],
   "extraPublicDirs": ["common/constants", "common/prepare_log_table", "common/expression_functions"],
   "owner": {
     "name": "Vis Editors",

src/plugins/visualize/public/application/app.tsx → src/plugins/visualizations/public/application/app.tsx

@@ -20,7 +20,7 @@ import {
   VisualizeNoMatch,
   VisualizeByValueEditor,
 } from './components';
-import { VisualizeConstants } from './visualize_constants';
+import { VisualizeConstants } from '../../common/constants';
 
 export interface VisualizeAppProps {
   onAppLeave: AppMountParameters['onAppLeave'];

src/plugins/visualize/public/application/components/experimental_vis_info.tsx → src/plugins/visualizations/public/application/components/experimental_vis_info.tsx

@@ -14,7 +14,7 @@ export const InfoComponent = () => {
   const title = (
     <>
       <FormattedMessage
-        id="visualize.experimentalVisInfoText"
+        id="visualizations.experimentalVisInfoText"
         defaultMessage="This visualization is experimental and is not subject to the support SLA of official GA features.
           For feedback, please create an issue in {githubLink}."
         values={{

src/plugins/visualize/public/application/components/split_chart_warning.tsx → src/plugins/visualizations/public/application/components/split_chart_warning.tsx

@@ -26,20 +26,20 @@ export const SplitChartWarning = () => {
       data-test-subj="vizSplitChartWarning"
       title={
         <FormattedMessage
-          id="visualize.newHeatmapChart.notificationMessage"
+          id="visualizations.newHeatmapChart.notificationMessage"
           defaultMessage="The new heatmap charts library does not yet support split chart aggregation. {conditionalMessage}"
           values={{
             conditionalMessage: (
               <>
                 {canEditAdvancedSettings && (
                   <FormattedMessage
-                    id="visualize.newHeatmapChart.conditionalMessage.newLibrary"
+                    id="visualizations.newHeatmapChart.conditionalMessage.newLibrary"
                     defaultMessage="Switch to the old library in {link}"
                     values={{
                       link: (
                         <EuiLink href={advancedSettingsLink}>
                           <FormattedMessage
-                            id="visualize.newHeatmapChart.conditionalMessage.advanced settings link"
+                            id="visualizations.newHeatmapChart.conditionalMessage.advancedSettingsLink"
                             defaultMessage="Advanced Settings."
                           />
                         </EuiLink>
@@ -49,7 +49,7 @@ export const SplitChartWarning = () => {
                 )}
                 {!canEditAdvancedSettings && (
                   <FormattedMessage
-                    id="visualize.legacyCharts.conditionalMessage.noPermissions"
+                    id="visualizations.legacyCharts.conditionalMessage.noPermissions"
                     defaultMessage="Contact your system administrator to switch to the old library."
                   />
                 )}

src/plugins/visualize/public/application/components/visualize_byvalue_editor.tsx → src/plugins/visualizations/public/application/components/visualize_byvalue_editor.tsx

@@ -22,7 +22,7 @@ import {
 import { VisualizeServices } from '../types';
 import { VisualizeEditorCommon } from './visualize_editor_common';
 import { VisualizeAppProps } from '../app';
-import { VisualizeConstants } from '../..';
+import { VisualizeConstants } from '../../../common/constants';
 
 export const VisualizeByValueEditor = ({ onAppLeave }: VisualizeAppProps) => {
   const [originatingApp, setOriginatingApp] = useState<string>();

src/plugins/visualize/public/application/components/visualize_editor.tsx → src/plugins/visualizations/public/application/components/visualize_editor.tsx

@@ -22,7 +22,7 @@ import {
 import { VisualizeServices } from '../types';
 import { VisualizeEditorCommon } from './visualize_editor_common';
 import { VisualizeAppProps } from '../app';
-import { VisualizeConstants } from '../..';
+import { VisualizeConstants } from '../../../common/constants';
 
 export const VisualizeEditor = ({ onAppLeave }: VisualizeAppProps) => {
   const { id: visualizationIdFromUrl } = useParams<{ id: string }>();

src/plugins/visualize/public/application/components/visualize_editor_common.tsx → src/plugins/visualizations/public/application/components/visualize_editor_common.tsx

@@ -72,7 +72,7 @@ export const VisualizeEditorCommon = ({
         const newPath = `${urlFor(newObjectId!)}${services.history.location.search}`;
         await services.spaces.ui.redirectLegacyUrl(
           newPath,
-          i18n.translate('visualize.legacyUrlConflict.objectNoun', {
+          i18n.translate('visualizations.legacyUrlConflict.objectNoun', {
             defaultMessage: '{visName} visualization',
             values: {
               visName: visInstance?.vis?.type.title,
@@ -96,7 +96,7 @@ export const VisualizeEditorCommon = ({
       const otherObjectId = sharingSavedObjectProps?.aliasTargetId!; // This is always defined if outcome === 'conflict'
       const otherObjectPath = `${urlFor(otherObjectId)}${services.history.location.search}`;
       return services.spaces.ui.components.getLegacyUrlConflict({
-        objectNoun: i18n.translate('visualize.legacyUrlConflict.objectNoun', {
+        objectNoun: i18n.translate('visualizations.legacyUrlConflict.objectNoun', {
           defaultMessage: '{visName} visualization',
           values: {
             visName: visInstance?.vis?.type.title,
@@ -144,7 +144,7 @@ export const VisualizeEditorCommon = ({
           <h1>
             {'savedVis' in visInstance && visInstance.savedVis.id ? (
               <FormattedMessage
-                id="visualize.pageHeading"
+                id="visualizations.pageHeading"
                 defaultMessage="{chartName} {chartType} visualization"
                 values={{
                   chartName: (visInstance as SavedVisInstance).savedVis.title,
@@ -153,7 +153,7 @@ export const VisualizeEditorCommon = ({
               />
             ) : (
               <FormattedMessage
-                id="visualize.byValue_pageHeading"
+                id="visualizations.byValue_pageHeading"
                 defaultMessage="Visualization of type {chartType} embedded into {originatingApp} app"
                 values={{
                   chartType: visInstance.vis.type.title,