optimize code

Signed-off-by: yubonluo <yubonluo@amazon.com>
ruanyl · Apr 15, 2024 · 991971e · 991971e
1 parent d176011
commit 991971e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/src/plugins/opensearch_dashboards_overview/public/plugin.ts b/src/plugins/opensearch_dashboards_overview/public/plugin.ts
@@ -84,13 +84,13 @@ export class OpenSearchDashboardsOverviewPlugin
             return {
               status: AppStatus.inaccessible,
               navLinkStatus: AppNavLinkStatus.hidden,
-              workspaceless: true,
+              workspaceAccessibility: WorkspaceAccessibility.NO,
             };
           } else {
             return {
               status: AppStatus.accessible,
               navLinkStatus: AppNavLinkStatus.default,
-              workspaceless: true,
+              workspaceAccessibility: WorkspaceAccessibility.NO,
             };
           }
         };

diff --git a/src/plugins/workspace/public/utils.test.ts b/src/plugins/workspace/public/utils.test.ts
@@ -139,7 +139,7 @@ describe('workspace utils: getSelectedFeatureQuantities', () => {
       navLinkStatus: 1,
       order: -2000,
       status: 0,
-      workspaceless: true,
+      workspaceAccessibility: WorkspaceAccessibility.NO,
     },
   ] as PublicAppInfo[];
   it('should support * rules and exclude management category', () => {

diff --git a/src/plugins/workspace/public/utils.ts b/src/plugins/workspace/public/utils.ts
@@ -71,15 +71,19 @@ export const featureMatchesConfig = (featureConfigs: string[]) => ({
 
 // Get all apps excluding management category
 export const getAllExcludingManagementApps = (applications: PublicAppInfo[]): PublicAppInfo[] => {
-  return applications.filter(({ navLinkStatus, chromeless, category, workspaceless, id }) => {
-    const filterCondition =
-      navLinkStatus !== AppNavLinkStatus.hidden && !chromeless && !workspaceless;
-    if (category?.id === DEFAULT_APP_CATEGORIES.management.id) {
-      return filterCondition && id === 'management';
-    } else {
-      return filterCondition;
+  return applications.filter(
+    ({ navLinkStatus, chromeless, category, workspaceAccessibility, id }) => {
+      const filterCondition =
+        navLinkStatus !== AppNavLinkStatus.hidden &&
+        !chromeless &&
+        workspaceAccessibility !== WorkspaceAccessibility.NO;
+      if (category?.id === DEFAULT_APP_CATEGORIES.management.id) {
+        return filterCondition && id === 'management';
+      } else {
+        return filterCondition;
+      }
     }
-  });
+  );
 };
 
 export const getSelectedFeatureQuantities = (