Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

fix(site): update workspace timings to use theme colors#15269

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
BrunoQuaresma merged 2 commits intomainfrombq/fix-timeline-theme
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes fromall 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
6 changes: 3 additions & 3 deletionssite/src/modules/workspaces/WorkspaceTiming/Chart/Bar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,15 +91,15 @@ const styles = {
left: -8,
},
}),
clickable: {
clickable:(theme) => ({
cursor: "pointer",
// We need to make the bar width at least 34px to allow the "..." icons to be displayed.
// The calculation is border * 1 + side paddings * 2 + icon width (which is 18px)
minWidth: 34,

"&:focus, &:hover, &:active": {
outline: "none",
borderColor:"#38BDF8",
borderColor:theme.roles.active.outline,
},
},
}),
} satisfies Record<string, Interpolation<Theme>>;
14 changes: 7 additions & 7 deletionssite/src/modules/workspaces/WorkspaceTiming/Chart/Blocks.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,22 +52,22 @@ const styles = {
gap: spaceBetweenBlocks,
alignItems: "center",
},
block: {
block:(theme) => ({
borderRadius: 4,
height: 18,
backgroundColor:"#082F49",
border:"1px solid#38BDF8",
backgroundColor:theme.roles.active.background,
border:`1px solid${theme.roles.active.outline}`,
flexShrink: 0,
flex: 1,
},
more: {
color:"#38BDF8",
}),
more:(theme) => ({
color:theme.roles.active.outline,
lineHeight: 0,
flexShrink: 0,
flex: 1,

"& svg": {
fontSize: moreIconSize,
},
},
}),
} satisfies Record<string, Interpolation<Theme>>;
58 changes: 31 additions & 27 deletionssite/src/modules/workspaces/WorkspaceTiming/ResourcesChart.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,33 +32,6 @@ import {
} from "./Chart/utils";
import type { StageCategory } from "./StagesChart";

const legendsByAction: Record<string, ChartLegend> = {
"state refresh": {
label: "state refresh",
},
create: {
label: "create",
colors: {
fill: "#022C22",
stroke: "#BBF7D0",
},
},
delete: {
label: "delete",
colors: {
fill: "#422006",
stroke: "#FDBA74",
},
},
read: {
label: "read",
colors: {
fill: "#082F49",
stroke: "#38BDF8",
},
},
};

type ResourceTiming = {
name: string;
source: string;
Expand DownExpand Up@@ -86,6 +59,8 @@ export const ResourcesChart: FC<ResourcesChartProps> = ({
const visibleTimings = timings.filter(
(t) => !isCoderResource(t.name) && t.name.includes(filter),
);
const theme = useTheme();
const legendsByAction = getLegendsByAction(theme);
const visibleLegends = [...new Set(visibleTimings.map((t) => t.action))].map(
(a) => legendsByAction[a],
);
Expand DownExpand Up@@ -168,3 +143,32 @@ export const isCoderResource = (resource: string) => {
resource.startsWith("coder_")
);
};

function getLegendsByAction(theme: Theme): Record<string, ChartLegend> {
return {
"state refresh": {
label: "state refresh",
},
create: {
label: "create",
colors: {
fill: theme.roles.success.background,
stroke: theme.roles.success.outline,
},
},
delete: {
label: "delete",
colors: {
fill: theme.roles.warning.background,
stroke: theme.roles.warning.outline,
},
},
read: {
label: "read",
colors: {
fill: theme.roles.active.background,
stroke: theme.roles.active.outline,
},
},
};
}
53 changes: 29 additions & 24 deletionssite/src/modules/workspaces/WorkspaceTiming/ScriptsChart.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { type Theme, useTheme } from "@emotion/react";
import { type FC, useState } from "react";
import { Bar } from "./Chart/Bar";
import {
Expand DownExpand Up@@ -28,30 +29,6 @@ import {
} from "./Chart/utils";
import type { StageCategory } from "./StagesChart";

const legendsByStatus: Record<string, ChartLegend> = {
ok: {
label: "success",
colors: {
fill: "#022C22",
stroke: "#BBF7D0",
},
},
exit_failure: {
label: "failure",
colors: {
fill: "#450A0A",
stroke: "#F87171",
},
},
timeout: {
label: "timed out",
colors: {
fill: "#422006",
stroke: "#FDBA74",
},
},
};

type ScriptTiming = {
name: string;
status: string;
Expand All@@ -77,6 +54,8 @@ export const ScriptsChart: FC<ScriptsChartProps> = ({
const [ticks, scale] = makeTicks(totalTime);
const [filter, setFilter] = useState("");
const visibleTimings = timings.filter((t) => t.name.includes(filter));
const theme = useTheme();
const legendsByStatus = getLegendsByStatus(theme);
const visibleLegends = [...new Set(visibleTimings.map((t) => t.status))].map(
(s) => legendsByStatus[s],
);
Expand DownExpand Up@@ -151,3 +130,29 @@ export const ScriptsChart: FC<ScriptsChartProps> = ({
</Chart>
);
};

function getLegendsByStatus(theme: Theme): Record<string, ChartLegend> {
return {
ok: {
label: "success",
colors: {
fill: theme.roles.success.background,
stroke: theme.roles.success.outline,
},
},
exit_failure: {
label: "failure",
colors: {
fill: theme.roles.error.background,
stroke: theme.roles.error.outline,
},
},
timeout: {
label: "timed out",
colors: {
fill: theme.roles.warning.background,
stroke: theme.roles.warning.outline,
},
},
};
}
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { Meta, StoryObj } from "@storybook/react";
import { expect, userEvent, waitFor, within } from "@storybook/test";
import { chromatic } from "testHelpers/chromatic";
import { WorkspaceTimings } from "./WorkspaceTimings";
import { WorkspaceTimingsResponse } from "./storybookData";

Expand All@@ -11,6 +12,9 @@ const meta: Meta<typeof WorkspaceTimings> = {
provisionerTimings: WorkspaceTimingsResponse.provisioner_timings,
agentScriptTimings: WorkspaceTimingsResponse.agent_script_timings,
},
parameters: {
chromatic,
},
};

export default meta;
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp