@bringg/dashboard-sdk 9.50.13-pre.7 → 9.50.13-pre.8

package/dist/Services/ServiceRequest.js

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

package/dist/Task/v2/task-merger.d.ts

@@ -1,12 +1,7 @@
 import { Task } from '@bringg/types';
+import { MappedStorableItem } from '../../data-entity';
 import DataStore from '../../data-store';
-declare function mergeTaskIntoExisting(tasksStore: DataStore<Task>, task: Task, shouldRemoveInventories?: boolean): {
-    current: Task;
-    diff: Task;
-} | {
-    current: Task;
-    diff?: undefined;
-};
+declare function mergeTaskIntoExisting(tasksStore: DataStore<Task>, task: Task, shouldRemoveInventories?: boolean): MappedStorableItem<Task>;
 export declare const taskMerger: {
     mergeTaskIntoExisting: typeof mergeTaskIntoExisting;
 };

package/dist/Task/v2/task-merger.js

@@ -16,6 +16,17 @@ function hasNoActualChanges(diffArray) {
         return false;
     });
 }
+var removeInventories = function (result, existingTask) {
+    var hasInventoriesInStore = existingTask && existingTask.task_inventories;
+    var noDiffOnInventories = result.diff &&
+        result.diff.task_inventories &&
+        hasNoActualChanges(result.diff.task_inventories) &&
+        !hasInventoriesInStore;
+    if (noDiffOnInventories || !existingTask) {
+        delete result.current.task_inventories;
+    }
+    return result;
+};
 function mergeTaskIntoExisting(tasksStore, task, shouldRemoveInventories) {
     if (shouldRemoveInventories === void 0) { shouldRemoveInventories = false; }
     var way_points = task.way_points;
@@ -23,16 +34,9 @@ function mergeTaskIntoExisting(tasksStore, task, shouldRemoveInventories) {
         way_points.sort(function (wp1, wp2) { return wp1.position - wp2.position; });
     }
     var existingTask = tasksStore.get(task.id);
-    var hasInventoriesInStore = existingTask && existingTask.task_inventories;
     var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
     if (shouldRemoveInventories) {
-        if (result.diff &&
-            result.diff.task_inventories &&
-            hasNoActualChanges(result.diff.task_inventories) &&
-            !hasInventoriesInStore) {
-            delete result.current.task_inventories;
-        }
-        return result;
+        return removeInventories(result, existingTask);
     }
     return result;
 }

package/dist/Task/v2/task-merger.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-merger.js","sourceRoot":"","sources":["../../../src/Task/v2/task-merger.ts"],"names":[],"mappings":";;;AAEA,wDAAsD;AAGtD,SAAS,kBAAkB,CAAC,SAAgB;IAC3C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC9B,OAAO,KAAK,CAAC;KACb;IAED,OAAO,SAAS,CAAC,KAAK,CAAC,UAAA,IAAI;QAC1B,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE;YACxC,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC7B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;SACtC;QAED,OAAO,KAAK,CAAC;IACd,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,UAA2B,EAAE,IAAU,EAAE,uBAA+B;IAA/B,wCAAA,EAAA,+BAA+B;IAC9F,IAAA,UAAU,GAAK,IAAI,WAAT,CAAU;IAE5B,IAAI,UAAU,EAAE;QACf,UAAU,CAAC,IAAI,CAAC,UAAC,GAAG,EAAE,GAAG,IAAK,OAAA,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAA3B,CAA2B,CAAC,CAAC;KAC3D;IAED,IAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7C,IAAM,qBAAqB,GAAG,YAAY,IAAI,YAAY,CAAC,gBAAgB,CAAC;IAE5E,IAAM,MAAM,GAAG,0BAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAE/D,IAAI,uBAAuB,EAAE;QAC5B,IACC,MAAM,CAAC,IAAI;YACX,MAAM,CAAC,IAAI,CAAC,gBAAgB;YAC5B,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAyB,CAAC;YACzD,CAAC,qBAAqB,EACrB;YACD,OAAO,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;SACvC;QAED,OAAO,MAAM,CAAC;KACd;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAEY,QAAA,UAAU,GAAG,EAAE,qBAAqB,uBAAA,EAAE,CAAC"}
+{"version":3,"file":"task-merger.js","sourceRoot":"","sources":["../../../src/Task/v2/task-merger.ts"],"names":[],"mappings":";;;AAEA,wDAAsD;AAItD,SAAS,kBAAkB,CAAC,SAAgB;IAC3C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC9B,OAAO,KAAK,CAAC;KACb;IAED,OAAO,SAAS,CAAC,KAAK,CAAC,UAAA,IAAI;QAC1B,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE;YACxC,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC7B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;SACtC;QAED,OAAO,KAAK,CAAC;IACd,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,IAAM,iBAAiB,GAAG,UAAC,MAAgC,EAAE,YAAkB;IAC9E,IAAM,qBAAqB,GAAG,YAAY,IAAI,YAAY,CAAC,gBAAgB,CAAC;IAE5E,IAAM,mBAAmB,GACxB,MAAM,CAAC,IAAI;QACX,MAAM,CAAC,IAAI,CAAC,gBAAgB;QAC5B,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAChD,CAAC,qBAAqB,CAAC;IAExB,IAAI,mBAAmB,IAAI,CAAC,YAAY,EAAE;QACzC,OAAO,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;KACvC;IAED,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAEF,SAAS,qBAAqB,CAAC,UAA2B,EAAE,IAAU,EAAE,uBAA+B;IAA/B,wCAAA,EAAA,+BAA+B;IAC9F,IAAA,UAAU,GAAK,IAAI,WAAT,CAAU;IAE5B,IAAI,UAAU,EAAE;QACf,UAAU,CAAC,IAAI,CAAC,UAAC,GAAG,EAAE,GAAG,IAAK,OAAA,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAA3B,CAA2B,CAAC,CAAC;KAC3D;IAED,IAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE7C,IAAM,MAAM,GAAG,0BAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAE/D,IAAI,uBAAuB,EAAE;QAC5B,OAAO,iBAAiB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;KAC/C;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAEY,QAAA,UAAU,GAAG,EAAE,qBAAqB,uBAAA,EAAE,CAAC"}

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

@@ -22401,7 +22401,7 @@ var lodash_1 = __webpack_require__(96486);
 var BringgException_1 = __webpack_require__(43605);
 var Logger_1 = __importDefault(__webpack_require__(55860));
 var abort_1 = __webpack_require__(34179);
-var version = '9.50.13-pre.7';
+var version = '9.50.13-pre.8';
 function logErrorResponse(response) {
     var data = response.data, status = response.status;
     try {
@@ -25134,6 +25134,17 @@ function hasNoActualChanges(diffArray) {
         return false;
     });
 }
+var removeInventories = function (result, existingTask) {
+    var hasInventoriesInStore = existingTask && existingTask.task_inventories;
+    var noDiffOnInventories = result.diff &&
+        result.diff.task_inventories &&
+        hasNoActualChanges(result.diff.task_inventories) &&
+        !hasInventoriesInStore;
+    if (noDiffOnInventories || !existingTask) {
+        delete result.current.task_inventories;
+    }
+    return result;
+};
 function mergeTaskIntoExisting(tasksStore, task, shouldRemoveInventories) {
     if (shouldRemoveInventories === void 0) { shouldRemoveInventories = false; }
     var way_points = task.way_points;
@@ -25141,16 +25152,9 @@ function mergeTaskIntoExisting(tasksStore, task, shouldRemoveInventories) {
         way_points.sort(function (wp1, wp2) { return wp1.position - wp2.position; });
     }
     var existingTask = tasksStore.get(task.id);
-    var hasInventoriesInStore = existingTask && existingTask.task_inventories;
     var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
     if (shouldRemoveInventories) {
-        if (result.diff &&
-            result.diff.task_inventories &&
-            hasNoActualChanges(result.diff.task_inventories) &&
-            !hasInventoriesInStore) {
-            delete result.current.task_inventories;
-        }
-        return result;
+        return removeInventories(result, existingTask);
     }
     return result;
 }