[dashboards as code] rename lens and visualization embeddable types

src/platform/packages/shared/kbn-lens-common/embeddable/constants.ts

@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+export const LENS_EMBEDDABLE_TYPE = 'vis';

src/platform/packages/shared/kbn-lens-common/index.ts

@@ -415,3 +415,4 @@ export {
 export { DRAG_DROP_EXTRA_TARGETS_WIDTH, DRAG_DROP_EXTRA_TARGETS_PADDING } from './editor/constants';
 export { LENS_DATASOURCE_ID } from './embeddable/types';
 export type { LensDatasourceId } from './embeddable/types';
+export { LENS_EMBEDDABLE_TYPE } from './embeddable/constants';

src/platform/packages/shared/kbn-visualizations-common/constants.ts

@@ -10,7 +10,7 @@
 export const VISUALIZE_APP_NAME = 'visualize';
 export const SAVED_OBJECTS_LIMIT_SETTING = 'savedObjects:listingLimit';
 export const SAVED_OBJECTS_PER_PAGE_SETTING = 'savedObjects:perPage';
-export const VISUALIZE_EMBEDDABLE_TYPE = 'visualization';
+export const VISUALIZE_EMBEDDABLE_TYPE = 'legacy_vis';
 export const VISUALIZE_SAVED_OBJECT_TYPE = 'visualization';
 
 export const STATE_STORAGE_KEY = '_a';

src/platform/plugins/shared/dashboard/moon.yml

@@ -125,6 +125,7 @@ dependsOn:
   - '@kbn/core-http-common'
   - '@kbn/core-http-server-mocks'
   - '@kbn/core-http-browser'
+  - '@kbn/lens-common'
 tags:
   - plugin
   - prod

src/platform/plugins/shared/dashboard/public/dashboard_app/hooks/use_observability_ai_assistant_context.tsx

@@ -25,6 +25,7 @@ import {
 } from '@kbn/lens-embeddable-utils/config_builder';
 import type { LensEmbeddableInput } from '@kbn/lens-plugin/public';
 import { useEffect } from 'react';
+import { LENS_EMBEDDABLE_TYPE } from '@kbn/lens-common';
 import type { DashboardApi } from '../../dashboard_api/types';
 import { dataService, observabilityAssistantService } from '../../services/kibana_services';
 
@@ -357,7 +358,7 @@ export function useObservabilityAIAssistantContext({
 
                 return dashboardApi
                   .addNewPanel({
-                    panelType: 'lens',
+                    panelType: LENS_EMBEDDABLE_TYPE,
                     serializedState: {
                       embeddableInput,
                     },

src/platform/plugins/shared/dashboard/public/dashboard_app/no_data/dashboard_app_no_data.tsx

@@ -20,6 +20,7 @@ import { withSuspense } from '@kbn/shared-ux-utility';
 import type { LensSerializedState } from '@kbn/lens-plugin/public';
 import { getLensAttributesFromSuggestion } from '@kbn/visualization-utils';
 import { AbortReason } from '@kbn/kibana-utils-plugin/common';
+import { LENS_EMBEDDABLE_TYPE } from '@kbn/lens-common';
 import {
   coreServices,
   dataService,
@@ -103,7 +104,7 @@ export const DashboardAppNoDataPage = ({
             .navigateToWithEmbeddablePackages<LensSerializedState>('dashboards', {
               state: [
                 {
-                  type: 'lens',
+                  type: LENS_EMBEDDABLE_TYPE,
                   serializedState: {
                     attributes: getLensAttributesFromSuggestion({
                       filters: [],

src/platform/plugins/shared/dashboard/server/api/transforms/in/transform_panels_in.ts

@@ -10,6 +10,7 @@
 import { v4 as uuidv4 } from 'uuid';
 
 import type { SavedObjectReference } from '@kbn/core/server';
+import { LENS_EMBEDDABLE_TYPE } from '@kbn/lens-common';
 import { isDashboardSection, prefixReferencesFromPanel } from '../../../../common';
 import type {
   DashboardSavedObjectAttributes,
@@ -84,7 +85,9 @@ function transformPanelIn(
   // Temporary escape hatch for lens as code
   // TODO remove when lens as code transforms are ready for production
   const transformType =
-    panel.type === 'lens' && isDashboardAppRequest ? 'lens-dashboard-app' : panel.type;
+    panel.type === LENS_EMBEDDABLE_TYPE && isDashboardAppRequest
+      ? 'lens-dashboard-app'
+      : panel.type;
   const transforms = embeddableService?.getTransforms(transformType);
 
   // Dashboard application routes do not validate panel.config at route level

src/platform/plugins/shared/dashboard/server/api/transforms/out/transform_panels_out.ts

@@ -10,6 +10,7 @@
 import type { SavedObjectReference } from '@kbn/core/server';
 import { transformTimeRangeOut, transformTitlesOut } from '@kbn/presentation-publishing';
 import { flow } from 'lodash';
+import { LENS_EMBEDDABLE_TYPE } from '@kbn/lens-common';
 import type { SavedDashboardPanel, SavedDashboardSection } from '../../../dashboard_saved_object';
 import type { DashboardState, DashboardPanel, DashboardSection } from '../../types';
 import { embeddableService } from '../../../kibana_services';
@@ -101,7 +102,8 @@ function transformPanel(
 
   // Temporary escape hatch for lens as code
   // TODO remove when lens as code transforms are ready for production
-  const transformType = type === 'lens' && isDashboardAppRequest ? 'lens-dashboard-app' : type;
+  const transformType =
+    type === LENS_EMBEDDABLE_TYPE && isDashboardAppRequest ? 'lens-dashboard-app' : type;
   const transforms = embeddableService?.getTransforms(transformType);
 
   const transformedPanelConfig =

src/platform/plugins/shared/dashboard/tsconfig.json

@@ -123,6 +123,7 @@
     "@kbn/core-http-common",
     "@kbn/core-http-server-mocks",
     "@kbn/core-http-browser",
+    "@kbn/lens-common"
   ],
   "exclude": ["target/**/*"]
 }

src/platform/plugins/shared/embeddable/common/bwc/transform_type.ts

@@ -8,6 +8,14 @@
  */
 
 export function transformType(type: string) {
+  if (type === 'lens') {
+    return 'vis';
+  }
+
+  if (type === 'visualization') {
+    return 'legacy_vis';
+  }
+
   if (type === 'DASHBOARD_MARKDOWN') {
     return 'markdown';
   }

src/platform/plugins/shared/unified_doc_viewer/moon.yml

@@ -63,6 +63,7 @@ dependsOn:
   - '@kbn/deeplinks-analytics'
   - '@kbn/lens-embeddable-utils'
   - '@kbn/restorable-state'
+  - '@kbn/lens-common'
 tags:
   - plugin
   - prod

src/platform/plugins/shared/unified_doc_viewer/public/components/doc_viewer_logs_overview/sub_components/similar_errors/similar_errors_occurrences_chart/index.tsx

@@ -20,6 +20,7 @@ import type { LensAttributes } from '@kbn/lens-embeddable-utils/config_builder';
 import { EuiCallOut, EuiLoadingChart, EuiFlexGroup, EuiFlexItem, useEuiTheme } from '@elastic/eui';
 import { EmbeddableRenderer } from '@kbn/embeddable-plugin/public';
 import { fieldConstants } from '@kbn/discover-utils';
+import { LENS_EMBEDDABLE_TYPE } from '@kbn/lens-common';
 import { useDataSourcesContext } from '../../../../../hooks/use_data_sources';
 import { getUnifiedDocViewerServices } from '../../../../../plugin';
 import { ContentFrameworkChart } from '../../../../content_framework/chart';
@@ -196,9 +197,11 @@ export function SimilarErrorsOccurrencesChart({
 
     return (
       <div style={{ height: '120px', width: '100%' }}>
-        {/* TODO update the string with LENS_EMBEDDABLE_TYPE once is moved to @kbn/lens-common
-        https://github.com/elastic/kibana/issues/245192 */}
-        <EmbeddableRenderer type={'lens'} getParentApi={getParentApi} hidePanelChrome />
+        <EmbeddableRenderer
+          type={LENS_EMBEDDABLE_TYPE}
+          getParentApi={getParentApi}
+          hidePanelChrome
+        />
       </div>
     );
   }, [getParentApi, lensAttributes]);

src/platform/plugins/shared/unified_doc_viewer/public/components/doc_viewer_logs_overview/sub_components/similar_errors/similar_errors_occurrences_chart/similar_errors_occurrences_chart.test.tsx

@@ -126,7 +126,7 @@ describe('SimilarErrorsOccurrencesChart', () => {
       expect(screen.getByTestId('lensEmbeddableSimilarErrorsChart')).toBeInTheDocument();
     });
 
-    expect(screen.getByText('Lens Chart (type: lens)')).toBeInTheDocument();
+    expect(screen.getByText('Lens Chart (type: vis)')).toBeInTheDocument();
   });
 
   it('shows error message when build fails', async () => {

src/platform/plugins/shared/unified_doc_viewer/tsconfig.json

@@ -58,6 +58,7 @@
     "@kbn/deeplinks-analytics",
     "@kbn/lens-embeddable-utils",
     "@kbn/restorable-state",
+    "@kbn/lens-common",
   ],
   "exclude": ["target/**/*"]
 }

src/platform/plugins/shared/visualizations/public/actions/edit_in_lens_action.tsx

@@ -32,8 +32,6 @@ import {
   apiHasVisualizeConfig,
   type HasVisualizeConfig,
 } from '../embeddable/interfaces/has_visualize_config';
-import type { HasExpressionVariables } from '../embeddable/interfaces/has_expression_variables';
-import { apiHasExpressionVariables } from '../embeddable/interfaces/has_expression_variables';
 import {
   getApplication,
   getCapabilities,
@@ -65,7 +63,7 @@ const MenuItem: React.FC = () => {
 type EditInLensActionApi = HasUniqueId &
   HasVisualizeConfig &
   CanAccessViewMode &
-  Partial<PublishesUnifiedSearch & HasExpressionVariables & PublishesTitle & PublishesDescription>;
+  Partial<PublishesUnifiedSearch & PublishesTitle & PublishesDescription>;
 
 const compatibilityCheck = (api: EmbeddableApiContext['embeddable']): api is EditInLensActionApi =>
   apiHasUniqueId(api) && apiCanAccessViewMode(api) && apiHasVisualizeConfig(api);
@@ -150,10 +148,7 @@ export class EditInLensAction implements Action<EmbeddableApiContext> {
     }
 
     // determine whether navigation to lens is available
-    if (
-      apiHasExpressionVariables(embeddable) &&
-      embeddable.getExpressionVariables()?.canNavigateToLens
-    ) {
+    if (embeddable.getExpressionVariables?.()?.canNavigateToLens) {
       return true;
     }
     return Boolean(await vis.type.navigateToLens?.(vis, this.timefilter));

src/platform/plugins/shared/visualizations/public/embeddable/embeddable_module.ts

@@ -8,4 +8,4 @@
  */
 
 export { getTransformOut } from '../../common/embeddable/transforms/get_transform_out';
-export { getVisualizeEmbeddableFactory } from './visualize_embeddable';
+export { visualizeEmbeddableFactory } from './visualize_embeddable';

src/platform/plugins/shared/visualizations/public/embeddable/interfaces/has_visualize_config.ts

@@ -8,17 +8,19 @@
  */
 
 import type { HasType } from '@kbn/presentation-publishing';
+import { VISUALIZE_EMBEDDABLE_TYPE } from '@kbn/visualizations-common';
 import type { VisParams } from '../../types';
 import type Vis from '../../vis';
 
-export type HasVisualizeConfig = HasType<'visualization'> & {
+export type HasVisualizeConfig = HasType<typeof VISUALIZE_EMBEDDABLE_TYPE> & {
   getVis: () => Vis<VisParams>;
+  getExpressionVariables?: () => Record<string, unknown> | undefined;
 };
 
 export const apiHasVisualizeConfig = (api: unknown): api is HasVisualizeConfig => {
   return Boolean(
     api &&
-      (api as HasType)?.type === 'visualization' &&
+      (api as HasType)?.type === VISUALIZE_EMBEDDABLE_TYPE &&
       typeof (api as HasVisualizeConfig).getVis === 'function'
   );
 };