Merge pull request #1484 from navikt/fix/migration-nested-properties

Fix migration dryrun on nested properties

Author: magnurh-cx

packages/bygger-backend/src/migration/filterUtils.test.ts

@@ -1,25 +1,25 @@
+import { Component } from '@navikt/skjemadigitalisering-shared-domain';
 import { componentHasDependencyMatchingFilters, getPropertyFromTarget, targetMatchesFilters } from './filterUtils';
 import {
   componentWithAdvancedConditionalToRadio,
   componentWithSimpleConditionalToRadio,
   formWithSimpleConditionalToRadio,
+  originalOtherDocumentationAttachmentComponent,
   originalTextFieldComponent,
 } from './testData';
 
 describe('filterUtils', () => {
   describe('getPropertyFromComponent', () => {
     it('gets the value of a property in the object as a string', () => {
-      const actual = getPropertyFromTarget({ value: 'the value' }, ['value']);
+      const actual = getPropertyFromTarget({ value: 'the value' } as unknown as Component, ['value']);
       expect(actual).toBe('the value');
     });
 
     it('gets properties from nested objects', () => {
-      const actual = getPropertyFromTarget({ firstLevel: { secondLevel: { thirdLevel: { value: 'the value' } } } }, [
-        'firstLevel',
-        'secondLevel',
-        'thirdLevel',
-        'value',
-      ]);
+      const actual = getPropertyFromTarget(
+        { firstLevel: { secondLevel: { thirdLevel: { value: 'the value' } } } } as unknown as Component,
+        ['firstLevel', 'secondLevel', 'thirdLevel', 'value'],
+      );
       expect(actual).toBe('the value');
     });
   });
@@ -70,6 +70,18 @@ describe('filterUtils', () => {
       ).toBe(false);
     });
 
+    it('handles nested properties with three levels', () => {
+      expect(
+        targetMatchesFilters(originalOtherDocumentationAttachmentComponent, [
+          {
+            key: 'attachmentValues.leggerVedNaa.enabled',
+            value: null,
+            operator: 'exists',
+          },
+        ]),
+      ).toBe(true);
+    });
+
     describe('With operators', () => {
       const typeEqTextfield = { key: 'type', value: 'textfield' };
       const typeEqRadio = { key: 'type', value: 'radio' };

packages/bygger-backend/src/migration/filterUtils.ts

@@ -20,11 +20,11 @@ function parseFiltersFromParam(filtersFromParam: object): Filter[] {
   });
 }
 
-function getPropertyFromTarget(comp: any, properties: string[]): string | undefined {
-  if (properties.length > 1) {
-    return getPropertyFromTarget(comp[properties[0]], properties.slice(1));
+function getPropertyFromTarget(component: Component | NavFormType, properties: string[]): string | undefined {
+  if (properties.length > 1 && component[properties[0]]) {
+    return getPropertyFromTarget(component[properties[0]], properties.slice(1));
   }
-  return comp && comp[properties[0]];
+  return component && component[properties[0]];
 }
 
 function targetMatchesFilters(target: Component | NavFormType, filters: Filter[]) {

packages/bygger-backend/src/migration/testData.ts

@@ -61,6 +61,30 @@ const originalFodselsnummerComponent = {
   tableView: true,
 };
 
+const originalOtherDocumentationAttachmentComponent: Component = {
+  key: 'annenDokumentasjon',
+  type: 'attachment',
+  input: true,
+  label: 'Annen dokumentasjon',
+  validate: {
+    required: true,
+  },
+  properties: {
+    vedleggskode: 'N6',
+    vedleggstittel: 'Annet',
+  },
+  description: 'Har du noen annen dokumentasjon du ønsker å legge ved?',
+  attachmentType: 'other',
+  attachmentValues: {
+    nei: {
+      enabled: true,
+    },
+    leggerVedNaa: {
+      enabled: true,
+    },
+  },
+};
+
 const originalForm: NavFormType = {
   path: 'testform',
   components: [originalFodselsnummerComponent, originalTextFieldComponent],
@@ -189,6 +213,7 @@ export {
   formWithSimpleConditionalToRadio,
   originalFodselsnummerComponent,
   originalForm,
+  originalOtherDocumentationAttachmentComponent,
   originalPanelComponent,
   originalSkjemaGruppeComponent,
   originalTextFieldComponent,