workspace filter

Signed-off-by: Hailong Cui <ihailong@amazon.com>

src/core/public/index.ts

@@ -93,7 +93,7 @@ import { WorkspacesStart, WorkspacesSetup } from './workspace';
 export { PackageInfo, EnvironmentMode } from '../server/types';
 /** @interal */
 export { CoreContext, CoreSystem } from './core_system';
-export { DEFAULT_APP_CATEGORIES, GLOBAL_WORKSPACE_ID } from '../utils';
+export { DEFAULT_APP_CATEGORIES } from '../utils';
 export {
   AppCategory,
   UiSettingsParams,

src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx

@@ -188,15 +188,23 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
   }
 
   private get workspaceIdQuery() {
-    const { availableWorkspace } = this.state;
-    return availableWorkspace?.map((ws) => ws.id) ?? [GLOBAL_WORKSPACE_ID];
-    // return this.state.workspaceId
-      ? Array.from(new Set([PUBLIC_WORKSPACE, this.state.workspaceId]))
-      : undefined;
+    const { availableWorkspace, workspaceId } = this.state;
+    // workspace is turned off
+    if (!availableWorkspace?.length) {
+      return undefined;
+    }
+    if (!workspaceId) {
+      return availableWorkspace.map((ws) => ws.id);
+    } else if (workspaceId === PUBLIC_WORKSPACE) {
+      return [PUBLIC_WORKSPACE];
+    } else {
+      return [workspaceId, PUBLIC_WORKSPACE];
+    }
   }
 
   private get wsNameIdLookup() {
     const { availableWorkspace } = this.state;
+    //  Assumption: workspace name is unique across the system
     return availableWorkspace?.reduce((map, ws) => {
       return map.set(ws.name, ws.id);
     }, new Map<string, string>());
@@ -239,7 +247,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
     }
     if (visibleWorkspaces?.length) {
       filteredCountOptions.workspaces = visibleWorkspaces.map(
-        (wsName) => this.wsNameIdLookup?.get(wsName) || GLOBAL_WORKSPACE_ID
+        (wsName) => this.wsNameIdLookup?.get(wsName) || PUBLIC_WORKSPACE
       );
     }
 
@@ -275,12 +283,6 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
       countOptions.namespacesToInclude = availableNamespaces;
     }
 
-    if (visibleWorkspaces?.length) {
-      countOptions.workspaces = visibleWorkspaces.map(
-        (wsName) => this.wsNameIdLookup?.get(wsName) || GLOBAL_WORKSPACE_ID
-      );
-    }
-
     // Fetch all the saved objects that exist so we can accurately populate the counts within
     // the table filter dropdown.
     const savedObjectCounts = await getSavedObjectCounts(this.props.http, countOptions);
@@ -307,13 +309,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
     );
 
     this.workspacesSubscription = workspaceClient.workspaceList$.subscribe((workspaceList) => {
-      // TOOD remove this one
-      const availableWorkspace = workspaceList.concat({
-        id: GLOBAL_WORKSPACE_ID,
-        name: GLOBAL_WORKSPACE_ID,
-      });
-
-      this.setState({ availableWorkspace });
+      this.setState({ availableWorkspace: workspaceList });
     });
   };
 
@@ -345,7 +341,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
 
     if (visibleWorkspaces?.length) {
       const workspaceIds: string[] = visibleWorkspaces.map(
-        (wsName) => this.wsNameIdLookup?.get(wsName) || GLOBAL_WORKSPACE_ID
+        (wsName) => this.wsNameIdLookup?.get(wsName) || PUBLIC_WORKSPACE
       );
       findOptions.workspaces = workspaceIds;
     }
@@ -990,14 +986,17 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
     // Add workspace filter
     if (availableWorkspace?.length) {
       const wsCounts = savedObjectCounts.workspaces || {};
-      // this will include public workspace
-      const wsFilterOptions = availableWorkspace.map((ws) => {
-        return {
-          name: ws.name,
-          value: ws.name,
-          view: `${ws.name} (${wsCounts[ws.id] || 0})`,
-        };
-      });
+      const wsFilterOptions = availableWorkspace
+        .filter((ws) => {
+          return this.workspaceIdQuery?.includes(ws.id);
+        })
+        .map((ws) => {
+          return {
+            name: ws.name,
+            value: ws.name,
+            view: `${ws.name} (${wsCounts[ws.id] || 0})`,
+          };
+        });
 
       filters.push({
         type: 'field_value_selection',