merge leftovers

coder · aslilac · Sep 15, 2023 · Sep 5, 2023 · Sep 5, 2023 · Sep 5, 2023
commit e3fc58fd544350bb2325d45dc7f7a6d72f81ea81
diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
@@ -32,10 +32,10 @@ const CliAuthenticationPage = lazy(
 );
 const AccountPage = lazy(
   () => import("./pages/UserSettingsPage/AccountPage/AccountPage"),
-)
+);
 const SchedulePage = lazy(
   () => import("./pages/UserSettingsPage/SchedulePage/SchedulePage"),
-)
+);
 const SecurityPage = lazy(
   () => import("./pages/UserSettingsPage/SecurityPage/SecurityPage"),
 );

diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -668,17 +668,17 @@ export const updateProfile = async (
 export const getUserQuietHoursSchedule = async (
   userId: TypesGen.User["id"],
 ): Promise<TypesGen.UserQuietHoursScheduleResponse> => {
-  const response = await axios.get(`/api/v2/users/${userId}/quiet-hours`)
-  return response.data
-}
+  const response = await axios.get(`/api/v2/users/${userId}/quiet-hours`);
+  return response.data;
+};
 
 export const updateUserQuietHoursSchedule = async (
   userId: TypesGen.User["id"],
   data: TypesGen.UpdateUserQuietHoursScheduleRequest,
 ): Promise<TypesGen.UserQuietHoursScheduleResponse> => {
-  const response = await axios.put(`/api/v2/users/${userId}/quiet-hours`, data)
-  return response.data
-}
+  const response = await axios.put(`/api/v2/users/${userId}/quiet-hours`, data);
+  return response.data;
+};
 
 export const activateUser = async (
   userId: TypesGen.User["id"],

diff --git a/site/src/components/SettingsLayout/Sidebar.tsx b/site/src/components/SettingsLayout/Sidebar.tsx
@@ -1,16 +1,16 @@
-import { makeStyles } from "@mui/styles"
-import VpnKeyOutlined from "@mui/icons-material/VpnKeyOutlined"
-import FingerprintOutlinedIcon from "@mui/icons-material/FingerprintOutlined"
-import { User } from "api/typesGenerated"
-import { Stack } from "components/Stack/Stack"
-import { UserAvatar } from "components/UserAvatar/UserAvatar"
-import { FC, ElementType, PropsWithChildren, ReactNode } from "react"
-import { NavLink } from "react-router-dom"
-import { combineClasses } from "utils/combineClasses"
-import AccountIcon from "@mui/icons-material/Person"
-import ScheduleIcon from "@mui/icons-material/EditCalendarOutlined"
-import SecurityIcon from "@mui/icons-material/LockOutlined"
-import { useDashboard } from "components/Dashboard/DashboardProvider"
+import { makeStyles } from "@mui/styles";
+import VpnKeyOutlined from "@mui/icons-material/VpnKeyOutlined";
+import FingerprintOutlinedIcon from "@mui/icons-material/FingerprintOutlined";
+import { User } from "api/typesGenerated";
+import { Stack } from "components/Stack/Stack";
+import { UserAvatar } from "components/UserAvatar/UserAvatar";
+import { FC, ElementType, PropsWithChildren, ReactNode } from "react";
+import { NavLink } from "react-router-dom";
+import { combineClasses } from "utils/combineClasses";
+import AccountIcon from "@mui/icons-material/Person";
+import ScheduleIcon from "@mui/icons-material/EditCalendarOutlined";
+import SecurityIcon from "@mui/icons-material/LockOutlined";
+import { useDashboard } from "components/Dashboard/DashboardProvider";
 
 const SidebarNavItem: FC<
   PropsWithChildren<{ href: string; icon: ReactNode }>
@@ -42,10 +42,10 @@ const SidebarNavItemIcon: React.FC<{ icon: ElementType }> = ({
 };
 
 export const Sidebar: React.FC<{ user: User }> = ({ user }) => {
-  const styles = useStyles()
-  const { entitlements } = useDashboard()
+  const styles = useStyles();
+  const { entitlements } = useDashboard();
   const allowAutostopRequirement =
-    entitlements.features.template_autostop_requirement.enabled
+    entitlements.features.template_autostop_requirement.enabled;
 
   return (
     <nav className={styles.sidebar}>

diff --git a/site/src/pages/CreateTemplatePage/CreateTemplatePage.tsx b/site/src/pages/CreateTemplatePage/CreateTemplatePage.tsx
@@ -32,17 +32,17 @@ const CreateTemplatePage: FC = () => {
   });
 
   const { starterTemplate, error, file, jobError, jobLogs, variables } =
-    state.context
-  const shouldDisplayForm = !state.hasTag("loading")
-  const { entitlements } = useDashboard()
+    state.context;
+  const shouldDisplayForm = !state.hasTag("loading");
+  const { entitlements } = useDashboard();
   const allowAdvancedScheduling =
     entitlements.features["advanced_template_scheduling"].enabled;
   // Requires the template RBAC feature, otherwise disabling everyone access
   // means no one can access.
   const allowDisableEveryoneAccess =
-    entitlements.features["template_rbac"].enabled
+    entitlements.features["template_rbac"].enabled;
   const allowAutostopRequirement =
-    entitlements.features["template_autostop_requirement"].enabled
+    entitlements.features["template_autostop_requirement"].enabled;
 
   const onCancel = () => {
     navigate(-1);

diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx
@@ -20,10 +20,10 @@ const TemplateSchedulePage: FC = () => {
     entitlements.features["advanced_template_scheduling"].enabled;
   // This check can be removed when https://github.com/coder/coder/milestone/19
   // is merged up
-  const allowWorkspaceActions = experiments.includes("workspace_actions")
+  const allowWorkspaceActions = experiments.includes("workspace_actions");
   const allowAutostopRequirement =
-    entitlements.features["template_autostop_requirement"].enabled
-  const { clearLocal } = useLocalStorage()
+    entitlements.features["template_autostop_requirement"].enabled;
+  const { clearLocal } = useLocalStorage();
 
   const {
     mutate: updateTemplate,

diff --git a/site/src/pages/UserSettingsPage/SchedulePage/ScheduleForm.stories.tsx b/site/src/pages/UserSettingsPage/SchedulePage/ScheduleForm.stories.tsx
@@ -1,20 +1,20 @@
-import { Story } from "@storybook/react"
-import { ScheduleForm, ScheduleFormProps } from "./ScheduleForm"
-import { mockApiError } from "testHelpers/entities"
+import { Story } from "@storybook/react";
+import { ScheduleForm, ScheduleFormProps } from "./ScheduleForm";
+import { mockApiError } from "testHelpers/entities";
 
 export default {
   title: "pages/UserSettingsPage/SchedulePage/ScheduleForm",
   component: ScheduleForm,
   argTypes: {
     onSubmit: { action: "Submit" },
   },
-}
+};
 
 const Template: Story<ScheduleFormProps> = (args: ScheduleFormProps) => (
   <ScheduleForm {...args} />
-)
+);
 
-export const ExampleDefault = Template.bind({})
+export const ExampleDefault = Template.bind({});
 ExampleDefault.args = {
   submitting: false,
   initialValues: {
@@ -26,12 +26,12 @@ ExampleDefault.args = {
   },
   updateErr: undefined,
   onSubmit: () => {
-    return Promise.resolve()
+    return Promise.resolve();
   },
   now: new Date("2023-09-04T15:00:00+10:00"),
-}
+};
 
-export const ExampleUserSet = Template.bind({})
+export const ExampleUserSet = Template.bind({});
 ExampleUserSet.args = {
   ...ExampleDefault.args,
   initialValues: {
@@ -42,15 +42,15 @@ ExampleUserSet.args = {
     next: "2023-09-05T02:00:00-05:00",
   },
   now: new Date("2023-09-04T15:00:00-05:00"),
-}
+};
 
-export const Submitting = Template.bind({})
+export const Submitting = Template.bind({});
 Submitting.args = {
   ...ExampleDefault.args,
   submitting: true,
-}
+};
 
-export const WithError = Template.bind({})
+export const WithError = Template.bind({});
 WithError.args = {
   ...ExampleDefault.args,
   updateErr: mockApiError({
@@ -62,4 +62,4 @@ WithError.args = {
       },
     ],
   }),
-}
+};