Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d258246

Browse files
aslilacaslilac
committed
🧹
1 parent 4d172e5 commit d258246

File tree

6 files changed

+62
-32
lines changed

6 files changed

+62
-32
lines changed

‎site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { HealthcheckReport } from "api/typesGenerated";
22
import { Alert } from "components/Alert/Alert";
3+
import { Provisioner } from "modules/provisioners/Provisioner";
34
import type { FC } from "react";
45
import { Helmet } from "react-helmet-async";
56
import { useOutletContext } from "react-router-dom";
@@ -12,7 +13,6 @@ import {
1213
Main,
1314
} from "./Content";
1415
import { DismissWarningButton } from "./DismissWarningButton";
15-
import { Provisioner } from "modules/provisioners/Provisioner";
1616

1717
export const ProvisionerDaemonsPage: FC = () => {
1818
const healthStatus = useOutletContext<HealthcheckReport>();

‎site/src/pages/ManagementSettingsPage/OrganizationProvisionersPage.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import {
33
provisionerDaemons,
44
} from "api/queries/organizations";
55
import type { Organization } from "api/typesGenerated";
6+
import { ErrorAlert } from "components/Alert/ErrorAlert";
67
import { EmptyState } from "components/EmptyState/EmptyState";
78
import { Loader } from "components/Loader/Loader";
9+
import NotFoundPage from "pages/404Page/404Page";
810
import type { FC } from "react";
911
import { useQuery } from "react-query";
1012
import { useParams } from "react-router-dom";
1113
import { useOrganizationSettings } from "./ManagementSettingsLayout";
1214
import { OrganizationProvisionersPageView } from "./OrganizationProvisionersPageView";
13-
import { ErrorAlert } from "components/Alert/ErrorAlert";
14-
import NotFoundPage from "pages/404Page/404Page";
1515

1616
const OrganizationProvisionersPage: FC = () => {
1717
const { organization: organizationName } = useParams() as {
@@ -54,12 +54,7 @@ const OrganizationProvisionersPage: FC = () => {
5454
return <NotFoundPage />;
5555
}
5656

57-
return (
58-
<OrganizationProvisionersPageView
59-
organization={organization}
60-
provisioners={provisioners}
61-
/>
62-
);
57+
return <OrganizationProvisionersPageView provisioners={provisioners} />;
6358
};
6459

6560
export default OrganizationProvisionersPage;

‎site/src/pages/ManagementSettingsPage/OrganizationProvisionersPageView.stories.tsx

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import type { Meta, StoryObj } from "@storybook/react";
2+
import { MockProvisioner, MockUserProvisioner } from "testHelpers/entities";
3+
import { OrganizationProvisionersPageView } from "./OrganizationProvisionersPageView";
4+
5+
const meta: Meta<typeof OrganizationProvisionersPageView> = {
6+
title: "pages/OrganizationProvisionersPage",
7+
component: OrganizationProvisionersPageView,
8+
};
9+
10+
export default meta;
11+
type Story = StoryObj<typeof OrganizationProvisionersPageView>;
12+
13+
export const Provisioners: Story = {
14+
args: {
15+
provisioners: [
16+
MockProvisioner,
17+
MockUserProvisioner,
18+
{
19+
...MockProvisioner,
20+
tags: {
21+
...MockProvisioner.tags,
22+
都市: "ユタ",
23+
きっぷ: "yes",
24+
ちいさい: "no",
25+
},
26+
},
27+
],
28+
},
29+
};

‎site/src/pages/ManagementSettingsPage/OrganizationProvisionersPageView.tsx

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
1-
import type { Organization, ProvisionerDaemon } from "api/typesGenerated";
1+
import OpenInNewIcon from "@mui/icons-material/OpenInNew";
2+
import Button from "@mui/material/Button";
3+
import type { ProvisionerDaemon } from "api/typesGenerated";
24
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
35
import { Stack } from "components/Stack/Stack";
46
import { Provisioner } from "modules/provisioners/Provisioner";
57
import type { FC } from "react";
8+
import { docs } from "utils/docs";
69

710
interface OrganizationProvisionersPageViewProps {
8-
organization: Organization;
911
provisioners: ProvisionerDaemon[];
1012
}
1113

1214
export const OrganizationProvisionersPageView: FC<
1315
OrganizationProvisionersPageViewProps
14-
> = ({ organization, provisioners }) => {
16+
> = ({ provisioners }) => {
1517
return (
1618
<div>
1719
<PageHeader
1820
// The deployment settings layout already has padding.
1921
css={{ paddingTop: 0 }}
22+
actions={
23+
<Button
24+
endIcon={<OpenInNewIcon />}
25+
href={docs("/admin/provisioners")}
26+
>
27+
Create a provisioner
28+
</Button>
29+
}
2030
>
2131
<PageHeaderTitle>Provisioners</PageHeaderTitle>
2232
</PageHeader>

‎site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
updateOrganization,
55
} from "api/queries/organizations";
66
import type { Organization } from "api/typesGenerated";
7+
import { ErrorAlert } from "components/Alert/ErrorAlert";
78
import { EmptyState } from "components/EmptyState/EmptyState";
89
import { displaySuccess } from "components/GlobalSnackbar/utils";
910
import { Loader } from "components/Loader/Loader";
@@ -17,7 +18,6 @@ import {
1718
} from "./ManagementSettingsLayout";
1819
import { OrganizationSettingsPageView } from "./OrganizationSettingsPageView";
1920
import { OrganizationSummaryPageView } from "./OrganizationSummaryPageView";
20-
import { ErrorAlert } from "components/Alert/ErrorAlert";
2121

2222
const OrganizationSettingsPage: FC = () => {
2323
const { organization: organizationName } = useParams() as {

‎site/src/testHelpers/entities.ts

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -542,19 +542,15 @@ export const MockProvisioner: TypesGen.ProvisionerDaemon = {
542542
name: "Test Provisioner",
543543
provisioners: ["echo"],
544544
tags: { scope: "organization" },
545-
version: "v2.34.5",
546-
api_version: "1.0",
545+
version: MockBuildInfo.version,
546+
api_version: MockBuildInfo.provisioner_api_version,
547547
};
548548

549549
export const MockUserProvisioner: TypesGen.ProvisionerDaemon = {
550-
created_at: "2022-05-17T17:39:01.382927298Z",
550+
...MockProvisioner,
551551
id: "test-user-provisioner",
552-
organization_id: MockOrganization.id,
553552
name: "Test User Provisioner",
554-
provisioners: ["echo"],
555553
tags: { scope: "user", owner: "12345678-abcd-1234-abcd-1234567890abcd" },
556-
version: "v2.34.5",
557-
api_version: "1.0",
558554
};
559555

560556
export const MockProvisionerJob: TypesGen.ProvisionerJob = {
@@ -826,7 +822,7 @@ export const MockWorkspaceAgent: TypesGen.WorkspaceAgent = {
826822
status: "connected",
827823
updated_at: "",
828824
version: MockBuildInfo.version,
829-
api_version: "1.0",
825+
api_version: MockBuildInfo.agent_api_version,
830826
latency: {
831827
"Coder Embedded DERP": {
832828
latency_ms: 32.55,
@@ -3313,7 +3309,7 @@ export const MockHealth: TypesGen.HealthcheckReport = {
33133309
created_at: "2023-05-01T19:15:56.606593Z",
33143310
updated_at: "2023-12-05T14:13:36.647535Z",
33153311
deleted: false,
3316-
version: "v2.5.0-devel+5fad61102",
3312+
version: MockBuildInfo.version,
33173313
},
33183314
{
33193315
id: "9d786ce0-55b1-4ace-8acc-a4672ff8d41f",
@@ -3336,7 +3332,7 @@ export const MockHealth: TypesGen.HealthcheckReport = {
33363332
created_at: "2023-05-01T20:34:11.114005Z",
33373333
updated_at: "2023-12-05T14:13:45.941716Z",
33383334
deleted: false,
3339-
version: "v2.5.0-devel+5fad61102",
3335+
version: MockBuildInfo.version,
33403336
},
33413337
{
33423338
id: "2e209786-73b1-4838-ba78-e01c9334450a",
@@ -3359,7 +3355,7 @@ export const MockHealth: TypesGen.HealthcheckReport = {
33593355
created_at: "2023-05-01T20:41:02.76448Z",
33603356
updated_at: "2023-12-05T14:13:41.968568Z",
33613357
deleted: false,
3362-
version: "v2.5.0-devel+5fad61102",
3358+
version: MockBuildInfo.version,
33633359
},
33643360
{
33653361
id: "c272e80c-0cce-49d6-9782-1b5cf90398e8",
@@ -3430,7 +3426,7 @@ export const MockHealth: TypesGen.HealthcheckReport = {
34303426
created_at: "2023-12-01T09:21:15.996267Z",
34313427
updated_at: "2023-12-05T14:13:59.663174Z",
34323428
deleted: false,
3433-
version: "v2.5.0-devel+5fad61102",
3429+
version: MockBuildInfo.version,
34343430
},
34353431
{
34363432
id: "72649dc9-03c7-46a8-bc95-96775e93ddc1",
@@ -3453,7 +3449,7 @@ export const MockHealth: TypesGen.HealthcheckReport = {
34533449
created_at: "2023-12-01T09:23:44.505529Z",
34543450
updated_at: "2023-12-05T14:13:55.769058Z",
34553451
deleted: false,
3456-
version: "v2.5.0-devel+5fad61102",
3452+
version: MockBuildInfo.version,
34573453
},
34583454
{
34593455
id: "1f78398f-e5ae-4c38-aa89-30222181d443",
@@ -3476,7 +3472,7 @@ export const MockHealth: TypesGen.HealthcheckReport = {
34763472
created_at: "2023-12-01T09:36:00.231252Z",
34773473
updated_at: "2023-12-05T14:13:47.015031Z",
34783474
deleted: false,
3479-
version: "v2.5.0-devel+5fad61102",
3475+
version: MockBuildInfo.version,
34803476
},
34813477
],
34823478
},
@@ -3502,8 +3498,8 @@ export const MockHealth: TypesGen.HealthcheckReport = {
35023498
created_at: "2024-01-04T15:53:03.21563Z",
35033499
last_seen_at: "2024-01-04T16:05:03.967551Z",
35043500
name: "ok",
3505-
version: "v2.3.4-devel+abcd1234",
3506-
api_version: "1.0",
3501+
version: MockBuildInfo.version,
3502+
api_version: MockBuildInfo.provisioner_api_version,
35073503
provisioners: ["echo", "terraform"],
35083504
tags: {
35093505
owner: "",
@@ -3523,8 +3519,8 @@ export const MockHealth: TypesGen.HealthcheckReport = {
35233519
created_at: "2024-01-04T15:53:03.21563Z",
35243520
last_seen_at: "2024-01-04T16:05:03.967551Z",
35253521
name: "user-scoped",
3526-
version: "v2.34-devel+abcd1234",
3527-
api_version: "1.0",
3522+
version: MockBuildInfo.version,
3523+
api_version: MockBuildInfo.provisioner_api_version,
35283524
provisioners: ["echo", "terraform"],
35293525
tags: {
35303526
owner: "12345678-1234-1234-1234-12345678abcd",
@@ -3569,7 +3565,7 @@ export const MockHealth: TypesGen.HealthcheckReport = {
35693565
},
35703566
],
35713567
},
3572-
coder_version: "v2.5.0-devel+5fad61102",
3568+
coder_version: MockBuildInfo.version,
35733569
};
35743570

35753571
export const MockListeningPortsResponse: TypesGen.WorkspaceAgentListeningPortsResponse =

0 commit comments

Comments
 (0)