impaktapps-ui-builder 0.0.276 → 0.0.278

package/src/impaktapps-ui-builder/builder/elements/UiSchema/Component/uiSchema.ts

@@ -225,7 +225,7 @@ export const componentBasicUiSchema: any = {
                       scope: "#/properties/value",
 
                       options: {
-                        widget: "InputField",
+                        widget: "MultipleSelect",
                       },
                       config: {
                         layout: {
@@ -236,6 +236,12 @@ export const componentBasicUiSchema: any = {
                         },
                         main: {
                           label: "Value",
+                          options: [
+                            { label: "3", value: "3" },
+                            { label: "5.5", value: "5.5" },
+                            { label: "8", value: "8" },
+                            { label: "12", value: "12" },
+                          ],
                         },
                       },
                     },

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

@@ -3,6 +3,7 @@ import { PageMasterUiSchema } from "../elements/UiSchema/PageMaster/uiSchema";
 import _ from "lodash";
 import Component from "./component";
 import { getFormdataFromLocalStorage, saveFormdataInLocalStorage } from "./saveHandler";
+import { schema } from "../build/buildUiSchema";
 
 interface funcParamsProps {
   store: any,
@@ -52,6 +53,7 @@ export default (funcParams:funcParamsProps) => {
       );
     },
     submitPageHandler: async function () {
+      console.log(schema)
       submitHandler(store,funcParams.service)
         .then((saveReturn: any) => {
           localStorage.removeItem("pageFormdata")

package/src/impaktapps-ui-builder/lib/index.ts

@@ -3,6 +3,7 @@ export {default as pageMaster} from "../builder/services/pageMaster"
 export {default as pageMasterEvents} from "../builder/services/event"
 export {default as pageMasterComponents} from "../builder/services/component"
 export {default as pageService} from "../runtime/services/service"
+export { schema} from "../builder/build/buildUiSchema"
 export {default as buildConfig} from "../builder/build/buildConfig"
 export  {default as buildUiSchema} from "../builder/build/buildUiSchema"
 export  {default as buildSchema} from "../builder/build/buildSchema"

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

@@ -16,6 +16,11 @@ export const executeEvents = async (
     nextEvent = events;
   }
   else {
+    if (!shouldEventExecute(config, componentName,
+      store, dynamicData, userValue,
+      service, serviceHolder, eventGroups)) {
+      return { response: undefined, events: undefined };
+    }
     const { response, events } = await executeEventsHandler(config, componentName,
       store, dynamicData, userValue,
       service, serviceHolder, eventGroups, parentEventOutput)
@@ -35,14 +40,10 @@ const executetOnLoadEvent = async (
 ) => {
 
   try {
-    const startEvent = config?.events.filter(e => e.eventType === "onStart");
-    if(startEvent.length > 0){
-      const { response } = await executeEventsHandler(config, componentName,
-        store, dynamicData, userValue,
-        service, serviceHolder, eventGroups, parentEventOutput);
-        if(response){
-          return;
-        }
+    if (!shouldEventExecute(config, componentName,
+      store, dynamicData, userValue,
+      service, serviceHolder, eventGroups)) {
+      return { response: undefined, events: undefined };
     }
     const { response } = await executeEventsHandler(config, componentName,
       store, dynamicData, userValue,
@@ -141,20 +142,21 @@ async function executeInBuiltFunctionHandler(refreshHandlerConfig: any, componen
 async function executeCustomHandler(customHandlerConfig: any, componentName: string,
   store: any, dynamicData: any, userValue: any,
   service: any, serviceHolder: any, parentEventOutput?: any) {
-    console.log(service)
-  const makeFunc =  eval(customHandlerConfig.eventCode)
-  const response = await makeFunc(store, dynamicData, userValue, parentEventOutput, service,componentName);
+  console.log(service)
+  const makeFunc = eval(customHandlerConfig.eventCode)
+  const response = await makeFunc(store, dynamicData, userValue, parentEventOutput, service, componentName);
   return { response: response, events: customHandlerConfig?.events };
 }
 
 async function mergeFormdata(handlerResponse: any, componentName: string, eventConfig: any, store: any) {
-  
-  if (eventConfig.type === "Select" && !(_.isEmpty(handlerResponse)&&handlerResponse)) {
+
+  if (eventConfig.type === "Select" && !(_.isEmpty(handlerResponse) && handlerResponse)) {
     store.setSchema((pre) => {
       return {
         ...pre, properties: {
           ...pre.properties, [componentName]: {
-            enum: handlerResponse.data
+            // ...pre?.properties?. [componentName],
+            oneOf: handlerResponse.data
           }
         }
       }
@@ -203,12 +205,24 @@ const buildHeadersFormat = (headers: any[]) => {
   return headerObj;
 }
 
-
+async function shouldEventExecute(config, componentName,
+  store, dynamicData, userValue,
+  service, serviceHolder, eventGroups) {
+  const startEvent = config?.events?.filter(e => e.eventType === "onStart");
+  if (startEvent?.length > 0) {
+    const { response } = await executeEventsHandler(startEvent[0], componentName,
+      store, dynamicData, userValue,
+      service, serviceHolder, eventGroups);
+    return response
+  }
+}
+// if(!response){
+//   return {response:undefined,events:undefined};
+// }
 export async function buildApiPayload(compConfig: any, body: any, headers: any, store: any, dynamicData: any, userValue: any, service) {
   if (compConfig?.headers) {
-    headers = {
-      headers: buildHeadersFormat(compConfig.headers)
-    }
+    headers = buildHeadersFormat(compConfig.headers)
+
   }
   if (compConfig.body) {
     body = { ...buildBodyFormat(compConfig.body, store.newData || store?.ctx?.core?.data || store.formData, userValue) };
@@ -228,81 +242,14 @@ export function getRefreshElements(eventConfig: any, eventGropus: any) {
     result = eventConfig.refreshElements.map((e) => {
       return e.value
     })
-   
+
   } else {
     if (eventGropus?.onLoad) {
       result = Object.keys(eventGropus?.onLoad)
-    //  const firstElem = result.shift();
-     result.push(result[0]);
+      result.push(result[0]);
     }
   }
+  console.log(result);
   return result;
 }
 
-
-
-// const  changeServerToFormData = async (res) => {
-//   // store.formData = res?.data?.payload?.config?.features?.rule?.id;
-//   const Api =
-//     "/master/getDetailById?masterName=com.act21.hyperform3.entity.master.rule.Rule&id=" +
-//     res?.data?.payload?.config?.features?.rule?.id;
-
-//   const data = await service.get(Api).then((response: any) => {
-//     const reportData = res?.data?.payload?.config?.features?.Reports?.names?.map(
-//         (elem: any) => {
-//           if (typeof elem === "string" || typeof elem === "number") {
-//             return { label: elem, value: elem };
-//           }
-//           return elem;
-//         }
-//       );
-//     const newData = {
-//       id: res.data.payload.id,
-//       name: res.data.payload.name,
-//       program: JSON.stringify(res.data.payload.program),
-//       startDate: res.data.payload.startDate,
-//       endDate: res.data.payload.endDate,
-//       downloadWorkflowFile:
-//         res.data.payload.config.features.workflow.externalFileName,
-//       uploadWorkflowFileId:
-//         res.data.payload.config.features.workflow.externalDataId,
-//       processDefKey1:
-//         res.data.payload.config.features.workflow.processDefKey,
-//       downloadInvoiceFile:
-//         res.data.payload.config.features.invoice.externalFileName,
-//       uploadInvoiceFileId:
-//         res.data.payload.config.features.invoice.externalDataId,
-//       invoiceEnabled: res.data.payload.config.features.invoice.enabled,
-//       groupId: response?.data?.payload?.groupId,
-//       project: response?.data?.payload?.artifactId,
-//       version: response?.data?.payload?.version,
-//       reportNames: reportData,
-//       clawbackEnabled: res.data.payload.config.features.Clawback.enabled,
-//       loadTimeout: res.data.payload.config.features?.timeouts?.loadTimeOut,
-//       computeTimeout:
-//         res.data.payload.config.features?.timeouts?.computeTimeOut,
-//       adjustments: res.data.payload.config.features?.Adjustments,
-//     };
-//     return newData;
-//   });
-//   return data;
-// };
-// const action = store.searchParams?.get("id");
-// console.log(action)
-//   if (action) {
-//     const Api =
-//       "/master/getDetailById?masterName=com.act21.hyperform3.entity.program.ProgramCycleStaging";
-//       await service
-//       .get(`${Api}&id=${action}`)
-//       .then(async (res) => {
-// console.log("response", res)
-//         const newData = await changeServerToFormData(res);
-//          store.setFormdata((pre)=>{return {...pre,...newData}});
-//       })
-//       .catch(() => {});
-//   }
-
-
-
-
-

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

@@ -3,7 +3,7 @@ import { downloadFile } from "./downloadFile";
 import { executeEvents } from "./events";
 let compType: string;
 let eventGroups: any = {};
-const notifyUiSchema =  {
+const notifyUiSchema = {
   type: "Control",
   scope: "#/properties/notify",
   options: {
@@ -37,7 +37,7 @@ export const extractEvents = (eventConfig: any) => {
 };
 
 interface funcParamsProps {
- store: any,
+  store: any,
   dynamicData: any,
   config: any,
   uiSchema: any,
@@ -45,25 +45,32 @@ interface funcParamsProps {
   service: any,
   userValue: any,
 }
-export default (funcParams:funcParamsProps) => {
+export default (funcParams: funcParamsProps) => {
   return {
     setPage: async function () {
       funcParams.store.setFormdata({});
       eventGroups = {}
       eventGroups = extractEvents(funcParams.config)
       await executeEvents(
-        { Handler: "refresh",eventType:"onPageRefresh"}, "all",
+        { Handler: "refresh", eventType: "onPageRefresh" }, "all",
         funcParams.store, funcParams.dynamicData, funcParams.userValue, funcParams.service,
         this, eventGroups)
-        // funcParams.store.setSchema(JSON.parse(localStorage.getItem("schemaDemo")))
-        funcParams.uiSchema.elements.push(notifyUiSchema);
-        funcParams.store.setUiSchema(funcParams.uiSchema);     
+      funcParams.store.setSchema(
+        (pre:any) => {
+          return {
+            ...funcParams.schema, properties:
+              { ...funcParams.schema.properties, ...pre.properties, }
+          }
+        })
+      funcParams.uiSchema.elements.push(notifyUiSchema);
+      funcParams.store.setUiSchema(funcParams.uiSchema);
     },
     onClick: async function () {
       const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[0];
       for (const eventConfig of eventGroups?.onClick[path]) {
-         await executeEvents(
-         eventConfig, path,
+
+        await executeEvents(
+          eventConfig, path,
           funcParams.store, funcParams.dynamicData, funcParams.userValue, funcParams.service,
           this, eventGroups)
       }
@@ -79,8 +86,8 @@ export default (funcParams:funcParamsProps) => {
             for (const eventConfig of eventGroups.onChange[componentName]) {
               await executeEvents(
                 eventConfig, componentName,
-                 funcParams.store, funcParams.dynamicData, funcParams.userValue, funcParams.service,
-                 this, eventGroups)
+                funcParams.store, funcParams.dynamicData, funcParams.userValue, funcParams.service,
+                this, eventGroups)
             }
           }
         }))