save button on settings; pass thru status

mmkal · May 9, 2024 · cf81bef · cf81bef
1 parent 20b50e6
commit cf81bef
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/packages/admin/e2e/setup.seed.ts b/packages/admin/e2e/setup.seed.ts
@@ -11,7 +11,7 @@ test('seed', async ({page, execute}) => {
   await page.getByRole('button', {name: 'Add to headers'}).click()
   await page.getByLabel('headers.connection-string').fill(adminConnectionString)
   await page.getByLabel('apiUrl').fill(apiUrl)
-  await page.reload()
+  await page.getByRole('button', {name: 'Save'}).click()
 
   await page.getByRole('button', {name: 'Open sql'}).click()
 
@@ -21,7 +21,7 @@ test('seed', async ({page, execute}) => {
 
   await page.getByRole('button', {name: 'Open settings'}).click()
   await page.getByLabel('headers.connection-string').fill(connectionString)
-  await page.reload()
+  await page.getByRole('button', {name: 'Save'}).click()
 
   await page.getByRole('button', {name: 'Open sql'}).click()
   await execute(`

diff --git a/packages/admin/src/client/settings.tsx b/packages/admin/src/client/settings.tsx
@@ -34,7 +34,16 @@ export const SettingsPanel = () => {
   return (
     <div className="h-full overflow-auto">
       <h1>Settings</h1>
-      <ZForm useFormProps={{defaultValues: value}} className="gap-5" schema={Settings} onTouch={update} />
+      <ZForm
+        useFormProps={{defaultValues: value, mode: 'onSubmit'}}
+        className="gap-5"
+        schema={Settings}
+        submitButton="Save"
+        onSubmit={values => {
+          update(values)
+          window.location.reload()
+        }}
+      />
     </div>
   )
 }
diff --git a/packages/admin/src/client/utils/zform/form.tsx b/packages/admin/src/client/utils/zform/form.tsx
@@ -115,10 +115,14 @@ export function ZForm<Z extends z.ZodObject<any>>({useFormProps, ...props}: ZFor
           {reflected.map(entry => (
             <RenderEntry form={form} entry={entry} key={jKey(entry.path)} />
           ))}
-          {props.submitButton || props.onSubmit ? <Button type="submit">Submit</Button> : null}
+          {typeof props.submitButton === 'string' ? (
+            <Button type="submit">{props.submitButton}</Button>
+          ) : props.submitButton || props.onSubmit ? (
+            props.submitButton || <Button type="submit">Submit</Button>
+          ) : null}
         </form>
       </Form>
-      {Object.keys(form.formState.errors).length > 0 && (
+      {/* {Object.keys(form.formState.errors).length > 0 && (
         <pre>
           {JSON.stringify(
             {
@@ -130,7 +134,7 @@ export function ZForm<Z extends z.ZodObject<any>>({useFormProps, ...props}: ZFor
             2,
           )}
         </pre>
-      )}
+      )} */}
     </>
   )
 }

diff --git a/packages/admin/src/server/migrations.ts b/packages/admin/src/server/migrations.ts
@@ -29,8 +29,8 @@ const getMigratorStuff = async (ctx: ServerContext) => {
   }
 }
 
-const formatMigrations = (migrations: {name: string; path?: string}[]) =>
-  migrations.map(m => ({name: m.name, path: m.path}))
+const formatMigrations = <Status extends string>(migrations: {name: string; path?: string; status?: Status}[]) =>
+  migrations.map(m => ({name: m.name, path: m.path, status: m.status}))
 
 export const migrationsRotuer = trpc.router({
   up: publicProcedure