temp: test schema migration

grafana · Dec 2, 2024 · 5fb2026 · 5fb2026
1 parent 8a2e5e2
commit 5fb2026
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 21 deletions.
diff --git a/src/components/Settings/AppearanceSettings.tsx b/src/components/Settings/AppearanceSettings.tsx
@@ -15,14 +15,14 @@ export function AppearanceSettings() {
   return (
     <SettingsSection>
       <FieldGroup
-        name="appearance.theme"
+        name="general.appearance.theme"
         label="Theme"
         errors={errors}
         hint="Select whether the app should use a light theme, dark theme, or match your system settings."
         hintType="text"
       >
         <Controller
-          name="appearance.theme"
+          name="general.appearance.theme"
           control={control}
           render={({ field }) => (
             <RadioCards.Root

diff --git a/src/components/Settings/UsageReportSettings.tsx b/src/components/Settings/UsageReportSettings.tsx
@@ -17,11 +17,11 @@ export const UsageReportSettings = () => {
       <Flex gap="2">
         <Controller
           control={control}
-          name="usageReport.enabled"
+          name="general.usageReport.enabled"
           render={({ field }) => (
             <Text size="2" as="label">
               <Checkbox
-                {...register('usageReport.enabled')}
+                {...register('general.usageReport.enabled')}
                 checked={field.value}
                 onCheckedChange={field.onChange}
               />{' '}

diff --git a/src/main.ts b/src/main.ts
@@ -198,9 +198,9 @@ const createWindow = async () => {
 app.whenReady().then(async () => {
   await initSettings()
   appSettings = await getSettings()
-  nativeTheme.themeSource = appSettings.appearance.theme
+  nativeTheme.themeSource = appSettings.general.appearance.theme
 
-  await sendReport(appSettings.usageReport)
+  await sendReport(appSettings.general.usageReport)
   await createSplashWindow()
   await setupProjectStructure()
   await createWindow()
@@ -353,7 +353,7 @@ ipcMain.handle(
       browserWindow,
       resolvedScriptPath,
       appSettings.proxy.port,
-      appSettings.usageReport.enabled
+      appSettings.general.usageReport.enabled
     )
   }
 )
@@ -628,12 +628,12 @@ async function applySettings(
   if (modifiedSettings.recorder) {
     appSettings.recorder = modifiedSettings.recorder
   }
-  if (modifiedSettings.usageReport) {
-    appSettings.usageReport = modifiedSettings.usageReport
+  if (modifiedSettings.general?.usageReport) {
+    appSettings.general.usageReport = modifiedSettings.general.usageReport
   }
-  if (modifiedSettings.appearance) {
-    appSettings.appearance = modifiedSettings.appearance
-    nativeTheme.themeSource = appSettings.appearance.theme
+  if (modifiedSettings.general?.appearance) {
+    appSettings.general.appearance = modifiedSettings.general.appearance
+    nativeTheme.themeSource = appSettings.general.appearance.theme
   }
 }
 

diff --git a/src/schemas/settings/v1/index.ts b/src/schemas/settings/v1/index.ts
@@ -117,8 +117,10 @@ export function migrate(
     proxy: settings.proxy,
     recorder: settings.recorder,
     windowState: settings.windowState,
-    usageReport: settings.usageReport,
-    appearance: settings.appearance,
+    general: {
+      usageReport: settings.usageReport,
+      appearance: settings.appearance,
+    },
   }
 }
 

diff --git a/src/schemas/settings/v2/index.ts b/src/schemas/settings/v2/index.ts
@@ -20,8 +20,10 @@ export const AppSettingsSchema = z.object({
   proxy: ProxySettingsSchema,
   recorder: RecorderSettingsSchema,
   windowState: WindowStateSchema,
-  usageReport: UsageReportSettingsSchema,
-  appearance: AppearanceSchema,
+  general: z.object({
+    usageReport: UsageReportSettingsSchema,
+    appearance: AppearanceSchema,
+  }),
 })
 
 export type AppSettings = z.infer<typeof AppSettingsSchema>

diff --git a/src/settings.ts b/src/settings.ts
@@ -24,11 +24,13 @@ const defaultSettings: AppSettings = {
     y: 0,
     isMaximized: true,
   },
-  usageReport: {
-    enabled: true,
-  },
-  appearance: {
-    theme: 'system',
+  general: {
+    usageReport: {
+      enabled: true,
+    },
+    appearance: {
+      theme: 'system',
+    },
   },
 }