impaktapps-ui-builder 1.0.113 → 1.0.114

package/dist/src/impaktapps-ui-builder/builder/build/buildUiSchema.d.ts

@@ -3,7 +3,8 @@ export declare let schema: {
     properties: {};
     required: any[];
 };
-export declare const buildSchema: (config: any, tableName?: string, isArrayType?: boolean) => {
+export declare function buildSchemaFromConfig(config: any, parentSchema: any): void;
+export declare const buildSchema: (config: any) => {
     type: string;
     properties: {};
     required: any[];

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

@@ -7,3 +7,4 @@ export { default as buildConfig } from "../builder/build/buildConfig";
 export { default as buildUiSchema } from "../builder/build/buildUiSchema";
 export { buildSchema } from "../builder/build/buildUiSchema";
 export { default as clearFromSessionStorage } from "../builder/services/utils";
+export { downloadFile, downloadFileFromUrl } from "../runtime/services/downloadFile";

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

@@ -1,2 +1,5 @@
-export declare const downloadFile: (obj: any) => void;
-export declare const doDownload: (response: any, service: any) => void;
+export declare function downloadFile({ data, name }: {
+    data: string;
+    name: string;
+}): void;
+export declare const downloadFileFromUrl: (response: any, service: any) => void;

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

@@ -1,3 +1,4 @@
+import { downloadFile } from "./downloadFile";
 interface funcParamsProps {
     store: any;
     dynamicData: any;
@@ -26,8 +27,8 @@ declare const _default: (funcParams: funcParamsProps) => {
     onBack: (functionParameters: any) => Promise<void>;
     onNext: (functionParameters: any) => Promise<void>;
     onReset: (functionParameters: any) => Promise<void>;
-    callHandler: (eventType: string, functionParameters?: any) => Promise<void>;
-    downloadFile: (obj: any) => void;
-    download: (response: any, service: any) => void;
+    callHandler: (eventType: string, functionParameters?: any) => void;
+    downloadFile: typeof downloadFile;
+    downloadFileFromUrl: (response: any, service: any) => void;
 };
 export default _default;

package/package.json

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

package/src/impaktapps-ui-builder/builder/build/buildCard.ts

@@ -7,9 +7,9 @@ export const buildCard = (config,componentScope,store) =>{
     if (config.style) {
       card.config.wrapperStyle = JSON.parse(config.style)
     }
-    card.elements[0].elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/value`
-    card.elements[1].scope = `#/properties/${config.name}/properties/url`
-    card.elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/description`
+    card.elements[0].elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/value`;
+    card.elements[1].scope = `#/properties/${config.name}/properties/url`;
+    card.elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/description`;
     if(config.layout){
       card.config.layout = createLayoutFormat(config.layout)
     }

package/src/impaktapps-ui-builder/builder/build/buildTable.ts

@@ -10,6 +10,9 @@ export const buildTable = (config: any, componentScope: string) => {
   if (config.lazyLoading) {
     table.config.main.lazyLoading = config.lazyLoading === "YES" ? true : false;
   }
+  if (config.defaultColumnSize) {
+    table.config.main.defaultColumnSize = config.defaultColumnSize
+  }
   if (config.enableRowMovement) {
     table.config.main.enableRowMovement = config.enableRowMovement === "YES" ? true : false;
   }
@@ -41,28 +44,28 @@ export const buildTable = (config: any, componentScope: string) => {
   if (config.downloadAllData) {
     table.config.main.downloadAllData = config.downloadAllData === "YES" ? true : false
   }
-  if(config.disableGlobalSearch){
+  if (config.disableGlobalSearch) {
     table.config.main.disableGlobalSearch = config.disableGlobalSearch === "YES" ? true : false
   }
-  if(config.disableColumnFilter){
+  if (config.disableColumnFilter) {
     table.config.main.disableColumnFilter = config.disableColumnFilter === "YES" ? true : false
   }
-  if(config.disableSorting){
+  if (config.disableSorting) {
     table.config.main.disableSorting = config.disableSorting === "YES" ? true : false
   }
-  if(config.disableEditColumn){
+  if (config.disableEditColumn) {
     table.config.main.disableEditColumn = config.disableEditColumn === "YES" ? true : false
   }
-  if(config.disableFullScreenToggle){
+  if (config.disableFullScreenToggle) {
     table.config.main.disableFullScreenToggle = config.disableFullScreenToggle === "YES" ? true : false
   }
-  if(config.disableDensityToggle){
+  if (config.disableDensityToggle) {
     table.config.main.disableDensityToggle = config.disableDensityToggle === "YES" ? true : false
   }
-  if(config.disableDownloadFile){
+  if (config.disableDownloadFile) {
     table.config.main.disableDownloadFile = config.disableDownloadFile === "YES" ? true : false
   }
-  if(config.disablePagination){
+  if (config.disablePagination) {
     table.config.main.disablePagination = config.disablePagination === "YES" ? true : false
   }
   if (config.Table_Download_Keys_Name) {
@@ -71,11 +74,8 @@ export const buildTable = (config: any, componentScope: string) => {
   if (config.selectKey) {
     table.config.main.selectKey = config.selectKey
   }
-  if(config.maxPageSize){
+  if (config.maxPageSize) {
     table.config.main.maxPageSize = config.maxPageSize
   }
-  if(config.initialDensity){
-    table.config.main.initialDensity = config.initialDensity
-  }
   return table;
 };

package/src/impaktapps-ui-builder/builder/build/buildUiSchema.ts

@@ -1,6 +1,4 @@
 import _ from "lodash";
-import emptyBox from "./uischema/emptyBox";
-import cardSlider from "./uischema/cardSlider";
 import { buildLeaderBoard } from "./buildLeaderboard";
 import { buildProgressBarCard } from "./buildProgressBarCard";
 import { buildProgressBar } from "./buildProgressBar";
@@ -47,126 +45,76 @@ export let schema = {
   properties: {},
   required: []
 };
-//MultipleSelect
-function buildRule(configObj: any, tableName?: string, arrayHolderName?: boolean) {
-  if (arrayHolderName) {
-    if (schema.properties?.[tableName]?.items?.properties) {
-      if (!schema.properties?.[tableName]?.items?.properties?.[configObj.name]) {
-        schema.properties[tableName].items.properties[configObj.name] = {};
-        if (configObj.type === "Select" && configObj.value?.length > 0) {
-          schema.properties[tableName].items.properties[configObj.name] = {
-            oneOf: configObj.value.map((e) => {
-              return { const: e.value, title: e.label }
-            })
-          }
-        }
-        else if (configObj.type === "MultipleSelect" && configObj.value?.length > 0) {
-          schema.properties[tableName].items.properties[configObj.name] = {
-            items: {
-              oneOf: configObj.value.map((e) => {
-                return { const: e.value, title: e.label }
-              })
-            }
-          }
-        }
-      }
-    }
-  } else if ((configObj.type === "Select" || configObj.type === "MultipleSelect") && configObj.value?.length > 0) {
-    if (configObj.type === "Select") {
-      schema.properties[configObj.name] = {
-        oneOf: configObj.value.map((e) => {
-          return { const: e.value, title: e.label }
-        })
-      }
-    }
-    else if (configObj.type === "MultipleSelect") {
-      schema.properties[configObj.name] = {
+function buildOneOf(values: any[]) {
+  return values.map((e) => ({
+    const: e.value,
+    title: e.label
+  }));
+}
+export function buildSchemaFromConfig(config: any, parentSchema: any) {
+  if (config.elements) {
+    if (config.type === "Array") {
+      parentSchema.properties ??= {};
+      parentSchema.properties[config.name] ??= {
+        type: "array",
         items: {
-          oneOf: configObj.value.map((e) => {
-            return { const: e.value, title: e.label }
-          })
-        }
-      }
-    }
-  }
-  if (configObj.validation) {
-    configObj.validation.forEach((rule: any) => {
-      if (tableName) {
-        if (schema.properties?.[tableName]?.items?.properties) {
-          if (!schema.properties?.[tableName]?.items?.properties?.[configObj.name]) {
-            schema.properties[tableName].items.properties[configObj.name] = {};
-            if (configObj.type === "Select" || configObj.value?.length > 0) {
-              schema.properties[tableName].items.properties[configObj.name] = {
-                oneOf: configObj.value.map((e) => {
-                  return { const: e.value, title: e.label }
-                })
-              }
-            }
-            else if (configObj.type === "MultipleSelect" || configObj.value?.length > 0) {
-              schema.properties[tableName].items.properties[configObj.name] = {
-                items: {
-                  oneOf: configObj.value.map((e) => {
-                    return { const: e.value, title: e.label }
-                  })
-                }
-              }
-            }
-          }
-          if (rule.validationType === "required") {
-            schema.properties?.[tableName]?.items?.required.push(configObj.name)
-          } else {
-            schema.properties[tableName].items.properties[configObj.name]["type"] = "string"
-            schema.properties[tableName].items.properties[configObj.name][rule.validationType] =
-              isNaN(rule.validationValue) ?
-                rule.validationValue : Number(rule.validationValue)
-          }
-
-        }
-      } else {
-        if (!schema.properties[configObj.name]) {
-          schema.properties[configObj.name] = {};
-        }
-        if (rule.validationType === "required") {
-          schema.required.push(configObj.name)
-        } else {
-          schema.properties[configObj.name]["type"] = "string"
-          schema.properties[configObj.name][rule.validationType] =
-            isNaN(rule.validationValue) ?
-              rule.validationValue : Number(rule.validationValue)
-        }
-      }
-    });
-  }
+          type: "object",
+          properties: {},
+          required: [],
+        },
+      };
 
+      const arrayItemSchema = parentSchema.properties[config.name].items;
 
-}
-export const buildSchema = (config: any, tableName?: string, isArrayType?: boolean) => {
-  buildRule(config, tableName, isArrayType);
-  if (config?.elements) {
-    if ( config.type == "Array") {
-      if (!schema.properties[config.name]) {
-        schema.properties[config.name] = {
-          type: "array",
-          items: {
-            type: "object",
-            properties: {},
-            required: []
-          }
-        }
-      }
-      config.elements.map((e, elemInd) => {
-        buildSchema(e, config.name, config.type === "Array" ? true : false)
-      })
+      config.elements?.forEach((child: any) =>
+        buildSchemaFromConfig(child, arrayItemSchema)
+      );
+      return;
+    } else {
+      config.elements?.forEach((child: any) =>
+        buildSchemaFromConfig(child, parentSchema)
+      );
+      return;
     }
-    else {
-      config.elements.map((e, elemInd) => {
-        buildSchema(e)
-      })
+  }
+  parentSchema.properties ??= {};
+  parentSchema.properties[config.name] ??= {};
+  const fieldSchema = parentSchema.properties[config.name];
+  config.validation?.forEach((v: any) => {
+    if (v.validationType === "required") {
+      parentSchema.required ??= [];
+      parentSchema.required.push(config.name);
+    } else if (v.validationType === "readOnly") {
+      fieldSchema.type = "string";
+      fieldSchema.disabled = true;
+    } else {
+      fieldSchema.type = "string";
+      fieldSchema[v.validationType] = isNaN(v.validationValue)
+        ? v.validationValue
+        : Number(v.validationValue);
     }
+  });
+  if (config.type === "Select" && config.value?.length) {
+    fieldSchema.oneOf = config.value.map((v: any) => ({
+      const: v.value,
+      title: v.label,
+    }));
+  }
+  if (config.type === "MultipleSelect" && config.value?.length) {
+    fieldSchema.type = "array";
+    fieldSchema.items = {
+      oneOf: config.value.map((v: any) => ({
+        const: v.value,
+        title: v.label,
+      })),
+    };
   }
-  return schema;
 }
 
+export const buildSchema = (config) => {
+  buildSchemaFromConfig(config, schema)
+  return schema;
+}
 
 const buildUiSchema = (config: any, store?: any) => {
   let elements: any = {};
@@ -387,7 +335,7 @@ const buildUiSchema = (config: any, store?: any) => {
           }
           if (cellElem.elementType == "tableHeader") {
             const headerElem = buildUiSchema(cellElem, store);
-            tableHeaderElements.push({widget:headerElem});
+            tableHeaderElements.push({ widget: headerElem });
             return false;
           }
           const tableElem = {

package/src/impaktapps-ui-builder/builder/build/uischema/buildPropertiesSection.ts

@@ -327,7 +327,7 @@ export const buildPropertiesSection = function (type: String) {
         emptyBox("PopUpEmpty", { xs: 6, sm: 6, md: 0, lg: 0 })
       ]
       break;
-    case "Text": 
+    case "Text":
       uiSchema.elements = [
         getInputField("placeholder", "Placeholder"),
         getRadioInputField("multiline", "Multiline", ["YES", "NO"]),
@@ -477,7 +477,7 @@ export const buildPropertiesSection = function (type: String) {
         getRadioInputField("disableDensityToggle", "Disable Density Toggle", ["YES", "NO"]),
         getRadioInputField("disableDownloadFile", "Disable Download File", ["YES", "NO"]),
         getRadioInputField("disablePagination", "Disable Pagination", ["YES", "NO"]),
-        getInputField("selectKey", "Selection Key"),
+        getInputField("selectKey", "Selection Key"),//defaultColumnSize
         getMultiSelectField("filteringOptions", "Filtering Options"),
         getSelectField("maxPageSize", "Max Page Size", [
           { label: "10", value: 10 },
@@ -487,11 +487,6 @@ export const buildPropertiesSection = function (type: String) {
           { label: "100", value: 100 },
           { label: "500", value: 500 }
         ]),
-        getSelectField("initialDensity", "Initial Toggle Density", [
-          { label: "Compact", value: "compact" },
-          { label: "Comfortable", value: "comfortable" },
-          { label: "Spacious", value: "spacious" }
-        ]),
         buildWrapper("Tree Table Properties", [
           getRadioInputField("enableRowMovement", "Row Rearrangement", ["YES", "NO"]),
           getRadioInputField("enableExpanding", "Row Expanding", ["YES", "NO"]),
@@ -499,7 +494,7 @@ export const buildPropertiesSection = function (type: String) {
           getRadioInputField("paginateExpandedRows", "Multi Page Expansion", ["YES", "NO"]),
           getRadioInputField("treeStructure", "Flat Tree Structure", ["YES", "NO"]),
           getRadioInputField("filterFromLeafRows", "Filter from tree rows", ["YES", "NO"]),
-          emptyBox("LazyLoadingTableEmpty2"), emptyBox("LazyLoadingTableEmpty3")
+          getInputField("defaultColumnSize", "Default Column Size"), , emptyBox("LazyLoadingTableEmpty3")
         ]),
         getArrayControl("Table_Download_Keys_Name", "KeyName", "Table Key Name"),
         sizeHolder,
@@ -537,7 +532,7 @@ export const buildPropertiesSection = function (type: String) {
         emptyBox("MultipleSelectEmpty2")
       ]
       break;
-    case "Date": 
+    case "Date":
       uiSchema.elements = [
         getSelectField("variant", "Variant", [
           { label: "Outlined", value: "outlined" },
@@ -547,7 +542,7 @@ export const buildPropertiesSection = function (type: String) {
         emptyBox("DateEmpty1", { xs: 6, sm: 6, md: 8, lg: 9 }),
       ]
       break;
-    case "DateTime": 
+    case "DateTime":
       uiSchema.elements = [
         getSelectField("variant", "Variant", [
           { label: "Outlined", value: "outlined" },
@@ -574,7 +569,7 @@ export const buildPropertiesSection = function (type: String) {
         getRadioInputField("variant", "Variant", ["Outlined", "Standard"]),
         getRadioInputField("disableUpload", "Disable Upload", ["YES", "NO"]),
         getRadioInputField("disableDelete", "Disable Delete", ["YES", "NO"]),
-        getRadioInputField("disableDownload", "Disable Download", ["YES", "NO"]) 
+        getRadioInputField("disableDownload", "Disable Download", ["YES", "NO"])
       ]
       break;
   }

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

@@ -58,15 +58,15 @@ export const ComponentSchema: any = {
         { title: "Date Column", const: "date" },
         { title: "DateTime Column", const: "dateTime" },
         { title: "Amount Column", const: "amount" },
-        { title: "Center Column", const: "action"}
+        { title: "Center Column", const: "action" }
       ]
     },
     variant: {
       oneOf: [
-          { title: "Outlined", const: "outlined" },
-          { title: "Filled", const: "filled" },
-          { title: "Standard", const: "standard" },
-        ]
+        { title: "Outlined", const: "outlined" },
+        { title: "Filled", const: "filled" },
+        { title: "Standard", const: "standard" },
+      ]
     },
     orientation: {
       oneOf: [
@@ -83,7 +83,7 @@ export const ComponentSchema: any = {
         { title: "Put", const: "put" },
       ]
     },
-    maxPageSize:{
+    maxPageSize: {
       type: "number",
       oneOf: [
         { title: "10", const: 10 },
@@ -94,14 +94,6 @@ export const ComponentSchema: any = {
         { title: "500", const: 500 }
       ]
     },
-    initialDensity:{
-      type: "string",
-       oneOf: [
-        { title: "Compact", const: "compact" },
-        { title: "Comfortable", const: "comfortable" },
-        { title: "Spacious", const: "spacious" }
-      ]
-    },
     layout: {
       type: "array",
       items: {
@@ -305,6 +297,7 @@ export const ComponentSchema: any = {
               { const: "minLength", title: "Minimum Length" },
               { const: "maxLength", title: "Maximum Length" },
               { const: "pattern", title: "Pattern" },
+              { const: "readOnly", title: "Read Only" },
             ]
           },
           validationValue: {

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

@@ -1,3 +1,5 @@
+import { title } from "process";
+
 export const EventSchema = {
   type: "object",
   properties: {
@@ -72,7 +74,7 @@ export const EventSchema = {
       oneOf: [
         { title: "RankProvider", const: "RankProvider" },
         { title: "Download File", const: "downloadFile" },
-        { title: "Download", const: "download" },
+        { title: "downloadFileFromUrl", const: "downloadFileFromUrl" },
       ]
     },
     body: {

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

@@ -30,7 +30,7 @@ const sectionLabels = {
   Timer: ["Core", "Events", "Style", "Validation"],
   Rank: ["Core", "Events", "Style", "Validation"],
   Button: ["Core", "Properties", "Events", "Style", "Validation"],
-  Array: ["Core", "Components",  "Properties","Validation"],
+  Array: ["Core", "Components",  "Properties","Events","Validation"],
   Radio: ["Core", "Properties", "Events", "Style", "Validation"],
   Text: ["Core", "Properties", "Events", "Style", "Validation"],
   TextArea: ["Core", "Properties", "Events", "Style", "Validation"],

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

@@ -31,18 +31,18 @@ export default (funcParams: funcParamsProps) => {
         return formData;
       }
       saveFormdataInSessionStorage(config)
-      return config
+      return { ...config, type: "page" }
     },
     getUiSchema: function () {
       const UiSchema = _.cloneDeep(PageMasterUiSchema(store.theme.myTheme));
-      if (sessionStorage.getItem("copiedConfig") ) {
+      if (sessionStorage.getItem("copiedConfig")) {
         Component(store, dynamicData, submitHandler, service).ElementPathSetter(UiSchema)
       }
       return UiSchema;
     },
     getSchema: () => {
       const schema = _.cloneDeep(PageMasterSchema);
-      if (sessionStorage.getItem("copiedConfig") ) {
+      if (sessionStorage.getItem("copiedConfig")) {
         schema.properties.RemoveItemButton.disabled = false;
       }
       return schema;
@@ -70,8 +70,8 @@ export default (funcParams: funcParamsProps) => {
     },
     saveHandler: async () => await saveHandler(store, service, submitHandler),
     Edit_Components: Component(store, dynamicData, submitHandler, service).editComponents,
-    
-    Delete_Components: async function() {
+
+    Delete_Components: async function () {
       await Component(store, dynamicData, submitHandler, service).deleteComponents(false);
       store.updateDialog("popUpPageMasterComponent");
     },
@@ -99,25 +99,25 @@ export default (funcParams: funcParamsProps) => {
       store.updateDialog("popUpPageMasterEvent");
       sessionStorage.removeItem('rowId');
     },
-    deletePopUpComponent: function(){
+    deletePopUpComponent: function () {
       const rowId = dynamicData.path.split(".")[1];
-      sessionStorage.setItem('rowId',rowId);
+      sessionStorage.setItem('rowId', rowId);
       store.updateDialog("popUpPageMasterComponent");
     },
-    deletePopUpEvent: function(){
+    deletePopUpEvent: function () {
       const rowId = dynamicData.path.split(".")[1];
-      sessionStorage.setItem('rowId',rowId);
+      sessionStorage.setItem('rowId', rowId);
       store.updateDialog("popUpPageMasterEvent");
     },
 
 
-    copyPasteElement:  function(){
-      Component(store, dynamicData, submitHandler, service).copyPasteElement(store,this.setPage.bind(this));
+    copyPasteElement: function () {
+      Component(store, dynamicData, submitHandler, service).copyPasteElement(store, this.setPage.bind(this));
     },
-    
-    RemoveItemButton: function(){
+
+    RemoveItemButton: function () {
       Component(store, dynamicData, submitHandler, service).RemoveItemButton(store)
     },
-    
+
   }
 };

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

@@ -1,10 +1,11 @@
 
-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  {buildSchema} from "../builder/build/buildUiSchema"
-export {default as clearFromSessionStorage} from "../builder/services/utils"
+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 { buildSchema } from "../builder/build/buildUiSchema"
+export { default as clearFromSessionStorage } from "../builder/services/utils"
+export { downloadFile, downloadFileFromUrl } from "../runtime/services/downloadFile"

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

@@ -1,32 +1,47 @@
-export const downloadFile = (obj: any) => {
-    const typeArr = obj.name.split(".");
-    const data = obj.data;
-    const finalData = window.atob(data);
-    let file;
-    file = new File([finalData], typeArr[typeArr.length - 1]);
-
-    const url = URL.createObjectURL(file);
-    const link = document.createElement("a");
-    link.href = typeArr[typeArr.length - 1] === 'pdf' ? 'data:application/octet-stream;base64,' + data : url;
-    link.download = `${obj.name}`;
-    document.body.appendChild(link);
-    link.click();
+export function downloadFile({ data, name }: { data: string; name: string }) {
+    const binary = window.atob(data);
+    const bytes = new Uint8Array(binary.length);
+
+    for (let i = 0; i < binary.length; i++) {
+        bytes[i] = binary.charCodeAt(i);
+    }
+
+    const extension = name.split(".").pop()?.toLowerCase();
+    const mimeMap: Record<string, string> = {
+        pdf: "application/pdf",
+        png: "image/png",
+        jpg: "image/jpeg",
+        jpeg: "image/jpeg",
+        xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        csv: "text/csv",
+    };
+
+    const blob = new Blob([bytes], {
+        type: mimeMap[extension!] || "application/octet-stream",
+    });
+
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement("a");
+    a.href = url;
+    a.download = name;
+    a.click();
 
     URL.revokeObjectURL(url);
-    document.body.removeChild(link);
-};
+}
 
-export const doDownload = (response: any, service) => {
+export const downloadFileFromUrl = (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 + `${i === 0?"?":"&"}${e}=${response?.params[e]}`
+            url = url + `${i === 0 ? "?" : "&"}${e}=${response?.params[e]}`
         })
-    }
+    };
     const link = document.createElement('a');
     link.href = url;
     document.body.appendChild(link);
     link.click();
     link.parentNode.removeChild(link);
 };
+
+