Skip to content

Commit bec2913

Browse files
SasSwartSasSwart
committed
make fmt
1 parent 8b91dc0 commit bec2913

File tree

10 files changed

+77
-73
lines changed

10 files changed

+77
-73
lines changed

‎site/src/api/api.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -686,16 +686,16 @@ class ApiMethods {
686686
*/
687687
getProvisionerDaemonsByOrganization = async (
688688
organization: string,
689-
tags?: Record<string, string>
689+
tags?: Record<string, string>,
690690
): Promise<TypesGen.ProvisionerDaemon[]> => {
691691
const params = new URLSearchParams();
692692

693693
if (tags) {
694-
params.append('tags', JSON.stringify(tags));
694+
params.append("tags", JSON.stringify(tags));
695695
}
696696

697697
const response = await this.axios.get<TypesGen.ProvisionerDaemon[]>(
698-
`/api/v2/organizations/${organization}/provisionerdaemons?${params.toString()}`
698+
`/api/v2/organizations/${organization}/provisionerdaemons?${params.toString()}`,
699699
);
700700
return response.data;
701701
};

‎site/src/api/queries/organizations.ts

+8-7
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,15 @@ export const organizations = () => {
115115
};
116116
};
117117

118-
export const getProvisionerDaemonsKey = (organization: string, tags?: Record<string, string>) => [
119-
"organization",
120-
organization,
121-
tags,
122-
"provisionerDaemons",
123-
];
118+
export const getProvisionerDaemonsKey = (
119+
organization: string,
120+
tags?: Record<string, string>,
121+
) => ["organization", organization, tags, "provisionerDaemons"];
124122

125-
export const provisionerDaemons = (organization: string, tags?: Record<string, string>) => {
123+
export const provisionerDaemons = (
124+
organization: string,
125+
tags?: Record<string, string>,
126+
) => {
126127
return {
127128
queryKey: getProvisionerDaemonsKey(organization, tags),
128129
queryFn: () => API.getProvisionerDaemonsByOrganization(organization, tags),

‎site/src/components/Alert/Alert.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import MuiAlert, {
2+
type AlertColor as MuiAlertColor,
23
type AlertProps as MuiAlertProps,
34
// biome-ignore lint/nursery/noRestrictedImports: Used as base component
45
} from "@mui/material/Alert";
@@ -11,6 +12,8 @@ import {
1112
useState,
1213
} from "react";
1314

15+
export type AlertColor = MuiAlertColor;
16+
1417
export type AlertProps = MuiAlertProps & {
1518
actions?: ReactNode;
1619
dismissible?: boolean;

‎site/src/modules/provisioners/ProvisionerAlert.stories.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,32 @@ export const HealthyProvisioners: Story = {
2424
args: {
2525
matchingProvisioners: 1,
2626
availableProvisioners: 1,
27-
}
27+
},
2828
};
2929

3030
export const UndefinedMatchingProvisioners: Story = {
3131
args: {
3232
matchingProvisioners: undefined,
33-
availableProvisioners: undefined
34-
}
33+
availableProvisioners: undefined,
34+
},
3535
};
3636

3737
export const UndefinedAvailableProvisioners: Story = {
3838
args: {
3939
matchingProvisioners: 1,
40-
availableProvisioners: undefined
41-
}
40+
availableProvisioners: undefined,
41+
},
4242
};
4343

4444
export const NoMatchingProvisioners: Story = {
4545
args: {
4646
matchingProvisioners: 0,
47-
}
47+
},
4848
};
4949

5050
export const NoAvailableProvisioners: Story = {
5151
args: {
5252
matchingProvisioners: 1,
5353
availableProvisioners: 0,
54-
}
54+
},
5555
};

‎site/src/modules/provisioners/ProvisionerAlert.tsx

+23-29
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
1-
import Alert, { type AlertColor } from "@mui/material/Alert";
21
import AlertTitle from "@mui/material/AlertTitle";
3-
import { Stack } from "components/Stack/Stack";
2+
import { Alert, type AlertColor } from "components/Alert/Alert";
43
import { AlertDetail } from "components/Alert/Alert";
5-
import type { FC } from "react";
4+
import { Stack } from "components/Stack/Stack";
65
import { ProvisionerTag } from "modules/provisioners/ProvisionerTag";
6+
import type { FC } from "react";
77

88
interface ProvisionerAlertProps {
9-
matchingProvisioners: number | undefined,
10-
availableProvisioners: number | undefined,
11-
tags: Record<string, string>
9+
matchingProvisioners: number | undefined;
10+
availableProvisioners: number | undefined;
11+
tags: Record<string, string>;
1212
}
1313

14-
export const ProvisionerAlert : FC<ProvisionerAlertProps> = ({
14+
export const ProvisionerAlert: FC<ProvisionerAlertProps> = ({
1515
matchingProvisioners,
1616
availableProvisioners,
17-
tags
17+
tags,
1818
}) => {
1919
let title: string;
2020
let detail: string;
2121
switch (true) {
22-
case (matchingProvisioners === 0):
23-
title="Provisioning Cannot Proceed"
24-
detail="There are no provisioners that accept the required tags. Please contact your administrator. Once a compatible provisioner becomes available, provisioning will continue."
22+
case matchingProvisioners === 0:
23+
title = "Provisioning Cannot Proceed";
24+
detail =
25+
"There are no provisioners that accept the required tags. Please contact your administrator. Once a compatible provisioner becomes available, provisioning will continue.";
2526
break;
26-
case (availableProvisioners === 0):
27-
title="Provisioning Delayed"
28-
detail="Provisioners that accept the required tags are currently anavailable. This may delay your build. Please contact your administrator if your build does not complete."
27+
case availableProvisioners === 0:
28+
title = "Provisioning Delayed";
29+
detail =
30+
"Provisioners that accept the required tags are currently anavailable. This may delay your build. Please contact your administrator if your build does not complete.";
2931
break;
3032
default:
3133
return null;
@@ -48,11 +50,7 @@ export const ProvisionerAlert : FC<ProvisionerAlertProps> = ({
4850
{Object.entries(tags)
4951
.filter(([key]) => key !== "owner")
5052
.map(([key, value]) => (
51-
<ProvisionerTag
52-
key={key}
53-
tagName={key}
54-
tagValue={value}
55-
/>
53+
<ProvisionerTag key={key} tagName={key} tagValue={value} />
5654
))}
5755
</Stack>
5856
</AlertDetail>
@@ -61,13 +59,13 @@ export const ProvisionerAlert : FC<ProvisionerAlertProps> = ({
6159
};
6260

6361
interface ProvisionerJobAlertProps {
64-
title: string
65-
detail: string
66-
severity: AlertColor
67-
tags: Record<string, string>
62+
title: string;
63+
detail: string;
64+
severity: AlertColor;
65+
tags: Record<string, string>;
6866
}
6967

70-
export const ProvisionerJobAlert : FC<ProvisionerJobAlertProps> = ({
68+
export const ProvisionerJobAlert: FC<ProvisionerJobAlertProps> = ({
7169
title,
7270
detail,
7371
severity,
@@ -90,11 +88,7 @@ export const ProvisionerJobAlert : FC<ProvisionerJobAlertProps> = ({
9088
{Object.entries(tags)
9189
.filter(([key]) => key !== "owner")
9290
.map(([key, value]) => (
93-
<ProvisionerTag
94-
key={key}
95-
tagName={key}
96-
tagValue={value}
97-
/>
91+
<ProvisionerTag key={key} tagName={key} tagValue={value} />
9892
))}
9993
</Stack>
10094
</AlertDetail>

‎site/src/pages/CreateTemplatePage/BuildLogsDrawer.stories.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const NoProvisioners: Story = {
4141
matched_provisioners: {
4242
count: 0,
4343
available: 0,
44-
}
44+
},
4545
},
4646
},
4747
};
@@ -53,7 +53,7 @@ export const ProvisionersUnhealthy: Story = {
5353
matched_provisioners: {
5454
count: 1,
5555
available: 0,
56-
}
56+
},
5757
},
5858
},
5959
};
@@ -66,12 +66,11 @@ export const ProvisionersHealthy: Story = {
6666
matched_provisioners: {
6767
count: 1,
6868
available: 1,
69-
}
69+
},
7070
},
7171
},
7272
};
7373

74-
7574
export const Logs: Story = {
7675
args: {
7776
templateVersion: {

‎site/src/pages/CreateTemplatePage/BuildLogsDrawer.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import { visuallyHidden } from "@mui/utils";
88
import { JobError } from "api/queries/templates";
99
import type { TemplateVersion } from "api/typesGenerated";
1010
import { Loader } from "components/Loader/Loader";
11+
import { ProvisionerAlert } from "modules/provisioners/ProvisionerAlert";
1112
import { useWatchVersionLogs } from "modules/templates/useWatchVersionLogs";
1213
import { WorkspaceBuildLogs } from "modules/workspaces/WorkspaceBuildLogs/WorkspaceBuildLogs";
1314
import { type FC, useLayoutEffect, useRef } from "react";
1415
import { navHeight } from "theme/constants";
15-
import { ProvisionerAlert } from "modules/provisioners/ProvisionerAlert";
1616

1717
type BuildLogsDrawerProps = {
1818
error: unknown;
@@ -28,8 +28,9 @@ export const BuildLogsDrawer: FC<BuildLogsDrawerProps> = ({
2828
variablesSectionRef,
2929
...drawerProps
3030
}) => {
31-
const matchingProvisioners = templateVersion?.matched_provisioners?.count
32-
const availableProvisioners = templateVersion?.matched_provisioners?.available
31+
const matchingProvisioners = templateVersion?.matched_provisioners?.count;
32+
const availableProvisioners =
33+
templateVersion?.matched_provisioners?.available;
3334

3435
const logs = useWatchVersionLogs(templateVersion);
3536
const logsContainer = useRef<HTMLDivElement>(null);
@@ -69,7 +70,7 @@ export const BuildLogsDrawer: FC<BuildLogsDrawerProps> = ({
6970
</IconButton>
7071
</header>
7172

72-
{ !logs && (
73+
{!logs && (
7374
<ProvisionerAlert
7475
matchingProvisioners={matchingProvisioners}
7576
availableProvisioners={availableProvisioners}

‎site/src/pages/TemplateVersionEditorPage/TemplateVersionEditor.stories.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ export const NoProvisioners: Story = {
8080
job: MockRunningProvisionerJob,
8181
matched_provisioners: {
8282
count: 0,
83-
available: 0
84-
}
83+
available: 0,
84+
},
8585
},
8686
},
8787
};
@@ -95,8 +95,8 @@ export const UnavailableProvisioners: Story = {
9595
job: MockRunningProvisionerJob,
9696
matched_provisioners: {
9797
count: 1,
98-
available: 0
99-
}
98+
available: 0,
99+
},
100100
},
101101
},
102102
};
@@ -110,8 +110,8 @@ export const HealthyProvisioners: Story = {
110110
job: MockRunningProvisionerJob,
111111
matched_provisioners: {
112112
count: 1,
113-
available: 1
114-
}
113+
available: 1,
114+
},
115115
},
116116
},
117117
};

‎site/src/pages/TemplateVersionEditorPage/TemplateVersionEditor.tsx

+7-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import ArrowBackOutlined from "@mui/icons-material/ArrowBackOutlined";
44
import CloseOutlined from "@mui/icons-material/CloseOutlined";
55
import PlayArrowOutlined from "@mui/icons-material/PlayArrowOutlined";
66
import WarningOutlined from "@mui/icons-material/WarningOutlined";
7-
import AlertTitle from "@mui/material/AlertTitle";
87
import Button from "@mui/material/Button";
98
import ButtonGroup from "@mui/material/ButtonGroup";
109
import IconButton from "@mui/material/IconButton";
@@ -17,7 +16,7 @@ import type {
1716
VariableValue,
1817
WorkspaceResource,
1918
} from "api/typesGenerated";
20-
import { Alert, AlertDetail } from "components/Alert/Alert";
19+
import { Alert } from "components/Alert/Alert";
2120
import { Sidebar } from "components/FullPageLayout/Sidebar";
2221
import {
2322
Topbar,
@@ -29,6 +28,10 @@ import {
2928
} from "components/FullPageLayout/Topbar";
3029
import { Loader } from "components/Loader/Loader";
3130
import { linkToTemplate, useLinks } from "modules/navigation";
31+
import {
32+
ProvisionerAlert,
33+
ProvisionerJobAlert,
34+
} from "modules/provisioners/ProvisionerAlert";
3235
import { TemplateFileTree } from "modules/templates/TemplateFiles/TemplateFileTree";
3336
import { isBinaryData } from "modules/templates/TemplateFiles/isBinaryData";
3437
import { TemplateResourcesTable } from "modules/templates/TemplateResourcesTable/TemplateResourcesTable";
@@ -60,7 +63,6 @@ import { MonacoEditor } from "./MonacoEditor";
6063
import { ProvisionerTagsPopover } from "./ProvisionerTagsPopover";
6164
import { PublishTemplateVersionDialog } from "./PublishTemplateVersionDialog";
6265
import { TemplateVersionStatusBadge } from "./TemplateVersionStatusBadge";
63-
import { ProvisionerAlert, ProvisionerJobAlert } from "modules/provisioners/ProvisionerAlert";
6466

6567
type Tab = "logs" | "resources" | undefined; // Undefined is to hide the tab
6668

@@ -127,9 +129,8 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
127129
const [deleteFileOpen, setDeleteFileOpen] = useState<string>();
128130
const [renameFileOpen, setRenameFileOpen] = useState<string>();
129131
const [dirty, setDirty] = useState(false);
130-
const matchingProvisioners = templateVersion.matched_provisioners?.count
131-
const availableProvisioners = templateVersion.matched_provisioners?.available
132-
132+
const matchingProvisioners = templateVersion.matched_provisioners?.count;
133+
const availableProvisioners = templateVersion.matched_provisioners?.available;
133134

134135
const triggerPreview = useCallback(async () => {
135136
await onPreview(fileTree);

‎site/src/testHelpers/storybook.tsx

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { StoryContext } from "@storybook/react";
22
import { withDefaultFeatures } from "api/api";
33
import { getAuthorizationKey } from "api/queries/authCheck";
4+
import { getProvisionerDaemonsKey } from "api/queries/organizations";
45
import { hasFirstUserKey, meKey } from "api/queries/users";
56
import type { Entitlements } from "api/typesGenerated";
67
import { GlobalSnackbar } from "components/GlobalSnackbar/GlobalSnackbar";
@@ -17,7 +18,6 @@ import {
1718
MockDeploymentConfig,
1819
MockEntitlements,
1920
} from "./entities";
20-
import { getProvisionerDaemonsKey } from "api/queries/organizations";
2121

2222
export const withDashboardProvider = (
2323
Story: FC,
@@ -124,21 +124,26 @@ export const withAuthProvider = (Story: FC, { parameters }: StoryContext) => {
124124

125125
export const withProvisioners = (Story: FC, { parameters }: StoryContext) => {
126126
if (!parameters.organization_id) {
127-
throw new Error("You forgot to add `parameters.organization_id` to your story");
127+
throw new Error(
128+
"You forgot to add `parameters.organization_id` to your story",
129+
);
128130
}
129131
if (!parameters.provisioners) {
130-
throw new Error("You forgot to add `parameters.provisioners` to your story");
132+
throw new Error(
133+
"You forgot to add `parameters.provisioners` to your story",
134+
);
131135
}
132136
if (!parameters.tags) {
133137
throw new Error("You forgot to add `parameters.tags` to your story");
134138
}
135139

136140
const queryClient = useQueryClient();
137-
queryClient.setQueryData(getProvisionerDaemonsKey(parameters.organization_id, parameters.tags), parameters.provisioners);
141+
queryClient.setQueryData(
142+
getProvisionerDaemonsKey(parameters.organization_id, parameters.tags),
143+
parameters.provisioners,
144+
);
138145

139-
return (
140-
<Story/>
141-
)
146+
return <Story />;
142147
};
143148

144149
export const withGlobalSnackbar = (Story: FC) => (

0 commit comments

Comments
 (0)