@processmaker/screen-builder 2.61.0 → 2.62.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.61.0",
+  "version": "2.62.1",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/mixins/ScreenBase.js

@@ -246,11 +246,9 @@ export default {
             return;
           }
 
-          this.$set(
-            object,
-            attr,
-            setValue,
-          );
+          if (object instanceof Object) {
+            this.$set(object, attr, setValue);
+          }
 
           object = get(object, attr);
           defaults = get(defaults, attr);

package/src/store/modules/globalErrorsModule.js

@@ -31,14 +31,22 @@ function countErrors(obj) {
   return errors;
 }
 
-const updateValidationRules = async (screen, commit) => {
-  const mainScreen = findRootScreen(screen);
+const updateValidationRules = async (screens, commit) => {
+  const rootScreen = findRootScreen(screens[0]);
+  const awaitLoad = [];
+  screens.forEach((screen) => {
+    if (rootScreen !== screen) {
+      // refresh nested screen validation rules
+      awaitLoad.push(screen.loadValidationRules());
+    }
+  });
+  await Promise.all(awaitLoad);
   try {
-    await mainScreen.loadValidationRules();
+    await rootScreen.loadValidationRules();
   } catch (error) {
     console.warn("There was a problem rendering the screen", error);
   }
-  const validate = mainScreen.$v;
+  const validate = rootScreen.$v;
   // update the global error state used by submit buttons
   if (validate) {
     let errors = 0;
@@ -50,7 +58,7 @@ const updateValidationRules = async (screen, commit) => {
         errors === 1
           ? "There is a validation error in your form."
           : "There are {{items}} validation errors in your form.";
-      message = mainScreen.$t(message, { items: errors });
+      message = rootScreen.$t(message, { items: errors });
     }
     commit("basic", {
       key: "valid",
@@ -63,7 +71,15 @@ const updateValidationRules = async (screen, commit) => {
   }
 };
 
-const updateValidationRulesDebounced = debounce(updateValidationRules, 1000);
+const updateValidationRulesDebounced = debounce(updateValidationRules, 500);
+
+const screensToValidate = [];
+const queueUpdateValidationRules = (mainScreen, commit) => {
+  if (!screensToValidate.includes(mainScreen)) {
+    screensToValidate.push(mainScreen);
+  }
+  updateValidationRulesDebounced(screensToValidate, commit);
+};
 
 const globalErrorsModule = {
   namespaced,
@@ -96,14 +112,14 @@ const globalErrorsModule = {
   },
   actions: {
     validate({ commit }, mainScreen) {
-      updateValidationRulesDebounced(mainScreen, commit);
+      queueUpdateValidationRules(mainScreen, commit);
     },
     async validateNow({ commit }, mainScreen) {
-      await updateValidationRules(mainScreen, commit);
+      await updateValidationRules([mainScreen], commit);
     },
     close({ commit }) {
       commit("basic", { key: "valid", value: true });
-    },
+    }
   }
 };