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

package/dist/Run/v2/runs-api.js

@@ -47,56 +47,82 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var BringgDashboardSDK_1 = require("../../BringgDashboardSDK");
+var data_entity_1 = require("../../data-entity");
 var data_store_1 = require("../../data-store");
-var realtime_subscriptions_1 = require("../../realtime-subscriptions");
+var storable_data_service_1 = require("../../storable-data-service");
 var runs_consts_1 = require("../runs.consts");
 var runs_service_1 = require("../Service/runs.service");
+var run_realtime_subscriptions_1 = require("./run-realtime-subscriptions");
 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.runsStore = new data_store_1.default();
+        this.onCreate = function (callback) {
+            return _this.realtimeSubscriptions.onCreate(callback);
+        };
+        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.add = function (run) {
+        return this.storableDataService.updateInStores(run);
+    };
+    RunsApi.prototype.remove = function (id) {
+        return this.storableDataService.removeFromStores(id);
     };
-    RunsApi.prototype.loadAll = function (options, commonOptions) {
+    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)];
             });
         });
     };
@@ -111,6 +137,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;

package/dist/Run/v2/runs-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"runs-api.js","sourceRoot":"","sources":["../../../src/Run/v2/runs-api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runs-api.js","sourceRoot":"","sources":["../../../src/Run/v2/runs-api.ts"],"names":[],"mappings":"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"}

package/dist/Services/ServiceRequest.js

@@ -53,7 +53,7 @@ var lodash_1 = require("lodash");
 var BringgException_1 = require("../Core/BringgException");
 var Logger_1 = require("../Core/Logger");
 var abort_1 = require("../utils/abort");
-var version = '8.18.3';
+var version = '8.20.0-pre.1';
 function logErrorResponse(response) {
     var data = response.data, status = response.status;
     try {

package/dist/Task/v2/task-realtime-subscriptions.d.ts

@@ -4,19 +4,13 @@ import DataStore from '../../data-store';
 import Session from '../../Services/Identity/Session';
 import StorableDataService from '../../storable-data-service';
 export default class TaskRealtimeSubscriptions {
-    private readonly realtimeSubscriptions;
-    private readonly tasksStore;
-    private readonly storableDataService;
-    private readonly eventCallbacks;
+    private tasksStore;
+    private readonly storableRealtimeSubscriptions;
     constructor(session: Session, tasksStore: DataStore<Task>, storableDataService: StorableDataService<Task, Task>);
     updateStoreOnEvents(): void;
-    onCreate(callback: (eventData: MappedStorableItem<Task>) => void): () => void;
-    onDelete(callback: (eventData: MappedStorableItem<Task>) => void): () => void;
-    onWayPointUpdate(callback: (eventData: MappedStorableItem<Task>) => void): () => void;
-    onWayPointDelete(callback: (eventData: MappedStorableItem<Task>) => void): () => void;
-    onUpdate(callback: (eventData: MappedStorableItem<Task>) => void): () => void;
-    private onEvent;
-    private runEventCallbacks;
-    private changeSubEntity;
-    private createArrayOfEmptyObjects;
+    onCreate(callback: (eventData: MappedStorableItem<Task>) => void): import("../../Data/storable-types").StorableEventUnsubscribe;
+    onDelete(callback: (eventData: MappedStorableItem<Task>) => void): import("../../Data/storable-types").StorableEventUnsubscribe;
+    onWayPointUpdate(callback: (eventData: MappedStorableItem<Task>) => void): import("../../Data/storable-types").StorableEventUnsubscribe;
+    onWayPointDelete(callback: (eventData: MappedStorableItem<Task>) => void): import("../../Data/storable-types").StorableEventUnsubscribe;
+    onUpdate(callback: (eventData: MappedStorableItem<Task>) => void): import("../../Data/storable-types").StorableEventUnsubscribe;
 }

package/dist/Task/v2/task-realtime-subscriptions.js

@@ -1,145 +1,84 @@
 "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 = require("../../Data/object-merger");
-var realtime_subscriptions_1 = require("../../realtime-subscriptions");
+var storable_realtime_subscriptions_1 = require("../../Data/storable-realtime-subscriptions");
 var Tasks_consts_1 = require("../Tasks.consts");
 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;
 }());

package/dist/Task/v2/task-realtime-subscriptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-realtime-subscriptions.js","sourceRoot":"","sources":["../../../src/Task/v2/task-realtime-subscriptions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-realtime-subscriptions.js","sourceRoot":"","sources":["../../../src/Task/v2/task-realtime-subscriptions.ts"],"names":[],"mappings":"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"}

package/dist/Task/v2/tasks-api.d.ts

@@ -9,11 +9,11 @@ export default class TasksApi {
     private readonly taskRealtimeSubscriptions;
     constructor(session: Session);
     updateStoreOnEvents(): void;
-    onUpdate(callback: (mappedStorableItem: MappedStorableItem<Task>) => void): () => void;
-    onCreate(callback: (mappedStorableItem: MappedStorableItem<Task>) => void): () => void;
-    onDelete(callback: (mappedStorableItem: MappedStorableItem<Task>) => void): () => void;
-    onWayPointUpdate(callback: any): () => void;
-    onWayPointDelete(callback: any): () => void;
+    onUpdate(callback: (mappedStorableItem: MappedStorableItem<Task>) => void): import("../../Data/storable-types").StorableEventUnsubscribe;
+    onCreate(callback: (mappedStorableItem: MappedStorableItem<Task>) => void): import("../../Data/storable-types").StorableEventUnsubscribe;
+    onDelete(callback: (mappedStorableItem: MappedStorableItem<Task>) => void): import("../../Data/storable-types").StorableEventUnsubscribe;
+    onWayPointUpdate(callback: any): import("../../Data/storable-types").StorableEventUnsubscribe;
+    onWayPointDelete(callback: any): import("../../Data/storable-types").StorableEventUnsubscribe;
     get(id: number, fields?: ItemFields): Task;
     getMany(ids: number[], fields?: ItemFields): Task[];
     getGroup(groupType: TaskGroupTypes, groupValue: GROUP_VALUES): Task[];

package/dist/Vehicle/v2/vehicles-api.d.ts

@@ -1,4 +1,5 @@
 import { MerchantConfigurationCSVField, Vehicle, VehicleChange } from '@bringg/types';
+import { StorableEventUnsubscribe } from '../../Data/storable-types';
 import { DataOptions, GroupValue } from '../../data-entity';
 import Session from '../../Services/Identity/Session';
 import { VehicleGroup, VehiclesCsvImportResponse } from '../Vehicle.consts';
@@ -6,8 +7,7 @@ export default class VehiclesApi {
     private readonly vehiclesStore;
     private readonly vehiclesService;
     private readonly storableDataService;
-    private readonly realtimeSubscriptions;
-    private readonly eventCallbacks;
+    private readonly storableRealtimeSubscriptions;
     constructor(session: Session);
     load(id: number, options?: DataOptions): Promise<Vehicle>;
     loadAll(options?: DataOptions): Promise<Vehicle[]>;
@@ -16,9 +16,9 @@ export default class VehiclesApi {
     update(id: number, vehicleData: Partial<Vehicle>): Promise<Vehicle>;
     create(vehicleData: Partial<Vehicle>): Promise<Vehicle>;
     updateStoreOnEvents(): void;
-    onUpdate(callback: any): () => void;
-    onDelete(callback: any): () => void;
-    onUnassigned(callback: any): () => void;
+    onUpdate(callback: (vehicle: Vehicle) => StorableEventUnsubscribe): StorableEventUnsubscribe;
+    onDelete(callback: (vehicle: Vehicle) => StorableEventUnsubscribe): StorableEventUnsubscribe;
+    onUnassigned(callback: (vehicle: Vehicle) => StorableEventUnsubscribe): () => void;
     get(id: number): Vehicle;
     getAll(): Vehicle[];
     getGroup(group: VehicleGroup, groupValue: GroupValue): Vehicle[];
@@ -26,6 +26,4 @@ export default class VehiclesApi {
     importVehiclesCsv(file: Blob): Promise<VehiclesCsvImportResponse>;
     getCsvUploadFields(): Promise<MerchantConfigurationCSVField[]>;
     getAssignmentHistory(id: number): Promise<VehicleChange[]>;
-    private runEventCallbacks;
-    private onEvent;
 }