Skip to content

Commit bf8c49e

Browse files
committed
Format
1 parent c064adb commit bf8c49e

File tree

5 files changed

+46
-14
lines changed

5 files changed

+46
-14
lines changed

site/src/api/api.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,7 @@ export const getDeploymentFlags =
648648
return response.data
649649
}
650650

651-
export const getReplicas =
652-
async (): Promise<TypesGen.Replica[]> => {
653-
const response = await axios.get(`/api/v2/replicas`)
654-
return response.data
655-
}
651+
export const getReplicas = async (): Promise<TypesGen.Replica[]> => {
652+
const response = await axios.get(`/api/v2/replicas`)
653+
return response.data
654+
}

site/src/components/DeploySettingsLayout/Option.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const useStyles = makeStyles((theme) => ({
3232
optionValue: {
3333
fontSize: 14,
3434
fontFamily: MONOSPACE_FONT_FAMILY,
35-
35+
3636
"& ul": {
3737
padding: theme.spacing(2),
3838
},

site/src/pages/DeploySettingsPage/NetworkSettingsPage.tsx

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,28 @@ import TableCell from "@material-ui/core/TableCell"
44
import TableContainer from "@material-ui/core/TableContainer"
55
import TableHead from "@material-ui/core/TableHead"
66
import TableRow from "@material-ui/core/TableRow"
7+
import { useMachine } from "@xstate/react"
78
import {
9+
Badges,
810
DisabledBadge,
9-
EnabledBadge
11+
EnabledBadge,
12+
EnterpriseBadge,
1013
} from "components/DeploySettingsLayout/Badges"
1114
import { useDeploySettings } from "components/DeploySettingsLayout/DeploySettingsLayout"
1215
import { Header } from "components/DeploySettingsLayout/Header"
1316
import {
1417
OptionDescription,
1518
OptionName,
16-
OptionValue
19+
OptionValue,
1720
} from "components/DeploySettingsLayout/Option"
21+
import { ReplicasTable } from "components/ReplicasTable/ReplicasTable"
1822
import { Stack } from "components/Stack/Stack"
1923
import React from "react"
24+
import { highAvailabilityMachine } from "xServices/deploymentFlags/highAvailabilityMachine"
2025

2126
const NetworkSettingsPage: React.FC = () => {
2227
const { deploymentFlags } = useDeploySettings()
28+
const [state] = useMachine(highAvailabilityMachine)
2329

2430
return (
2531
<Stack direction="column" spacing={6}>
@@ -114,6 +120,26 @@ const NetworkSettingsPage: React.FC = () => {
114120
</Table>
115121
</TableContainer>
116122
</div>
123+
124+
<div>
125+
<Header
126+
title="High Availability"
127+
secondary
128+
description="Deploy Coder multi regionally for high availability. Only active if more than one replica exists."
129+
docsHref="https://coder.com/docs/coder-oss/latest/admin/auth#openid-connect-with-google"
130+
/>
131+
132+
<Badges>
133+
{deploymentFlags.derp_server_relay_address.value ? (
134+
<EnabledBadge />
135+
) : (
136+
<DisabledBadge />
137+
)}
138+
<EnterpriseBadge />
139+
</Badges>
140+
141+
<ReplicasTable replicas={state.context.replicas || []} />
142+
</div>
117143
</Stack>
118144
)
119145
}

site/src/pages/DeploySettingsPage/SecuritySettingsPage.tsx

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@ import TableContainer from "@material-ui/core/TableContainer"
55
import TableHead from "@material-ui/core/TableHead"
66
import TableRow from "@material-ui/core/TableRow"
77
import {
8-
Badges, DisabledBadge, EnabledBadge, EnterpriseBadge
8+
Badges,
9+
DisabledBadge,
10+
EnabledBadge,
11+
EnterpriseBadge,
912
} from "components/DeploySettingsLayout/Badges"
1013
import { useDeploySettings } from "components/DeploySettingsLayout/DeploySettingsLayout"
1114
import { Header } from "components/DeploySettingsLayout/Header"
1215
import {
1316
OptionDescription,
1417
OptionName,
15-
OptionValue
18+
OptionValue,
1619
} from "components/DeploySettingsLayout/Option"
1720
import { Stack } from "components/Stack/Stack"
1821
import React from "react"
@@ -56,7 +59,9 @@ const SecuritySettingsPage: React.FC = () => {
5659
</TableRow>
5760
<TableRow>
5861
<TableCell>
59-
<OptionName>{deploymentFlags.secure_auth_cookie.name}</OptionName>
62+
<OptionName>
63+
{deploymentFlags.secure_auth_cookie.name}
64+
</OptionName>
6065
<OptionDescription>
6166
{deploymentFlags.secure_auth_cookie.description}
6267
</OptionDescription>
@@ -192,7 +197,9 @@ const SecuritySettingsPage: React.FC = () => {
192197

193198
<TableRow>
194199
<TableCell>
195-
<OptionName>{deploymentFlags.tls_min_version.name}</OptionName>
200+
<OptionName>
201+
{deploymentFlags.tls_min_version.name}
202+
</OptionName>
196203
<OptionDescription>
197204
{deploymentFlags.tls_min_version.description}
198205
</OptionDescription>

site/src/xServices/auth/authXService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ export const authMachine =
354354
idle: {
355355
on: {
356356
GET_AUTH_METHODS: {
357-
target: "gettingMethods"
358-
},
357+
target: "gettingMethods",
358+
},
359359
},
360360
},
361361
gettingMethods: {

0 commit comments

Comments
 (0)