From 52b26bf421de05ac6a2b025e401ddfd979f541ab Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Mon, 1 Aug 2022 20:56:15 +0000 Subject: [PATCH] Format --- .../WorkspaceScheduleForm.tsx | 136 +++++++++--------- .../WorkspaceSchedulePage.tsx | 17 +-- site/src/pages/WorkspacesPage/schedule.ts | 5 +- site/src/pages/WorkspacesPage/ttl.ts | 3 +- 4 files changed, 80 insertions(+), 81 deletions(-) diff --git a/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx b/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx index 8186cf3525..b63ed4edfb 100644 --- a/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx +++ b/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx @@ -209,80 +209,80 @@ export const WorkspaceScheduleForm: FC = ({ {submitScheduleError && }
- } - label="Auto-start" - /> - + } + label="Auto-start" + /> + - - {zones.map((zone) => ( - - {zone} - - ))} - - - - - {Language.daysOfWeekLabel} - - - - {checkboxes.map((checkbox) => ( - - } - key={checkbox.name} - label={checkbox.label} - /> + + {zones.map((zone) => ( + + {zone} + ))} - + - {form.errors.monday && {Language.errorNoDayOfWeek}} - + + + {Language.daysOfWeekLabel} + + + + {checkboxes.map((checkbox) => ( + + } + key={checkbox.name} + label={checkbox.label} + /> + ))} + + + {form.errors.monday && {Language.errorNoDayOfWeek}} +
- } - label="Auto-Stop" - /> - + } + label="Auto-Stop" + /> +
diff --git a/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx index 70bf14848c..bc3a113b94 100644 --- a/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx +++ b/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx @@ -1,6 +1,6 @@ import { useMachine, useSelector } from "@xstate/react" import { defaultSchedule, emptySchedule, scheduleToAutoStart } from "pages/WorkspacesPage/schedule" -import { ttlMsToAutoStop, emptyTTL, defaultTTL } from "pages/WorkspacesPage/ttl" +import { defaultTTL, emptyTTL, ttlMsToAutoStop } from "pages/WorkspacesPage/ttl" import React, { useContext, useEffect, useState } from "react" import { useNavigate, useParams } from "react-router-dom" import * as TypesGen from "../../api/typesGenerated" @@ -116,7 +116,8 @@ export const WorkspaceSchedulePage: React.FC = () => { username && workspaceName && scheduleSend({ type: "GET_WORKSPACE", username, workspaceName }) }, [username, workspaceName, scheduleSend]) - const getAutoStart = (workspace?: TypesGen.Workspace) => scheduleToAutoStart(workspace?.autostart_schedule) + const getAutoStart = (workspace?: TypesGen.Workspace) => + scheduleToAutoStart(workspace?.autostart_schedule) const getAutoStop = (workspace?: TypesGen.Workspace) => ttlMsToAutoStop(workspace?.ttl_ms) const [autoStart, setAutoStart] = useState(getAutoStart(workspace)) @@ -131,20 +132,20 @@ export const WorkspaceSchedulePage: React.FC = () => { if (autoStart.enabled) { setAutoStart({ enabled: false, - schedule: emptySchedule + schedule: emptySchedule, }) } else { if (workspace?.autostart_schedule) { // repopulate saved schedule setAutoStart({ enabled: true, - schedule: getAutoStart(workspace).schedule + schedule: getAutoStart(workspace).schedule, }) } else { // populate with defaults setAutoStart({ enabled: true, - schedule: defaultSchedule() + schedule: defaultSchedule(), }) } } @@ -154,20 +155,20 @@ export const WorkspaceSchedulePage: React.FC = () => { if (autoStop.enabled) { setAutoStop({ enabled: false, - ttl: emptyTTL + ttl: emptyTTL, }) } else { if (workspace?.ttl_ms) { // repopulate saved ttl setAutoStop({ enabled: true, - ttl: getAutoStop(workspace).ttl + ttl: getAutoStop(workspace).ttl, }) } else { // set default setAutoStop({ enabled: true, - ttl: defaultTTL + ttl: defaultTTL, }) } } diff --git a/site/src/pages/WorkspacesPage/schedule.ts b/site/src/pages/WorkspacesPage/schedule.ts index d39d261ef7..6518872cb6 100644 --- a/site/src/pages/WorkspacesPage/schedule.ts +++ b/site/src/pages/WorkspacesPage/schedule.ts @@ -40,8 +40,7 @@ export const emptySchedule = { timezone: "", } -export const defaultSchedule = ( -): AutoStartSchedule => ({ +export const defaultSchedule = (): AutoStartSchedule => ({ sunday: false, monday: true, tuesday: true, @@ -85,7 +84,7 @@ export const scheduleToAutoStart = (schedule?: string): AutoStart => { if (schedule) { return { enabled: true, - schedule: transformSchedule(schedule) + schedule: transformSchedule(schedule), } } else { return { enabled: false, schedule: emptySchedule } diff --git a/site/src/pages/WorkspacesPage/ttl.ts b/site/src/pages/WorkspacesPage/ttl.ts index 48459eeffb..4035ab09ed 100644 --- a/site/src/pages/WorkspacesPage/ttl.ts +++ b/site/src/pages/WorkspacesPage/ttl.ts @@ -9,6 +9,5 @@ export const defaultTTL = 8 const msToHours = (ms: number) => Math.round(ms / (1000 * 60 * 60)) -export const ttlMsToAutoStop = (ttl_ms?: number): AutoStop => ( +export const ttlMsToAutoStop = (ttl_ms?: number): AutoStop => ttl_ms ? { enabled: true, ttl: msToHours(ttl_ms) } : { enabled: false, ttl: 0 } -)