[Portable Dashboards] Remove Saved Object Class (#138774)

* Removed dashboard saved object class, replaced with dashboard saved object service
elastic · Sep 28, 2022 · f5b6a2c · f5b6a2c
1 parent 0e6d079
commit f5b6a2c
Show file tree

Hide file tree

Showing 144 changed files with 2,575 additions and 3,151 deletions.
diff --git a/src/plugins/controls/public/services/plugin_services.stub.ts b/src/plugins/controls/public/services/plugin_services.stub.ts
@@ -27,16 +27,15 @@ import { themeServiceFactory } from './theme/theme.story';
 import { registry as stubRegistry } from './plugin_services.story';
 
 export const providers: PluginServiceProviders<ControlsServices> = {
-  http: new PluginServiceProvider(httpServiceFactory),
+  controls: new PluginServiceProvider(controlsServiceFactory),
   data: new PluginServiceProvider(dataServiceFactory),
-  overlays: new PluginServiceProvider(overlaysServiceFactory),
   dataViews: new PluginServiceProvider(dataViewsServiceFactory),
+  http: new PluginServiceProvider(httpServiceFactory),
+  optionsList: new PluginServiceProvider(optionsListServiceFactory),
+  overlays: new PluginServiceProvider(overlaysServiceFactory),
   settings: new PluginServiceProvider(settingsServiceFactory),
-  unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory),
   theme: new PluginServiceProvider(themeServiceFactory),
-
-  controls: new PluginServiceProvider(controlsServiceFactory),
-  optionsList: new PluginServiceProvider(optionsListServiceFactory),
+  unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory),
 };
 
 export const pluginServices = new PluginServices<ControlsServices>();

diff --git a/src/plugins/controls/public/services/plugin_services.ts b/src/plugins/controls/public/services/plugin_services.ts
@@ -30,16 +30,15 @@ export const providers: PluginServiceProviders<
   ControlsServices,
   KibanaPluginServiceParams<ControlsPluginStartDeps>
 > = {
-  http: new PluginServiceProvider(httpServiceFactory),
+  controls: new PluginServiceProvider(controlsServiceFactory),
   data: new PluginServiceProvider(dataServiceFactory),
-  unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory),
-  overlays: new PluginServiceProvider(overlaysServiceFactory),
   dataViews: new PluginServiceProvider(dataViewsServiceFactory),
+  http: new PluginServiceProvider(httpServiceFactory),
+  optionsList: new PluginServiceProvider(optionsListServiceFactory, ['data', 'http']),
+  overlays: new PluginServiceProvider(overlaysServiceFactory),
   settings: new PluginServiceProvider(settingsServiceFactory),
   theme: new PluginServiceProvider(themeServiceFactory),
-
-  optionsList: new PluginServiceProvider(optionsListServiceFactory, ['data', 'http']),
-  controls: new PluginServiceProvider(controlsServiceFactory),
+  unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory),
 };
 
 export const pluginServices = new PluginServices<ControlsServices>();

diff --git a/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts b/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts
diff --git a/src/plugins/dashboard/common/embeddable/embeddable_references.ts b/src/plugins/dashboard/common/embeddable/embeddable_references.ts
diff --git a/src/plugins/dashboard/common/embeddable/types.ts b/src/plugins/dashboard/common/embeddable/types.ts
diff --git a/src/plugins/dashboard/common/index.ts b/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',

diff --git a/...mbeddable_saved_object_converters.test.ts → ...on/lib/dashboard_panel_converters.test.ts b/...mbeddable_saved_object_converters.test.ts → ...on/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';
 

diff --git a/...ble/embeddable_saved_object_converters.ts → .../common/lib/dashboard_panel_converters.ts b/...ble/embeddable_saved_object_converters.ts → .../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)
+  );
+};
diff --git a/...board_container_persistable_state.test.ts → ...te/dashboard_container_references.test.ts b/...board_container_persistable_state.test.ts → ...te/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';
 

diff --git a/.../dashboard_container_persistable_state.ts → ...e_state/dashboard_container_references.ts b/.../dashboard_container_persistable_state.ts → ...e_state/dashboard_container_references.ts
diff --git a/...common/saved_dashboard_references.test.ts → ...dashboard_saved_object_references.test.ts b/...common/saved_dashboard_references.test.ts → ...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();