@epam/uui-db 4.6.1-alpha.0 → 4.6.3

package/index.js

@@ -483,6 +483,7 @@ var tempIds_1 = __webpack_require__(/*! ./tempIds */ "./src/tempIds.tsx");
 var utils_1 = __webpack_require__(/*! ./utils */ "./src/utils.ts");
 var lodash_isempty_1 = (0, tslib_1.__importDefault)(__webpack_require__(/*! lodash.isempty */ "lodash.isempty"));
 var Loader_1 = __webpack_require__(/*! ./Loader */ "./src/Loader.ts");
+var uui_core_1 = __webpack_require__(/*! @epam/uui-core */ "@epam/uui-core");
 var SimpleLoadingTracker_1 = __webpack_require__(/*! ./SimpleLoadingTracker */ "./src/SimpleLoadingTracker.ts");
 var ListLoadingTracker_1 = __webpack_require__(/*! ./ListLoadingTracker */ "./src/ListLoadingTracker.ts");
 var DbRef = /** @class */ (function () {
@@ -492,7 +493,6 @@ var DbRef = /** @class */ (function () {
         this.log = [];
         this.autoSave = true;
         this.savedPoint = 0;
-        this.errors = [];
         this.throttleSaveMs = 1000;
         /* Update subscriptions (aka live views) */
         this.lastSubscriptionId = 1;
@@ -501,10 +501,36 @@ var DbRef = /** @class */ (function () {
         /* Error Subscriptions */
         this.saveErrorHandlers = [];
         /* Save scheduling */
-        this.isSaveInProgress = false;
-        this.isSaveThrottled = false;
+        this.enqueueSave = (0, uui_core_1.batch)(function () { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+            var cumulativePatch, lastLogEntry, response, error_1;
+            return (0, tslib_1.__generator)(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        cumulativePatch = this.makeCumulativePatch();
+                        lastLogEntry = this.log.length;
+                        if ((0, lodash_isempty_1.default)(cumulativePatch)) {
+                            return [2 /*return*/];
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.savePatch(cumulativePatch)];
+                    case 2:
+                        response = _a.sent();
+                        this.applyResponse(response, lastLogEntry);
+                        this.update();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_1 = _a.sent();
+                        this.saveError(cumulativePatch, error_1);
+                        this.update();
+                        throw error_1;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }); });
         this.handleBeforeUnload = function (e) {
-            if (_this.isSaveInProgress || _this.isSaveThrottled) {
+            if (_this.enqueueSave.isBusy) {
                 e.returnValue = false;
                 return false;
             }
@@ -518,8 +544,7 @@ var DbRef = /** @class */ (function () {
     }
     /** Saves all committed patches. Useful only if autoSave is off. */
     DbRef.prototype.save = function () {
-        this.enqueueSave();
-        this.update();
+        return this.enqueueSave();
     };
     DbRef.prototype.getAutoSave = function () {
         return this.autoSave;
@@ -527,13 +552,12 @@ var DbRef = /** @class */ (function () {
     DbRef.prototype.setAutoSave = function (val) {
         if (this.autoSave != val) {
             this.autoSave = val;
-            this.enqueueSave();
+            this.autoSave && this.enqueueSave();
             this.update();
         }
     };
     DbRef.prototype.revert = function () {
         this.db = this.base;
-        this.errors = [];
         this.log = this.log.slice(0, this.savedPoint);
         this.update();
     };
@@ -543,18 +567,13 @@ var DbRef = /** @class */ (function () {
     };
     /* Db Update logic */
     DbRef.prototype.commit = function (patch) {
-        try {
-            var dbBeforeUpdate = this.db.with(patch);
-            patch = this.beforeUpdate(patch, dbBeforeUpdate.tables, this.db.tables);
-            patch = (0, patchHelpers_1.mergeEntityPatches)(this.db.tables, patch);
-            this.log.push({ patch: patch });
-            this.db = this.db.with(patch);
-            this.autoSave && this.enqueueSave();
-            this.update();
-        }
-        catch (e) {
-            this.saveError(patch, e);
-        }
+        var dbBeforeUpdate = this.db.with(patch);
+        patch = this.beforeUpdate(patch, dbBeforeUpdate.tables, this.db.tables);
+        patch = (0, patchHelpers_1.mergeEntityPatches)(this.db.tables, patch);
+        this.log.push({ patch: patch });
+        this.db = this.db.with(patch);
+        this.autoSave && this.enqueueSave(null, { throttleMs: this.throttleSaveMs });
+        this.update();
     };
     DbRef.prototype.beforeUpdate = function (patch, tables, prevTables) {
         var _this = this;
@@ -600,24 +619,12 @@ var DbRef = /** @class */ (function () {
         return cumulativePatch;
     };
     DbRef.prototype.applyResponse = function (response, newSavedPoint) {
-        var _this = this;
-        if (this.errors.length == 0) {
-            this.tempIdMap.appendServerMapping(response);
-            var serverPatch = (0, patchHelpers_1.flattenResponse)(response.submit, this.db.tables);
-            serverPatch = (0, patchHelpers_1.mergeEntityPatches)(this.db.tables, serverPatch);
-            this.savedPoint = newSavedPoint;
-            this.base = this.db;
-            this.commitFetch(serverPatch);
-            if (this.autoSave) {
-                this.isSaveThrottled = true;
-                setTimeout(function () {
-                    _this.isSaveThrottled = false;
-                    if (_this.savedPoint < _this.log.length) {
-                        _this.enqueueSave();
-                    }
-                }, this.throttleSaveMs);
-            }
-        }
+        this.tempIdMap.appendServerMapping(response);
+        var serverPatch = (0, patchHelpers_1.flattenResponse)(response.submit, this.db.tables);
+        serverPatch = (0, patchHelpers_1.mergeEntityPatches)(this.db.tables, serverPatch);
+        this.savedPoint = newSavedPoint;
+        this.base = this.db;
+        this.commitFetch(serverPatch);
     };
     DbRef.prototype.subscribe = function (view, params, onUpdate) {
         var _this = this;
@@ -658,36 +665,6 @@ var DbRef = /** @class */ (function () {
     DbRef.prototype.saveError = function (request, error) {
         this.saveErrorHandlers.forEach(function (handler) { return handler(request, error); });
     };
-    DbRef.prototype.enqueueSave = function () {
-        var _this = this;
-        if (!this.isSaveInProgress && !this.isSaveThrottled) {
-            try {
-                this.isSaveInProgress = true;
-                var lastLogEntry_1 = this.log.length;
-                var cumulativePatch_1 = this.makeCumulativePatch();
-                if ((0, lodash_isempty_1.default)(cumulativePatch_1)) {
-                    this.isSaveInProgress = false;
-                    return;
-                }
-                this.savePatch(cumulativePatch_1)
-                    .then(function (response) {
-                    _this.applyResponse(response, lastLogEntry_1);
-                    _this.isSaveInProgress = false;
-                    _this.update();
-                })
-                    .catch(function (reason) {
-                    _this.saveError(cumulativePatch_1, reason);
-                    _this.isSaveInProgress = false;
-                    _this.update();
-                });
-            }
-            catch (e) {
-                this.isSaveInProgress = false;
-                this.isSaveThrottled = false;
-                throw e;
-            }
-        }
-    };
     DbRef.prototype.makeLoader = function (options) {
         var loader = new Loader_1.Loader(this, function () { return new SimpleLoadingTracker_1.SimpleLoadingTracker(); }, options);
         this.loaders.push(loader);
@@ -770,14 +747,22 @@ var DbTable = /** @class */ (function () {
             var id = _this.getId(entityPatch);
             var immId = _this.keyToImmutable(id);
             var existing = _this.state.pk.get(immId);
+            var isDeleted = false;
             var updated = entityPatch;
             if (existing) {
                 updated = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, existing), entityPatch);
+                if (_this.schema.deleteFlag) {
+                    isDeleted = updated[_this.schema.deleteFlag] === true;
+                }
             }
-            return { id: id, immId: immId, patch: entityPatch, existing: existing, updated: updated, updatedFieldsisNew: !existing };
+            return { id: id, immId: immId, patch: entityPatch, existing: existing, updated: updated, isNew: !existing, isDeleted: isDeleted };
         });
         var idVal = immutable_1.Seq.Keyed(updates.map(function (entity) { return [entity.immId, entity.updated]; }));
         var newPk = this.state.pk.merge(idVal);
+        // TBD: replace with deleteAll after migrating to immutable 4
+        updates.filter(function (u) { return u.isDeleted; }).forEach(function (u) {
+            newPk = newPk.delete(u.immId);
+        });
         var newIndexes = this.state.indexes.map(function (index) {
             var newMap = index.map;
             var _loop_1 = function (n) {
@@ -785,11 +770,13 @@ var DbTable = /** @class */ (function () {
                 var newKey = update.updated[index.field];
                 if (update.existing) {
                     var oldKey = update.existing[index.field];
-                    if (oldKey !== newKey) {
+                    if (oldKey !== newKey || update.isDeleted) {
                         newMap = newMap.update(oldKey, function (set) { return set.remove(update.immId); });
                     }
                 }
-                newMap = newMap.update(newKey, I.Set(), function (set) { return set.add(update.immId); });
+                if (!update.isDeleted) {
+                    newMap = newMap.update(newKey, I.Set(), function (set) { return set.add(update.immId); });
+                }
             };
             for (var n = 0; n < updates.length; n++) {
                 _loop_1(n);