From 6486a5d9710a0c7a38477a8779c29b2d51f53ff5 Mon Sep 17 00:00:00 2001
From: Oscar Zhou <100548325+oscarzhou-portainer@users.noreply.github.com>
Date: Mon, 29 Jul 2024 09:42:05 +1200
Subject: [PATCH] fix(edgestack): broken parallel setting in create view
 [EE-7245] (#11945)

---
 .../edge/edge-stacks/CreateView/InnerForm.tsx   | 10 +++++++++-
 .../GitForm/useUpdateEdgeStackGitMutation.ts    | 17 ++++++++++++++---
 .../EditEdgeStackForm/NonGitStackForm.tsx       | 13 +++++++++----
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/app/react/edge/edge-stacks/CreateView/InnerForm.tsx b/app/react/edge/edge-stacks/CreateView/InnerForm.tsx
index 1aed6a42b..f21ee45b6 100644
--- a/app/react/edge/edge-stacks/CreateView/InnerForm.tsx
+++ b/app/react/edge/edge-stacks/CreateView/InnerForm.tsx
@@ -124,7 +124,15 @@ export function InnerForm({
       <StaggerFieldset
         isEdit={false}
         values={values.staggerConfig}
-        onChange={(value) => setFieldValue('staggerConfig', value)}
+        onChange={(newStaggerValues) =>
+          setValues((values) => ({
+            ...values,
+            staggerConfig: {
+              ...values.staggerConfig,
+              ...newStaggerValues,
+            },
+          }))
+        }
       />
 
       <FormActions
diff --git a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/GitForm/useUpdateEdgeStackGitMutation.ts b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/GitForm/useUpdateEdgeStackGitMutation.ts
index 5f7431b5c..e4da60bf2 100644
--- a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/GitForm/useUpdateEdgeStackGitMutation.ts
+++ b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/GitForm/useUpdateEdgeStackGitMutation.ts
@@ -1,7 +1,11 @@
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { mutationOptions, withError } from '@/react-tools/react-query';
+import {
+  mutationOptions,
+  withError,
+  withInvalidate,
+} from '@/react-tools/react-query';
 import {
   AutoUpdateResponse,
   GitAuthenticationResponse,
@@ -11,6 +15,8 @@ import { DeploymentType, EdgeStack } from '@/react/edge/edge-stacks/types';
 import { EdgeGroup } from '@/react/edge/edge-groups/types';
 import { Registry } from '@/react/portainer/registries/types/registry';
 
+import { queryKeys } from '../../../queries/query-keys';
+
 export interface UpdateEdgeStackGitPayload {
   id: EdgeStack['Id'];
   autoUpdate: AutoUpdateResponse | null;
@@ -23,9 +29,14 @@ export interface UpdateEdgeStackGitPayload {
 }
 
 export function useUpdateEdgeStackGitMutation() {
+  const queryClient = useQueryClient();
+
   return useMutation(
     updateEdgeStackGit,
-    mutationOptions(withError('Failed updating stack'))
+    mutationOptions(
+      withError('Failed updating stack'),
+      withInvalidate(queryClient, [queryKeys.base()])
+    )
   );
 }
 
diff --git a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/NonGitStackForm.tsx b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/NonGitStackForm.tsx
index 414ace0c9..d259e0773 100644
--- a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/NonGitStackForm.tsx
+++ b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/NonGitStackForm.tsx
@@ -186,6 +186,7 @@ function InnerForm({
     setFieldValue,
     isValid,
     errors,
+    setValues,
     setFieldError,
     initialValues,
   } = useFormikContext<FormValues>();
@@ -327,10 +328,14 @@ function InnerForm({
 
           <StaggerFieldset
             values={values.staggerConfig}
-            onChange={(value) =>
-              Object.entries(value).forEach(([key, value]) =>
-                setFieldValue(`staggerConfig.${key}`, value)
-              )
+            onChange={(newStaggerValues) =>
+              setValues((values) => ({
+                ...values,
+                staggerConfig: {
+                  ...values.staggerConfig,
+                  ...newStaggerValues,
+                },
+              }))
             }
             errors={errors.staggerConfig}
           />