blixify-ui-web 0.4.33 → 0.4.35

package/lib/components/data/dataTemplate/index.js

@@ -140,7 +140,7 @@ var pagination_1 = require("./pagination");
 var referenceModal_1 = require("./referenceModal");
 var settingsModal_1 = require("./settingsModal");
 exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21;
     var formRef = (0, react_1.createRef)();
     var objectFormRef = (0, react_1.createRef)();
     var listAddressFromRef = (0, react_1.createRef)();
@@ -155,133 +155,135 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     var typingTimeout = (0, react_1.useRef)();
     // const oldCollectionId: any = useRef();
     var mapViewRef = (0, react_1.useRef)();
-    var _21 = (0, react_1.useState)(false), loading = _21[0], setLoading = _21[1];
-    var _22 = (0, react_1.useState)(), notification = _22[0], setNotification = _22[1];
+    var _22 = (0, react_1.useState)(false), loading = _22[0], setLoading = _22[1];
+    var _23 = (0, react_1.useState)(), notification = _23[0], setNotification = _23[1];
     //INFO : Used by List
-    var _23 = (0, react_1.useState)({}), filterSearch = _23[0], setFilterSearch = _23[1];
-    var _24 = (0, react_1.useState)({}), filterSearchParams = _24[0], setFilterSearchParams = _24[1];
-    var _25 = (0, react_1.useState)({}), filterSelection = _25[0], setFilterSelection = _25[1];
-    var _26 = (0, react_1.useState)({}), filterReference = _26[0], setFilterReference = _26[1];
-    var _27 = (0, react_1.useState)({}), filterReferenceSearch = _27[0], setFilterReferenceSearch = _27[1];
-    var _28 = (0, react_1.useState)({}), filterReferenceList = _28[0], setFilterReferenceList = _28[1];
-    var _29 = (0, react_1.useState)({
+    var _24 = (0, react_1.useState)({}), filterSearch = _24[0], setFilterSearch = _24[1];
+    var _25 = (0, react_1.useState)({}), filterSearchParams = _25[0], setFilterSearchParams = _25[1];
+    var _26 = (0, react_1.useState)({}), filterSelection = _26[0], setFilterSelection = _26[1];
+    var _27 = (0, react_1.useState)({}), filterReference = _27[0], setFilterReference = _27[1];
+    var _28 = (0, react_1.useState)({}), filterReferenceSearch = _28[0], setFilterReferenceSearch = _28[1];
+    var _29 = (0, react_1.useState)({}), filterReferenceList = _29[0], setFilterReferenceList = _29[1];
+    var _30 = (0, react_1.useState)({
         startDate: undefined,
         endDate: undefined,
-    }), filterReferenceDate = _29[0], setFilterReferenceDate = _29[1];
-    var _30 = (0, react_1.useState)(true), tableLoading = _30[0], setTableLoading = _30[1];
-    var _31 = (0, react_1.useState)(""), cursor = _31[0], setCursor = _31[1];
-    var _32 = (0, react_1.useState)(""), lastCursor = _32[0], setLastCursor = _32[1];
-    var _33 = (0, react_1.useState)([]), tableData = _33[0], setTableData = _33[1];
-    var _34 = (0, react_1.useState)([]), spaceTableData = _34[0], setSpaceTableData = _34[1];
-    var _35 = (0, react_1.useState)(0), size = _35[0], setSize = _35[1];
-    var _36 = (0, react_1.useState)((_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.pageIndex) !== null && _b !== void 0 ? _b : 0), pageIndex = _36[0], setPageIndex = _36[1];
-    var _37 = (0, react_1.useState)([]), selectedIds = _37[0], setSelectedIds = _37[1];
-    var _38 = (0, react_1.useState)(false), selectAll = _38[0], setSelectAll = _38[1];
-    var _39 = (0, react_1.useState)(""), deletePasscode = _39[0], setDeletePasscode = _39[1];
-    var _40 = (0, react_1.useState)(""), deletePasscodeInput = _40[0], setDeletePasscodeInput = _40[1];
-    var _41 = (0, react_1.useState)(""), deleteFeedId = _41[0], setDeleteFeedId = _41[1];
+    }), filterReferenceDate = _30[0], setFilterReferenceDate = _30[1];
+    var _31 = (0, react_1.useState)(true), tableLoading = _31[0], setTableLoading = _31[1];
+    var _32 = (0, react_1.useState)(""), cursor = _32[0], setCursor = _32[1];
+    var _33 = (0, react_1.useState)(""), lastCursor = _33[0], setLastCursor = _33[1];
+    var _34 = (0, react_1.useState)([]), tableData = _34[0], setTableData = _34[1];
+    var _35 = (0, react_1.useState)([]), spaceTableData = _35[0], setSpaceTableData = _35[1];
+    var _36 = (0, react_1.useState)(0), size = _36[0], setSize = _36[1];
+    var _37 = (0, react_1.useState)((_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.pageIndex) !== null && _b !== void 0 ? _b : 0), pageIndex = _37[0], setPageIndex = _37[1];
+    var _38 = (0, react_1.useState)([]), selectedIds = _38[0], setSelectedIds = _38[1];
+    var _39 = (0, react_1.useState)(false), selectAll = _39[0], setSelectAll = _39[1];
+    var _40 = (0, react_1.useState)(""), deletePasscode = _40[0], setDeletePasscode = _40[1];
+    var _41 = (0, react_1.useState)(""), deletePasscodeInput = _41[0], setDeletePasscodeInput = _41[1];
+    var _42 = (0, react_1.useState)(""), deleteFeedId = _42[0], setDeleteFeedId = _42[1];
     var previousType = (0, react_1.useRef)();
     var previousSelectedData = (0, react_1.useRef)();
     //INFO : Used by List Organise
-    var _42 = (0, react_1.useState)(false), sortModal = _42[0], setSortModal = _42[1];
-    var _43 = (0, react_1.useState)(false), filterModal = _43[0], setFilterModal = _43[1];
-    var _44 = (0, react_1.useState)(false), addTabModal = _44[0], setAddTabModal = _44[1];
-    var _45 = (0, react_1.useState)(false), overviewModal = _45[0], setOverviewModal = _45[1];
-    var _46 = (0, react_1.useState)((_c = props.defaultTab) !== null && _c !== void 0 ? _c : ""), selectedTab = _46[0], setSelectedTab = _46[1];
-    var _47 = (0, react_1.useState)("dayGridMonth"), calendarView = _47[0], setCalendarView = _47[1];
-    var _48 = (0, react_1.useState)(new Date()), calendarTabMonth = _48[0], setCalendarTabMonth = _48[1];
-    var _49 = (0, react_1.useState)(true), kanbanDroppable = _49[0], setKanbanDroppable = _49[1];
-    var _50 = (0, react_1.useState)([]), kanbanOptions = _50[0], setKanbanOptions = _50[1];
-    var _51 = (0, react_1.useState)(false), queryForm = _51[0], setQueryForm = _51[1];
-    var _52 = (0, react_1.useState)(false), batchUpdateModal = _52[0], setBatchUpdateModal = _52[1];
-    var _53 = (0, react_1.useState)({
+    var _43 = (0, react_1.useState)(false), sortModal = _43[0], setSortModal = _43[1];
+    var _44 = (0, react_1.useState)(false), filterModal = _44[0], setFilterModal = _44[1];
+    var _45 = (0, react_1.useState)(false), addTabModal = _45[0], setAddTabModal = _45[1];
+    var _46 = (0, react_1.useState)(false), overviewModal = _46[0], setOverviewModal = _46[1];
+    var _47 = (0, react_1.useState)((_c = props.defaultTab) !== null && _c !== void 0 ? _c : ""), selectedTab = _47[0], setSelectedTab = _47[1];
+    var _48 = (0, react_1.useState)("dayGridMonth"), calendarView = _48[0], setCalendarView = _48[1];
+    var _49 = (0, react_1.useState)(new Date()), calendarTabMonth = _49[0], setCalendarTabMonth = _49[1];
+    var _50 = (0, react_1.useState)(true), kanbanDroppable = _50[0], setKanbanDroppable = _50[1];
+    var _51 = (0, react_1.useState)([]), kanbanOptions = _51[0], setKanbanOptions = _51[1];
+    var _52 = (0, react_1.useState)(false), queryForm = _52[0], setQueryForm = _52[1];
+    var _53 = (0, react_1.useState)(false), batchUpdateModal = _53[0], setBatchUpdateModal = _53[1];
+    var _54 = (0, react_1.useState)({
         columnId: "",
         columnData: {},
-    }), batchUpdateData = _53[0], setBatchUpdateData = _53[1];
+    }), batchUpdateData = _54[0], setBatchUpdateData = _54[1];
+    var _55 = (0, react_1.useState)((props === null || props === void 0 ? void 0 : props.model) || []), structure = _55[0], setStructure = _55[1];
+    var _56 = (0, react_1.useState)(((_d = props === null || props === void 0 ? void 0 : props.organise) === null || _d === void 0 ? void 0 : _d.additionalQuery) || []), additionalQuery = _56[0], setAdditionalQuery = _56[1];
     //INFO : Used by Auth
-    var _54 = (0, react_1.useState)({
+    var _57 = (0, react_1.useState)({
         email: "",
         google: "",
         phone: "",
         disabled: false,
-    }), authMethods = _54[0], setAuthMethods = _54[1];
-    var _55 = (0, react_1.useState)(""), selectedAuthMethod = _55[0], setSelectedAuthMethod = _55[1];
+    }), authMethods = _57[0], setAuthMethods = _57[1];
+    var _58 = (0, react_1.useState)(""), selectedAuthMethod = _58[0], setSelectedAuthMethod = _58[1];
     // INFO: Used by Activity Log
-    var _56 = (0, react_1.useState)(false), activityModal = _56[0], setActivityModal = _56[1];
-    var _57 = (0, react_1.useState)(""), activityId = _57[0], setActivityId = _57[1];
+    var _59 = (0, react_1.useState)(false), activityModal = _59[0], setActivityModal = _59[1];
+    var _60 = (0, react_1.useState)(""), activityId = _60[0], setActivityId = _60[1];
     //INFO : Used by Export
-    var _58 = (0, react_1.useState)(null), csvFile = _58[0], setCSVFile = _58[1];
-    var _59 = (0, react_1.useState)([]), csvFileData = _59[0], setCSVFileData = _59[1];
-    var _60 = (0, react_1.useState)(0), stepCSVIndex = _60[0], setStepCSVIndex = _60[1];
-    var _61 = (0, react_1.useState)({}), listCSVMapAttribute = _61[0], setListCSVMapAttribute = _61[1];
-    var _62 = (0, react_1.useState)({}), listCSVObjAttribute = _62[0], setListCSVObjAttribute = _62[1];
-    var _63 = (0, react_1.useState)([]), csvAPIAttribute = _63[0], setCSVAPIAttribute = _63[1];
-    var _64 = (0, react_1.useState)(((_d = props.devSettings.currentUser) === null || _d === void 0 ? void 0 : _d.userEmail) || ""), exportCSVEmail = _64[0], setExportCSVEmail = _64[1];
-    var _65 = (0, react_1.useState)(((_f = (_e = props.organise) === null || _e === void 0 ? void 0 : _e.exportSettings) === null || _f === void 0 ? void 0 : _f.defaultExportPDFName) || ""), exportPDFTitle = _65[0], setExportPDFTitle = _65[1];
-    var _66 = (0, react_1.useState)([]), exportSumAttributeIds = _66[0], setExportSumAttributeIds = _66[1];
-    var _67 = (0, react_1.useState)([]), importTableData = _67[0], setImportTableData = _67[1];
-    var _68 = (0, react_1.useState)([]), queryList = _68[0], setQueryList = _68[1];
-    var _69 = (0, react_1.useState)(-1), queryIndex = _69[0], setQueryIndex = _69[1];
-    var _70 = (0, react_1.useState)((_g = props.organise) === null || _g === void 0 ? void 0 : _g.groupBy), groupId = _70[0], setGroupId = _70[1];
+    var _61 = (0, react_1.useState)(null), csvFile = _61[0], setCSVFile = _61[1];
+    var _62 = (0, react_1.useState)([]), csvFileData = _62[0], setCSVFileData = _62[1];
+    var _63 = (0, react_1.useState)(0), stepCSVIndex = _63[0], setStepCSVIndex = _63[1];
+    var _64 = (0, react_1.useState)({}), listCSVMapAttribute = _64[0], setListCSVMapAttribute = _64[1];
+    var _65 = (0, react_1.useState)({}), listCSVObjAttribute = _65[0], setListCSVObjAttribute = _65[1];
+    var _66 = (0, react_1.useState)([]), csvAPIAttribute = _66[0], setCSVAPIAttribute = _66[1];
+    var _67 = (0, react_1.useState)(((_e = props.devSettings.currentUser) === null || _e === void 0 ? void 0 : _e.userEmail) || ""), exportCSVEmail = _67[0], setExportCSVEmail = _67[1];
+    var _68 = (0, react_1.useState)(((_g = (_f = props.organise) === null || _f === void 0 ? void 0 : _f.exportSettings) === null || _g === void 0 ? void 0 : _g.defaultExportPDFName) || ""), exportPDFTitle = _68[0], setExportPDFTitle = _68[1];
+    var _69 = (0, react_1.useState)([]), exportSumAttributeIds = _69[0], setExportSumAttributeIds = _69[1];
+    var _70 = (0, react_1.useState)([]), importTableData = _70[0], setImportTableData = _70[1];
+    var _71 = (0, react_1.useState)([]), queryList = _71[0], setQueryList = _71[1];
+    var _72 = (0, react_1.useState)(-1), queryIndex = _72[0], setQueryIndex = _72[1];
+    var _73 = (0, react_1.useState)((_h = props.organise) === null || _h === void 0 ? void 0 : _h.groupBy), groupId = _73[0], setGroupId = _73[1];
     //INFO : Used by Read
     //INFO : Used by Update
-    var _71 = (0, react_1.useState)(false), modalVisible = _71[0], setModalVisible = _71[1];
-    var _72 = (0, react_1.useState)(false), deleteModal = _72[0], setDeleteModal = _72[1];
-    var _73 = (0, react_1.useState)(false), excelModal = _73[0], setExcelModal = _73[1];
-    var _74 = (0, react_1.useState)(false), exportExcel = _74[0], setExportExcel = _74[1];
-    var _75 = (0, react_1.useState)(""), exportType = _75[0], setExportType = _75[1];
-    var _76 = (0, react_1.useState)(false), exportQR = _76[0], setExportQR = _76[1];
-    var _77 = (0, react_1.useState)(false), signatureSigning = _77[0], setSignatureSigning = _77[1];
-    var _78 = (0, react_1.useState)({}), selectedData = _78[0], setSelectedData = _78[1];
-    var _79 = (0, react_1.useState)(""), selectedObjectStructureId = _79[0], setSelectedObjectStructureId = _79[1];
-    var _80 = (0, react_1.useState)(""), selectedObjectId = _80[0], setSelectedObjectId = _80[1];
-    var _81 = (0, react_1.useState)(""), selectedListAddressId = _81[0], setSelectedListAddressId = _81[1];
-    var _82 = (0, react_1.useState)({
+    var _74 = (0, react_1.useState)(false), modalVisible = _74[0], setModalVisible = _74[1];
+    var _75 = (0, react_1.useState)(false), deleteModal = _75[0], setDeleteModal = _75[1];
+    var _76 = (0, react_1.useState)(false), excelModal = _76[0], setExcelModal = _76[1];
+    var _77 = (0, react_1.useState)(false), exportExcel = _77[0], setExportExcel = _77[1];
+    var _78 = (0, react_1.useState)(""), exportType = _78[0], setExportType = _78[1];
+    var _79 = (0, react_1.useState)(false), exportQR = _79[0], setExportQR = _79[1];
+    var _80 = (0, react_1.useState)(false), signatureSigning = _80[0], setSignatureSigning = _80[1];
+    var _81 = (0, react_1.useState)({}), selectedData = _81[0], setSelectedData = _81[1];
+    var _82 = (0, react_1.useState)(""), selectedObjectStructureId = _82[0], setSelectedObjectStructureId = _82[1];
+    var _83 = (0, react_1.useState)(""), selectedObjectId = _83[0], setSelectedObjectId = _83[1];
+    var _84 = (0, react_1.useState)(""), selectedListAddressId = _84[0], setSelectedListAddressId = _84[1];
+    var _85 = (0, react_1.useState)({
         lat: 0,
         lng: 0,
         name: "",
-    }), selectedListAddress = _82[0], setSelectedListAddress = _82[1];
-    var _83 = (0, react_1.useState)({}), selectedObjectData = _83[0], setSelectedObjectData = _83[1];
-    var _84 = (0, react_1.useState)(false), referenceLoading = _84[0], setReferenceLoading = _84[1];
-    var _85 = (0, react_1.useState)({}), referencesOptions = _85[0], setReferencesOptions = _85[1];
-    var _86 = (0, react_1.useState)({}), referencesDetails = _86[0], setReferencesDetails = _86[1];
-    var _87 = (0, react_1.useState)({}), referenceDeleteTableData = _87[0], setReferenceDeleteTableData = _87[1];
-    var _88 = (0, react_1.useState)(0), referenceDeleteIndex = _88[0], setReferenceDeleteIndex = _88[1];
-    var _89 = (0, react_1.useState)({
+    }), selectedListAddress = _85[0], setSelectedListAddress = _85[1];
+    var _86 = (0, react_1.useState)({}), selectedObjectData = _86[0], setSelectedObjectData = _86[1];
+    var _87 = (0, react_1.useState)(false), referenceLoading = _87[0], setReferenceLoading = _87[1];
+    var _88 = (0, react_1.useState)({}), referencesOptions = _88[0], setReferencesOptions = _88[1];
+    var _89 = (0, react_1.useState)({}), referencesDetails = _89[0], setReferencesDetails = _89[1];
+    var _90 = (0, react_1.useState)({}), referenceDeleteTableData = _90[0], setReferenceDeleteTableData = _90[1];
+    var _91 = (0, react_1.useState)(0), referenceDeleteIndex = _91[0], setReferenceDeleteIndex = _91[1];
+    var _92 = (0, react_1.useState)({
         id: "",
         name: "",
         type: "string",
-    }), referenceCreationModal = _89[0], setReferenceCreationModal = _89[1];
-    var _90 = (0, react_1.useState)({}), referenceModelSchema = _90[0], setReferenceSchema = _90[1];
+    }), referenceCreationModal = _92[0], setReferenceCreationModal = _92[1];
+    var _93 = (0, react_1.useState)({}), referenceModelSchema = _93[0], setReferenceSchema = _93[1];
     // INFO ; Use to Trigger Update Prefill UI
-    var _91 = (0, react_1.useState)(false), prefillTrigger = _91[0], setPrefillTrigger = _91[1];
+    var _94 = (0, react_1.useState)(false), prefillTrigger = _94[0], setPrefillTrigger = _94[1];
     //INFO : Offline
-    var _92 = (0, react_1.useState)(0), offlineDataLength = _92[0], setOfflineDataLength = _92[1];
-    var _93 = (0, react_1.useState)(false), offlineModal = _93[0], setOfflineModal = _93[1];
+    var _95 = (0, react_1.useState)(0), offlineDataLength = _95[0], setOfflineDataLength = _95[1];
+    var _96 = (0, react_1.useState)(false), offlineModal = _96[0], setOfflineModal = _96[1];
     var devSettings = props.devSettings;
     var serverId = (0, utils_1.parseServerId)(devSettings.server);
-    var viewType = (_j = (_h = props.organise) === null || _h === void 0 ? void 0 : _h.viewId) !== null && _j !== void 0 ? _j : "general";
+    var viewType = (_k = (_j = props.organise) === null || _j === void 0 ? void 0 : _j.viewId) !== null && _k !== void 0 ? _k : "general";
     var isFirebaseClient = devSettings.server === "firebase";
     var isFirebase = isFirebaseClient || devSettings.server === "fbServer";
-    var dbModule = isFirebaseClient ? (_k = props.lib) === null || _k === void 0 ? void 0 : _k.firebase : (_l = props.lib) === null || _l === void 0 ? void 0 : _l.axios;
+    var dbModule = isFirebaseClient ? (_l = props.lib) === null || _l === void 0 ? void 0 : _l.firebase : (_m = props.lib) === null || _m === void 0 ? void 0 : _m.axios;
     var schemaPresent = props.devSettings.schemaEndpoint ? true : false;
     var limit = props.limit ? props.limit : 10;
-    var isEditor = ((_m = props.edit) === null || _m === void 0 ? void 0 : _m.allEditable) ? true : false;
-    var isOffline = (_o = props.bareSettings) === null || _o === void 0 ? void 0 : _o.bareOffline;
-    var showId = (_p = props.space) === null || _p === void 0 ? void 0 : _p.showId;
-    var idField = (_q = props.space) === null || _q === void 0 ? void 0 : _q.idField;
-    var pipeline = (_r = props === null || props === void 0 ? void 0 : props.space) === null || _r === void 0 ? void 0 : _r.pipeline;
-    var hasNavigation = ((_s = props.organise) === null || _s === void 0 ? void 0 : _s.handleNavigate) ? true : false;
-    var formColumn = ((_t = props.bareSettings) === null || _t === void 0 ? void 0 : _t.bareUpdateOneColumn)
+    var isEditor = ((_o = props.edit) === null || _o === void 0 ? void 0 : _o.allEditable) ? true : false;
+    var isOffline = (_p = props.bareSettings) === null || _p === void 0 ? void 0 : _p.bareOffline;
+    var showId = (_q = props.space) === null || _q === void 0 ? void 0 : _q.showId;
+    var idField = (_r = props.space) === null || _r === void 0 ? void 0 : _r.idField;
+    var pipeline = (_s = props === null || props === void 0 ? void 0 : props.space) === null || _s === void 0 ? void 0 : _s.pipeline;
+    var hasNavigation = ((_t = props.organise) === null || _t === void 0 ? void 0 : _t.handleNavigate) ? true : false;
+    var formColumn = ((_u = props.bareSettings) === null || _u === void 0 ? void 0 : _u.bareUpdateOneColumn)
         ? "grid-cols-2"
         : "grid-cols-4";
-    var isActivityLog = (((_v = (_u = props.edit) === null || _u === void 0 ? void 0 : _u.activityLog) === null || _v === void 0 ? void 0 : _v.enableComments) &&
-        ((_w = props.edit) === null || _w === void 0 ? void 0 : _w.activityLog.commentCollectionId)) ||
-        (((_y = (_x = props.edit) === null || _x === void 0 ? void 0 : _x.activityLog) === null || _y === void 0 ? void 0 : _y.enableLogs) &&
-            ((_z = props.edit) === null || _z === void 0 ? void 0 : _z.activityLog.logsCollectionId));
+    var isActivityLog = (((_w = (_v = props.edit) === null || _v === void 0 ? void 0 : _v.activityLog) === null || _w === void 0 ? void 0 : _w.enableComments) &&
+        ((_x = props.edit) === null || _x === void 0 ? void 0 : _x.activityLog.commentCollectionId)) ||
+        (((_z = (_y = props.edit) === null || _y === void 0 ? void 0 : _y.activityLog) === null || _z === void 0 ? void 0 : _z.enableLogs) &&
+            ((_0 = props.edit) === null || _0 === void 0 ? void 0 : _0.activityLog.logsCollectionId));
     //TODO : Code - Pass ...devSettings, search dbEndpoint:
     var writeServerQuery = new writeQuery_1.WriteQuery({
-        dbModule: (_0 = props.lib) === null || _0 === void 0 ? void 0 : _0.axios,
+        dbModule: (_1 = props.lib) === null || _1 === void 0 ? void 0 : _1.axios,
         dbType: devSettings.server,
         dbCollection: props.collectionId,
         dbEndpoint: devSettings.dbEndpoint,
@@ -289,7 +291,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         dbUserToken: devSettings.dbUserToken,
     });
     var readServerQuery = new readQuery_1.ReadQuery({
-        dbModule: (_1 = props.lib) === null || _1 === void 0 ? void 0 : _1.axios,
+        dbModule: (_2 = props.lib) === null || _2 === void 0 ? void 0 : _2.axios,
         dbType: devSettings.server,
         dbCollection: props.collectionId,
         dbEndpoint: devSettings.dbEndpoint,
@@ -297,7 +299,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         dbUserToken: devSettings.dbUserToken,
     });
     var moreButtonPopUp = [
-        ((_2 = props.edit) === null || _2 === void 0 ? void 0 : _2.allEditable) && !isFirebase
+        ((_3 = props.edit) === null || _3 === void 0 ? void 0 : _3.allEditable) && !isFirebase
             ? {
                 text: "Import Excel",
                 onClick: function () {
@@ -306,7 +308,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_4 = (_3 = props.organise) === null || _3 === void 0 ? void 0 : _3.exportSettings) === null || _4 === void 0 ? void 0 : _4.hideExportCSV)
+        !((_5 = (_4 = props.organise) === null || _4 === void 0 ? void 0 : _4.exportSettings) === null || _5 === void 0 ? void 0 : _5.hideExportCSV)
             ? {
                 text: "Export CSV",
                 onClick: function () {
@@ -316,7 +318,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_6 = (_5 = props.organise) === null || _5 === void 0 ? void 0 : _5.exportSettings) === null || _6 === void 0 ? void 0 : _6.hideExportExcel)
+        !((_7 = (_6 = props.organise) === null || _6 === void 0 ? void 0 : _6.exportSettings) === null || _7 === void 0 ? void 0 : _7.hideExportExcel)
             ? {
                 text: "Export Excel",
                 onClick: function () {
@@ -326,7 +328,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_8 = (_7 = props.organise) === null || _7 === void 0 ? void 0 : _7.exportSettings) === null || _8 === void 0 ? void 0 : _8.hideExportPDF)
+        !((_9 = (_8 = props.organise) === null || _8 === void 0 ? void 0 : _8.exportSettings) === null || _9 === void 0 ? void 0 : _9.hideExportPDF)
             ? {
                 text: "Export PDF",
                 onClick: function () {
@@ -336,7 +338,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_10 = (_9 = props.organise) === null || _9 === void 0 ? void 0 : _9.exportSettings) === null || _10 === void 0 ? void 0 : _10.hideExportQR)
+        !((_11 = (_10 = props.organise) === null || _10 === void 0 ? void 0 : _10.exportSettings) === null || _11 === void 0 ? void 0 : _11.hideExportQR)
             ? {
                 text: "Export QR",
                 onClick: function () {
@@ -346,7 +348,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_12 = (_11 = props.organise) === null || _11 === void 0 ? void 0 : _11.exportSettings) === null || _12 === void 0 ? void 0 : _12.hideExportPrint)
+        !((_13 = (_12 = props.organise) === null || _12 === void 0 ? void 0 : _12.exportSettings) === null || _13 === void 0 ? void 0 : _13.hideExportPrint)
             ? {
                 text: "Print",
                 onClick: function () {
@@ -358,11 +360,11 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             }
             : null,
     ].filter(Boolean);
-    if ((_13 = props.organise) === null || _13 === void 0 ? void 0 : _13.moreSettings)
+    if ((_14 = props.organise) === null || _14 === void 0 ? void 0 : _14.moreSettings)
         moreButtonPopUp = moreButtonPopUp.concat(props.organise.moreSettings);
     var renderImpSearchFilterConditions = function () {
         var _a;
-        return (0, listModule_1.renderSearchFilterConditions)(props.model, devSettings, {
+        return (0, listModule_1.renderSearchFilterConditions)(structure, devSettings, {
             filterSearchParams: filterSearchParams,
             filterSelection: filterSelection,
             filterReferenceDate: filterReferenceDate,
@@ -414,8 +416,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 setSelectedIds([]);
                 // INFO - To Get Reference/ListReference/ObjReference Default Value
                 if (props.type === "update" && props.id === "new") {
-                    var clonedData = (0, updateModule_1.handleClonedDataAttribute)({}, props.model, props.devSettings.server);
-                    (0, updateModule_1.handleRetrieveReferenceOptions)(clonedData, props.model, dbModule, devSettings, setReferencesOptions, setReferencesDetails);
+                    var clonedData = (0, updateModule_1.handleClonedDataAttribute)({}, structure, props.devSettings.server);
+                    (0, updateModule_1.handleRetrieveReferenceOptions)(clonedData, structure, dbModule, devSettings, setReferencesOptions, setReferencesDetails);
                 }
                 if (props.id !== "new" && props.id !== "") {
                     setModalVisible(true);
@@ -446,26 +448,29 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     (0, react_1.useEffect)(function () {
         var handleInitTab = function () { return __awaiter(void 0, void 0, void 0, function () {
             var currentTab, kanbanSettings, kanbanTitle_1, kanbanRefRQ_1, kanbanRefOption_1, kanbanRefLabel_1, kanbanRefQuery;
-            var _a, _b, _c, _d, _e;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            return __generator(this, function (_o) {
+                switch (_o.label) {
                     case 0:
-                        if (!(props.type === "list")) return [3 /*break*/, 4];
+                        if (!(props.type === "list")) return [3 /*break*/, 5];
                         currentTab = (0, listModule_1.renderSelectedRefreshTab)(props.localURLEndpoint, props.type, props.collectionId, props.id, (_a = props.organise) === null || _a === void 0 ? void 0 : _a.extendedTabs, (_b = props.organise) === null || _b === void 0 ? void 0 : _b.viewId);
+                        setStructure((_c = props.model) !== null && _c !== void 0 ? _c : []);
+                        setAdditionalQuery((_e = (_d = props.organise) === null || _d === void 0 ? void 0 : _d.additionalQuery) !== null && _e !== void 0 ? _e : []);
+                        setGroupId((_g = (_f = props.organise) === null || _f === void 0 ? void 0 : _f.groupBy) !== null && _g !== void 0 ? _g : "");
                         setSelectedTab(currentTab);
                         if (!((currentTab === null || currentTab === void 0 ? void 0 : currentTab.viewType) === "calendar")) return [3 /*break*/, 1];
                         setFilterSearch({});
                         setFilterSearchParams({});
-                        (_c = listRQueryHocRef.current) === null || _c === void 0 ? void 0 : _c.handleRefresh();
-                        return [3 /*break*/, 4];
+                        (_h = listRQueryHocRef.current) === null || _h === void 0 ? void 0 : _h.handleRefresh();
+                        return [3 /*break*/, 5];
                     case 1:
                         if (!((currentTab === null || currentTab === void 0 ? void 0 : currentTab.viewType) === "kanban")) return [3 /*break*/, 4];
                         kanbanSettings = currentTab === null || currentTab === void 0 ? void 0 : currentTab.kanbanSettings;
-                        kanbanTitle_1 = (_d = kanbanSettings === null || kanbanSettings === void 0 ? void 0 : kanbanSettings.title) !== null && _d !== void 0 ? _d : "";
+                        kanbanTitle_1 = (_j = kanbanSettings === null || kanbanSettings === void 0 ? void 0 : kanbanSettings.title) !== null && _j !== void 0 ? _j : "";
                         kanbanRefRQ_1 = null;
                         kanbanRefOption_1 = [];
                         kanbanRefLabel_1 = "";
-                        props.model.map(function (eachModel) {
+                        structure.map(function (eachModel) {
                             var _a, _b;
                             if (kanbanTitle_1 === eachModel.id) {
                                 if (eachModel.type === "reference") {
@@ -486,10 +491,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         return [4 /*yield*/, kanbanRefRQ_1.call({
                                 type: "list",
                                 limit: limit,
-                                query: ((_e = currentTab === null || currentTab === void 0 ? void 0 : currentTab.kanbanSettings) === null || _e === void 0 ? void 0 : _e.query) || undefined,
+                                query: ((_k = currentTab === null || currentTab === void 0 ? void 0 : currentTab.kanbanSettings) === null || _k === void 0 ? void 0 : _k.query) || undefined,
                             })];
                     case 2:
-                        kanbanRefQuery = _f.sent();
+                        kanbanRefQuery = _o.sent();
                         if (kanbanRefQuery.data) {
                             kanbanRefQuery.data.map(function (eachData) {
                                 kanbanRefOption_1.push({
@@ -499,11 +504,21 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                 return null;
                             });
                         }
-                        _f.label = 3;
+                        _o.label = 3;
                     case 3:
                         setKanbanOptions(kanbanRefOption_1);
-                        _f.label = 4;
-                    case 4: return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 4:
+                        if ((currentTab === null || currentTab === void 0 ? void 0 : currentTab.viewType) === "report") {
+                            if (currentTab.structure)
+                                setStructure((_l = currentTab.structure) !== null && _l !== void 0 ? _l : []);
+                            if (currentTab.additionalQuery)
+                                setAdditionalQuery((_m = currentTab.additionalQuery) !== null && _m !== void 0 ? _m : []);
+                            if (currentTab.groupBy)
+                                setGroupId(currentTab.groupBy);
+                        }
+                        _o.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         }); };
@@ -512,8 +527,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         props.collectionId,
         props.id,
         props.localURLEndpoint,
-        (_14 = props.organise) === null || _14 === void 0 ? void 0 : _14.extendedTabs,
-        (_15 = props.organise) === null || _15 === void 0 ? void 0 : _15.viewId,
+        (_15 = props.organise) === null || _15 === void 0 ? void 0 : _15.extendedTabs,
+        (_16 = props.organise) === null || _16 === void 0 ? void 0 : _16.viewId,
         props.type,
     ]);
     (0, react_1.useEffect)(function () {
@@ -521,7 +536,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         if ((_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.exportSettings) === null || _b === void 0 ? void 0 : _b.sumColumnId) {
             setExportSumAttributeIds((_e = (_d = (_c = props.organise) === null || _c === void 0 ? void 0 : _c.exportSettings) === null || _d === void 0 ? void 0 : _d.sumColumnId) !== null && _e !== void 0 ? _e : []);
         }
-    }, (_17 = (_16 = props.organise) === null || _16 === void 0 ? void 0 : _16.exportSettings) === null || _17 === void 0 ? void 0 : _17.sumColumnId);
+    }, (_18 = (_17 = props.organise) === null || _17 === void 0 ? void 0 : _17.exportSettings) === null || _18 === void 0 ? void 0 : _18.sumColumnId);
     (0, react_1.useEffect)(function () {
         if (props.devSettings.schemaReference)
             setReferenceSchema(props.devSettings.schemaReference);
@@ -781,7 +796,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     });
                     prettierDataList = dummyPrettierDataList_1;
                     return [3 /*break*/, 4];
-                case 2: return [4 /*yield*/, (0, listModule_1.handleListDataBasedOnModel)(responseData === null || responseData === void 0 ? void 0 : responseData.data, props.devSettings, (_c = props.lib) === null || _c === void 0 ? void 0 : _c.axios, props.model, (_d = props.organise) === null || _d === void 0 ? void 0 : _d.handleNavigate, ((_e = props.organise) === null || _e === void 0 ? void 0 : _e.viewId) === "general", setActivityModal, setActivityId, isActivityLog ? (_f = props.edit) === null || _f === void 0 ? void 0 : _f.activityLog : undefined, (_g = props.bareSettings) === null || _g === void 0 ? void 0 : _g.bareListActionBtns)];
+                case 2: return [4 /*yield*/, (0, listModule_1.handleListDataBasedOnModel)(responseData === null || responseData === void 0 ? void 0 : responseData.data, props.devSettings, (_c = props.lib) === null || _c === void 0 ? void 0 : _c.axios, structure, (_d = props.organise) === null || _d === void 0 ? void 0 : _d.handleNavigate, ((_e = props.organise) === null || _e === void 0 ? void 0 : _e.viewId) === "general", setActivityModal, setActivityId, isActivityLog ? (_f = props.edit) === null || _f === void 0 ? void 0 : _f.activityLog : undefined, (_g = props.bareSettings) === null || _g === void 0 ? void 0 : _g.bareListActionBtns)];
                 case 3:
                     prettierDataList = _m.sent();
                     _m.label = 4;
@@ -1051,7 +1066,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     //SECTION: Handle Object
     //=====================================================================================
     var handleRemoveObjectListData = function () {
-        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, props.model, props.devSettings.server);
+        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, structure, props.devSettings.server);
         if (selectedObjectId) {
             var index = clonedSelectedData[selectedObjectStructureId].findIndex(function (eachData) { return eachData.id === selectedObjectId; });
             if (index !== -1) {
@@ -1064,8 +1079,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     var handleSubmitObjectDataType = function () {
         var _a, _b;
-        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, props.model, props.devSettings.server, false, showId);
-        var filterObjectModel = props.model.find(function (eachModel) {
+        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, structure, props.devSettings.server, false, showId);
+        var filterObjectModel = structure.find(function (eachModel) {
             return eachModel.id === selectedObjectStructureId;
         });
         var clonedSelectedObjectData = (0, updateModule_1.handleClonedDataAttribute)(selectedObjectData, (_a = filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.objectData) !== null && _a !== void 0 ? _a : [], props.devSettings.server, true, true);
@@ -1108,7 +1123,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     //TODO: Bug - try to solve clicking List Object too fast
     var handleSelectListObjectData = function (id, structureId, objectIndex) {
         var _a;
-        var filterObjectModel = props.model.find(function (eachModel) {
+        var filterObjectModel = structure.find(function (eachModel) {
             return eachModel.id === structureId;
         });
         if ((filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.type) === "listObject") {
@@ -1136,26 +1151,30 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     //SECTION: Handle Assets
     //=====================================================================================
     var handleUploadAxios = function (eachImageEndpoint, assetParentId, assetCollectionName, assetFileName, file, bucketName) { return __awaiter(void 0, void 0, void 0, function () {
-        var uploadTask, uploadTaskUrl, urlParams, imageToken, err_2, dataForm, responseData, err_3;
-        var _a, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var storageRef, uploadTaskUrl, urlParams, imageToken, err_2, dataForm, responseData, err_3;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        return __generator(this, function (_k) {
+            switch (_k.label) {
                 case 0:
-                    if (!((_a = props.lib) === null || _a === void 0 ? void 0 : _a.firebase)) return [3 /*break*/, 6];
-                    _d.label = 1;
+                    if (!(((_a = props.lib) === null || _a === void 0 ? void 0 : _a.storage) &&
+                        ((_b = props.lib) === null || _b === void 0 ? void 0 : _b.ref) &&
+                        ((_c = props.lib) === null || _c === void 0 ? void 0 : _c.uploadBytes) &&
+                        ((_d = props.lib) === null || _d === void 0 ? void 0 : _d.getDownloadURL))) return [3 /*break*/, 6];
+                    _k.label = 1;
                 case 1:
-                    _d.trys.push([1, 4, , 5]);
-                    return [4 /*yield*/, ((_b = props.lib) === null || _b === void 0 ? void 0 : _b.firebase.storage().ref(assetCollectionName).child(assetParentId + "/".concat(assetFileName)).put(file))];
+                    _k.trys.push([1, 4, , 5]);
+                    storageRef = (_e = props.lib) === null || _e === void 0 ? void 0 : _e.ref((_f = props.lib) === null || _f === void 0 ? void 0 : _f.storage, "".concat(assetCollectionName, "/").concat(assetParentId, "/").concat(assetFileName));
+                    return [4 /*yield*/, ((_g = props.lib) === null || _g === void 0 ? void 0 : _g.uploadBytes(storageRef, file))];
                 case 2:
-                    uploadTask = _d.sent();
-                    return [4 /*yield*/, uploadTask.ref.getDownloadURL()];
+                    _k.sent();
+                    return [4 /*yield*/, ((_h = props.lib) === null || _h === void 0 ? void 0 : _h.getDownloadURL(storageRef))];
                 case 3:
-                    uploadTaskUrl = _d.sent();
-                    urlParams = new URLSearchParams(uploadTaskUrl);
+                    uploadTaskUrl = _k.sent();
+                    urlParams = new URLSearchParams(uploadTaskUrl.split("?")[1]);
                     imageToken = urlParams.get("token");
                     return [2 /*return*/, { data: { data: imageToken } }];
                 case 4:
-                    err_2 = _d.sent();
+                    err_2 = _k.sent();
                     console.log("Firebase Upload Error - ", JSON.stringify(err_2));
                     return [3 /*break*/, 5];
                 case 5: return [3 /*break*/, 10];
@@ -1167,20 +1186,20 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     dataForm.append("data[assetFileName]", assetFileName);
                     if (bucketName)
                         dataForm.append("data[bucketName]", bucketName);
-                    _d.label = 7;
+                    _k.label = 7;
                 case 7:
-                    _d.trys.push([7, 9, , 10]);
-                    return [4 /*yield*/, ((_c = props.lib) === null || _c === void 0 ? void 0 : _c.axios({
+                    _k.trys.push([7, 9, , 10]);
+                    return [4 /*yield*/, ((_j = props.lib) === null || _j === void 0 ? void 0 : _j.axios({
                             method: "post",
                             url: "".concat(eachImageEndpoint, "/upload"),
                             data: dataForm,
                             headers: { "Content-Type": "multipart/form-data" },
                         }))];
                 case 8:
-                    responseData = _d.sent();
+                    responseData = _k.sent();
                     return [2 /*return*/, responseData];
                 case 9:
-                    err_3 = _d.sent();
+                    err_3 = _k.sent();
                     return [3 /*break*/, 10];
                 case 10: return [2 /*return*/];
             }
@@ -1191,12 +1210,12 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(data !== null && data !== void 0 ? data : selectedData, props.model, props.devSettings.server, true, showId);
-                    return [4 /*yield*/, handleParseImageField(id, clonedSelectedData, props.model)];
+                    clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(data !== null && data !== void 0 ? data : selectedData, structure, props.devSettings.server, true, showId);
+                    return [4 /*yield*/, handleParseImageField(id, clonedSelectedData, structure)];
                 case 1:
                     //INFO: Parse & Upload Data "Image & File attributes"
                     clonedSelectedData = _a.sent();
-                    objectAttribute = props.model.filter(function (eachAttribute) {
+                    objectAttribute = structure.filter(function (eachAttribute) {
                         return eachAttribute.type === "object";
                     });
                     return [4 /*yield*/, Promise.all(objectAttribute.map(function (eachObject) { return __awaiter(void 0, void 0, void 0, function () {
@@ -1212,7 +1231,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         }); }))];
                 case 2:
                     _a.sent();
-                    listObjectAttribute = props.model.filter(function (eachAttribute) {
+                    listObjectAttribute = structure.filter(function (eachAttribute) {
                         return eachAttribute.type === "listObject";
                     });
                     return [4 /*yield*/, Promise.all(listObjectAttribute.map(function (eachObject) { return __awaiter(void 0, void 0, void 0, function () {
@@ -2020,7 +2039,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     _a.trys.push([0, 7, , 8]);
                     setLoading(true);
                     setModalVisible(true);
-                    model_1 = props.model.find(function (eachModel) { return eachModel.id === batchUpdateData.columnId; });
+                    model_1 = structure.find(function (eachModel) { return eachModel.id === batchUpdateData.columnId; });
                     columnId_1 = batchUpdateData.columnId;
                     dataToSubmit_1 = batchUpdateData.columnData;
                     isFile = (model_1 === null || model_1 === void 0 ? void 0 : model_1.type) === "image" || (model_1 === null || model_1 === void 0 ? void 0 : model_1.type) === "file";
@@ -2241,7 +2260,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     createSelectedData_1 = _j.sent();
                     _j.label = 3;
                 case 3:
-                    uniqueDataStructure = props.model.filter(function (eachStructure) {
+                    uniqueDataStructure = structure.filter(function (eachStructure) {
                         return eachStructure.unique;
                     });
                     uniqueColumnId = uniqueDataStructure.length > 0 ? uniqueDataStructure[0].id : undefined;
@@ -2264,7 +2283,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 case 5:
                     offlineDataResp = _j.sent();
                     offlineData = (_e = offlineDataResp === null || offlineDataResp === void 0 ? void 0 : offlineDataResp.data) !== null && _e !== void 0 ? _e : [];
-                    tempData = (0, updateModule_1.handleParseOfflineWrite)(selectedData, props.model);
+                    tempData = (0, updateModule_1.handleParseOfflineWrite)(selectedData, structure);
                     offlineData.push(tempData);
                     return [4 /*yield*/, indexedDb_1.indexedDb.putValue("local", {
                             data: offlineData,
@@ -2296,7 +2315,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     return [4 /*yield*/, indexedDb_1.indexedDb.getValue("local", props.collectionId)];
                 case 14:
                     offlineDataResp = _j.sent();
-                    tempData = (0, updateModule_1.handleParseOfflineWrite)(selectedData, props.model);
+                    tempData = (0, updateModule_1.handleParseOfflineWrite)(selectedData, structure);
                     tempData[serverId] = selectedId_2;
                     selectedIndex_3 = -1;
                     offlineData = (_f = offlineDataResp === null || offlineDataResp === void 0 ? void 0 : offlineDataResp.data) !== null && _f !== void 0 ? _f : [];
@@ -2505,9 +2524,9 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     }); };
     var handleRetrieveSelectedData = function (responseData) { return __awaiter(void 0, void 0, void 0, function () {
         var clonedReferencesOptions_1, dummyRespData, dummyReferenceModelSchema, newRespData, _a;
-        var _b, _c, _d, _e, _f, _g, _h;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
+        var _b, _c, _d, _e, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
                     if (!responseData.data) return [3 /*break*/, 6];
                     if (!((_b = props.bareSettings) === null || _b === void 0 ? void 0 : _b.bareOffline)) return [3 /*break*/, 2];
@@ -2515,7 +2534,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     if ((_c = props.bareSettings) === null || _c === void 0 ? void 0 : _c.bareReadHandleData)
                         props.bareSettings.bareReadHandleData(responseData.data);
                     clonedReferencesOptions_1 = JSON.parse(JSON.stringify(referencesOptions));
-                    return [4 /*yield*/, Promise.all(props.model.map(function (eachModel) { return __awaiter(void 0, void 0, void 0, function () {
+                    return [4 /*yield*/, Promise.all(structure.map(function (eachModel) { return __awaiter(void 0, void 0, void 0, function () {
                             var isObject, offlineDataResp, offlineData, prefix_1;
                             var _a, _b;
                             return __generator(this, function (_c) {
@@ -2560,30 +2579,30 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             });
                         }); }))];
                 case 1:
-                    _j.sent();
+                    _h.sent();
                     setReferencesOptions(clonedReferencesOptions_1);
                     return [3 /*break*/, 6];
                 case 2:
                     dummyRespData = JSON.parse(JSON.stringify(responseData.data), utils_1.jsonReviver);
                     dummyReferenceModelSchema = JSON.parse(JSON.stringify(referenceModelSchema));
                     if (!(props.type === "read")) return [3 /*break*/, 4];
-                    return [4 /*yield*/, (0, readModule_1.handleRetrieveDeepModel)(dummyRespData, (_d = props.model) !== null && _d !== void 0 ? _d : [], dbModule, devSettings, {
-                            assetParentId: (_e = props.id) !== null && _e !== void 0 ? _e : "",
-                            bucketName: (_f = devSettings.bucketName) !== null && _f !== void 0 ? _f : "",
-                        }, dummyReferenceModelSchema, setReferenceSchema, (_g = props.organise) === null || _g === void 0 ? void 0 : _g.handleCustomDownloadFile)];
+                    return [4 /*yield*/, (0, readModule_1.handleRetrieveDeepModel)(dummyRespData, structure !== null && structure !== void 0 ? structure : [], dbModule, devSettings, {
+                            assetParentId: (_d = props.id) !== null && _d !== void 0 ? _d : "",
+                            bucketName: (_e = devSettings.bucketName) !== null && _e !== void 0 ? _e : "",
+                        }, dummyReferenceModelSchema, setReferenceSchema, (_f = props.organise) === null || _f === void 0 ? void 0 : _f.handleCustomDownloadFile)];
                 case 3:
-                    _a = _j.sent();
+                    _a = _h.sent();
                     return [3 /*break*/, 5];
                 case 4:
                     _a = dummyRespData;
-                    _j.label = 5;
+                    _h.label = 5;
                 case 5:
                     newRespData = _a;
                     setSelectedData(newRespData);
-                    if ((_h = props.bareSettings) === null || _h === void 0 ? void 0 : _h.bareReadHandleData)
+                    if ((_g = props.bareSettings) === null || _g === void 0 ? void 0 : _g.bareReadHandleData)
                         props.bareSettings.bareReadHandleData(newRespData);
-                    (0, updateModule_1.handleRetrieveReferenceOptions)(newRespData, props.model, dbModule, devSettings, setReferencesOptions, setReferencesDetails);
-                    _j.label = 6;
+                    (0, updateModule_1.handleRetrieveReferenceOptions)(newRespData, structure, dbModule, devSettings, setReferencesOptions, setReferencesDetails);
+                    _h.label = 6;
                 case 6:
                     setModalVisible(false);
                     setLoading(false);
@@ -2594,7 +2613,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     var handleOnChangeData = function () {
         var _a;
         if (modalVisible && selectedObjectStructureId) {
-            var filterObjectModel = props.model.find(function (eachModel) {
+            var filterObjectModel = structure.find(function (eachModel) {
                 return eachModel.id === selectedObjectStructureId;
             });
             return {
@@ -2605,13 +2624,13 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         else if (batchUpdateModal && batchUpdateData.columnId) {
             return {
                 data: batchUpdateData.columnData,
-                model: props.model,
+                model: structure,
             };
         }
         else {
             return {
                 data: selectedData,
-                model: props.model,
+                model: structure,
             };
         }
     };
@@ -2621,7 +2640,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             setSelectedObjectData(data);
         }
         else if (batchUpdateModal && batchUpdateData.columnId) {
-            var selectedModel = props.model.find(function (eachModel) { return eachModel.id === batchUpdateData.columnId; });
+            var selectedModel = structure.find(function (eachModel) { return eachModel.id === batchUpdateData.columnId; });
             if (selectedModel) {
                 //INFO: [UPDATE] Update data via batch modal
                 var clonedData = JSON.parse(JSON.stringify(data));
@@ -2717,7 +2736,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         var clonedData = (0, updateModule_1.handleClonedDataAttribute)(data, model, props.devSettings.server, false, showId ? true : false);
         if ((Array.isArray(value) && value.includes("creation")) ||
             value === "creation") {
-            var currentSchema = props.model.filter(function (dsValue) {
+            var currentSchema = structure.filter(function (dsValue) {
                 return dsValue.id === id;
             });
             if (currentSchema.length > 0)
@@ -2760,7 +2779,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             var eachKey = eachRow[0];
                             if (!eachKey)
                                 return null;
-                            props.model.map(function (eachModel) {
+                            structure.map(function (eachModel) {
                                 if (eachKey.toLowerCase().includes(eachModel.id.toLowerCase()) &&
                                     eachModel.id !== "_id" &&
                                     eachModel.id !== "id" &&
@@ -2810,7 +2829,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     csvList_1 = [];
                     _loop_2 = function (eachKey, eachValue) {
                         if (eachKey && eachValue && typeof eachValue === "string") {
-                            var selectedModel = props.model.find(function (eachModel) {
+                            var selectedModel = structure.find(function (eachModel) {
                                 return eachModel.id === eachValue;
                             });
                             if ((selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "object" ||
@@ -2871,7 +2890,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     }
                     valid_1 = true;
                     errorValue_1 = "";
-                    return [4 /*yield*/, Promise.all(props.model.map(function (eachEachModel) {
+                    return [4 /*yield*/, Promise.all(structure.map(function (eachEachModel) {
                             if (eachEachModel.id === "_id" || eachEachModel.id === "id") {
                                 return "";
                             }
@@ -2955,11 +2974,11 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     }); };
     var handleExportCSVData = function (downloadLinkOnly, printOnly) { return __awaiter(void 0, void 0, void 0, function () {
         var exportQueryList, baseUrl, apiEndpoint, reqData, res, dataList, csvDownloadLink, notificaitonMsg, err_20;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
-        return __generator(this, function (_z) {
-            switch (_z.label) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+        return __generator(this, function (_1) {
+            switch (_1.label) {
                 case 0:
-                    _z.trys.push([0, 5, , 6]);
+                    _1.trys.push([0, 5, , 6]);
                     setLoading(true);
                     exportQueryList = JSON.parse(JSON.stringify(queryList));
                     if ((_a = props.bareSettings) === null || _a === void 0 ? void 0 : _a.bareCSVExportSettings) {
@@ -2992,21 +3011,22 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         excludeReferenceId: (_e = (_d = props.organise) === null || _d === void 0 ? void 0 : _d.exportSettings) === null || _e === void 0 ? void 0 : _e.excludeReferenceId,
                         excludeSecondaryLabel: (_g = (_f = props.organise) === null || _f === void 0 ? void 0 : _f.exportSettings) === null || _g === void 0 ? void 0 : _g.excludeSecondaryLabel,
                         csvHeaderUseName: (_j = (_h = props.organise) === null || _h === void 0 ? void 0 : _h.exportSettings) === null || _j === void 0 ? void 0 : _j.csvHeaderUseName,
-                        excludeDataId: (_l = (_k = props.organise) === null || _k === void 0 ? void 0 : _k.exportSettings) === null || _l === void 0 ? void 0 : _l.excludeDataId,
-                        columnIds: (_o = (_m = props.organise) === null || _m === void 0 ? void 0 : _m.exportSettings) === null || _o === void 0 ? void 0 : _o.columnIds,
-                        sort: (_q = (_p = props.organise) === null || _p === void 0 ? void 0 : _p.exportSettings) === null || _q === void 0 ? void 0 : _q.sort,
+                        dateFormatString: (_l = (_k = props.organise) === null || _k === void 0 ? void 0 : _k.exportSettings) === null || _l === void 0 ? void 0 : _l.dateFormatString,
+                        excludeDataId: (_o = (_m = props.organise) === null || _m === void 0 ? void 0 : _m.exportSettings) === null || _o === void 0 ? void 0 : _o.excludeDataId,
+                        columnIds: (_q = (_p = props.organise) === null || _p === void 0 ? void 0 : _p.exportSettings) === null || _q === void 0 ? void 0 : _q.columnIds,
+                        sort: (_s = (_r = props.organise) === null || _r === void 0 ? void 0 : _r.exportSettings) === null || _s === void 0 ? void 0 : _s.sort,
                         groupBy: groupId,
                         sumAttributeId: exportSumAttributeIds,
                     };
-                    return [4 /*yield*/, ((_r = props.lib) === null || _r === void 0 ? void 0 : _r.axios({
+                    return [4 /*yield*/, ((_t = props.lib) === null || _t === void 0 ? void 0 : _t.axios({
                             url: apiEndpoint,
                             method: "post",
                             data: { data: reqData },
                         }))];
                 case 1:
-                    res = _z.sent();
-                    if (!(downloadLinkOnly && ((_s = res === null || res === void 0 ? void 0 : res.data) === null || _s === void 0 ? void 0 : _s.dataList))) return [3 /*break*/, 4];
-                    dataList = (_t = res === null || res === void 0 ? void 0 : res.data) === null || _t === void 0 ? void 0 : _t.dataList;
+                    res = _1.sent();
+                    if (!(downloadLinkOnly && ((_u = res === null || res === void 0 ? void 0 : res.data) === null || _u === void 0 ? void 0 : _u.dataList))) return [3 /*break*/, 4];
+                    dataList = (_v = res === null || res === void 0 ? void 0 : res.data) === null || _v === void 0 ? void 0 : _v.dataList;
                     if (!(dataList && typeof dataList === "object")) return [3 /*break*/, 4];
                     csvDownloadLink = Object.values(dataList)[0];
                     if (!(exportType === "csv" ||
@@ -3018,10 +3038,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     if (!(exportType === "pdf" ||
                         printOnly ||
                         exportType === "print")) return [3 /*break*/, 4];
-                    return [4 /*yield*/, (0, listModule_1.handleExportPDF)(csvDownloadLink, exportPDFTitle, printOnly, (_w = (_v = (_u = props.organise) === null || _u === void 0 ? void 0 : _u.exportSettings) === null || _v === void 0 ? void 0 : _v.generateBy) !== null && _w !== void 0 ? _w : "Admin")];
+                    return [4 /*yield*/, (0, listModule_1.handleExportPDF)(csvDownloadLink, exportPDFTitle, printOnly, (_y = (_x = (_w = props.organise) === null || _w === void 0 ? void 0 : _w.exportSettings) === null || _x === void 0 ? void 0 : _x.generateBy) !== null && _y !== void 0 ? _y : "Admin")];
                 case 3:
-                    _z.sent();
-                    _z.label = 4;
+                    _1.sent();
+                    _1.label = 4;
                 case 4:
                     notificaitonMsg = "A download link will be sent to your email. This may take a while if the data is huge, contact our team if you do not receive any email after 10 minutes (Check your Junk Email too).";
                     if (downloadLinkOnly)
@@ -3035,10 +3055,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     }
                     setLoading(false);
                     handlePopUpModal(false);
-                    setExportCSVEmail((_y = (_x = props.devSettings.currentUser) === null || _x === void 0 ? void 0 : _x.userEmail) !== null && _y !== void 0 ? _y : "");
+                    setExportCSVEmail((_0 = (_z = props.devSettings.currentUser) === null || _z === void 0 ? void 0 : _z.userEmail) !== null && _0 !== void 0 ? _0 : "");
                     return [3 /*break*/, 6];
                 case 5:
-                    err_20 = _z.sent();
+                    err_20 = _1.sent();
                     setNotification({
                         type: true,
                         title: "Export Failed",
@@ -3175,7 +3195,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 return (react_1.default.createElement(uploadInput_1.UploadInput, { lib: { axios: (_a = props.lib) === null || _a === void 0 ? void 0 : _a.axios }, label: "Please insert a csv file", fileDescription: "CSV file thats doesn't exceeds 30MB and row not more than 100 data", accept: ".csv", hidePreview: true, onChange: handleOnChangeCSV }));
             case 1:
                 var filterOptions_1 = [];
-                props.model.map(function (eachData) {
+                structure.map(function (eachData) {
                     var eachDataJSON = JSON.parse(JSON.stringify(eachData));
                     if (eachData.id !== "_id" && eachData.id !== "id") {
                         filterOptions_1.push({
@@ -3190,7 +3210,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     if (!eachKey)
                         return null;
                     var clonedListValue = JSON.parse(JSON.stringify(listCSVMapAttribute));
-                    var selectedObjectModel = props.model.find(function (eachModel) {
+                    var selectedObjectModel = structure.find(function (eachModel) {
                         return ((eachModel.id === clonedListValue[index] &&
                             eachModel.type === "listObject") ||
                             (eachModel.id === clonedListValue[index] &&
@@ -3268,7 +3288,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     var renderTableHeader = function () {
         var _a;
         var tableHeader = [];
-        props.model.map(function (eachAttribute) {
+        structure.map(function (eachAttribute) {
             if (eachAttribute.id === "baseUpdatedAt" ||
                 eachAttribute.id === "baseDraft" ||
                 eachAttribute.type === "listObject" ||
@@ -3295,7 +3315,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             return pageIndex === 0 ? undefined : pageIndex * limit;
         }
         else {
-            var selectedModel = props.model.find(function (eachModel) { var _a, _b; return eachModel.id === ((_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.sort) === null || _b === void 0 ? void 0 : _b.sortId); });
+            var selectedModel = structure.find(function (eachModel) { var _a, _b; return eachModel.id === ((_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.sort) === null || _b === void 0 ? void 0 : _b.sortId); });
             var cursor_1 = lastCursor;
             switch (selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) {
                 case "date":
@@ -3357,7 +3377,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         var _a;
                         event.preventDefault();
                         event.stopPropagation();
-                        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, props.model, props.devSettings.server);
+                        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, structure, props.devSettings.server);
                         (_a = clonedSelectedData[fieldsId]) === null || _a === void 0 ? void 0 : _a.splice(index, 1);
                         setSelectedData(clonedSelectedData);
                     } })) }));
@@ -3367,8 +3387,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     var renderListAddress = function (type) {
         var listElement = [];
-        var isListAddress = props.model.filter(function (eachAttribute) { return eachAttribute.type === "listAddress"; });
-        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, props.model, props.devSettings.server, false, showId ? true : false);
+        var isListAddress = structure.filter(function (eachAttribute) { return eachAttribute.type === "listAddress"; });
+        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, structure, props.devSettings.server, false, showId ? true : false);
         isListAddress.map(function (eachListAdressFields) {
             var header = [
                 {
@@ -3423,10 +3443,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     var renderListObject = function (type) {
         var listElement = [];
-        var isListObject = props.model.filter(function (eachAttribute) { return eachAttribute.type === "listObject"; });
+        var isListObject = structure.filter(function (eachAttribute) { return eachAttribute.type === "listObject"; });
         var list = {};
         var listObjTableData = {};
-        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, props.model, props.devSettings.server, false, showId ? true : false);
+        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, structure, props.devSettings.server, false, showId ? true : false);
         isListObject.map(function (eachListObject) {
             var _a, _b, _c, _d, _e, _f, _g;
             if (props.onComplete &&
@@ -3683,8 +3703,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             return react_1.default.createElement(react_1.default.Fragment, null);
     };
     var renderSearchContent = function (addQuery) {
-        var _a, _b, _c;
-        var filterComponent = (0, listModule_1.renderSearchFilterComponents)(props.model, devSettings, limit, dbModule, {
+        var _a, _b;
+        var filterComponent = (0, listModule_1.renderSearchFilterComponents)(structure, devSettings, limit, dbModule, {
             filterSearch: filterSearch,
             filterSelection: filterSelection,
             filterReferenceDate: filterReferenceDate,
@@ -3700,7 +3720,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             handleClearDataByFilter: handleClearDataByFilter,
             handleRangeFilterOnChange: handleRangeFilterOnChange,
             handleFilterDataSelected: handleFilterDataSelected,
-        }, __assign(__assign({}, props.organise), { additionalQuery: addQuery !== null && addQuery !== void 0 ? addQuery : (_a = props.organise) === null || _a === void 0 ? void 0 : _a.additionalQuery, hideSearch: addQuery ? true : (_b = props.organise) === null || _b === void 0 ? void 0 : _b.hideSearch }), selectedTab, (_c = props.bareSettings) === null || _c === void 0 ? void 0 : _c.bareListFilterAddComponent);
+        }, __assign(__assign({}, props.organise), { additionalQuery: addQuery !== null && addQuery !== void 0 ? addQuery : additionalQuery, hideSearch: addQuery ? true : (_a = props.organise) === null || _a === void 0 ? void 0 : _a.hideSearch }), selectedTab, (_b = props.bareSettings) === null || _b === void 0 ? void 0 : _b.bareListFilterAddComponent);
         return filterComponent;
     };
     var renderAuthContent = function () {
@@ -3833,7 +3853,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 });
                 var filterModel_1 = [];
                 var disabledOnEnter_1 = (_r = (_q = props.organise) === null || _q === void 0 ? void 0 : _q.disabledOnEnter) !== null && _r !== void 0 ? _r : false;
-                props.model.map(function (eachModel) {
+                structure.map(function (eachModel) {
                     var _a;
                     var present = false;
                     if (eachModel.type === "markdown" ||
@@ -3856,7 +3876,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     return null;
                 });
                 return (react_1.default.createElement(react_1.default.Fragment, null,
-                    props.id && props.id !== "new" && props.model.length > 1 && (react_1.default.createElement(readQueryHoc_1.ReadQueryHoc, { ref: readQueryHocRef, database: {
+                    props.id && props.id !== "new" && structure.length > 1 && (react_1.default.createElement(readQueryHoc_1.ReadQueryHoc, { ref: readQueryHocRef, database: {
                             dbModule: dbModule,
                             dbType: devSettings.server,
                             dbCollection: (_t = (_s = props === null || props === void 0 ? void 0 : props.space) === null || _s === void 0 ? void 0 : _s.pipelineDefaultSpaceId) !== null && _t !== void 0 ? _t : props.collectionId,
@@ -3945,8 +3965,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     ((_11 = props.organise) === null || _11 === void 0 ? void 0 : _11.filterComponentNewRow) && (react_1.default.createElement("div", { className: "flex flex-wrap items-center justify-center my-6 gap-3" },
                         ((_12 = props === null || props === void 0 ? void 0 : props.organise) === null || _12 === void 0 ? void 0 : _12.showGroupByFeature) && (react_1.default.createElement(select_1.Select, { label: "Group", options: (_18 = (_15 = (_14 = (_13 = props === null || props === void 0 ? void 0 : props.organise) === null || _13 === void 0 ? void 0 : _13.renderGroupByOptions) === null || _14 === void 0 ? void 0 : _14.call(_13)) !== null && _15 !== void 0 ? _15 : (_17 = (_16 = props === null || props === void 0 ? void 0 : props.organise) === null || _16 === void 0 ? void 0 : _16.renderReferenceLabelOptions) === null || _17 === void 0 ? void 0 : _17.call(_16, props.collectionId, true)) !== null && _18 !== void 0 ? _18 : [], value: groupId !== null && groupId !== void 0 ? groupId : "", onChange: function (value) { return setGroupId(value); } })),
                         filterComponent.map(function (item, index) {
-                            var _a, _b;
-                            var filter = (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.additionalQuery) === null || _b === void 0 ? void 0 : _b[index];
+                            var filter = additionalQuery === null || additionalQuery === void 0 ? void 0 : additionalQuery[index];
                             return (react_1.default.createElement("div", { key: index, className: (filter === null || filter === void 0 ? void 0 : filter.type) === "range"
                                     ? "flex-grow sm:basis-full md:basis-1/2 lg:basis-1/3"
                                     : "flex-grow sm:flex-shrink-0 sm:basis-1/2 md:basis-1/4 lg:basis-1/6" }, item));
@@ -4010,7 +4029,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     var renderGridAndListData = function (imageTag, type, kanbanGroupId) {
         var gridData = [];
         var titleKey = "";
-        var titleModel = props.model.find(function (eachModel) {
+        var titleModel = structure.find(function (eachModel) {
             return !eachModel.hide && eachModel.id !== "_id" && eachModel.id !== "id";
         });
         if (titleModel)
@@ -4028,7 +4047,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             var listDescArray = [];
             Object.entries(eachData).forEach(function (value) {
                 var eachKey = value[0], eachValue = value[1];
-                var selectedModel = props.model.find(function (eachModel) { return eachModel.id === eachKey; });
+                var selectedModel = structure.find(function (eachModel) { return eachModel.id === eachKey; });
                 var modelInStructure;
                 var structurePresent = false;
                 if (selectedTab === null || selectedTab === void 0 ? void 0 : selectedTab.structure) {
@@ -4146,7 +4165,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         if (((_a = props.organise) === null || _a === void 0 ? void 0 : _a.extendedTabs) &&
             ((_b = props.organise.extendedTabs) === null || _b === void 0 ? void 0 : _b.length) > 0) {
             (_c = props.organise) === null || _c === void 0 ? void 0 : _c.extendedTabs.map(function (eachTab) {
-                var _a, _b, _c, _d;
+                var _a, _b, _c, _d, _e;
                 var hrefPoint = "".concat(props.localURLEndpoint, "?type=").concat(props.type, "&collection=").concat(props.collectionId);
                 if (props.id)
                     hrefPoint += "&data=".concat(props.id);
@@ -4168,11 +4187,13 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 else
                     tabData["viewImage"] = eachTab.viewImage;
                 if (eachTab.type === props.type) {
-                    tabs.push(__assign(__assign({}, tabData), { del: (react_1.default.createElement(outline_1.XMarkIcon, { className: "'h-4 w-4 ml-2 text-red-600 hover:text-red-400", onClick: function (e) {
+                    tabs.push(__assign(__assign({}, tabData), (!((_e = props.edit) === null || _e === void 0 ? void 0 : _e.disabledTabsDeleteBtn) && {
+                        del: (react_1.default.createElement(outline_1.XMarkIcon, { className: "h-4 w-4 ml-2 text-red-600 hover:text-red-400", onClick: function (e) {
                                 e.stopPropagation();
                                 e.preventDefault();
                                 handleDeleteTab(tabData.id);
-                            } })) }));
+                            } })),
+                    })));
                 }
                 return null;
             });
@@ -4188,10 +4209,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     var renderAddMathColumn = function (id, onClose) {
         var _a, _b, _c;
-        return (react_1.default.createElement(settingsModal_1.ExpressionModal, { selectedId: id, model: props.model, renderReferenceLabelOptions: (_a = props.organise) === null || _a === void 0 ? void 0 : _a.renderReferenceLabelOptions, renderReferenceSpaceOptions: (_b = props.organise) === null || _b === void 0 ? void 0 : _b.renderReferenceSpaceOptions, onAddModelSchema: (_c = props.organise) === null || _c === void 0 ? void 0 : _c.onAddColumns, onClose: onClose }));
+        return (react_1.default.createElement(settingsModal_1.ExpressionModal, { selectedId: id, model: structure, renderReferenceLabelOptions: (_a = props.organise) === null || _a === void 0 ? void 0 : _a.renderReferenceLabelOptions, renderReferenceSpaceOptions: (_b = props.organise) === null || _b === void 0 ? void 0 : _b.renderReferenceSpaceOptions, onAddModelSchema: (_c = props.organise) === null || _c === void 0 ? void 0 : _c.onAddColumns, onClose: onClose }));
     };
     var renderGroupTable = function (multipleSelect) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         if (groupId) {
             var groupedSpaceTableData = spaceTableData.reduce(function (acc, eachData) {
                 var key = (eachData === null || eachData === void 0 ? void 0 : eachData[groupId]) && (eachData === null || eachData === void 0 ? void 0 : eachData[groupId]) !== " - "
@@ -4206,7 +4227,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             }
             else {
                 return Object.entries(groupedSpaceTableData).map(function (_a) {
-                    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+                    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
                     var eachKey = _a[0], eachValue = _a[1];
                     var dataList = eachValue;
                     var ids = (dataList === null || dataList === void 0 ? void 0 : dataList.map(function (eachData) { return eachData._id; })) || [];
@@ -4253,7 +4274,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                 sortOptions: (_t = (_s = props.organise) === null || _s === void 0 ? void 0 : _s.renderReferenceLabelOptions) === null || _t === void 0 ? void 0 : _t.call(_s),
                                 onSortColumn: (_u = props.organise) === null || _u === void 0 ? void 0 : _u.onChangeSort,
                                 onDragColumn: (_v = props.organise) === null || _v === void 0 ? void 0 : _v.onChangeDrag,
-                                filterOptions: (_x = (_w = props.organise) === null || _w === void 0 ? void 0 : _w.additionalQuery) === null || _x === void 0 ? void 0 : _x.map(function (eachQuery) {
+                                filterOptions: additionalQuery === null || additionalQuery === void 0 ? void 0 : additionalQuery.map(function (eachQuery) {
                                     var _a;
                                     return {
                                         key: eachQuery.value,
@@ -4261,16 +4282,15 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                     };
                                 }),
                                 renderFilterElements: function (id) {
-                                    var _a, _b;
-                                    var selectedQuery = (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.additionalQuery) === null || _b === void 0 ? void 0 : _b.filter(function (eachQuery) {
+                                    var selectedQuery = additionalQuery === null || additionalQuery === void 0 ? void 0 : additionalQuery.filter(function (eachQuery) {
                                         return eachQuery.value === id;
                                     });
-                                    var selectedModelList = props.model.filter(function (eachModel) { return eachModel.id === id; });
+                                    var selectedModelList = structure.filter(function (eachModel) { return eachModel.id === id; });
                                     var newQuery = (0, listModule_1.renderSearchAdditionalQueries)(selectedModelList, selectedQuery);
                                     return renderSearchContent(newQuery);
                                 },
                             }, editable: {
-                                active: ((_y = props.edit) === null || _y === void 0 ? void 0 : _y.listEditable) && !props.edit.disabledUpdate
+                                active: ((_w = props.edit) === null || _w === void 0 ? void 0 : _w.listEditable) && !props.edit.disabledUpdate
                                     ? true
                                     : false,
                                 onUpdateData: function (rowId, columnId, data) { return __awaiter(void 0, void 0, void 0, function () {
@@ -4284,7 +4304,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                     });
                                 }); },
                             }, addable: {
-                                active: ((_z = props.edit) === null || _z === void 0 ? void 0 : _z.listAddable) ? true : false,
+                                active: ((_x = props.edit) === null || _x === void 0 ? void 0 : _x.listAddable) ? true : false,
                                 onAddData: function (data) { return __awaiter(void 0, void 0, void 0, function () {
                                     return __generator(this, function (_a) {
                                         switch (_a.label) {
@@ -4295,7 +4315,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                         }
                                     });
                                 }); },
-                            }, darkMode: (_0 = props.organise) === null || _0 === void 0 ? void 0 : _0.darkMode, hidePagination: true })));
+                            }, darkMode: (_y = props.organise) === null || _y === void 0 ? void 0 : _y.darkMode, hidePagination: true })));
                 });
             }
         }
@@ -4338,7 +4358,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     sortOptions: (_r = (_q = props.organise) === null || _q === void 0 ? void 0 : _q.renderReferenceLabelOptions) === null || _r === void 0 ? void 0 : _r.call(_q),
                     onSortColumn: (_s = props.organise) === null || _s === void 0 ? void 0 : _s.onChangeSort,
                     onDragColumn: (_t = props.organise) === null || _t === void 0 ? void 0 : _t.onChangeDrag,
-                    filterOptions: (_v = (_u = props.organise) === null || _u === void 0 ? void 0 : _u.additionalQuery) === null || _v === void 0 ? void 0 : _v.map(function (eachQuery) {
+                    filterOptions: additionalQuery === null || additionalQuery === void 0 ? void 0 : additionalQuery.map(function (eachQuery) {
                         var _a;
                         return {
                             key: eachQuery.value,
@@ -4346,16 +4366,15 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         };
                     }),
                     renderFilterElements: function (id) {
-                        var _a, _b;
-                        var selectedQuery = (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.additionalQuery) === null || _b === void 0 ? void 0 : _b.filter(function (eachQuery) {
+                        var selectedQuery = additionalQuery === null || additionalQuery === void 0 ? void 0 : additionalQuery.filter(function (eachQuery) {
                             return eachQuery.value === id;
                         });
-                        var selectedModelList = props.model.filter(function (eachModel) { return eachModel.id === id; });
+                        var selectedModelList = structure.filter(function (eachModel) { return eachModel.id === id; });
                         var newQuery = (0, listModule_1.renderSearchAdditionalQueries)(selectedModelList, selectedQuery);
                         return renderSearchContent(newQuery);
                     },
                 }, editable: {
-                    active: ((_w = props.edit) === null || _w === void 0 ? void 0 : _w.listEditable) && !props.edit.disabledUpdate
+                    active: ((_u = props.edit) === null || _u === void 0 ? void 0 : _u.listEditable) && !props.edit.disabledUpdate
                         ? true
                         : false,
                     onUpdateData: function (rowId, columnId, data) { return __awaiter(void 0, void 0, void 0, function () {
@@ -4369,7 +4388,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         });
                     }); },
                 }, addable: {
-                    active: ((_x = props.edit) === null || _x === void 0 ? void 0 : _x.listAddable) ? true : false,
+                    active: ((_v = props.edit) === null || _v === void 0 ? void 0 : _v.listAddable) ? true : false,
                     onAddData: function (data) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
@@ -4380,7 +4399,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             }
                         });
                     }); },
-                }, darkMode: (_y = props.organise) === null || _y === void 0 ? void 0 : _y.darkMode, hidePagination: (_z = props.organise) === null || _z === void 0 ? void 0 : _z.hidePagination }));
+                }, darkMode: (_w = props.organise) === null || _w === void 0 ? void 0 : _w.darkMode, hidePagination: (_x = props.organise) === null || _x === void 0 ? void 0 : _x.hidePagination }));
         }
     };
     var renderTabContent = function (tabs, dataType, viewType) {
@@ -4394,13 +4413,13 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             }
         });
         var multipleSelect = isEditor && !((_a = props.organise) === null || _a === void 0 ? void 0 : _a.disableMulti) ? true : false;
-        if (viewType === "general") {
+        if (viewType === "general" || (selectedTabData === null || selectedTabData === void 0 ? void 0 : selectedTabData.viewType) === "report") {
             if (dataType === "list") {
                 return react_1.default.createElement(react_1.default.Fragment, null, renderGroupTable(multipleSelect));
             }
             else if (dataType === "read") {
                 return (react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement(detailList_1.DetailList, { model: props.model, referenceModel: referenceModelSchema, className: "mt-5 bg-white rounded-md", title: "General Details", list: renderDetailListData(props.model), handleReferenceLink: !schemaPresent && ((_b = props.bareSettings) === null || _b === void 0 ? void 0 : _b.bareReadReferenceView)
+                    react_1.default.createElement(detailList_1.DetailList, { model: structure, referenceModel: referenceModelSchema, className: "mt-5 bg-white rounded-md", title: "General Details", list: renderDetailListData(structure), handleReferenceLink: !schemaPresent && ((_b = props.bareSettings) === null || _b === void 0 ? void 0 : _b.bareReadReferenceView)
                             ? props.bareSettings.bareReadReferenceView
                             : undefined, splitView: (_c = props.organise) === null || _c === void 0 ? void 0 : _c.splitView }),
                     react_1.default.createElement("div", { className: "mt-8" }, renderListAddress(dataType)),
@@ -4707,7 +4726,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 var nullColumn_1 = false;
                 var groupBy_1 = [];
                 var groupLabel_1 = [];
-                props.model.map(function (eachModel) {
+                structure.map(function (eachModel) {
                     var _a, _b, _c;
                     if (kanbanTitle_2 === eachModel.id) {
                         if (eachModel.type === "list") {
@@ -4745,155 +4764,6 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "read", id, "general");
                     } }));
             }
-            // else if (selectedTabData.viewType === "report") {
-            //   return (
-            //     <Table
-            //       showId={showId}
-            //       paginationType={isFirebase ? "cursor" : "page"}
-            //       data={tableData}
-            //       spaceData={spaceTableData}
-            //       size={size}
-            //       limit={limit}
-            //       cursor={cursor}
-            //       loading={tableLoading}
-            //       checkbox={multipleSelect}
-            //       selectAll={selectAll}
-            //       selectedIds={selectedIds}
-            //       selectAllText={selectAll ? "from filter" : ""}
-            //       multiActionButton={
-            //         <div className="flex flex-row space-x-3">
-            //           {selectedIds.length > 0 &&
-            //             !props.edit?.disabledUpdate &&
-            //             !props.bareSettings?.bareHideTableExtraMultipleAction && (
-            //               <>
-            //                 <TextButton
-            //                   className="text-sm"
-            //                   text="Change to Draft"
-            //                   disable={loading}
-            //                   onClick={() => {
-            //                     handleBatchDraftData();
-            //                   }}
-            //                 />
-            //                 <TextButton
-            //                   className="text-sm"
-            //                   text="Clone Items"
-            //                   disable={loading}
-            //                   onClick={() => {
-            //                     handleCloneSelectedData();
-            //                   }}
-            //                 />
-            //               </>
-            //             )}
-            //           {props.edit?.deleteBtn && (
-            //             <TextButton
-            //               className="text-sm text-red-500 hover:text-red-600"
-            //               text="Delete"
-            //               onClick={() => {
-            //                 handleGenerateDeletePasscode();
-            //                 setDeleteModal(true);
-            //               }}
-            //             />
-            //           )}
-            //           {!isFirebase && !props.edit?.disableBatchUpdate && (
-            //             <TextButton
-            //               className="text-sm"
-            //               text="Update"
-            //               onClick={() => {
-            //                 setBatchUpdateModal(true);
-            //               }}
-            //             />
-            //           )}
-            //           {props.bareSettings?.bareListMultipleSelectAddtionalActions &&
-            //             props.bareSettings?.bareListMultipleSelectAddtionalActions?.map(
-            //               (eachButton) => {
-            //                 return (
-            //                   <TextButton
-            //                     className={`text-sm ${eachButton.className}`}
-            //                     text={eachButton.text}
-            //                     onClick={() => {
-            //                       eachButton.onClick?.(
-            //                         selectedIds,
-            //                         selectAll,
-            //                         renderImpSearchFilterConditions() ?? []
-            //                       );
-            //                     }}
-            //                   />
-            //                 );
-            //               }
-            //             )}
-            //         </div>
-            //       }
-            //       handleSelectAll={handleSelectAllPages}
-            //       handleSelectedIds={handleSelectIds}
-            //       header={renderTableHeader()}
-            //       pageIndex={pageIndex}
-            //       onClickRow={(id: string) => {
-            //         props.organise?.handleNavigate?.("read", id, "general");
-            //       }}
-            //       linkType={props.linkType}
-            //       custom={props.custom}
-            //       newTabUrl={`${props.localURLEndpoint}?data=`}
-            //       addNewTabUrl={`&type=read&collection=${props.collectionId}&view=general`}
-            //       handleUpdatePageIndex={handlePagination}
-            //       className="mt-5"
-            //       lib={{ axios: props.lib?.axios }}
-            //       devSettings={props.devSettings}
-            //       bareSettings={props.bareSettings}
-            //       fixedPagination={props.organise?.fixedPagination}
-            //       advSettings={{
-            //         addColumnEnabled: true,
-            //         renderAddColumnElements: renderAddMathColumn,
-            //         dragEnabled: props.organise?.advDragEnabled,
-            //         sortEnabled: props.organise?.advSortEnabled,
-            //         filterEnabled: props.organise?.advFilterEnabled,
-            //         sortId: props.organise?.sort,
-            //         sortOptions: props.organise?.renderReferenceLabelOptions?.(),
-            //         onSortColumn: props.organise?.onChangeSort,
-            //         onDragColumn: props.organise?.onChangeDrag,
-            //         filterOptions: props.organise?.additionalQuery?.map(
-            //           (eachQuery) => {
-            //             return {
-            //               key: eachQuery.value,
-            //               label: eachQuery.label ?? "",
-            //             };
-            //           }
-            //         ),
-            //         renderFilterElements: (id: string) => {
-            //           const selectedQuery = props.organise?.additionalQuery?.filter(
-            //             (eachQuery) => {
-            //               return eachQuery.value === id;
-            //             }
-            //           );
-            //           const selectedModelList = props.model.filter(
-            //             (eachModel) => eachModel.id === id
-            //           );
-            //           const newQuery = renderSearchAdditionalQueries(
-            //             selectedModelList,
-            //             selectedQuery
-            //           );
-            //           return renderSearchContent(newQuery);
-            //         },
-            //       }}
-            //       editable={{
-            //         active:
-            //           props.edit?.listEditable && !props.edit.disabledUpdate
-            //             ? true
-            //             : false,
-            //         onUpdateData: async (rowId, columnId, data) => {
-            //           await handleSubmitData("update", rowId, columnId, data);
-            //         },
-            //       }}
-            //       addable={{
-            //         active: props.edit?.listAddable ? true : false,
-            //         onAddData: async (data) => {
-            //           await handleSubmitData("create", "", "", data);
-            //         },
-            //       }}
-            //       darkMode={props.organise?.darkMode}
-            //       hidePagination={props.organise?.hidePagination}
-            //     />
-            //   );
-            // }
             else if (selectedTabData.renderComp) {
                 return react_1.default.createElement(react_1.default.Fragment, null, selectedTabData.renderComp());
             }
@@ -4923,7 +4793,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         return null;
     };
     var renderModalContent = function () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
         if (loading) {
             return (react_1.default.createElement("div", { className: "mt-5" },
                 react_1.default.createElement(loading_1.Loading, null),
@@ -4957,7 +4827,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         }
         else if (exportExcel || exportQR) {
             var showEmail = exportType !== "pdf" && !((_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.exportSettings) === null || _b === void 0 ? void 0 : _b.disableEmail);
-            return (react_1.default.createElement(react_1.default.Fragment, null, queryForm ? (react_1.default.createElement(queryForm_1.QueryForm, { dbModule: (_c = props.lib) === null || _c === void 0 ? void 0 : _c.axios, model: props.model, updateQuery: queryIndex >= 0 ? queryList[queryIndex] : undefined, devSettings: props.devSettings, handleCloseForm: function () {
+            return (react_1.default.createElement(react_1.default.Fragment, null, queryForm ? (react_1.default.createElement(queryForm_1.QueryForm, { dbModule: (_c = props.lib) === null || _c === void 0 ? void 0 : _c.axios, model: structure, updateQuery: queryIndex >= 0 ? queryList[queryIndex] : undefined, devSettings: props.devSettings, handleCloseForm: function () {
                     handleViewQuery(-1);
                 }, handleQueryOnComplete: function (queryData) {
                     handlePushQueryList(queryData, queryIndex);
@@ -5007,17 +4877,17 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 } }));
         }
         else if (overviewModal) {
-            return (react_1.default.createElement(settingsModal_1.OverviewModal, { model: props.model, referenceSchema: referenceModelSchema, setReferenceSchema: setReferenceSchema, onChangeHide: (_s = props.organise) === null || _s === void 0 ? void 0 : _s.onChangeHide, onClose: function () {
+            return (react_1.default.createElement(settingsModal_1.OverviewModal, { model: structure, referenceSchema: referenceModelSchema, setReferenceSchema: setReferenceSchema, onChangeHide: (_s = props.organise) === null || _s === void 0 ? void 0 : _s.onChangeHide, onClose: function () {
                     handlePopUpModal(false);
                 } }));
         }
         else if (filterModal) {
-            return (react_1.default.createElement(settingsModal_1.FilterModal, { server: props.devSettings.server, filter: (_t = props.organise) === null || _t === void 0 ? void 0 : _t.additionalQuery, onChangeFilter: (_u = props.organise) === null || _u === void 0 ? void 0 : _u.onChangeFilter, renderReferenceLabelOptions: (_v = props.organise) === null || _v === void 0 ? void 0 : _v.renderReferenceLabelOptions, renderReferenceSpaceOptions: (_w = props.organise) === null || _w === void 0 ? void 0 : _w.renderReferenceSpaceOptions, setNotification: setNotification, onClose: function () {
+            return (react_1.default.createElement(settingsModal_1.FilterModal, { server: props.devSettings.server, filter: additionalQuery, onChangeFilter: (_t = props.organise) === null || _t === void 0 ? void 0 : _t.onChangeFilter, renderReferenceLabelOptions: (_u = props.organise) === null || _u === void 0 ? void 0 : _u.renderReferenceLabelOptions, renderReferenceSpaceOptions: (_v = props.organise) === null || _v === void 0 ? void 0 : _v.renderReferenceSpaceOptions, setNotification: setNotification, onClose: function () {
                     handlePopUpModal(false);
                 } }));
         }
         else if (addTabModal) {
-            return (react_1.default.createElement(settingsModal_1.TabModal, { type: props.type, tabs: (_x = props.organise) === null || _x === void 0 ? void 0 : _x.extendedTabs, onChangeTabs: (_y = props.organise) === null || _y === void 0 ? void 0 : _y.onChangeTabs, model: props.model, renderReferenceLabelOptions: (_z = props.organise) === null || _z === void 0 ? void 0 : _z.renderReferenceLabelOptions, onClose: function () {
+            return (react_1.default.createElement(settingsModal_1.TabModal, { type: props.type, tabs: (_w = props.organise) === null || _w === void 0 ? void 0 : _w.extendedTabs, onChangeTabs: (_x = props.organise) === null || _x === void 0 ? void 0 : _x.onChangeTabs, model: structure, renderReferenceLabelOptions: (_y = props.organise) === null || _y === void 0 ? void 0 : _y.renderReferenceLabelOptions, onClose: function () {
                     handlePopUpModal(false);
                 } }));
         }
@@ -5037,7 +4907,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         else if (selectedListAddressId) {
             return (react_1.default.createElement(react_1.default.Fragment, null,
                 react_1.default.createElement(form_1.Form, { className: "grid grid-cols-1 gap-6 pb-20 mt-6", ref: listAddressFromRef, refList: [listAddressInputRef], handleComplete: function () {
-                        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, props.model, props.devSettings.server);
+                        var clonedSelectedData = (0, updateModule_1.handleClonedDataAttribute)(selectedData, structure, props.devSettings.server);
                         var listAddressValue = clonedSelectedData[selectedListAddressId];
                         if (listAddressValue)
                             clonedSelectedData[selectedListAddressId] = __spreadArray(__spreadArray([], listAddressValue, true), [
@@ -5074,7 +4944,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         }); } }))));
         }
         else {
-            var filterObjectModel = props.model.find(function (eachModel) {
+            var filterObjectModel = structure.find(function (eachModel) {
                 return eachModel.id === selectedObjectStructureId;
             });
             if (filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.objectData) {
@@ -5087,16 +4957,16 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         disabledOnEnter_2 = true;
                     return null;
                 });
-                if ((_0 = props.bareSettings) === null || _0 === void 0 ? void 0 : _0.bareListObjectHandleData) {
+                if ((_z = props.bareSettings) === null || _z === void 0 ? void 0 : _z.bareListObjectHandleData) {
                     var listObjectViewType = props.type === "read"
                         ? "read"
                         : selectedObjectId
                             ? "update"
                             : "new";
-                    (_2 = (_1 = props.bareSettings) === null || _1 === void 0 ? void 0 : _1.bareListObjectHandleData) === null || _2 === void 0 ? void 0 : _2.call(_1, listObjectViewType, selectedObjectData);
+                    (_1 = (_0 = props.bareSettings) === null || _0 === void 0 ? void 0 : _0.bareListObjectHandleData) === null || _1 === void 0 ? void 0 : _1.call(_0, listObjectViewType, selectedObjectData);
                 }
                 return (react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement(form_1.Form, { className: "grid ".concat(formColumn, " gap-6 pb-32 mt-6 sm:pb-36"), ref: objectFormRef, refList: objectFormInputRefs, handleComplete: handleSubmitObjectDataType, disabledOnEnter: disabledOnEnter_2 }, renderDataTemplateFormContent(selectedObjectData, (_3 = filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.objectData) !== null && _3 !== void 0 ? _3 : [], objectFormInputRefs, true, filterObjectModel.type === "listObject", undefined, filterObjectModel.type === "listObject"
+                    react_1.default.createElement(form_1.Form, { className: "grid ".concat(formColumn, " gap-6 pb-32 mt-6 sm:pb-36"), ref: objectFormRef, refList: objectFormInputRefs, handleComplete: handleSubmitObjectDataType, disabledOnEnter: disabledOnEnter_2 }, renderDataTemplateFormContent(selectedObjectData, (_2 = filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.objectData) !== null && _2 !== void 0 ? _2 : [], objectFormInputRefs, true, filterObjectModel.type === "listObject", undefined, filterObjectModel.type === "listObject"
                         ? selectedData
                         : undefined)),
                     react_1.default.createElement("div", { className: "flex justify-end pt-8" },
@@ -5202,7 +5072,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     var renderBatchUpdateModalContent = function () {
         var _a;
         if (batchUpdateModal) {
-            var columnIdOptions = props.model
+            var columnIdOptions = structure
                 .filter(function (eachModel) {
                 return eachModel.id !== "id" &&
                     !eachModel.unique &&
@@ -5216,7 +5086,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 disabled: true,
                 type: "string",
             };
-            var modelFound = props.model.find(function (eachModel) { return eachModel.id === batchUpdateData.columnId; });
+            var modelFound = structure.find(function (eachModel) { return eachModel.id === batchUpdateData.columnId; });
             var model = modelFound !== null && modelFound !== void 0 ? modelFound : defaultModel;
             return (react_1.default.createElement(react_1.default.Fragment, null,
                 react_1.default.createElement(form_1.Form, { ref: batchUpdateFormRef, refList: [batchUpdateColumnIdRef, batchUpdateInputRef], handleComplete: handleBatchUpdateData },
@@ -5224,7 +5094,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             var _a;
                             var _b;
                             var columnDataValue = undefined;
-                            var selectedModel = props.model.find(function (eachAttribute) { return eachAttribute.id === value; });
+                            var selectedModel = structure.find(function (eachAttribute) { return eachAttribute.id === value; });
                             if (selectedModel) {
                                 if (selectedModel.type === "list") {
                                     var isOptional = (_b = selectedModel.optional) !== null && _b !== void 0 ? _b : false;
@@ -5310,7 +5180,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     return (react_1.default.createElement(react_1.default.Fragment, null,
         renderNotification("root"),
-        ((_19 = (_18 = props.renderSettings) === null || _18 === void 0 ? void 0 : _18.renderLoadingUI) === null || _19 === void 0 ? void 0 : _19.call(_18)) && loading ? ((_20 = props.renderSettings) === null || _20 === void 0 ? void 0 : _20.renderLoadingUI()) : (react_1.default.createElement(modal_1.Modal, { maxWidth: selectedObjectStructureId || excelModal ? "2xl" : undefined, open: modalVisible, title: renderModalTitle(), renderContent: renderModalContent, onClose: function () {
+        ((_20 = (_19 = props.renderSettings) === null || _19 === void 0 ? void 0 : _19.renderLoadingUI) === null || _20 === void 0 ? void 0 : _20.call(_19)) && loading ? ((_21 = props.renderSettings) === null || _21 === void 0 ? void 0 : _21.renderLoadingUI()) : (react_1.default.createElement(modal_1.Modal, { maxWidth: selectedObjectStructureId || excelModal ? "2xl" : undefined, open: modalVisible, title: renderModalTitle(), renderContent: renderModalContent, onClose: function () {
                 var _a, _b;
                 if (loading)
                     return;