resolve comments

Signed-off-by: Qxisylolo <[email protected]>
opensearch-project · Oct 31, 2024 · 495fe77 · 495fe77
1 parent fa77ff3
commit 495fe77
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/plugins/data_source/server/saved_objects/data_source.ts b/src/plugins/data_source/server/saved_objects/data_source.ts
@@ -16,7 +16,7 @@ export const dataSource: SavedObjectsType = {
   namespaceType: 'agnostic',
   hidden: false,
   management: {
-    icon: 'database', // todo: pending ux #2034
+    icon: 'database',
     defaultSearchField: 'title',
     importableAndExportable: true,
     getTitle(obj) {

diff --git a/...aved_objects_management/public/management_section/objects_table/components/table.test.tsx b/...aved_objects_management/public/management_section/objects_table/components/table.test.tsx
@@ -84,7 +84,7 @@ const defaultProps: TableProps = {
   canGoInApp: () => true,
   pageIndex: 1,
   pageSize: 2,
-  workspaceIdNameMap: new Map([
+  workspaceNameIdLookup: new Map([
     ['test1', 'jVyiM7'],
     ['test2', '8rZ0OL'],
     ['test3', 'evIuNZ'],

diff --git a/...ins/saved_objects_management/public/management_section/objects_table/components/table.tsx b/...ins/saved_objects_management/public/management_section/objects_table/components/table.tsx
@@ -81,7 +81,7 @@ export interface TableProps {
   pageIndex: number;
   pageSize: number;
   items: SavedObjectWithMetadata[];
-  workspaceIdNameMap: Map<string, string>;
+  workspaceNameIdLookup: Map<string, string>;
   itemId: string | (() => string);
   totalItemCount: number;
   onQueryChange: (query: any, filterFields: string[]) => void;
@@ -188,7 +188,7 @@ export class Table extends PureComponent<TableProps, TableState> {
       pageSize,
       itemId,
       items,
-      workspaceIdNameMap,
+      workspaceNameIdLookup,
       totalItemCount,
       isSearching,
       filters,
@@ -313,7 +313,7 @@ export class Table extends PureComponent<TableProps, TableState> {
           const displayedWorkspaces = workspaces.slice(0, 1);
           const remainingWorkspaces = workspaces.length - 1;
           const getWorkspaceNameById = (workspaceId: string) => {
-            for (const [name, id] of workspaceIdNameMap) {
+            for (const [name, id] of workspaceNameIdLookup) {
               if (id === workspaceId) {
                 return name;
               }

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
@@ -161,7 +161,6 @@ export interface SavedObjectsTableState {
   isIncludeReferencesDeepChecked: boolean;
   currentWorkspace?: WorkspaceObject;
   workspaceEnabled: boolean;
-  workspaceIdNameMap: Map<string, string>;
   availableWorkspaces?: WorkspaceAttribute[];
   isShowingDuplicateResultFlyout: boolean;
   failedCopies: SavedObjectsImportError[];
@@ -202,7 +201,6 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
       exportAllOptions: [],
       exportAllSelectedOptions: {},
       isIncludeReferencesDeepChecked: true,
-      workspaceIdNameMap: new Map<string, string>(),
       currentWorkspace: this.props.workspaces.currentWorkspace$.getValue(),
       availableWorkspaces: this.props.workspaces.workspaceList$.getValue(),
       workspaceEnabled: this.props.applications.capabilities.workspaces.enabled,
@@ -380,7 +378,6 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
     this.workspacesSubscription = workspace.workspaceList$.subscribe((workspaceList) => {
       this.setState({ availableWorkspaces: workspaceList });
     });
-    this.setState({ workspaceIdNameMap: this.workspaceNameIdLookup });
   };
 
   unSubscribeWorkspace = () => {
@@ -1085,7 +1082,6 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
       page,
       perPage,
       savedObjects,
-      workspaceIdNameMap,
       filteredItemCount,
       isSearching,
       savedObjectCounts,
@@ -1225,7 +1221,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
             pageIndex={page}
             pageSize={perPage}
             items={savedObjects}
-            workspaceIdNameMap={workspaceIdNameMap}
+            workspaceIdNameMap={this.workspaceNameIdLookup}
             totalItemCount={filteredItemCount}
             isSearching={isSearching}
             onShowRelationships={this.onShowRelationships}