From 7181366b1868c325f0e51ff8cabc2c7b4b9b3ecd Mon Sep 17 00:00:00 2001
From: Animesh404 <akjha6680@gmail.com>
Date: Sat, 26 Oct 2024 14:35:02 +0530
Subject: [PATCH] format fix

---
 .../app/settings/(api_keys)/form.tsx          | 19 +++++++++++++++----
 .../app/settings/record_and_replay/form.tsx   | 10 +++++-----
 .../dashboard/app/settings/scrubbing/form.tsx |  2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/openadapt/app/dashboard/app/settings/(api_keys)/form.tsx b/openadapt/app/dashboard/app/settings/(api_keys)/form.tsx
index 3afafe87f..4cdcc6611 100644
--- a/openadapt/app/dashboard/app/settings/(api_keys)/form.tsx
+++ b/openadapt/app/dashboard/app/settings/(api_keys)/form.tsx
@@ -12,13 +12,24 @@ type Props = {
 export const Form = ({
     settings,
 }: Props) => {
+    const defaultSettings = {
+        PRIVATE_AI_API_KEY: '',
+        REPLICATE_API_TOKEN: '',
+        OPENAI_API_KEY: '',
+        ANTHROPIC_API_KEY: '',
+        GOOGLE_API_KEY: '',
+    };
+
     const form = useForm({
-        initialValues: JSON.parse(JSON.stringify(settings)),
-    })
+        initialValues: { ...defaultSettings, ...settings },
+    });
 
     useEffect(() => {
-        form.setValues(JSON.parse(JSON.stringify(settings)));
-        form.setInitialValues(JSON.parse(JSON.stringify(settings)));
+        // Only set values if settings are defined and different from initial values
+        if (settings && JSON.stringify(form.values) !== JSON.stringify(settings)) {
+            form.setValues({ ...defaultSettings, ...settings });
+            form.setInitialValues({ ...defaultSettings, ...settings });
+        }
     }, [settings]);
 
     function resetForm() {
diff --git a/openadapt/app/dashboard/app/settings/record_and_replay/form.tsx b/openadapt/app/dashboard/app/settings/record_and_replay/form.tsx
index 036ae26bf..f18375dfb 100644
--- a/openadapt/app/dashboard/app/settings/record_and_replay/form.tsx
+++ b/openadapt/app/dashboard/app/settings/record_and_replay/form.tsx
@@ -32,19 +32,19 @@ export const Form = ({
         <form onSubmit={form.onSubmit(saveSettings(form))}>
             <Grid>
                 <Grid.Col span={6}>
-                    <Checkbox label="Record window data" {...form.getInputProps('RECORD_WINDOW_DATA')} checked={form.values.RECORD_WINDOW_DATA} />
+                    <Checkbox label="Record window data" {...form.getInputProps('RECORD_WINDOW_DATA')} />
                 </Grid.Col>
                 <Grid.Col span={6}>
-                    <Checkbox label="Record active element state" {...form.getInputProps('RECORD_ACTIVE_ELEMENT_STATE')} checked={form.values.RECORD_ACTIVE_ELEMENT_STATE} />
+                    <Checkbox label="Record active element state" {...form.getInputProps('RECORD_ACTIVE_ELEMENT_STATE')} />
                 </Grid.Col>
                 <Grid.Col span={6}>
-                    <Checkbox label="Record video" {...form.getInputProps('RECORD_VIDEO')} checked={form.values.RECORD_VIDEO} />
+                    <Checkbox label="Record video" {...form.getInputProps('RECORD_VIDEO')} />
                 </Grid.Col>
                 <Grid.Col span={6}>
-                    <Checkbox label="Record images" {...form.getInputProps('RECORD_IMAGES')} checked={form.values.RECORD_IMAGES} />
+                    <Checkbox label="Record images" {...form.getInputProps('RECORD_IMAGES')} />
                 </Grid.Col>
                 <Grid.Col span={6}>
-                    <Checkbox label="Record browser (Chrome) events (see <insert link to relevant README section> to install extension)" {...form.getInputProps('RECORD_BROWSER_EVENTS')} checked={form.values.RECORD_BROWSER_EVENTS} />
+                    <Checkbox label="Record browser (Chrome) events (see <insert link to relevant README section> to install extension)" {...form.getInputProps('RECORD_BROWSER_EVENTS')} />
                 </Grid.Col>
                 <Grid.Col span={6}>
                     <TextInput label="Video pixel format" placeholder="Video pixel format" {...form.getInputProps('VIDEO_PIXEL_FORMAT')} />
diff --git a/openadapt/app/dashboard/app/settings/scrubbing/form.tsx b/openadapt/app/dashboard/app/settings/scrubbing/form.tsx
index 65aec6070..314f584bc 100644
--- a/openadapt/app/dashboard/app/settings/scrubbing/form.tsx
+++ b/openadapt/app/dashboard/app/settings/scrubbing/form.tsx
@@ -39,7 +39,7 @@ export const Form = ({
         <form onSubmit={form.onSubmit(_onSubmit)}>
             <Grid>
                 <Grid.Col span={6}>
-                    <Checkbox label="Scrubbing Enabled" {...form.getInputProps('SCRUB_ENABLED')} checked={form.values.SCRUB_ENABLED} />
+                    <Checkbox label="Scrubbing Enabled" {...form.getInputProps('SCRUB_ENABLED')} />
                 </Grid.Col>
                 <Grid.Col span={6}>
                     <TextInput label="Scrubbing character" placeholder="Scrubbing character" {...form.getInputProps('SCRUB_CHAR')} />