remove embeddable migration from dashboard and put in maps

src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts

@@ -32,7 +32,6 @@ import {
   MigrateFunctionsObject,
 } from '../../../kibana_utils/common';
 import { replaceIndexPatternReference } from './replace_index_pattern_reference';
-import { migrateMapEmbeddable } from './migrate_map_embeddable';
 
 function migrateIndexPattern(doc: DashboardDoc700To720) {
   const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
@@ -250,9 +249,6 @@ export const createDashboardSavedObjectTypeMigrations = (
     // '7.x': flow(yourNewMigrationFunction, embeddableMigrations['7.x'] ?? identity),
 
     '7.14.0': flow(replaceIndexPatternReference),
-
-    '7.17.1': flow(migrateMapEmbeddable),
-    '8.0.1': flow(migrateMapEmbeddable),
   };
 
   return mergeMigrationFunctionMaps(dashboardMigrations, embeddableMigrations);

x-pack/plugins/maps/server/embeddable_migrations.ts

@@ -10,6 +10,7 @@ import { MapSavedObjectAttributes } from '../common/map_saved_object_type';
 import { moveAttribution } from '../common/migrations/move_attribution';
 import { setEmsTmsDefaultModes } from '../common/migrations/set_ems_tms_default_modes';
 import { renameLayerTypes } from '../common/migrations/rename_layer_types';
+import { extractReferences } from '../common/migrations/references';
 
 /*
  * Embeddables such as Maps, Lens, and Visualize can be embedded by value or by reference on a dashboard.
@@ -31,6 +32,19 @@ export const embeddableMigrations = {
       return state;
     }
   },
+  '7.17.1': (state: SerializableRecord) => {
+    try {
+      const { attributes } = extractReferences(state as { attributes: MapSavedObjectAttributes });
+      return {
+        ...state,
+        attributes,
+      } as SerializableRecord;
+    } catch (e) {
+      // Do not fail migration for invalid layerListJSON
+      // Maps application can display invalid layerListJSON error when saved object is viewed
+      return state;
+    }
+  },
   '8.0.0': (state: SerializableRecord) => {
     try {
       return {
@@ -43,6 +57,19 @@ export const embeddableMigrations = {
       return state;
     }
   },
+  '8.0.1': (state: SerializableRecord) => {
+    try {
+      const { attributes } = extractReferences(state as { attributes: MapSavedObjectAttributes });
+      return {
+        ...state,
+        attributes,
+      } as SerializableRecord;
+    } catch (e) {
+      // Do not fail migration for invalid layerListJSON
+      // Maps application can display invalid layerListJSON error when saved object is viewed
+      return state;
+    }
+  },
   '8.1.0': (state: SerializableRecord) => {
     try {
       return {