remove promise

greyscaled · greyscaled · commit ecc6792c3e1a · 2022-05-24T20:00:58.000Z
diff --git a/site/src/components/WorkspaceStats/WorkspaceScheduleForm.stories.tsx b/site/src/components/WorkspaceStats/WorkspaceScheduleForm.stories.tsx
@@ -13,8 +13,5 @@ const Template: Story<WorkspaceScheduleFormProps> = (args) => <WorkspaceSchedule
 export const Example = Template.bind({})
 Example.args = {
   onCancel: () => action("onCancel"),
-  onSubmit: () => {
-    action("onSubmit")
-    return Promise.resolve()
-  },
+  onSubmit: () => action("onSubmit"),
 }
diff --git a/site/src/components/WorkspaceStats/WorkspaceScheduleForm.tsx b/site/src/components/WorkspaceStats/WorkspaceScheduleForm.tsx
@@ -31,10 +31,9 @@ export const Language = {
 }
 
 export interface WorkspaceScheduleFormProps {
+  isLoading: boolean
   onCancel: () => void
-
-  // TODO(Grey): un-promisfy and adding isSubmitting prop
-  onSubmit: (values: WorkspaceScheduleFormValues) => Promise<void>
+  onSubmit: (values: WorkspaceScheduleFormValues) => void
 }
 
 export interface WorkspaceScheduleFormValues {
@@ -80,7 +79,7 @@ export const validationSchema = Yup.object({
   ttl: Yup.number().min(0).integer(),
 })
 
-export const WorkspaceScheduleForm: React.FC<WorkspaceScheduleFormProps> = ({ onCancel, onSubmit }) => {
+export const WorkspaceScheduleForm: React.FC<WorkspaceScheduleFormProps> = ({ isLoading, onCancel, onSubmit }) => {
   const styles = useStyles()
 
   const form = useFormik<WorkspaceScheduleFormValues>({
@@ -210,7 +209,7 @@ export const WorkspaceScheduleForm: React.FC<WorkspaceScheduleFormProps> = ({ on
             variant="standard"
           />
 
-          <FormFooter onCancel={onCancel} isLoading={form.isSubmitting} />
+          <FormFooter onCancel={onCancel} isLoading={form.isSubmitting || isLoading} />
         </Stack>
       </form>
     </FullPageForm>
diff --git a/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
@@ -68,6 +68,7 @@ export const WorkspaceSchedulePage: React.FC = () => {
   } else {
     return (
       <WorkspaceScheduleForm
+        isLoading={scheduleState.tags.has("loading")}
         onCancel={() => {
           navigate(`/workspaces/${workspaceId}`)
         }}
@@ -77,10 +78,7 @@ export const WorkspaceSchedulePage: React.FC = () => {
             autoStart: formValuesToAutoStartRequest(values),
             ttl: formValuesToTTLRequest(values),
           })
-
-          // TODO(Grey): Remove this after onSubmit is un-promisified
           // TODO(Grey): navigation logic
-          return Promise.resolve()
         }}
       />
     )
