[Fleet] Fix race condition edit package policy (#123762) (#123778)

(cherry picked from commit 797f07b) Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
elastic · Jan 26, 2022 · 01d4a6a · 01d4a6a
1 parent 919c0d0
commit 01d4a6a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...ons/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx b/...ons/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
@@ -50,12 +50,14 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
   updatePackagePolicy: (fields: Partial<NewPackagePolicy>) => void;
   validationResults: PackagePolicyValidationResults;
   submitAttempted: boolean;
+  isUpdate?: boolean;
 }> = memo(
   ({
     agentPolicy,
     packageInfo,
     packagePolicy,
     integrationToEnable,
+    isUpdate,
     updatePackagePolicy,
     validationResults,
     submitAttempted,
@@ -88,7 +90,7 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
 
     // Update package policy's package and agent policy info
     useEffect(() => {
-      if (isLoadingPackagePolicies) {
+      if (isUpdate || isLoadingPackagePolicies) {
         return;
       }
       const pkg = packagePolicy.package;
@@ -133,6 +135,7 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
         });
       }
     }, [
+      isUpdate,
       packagePolicy,
       agentPolicy,
       packageInfo,

diff --git a/.../fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx b/.../fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -504,6 +504,7 @@ export const EditPackagePolicyForm = memo<{
               updatePackagePolicy={updatePackagePolicy}
               validationResults={validationResults!}
               submitAttempted={formState === 'INVALID'}
+              isUpdate={true}
             />
           )}