Fixing tests with modalEdit by removing some hacks with nested wizard…

…s and modal edit components.
formio · Nov 25, 2024 · bb70b36 · bb70b36
1 parent 08b39fe
commit bb70b36
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 31 deletions.
diff --git a/src/Webform.js b/src/Webform.js
@@ -670,11 +670,6 @@ export default class Webform extends NestedDataComponent {
             if (this.onSetForm) {
                 this.onSetForm(_.cloneDeep(this._form), form);
             }
-
-            if (this.parent?.component?.modalEdit) {
-                this.formReadyResolve();
-                return Promise.resolve();
-            }
         } catch (err) {
             console.warn(err);
             // If provided form is not a valid JSON object, do not set it too

diff --git a/src/WebformBuilder.js b/src/WebformBuilder.js
@@ -1275,25 +1275,14 @@ export default class WebformBuilder extends Component {
   findRepeatablePaths() {
     const repeatablePaths = [];
     const keys = new Map();
-
-    eachComponent(this.form.components, (comp, path) => {
-      if (!comp.key) {
-        return;
-      }
-
-      if (keys.has(comp.key)) {
-        if (keys.get(comp.key).includes(path)) {
-          repeatablePaths.push(path);
-        }
-        else {
-          keys.set(comp.key, [...keys.get(comp.key), path]);
-        }
+    eachComponent(this.form.components, (comp, path, components, parent, paths) => {
+      if (keys.has(paths.dataPath)) {
+        repeatablePaths.push(paths.dataPath);
       }
       else {
-        keys.set(comp.key, [path]);
+        keys.set(paths.dataPath, true);
       }
     }, true);
-
     return repeatablePaths;
   }
 

diff --git a/src/Wizard.js b/src/Wizard.js
@@ -1036,13 +1036,6 @@ export default class Wizard extends Webform {
     }
   }
 
-  redraw() {
-    if (this.parent?.component?.modalEdit) {
-      return this.parent.redraw();
-    }
-    return super.redraw();
-  }
-
   rebuild() {
     const currentPage = this.page;
     const setCurrentPage = () => this.setPage(currentPage);

diff --git a/src/components/_classes/component/Component.js b/src/components/_classes/component/Component.js
@@ -486,7 +486,7 @@ export default class Component extends Element {
   /* eslint-enable max-statements */
 
   get componentsMap() {
-    return this.root.childComponentsMap;
+    return this.root?.childComponentsMap || {};
   }
 
   get data() {

diff --git a/src/components/form/Form.js b/src/components/form/Form.js
@@ -327,6 +327,7 @@ export default class FormComponent extends Component {
             const modalShouldBeOpened = this.componentModal ? this.componentModal.isOpened : false;
             const currentValue = modalShouldBeOpened ? this.componentModal.currentValue : this.dataValue;
             this.componentModal = new ComponentModal(this, element, modalShouldBeOpened, currentValue, this._referenceAttributeName);
+            this.subForm.element = this.componentModal.refs.modalContents;
             this.setOpenModalElement();
           }
 

diff --git a/test/unit/Wizard.unit.js b/test/unit/Wizard.unit.js
@@ -293,9 +293,8 @@ describe('Wizard tests', () => {
         assert.deepEqual(wizard.submission.data, submission.data, 'Should get wizard submission data');
 
         wizard.everyComponent((comp) => {
-          const expectedValue = _.get(submission.data, comp.path, 'no data');
-
-          if (expectedValue !== 'no data') {
+          if (comp.hasInput) {
+            const expectedValue = _.get(submission.data, comp.path, undefined);
             assert.deepEqual(comp.getValue(), expectedValue, `Should set value for ${comp.component.type} inside wizard`);
             assert.deepEqual(comp.dataValue, expectedValue, `Should set value for ${comp.component.type} inside wizard`);
           }