impaktapps-ui-builder 1.0.122 → 1.0.123-testValidation

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "impaktapps-ui-builder",
-    "version": "1.0.122",
+    "version": "1.0.123-testValidation",
     "scripts": {
         "dev": "vite",
         "build": "tsc && vite build",

package/src/impaktapps-ui-builder/builder/services/pageMaster.ts

@@ -68,7 +68,15 @@ export default (funcParams: funcParamsProps) => {
       }
 
     },
-    saveHandler: async () => await saveHandler(store, service, submitHandler),
+    saveHandler: async () => {
+      if (store.ctx.core.errors.length > 0) {
+        store.setValidation("ValidateAndShow");
+        store.setNotify({
+          FailMessage: "Errors on page",
+          Fail: true,
+        });
+      }else await saveHandler(store, service, submitHandler);
+    },
     Edit_Components: Component(store, dynamicData, submitHandler, service).editComponents,
 
     Delete_Components: async function () {

package/src/impaktapps-ui-builder/runtime/services/events.ts

@@ -193,7 +193,7 @@ function mergeFormdata(handlerResponse: any, componentName: string, eventConfig:
     }
   }
   else {
-    if (handlerResponse) {
+    if (handlerResponse?.data) {
       formDataHolder[componentName] = handlerResponse.data
     }
   }

package/src/impaktapps-ui-builder/runtime/services/service.ts

@@ -192,14 +192,23 @@ export default (funcParams: funcParamsProps) => {
             funcParams.store?.newData[componentName] !== undefined
           ) {
             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: formDataHolder
+                })
+                if (!isEmpty(formDataHolder)) {
+                  funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+                }
+              } else {
+                await executeEvents({
+                  ...executeEventsParameters,
+                  config: eventConfig,
+                  componentName,
+                })
               }
             }
           }
@@ -261,7 +270,9 @@ export default (funcParams: funcParamsProps) => {
               componentName: path,
               formDataHolder: formDataHolder
             }).then((res) => {
-              funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+              if (!isEmpty(formDataHolder)) {
+                funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+              }
             });
           } else {
             executeEvents({