blixify-ui-web 1.1.4 → 1.1.9

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

@@ -2991,13 +2991,13 @@ 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, offlineDataResp, tempData, selectedIndex_3, offlineData, err_20, dataToSubmit, operationType, selectedIndex_4, dataId, err_21;
+        var selectedId_2, id, createSelectedData_1, uniqueDataStructure, uniqueColumnId, res, offlineDataResp, offlineData, tempData, err_19, offlineDataResp, tempData, selectedIndex_3, offlineData, err_20, dataToSubmit_2, changedAttributeIds, operationType, selectedIndex_4, dataId, err_21;
         var _a, _b;
-        var _c, _d, _e, _f, _g, _h;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
+        var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        return __generator(this, function (_o) {
+            switch (_o.label) {
                 case 0:
-                    _j.trys.push([0, 33, , 34]);
+                    _o.trys.push([0, 35, , 36]);
                     selectedId_2 = "";
                     if (type === "update")
                         selectedId_2 = rowId !== null && rowId !== void 0 ? rowId : "";
@@ -3027,8 +3027,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     return [3 /*break*/, 3];
                 case 1: return [4 /*yield*/, handleUploadImage(id, data)];
                 case 2:
-                    createSelectedData_1 = _j.sent();
-                    _j.label = 3;
+                    createSelectedData_1 = _o.sent();
+                    _o.label = 3;
                 case 3:
                     uniqueDataStructure = structure.filter(function (eachStructure) {
                         return eachStructure.unique;
@@ -3042,18 +3042,18 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         });
                     }
                     res = "";
-                    if (!(selectedId_2 === "new")) return [3 /*break*/, 14];
+                    if (!(selectedId_2 === "new")) return [3 /*break*/, 16];
                     if (!showId)
                         createSelectedData_1[serverId] = id;
                     if (isDraft)
                         createSelectedData_1["baseDraft"] = true;
                     if (!isOffline) return [3 /*break*/, 9];
-                    _j.label = 4;
+                    _o.label = 4;
                 case 4:
-                    _j.trys.push([4, 7, , 8]);
+                    _o.trys.push([4, 7, , 8]);
                     return [4 /*yield*/, indexedDb_1.indexedDb.getValue("local", props.collectionId)];
                 case 5:
-                    offlineDataResp = _j.sent();
+                    offlineDataResp = _o.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);
@@ -3062,14 +3062,25 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             type: props.collectionId,
                         })];
                 case 6:
-                    _j.sent();
+                    _o.sent();
                     res = true;
                     return [3 /*break*/, 8];
                 case 7:
-                    err_19 = _j.sent();
+                    err_19 = _o.sent();
                     return [3 /*break*/, 8];
-                case 8: return [3 /*break*/, 13];
+                case 8: return [3 /*break*/, 15];
                 case 9:
+                    if (!((idField && selectedData[idField]) ||
+                        ((_f = props.bareSettings) === null || _f === void 0 ? void 0 : _f.bareUpsertPartialUpdate))) return [3 /*break*/, 11];
+                    return [4 /*yield*/, writeServerQuery.call("update", {
+                            id: id,
+                            data: createSelectedData_1,
+                            upsert: true,
+                        })];
+                case 10:
+                    res = _o.sent();
+                    return [3 /*break*/, 15];
+                case 11:
                     // INFO: stepper create guard — if a create is already in-flight, queue this
                     // draft save and return early. It will be replayed as an update once the
                     // in-flight create resolves.
@@ -3085,39 +3096,39 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             data: createSelectedData_1,
                             unique: uniqueColumnId,
                         })];
-                case 10:
+                case 12:
                     //INFO: [CREATE] Create new data
-                    res = _j.sent();
-                    if (!(selectedId_2 === "new")) return [3 /*break*/, 13];
+                    res = _o.sent();
+                    if (!(selectedId_2 === "new")) return [3 /*break*/, 15];
                     isCreatingRef.current = false;
-                    if (!pendingDraftSaveRef.current) return [3 /*break*/, 12];
+                    if (!pendingDraftSaveRef.current) return [3 /*break*/, 14];
                     pendingDraftSaveRef.current = false;
                     // INFO: replay as update — inflightIdRef.current holds the real _id
                     return [4 /*yield*/, writeServerQuery.call("update", {
                             id: inflightIdRef.current,
                             data: __assign(__assign({}, createSelectedData_1), { baseDraft: true }),
                         })];
-                case 11:
+                case 13:
                     // INFO: replay as update — inflightIdRef.current holds the real _id
-                    _j.sent();
-                    _j.label = 12;
-                case 12:
-                    inflightIdRef.current = "";
-                    _j.label = 13;
-                case 13: return [3 /*break*/, 22];
+                    _o.sent();
+                    _o.label = 14;
                 case 14:
-                    if (!selectedId_2) return [3 /*break*/, 22];
-                    if (!(isOffline && !offlineId)) return [3 /*break*/, 20];
-                    _j.label = 15;
-                case 15:
-                    _j.trys.push([15, 18, , 19]);
-                    return [4 /*yield*/, indexedDb_1.indexedDb.getValue("local", props.collectionId)];
+                    inflightIdRef.current = "";
+                    _o.label = 15;
+                case 15: return [3 /*break*/, 24];
                 case 16:
-                    offlineDataResp = _j.sent();
+                    if (!selectedId_2) return [3 /*break*/, 24];
+                    if (!(isOffline && !offlineId)) return [3 /*break*/, 22];
+                    _o.label = 17;
+                case 17:
+                    _o.trys.push([17, 20, , 21]);
+                    return [4 /*yield*/, indexedDb_1.indexedDb.getValue("local", props.collectionId)];
+                case 18:
+                    offlineDataResp = _o.sent();
                     tempData = (0, updateModule_1.handleParseOfflineWrite)(selectedData, structure);
                     tempData[serverId] = selectedId_2;
                     selectedIndex_3 = -1;
-                    offlineData = (_f = offlineDataResp === null || offlineDataResp === void 0 ? void 0 : offlineDataResp.data) !== null && _f !== void 0 ? _f : [];
+                    offlineData = (_g = offlineDataResp === null || offlineDataResp === void 0 ? void 0 : offlineDataResp.data) !== null && _g !== void 0 ? _g : [];
                     offlineData.map(function (eachOfflineData, index) {
                         var offlineDataId = eachOfflineData[serverId];
                         if (selectedId_2 === offlineDataId)
@@ -3130,27 +3141,43 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             data: offlineData,
                             type: props.collectionId,
                         })];
-                case 17:
-                    _j.sent();
+                case 19:
+                    _o.sent();
                     res = true;
-                    return [3 /*break*/, 19];
-                case 18:
-                    err_20 = _j.sent();
-                    return [3 /*break*/, 19];
-                case 19: return [3 /*break*/, 22];
+                    return [3 /*break*/, 21];
                 case 20:
-                    dataToSubmit = void 0;
+                    err_20 = _o.sent();
+                    return [3 /*break*/, 21];
+                case 21: return [3 /*break*/, 24];
+                case 22:
                     if (type === "update" && columnId) {
-                        dataToSubmit = (_a = {},
+                        dataToSubmit_2 = (_a = {},
                             _a[columnId] = createSelectedData_1[columnId],
                             _a);
                     }
+                    else if ((_h = props.bareSettings) === null || _h === void 0 ? void 0 : _h.bareUpsertPartialUpdate) {
+                        changedAttributeIds = (0, updateModule_1.compareUpdatedFields)((_j = previousSelectedData.current) !== null && _j !== void 0 ? _j : {}, createSelectedData_1).changedAttributeIds;
+                        // INFO: if nothing changed, skip the write entirely — sending an
+                        // empty payload would be a no-op at best and an error at worst.
+                        if (changedAttributeIds.length === 0)
+                            return [2 /*return*/, id];
+                        dataToSubmit_2 = {};
+                        changedAttributeIds.forEach(function (key) {
+                            dataToSubmit_2[key] = createSelectedData_1[key];
+                        });
+                        if (isDraft)
+                            dataToSubmit_2["baseDraft"] = true;
+                        else
+                            dataToSubmit_2["baseDraft"] = false; // INFO: clear draft flag on final save
+                        if (offlineId)
+                            dataToSubmit_2[serverId] = offlineId;
+                    }
                     else {
-                        dataToSubmit = __assign(__assign({}, createSelectedData_1), { baseDraft: false });
+                        dataToSubmit_2 = __assign(__assign({}, createSelectedData_1), { baseDraft: false });
                         if (isDraft)
-                            dataToSubmit["baseDraft"] = true;
+                            dataToSubmit_2["baseDraft"] = true;
                         if (offlineId)
-                            dataToSubmit[serverId] = offlineId;
+                            dataToSubmit_2[serverId] = offlineId;
                     }
                     operationType = isOfflineUpdate
                         ? "update"
@@ -3159,17 +3186,26 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             : "update";
                     return [4 /*yield*/, writeServerQuery.call(operationType, {
                             id: selectedId_2,
-                            data: dataToSubmit,
+                            data: dataToSubmit_2,
                             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: ((_k = props.bareSettings) === null || _k === void 0 ? void 0 : _k.bareUpsertPartialUpdate) &&
+                                !offlineId &&
+                                !isOfflineUpdate
+                                ? true
+                                : undefined,
                         })];
-                case 21:
-                    res = _j.sent();
-                    _j.label = 22;
-                case 22:
-                    if (!(type === "update" || type === "create")) return [3 /*break*/, 30];
-                    if (!res) return [3 /*break*/, 29];
-                    if (!(type === "update")) return [3 /*break*/, 25];
-                    if (!columnId) return [3 /*break*/, 24];
+                case 23:
+                    res = _o.sent();
+                    _o.label = 24;
+                case 24:
+                    if (!(type === "update" || type === "create")) return [3 /*break*/, 32];
+                    if (!res) return [3 /*break*/, 31];
+                    if (!(type === "update")) return [3 /*break*/, 27];
+                    if (!columnId) return [3 /*break*/, 26];
                     selectedIndex_4 = -1;
                     tableData.map(function (eachData, index) {
                         if (eachData.id === rowId || eachData._id === rowId) {
@@ -3179,26 +3215,26 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         return null;
                     });
                     return [4 /*yield*/, handleGetListData({ data: tableData[selectedIndex_4] }, "update", rowId)];
-                case 23:
-                    _j.sent();
-                    _j.label = 24;
-                case 24: return [3 /*break*/, 27];
-                case 25: return [4 /*yield*/, handleGetListData({ data: [createSelectedData_1] }, "create")];
-                case 26:
-                    _j.sent();
-                    _j.label = 27;
-                case 27:
-                    if (!((_g = props.bareSettings) === null || _g === void 0 ? void 0 : _g.bareUpdateHandlePostComplete)) return [3 /*break*/, 29];
-                    return [4 /*yield*/, props.bareSettings.bareUpdateHandlePostComplete(__assign((_b = {}, _b[serverId] = id, _b), createSelectedData_1))];
+                case 25:
+                    _o.sent();
+                    _o.label = 26;
+                case 26: return [3 /*break*/, 29];
+                case 27: return [4 /*yield*/, handleGetListData({ data: [createSelectedData_1] }, "create")];
                 case 28:
-                    _j.sent();
-                    _j.label = 29;
-                case 29: return [3 /*break*/, 32];
+                    _o.sent();
+                    _o.label = 29;
+                case 29:
+                    if (!((_l = props.bareSettings) === null || _l === void 0 ? void 0 : _l.bareUpdateHandlePostComplete)) return [3 /*break*/, 31];
+                    return [4 /*yield*/, props.bareSettings.bareUpdateHandlePostComplete(__assign((_b = {}, _b[serverId] = id, _b), createSelectedData_1))];
                 case 30:
+                    _o.sent();
+                    _o.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)];
-                case 31:
-                    _j.sent();
+                case 33:
+                    _o.sent();
                     setNotification({
                         type: true,
                         title: props.id === "new"
@@ -3208,12 +3244,12 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                             ? "Data sucessfully created"
                             : "Data sucessfully updated",
                     });
-                    _j.label = 32;
-                case 32:
+                    _o.label = 34;
+                case 34:
                     dataId = res ? id : "";
                     return [2 /*return*/, dataId];
-                case 33:
-                    err_21 = _j.sent();
+                case 35:
+                    err_21 = _o.sent();
                     console.log("error", err_21);
                     // INFO: clear in-flight guard on failure so the next save retries as a create
                     if (isCreatingRef.current) {
@@ -3222,7 +3258,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         inflightIdRef.current = "";
                     }
                     if (err_21.response && err_21.response.status === 400) {
-                        if (typeof ((_h = err_21.response.data) === null || _h === void 0 ? void 0 : _h.err) === "string")
+                        if (typeof ((_m = err_21.response.data) === null || _m === void 0 ? void 0 : _m.err) === "string")
                             setNotification({
                                 type: false,
                                 title: "Error",
@@ -3235,8 +3271,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                 msg: "Please contact our administrator for assistance or try your request again later. We apologize for any inconvenience",
                             });
                     }
-                    return [3 /*break*/, 34];
-                case 34: return [2 /*return*/];
+                    return [3 /*break*/, 36];
+                case 36: return [2 /*return*/];
             }
         });
     }); };