@bringg/dashboard-sdk 8.30.1-pre.3 → 9.1.0-pre.0

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

@@ -1,148 +1,87 @@
 "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.");
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var object_merger_1 = require("../../Data/object-merger");
-var realtime_subscriptions_1 = __importDefault(require("../../realtime-subscriptions"));
+var storable_realtime_subscriptions_1 = __importDefault(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/UserPresetViews/user-preset-views-api.d.ts

@@ -6,7 +6,7 @@ export declare class UserPresetViewsApi {
     private readonly storableDataService;
     constructor(session: Session);
     loadAll: () => Promise<UserPresetView[]>;
-    update: (id: any, body: UpdateUserPresetViewPayload) => Promise<UserPresetView>;
+    update: (body: UpdateUserPresetViewPayload) => Promise<UserPresetView>;
     get: (id: number) => UserPresetView;
     getAll: () => UserPresetView[];
     getPresetViewsByViewName: (view: PresetViewSupportedView) => UserPresetView[];

package/dist/UserPresetViews/user-preset-views-api.js

@@ -50,11 +50,11 @@ var UserPresetViewsApi = /** @class */ (function () {
         this.loadAll = function () {
             return _this.storableDataService.loadAll('loadAll', function () { return _this.userPresetViewsService.loadAll(); });
         };
-        this.update = function (id, body) { return __awaiter(_this, void 0, void 0, function () {
+        this.update = function (body) { return __awaiter(_this, void 0, void 0, function () {
             var result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.userPresetViewsService.update(id, body)];
+                    case 0: return [4 /*yield*/, this.userPresetViewsService.update(body)];
                     case 1:
                         result = _a.sent();
                         this.userPresetViewsStore.set(result);
@@ -77,7 +77,8 @@ var UserPresetViewsApi = /** @class */ (function () {
                 keyFunc: function (userPresetView) { return userPresetView.view; }
             }
         ];
-        this.userPresetViewsStore = new data_store_1.default(groupFilters, { shallow: true });
+        // TODO: investigate how to turn items in DataStore in real observables
+        this.userPresetViewsStore = new data_store_1.default(groupFilters);
         this.userPresetViewsService = new user_preset_views_service_1.UserPresetViewsService(session);
         this.storableDataService = new storable_data_service_1.default(this.userPresetViewsStore);
     }

package/dist/UserPresetViews/user-preset-views-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-preset-views-api.js","sourceRoot":"","sources":["../../src/UserPresetViews/user-preset-views-api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,6DAAsC;AAEtC,mFAA2D;AAC3D,uEAAsE;AACtE,yEAAqE;AAErE;IAKC,4BAAY,OAAgB;QAA5B,iBAWC;QAEM,YAAO,GAAG;YAChB,OAAO,KAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,cAAM,OAAA,KAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,EAArC,CAAqC,CAAC,CAAC;QACjG,CAAC,CAAC;QAEK,WAAM,GAAG,UAAO,EAAE,EAAE,IAAiC;;;;4BAC5C,qBAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,EAAA;;wBAA3D,MAAM,GAAG,SAAkD;wBAEjE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAEtC,sBAAO,MAAM,EAAC;;;aACd,CAAC;QAEK,QAAG,GAAG,UAAC,EAAU;YACvB,OAAO,KAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAC;QAEK,WAAM,GAAG;YACf,OAAO,KAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC;QAC3C,CAAC,CAAC;QAEK,6BAAwB,GAAG,UAAC,IAA6B;YAC/D,OAAO,KAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,mDAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAChF,CAAC,CAAC;QAlCD,IAAM,YAAY,GAAG;YACpB;gBACC,SAAS,EAAE,mDAAwB,CAAC,IAAI;gBACxC,OAAO,EAAE,UAAC,cAA8B,IAAK,OAAA,cAAc,CAAC,IAAI,EAAnB,CAAmB;aAChE;SACD,CAAC;QAEF,IAAI,CAAC,oBAAoB,GAAG,IAAI,oBAAS,CAAiB,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3F,IAAI,CAAC,sBAAsB,GAAG,IAAI,kDAAsB,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,mBAAmB,GAAG,IAAI,+BAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC/E,CAAC;IAyBF,yBAAC;AAAD,CAAC,AAzCD,IAyCC;AAzCY,gDAAkB"}
+{"version":3,"file":"user-preset-views-api.js","sourceRoot":"","sources":["../../src/UserPresetViews/user-preset-views-api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,6DAAsC;AAEtC,mFAA2D;AAC3D,uEAAsE;AACtE,yEAAqE;AAErE;IAKC,4BAAY,OAAgB;QAA5B,iBAYC;QAEM,YAAO,GAAG;YAChB,OAAO,KAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,cAAM,OAAA,KAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,EAArC,CAAqC,CAAC,CAAC;QACjG,CAAC,CAAC;QAEK,WAAM,GAAG,UAAO,IAAiC;;;;4BACxC,qBAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAA;;wBAAvD,MAAM,GAAG,SAA8C;wBAE7D,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAEtC,sBAAO,MAAM,EAAC;;;aACd,CAAC;QAEK,QAAG,GAAG,UAAC,EAAU;YACvB,OAAO,KAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAC;QAEK,WAAM,GAAG;YACf,OAAO,KAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC;QAC3C,CAAC,CAAC;QAEK,6BAAwB,GAAG,UAAC,IAA6B;YAC/D,OAAO,KAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,mDAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAChF,CAAC,CAAC;QAnCD,IAAM,YAAY,GAAG;YACpB;gBACC,SAAS,EAAE,mDAAwB,CAAC,IAAI;gBACxC,OAAO,EAAE,UAAC,cAA8B,IAAK,OAAA,cAAc,CAAC,IAAI,EAAnB,CAAmB;aAChE;SACD,CAAC;QAEF,uEAAuE;QACvE,IAAI,CAAC,oBAAoB,GAAG,IAAI,oBAAS,CAAiB,YAAY,CAAC,CAAC;QACxE,IAAI,CAAC,sBAAsB,GAAG,IAAI,kDAAsB,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,mBAAmB,GAAG,IAAI,+BAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC/E,CAAC;IAyBF,yBAAC;AAAD,CAAC,AA1CD,IA0CC;AA1CY,gDAAkB"}

package/dist/UserPresetViews/user-preset-views-service.d.ts

@@ -4,5 +4,5 @@ export declare class UserPresetViewsService {
     private readonly service;
     constructor(session: Session);
     loadAll: () => Promise<UserPresetView[]>;
-    update: (id: any, body: UpdateUserPresetViewPayload) => Promise<UserPresetView>;
+    update: (body: UpdateUserPresetViewPayload) => Promise<UserPresetView>;
 }

package/dist/UserPresetViews/user-preset-views-service.js

@@ -56,11 +56,15 @@ var UserPresetViewsService = /** @class */ (function () {
                 }
             });
         }); };
-        this.update = function (id, body) { return __awaiter(_this, void 0, void 0, function () {
+        this.update = function (body) { return __awaiter(_this, void 0, void 0, function () {
             var result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.service.update(id, body)];
+                    case 0: return [4 /*yield*/, this.service.routeGenerator
+                            .put("/".concat(this.service.entityName))
+                            .withPayload(body)
+                            .setException("Failed to update ".concat(this.service.entityName))
+                            .invoke()];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, result];

package/dist/UserPresetViews/user-preset-views-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-preset-views-service.js","sourceRoot":"","sources":["../../src/UserPresetViews/user-preset-views-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,oEAA8C;AAG9C,IAAM,SAAS,GAAG,kBAAkB,CAAC;AAErC;IAGC,gCAAY,OAAgB;QAA5B,iBAEC;QAEM,YAAO,GAAG;;;;4BACD,qBAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAA;;wBAApC,MAAM,GAAG,SAA2B;wBAE1C,sBAAO,MAAM,EAAC;;;aACd,CAAC;QAEK,WAAM,GAAG,UAAO,EAAE,EAAE,IAAiC;;;;4BAC5C,qBAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,EAAA;;wBAA5C,MAAM,GAAG,SAAmC;wBAElD,sBAAO,MAAM,EAAC;;;aACd,CAAC;QAbD,IAAI,CAAC,OAAO,GAAG,IAAI,qBAAW,CAAC,OAAO,EAAE,UAAG,SAAS,uBAAoB,CAAC,CAAC;IAC3E,CAAC;IAaF,6BAAC;AAAD,CAAC,AAlBD,IAkBC;AAlBY,wDAAsB"}
+{"version":3,"file":"user-preset-views-service.js","sourceRoot":"","sources":["../../src/UserPresetViews/user-preset-views-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,oEAA8C;AAG9C,IAAM,SAAS,GAAG,kBAAkB,CAAC;AAErC;IAGC,gCAAY,OAAgB;QAA5B,iBAEC;QAEM,YAAO,GAAG;;;;4BACD,qBAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAA;;wBAApC,MAAM,GAAG,SAA2B;wBAE1C,sBAAO,MAAM,EAAC;;;aACd,CAAC;QAEK,WAAM,GAAG,UAAO,IAAiC;;;;4BACxB,qBAAM,IAAI,CAAC,OAAO,CAAC,cAAc;6BAC9D,GAAG,CAAC,WAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAE,CAAC;6BAClC,WAAW,CAAC,IAAI,CAAC;6BACjB,YAAY,CAAC,2BAAoB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAE,CAAC;6BAC3D,MAAM,EAAE,EAAA;;wBAJJ,MAAM,GAAmB,SAIrB;wBAEV,sBAAO,MAAM,EAAC;;;aACd,CAAC;QAjBD,IAAI,CAAC,OAAO,GAAG,IAAI,qBAAW,CAAC,OAAO,EAAE,UAAG,SAAS,uBAAoB,CAAC,CAAC;IAC3E,CAAC;IAiBF,6BAAC;AAAD,CAAC,AAtBD,IAsBC;AAtBY,wDAAsB"}

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;
 }

package/dist/Vehicle/v2/vehicles-api.js

@@ -50,8 +50,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var storable_realtime_subscriptions_1 = __importDefault(require("../../Data/storable-realtime-subscriptions"));
 var data_store_1 = __importDefault(require("../../data-store"));
-var realtime_subscriptions_1 = __importDefault(require("../../realtime-subscriptions"));
 var storable_data_service_1 = __importDefault(require("../../storable-data-service"));
 var Vehicle_consts_1 = require("../Vehicle.consts");
 var vehicles_service_1 = __importDefault(require("./vehicles-service"));
@@ -61,11 +61,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;
@@ -92,24 +91,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);
@@ -149,20 +145,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;

package/dist/Vehicle/v2/vehicles-api.js.map

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