Skip to content

Commit

Permalink
fix: workspace card issue
Browse files Browse the repository at this point in the history
  • Loading branch information
keita-determined committed Mar 22, 2023
1 parent 8944890 commit a96340c
Showing 1 changed file with 30 additions and 25 deletions.
55 changes: 30 additions & 25 deletions webui/react/src/pages/WorkspaceList/WorkspaceCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,41 @@ const WorkspaceCard: React.FC<Props> = ({ workspace, fetchWorkspaces }: Props) =
if (workspace.archived) classnames.push(css.archived);

return (
<Card
actionMenu={!workspace.immutable ? menuProps : undefined}
href={paths.workspaceDetails(workspace.id)}
size="medium">
<div className={classnames.join(' ')}>
<div className={css.icon}>
<DynamicIcon name={workspace.name} size={78} />
</div>
<div className={css.info}>
<div className={css.nameRow}>
<Typography.Title className={css.name} ellipsis={{ rows: 1, tooltip: true }} level={5}>
{workspace.name}
</Typography.Title>
{workspace.pinned && <PushpinOutlined className={css.pinned} />}
<>
<Card
actionMenu={!workspace.immutable ? menuProps : undefined}
href={paths.workspaceDetails(workspace.id)}
size="medium">
<div className={classnames.join(' ')}>
<div className={css.icon}>
<DynamicIcon name={workspace.name} size={78} />
</div>
<p className={css.projects}>
{workspace.numProjects} {pluralizer(workspace.numProjects, 'project')}
</p>
<div className={css.avatarRow}>
<div className={css.avatar}>
<Spinner conditionalRender spinning={Loadable.isLoading(user)}>
{Loadable.isLoaded(user) && <Avatar user={user.data} />}
</Spinner>
<div className={css.info}>
<div className={css.nameRow}>
<Typography.Title
className={css.name}
ellipsis={{ rows: 1, tooltip: true }}
level={5}>
{workspace.name}
</Typography.Title>
{workspace.pinned && <PushpinOutlined className={css.pinned} />}
</div>
<p className={css.projects}>
{workspace.numProjects} {pluralizer(workspace.numProjects, 'project')}
</p>
<div className={css.avatarRow}>
<div className={css.avatar}>
<Spinner conditionalRender spinning={Loadable.isLoading(user)}>
{Loadable.isLoaded(user) && <Avatar user={user.data} />}
</Spinner>
</div>
{workspace.archived && <div className={css.archivedBadge}>Archived</div>}
</div>
{workspace.archived && <div className={css.archivedBadge}>Archived</div>}
</div>
</div>
</div>
</Card>
{contextHolders}
</Card>
</>
);
};

Expand Down

0 comments on commit a96340c

Please sign in to comment.