Skip to content

refactor: update the workspace table design #17404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 15, 2025
+204 −250
Merged

refactor: update the workspace table design #17404

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3bd2a0
refactor: update the workspace table design
BrunoQuaresma Apr 15, 2025
62a89d8
FMT
BrunoQuaresma Apr 15, 2025
244d1cf
Fixes
BrunoQuaresma Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions site/src/hooks/useClickableTableRow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* It might not make sense to test this hook until the underlying design
* problems are fixed.
*/
import { type CSSObject, useTheme } from "@emotion/react";
import type { TableRowProps } from "@mui/material/TableRow";
import type { MouseEventHandler } from "react";
import { cn } from "utils/cn";
import {
type ClickableAriaRole,
type UseClickableResult,
Expand All @@ -26,7 +26,7 @@ type UseClickableTableRowResult<
TRole extends ClickableAriaRole = ClickableAriaRole,
> = UseClickableResult<HTMLTableRowElement, TRole> &
TableRowProps & {
css: CSSObject;
className: string;
hover: true;
onAuxClick: MouseEventHandler<HTMLTableRowElement>;
};
Expand Down Expand Up @@ -54,23 +54,13 @@ export const useClickableTableRow = <
onAuxClick: externalOnAuxClick,
}: UseClickableTableRowConfig<TRole>): UseClickableTableRowResult<TRole> => {
const clickableProps = useClickable(onClick, (role ?? "button") as TRole);
const theme = useTheme();

return {
...clickableProps,
css: {
cursor: "pointer",

"&:focus": {
outline: `1px solid ${theme.palette.primary.main}`,
outlineOffset: -1,
},

"&:last-of-type": {
borderBottomLeftRadius: 8,
borderBottomRightRadius: 8,
},
},
className: cn([
"cursor-pointer hover:outline focus:outline -outline-offset-1 outline-border-hover",
"first:rounded-t-md last:rounded-b-md",
]),
hover: true,
onDoubleClick,
onAuxClick: (event) => {
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/TemplatesPage/TemplatesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const TemplateRow: FC<TemplateRowProps> = ({
);
const navigate = useNavigate();

const { css: clickableCss, ...clickableRow } = useClickableTableRow({
const clickableRow = useClickableTableRow({
onClick: () => navigate(templatePageLink),
});

Expand All @@ -111,7 +111,7 @@ const TemplateRow: FC<TemplateRowProps> = ({
key={template.id}
data-testid={`template-${template.id}`}
{...clickableRow}
css={[clickableCss, styles.tableRow]}
css={styles.tableRow}
>
<TableCell>
<AvatarData
Expand Down
5 changes: 1 addition & 4 deletions site/src/pages/WorkspacesPage/LastUsed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useTheme } from "@emotion/react";
import { Stack } from "components/Stack/Stack";
import { StatusIndicatorDot } from "components/StatusIndicator/StatusIndicator";
import dayjs from "dayjs";
Expand All @@ -12,8 +11,6 @@ interface LastUsedProps {
}

export const LastUsed: FC<LastUsedProps> = ({ lastUsedAt }) => {
const theme = useTheme();

const [circle, message] = useTime(() => {
const t = dayjs(lastUsedAt);
const now = dayjs();
Expand All @@ -40,7 +37,7 @@ export const LastUsed: FC<LastUsedProps> = ({ lastUsedAt }) => {

return (
<Stack
style={{ color: theme.palette.text.secondary }}
className="text-content-secondary"
direction="row"
spacing={1}
alignItems="center"
Expand Down
Loading
Loading