Fix not persisting default values for new variables

elastic · May 12, 2022 · fede140 · fede140
1 parent 132f547
commit fede140
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/x-pack/plugins/fleet/common/services/validate_package_policy.test.ts b/x-pack/plugins/fleet/common/services/validate_package_policy.test.ts
@@ -241,6 +241,7 @@ describe('Fleet - validatePackagePolicy()', () => {
           ],
         },
       ],
+      vars: {},
     };
 
     const invalidPackagePolicy: NewPackagePolicy = {
@@ -332,6 +333,7 @@ describe('Fleet - validatePackagePolicy()', () => {
           ],
         },
       ],
+      vars: {},
     };
 
     const noErrorsValidationResults = {
@@ -370,6 +372,7 @@ describe('Fleet - validatePackagePolicy()', () => {
           vars: { 'var-name': null },
         },
       },
+      vars: {},
     };
 
     it('returns no errors for valid package policy', () => {
@@ -416,6 +419,7 @@ describe('Fleet - validatePackagePolicy()', () => {
             streams: { 'with-no-stream-vars-bar': {} },
           },
         },
+        vars: {},
       });
     });
 
@@ -487,6 +491,7 @@ describe('Fleet - validatePackagePolicy()', () => {
             streams: { 'with-no-stream-vars-bar': {} },
           },
         },
+        vars: {},
       });
     });
 
@@ -505,6 +510,7 @@ describe('Fleet - validatePackagePolicy()', () => {
         description: null,
         namespace: null,
         inputs: null,
+        vars: {},
       });
       expect(
         validatePackagePolicy(
@@ -520,6 +526,7 @@ describe('Fleet - validatePackagePolicy()', () => {
         description: null,
         namespace: null,
         inputs: null,
+        vars: {},
       });
     });
 
@@ -538,6 +545,7 @@ describe('Fleet - validatePackagePolicy()', () => {
         description: null,
         namespace: null,
         inputs: null,
+        vars: {},
       });
       expect(
         validatePackagePolicy(
@@ -553,6 +561,7 @@ describe('Fleet - validatePackagePolicy()', () => {
         description: null,
         namespace: null,
         inputs: null,
+        vars: {},
       });
     });
 
@@ -604,6 +613,7 @@ describe('Fleet - validatePackagePolicy()', () => {
             },
           },
         },
+        vars: {},
       });
     });
 
@@ -729,6 +739,7 @@ describe('Fleet - validatePackagePolicy()', () => {
             },
           },
         },
+        vars: {},
         name: null,
         namespace: null,
       });

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
@@ -209,7 +209,17 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
           {/* Required vars */}
           {requiredVars.map((varDef) => {
             const { name: varName, type: varType, default: defaultValue } = varDef;
-            const value = packagePolicy.vars?.[varName]?.value ?? defaultValue;
+
+            // Set up the `vars` object and assign the default value if it doesn't exist
+            if (!packagePolicy.vars) {
+              packagePolicy.vars = {};
+            }
+
+            if (!packagePolicy.vars[varName]) {
+              packagePolicy.vars[varName] = { value: defaultValue, type: varType };
+            }
+
+            const value = packagePolicy.vars?.[varName]?.value;
 
             return (
               <EuiFlexItem key={varName}>