Skip to content

Commit 207094a

Browse files
committed
Minor fixes
1 parent 3b5f20b commit 207094a

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

site/src/modules/workspaces/WorkspaceMoreActions/WorkspaceMoreActions.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ export const WorkspaceMoreActions: FC<WorkspaceMoreActionsProps> = ({
8282

8383
<DropdownMenuContent id="workspace-options" align="end">
8484
<DropdownMenuItem asChild>
85-
<RouterLink to="settings">
85+
<RouterLink
86+
to={`/@${workspace.owner_name}/${workspace.name}/settings`}
87+
>
8688
<SettingsIcon />
8789
Settings
8890
</RouterLink>

site/src/pages/WorkspacesPage/WorkspacesTable.tsx

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import dayjs from "dayjs";
5252
import relativeTime from "dayjs/plugin/relativeTime";
5353
import { useAuthenticated } from "hooks";
5454
import { useClickableTableRow } from "hooks/useClickableTableRow";
55-
import { ChevronRightIcon } from "lucide-react";
55+
import { ChevronRightIcon, EllipsisVertical } from "lucide-react";
5656
import {
5757
BanIcon,
5858
PlayIcon,
@@ -377,8 +377,13 @@ const TableLoader: FC<TableLoaderProps> = ({ canCheckWorkspaces }) => {
377377
<TableCell className="w-2/6">
378378
<Skeleton variant="text" width="50%" />
379379
</TableCell>
380-
<TableCell className="w-0">
381-
<Skeleton variant="rounded" width={40} height={40} />
380+
<TableCell className="w-0 ">
381+
<div className="flex gap-1 justify-end">
382+
<Skeleton variant="rounded" width={40} height={40} />
383+
<Button size="icon-lg" variant="subtle" disabled>
384+
<EllipsisVertical aria-hidden="true" />
385+
</Button>
386+
</div>
382387
</TableCell>
383388
</TableRowSkeleton>
384389
</TableLoaderSkeleton>
@@ -527,7 +532,12 @@ const WorkspaceActionsCell: FC<WorkspaceActionsCellProps> = ({
527532
};
528533

529534
return (
530-
<TableCell>
535+
<TableCell
536+
onClick={(e) => {
537+
// Prevent the click in the actions to trigger the row click
538+
e.stopPropagation();
539+
}}
540+
>
531541
<div className="flex gap-1 justify-end">
532542
{workspace.latest_build.status === "running" && (
533543
<WorkspaceApps workspace={workspace} />
@@ -601,14 +611,7 @@ const PrimaryAction: FC<PrimaryActionProps> = ({
601611
<TooltipProvider>
602612
<Tooltip>
603613
<TooltipTrigger asChild>
604-
<Button
605-
variant="outline"
606-
size="icon-lg"
607-
onClick={(e) => {
608-
e.stopPropagation();
609-
onClick();
610-
}}
611-
>
614+
<Button variant="outline" size="icon-lg" onClick={onClick}>
612615
<Spinner loading={isLoading}>{children}</Spinner>
613616
<span className="sr-only">{label}</span>
614617
</Button>

0 commit comments

Comments
 (0)