diff --git a/src/plugins/workspace/public/components/utils/workspace_column.tsx b/src/plugins/workspace/public/components/utils/workspace_column.tsx
index 8a377e549da5..eeb650508794 100644
--- a/src/plugins/workspace/public/components/utils/workspace_column.tsx
+++ b/src/plugins/workspace/public/components/utils/workspace_column.tsx
@@ -8,15 +8,18 @@ import { EuiText } from '@elastic/eui';
import { CoreSetup } from 'opensearch-dashboards/public';
import useObservable from 'react-use/lib/useObservable';
import { i18n } from '@osd/i18n';
-import { SavedObjectsManagementColumn } from '../../../../saved_objects_management/public';
+import {
+ SavedObjectsManagementColumn,
+ SavedObjectsManagementRecord,
+} from '../../../../saved_objects_management/public';
interface Props {
core: CoreSetup;
workspaces?: string[];
+ record: SavedObjectsManagementRecord;
}
-function WorkspaceColumn(props: Props) {
- const { core, workspaces } = props;
+function WorkspaceColumn({ core, workspaces, record }: Props) {
const workspaceList = useObservable(core.workspaces.client.workspaceList$);
const wsLookup =
@@ -28,11 +31,15 @@ function WorkspaceColumn(props: Props) {
wsLookup.set('public', publicWsName);
+ if (record?.type === 'workspace') {
+ return null;
+ }
+
if (workspaces) {
- const wsNameList = workspaces.map((wsId) => wsLookup.get(wsId));
- return {wsNameList.join(' | ')};
+ const wsNameList = workspaces?.map((wsId) => wsLookup.get(wsId));
+ return {wsNameList.join(' | ')};
} else {
- return {publicWsName};
+ return {publicWsName};
}
}
@@ -41,11 +48,12 @@ export const getWorkspaceColumn = (core: CoreSetup): SavedObjectsManagementColum
id: 'workspace_column',
euiColumn: {
field: 'workspaces',
+ dataType: 'string',
name: i18n.translate('savedObjectsManagement.objectsTable.table.columnWorkspacesName', {
defaultMessage: 'Workspaces',
}),
- render: (workspaces?: string[]) => {
- return ;
+ render: (workspaces: string[], record: SavedObjectsManagementRecord) => {
+ return ;
},
},
loadData: () => Promise.resolve(''),