@bringg/dashboard-sdk 9.51.1-pre.9 → 9.53.0-pre.1
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/Geocoding/Geocoding.consts.d.ts +3 -0
- package/dist/Geocoding/Geocoding.consts.js +8 -0
- package/dist/Geocoding/Geocoding.consts.js.map +1 -0
- package/dist/Geocoding/GeocodingApi.d.ts +3 -0
- package/dist/Geocoding/GeocodingApi.js +9 -0
- package/dist/Geocoding/GeocodingApi.js.map +1 -1
- package/dist/Services/ServiceRequest.js +1 -1
- package/dist/Task/v2/task-merger.d.ts +9 -7
- package/dist/Task/v2/task-merger.js +34 -2
- package/dist/Task/v2/task-merger.js.map +1 -1
- package/dist/Task/v2/task-realtime-subscriptions.js +4 -1
- package/dist/Task/v2/task-realtime-subscriptions.js.map +1 -1
- package/dist/Task/v2/tasks-api.d.ts +1 -0
- package/dist/Task/v2/tasks-api.js +10 -1
- package/dist/Task/v2/tasks-api.js.map +1 -1
- package/dist/User/User.consts.d.ts +0 -3
- package/dist/User/User.consts.js +2 -6
- package/dist/User/User.consts.js.map +1 -1
- package/dist/User/UserHelpers.d.ts +0 -1
- package/dist/User/UserHelpers.js +0 -3
- package/dist/User/UserHelpers.js.map +1 -1
- package/dist/User/v2/users-api.d.ts +2 -6
- package/dist/User/v2/users-api.js +20 -94
- package/dist/User/v2/users-api.js.map +1 -1
- package/dist/User/v2/users-service.d.ts +6 -6
- package/dist/User/v2/users-service.js +4 -53
- package/dist/User/v2/users-service.js.map +1 -1
- package/dist/bringg-dashboard-sdk-cjs2.js +101 -161
- package/dist/bringg-dashboard-sdk-cjs2.js.map +1 -1
- package/dist/bringg-dashboard-sdk.js +22 -11
- package/dist/bringg-dashboard-sdk.min.js +1 -1
- package/dist/bringg-dashboard-sdk.min.js.map +1 -1
- package/package.json +2 -2
|
@@ -39,7 +39,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
39
39
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
40
|
};
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
|
-
var types_1 = require("@bringg/types");
|
|
43
42
|
var CrudService_1 = __importDefault(require("../../Core/CrudService"));
|
|
44
43
|
var User_consts_1 = require("../User.consts");
|
|
45
44
|
var UsersService = /** @class */ (function () {
|
|
@@ -93,19 +92,14 @@ var UsersService = /** @class */ (function () {
|
|
|
93
92
|
});
|
|
94
93
|
});
|
|
95
94
|
};
|
|
96
|
-
UsersService.prototype.loadAll = function (
|
|
95
|
+
UsersService.prototype.loadAll = function (query, commonOptions) {
|
|
96
|
+
if (query === void 0) { query = {}; }
|
|
97
97
|
return __awaiter(this, void 0, void 0, function () {
|
|
98
|
-
var limit, page_action, cursor;
|
|
99
98
|
return __generator(this, function (_a) {
|
|
100
|
-
limit = request.limit, page_action = request.page_action, cursor = request.cursor;
|
|
101
99
|
return [2 /*return*/, this.service.routeGenerator
|
|
102
100
|
.get(User_consts_1.ROUTES.GET_ALL)
|
|
103
|
-
.withQueryString(
|
|
104
|
-
.withExtractor(function (response) { return ({
|
|
105
|
-
next_page_cursor: response.next_page_cursor,
|
|
106
|
-
previous_page_cursor: response.previous_page_cursor,
|
|
107
|
-
users: response.users
|
|
108
|
-
}); })
|
|
101
|
+
.withQueryString(query)
|
|
102
|
+
.withExtractor(function (response) { return ({ has_next_page: response.has_next_page, users: response.users }); })
|
|
109
103
|
.setException('Could not get users')
|
|
110
104
|
.withCommonOptions(commonOptions)
|
|
111
105
|
.invoke()];
|
|
@@ -184,13 +178,6 @@ var UsersService = /** @class */ (function () {
|
|
|
184
178
|
});
|
|
185
179
|
});
|
|
186
180
|
};
|
|
187
|
-
UsersService.prototype.getAllAdminsAndDispatchers = function (request) {
|
|
188
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
189
|
-
return __generator(this, function (_a) {
|
|
190
|
-
return [2 /*return*/, this.getAllUsersWithKeysetPagination(request, [User_consts_1.UsersScopes.DISPATCHERS, User_consts_1.UsersScopes.ADMINS], 'Could not get all admins and dispatchers')];
|
|
191
|
-
});
|
|
192
|
-
});
|
|
193
|
-
};
|
|
194
181
|
UsersService.prototype.unlock = function (userId) {
|
|
195
182
|
return __awaiter(this, void 0, void 0, function () {
|
|
196
183
|
return __generator(this, function (_a) {
|
|
@@ -228,42 +215,6 @@ var UsersService = /** @class */ (function () {
|
|
|
228
215
|
});
|
|
229
216
|
});
|
|
230
217
|
};
|
|
231
|
-
UsersService.prototype.getDriverCost = function (userId) {
|
|
232
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
233
|
-
return __generator(this, function (_a) {
|
|
234
|
-
return [2 /*return*/, this.service.routeGenerator
|
|
235
|
-
.get(User_consts_1.ROUTES.DRIVER_COST)
|
|
236
|
-
.withRouteParams({ userId: userId })
|
|
237
|
-
.withExtractor(function (response) { return response; })
|
|
238
|
-
.setException("Could not get driver cost for user ".concat(userId))
|
|
239
|
-
.invoke()];
|
|
240
|
-
});
|
|
241
|
-
});
|
|
242
|
-
};
|
|
243
|
-
UsersService.prototype.byUserType = function (userTypeId) {
|
|
244
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
245
|
-
return __generator(this, function (_a) {
|
|
246
|
-
return [2 /*return*/, this.service.routeGenerator
|
|
247
|
-
.get(User_consts_1.ROUTES.GET_USERS_WITH_USER_TYPE)
|
|
248
|
-
.withRouteParams({ userTypeId: userTypeId })
|
|
249
|
-
.withExtractor(function (response) { return response.users; })
|
|
250
|
-
.setException("Could not get users with user type ".concat(userTypeId))
|
|
251
|
-
.invoke()];
|
|
252
|
-
});
|
|
253
|
-
});
|
|
254
|
-
};
|
|
255
|
-
UsersService.prototype.invite = function (userId) {
|
|
256
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
257
|
-
return __generator(this, function (_a) {
|
|
258
|
-
return [2 /*return*/, this.service.routeGenerator
|
|
259
|
-
.post(User_consts_1.ROUTES.INVITE)
|
|
260
|
-
.withRouteParams({ userId: userId })
|
|
261
|
-
.withExtractor(function (response) { return response.user; })
|
|
262
|
-
.setException("Could not invite user with id: ".concat(userId))
|
|
263
|
-
.invoke()];
|
|
264
|
-
});
|
|
265
|
-
});
|
|
266
|
-
};
|
|
267
218
|
return UsersService;
|
|
268
219
|
}());
|
|
269
220
|
exports.default = UsersService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users-service.js","sourceRoot":"","sources":["../../../src/User/v2/users-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"users-service.js","sourceRoot":"","sources":["../../../src/User/v2/users-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10793,6 +10793,21 @@ exports["default"] = GeocodingEntity;
|
|
|
10793
10793
|
|
|
10794
10794
|
/***/ }),
|
|
10795
10795
|
|
|
10796
|
+
/***/ 29091:
|
|
10797
|
+
/***/ ((__unused_webpack_module, exports) => {
|
|
10798
|
+
|
|
10799
|
+
"use strict";
|
|
10800
|
+
|
|
10801
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
10802
|
+
exports.RealTimeGeocodingEvents = void 0;
|
|
10803
|
+
var RealTimeGeocodingEvents;
|
|
10804
|
+
(function (RealTimeGeocodingEvents) {
|
|
10805
|
+
RealTimeGeocodingEvents["GEOCODING_CHANGED"] = "geocoding status changed";
|
|
10806
|
+
})(RealTimeGeocodingEvents = exports.RealTimeGeocodingEvents || (exports.RealTimeGeocodingEvents = {}));
|
|
10807
|
+
//# sourceMappingURL=Geocoding.consts.js.map
|
|
10808
|
+
|
|
10809
|
+
/***/ }),
|
|
10810
|
+
|
|
10796
10811
|
/***/ 87206:
|
|
10797
10812
|
/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
|
|
10798
10813
|
|
|
@@ -10802,10 +10817,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
10802
10817
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10803
10818
|
};
|
|
10804
10819
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
10820
|
+
var StoreEntity_1 = __webpack_require__(95574);
|
|
10805
10821
|
var Geocoding_1 = __importDefault(__webpack_require__(84431));
|
|
10822
|
+
var Geocoding_consts_1 = __webpack_require__(29091);
|
|
10806
10823
|
var GeocodingApi = /** @class */ (function () {
|
|
10807
10824
|
function GeocodingApi(session) {
|
|
10808
10825
|
this.geocodingEntity = new Geocoding_1.default(session);
|
|
10826
|
+
this.realTime = new StoreEntity_1.RealTimeHandler(session.persistentConnection);
|
|
10809
10827
|
}
|
|
10810
10828
|
GeocodingApi.prototype.autoComplete = function (address) {
|
|
10811
10829
|
return this.geocodingEntity.autoComplete(address);
|
|
@@ -10816,6 +10834,12 @@ var GeocodingApi = /** @class */ (function () {
|
|
|
10816
10834
|
GeocodingApi.prototype.reverseGeocode = function (lat, lng) {
|
|
10817
10835
|
return this.geocodingEntity.reverseGeocode(lat, lng);
|
|
10818
10836
|
};
|
|
10837
|
+
GeocodingApi.prototype.subscribeToEvent = function (eventHandle) {
|
|
10838
|
+
return this.realTime.on(Geocoding_consts_1.RealTimeGeocodingEvents.GEOCODING_CHANGED, eventHandle);
|
|
10839
|
+
};
|
|
10840
|
+
GeocodingApi.prototype.unsubscribeToEvent = function (eventHandle) {
|
|
10841
|
+
this.realTime.off(Geocoding_consts_1.RealTimeGeocodingEvents.GEOCODING_CHANGED, eventHandle);
|
|
10842
|
+
};
|
|
10819
10843
|
return GeocodingApi;
|
|
10820
10844
|
}());
|
|
10821
10845
|
exports["default"] = GeocodingApi;
|
|
@@ -22401,7 +22425,7 @@ var lodash_1 = __webpack_require__(96486);
|
|
|
22401
22425
|
var BringgException_1 = __webpack_require__(43605);
|
|
22402
22426
|
var Logger_1 = __importDefault(__webpack_require__(55860));
|
|
22403
22427
|
var abort_1 = __webpack_require__(34179);
|
|
22404
|
-
var version = '9.
|
|
22428
|
+
var version = '9.53.0-pre.1';
|
|
22405
22429
|
function logErrorResponse(response) {
|
|
22406
22430
|
var data = response.data, status = response.status;
|
|
22407
22431
|
try {
|
|
@@ -25127,12 +25151,44 @@ exports.taskDefaultFields = [
|
|
|
25127
25151
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
25128
25152
|
exports.taskMerger = void 0;
|
|
25129
25153
|
var merge_mapper_1 = __webpack_require__(59200);
|
|
25130
|
-
function
|
|
25154
|
+
function hasNoActualChanges(diffArray) {
|
|
25155
|
+
if (!Array.isArray(diffArray)) {
|
|
25156
|
+
return false;
|
|
25157
|
+
}
|
|
25158
|
+
return diffArray.every(function (item) {
|
|
25159
|
+
if (item === undefined || item === null) {
|
|
25160
|
+
return true;
|
|
25161
|
+
}
|
|
25162
|
+
if (typeof item === 'object') {
|
|
25163
|
+
return Object.keys(item).length === 0;
|
|
25164
|
+
}
|
|
25165
|
+
return false;
|
|
25166
|
+
});
|
|
25167
|
+
}
|
|
25168
|
+
var removeInventories = function (result, isTaskNewFromRealtimeEvent, hasInventoriesInStore) {
|
|
25169
|
+
var noDiffOnInventories = result.diff &&
|
|
25170
|
+
result.diff.task_inventories &&
|
|
25171
|
+
hasNoActualChanges(result.diff.task_inventories) &&
|
|
25172
|
+
!hasInventoriesInStore;
|
|
25173
|
+
if (noDiffOnInventories || isTaskNewFromRealtimeEvent) {
|
|
25174
|
+
delete result.current.task_inventories;
|
|
25175
|
+
}
|
|
25176
|
+
return result;
|
|
25177
|
+
};
|
|
25178
|
+
function mergeTaskIntoExisting(_a) {
|
|
25179
|
+
var tasksStore = _a.tasksStore, task = _a.task, _b = _a.shouldRemoveInventories, shouldRemoveInventories = _b === void 0 ? false : _b, params = _a.params;
|
|
25131
25180
|
var way_points = task.way_points;
|
|
25132
25181
|
if (way_points) {
|
|
25133
25182
|
way_points.sort(function (wp1, wp2) { return wp1.position - wp2.position; });
|
|
25134
25183
|
}
|
|
25135
|
-
|
|
25184
|
+
var existingTask = tasksStore.get(task.id);
|
|
25185
|
+
var hasInventoriesInStore = !!(existingTask === null || existingTask === void 0 ? void 0 : existingTask.task_inventories);
|
|
25186
|
+
var result = merge_mapper_1.mergeMapper.mergeIntoExisting(tasksStore, task);
|
|
25187
|
+
if (shouldRemoveInventories) {
|
|
25188
|
+
var isTaskNewFromRealtimeEvent = !existingTask && !['load', 'loadPlanningTasks', 'loadOpenTasks'].includes(params === null || params === void 0 ? void 0 : params.action);
|
|
25189
|
+
return removeInventories(result, isTaskNewFromRealtimeEvent, hasInventoriesInStore);
|
|
25190
|
+
}
|
|
25191
|
+
return result;
|
|
25136
25192
|
}
|
|
25137
25193
|
exports.taskMerger = { mergeTaskIntoExisting: mergeTaskIntoExisting };
|
|
25138
25194
|
//# sourceMappingURL=task-merger.js.map
|
|
@@ -25177,7 +25233,10 @@ var TaskRealtimeSubscriptions = /** @class */ (function () {
|
|
|
25177
25233
|
return { ignore: isPartialUpdate && !_this.tasksStore.get(task.id) };
|
|
25178
25234
|
}
|
|
25179
25235
|
},
|
|
25180
|
-
{
|
|
25236
|
+
{
|
|
25237
|
+
name: Tasks_consts_1.TaskRealTimeEvents.NEW_TASK,
|
|
25238
|
+
isDelete: false
|
|
25239
|
+
},
|
|
25181
25240
|
{ name: Tasks_consts_1.TaskRealTimeEvents.TASK_DELETED, isDelete: true }
|
|
25182
25241
|
];
|
|
25183
25242
|
var subEntityEvents = [
|
|
@@ -25363,6 +25422,8 @@ var READY_TO_EXECUTE_FIELDS = ['ready_to_execute'];
|
|
|
25363
25422
|
var TasksApi = /** @class */ (function () {
|
|
25364
25423
|
function TasksApi(session) {
|
|
25365
25424
|
var _this = this;
|
|
25425
|
+
var _a;
|
|
25426
|
+
this.shouldRemoveInventories = !!((_a = session.user.feature_flags) === null || _a === void 0 ? void 0 : _a.omit_task_inventories_in_realtime_events);
|
|
25366
25427
|
var groupFilters = [
|
|
25367
25428
|
{
|
|
25368
25429
|
groupType: Tasks_consts_1.TaskGroupTypes.Main,
|
|
@@ -25395,7 +25456,14 @@ var TasksApi = /** @class */ (function () {
|
|
|
25395
25456
|
this.tasksStore = new data_store_1.default(groupFilters, { shallow: true });
|
|
25396
25457
|
this.tasksService = new tasks_service_1.default(session);
|
|
25397
25458
|
var lightDataStore = new light_data_store_1.default();
|
|
25398
|
-
this.storableDataService = new storable_data_service_1.default(this.tasksStore, function (task
|
|
25459
|
+
this.storableDataService = new storable_data_service_1.default(this.tasksStore, function (task, params) {
|
|
25460
|
+
return task_merger_1.taskMerger.mergeTaskIntoExisting({
|
|
25461
|
+
tasksStore: _this.tasksStore,
|
|
25462
|
+
task: task,
|
|
25463
|
+
shouldRemoveInventories: _this.shouldRemoveInventories,
|
|
25464
|
+
params: params
|
|
25465
|
+
});
|
|
25466
|
+
}, [lightDataStore]);
|
|
25399
25467
|
this.taskRealtimeSubscriptions = new task_realtime_subscriptions_1.default(session, this.tasksStore, this.storableDataService);
|
|
25400
25468
|
}
|
|
25401
25469
|
TasksApi.prototype.updateStoreOnEvents = function () {
|
|
@@ -29660,10 +29728,7 @@ exports.ROUTES = {
|
|
|
29660
29728
|
UNLOCK: "".concat(exports.baseRoute, "/{:userId}/unlock"),
|
|
29661
29729
|
MESSAGE_DRIVER: '/announcement/user/{:userId}',
|
|
29662
29730
|
VALIDATE_PHONE: '/api/user/validate_phone',
|
|
29663
|
-
DELETE_MANY: '/users/batch_delete'
|
|
29664
|
-
DRIVER_COST: '/users/{:userId}/driver_cost',
|
|
29665
|
-
GET_USERS_WITH_USER_TYPE: '/user_types/{:userTypeId}/users',
|
|
29666
|
-
INVITE: '/users/{:userId}/reinvite'
|
|
29731
|
+
DELETE_MANY: '/users/batch_delete'
|
|
29667
29732
|
};
|
|
29668
29733
|
var UserEvents;
|
|
29669
29734
|
(function (UserEvents) {
|
|
@@ -29689,8 +29754,7 @@ exports.groupFilter = new Map([
|
|
|
29689
29754
|
[GROUP_VALUES.OnShiftDrivers, UserHelpers_1.UserHelpers.isOnShiftDriver],
|
|
29690
29755
|
[GROUP_VALUES.Customers, UserHelpers_1.UserHelpers.isCustomer],
|
|
29691
29756
|
[GROUP_VALUES.Admins, UserHelpers_1.UserHelpers.isAdmin],
|
|
29692
|
-
[GROUP_VALUES.Dispatchers, UserHelpers_1.UserHelpers.isDispatcher]
|
|
29693
|
-
[GROUP_VALUES.Drivers, UserHelpers_1.UserHelpers.isDriver]
|
|
29757
|
+
[GROUP_VALUES.Dispatchers, UserHelpers_1.UserHelpers.isDispatcher]
|
|
29694
29758
|
]);
|
|
29695
29759
|
var groupKeys = Array.from(exports.groupFilter.keys());
|
|
29696
29760
|
var userToGroupsMapper = function (user) {
|
|
@@ -29755,9 +29819,6 @@ var UserHelpers = /** @class */ (function () {
|
|
|
29755
29819
|
UserHelpers.isDispatcher = function (user) {
|
|
29756
29820
|
return user.dispatcher === true;
|
|
29757
29821
|
};
|
|
29758
|
-
UserHelpers.isDriver = function (user) {
|
|
29759
|
-
return user.driver === true;
|
|
29760
|
-
};
|
|
29761
29822
|
return UserHelpers;
|
|
29762
29823
|
}());
|
|
29763
29824
|
exports.UserHelpers = UserHelpers;
|
|
@@ -30158,8 +30219,8 @@ var UsersApi = /** @class */ (function () {
|
|
|
30158
30219
|
keyFunc: function (user) { return (0, User_consts_1.userToGroupsMapper)(user); }
|
|
30159
30220
|
},
|
|
30160
30221
|
{
|
|
30161
|
-
groupType: '
|
|
30162
|
-
keyFunc: function (user) { return
|
|
30222
|
+
groupType: 'team',
|
|
30223
|
+
keyFunc: function (user) { return user.team_ids || []; }
|
|
30163
30224
|
}
|
|
30164
30225
|
];
|
|
30165
30226
|
this.userStore = new data_store_1.default(groupFilters, { shallow: true });
|
|
@@ -30173,9 +30234,6 @@ var UsersApi = /** @class */ (function () {
|
|
|
30173
30234
|
{ name: User_consts_1.RealtimeEvents.Create, isDelete: false },
|
|
30174
30235
|
{ name: User_consts_1.RealtimeEvents.Delete, isDelete: true }
|
|
30175
30236
|
]);
|
|
30176
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
30177
|
-
// @ts-ignore: Extend window for debugging purpose
|
|
30178
|
-
window.usersApi = this;
|
|
30179
30237
|
}
|
|
30180
30238
|
UsersApi.prototype.delete = function (userId) {
|
|
30181
30239
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -30295,41 +30353,33 @@ var UsersApi = /** @class */ (function () {
|
|
|
30295
30353
|
return [2 /*return*/, users];
|
|
30296
30354
|
}
|
|
30297
30355
|
});
|
|
30298
|
-
}); }, __assign(__assign({}, options), { groupType: '
|
|
30356
|
+
}); }, __assign(__assign({}, options), { groupType: 'team', groupValue: teamId }))];
|
|
30299
30357
|
});
|
|
30300
30358
|
});
|
|
30301
30359
|
};
|
|
30302
30360
|
// Pagination methods
|
|
30303
|
-
UsersApi.prototype.loadAll = function (
|
|
30304
|
-
var _b = _a === void 0 ? {} : _a, _c = _b.limit, limit = _c === void 0 ? 2500 : _c, _d = _b.page_action, page_action = _d === void 0 ? keyset_pagination_consts_1.KeysetPaginationPageAction.NEXT : _d, cursor = _b.cursor, options = _b.options;
|
|
30361
|
+
UsersApi.prototype.loadAll = function (options) {
|
|
30305
30362
|
return __awaiter(this, void 0, void 0, function () {
|
|
30306
|
-
var loadResult, users;
|
|
30307
30363
|
var _this = this;
|
|
30308
|
-
return __generator(this, function (
|
|
30309
|
-
|
|
30310
|
-
|
|
30311
|
-
|
|
30312
|
-
|
|
30313
|
-
|
|
30314
|
-
|
|
30315
|
-
|
|
30316
|
-
|
|
30317
|
-
|
|
30318
|
-
|
|
30319
|
-
|
|
30320
|
-
});
|
|
30321
|
-
}); }, options)];
|
|
30322
|
-
case 1:
|
|
30323
|
-
users = _e.sent();
|
|
30324
|
-
return [2 /*return*/, __assign(__assign({}, loadResult), { users: users })];
|
|
30325
|
-
}
|
|
30364
|
+
return __generator(this, function (_a) {
|
|
30365
|
+
return [2 /*return*/, this.storableDataService.loadAll('loadAll', function () { return __awaiter(_this, void 0, void 0, function () {
|
|
30366
|
+
var response;
|
|
30367
|
+
return __generator(this, function (_a) {
|
|
30368
|
+
switch (_a.label) {
|
|
30369
|
+
case 0: return [4 /*yield*/, this.usersService.loadAll({}, { signal: options === null || options === void 0 ? void 0 : options.signal })];
|
|
30370
|
+
case 1:
|
|
30371
|
+
response = _a.sent();
|
|
30372
|
+
return [2 /*return*/, response.users];
|
|
30373
|
+
}
|
|
30374
|
+
});
|
|
30375
|
+
}); }, options)];
|
|
30326
30376
|
});
|
|
30327
30377
|
});
|
|
30328
30378
|
};
|
|
30329
30379
|
UsersApi.prototype.getAllDrivers = function (_a) {
|
|
30330
30380
|
var _b = _a.limit, limit = _b === void 0 ? 25 : _b, _c = _a.page_action, page_action = _c === void 0 ? keyset_pagination_consts_1.KeysetPaginationPageAction.NEXT : _c, cursor = _a.cursor, options = _a.options;
|
|
30331
30381
|
return __awaiter(this, void 0, void 0, function () {
|
|
30332
|
-
var optionsWithDefaults, loadResult
|
|
30382
|
+
var optionsWithDefaults, loadResult;
|
|
30333
30383
|
var _this = this;
|
|
30334
30384
|
return __generator(this, function (_d) {
|
|
30335
30385
|
switch (_d.label) {
|
|
@@ -30358,43 +30408,8 @@ var UsersApi = /** @class */ (function () {
|
|
|
30358
30408
|
groupValue: optionsWithDefaults.onlyCustomers ? User_consts_1.GROUP_VALUES.Customers : User_consts_1.GROUP_VALUES.Drivers
|
|
30359
30409
|
})];
|
|
30360
30410
|
case 1:
|
|
30361
|
-
|
|
30362
|
-
return [2 /*return*/, __assign(__assign({}, loadResult), { users: users })];
|
|
30363
|
-
}
|
|
30364
|
-
});
|
|
30365
|
-
});
|
|
30366
|
-
};
|
|
30367
|
-
UsersApi.prototype.getAllAdminsAndDispatchers = function (_a) {
|
|
30368
|
-
var _b = _a.limit, limit = _b === void 0 ? 25 : _b, _c = _a.page_action, page_action = _c === void 0 ? keyset_pagination_consts_1.KeysetPaginationPageAction.NEXT : _c, cursor = _a.cursor, options = _a.options;
|
|
30369
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
30370
|
-
var loadResult, users;
|
|
30371
|
-
var _this = this;
|
|
30372
|
-
return __generator(this, function (_d) {
|
|
30373
|
-
switch (_d.label) {
|
|
30374
|
-
case 0: return [4 /*yield*/, this.storableDataService.loadAll('getAllAdminsAndDispatchers', function () { return __awaiter(_this, void 0, void 0, function () {
|
|
30375
|
-
var result;
|
|
30376
|
-
return __generator(this, function (_a) {
|
|
30377
|
-
switch (_a.label) {
|
|
30378
|
-
case 0: return [4 /*yield*/, this.usersService.getAllAdminsAndDispatchers({
|
|
30379
|
-
limit: limit,
|
|
30380
|
-
page_action: page_action,
|
|
30381
|
-
cursor: cursor
|
|
30382
|
-
})];
|
|
30383
|
-
case 1:
|
|
30384
|
-
result = _a.sent();
|
|
30385
|
-
loadResult = result;
|
|
30386
|
-
return [2 /*return*/, result.users];
|
|
30387
|
-
}
|
|
30388
|
-
});
|
|
30389
|
-
}); }, {
|
|
30390
|
-
useCache: true,
|
|
30391
|
-
// Group drivers appropriately based on options
|
|
30392
|
-
groupType: User_consts_1.UserGroupTypes.Main,
|
|
30393
|
-
groupValue: [User_consts_1.GROUP_VALUES.Admins, User_consts_1.GROUP_VALUES.Dispatchers]
|
|
30394
|
-
})];
|
|
30395
|
-
case 1:
|
|
30396
|
-
users = _d.sent();
|
|
30397
|
-
return [2 /*return*/, __assign(__assign({}, loadResult), { users: users })];
|
|
30411
|
+
_d.sent();
|
|
30412
|
+
return [2 /*return*/, __assign(__assign({}, loadResult), { users: loadResult.users.map(function (user) { return _this.userStore.get(user.id); }) })];
|
|
30398
30413
|
}
|
|
30399
30414
|
});
|
|
30400
30415
|
});
|
|
@@ -30421,40 +30436,12 @@ var UsersApi = /** @class */ (function () {
|
|
|
30421
30436
|
});
|
|
30422
30437
|
});
|
|
30423
30438
|
};
|
|
30424
|
-
UsersApi.prototype.getDriverCost = function (userId) {
|
|
30425
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
30426
|
-
return __generator(this, function (_a) {
|
|
30427
|
-
return [2 /*return*/, this.usersService.getDriverCost(userId)];
|
|
30428
|
-
});
|
|
30429
|
-
});
|
|
30430
|
-
};
|
|
30431
|
-
UsersApi.prototype.invite = function (userId) {
|
|
30432
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
30433
|
-
var user;
|
|
30434
|
-
return __generator(this, function (_a) {
|
|
30435
|
-
switch (_a.label) {
|
|
30436
|
-
case 0: return [4 /*yield*/, this.usersService.invite(userId)];
|
|
30437
|
-
case 1:
|
|
30438
|
-
user = _a.sent();
|
|
30439
|
-
this.storableDataService.updateInStores(user);
|
|
30440
|
-
return [2 /*return*/, user];
|
|
30441
|
-
}
|
|
30442
|
-
});
|
|
30443
|
-
});
|
|
30444
|
-
};
|
|
30445
|
-
UsersApi.prototype.byUserType = function (userTypeId) {
|
|
30446
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
30447
|
-
return __generator(this, function (_a) {
|
|
30448
|
-
return [2 /*return*/, this.usersService.byUserType(userTypeId)];
|
|
30449
|
-
});
|
|
30450
|
-
});
|
|
30451
|
-
};
|
|
30452
30439
|
// Store query methods - direct access to local store without API calls
|
|
30453
30440
|
UsersApi.prototype.getGroup = function (group) {
|
|
30454
30441
|
return this.userStore.getGroup(User_consts_1.UserGroupTypes.Main, group);
|
|
30455
30442
|
};
|
|
30456
30443
|
UsersApi.prototype.getTeamGroup = function (teamId) {
|
|
30457
|
-
return this.userStore.getGroup('
|
|
30444
|
+
return this.userStore.getGroup('team', teamId);
|
|
30458
30445
|
};
|
|
30459
30446
|
UsersApi.prototype.get = function (id) {
|
|
30460
30447
|
return this.userStore.get(id);
|
|
@@ -30543,7 +30530,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
30543
30530
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
30544
30531
|
};
|
|
30545
30532
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
30546
|
-
var types_1 = __webpack_require__(63127);
|
|
30547
30533
|
var CrudService_1 = __importDefault(__webpack_require__(14809));
|
|
30548
30534
|
var User_consts_1 = __webpack_require__(38894);
|
|
30549
30535
|
var UsersService = /** @class */ (function () {
|
|
@@ -30597,19 +30583,14 @@ var UsersService = /** @class */ (function () {
|
|
|
30597
30583
|
});
|
|
30598
30584
|
});
|
|
30599
30585
|
};
|
|
30600
|
-
UsersService.prototype.loadAll = function (
|
|
30586
|
+
UsersService.prototype.loadAll = function (query, commonOptions) {
|
|
30587
|
+
if (query === void 0) { query = {}; }
|
|
30601
30588
|
return __awaiter(this, void 0, void 0, function () {
|
|
30602
|
-
var limit, page_action, cursor;
|
|
30603
30589
|
return __generator(this, function (_a) {
|
|
30604
|
-
limit = request.limit, page_action = request.page_action, cursor = request.cursor;
|
|
30605
30590
|
return [2 /*return*/, this.service.routeGenerator
|
|
30606
30591
|
.get(User_consts_1.ROUTES.GET_ALL)
|
|
30607
|
-
.withQueryString(
|
|
30608
|
-
.withExtractor(function (response) { return ({
|
|
30609
|
-
next_page_cursor: response.next_page_cursor,
|
|
30610
|
-
previous_page_cursor: response.previous_page_cursor,
|
|
30611
|
-
users: response.users
|
|
30612
|
-
}); })
|
|
30592
|
+
.withQueryString(query)
|
|
30593
|
+
.withExtractor(function (response) { return ({ has_next_page: response.has_next_page, users: response.users }); })
|
|
30613
30594
|
.setException('Could not get users')
|
|
30614
30595
|
.withCommonOptions(commonOptions)
|
|
30615
30596
|
.invoke()];
|
|
@@ -30688,13 +30669,6 @@ var UsersService = /** @class */ (function () {
|
|
|
30688
30669
|
});
|
|
30689
30670
|
});
|
|
30690
30671
|
};
|
|
30691
|
-
UsersService.prototype.getAllAdminsAndDispatchers = function (request) {
|
|
30692
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
30693
|
-
return __generator(this, function (_a) {
|
|
30694
|
-
return [2 /*return*/, this.getAllUsersWithKeysetPagination(request, [User_consts_1.UsersScopes.DISPATCHERS, User_consts_1.UsersScopes.ADMINS], 'Could not get all admins and dispatchers')];
|
|
30695
|
-
});
|
|
30696
|
-
});
|
|
30697
|
-
};
|
|
30698
30672
|
UsersService.prototype.unlock = function (userId) {
|
|
30699
30673
|
return __awaiter(this, void 0, void 0, function () {
|
|
30700
30674
|
return __generator(this, function (_a) {
|
|
@@ -30732,42 +30706,6 @@ var UsersService = /** @class */ (function () {
|
|
|
30732
30706
|
});
|
|
30733
30707
|
});
|
|
30734
30708
|
};
|
|
30735
|
-
UsersService.prototype.getDriverCost = function (userId) {
|
|
30736
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
30737
|
-
return __generator(this, function (_a) {
|
|
30738
|
-
return [2 /*return*/, this.service.routeGenerator
|
|
30739
|
-
.get(User_consts_1.ROUTES.DRIVER_COST)
|
|
30740
|
-
.withRouteParams({ userId: userId })
|
|
30741
|
-
.withExtractor(function (response) { return response; })
|
|
30742
|
-
.setException("Could not get driver cost for user ".concat(userId))
|
|
30743
|
-
.invoke()];
|
|
30744
|
-
});
|
|
30745
|
-
});
|
|
30746
|
-
};
|
|
30747
|
-
UsersService.prototype.byUserType = function (userTypeId) {
|
|
30748
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
30749
|
-
return __generator(this, function (_a) {
|
|
30750
|
-
return [2 /*return*/, this.service.routeGenerator
|
|
30751
|
-
.get(User_consts_1.ROUTES.GET_USERS_WITH_USER_TYPE)
|
|
30752
|
-
.withRouteParams({ userTypeId: userTypeId })
|
|
30753
|
-
.withExtractor(function (response) { return response.users; })
|
|
30754
|
-
.setException("Could not get users with user type ".concat(userTypeId))
|
|
30755
|
-
.invoke()];
|
|
30756
|
-
});
|
|
30757
|
-
});
|
|
30758
|
-
};
|
|
30759
|
-
UsersService.prototype.invite = function (userId) {
|
|
30760
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
30761
|
-
return __generator(this, function (_a) {
|
|
30762
|
-
return [2 /*return*/, this.service.routeGenerator
|
|
30763
|
-
.post(User_consts_1.ROUTES.INVITE)
|
|
30764
|
-
.withRouteParams({ userId: userId })
|
|
30765
|
-
.withExtractor(function (response) { return response.user; })
|
|
30766
|
-
.setException("Could not invite user with id: ".concat(userId))
|
|
30767
|
-
.invoke()];
|
|
30768
|
-
});
|
|
30769
|
-
});
|
|
30770
|
-
};
|
|
30771
30709
|
return UsersService;
|
|
30772
30710
|
}());
|
|
30773
30711
|
exports["default"] = UsersService;
|
|
@@ -39376,6 +39314,7 @@ var PrivilegeTypes;
|
|
|
39376
39314
|
PrivilegeTypes["ALLOW_DISPATCHERS_TO_ADD_DISPATCHER"] = "allow_dispatchers_to_add_dispatcher";
|
|
39377
39315
|
PrivilegeTypes["CHANGE_SKILLS"] = "change_skills";
|
|
39378
39316
|
PrivilegeTypes["CREATE_SKILLS"] = "create_skills";
|
|
39317
|
+
PrivilegeTypes["ALLOW_USING_ROUTE_SIMULATOR"] = "allow_using_route_simulator";
|
|
39379
39318
|
})(PrivilegeTypes || (exports.PrivilegeTypes = PrivilegeTypes = {}));
|
|
39380
39319
|
exports.PRIVILEGES_DEFAULTS = (_a = {},
|
|
39381
39320
|
_a[PrivilegeTypes.CANCEL_TASK] = true,
|
|
@@ -39564,6 +39503,7 @@ var RealtimeEvent;
|
|
|
39564
39503
|
RealtimeEvent["ZipCodesImportDone"] = "zip_codes_import:done";
|
|
39565
39504
|
RealtimeEvent["ServiceAreasImportDone"] = "service_areas_import:done";
|
|
39566
39505
|
RealtimeEvent["AsyncOperationStatus"] = "async_operation_status";
|
|
39506
|
+
RealtimeEvent["WaypointGeocodingStatusChanged"] = "waypoint_geocoding:status_changed";
|
|
39567
39507
|
})(RealtimeEvent || (exports.RealtimeEvent = RealtimeEvent = {}));
|
|
39568
39508
|
//# sourceMappingURL=realtime_event.js.map
|
|
39569
39509
|
|