blixify-ui-web 1.2.6 → 1.2.7

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

@@ -333,6 +333,18 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     // Intentionally separate from previousSelectedData, which advances on every
     // edit and therefore cannot serve as a stable submit baseline.
     var loadedSelectedData = (0, react_1.useRef)(null);
+    // INFO: Cumulative set of field IDs the user explicitly interacted with (dirty tracking).
+    // Populated via the bareUpdateHandleData useEffect which detects per-render field changes.
+    // Used as the PRIMARY condition for deciding what to submit:
+    //   - If a field is in dirtyFields → it was user-edited → always include it in the payload
+    //   - If a field is NOT in dirtyFields but appears in compareUpdatedFields diff → it was
+    //     changed externally (e.g. socket merge, prefill) → apply non-empty-wins as SECONDARY guard
+    // Reset after each successful save (baseline rebase).
+    var dirtyFieldsRef = (0, react_1.useRef)(new Set());
+    // INFO: Flag to distinguish user interactions from programmatic updates (handleUpdateSelectedData,
+    // socket merges, prefills). When true, the next changedAttributeIds from the useEffect should NOT
+    // be added to dirtyFields because the change was programmatic, not user-driven.
+    var programmaticUpdateRef = (0, react_1.useRef)(false);
     var formRef = (0, react_1.createRef)();
     var objectFormRef = (0, react_1.createRef)();
     var listAddressFromRef = (0, react_1.createRef)();
@@ -518,6 +530,16 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         handleUploadOfflineData: handleUploadOfflineData,
         handleUpdateSelectedData: handleUpdateSelectedData,
         handleExportReadPDF: handleExportReadPDF,
+        // INFO: Allow consumer to update the diff baseline externally (e.g. for socket-driven merge)
+        handleUpdateBaseline: function (newBaseline) {
+            // INFO: Do NOT reset dirtyFields here — the user's pending edits should still be
+            // treated as dirty even after a socket merge updates the baseline. dirtyFields is
+            // only reset after a successful save.
+            programmaticUpdateRef.current = true;
+            loadedSelectedData.current = newBaseline
+                ? JSON.parse(JSON.stringify(newBaseline))
+                : null;
+        },
     }); });
     (0, react_1.useEffect)(function () {
         handleCheckOfflineDataLength();
@@ -758,10 +780,22 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         }
     }, [renderImpSearchFilterConditions]);
     (0, react_1.useEffect)(function () {
-        var _a, _b;
+        var _a, _b, _c;
         if ((_a = props.bareSettings) === null || _a === void 0 ? void 0 : _a.bareUpdateHandleData) {
             var comparisonResult = (0, updateModule_1.compareUpdatedFields)((_b = previousSelectedData === null || previousSelectedData === void 0 ? void 0 : previousSelectedData.current) !== null && _b !== void 0 ? _b : {}, selectedData);
             var changedAttributeIds = comparisonResult.changedAttributeIds || [];
+            // INFO: Dirty tracking — only add to dirtyFields when the change was triggered by
+            // user interaction (not programmatic updates like handleUpdateSelectedData or socket merges).
+            if ((_c = props.bareSettings) === null || _c === void 0 ? void 0 : _c.bareUpsertPartialUpdate) {
+                if (programmaticUpdateRef.current) {
+                    // INFO: This change was programmatic — do NOT mark fields as dirty
+                    programmaticUpdateRef.current = false;
+                }
+                else if (previousSelectedData.current != null) {
+                    // INFO: User-driven change — mark these fields as dirty
+                    changedAttributeIds.forEach(function (id) { return dirtyFieldsRef.current.add(id); });
+                }
+            }
             props.bareSettings.bareUpdateHandleData(selectedData, changedAttributeIds);
         }
         previousSelectedData.current = selectedData;
@@ -863,6 +897,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         }
     }, [props.id]);
     var handleUpdateSelectedData = function (changeData) {
+        // INFO: Mark as programmatic so dirtyFields is NOT populated for these changes
+        programmaticUpdateRef.current = true;
         changeData.map(function (eachField) {
             var key = eachField.key, value = eachField.value;
             selectedData[key] = value;
@@ -2955,22 +2991,22 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     }); };
     var handleUploadOfflineData = function () { return __awaiter(void 0, void 0, void 0, function () {
         var dataUploadedId, offlineDataResp, offlineData, offlineDataIds, updateDataRes, updateDataList, _loop_1, i, err_18, success, filteredData;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var _a, _b, _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     setLoading(true);
                     dataUploadedId = [];
                     return [4 /*yield*/, indexedDb_1.indexedDb.getValue("local", props.collectionId)];
                 case 1:
-                    offlineDataResp = _b.sent();
+                    offlineDataResp = _f.sent();
                     offlineData = (_a = offlineDataResp === null || offlineDataResp === void 0 ? void 0 : offlineDataResp.data) !== null && _a !== void 0 ? _a : [];
                     offlineDataIds = offlineData.map(function (eachData) {
                         return eachData[serverId];
                     });
-                    _b.label = 2;
+                    _f.label = 2;
                 case 2:
-                    _b.trys.push([2, 8, , 9]);
+                    _f.trys.push([2, 8, , 9]);
                     if (!(offlineData.length > 0)) return [3 /*break*/, 7];
                     return [4 /*yield*/, readServerQuery.call({
                             type: "list",
@@ -2984,42 +3020,91 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             stopLimit: true,
                         })];
                 case 3:
-                    updateDataRes = _b.sent();
-                    updateDataList = updateDataRes === null || updateDataRes === void 0 ? void 0 : updateDataRes.data;
+                    updateDataRes = _f.sent();
+                    updateDataList = (_b = updateDataRes === null || updateDataRes === void 0 ? void 0 : updateDataRes.data) !== null && _b !== void 0 ? _b : [];
                     _loop_1 = function (i) {
-                        var eachOfflineData, offlineDataId, isUpdate, res;
-                        return __generator(this, function (_c) {
-                            switch (_c.label) {
+                        var eachOfflineData, offlineDataId, storedBaseline, serverDoc, preComplete, isUpdate, res, err_19;
+                        var _g;
+                        return __generator(this, function (_h) {
+                            switch (_h.label) {
                                 case 0:
                                     eachOfflineData = offlineData[i];
                                     return [4 /*yield*/, (0, utils_1.sleep)(300)];
                                 case 1:
-                                    _c.sent();
+                                    _h.sent();
                                     offlineDataId = eachOfflineData[serverId];
-                                    isUpdate = updateDataList.some(function (eachData) { return eachData[serverId] === offlineDataId; });
-                                    return [4 /*yield*/, handleSubmitData(undefined, undefined, undefined, eachOfflineData, offlineDataId, isUpdate)];
+                                    storedBaseline = (_c = eachOfflineData.__offlineBaseline) !== null && _c !== void 0 ? _c : null;
+                                    delete eachOfflineData.__offlineBaseline;
+                                    serverDoc = updateDataList.find(function (eachData) { return eachData[serverId] === offlineDataId; });
+                                    if (storedBaseline) {
+                                        loadedSelectedData.current = storedBaseline;
+                                    }
+                                    else if (serverDoc) {
+                                        loadedSelectedData.current = JSON.parse(JSON.stringify(serverDoc));
+                                    }
+                                    else {
+                                        loadedSelectedData.current = null;
+                                    }
+                                    // INFO: For offline uploads, populate dirtyFields with all non-empty fields
+                                    // from the offline data. The user explicitly saved these while offline, so they
+                                    // are all "user-dirty" and should take precedence over server values.
+                                    dirtyFieldsRef.current.clear();
+                                    Object.keys(eachOfflineData).forEach(function (key) {
+                                        if (key === "__offlineBaseline" || key === serverId)
+                                            return;
+                                        var val = eachOfflineData[key];
+                                        var hasValue = val !== undefined &&
+                                            val !== null &&
+                                            val !== "" &&
+                                            !(Array.isArray(val) && val.length === 0) &&
+                                            val !== 0 &&
+                                            val !== false;
+                                        if (hasValue)
+                                            dirtyFieldsRef.current.add(key);
+                                    });
+                                    if (!((_d = props.bareSettings) === null || _d === void 0 ? void 0 : _d.bareUpdateHandlePreComplete)) return [3 /*break*/, 3];
+                                    return [4 /*yield*/, props.bareSettings.bareUpdateHandlePreComplete(eachOfflineData)];
                                 case 2:
-                                    res = _c.sent();
-                                    if (res)
-                                        dataUploadedId.push(offlineDataId);
-                                    return [2 /*return*/];
+                                    preComplete = _h.sent();
+                                    if (!preComplete)
+                                        return [2 /*return*/, "continue"]; // Skip this item
+                                    _h.label = 3;
+                                case 3:
+                                    isUpdate = !!serverDoc;
+                                    return [4 /*yield*/, handleSubmitData(undefined, undefined, undefined, eachOfflineData, offlineDataId, isUpdate)];
+                                case 4:
+                                    res = _h.sent();
+                                    if (!res) return [3 /*break*/, 8];
+                                    dataUploadedId.push(offlineDataId);
+                                    if (!((_e = props.bareSettings) === null || _e === void 0 ? void 0 : _e.bareUpdateHandlePostComplete)) return [3 /*break*/, 8];
+                                    _h.label = 5;
+                                case 5:
+                                    _h.trys.push([5, 7, , 8]);
+                                    return [4 /*yield*/, props.bareSettings.bareUpdateHandlePostComplete(__assign((_g = {}, _g[serverId] = res, _g), eachOfflineData))];
+                                case 6:
+                                    _h.sent();
+                                    return [3 /*break*/, 8];
+                                case 7:
+                                    err_19 = _h.sent();
+                                    return [3 /*break*/, 8];
+                                case 8: return [2 /*return*/];
                             }
                         });
                     };
                     i = 0;
-                    _b.label = 4;
+                    _f.label = 4;
                 case 4:
                     if (!(i < offlineData.length)) return [3 /*break*/, 7];
                     return [5 /*yield**/, _loop_1(i)];
                 case 5:
-                    _b.sent();
-                    _b.label = 6;
+                    _f.sent();
+                    _f.label = 6;
                 case 6:
                     i++;
                     return [3 /*break*/, 4];
                 case 7: return [3 /*break*/, 9];
                 case 8:
-                    err_18 = _b.sent();
+                    err_18 = _f.sent();
                     return [3 /*break*/, 9];
                 case 9:
                     success = dataUploadedId.length === offlineData.length;
@@ -3036,7 +3121,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             type: props.collectionId,
                         })];
                 case 10:
-                    _b.sent();
+                    _f.sent();
                     handleRefresh();
                     setLoading(false);
                     handlePopUpModal(false);
@@ -3045,7 +3130,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         });
     }); };
     var handleSubmitData = function (type, rowId, columnId, data, offlineId, isOfflineUpdate, isDraft) { return __awaiter(void 0, void 0, void 0, function () {
-        var selectedId_2, id, createSelectedData_1, uniqueDataStructure, uniqueColumnId, res, offlineDataResp, offlineData, tempData, err_19, isExistingDoc, newRecordData_1, changedAttributeIds, baseDraftValue, hasBaseDraftChange, offlineDataResp, tempData, selectedIndex_3, offlineData, err_20, dataToSubmit_2, changedAttributeIds, baseDraftValue, hasBaseDraftChange, operationType, selectedIndex_4, dataId, err_21;
+        var selectedId_2, id_1, createSelectedData_1, uniqueDataStructure, uniqueColumnId, res, offlineDataResp, offlineData, clonedForOffline, tempData, selectedIndex_3, err_20, isExistingDoc, newRecordData_1, changedAttributeIds, baseDraftValue, hasBaseDraftChange, offlineDataResp, clonedForOffline, tempData, selectedIndex_4, offlineData, err_21, dataToSubmit_2, changedAttributeIds, baseDraftValue, hasBaseDraftChange, operationType, selectedIndex_5, dataId, err_22;
         var _a, _b;
         var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         return __generator(this, function (_t) {
@@ -3061,25 +3146,25 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         selectedId_2 = props.id;
                     else
                         selectedId_2 = "new";
-                    id = "";
+                    id_1 = "";
                     if (type === "update")
-                        id = rowId !== null && rowId !== void 0 ? rowId : "";
+                        id_1 = rowId !== null && rowId !== void 0 ? rowId : "";
                     else if (selectedId_2 === "new" && !showId) {
                         if (idField && selectedData[idField])
-                            id = selectedData[idField];
+                            id_1 = selectedData[idField];
                         else
-                            id = (0, uuid_1.v4)();
+                            id_1 = (0, uuid_1.v4)();
                     }
                     else
-                        id = (_c = props.id) !== null && _c !== void 0 ? _c : "";
+                        id_1 = (_c = props.id) !== null && _c !== void 0 ? _c : "";
                     if (offlineId) {
                         selectedId_2 = offlineId;
-                        id = offlineId;
+                        id_1 = offlineId;
                     }
                     if (!(isOffline && !offlineId)) return [3 /*break*/, 1];
                     createSelectedData_1 = selectedData;
                     return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, handleUploadImage(id, data)];
+                case 1: return [4 /*yield*/, handleUploadImage(id_1, data)];
                 case 2:
                     createSelectedData_1 = _t.sent();
                     _t.label = 3;
@@ -3098,7 +3183,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     res = "";
                     if (!(selectedId_2 === "new")) return [3 /*break*/, 16];
                     if (!showId)
-                        createSelectedData_1[serverId] = id;
+                        createSelectedData_1[serverId] = id_1;
                     if (isDraft)
                         createSelectedData_1["baseDraft"] = true;
                     if (!isOffline) return [3 /*break*/, 9];
@@ -3109,8 +3194,39 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 case 5:
                     offlineDataResp = _t.sent();
                     offlineData = (_e = offlineDataResp === null || offlineDataResp === void 0 ? void 0 : offlineDataResp.data) !== null && _e !== void 0 ? _e : [];
-                    tempData = (0, updateModule_1.handleParseOfflineWrite)(selectedData, structure);
-                    offlineData.push(tempData);
+                    clonedForOffline = (0, updateModule_1.handleClonedDataAttribute)(selectedData, structure, props.devSettings.server, true, showId);
+                    tempData = (0, updateModule_1.handleParseOfflineWrite)(clonedForOffline, structure);
+                    // INFO: Stamp the _id on the offline entry so subsequent saves can find and update it
+                    if (!tempData[serverId])
+                        tempData[serverId] = id_1;
+                    // INFO: Remove non-serializable keys that IDB's structured clone can't handle
+                    delete tempData["update"];
+                    // INFO: Store original baseline on first offline save so the upload
+                    // diff can identify which fields the user actually changed.
+                    if (!tempData.__offlineBaseline) {
+                        tempData.__offlineBaseline = loadedSelectedData.current
+                            ? JSON.parse(JSON.stringify(loadedSelectedData.current))
+                            : null;
+                    }
+                    selectedIndex_3 = -1;
+                    offlineData.map(function (eachOfflineData, index) {
+                        var offlineDataId = eachOfflineData[serverId];
+                        if (id_1 === offlineDataId)
+                            selectedIndex_3 = index;
+                        return null;
+                    });
+                    if (selectedIndex_3 >= 0) {
+                        // INFO: Update existing entry, carry forward baseline
+                        if (!tempData.__offlineBaseline &&
+                            offlineData[selectedIndex_3].__offlineBaseline) {
+                            tempData.__offlineBaseline =
+                                offlineData[selectedIndex_3].__offlineBaseline;
+                        }
+                        offlineData[selectedIndex_3] = tempData;
+                    }
+                    else {
+                        offlineData.push(tempData);
+                    }
                     return [4 /*yield*/, indexedDb_1.indexedDb.putValue("local", {
                             data: offlineData,
                             type: props.collectionId,
@@ -3120,7 +3236,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     res = true;
                     return [3 /*break*/, 8];
                 case 7:
-                    err_19 = _t.sent();
+                    err_20 = _t.sent();
                     return [3 /*break*/, 8];
                 case 8: return [3 /*break*/, 15];
                 case 9:
@@ -3135,10 +3251,36 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             baseDraftValue;
                         // INFO: if nothing changed (including baseDraft), skip the write
                         if (changedAttributeIds.length === 0 && !hasBaseDraftChange)
-                            return [2 /*return*/, id];
+                            return [2 /*return*/, id_1];
                         newRecordData_1 = {};
                         changedAttributeIds.forEach(function (key) {
-                            newRecordData_1[key] = createSelectedData_1[key];
+                            var _a;
+                            var newValue = createSelectedData_1[key];
+                            var baselineValue = (_a = loadedSelectedData.current) === null || _a === void 0 ? void 0 : _a[key];
+                            // INFO: Dirty tracking is the PRIMARY condition.
+                            var isUserDirty = dirtyFieldsRef.current.has(key);
+                            if (isUserDirty) {
+                                // INFO: User explicitly edited this field — always include
+                                newRecordData_1[key] = newValue;
+                                return;
+                            }
+                            // INFO: SECONDARY condition (non-empty-wins) — field changed but user didn't touch it
+                            var valueIsEmpty = newValue === undefined ||
+                                newValue === null ||
+                                newValue === "" ||
+                                (Array.isArray(newValue) && newValue.length === 0) ||
+                                newValue === 0 ||
+                                newValue === false;
+                            var baselineHasValue = baselineValue !== undefined &&
+                                baselineValue !== null &&
+                                baselineValue !== "" &&
+                                !(Array.isArray(baselineValue) && baselineValue.length === 0) &&
+                                baselineValue !== 0 &&
+                                baselineValue !== false;
+                            if (valueIsEmpty && baselineHasValue) {
+                                return;
+                            }
+                            newRecordData_1[key] = newValue;
                         });
                         // INFO: always stamp baseDraft — it is not user-edited so it may
                         // not appear in changedAttributeIds, but clearing true→false on
@@ -3151,7 +3293,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         newRecordData_1 = createSelectedData_1;
                     }
                     return [4 /*yield*/, writeServerQuery.call("update", {
-                            id: id,
+                            id: id_1,
                             data: newRecordData_1,
                             upsert: true,
                         })];
@@ -3168,7 +3310,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     }
                     if (selectedId_2 === "new") {
                         isCreatingRef.current = true;
-                        inflightIdRef.current = id; // INFO: id is the UUID already generated above
+                        inflightIdRef.current = id_1; // INFO: id is the UUID already generated above
                     }
                     return [4 /*yield*/, writeServerQuery.call("create", {
                             data: createSelectedData_1,
@@ -3203,18 +3345,38 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     return [4 /*yield*/, indexedDb_1.indexedDb.getValue("local", props.collectionId)];
                 case 18:
                     offlineDataResp = _t.sent();
-                    tempData = (0, updateModule_1.handleParseOfflineWrite)(selectedData, structure);
+                    clonedForOffline = (0, updateModule_1.handleClonedDataAttribute)(selectedData, structure, props.devSettings.server, true, showId);
+                    tempData = (0, updateModule_1.handleParseOfflineWrite)(clonedForOffline, structure);
                     tempData[serverId] = selectedId_2;
-                    selectedIndex_3 = -1;
+                    // INFO: Remove non-serializable keys that IDB's structured clone can't handle
+                    // (e.g. 'update' which is a React element injected by bareUpdateActionComponent)
+                    delete tempData["update"];
+                    selectedIndex_4 = -1;
                     offlineData = (_k = offlineDataResp === null || offlineDataResp === void 0 ? void 0 : offlineDataResp.data) !== null && _k !== void 0 ? _k : [];
                     offlineData.map(function (eachOfflineData, index) {
                         var offlineDataId = eachOfflineData[serverId];
                         if (selectedId_2 === offlineDataId)
-                            selectedIndex_3 = index;
+                            selectedIndex_4 = index;
                         return null;
                     });
-                    if (selectedIndex_3 >= 0)
-                        offlineData[selectedIndex_3] = tempData;
+                    if (selectedIndex_4 >= 0) {
+                        // INFO: Carry forward the original baseline from the existing entry
+                        if (!tempData.__offlineBaseline &&
+                            offlineData[selectedIndex_4].__offlineBaseline) {
+                            tempData.__offlineBaseline =
+                                offlineData[selectedIndex_4].__offlineBaseline;
+                        }
+                        offlineData[selectedIndex_4] = tempData;
+                    }
+                    else {
+                        // INFO: First save for this ID — stamp baseline
+                        if (!tempData.__offlineBaseline) {
+                            tempData.__offlineBaseline = loadedSelectedData.current
+                                ? JSON.parse(JSON.stringify(loadedSelectedData.current))
+                                : null;
+                        }
+                        offlineData.push(tempData);
+                    }
                     return [4 /*yield*/, indexedDb_1.indexedDb.putValue("local", {
                             data: offlineData,
                             type: props.collectionId,
@@ -3224,7 +3386,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     res = true;
                     return [3 /*break*/, 21];
                 case 20:
-                    err_20 = _t.sent();
+                    err_21 = _t.sent();
                     return [3 /*break*/, 21];
                 case 21: return [3 /*break*/, 24];
                 case 22:
@@ -3240,10 +3402,46 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             baseDraftValue;
                         // INFO: if nothing changed (including baseDraft), skip the write entirely
                         if (changedAttributeIds.length === 0 && !hasBaseDraftChange)
-                            return [2 /*return*/, id];
+                            return [2 /*return*/, id_1];
                         dataToSubmit_2 = {};
                         changedAttributeIds.forEach(function (key) {
-                            dataToSubmit_2[key] = createSelectedData_1[key];
+                            var _a;
+                            var newValue = createSelectedData_1[key];
+                            var baselineValue = (_a = loadedSelectedData.current) === null || _a === void 0 ? void 0 : _a[key];
+                            // INFO: Dirty tracking is the PRIMARY condition.
+                            // If the user explicitly interacted with this field (dirtyFields), always include it
+                            // — even if the value is empty (user intentionally cleared it).
+                            var isUserDirty = dirtyFieldsRef.current.has(key);
+                            if (isUserDirty) {
+                                // INFO: User explicitly edited this field — always send it (supports intentional clears)
+                                dataToSubmit_2[key] = newValue;
+                                return;
+                            }
+                            // INFO: SECONDARY condition (non-empty-wins) — field changed in the diff but the user
+                            // did NOT interact with it. This happens when:
+                            // (a) Socket merge updated the baseline and the form value differs from new baseline
+                            // (b) Programmatic prefill set a value
+                            // Guard: if the form value is empty but the baseline has a real value, skip it
+                            // to prevent stale empty form fields from clearing another user's data.
+                            var valueIsEmpty = newValue === undefined ||
+                                newValue === null ||
+                                newValue === "" ||
+                                (Array.isArray(newValue) && newValue.length === 0) ||
+                                newValue === 0 ||
+                                newValue === false;
+                            var baselineHasValue = baselineValue !== undefined &&
+                                baselineValue !== null &&
+                                baselineValue !== "" &&
+                                !(Array.isArray(baselineValue) && baselineValue.length === 0) &&
+                                baselineValue !== 0 &&
+                                baselineValue !== false;
+                            if (valueIsEmpty && baselineHasValue) {
+                                // INFO: Non-empty-wins — skip to prevent clearing server data
+                                return;
+                            }
+                            // INFO: Field changed, user didn't explicitly touch it, but it's not an empty→value conflict
+                            // (e.g. programmatic update set a non-empty value). Include it.
+                            dataToSubmit_2[key] = newValue;
                         });
                         dataToSubmit_2["baseDraft"] = baseDraftValue;
                         if (offlineId)
@@ -3267,11 +3465,9 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             unique: uniqueColumnId,
                             // INFO: bareUpsertPartialUpdate — upsert so the doc is created if it
                             // doesn't exist yet (covers deterministicId passed directly as props.id).
-                            // Scoped away from offline paths: offlineId uses operationType="create"
-                            // and isOfflineUpdate is a separate flow — upsert is not meaningful there.
-                            upsert: ((_q = props.bareSettings) === null || _q === void 0 ? void 0 : _q.bareUpsertPartialUpdate) &&
-                                !offlineId &&
-                                !isOfflineUpdate
+                            // Also applies to offline upload path so the doc is created if it was
+                            // deleted between the existence check and the write call.
+                            upsert: ((_q = props.bareSettings) === null || _q === void 0 ? void 0 : _q.bareUpsertPartialUpdate) && !isOfflineUpdate
                                 ? true
                                 : undefined,
                         })];
@@ -3283,15 +3479,15 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     if (!res) return [3 /*break*/, 31];
                     if (!(type === "update")) return [3 /*break*/, 27];
                     if (!columnId) return [3 /*break*/, 26];
-                    selectedIndex_4 = -1;
+                    selectedIndex_5 = -1;
                     tableData.map(function (eachData, index) {
                         if (eachData.id === rowId || eachData._id === rowId) {
                             eachData[columnId] = createSelectedData_1[columnId];
-                            selectedIndex_4 = index;
+                            selectedIndex_5 = index;
                         }
                         return null;
                     });
-                    return [4 /*yield*/, handleGetListData({ data: tableData[selectedIndex_4] }, "update", rowId)];
+                    return [4 /*yield*/, handleGetListData({ data: tableData[selectedIndex_5] }, "update", rowId)];
                 case 25:
                     _t.sent();
                     _t.label = 26;
@@ -3302,14 +3498,14 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     _t.label = 29;
                 case 29:
                     if (!((_r = props.bareSettings) === null || _r === void 0 ? void 0 : _r.bareUpdateHandlePostComplete)) return [3 /*break*/, 31];
-                    return [4 /*yield*/, props.bareSettings.bareUpdateHandlePostComplete(__assign((_b = {}, _b[serverId] = id, _b), createSelectedData_1))];
+                    return [4 /*yield*/, props.bareSettings.bareUpdateHandlePostComplete(__assign((_b = {}, _b[serverId] = id_1, _b), createSelectedData_1))];
                 case 30:
                     _t.sent();
                     _t.label = 31;
                 case 31: return [3 /*break*/, 34];
                 case 32:
-                    createSelectedData_1[serverId] = id;
-                    return [4 /*yield*/, handleGetListData({ data: [createSelectedData_1] }, selectedId_2 === "new" ? "create" : "update", id)];
+                    createSelectedData_1[serverId] = id_1;
+                    return [4 /*yield*/, handleGetListData({ data: [createSelectedData_1] }, selectedId_2 === "new" ? "create" : "update", id_1)];
                 case 33:
                     _t.sent();
                     setNotification({
@@ -3323,23 +3519,23 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     });
                     _t.label = 34;
                 case 34:
-                    dataId = res ? id : "";
+                    dataId = res ? id_1 : "";
                     return [2 /*return*/, dataId];
                 case 35:
-                    err_21 = _t.sent();
-                    console.log("error", err_21);
+                    err_22 = _t.sent();
+                    console.log("error", err_22);
                     // INFO: clear in-flight guard on failure so the next save retries as a create
                     if (isCreatingRef.current) {
                         isCreatingRef.current = false;
                         pendingDraftSaveRef.current = false;
                         inflightIdRef.current = "";
                     }
-                    if (err_21.response && err_21.response.status === 400) {
-                        if (typeof ((_s = err_21.response.data) === null || _s === void 0 ? void 0 : _s.err) === "string")
+                    if (err_22.response && err_22.response.status === 400) {
+                        if (typeof ((_s = err_22.response.data) === null || _s === void 0 ? void 0 : _s.err) === "string")
                             setNotification({
                                 type: false,
                                 title: "Error",
-                                msg: err_21.response.data.err,
+                                msg: err_22.response.data.err,
                             });
                         else
                             setNotification({
@@ -3392,11 +3588,11 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         });
     }); };
     var handleSubmit = function (isDraft) { return __awaiter(void 0, void 0, void 0, function () {
-        var preComplete, res, updatedMarkdownData_1, uploadedData_2, uploadTypes_1, err_22;
+        var preComplete, res, updatedMarkdownData_1, uploadedData_2, uploadTypes_1, err_23;
         var _a;
-        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        return __generator(this, function (_o) {
-            switch (_o.label) {
+        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        return __generator(this, function (_p) {
+            switch (_p.label) {
                 case 0:
                     // INFO: re-entry guard — if a submit is already in-flight (double-click,
                     // rapid Enter keypresses, or concurrent bareSaveOnTabChange calls), return
@@ -3405,9 +3601,9 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     if (isSubmittingRef.current)
                         return [2 /*return*/];
                     isSubmittingRef.current = true;
-                    _o.label = 1;
+                    _p.label = 1;
                 case 1:
-                    _o.trys.push([1, 10, , 11]);
+                    _p.trys.push([1, 10, , 11]);
                     setLoading(true);
                     setModalVisible(true);
                     preComplete = true;
@@ -3415,25 +3611,25 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     return [4 /*yield*/, props.bareSettings.bareUpdateHandlePreComplete(selectedData)];
                 case 2:
                     preComplete =
-                        _o.sent();
-                    _o.label = 3;
+                        _p.sent();
+                    _p.label = 3;
                 case 3:
                     if (!preComplete)
                         throw "Error";
                     if (!((_c = props.bareSettings) === null || _c === void 0 ? void 0 : _c.bareUpdateHandleComplete)) return [3 /*break*/, 5];
                     return [4 /*yield*/, props.bareSettings.bareUpdateHandleComplete(selectedData)];
                 case 4:
-                    _o.sent();
+                    _p.sent();
                     return [3 /*break*/, 9];
                 case 5: return [4 /*yield*/, handleSubmitData(undefined, undefined, undefined, undefined, undefined, undefined, isDraft)];
                 case 6:
-                    res = _o.sent();
+                    res = _p.sent();
                     if (!res) return [3 /*break*/, 9];
-                    if (!((_d = props.bareSettings) === null || _d === void 0 ? void 0 : _d.bareUpdateHandlePostComplete)) return [3 /*break*/, 8];
+                    if (!(((_d = props.bareSettings) === null || _d === void 0 ? void 0 : _d.bareUpdateHandlePostComplete) && !isOffline)) return [3 /*break*/, 8];
                     return [4 /*yield*/, props.bareSettings.bareUpdateHandlePostComplete(__assign((_a = {}, _a[serverId] = res, _a), selectedData))];
                 case 7:
-                    _o.sent();
-                    _o.label = 8;
+                    _p.sent();
+                    _p.label = 8;
                 case 8:
                     handleCheckOfflineDataLength();
                     if (isDraft) {
@@ -3443,7 +3639,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         // re-sent on every subsequent save (harmless but wasteful), and the
                         // "skip write if nothing changed" short-circuit would never trigger.
                         if ((_e = props.bareSettings) === null || _e === void 0 ? void 0 : _e.bareUpsertPartialUpdate) {
-                            loadedSelectedData.current = JSON.parse(JSON.stringify(selectedData));
+                            loadedSelectedData.current = (0, updateModule_1.handleClonedDataAttribute)(selectedData, structure, props.devSettings.server, true, showId);
+                            // INFO: Reset dirty tracking after successful save — the new baseline
+                            // is the saved state, so all fields start "clean" again.
+                            dirtyFieldsRef.current.clear();
                         }
                         updatedMarkdownData_1 = {};
                         structure.forEach(function (eachAttribute) {
@@ -3480,6 +3679,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             });
                         }
                         if (Object.keys(updatedMarkdownData_1).length > 0) {
+                            // INFO: Post-save markdown/upload data sync is programmatic, not user-driven
+                            programmaticUpdateRef.current = true;
                             setSelectedData(function (prev) { return (__assign(__assign({}, prev), updatedMarkdownData_1)); });
                         }
                         if (props.id === "new" || !props.id) {
@@ -3492,25 +3693,32 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         });
                     }
                     else {
+                        // INFO: Non-draft (final submit) — reset dirty tracking and rebase baseline.
+                        // Usually the component navigates away, but in case it doesn't (e.g. custom onComplete
+                        // that stays on the same page), ensure clean state for subsequent interactions.
+                        if ((_j = props.bareSettings) === null || _j === void 0 ? void 0 : _j.bareUpsertPartialUpdate) {
+                            loadedSelectedData.current = (0, updateModule_1.handleClonedDataAttribute)(selectedData, structure, props.devSettings.server, true, showId);
+                            dirtyFieldsRef.current.clear();
+                        }
                         if (props.onComplete) {
                             props.onComplete(res);
                         }
                         else {
                             if (selectedTab) {
-                                (_k = (_j = props.organise) === null || _j === void 0 ? void 0 : _j.handleNavigate) === null || _k === void 0 ? void 0 : _k.call(_j, "read", res, selectedTab.id);
+                                (_l = (_k = props.organise) === null || _k === void 0 ? void 0 : _k.handleNavigate) === null || _l === void 0 ? void 0 : _l.call(_k, "read", res, selectedTab.id);
                             }
                             else
-                                (_m = (_l = props.organise) === null || _l === void 0 ? void 0 : _l.handleNavigate) === null || _m === void 0 ? void 0 : _m.call(_l, "read", res, "general");
+                                (_o = (_m = props.organise) === null || _m === void 0 ? void 0 : _m.handleNavigate) === null || _o === void 0 ? void 0 : _o.call(_m, "read", res, "general");
                         }
                     }
-                    _o.label = 9;
+                    _p.label = 9;
                 case 9:
                     setModalVisible(false);
                     setLoading(false);
                     isSubmittingRef.current = false;
                     return [3 /*break*/, 11];
                 case 10:
-                    err_22 = _o.sent();
+                    err_23 = _p.sent();
                     setModalVisible(false);
                     setLoading(false);
                     isSubmittingRef.current = false;
@@ -3540,6 +3748,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 case 0:
                     if (!responseData.data) return [3 /*break*/, 6];
                     if (!((_b = props.bareSettings) === null || _b === void 0 ? void 0 : _b.bareOffline)) return [3 /*break*/, 2];
+                    // INFO: Mark as programmatic so initial data load doesn't populate dirtyFields
+                    programmaticUpdateRef.current = true;
                     setSelectedData(responseData.data);
                     // INFO: stamp the load baseline so bareUpsertPartialUpdate can diff
                     // against the original doc rather than the post-edit state.
@@ -3613,6 +3823,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     _h.label = 5;
                 case 5:
                     newRespData = _a;
+                    // INFO: Mark as programmatic so initial data load doesn't populate dirtyFields
+                    programmaticUpdateRef.current = true;
                     setSelectedData(newRespData);
                     // INFO: stamp the load baseline so bareUpsertPartialUpdate can diff
                     // against the original doc rather than the post-edit state.
@@ -3837,7 +4049,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         handleUpdateChangeData(clonedData);
     };
     var handleOnChangeSelect = function (id, value) { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, data, model, clonedData, refetchReference, currentSchema, allowedWatchedColumnTypes_1, watchedColumns, _i, watchedColumns_1, eachWatched, dependency, referenceRQ, valueRes, err_23;
+        var _a, data, model, clonedData, refetchReference, currentSchema, allowedWatchedColumnTypes_1, watchedColumns, _i, watchedColumns_1, eachWatched, dependency, referenceRQ, valueRes, err_24;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -3900,7 +4112,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 8];
                 case 7:
-                    err_23 = _b.sent();
+                    err_24 = _b.sent();
                     return [3 /*break*/, 8];
                 case 8:
                     clonedData[id] = value;
@@ -3978,7 +4190,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         }
     };
     var handleStepCSV = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var csvList_1, _loop_2, _i, _a, _b, eachKey, eachValue, valid_1, errorValue_1, excelFormData, updateFields, response, open_1, err_24;
+        var csvList_1, _loop_2, _i, _a, _b, eachKey, eachValue, valid_1, errorValue_1, excelFormData, updateFields, response, open_1, err_25;
         var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         return __generator(this, function (_p) {
             switch (_p.label) {
@@ -4126,12 +4338,12 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     _p.label = 5;
                 case 5: return [3 /*break*/, 7];
                 case 6:
-                    err_24 = _p.sent();
+                    err_25 = _p.sent();
                     setLoading(false);
                     setNotification({
                         type: false,
                         title: "Import Error",
-                        msg: err_24.message,
+                        msg: err_25.message,
                     });
                     return [3 /*break*/, 7];
                 case 7: return [2 /*return*/];
@@ -4139,7 +4351,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         });
     }); };
     var handleExportCSVData = function (downloadLinkOnly, printOnly) { return __awaiter(void 0, void 0, void 0, function () {
-        var exportQueryList, baseUrl, apiEndpoint, reqData, res, dataList, csvDownloadLink, notificaitonMsg, err_25;
+        var exportQueryList, baseUrl, apiEndpoint, reqData, res, dataList, csvDownloadLink, notificaitonMsg, err_26;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
         return __generator(this, function (_1) {
             switch (_1.label) {
@@ -4213,7 +4425,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     setExportCSVEmail((_0 = (_z = props.devSettings.currentUser) === null || _z === void 0 ? void 0 : _z.userEmail) !== null && _0 !== void 0 ? _0 : "");
                     return [3 /*break*/, 6];
                 case 5:
-                    err_25 = _1.sent();
+                    err_26 = _1.sent();
                     setNotification({
                         type: true,
                         title: "Export Failed",
@@ -4269,7 +4481,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         });
     }); };
     var handleExportReadPDF = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var elementToExport, dimensionsConfig, headerConfig_1, isMobile, scale, html2canvasOptions, originalStyles, captureWidth, captureHeight, canvas, pageWidth, pageHeight, orientation_1, pdf, pixelsToMm, elementWidthMm, elementHeightMm, pageSize, margin, headerHeight, imageDataURL, imageWidth_1, imageHeight_1, hasImage, hasText, img_1, err_26, textHeight, usableWidth, imgHeight, usableHeight, currentY, imgX, imgY, imgW, imgH, finalX, textY, textX, heightLeft, page, currentY, imgX, imgY, imgW, imgH, finalX, textY, textX, sourceY, sourceHeight, pageCanvas, ctx, pageData, pdfBlob, err_27;
+        var elementToExport, dimensionsConfig, headerConfig_1, isMobile, scale, html2canvasOptions, originalStyles, captureWidth, captureHeight, canvas, pageWidth, pageHeight, orientation_1, pdf, pixelsToMm, elementWidthMm, elementHeightMm, pageSize, margin, headerHeight, imageDataURL, imageWidth_1, imageHeight_1, hasImage, hasText, img_1, err_27, textHeight, usableWidth, imgHeight, usableHeight, currentY, imgX, imgY, imgW, imgH, finalX, textY, textX, heightLeft, page, currentY, imgX, imgY, imgW, imgH, finalX, textY, textX, sourceY, sourceHeight, pageCanvas, ctx, pageData, pdfBlob, err_28;
         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;
         return __generator(this, function (_4) {
             switch (_4.label) {
@@ -4440,8 +4652,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     headerHeight = imageHeight_1 + 2;
                     return [3 /*break*/, 13];
                 case 12:
-                    err_26 = _4.sent();
-                    console.error("Failed to load PDF header image:", err_26);
+                    err_27 = _4.sent();
+                    console.error("Failed to load PDF header image:", err_27);
                     console.error("Image source:", headerConfig_1.image.src);
                     return [3 /*break*/, 13];
                 case 13:
@@ -4582,8 +4794,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     }
                     return [3 /*break*/, 17];
                 case 15:
-                    err_27 = _4.sent();
-                    console.error("PDF export error:", err_27);
+                    err_28 = _4.sent();
+                    console.error("PDF export error:", err_28);
                     setNotification({
                         type: false,
                         title: "Error",
@@ -5747,8 +5959,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         // INFO: in compact mode, the search input is rendered inline by
                         // renderListFilterElements, so drop the trailing search element
                         // from the popup to avoid duplication.
-                        var popupFilters = ((_c = props.bareSettings) === null || _c === void 0 ? void 0 : _c.bareCompactMode) &&
-                            !((_d = props.organise) === null || _d === void 0 ? void 0 : _d.hideSearch)
+                        var popupFilters = ((_c = props.bareSettings) === null || _c === void 0 ? void 0 : _c.bareCompactMode) && !((_d = props.organise) === null || _d === void 0 ? void 0 : _d.hideSearch)
                             ? filterComponent_1.slice(0, -1)
                             : filterComponent_1;
                         if (popupFilters.length > 0) {