@bringg/dashboard-sdk 8.19.0 → 8.20.0-pre.1

package/dist/bringg-dashboard-sdk-cjs2.js

@@ -3763,7 +3763,7 @@ var BaseStore = /** @class */ (function () {
         };
         this.getItemsByIds = function (ids) {
             var idsSet = new Set(ids);
-            return _this.getItems().filter(function (runModel) { return idsSet.has(runModel.id); });
+            return _this.getItems().filter(function (item) { return idsSet.has(item.id); });
         };
         this.getItemsMap = function () {
             return _this._items;
@@ -6264,9 +6264,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 var _ = __webpack_require__(96486);
 var merge_mapper_1 = __webpack_require__(59200);
+var storable_realtime_subscriptions_1 = __webpack_require__(1227);
 var data_entity_1 = __webpack_require__(91083);
 var data_store_1 = __webpack_require__(73135);
-var realtime_subscriptions_1 = __webpack_require__(47985);
 var storable_data_service_1 = __webpack_require__(45297);
 var array_utils_1 = __webpack_require__(43052);
 var Customer_consts_1 = __webpack_require__(85240);
@@ -6279,15 +6279,19 @@ var CustomersApi = /** @class */ (function () {
         this.storableDataService = new storable_data_service_1.default(this.customersStore, function (customer) {
             return merge_mapper_1.mergeMapper.mergeIntoExisting(_this.customersStore, customer);
         });
-        this.realtimeSubscriptions = new realtime_subscriptions_1.default(session);
-        this.realtimeSubscriptions.subscribe(Customer_consts_1.RealtimeEvents.Created, this.storableDataService.updateInStores.bind(this.storableDataService));
-        this.realtimeSubscriptions.subscribe(Customer_consts_1.RealtimeEvents.Updated, this.storableDataService.updateInStores.bind(this.storableDataService));
-        this.realtimeSubscriptions.subscribe(Customer_consts_1.RealtimeEvents.Deleted, function (data) {
-            return _this.storableDataService.removeFromStores(data.customer_id);
-        });
+        this.storableRealtimeSubscriptions = new storable_realtime_subscriptions_1.default(session, this.customersStore, this.storableDataService);
+        this.storableRealtimeSubscriptions.updateStoreOnEvents([
+            { name: Customer_consts_1.RealtimeEvents.Created, isDelete: false },
+            { name: Customer_consts_1.RealtimeEvents.Updated, isDelete: false },
+            {
+                name: Customer_consts_1.RealtimeEvents.Deleted,
+                isDelete: true,
+                itemExtractor: function (payload) { return ({ id: payload.customer_id }); }
+            }
+        ]);
     }
     CustomersApi.prototype.onCreate = function (callback) {
-        this.realtimeSubscriptions.subscribe(Customer_consts_1.RealtimeEvents.Created, callback);
+        return this.storableRealtimeSubscriptions.onEvent(Customer_consts_1.RealtimeEvents.Created, function (item) { return callback(item.current); });
     };
     CustomersApi.prototype.add = function (customer) {
         return this.storableDataService.updateInStores(customer);
@@ -7301,6 +7305,157 @@ exports.objectMerger = { deepMerge: deepMerge };
 
 /***/ }),
 
+/***/ 1227:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+var realtime_subscriptions_1 = __webpack_require__(47985);
+var object_merger_1 = __webpack_require__(7262);
+var StorableRealtimeSubscriptions = /** @class */ (function () {
+    function StorableRealtimeSubscriptions(session, dataStore, storableDataService) {
+        this.realtimeSubscriptions = new realtime_subscriptions_1.default(session);
+        this.dataStore = dataStore;
+        this.storableDataService = storableDataService;
+        this.eventCallbacks = {};
+    }
+    StorableRealtimeSubscriptions.prototype.updateStoreOnEvents = function (events, subEntityEvents) {
+        var e_1, _a, e_2, _b;
+        var _this = this;
+        if (subEntityEvents === void 0) { subEntityEvents = []; }
+        var _loop_1 = function (event_1) {
+            this_1.realtimeSubscriptions.subscribe(event_1.name, function (item) {
+                item = event_1.itemExtractor ? event_1.itemExtractor(item) : item;
+                var data = event_1.extraDataFunc && event_1.extraDataFunc(item);
+                if (data === null || data === void 0 ? void 0 : data.ignore) {
+                    return;
+                }
+                if (event_1.isDelete) {
+                    var deletedItem = _this.storableDataService.removeFromStores(item.id);
+                    _this.runEventCallbacks(event_1.name, { diff: deletedItem });
+                }
+                else {
+                    var mappedStorableItem = _this.storableDataService.updateInStores(item, undefined, undefined, data === null || data === void 0 ? void 0 : data.params);
+                    _this.runEventCallbacks(event_1.name, mappedStorableItem);
+                }
+            });
+        };
+        var this_1 = this;
+        try {
+            for (var events_1 = __values(events), events_1_1 = events_1.next(); !events_1_1.done; events_1_1 = events_1.next()) {
+                var event_1 = events_1_1.value;
+                _loop_1(event_1);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (events_1_1 && !events_1_1.done && (_a = events_1.return)) _a.call(events_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        var _loop_2 = function (subEntityEvent) {
+            this_2.realtimeSubscriptions.subscribe(subEntityEvent.name, function (subEntity) {
+                subEntityEvent.ignoreFields.forEach(function (field) { return delete subEntity[field]; });
+                var eventChangeData = _this.changeSubEntity(subEntity, subEntityEvent.parentField, subEntityEvent.field, subEntityEvent.isDelete);
+                if (eventChangeData.current) {
+                    _this.runEventCallbacks(subEntityEvent.eventToRaise, eventChangeData);
+                }
+            });
+        };
+        var this_2 = this;
+        try {
+            for (var subEntityEvents_1 = __values(subEntityEvents), subEntityEvents_1_1 = subEntityEvents_1.next(); !subEntityEvents_1_1.done; subEntityEvents_1_1 = subEntityEvents_1.next()) {
+                var subEntityEvent = subEntityEvents_1_1.value;
+                _loop_2(subEntityEvent);
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (subEntityEvents_1_1 && !subEntityEvents_1_1.done && (_b = subEntityEvents_1.return)) _b.call(subEntityEvents_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+    };
+    StorableRealtimeSubscriptions.prototype.onAnyEvent = function (event, callback) {
+        return this.realtimeSubscriptions.subscribe(event, callback);
+    };
+    StorableRealtimeSubscriptions.prototype.onEvent = function (event, callback) {
+        var _this = this;
+        if (!this.eventCallbacks[event]) {
+            this.eventCallbacks[event] = [];
+        }
+        this.eventCallbacks[event].push(callback);
+        return function () {
+            var indexOfCallback = _this.eventCallbacks[event].indexOf(callback);
+            _this.eventCallbacks[event].splice(indexOfCallback, 1);
+        };
+    };
+    StorableRealtimeSubscriptions.prototype.runEventCallbacks = function (event, data) {
+        (this.eventCallbacks[event] || []).forEach(function (callback) { return callback(data); });
+    };
+    StorableRealtimeSubscriptions.prototype.changeSubEntity = function (subEntity, parentField, containerField, isDelete) {
+        var _a, _b, _c;
+        var current = this.dataStore.get(subEntity[parentField]);
+        var diff;
+        if (current) {
+            if (!current[containerField]) {
+                current[containerField] = [];
+            }
+            var existingIndex = current[containerField].findIndex(function (taskSubEntity) { return taskSubEntity.id === subEntity.id; });
+            if (existingIndex > -1) {
+                if (isDelete) {
+                    diff = (_a = { id: current.id }, _a[containerField] = this.createArrayOfEmptyObjects(existingIndex), _a);
+                    for (var i = existingIndex + 1; i < current[containerField].length; i++) {
+                        diff[containerField].push(current[containerField][i]);
+                    }
+                    current[containerField].splice(existingIndex, 1);
+                }
+                else {
+                    var subEntityDiff = object_merger_1.objectMerger.deepMerge(current[containerField][existingIndex], subEntity);
+                    diff = (_b = {
+                            id: current.id
+                        },
+                        _b[containerField] = this.createArrayOfEmptyObjects(current[containerField].length),
+                        _b);
+                    diff[containerField][existingIndex] = subEntityDiff;
+                }
+            }
+            else if (!isDelete) {
+                diff = (_c = {
+                        id: current.id
+                    },
+                    _c[containerField] = this.createArrayOfEmptyObjects(current[containerField].length),
+                    _c);
+                diff[containerField].push(subEntity);
+                current[containerField].push(subEntity);
+            }
+        }
+        return { current: current, diff: diff };
+    };
+    StorableRealtimeSubscriptions.prototype.createArrayOfEmptyObjects = function (length) {
+        return Array.from({ length: length }, function () { return ({}); });
+    };
+    return StorableRealtimeSubscriptions;
+}());
+exports["default"] = StorableRealtimeSubscriptions;
+//# sourceMappingURL=storable-realtime-subscriptions.js.map
+
+/***/ }),
+
 /***/ 27774:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -16886,21 +17041,6 @@ exports["default"] = Rules;
 
 "use strict";
 
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -16951,8 +17091,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RunsService = exports.Routes = void 0;
 var BringgException_1 = __webpack_require__(43605);
+var CrudService_1 = __webpack_require__(14809);
 var Route_1 = __webpack_require__(92641);
-var SessionBasedService_1 = __webpack_require__(27826);
 var array_utils_1 = __webpack_require__(43052);
 var runs_consts_1 = __webpack_require__(4669);
 exports.Routes = {
@@ -16971,27 +17111,23 @@ exports.Routes = {
     ASSIGN_VEHICLES: new Route_1.Route('/runs/{:id}/vehicles_assignment', 3 /* HttpMethod.PATCH */),
     UNASSIGN_VEHICLES: new Route_1.Route('/runs/{:id}/vehicles_assignment', 4 /* HttpMethod.DELETE */)
 };
-var RunsService = /** @class */ (function (_super) {
-    __extends(RunsService, _super);
+var RunsService = /** @class */ (function () {
     function RunsService(session) {
-        return _super.call(this, session.config.getApiEndpoint(), session) || this;
+        this.service = new CrudService_1.default(session, 'runs');
     }
     RunsService.prototype.getAll = function (options, _a) {
         var _b = _a === void 0 ? {} : _a, signal = _b.signal;
         return __awaiter(this, void 0, void 0, function () {
-            var runsResponse;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.GET_RUNS,
                             extractor: runs_consts_1.defaultExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to get Runs'),
                             queryString: options,
                             signal: signal
                         })];
-                    case 1:
-                        runsResponse = _c.sent();
-                        return [2 /*return*/, runsResponse];
+                    case 1: return [2 /*return*/, _c.sent()];
                 }
             });
         });
@@ -17001,7 +17137,7 @@ var RunsService = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.GET_RUN_DATA,
                             extractor: runs_consts_1.defaultExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to get routes data'),
@@ -17076,22 +17212,19 @@ var RunsService = /** @class */ (function (_super) {
             });
         });
     };
-    RunsService.prototype.get = function (id, _a) {
+    RunsService.prototype.load = function (id, _a) {
         var _b = _a === void 0 ? {} : _a, signal = _b.signal;
         return __awaiter(this, void 0, void 0, function () {
-            var run;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.GET_RUN,
                             extractor: runs_consts_1.runExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to get Run'),
                             routeParams: { id: id },
                             signal: signal
                         })];
-                    case 1:
-                        run = _c.sent();
-                        return [2 /*return*/, run];
+                    case 1: return [2 /*return*/, _c.sent()];
                 }
             });
         });
@@ -17099,9 +17232,10 @@ var RunsService = /** @class */ (function (_super) {
     RunsService.prototype.update = function (id, options, _a) {
         var _b = _a === void 0 ? {} : _a, signal = _b.signal;
         return __awaiter(this, void 0, void 0, function () {
+            var response;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.UPDATE_RUN,
                             extractor: runs_consts_1.defaultExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to update Run'),
@@ -17109,7 +17243,9 @@ var RunsService = /** @class */ (function (_super) {
                             routeParams: { id: id },
                             signal: signal
                         })];
-                    case 1: return [2 /*return*/, _c.sent()];
+                    case 1:
+                        response = _c.sent();
+                        return [2 /*return*/, response.run];
                 }
             });
         });
@@ -17120,7 +17256,7 @@ var RunsService = /** @class */ (function (_super) {
             var runHistory;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.GET_RUN_HISTORY,
                             extractor: runs_consts_1.runsHistoryExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to get run history'),
@@ -17140,7 +17276,7 @@ var RunsService = /** @class */ (function (_super) {
             var runLocations;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.GET_RUN_LOCATIONS,
                             extractor: runs_consts_1.runsLocationsExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to get run locations'),
@@ -17160,7 +17296,7 @@ var RunsService = /** @class */ (function (_super) {
             var runLocations;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.GET_RUN_CASHOUT,
                             extractor: runs_consts_1.runCashoutExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to get run cashout'),
@@ -17180,7 +17316,7 @@ var RunsService = /** @class */ (function (_super) {
             var response;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.ASSIGN_DRIVER,
                             extractor: runs_consts_1.defaultExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to assign driver to run'),
@@ -17201,7 +17337,7 @@ var RunsService = /** @class */ (function (_super) {
             var response;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.UNASSIGN_DRIVER,
                             extractor: runs_consts_1.defaultExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to assign driver to run'),
@@ -17222,7 +17358,7 @@ var RunsService = /** @class */ (function (_super) {
             var response;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.ASSIGN_VEHICLES,
                             extractor: runs_consts_1.defaultExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to assign vehicles to run'),
@@ -17243,7 +17379,7 @@ var RunsService = /** @class */ (function (_super) {
             var response;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.UNASSIGN_VEHICLES,
                             extractor: runs_consts_1.defaultExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to unassign vehicles from run'),
@@ -17264,7 +17400,7 @@ var RunsService = /** @class */ (function (_super) {
             var runBulkClose;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.BULK_CLOSE,
                             extractor: runs_consts_1.defaultExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to bulk close runs'),
@@ -17284,7 +17420,7 @@ var RunsService = /** @class */ (function (_super) {
             var markDonePlanning;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.MARK_DONE_PLANNING,
                             extractor: runs_consts_1.defaultExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to mark done planning for runs'),
@@ -17304,7 +17440,7 @@ var RunsService = /** @class */ (function (_super) {
             var actualBreaksByRunIdResponse;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.handleAuthorizedRequest({
+                    case 0: return [4 /*yield*/, this.service.handleAuthorizedRequest({
                             route: exports.Routes.GET_ACTUAL_BREAKS,
                             extractor: runs_consts_1.defaultExtractor,
                             exceptionProducer: BringgException_1.BringgException.serviceException('Failed to get actual breaks of runs'),
@@ -17321,7 +17457,7 @@ var RunsService = /** @class */ (function (_super) {
         });
     };
     return RunsService;
-}(SessionBasedService_1.SessionBasedService));
+}());
 exports.RunsService = RunsService;
 //# sourceMappingURL=runs.service.js.map
 
@@ -17372,7 +17508,6 @@ var RunStore = /** @class */ (function (_super) {
         _this.updateRun = function (payload) {
             return _this.createOrUpdateRun(payload, _this.onUpdate.bind(_this));
         };
-        // eslint-disable-next-line @typescript-eslint/ban-types
         _this.createOrUpdateRun = function (payload, callback) {
             var existingRunModel = _this.store.getItem(payload.run.id);
             var updatedRunModel = { id: payload.run.id, run: payload.run, taskIds: undefined };
@@ -17508,7 +17643,7 @@ exports["default"] = RunStore;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.GetAllChunkSize = exports.defaultExtractor = exports.runCashoutExtractor = exports.runsLocationsExtractor = exports.runsHistoryExtractor = exports.runExtractor = exports.RunEvents = exports.RunStatus = void 0;
+exports.GetAllChunkSize = exports.defaultExtractor = exports.runCashoutExtractor = exports.runsLocationsExtractor = exports.runsHistoryExtractor = exports.runExtractor = exports.RunGroupTypes = exports.RunEvents = exports.RunStatus = void 0;
 var RunStatus;
 (function (RunStatus) {
     RunStatus["ALL"] = "all";
@@ -17521,6 +17656,10 @@ var RunEvents;
     RunEvents["DELETED"] = "run deleted";
     RunEvents["CREATED"] = "run created";
 })(RunEvents = exports.RunEvents || (exports.RunEvents = {}));
+var RunGroupTypes;
+(function (RunGroupTypes) {
+    RunGroupTypes["TaskIds"] = "taskIds";
+})(RunGroupTypes = exports.RunGroupTypes || (exports.RunGroupTypes = {}));
 var runExtractor = function (response) { return response.run; };
 exports.runExtractor = runExtractor;
 var runsHistoryExtractor = function (response) { return response; };
@@ -17668,7 +17807,7 @@ var Runs = /** @class */ (function () {
             var run;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.runsService.get(id, commonOptions)];
+                    case 0: return [4 /*yield*/, this.runsService.load(id, commonOptions)];
                     case 1:
                         run = _a.sent();
                         return [2 /*return*/, this.runStore.set(run)];
@@ -17681,7 +17820,7 @@ var Runs = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.runsService.get(id, commonOptions)];
+                    case 0: return [4 /*yield*/, this.runsService.load(id, commonOptions)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -17826,6 +17965,165 @@ exports["default"] = Runs;
 
 /***/ }),
 
+/***/ 30196:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+var storable_realtime_subscriptions_1 = __webpack_require__(1227);
+var Tasks_consts_1 = __webpack_require__(24976);
+var runs_consts_1 = __webpack_require__(4669);
+var RunRealtimeSubscriptions = /** @class */ (function () {
+    function RunRealtimeSubscriptions(session, runsStore, storableDataService) {
+        var _this = this;
+        this.runsStore = runsStore;
+        this.storableDataService = storableDataService;
+        this.updateTaskIdsOnDelete = function (task) {
+            var existingRun = _this.runsStore.get(task.run_id);
+            if (!existingRun) {
+                return;
+            }
+            var updatedTaskIds = new Set(existingRun.task_ids);
+            updatedTaskIds.delete(task.id);
+            _this.updateRunInStore(existingRun, updatedTaskIds);
+        };
+        this.storableRealtimeSubscriptions = new storable_realtime_subscriptions_1.default(session, runsStore, storableDataService);
+        this.taskIdsWaitingForRun = new Map();
+    }
+    RunRealtimeSubscriptions.prototype.updateStoreOnEvents = function () {
+        var runExtractor = function (_a) {
+            var run = _a.run;
+            return run;
+        };
+        this.storableRealtimeSubscriptions.updateStoreOnEvents([
+            {
+                name: runs_consts_1.RunEvents.CREATED,
+                isDelete: false,
+                extraDataFunc: this.addTaskIdsOnCreateOrUpdate.bind(this),
+                itemExtractor: runExtractor
+            },
+            {
+                name: runs_consts_1.RunEvents.UPDATED,
+                isDelete: false,
+                extraDataFunc: this.addTaskIdsOnCreateOrUpdate.bind(this),
+                itemExtractor: runExtractor
+            },
+            { name: runs_consts_1.RunEvents.DELETED, isDelete: true }
+        ]);
+        this.storableRealtimeSubscriptions.onAnyEvent(Tasks_consts_1.TaskRealTimeEvents.TASK_DELETED, this.updateTaskIdsOnDelete.bind(this));
+        this.storableRealtimeSubscriptions.onAnyEvent(Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE, this.updateTaskIds.bind(this));
+        this.storableRealtimeSubscriptions.onAnyEvent(Tasks_consts_1.TaskRealTimeEvents.NEW_TASK, this.updateTaskIds.bind(this));
+    };
+    RunRealtimeSubscriptions.prototype.onUpdate = function (callback) {
+        return this.storableRealtimeSubscriptions.onEvent(runs_consts_1.RunEvents.UPDATED, callback);
+    };
+    RunRealtimeSubscriptions.prototype.onDelete = function (callback) {
+        return this.storableRealtimeSubscriptions.onEvent(runs_consts_1.RunEvents.DELETED, callback);
+    };
+    RunRealtimeSubscriptions.prototype.onCreate = function (callback) {
+        return this.storableRealtimeSubscriptions.onEvent(runs_consts_1.RunEvents.CREATED, callback);
+    };
+    RunRealtimeSubscriptions.prototype.addTaskIdsOnCreateOrUpdate = function (run) {
+        if (run.task_ids || run.tasks) {
+            return;
+        }
+        var existingRun = this.runsStore.get(run.id);
+        var taskIdsWaitingForRun = this.taskIdsWaitingForRun.get(run.id) || new Set();
+        var taskIds = existingRun
+            ? Array.from(new Set(__spreadArray(__spreadArray([], __read(existingRun.task_ids), false), __read(taskIdsWaitingForRun), false)))
+            : Array.from(taskIdsWaitingForRun);
+        this.taskIdsWaitingForRun.delete(run.id);
+        return { params: { taskIds: taskIds } };
+    };
+    RunRealtimeSubscriptions.prototype.updateTaskIds = function (task) {
+        var existingRun = this.runsStore.getGroup(runs_consts_1.RunGroupTypes.TaskIds, task.id)[0];
+        if (task.run_id) {
+            var newRun = this.runsStore.get(task.run_id);
+            if (!newRun) {
+                this.backupTasksUntilRunIsCreated(task);
+            }
+            else if (this.taskAddedToRun(task, newRun)) {
+                var updatedTaskIds = new Set(newRun.task_ids);
+                updatedTaskIds.add(task.id);
+                this.updateRunInStore(newRun, updatedTaskIds);
+            }
+        }
+        else if (this.taskRemovedFromRun(task, existingRun)) {
+            var updatedTaskIds = new Set(existingRun.task_ids);
+            updatedTaskIds.delete(task.id);
+            this.updateRunInStore(existingRun, updatedTaskIds);
+        }
+        this.updatePreviousRun(task, existingRun === null || existingRun === void 0 ? void 0 : existingRun.id);
+    };
+    RunRealtimeSubscriptions.prototype.updatePreviousRun = function (task, previousRunId) {
+        if (previousRunId && previousRunId != task.run_id) {
+            if (this.taskIdsWaitingForRun.has(previousRunId)) {
+                this.taskIdsWaitingForRun.get(previousRunId).delete(task.id);
+            }
+            var previousRunOfTask = this.runsStore.get(previousRunId);
+            if (previousRunOfTask) {
+                var updatedTaskIds = new Set(previousRunOfTask.task_ids);
+                updatedTaskIds.delete(task.id);
+                this.updateRunInStore(previousRunOfTask, updatedTaskIds);
+            }
+        }
+    };
+    RunRealtimeSubscriptions.prototype.updateRunInStore = function (newRun, taskIds) {
+        var mappedItem = this.storableDataService.updateInStores(newRun, undefined, undefined, {
+            taskIds: Array.from(taskIds)
+        });
+        this.storableRealtimeSubscriptions.runEventCallbacks(runs_consts_1.RunEvents.UPDATED, mappedItem);
+    };
+    RunRealtimeSubscriptions.prototype.taskRemovedFromRun = function (task, existingRun) {
+        var _a;
+        return !task.run_id && ((_a = existingRun === null || existingRun === void 0 ? void 0 : existingRun.task_ids) === null || _a === void 0 ? void 0 : _a.includes(task.id));
+    };
+    RunRealtimeSubscriptions.prototype.taskAddedToRun = function (task, existingRun) {
+        var _a;
+        return task.run_id && !((_a = existingRun.task_ids) === null || _a === void 0 ? void 0 : _a.includes(task.id));
+    };
+    RunRealtimeSubscriptions.prototype.backupTasksUntilRunIsCreated = function (task) {
+        if (!task.run_id) {
+            return;
+        }
+        if (!this.taskIdsWaitingForRun.has(task.run_id)) {
+            this.taskIdsWaitingForRun.set(task.run_id, new Set());
+        }
+        this.taskIdsWaitingForRun.get(task.run_id).add(task.id);
+    };
+    return RunRealtimeSubscriptions;
+}());
+exports["default"] = RunRealtimeSubscriptions;
+//# sourceMappingURL=run-realtime-subscriptions.js.map
+
+/***/ }),
+
 /***/ 83582:
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
@@ -17879,56 +18177,82 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+var BringgDashboardSDK_1 = __webpack_require__(5655);
+var data_entity_1 = __webpack_require__(91083);
 var data_store_1 = __webpack_require__(73135);
-var realtime_subscriptions_1 = __webpack_require__(47985);
+var storable_data_service_1 = __webpack_require__(45297);
 var runs_consts_1 = __webpack_require__(4669);
 var runs_service_1 = __webpack_require__(34075);
+var run_realtime_subscriptions_1 = __webpack_require__(30196);
 var RunsApi = /** @class */ (function () {
     function RunsApi(session) {
         var _this = this;
-        this.createOrUpdateRun = function (payload) {
-            _this.runsStore.set(payload.run);
+        this.onUpdate = function (callback) {
+            return _this.realtimeSubscriptions.onUpdate(callback);
         };
-        this.deleteRun = function (payload) {
-            _this.runsStore.remove(payload.id);
+        this.onDelete = function (callback) {
+            return _this.realtimeSubscriptions.onDelete(callback);
+        };
+        this.onCreate = function (callback) {
+            return _this.realtimeSubscriptions.onCreate(callback);
         };
-        this.runsStore = new data_store_1.default();
+        this.runsStore = new data_store_1.default([
+            {
+                groupType: runs_consts_1.RunGroupTypes.TaskIds,
+                keyFunc: function (runModel) { return runModel.task_ids; }
+            }
+        ]);
         this.runsService = new runs_service_1.RunsService(session);
-        this.realtimeSubscriptions = new realtime_subscriptions_1.default(session);
-        this.realtimeSubscriptions.subscribe(runs_consts_1.RunEvents.CREATED, this.createOrUpdateRun);
-        this.realtimeSubscriptions.subscribe(runs_consts_1.RunEvents.UPDATED, this.createOrUpdateRun);
-        this.realtimeSubscriptions.subscribe(runs_consts_1.RunEvents.DELETED, this.deleteRun);
+        var mapper = function (run, params) {
+            var existing = _this.runsStore.get(run.id);
+            var taskIds;
+            if (params.taskIds || run.task_ids || run.tasks) {
+                taskIds = params.taskIds || run.task_ids || run.tasks.map(function (task) { return task.id; });
+            }
+            if (existing) {
+                var previous = (0, BringgDashboardSDK_1.getGlobals)().mobx.toJS(existing);
+                run.task_ids = taskIds || existing.task_ids;
+                return { current: run, previous: previous };
+            }
+            else {
+                run.task_ids = taskIds || [];
+                return { current: run };
+            }
+        };
+        this.storableDataService = new storable_data_service_1.default(this.runsStore, mapper);
+        this.realtimeSubscriptions = new run_realtime_subscriptions_1.default(session, this.runsStore, this.storableDataService);
     }
+    RunsApi.prototype.updateStoreOnEvents = function () {
+        this.realtimeSubscriptions.updateStoreOnEvents();
+    };
+    RunsApi.prototype.get = function (id) {
+        return this.runsStore.get(id);
+    };
     RunsApi.prototype.getAll = function () {
         return this.runsStore.getAll();
     };
+    RunsApi.prototype.getAllMap = function () {
+        return this.runsStore.getAllById();
+    };
     RunsApi.prototype.getByIds = function (ids) {
         var _this = this;
-        return ids.map(function (runId) { return _this.runsStore.get(runId); });
+        return ids.map(function (runId) { return _this.runsStore.get(runId); }).filter(Boolean);
     };
-    RunsApi.prototype.loadAll = function (options, commonOptions) {
+    RunsApi.prototype.add = function (run) {
+        return this.storableDataService.updateInStores(run);
+    };
+    RunsApi.prototype.remove = function (id) {
+        return this.storableDataService.removeFromStores(id);
+    };
+    RunsApi.prototype.loadMany = function (queryParams, options, commonOptions) {
+        if (options === void 0) { options = data_entity_1.DEFAULT_OPTIONS; }
         if (commonOptions === void 0) { commonOptions = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var idsToFetch, runs_1, runs;
             var _this = this;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!options.ids) return [3 /*break*/, 3];
-                        idsToFetch = options.ids.filter(function (id) { return !_this.runsStore.get(id); });
-                        if (!idsToFetch.length) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.runsService.loadAll(__assign(__assign({}, options), { ids: idsToFetch }), commonOptions)];
-                    case 1:
-                        runs_1 = _a.sent();
-                        this.runsStore.setMany(runs_1.map(function (run) { return ({ current: run }); }));
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, this.getByIds(options.ids)];
-                    case 3: return [4 /*yield*/, this.runsService.loadAll(options, commonOptions)];
-                    case 4:
-                        runs = _a.sent();
-                        this.runsStore.setAll(runs.map(function (run) { return ({ current: run }); }));
-                        return [2 /*return*/, runs];
-                }
+                return [2 /*return*/, this.storableDataService.loadMany('loadMany', function (idsToLoad) {
+                        return _this.runsService.loadAll(__assign(__assign({}, options), { ids: idsToLoad }), commonOptions);
+                    }, queryParams.ids, options)];
             });
         });
     };
@@ -17943,6 +18267,130 @@ var RunsApi = /** @class */ (function () {
             });
         });
     };
+    RunsApi.prototype.load = function (id, options) {
+        var _this = this;
+        if (options === void 0) { options = data_entity_1.DEFAULT_OPTIONS; }
+        return this.storableDataService.load('load', function () { return _this.runsService.load(id); }, id, options);
+    };
+    RunsApi.prototype.update = function (id, options, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.storableDataService.modify('update', function () { return _this.runsService.update(id, options, commonOptions); })];
+            });
+        });
+    };
+    RunsApi.prototype.getHistory = function (id, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.runsService.getHistory(id, commonOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RunsApi.prototype.getLocations = function (id, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.runsService.getLocations(id, commonOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RunsApi.prototype.getCashout = function (id, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.runsService.getCashout(id, commonOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RunsApi.prototype.assignDriver = function (id, userId, targetRun, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.runsService.assignDriver(id, userId, targetRun, commonOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RunsApi.prototype.unassignDriver = function (id, userId, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.runsService.unassignDriver(id, userId, commonOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RunsApi.prototype.assignVehicles = function (id, vehicleId, tasks, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.runsService.assignVehicles(id, vehicleId, tasks, commonOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RunsApi.prototype.unassignVehicles = function (id, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.runsService.unassignVehicles(id, commonOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RunsApi.prototype.bulkClose = function (runIds, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.runsService.bulkClose(runIds, commonOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RunsApi.prototype.markDonePlanning = function (runIds, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.runsService.markDonePlanning(runIds, commonOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RunsApi.prototype.getActualBreaks = function (runIds, commonOptions) {
+        if (commonOptions === void 0) { commonOptions = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.runsService.getActualBreaks(runIds, commonOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
     return RunsApi;
 }());
 exports["default"] = RunsApi;
@@ -20206,7 +20654,7 @@ var lodash_1 = __webpack_require__(96486);
 var BringgException_1 = __webpack_require__(43605);
 var Logger_1 = __webpack_require__(55860);
 var abort_1 = __webpack_require__(34179);
-var version = '8.19.0';
+var version = '8.20.0-pre.1';
 function logErrorResponse(response) {
     var data = response.data, status = response.status;
     try {
@@ -22489,151 +22937,90 @@ exports.Routes = {
 /***/ }),
 
 /***/ 52131:
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-var object_merger_1 = __webpack_require__(7262);
-var realtime_subscriptions_1 = __webpack_require__(47985);
+var storable_realtime_subscriptions_1 = __webpack_require__(1227);
 var Tasks_consts_1 = __webpack_require__(24976);
 var TaskRealtimeSubscriptions = /** @class */ (function () {
     function TaskRealtimeSubscriptions(session, tasksStore, storableDataService) {
-        this.realtimeSubscriptions = new realtime_subscriptions_1.default(session);
         this.tasksStore = tasksStore;
-        this.storableDataService = storableDataService;
-        this.eventCallbacks = {};
+        this.storableRealtimeSubscriptions = new storable_realtime_subscriptions_1.default(session, tasksStore, storableDataService);
     }
     TaskRealtimeSubscriptions.prototype.updateStoreOnEvents = function () {
         var _this = this;
-        var ignoreFields = ['way_points'];
-        this.realtimeSubscriptions.subscribe(Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE, function (task) {
-            var isPartialUpdate = !task.hasOwnProperty('status');
-            if (isPartialUpdate && !_this.tasksStore.get(task.id)) {
-                return;
-            }
-            var mappedStorableItem = _this.storableDataService.updateInStores(task);
-            _this.runEventCallbacks(Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE, mappedStorableItem);
-        });
-        this.realtimeSubscriptions.subscribe(Tasks_consts_1.TaskRealTimeEvents.NEW_TASK, function (task) {
-            var mappedStorableItem = _this.storableDataService.updateInStores(task);
-            _this.runEventCallbacks(Tasks_consts_1.TaskRealTimeEvents.NEW_TASK, mappedStorableItem);
-        });
-        this.realtimeSubscriptions.subscribe(Tasks_consts_1.TaskRealTimeEvents.TASK_DELETED, function (task) {
-            var deletedTasks = _this.storableDataService.removeFromStores(task.id);
-            _this.runEventCallbacks(Tasks_consts_1.TaskRealTimeEvents.TASK_DELETED, { diff: deletedTasks });
-        });
-        [
-            { event: Tasks_consts_1.TaskRealTimeEvents.NEW_SCAN, field: 'scans', isDelete: false },
-            { event: Tasks_consts_1.TaskRealTimeEvents.NEW_NOTE, field: 'task_notes', isDelete: false },
-            { event: Tasks_consts_1.TaskRealTimeEvents.WAYPOINT_ADDED, field: 'way_points', isDelete: false },
-            { event: Tasks_consts_1.TaskRealTimeEvents.WAYPOINT_UPDATED, field: 'way_points', isDelete: false },
-            { event: Tasks_consts_1.TaskRealTimeEvents.WAYPOINT_DELETED, field: 'way_points', isDelete: true }
-        ].forEach(function (eventData) {
-            _this.realtimeSubscriptions.subscribe(eventData.event, function (subEntity) {
-                ignoreFields.forEach(function (field) { return delete subEntity[field]; });
-                var eventChangeData = _this.changeSubEntity(subEntity, eventData.field, eventData.isDelete);
-                if (eventChangeData.current) {
-                    _this.runEventCallbacks(Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE, eventChangeData);
+        var events = [
+            {
+                name: Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE,
+                isDelete: false,
+                extraDataFunc: function (task) {
+                    var isPartialUpdate = !task.hasOwnProperty('status');
+                    return { ignore: isPartialUpdate && !_this.tasksStore.get(task.id) };
                 }
-            });
-        });
+            },
+            { name: Tasks_consts_1.TaskRealTimeEvents.NEW_TASK, isDelete: false },
+            { name: Tasks_consts_1.TaskRealTimeEvents.TASK_DELETED, isDelete: true }
+        ];
+        var subEntityEvents = [
+            {
+                name: Tasks_consts_1.TaskRealTimeEvents.NEW_SCAN,
+                eventToRaise: Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE,
+                parentField: 'task_id',
+                field: 'scans',
+                ignoreFields: ['way_points'],
+                isDelete: false
+            },
+            {
+                name: Tasks_consts_1.TaskRealTimeEvents.NEW_NOTE,
+                eventToRaise: Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE,
+                parentField: 'task_id',
+                field: 'task_notes',
+                ignoreFields: ['way_points'],
+                isDelete: false
+            },
+            {
+                name: Tasks_consts_1.TaskRealTimeEvents.WAYPOINT_ADDED,
+                eventToRaise: Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE,
+                parentField: 'task_id',
+                field: 'way_points',
+                ignoreFields: ['way_points'],
+                isDelete: false
+            },
+            {
+                name: Tasks_consts_1.TaskRealTimeEvents.WAYPOINT_UPDATED,
+                eventToRaise: Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE,
+                parentField: 'task_id',
+                field: 'way_points',
+                ignoreFields: ['way_points'],
+                isDelete: false
+            },
+            {
+                name: Tasks_consts_1.TaskRealTimeEvents.WAYPOINT_DELETED,
+                eventToRaise: Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE,
+                parentField: 'task_id',
+                field: 'way_points',
+                ignoreFields: ['way_points'],
+                isDelete: true
+            }
+        ];
+        this.storableRealtimeSubscriptions.updateStoreOnEvents(events, subEntityEvents);
     };
     TaskRealtimeSubscriptions.prototype.onCreate = function (callback) {
-        return this.onEvent(Tasks_consts_1.TaskRealTimeEvents.NEW_TASK, callback);
+        return this.storableRealtimeSubscriptions.onEvent(Tasks_consts_1.TaskRealTimeEvents.NEW_TASK, callback);
     };
     TaskRealtimeSubscriptions.prototype.onDelete = function (callback) {
-        return this.onEvent(Tasks_consts_1.TaskRealTimeEvents.TASK_DELETED, callback);
+        return this.storableRealtimeSubscriptions.onEvent(Tasks_consts_1.TaskRealTimeEvents.TASK_DELETED, callback);
     };
     TaskRealtimeSubscriptions.prototype.onWayPointUpdate = function (callback) {
-        return this.onEvent(Tasks_consts_1.TaskRealTimeEvents.WAYPOINT_UPDATED, callback);
+        return this.storableRealtimeSubscriptions.onEvent(Tasks_consts_1.TaskRealTimeEvents.WAYPOINT_UPDATED, callback);
     };
     TaskRealtimeSubscriptions.prototype.onWayPointDelete = function (callback) {
-        return this.onEvent(Tasks_consts_1.TaskRealTimeEvents.WAYPOINT_DELETED, callback);
+        return this.storableRealtimeSubscriptions.onEvent(Tasks_consts_1.TaskRealTimeEvents.WAYPOINT_DELETED, callback);
     };
     TaskRealtimeSubscriptions.prototype.onUpdate = function (callback) {
-        var subscriptions = [];
-        subscriptions.push(this.onEvent(Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE, callback));
-        return function () {
-            var e_1, _a;
-            try {
-                for (var subscriptions_1 = __values(subscriptions), subscriptions_1_1 = subscriptions_1.next(); !subscriptions_1_1.done; subscriptions_1_1 = subscriptions_1.next()) {
-                    var subscription = subscriptions_1_1.value;
-                    subscription();
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (subscriptions_1_1 && !subscriptions_1_1.done && (_a = subscriptions_1.return)) _a.call(subscriptions_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-        };
-    };
-    TaskRealtimeSubscriptions.prototype.onEvent = function (event, callback) {
-        var _this = this;
-        if (!this.eventCallbacks[event]) {
-            this.eventCallbacks[event] = [];
-        }
-        this.eventCallbacks[event].push(callback);
-        return function () {
-            var indexOfCallback = _this.eventCallbacks[event].indexOf(callback);
-            _this.eventCallbacks[event].splice(indexOfCallback, 1);
-        };
-    };
-    TaskRealtimeSubscriptions.prototype.runEventCallbacks = function (event, data) {
-        (this.eventCallbacks[event] || []).forEach(function (callback) { return callback(data); });
-    };
-    TaskRealtimeSubscriptions.prototype.changeSubEntity = function (subEntity, containerField, isDelete) {
-        var _a, _b, _c;
-        if (isDelete === void 0) { isDelete = false; }
-        var task = this.tasksStore.get(subEntity.task_id);
-        var diff;
-        if (task) {
-            if (!task[containerField]) {
-                task[containerField] = [];
-            }
-            var existingIndex = task[containerField].findIndex(function (taskSubEntity) { return taskSubEntity.id === subEntity.id; });
-            if (existingIndex > -1) {
-                if (isDelete) {
-                    diff = (_a = { id: task.id }, _a[containerField] = this.createArrayOfEmptyObjects(existingIndex), _a);
-                    for (var i = existingIndex + 1; i < task[containerField].length; i++) {
-                        diff[containerField].push(task[containerField][i]);
-                    }
-                    task[containerField].splice(existingIndex, 1);
-                }
-                else {
-                    var subEntityDiff = object_merger_1.objectMerger.deepMerge(task[containerField][existingIndex], subEntity);
-                    diff = (_b = {
-                            id: task.id
-                        },
-                        _b[containerField] = this.createArrayOfEmptyObjects(task[containerField].length),
-                        _b);
-                    diff[containerField][existingIndex] = subEntityDiff;
-                }
-            }
-            else if (!isDelete) {
-                diff = (_c = { id: task.id }, _c[containerField] = this.createArrayOfEmptyObjects(task[containerField].length), _c);
-                diff[containerField].push(subEntity);
-                task[containerField].push(subEntity);
-            }
-        }
-        return { current: task, diff: diff };
-    };
-    TaskRealtimeSubscriptions.prototype.createArrayOfEmptyObjects = function (length) {
-        return Array.from({ length: length }, function () { return ({}); });
+        return this.storableRealtimeSubscriptions.onEvent(Tasks_consts_1.TaskRealTimeEvents.TASK_UPDATE, callback);
     };
     return TaskRealtimeSubscriptions;
 }());
@@ -27543,8 +27930,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+var storable_realtime_subscriptions_1 = __webpack_require__(1227);
 var data_store_1 = __webpack_require__(73135);
-var realtime_subscriptions_1 = __webpack_require__(47985);
 var storable_data_service_1 = __webpack_require__(45297);
 var Vehicle_consts_1 = __webpack_require__(84010);
 var vehicles_service_1 = __webpack_require__(87386);
@@ -27554,11 +27941,10 @@ var VehiclesApi = /** @class */ (function () {
             { groupType: Vehicle_consts_1.VehicleGroup.Team, keyFunc: function (vehicle) { return vehicle.team_id; } },
             { groupType: Vehicle_consts_1.VehicleGroup.IsTrailer, keyFunc: function (vehicle) { return !!vehicle.is_trailer; } }
         ];
-        this.eventCallbacks = {};
         this.vehiclesStore = new data_store_1.default(groupFilters);
         this.vehiclesService = new vehicles_service_1.default(session);
         this.storableDataService = new storable_data_service_1.default(this.vehiclesStore);
-        this.realtimeSubscriptions = new realtime_subscriptions_1.default(session);
+        this.storableRealtimeSubscriptions = new storable_realtime_subscriptions_1.default(session, this.vehiclesStore, this.storableDataService);
     }
     VehiclesApi.prototype.load = function (id, options) {
         var _this = this;
@@ -27585,24 +27971,21 @@ var VehiclesApi = /** @class */ (function () {
         return this.storableDataService.modify('create', function () { return _this.vehiclesService.create(vehicleData); });
     };
     VehiclesApi.prototype.updateStoreOnEvents = function () {
-        var _this = this;
-        this.realtimeSubscriptions.subscribe(Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_UPDATE, function (vehicle) {
-            _this.storableDataService.updateInStores(vehicle);
-            _this.runEventCallbacks(Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_UPDATE, vehicle);
-        });
-        this.realtimeSubscriptions.subscribe(Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_DELETE, function (vehicle) {
-            _this.storableDataService.removeFromStores(vehicle.id);
-            _this.runEventCallbacks(Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_DELETE, vehicle);
-        });
+        this.storableRealtimeSubscriptions.updateStoreOnEvents([
+            { name: Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_UPDATE, isDelete: false },
+            { name: Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_DELETE, isDelete: true }
+        ]);
     };
     VehiclesApi.prototype.onUpdate = function (callback) {
-        return this.onEvent(Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_UPDATE, callback);
+        return this.storableRealtimeSubscriptions.onEvent(Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_UPDATE, function (item) { return callback(item.current); });
     };
     VehiclesApi.prototype.onDelete = function (callback) {
-        return this.onEvent(Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_DELETE, callback);
+        return this.storableRealtimeSubscriptions.onEvent(Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_DELETE, function (item) { return callback(item.current); });
     };
     VehiclesApi.prototype.onUnassigned = function (callback) {
-        return this.realtimeSubscriptions.subscribe(Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_UNASSIGNED, callback);
+        return this.storableRealtimeSubscriptions.onAnyEvent(Vehicle_consts_1.REAL_TIME_EVENTS.VEHICLE_UNASSIGNED, function (vehicle) {
+            return callback(vehicle);
+        });
     };
     VehiclesApi.prototype.get = function (id) {
         return this.vehiclesStore.get(id);
@@ -27642,20 +28025,6 @@ var VehiclesApi = /** @class */ (function () {
             });
         });
     };
-    VehiclesApi.prototype.runEventCallbacks = function (event, data) {
-        (this.eventCallbacks[event] || []).forEach(function (callback) { return callback(data); });
-    };
-    VehiclesApi.prototype.onEvent = function (event, callback) {
-        var _this = this;
-        if (!this.eventCallbacks[event]) {
-            this.eventCallbacks[event] = [];
-        }
-        this.eventCallbacks[event].push(callback);
-        return function () {
-            var indexOfCallback = _this.eventCallbacks[event].indexOf(callback);
-            _this.eventCallbacks[event].splice(indexOfCallback, 1);
-        };
-    };
     return VehiclesApi;
 }());
 exports["default"] = VehiclesApi;
@@ -29354,6 +29723,17 @@ exports["default"] = { build: build };
 
 "use strict";
 
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -29427,7 +29807,7 @@ var StorableDataService = /** @class */ (function () {
                         return [4 /*yield*/, loadFunc(loadFnIdsParams)];
                     case 1:
                         items = _a.sent();
-                        mappedItems_1 = items.map(function (item) { return _this.mapper(item, action); });
+                        mappedItems_1 = items.map(function (item) { return _this.mapper(item, { action: action }); });
                         if (options.groupType) {
                             this.dataStore.setGroup(options.groupType, groupValue, mappedItems_1);
                         }
@@ -29455,7 +29835,7 @@ var StorableDataService = /** @class */ (function () {
                         return [4 /*yield*/, loadFunc(ids)];
                     case 1:
                         items = _a.sent();
-                        mappedItems_2 = items.map(function (item) { return _this.mapper(item, action); });
+                        mappedItems_2 = items.map(function (item) { return _this.mapper(item, { action: action }); });
                         this.dataStore.setMany(mappedItems_2);
                         this.extraDataStores.forEach(function (dataStore) { return dataStore.setMany(mappedItems_2, options.fields); });
                         return [2 /*return*/, mappedItems_2.map(function (mappedItems) { return mappedItems.current; })];
@@ -29537,13 +29917,13 @@ var StorableDataService = /** @class */ (function () {
             });
         });
     };
-    StorableDataService.prototype.updateInStores = function (item, action, fields) {
-        return this.updateManyInStores([item], action, fields)[0];
+    StorableDataService.prototype.updateInStores = function (item, action, fields, extraMapperParams) {
+        return this.updateManyInStores([item], action, fields, extraMapperParams)[0];
     };
-    StorableDataService.prototype.updateManyInStores = function (items, action, fields) {
+    StorableDataService.prototype.updateManyInStores = function (items, action, fields, extraMapperParams) {
         var _this = this;
         return (0, BringgDashboardSDK_1.getGlobals)().mobx.runInAction(function () {
-            var clientItems = items.map(function (item) { return _this.mapper(item, action); });
+            var clientItems = items.map(function (item) { return _this.mapper(item, __assign({ action: action }, extraMapperParams)); });
             _this.dataStore.setMany(clientItems);
             _this.extraDataStores.forEach(function (dataStore) { return dataStore.setMany(clientItems, fields); });
             return clientItems;