changes based on review 2

Signed-off-by: Sajid Alam <[email protected]>
kedro-org · Jul 18, 2024 · b9d07f0 · b9d07f0
1 parent 58538bd
commit b9d07f0
Showing 1 changed file with 27 additions and 30 deletions.
diff --git a/src/components/settings-modal/settings-modal.js b/src/components/settings-modal/settings-modal.js
@@ -55,6 +55,32 @@ const SettingsModal = ({
     setShowDatasetPreviewsValue(showDatasetPreviews);
   }, [showDatasetPreviews]);
 
+  useEffect(() => {
+    setToggleFlags(flags);
+  }, [flags]);
+
+  const handleSavePreferences = async () => {
+    try {
+      const response = await fetch('/api/preferences', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          showDatasetPreviews: showDatasetPreviewsValue,
+        }),
+      });
+      if (!response.ok) {
+        throw new Error('Failed to save preferences');
+      }
+      onToggleIsPrettyName(isPrettyNameValue);
+      onToggleShowFeatureHints(showFeatureHintsValue);
+      onToggleShowDatasetPreviews(showDatasetPreviewsValue);
+    } catch (error) {
+      console.error('Error saving preferences:', error);
+    }
+  };
+
   useEffect(() => {
     let modalTimeout, resetTimeout;
 
@@ -72,9 +98,7 @@ const SettingsModal = ({
           return onToggleFlag(name, value);
         });
 
-        onToggleIsPrettyName(isPrettyNameValue);
-        onToggleShowFeatureHints(showFeatureHintsValue);
-        onToggleShowDatasetPreviews(showDatasetPreviewsValue);
+        handleSavePreferences();
         setHasNotInteracted(true);
         setHasClickApplyAndClose(false);
 
@@ -99,33 +123,6 @@ const SettingsModal = ({
     toggleFlags,
   ]);
 
-  useEffect(() => {
-    const updatePreferences = async () => {
-      try {
-        const response = await fetch('/api/preferences', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            showDatasetPreviews: showDatasetPreviewsValue,
-          }),
-        });
-
-        if (!response.ok) {
-          throw new Error('Failed to update preferences');
-        }
-
-        const result = await response.json();
-        console.log('Preferences updated successfully:', result);
-      } catch (error) {
-        console.error('Error updating preferences:', error);
-      }
-    };
-
-    updatePreferences();
-  }, [showDatasetPreviewsValue]);
-
   const resetStateCloseModal = () => {
     showSettingsModal(false);
     setHasNotInteracted(true);