Address PR feedback + update tests

elastic · May 12, 2022 · 2e2469e · 2e2469e
1 parent 71317da
commit 2e2469e
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 14 deletions.
diff --git a/...leet/sections/agent_policy/create_package_policy_page/step_define_package_policy.test.tsx b/...leet/sections/agent_policy/create_package_policy_page/step_define_package_policy.test.tsx
@@ -92,7 +92,7 @@ describe('StepDefinePackagePolicy', () => {
 
   let testRenderer: TestRenderer;
   let renderResult: ReturnType<typeof testRenderer.render>;
-  const render = () =>
+  const render = ({ isUpdate } = { isUpdate: false }) =>
     (renderResult = testRenderer.render(
       <StepDefinePackagePolicy
         agentPolicy={agentPolicy}
@@ -101,6 +101,7 @@ describe('StepDefinePackagePolicy', () => {
         updatePackagePolicy={mockUpdatePackagePolicy}
         validationResults={validationResults}
         submitAttempted={false}
+        isUpdate={isUpdate}
       />
     ));
 
@@ -205,4 +206,23 @@ describe('StepDefinePackagePolicy', () => {
       expect(renderResult.getByDisplayValue('apache-11')).toBeInTheDocument();
     });
   });
+
+  describe('update', () => {
+    describe('when package vars are introduced in a new package version', () => {
+      it('should display new package vars', () => {
+        render({ isUpdate: true });
+
+        waitFor(async () => {
+          expect(renderResult.getByDisplayValue('showUserVarVal')).toBeInTheDocument();
+          expect(renderResult.getByText('Required var')).toBeInTheDocument();
+
+          await act(async () => {
+            fireEvent.click(renderResult.getByText('Advanced options').closest('button')!);
+          });
+
+          expect(renderResult.getByText('Advanced var')).toBeInTheDocument();
+        });
+      });
+    });
+  });
 });
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
@@ -90,9 +90,28 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
 
     // Update package policy's package and agent policy info
     useEffect(() => {
-      if (isUpdate || isLoadingPackagePolicies) {
+      if (isLoadingPackagePolicies) {
         return;
       }
+
+      if (isUpdate) {
+        // If we're upgrading, we need to make sure we catch an addition of package-level
+        // vars when they were previously no package-level vars defined
+        if (!packagePolicy.vars && packageInfo.vars) {
+          updatePackagePolicy(
+            packageToPackagePolicy(
+              packageInfo,
+              agentPolicy?.id || '',
+              packagePolicy.output_id,
+              packagePolicy.namespace,
+              packagePolicy.name,
+              packagePolicy.description,
+              integrationToEnable
+            )
+          );
+        }
+      }
+
       const pkg = packagePolicy.package;
       const currentPkgKey = pkg ? pkgKeyFromPackageInfo(pkg) : '';
       const pkgKey = pkgKeyFromPackageInfo(packageInfo);
@@ -208,18 +227,9 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
 
           {/* Required vars */}
           {requiredVars.map((varDef) => {
-            const { name: varName, type: varType, default: defaultValue } = varDef;
-
-            // 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;
+            const { name: varName, type: varType } = varDef;
+            if (!packagePolicy.vars || !packagePolicy.vars[varName]) return null;
+            const value = packagePolicy.vars[varName].value;
 
             return (
               <EuiFlexItem key={varName}>