impaktapps-ui-builder 0.0.284 → 0.0.285

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

@@ -113,7 +113,7 @@ const PageMasterUiSchema = {
             main: {
               label: "Template",
               programType: true,
-              options: [{ title: "Basic Template", const: 1 }],
+              options: [{ label: "Basic Template", value: 1 }],
               required: true
             }
           }
@@ -6085,34 +6085,34 @@ const componentBasicUiSchema = {
                 main: {
                   label: "Type",
                   options: [
-                    { title: "Select", const: "Select" },
-                    { title: "Date", const: "Date" },
-                    { title: "CheckBox", const: "CheckBox" },
-                    { title: "Table", const: "Table" },
-                    { title: "Lazy Loading Table", const: "LazyLoadingTable" },
-                    { title: "Array", const: "Array" },
-                    { title: "Container", const: "WrapperSection" },
-                    { title: "Tabs", const: "TabSection" },
-                    { title: "Text", const: "Text" },
-                    { title: "Radio", const: "Radio" },
-                    { title: "Text Area", const: "TextArea" },
-                    { title: "Button", const: "Button" },
-                    { title: "Card", const: "card" },
-                    { title: "Rank", const: "Rank" },
-                    { title: "SpeedoMeter", const: "SpeedoMeter" },
-                    { title: "ProgressBar", const: "ProgressBar" },
-                    { title: "Graph", const: "Graph" },
-                    { title: "Label", const: "Box" },
-                    { title: "Upload File", const: "UploadFile" },
-                    { title: "Download File", const: "DownloadFile" },
-                    { title: "Empty Box", const: "EmptyBox" },
-                    { title: "ProgressBar Card", const: "ProgressBarCard" },
-                    { title: "Rank Card", const: "RankCard" },
-                    { title: "Runner Boy Progress Bar", const: "RunnerBoyProgressBar" },
-                    { title: "Slider", const: "Slider" },
-                    { title: "Timer", const: "Timer" },
-                    { title: "MultipleSelect", const: "MultipleSelect" },
-                    { title: "LeaderBoard", const: "LeaderBoard" }
+                    { label: "Select", value: "Select" },
+                    { label: "Date", value: "Date" },
+                    { label: "CheckBox", value: "CheckBox" },
+                    { label: "Table", value: "Table" },
+                    { label: "Lazy Loading Table", value: "LazyLoadingTable" },
+                    { label: "Array", value: "Array" },
+                    { label: "Container", value: "WrapperSection" },
+                    { label: "Tabs", value: "TabSection" },
+                    { label: "Text", value: "Text" },
+                    { label: "Radio", value: "Radio" },
+                    { label: "Text Area", value: "TextArea" },
+                    { label: "Button", value: "Button" },
+                    { label: "Card", value: "card" },
+                    { label: "Rank", value: "Rank" },
+                    { label: "SpeedoMeter", value: "SpeedoMeter" },
+                    { label: "ProgressBar", value: "ProgressBar" },
+                    { label: "Graph", value: "Graph" },
+                    { label: "Label", value: "Box" },
+                    { label: "Upload File", value: "UploadFile" },
+                    { label: "Download File", value: "DownloadFile" },
+                    { label: "Empty Box", value: "EmptyBox" },
+                    { label: "ProgressBar Card", value: "ProgressBarCard" },
+                    { label: "Rank Card", value: "RankCard" },
+                    { label: "Runner Boy Progress Bar", value: "RunnerBoyProgressBar" },
+                    { label: "Slider", value: "Slider" },
+                    { label: "Timer", value: "Timer" },
+                    { label: "MultipleSelect", value: "MultipleSelect" },
+                    { label: "LeaderBoard", value: "LeaderBoard" }
                   ]
                 }
               }
@@ -6193,10 +6193,10 @@ const componentBasicUiSchema = {
                         main: {
                           label: "Screen Size",
                           options: [
-                            { title: "Extra Small", const: "xs" },
-                            { title: "Small", const: "sm" },
-                            { title: "Medium", const: "md" },
-                            { title: "Large", const: "lg" }
+                            { label: "Extra Small", value: "xs" },
+                            { label: "Small", value: "sm" },
+                            { label: "Medium", value: "md" },
+                            { label: "Large", value: "lg" }
                           ]
                         }
                       }
@@ -6217,10 +6217,10 @@ const componentBasicUiSchema = {
                         main: {
                           label: "Value",
                           options: [
-                            { title: "3", const: "3" },
-                            { title: "5.5", const: "5.5" },
-                            { title: "8", const: "8" },
-                            { title: "12", const: "12" }
+                            { label: "3", value: "3" },
+                            { label: "5.5", value: "5.5" },
+                            { label: "8", value: "8" },
+                            { label: "12", value: "12" }
                           ]
                         }
                       }
@@ -6870,8 +6870,8 @@ const buildPropertiesSection = function(type) {
   } else if (type === "Box") {
     const iconName = getInputField("value", "Value");
     uiSchema.elements = [getSelectField("graphType", "Label Type", [
-      { title: "URL", const: "url" },
-      { title: "Heading", const: "heading" }
+      { label: "URL", value: "url" },
+      { label: "Heading", value: "heading" }
     ]), iconName];
   } else if (type === "Button") {
     const caption = getInputField("color", "Color");
@@ -6879,16 +6879,16 @@ const buildPropertiesSection = function(type) {
     const iconName = getInputField("iconName", "Icon Name");
     uiSchema.elements = [
       getSelectField("buttonType", "Button Type", [
-        { title: "Button With Text", const: "Button" },
-        { title: "Button With Icon", const: "IconButton" },
-        { title: "Button With Icon and Text", const: "ButtonWithIconAndText" }
+        { label: "Button With Text", value: "Button" },
+        { label: "Button With Icon", value: "IconButton" },
+        { label: "Button With Icon and Text", value: "ButtonWithIconAndText" }
       ]),
       iconName,
       size,
       caption,
       getSelectField("defaultStyle", "Default Style", [
-        { title: "Apply Default Style", const: "true" },
-        { title: "No Style", const: "false" }
+        { label: "Apply Default Style", value: "true" },
+        { label: "No Style", value: "false" }
       ]),
       JSON.parse(JSON.stringify(EmptyBox))
     ];
@@ -6902,11 +6902,11 @@ const buildPropertiesSection = function(type) {
       heading,
       height,
       getSelectField("graphType", "Graph Type", [
-        { title: "Bar Graph", const: "BarGraph" },
-        { title: "Stack Bar Graph", const: "StackBarGraph" },
-        { title: "Line Graph", const: "LineGraph" },
-        { title: "Pie Graph", const: "PieGraph" },
-        { title: "Horizontal Bar Graph", const: "HorizontalBarGraph" }
+        { label: "Bar Graph", value: "BarGraph" },
+        { label: "Stack Bar Graph", value: "StackBarGraph" },
+        { label: "Line Graph", value: "LineGraph" },
+        { label: "Pie Graph", value: "PieGraph" },
+        { label: "Horizontal Bar Graph", value: "HorizontalBarGraph" }
       ]),
       leftLabel,
       bottomLabel,
@@ -6922,15 +6922,27 @@ const buildPropertiesSection = function(type) {
     ];
   } else if (type === "Table" || type === "LazyLoadingTable") {
     uiSchema.elements = [
+      getRadioInputField("lazyLoading", "Lazy Loading", ["YES", "NO"]),
       getRadioInputField("SelectionAvailable", "Selection Available", ["YES", "NO"]),
       getRadioInputField("ColumnResizingAvailable", "ColumnResizing Available", ["YES", "NO"]),
       getRadioInputField("DragAvailable", "Drag Available", ["YES", "NO"]),
-      getInputField("selectKey", "Selection Key")
+      getInputField("selectKey", "Selection Key"),
+      EmptyBox
     ];
   } else if (type === "Radio") {
     uiSchema.elements = [
       getArrayControl("sectionLabels", "label", "Options Of Radio")
     ];
+  } else if (type === "Select") {
+    uiSchema.elements = [
+      getRadioInputField("lazyLoading", "Lazy Loading", ["YES", "NO"]),
+      getRadioInputField("freeSolo", "FreeSolo", ["YES", "NO"])
+    ];
+  } else if (type === "MultipleSelect") {
+    uiSchema.elements = [
+      getRadioInputField("lazyLoading", "Lazy Loading", ["YES", "NO"]),
+      EmptyBox
+    ];
   }
   return uiSchema;
 };
@@ -7153,8 +7165,8 @@ const ValidationSection = {
   ]
 };
 const sectionLabels = {
-  Select: ["Core", "Value", "style", "Event", "Validation"],
-  MultipleSelect: ["Core", "Value", "style", "Event", "Validation"],
+  Select: ["Core", "Properties", "Value", "style", "Event", "Validation"],
+  MultipleSelect: ["Core", "Properties", "Value", "style", "Event", "Validation"],
   Table: ["Core", "Components", "Properties", "style", "Event", "Validation"],
   LazyLoadingTable: ["Core", "Components", "Properties", "style", "Event", "Validation"],
   LeaderBoard: ["Core", "Components", "Properties", "style", "Event", "Validation"],
@@ -8169,7 +8181,8 @@ var SelectInputField = {
     },
     main: {
       label: "",
-      type: "text"
+      type: "text",
+      freeSole: false
     }
   }
 };
@@ -8177,10 +8190,13 @@ const buildSelect = (config, componentScope) => {
   const selectInputField = _.cloneDeep(SelectInputField);
   selectInputField.config.main.label = config.label;
   if (config.value) {
-    const options = config.value.map((e) => {
-      return { title: e.label, const: e.value };
-    });
-    selectInputField.config.main.options = options;
+    selectInputField.config.main.options = config.value;
+  }
+  if (config.freeSolo) {
+    selectInputField.config.main.freeSolo = config.freeSolo === "YES" ? true : false;
+  }
+  if (config.lazyLoading) {
+    selectInputField.config.main.lazyLoading = config.lazyLoading === "YES" ? true : false;
   }
   if (config.layout) {
     selectInputField.config.layout = createLayoutFormat(config.layout);
@@ -8278,6 +8294,9 @@ const buildTable = (config, componentScope) => {
   if (config.style) {
     table.config.style = JSON.parse(config.style);
   }
+  if (config.lazyLoading) {
+    table.config.main.lazyLoading = config.lazyLoading === "YES" ? true : false;
+  }
   if (config.SelectionAvailable) {
     table.config.main.Selection = config.SelectionAvailable === "YES" ? true : false;
   }
@@ -8682,10 +8701,10 @@ const buildMultiSelect = (config, componentScope) => {
     multipleSelect.config.layout = createLayoutFormat(config.layout);
   }
   if (config.value) {
-    const options = config.value.map((e) => {
-      return { title: e.label, const: e.value };
-    });
-    multipleSelect.config.main.options = options != null ? options : [];
+    multipleSelect.config.main.options = config.value;
+  }
+  if (config.lazyLoading) {
+    multipleSelect.config.main.lazyLoading = config.lazyLoading === "YES" ? true : false;
   }
   return multipleSelect;
 };
@@ -9271,21 +9290,21 @@ const EventUiSchema = {
                   label: "Event Type",
                   type: "text",
                   options: [
-                    { title: "Click Event", const: "onClick" },
-                    { title: "onStart", const: "onStart" },
-                    { title: "Load Event", const: "onLoad" },
-                    { title: "Change Event", const: "onChange" },
-                    { title: "Success", const: "Success" },
-                    { title: "Fail", const: "Fail" }
+                    { label: "Click Event", value: "onClick" },
+                    { label: "onStart", value: "onStart" },
+                    { label: "Load Event", value: "onLoad" },
+                    { label: "Change Event", value: "onChange" },
+                    { label: "Success", value: "Success" },
+                    { label: "Fail", value: "Fail" }
                   ]
                 }
               }
             },
             getSelectField("Handler", "Handler", [
-              { title: "Custom", const: "custom" },
-              { title: "Api", const: "api" },
-              { title: "Inbuilt Function", const: "inBuiltFunction" },
-              { title: "Refresh", const: "refresh" }
+              { label: "Custom", value: "custom" },
+              { label: "Api", value: "api" },
+              { label: "Inbuilt Function", value: "inBuiltFunction" },
+              { label: "Refresh", value: "refresh" }
             ])
           ]
         },
@@ -9650,8 +9669,8 @@ var event = (store2, dynamicData2) => {
           uiSchema.elements[1].elements[0].elements[2] = APISection;
         } else if (handlerType === "inBuiltFunction") {
           uiSchema.elements[1].elements[0].elements[2] = getSelectField("inBuiltFunctionType", "Function Name", [
-            { title: "RankProvider", const: "RankProvider" },
-            { title: "Download File", const: "downloadFile" }
+            { label: "RankProvider", value: "RankProvider" },
+            { label: "Download File", value: "downloadFile" }
           ]);
           uiSchema.elements[1].elements[0].elements[3] = getTextArea("funcParametersCode", "Write Custom Code for Functions Parameter", true, { xs: 12, sm: 12, md: 6 });
         } else if (handlerType === "refresh") {
@@ -9717,195 +9736,100 @@ const downloadFile = (obj) => {
   URL.revokeObjectURL(url);
   document.body.removeChild(link);
 };
-const executeEvents = async (config, componentName2, store2, dynamicData2, userValue2, service2, serviceHolder2, eventGroups2, parentEventOutput2) => {
+const executeEvents = async (params2) => {
+  var _a, _b, _c;
   let nextEvent = [];
   let LoadResponse = null;
-  if (config.eventType === "onLoad") {
-    const { response: response2, events } = await executetOnLoadEvent(
-      config,
-      componentName2,
-      store2,
-      dynamicData2,
-      userValue2,
-      service2,
-      serviceHolder2,
-      eventGroups2,
-      parentEventOutput2
-    );
-    if (config.returnResponse) {
-      return response2;
-    }
-    LoadResponse = response2;
-    nextEvent = events;
-  } else {
-    if (!shouldEventExecute(
-      config,
-      componentName2,
-      store2,
-      dynamicData2,
-      userValue2,
-      service2,
-      serviceHolder2,
-      eventGroups2
-    )) {
+  try {
+    if (!shouldEventExecute(params2)) {
       return { response: void 0, events: void 0 };
     }
-    const { response: response2, events } = await executeEventsHandler(
-      config,
-      componentName2,
-      store2,
-      dynamicData2,
-      userValue2,
-      service2,
-      serviceHolder2,
-      eventGroups2,
-      parentEventOutput2
-    );
+    const response2 = await executeEventsHandler(params2);
     LoadResponse = response2;
-    nextEvent = events;
+    const SuccessEvent = (_a = params2.config) == null ? void 0 : _a.events.filter((e) => e.eventType === "Success");
+    if (params2.config.returnNeeded) {
+      return LoadResponse;
+    }
+    nextEvent = SuccessEvent;
+  } catch (err) {
+    const FailEvent = (_c = (_b = params2.config) == null ? void 0 : _b.events) == null ? void 0 : _c.filter((e) => e.eventType === "Fail");
+    const setEvent = (FailEvent == null ? void 0 : FailEvent.length) > 0 ? FailEvent : [];
+    nextEvent = setEvent;
   }
   if ((nextEvent == null ? void 0 : nextEvent.length) > 0) {
     for (const actionConfig of nextEvent) {
-      await executeEvents(actionConfig, componentName2, store2, dynamicData2, userValue2, service2, serviceHolder2, eventGroups2, LoadResponse);
+      await executeEvents({ ...params2, config: actionConfig, parentEventOutput: LoadResponse });
     }
   }
+  return LoadResponse;
 };
-const executetOnLoadEvent = async (config, componentName2, store2, dynamicData2, userValue2, service2, serviceHolder2, eventGroups2, parentEventOutput2) => {
-  try {
-    if (!shouldEventExecute(
-      config,
-      componentName2,
-      store2,
-      dynamicData2,
-      userValue2,
-      service2,
-      serviceHolder2,
-      eventGroups2
-    )) {
-      return { response: void 0, events: void 0 };
-    }
-    const { response: response2 } = await executeEventsHandler(
-      config,
-      componentName2,
-      store2,
-      dynamicData2,
-      userValue2,
-      service2,
-      serviceHolder2,
-      eventGroups2,
-      parentEventOutput2
-    );
-    if (config.returnResponse) {
-      return { response: response2 };
-    }
-    const SuccessEvent = config == null ? void 0 : config.events.filter((e) => e.eventType === "Success");
-    const setEvent = SuccessEvent.length > 0 ? SuccessEvent : [{ Handler: "mergeFormdata", eventType: "Success", type: config.type }];
-    return { response: response2, events: setEvent };
-  } catch (err) {
-    const FailEvent = config == null ? void 0 : config.events.filter((e) => e.eventType === "Fail");
-    const setEvent = FailEvent.length > 0 ? FailEvent : [];
-    return { response: void 0, events: setEvent };
-  }
-};
-async function executeEventsHandler(config, componentName2, store2, dynamicData2, userValue2, service2, serviceHolder2, eventGroups2, parentEventOutput2) {
-  if (config.Handler === "api") {
-    return await executeApiEventHandler(
-      config,
-      componentName2,
-      store2,
-      dynamicData2,
-      userValue2,
-      service2
+async function executeEventsHandler(params2) {
+  if (params2.config.Handler === "api") {
+    return await executeApiEventHandler(params2);
+  } else if (params2.config.Handler === "inBuiltFunction") {
+    return await executeInBuiltFunctionHandler(params2);
+  } else if (params2.config.Handler === "custom") {
+    return await executeCustomHandler(params2);
+  } else if (params2.config.Handler === "refresh") {
+    return await executeRefreshHandler(params2);
+  } else if (params2.config.Handler === "mergeFormdata") {
+    return await mergeFormdata(
+      params2.parentEventOutput,
+      params2.componentName,
+      params2.config,
+      params2.store
     );
-  } else if (config.Handler === "inBuiltFunction") {
-    return await executeInBuiltFunctionHandler(
-      config,
-      componentName2,
-      store2,
-      dynamicData2,
-      userValue2,
-      service2,
-      serviceHolder2,
-      parentEventOutput2
-    );
-  } else if (config.Handler === "custom") {
-    return await executeCustomHandler(
-      config,
-      componentName2,
-      store2,
-      dynamicData2,
-      userValue2,
-      service2,
-      serviceHolder2,
-      parentEventOutput2
-    );
-  } else if (config.Handler === "refresh") {
-    return await executeRefreshHandler(
-      config,
-      componentName2,
-      store2,
-      dynamicData2,
-      userValue2,
-      service2,
-      serviceHolder2,
-      parentEventOutput2,
-      eventGroups2
-    );
-  } else if (config.Handler === "mergeFormdata") {
-    return await mergeFormdata(parentEventOutput2, componentName2, config, store2);
   }
 }
-async function executeRefreshHandler(refreshConfig, componentName2, store2, dynamicData2, userValue2, service2, serviceHolder2, parentEventOutput2, eventGroups2) {
-  const compToRefresh = getRefreshElements(refreshConfig, eventGroups2);
-  for (const componentName3 of compToRefresh) {
-    for (const compEventConfig of eventGroups2.onLoad[componentName3]) {
-      await executeEvents(compEventConfig, componentName3, store2, dynamicData2, userValue2, service2, serviceHolder2);
+async function executeRefreshHandler(params2) {
+  const compToRefresh = getRefreshElements(params2.config, params2.eventGroups);
+  for (const componentName of compToRefresh) {
+    for (const compEventConfig of params2.eventGroups.onLoad[componentName]) {
+      await executeEvents({ ...params2, config: compEventConfig });
     }
   }
-  return { response: void 0, events: void 0 };
 }
-async function executeApiEventHandler(apiHandlerConfig, componentName2, store2, dynamicData2, userValue2, service2, serviceHolder2, parentEventOutput2) {
-  const initialBody = { ...userValue2 == null ? void 0 : userValue2.payload };
+async function executeApiEventHandler(params2) {
+  var _a;
+  const initialBody = { ...(_a = params2.userValue) == null ? void 0 : _a.payload };
   const initialHeaders = {
     "X-Requested-With": "XMLHttpRequest",
     "Access-Control-Allow-Origin": "*"
   };
-  const { body: body2, headers: headers2 } = await buildApiPayload(apiHandlerConfig, initialBody, initialHeaders, store2, dynamicData2, userValue2);
+  const { body: body2, headers: headers2 } = await buildApiPayload(params2.config, initialBody, initialHeaders, params2.store, params2.dynamicData, params2.userValue, params2.service);
   let response2;
-  response2 = await service2[apiHandlerConfig.method](
-    apiHandlerConfig.path,
-    body2,
-    headers2 && { headers: headers2 }
-  );
-  if (apiHandlerConfig.returnResponse) {
-    return { response: response2 };
-  }
-  return { response: response2, events: apiHandlerConfig == null ? void 0 : apiHandlerConfig.events };
+  const dataJSON = await fetch(params2.config.path, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(body2)
+  });
+  response2 = await dataJSON.json();
+  return response2;
 }
-async function executeInBuiltFunctionHandler(refreshHandlerConfig, componentName, store, dynamicData, userValue, service, serviceHolder, parentEventOutput) {
+async function executeInBuiltFunctionHandler(params) {
   let parameter = {};
-  if (refreshHandlerConfig.funcParametersCode) {
-    const makeFunc = eval(refreshHandlerConfig.funcParametersCode);
-    parameter = makeFunc(store, dynamicData, userValue, parentEventOutput, service);
+  if (params.config.funcParametersCode) {
+    const makeFunc = eval(params.config.funcParametersCode);
+    parameter = makeFunc(params.store, params.dynamicData, params.userValue, params.parentEventOutput, params.service);
   }
-  serviceHolder[refreshHandlerConfig.inBuiltFunctionType](parameter);
-  return { response: void 0, events: refreshHandlerConfig == null ? void 0 : refreshHandlerConfig.events };
+  params.serviceHolder[params.config.inBuiltFunctionType](parameter);
 }
-async function executeCustomHandler(customHandlerConfig, componentName, store, dynamicData, userValue, service, serviceHolder, parentEventOutput) {
-  console.log(service);
-  const makeFunc = eval(customHandlerConfig.eventCode);
-  const response = await makeFunc(store, dynamicData, userValue, parentEventOutput, service, componentName);
-  return { response, events: customHandlerConfig == null ? void 0 : customHandlerConfig.events };
+async function executeCustomHandler(params) {
+  const makeFunc = eval(params.config.eventCode);
+  const response = await makeFunc(params.store, params.dynamicData, params.userValue, params.parentEventOutput, params.service, params.componentName);
+  return response;
 }
-async function mergeFormdata(handlerResponse, componentName2, eventConfig, store2) {
+async function mergeFormdata(handlerResponse, componentName, eventConfig, store2) {
   if (eventConfig.type === "Select" && !(_.isEmpty(handlerResponse) && handlerResponse)) {
     store2.setSchema((pre) => {
       return {
         ...pre,
         properties: {
           ...pre.properties,
-          [componentName2]: {
-            oneOf: handlerResponse.data
+          [componentName]: {
+            enum: handlerResponse.data
           }
         }
       };
@@ -9915,11 +9839,12 @@ async function mergeFormdata(handlerResponse, componentName2, eventConfig, store
       return { ...pre, ...handlerResponse == null ? void 0 : handlerResponse.data };
     });
   } else {
-    handlerResponse && store2.setFormdata((pre) => {
-      return { ...pre, [componentName2]: handlerResponse.data };
-    });
+    if (handlerResponse) {
+      store2.setFormdata((pre) => {
+        return { ...pre, [componentName]: handlerResponse };
+      });
+    }
   }
-  return { response: void 0, events: void 0 };
 }
 const buildBodyFormat = (body2, formData, userValue2) => {
   const finalBody = { ...userValue2 == null ? void 0 : userValue2.payload };
@@ -9951,20 +9876,11 @@ const buildHeadersFormat = (headers2) => {
   });
   return headerObj;
 };
-async function shouldEventExecute(config, componentName2, store2, dynamicData2, userValue2, service2, serviceHolder2, eventGroups2) {
-  var _a;
-  const startEvent = (_a = config == null ? void 0 : config.events) == null ? void 0 : _a.filter((e) => e.eventType === "onStart");
+async function shouldEventExecute(params2) {
+  var _a, _b;
+  const startEvent = (_b = (_a = params2.config) == null ? void 0 : _a.events) == null ? void 0 : _b.filter((e) => e.eventType === "onStart");
   if ((startEvent == null ? void 0 : startEvent.length) > 0) {
-    const { response: response2 } = await executeEventsHandler(
-      startEvent[0],
-      componentName2,
-      store2,
-      dynamicData2,
-      userValue2,
-      service2,
-      serviceHolder2,
-      eventGroups2
-    );
+    const { response: response2 } = await executeEventsHandler(params2);
     return response2;
   }
 }
@@ -10013,6 +9929,7 @@ const extractEvents = (eventConfig) => {
   function extractsConfigEvents(eventConfigObj) {
     if (eventConfigObj.events) {
       eventConfigObj.events.forEach((event2) => {
+        var _a;
         if (eventConfigObj.type) {
           compType = eventConfigObj.type;
         }
@@ -10022,6 +9939,12 @@ const extractEvents = (eventConfig) => {
         if (!eventGroups[event2.eventType][eventConfigObj.name]) {
           eventGroups[event2.eventType][eventConfigObj.name] = [];
         }
+        const SuccessEvent = (_a = event2 == null ? void 0 : event2.events) == null ? void 0 : _a.find((elem) => {
+          return elem.eventType === "Success";
+        });
+        if (!!!SuccessEvent && event2.eventType === "onLoad") {
+          event2.events.push({ Handler: "mergeFormdata", eventType: "Success", type: compType });
+        }
         eventGroups[event2.eventType][eventConfigObj.name].push({ ...event2, type: compType });
       });
     }
@@ -10033,21 +9956,36 @@ const extractEvents = (eventConfig) => {
   return eventGroups;
 };
 var service = (funcParams) => {
+  eventGroups = {};
+  eventGroups = extractEvents(funcParams.config);
+  let executeEventsParameters = {
+    config: {},
+    componentName: "",
+    store: funcParams.store,
+    dynamicData: funcParams.dynamicData,
+    userValue: funcParams.userValue,
+    service: funcParams.service,
+    serviceHolder: void 0,
+    eventGroups
+  };
   return {
     setPage: async function() {
       funcParams.store.setFormdata({});
-      eventGroups = {};
-      eventGroups = extractEvents(funcParams.config);
-      await executeEvents(
-        { Handler: "refresh", eventType: "onPageRefresh" },
-        "all",
-        funcParams.store,
-        funcParams.dynamicData,
-        funcParams.userValue,
-        funcParams.service,
-        this,
+      executeEventsParameters = {
+        config: {},
+        componentName: "",
+        store: funcParams.store,
+        dynamicData: funcParams.dynamicData,
+        userValue: funcParams.userValue,
+        service: funcParams.service,
+        serviceHolder: this,
         eventGroups
-      );
+      };
+      await executeEvents({
+        ...executeEventsParameters,
+        config: { Handler: "refresh", eventType: "onPageRefresh" },
+        componentName: "all"
+      });
       funcParams.store.setSchema(
         (pre) => {
           return {
@@ -10063,66 +10001,55 @@ var service = (funcParams) => {
       var _a;
       const path = ((_a = funcParams.dynamicData) == null ? void 0 : _a.tableButtonPath) || funcParams.dynamicData.path.split(".")[0];
       for (const eventConfig of eventGroups == null ? void 0 : eventGroups.onClick[path]) {
-        await executeEvents(
-          eventConfig,
-          path,
-          funcParams.store,
-          funcParams.dynamicData,
-          funcParams.userValue,
-          funcParams.service,
-          this,
-          eventGroups
-        );
+        await executeEvents({
+          ...executeEventsParameters,
+          config: eventConfig,
+          componentName: path
+        });
       }
     },
     onPaginationChange: async (paginationValues) => {
-      var _a;
+      var _a, _b;
       for (const eventConfig of eventGroups == null ? void 0 : eventGroups.onLoad[paginationValues.path]) {
         const bodyValues = [
           { key: "size", value: paginationValues.pagination.pageSize },
           { key: "start", value: paginationValues.pagination.pageIndex * paginationValues.pagination.pageSize },
+          { key: "sorting", value: paginationValues.sorting || [] },
           { key: "filters", value: paginationValues.columnFilters || [] },
           { key: "globalFilter", value: (_a = paginationValues.globalFilter) != null ? _a : "" }
         ];
         if (eventConfig.body) {
-          eventConfig.returnResponse = true;
           eventConfig.body = [
             ...eventConfig.body,
             ...bodyValues
           ];
         } else {
-          eventConfig.returnResponse = true;
           eventConfig.body = bodyValues;
         }
-        await executeEvents(
-          eventConfig,
-          paginationValues.path,
-          funcParams.store,
-          funcParams.dynamicData,
-          funcParams.userValue,
-          funcParams.service,
-          void 0,
-          eventGroups
-        );
+        const responseEvent = (_b = eventConfig == null ? void 0 : eventConfig.events) == null ? void 0 : _b.filter((elem) => {
+          return elem.Handler !== "mergeFormdata";
+        });
+        eventConfig.events = responseEvent != null ? responseEvent : [];
+        const data2 = await executeEvents({
+          ...executeEventsParameters,
+          config: eventConfig,
+          componentName: paginationValues.path
+        });
+        return data2;
       }
     },
     onChange: async function() {
       if (eventGroups.onChange) {
         const ChangeEventsKeysArray = Object.keys(eventGroups.onChange);
-        Promise.all(ChangeEventsKeysArray.map(async (componentName2) => {
+        Promise.all(ChangeEventsKeysArray.map(async (componentName) => {
           var _a, _b;
-          if (((_a = funcParams.store) == null ? void 0 : _a.formData[componentName2]) !== funcParams.store.newData[componentName2] && ((_b = funcParams.store) == null ? void 0 : _b.newData[componentName2]) !== void 0) {
-            for (const eventConfig of eventGroups.onChange[componentName2]) {
-              await executeEvents(
-                eventConfig,
-                componentName2,
-                funcParams.store,
-                funcParams.dynamicData,
-                funcParams.userValue,
-                funcParams.service,
-                this,
-                eventGroups
-              );
+          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
+              });
             }
           }
         }));