blixify-ui-web 0.2.83 → 0.2.85

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

@@ -134,7 +134,7 @@ var indexedDb_1 = require("./indexedDb");
 var pagination_1 = require("./pagination");
 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;
+    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;
     var formRef = (0, react_1.createRef)();
     var objectFormRef = (0, react_1.createRef)();
     var listAddressFromRef = (0, react_1.createRef)();
@@ -149,107 +149,108 @@ 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 _z = (0, react_1.useState)(false), loading = _z[0], setLoading = _z[1];
-    var _0 = (0, react_1.useState)(), notification = _0[0], setNotification = _0[1];
+    var _1 = (0, react_1.useState)(false), loading = _1[0], setLoading = _1[1];
+    var _2 = (0, react_1.useState)(), notification = _2[0], setNotification = _2[1];
     //INFO : Used by List
-    var _1 = (0, react_1.useState)({}), filterSearch = _1[0], setFilterSearch = _1[1];
-    var _2 = (0, react_1.useState)({}), filterSearchParams = _2[0], setFilterSearchParams = _2[1];
-    var _3 = (0, react_1.useState)({}), filterSelection = _3[0], setFilterSelection = _3[1];
-    var _4 = (0, react_1.useState)({}), filterReference = _4[0], setFilterReference = _4[1];
-    var _5 = (0, react_1.useState)({}), filterReferenceSearch = _5[0], setFilterReferenceSearch = _5[1];
-    var _6 = (0, react_1.useState)({}), filterReferenceList = _6[0], setFilterReferenceList = _6[1];
-    var _7 = (0, react_1.useState)({
+    var _3 = (0, react_1.useState)({}), filterSearch = _3[0], setFilterSearch = _3[1];
+    var _4 = (0, react_1.useState)({}), filterSearchParams = _4[0], setFilterSearchParams = _4[1];
+    var _5 = (0, react_1.useState)({}), filterSelection = _5[0], setFilterSelection = _5[1];
+    var _6 = (0, react_1.useState)({}), filterReference = _6[0], setFilterReference = _6[1];
+    var _7 = (0, react_1.useState)({}), filterReferenceSearch = _7[0], setFilterReferenceSearch = _7[1];
+    var _8 = (0, react_1.useState)({}), filterReferenceList = _8[0], setFilterReferenceList = _8[1];
+    var _9 = (0, react_1.useState)({
         startDate: undefined,
         endDate: undefined,
-    }), filterReferenceDate = _7[0], setFilterReferenceDate = _7[1];
-    var _8 = (0, react_1.useState)(true), tableLoading = _8[0], setTableLoading = _8[1];
-    var _9 = (0, react_1.useState)(""), cursor = _9[0], setCursor = _9[1];
-    var _10 = (0, react_1.useState)(""), lastCursor = _10[0], setLastCursor = _10[1];
-    var _11 = (0, react_1.useState)([]), tableData = _11[0], setTableData = _11[1];
-    var _12 = (0, react_1.useState)([]), spaceTableData = _12[0], setSpaceTableData = _12[1];
-    var _13 = (0, react_1.useState)(0), size = _13[0], setSize = _13[1];
-    var _14 = (0, react_1.useState)(0), pageIndex = _14[0], setPageIndex = _14[1];
-    var _15 = (0, react_1.useState)([]), selectedIds = _15[0], setSelectedIds = _15[1];
-    var _16 = (0, react_1.useState)(false), selectAll = _16[0], setSelectAll = _16[1];
-    var _17 = (0, react_1.useState)(""), deletePasscode = _17[0], setDeletePasscode = _17[1];
-    var _18 = (0, react_1.useState)(""), deletePasscodeInput = _18[0], setDeletePasscodeInput = _18[1];
-    var _19 = (0, react_1.useState)(""), deleteFeedId = _19[0], setDeleteFeedId = _19[1];
+    }), filterReferenceDate = _9[0], setFilterReferenceDate = _9[1];
+    var _10 = (0, react_1.useState)(true), tableLoading = _10[0], setTableLoading = _10[1];
+    var _11 = (0, react_1.useState)(""), cursor = _11[0], setCursor = _11[1];
+    var _12 = (0, react_1.useState)(""), lastCursor = _12[0], setLastCursor = _12[1];
+    var _13 = (0, react_1.useState)([]), tableData = _13[0], setTableData = _13[1];
+    var _14 = (0, react_1.useState)([]), spaceTableData = _14[0], setSpaceTableData = _14[1];
+    var _15 = (0, react_1.useState)(0), size = _15[0], setSize = _15[1];
+    var _16 = (0, react_1.useState)(0), pageIndex = _16[0], setPageIndex = _16[1];
+    var _17 = (0, react_1.useState)([]), selectedIds = _17[0], setSelectedIds = _17[1];
+    var _18 = (0, react_1.useState)(false), selectAll = _18[0], setSelectAll = _18[1];
+    var _19 = (0, react_1.useState)(""), deletePasscode = _19[0], setDeletePasscode = _19[1];
+    var _20 = (0, react_1.useState)(""), deletePasscodeInput = _20[0], setDeletePasscodeInput = _20[1];
+    var _21 = (0, react_1.useState)(""), deleteFeedId = _21[0], setDeleteFeedId = _21[1];
     var previousType = (0, react_1.useRef)();
     //INFO : Used by List Organise
-    var _20 = (0, react_1.useState)(false), sortModal = _20[0], setSortModal = _20[1];
-    var _21 = (0, react_1.useState)(false), filterModal = _21[0], setFilterModal = _21[1];
-    var _22 = (0, react_1.useState)(false), addTabModal = _22[0], setAddTabModal = _22[1];
-    var _23 = (0, react_1.useState)(), selectedTab = _23[0], setSelectedTab = _23[1];
-    var _24 = (0, react_1.useState)("dayGridMonth"), calendarView = _24[0], setCalendarView = _24[1];
-    var _25 = (0, react_1.useState)((0, moment_1.default)().startOf("month").toDate()), calendarTabMonth = _25[0], setCalendarTabMonth = _25[1];
-    var _26 = (0, react_1.useState)(false), queryForm = _26[0], setQueryForm = _26[1];
-    var _27 = (0, react_1.useState)(false), batchUpdateModal = _27[0], setBatchUpdateModal = _27[1];
-    var _28 = (0, react_1.useState)({
+    var _22 = (0, react_1.useState)(false), sortModal = _22[0], setSortModal = _22[1];
+    var _23 = (0, react_1.useState)(false), filterModal = _23[0], setFilterModal = _23[1];
+    var _24 = (0, react_1.useState)(false), addTabModal = _24[0], setAddTabModal = _24[1];
+    var _25 = (0, react_1.useState)((_a = props.defaultTab) !== null && _a !== void 0 ? _a : ""), selectedTab = _25[0], setSelectedTab = _25[1];
+    var _26 = (0, react_1.useState)("dayGridMonth"), calendarView = _26[0], setCalendarView = _26[1];
+    var _27 = (0, react_1.useState)((0, moment_1.default)().startOf("month").toDate()), calendarTabMonth = _27[0], setCalendarTabMonth = _27[1];
+    var _28 = (0, react_1.useState)(false), queryForm = _28[0], setQueryForm = _28[1];
+    var _29 = (0, react_1.useState)(false), batchUpdateModal = _29[0], setBatchUpdateModal = _29[1];
+    var _30 = (0, react_1.useState)({
         columnId: "",
         columnData: {},
-    }), batchUpdateData = _28[0], setBatchUpdateData = _28[1];
+    }), batchUpdateData = _30[0], setBatchUpdateData = _30[1];
     // INFO: Used by Activity Log
-    var _29 = (0, react_1.useState)(false), activityModal = _29[0], setActivityModal = _29[1];
-    var _30 = (0, react_1.useState)(""), activityId = _30[0], setActivityId = _30[1];
+    var _31 = (0, react_1.useState)(false), activityModal = _31[0], setActivityModal = _31[1];
+    var _32 = (0, react_1.useState)(""), activityId = _32[0], setActivityId = _32[1];
     //INFO : Used by Export
-    var _31 = (0, react_1.useState)(null), csvFile = _31[0], setCSVFile = _31[1];
-    var _32 = (0, react_1.useState)([]), csvFileData = _32[0], setCSVFileData = _32[1];
-    var _33 = (0, react_1.useState)(0), stepCSVIndex = _33[0], setStepCSVIndex = _33[1];
-    var _34 = (0, react_1.useState)({}), listCSVMapAttribute = _34[0], setListCSVMapAttribute = _34[1];
-    var _35 = (0, react_1.useState)({}), listCSVObjAttribute = _35[0], setListCSVObjAttribute = _35[1];
-    var _36 = (0, react_1.useState)([]), csvAPIAttribute = _36[0], setCSVAPIAttribute = _36[1];
-    var _37 = (0, react_1.useState)(((_a = props.devSettings.currentUser) === null || _a === void 0 ? void 0 : _a.userEmail) || ""), exportCSVEmail = _37[0], setExportCSVEmail = _37[1];
-    var _38 = (0, react_1.useState)([]), importTableData = _38[0], setImportTableData = _38[1];
-    var _39 = (0, react_1.useState)([]), queryList = _39[0], setQueryList = _39[1];
-    var _40 = (0, react_1.useState)(-1), queryIndex = _40[0], setQueryIndex = _40[1];
+    var _33 = (0, react_1.useState)(null), csvFile = _33[0], setCSVFile = _33[1];
+    var _34 = (0, react_1.useState)([]), csvFileData = _34[0], setCSVFileData = _34[1];
+    var _35 = (0, react_1.useState)(0), stepCSVIndex = _35[0], setStepCSVIndex = _35[1];
+    var _36 = (0, react_1.useState)({}), listCSVMapAttribute = _36[0], setListCSVMapAttribute = _36[1];
+    var _37 = (0, react_1.useState)({}), listCSVObjAttribute = _37[0], setListCSVObjAttribute = _37[1];
+    var _38 = (0, react_1.useState)([]), csvAPIAttribute = _38[0], setCSVAPIAttribute = _38[1];
+    var _39 = (0, react_1.useState)(((_b = props.devSettings.currentUser) === null || _b === void 0 ? void 0 : _b.userEmail) || ""), exportCSVEmail = _39[0], setExportCSVEmail = _39[1];
+    var _40 = (0, react_1.useState)([]), importTableData = _40[0], setImportTableData = _40[1];
+    var _41 = (0, react_1.useState)([]), queryList = _41[0], setQueryList = _41[1];
+    var _42 = (0, react_1.useState)(-1), queryIndex = _42[0], setQueryIndex = _42[1];
     //INFO : Used by Read
     //INFO : Used by Update
-    var _41 = (0, react_1.useState)(false), modalVisible = _41[0], setModalVisible = _41[1];
-    var _42 = (0, react_1.useState)(false), deleteModal = _42[0], setDeleteModal = _42[1];
-    var _43 = (0, react_1.useState)(false), excelModal = _43[0], setExcelModal = _43[1];
-    var _44 = (0, react_1.useState)(false), exportExcel = _44[0], setExportExcel = _44[1];
-    var _45 = (0, react_1.useState)(false), exportQR = _45[0], setExportQR = _45[1];
-    var _46 = (0, react_1.useState)(false), signatureSigning = _46[0], setSignatureSigning = _46[1];
-    var _47 = (0, react_1.useState)({}), selectedData = _47[0], setSelectedData = _47[1];
-    var _48 = (0, react_1.useState)(""), selectedObjectStructureId = _48[0], setSelectedObjectStructureId = _48[1];
-    var _49 = (0, react_1.useState)(""), selectedObjectId = _49[0], setSelectedObjectId = _49[1];
-    var _50 = (0, react_1.useState)(""), selectedListAddressId = _50[0], setSelectedListAddressId = _50[1];
-    var _51 = (0, react_1.useState)({
+    var _43 = (0, react_1.useState)(false), modalVisible = _43[0], setModalVisible = _43[1];
+    var _44 = (0, react_1.useState)(false), deleteModal = _44[0], setDeleteModal = _44[1];
+    var _45 = (0, react_1.useState)(false), excelModal = _45[0], setExcelModal = _45[1];
+    var _46 = (0, react_1.useState)(false), exportExcel = _46[0], setExportExcel = _46[1];
+    var _47 = (0, react_1.useState)(false), exportQR = _47[0], setExportQR = _47[1];
+    var _48 = (0, react_1.useState)(false), signatureSigning = _48[0], setSignatureSigning = _48[1];
+    var _49 = (0, react_1.useState)({}), selectedData = _49[0], setSelectedData = _49[1];
+    var _50 = (0, react_1.useState)(""), selectedObjectStructureId = _50[0], setSelectedObjectStructureId = _50[1];
+    var _51 = (0, react_1.useState)(""), selectedObjectId = _51[0], setSelectedObjectId = _51[1];
+    var _52 = (0, react_1.useState)(""), selectedListAddressId = _52[0], setSelectedListAddressId = _52[1];
+    var _53 = (0, react_1.useState)({
         lat: 0,
         lng: 0,
         name: "",
-    }), selectedListAddress = _51[0], setSelectedListAddress = _51[1];
-    var _52 = (0, react_1.useState)({}), selectedObjectData = _52[0], setSelectedObjectData = _52[1];
-    var _53 = (0, react_1.useState)(false), referenceLoading = _53[0], setReferenceLoading = _53[1];
-    var _54 = (0, react_1.useState)({}), referencesOptions = _54[0], setReferencesOptions = _54[1];
-    var _55 = (0, react_1.useState)({}), referencesDetails = _55[0], setReferencesDetails = _55[1];
-    var _56 = (0, react_1.useState)({}), referenceDeleteTableData = _56[0], setReferenceDeleteTableData = _56[1];
-    var _57 = (0, react_1.useState)(0), referenceDeleteIndex = _57[0], setReferenceDeleteIndex = _57[1];
-    var _58 = (0, react_1.useState)({}), referenceModelSchema = _58[0], setReferenceSchema = _58[1];
+    }), selectedListAddress = _53[0], setSelectedListAddress = _53[1];
+    var _54 = (0, react_1.useState)({}), selectedObjectData = _54[0], setSelectedObjectData = _54[1];
+    var _55 = (0, react_1.useState)(false), referenceLoading = _55[0], setReferenceLoading = _55[1];
+    var _56 = (0, react_1.useState)({}), referencesOptions = _56[0], setReferencesOptions = _56[1];
+    var _57 = (0, react_1.useState)({}), referencesDetails = _57[0], setReferencesDetails = _57[1];
+    var _58 = (0, react_1.useState)({}), referenceDeleteTableData = _58[0], setReferenceDeleteTableData = _58[1];
+    var _59 = (0, react_1.useState)(0), referenceDeleteIndex = _59[0], setReferenceDeleteIndex = _59[1];
+    var _60 = (0, react_1.useState)({}), referenceModelSchema = _60[0], setReferenceSchema = _60[1];
     //INFO : Offline
-    var _59 = (0, react_1.useState)(0), offlineDataLength = _59[0], setOfflineDataLength = _59[1];
-    var _60 = (0, react_1.useState)(false), offlineModal = _60[0], setOfflineModal = _60[1];
+    var _61 = (0, react_1.useState)(0), offlineDataLength = _61[0], setOfflineDataLength = _61[1];
+    var _62 = (0, react_1.useState)(false), offlineModal = _62[0], setOfflineModal = _62[1];
     var devSettings = props.devSettings;
     var serverId = (0, utils_1.parseServerId)(devSettings.server);
     var isFirebaseClient = devSettings.server === "firebase";
     var isFirebase = isFirebaseClient || devSettings.server === "fbServer";
-    var dbModule = isFirebaseClient ? (_b = props.lib) === null || _b === void 0 ? void 0 : _b.firebase : (_c = props.lib) === null || _c === void 0 ? void 0 : _c.axios;
+    var dbModule = isFirebaseClient ? (_c = props.lib) === null || _c === void 0 ? void 0 : _c.firebase : (_d = props.lib) === null || _d === void 0 ? void 0 : _d.axios;
     var schemaPresent = props.devSettings.schemaEndpoint ? true : false;
     var limit = props.limit ? props.limit : 10;
-    var isEditor = ((_d = props.edit) === null || _d === void 0 ? void 0 : _d.allEditable) ? true : false;
-    var isOffline = (_e = props.bareSettings) === null || _e === void 0 ? void 0 : _e.bareOffline;
-    var showId = (_f = props.space) === null || _f === void 0 ? void 0 : _f.showId;
-    var hasNavigation = ((_g = props.organise) === null || _g === void 0 ? void 0 : _g.handleNavigate) ? true : false;
-    var formColumn = ((_h = props.bareSettings) === null || _h === void 0 ? void 0 : _h.bareUpdateOneColumn)
+    var isEditor = ((_e = props.edit) === null || _e === void 0 ? void 0 : _e.allEditable) ? true : false;
+    var isOffline = (_f = props.bareSettings) === null || _f === void 0 ? void 0 : _f.bareOffline;
+    var showId = (_g = props.space) === null || _g === void 0 ? void 0 : _g.showId;
+    var idField = (_h = props.space) === null || _h === void 0 ? void 0 : _h.idField;
+    var hasNavigation = ((_j = props.organise) === null || _j === void 0 ? void 0 : _j.handleNavigate) ? true : false;
+    var formColumn = ((_k = props.bareSettings) === null || _k === void 0 ? void 0 : _k.bareUpdateOneColumn)
         ? "grid-cols-2"
         : "grid-cols-4";
-    var isActivityLog = (((_k = (_j = props.edit) === null || _j === void 0 ? void 0 : _j.activityLog) === null || _k === void 0 ? void 0 : _k.enableComments) &&
-        ((_l = props.edit) === null || _l === void 0 ? void 0 : _l.activityLog.commentCollectionId)) ||
-        (((_o = (_m = props.edit) === null || _m === void 0 ? void 0 : _m.activityLog) === null || _o === void 0 ? void 0 : _o.enableLogs) &&
-            ((_p = props.edit) === null || _p === void 0 ? void 0 : _p.activityLog.logsCollectionId));
+    var isActivityLog = (((_m = (_l = props.edit) === null || _l === void 0 ? void 0 : _l.activityLog) === null || _m === void 0 ? void 0 : _m.enableComments) &&
+        ((_o = props.edit) === null || _o === void 0 ? void 0 : _o.activityLog.commentCollectionId)) ||
+        (((_q = (_p = props.edit) === null || _p === void 0 ? void 0 : _p.activityLog) === null || _q === void 0 ? void 0 : _q.enableLogs) &&
+            ((_r = props.edit) === null || _r === void 0 ? void 0 : _r.activityLog.logsCollectionId));
     //TODO : Code - Pass ...devSettings, search dbEndpoint:
     var writeServerQuery = new writeQuery_1.WriteQuery({
-        dbModule: (_q = props.lib) === null || _q === void 0 ? void 0 : _q.axios,
+        dbModule: (_s = props.lib) === null || _s === void 0 ? void 0 : _s.axios,
         dbType: devSettings.server,
         dbCollection: props.collectionId,
         dbEndpoint: devSettings.dbEndpoint,
@@ -257,7 +258,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         dbUserToken: devSettings.dbUserToken,
     });
     var readServerQuery = new readQuery_1.ReadQuery({
-        dbModule: (_r = props.lib) === null || _r === void 0 ? void 0 : _r.axios,
+        dbModule: (_t = props.lib) === null || _t === void 0 ? void 0 : _t.axios,
         dbType: devSettings.server,
         dbCollection: props.collectionId,
         dbEndpoint: devSettings.dbEndpoint,
@@ -265,7 +266,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         dbUserToken: devSettings.dbUserToken,
     });
     var moreButtonPopUp = [
-        ((_s = props.edit) === null || _s === void 0 ? void 0 : _s.allEditable) && !isFirebase
+        ((_u = props.edit) === null || _u === void 0 ? void 0 : _u.allEditable) && !isFirebase
             ? {
                 text: "Import Excel",
                 onClick: function () {
@@ -289,7 +290,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             },
         },
     ].filter(Boolean);
-    if ((_t = props.organise) === null || _t === void 0 ? void 0 : _t.moreSettings)
+    if ((_v = props.organise) === null || _v === void 0 ? void 0 : _v.moreSettings)
         moreButtonPopUp = moreButtonPopUp.concat(props.organise.moreSettings);
     (0, react_1.useImperativeHandle)(ref, function () { return ({
         handleRefresh: handleRefresh,
@@ -305,6 +306,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     /* eslint-enable */
     //INFO : Change Data Type & ID Refresh
     (0, react_1.useEffect)(function () {
+        var _a;
         switch (props.type) {
             case "read":
             case "update":
@@ -325,8 +327,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     setModalVisible(true);
                     setLoading(true);
                     if (previousType.current === "read" && props.type === "update") {
-                        if (readQueryHocRef.current)
-                            readQueryHocRef.current.handleRefresh();
+                        (_a = readQueryHocRef.current) === null || _a === void 0 ? void 0 : _a.handleRefresh();
                     }
                 }
                 break;
@@ -346,38 +347,22 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     //   oldCollectionId.current = props.collectionId;
     // }, [props.collectionId]);
     (0, react_1.useEffect)(function () {
-        var _a, _b, _c, _d, _e;
-        if (!selectedTab) {
-            var currentTab = (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.extendedTabs) === null || _b === void 0 ? void 0 : _b.find(function (eachTab) { var _a; return (0, utils_1.lowercaseTextToId)(eachTab.name) === ((_a = props.organise) === null || _a === void 0 ? void 0 : _a.viewId); });
-            if (currentTab) {
-                if (currentTab.viewType === "calendar" ||
-                    currentTab.viewType === "feeds") {
-                    var hrefPoint = "".concat(props.localURLEndpoint, "?type=").concat(props.type, "&collection=").concat(props.collectionId);
-                    if (props.id)
-                        hrefPoint += "&data=".concat(props.id);
-                    var id = (0, utils_1.lowercaseTextToId)(currentTab.name);
-                    setSelectedTab({
-                        id: id,
-                        name: currentTab.name,
-                        href: hrefPoint + "&view=".concat(id),
-                        type: currentTab.type,
-                        viewType: currentTab.viewType,
-                        viewImage: currentTab.viewImage,
-                        calendarSettings: (_c = currentTab.calendarSettings) !== null && _c !== void 0 ? _c : undefined,
-                        feedsSettings: (_d = currentTab.feedsSettings) !== null && _d !== void 0 ? _d : undefined,
-                        mapSettings: (_e = currentTab.mapSettings) !== null && _e !== void 0 ? _e : undefined,
-                    });
-                    if (listRQueryHocRef.current)
-                        listRQueryHocRef.current.handleRefresh();
-                }
+        var _a, _b, _c, _d;
+        if (props.type === "list" && (selectedTab === null || selectedTab === void 0 ? void 0 : selectedTab.id) !== ((_a = props.organise) === null || _a === void 0 ? void 0 : _a.viewId)) {
+            var currentTab = (0, listModule_1.renderSelectedRefreshTab)(props.localURLEndpoint, props.type, props.collectionId, props.id, (_b = props.organise) === null || _b === void 0 ? void 0 : _b.extendedTabs, (_c = props.organise) === null || _c === void 0 ? void 0 : _c.viewId);
+            setSelectedTab(currentTab);
+            if ((currentTab === null || currentTab === void 0 ? void 0 : currentTab.viewType) === "calendar") {
+                setFilterSearch({});
+                setFilterSearchParams({});
+                (_d = listRQueryHocRef.current) === null || _d === void 0 ? void 0 : _d.handleRefresh();
             }
         }
     }, [
         props.collectionId,
         props.id,
         props.localURLEndpoint,
-        (_u = props.organise) === null || _u === void 0 ? void 0 : _u.extendedTabs,
-        (_v = props.organise) === null || _v === void 0 ? void 0 : _v.viewId,
+        (_w = props.organise) === null || _w === void 0 ? void 0 : _w.extendedTabs,
+        (_x = props.organise) === null || _x === void 0 ? void 0 : _x.viewId,
         props.type,
         selectedTab,
     ]);
@@ -575,18 +560,12 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             }
         }
     };
-    var handleSelectTab = function (id, tabs) {
+    var handleSelectTab = function (id) {
         var _a, _b;
         if (id === "blixify_new_tab") {
             handlePopUpModal(true, id);
         }
         else {
-            if (id === "calendar") {
-                setFilterSearch({});
-                setFilterSearchParams({});
-            }
-            var currentTab = tabs.find(function (eachTab) { return eachTab.id === id; });
-            setSelectedTab(currentTab);
             (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, props.type, props.id, id);
         }
     };
@@ -1368,19 +1347,19 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     }); };
     var handleRemoveSelectedData = function () { return __awaiter(void 0, void 0, void 0, function () {
         var deletable, selectedId_1, deleteIds, res, offlineDataResp, offlineData, selectedIndex_2, err_7;
-        var _a, _b, _c, _d, _e, _f, _g;
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
-                    _h.trys.push([0, 9, , 10]);
+                    _j.trys.push([0, 11, , 12]);
                     deletable = true;
                     selectedId_1 = deleteFeedId || props.id;
                     return [4 /*yield*/, handleCheckDeleteReference([selectedData])];
                 case 1:
-                    deleteIds = _h.sent();
+                    deleteIds = _j.sent();
                     if (deleteIds && deleteIds.length <= 0)
                         deletable = false;
-                    if (!(selectedId_1 && deletable)) return [3 /*break*/, 8];
+                    if (!(selectedId_1 && deletable)) return [3 /*break*/, 10];
                     setLoading(true);
                     setModalVisible(true);
                     setDeleteModal(true);
@@ -1388,7 +1367,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     if (!((_a = props.bareSettings) === null || _a === void 0 ? void 0 : _a.bareOffline)) return [3 /*break*/, 4];
                     return [4 /*yield*/, indexedDb_1.indexedDb.getValue("local", props.collectionId)];
                 case 2:
-                    offlineDataResp = _h.sent();
+                    offlineDataResp = _j.sent();
                     offlineData = (_b = offlineDataResp === null || offlineDataResp === void 0 ? void 0 : offlineDataResp.data) !== null && _b !== void 0 ? _b : [];
                     selectedIndex_2 = -1;
                     offlineData.map(function (eachOfflineData, index) {
@@ -1404,33 +1383,38 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             type: props.collectionId,
                         })];
                 case 3:
-                    _h.sent();
+                    _j.sent();
                     res = true;
                     return [3 /*break*/, 7];
                 case 4: return [4 /*yield*/, handleRemoveImage((_c = devSettings.bucketName) !== null && _c !== void 0 ? _c : "")];
                 case 5:
-                    _h.sent();
+                    _j.sent();
                     return [4 /*yield*/, writeServerQuery.call("delete", { id: selectedId_1 })];
                 case 6:
-                    res = _h.sent();
-                    _h.label = 7;
+                    res = _j.sent();
+                    _j.label = 7;
                 case 7:
-                    if (res) {
-                        handleRefresh();
-                        if (selectedTab) {
-                            (_e = (_d = props.organise) === null || _d === void 0 ? void 0 : _d.handleNavigate) === null || _e === void 0 ? void 0 : _e.call(_d, "list", "", selectedTab.id);
-                        }
-                        else
-                            (_g = (_f = props.organise) === null || _f === void 0 ? void 0 : _f.handleNavigate) === null || _g === void 0 ? void 0 : _g.call(_f, "list", "", "general");
-                    }
-                    _h.label = 8;
-                case 8: return [3 /*break*/, 10];
+                    if (!res) return [3 /*break*/, 10];
+                    if (!((_d = props.bareSettings) === null || _d === void 0 ? void 0 : _d.bareUpdateHandlePostComplete)) return [3 /*break*/, 9];
+                    return [4 /*yield*/, props.bareSettings.bareUpdateHandlePostComplete({})];
+                case 8:
+                    _j.sent();
+                    _j.label = 9;
                 case 9:
-                    err_7 = _h.sent();
+                    handleRefresh();
+                    if (selectedTab) {
+                        (_f = (_e = props.organise) === null || _e === void 0 ? void 0 : _e.handleNavigate) === null || _f === void 0 ? void 0 : _f.call(_e, "list", "", selectedTab.id);
+                    }
+                    else
+                        (_h = (_g = props.organise) === null || _g === void 0 ? void 0 : _g.handleNavigate) === null || _h === void 0 ? void 0 : _h.call(_g, "list", "", "general");
+                    _j.label = 10;
+                case 10: return [3 /*break*/, 12];
+                case 11:
+                    err_7 = _j.sent();
                     setDeleteModal(false);
                     setDeleteFeedId("");
-                    return [3 /*break*/, 10];
-                case 10:
+                    return [3 /*break*/, 12];
+                case 12:
                     setLoading(false);
                     setDeleteModal(false);
                     setModalVisible(false);
@@ -1830,7 +1814,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         });
     }); };
     var handleUploadOfflineData = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var dataUploadedId, offlineDataResp, offlineData, i, eachOfflineData, offlineDataId, res, err_12, success, filteredData;
+        var dataUploadedId, offlineDataResp, offlineData, offlineDataIds, updateDataRes, updateDataList, _loop_1, i, err_12, success, filteredData;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -1841,28 +1825,58 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 case 1:
                     offlineDataResp = _b.sent();
                     offlineData = (_a = offlineDataResp === null || offlineDataResp === void 0 ? void 0 : offlineDataResp.data) !== null && _a !== void 0 ? _a : [];
+                    offlineDataIds = offlineData.map(function (eachData) {
+                        return eachData[serverId];
+                    });
                     _b.label = 2;
                 case 2:
                     _b.trys.push([2, 8, , 9]);
                     if (!(offlineData.length > 0)) return [3 /*break*/, 7];
-                    i = 0;
-                    _b.label = 3;
+                    return [4 /*yield*/, readServerQuery.call({
+                            type: "list",
+                            query: [
+                                {
+                                    type: "in",
+                                    queryId: serverId,
+                                    value: offlineDataIds,
+                                },
+                            ],
+                            stopLimit: true,
+                        })];
                 case 3:
-                    if (!(i < offlineData.length)) return [3 /*break*/, 7];
-                    eachOfflineData = offlineData[i];
-                    return [4 /*yield*/, (0, utils_1.sleep)(300)];
+                    updateDataRes = _b.sent();
+                    updateDataList = updateDataRes === null || updateDataRes === void 0 ? void 0 : updateDataRes.data;
+                    _loop_1 = function (i) {
+                        var eachOfflineData, offlineDataId, isUpdate, res;
+                        return __generator(this, function (_c) {
+                            switch (_c.label) {
+                                case 0:
+                                    eachOfflineData = offlineData[i];
+                                    return [4 /*yield*/, (0, utils_1.sleep)(300)];
+                                case 1:
+                                    _c.sent();
+                                    offlineDataId = eachOfflineData[serverId];
+                                    isUpdate = updateDataList.some(function (eachData) { return eachData[serverId] === offlineDataId; });
+                                    return [4 /*yield*/, handleSubmitData(undefined, undefined, undefined, eachOfflineData, offlineDataId, isUpdate)];
+                                case 2:
+                                    res = _c.sent();
+                                    if (res)
+                                        dataUploadedId.push(offlineDataId);
+                                    return [2 /*return*/];
+                            }
+                        });
+                    };
+                    i = 0;
+                    _b.label = 4;
                 case 4:
-                    _b.sent();
-                    offlineDataId = eachOfflineData[serverId];
-                    return [4 /*yield*/, handleSubmitData(undefined, undefined, undefined, eachOfflineData, offlineDataId)];
+                    if (!(i < offlineData.length)) return [3 /*break*/, 7];
+                    return [5 /*yield**/, _loop_1(i)];
                 case 5:
-                    res = _b.sent();
-                    if (res)
-                        dataUploadedId.push(offlineDataId);
+                    _b.sent();
                     _b.label = 6;
                 case 6:
                     i++;
-                    return [3 /*break*/, 3];
+                    return [3 /*break*/, 4];
                 case 7: return [3 /*break*/, 9];
                 case 8:
                     err_12 = _b.sent();
@@ -1890,7 +1904,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             }
         });
     }); };
-    var handleSubmitData = function (type, rowId, columnId, data, offlineId) { return __awaiter(void 0, void 0, void 0, function () {
+    var handleSubmitData = function (type, rowId, columnId, data, offlineId, isOfflineUpdate) { return __awaiter(void 0, void 0, void 0, function () {
         var selectedId_2, id, createSelectedData_1, uniqueDataStructure, uniqueColumnId, res, offlineDataResp, offlineData, tempData, err_13, offlineDataResp, tempData, selectedIndex_3, offlineData, err_14, dataToSubmit, operationType, selectedIndex_4, dataId, err_15;
         var _a;
         var _b, _c, _d, _e, _f;
@@ -1910,8 +1924,12 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     id = "";
                     if (type === "update")
                         id = rowId !== null && rowId !== void 0 ? rowId : "";
-                    else if (selectedId_2 === "new" && !showId)
-                        id = (0, uuid_1.v4)();
+                    else if (selectedId_2 === "new" && !showId) {
+                        if (idField && selectedData[idField])
+                            id = selectedData[idField];
+                        else
+                            id = (0, uuid_1.v4)();
+                    }
                     else
                         id = (_b = props.id) !== null && _b !== void 0 ? _b : "";
                     if (offlineId) {
@@ -2017,7 +2035,11 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         if (offlineId)
                             dataToSubmit[serverId] = offlineId;
                     }
-                    operationType = offlineId ? "create" : "update";
+                    operationType = isOfflineUpdate
+                        ? "update"
+                        : offlineId
+                            ? "create"
+                            : "update";
                     return [4 /*yield*/, writeServerQuery.call(operationType, {
                             id: selectedId_2,
                             data: dataToSubmit,
@@ -2426,7 +2448,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         }
     };
     var handleStepCSV = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var csvList_1, _loop_1, _i, _a, _b, eachKey, eachValue, valid_1, errorValue_1, excelFormData, response, open_1, err_17;
+        var csvList_1, _loop_2, _i, _a, _b, eachKey, eachValue, valid_1, errorValue_1, excelFormData, response, open_1, err_17;
         var _c, _d, _e, _f, _g, _h, _j, _k;
         return __generator(this, function (_l) {
             switch (_l.label) {
@@ -2441,7 +2463,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 case 1:
                     if (!(stepCSVIndex === 1)) return [3 /*break*/, 3];
                     csvList_1 = [];
-                    _loop_1 = function (eachKey, eachValue) {
+                    _loop_2 = function (eachKey, eachValue) {
                         if (eachKey && eachValue && typeof eachValue === "string") {
                             var selectedModel = props.model.find(function (eachModel) {
                                 return eachModel.id === eachValue;
@@ -2500,7 +2522,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     };
                     for (_i = 0, _a = Object.entries(listCSVMapAttribute); _i < _a.length; _i++) {
                         _b = _a[_i], eachKey = _b[0], eachValue = _b[1];
-                        _loop_1(eachKey, eachValue);
+                        _loop_2(eachKey, eachValue);
                     }
                     valid_1 = true;
                     errorValue_1 = "";
@@ -2719,12 +2741,9 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             }
         }
     };
-    var handleBreadcrumbNavigate = function (pages) {
-        var _a, _b, _c, _d;
-        if (pages === "Calendar")
-            (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "list", "", selectedTab.id);
-        else
-            (_d = (_c = props.organise) === null || _c === void 0 ? void 0 : _c.handleNavigate) === null || _d === void 0 ? void 0 : _d.call(_c, "list", "", "general");
+    var handleBreadcrumbNavigate = function () {
+        var _a, _b;
+        (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "list", "", (selectedTab === null || selectedTab === void 0 ? void 0 : selectedTab.id) ? selectedTab.id : "general");
     };
     //=====================================================================================
     //SECTION: Render CSV
@@ -3011,7 +3030,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         title: "",
                     };
                     var isTitle = true;
-                    var _loop_2 = function (eachKey, eachValue) {
+                    var _loop_3 = function (eachKey, eachValue) {
                         if (eachListObject.objectData) {
                             var model = eachListObject.objectData.find(function (eachAttribute) {
                                 return eachAttribute.id === eachKey;
@@ -3072,7 +3091,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     };
                     for (var _i = 0, _c = Object.entries(eachObject); _i < _c.length; _i++) {
                         var _d = _c[_i], eachKey = _d[0], eachValue = _d[1];
-                        _loop_2(eachKey, eachValue);
+                        _loop_3(eachKey, eachValue);
                     }
                     if (!checkIdExists_1) {
                         delete eachNewList["id"];
@@ -3228,13 +3247,6 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 current: false,
             },
         ];
-        if (selectedTab && selectedTab.viewType === "calendar") {
-            pages.push({
-                name: "Calendar",
-                href: "".concat(props.localURLEndpoint, "?type=list&collection=").concat(props.collectionId),
-                current: false,
-            });
-        }
         switch (props.type) {
             case "read":
                 pages.push({
@@ -3262,7 +3274,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                     react_1.default.createElement("p", { className: "text-xl font-medium" }, props.title),
                                     react_1.default.createElement("span", { className: "text-sm text-gray-500" }, props.description)),
                                 !isBottom && renderActionButtons(props.type))),
-                        schemaPresent && (react_1.default.createElement(tabs_1.Tabs, { tabs: tabs, selectedId: viewType, linkType: props.linkType, custom: props.custom, onClick: function (id) { return handleSelectTab(id, tabs); }, darkMode: (_j = props.organise) === null || _j === void 0 ? void 0 : _j.darkMode })),
+                        schemaPresent && (react_1.default.createElement(tabs_1.Tabs, { tabs: tabs, selectedId: viewType, linkType: props.linkType, custom: props.custom, onClick: function (id) { return handleSelectTab(id); }, darkMode: (_j = props.organise) === null || _j === void 0 ? void 0 : _j.darkMode })),
                         ((_k = props.bareSettings) === null || _k === void 0 ? void 0 : _k.bareReadComponentPos) === "top" &&
                             renderBareReadComp(),
                         !((_l = props.bareSettings) === null || _l === void 0 ? void 0 : _l.bareReadComponentHide) &&
@@ -3395,7 +3407,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                     Transition: (_x = props === null || props === void 0 ? void 0 : props.lib) === null || _x === void 0 ? void 0 : _x.Transition,
                                 } })))),
                     ((_y = props.organise) === null || _y === void 0 ? void 0 : _y.filterComponentNewRow) && (react_1.default.createElement("div", { className: "flex flex-col items-center justify-center my-6 space-y-3 md:space-x-3 md:space-y-0 md:flex-row" }, filterComponent)),
-                    schemaPresent && (react_1.default.createElement(tabs_1.Tabs, { tabs: tabs, selectedId: viewType, linkType: props.linkType, custom: props.custom, onClick: function (id) { return handleSelectTab(id, tabs); }, darkMode: (_z = props.organise) === null || _z === void 0 ? void 0 : _z.darkMode })),
+                    schemaPresent && (react_1.default.createElement(tabs_1.Tabs, { tabs: tabs, selectedId: viewType, linkType: props.linkType, custom: props.custom, onClick: function (id) { return handleSelectTab(id); }, darkMode: (_z = props.organise) === null || _z === void 0 ? void 0 : _z.darkMode })),
                     renderTabContent(tabs, props.type, viewType),
                     isBottom && renderActionButtons(props.type, true)));
             default:
@@ -3595,11 +3607,6 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             } }))), handleSelectAll: handleSelectAllPages, handleSelectedIds: handleSelectIds, header: renderTableHeader(), pageIndex: pageIndex, onClickRow: function (id) {
                         var _a, _b;
                         (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "read", id, "general");
-                        setSelectedTab({
-                            id: "general",
-                            name: props.type === "list" ? "Table View" : "Card View",
-                            href: "".concat(props.localURLEndpoint, "?data=").concat(props.id, "&type=").concat(props.type, "&collection=").concat(props.collectionId, "&view=general"),
-                        });
                     }, linkType: props.linkType, custom: props.custom, newTabUrl: "".concat(props.localURLEndpoint, "?data="), addNewTabUrl: "&type=read&collection=".concat(props.collectionId, "&view=general"), handleUpdatePageIndex: handlePagination, className: "mt-5", lib: { axios: (_d = props.lib) === null || _d === void 0 ? void 0 : _d.axios }, devSettings: props.devSettings, bareSettings: props.bareSettings, editable: {
                         active: ((_e = props.edit) === null || _e === void 0 ? void 0 : _e.listEditable) ? true : false,
                         onUpdateData: function (rowId, columnId, data) { return __awaiter(void 0, void 0, void 0, function () {
@@ -3750,7 +3757,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     }
                     return eventAvailabilities;
                 };
-                return (react_1.default.createElement("div", { className: "mt-4" }, tableLoading ? (react_1.default.createElement(loading_1.Loading, null)) : (react_1.default.createElement(calendar_1.Calendar, { currentDate: calendarTabMonth, calendarView: calendarSettings_1.customPlugin ? "timeGridWeek" : calendarView, handleMonthChange: function (date) {
+                return (react_1.default.createElement("div", { className: "mt-4" }, tableLoading ? (react_1.default.createElement(loading_1.Loading, null)) : (react_1.default.createElement(calendar_1.Calendar, { currentDate: calendarTabMonth, calendarView: (calendarSettings_1 === null || calendarSettings_1 === void 0 ? void 0 : calendarSettings_1.customPlugin) ? "timeGridWeek" : calendarView, handleMonthChange: function (date) {
                         var startOfMonth = (0, moment_1.default)(calendarTabMonth).startOf("month");
                         var endOfMonth = (0, moment_1.default)(calendarTabMonth).endOf("month");
                         if (!(0, moment_1.default)(date).isBetween(startOfMonth, endOfMonth)) {
@@ -3761,7 +3768,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         var _a, _b;
                         if (id)
                             (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "read", id, "general");
-                    }, height: "95vh", dayCellMinHeight: 120, lib: { moment: moment_1.default }, customPlugin: calendarSettings_1.customPlugin }))));
+                    }, height: "95vh", dayCellMinHeight: 120, lib: { moment: moment_1.default }, customPlugin: calendarSettings_1 === null || calendarSettings_1 === void 0 ? void 0 : calendarSettings_1.customPlugin }))));
             }
             else if (selectedTabData.viewType === "feeds") {
                 var contentList_1 = [];
@@ -4295,7 +4302,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     return (react_1.default.createElement(react_1.default.Fragment, null,
         renderNotification("root"),
-        ((_x = (_w = props.renderSettings) === null || _w === void 0 ? void 0 : _w.renderLoadingUI) === null || _x === void 0 ? void 0 : _x.call(_w)) && loading ? ((_y = props.renderSettings) === null || _y === void 0 ? void 0 : _y.renderLoadingUI()) : (react_1.default.createElement(modal_1.Modal, { maxWidth: selectedObjectStructureId || excelModal ? "2xl" : undefined, open: modalVisible, title: renderModalTitle(), renderContent: renderModalContent, onClose: function () {
+        ((_z = (_y = props.renderSettings) === null || _y === void 0 ? void 0 : _y.renderLoadingUI) === null || _z === void 0 ? void 0 : _z.call(_y)) && loading ? ((_0 = props.renderSettings) === null || _0 === void 0 ? void 0 : _0.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;