Skip to content

refactor: replace badge by status indicator #17811

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.

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 2 commits into from
May 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 11 additions & 13 deletions site/e2e/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export const createWorkspace = async (
const user = currentUser(page);
await expectUrl(page).toHavePathName(`/@${user.username}/${name}`);

await page.waitForSelector("[data-testid='build-status'] >> text=Running", {
await page.waitForSelector("text=Workspace status: Running", {
state: "visible",
});
return name;
Expand Down Expand Up @@ -364,7 +364,7 @@ export const stopWorkspace = async (page: Page, workspaceName: string) => {

await page.getByTestId("workspace-stop-button").click();

await page.waitForSelector("*[data-testid='build-status'] >> text=Stopped", {
await page.waitForSelector("text=Workspace status: Stopped", {
state: "visible",
});
};
Expand All @@ -389,7 +389,7 @@ export const buildWorkspaceWithParameters = async (
await page.getByTestId("confirm-button").click();
}

await page.waitForSelector("*[data-testid='build-status'] >> text=Running", {
await page.waitForSelector("text=Workspace status: Running", {
state: "visible",
});
};
Expand All @@ -412,11 +412,12 @@ export const startAgent = async (
export const downloadCoderVersion = async (
version: string,
): Promise<string> => {
if (version.startsWith("v")) {
version = version.slice(1);
let versionNumber = version;
if (versionNumber.startsWith("v")) {
versionNumber = versionNumber.slice(1);
}

const binaryName = `coder-e2e-${version}`;
const binaryName = `coder-e2e-${versionNumber}`;
const tempDir = "/tmp/coder-e2e-cache";
// The install script adds `./bin` automatically to the path :shrug:
const binaryPath = path.join(tempDir, "bin", binaryName);
Expand All @@ -438,7 +439,7 @@ export const downloadCoderVersion = async (
path.join(__dirname, "../../install.sh"),
[
"--version",
version,
versionNumber,
"--method",
"standalone",
"--prefix",
Expand Down Expand Up @@ -551,11 +552,8 @@ const emptyPlan = new TextEncoder().encode("{}");
* converts it into an uploadable tar file.
*/
const createTemplateVersionTar = async (
responses?: EchoProvisionerResponses,
responses: EchoProvisionerResponses = {},
): Promise<Buffer> => {
if (!responses) {
responses = {};
}
if (!responses.parse) {
responses.parse = [
{
Expand Down Expand Up @@ -1012,7 +1010,7 @@ export const updateWorkspace = async (
await fillParameters(page, richParameters, buildParameters);
await page.getByRole("button", { name: /update parameters/i }).click();

await page.waitForSelector("*[data-testid='build-status'] >> text=Running", {
await page.waitForSelector("text=Workspace status: Running", {
state: "visible",
});
};
Expand All @@ -1031,7 +1029,7 @@ export const updateWorkspaceParameters = async (
await fillParameters(page, richParameters, buildParameters);
await page.getByRole("button", { name: /submit and restart/i }).click();

await page.waitForSelector("*[data-testid='build-status'] >> text=Running", {
await page.waitForSelector("text=Workspace status: Running", {
state: "visible",
});
};
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
import type { Meta, StoryObj } from "@storybook/react";
import type { Workspace, WorkspaceStatus } from "api/typesGenerated";
import { MockWorkspace } from "testHelpers/entities";
import { WorkspaceStatusIndicator } from "./WorkspaceStatusIndicator";

const meta: Meta<typeof WorkspaceStatusIndicator> = {
title: "modules/workspaces/WorkspaceStatusIndicator",
component: WorkspaceStatusIndicator,
};

export default meta;
type Story = StoryObj<typeof WorkspaceStatusIndicator>;

const createWorkspaceWithStatus = (status: WorkspaceStatus): Workspace => {
return {
...MockWorkspace,
latest_build: {
...MockWorkspace.latest_build,
status,
},
} as Workspace;
};

export const Running: Story = {
args: {
workspace: createWorkspaceWithStatus("running"),
},
};

export const Stopped: Story = {
args: {
workspace: createWorkspaceWithStatus("stopped"),
},
};

export const Starting: Story = {
args: {
workspace: createWorkspaceWithStatus("starting"),
},
};

export const Stopping: Story = {
args: {
workspace: createWorkspaceWithStatus("stopping"),
},
};

export const Failed: Story = {
args: {
workspace: createWorkspaceWithStatus("failed"),
},
};

export const Canceling: Story = {
args: {
workspace: createWorkspaceWithStatus("canceling"),
},
};

export const Canceled: Story = {
args: {
workspace: createWorkspaceWithStatus("canceled"),
},
};

export const Deleting: Story = {
args: {
workspace: createWorkspaceWithStatus("deleting"),
},
};

export const Deleted: Story = {
args: {
workspace: createWorkspaceWithStatus("deleted"),
},
};

export const Pending: Story = {
args: {
workspace: createWorkspaceWithStatus("pending"),
},
};
Loading
Loading