Skip to content

Commit

Permalink
show workspace column as empty for workpace itself
Browse files Browse the repository at this point in the history
Signed-off-by: Hailong Cui <ihailong@amazon.com>
  • Loading branch information
Hailong-am committed Jul 13, 2023
1 parent 9242e5e commit 43d1f56
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions src/plugins/workspace/public/components/utils/workspace_column.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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 <EuiText>{wsNameList.join(' | ')}</EuiText>;
const wsNameList = workspaces?.map((wsId) => wsLookup.get(wsId));
return <EuiText size="s">{wsNameList.join(' | ')}</EuiText>;
} else {
return <EuiText>{publicWsName}</EuiText>;
return <EuiText size="s">{publicWsName}</EuiText>;
}
}

Expand All @@ -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 <WorkspaceColumn core={core} workspaces={workspaces} />;
render: (workspaces: string[], record: SavedObjectsManagementRecord) => {
return <WorkspaceColumn core={core} workspaces={workspaces} record={record} />;
},
},
loadData: () => Promise.resolve(''),
Expand Down

0 comments on commit 43d1f56

Please sign in to comment.