blixify-ui-web 1.2.58 → 1.2.60

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

@@ -167,7 +167,7 @@ var handleGetWriteErrorMessage = function (response) {
     return "Please contact our administrator for assistance or try your request again later. We apologize for any inconvenience";
 };
 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, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49;
+    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, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50;
     var intialiseDefaultFilterValues = function () {
         var _a;
         var initialFilterSearch = {};
@@ -228,67 +228,67 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             initialFilterReferenceDate: initialFilterReferenceDate,
         };
     };
-    var _50 = intialiseDefaultFilterValues(), initialFilterSearch = _50.initialFilterSearch, initialFilterSearchParams = _50.initialFilterSearchParams, initialFilterSelection = _50.initialFilterSelection, initialFilterReference = _50.initialFilterReference, initialFilterReferenceDate = _50.initialFilterReferenceDate;
+    var _51 = intialiseDefaultFilterValues(), initialFilterSearch = _51.initialFilterSearch, initialFilterSearchParams = _51.initialFilterSearchParams, initialFilterSelection = _51.initialFilterSelection, initialFilterReference = _51.initialFilterReference, initialFilterReferenceDate = _51.initialFilterReferenceDate;
     // INFO: Persist view state hook — handles storage read/write for filter/sort/column state
-    var _51 = (0, viewStatePersistence_1.usePersistedViewState)({
+    var _52 = (0, viewStatePersistence_1.usePersistedViewState)({
         mode: (_a = props.organise) === null || _a === void 0 ? void 0 : _a.persistViewState,
         collectionId: props.collectionId,
         uniqueLabel: props.uniqueLabel,
         type: props.type,
-    }), persistedState = _51.persistedState, isPersistEnabled = _51.isEnabled, handleSaveView = _51.handleSaveView;
-    var _52 = (0, react_1.useState)(false), loading = _52[0], setLoading = _52[1];
-    var _53 = (0, react_1.useState)(), notification = _53[0], setNotification = _53[1];
+    }), persistedState = _52.persistedState, isPersistEnabled = _52.isEnabled, handleSaveView = _52.handleSaveView;
+    var _53 = (0, react_1.useState)(false), loading = _53[0], setLoading = _53[1];
+    var _54 = (0, react_1.useState)(), notification = _54[0], setNotification = _54[1];
     //INFO : Used by List
-    var _54 = (0, react_1.useState)((_b = persistedState === null || persistedState === void 0 ? void 0 : persistedState.filterSearchParams) !== null && _b !== void 0 ? _b : initialFilterSearch), filterSearch = _54[0], setFilterSearch = _54[1];
-    var _55 = (0, react_1.useState)((_c = persistedState === null || persistedState === void 0 ? void 0 : persistedState.filterSearchParams) !== null && _c !== void 0 ? _c : initialFilterSearchParams), filterSearchParams = _55[0], setFilterSearchParams = _55[1];
-    var _56 = (0, react_1.useState)((_d = persistedState === null || persistedState === void 0 ? void 0 : persistedState.filterSelection) !== null && _d !== void 0 ? _d : initialFilterSelection), filterSelection = _56[0], setFilterSelection = _56[1];
-    var _57 = (0, react_1.useState)((_e = persistedState === null || persistedState === void 0 ? void 0 : persistedState.filterReference) !== null && _e !== void 0 ? _e : initialFilterReference), filterReference = _57[0], setFilterReference = _57[1];
-    var _58 = (0, react_1.useState)({}), filterReferenceSearch = _58[0], setFilterReferenceSearch = _58[1];
-    var _59 = (0, react_1.useState)({}), filterReferenceList = _59[0], setFilterReferenceList = _59[1];
-    var _60 = (0, react_1.useState)((persistedState === null || persistedState === void 0 ? void 0 : persistedState.filterReferenceDate)
+    var _55 = (0, react_1.useState)((_b = persistedState === null || persistedState === void 0 ? void 0 : persistedState.filterSearchParams) !== null && _b !== void 0 ? _b : initialFilterSearch), filterSearch = _55[0], setFilterSearch = _55[1];
+    var _56 = (0, react_1.useState)((_c = persistedState === null || persistedState === void 0 ? void 0 : persistedState.filterSearchParams) !== null && _c !== void 0 ? _c : initialFilterSearchParams), filterSearchParams = _56[0], setFilterSearchParams = _56[1];
+    var _57 = (0, react_1.useState)((_d = persistedState === null || persistedState === void 0 ? void 0 : persistedState.filterSelection) !== null && _d !== void 0 ? _d : initialFilterSelection), filterSelection = _57[0], setFilterSelection = _57[1];
+    var _58 = (0, react_1.useState)((_e = persistedState === null || persistedState === void 0 ? void 0 : persistedState.filterReference) !== null && _e !== void 0 ? _e : initialFilterReference), filterReference = _58[0], setFilterReference = _58[1];
+    var _59 = (0, react_1.useState)({}), filterReferenceSearch = _59[0], setFilterReferenceSearch = _59[1];
+    var _60 = (0, react_1.useState)({}), filterReferenceList = _60[0], setFilterReferenceList = _60[1];
+    var _61 = (0, react_1.useState)((persistedState === null || persistedState === void 0 ? void 0 : persistedState.filterReferenceDate)
         ? (0, viewStatePersistence_1.parseDateFilterState)(persistedState.filterReferenceDate)
-        : initialFilterReferenceDate), filterReferenceDate = _60[0], setFilterReferenceDate = _60[1];
-    var _61 = (0, react_1.useState)(true), tableLoading = _61[0], setTableLoading = _61[1];
-    var _62 = (0, react_1.useState)(""), cursor = _62[0], setCursor = _62[1];
-    var _63 = (0, react_1.useState)(""), lastCursor = _63[0], setLastCursor = _63[1];
-    var _64 = (0, react_1.useState)([]), tableData = _64[0], setTableData = _64[1];
-    var _65 = (0, react_1.useState)([]), spaceTableData = _65[0], setSpaceTableData = _65[1];
-    var _66 = (0, react_1.useState)(0), size = _66[0], setSize = _66[1];
-    var _67 = (0, react_1.useState)((_h = (_f = persistedState === null || persistedState === void 0 ? void 0 : persistedState.pageIndex) !== null && _f !== void 0 ? _f : (_g = props.organise) === null || _g === void 0 ? void 0 : _g.pageIndex) !== null && _h !== void 0 ? _h : 0), pageIndex = _67[0], setPageIndex = _67[1];
-    var _68 = (0, react_1.useState)([]), selectedIds = _68[0], setSelectedIds = _68[1];
-    var _69 = (0, react_1.useState)(false), selectAll = _69[0], setSelectAll = _69[1];
-    var _70 = (0, react_1.useState)(""), deletePasscode = _70[0], setDeletePasscode = _70[1];
-    var _71 = (0, react_1.useState)(""), deletePasscodeInput = _71[0], setDeletePasscodeInput = _71[1];
-    var _72 = (0, react_1.useState)(""), deleteFeedId = _72[0], setDeleteFeedId = _72[1];
+        : initialFilterReferenceDate), filterReferenceDate = _61[0], setFilterReferenceDate = _61[1];
+    var _62 = (0, react_1.useState)(true), tableLoading = _62[0], setTableLoading = _62[1];
+    var _63 = (0, react_1.useState)(""), cursor = _63[0], setCursor = _63[1];
+    var _64 = (0, react_1.useState)(""), lastCursor = _64[0], setLastCursor = _64[1];
+    var _65 = (0, react_1.useState)([]), tableData = _65[0], setTableData = _65[1];
+    var _66 = (0, react_1.useState)([]), spaceTableData = _66[0], setSpaceTableData = _66[1];
+    var _67 = (0, react_1.useState)(0), size = _67[0], setSize = _67[1];
+    var _68 = (0, react_1.useState)((_h = (_f = persistedState === null || persistedState === void 0 ? void 0 : persistedState.pageIndex) !== null && _f !== void 0 ? _f : (_g = props.organise) === null || _g === void 0 ? void 0 : _g.pageIndex) !== null && _h !== void 0 ? _h : 0), pageIndex = _68[0], setPageIndex = _68[1];
+    var _69 = (0, react_1.useState)([]), selectedIds = _69[0], setSelectedIds = _69[1];
+    var _70 = (0, react_1.useState)(false), selectAll = _70[0], setSelectAll = _70[1];
+    var _71 = (0, react_1.useState)(""), deletePasscode = _71[0], setDeletePasscode = _71[1];
+    var _72 = (0, react_1.useState)(""), deletePasscodeInput = _72[0], setDeletePasscodeInput = _72[1];
+    var _73 = (0, react_1.useState)(""), deleteFeedId = _73[0], setDeleteFeedId = _73[1];
     //INFO : Used by List Organise
-    var _73 = (0, react_1.useState)(false), sortModal = _73[0], setSortModal = _73[1];
-    var _74 = (0, react_1.useState)(false), filterModal = _74[0], setFilterModal = _74[1];
+    var _74 = (0, react_1.useState)(false), sortModal = _74[0], setSortModal = _74[1];
+    var _75 = (0, react_1.useState)(false), filterModal = _75[0], setFilterModal = _75[1];
     // INFO: Internal sort state that overrides props.organise?.sort when
     // persistViewState is enabled and a persisted sort exists
-    var _75 = (0, react_1.useState)((_j = persistedState === null || persistedState === void 0 ? void 0 : persistedState.sort) !== null && _j !== void 0 ? _j : undefined), persistedSort = _75[0], setPersistedSort = _75[1];
-    var _76 = (0, react_1.useState)(false), filterDraft = _76[0], setFilterDraft = _76[1];
-    var _77 = (0, react_1.useState)(false), addTabModal = _77[0], setAddTabModal = _77[1];
-    var _78 = (0, react_1.useState)(false), overviewModal = _78[0], setOverviewModal = _78[1];
+    var _76 = (0, react_1.useState)((_j = persistedState === null || persistedState === void 0 ? void 0 : persistedState.sort) !== null && _j !== void 0 ? _j : undefined), persistedSort = _76[0], setPersistedSort = _76[1];
+    var _77 = (0, react_1.useState)(false), filterDraft = _77[0], setFilterDraft = _77[1];
+    var _78 = (0, react_1.useState)(false), addTabModal = _78[0], setAddTabModal = _78[1];
+    var _79 = (0, react_1.useState)(false), overviewModal = _79[0], setOverviewModal = _79[1];
     //INFO : resolve the initial tab synchronously so the mount cond is already
     // tab-scoped — an empty initial tab caused a second wasted list fetch
-    var _79 = (0, react_1.useState)(function () {
+    var _80 = (0, react_1.useState)(function () {
         var _a, _b;
         return (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);
-    }), selectedTab = _79[0], setSelectedTab = _79[1];
-    var _80 = (0, react_1.useState)("dayGridMonth"), calendarView = _80[0], setCalendarView = _80[1];
+    }), selectedTab = _80[0], setSelectedTab = _80[1];
+    var _81 = (0, react_1.useState)("dayGridMonth"), calendarView = _81[0], setCalendarView = _81[1];
     // INFO: bareNewDTW calendar viewSwitch mode — drives the NewCalendar variant
     // (calendarView above drives the matching range query)
-    var _81 = (0, react_1.useState)("month"), newCalendarViewMode = _81[0], setNewCalendarViewMode = _81[1];
-    var _82 = (0, react_1.useState)(new Date()), calendarTabMonth = _82[0], setCalendarTabMonth = _82[1];
-    var _83 = (0, react_1.useState)(true), kanbanDroppable = _83[0], setKanbanDroppable = _83[1];
-    var _84 = (0, react_1.useState)([]), kanbanOptions = _84[0], setKanbanOptions = _84[1];
-    var _85 = (0, react_1.useState)(false), queryForm = _85[0], setQueryForm = _85[1];
-    var _86 = (0, react_1.useState)(false), batchUpdateModal = _86[0], setBatchUpdateModal = _86[1];
-    var _87 = (0, react_1.useState)({
+    var _82 = (0, react_1.useState)("month"), newCalendarViewMode = _82[0], setNewCalendarViewMode = _82[1];
+    var _83 = (0, react_1.useState)(new Date()), calendarTabMonth = _83[0], setCalendarTabMonth = _83[1];
+    var _84 = (0, react_1.useState)(true), kanbanDroppable = _84[0], setKanbanDroppable = _84[1];
+    var _85 = (0, react_1.useState)([]), kanbanOptions = _85[0], setKanbanOptions = _85[1];
+    var _86 = (0, react_1.useState)(false), queryForm = _86[0], setQueryForm = _86[1];
+    var _87 = (0, react_1.useState)(false), batchUpdateModal = _87[0], setBatchUpdateModal = _87[1];
+    var _88 = (0, react_1.useState)({
         columnId: "",
         columnData: {},
-    }), batchUpdateData = _87[0], setBatchUpdateData = _87[1];
-    var _88 = (0, react_1.useState)(function () {
+    }), batchUpdateData = _88[0], setBatchUpdateData = _88[1];
+    var _89 = (0, react_1.useState)(function () {
         var baseModel = (props === null || props === void 0 ? void 0 : props.model) || [];
         if (!persistedState)
             return baseModel;
@@ -314,8 +314,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             });
         }
         return model;
-    }), structure = _88[0], setStructure = _88[1];
-    var _89 = (0, react_1.useState)(((_k = props === null || props === void 0 ? void 0 : props.organise) === null || _k === void 0 ? void 0 : _k.additionalQuery) || []), additionalQuery = _89[0], setAdditionalQuery = _89[1];
+    }), structure = _89[0], setStructure = _89[1];
+    var _90 = (0, react_1.useState)(((_k = props === null || props === void 0 ? void 0 : props.organise) === null || _k === void 0 ? void 0 : _k.additionalQuery) || []), additionalQuery = _90[0], setAdditionalQuery = _90[1];
     // INFO: State for user-configurable flex filters (Monday.com-style)
     // INFO: Initialize with one empty row so users see inputs immediately without clicking "Add Filter"
     var defaultFlexFilterRow = [
@@ -326,97 +326,105 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             value: undefined,
         },
     ];
-    var _90 = (0, react_1.useState)((persistedState === null || persistedState === void 0 ? void 0 : persistedState.flexFilters) && persistedState.flexFilters.length > 0
+    var _91 = (0, react_1.useState)((persistedState === null || persistedState === void 0 ? void 0 : persistedState.flexFilters) && persistedState.flexFilters.length > 0
         ? persistedState.flexFilters
-        : defaultFlexFilterRow), flexFilters = _90[0], setFlexFilters = _90[1];
+        : defaultFlexFilterRow), flexFilters = _91[0], setFlexFilters = _91[1];
     // INFO: Debounced version of flexFilters used by renderImpSearchFilterConditions
     // to prevent API calls on every keystroke when typing in value inputs
-    var _91 = (0, react_1.useState)((persistedState === null || persistedState === void 0 ? void 0 : persistedState.flexFilters) && persistedState.flexFilters.length > 0
+    var _92 = (0, react_1.useState)((persistedState === null || persistedState === void 0 ? void 0 : persistedState.flexFilters) && persistedState.flexFilters.length > 0
         ? persistedState.flexFilters
-        : defaultFlexFilterRow), flexFiltersDebounced = _91[0], setFlexFiltersDebounced = _91[1];
-    var _92 = (0, react_1.useState)({}), flexFilterReferenceOptions = _92[0], setFlexFilterReferenceOptions = _92[1];
-    var _93 = (0, react_1.useState)({}), flexFilterReferenceSearch = _93[0], setFlexFilterReferenceSearch = _93[1];
-    var _94 = (0, react_1.useState)(false), flexFilterModalOpen = _94[0], setFlexFilterModalOpen = _94[1];
+        : defaultFlexFilterRow), flexFiltersDebounced = _92[0], setFlexFiltersDebounced = _92[1];
+    var _93 = (0, react_1.useState)({}), flexFilterReferenceOptions = _93[0], setFlexFilterReferenceOptions = _93[1];
+    var _94 = (0, react_1.useState)({}), flexFilterReferenceSearch = _94[0], setFlexFilterReferenceSearch = _94[1];
+    var _95 = (0, react_1.useState)(false), flexFilterModalOpen = _95[0], setFlexFilterModalOpen = _95[1];
+    // INFO: Columns the end user chose to hide (organise.hideColumnEnabled).
+    // Deliberately kept out of `structure`: the props-sync effect below resets
+    // structure to props.model whenever props change, which would wipe the
+    // choice, and the persist effect derives schema-level hiddenColumnIds from
+    // structure — writing user hides there would blur the two concepts.
+    var _96 = (0, react_1.useState)((_l = persistedState === null || persistedState === void 0 ? void 0 : persistedState.userHiddenColumnIds) !== null && _l !== void 0 ? _l : []), userHiddenColumnIds = _96[0], setUserHiddenColumnIds = _96[1];
     //INFO : Used by Auth
-    var _95 = (0, react_1.useState)({
+    var _97 = (0, react_1.useState)({
         email: "",
         google: "",
         phone: "",
         disabled: false,
         create: false,
-    }), authMethods = _95[0], setAuthMethods = _95[1];
-    var _96 = (0, react_1.useState)(""), selectedAuthMethod = _96[0], setSelectedAuthMethod = _96[1];
+    }), authMethods = _97[0], setAuthMethods = _97[1];
+    var _98 = (0, react_1.useState)(""), selectedAuthMethod = _98[0], setSelectedAuthMethod = _98[1];
     // INFO: Used by Activity Log
-    var _97 = (0, react_1.useState)(false), activityModal = _97[0], setActivityModal = _97[1];
-    var _98 = (0, react_1.useState)(""), activityId = _98[0], setActivityId = _98[1];
+    var _99 = (0, react_1.useState)(false), activityModal = _99[0], setActivityModal = _99[1];
+    var _100 = (0, react_1.useState)(""), activityId = _100[0], setActivityId = _100[1];
     //INFO : Used by Export
-    var _99 = (0, react_1.useState)(null), csvFile = _99[0], setCSVFile = _99[1];
-    var _100 = (0, react_1.useState)([]), csvFileData = _100[0], setCSVFileData = _100[1];
-    var _101 = (0, react_1.useState)(0), stepCSVIndex = _101[0], setStepCSVIndex = _101[1];
-    var _102 = (0, react_1.useState)({}), listCSVMapAttribute = _102[0], setListCSVMapAttribute = _102[1];
-    var _103 = (0, react_1.useState)({}), listCSVObjAttribute = _103[0], setListCSVObjAttribute = _103[1];
-    var _104 = (0, react_1.useState)([]), csvAPIAttribute = _104[0], setCSVAPIAttribute = _104[1];
-    var _105 = (0, react_1.useState)(((_l = props.devSettings.currentUser) === null || _l === void 0 ? void 0 : _l.userEmail) || ""), exportCSVEmail = _105[0], setExportCSVEmail = _105[1];
-    var _106 = (0, react_1.useState)(((_o = (_m = props.organise) === null || _m === void 0 ? void 0 : _m.exportSettings) === null || _o === void 0 ? void 0 : _o.defaultExportPDFName) || ""), exportPDFTitle = _106[0], setExportPDFTitle = _106[1];
-    var _107 = (0, react_1.useState)(false), exportPDFLoading = _107[0], setExportPDFLoading = _107[1];
-    var _108 = (0, react_1.useState)(false), exportReadPDFLoading = _108[0], setExportReadPDFLoading = _108[1];
-    var _109 = (0, react_1.useState)((_r = (_q = (_p = props.organise) === null || _p === void 0 ? void 0 : _p.exportSettings) === null || _q === void 0 ? void 0 : _q.sumColumnId) !== null && _r !== void 0 ? _r : []), exportSumAttributeIds = _109[0], setExportSumAttributeIds = _109[1];
-    var _110 = (0, react_1.useState)((_u = (_t = (_s = props.organise) === null || _s === void 0 ? void 0 : _s.exportSettings) === null || _t === void 0 ? void 0 : _t.hideSubItems) !== null && _u !== void 0 ? _u : false), hideSubItems = _110[0], setHideSubItems = _110[1];
-    var _111 = (0, react_1.useState)([]), importTableData = _111[0], setImportTableData = _111[1];
-    var _112 = (0, react_1.useState)([]), queryList = _112[0], setQueryList = _112[1];
-    var _113 = (0, react_1.useState)(undefined), allQueryList = _113[0], setAllQueryList = _113[1];
-    var _114 = (0, react_1.useState)(-1), queryIndex = _114[0], setQueryIndex = _114[1];
-    var _115 = (0, react_1.useState)((_v = props.organise) === null || _v === void 0 ? void 0 : _v.groupBy), groupId = _115[0], setGroupId = _115[1];
-    var _116 = (0, react_1.useState)(""), readTabSection = _116[0], setReadTabSection = _116[1];
-    var _117 = (0, react_1.useState)(false), readFloatingNav = _117[0], setReadFloatingNav = _117[1];
+    var _101 = (0, react_1.useState)(null), csvFile = _101[0], setCSVFile = _101[1];
+    var _102 = (0, react_1.useState)([]), csvFileData = _102[0], setCSVFileData = _102[1];
+    var _103 = (0, react_1.useState)(0), stepCSVIndex = _103[0], setStepCSVIndex = _103[1];
+    var _104 = (0, react_1.useState)({}), listCSVMapAttribute = _104[0], setListCSVMapAttribute = _104[1];
+    var _105 = (0, react_1.useState)({}), listCSVObjAttribute = _105[0], setListCSVObjAttribute = _105[1];
+    var _106 = (0, react_1.useState)([]), csvAPIAttribute = _106[0], setCSVAPIAttribute = _106[1];
+    var _107 = (0, react_1.useState)(((_m = props.devSettings.currentUser) === null || _m === void 0 ? void 0 : _m.userEmail) || ""), exportCSVEmail = _107[0], setExportCSVEmail = _107[1];
+    var _108 = (0, react_1.useState)(((_p = (_o = props.organise) === null || _o === void 0 ? void 0 : _o.exportSettings) === null || _p === void 0 ? void 0 : _p.defaultExportPDFName) || ""), exportPDFTitle = _108[0], setExportPDFTitle = _108[1];
+    var _109 = (0, react_1.useState)(false), exportPDFLoading = _109[0], setExportPDFLoading = _109[1];
+    var _110 = (0, react_1.useState)(false), exportReadPDFLoading = _110[0], setExportReadPDFLoading = _110[1];
+    var _111 = (0, react_1.useState)((_s = (_r = (_q = props.organise) === null || _q === void 0 ? void 0 : _q.exportSettings) === null || _r === void 0 ? void 0 : _r.sumColumnId) !== null && _s !== void 0 ? _s : []), exportSumAttributeIds = _111[0], setExportSumAttributeIds = _111[1];
+    var _112 = (0, react_1.useState)((_v = (_u = (_t = props.organise) === null || _t === void 0 ? void 0 : _t.exportSettings) === null || _u === void 0 ? void 0 : _u.hideSubItems) !== null && _v !== void 0 ? _v : false), hideSubItems = _112[0], setHideSubItems = _112[1];
+    var _113 = (0, react_1.useState)([]), importTableData = _113[0], setImportTableData = _113[1];
+    var _114 = (0, react_1.useState)([]), queryList = _114[0], setQueryList = _114[1];
+    var _115 = (0, react_1.useState)(undefined), allQueryList = _115[0], setAllQueryList = _115[1];
+    var _116 = (0, react_1.useState)(-1), queryIndex = _116[0], setQueryIndex = _116[1];
+    var _117 = (0, react_1.useState)((_w = props.organise) === null || _w === void 0 ? void 0 : _w.groupBy), groupId = _117[0], setGroupId = _117[1];
+    var _118 = (0, react_1.useState)(""), readTabSection = _118[0], setReadTabSection = _118[1];
+    var _119 = (0, react_1.useState)(false), readFloatingNav = _119[0], setReadFloatingNav = _119[1];
     var readTabSectionRefs = (0, react_1.useRef)({});
     //INFO : Used by Read
     //INFO : Used by Update
-    var _118 = (0, react_1.useState)(false), modalVisible = _118[0], setModalVisible = _118[1];
-    var _119 = (0, react_1.useState)(false), deleteModal = _119[0], setDeleteModal = _119[1];
-    var _120 = (0, react_1.useState)(false), excelModal = _120[0], setExcelModal = _120[1];
-    var _121 = (0, react_1.useState)(false), exportExcel = _121[0], setExportExcel = _121[1];
-    var _122 = (0, react_1.useState)(""), exportType = _122[0], setExportType = _122[1];
-    var _123 = (0, react_1.useState)(false), exportQR = _123[0], setExportQR = _123[1];
-    var _124 = (0, react_1.useState)(function () {
+    var _120 = (0, react_1.useState)(false), modalVisible = _120[0], setModalVisible = _120[1];
+    var _121 = (0, react_1.useState)(false), deleteModal = _121[0], setDeleteModal = _121[1];
+    var _122 = (0, react_1.useState)(false), excelModal = _122[0], setExcelModal = _122[1];
+    var _123 = (0, react_1.useState)(false), exportExcel = _123[0], setExportExcel = _123[1];
+    var _124 = (0, react_1.useState)(""), exportType = _124[0], setExportType = _124[1];
+    var _125 = (0, react_1.useState)(false), exportQR = _125[0], setExportQR = _125[1];
+    var _126 = (0, react_1.useState)(function () {
         var _a, _b;
         var firstTabId = (_b = (_a = structure.find(function (item) { return item.tabId; })) === null || _a === void 0 ? void 0 : _a.tabId) !== null && _b !== void 0 ? _b : "";
         return firstTabId;
-    }), activeTab = _124[0], setActiveTab = _124[1];
-    var _125 = (0, react_1.useState)(false), signatureSigning = _125[0], setSignatureSigning = _125[1];
-    var _126 = (0, react_1.useState)({}), selectedData = _126[0], setSelectedData = _126[1];
-    var _127 = (0, react_1.useState)(""), selectedObjectStructureId = _127[0], setSelectedObjectStructureId = _127[1];
-    var _128 = (0, react_1.useState)(""), selectedObjectId = _128[0], setSelectedObjectId = _128[1];
-    var _129 = (0, react_1.useState)(""), selectedListAddressId = _129[0], setSelectedListAddressId = _129[1];
-    var _130 = (0, react_1.useState)(-1), selectedListAddressIndex = _130[0], setSelectedListAddressIndex = _130[1];
-    var _131 = (0, react_1.useState)({
+    }), activeTab = _126[0], setActiveTab = _126[1];
+    var _127 = (0, react_1.useState)(false), signatureSigning = _127[0], setSignatureSigning = _127[1];
+    var _128 = (0, react_1.useState)({}), selectedData = _128[0], setSelectedData = _128[1];
+    var _129 = (0, react_1.useState)(""), selectedObjectStructureId = _129[0], setSelectedObjectStructureId = _129[1];
+    var _130 = (0, react_1.useState)(""), selectedObjectId = _130[0], setSelectedObjectId = _130[1];
+    var _131 = (0, react_1.useState)(""), selectedListAddressId = _131[0], setSelectedListAddressId = _131[1];
+    var _132 = (0, react_1.useState)(-1), selectedListAddressIndex = _132[0], setSelectedListAddressIndex = _132[1];
+    var _133 = (0, react_1.useState)({
         lat: 0,
         lng: 0,
         name: "",
-    }), selectedListAddress = _131[0], setSelectedListAddress = _131[1];
-    var _132 = (0, react_1.useState)({}), selectedObjectData = _132[0], setSelectedObjectData = _132[1];
-    var _133 = (0, react_1.useState)(false), referenceLoading = _133[0], setReferenceLoading = _133[1];
-    var _134 = (0, react_1.useState)({}), referencesOptions = _134[0], setReferencesOptions = _134[1];
-    var _135 = (0, react_1.useState)({}), referencesDetails = _135[0], setReferencesDetails = _135[1];
-    var _136 = (0, react_1.useState)({}), referenceDeleteTableData = _136[0], setReferenceDeleteTableData = _136[1];
-    var _137 = (0, react_1.useState)(0), referenceDeleteIndex = _137[0], setReferenceDeleteIndex = _137[1];
-    var _138 = (0, react_1.useState)({
+    }), selectedListAddress = _133[0], setSelectedListAddress = _133[1];
+    var _134 = (0, react_1.useState)({}), selectedObjectData = _134[0], setSelectedObjectData = _134[1];
+    var _135 = (0, react_1.useState)(null), objectCellEdit = _135[0], setObjectCellEdit = _135[1];
+    var _136 = (0, react_1.useState)(false), referenceLoading = _136[0], setReferenceLoading = _136[1];
+    var _137 = (0, react_1.useState)({}), referencesOptions = _137[0], setReferencesOptions = _137[1];
+    var _138 = (0, react_1.useState)({}), referencesDetails = _138[0], setReferencesDetails = _138[1];
+    var _139 = (0, react_1.useState)({}), listReferencesOptions = _139[0], setListReferencesOptions = _139[1];
+    var _140 = (0, react_1.useState)({}), referenceDeleteTableData = _140[0], setReferenceDeleteTableData = _140[1];
+    var _141 = (0, react_1.useState)(0), referenceDeleteIndex = _141[0], setReferenceDeleteIndex = _141[1];
+    var _142 = (0, react_1.useState)({
         id: "",
         name: "",
         type: "string",
-    }), referenceCreationModal = _138[0], setReferenceCreationModal = _138[1];
-    var _139 = (0, react_1.useState)({}), referenceModelSchema = _139[0], setReferenceSchema = _139[1];
-    var _140 = (0, react_1.useState)([]), kanbanChecked = _140[0], setKanbanChecked = _140[1];
+    }), referenceCreationModal = _142[0], setReferenceCreationModal = _142[1];
+    var _143 = (0, react_1.useState)({}), referenceModelSchema = _143[0], setReferenceSchema = _143[1];
+    var _144 = (0, react_1.useState)([]), kanbanChecked = _144[0], setKanbanChecked = _144[1];
     //INFO : Offline
-    var _141 = (0, react_1.useState)(0), offlineDataLength = _141[0], setOfflineDataLength = _141[1];
-    var _142 = (0, react_1.useState)(false), offlineModal = _142[0], setOfflineModal = _142[1];
+    var _145 = (0, react_1.useState)(0), offlineDataLength = _145[0], setOfflineDataLength = _145[1];
+    var _146 = (0, react_1.useState)(false), offlineModal = _146[0], setOfflineModal = _146[1];
     // INFO: live-stream state — driven by socket connection and navigator.onLine
-    var _143 = (0, react_1.useState)(false), isLive = _143[0], setIsLive = _143[1];
-    var _144 = (0, react_1.useState)(false), isLiveOffline = _144[0], setIsLiveOffline = _144[1];
+    var _147 = (0, react_1.useState)(false), isLive = _147[0], setIsLive = _147[1];
+    var _148 = (0, react_1.useState)(false), isLiveOffline = _148[0], setIsLiveOffline = _148[1];
     // INFO: true when navigator is offline — used to switch ReadQueryHoc between
     // server reads (online, full pagination) and IndexedDB reads (offline, cached data).
     // Independent of SSE status so it works even when bareSocketName is not set.
-    var _145 = (0, react_1.useState)(typeof navigator !== "undefined" ? !navigator.onLine : false), isNetworkOffline = _145[0], setIsNetworkOffline = _145[1];
+    var _149 = (0, react_1.useState)(typeof navigator !== "undefined" ? !navigator.onLine : false), isNetworkOffline = _149[0], setIsNetworkOffline = _149[1];
     var previousType = (0, react_1.useRef)(null);
     var previousSelectedData = (0, react_1.useRef)(null);
     var scrollSentinelRef = (0, react_1.useRef)(null);
@@ -492,47 +500,47 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     var isSubmittingRef = (0, react_1.useRef)(false);
     var devSettings = props.devSettings;
     var serverId = (0, utils_1.parseServerId)(devSettings.server);
-    var viewType = (_x = (_w = props.organise) === null || _w === void 0 ? void 0 : _w.viewId) !== null && _x !== void 0 ? _x : "general";
+    var viewType = (_y = (_x = props.organise) === null || _x === void 0 ? void 0 : _x.viewId) !== null && _y !== void 0 ? _y : "general";
     var isFirebaseClient = devSettings.server === "firebase";
     var isFirebase = isFirebaseClient || devSettings.server === "fbServer";
-    var dbModule = isFirebaseClient ? (_y = props.lib) === null || _y === void 0 ? void 0 : _y.firebase : (_z = props.lib) === null || _z === void 0 ? void 0 : _z.axios;
+    var dbModule = isFirebaseClient ? (_z = props.lib) === null || _z === void 0 ? void 0 : _z.firebase : (_0 = props.lib) === null || _0 === void 0 ? void 0 : _0.axios;
     var schemaPresent = props.devSettings.schemaEndpoint ? true : false;
     var limit = props.limit ? props.limit : 10;
-    var activeSortId = (isPersistEnabled && persistedSort) || ((_0 = props.organise) === null || _0 === void 0 ? void 0 : _0.sort);
+    var activeSortId = (isPersistEnabled && persistedSort) || ((_1 = props.organise) === null || _1 === void 0 ? void 0 : _1.sort);
     var handleSortColumn = function (value) {
         var _a, _b;
         if (isPersistEnabled)
             setPersistedSort(value);
         (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.onChangeSort) === null || _b === void 0 ? void 0 : _b.call(_a, value);
     };
-    var isEditor = ((_1 = props.edit) === null || _1 === void 0 ? void 0 : _1.allEditable) ? true : false;
-    var isOffline = (_2 = props.bareSettings) === null || _2 === void 0 ? void 0 : _2.bareOffline;
+    var isEditor = ((_2 = props.edit) === null || _2 === void 0 ? void 0 : _2.allEditable) ? true : false;
+    var isOffline = (_3 = props.bareSettings) === null || _3 === void 0 ? void 0 : _3.bareOffline;
     // INFO: when bareOfflineNetworkAware is true, the save path is also gated on
     // the live network state — online saves go to the server even if bareOffline
     // is true, offline saves go to IDB as normal.
-    var isOfflineNetworkListener = isOffline && ((_3 = props.bareSettings) === null || _3 === void 0 ? void 0 : _3.bareOfflineNetworkListener);
-    var showId = (_4 = props.space) === null || _4 === void 0 ? void 0 : _4.showId;
+    var isOfflineNetworkListener = isOffline && ((_4 = props.bareSettings) === null || _4 === void 0 ? void 0 : _4.bareOfflineNetworkListener);
+    var showId = (_5 = props.space) === null || _5 === void 0 ? void 0 : _5.showId;
     var remainId = showId || selectedObjectStructureId ? true : false;
-    var idField = ((_5 = props.space) === null || _5 === void 0 ? void 0 : _5.idField) || ((_6 = props.organise) === null || _6 === void 0 ? void 0 : _6.idField);
-    var pipeline = (_7 = props === null || props === void 0 ? void 0 : props.space) === null || _7 === void 0 ? void 0 : _7.pipeline;
-    if ((_8 = props.bareSettings) === null || _8 === void 0 ? void 0 : _8.bareListPipeline) {
+    var idField = ((_6 = props.space) === null || _6 === void 0 ? void 0 : _6.idField) || ((_7 = props.organise) === null || _7 === void 0 ? void 0 : _7.idField);
+    var pipeline = (_8 = props === null || props === void 0 ? void 0 : props.space) === null || _8 === void 0 ? void 0 : _8.pipeline;
+    if ((_9 = props.bareSettings) === null || _9 === void 0 ? void 0 : _9.bareListPipeline) {
         pipeline = pipeline
             ? __spreadArray(__spreadArray([], pipeline, true), props.bareSettings.bareListPipeline, true) : props.bareSettings.bareListPipeline;
     }
-    var hasNavigation = ((_9 = props.organise) === null || _9 === void 0 ? void 0 : _9.handleNavigate) ? true : false;
+    var hasNavigation = ((_10 = props.organise) === null || _10 === void 0 ? void 0 : _10.handleNavigate) ? true : false;
     var formColumn = "grid-cols-12";
-    var useMobileView = (_11 = (_10 = props.bareSettings) === null || _10 === void 0 ? void 0 : _10.bareUpdateMobileView) !== null && _11 !== void 0 ? _11 : false;
+    var useMobileView = (_12 = (_11 = props.bareSettings) === null || _11 === void 0 ? void 0 : _11.bareUpdateMobileView) !== null && _12 !== void 0 ? _12 : false;
     var gridGap = useMobileView ? "gap-x-6 gap-y-2 md:gap-y-6" : "gap-6";
-    var isActivityLog = (((_13 = (_12 = props.edit) === null || _12 === void 0 ? void 0 : _12.activityLog) === null || _13 === void 0 ? void 0 : _13.enableComments) &&
-        ((_14 = props.edit) === null || _14 === void 0 ? void 0 : _14.activityLog.commentCollectionId)) ||
-        (((_16 = (_15 = props.edit) === null || _15 === void 0 ? void 0 : _15.activityLog) === null || _16 === void 0 ? void 0 : _16.enableLogs) &&
-            ((_17 = props.edit) === null || _17 === void 0 ? void 0 : _17.activityLog.logsCollectionId));
-    var customPaginationSize = ((_18 = props.organise) === null || _18 === void 0 ? void 0 : _18.customPaginationCount)
+    var isActivityLog = (((_14 = (_13 = props.edit) === null || _13 === void 0 ? void 0 : _13.activityLog) === null || _14 === void 0 ? void 0 : _14.enableComments) &&
+        ((_15 = props.edit) === null || _15 === void 0 ? void 0 : _15.activityLog.commentCollectionId)) ||
+        (((_17 = (_16 = props.edit) === null || _16 === void 0 ? void 0 : _16.activityLog) === null || _17 === void 0 ? void 0 : _17.enableLogs) &&
+            ((_18 = props.edit) === null || _18 === void 0 ? void 0 : _18.activityLog.logsCollectionId));
+    var customPaginationSize = ((_19 = props.organise) === null || _19 === void 0 ? void 0 : _19.customPaginationCount)
         ? props.organise.customPaginationCount(size)
         : undefined;
     //TODO : Code - Pass ...devSettings, search dbEndpoint:
     var writeServerQuery = new writeQuery_1.WriteQuery({
-        dbModule: (_19 = props.lib) === null || _19 === void 0 ? void 0 : _19.axios,
+        dbModule: (_20 = props.lib) === null || _20 === void 0 ? void 0 : _20.axios,
         dbType: devSettings.server,
         dbCollection: props.collectionId,
         dbEndpoint: devSettings.dbEndpoint,
@@ -540,7 +548,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         dbUserToken: devSettings.dbUserToken,
     });
     var readServerQuery = new readQuery_1.ReadQuery({
-        dbModule: (_20 = props.lib) === null || _20 === void 0 ? void 0 : _20.axios,
+        dbModule: (_21 = props.lib) === null || _21 === void 0 ? void 0 : _21.axios,
         dbType: devSettings.server,
         dbCollection: props.collectionId,
         dbEndpoint: devSettings.dbEndpoint,
@@ -548,9 +556,9 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         dbUserToken: devSettings.dbUserToken,
     });
     var moreButtonPopUp = [
-        ((_21 = props.edit) === null || _21 === void 0 ? void 0 : _21.allEditable) &&
+        ((_22 = props.edit) === null || _22 === void 0 ? void 0 : _22.allEditable) &&
             !isFirebase &&
-            !((_23 = (_22 = props.organise) === null || _22 === void 0 ? void 0 : _22.exportSettings) === null || _23 === void 0 ? void 0 : _23.hideImportCSV)
+            !((_24 = (_23 = props.organise) === null || _23 === void 0 ? void 0 : _23.exportSettings) === null || _24 === void 0 ? void 0 : _24.hideImportCSV)
             ? {
                 text: "Import Excel",
                 onClick: function () {
@@ -559,7 +567,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_25 = (_24 = props.organise) === null || _24 === void 0 ? void 0 : _24.exportSettings) === null || _25 === void 0 ? void 0 : _25.hideExportCSV)
+        !((_26 = (_25 = props.organise) === null || _25 === void 0 ? void 0 : _25.exportSettings) === null || _26 === void 0 ? void 0 : _26.hideExportCSV)
             ? {
                 text: "Export CSV",
                 onClick: function () {
@@ -569,7 +577,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_27 = (_26 = props.organise) === null || _26 === void 0 ? void 0 : _26.exportSettings) === null || _27 === void 0 ? void 0 : _27.hideExportExcel)
+        !((_28 = (_27 = props.organise) === null || _27 === void 0 ? void 0 : _27.exportSettings) === null || _28 === void 0 ? void 0 : _28.hideExportExcel)
             ? {
                 text: "Export Excel",
                 onClick: function () {
@@ -579,7 +587,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_29 = (_28 = props.organise) === null || _28 === void 0 ? void 0 : _28.exportSettings) === null || _29 === void 0 ? void 0 : _29.hideExportPDF)
+        !((_30 = (_29 = props.organise) === null || _29 === void 0 ? void 0 : _29.exportSettings) === null || _30 === void 0 ? void 0 : _30.hideExportPDF)
             ? {
                 text: "Export PDF",
                 onClick: function () {
@@ -589,7 +597,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_31 = (_30 = props.organise) === null || _30 === void 0 ? void 0 : _30.exportSettings) === null || _31 === void 0 ? void 0 : _31.hideExportQR)
+        !((_32 = (_31 = props.organise) === null || _31 === void 0 ? void 0 : _31.exportSettings) === null || _32 === void 0 ? void 0 : _32.hideExportQR)
             ? {
                 text: "Export QR",
                 onClick: function () {
@@ -599,7 +607,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_33 = (_32 = props.organise) === null || _32 === void 0 ? void 0 : _32.exportSettings) === null || _33 === void 0 ? void 0 : _33.hideExportQR)
+        !((_34 = (_33 = props.organise) === null || _33 === void 0 ? void 0 : _33.exportSettings) === null || _34 === void 0 ? void 0 : _34.hideExportQR)
             ? {
                 text: "Export QR(Data)",
                 onClick: function () {
@@ -609,7 +617,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_35 = (_34 = props.organise) === null || _34 === void 0 ? void 0 : _34.exportSettings) === null || _35 === void 0 ? void 0 : _35.hideExportPrint)
+        !((_36 = (_35 = props.organise) === null || _35 === void 0 ? void 0 : _35.exportSettings) === null || _36 === void 0 ? void 0 : _36.hideExportPrint)
             ? {
                 text: "Print",
                 onClick: function () {
@@ -619,7 +627,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 },
             }
             : null,
-        !((_37 = (_36 = props.organise) === null || _36 === void 0 ? void 0 : _36.exportSettings) === null || _37 === void 0 ? void 0 : _37.hideExportDraft)
+        !((_38 = (_37 = props.organise) === null || _37 === void 0 ? void 0 : _37.exportSettings) === null || _38 === void 0 ? void 0 : _38.hideExportDraft)
             ? {
                 text: filterDraft ? "Show All Items" : "Filter Draft",
                 onClick: function () {
@@ -628,9 +636,22 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             }
             : null,
     ].filter(Boolean);
-    if ((_38 = props.organise) === null || _38 === void 0 ? void 0 : _38.moreSettings)
+    if ((_39 = props.organise) === null || _39 === void 0 ? void 0 : _39.moreSettings)
         moreButtonPopUp = moreButtonPopUp.concat(props.organise.moreSettings);
     //=====================================================================================
+    //SECTION: User Column Visibility Handlers
+    //=====================================================================================
+    var handleToggleUserHiddenColumn = function (columnId) {
+        setUserHiddenColumnIds(function (prevIds) {
+            return prevIds.includes(columnId)
+                ? prevIds.filter(function (eachId) { return eachId !== columnId; })
+                : __spreadArray(__spreadArray([], prevIds, true), [columnId], false);
+        });
+    };
+    var handleShowAllUserHiddenColumns = function () {
+        setUserHiddenColumnIds([]);
+    };
+    //=====================================================================================
     //SECTION: Flex Filter Handlers
     //=====================================================================================
     // INFO: cancel any pending value-typing timer before setting flexFiltersDebounced
@@ -755,6 +776,16 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     (0, react_1.useImperativeHandle)(ref, function () { return ({
         handleRefresh: handleRefresh,
+        // INFO: refetches whatever is currently mounted without touching pageIndex, cursor or
+        // filters. handleRefresh clears those (handleClearDataByFilter resets pageIndex to 0),
+        // which is right when the caller wants a clean slate but wrong when it only needs the
+        // data reloaded in place — e.g. reflecting a write made in an overlay without bouncing
+        // the user back to page 1.
+        handleRefreshCurrentPage: function () {
+            var _a, _b;
+            (_a = listRQueryHocRef.current) === null || _a === void 0 ? void 0 : _a.handleRefresh();
+            (_b = readQueryHocRef.current) === null || _b === void 0 ? void 0 : _b.handleRefresh();
+        },
         handleFormSubmit: handleFormSubmit,
         handleFormCheck: handleFormCheck,
         handlePopUpModal: handlePopUpModal,
@@ -806,6 +837,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             // a mid-scroll pageIndex would skip rows on next hydration.
             pageIndex: renderCheckScrollMode() ? 0 : pageIndex,
             hiddenColumnIds: structure.filter(function (col) { return col.hide; }).map(function (col) { return col.id; }),
+            // INFO: stored raw rather than through getActiveUserHiddenColumnIds so a
+            // consumer temporarily switching hideColumnEnabled off does not wipe the
+            // user's saved choice.
+            userHiddenColumnIds: userHiddenColumnIds,
             columnOrder: structure.map(function (col) { return col.id; }),
         });
     }, [
@@ -817,6 +852,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         pageIndex,
         structure,
         persistedSort,
+        userHiddenColumnIds,
     ]);
     (0, react_1.useEffect)(function () {
         handleCheckOfflineDataLength();
@@ -829,7 +865,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     (0, react_1.useEffect)(function () {
         handleOfflinePrefetch();
         /* eslint-disable */
-    }, [props.collectionId, (_39 = props.bareSettings) === null || _39 === void 0 ? void 0 : _39.bareOffline]);
+    }, [props.collectionId, (_40 = props.bareSettings) === null || _40 === void 0 ? void 0 : _40.bareOffline]);
     /* eslint-enable */
     // INFO: MRQ polling — calls handleRefresh every N ms (e.g. 1500) as a fallback.
     // Calls through handleRefreshRef so the interval always dispatches the latest
@@ -849,7 +885,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         }, interval);
         return function () { return clearInterval(timer); };
         /* eslint-disable */
-    }, [(_40 = props.bareSettings) === null || _40 === void 0 ? void 0 : _40.barePollingInterval, isLive, isNetworkOffline]);
+    }, [(_41 = props.bareSettings) === null || _41 === void 0 ? void 0 : _41.barePollingInterval, isLive, isNetworkOffline]);
     /* eslint-enable */
     // INFO: Pub/Sub → SSE live-stream — driven by bareSettings.bareSocketName
     // EventSource URL: {sseEndpoint}/{room}?bm_apiToken={token}
@@ -891,7 +927,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         };
         /* eslint-disable */
     }, [
-        (_41 = props.bareSettings) === null || _41 === void 0 ? void 0 : _41.bareSocketName,
+        (_42 = props.bareSettings) === null || _42 === void 0 ? void 0 : _42.bareSocketName,
         props.collectionId,
         props.devSettings.sseEndpoint,
         props.devSettings.dbAPIToken,
@@ -1130,10 +1166,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         props.collectionId,
         props.model,
         props.localURLEndpoint,
-        (_42 = props.organise) === null || _42 === void 0 ? void 0 : _42.extendedTabs,
-        (_43 = props.organise) === null || _43 === void 0 ? void 0 : _43.viewId,
-        (_44 = props.organise) === null || _44 === void 0 ? void 0 : _44.additionalQuery,
-        (_45 = props.organise) === null || _45 === void 0 ? void 0 : _45.groupBy,
+        (_43 = props.organise) === null || _43 === void 0 ? void 0 : _43.extendedTabs,
+        (_44 = props.organise) === null || _44 === void 0 ? void 0 : _44.viewId,
+        (_45 = props.organise) === null || _45 === void 0 ? void 0 : _45.additionalQuery,
+        (_46 = props.organise) === null || _46 === void 0 ? void 0 : _46.groupBy,
         props.type,
     ]);
     (0, react_1.useEffect)(function () {
@@ -1223,7 +1259,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             };
         }, 100);
         return function () { return clearTimeout(timeoutId); };
-    }, [(_46 = props.organise) === null || _46 === void 0 ? void 0 : _46.showReadFloatingNav, props.type, props.id, loading]);
+    }, [(_47 = props.organise) === null || _47 === void 0 ? void 0 : _47.showReadFloatingNav, props.type, props.id, loading]);
     (0, react_1.useEffect)(function () {
         if (props.type !== "read")
             return;
@@ -1432,7 +1468,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             switch (_a.label) {
                 case 0:
                     refFields = structure.filter(function (s) {
-                        return (s.type === "reference" || s.type === "listReference") &&
+                        return (utils_1.REFERENCE_DATA_TYPES.includes(s.type)) &&
                             s.referenceSpaceId &&
                             s.referenceLabel;
                     });
@@ -1519,7 +1555,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                             (0, listModule_1.handleDataEditButton)(tempData, (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate, (_b = props.bareSettings) === null || _b === void 0 ? void 0 : _b.bareListActionBtns);
                                             return tempData;
                                         })];
-                                case 2: return [2 /*return*/, (0, listModule_1.handleListDataBasedOnModel)(records, props.devSettings, (_a = props.lib) === null || _a === void 0 ? void 0 : _a.axios, structure, (_b = props.organise) === null || _b === void 0 ? void 0 : _b.handleNavigate, ((_c = props.organise) === null || _c === void 0 ? void 0 : _c.viewId) === "general", setActivityModal, setActivityId, isActivityLog ? (_d = props.edit) === null || _d === void 0 ? void 0 : _d.activityLog : undefined, (_e = props.bareSettings) === null || _e === void 0 ? void 0 : _e.bareListActionBtns, (_f = props.edit) === null || _f === void 0 ? void 0 : _f.disabledUpdate)];
+                                case 2: return [2 /*return*/, (0, listModule_1.handleListDataBasedOnModel)(records, props.devSettings, (_a = props.lib) === null || _a === void 0 ? void 0 : _a.axios, structure, (_b = props.organise) === null || _b === void 0 ? void 0 : _b.handleNavigate, ((_c = props.organise) === null || _c === void 0 ? void 0 : _c.viewId) === "general", setActivityModal, setActivityId, isActivityLog ? (_d = props.edit) === null || _d === void 0 ? void 0 : _d.activityLog : undefined, (_e = props.bareSettings) === null || _e === void 0 ? void 0 : _e.bareListActionBtns, (_f = props.edit) === null || _f === void 0 ? void 0 : _f.disabledUpdate, undefined, handleSeedListReferenceOptions)];
                             }
                         });
                     }); };
@@ -1904,6 +1940,31 @@ 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, props.type, props.id, id);
         }
     };
+    // INFO: the list already fetches every referenced document once per page to
+    // print labels. Re-shaping those docs into Select options and handing them
+    // to the table renderers lets an inline-editable reference cell show its
+    // current label immediately — otherwise the cell's Select has no options
+    // until the user types into it, and renders blank.
+    var handleSeedListReferenceOptions = function (details) {
+        var seeded = {};
+        Object.entries(details !== null && details !== void 0 ? details : {}).forEach(function (_a) {
+            var eachKey = _a[0], eachDocs = _a[1];
+            var model = structure.find(function (eachModel) { return eachModel.id === eachKey; });
+            if (!model || !Array.isArray(eachDocs))
+                return;
+            seeded[eachKey] = eachDocs.map(function (eachDoc) {
+                var _a, _b, _c;
+                var option = {
+                    key: eachDoc[serverId],
+                    label: (_b = eachDoc[(_a = model.referenceLabel) !== null && _a !== void 0 ? _a : ""]) !== null && _b !== void 0 ? _b : (0, moduleUtils_1.renderReferenceStringAttribute)(eachDoc),
+                };
+                if (model.referenceSecondaryLabel)
+                    option.secondaryLabel = (_c = eachDoc[model.referenceSecondaryLabel]) !== null && _c !== void 0 ? _c : "-";
+                return option;
+            });
+        });
+        setListReferencesOptions(function (prev) { return (__assign(__assign({}, prev), seeded)); });
+    };
     var handleSetListData = function (newTableData, newSpaceTableData) {
         var _a, _b, _c, _d, _e;
         setTableData(newTableData);
@@ -1960,7 +2021,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     });
                     prettierDataList = dummyPrettierDataList_1;
                     return [3 /*break*/, 5];
-                case 3: return [4 /*yield*/, (0, listModule_1.handleListDataBasedOnModel)(responseData === null || responseData === void 0 ? void 0 : responseData.data, props.devSettings, (_b = props.lib) === null || _b === void 0 ? void 0 : _b.axios, structure, (_c = props.organise) === null || _c === void 0 ? void 0 : _c.handleNavigate, ((_d = props.organise) === null || _d === void 0 ? void 0 : _d.viewId) === "general", setActivityModal, setActivityId, isActivityLog ? (_e = props.edit) === null || _e === void 0 ? void 0 : _e.activityLog : undefined, (_f = props.bareSettings) === null || _f === void 0 ? void 0 : _f.bareListActionBtns, (_g = props.edit) === null || _g === void 0 ? void 0 : _g.disabledUpdate)];
+                case 3: return [4 /*yield*/, (0, listModule_1.handleListDataBasedOnModel)(responseData === null || responseData === void 0 ? void 0 : responseData.data, props.devSettings, (_b = props.lib) === null || _b === void 0 ? void 0 : _b.axios, structure, (_c = props.organise) === null || _c === void 0 ? void 0 : _c.handleNavigate, ((_d = props.organise) === null || _d === void 0 ? void 0 : _d.viewId) === "general", setActivityModal, setActivityId, isActivityLog ? (_e = props.edit) === null || _e === void 0 ? void 0 : _e.activityLog : undefined, (_f = props.bareSettings) === null || _f === void 0 ? void 0 : _f.bareListActionBtns, (_g = props.edit) === null || _g === void 0 ? void 0 : _g.disabledUpdate, undefined, handleSeedListReferenceOptions)];
                 case 4:
                     prettierDataList = _o.sent();
                     if (props.groupId) {
@@ -2099,22 +2160,20 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        if (!((eachModel.type === "reference" ||
-                                            eachModel.type === "listReference") &&
+                                        if (!((utils_1.REFERENCE_DATA_TYPES.includes(eachModel.type)) &&
                                             eachModel.referenceMapColumnId)) return [3 /*break*/, 2];
                                         return [4 /*yield*/, (0, updateModule_1.handleRetrieveObjectReferenceOptions)(eachModel, clonedOptions_1, clonedDetails_1, selectedData, dbModule, devSettings, undefined, undefined, undefined, undefined, props.type === "read")];
                                     case 1:
                                         _a.sent();
                                         _a.label = 2;
                                     case 2:
-                                        if (!((eachModel.type === "object" || eachModel.type === "listObject") &&
+                                        if (!((utils_1.OBJECT_DATA_TYPES.includes(eachModel.type)) &&
                                             eachModel.objectData)) return [3 /*break*/, 4];
                                         return [4 /*yield*/, Promise.all(eachModel.objectData.map(function (eachObjectData) { return __awaiter(void 0, void 0, void 0, function () {
                                                 return __generator(this, function (_a) {
                                                     switch (_a.label) {
                                                         case 0:
-                                                            if (!((eachObjectData.type === "reference" ||
-                                                                eachObjectData.type === "listReference") &&
+                                                            if (!((utils_1.REFERENCE_DATA_TYPES.includes(eachObjectData.type)) &&
                                                                 eachObjectData.referenceMapColumnId)) return [3 /*break*/, 2];
                                                             return [4 /*yield*/, (0, updateModule_1.handleRetrieveObjectReferenceOptions)(eachObjectData, clonedOptions_1, clonedDetails_1, selectedData, dbModule, devSettings, eachModel.id, eachModel.type === "listObject", selectedData, undefined, props.type === "read")];
                                                         case 1:
@@ -2337,16 +2396,25 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             handlePopUpModal(false);
         }
     };
+    var handleObjectCellEdit = function (rowId, columnId, data) {
+        var _a;
+        setObjectCellEdit({ rowId: rowId, columnId: columnId });
+        setSelectedObjectStructureId(columnId);
+        setSelectedObjectData((_a = data === null || data === void 0 ? void 0 : data[columnId]) !== null && _a !== void 0 ? _a : {});
+        setSelectedObjectId("");
+        handlePopUpModal(true);
+    };
     var handleSubmitObjectDataType = function () {
-        var _a, _b, _c;
+        var _a;
+        var _b, _c, _d;
         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);
+        var clonedSelectedObjectData = (0, updateModule_1.handleClonedDataAttribute)(selectedObjectData, (_b = filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.objectData) !== null && _b !== void 0 ? _b : [], props.devSettings.server, true, true);
         // Clean up canvas background images that were unselected or cleared
         // If a canvas has backgroundImage with _cleared flag, clear it when modal closes
-        (_b = filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.objectData) === null || _b === void 0 ? void 0 : _b.forEach(function (eachAttribute) {
+        (_c = filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.objectData) === null || _c === void 0 ? void 0 : _c.forEach(function (eachAttribute) {
             if (eachAttribute.type === "canvas" &&
                 eachAttribute.enableImageUpload &&
                 clonedSelectedObjectData[eachAttribute.id] &&
@@ -2398,7 +2466,17 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         }
         else {
             //INFO: [UPDATE] Updating an object field
-            var clonedSelectedObjectData_1 = (0, updateModule_1.handleClonedDataAttribute)(selectedObjectData, (_c = filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.objectData) !== null && _c !== void 0 ? _c : [], props.devSettings.server, true);
+            var clonedSelectedObjectData_1 = (0, updateModule_1.handleClonedDataAttribute)(selectedObjectData, (_d = filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.objectData) !== null && _d !== void 0 ? _d : [], props.devSettings.server, true);
+            if (objectCellEdit) {
+                handleSubmitData("update", objectCellEdit.rowId, objectCellEdit.columnId, (_a = {},
+                    _a[objectCellEdit.columnId] = clonedSelectedObjectData_1,
+                    _a));
+                setObjectCellEdit(null);
+                setSelectedObjectStructureId("");
+                setSelectedObjectData({});
+                handlePopUpModal(false);
+                return;
+            }
             clonedSelectedData[selectedObjectStructureId] = clonedSelectedObjectData_1;
             setSelectedData(clonedSelectedData);
         }
@@ -2946,8 +3024,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 case 1:
                     _a.sent();
                     multiImageAttribute = model.filter(function (eachAttribute) {
-                        return (eachAttribute.type === "multipleImage" ||
-                            eachAttribute.type === "multipleFile");
+                        return (utils_1.MULTIPLE_ASSET_DATA_TYPES.includes(eachAttribute.type));
                     });
                     return [4 /*yield*/, Promise.all(multiImageAttribute.map(function (eachImage) { return __awaiter(void 0, void 0, void 0, function () {
                             var _a, _b, _c, _d;
@@ -4679,7 +4756,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             return __generator(this, function (_c) {
                                 switch (_c.label) {
                                     case 0:
-                                        isObject = eachModel.type === "listObject" || eachModel.type === "object";
+                                        isObject = utils_1.OBJECT_DATA_TYPES.includes(eachModel.type);
                                         return [4 /*yield*/, indexedDb_1.indexedDb.getValue("local", eachModel.referenceSpaceId + "-ref")];
                                     case 1:
                                         offlineDataResp = _c.sent();
@@ -4690,8 +4767,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                         // INFO: convert raw docs to Option[] format so reference Select
                                         // components receive { key, label, secondaryLabel } as expected
                                         // (mirrors the shape handleRetrieveObjectReferenceOptions builds online)
-                                        if ((eachModel.type === "reference" ||
-                                            eachModel.type === "listReference") &&
+                                        if ((utils_1.REFERENCE_DATA_TYPES.includes(eachModel.type)) &&
                                             eachModel.referenceLabel) {
                                             clonedReferencesOptions_1[eachModel.id] = offlineData.map(function (r) {
                                                 var _a, _b, _c, _d;
@@ -5149,15 +5225,13 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             var selectedModel = structure.find(function (eachModel) {
                                 return eachModel.id === eachValue;
                             });
-                            if ((selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "object" ||
-                                (selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "listObject") {
+                            if ((selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "object" || (selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "listObject") {
                                 var selectedObjectModel = (_c = selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.objectData) === null || _c === void 0 ? void 0 : _c.find(function (eachModel) {
                                     return eachModel.id === listCSVObjAttribute[eachKey];
                                 });
                                 if ((selectedObjectModel === null || selectedObjectModel === void 0 ? void 0 : selectedObjectModel.type) === "image" ||
                                     (selectedObjectModel === null || selectedObjectModel === void 0 ? void 0 : selectedObjectModel.type) === "file" ||
-                                    (selectedObjectModel === null || selectedObjectModel === void 0 ? void 0 : selectedObjectModel.type) === "multipleFile" ||
-                                    (selectedObjectModel === null || selectedObjectModel === void 0 ? void 0 : selectedObjectModel.type) === "multipleImage") {
+                                    (selectedObjectModel === null || selectedObjectModel === void 0 ? void 0 : selectedObjectModel.type) === "multipleImage" || (selectedObjectModel === null || selectedObjectModel === void 0 ? void 0 : selectedObjectModel.type) === "multipleFile") {
                                     csvList_1.push({
                                         id: (_d = listCSVObjAttribute[eachKey]) !== null && _d !== void 0 ? _d : "",
                                         ori: Number(eachKey),
@@ -5181,8 +5255,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             }
                             else if ((selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "image" ||
                                 (selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "file" ||
-                                (selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "multipleFile" ||
-                                (selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "multipleImage") {
+                                (selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "multipleImage" || (selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) === "multipleFile") {
                                 csvList_1.push({
                                     id: eachValue !== null && eachValue !== void 0 ? eachValue : "",
                                     ori: Number(eachKey),
@@ -5214,8 +5287,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             if (!eachEachModel.optional) {
                                 // INFO : Validate and compare the modal with csv list and return true if > 1 consist within
                                 var innearValidation = csvList_1.some(function (eachCsvList) {
-                                    if (eachCsvList.type === "object" ||
-                                        eachCsvList.type === "listObject") {
+                                    if (utils_1.OBJECT_DATA_TYPES.includes(eachCsvList.type)) {
                                         return eachEachModel.id === eachCsvList.objectId;
                                     }
                                     else {
@@ -5817,6 +5889,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             setExportQR(false);
             setSelectedObjectId("");
             setSelectedObjectStructureId("");
+            setObjectCellEdit(null);
             setSelectedListAddress({ lat: 0, lng: 0, name: "" });
             setSelectedListAddressId("");
             setSelectedListAddressIndex(-1);
@@ -5966,21 +6039,76 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     //=====================================================================================
     //SECTION: Render CRUD
     //=====================================================================================
+    // INFO: columns the end user is allowed to toggle via organise.hideColumnEnabled.
+    // Developer-hidden columns (DataStructure.hide) are excluded on purpose —
+    // a developer hiding a column is not a preference the user may override — as
+    // are the id fields and anything that never becomes a column anyway.
+    var getTogglableColumns = function () {
+        return structure.filter(function (eachAttribute) {
+            var _a;
+            if (eachAttribute.id === "_id" ||
+                eachAttribute.id === "id" ||
+                eachAttribute.id === "baseDraft" ||
+                eachAttribute.hide ||
+                utils_1.NON_TABLE_COLUMN_DATA_TYPES.includes(eachAttribute.type)) {
+                return false;
+            }
+            if (!((_a = props.organise) === null || _a === void 0 ? void 0 : _a.showBaseUpdatedAt) &&
+                eachAttribute.id === "baseUpdatedAt") {
+                return false;
+            }
+            return true;
+        });
+    };
+    // INFO: user hides are only honoured while the feature is switched on, so
+    // turning the prop off restores every column without clearing stored state.
+    var getActiveUserHiddenColumnIds = function () {
+        var _a;
+        if (schemaPresent || !((_a = props.organise) === null || _a === void 0 ? void 0 : _a.hideColumnEnabled))
+            return [];
+        return userHiddenColumnIds;
+    };
+    // INFO: counted off the togglable list rather than the raw array so ids left
+    // over from an older schema can never inflate the badge.
+    var getUserHiddenColumnCount = function () {
+        var activeUserHiddenColumnIds = getActiveUserHiddenColumnIds();
+        return getTogglableColumns().filter(function (eachColumn) {
+            return activeUserHiddenColumnIds.includes(eachColumn.id);
+        }).length;
+    };
+    var renderHideColumnPopupContent = function () {
+        var activeUserHiddenColumnIds = getActiveUserHiddenColumnIds();
+        var togglableColumns = getTogglableColumns();
+        var visibleCount = togglableColumns.filter(function (eachColumn) { return !activeUserHiddenColumnIds.includes(eachColumn.id); }).length;
+        return (react_1.default.createElement("div", { className: "shadow-lg bg-white rounded-md p-4 flex flex-col w-[calc(100vw-2rem)] max-w-[280px]" },
+            react_1.default.createElement("div", { className: "flex flex-row items-center" },
+                react_1.default.createElement("p", { className: "text-sm font-medium text-gray-700" }, "Columns"),
+                react_1.default.createElement("div", { className: "grow" }),
+                activeUserHiddenColumnIds.length > 0 && (react_1.default.createElement(textButton_1.TextButton, { text: "Show all", onClick: handleShowAllUserHiddenColumns }))),
+            react_1.default.createElement("div", { className: "flex flex-col mt-2 overflow-y-auto max-h-72" }, togglableColumns.map(function (eachColumn) {
+                var isHidden = activeUserHiddenColumnIds.includes(eachColumn.id);
+                // INFO: an empty table header breaks both table renderers, so the
+                // last visible column stays locked until another one is shown.
+                var isLocked = !isHidden && visibleCount <= 1;
+                return (react_1.default.createElement("button", { key: eachColumn.id, type: "button", disabled: isLocked, "aria-pressed": !isHidden, "data-testid": "dtw-hide-column-".concat(eachColumn.id), className: "flex flex-row items-center py-2 text-sm text-left ".concat(isLocked
+                        ? "opacity-50 cursor-not-allowed"
+                        : "cursor-pointer hover:text-primary-600"), onClick: function () {
+                        handleToggleUserHiddenColumn(eachColumn.id);
+                    } },
+                    react_1.default.createElement("span", { className: "pr-3 truncate grow" }, eachColumn.name),
+                    isHidden ? (react_1.default.createElement(outline_1.EyeSlashIcon, { className: "w-4 h-4 text-gray-400 shrink-0" })) : (react_1.default.createElement(outline_1.EyeIcon, { className: "w-4 h-4 text-primary-600 shrink-0" }))));
+            }))));
+    };
     var renderTableHeader = function () {
         var _a, _b;
         var tableHeader = [];
+        var activeUserHiddenColumnIds = getActiveUserHiddenColumnIds();
         structure.map(function (eachAttribute) {
             var _a;
             if (eachAttribute.id === "baseDraft" ||
-                eachAttribute.type === "listObject" ||
-                eachAttribute.type === "listAddress" ||
-                eachAttribute.type === "file" ||
-                eachAttribute.type === "multipleFile" ||
-                eachAttribute.type === "markdown" ||
-                eachAttribute.type === "signature" ||
-                eachAttribute.type === "ganttchart" ||
-                eachAttribute.type === "canvas" ||
-                eachAttribute.hide) {
+                utils_1.NON_TABLE_COLUMN_DATA_TYPES.includes(eachAttribute.type) ||
+                eachAttribute.hide ||
+                activeUserHiddenColumnIds.includes(eachAttribute.id)) {
                 return null;
             }
             if (!((_a = props.organise) === null || _a === void 0 ? void 0 : _a.showBaseUpdatedAt) &&
@@ -6034,14 +6162,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     var renderDetailListData = function (model) {
         var detailList = [];
-        var exludedDataTypes = [
-            "listObject",
-            "listAddress",
-            "ganttchart",
-            "canvas",
-        ];
         model
-            .filter(function (eachAttribute) { return !exludedDataTypes.includes(eachAttribute.type); })
+            .filter(function (eachAttribute) { return !utils_1.NON_DETAIL_LIST_DATA_TYPES.includes(eachAttribute.type); })
             .map(function (eachAttribute) {
             var _a, _b, _c, _d, _e, _f;
             var selectedDataKey = Object.keys(selectedData).find(function (eachKey) { return eachKey === eachAttribute.id; });
@@ -6306,7 +6428,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         });
         return canvasElement;
     };
-    var renderActionButtons = function (type, isBottom, hasTabAlign, uniqueTabIds) {
+    // INFO: placement is decided by the caller (see isBottom in renderContent), so this only
+    // builds the buttons. It previously took an isBottom argument purely to add a top margin
+    // to the list's create button when that button was pushed below the table.
+    var renderActionButtons = function (type, hasTabAlign, uniqueTabIds) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         var bareActionComponent = (_c = (_b = (_a = props.bareSettings) === null || _a === void 0 ? void 0 : _a.bareUpdateActionComponent) === null || _b === void 0 ? void 0 : _b.call(_a, selectedData, formRef)) !== null && _c !== void 0 ? _c : undefined;
         if (type === "read") {
@@ -6404,11 +6529,11 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     hasNavigation ? (react_1.default.createElement(iconButton_1.IconButton, { testId: "dtw-create", icon: react_1.default.createElement(outline_1.PlusIcon, { className: "h-7 w-7 text-white" }), background: "bg-primary-500 hover:bg-primary-600", onClick: 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, "update", "new");
-                        }, className: isBottom ? "mt-5" : "" })) : (react_1.default.createElement(link_1.Link, { href: "".concat(props.localURLEndpoint, "?data=new&type=update&collection=").concat(props.collectionId), linkType: props.linkType, custom: props.custom },
-                        react_1.default.createElement(iconButton_1.IconButton, { testId: "dtw-create", icon: react_1.default.createElement(outline_1.PlusIcon, { className: "h-7 w-7 text-white" }), background: "bg-primary-500 hover:bg-primary-600", className: isBottom ? "mt-5" : "" }))),
+                        } })) : (react_1.default.createElement(link_1.Link, { href: "".concat(props.localURLEndpoint, "?data=new&type=update&collection=").concat(props.collectionId), linkType: props.linkType, custom: props.custom },
+                        react_1.default.createElement(iconButton_1.IconButton, { testId: "dtw-create", icon: react_1.default.createElement(outline_1.PlusIcon, { className: "h-7 w-7 text-white" }), background: "bg-primary-500 hover:bg-primary-600" }))),
                     offlineDataLength > 0 && (react_1.default.createElement(iconButton_1.IconButton, { icon: react_1.default.createElement(solid_1.CloudArrowUpIcon, { className: "h-7 w-7 text-white" }), background: "bg-primary-500 hover:bg-primary-600", onClick: function () {
                             handlePopUpModal(true, "offline");
-                        }, className: isBottom ? "mt-5" : "" }))));
+                        } }))));
             }
             if (listActionBtns.length > 0) {
                 return react_1.default.createElement(react_1.default.Fragment, null, listActionBtns);
@@ -6544,6 +6669,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         switch (props.type) {
             case "read":
                 var anyAuthMethod = Object.values(authMethods).some(function (value) { return value; });
+                var hasReadHeading = !!(props.title || props.description);
                 pages.push({
                     name: (_d = selectedData === null || selectedData === void 0 ? void 0 : selectedData[(_c = (_b = props.organise) === null || _b === void 0 ? void 0 : _b.breadcrumbAttributeId) !== null && _c !== void 0 ? _c : serverId]) !== null && _d !== void 0 ? _d : (props.id ? props.id : "new"),
                     href: "#",
@@ -6565,8 +6691,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     !loading && (react_1.default.createElement(react_1.default.Fragment, null,
                         renderBreadcrumb(pages),
                         react_1.default.createElement("div", null,
-                            react_1.default.createElement("div", { className: "flex flex-col justify-between sm:py-2 sm:items-center sm:flex-row" },
-                                (props.title || props.description) && (react_1.default.createElement("div", { className: "flex flex-col" },
+                            react_1.default.createElement("div", { className: "flex flex-col sm:py-2 sm:items-center sm:flex-row ".concat(hasReadHeading ? "justify-between" : "sm:justify-end") },
+                                hasReadHeading && (react_1.default.createElement("div", { className: "flex flex-col" },
                                     props.title && (react_1.default.createElement("p", { className: "text-xl font-medium" }, props.title)),
                                     props.description && (react_1.default.createElement("span", { className: "text-sm text-gray-500" }, props.description)))),
                                 !isBottom && renderActionButtons(props.type))),
@@ -6578,7 +6704,9 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             !((_l = props.bareSettings) === null || _l === void 0 ? void 0 : _l.bareReadComponentHide) && (react_1.default.createElement("div", null, renderTabContent(tabs, props.type, viewType))),
                             ((_m = props.bareSettings) === null || _m === void 0 ? void 0 : _m.bareReadComponentPos) !== "top" &&
                                 renderBareReadComp()),
-                        isBottom && renderActionButtons(props.type, true)))));
+                        isBottom && (
+                        // INFO: matches the update view's bottom bar, which is already sm:justify-end
+                        react_1.default.createElement("div", { className: "flex sm:justify-end" }, renderActionButtons(props.type)))))));
             case "update":
                 if (props.id !== "new") {
                     pages.push({
@@ -6598,8 +6726,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     var _a;
                     var present = false;
                     if (eachModel.type === "markdown" ||
-                        eachModel.type === "object" ||
-                        eachModel.type === "listObject" ||
+                        utils_1.OBJECT_DATA_TYPES.includes(eachModel.type) ||
                         eachModel.type === "textArea") {
                         disabledOnEnter_1 = true;
                     }
@@ -6760,7 +6887,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             props.title && (react_1.default.createElement("p", { className: "text-xl font-medium" }, props.title)),
                             props.description && (react_1.default.createElement("span", { className: "text-sm text-gray-500" }, props.description)))),
                         !isBottom &&
-                            renderActionButtons(props.type, false, hasTabAlign_1, uniqueTabIds_2)),
+                            renderActionButtons(props.type, hasTabAlign_1, uniqueTabIds_2)),
                     hasTabAlign_1 ? (react_1.default.createElement("div", { className: "w-full ".concat(leftTabAlign
                             ? "grid sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-5"
                             : "") },
@@ -6800,7 +6927,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             react_1.default.createElement("div", { className: "mt-8" }, renderListAddress(props.type)),
                             react_1.default.createElement("div", { className: "mt-8" }, renderListObject(props.type)),
                             isBottom &&
-                                renderActionButtons(props.type, true, hasTabAlign_1, uniqueTabIds_2)))) : (react_1.default.createElement("div", null,
+                                renderActionButtons(props.type, hasTabAlign_1, uniqueTabIds_2)))) : (react_1.default.createElement("div", null,
                         ((_13 = props.bareSettings) === null || _13 === void 0 ? void 0 : _13.bareUpdateComponentAbove) &&
                             ((_14 = props.bareSettings) === null || _14 === void 0 ? void 0 : _14.bareUpdateComponent) &&
                             ((_15 = props.bareSettings) === null || _15 === void 0 ? void 0 : _15.bareUpdateComponent(selectedData)),
@@ -6812,7 +6939,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         react_1.default.createElement("div", { className: "mt-8" }, renderListAddress(props.type)),
                         react_1.default.createElement("div", { className: "mt-8" }, renderListObject(props.type)),
                         isBottom &&
-                            renderActionButtons(props.type, true, hasTabAlign_1, uniqueTabIds_2)))));
+                            renderActionButtons(props.type, hasTabAlign_1, uniqueTabIds_2)))));
             case "list":
             case "union":
                 var filterComponent_1 = renderSearchContent();
@@ -6881,7 +7008,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         return null;
                 };
                 var renderListActionElements = function () {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
                     var actionElementList = [];
                     if (schemaPresent) {
                         actionElementList.push(react_1.default.createElement(react_1.default.Fragment, null,
@@ -6915,8 +7042,19 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             actionElementList.push(react_1.default.createElement(popUp_1.PopUp, { ctaComp: react_1.default.createElement(iconButton_1.IconButton, { icon: react_1.default.createElement(outline_1.FunnelIcon, { className: "h-7 w-7 text-primary-500" }), bgColor: "bg-white" }), renderComp: react_1.default.createElement("div", { className: "shadow-lg p-4 flex flex-col space-y-3 w-[calc(100vw-2rem)] max-w-[320px]" }, popupFilters.map(function (filterEl, index) { return (react_1.default.createElement("div", { key: index }, filterEl)); })), anchor: "right", excludePortalIds: ["datepicker-portal"], lib: { Transition: (_f = props === null || props === void 0 ? void 0 : props.lib) === null || _f === void 0 ? void 0 : _f.Transition } }));
                         }
                     }
+                    // INFO: User column hiding — the schemaPresent path already exposes
+                    // OverviewModal, which writes hide back to the schema in the database.
+                    // This one is the client-only counterpart for bare DTWs.
+                    if (!schemaPresent && ((_g = props.organise) === null || _g === void 0 ? void 0 : _g.hideColumnEnabled)) {
+                        var hiddenColumnCount = getUserHiddenColumnCount();
+                        actionElementList.push(react_1.default.createElement(popUp_1.PopUp, { ctaComp: react_1.default.createElement("div", { className: "relative w-fit h-fit" },
+                                hiddenColumnCount > 0 && (react_1.default.createElement("div", { "data-testid": "dtw-hide-columns-count", className: "absolute top-0 right-0 translate-x-1/4 -translate-y-1/4 z-[1] rounded-full bg-primary-500 text-white flex items-center justify-center w-5 h-5 text-[10px]" }, hiddenColumnCount)),
+                                react_1.default.createElement(iconButton_1.IconButton, { testId: "dtw-hide-columns-btn", icon: react_1.default.createElement(outline_1.EyeSlashIcon, { className: "h-7 w-7 ".concat(hiddenColumnCount > 0
+                                            ? "text-white"
+                                            : "text-primary-500") }), bgColor: hiddenColumnCount > 0 ? "bg-primary-500" : "bg-white" })), renderComp: renderHideColumnPopupContent(), anchor: "right", lib: { Transition: (_h = props === null || props === void 0 ? void 0 : props.lib) === null || _h === void 0 ? void 0 : _h.Transition } }));
+                    }
                     // INFO: Flex filter — desktop uses PopUp, mobile uses Modal
-                    if ((_g = props.bareSettings) === null || _g === void 0 ? void 0 : _g.bareFlexFilters) {
+                    if ((_j = props.bareSettings) === null || _j === void 0 ? void 0 : _j.bareFlexFilters) {
                         var flexActions = {
                             handleAddFilter: handleFlexFilterAdd,
                             handleRemoveFilter: handleFlexFilterRemove,
@@ -6929,16 +7067,16 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         };
                         // INFO: Search input will only render above flex filters if bareListFilterAsPopup is true
                         var searchInput = !isFirebase &&
-                            ((_h = props.bareSettings) === null || _h === void 0 ? void 0 : _h.bareListFilterAsPopup) &&
-                            !((_j = props.organise) === null || _j === void 0 ? void 0 : _j.hideSearch) &&
+                            ((_k = props.bareSettings) === null || _k === void 0 ? void 0 : _k.bareListFilterAsPopup) &&
+                            !((_l = props.organise) === null || _l === void 0 ? void 0 : _l.hideSearch) &&
                             filterComponent_1 &&
                             Array.isArray(filterComponent_1) &&
                             filterComponent_1.length > 0
                             ? filterComponent_1[filterComponent_1.length - 1]
                             : undefined;
                         var flexFilterLength_1 = activeFlexFilterCount_1;
-                        if (!((_k = props.organise) === null || _k === void 0 ? void 0 : _k.hideSearch) &&
-                            ((_l = props.bareSettings) === null || _l === void 0 ? void 0 : _l.bareListFilterAsPopup) &&
+                        if (!((_m = props.organise) === null || _m === void 0 ? void 0 : _m.hideSearch) &&
+                            ((_o = props.bareSettings) === null || _o === void 0 ? void 0 : _o.bareListFilterAsPopup) &&
                             (filterSearchParams === null || filterSearchParams === void 0 ? void 0 : filterSearchParams["search"]))
                             flexFilterLength_1 += 1;
                         var flexFilterIconBtn = function (mobile) {
@@ -6948,26 +7086,27 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         };
                         // INFO: Desktop — PopUp (hidden on mobile)
                         actionElementList.push(react_1.default.createElement("div", { className: "hidden md:block" },
-                            react_1.default.createElement(popUp_1.PopUp, { ctaComp: flexFilterIconBtn(), renderComp: (0, flexFilter_1.renderFlexFilterPopupContent)(flexFilters, structure, devSettings, dbModule, flexFilterReferenceOptions, flexFilterReferenceSearch, flexActions, (_m = props.bareSettings) === null || _m === void 0 ? void 0 : _m.bareListFilterQuery, searchInput, (_o = props.bareSettings) === null || _o === void 0 ? void 0 : _o.bareListFilterAddComponent), anchor: "right", excludePortalIds: ["datepicker-portal", "select-portal"], lib: { Transition: (_p = props === null || props === void 0 ? void 0 : props.lib) === null || _p === void 0 ? void 0 : _p.Transition } })));
+                            react_1.default.createElement(popUp_1.PopUp, { ctaComp: flexFilterIconBtn(), renderComp: (0, flexFilter_1.renderFlexFilterPopupContent)(flexFilters, structure, devSettings, dbModule, flexFilterReferenceOptions, flexFilterReferenceSearch, flexActions, (_p = props.bareSettings) === null || _p === void 0 ? void 0 : _p.bareListFilterQuery, searchInput, (_q = props.bareSettings) === null || _q === void 0 ? void 0 : _q.bareListFilterAddComponent), anchor: "right", excludePortalIds: ["datepicker-portal", "select-portal"], lib: { Transition: (_r = props === null || props === void 0 ? void 0 : props.lib) === null || _r === void 0 ? void 0 : _r.Transition } })));
                         // INFO: Mobile — IconButton that opens a Modal (hidden on desktop)
                         actionElementList.push(react_1.default.createElement("div", { className: "block md:hidden" },
-                            !((_q = props.bareSettings) === null || _q === void 0 ? void 0 : _q.bareListMobileFloatingSearch) &&
+                            !((_s = props.bareSettings) === null || _s === void 0 ? void 0 : _s.bareListMobileFloatingSearch) &&
                                 flexFilterIconBtn(true),
-                            (0, flexFilter_1.renderFlexFilterModal)(flexFilterModalOpen, flexFilters, structure, devSettings, dbModule, flexFilterReferenceOptions, flexFilterReferenceSearch, flexActions, function () { return setFlexFilterModalOpen(false); }, (_r = props.bareSettings) === null || _r === void 0 ? void 0 : _r.bareListFilterQuery, searchInput, (_s = props.bareSettings) === null || _s === void 0 ? void 0 : _s.bareListFilterAddComponent)));
-                    }
-                    if (!isBottom) {
-                        var actionBtns = renderActionButtons(props.type);
-                        if (actionBtns)
-                            actionElementList.push(actionBtns);
+                            (0, flexFilter_1.renderFlexFilterModal)(flexFilterModalOpen, flexFilters, structure, devSettings, dbModule, flexFilterReferenceOptions, flexFilterReferenceSearch, flexActions, function () { return setFlexFilterModalOpen(false); }, (_t = props.bareSettings) === null || _t === void 0 ? void 0 : _t.bareListFilterQuery, searchInput, (_u = props.bareSettings) === null || _u === void 0 ? void 0 : _u.bareListFilterAddComponent)));
                     }
-                    if (schemaPresent || ((_t = props.organise) === null || _t === void 0 ? void 0 : _t.showExport)) {
+                    // INFO: bareUpdateActionBottom positions the read/update action bar. The list's own
+                    // create and offline-upload buttons stay in the filter row either way — they belong
+                    // with the controls they sit beside, not stranded below the table and pagination.
+                    var actionBtns = renderActionButtons(props.type);
+                    if (actionBtns)
+                        actionElementList.push(actionBtns);
+                    if (schemaPresent || ((_v = props.organise) === null || _v === void 0 ? void 0 : _v.showExport)) {
                         actionElementList.push(react_1.default.createElement(popUp_1.PopUp, { ctaComp: react_1.default.createElement(iconButton_1.IconButton, { className: "bg-primary-100", icon: react_1.default.createElement(solid_1.EllipsisVerticalIcon, { className: "h-7 w-7 text-primary-500" }), bgColor: "bg-white" }), renderComp: react_1.default.createElement("div", { className: "shadow-lg" }, moreButtonPopUp.map(function (eachPopup) { return (
                             //TODO: Bug - Crash on Next Js
                             // <Menu.Item>
                             react_1.default.createElement("span", { className: "block w-40 py-3 text-sm text-center text-gray-700 cursor-pointer hover:bg-gray-100", onClick: eachPopup === null || eachPopup === void 0 ? void 0 : eachPopup.onClick }, eachPopup === null || eachPopup === void 0 ? void 0 : eachPopup.text)
                             // </Menu.Item>
                             ); })), lib: {
-                                Transition: (_u = props === null || props === void 0 ? void 0 : props.lib) === null || _u === void 0 ? void 0 : _u.Transition,
+                                Transition: (_w = props === null || props === void 0 ? void 0 : props.lib) === null || _w === void 0 ? void 0 : _w.Transition,
                             } }));
                     }
                     if (actionElementList.length > 0) {
@@ -7033,7 +7172,6 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     renderListNewRowFilterElements(),
                     (schemaPresent || ((_28 = props.bareSettings) === null || _28 === void 0 ? void 0 : _28.bareReadListTabs)) && (react_1.default.createElement(tabs_1.Tabs, { tabs: tabs, selectedId: viewType, linkType: props.linkType, custom: props.custom, onClick: function (id) { return handleSelectTab(id); }, darkMode: (_29 = props.organise) === null || _29 === void 0 ? void 0 : _29.darkMode })),
                     renderTabContent(tabs, props.type, viewType),
-                    isBottom && renderActionButtons(props.type, true),
                     ((_30 = props.bareSettings) === null || _30 === void 0 ? void 0 : _30.bareListMobileFloatingSearch) &&
                         (0, listModule_1.renderFloatingMobileSearch)({
                             filterSearch: filterSearch,
@@ -7123,7 +7261,11 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         var isKanban = (selectedTab === null || selectedTab === void 0 ? void 0 : selectedTab.viewType) === "kanban";
         var isListEditable = (_a = props.edit) === null || _a === void 0 ? void 0 : _a.listEditable;
         var disableUpdate = (_b = props.edit) === null || _b === void 0 ? void 0 : _b.disabledUpdate;
+        var activeUserHiddenColumnIds = getActiveUserHiddenColumnIds();
         var titleKey = "";
+        // INFO: titleModel ignores user hides so the card title stays stable
+        // regardless of which columns the user chose to hide — shifting the title
+        // when hiding the first column would be confusing in grid/kanban views.
         var titleModel = structure.find(function (eachModel) {
             return !eachModel.hide && eachModel.id !== "_id" && eachModel.id !== "id";
         });
@@ -7161,13 +7303,13 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     eachKey === "baseDraft" ||
                     eachKey === "update" ||
                     !selectedModel ||
-                    selectedModel.type === "object" ||
-                    selectedModel.type === "listObject" ||
+                    utils_1.OBJECT_DATA_TYPES.includes(selectedModel.type) ||
                     selectedModel.type === "file" ||
                     selectedModel.type === "multipleFile" ||
                     selectedModel.type === "ganttchart" ||
                     selectedModel.type === "canvas" ||
                     selectedModel.hide ||
+                    activeUserHiddenColumnIds.includes(eachKey) ||
                     eachKey === imageTag ||
                     eachValue === title ||
                     (structurePresent && (!modelInStructure || modelInStructure.hide))) {
@@ -7453,7 +7595,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         react_1.default.createElement("div", { className: "font-semibold text-md mt-5" },
                             "Group By ",
                             eachKey),
-                        react_1.default.createElement(table_1.Table, { showId: showId, paginationType: renderResolvedPaginationType(), data: filterTableData, spaceData: dataList !== null && dataList !== void 0 ? dataList : [], size: (_b = dataList.length) !== null && _b !== void 0 ? _b : 0, limit: 5, cursor: "", loading: tableLoading !== null && tableLoading !== void 0 ? tableLoading : true, checkbox: multipleSelect, selectAll: selectAll, selectedIds: selectedIds, selectAllText: selectAll ? "from filter" : "", disableSelectFullData: (_d = (_c = props.organise) === null || _c === void 0 ? void 0 : _c.disableSelectFullData) === null || _d === void 0 ? void 0 : _d.table, multiActionButton: react_1.default.createElement("div", { className: "flex flex-row space-x-3" },
+                        react_1.default.createElement(table_1.Table, { showId: showId, paginationType: renderResolvedPaginationType(), data: filterTableData, spaceData: dataList !== null && dataList !== void 0 ? dataList : [], referencesOptions: listReferencesOptions, size: (_b = dataList.length) !== null && _b !== void 0 ? _b : 0, limit: 5, cursor: "", loading: tableLoading !== null && tableLoading !== void 0 ? tableLoading : true, checkbox: multipleSelect, selectAll: selectAll, selectedIds: selectedIds, selectAllText: selectAll ? "from filter" : "", disableSelectFullData: (_d = (_c = props.organise) === null || _c === void 0 ? void 0 : _c.disableSelectFullData) === null || _d === void 0 ? void 0 : _d.table, multiActionButton: react_1.default.createElement("div", { className: "flex flex-row space-x-3" },
                                 selectedIds.length > 0 &&
                                     !((_e = props.edit) === null || _e === void 0 ? void 0 : _e.disabledUpdate) &&
                                     !((_f = props.bareSettings) === null || _f === void 0 ? void 0 : _f.bareHideTableExtraMultipleAction) && (react_1.default.createElement(react_1.default.Fragment, null,
@@ -7520,7 +7662,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                         }
                                     });
                                 }); },
-                            }, addable: {
+                            }, onObjectEdit: handleObjectCellEdit, addable: {
                                 active: ((_2 = props.edit) === null || _2 === void 0 ? void 0 : _2.listAddable) ? true : false,
                                 onAddData: function (data) { return __awaiter(void 0, void 0, void 0, function () {
                                     return __generator(this, function (_a) {
@@ -7539,7 +7681,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         else {
             // INFO: when bareNewDTW is enabled, render NewTable instead of legacy Table
             if ((_a = props.bareSettings) === null || _a === void 0 ? void 0 : _a.bareNewDTW) {
-                return (react_1.default.createElement(newTable_1.NewTable, { showId: showId, paginationType: renderResolvedPaginationType(), data: tableData, spaceData: spaceTableData !== null && spaceTableData !== void 0 ? spaceTableData : [], size: size !== null && size !== void 0 ? size : 0, limit: limit, cursor: cursor !== null && cursor !== void 0 ? cursor : "", loading: tableLoading !== null && tableLoading !== void 0 ? tableLoading : true, checkbox: multipleSelect, selectAll: selectAll, selectedIds: selectedIds, selectAllText: selectAll ? "from filter" : "", disableSelectFullData: (_c = (_b = props.organise) === null || _b === void 0 ? void 0 : _b.disableSelectFullData) === null || _c === void 0 ? void 0 : _c.table, maxSelectedCount: (_d = props.bareSettings) === null || _d === void 0 ? void 0 : _d.bareListMaxSelectedCount, mobileView: (_e = props.bareSettings) === null || _e === void 0 ? void 0 : _e.bareListMobileView, mobileTooltip: (_f = props.bareSettings) === null || _f === void 0 ? void 0 : _f.bareMobileTooltip, multiActionFloatingBtns: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], (!((_g = props.edit) === null || _g === void 0 ? void 0 : _g.disabledUpdate) &&
+                return (react_1.default.createElement(newTable_1.NewTable, { showId: showId, paginationType: renderResolvedPaginationType(), data: tableData, spaceData: spaceTableData !== null && spaceTableData !== void 0 ? spaceTableData : [], referencesOptions: listReferencesOptions, size: size !== null && size !== void 0 ? size : 0, limit: limit, cursor: cursor !== null && cursor !== void 0 ? cursor : "", loading: tableLoading !== null && tableLoading !== void 0 ? tableLoading : true, checkbox: multipleSelect, selectAll: selectAll, selectedIds: selectedIds, selectAllText: selectAll ? "from filter" : "", disableSelectFullData: (_c = (_b = props.organise) === null || _b === void 0 ? void 0 : _b.disableSelectFullData) === null || _c === void 0 ? void 0 : _c.table, maxSelectedCount: (_d = props.bareSettings) === null || _d === void 0 ? void 0 : _d.bareListMaxSelectedCount, mobileView: (_e = props.bareSettings) === null || _e === void 0 ? void 0 : _e.bareListMobileView, mobileTooltip: (_f = props.bareSettings) === null || _f === void 0 ? void 0 : _f.bareMobileTooltip, multiActionFloatingBtns: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], (!((_g = props.edit) === null || _g === void 0 ? void 0 : _g.disabledUpdate) &&
                         !((_h = props.bareSettings) === null || _h === void 0 ? void 0 : _h.bareHideTableExtraMultipleAction)
                         ? [
                             {
@@ -7629,7 +7771,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                 }
                             });
                         }); },
-                    }, addable: {
+                    }, onObjectEdit: handleObjectCellEdit, addable: {
                         active: ((_2 = props.edit) === null || _2 === void 0 ? void 0 : _2.listAddable) ? true : false,
                         onAddData: function (data) { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
@@ -7643,7 +7785,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         }); },
                     }, darkMode: (_3 = props.organise) === null || _3 === void 0 ? void 0 : _3.darkMode, hidePagination: (_4 = props.organise) === null || _4 === void 0 ? void 0 : _4.hidePagination, customPaginationSize: customPaginationSize, disableEllipsisOnLongWord: (_5 = props.organise) === null || _5 === void 0 ? void 0 : _5.disableEllipsisOnLongWord, pinColumns: (_6 = props.bareSettings) === null || _6 === void 0 ? void 0 : _6.bareListTablePinColumns }));
             }
-            return (react_1.default.createElement(table_1.Table, { showId: showId, paginationType: renderResolvedPaginationType(), data: tableData, spaceData: spaceTableData !== null && spaceTableData !== void 0 ? spaceTableData : [], size: size !== null && size !== void 0 ? size : 0, limit: limit, cursor: cursor !== null && cursor !== void 0 ? cursor : "", loading: tableLoading !== null && tableLoading !== void 0 ? tableLoading : true, checkbox: multipleSelect, selectAll: selectAll, selectedIds: selectedIds, selectAllText: selectAll ? "from filter" : "", disableSelectFullData: (_8 = (_7 = props.organise) === null || _7 === void 0 ? void 0 : _7.disableSelectFullData) === null || _8 === void 0 ? void 0 : _8.table, multiActionButton: react_1.default.createElement("div", { className: "flex flex-row space-x-3" },
+            return (react_1.default.createElement(table_1.Table, { showId: showId, paginationType: renderResolvedPaginationType(), data: tableData, spaceData: spaceTableData !== null && spaceTableData !== void 0 ? spaceTableData : [], referencesOptions: listReferencesOptions, size: size !== null && size !== void 0 ? size : 0, limit: limit, cursor: cursor !== null && cursor !== void 0 ? cursor : "", loading: tableLoading !== null && tableLoading !== void 0 ? tableLoading : true, checkbox: multipleSelect, selectAll: selectAll, selectedIds: selectedIds, selectAllText: selectAll ? "from filter" : "", disableSelectFullData: (_8 = (_7 = props.organise) === null || _7 === void 0 ? void 0 : _7.disableSelectFullData) === null || _8 === void 0 ? void 0 : _8.table, multiActionButton: react_1.default.createElement("div", { className: "flex flex-row space-x-3" },
                     selectedIds.length > 0 &&
                         !((_9 = props.edit) === null || _9 === void 0 ? void 0 : _9.disabledUpdate) &&
                         !((_10 = props.bareSettings) === null || _10 === void 0 ? void 0 : _10.bareHideTableExtraMultipleAction) && (react_1.default.createElement(react_1.default.Fragment, null,
@@ -7712,7 +7854,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             }
                         });
                     }); },
-                }, addable: {
+                }, onObjectEdit: handleObjectCellEdit, addable: {
                     active: ((_31 = props.edit) === null || _31 === void 0 ? void 0 : _31.listAddable) ? true : false,
                     onAddData: function (data) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
@@ -8529,7 +8671,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         }, delayInit: true })),
                 react_1.default.createElement("div", { className: "flex justify-end pt-8" },
                     selectedObjectId && props.type !== "read" && (react_1.default.createElement(button_1.Button, { className: "mr-5", text: "Delete", type: "danger", onClick: function () { } })),
-                    react_1.default.createElement(button_1.Button, { text: "".concat(props.type === "read" ? "Close" : "Submit"), type: "normal", onClick: function () { return __awaiter(void 0, void 0, void 0, function () {
+                    react_1.default.createElement(button_1.Button, { text: "".concat(props.type === "read" && !objectCellEdit ? "Close" : "Submit"), type: "normal", onClick: function () { return __awaiter(void 0, void 0, void 0, function () {
                             var _a;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
@@ -8644,7 +8786,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                 return __generator(this, function (_b) {
                                     switch (_b.label) {
                                         case 0:
-                                            if (!(props.type === "update")) return [3 /*break*/, 2];
+                                            if (!(props.type === "update" || objectCellEdit)) return [3 /*break*/, 2];
                                             return [4 /*yield*/, ((_a = objectFormRef.current) === null || _a === void 0 ? void 0 : _a.handleSubmit())];
                                         case 1:
                                             _b.sent();
@@ -8846,7 +8988,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     return (react_1.default.createElement(react_1.default.Fragment, null,
         renderNotification("root"),
-        ((_48 = (_47 = props.renderSettings) === null || _47 === void 0 ? void 0 : _47.renderLoadingUI) === null || _48 === void 0 ? void 0 : _48.call(_47)) && loading ? ((_49 = props.renderSettings) === null || _49 === void 0 ? void 0 : _49.renderLoadingUI()) : (react_1.default.createElement(modal_1.Modal, { maxWidth: selectedObjectStructureId || excelModal ? "2xl" : undefined, open: modalVisible, title: renderModalTitle(), renderContent: renderModalContent, onClose: function () {
+        ((_49 = (_48 = props.renderSettings) === null || _48 === void 0 ? void 0 : _48.renderLoadingUI) === null || _49 === void 0 ? void 0 : _49.call(_48)) && loading ? ((_50 = props.renderSettings) === null || _50 === void 0 ? void 0 : _50.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;