Remove workspacesEnabledSubscription

Signed-off-by: Hailong Cui <ihailong@amazon.com>
ruanyl · Oct 18, 2023 · 7de3949 · 7de3949
1 parent dcb3a60
commit 7de3949
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
@@ -104,6 +104,7 @@ export {
   StringValidationRegex,
   StringValidationRegexString,
   WorkspaceObject,
+  WorkspaceAttribute,
 } from '../types';
 
 export {

diff --git a/.../saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx b/.../saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
@@ -149,7 +149,6 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
   private _isMounted = false;
   private currentWorkspaceIdSubscription?: Subscription;
   private workspacesSubscription?: Subscription;
-  private workspacesEnabledSubscription?: Subscription;
 
   constructor(props: SavedObjectsTableProps) {
     super(props);
@@ -230,7 +229,6 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
     this.debouncedFetchObjects.cancel();
     this.currentWorkspaceIdSubscription?.unsubscribe();
     this.workspacesSubscription?.unsubscribe();
-    this.workspacesEnabledSubscription?.unsubscribe();
   }
 
   fetchCounts = async () => {
@@ -877,7 +875,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
       filteredItemCount,
       isSearching,
       savedObjectCounts,
-      availableWorkspaces: availableWorkspace,
+      availableWorkspaces,
       workspaceEnabled,
       currentWorkspaceId: workspaceId,
     } = this.state;
@@ -931,9 +929,9 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
     }
 
     // Add workspace filter
-    if (workspaceEnabled && availableWorkspace?.length) {
+    if (workspaceEnabled && availableWorkspaces?.length) {
       const wsCounts = savedObjectCounts.workspaces || {};
-      const wsFilterOptions = availableWorkspace
+      const wsFilterOptions = availableWorkspaces
         .filter((ws) => {
           return this.workspaceIdQuery?.includes(ws.id);
         })
@@ -1000,7 +998,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
             onShowRelationships={this.onShowRelationships}
             canGoInApp={this.props.canGoInApp}
             dateFormat={this.props.dateFormat}
-            availableWorkspaces={this.state.availableWorkspaces}
+            availableWorkspaces={availableWorkspaces}
           />
         </RedirectAppLinks>
       </EuiPageContent>