impaktapps-ui-builder 0.0.381 → 0.0.382-alpha.10

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

@@ -41,7 +41,7 @@ const sectionLabels = {
 
 
 export const refreshPage = (type:string,store:any) => {
-  const UiSchema = _.cloneDeep(componentBasicUiSchema)
+  const UiSchema = _.cloneDeep(componentBasicUiSchema(store.theme.myTheme))
   if(type){
   const sectionUiSchema = {
     Core: CoreSection,
@@ -54,8 +54,8 @@ export const refreshPage = (type:string,store:any) => {
   
   }
   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];
+  UiSchema.elements[0].config.main.tabLabels = sectionLabels[type] || ["Core", "style","Event","Validation"];
+  UiSchema.elements[0].elements = elements || [CoreSection, StyleSection,EventSection,ValidationSection];
  
 }
 store.setUiSchema(UiSchema);

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

@@ -22,26 +22,26 @@ export default (
       this.refreshPage(formdata.Handler, store)
     },
     refreshPage: (handlerType: any, store: any) => {
-      const uiSchema = _.cloneDeep(EventUiSchema);
+      const uiSchema = _.cloneDeep(EventUiSchema(store.theme.myTheme));
       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[0].elements[0].elements[2] = getTextArea("eventCode", "Write Custom Code", false)
           schema.required = ["eventType", "Handler", "eventCode"]
 
         } else if (handlerType === "api") {
-          uiSchema.elements[1].elements[0].elements[2] = APISection;
+          uiSchema.elements[0].elements[0].elements[2] = APISection;
           schema.required = ["eventType", "Handler", "method", "path"]
         } else if (handlerType === "inBuiltFunction") {
-          uiSchema.elements[1].elements[0].elements[2] = getSelectField("inBuiltFunctionType", "Function Name", [
+          uiSchema.elements[0].elements[0].elements[2] = getSelectField("inBuiltFunctionType", "Function Name", [
             { label: "RankProvider", value: "RankProvider" },
             { label: "Download File", value: "downloadFile" },
             { label: "Download Blob File", value: "downloadBlobFile" }
           ])
-          uiSchema.elements[1].elements[0].elements[3] = getTextArea("funcParametersCode", "Write Custom Code for Functions Parameter", true, { xs: 12, sm: 12, md: 6 });
+          uiSchema.elements[0].elements[0].elements[3] = getTextArea("funcParametersCode", "Write Custom Code for Functions Parameter", true, { xs: 12, sm: 12, md: 6 });
           schema.required = ["eventType", "Handler", "inBuiltFunctionType"]
         } else if (handlerType === "refresh") {
-          uiSchema.elements[1].elements[0].elements[2] = refreshSectionUiSchema;
+          uiSchema.elements[0].elements[0].elements[2] = refreshSectionUiSchema;
           schema.properties.refreshElements.required = ["value"]
           schema.properties.refreshElements.items.required = ["value"]
           schema.required = ["eventType", "Handler", "refreshElements"]
@@ -52,8 +52,8 @@ export default (
     },
 
     getFormData: Component(store, dynamicData, submitHandler, service).getFormdata,
-    getUiSchema: function () {
-      return EventUiSchema;
+    getUiSchema: async function () {
+      return await EventUiSchema(store.theme.myTheme);
     },
     getSchema: () => {
       return EventSchema;

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

@@ -34,7 +34,7 @@ export default (funcParams: funcParamsProps) => {
       return config
     },
     getUiSchema: function () {
-      return PageMasterUiSchema;
+      return PageMasterUiSchema(store.theme.myTheme);
     },
     getSchema: () => {
       return PageMasterSchema;

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

@@ -16,13 +16,12 @@ export const downloadFile = (obj: any) => {
     document.body.removeChild(link);
 };
 
-export const clickDownloadLink = (response: any, service) => {
-    const user = JSON.parse(localStorage.getItem("user"));
-    let url = `${service.defaults.baseURL}/${response.path}?Authorization=Bearer%20${user.token}`;
+export const doDownload = (response: any, service) => {
+    let url = `${service.defaults.baseURL}/${response.path}`;
     if (response?.params) {
         const keysArray = Object.keys(response?.params);
         keysArray.map((e, i) => {
-            url = url + `&${e}=${response?.params[e]}`
+            url = url + `${i === 0?"?":"&"}${e}=${response?.params[e]}`
         })
     }
     const link = document.createElement('a');

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

@@ -87,7 +87,7 @@ async function executeInBuiltFunctionHandler(params: handlersProps) {
     const makeFunc = eval(params.config.funcParametersCode)
     parameter = makeFunc(params.store, params.dynamicData, params.userValue, params.parentEventOutput, params.service);
   }
-  params.serviceHolder[params.config.inBuiltFunctionType](parameter,params.service)
+  params.serviceHolder[params.config.inBuiltFunctionType](parameter)
 }
 
 async function executeCustomHandler(params: handlersProps) {

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

@@ -1,5 +1,5 @@
 import _, { isEmpty } from "lodash";
-import { clickDownloadLink, downloadFile } from "./downloadFile";
+import { doDownload, downloadFile } from "./downloadFile";
 import { executeEvents, executeRefreshHandler } from "./events";
 import { handlersProps } from "./interface";
 let compType: string;
@@ -62,7 +62,7 @@ export default (funcParams: funcParamsProps) => {
   let executeEventsParameters: handlersProps = {
     config: {}, componentName: "",
     store: funcParams.store, dynamicData: funcParams.dynamicData, userValue: funcParams.userValue, service: funcParams.service,
-    serviceHolder: { downloadFile ,download:clickDownloadLink}, eventGroups
+    serviceHolder: { downloadFile,download:doDownload }, eventGroups
   };
   return {
     setPage: async function () {
@@ -192,7 +192,7 @@ export default (funcParams: funcParamsProps) => {
       }
     },
     downloadFile: downloadFile,
-    download:clickDownloadLink,
+    download:doDownload,
   };
 };