From fc8df8d4ac82cbadcf1feb544d5da763ac32174a Mon Sep 17 00:00:00 2001
From: Richard Fontein <32132657+rifont@users.noreply.github.com>
Date: Mon, 30 Sep 2024 10:51:25 +0100
Subject: [PATCH] fix(preferences): initialize state with user prefs check

---
 .../templates/editor_v2/CloudWorkflowSettingsSidePanel.tsx    | 4 ++--
 .../workflows/preferences/WorkflowSubscriptionPreferences.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/pages/templates/editor_v2/CloudWorkflowSettingsSidePanel.tsx b/apps/web/src/pages/templates/editor_v2/CloudWorkflowSettingsSidePanel.tsx
index e32d2ad508a..fb909898794 100644
--- a/apps/web/src/pages/templates/editor_v2/CloudWorkflowSettingsSidePanel.tsx
+++ b/apps/web/src/pages/templates/editor_v2/CloudWorkflowSettingsSidePanel.tsx
@@ -16,10 +16,10 @@ export const CloudWorkflowSettingsSidePanel: FC<CloudWorkflowSettingsSidePanelPr
   const { templateId: workflowId = '' } = useParams<{ templateId: string }>();
   const [searchParams] = useSearchParams();
   const { isLoading, workflowUserPreferences, workflowResourcePreferences } = useCloudWorkflowPreferences(workflowId);
-  const { setValue } = useFormContext<WorkflowDetailFormContext>();
+  const { setValue, getValues } = useFormContext<WorkflowDetailFormContext>();
 
   useEffect(() => {
-    if (workflowUserPreferences !== undefined) {
+    if (workflowUserPreferences !== undefined && getValues('preferences') === undefined) {
       setValue('preferences', workflowUserPreferences, { shouldDirty: false });
     }
   }, [setValue, workflowUserPreferences]);
diff --git a/apps/web/src/studio/components/workflows/preferences/WorkflowSubscriptionPreferences.tsx b/apps/web/src/studio/components/workflows/preferences/WorkflowSubscriptionPreferences.tsx
index 42214a9820c..58898ef545c 100644
--- a/apps/web/src/studio/components/workflows/preferences/WorkflowSubscriptionPreferences.tsx
+++ b/apps/web/src/studio/components/workflows/preferences/WorkflowSubscriptionPreferences.tsx
@@ -47,7 +47,7 @@ export const WorkflowSubscriptionPreferences: FC<WorkflowSubscriptionPreferences
   updateWorkflowPreferences,
   arePreferencesDisabled,
 }) => {
-  const [isOverridingPreferences, setIsOverridingPreferences] = useState(false);
+  const [isOverridingPreferences, setIsOverridingPreferences] = useState(workflowUserPreferences !== null);
   // Use the user preferences if they exist, otherwise fall back to the resource preferences
   const [preferences, setPreferences] = useState<WorkflowPreferences>(
     workflowUserPreferences || workflowResourcePreferences!