Make spaces dependency optional

elastic · Oct 10, 2024 · a2239e0 · a2239e0
1 parent d880fb6
commit a2239e0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/x-pack/plugins/observability_solution/inventory/kibana.jsonc b/x-pack/plugins/observability_solution/inventory/kibana.jsonc
@@ -16,11 +16,10 @@
       "features",
       "unifiedSearch",
       "data",
-      "share",
-      "spaces"
+      "share"
     ],
     "requiredBundles": ["kibanaReact"],
-    "optionalPlugins": [],
+    "optionalPlugins": ["spaces"],
     "extraPublicDirs": []
   }
 }
diff --git a/x-pack/plugins/observability_solution/inventory/public/plugin.ts b/x-pack/plugins/observability_solution/inventory/public/plugin.ts
@@ -17,7 +17,7 @@ import {
 import { INVENTORY_APP_ID } from '@kbn/deeplinks-observability/constants';
 import { i18n } from '@kbn/i18n';
 import type { Logger } from '@kbn/logging';
-import { from, map, mergeMap } from 'rxjs';
+import { from, map, mergeMap, of } from 'rxjs';
 import { createCallInventoryAPI } from './api';
 import { TelemetryService } from './services/telemetry/telemetry_service';
 import { InventoryServices } from './services/types';
@@ -57,15 +57,19 @@ export class InventoryPlugin
     const getStartServices = coreSetup.getStartServices();
 
     const hideInventory$ = from(getStartServices).pipe(
-      mergeMap(([coreStart, pluginsStart]) =>
-        from(pluginsStart.spaces.getActiveSpace()).pipe(
-          map(
-            (space) =>
-              space.disabledFeatures.includes(INVENTORY_APP_ID) ||
-              !coreStart.application.capabilities.inventory.show
-          )
-        )
-      )
+      mergeMap(([coreStart, pluginsStart]) => {
+        if (pluginsStart.spaces) {
+          return from(pluginsStart.spaces.getActiveSpace()).pipe(
+            map(
+              (space) =>
+                space.disabledFeatures.includes(INVENTORY_APP_ID) ||
+                !coreStart.application.capabilities.inventory.show
+            )
+          );
+        }
+
+        return of(!coreStart.application.capabilities.inventory.show);
+      })
     );
 
     const sections$ = hideInventory$.pipe(

diff --git a/x-pack/plugins/observability_solution/inventory/public/types.ts b/x-pack/plugins/observability_solution/inventory/public/types.ts
@@ -39,7 +39,7 @@ export interface InventoryStartDependencies {
   data: DataPublicPluginStart;
   entityManager: EntityManagerPublicPluginStart;
   share: SharePluginStart;
-  spaces: SpacesPluginStart;
+  spaces?: SpacesPluginStart;
 }
 
 export interface InventoryPublicSetup {}