[Workspace] Fix non-workspace admin update observability:defaultDashb…

…oard (#2223) * Fix non-workspace admin update observability:defaultDashboard Signed-off-by: yubonluo <yubonluo@amazon.com> * optimize the code Signed-off-by: yubonluo <yubonluo@amazon.com> * optimize the code Signed-off-by: yubonluo <yubonluo@amazon.com> * optimize the code Signed-off-by: yubonluo <yubonluo@amazon.com> --------- Signed-off-by: yubonluo <yubonluo@amazon.com>
opensearch-project · Oct 22, 2024 · f631248 · f631248
1 parent 46ec7f2
commit f631248
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 17 deletions.
diff --git a/public/components/overview/home.tsx b/public/components/overview/home.tsx
@@ -11,7 +11,7 @@ import {
   EuiButtonEmpty,
   EuiToolTip,
 } from '@elastic/eui';
-import React, { ReactNode, useEffect, useState } from 'react';
+import React, { ReactNode, useEffect, useMemo, useState } from 'react';
 import { HashRouter, Route, Switch } from 'react-router-dom';
 import { useObservable } from 'react-use';
 import { EMPTY } from 'rxjs';
@@ -52,6 +52,18 @@ export const Home = () => {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   const [showGetStarted, setShowGetStarted] = useState<boolean | null>(null); // Initial null state
 
+  const canUpdateUiSetting = useMemo(() => {
+    const capabilities = coreRefs.application?.capabilities;
+
+    // When workspace enabled, only workspace owner/OSD admin can update observability:defaultDashboard.
+    if (capabilities?.workspaces?.enabled) {
+      const isCurrentWorkspaceOwner = coreRefs.workspaces?.currentWorkspace$.getValue()?.owner;
+      const isDashboardAdmin = capabilities?.dashboards?.isDashboardAdmin !== false;
+      return isCurrentWorkspaceOwner || isDashboardAdmin;
+    }
+    return true;
+  }, [coreRefs.workspaces?.currentWorkspace$, coreRefs.application?.capabilities]);
+
   ObsDashboardStateManager.showFlyout$.next(() => () => setIsFlyoutVisible(true));
 
   const loadHomePage = () => {
@@ -95,14 +107,16 @@ export const Home = () => {
           });
           ObsDashboardStateManager.isDashboardSelected$.next(true);
         } else {
-          setObservabilityDashboardsId(null);
-          ObsDashboardStateManager.dashboardState$.next({
-            startDate: '',
-            endDate: '',
-            dashboardTitle: '',
-            dashboardId: '',
-          });
-          ObsDashboardStateManager.isDashboardSelected$.next(false);
+          if (canUpdateUiSetting) {
+            setObservabilityDashboardsId(null);
+            ObsDashboardStateManager.dashboardState$.next({
+              startDate: '',
+              endDate: '',
+              dashboardTitle: '',
+              dashboardId: '',
+            });
+            ObsDashboardStateManager.isDashboardSelected$.next(false);
+          }
         }
       })
       .catch((error) => {
@@ -316,14 +330,16 @@ export const Home = () => {
           });
           ObsDashboardStateManager.isDashboardSelected$.next(true);
         } else {
-          setObservabilityDashboardsId(null);
-          ObsDashboardStateManager.dashboardState$.next({
-            startDate: '',
-            endDate: '',
-            dashboardTitle: '',
-            dashboardId: '',
-          });
-          ObsDashboardStateManager.isDashboardSelected$.next(false);
+          if (canUpdateUiSetting) {
+            setObservabilityDashboardsId(null);
+            ObsDashboardStateManager.dashboardState$.next({
+              startDate: '',
+              endDate: '',
+              dashboardTitle: '',
+              dashboardId: '',
+            });
+            ObsDashboardStateManager.isDashboardSelected$.next(false);
+          }
         }
       })
       .catch((error) => {

diff --git a/public/framework/core_refs.ts b/public/framework/core_refs.ts
@@ -12,6 +12,7 @@ import {
   IToasts,
   OverlayStart,
   SavedObjectsClientContract,
+  WorkspacesStart,
 } from '../../../../src/core/public';
 import { DashboardStart } from '../../../../src/plugins/dashboard/public';
 import { DataSourcePluginStart } from '../../../../src/plugins/data_source/public';
@@ -38,6 +39,7 @@ class CoreRefs {
   public dataSource?: DataSourcePluginStart;
   public navigation?: NavigationPublicPluginStart;
   public contentManagement?: ContentManagementPluginStart;
+  public workspaces?: WorkspacesStart;
   private constructor() {
     // ...
   }

diff --git a/public/plugin.tsx b/public/plugin.tsx
@@ -459,6 +459,7 @@ export class ObservabilityPlugin
     coreRefs.dataSource = startDeps.dataSource;
     coreRefs.navigation = startDeps.navigation;
     coreRefs.contentManagement = startDeps.contentManagement;
+    coreRefs.workspaces = core.workspaces;
 
     // redirect trace URL based on new navigation
     if (window.location.pathname.includes(observabilityTracesID)) {