[Portable Dashboards] Remove Saved Object Class

src/plugins/dashboard/common/index.ts

@@ -6,24 +6,28 @@
  * Side Public License, v 1.
  */
 
-export type { GridData } from './embeddable/types';
-export type {
-  RawSavedDashboardPanel730ToLatest,
-  DashboardDoc730ToLatest,
-  DashboardDoc700To720,
-  DashboardDocPre700,
-} from './bwc/types';
 export type {
+  GridData,
+  DashboardPanelMap,
+  SavedDashboardPanel,
+  DashboardAttributes,
+  DashboardPanelState,
   DashboardContainerStateWithType,
-  SavedDashboardPanelTo60,
-  SavedDashboardPanel610,
-  SavedDashboardPanel620,
-  SavedDashboardPanel630,
-  SavedDashboardPanel640To720,
-  SavedDashboardPanel730ToLatest,
 } from './types';
 
-export { migratePanelsTo730 } from './migrate_to_730_panels';
+export {
+  injectReferences,
+  extractReferences,
+} from './persistable_state/dashboard_saved_object_references';
+
+export { createInject, createExtract } from './persistable_state/dashboard_container_references';
+
+export {
+  convertPanelStateToSavedDashboardPanel,
+  convertSavedDashboardPanelToPanelState,
+  convertSavedPanelsToPanelMap,
+  convertPanelMapToSavedPanels,
+} from './lib/dashboard_panel_converters';
 
 export const UI_SETTINGS = {
   ENABLE_LABS_UI: 'labs:dashboard:enable_ui',

src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts → src/plugins/dashboard/common/lib/dashboard_panel_converters.test.ts

@@ -9,7 +9,7 @@
 import {
   convertSavedDashboardPanelToPanelState,
   convertPanelStateToSavedDashboardPanel,
-} from './embeddable_saved_object_converters';
+} from './dashboard_panel_converters';
 import { SavedDashboardPanel, DashboardPanelState } from '../types';
 import { EmbeddableInput } from '@kbn/embeddable-plugin/common/types';
 

src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts → src/plugins/dashboard/common/lib/dashboard_panel_converters.ts

@@ -8,7 +8,7 @@
 
 import { omit } from 'lodash';
 import { EmbeddableInput, SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common';
-import { DashboardPanelState, SavedDashboardPanel } from '../types';
+import { DashboardPanelMap, DashboardPanelState, SavedDashboardPanel } from '../types';
 
 export function convertSavedDashboardPanelToPanelState<
   TEmbeddableInput extends EmbeddableInput | SavedObjectEmbeddableInput = SavedObjectEmbeddableInput
@@ -42,3 +42,17 @@ export function convertPanelStateToSavedDashboardPanel(
     ...(panelState.panelRefName !== undefined && { panelRefName: panelState.panelRefName }),
   };
 }
+
+export const convertSavedPanelsToPanelMap = (panels?: SavedDashboardPanel[]): DashboardPanelMap => {
+  const panelsMap: DashboardPanelMap = {};
+  panels?.forEach((panel, idx) => {
+    panelsMap![panel.panelIndex ?? String(idx)] = convertSavedDashboardPanelToPanelState(panel);
+  });
+  return panelsMap;
+};
+
+export const convertPanelMapToSavedPanels = (panels: DashboardPanelMap, version: string) => {
+  return Object.values(panels).map((panel) =>
+    convertPanelStateToSavedDashboardPanel(panel, version)
+  );
+};

src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts → src/plugins/dashboard/common/persistable_state/dashboard_container_references.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createExtract, createInject } from './dashboard_container_persistable_state';
+import { createExtract, createInject } from './dashboard_container_references';
 import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks';
 import { DashboardContainerStateWithType } from '../types';
 

src/plugins/dashboard/common/saved_dashboard_references.test.ts → src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.test.ts

@@ -11,9 +11,9 @@ import {
   injectReferences,
   InjectDeps,
   ExtractDeps,
-} from './saved_dashboard_references';
+} from './dashboard_saved_object_references';
 
-import { createExtract, createInject } from './embeddable/dashboard_container_persistable_state';
+import { createExtract, createInject } from './dashboard_container_references';
 import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks';
 
 const embeddablePersistableStateServiceMock = createEmbeddablePersistableStateServiceMock();

src/plugins/dashboard/common/saved_dashboard_references.ts → src/plugins/dashboard/common/persistable_state/dashboard_saved_object_references.ts

@@ -6,23 +6,33 @@
  * Side Public License, v 1.
  */
 import semverGt from 'semver/functions/gt';
-import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/types';
-import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common/types';
+
 import {
-  PersistableControlGroupInput,
   RawControlGroupAttributes,
+  PersistableControlGroupInput,
 } from '@kbn/controls-plugin/common';
-import { DashboardContainerStateWithType, DashboardPanelState } from './types';
+import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/types';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common/types';
+
+import {
+  SavedDashboardPanel,
+  DashboardPanelState,
+  DashboardContainerStateWithType,
+} from '../types';
 import {
   convertPanelStateToSavedDashboardPanel,
   convertSavedDashboardPanelToPanelState,
-} from './embeddable/embeddable_saved_object_converters';
-import { SavedDashboardPanel } from './types';
+} from '../lib/dashboard_panel_converters';
+
+interface ExtractDeps {
+  embeddablePersistableStateService: EmbeddablePersistableStateService;
+}
 
-export interface ExtractDeps {
+interface InjectDeps {
   embeddablePersistableStateService: EmbeddablePersistableStateService;
 }
-export interface SavedObjectAttributesAndReferences {
+
+interface SavedObjectAttributesAndReferences {
   attributes: SavedObjectAttributes;
   references: SavedObjectReference[];
 }
@@ -79,7 +89,7 @@ function panelStatesToPanels(
     let originalPanel = originalPanels.find((p) => p.panelIndex === id);
 
     if (!originalPanel) {
-      // Maybe original panel doesn't have a panel index and it's just straight up based on it's index
+      // Maybe original panel doesn't have a panel index and it's just straight up based on its index
       const numericId = parseInt(id, 10);
       originalPanel = isNaN(numericId) ? originalPanel : originalPanels[numericId];
     }
@@ -91,6 +101,45 @@ function panelStatesToPanels(
   });
 }
 
+export function injectReferences(
+  { attributes, references = [] }: SavedObjectAttributesAndReferences,
+  deps: InjectDeps
+): SavedObjectAttributes {
+  // Skip if panelsJSON is missing otherwise this will cause saved object import to fail when
+  // importing objects without panelsJSON. At development time of this, there is no guarantee each saved
+  // object has panelsJSON in all previous versions of kibana.
+  if (typeof attributes.panelsJSON !== 'string') {
+    return attributes;
+  }
+  const parsedPanels = JSON.parse(attributes.panelsJSON);
+  // Same here, prevent failing saved object import if ever panels aren't an array.
+  if (!Array.isArray(parsedPanels)) {
+    return attributes;
+  }
+
+  const { panels, state } = dashboardAttributesToState(attributes);
+
+  const injectedState = deps.embeddablePersistableStateService.inject(
+    state,
+    references
+  ) as DashboardContainerStateWithType;
+  const injectedPanels = panelStatesToPanels(injectedState.panels, panels);
+
+  const newAttributes = {
+    ...attributes,
+    panelsJSON: JSON.stringify(injectedPanels),
+  } as SavedObjectAttributes;
+
+  if (injectedState.controlGroupInput) {
+    newAttributes.controlGroupInput = {
+      ...(attributes.controlGroupInput as SavedObjectAttributes),
+      panelsJSON: JSON.stringify(injectedState.controlGroupInput.panels),
+    };
+  }
+
+  return newAttributes;
+}
+
 export function extractReferences(
   { attributes, references = [] }: SavedObjectAttributesAndReferences,
   deps: ExtractDeps
@@ -137,49 +186,6 @@ export function extractReferences(
   };
 }
 
-export interface InjectDeps {
-  embeddablePersistableStateService: EmbeddablePersistableStateService;
-}
-
-export function injectReferences(
-  { attributes, references = [] }: SavedObjectAttributesAndReferences,
-  deps: InjectDeps
-): SavedObjectAttributes {
-  // Skip if panelsJSON is missing otherwise this will cause saved object import to fail when
-  // importing objects without panelsJSON. At development time of this, there is no guarantee each saved
-  // object has panelsJSON in all previous versions of kibana.
-  if (typeof attributes.panelsJSON !== 'string') {
-    return attributes;
-  }
-  const parsedPanels = JSON.parse(attributes.panelsJSON);
-  // Same here, prevent failing saved object import if ever panels aren't an array.
-  if (!Array.isArray(parsedPanels)) {
-    return attributes;
-  }
-
-  const { panels, state } = dashboardAttributesToState(attributes);
-
-  const injectedState = deps.embeddablePersistableStateService.inject(
-    state,
-    references
-  ) as DashboardContainerStateWithType;
-  const injectedPanels = panelStatesToPanels(injectedState.panels, panels);
-
-  const newAttributes = {
-    ...attributes,
-    panelsJSON: JSON.stringify(injectedPanels),
-  } as SavedObjectAttributes;
-
-  if (injectedState.controlGroupInput) {
-    newAttributes.controlGroupInput = {
-      ...(attributes.controlGroupInput as SavedObjectAttributes),
-      panelsJSON: JSON.stringify(injectedState.controlGroupInput.panels),
-    };
-  }
-
-  return newAttributes;
-}
-
 function pre730ExtractReferences(
   { attributes, references = [] }: SavedObjectAttributesAndReferences,
   deps: ExtractDeps