Skip to content

Commit 8a60b96

Browse files
BrunoQuaresmaBrunoQuaresma
committed
refactor: minor improvements on app status and statuses
1 parent bedeb47 commit 8a60b96

File tree

7 files changed

+180
-177
lines changed

7 files changed

+180
-177
lines changed

‎site/src/modules/apps/AppStatusIcon.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ export const AppStatusIcon: FC<AppStatusIconProps> = ({
2525
switch (status.state) {
2626
case "complete":
2727
return (
28-
<CircleCheckIcon className={cn([className, "text-content-success"])} />
28+
<CircleCheckIcon className={cn(["text-content-success", className])} />
2929
);
3030
case "failure":
3131
return (
32-
<CircleAlertIcon className={cn([className, "text-content-warning"])} />
32+
<CircleAlertIcon className={cn(["text-content-warning", className])} />
3333
);
3434
case "working":
3535
return latest ? (
3636
<Spinner size="sm" className="shrink-0" loading />
3737
) : (
38-
<HourglassIcon className={cn([className, "text-highlight-sky"])} />
38+
<HourglassIcon className={cn(["text-highlight-sky", className])} />
3939
);
4040
default:
4141
return (
4242
<TriangleAlertIcon
43-
className={cn([className, "text-content-secondary"])}
43+
className={cn(["text-content-secondary", className])}
4444
/>
4545
);
4646
}

‎site/src/modules/workspaces/WorkspaceAppStatus/WorkspaceAppStatus.stories.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,10 @@ export const LongMessage: Story = {
4848
},
4949
},
5050
};
51+
52+
export const Disabled: Story = {
53+
args: {
54+
status: MockWorkspaceAppStatus,
55+
disabled: true,
56+
},
57+
};

‎site/src/modules/workspaces/WorkspaceAppStatus/WorkspaceAppStatus.tsx

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
1-
import type {
2-
WorkspaceAppStatus as APIWorkspaceAppStatus,
3-
WorkspaceAppStatusState,
4-
} from "api/typesGenerated";
5-
import { Spinner } from "components/Spinner/Spinner";
1+
import type { WorkspaceAppStatus as APIWorkspaceAppStatus } from "api/typesGenerated";
62
import {
73
Tooltip,
84
TooltipContent,
95
TooltipProvider,
106
TooltipTrigger,
117
} from "components/Tooltip/Tooltip";
12-
import { CircleAlertIcon, CircleCheckIcon } from "lucide-react";
13-
import type { ReactNode } from "react";
8+
import { AppStatusIcon } from "modules/apps/AppStatusIcon";
9+
import { cn } from "utils/cn";
1410

15-
const iconByState: Record<WorkspaceAppStatusState, ReactNode> = {
16-
complete: (
17-
<CircleCheckIcon className="size-4 shrink-0 text-content-success" />
18-
),
19-
failure: <CircleAlertIcon className="size-4 shrink-0 text-content-warning" />,
20-
working: <Spinner size="sm" className="shrink-0" loading />,
11+
type WorkspaceAppStatusProps = {
12+
status: APIWorkspaceAppStatus | null;
13+
disabled?: boolean;
2114
};
2215

2316
export const WorkspaceAppStatus = ({
2417
status,
25-
}: {
26-
status: APIWorkspaceAppStatus | null;
27-
}) => {
18+
disabled,
19+
}: WorkspaceAppStatusProps) => {
2820
if (!status) {
2921
return (
3022
<span className="text-content-disabled text-sm">
@@ -39,7 +31,13 @@ export const WorkspaceAppStatus = ({
3931
<Tooltip>
4032
<TooltipTrigger asChild>
4133
<div className="flex items-center gap-2">
42-
{iconByState[status.state]}
34+
<AppStatusIcon
35+
status={status}
36+
latest
37+
className={cn({
38+
"text-content-disabled": disabled,
39+
})}
40+
/>
4341
<span className="whitespace-nowrap max-w-72 overflow-hidden text-ellipsis text-sm text-content-primary font-medium">
4442
{status.message}
4543
</span>

‎site/src/pages/WorkspacePage/AppStatuses.stories.tsx

Lines changed: 62 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import type { Meta, StoryObj } from "@storybook/react";
2+
import type { WorkspaceAppStatus } from "api/typesGenerated";
23
import {
34
MockWorkspace,
45
MockWorkspaceAgent,
56
MockWorkspaceApp,
67
MockWorkspaceAppStatus,
8+
MockWorkspaceAppStatuses,
9+
createTimestamp,
710
} from "testHelpers/entities";
811
import { withProxyProvider } from "testHelpers/storybook";
912
import { AppStatuses } from "./AppStatuses";
@@ -13,6 +16,8 @@ const meta: Meta<typeof AppStatuses> = {
1316
component: AppStatuses,
1417
args: {
1518
referenceDate: new Date("2024-03-26T15:15:00Z"),
19+
agent: mockAgent(MockWorkspaceAppStatuses),
20+
workspace: MockWorkspace,
1621
},
1722
decorators: [withProxyProvider()],
1823
};
@@ -21,163 +26,70 @@ export default meta;
2126

2227
type Story = StoryObj<typeof AppStatuses>;
2328

24-
export const Default: Story = {
29+
export const Default: Story = {};
30+
31+
// Add a story with a "Working" status as the latest
32+
export const WorkingState: Story = {
2533
args: {
26-
workspace: MockWorkspace,
27-
agent: {
28-
...MockWorkspaceAgent,
29-
apps: [
30-
{
31-
...MockWorkspaceApp,
32-
statuses: [
33-
{
34-
// This is the latest status chronologically (15:04:38)
35-
...MockWorkspaceAppStatus,
36-
id: "status-7",
37-
icon: "/emojis/1f4dd.png", // 📝
38-
message: "Creating PR with gh CLI",
39-
created_at: createTimestamp(4, 38), // 15:04:38
40-
uri: "https://github.com/coder/coder/pull/5678",
41-
state: "complete" as const,
42-
},
43-
{
44-
// (15:03:56)
45-
...MockWorkspaceAppStatus,
46-
id: "status-6",
47-
icon: "/emojis/1f680.png", // 🚀
48-
message: "Pushing branch to remote",
49-
created_at: createTimestamp(3, 56), // 15:03:56
50-
uri: "",
51-
state: "complete" as const,
52-
},
53-
{
54-
// (15:02:29)
55-
...MockWorkspaceAppStatus,
56-
id: "status-5",
57-
icon: "/emojis/1f527.png", // 🔧
58-
message: "Configuring git identity",
59-
created_at: createTimestamp(2, 29), // 15:02:29
60-
uri: "",
61-
state: "complete" as const,
62-
},
63-
{
64-
// (15:02:04)
65-
...MockWorkspaceAppStatus,
66-
id: "status-4",
67-
icon: "/emojis/1f4be.png", // 💾
68-
message: "Committing changes",
69-
created_at: createTimestamp(2, 4), // 15:02:04
70-
uri: "",
71-
state: "complete" as const,
72-
},
73-
{
74-
// (15:01:44)
75-
...MockWorkspaceAppStatus,
76-
id: "status-3",
77-
icon: "/emojis/2795.png", // +
78-
message: "Adding files to staging",
79-
created_at: createTimestamp(1, 44), // 15:01:44
80-
uri: "",
81-
state: "complete" as const,
82-
},
83-
{
84-
// (15:01:32)
85-
...MockWorkspaceAppStatus,
86-
id: "status-2",
87-
icon: "/emojis/1f33f.png", // 🌿
88-
message: "Creating a new branch for PR",
89-
created_at: createTimestamp(1, 32), // 15:01:32
90-
uri: "",
91-
state: "complete" as const,
92-
},
93-
{
94-
// (15:01:00) - Oldest
95-
...MockWorkspaceAppStatus,
96-
id: "status-1",
97-
icon: "/emojis/1f680.png", // 🚀
98-
message: "Starting to create a PR",
99-
created_at: createTimestamp(1, 0), // 15:01:00
100-
uri: "",
101-
state: "complete" as const,
102-
},
103-
].sort(
104-
(a, b) =>
105-
new Date(b.created_at).getTime() -
106-
new Date(a.created_at).getTime(),
107-
), // Ensure sorted correctly for component input if needed
108-
},
109-
],
110-
},
34+
agent: mockAgent([
35+
{
36+
// This is now the latest (15:05:15) and is "working"
37+
...MockWorkspaceAppStatus,
38+
id: "status-8",
39+
icon: "", // Let the component handle the spinner icon
40+
message: "Processing final checks...",
41+
created_at: createTimestamp(5, 15), // 15:05:15 (after referenceDate)
42+
uri: "",
43+
state: "working" as const,
44+
},
45+
...MockWorkspaceAppStatuses,
46+
]),
47+
},
48+
};
11149

112-
// Pass the reference date to the component for Storybook rendering
50+
export const LongStatusText: Story = {
51+
args: {
52+
agent: mockAgent([
53+
{
54+
// This is now the latest (15:05:15) and is "working"
55+
...MockWorkspaceAppStatus,
56+
id: "status-8",
57+
icon: "", // Let the component handle the spinner icon
58+
message:
59+
"Processing final checks with a very long message that exceeds the usual length to test how the component handles overflow and truncation in the UI. This should be long enough to ensure it wraps correctly and doesn't break the layout.",
60+
created_at: createTimestamp(5, 15), // 15:05:15 (after referenceDate)
61+
uri: "",
62+
state: "complete" as const,
63+
},
64+
...MockWorkspaceAppStatuses,
65+
]),
11366
},
11467
};
11568

116-
// Add a story with a "Working" status as the latest
117-
export const WorkingState: Story = {
69+
export const SingleStatus: Story = {
11870
args: {
119-
workspace: MockWorkspace,
120-
agent: {
121-
...MockWorkspaceAgent,
122-
apps: [
123-
{
124-
...MockWorkspaceApp,
125-
statuses: [
126-
{
127-
// This is now the latest (15:05:15) and is "working"
128-
...MockWorkspaceAppStatus,
129-
id: "status-8",
130-
icon: "", // Let the component handle the spinner icon
131-
message: "Processing final checks...",
132-
created_at: createTimestamp(5, 15), // 15:05:15 (after referenceDate)
133-
uri: "",
134-
state: "working" as const,
135-
},
136-
{
137-
// Previous latest (15:04:38)
138-
...MockWorkspaceAppStatus,
139-
id: "status-7",
140-
icon: "/emojis/1f4dd.png", // 📝
141-
message: "Creating PR with gh CLI",
142-
created_at: createTimestamp(4, 38), // 15:04:38
143-
uri: "https://github.com/coder/coder/pull/5678",
144-
state: "complete" as const,
145-
},
146-
{
147-
// (15:03:56)
148-
...MockWorkspaceAppStatus,
149-
id: "status-6",
150-
icon: "/emojis/1f680.png", // 🚀
151-
message: "Pushing branch to remote",
152-
created_at: createTimestamp(3, 56), // 15:03:56
153-
uri: "",
154-
state: "complete" as const,
155-
},
156-
// ... include other older statuses if desired ...
157-
{
158-
// (15:01:00) - Oldest
159-
...MockWorkspaceAppStatus,
160-
id: "status-1",
161-
icon: "/emojis/1f680.png", // 🚀
162-
message: "Starting to create a PR",
163-
created_at: createTimestamp(1, 0), // 15:01:00
164-
uri: "",
165-
state: "complete" as const,
166-
},
167-
].sort(
168-
(a, b) =>
169-
new Date(b.created_at).getTime() -
170-
new Date(a.created_at).getTime(),
171-
),
172-
},
173-
],
174-
},
71+
agent: mockAgent([
72+
{
73+
...MockWorkspaceAppStatus,
74+
id: "status-1",
75+
icon: "",
76+
message: "Initial setup complete.",
77+
created_at: createTimestamp(5, 10), // 15:05:10 (after referenceDate)
78+
uri: "",
79+
state: "complete" as const,
80+
},
81+
]),
17582
},
17683
};
17784

178-
function createTimestamp(minuteOffset: number, secondOffset: number) {
179-
const baseDate = new Date("2024-03-26T15:00:00Z");
180-
baseDate.setMinutes(baseDate.getMinutes() + minuteOffset);
181-
baseDate.setSeconds(baseDate.getSeconds() + secondOffset);
182-
return baseDate.toISOString();
85+
function mockAgent(statuses: WorkspaceAppStatus[]) {
86+
return {
87+
...MockWorkspaceAgent,
88+
apps: [
89+
{
90+
...MockWorkspaceApp,
91+
statuses,
92+
},
93+
],
94+
};
18395
}

‎site/src/pages/WorkspacePage/AppStatuses.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,17 @@ export const AppStatuses: FC<AppStatusesProps> = ({
103103
<div className="flex flex-col border border-solid border-border rounded-lg">
104104
<div
105105
className={`
106-
flex items-center justify-between px-4 py-3
106+
flex items-center justify-between px-4 py-3 gap-6
107107
border-0 [&:not(:last-child)]:border-b border-solid border-border
108108
`}
109109
>
110-
<div className="flex flex-col">
111-
<span className="text-sm font-medium text-content-primary flex items-center gap-2">
110+
<div className="flex flex-col overflow-hidden">
111+
<div className="text-sm font-medium text-content-primary flex items-center gap-2 ">
112112
<AppStatusIcon status={latestStatus} latest />
113-
{latestStatus.message}
114-
</span>
113+
<span className="block flex-1 whitespace-nowrap overflow-hidden text-ellipsis">
114+
{latestStatus.message}
115+
</span>
116+
</div>
115117
<span className="text-xs text-content-secondary first-letter:uppercase block pl-[26px]">
116118
{timeFrom(new Date(latestStatus.created_at), comparisonDate)}
117119
</span>
@@ -154,6 +156,7 @@ export const AppStatuses: FC<AppStatusesProps> = ({
154156
<Tooltip>
155157
<TooltipTrigger asChild>
156158
<Button
159+
disabled={otherStatuses.length === 0}
157160
size="icon"
158161
variant="subtle"
159162
onClick={() => {

‎site/src/pages/WorkspacesPage/WorkspacesTable.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,10 @@ export const WorkspacesTable: FC<WorkspacesTableProps> = ({
297297

298298
{hasActivity && (
299299
<TableCell>
300-
<WorkspaceAppStatus status={workspace.latest_app_status} />
300+
<WorkspaceAppStatus
301+
status={workspace.latest_app_status}
302+
disabled={workspace.latest_build.status !== "running"}
303+
/>
301304
</TableCell>
302305
)}
303306

0 commit comments

Comments
 (0)