Skip to content

fix: update workspace table icons in WorkspacesTable #18525

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
Jun 24, 2025
Merged

fix: update workspace table icons in WorkspacesTable #18525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eca4407
fix: WorkspacesTable: update icons to differentiate between updateAnd…
johnstcn Jun 24, 2025
42b3539
chore: WorkspacePageView: update storybook
johnstcn Jun 24, 2025
6f902e0
add outdated suffix to oudated workspcaes
johnstcn Jun 24, 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
58 changes: 54 additions & 4 deletions site/src/pages/WorkspacesPage/WorkspacesPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
import { WorkspacesPageView } from "./WorkspacesPageView";

const createWorkspace = (
name: string,
status: WorkspaceStatus,
outdated = false,
lastUsedAt = "0001-01-01",
Expand All @@ -42,6 +43,7 @@ const createWorkspace = (
return {
...MockWorkspace,
id: uniqueId("workspace"),
name: name,
outdated,
latest_build: {
...MockWorkspace.latest_build,
Expand All @@ -59,17 +61,50 @@ const createWorkspace = (

// This is type restricted to prevent future statuses from slipping
// through the cracks unchecked!
const workspaces = WorkspaceStatuses.map((status) => createWorkspace(status));
const workspaces = WorkspaceStatuses.map((status) =>
createWorkspace(status, status),
);

// Additional Workspaces depending on time
const additionalWorkspaces: Record<string, Workspace> = {
today: createWorkspace(
"running-outdated",
"running",
true,
dayjs().subtract(3, "hour").toString(),
),
old: createWorkspace("running", true, dayjs().subtract(1, "week").toString()),
old: createWorkspace(
"old-outdated",
"running",
true,
dayjs().subtract(1, "week").toString(),
),
oldStopped: createWorkspace(
"old-stopped-outdated",
"stopped",
true,
dayjs().subtract(1, "week").toString(),
),
oldRequireActiveVersion: {
...createWorkspace(
"old-require-active-version-outdated",
"running",
true,
dayjs().subtract(1, "week").toString(),
),
template_require_active_version: true,
},
oldStoppedRequireActiveVersion: {
...createWorkspace(
"old-stopped-require-active-version-outdated",
"stopped",
true,
dayjs().subtract(1, "week").toString(),
),
template_require_active_version: true,
},
veryOld: createWorkspace(
"very-old-running-outdated",
"running",
true,
dayjs().subtract(1, "month").subtract(4, "day").toString(),
Expand All @@ -78,12 +113,14 @@ const additionalWorkspaces: Record<string, Workspace> = {

const dormantWorkspaces: Record<string, Workspace> = {
dormantNoDelete: createWorkspace(
"dormant-no-delete",
"stopped",
false,
dayjs().subtract(1, "month").toString(),
dayjs().subtract(1, "month").toString(),
),
dormantAutoDelete: createWorkspace(
"dormant-auto-delete",
"stopped",
false,
dayjs().subtract(1, "month").toString(),
Expand Down Expand Up @@ -245,7 +282,7 @@ export const UnhealthyWorkspace: Story = {
args: {
workspaces: [
{
...createWorkspace("running"),
...createWorkspace("unhealthy", "running"),
health: {
healthy: false,
failing_agents: [],
Expand Down Expand Up @@ -282,6 +319,7 @@ export const MultipleApps: Story = {
workspaces: [
{
...MockWorkspace,
name: "multiple-apps",
latest_build: {
...MockWorkspace.latest_build,
resources: [
Expand Down Expand Up @@ -315,7 +353,13 @@ export const MultipleApps: Story = {

export const ShowOrganizations: Story = {
args: {
workspaces: [{ ...MockWorkspace, organization_name: "limbus-co" }],
workspaces: [
{
...MockWorkspace,
name: "other-org-workspace",
organization_name: "limbus-co",
},
],
},

parameters: {
Expand Down Expand Up @@ -347,6 +391,7 @@ export const WithLatestAppStatus: Story = {
workspaces: [
{
...MockWorkspace,
name: "long-app-status",
latest_app_status: {
...MockWorkspaceAppStatus,
message:
Expand All @@ -355,10 +400,12 @@ export const WithLatestAppStatus: Story = {
},
{
...MockWorkspace,
name: "no-app-status",
latest_app_status: null,
},
{
...MockWorkspace,
name: "app-status-working",
latest_app_status: {
...MockWorkspaceAppStatus,
state: "working",
Expand All @@ -367,6 +414,7 @@ export const WithLatestAppStatus: Story = {
},
{
...MockWorkspace,
name: "app-status-failure",
latest_app_status: {
...MockWorkspaceAppStatus,
state: "failure",
Expand All @@ -381,6 +429,7 @@ export const WithLatestAppStatus: Story = {
resources: [],
},
},
name: "stopped-app-status-failure",
latest_app_status: {
...MockWorkspaceAppStatus,
state: "failure",
Expand All @@ -390,6 +439,7 @@ export const WithLatestAppStatus: Story = {
},
{
...MockWorkspace,
name: "app-status-working-with-uri",
latest_app_status: {
...MockWorkspaceAppStatus,
state: "working",
Expand Down
43 changes: 42 additions & 1 deletion site/src/pages/WorkspacesPage/WorkspacesTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ import { ExternalLinkIcon, FileIcon, StarIcon } from "lucide-react";
import { EllipsisVertical } from "lucide-react";
import {
BanIcon,
CirclePlayIcon,
CloudIcon,
PlayIcon,
RefreshCcwIcon,
SquareIcon,
Expand Down Expand Up @@ -558,7 +560,46 @@ const WorkspaceActionsCell: FC<WorkspaceActionsCellProps> = ({
isLoading={workspaceUpdate.isUpdating}
label="Update and start workspace"
>
<PlayIcon />
<CloudIcon />
</PrimaryAction>
<WorkspaceUpdateDialogs {...workspaceUpdate.dialogs} />
</>
)}

{abilities.actions.includes("updateAndStartRequireActiveVersion") && (
<>
<PrimaryAction
onClick={workspaceUpdate.update}
isLoading={workspaceUpdate.isUpdating}
label="This template requires automatic updates on workspace startup. Contact your administrator if you want to preserve the template version."
>
<CirclePlayIcon />
</PrimaryAction>
<WorkspaceUpdateDialogs {...workspaceUpdate.dialogs} />
</>
)}

{abilities.actions.includes("updateAndRestart") && (
<>
<PrimaryAction
onClick={workspaceUpdate.update}
isLoading={workspaceUpdate.isUpdating}
label="Update and restart workspace"
>
<CloudIcon />
</PrimaryAction>
<WorkspaceUpdateDialogs {...workspaceUpdate.dialogs} />
</>
)}

{abilities.actions.includes("updateAndRestartRequireActiveVersion") && (
<>
<PrimaryAction
onClick={workspaceUpdate.update}
isLoading={workspaceUpdate.isUpdating}
label="This template requires automatic updates on workspace restart. Contact your administrator if you want to preserve the template version."
>
<CirclePlayIcon />
</PrimaryAction>
<WorkspaceUpdateDialogs {...workspaceUpdate.dialogs} />
</>
Expand Down
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy