PR comment cleanup

Emyrk · Emyrk · commit 163bbffcf3e7 · 2023-04-27T16:18:53.000-05:00
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -901,7 +901,6 @@ export const getWorkspaceProxies =
   async (): Promise<TypesGen.RegionsResponse> => {
     const response = await axios.get<TypesGen.RegionsResponse>(
       `/api/v2/regions`,
-      {},
     )
     return response.data
   }
diff --git a/site/src/pages/UserSettingsPage/WorkspaceProxyPage/WorkspaceProxyPage.tsx b/site/src/pages/UserSettingsPage/WorkspaceProxyPage/WorkspaceProxyPage.tsx
@@ -2,63 +2,51 @@ import { FC, PropsWithChildren } from "react"
 import { Section } from "components/SettingsLayout/Section"
 import { WorkspaceProxyView } from "./WorkspaceProxyView"
 import makeStyles from "@material-ui/core/styles/makeStyles"
-import { Trans } from "react-i18next"
 import { useWorkspaceProxiesData } from "./hooks"
 import { displayError } from "components/GlobalSnackbar/utils"
 import { useProxy } from "contexts/ProxyContext"
-// import { ConfirmDeleteDialog } from "./components"
-// import { Stack } from "components/Stack/Stack"
-// import Button from "@material-ui/core/Button"
-// import { Link as RouterLink } from "react-router-dom"
-// import AddIcon from "@material-ui/icons/AddOutlined"
-// import { APIKeyWithOwner } from "api/typesGenerated"
 
 export const WorkspaceProxyPage: FC<PropsWithChildren<unknown>> = () => {
   const styles = useStyles()
 
-  const description = (
-    <Trans values={{}}>
-      Workspace proxies are used to reduce the latency of connections to a
-      workspace. To get the best experience, choose the workspace proxy that is
-      closest located to you.
-    </Trans>
-  )
+  const description =
+    "Workspace proxies are used to reduce the latency of connections to a" +
+    "workspace. To get the best experience, choose the workspace proxy that is" +
+    "closest located to you."
 
   const { proxy, setProxy } = useProxy()
 
   const {
-    data: response,
+    data: proxiesResposne,
     error: getProxiesError,
     isFetching,
     isFetched,
   } = useWorkspaceProxiesData()
 
   return (
-    <>
-      <Section
-        title="Workspace Proxies"
-        className={styles.section}
-        description={description}
-        layout="fluid"
-      >
-        <WorkspaceProxyView
-          proxies={response ? response.regions : []}
-          isLoading={isFetching}
-          hasLoaded={isFetched}
-          getWorkspaceProxiesError={getProxiesError}
-          preferredProxy={proxy.selectedRegion}
-          onSelect={(proxy) => {
-            if (!proxy.healthy) {
-              displayError("Please select a healthy workspace proxy.")
-              return
-            }
+    <Section
+      title="Workspace Proxies"
+      className={styles.section}
+      description={description}
+      layout="fluid"
+    >
+      <WorkspaceProxyView
+        proxies={proxiesResposne?.regions}
+        isLoading={isFetching}
+        hasLoaded={isFetched}
+        getWorkspaceProxiesError={getProxiesError}
+        preferredProxy={proxy.selectedRegion}
+        onSelect={(proxy) => {
+          if (!proxy.healthy) {
+            displayError("Please select a healthy workspace proxy.")
+            return
+          }
 
-            // Set the fetched regions + the selected proxy
-            setProxy(response ? response.regions : [], proxy)
-          }}
-        />
-      </Section>
-    </>
+          // Set the fetched regions + the selected proxy
+          setProxy(proxiesResposne ? proxiesResposne.regions : [], proxy)
+        }}
+      />
+    </Section>
   )
 }
 
diff --git a/site/src/pages/UserSettingsPage/WorkspaceProxyPage/hooks.ts b/site/src/pages/UserSettingsPage/WorkspaceProxyPage/hooks.ts
@@ -4,12 +4,8 @@ import { getWorkspaceProxies } from "api/api"
 // Loads all workspace proxies
 export const useWorkspaceProxiesData = () => {
   const queryKey = ["workspace-proxies"]
-  const result = useQuery({
+  return useQuery({
     queryKey,
-    queryFn: () => getWorkspaceProxies(),
+    queryFn: getWorkspaceProxies,
   })
-
-  return {
-    ...result,
-  }
 }

Original file line number	Diff line number	Diff line change
`@@ -901,7 +901,6 @@ export const getWorkspaceProxies =`
`901`	`901`	`async (): Promise<TypesGen.RegionsResponse> => {`
`902`	`902`	`const response = await axios.get<TypesGen.RegionsResponse>(`
`903`	`903`	`/api/v2/regions`,
`904`		`- {},`
`905`	`904`	`)`
`906`	`905`	`return response.data`
`907`	`906`	`}`