impaktapps-ui-builder 1.0.121 → 1.0.123-testValidation

package/dist/impaktapps-ui-builder.es.js

@@ -8871,7 +8871,16 @@ var pageMaster = (funcParams) => {
         );
       }
     },
-    saveHandler: async () => await saveHandler(store2, service2, submitHandler),
+    saveHandler: async () => {
+      if (store2.ctx.core.errors.length > 0) {
+        store2.setValidation("ValidateAndShow");
+        store2.setNotify({
+          FailMessage: "Errors on page",
+          Fail: true
+        });
+      } else
+        await saveHandler(store2, service2, submitHandler);
+    },
     Edit_Components: Component(store2, dynamicData2, submitHandler, service2).editComponents,
     Delete_Components: async function() {
       await Component(store2, dynamicData2, submitHandler, service2).deleteComponents(false);
@@ -10159,7 +10168,7 @@ function mergeFormdata(handlerResponse, componentName, eventConfig, store2, form
       formDataHolder[`${componentName}_RowCount`] = (_c = (_b = handlerResponse.data) == null ? void 0 : _b.meta) == null ? void 0 : _c.totalRowCount;
     }
   } else {
-    if (handlerResponse) {
+    if (handlerResponse == null ? void 0 : handlerResponse.data) {
       formDataHolder[componentName] = handlerResponse.data;
     }
   }
@@ -10307,10 +10316,7 @@ var service = (funcParams) => {
     setPage: async function() {
       var _a, _b, _c;
       funcParams.store.setAdditionalErrors([]);
-      funcParams.store.setFormdata((pre) => ({
-        ...pre,
-        ...funcParams == null ? void 0 : funcParams.initFormData()
-      }));
+      funcParams.store.setFormdata((funcParams == null ? void 0 : funcParams.initFormData()) || {});
       funcParams.store.setSchema({ type: "object", properties: {} });
       funcParams.store.newData = {};
       eventGroups = {};
@@ -10442,14 +10448,22 @@ var service = (funcParams) => {
           var _a, _b;
           if (((_a = funcParams.store) == null ? void 0 : _a.formData[componentName]) !== funcParams.store.newData[componentName] && ((_b = funcParams.store) == null ? void 0 : _b.newData[componentName]) !== void 0) {
             for (const eventConfig of eventGroups.onChange[componentName]) {
-              await executeEvents({
-                ...executeEventsParameters,
-                config: eventConfig,
-                componentName,
-                formDataHolder
-              });
               if (eventConfig.Handler === "refresh") {
-                funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+                await executeEvents({
+                  ...executeEventsParameters,
+                  config: eventConfig,
+                  componentName,
+                  formDataHolder
+                });
+                if (!lodash.exports.isEmpty(formDataHolder)) {
+                  funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+                }
+              } else {
+                await executeEvents({
+                  ...executeEventsParameters,
+                  config: eventConfig,
+                  componentName
+                });
               }
             }
           }
@@ -10518,7 +10532,9 @@ var service = (funcParams) => {
               componentName: path,
               formDataHolder
             }).then((res) => {
-              funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+              if (!lodash.exports.isEmpty(formDataHolder)) {
+                funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+              }
             });
           } else {
             executeEvents({