@bringg/dashboard-sdk 9.50.13-pre.4 → 9.50.13-pre.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -56,7 +56,7 @@ var lodash_1 = require("lodash");
56
56
  var BringgException_1 = require("../Core/BringgException");
57
57
  var Logger_1 = __importDefault(require("../Core/Logger"));
58
58
  var abort_1 = require("../utils/abort");
59
- var version = '9.50.13-pre.4';
59
+ var version = '9.50.13-pre.6';
60
60
  function logErrorResponse(response) {
61
61
  var data = response.data, status = response.status;
62
62
  try {
@@ -2,22 +2,40 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.taskMerger = void 0;
4
4
  var merge_mapper_1 = require("../../Data/merge-mapper");
5
+ function hasNoActualChanges(diffArray) {
6
+ if (!Array.isArray(diffArray)) {
7
+ return false;
8
+ }
9
+ return diffArray.every(function (item) {
10
+ if (item === undefined || item === null) {
11
+ return true;
12
+ }
13
+ if (typeof item === 'object') {
14
+ return Object.keys(item).length === 0;
15
+ }
16
+ return false;
17
+ });
18
+ }
5
19
  function mergeTaskIntoExisting(tasksStore, task, shouldRemoveInventories) {
6
20
  if (shouldRemoveInventories === void 0) { shouldRemoveInventories = false; }
7
21
  var way_points = task.way_points;
8
22
  if (way_points) {
9
23
  way_points.sort(function (wp1, wp2) { return wp1.position - wp2.position; });
10
24
  }
25
+ var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
11
26
  if (shouldRemoveInventories) {
12
27
  var existingTask = tasksStore.get(task.id);
13
28
  var hasInventoriesInStore = existingTask && existingTask.task_inventories;
14
- var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
15
- if (result.diff && !result.diff.task_inventories && !hasInventoriesInStore) {
29
+ // Clean up task_inventories from diff if it hasn't actually changed
30
+ if (result.diff &&
31
+ result.diff.task_inventories &&
32
+ hasNoActualChanges(result.diff.task_inventories) &&
33
+ !hasInventoriesInStore) {
16
34
  delete result.current.task_inventories;
17
35
  }
18
36
  return result;
19
37
  }
20
- return merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
38
+ return result;
21
39
  }
22
40
  exports.taskMerger = { mergeTaskIntoExisting: mergeTaskIntoExisting };
23
41
  //# sourceMappingURL=task-merger.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"task-merger.js","sourceRoot":"","sources":["../../../src/Task/v2/task-merger.ts"],"names":[],"mappings":";;;AAEA,wDAAsD;AAGtD,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,IAAI,uBAAuB,EAAE;QAC5B,IAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAM,qBAAqB,GAAG,YAAY,IAAI,YAAY,CAAC,gBAAgB,CAAC;QAE5E,IAAM,MAAM,GAAG,0BAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAE/D,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,qBAAqB,EAAE;YAC3E,OAAO,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;SACvC;QAED,OAAO,MAAM,CAAC;KACd;IAED,OAAO,0BAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AACxD,CAAC;AAEY,QAAA,UAAU,GAAG,EAAE,qBAAqB,uBAAA,EAAE,CAAC"}
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,MAAM,GAAG,0BAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAE/D,IAAI,uBAAuB,EAAE;QAC5B,IAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAM,qBAAqB,GAAG,YAAY,IAAI,YAAY,CAAC,gBAAgB,CAAC;QAE5E,oEAAoE;QACpE,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"}
@@ -22401,7 +22401,7 @@ var lodash_1 = __webpack_require__(96486);
22401
22401
  var BringgException_1 = __webpack_require__(43605);
22402
22402
  var Logger_1 = __importDefault(__webpack_require__(55860));
22403
22403
  var abort_1 = __webpack_require__(34179);
22404
- var version = '9.50.13-pre.4';
22404
+ var version = '9.50.13-pre.6';
22405
22405
  function logErrorResponse(response) {
22406
22406
  var data = response.data, status = response.status;
22407
22407
  try {
@@ -25120,22 +25120,40 @@ exports.taskDefaultFields = [
25120
25120
  Object.defineProperty(exports, "__esModule", ({ value: true }));
25121
25121
  exports.taskMerger = void 0;
25122
25122
  var merge_mapper_1 = __webpack_require__(59200);
25123
+ function hasNoActualChanges(diffArray) {
25124
+ if (!Array.isArray(diffArray)) {
25125
+ return false;
25126
+ }
25127
+ return diffArray.every(function (item) {
25128
+ if (item === undefined || item === null) {
25129
+ return true;
25130
+ }
25131
+ if (typeof item === 'object') {
25132
+ return Object.keys(item).length === 0;
25133
+ }
25134
+ return false;
25135
+ });
25136
+ }
25123
25137
  function mergeTaskIntoExisting(tasksStore, task, shouldRemoveInventories) {
25124
25138
  if (shouldRemoveInventories === void 0) { shouldRemoveInventories = false; }
25125
25139
  var way_points = task.way_points;
25126
25140
  if (way_points) {
25127
25141
  way_points.sort(function (wp1, wp2) { return wp1.position - wp2.position; });
25128
25142
  }
25143
+ var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
25129
25144
  if (shouldRemoveInventories) {
25130
25145
  var existingTask = tasksStore.get(task.id);
25131
25146
  var hasInventoriesInStore = existingTask && existingTask.task_inventories;
25132
- var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
25133
- if (result.diff && !result.diff.task_inventories && !hasInventoriesInStore) {
25147
+ // Clean up task_inventories from diff if it hasn't actually changed
25148
+ if (result.diff &&
25149
+ result.diff.task_inventories &&
25150
+ hasNoActualChanges(result.diff.task_inventories) &&
25151
+ !hasInventoriesInStore) {
25134
25152
  delete result.current.task_inventories;
25135
25153
  }
25136
25154
  return result;
25137
25155
  }
25138
- return merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
25156
+ return result;
25139
25157
  }
25140
25158
  exports.taskMerger = { mergeTaskIntoExisting: mergeTaskIntoExisting };
25141
25159
  //# sourceMappingURL=task-merger.js.map