@bringg/dashboard-sdk 9.14.0 → 9.15.0
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.
- package/dist/Services/ServiceRequest.js +1 -1
- package/dist/Task/Tasks.consts.d.ts +3 -0
- package/dist/Task/Tasks.consts.js +9 -1
- package/dist/Task/Tasks.consts.js.map +1 -1
- package/dist/Task/v2/task-merger.d.ts +13 -0
- package/dist/Task/v2/task-merger.js +13 -0
- package/dist/Task/v2/task-merger.js.map +1 -0
- package/dist/Task/v2/tasks-api.js +16 -4
- package/dist/Task/v2/tasks-api.js.map +1 -1
- package/dist/bringg-dashboard-sdk-cjs2.js +46 -6
- package/dist/bringg-dashboard-sdk-cjs2.js.map +1 -1
- package/dist/bringg-dashboard-sdk.js +14 -3
- package/dist/bringg-dashboard-sdk.min.js +1 -1
- package/dist/bringg-dashboard-sdk.min.js.map +1 -1
- package/package.json +1 -1
|
@@ -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.
|
|
59
|
+
var version = '9.15.0';
|
|
60
60
|
function logErrorResponse(response) {
|
|
61
61
|
var data = response.data, status = response.status;
|
|
62
62
|
try {
|
|
@@ -11,7 +11,7 @@ var __values = (this && this.__values) || function(o) {
|
|
|
11
11
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.Routes = exports.baseRoute = exports.TaskRealTimeEvents = exports.quotesExtractor = exports.formExtractor = exports.taskIdsExtractor = exports.scanCodeExtractor = exports.locationExtractor = exports.childTasksExtractor = exports.tasksExtractor = exports.successExtractor = exports.taskExtractor = exports.defaultExtractor = exports.noteTypes = exports.taskToGroupMapper = exports.groupFilter = exports.TaskGroupTypes = exports.GROUP_VALUES = exports.DONE_TASK_STATUES = exports.OPEN_TASK_STATUES = void 0;
|
|
14
|
+
exports.taskDefaultFields = exports.Routes = exports.baseRoute = exports.TaskRealTimeEvents = exports.quotesExtractor = exports.formExtractor = exports.taskIdsExtractor = exports.scanCodeExtractor = exports.locationExtractor = exports.childTasksExtractor = exports.tasksExtractor = exports.successExtractor = exports.taskExtractor = exports.defaultExtractor = exports.noteTypes = exports.taskToGroupMapper = exports.groupFilter = exports.TaskGroupTypes = exports.GROUP_VALUES = exports.DONE_TASK_STATUES = exports.OPEN_TASK_STATUES = void 0;
|
|
15
15
|
var types_1 = require("@bringg/types");
|
|
16
16
|
var TaskHelpers_1 = require("./TaskHelpers");
|
|
17
17
|
exports.OPEN_TASK_STATUES = [
|
|
@@ -145,4 +145,12 @@ exports.Routes = {
|
|
|
145
145
|
// keep this here in case we need, all this data is required by frontend currently
|
|
146
146
|
//const PLANNING_DEFAULT_PARAMS_REQUEST = "first_way_point_has_to_leave_by,active_way_point_id,status,id,way_points.all.position,group_leader_id,priority,late,customer_id,way_points.all.customer_id,way_points.all.id,payment_type_name,task_inventories.all.id,task_inventories.all.way_point_id,task_inventories.all.pending,task_inventories.all.inventory,task_inventories.all.original_quantity,ready_to_execute,virtual_task,done_planning,task_type_id,rogue_reasons,invalidated,automatically_assigned,external_id,title,tag_id,created_at,user_id,way_points.all.late,way_points.all.done,way_points.all.address,planning_done,scheduled_at,way_points.first.address,way_points.last.address,total_price,fleet_id,lat,lng,way_points.all.lat,way_points.all.lng,way_points.all.scheduled_at,team_ids,way_points.all.customer,way_points.all.eta,route_name,run,dispatcher_id,preparation_status,preparation_start_time_planned,preparation_end_time_planned,preparation_ready_for_pickup_time_planned,payment_method,preparation_external_id,fleet_delivery_external_id";
|
|
147
147
|
//const OPEN_DEFAULT_PARAMS_REQUEST = "first_way_point_has_to_leave_by,active_way_point_id,status,id,way_points.all.position,group_leader_id,priority,late,customer_id,way_points.all.customer_id,way_points.all.id,payment_type_name,task_inventories.all.id,task_inventories.all.way_point_id,task_inventories.all.pending,task_inventories.all.inventory,task_inventories.all.original_quantity,ready_to_execute,virtual_task,done_planning,task_type_id,rogue_reasons,invalidated,automatically_assigned,external_id,title,tag_id,created_at,user_id,way_points.all.late,way_points.all.done,way_points.all.address,planning_done,scheduled_at,way_points.first.address,way_points.last.address,total_price,fleet_id,lat,lng,way_points.all.lat,way_points.all.lng,way_points.all.scheduled_at,team_ids,way_points.all.customer,way_points.all.eta,route_name,run,dispatcher_id,preparation_status,preparation_start_time_planned,preparation_end_time_planned,preparation_ready_for_pickup_time_planned,payment_method,preparation_external_id,fleet_delivery_external_id";
|
|
148
|
+
exports.taskDefaultFields = [
|
|
149
|
+
'id',
|
|
150
|
+
'status',
|
|
151
|
+
'invalidated',
|
|
152
|
+
'group_leader_id',
|
|
153
|
+
'ready_to_execute',
|
|
154
|
+
{ way_points: ['position'] }
|
|
155
|
+
];
|
|
148
156
|
//# sourceMappingURL=Tasks.consts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tasks.consts.js","sourceRoot":"","sources":["../../src/Task/Tasks.consts.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Tasks.consts.js","sourceRoot":"","sources":["../../src/Task/Tasks.consts.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Task } from '@bringg/types';
|
|
2
|
+
import DataStore from '../../data-store';
|
|
3
|
+
declare function mergeTaskIntoExisting(tasksStore: DataStore<Task>, task: Task): {
|
|
4
|
+
current: Task;
|
|
5
|
+
diff: Task;
|
|
6
|
+
} | {
|
|
7
|
+
current: Task;
|
|
8
|
+
diff?: undefined;
|
|
9
|
+
};
|
|
10
|
+
export declare const taskMerger: {
|
|
11
|
+
mergeTaskIntoExisting: typeof mergeTaskIntoExisting;
|
|
12
|
+
};
|
|
13
|
+
export {};
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.taskMerger = void 0;
|
|
4
|
+
var merge_mapper_1 = require("../../Data/merge-mapper");
|
|
5
|
+
function mergeTaskIntoExisting(tasksStore, task) {
|
|
6
|
+
var way_points = task.way_points;
|
|
7
|
+
if (way_points) {
|
|
8
|
+
way_points.sort(function (wp1, wp2) { return wp1.position - wp2.position; });
|
|
9
|
+
}
|
|
10
|
+
return merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
|
|
11
|
+
}
|
|
12
|
+
exports.taskMerger = { mergeTaskIntoExisting: mergeTaskIntoExisting };
|
|
13
|
+
//# sourceMappingURL=task-merger.js.map
|
|
@@ -0,0 +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;IAC7D,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,OAAO,0BAAW,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AACxD,CAAC;AAEY,QAAA,UAAU,GAAG,EAAE,qBAAqB,uBAAA,EAAE,CAAC"}
|
|
@@ -77,12 +77,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
77
77
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
78
78
|
var types_1 = require("@bringg/types");
|
|
79
79
|
var light_data_store_1 = __importDefault(require("../../Data/light-data-store"));
|
|
80
|
-
var merge_mapper_1 = require("../../Data/merge-mapper");
|
|
81
80
|
var data_entity_1 = require("../../data-entity");
|
|
82
81
|
var data_store_1 = __importDefault(require("../../data-store"));
|
|
83
82
|
var storable_data_service_1 = __importDefault(require("../../storable-data-service"));
|
|
84
83
|
var keyset_pagination_consts_1 = require("../../utils/consts/keyset-pagination.consts");
|
|
85
84
|
var Tasks_consts_1 = require("../Tasks.consts");
|
|
85
|
+
var task_merger_1 = require("./task-merger");
|
|
86
86
|
var task_realtime_subscriptions_1 = __importDefault(require("./task-realtime-subscriptions"));
|
|
87
87
|
var tasks_service_1 = __importDefault(require("./tasks-service"));
|
|
88
88
|
// hard coded fields to take advantage of the light data store cache
|
|
@@ -122,7 +122,7 @@ var TasksApi = /** @class */ (function () {
|
|
|
122
122
|
this.tasksStore = new data_store_1.default(groupFilters, { shallow: true });
|
|
123
123
|
this.tasksService = new tasks_service_1.default(session);
|
|
124
124
|
var lightDataStore = new light_data_store_1.default();
|
|
125
|
-
this.storableDataService = new storable_data_service_1.default(this.tasksStore, function (task) { return
|
|
125
|
+
this.storableDataService = new storable_data_service_1.default(this.tasksStore, function (task) { return task_merger_1.taskMerger.mergeTaskIntoExisting(_this.tasksStore, task); }, [lightDataStore]);
|
|
126
126
|
this.taskRealtimeSubscriptions = new task_realtime_subscriptions_1.default(session, this.tasksStore, this.storableDataService);
|
|
127
127
|
}
|
|
128
128
|
TasksApi.prototype.updateStoreOnEvents = function () {
|
|
@@ -365,8 +365,20 @@ var TasksApi = /** @class */ (function () {
|
|
|
365
365
|
fields = fields.split(',');
|
|
366
366
|
}
|
|
367
367
|
var allFields = __spreadArray([], __read(fields), false);
|
|
368
|
-
|
|
369
|
-
if (
|
|
368
|
+
Tasks_consts_1.taskDefaultFields.forEach(function (field) {
|
|
369
|
+
if (typeof field === 'object') {
|
|
370
|
+
if (field['way_points']) {
|
|
371
|
+
var wayPointsIndex = allFields.findIndex(function (field) { return typeof field === 'object' && field['way_points']; });
|
|
372
|
+
var wayPointsFields_1 = wayPointsIndex > -1 ? allFields.splice(wayPointsIndex, 1)[0]['way_points'] : [];
|
|
373
|
+
field['way_points'].forEach(function (wayPointField) {
|
|
374
|
+
if (!wayPointsFields_1.includes(wayPointField)) {
|
|
375
|
+
wayPointsFields_1.push(wayPointField);
|
|
376
|
+
}
|
|
377
|
+
});
|
|
378
|
+
allFields.push({ way_points: wayPointsFields_1 });
|
|
379
|
+
}
|
|
380
|
+
}
|
|
381
|
+
else if (!fields.includes(field)) {
|
|
370
382
|
allFields.push(field);
|
|
371
383
|
}
|
|
372
384
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks-api.js","sourceRoot":"","sources":["../../../src/Task/v2/tasks-api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAUuB;AAEvB,iFAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"tasks-api.js","sourceRoot":"","sources":["../../../src/Task/v2/tasks-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -22369,7 +22369,7 @@ var lodash_1 = __webpack_require__(96486);
|
|
|
22369
22369
|
var BringgException_1 = __webpack_require__(43605);
|
|
22370
22370
|
var Logger_1 = __importDefault(__webpack_require__(55860));
|
|
22371
22371
|
var abort_1 = __webpack_require__(34179);
|
|
22372
|
-
var version = '9.
|
|
22372
|
+
var version = '9.15.0';
|
|
22373
22373
|
function logErrorResponse(response) {
|
|
22374
22374
|
var data = response.data, status = response.status;
|
|
22375
22375
|
try {
|
|
@@ -24926,7 +24926,7 @@ var __values = (this && this.__values) || function(o) {
|
|
|
24926
24926
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
24927
24927
|
};
|
|
24928
24928
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
24929
|
-
exports.Routes = exports.baseRoute = exports.TaskRealTimeEvents = exports.quotesExtractor = exports.formExtractor = exports.taskIdsExtractor = exports.scanCodeExtractor = exports.locationExtractor = exports.childTasksExtractor = exports.tasksExtractor = exports.successExtractor = exports.taskExtractor = exports.defaultExtractor = exports.noteTypes = exports.taskToGroupMapper = exports.groupFilter = exports.TaskGroupTypes = exports.GROUP_VALUES = exports.DONE_TASK_STATUES = exports.OPEN_TASK_STATUES = void 0;
|
|
24929
|
+
exports.taskDefaultFields = exports.Routes = exports.baseRoute = exports.TaskRealTimeEvents = exports.quotesExtractor = exports.formExtractor = exports.taskIdsExtractor = exports.scanCodeExtractor = exports.locationExtractor = exports.childTasksExtractor = exports.tasksExtractor = exports.successExtractor = exports.taskExtractor = exports.defaultExtractor = exports.noteTypes = exports.taskToGroupMapper = exports.groupFilter = exports.TaskGroupTypes = exports.GROUP_VALUES = exports.DONE_TASK_STATUES = exports.OPEN_TASK_STATUES = void 0;
|
|
24930
24930
|
var types_1 = __webpack_require__(63127);
|
|
24931
24931
|
var TaskHelpers_1 = __webpack_require__(73119);
|
|
24932
24932
|
exports.OPEN_TASK_STATUES = [
|
|
@@ -25060,10 +25060,38 @@ exports.Routes = {
|
|
|
25060
25060
|
// keep this here in case we need, all this data is required by frontend currently
|
|
25061
25061
|
//const PLANNING_DEFAULT_PARAMS_REQUEST = "first_way_point_has_to_leave_by,active_way_point_id,status,id,way_points.all.position,group_leader_id,priority,late,customer_id,way_points.all.customer_id,way_points.all.id,payment_type_name,task_inventories.all.id,task_inventories.all.way_point_id,task_inventories.all.pending,task_inventories.all.inventory,task_inventories.all.original_quantity,ready_to_execute,virtual_task,done_planning,task_type_id,rogue_reasons,invalidated,automatically_assigned,external_id,title,tag_id,created_at,user_id,way_points.all.late,way_points.all.done,way_points.all.address,planning_done,scheduled_at,way_points.first.address,way_points.last.address,total_price,fleet_id,lat,lng,way_points.all.lat,way_points.all.lng,way_points.all.scheduled_at,team_ids,way_points.all.customer,way_points.all.eta,route_name,run,dispatcher_id,preparation_status,preparation_start_time_planned,preparation_end_time_planned,preparation_ready_for_pickup_time_planned,payment_method,preparation_external_id,fleet_delivery_external_id";
|
|
25062
25062
|
//const OPEN_DEFAULT_PARAMS_REQUEST = "first_way_point_has_to_leave_by,active_way_point_id,status,id,way_points.all.position,group_leader_id,priority,late,customer_id,way_points.all.customer_id,way_points.all.id,payment_type_name,task_inventories.all.id,task_inventories.all.way_point_id,task_inventories.all.pending,task_inventories.all.inventory,task_inventories.all.original_quantity,ready_to_execute,virtual_task,done_planning,task_type_id,rogue_reasons,invalidated,automatically_assigned,external_id,title,tag_id,created_at,user_id,way_points.all.late,way_points.all.done,way_points.all.address,planning_done,scheduled_at,way_points.first.address,way_points.last.address,total_price,fleet_id,lat,lng,way_points.all.lat,way_points.all.lng,way_points.all.scheduled_at,team_ids,way_points.all.customer,way_points.all.eta,route_name,run,dispatcher_id,preparation_status,preparation_start_time_planned,preparation_end_time_planned,preparation_ready_for_pickup_time_planned,payment_method,preparation_external_id,fleet_delivery_external_id";
|
|
25063
|
+
exports.taskDefaultFields = [
|
|
25064
|
+
'id',
|
|
25065
|
+
'status',
|
|
25066
|
+
'invalidated',
|
|
25067
|
+
'group_leader_id',
|
|
25068
|
+
'ready_to_execute',
|
|
25069
|
+
{ way_points: ['position'] }
|
|
25070
|
+
];
|
|
25063
25071
|
//# sourceMappingURL=Tasks.consts.js.map
|
|
25064
25072
|
|
|
25065
25073
|
/***/ }),
|
|
25066
25074
|
|
|
25075
|
+
/***/ 3892:
|
|
25076
|
+
/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
|
|
25077
|
+
|
|
25078
|
+
"use strict";
|
|
25079
|
+
|
|
25080
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
25081
|
+
exports.taskMerger = void 0;
|
|
25082
|
+
var merge_mapper_1 = __webpack_require__(59200);
|
|
25083
|
+
function mergeTaskIntoExisting(tasksStore, task) {
|
|
25084
|
+
var way_points = task.way_points;
|
|
25085
|
+
if (way_points) {
|
|
25086
|
+
way_points.sort(function (wp1, wp2) { return wp1.position - wp2.position; });
|
|
25087
|
+
}
|
|
25088
|
+
return merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
|
|
25089
|
+
}
|
|
25090
|
+
exports.taskMerger = { mergeTaskIntoExisting: mergeTaskIntoExisting };
|
|
25091
|
+
//# sourceMappingURL=task-merger.js.map
|
|
25092
|
+
|
|
25093
|
+
/***/ }),
|
|
25094
|
+
|
|
25067
25095
|
/***/ 52131:
|
|
25068
25096
|
/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
|
|
25069
25097
|
|
|
@@ -25243,12 +25271,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
25243
25271
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
25244
25272
|
var types_1 = __webpack_require__(63127);
|
|
25245
25273
|
var light_data_store_1 = __importDefault(__webpack_require__(93670));
|
|
25246
|
-
var merge_mapper_1 = __webpack_require__(59200);
|
|
25247
25274
|
var data_entity_1 = __webpack_require__(91083);
|
|
25248
25275
|
var data_store_1 = __importDefault(__webpack_require__(73135));
|
|
25249
25276
|
var storable_data_service_1 = __importDefault(__webpack_require__(45297));
|
|
25250
25277
|
var keyset_pagination_consts_1 = __webpack_require__(92400);
|
|
25251
25278
|
var Tasks_consts_1 = __webpack_require__(24976);
|
|
25279
|
+
var task_merger_1 = __webpack_require__(3892);
|
|
25252
25280
|
var task_realtime_subscriptions_1 = __importDefault(__webpack_require__(52131));
|
|
25253
25281
|
var tasks_service_1 = __importDefault(__webpack_require__(8159));
|
|
25254
25282
|
// hard coded fields to take advantage of the light data store cache
|
|
@@ -25288,7 +25316,7 @@ var TasksApi = /** @class */ (function () {
|
|
|
25288
25316
|
this.tasksStore = new data_store_1.default(groupFilters, { shallow: true });
|
|
25289
25317
|
this.tasksService = new tasks_service_1.default(session);
|
|
25290
25318
|
var lightDataStore = new light_data_store_1.default();
|
|
25291
|
-
this.storableDataService = new storable_data_service_1.default(this.tasksStore, function (task) { return
|
|
25319
|
+
this.storableDataService = new storable_data_service_1.default(this.tasksStore, function (task) { return task_merger_1.taskMerger.mergeTaskIntoExisting(_this.tasksStore, task); }, [lightDataStore]);
|
|
25292
25320
|
this.taskRealtimeSubscriptions = new task_realtime_subscriptions_1.default(session, this.tasksStore, this.storableDataService);
|
|
25293
25321
|
}
|
|
25294
25322
|
TasksApi.prototype.updateStoreOnEvents = function () {
|
|
@@ -25531,8 +25559,20 @@ var TasksApi = /** @class */ (function () {
|
|
|
25531
25559
|
fields = fields.split(',');
|
|
25532
25560
|
}
|
|
25533
25561
|
var allFields = __spreadArray([], __read(fields), false);
|
|
25534
|
-
|
|
25535
|
-
if (
|
|
25562
|
+
Tasks_consts_1.taskDefaultFields.forEach(function (field) {
|
|
25563
|
+
if (typeof field === 'object') {
|
|
25564
|
+
if (field['way_points']) {
|
|
25565
|
+
var wayPointsIndex = allFields.findIndex(function (field) { return typeof field === 'object' && field['way_points']; });
|
|
25566
|
+
var wayPointsFields_1 = wayPointsIndex > -1 ? allFields.splice(wayPointsIndex, 1)[0]['way_points'] : [];
|
|
25567
|
+
field['way_points'].forEach(function (wayPointField) {
|
|
25568
|
+
if (!wayPointsFields_1.includes(wayPointField)) {
|
|
25569
|
+
wayPointsFields_1.push(wayPointField);
|
|
25570
|
+
}
|
|
25571
|
+
});
|
|
25572
|
+
allFields.push({ way_points: wayPointsFields_1 });
|
|
25573
|
+
}
|
|
25574
|
+
}
|
|
25575
|
+
else if (!fields.includes(field)) {
|
|
25536
25576
|
allFields.push(field);
|
|
25537
25577
|
}
|
|
25538
25578
|
});
|