impaktapps-ui-builder 0.0.410 → 0.0.412

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

@@ -228,7 +228,7 @@ export const EventUiSchema: any = {
                         icon: "RejectIcon",
                         color: "error",
                         tooltipMessage: "Reject This Record",
-                        onClick: "deletePopUpEvent",
+                        onClick: "deleteEvent",
                       },
                     },
                   },
@@ -238,109 +238,6 @@ export const EventUiSchema: any = {
         }
       ],
     },
-    {
-      type: "Control",
-      scope: "#/properties/popUpEvent",
-      options: {
-        widget: "PopUp"
-      },
-      config: {
-        layout: {
-          xs: 12,
-          sm: 12,
-          md: 12,
-          lg: 12,
-        },
-        style:{
-          width: "32%",
-          margin: "auto"
-        },
-        main: {
-           title: "Delete Content"
-        },
-      },
-      elements:
-        [
-          {
-            type: "Control",
-            scope: "#/properties/label",
-            options: {
-              widget: "Box",
-            },
-            config: {
-              layout: 12,
-              main: {
-                heading: "Are you sure you want to delete ?",
-              },
-              style:{
-                marginTop: "-25px",
-                marginLeft: "11px"
-              }
-            },
-          },
-          {
-            type: "Control",
-            scope: "#/properties/EmptyBox",
-            options: {
-              widget: "EmptyBox",
-            },
-            config: {
-              main:{},
-              layout: { xs: 11, sm: 5.5, md: 4.5, lg: 4.5 },
-            },
-          },
-          {
-            type: "Control",
-            scope: "#/properties/ConfirmDeleteEventButton",
-            options: {
-              widget: "Button",
-            },
-            config: {
-              layout: 3,
-              main: {
-                name: "Yes",
-                endIcon: "DeleteIcon",
-                variant: "contained",
-                color: "info",
-                type: "text",
-                onClick: "deleteEvent",
-                size: "small",
-              },
-            },
-          },
-          {
-            type: "Control",
-            scope: "#/properties/CancelDeleteEventButton",
-            options: {
-              widget: "Button",
-            },
-            config: {
-              layout: 3,
-              main: {
-                name: "No",
-                endIcon: "CloseIcon",
-                variant: "contained",
-                color: "info",
-                type: "text",
-                onClick: "deletePopUpEvent",
-                size: "small",
-              },
-            },
-          },
-          {
-            type: "Control",
-            scope: "#/properties/EmptyBox",
-            options: {
-              widget: "EmptyBox",
-            },
-            config: {
-              main:{},
-              layout: 0.5,
-            },
-          },
-        ]
-      },
-
     {
       type: "Control",
       scope: "#/properties/proc",

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

@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { ComponentSchema } from "../elements/UiSchema/Component/schema"; 
+import { ComponentSchema } from "../elements/UiSchema/Component/schema";
 import { componentBasicUiSchema } from "../elements/UiSchema/Component/uiSchema";
 import { CoreSection } from "../build/uischema/coreSection";
 import { EventSection } from "../build/uischema/eventSection";
@@ -10,55 +10,58 @@ import { ValueTab } from "../build/uischema/valueTab";
 import { ValidationSection } from "../build/uischema/validationSections";
 import { getFormdataFromLocalStorage, okHandler, saveFormdataInLocalStorage, saveHandler } from "./utils";
 const sectionLabels = {
-  Select: ["Core", "Properties","Value", "style", "Event","Validation"],
-  MultipleSelect: ["Core", "Properties","Value", "style", "Event","Validation"],
-  Table: ["Core", "Components",  "Properties","style",  "Event","Validation"],
-  LeaderBoard: ["Core", "Components", "Properties", "style", "Event","Validation"],
-  WrapperSection: ["Core", "Components","Properties", "style","Validation"],
-  TabSection: ["Core", "Components", "Properties", "style","Validation"],
-  SpeedoMeter:["Core", "Properties", "style", "Event","Validation"],
-  card:["Core", "Properties", "style", "Event","Validation"],
-  UploadFile:["Core",  "style", "Event","Validation"],
-  Graph:["Core", "Properties", "style", "Event","Validation"],
-  DownloadFile:["Core",  "style", "Event","Validation"],
-  Box: ["Core", "style", "Event","Validation"],
-  Properties: ["Core", "Properties", "style", "Event","Validation"],
-  ProgressBarCard: ["Core", "Properties", "style", "Event","Validation"],
-  RankCard: ["Core", "Properties", "style", "Event","Validation"],
-  Slider: ["Core", "Components", "style", "Event","Validation"],
-  Timer: ["Core", "style", "Event","Validation"],
-  Rank: ["Core","style", "Event","Validation"],
-  Button: ["Core", "Properties", "style", "Event","Validation"],
-  Array:["Core","Components","Validation"],
-  Radio:["Core", "Properties", "style", "Event","Validation"],
-  Text:["Core","Properties","style", "Event","Validation"],
-  TextArea:["Core","Properties","style", "Event","Validation"],
-  PopUp: ["Core", "Components","Properties", "style"],
-  Stepper: ["Core", "Components","Properties","Event", "style"],
-  DataGrid: ["Core", "Components","Properties","Event", "style"],
+  Select: ["Core", "Properties", "Value", "Event", "Style", "Validation"],
+  MultipleSelect: ["Core", "Properties", "Value", "Event", "Style", "Validation"],
+  Table: ["Core", "Components", "Properties", "Event", "Style", "Validation"],
+  LeaderBoard: ["Core", "Components", "Properties", "Event", "Style", "Validation"],
+  WrapperSection: ["Core", "Components", "Properties", "Style", "Validation"],
+  TabSection: ["Core", "Components", "Properties", "Style", "Validation"],
+  SpeedoMeter: ["Core", "Properties", "Event", "Style", "Validation"],
+  card: ["Core", "Properties", "Event", "Style", "Validation"],
+  UploadFile: ["Core", "Event", "Style", "Validation"],
+  Graph: ["Core", "Properties", "Event", "Style", "Validation"],
+  DownloadFile: ["Core", "Event", "Style", "Validation"],
+  Box: ["Core", "Event", "Style", "Validation"],
+  Properties: ["Core", "Properties", "Event", "Style", "Validation"],
+  ProgressBarCard: ["Core", "Properties", "Event", "Style", "Validation"],
+  RankCard: ["Core", "Properties", "Event", "Style", "Validation"],
+  Slider: ["Core", "Components", "Event", "Style", "Validation"],
+  Timer: ["Core", "Event", "Style", "Validation"],
+  Rank: ["Core", "Event", "Style", "Validation"],
+  Button: ["Core", "Properties", "Event", "Style", "Validation"],
+  Array: ["Core", "Components", "Validation"],
+  Radio: ["Core", "Properties", "Event", "Style", "Validation"],
+  Text: ["Core", "Properties", "Event", "Style", "Validation"],
+  TextArea: ["Core", "Properties", "Event", "Style", "Validation"],
+  PopUp: ["Core", "Components", "Properties", "Style"],
+  Stepper: ["Core", "Components", "Properties", "Event", "Style"],
+  DataGrid: ["Core", "Components", "Properties", "Event", "Style"],
+  InputSlider: ["Core", "Properties", "Event", "Style", "Validation"],
+  TreeMap: ["Core", "Components", "Properties", "Event", "Style"],
+  ColumnGroup: ["Core", "Components"]
 }
 
 
 
-export const refreshPage = (type:string,store:any) => {
+export const refreshPage = (type: string, store: any) => {
   const UiSchema = _.cloneDeep(componentBasicUiSchema)
-  if(type){
-  const sectionUiSchema = {
-    Core: CoreSection,
-    Value: ValueTab,
-    style: StyleSection,
-    Event: EventSection,
-    Components: TableSection,
-    Properties: buildPropertiesSection(type),
-    Validation:ValidationSection
-  
+  if (type) {
+    const sectionUiSchema = {
+      Core: CoreSection,
+      Value: ValueTab,
+      Style: StyleSection,
+      Event: EventSection,
+      Components: TableSection,
+      Properties: buildPropertiesSection(type),
+      Validation: ValidationSection
+
+    }
+    const elements = sectionLabels[type]?.map(e => sectionUiSchema[e]);
+    UiSchema.elements[1].config.main.tabLabels = sectionLabels[type] || ["Core", "Style", "Event", "Validation"];
+    UiSchema.elements[1].elements = elements || [CoreSection, StyleSection, EventSection, ValidationSection];
+
   }
-  const elements = sectionLabels[type]?.map(e => sectionUiSchema[e]);
-  UiSchema.elements[1].config.main.tabLabels = sectionLabels[type] || ["Core", "style","Event","Validation"];
-  UiSchema.elements[1].elements = elements || [CoreSection, StyleSection,EventSection,ValidationSection];
- 
-}
-store.setUiSchema(UiSchema);
+  store.setUiSchema(UiSchema);
 }
 
 export default (store: any, dynamicData: any, submitHandler: any, service: any) => {
@@ -67,26 +70,26 @@ export default (store: any, dynamicData: any, submitHandler: any, service: any)
       const formdata = await this.getFormdata();
       store.setFormdata(formdata);
       const schema = this.getSchema();
-      store.setSchema(schema); 
-     this.refreshPage(formdata?.type, store);
-    
+      store.setSchema(schema);
+      this.refreshPage(formdata?.type, store);
+
     },
-    refreshPage:refreshPage,
+    refreshPage: refreshPage,
     getFormdata: function () {
       const path = store.searchParams?.get("path");
-      return getFormdataFromLocalStorage(path) 
+      return getFormdataFromLocalStorage(path)
     },
     getSchema: function () {
       return ComponentSchema;
     },
-    okHandler:()=>okHandler(store),
-    saveHandler: async ()=> await saveHandler(store,service,submitHandler,"PageMaster"),
+    okHandler: () => okHandler(store),
+    saveHandler: async () => await saveHandler(store, service, submitHandler, "PageMaster"),
     onChange: function () {
       if (
         store?.formData?.type !== store?.newData?.type &&
         store?.newData?.type !== undefined
       ) {
-        this.refreshPage(store?.newData?.type,store);
+        this.refreshPage(store?.newData?.type, store);
       }
     },
     editComponents: function () {
@@ -104,28 +107,20 @@ export default (store: any, dynamicData: any, submitHandler: any, service: any)
         store.navigate(`/Component?path=${`elements[${rowId}]`}&id=${id}`)
       }
     },
-    deleteComponents: function (shouldUpdateDialog: boolean = true) {
+    deleteComponents: function () {
       const path = store.searchParams?.get("path");
-      const rowId = localStorage.getItem('rowId');
+      const rowId = dynamicData.path.split(".")[1];
       store.formData.elements.splice(rowId, 1);
       const response = saveFormdataInLocalStorage(store.ctx.core.data, path)
       const data = path ? _.get(response, path) : response;
       store.setFormdata(data);
-      if(shouldUpdateDialog){
-        store.updateDialog("popUpComponentSection");
-      }
-      localStorage.removeItem('rowId');
     },
-    deleteEvent: function (shouldUpdateDialog: boolean = true) {
+    deleteEvent: function () {
       const path = store.searchParams?.get("path");
-      const rowId = localStorage.getItem('rowId');
+      const rowId = dynamicData.path.split(".")[1];
       store.formData.events.splice(rowId, 1);
       const response = saveFormdataInLocalStorage(store.ctx.core.data, path)
       store.setFormdata(_.get(response, path));
-      if(shouldUpdateDialog){
-        store.updateDialog("popUpEventSection")
-      }
-      localStorage.removeItem('rowId');
     },
     widgetAddClickHandler: function () {
       if (!Array.isArray(store.formData.elements)) {
@@ -160,16 +155,6 @@ export default (store: any, dynamicData: any, submitHandler: any, service: any)
     backHandler: function () {
       store.navigate(-1)
     },
-    deletePopUpComponent: function(){
-      const rowId = dynamicData.path.split(".")[1];
-      localStorage.setItem('rowId',rowId);
-      store.updateDialog("popUpComponentSection");
-    },
-    deletePopUpEvent: function(){
-      const rowId = dynamicData.path.split(".")[1];
-      localStorage.setItem('rowId',rowId);
-      store.updateDialog("popUpEventSection");
-    },
   }
 };
 

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

@@ -3,15 +3,17 @@ import { EventUiSchema } from "../elements/UiSchema/event/uiSchema";
 import Component from "./component";
 import { okHandler, saveFormdataInLocalStorage, saveHandler } from "./utils";
 import { APISection } from "../build/uischema/apiSection";
-import { getSelectField, getTextArea } from "../build/uischema/buildPropertiesSection";
+import { getRadioInputField, getSelectField, getTextArea } from "../build/uischema/buildPropertiesSection";
 import { refreshSectionUiSchema } from "../build/uischema/refresh";
 import _ from "lodash";
+import emptyBox from "../build/uischema/emptyBox";
 
 export default (
   store: any,
   dynamicData: any,
   submitHandler: any,
-  service: any
+  service: any,
+  functionsName?: { const: string, title: string }[]
 ) => {
   return {
     setPage: async function () {
@@ -26,7 +28,9 @@ export default (
       const schema: any = _.cloneDeep(EventSchema)
       if (handlerType) {
         if (handlerType === "custom") {
-          uiSchema.elements[1].elements[0].elements[2] = getTextArea("eventCode", "Write Custom Code", false)
+          uiSchema.elements[1].elements[0].elements[2] =  getRadioInputField("isSync","Run in Sync",["Yes","No"])
+          uiSchema.elements[1].elements[0].elements[3] = emptyBox;
+          uiSchema.elements[1].elements[0].elements[4] = getTextArea("eventCode", "Write Custom Code", false)
           schema.required = ["eventType", "Handler", "eventCode"]
 
         } else if (handlerType === "api") {
@@ -47,6 +51,12 @@ export default (
           schema.required = ["eventType", "Handler", "refreshElements"]
         }
       }
+      if (functionsName) {
+        schema.properties.inBuiltFunctionType.oneOf = [
+          ...schema.properties.inBuiltFunctionType.oneOf,
+          ...functionsName
+        ]
+      }
       store.setSchema(schema)
       store.setUiSchema(uiSchema)
     },
@@ -59,7 +69,7 @@ export default (
       return EventSchema;
     },
     okHandler: () => okHandler(store),
-    saveHandler: async () => await saveHandler(store, service, submitHandler,"PageMaster"),
+    saveHandler: async () => await saveHandler(store, service, submitHandler, "PageMaster"),
     onChange: function () {
       if (
         store?.formData?.Handler !== store?.newData?.Handler &&
@@ -89,17 +99,9 @@ export default (
       this.setPage()
 
     },
-    deleteEvent: async function () {
-      await Component(store, dynamicData, submitHandler, service).deleteEvent(false);
-      store.updateDialog("popUpEvent");
-    },
+    deleteEvent: Component(store, dynamicData, submitHandler, service).deleteEvent,
     backHandler: function () {
       store.navigate(-1)
     },
-    deletePopUpEvent: function(){
-      const rowId = dynamicData.path.split(".")[1];
-      localStorage.setItem('rowId',rowId);
-      store.updateDialog("popUpEvent");
-    }
   }
 };

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

@@ -8,13 +8,12 @@ import { getFormdataFromLocalStorage, saveFormdataInLocalStorage, saveHandler }
 interface funcParamsProps {
   store: any,
   dynamicData: any,
-
+  pageConfigProvider: any,
   submitHandler: any,
   service: any
-  config?: any
 }
 export default (funcParams: funcParamsProps) => {
-  const { store, dynamicData, config, submitHandler, service } = funcParams
+  const { store, dynamicData, submitHandler, service } = funcParams
   return {
     setPage: async function () {
       const formdata = await this.getFormdata();
@@ -24,8 +23,9 @@ export default (funcParams: funcParamsProps) => {
       store.setSchema(schema);
       store.setUiSchema(uiSchema);
     },
-    getFormdata: function () {
+    getFormdata: async function () {
       const id = store.searchParams?.get("id");
+      const config: any = await funcParams.pageConfigProvider(id)
       const formData = getFormdataFromLocalStorage()
       if (formData) {
         return formData;
@@ -49,17 +49,20 @@ export default (funcParams: funcParamsProps) => {
         store.formData.elements = []
       }
       const response = saveFormdataInLocalStorage(store.ctx.core.data)
-      store.navigate(
-        `/Component?path=${`elements[${response?.elements.length}]`}&id=${id}`
-      );
+      if (id) {
+        store.navigate(
+          `/Component?path=${`elements[${response?.elements.length}]`}&id=${id}`
+        );
+      } else {
+        store.navigate(
+          `/Component?path=${`elements[${response?.elements.length}]`}`
+        );
+      }
+
     },
-    saveHandler: async ()=> await saveHandler(store,service,submitHandler),
+    saveHandler: async () => await saveHandler(store, service, submitHandler),
     Edit_Components: Component(store, dynamicData, submitHandler, service).editComponents,
-    
-    Delete_Components: async function() {
-      await Component(store, dynamicData, submitHandler, service).deleteComponents(false);
-      store.updateDialog("popUpPageMasterComponent");
-    },
+    Delete_Components: Component(store, dynamicData, submitHandler, service).deleteComponents,
     eventAddHandler: function () {
       const id = store.searchParams?.get("id");
       if (!Array.isArray(store.formData.events)) {
@@ -77,22 +80,10 @@ export default (funcParams: funcParamsProps) => {
       store.navigate(`/ComponentEvents?path=${finalPath}&id=${id}`)
     },
     deleteEvent: function () {
-      const rowId = localStorage.getItem('rowId');
+      const rowId = dynamicData.path.split(".")[1];
       store.formData.events.splice(rowId, 1);
       const response = saveFormdataInLocalStorage(store.ctx.core.data)
       store.setFormdata(response);
-      store.updateDialog("popUpPageMasterEvent");
-      localStorage.removeItem('rowId');
-    },
-    deletePopUpComponent: function(){
-      const rowId = dynamicData.path.split(".")[1];
-      localStorage.setItem('rowId',rowId);
-      store.updateDialog("popUpPageMasterComponent");
-    },
-    deletePopUpEvent: function(){
-      const rowId = dynamicData.path.split(".")[1];
-      localStorage.setItem('rowId',rowId);
-      store.updateDialog("popUpPageMasterEvent");
     },
   }
 };

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

@@ -65,7 +65,7 @@ export async function saveHandler(store, service, submitHandler, pageName?: stri
     if (_.isEmpty(store.ctx.core.errors)) {
         try {
             const saveReturn = await submitHandler(store, service, config);
-            navigateHandler(store, true, pageName ? `/${pageName}?id=${id}` : "/PageMasterRecords")
+            navigateHandler(store, true, pageName ? `/${pageName}?id=${saveReturn.id}` : "/PageMasterRecords")
         } catch (err) {
             navigateHandler(store, false)
         }

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

@@ -29,4 +29,4 @@ export const doDownload = (response: any, service) => {
     document.body.appendChild(link);
     link.click();
     link.parentNode.removeChild(link);
-};
+};