feat: add feature flag check

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
SuZhou-Joe · Mar 8, 2024 · 64b3645 · 64b3645
1 parent b6a1622
commit 64b3645
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/core/public/http/http_service.ts b/src/core/public/http/http_service.ts
@@ -53,9 +53,14 @@ export class HttpService implements CoreService<HttpSetup, HttpStart> {
   public setup({ injectedMetadata, fatalErrors }: HttpDeps): HttpSetup {
     const opensearchDashboardsVersion = injectedMetadata.getOpenSearchDashboardsVersion();
     let workspaceBasePath = '';
-    const workspaceId = getWorkspaceIdFromUrl(window.location.href);
-    if (workspaceId) {
-      workspaceBasePath = `${WORKSPACE_PATH_PREFIX}/${workspaceId}`;
+    const plugins = injectedMetadata.getPlugins();
+    const findWorkspaceConfig = plugins.find((plugin) => plugin.id === 'workspace');
+    // Only try to get workspace id from url when workspace feature is enabled
+    if (findWorkspaceConfig) {
+      const workspaceId = getWorkspaceIdFromUrl(window.location.href);
+      if (workspaceId) {
+        workspaceBasePath = `${WORKSPACE_PATH_PREFIX}/${workspaceId}`;
+      }
     }
     const basePath = new BasePath(
       injectedMetadata.getBasePath(),

diff --git a/src/plugins/workspace/opensearch_dashboards.json b/src/plugins/workspace/opensearch_dashboards.json
@@ -2,7 +2,7 @@
   "id": "workspace",
   "version": "opensearchDashboards",
   "server": true,
-  "ui": false,
+  "ui": true,
   "requiredPlugins": [
     "savedObjects"
   ],