@bringg/dashboard-sdk 0.4.106 → 0.5.0-pre
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/User/Store/UsersStore.d.ts +10 -9
- package/dist/User/Store/UsersStore.js +26 -26
- package/dist/User/Store/UsersStore.js.map +1 -1
- package/dist/User/Users.d.ts +6 -6
- package/dist/User/Users.js +21 -74
- package/dist/User/Users.js.map +1 -1
- package/dist/bringg-dashboard-sdk-cjs2.js +48 -101
- package/dist/bringg-dashboard-sdk-cjs2.js.map +1 -1
- package/dist/bringg-dashboard-sdk.js +3 -3
- package/dist/bringg-dashboard-sdk.min.js +2 -2
- package/dist/bringg-dashboard-sdk.min.js.map +1 -1
- package/package.json +1 -1
|
@@ -52,7 +52,7 @@ var axios_1 = require("axios");
|
|
|
52
52
|
var Logger_1 = require("../Core/Logger");
|
|
53
53
|
var lodash_1 = require("lodash");
|
|
54
54
|
var BringgException_1 = require("../Core/BringgException");
|
|
55
|
-
var version = '0.
|
|
55
|
+
var version = '0.5.0-pre';
|
|
56
56
|
function logErrorResponse(response) {
|
|
57
57
|
var data = response.data, status = response.status;
|
|
58
58
|
try {
|
|
@@ -5,10 +5,11 @@ import Session from '../../Services/Identity/Session';
|
|
|
5
5
|
import { AllDriversRepsonse, AllUsersKeysetPaginationResponse, AllUsersRepsonse, GROUP_VALUES } from '../User.consts';
|
|
6
6
|
import { GetAllDriversOptions } from '../Users';
|
|
7
7
|
import { KeysetPaginationRequest } from '../../utils/consts/keyset-pagination.consts';
|
|
8
|
-
export declare type UserGroupValue = Map<GROUP_VALUES,
|
|
8
|
+
export declare type UserGroupValue = Map<GROUP_VALUES, Set<User>>;
|
|
9
9
|
export default class UsersStore extends BaseStore<User> {
|
|
10
10
|
private groupUpdateEvents;
|
|
11
11
|
private groupedValues;
|
|
12
|
+
private drivers;
|
|
12
13
|
usersService: UsersService;
|
|
13
14
|
fetchedStatus: {
|
|
14
15
|
drivers: boolean;
|
|
@@ -39,14 +40,14 @@ export default class UsersStore extends BaseStore<User> {
|
|
|
39
40
|
closedTasks(userId: number, page?: number): Promise<Task[]>;
|
|
40
41
|
messageDriver(userId: number, message: string): Promise<number>;
|
|
41
42
|
subscribeToGroupUpdates(fn: (groupValues?: UserGroupValue) => void): void;
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
43
|
+
getOfflineDrivers(): Set<User>;
|
|
44
|
+
getOnlineDrivers(): Set<User>;
|
|
45
|
+
getOnShiftDrivers(): User[];
|
|
46
|
+
getCustomers(): User[];
|
|
47
|
+
getAdmins(): User[];
|
|
48
|
+
getDispatchers(): User[];
|
|
48
49
|
private emitGroupEvents;
|
|
49
|
-
private
|
|
50
|
-
|
|
50
|
+
private calcAllLocalDrivers;
|
|
51
|
+
getAllLocalDrivers(): User[];
|
|
51
52
|
private getAllLocalAdminsAndDispatchers;
|
|
52
53
|
}
|
|
@@ -64,6 +64,7 @@ var UsersStore = /** @class */ (function (_super) {
|
|
|
64
64
|
var _this = _super.call(this) || this;
|
|
65
65
|
_this.groupUpdateEvents = [];
|
|
66
66
|
_this.groupedValues = new Map();
|
|
67
|
+
_this.drivers = [];
|
|
67
68
|
_this.fetchedStatus = {
|
|
68
69
|
drivers: false,
|
|
69
70
|
customers: false,
|
|
@@ -76,11 +77,15 @@ var UsersStore = /** @class */ (function (_super) {
|
|
|
76
77
|
.pipe(operators_1.throttleTime(throttleTimeValue, rxjs_1.asyncScheduler, { trailing: true, leading: false }))
|
|
77
78
|
.subscribe(function (map) {
|
|
78
79
|
rxjs_1.from(map.values())
|
|
79
|
-
.pipe(operators_1.groupBy(User_consts_1.userToGroupMapper, function (user) { return user
|
|
80
|
+
.pipe(operators_1.groupBy(User_consts_1.userToGroupMapper, function (user) { return user; }), operators_1.mergeMap(function (group) { return rxjs_1.zip(rxjs_1.of(group.key), group.pipe(operators_1.toArray())); }))
|
|
80
81
|
.subscribe(function (_a) {
|
|
81
82
|
var groupId = _a[0], groupValues = _a[1];
|
|
82
|
-
_this.groupedValues.set(groupId, groupValues);
|
|
83
|
+
_this.groupedValues.set(groupId, new Set(groupValues));
|
|
83
84
|
_this.emitGroupEvents();
|
|
85
|
+
if (groupId === User_consts_1.GROUP_VALUES.OfflineDrivers || groupId === User_consts_1.GROUP_VALUES.OnlineDrivers) {
|
|
86
|
+
_this.drivers.length = 0;
|
|
87
|
+
Array.prototype.push.apply(_this.drivers, _this.calcAllLocalDrivers());
|
|
88
|
+
}
|
|
84
89
|
});
|
|
85
90
|
});
|
|
86
91
|
return _this;
|
|
@@ -198,7 +203,7 @@ var UsersStore = /** @class */ (function (_super) {
|
|
|
198
203
|
return __generator(this, function (_a) {
|
|
199
204
|
options = request.options;
|
|
200
205
|
if (lodash_1.get(options, 'onlyCustomers')) {
|
|
201
|
-
return [2 /*return*/, this.getOrFetchUsers(request, this.fetchedStatus.customers, function (isAllCustomersFetched) { return (_this.fetchedStatus.customers = isAllCustomersFetched); }, this.usersService.getAllDrivers, function () { return _this.
|
|
206
|
+
return [2 /*return*/, this.getOrFetchUsers(request, this.fetchedStatus.customers, function (isAllCustomersFetched) { return (_this.fetchedStatus.customers = isAllCustomersFetched); }, this.usersService.getAllDrivers, function () { return _this.getCustomers(); })];
|
|
202
207
|
}
|
|
203
208
|
return [2 /*return*/, this.getOrFetchUsers(request, this.fetchedStatus.drivers, function (isAllDriversFetched) { return (_this.fetchedStatus.drivers = isAllDriversFetched); }, function () {
|
|
204
209
|
var _a;
|
|
@@ -388,43 +393,38 @@ var UsersStore = /** @class */ (function (_super) {
|
|
|
388
393
|
UsersStore.prototype.subscribeToGroupUpdates = function (fn) {
|
|
389
394
|
this.groupUpdateEvents.push(fn);
|
|
390
395
|
};
|
|
391
|
-
UsersStore.prototype.
|
|
392
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.OfflineDrivers) ||
|
|
396
|
+
UsersStore.prototype.getOfflineDrivers = function () {
|
|
397
|
+
return this.groupedValues.get(User_consts_1.GROUP_VALUES.OfflineDrivers) || new Set();
|
|
393
398
|
};
|
|
394
|
-
UsersStore.prototype.
|
|
395
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.OnlineDrivers) ||
|
|
399
|
+
UsersStore.prototype.getOnlineDrivers = function () {
|
|
400
|
+
return this.groupedValues.get(User_consts_1.GROUP_VALUES.OnlineDrivers) || new Set();
|
|
396
401
|
};
|
|
397
|
-
UsersStore.prototype.
|
|
398
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.OnShiftDrivers) || [];
|
|
402
|
+
UsersStore.prototype.getOnShiftDrivers = function () {
|
|
403
|
+
return Array.from(this.groupedValues.get(User_consts_1.GROUP_VALUES.OnShiftDrivers) || []);
|
|
399
404
|
};
|
|
400
|
-
UsersStore.prototype.
|
|
401
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.Customers) || [];
|
|
405
|
+
UsersStore.prototype.getCustomers = function () {
|
|
406
|
+
return Array.from(this.groupedValues.get(User_consts_1.GROUP_VALUES.Customers) || []);
|
|
402
407
|
};
|
|
403
|
-
UsersStore.prototype.
|
|
404
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.Admins) || [];
|
|
408
|
+
UsersStore.prototype.getAdmins = function () {
|
|
409
|
+
return Array.from(this.groupedValues.get(User_consts_1.GROUP_VALUES.Admins) || []);
|
|
405
410
|
};
|
|
406
|
-
UsersStore.prototype.
|
|
407
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.Dispatchers) || [];
|
|
411
|
+
UsersStore.prototype.getDispatchers = function () {
|
|
412
|
+
return Array.from(this.groupedValues.get(User_consts_1.GROUP_VALUES.Dispatchers) || []);
|
|
408
413
|
};
|
|
409
414
|
UsersStore.prototype.emitGroupEvents = function () {
|
|
410
415
|
var _this = this;
|
|
411
416
|
this.groupUpdateEvents.forEach(function (fn) { return fn(_this.groupedValues); });
|
|
412
417
|
};
|
|
413
|
-
UsersStore.prototype.
|
|
414
|
-
var
|
|
415
|
-
var
|
|
416
|
-
var offlineDrivers = this.getOfflineDriversIds().map(function (driverId) { return _this.getItem(driverId); });
|
|
418
|
+
UsersStore.prototype.calcAllLocalDrivers = function () {
|
|
419
|
+
var onlineDrivers = Array.from(this.getOnlineDrivers());
|
|
420
|
+
var offlineDrivers = Array.from(this.getOfflineDrivers());
|
|
417
421
|
return onlineDrivers.concat(offlineDrivers);
|
|
418
422
|
};
|
|
419
|
-
UsersStore.prototype.
|
|
420
|
-
|
|
421
|
-
return this.getCustomersIds().map(function (driverId) { return _this.getItem(driverId); });
|
|
423
|
+
UsersStore.prototype.getAllLocalDrivers = function () {
|
|
424
|
+
return this.drivers;
|
|
422
425
|
};
|
|
423
426
|
UsersStore.prototype.getAllLocalAdminsAndDispatchers = function () {
|
|
424
|
-
|
|
425
|
-
return this.getAdminsIds()
|
|
426
|
-
.concat(this.getDispatchersIds())
|
|
427
|
-
.map(function (userId) { return _this.getItem(userId); });
|
|
427
|
+
return this.getAdmins().concat(this.getDispatchers());
|
|
428
428
|
};
|
|
429
429
|
return UsersStore;
|
|
430
430
|
}(BaseStore_1.default));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UsersStore.js","sourceRoot":"","sources":["../../../src/User/Store/UsersStore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAA6C;AAC7C,wDAAmD;AAEnD,8CAMwB;AAExB,4CAA0E;AAC1E,6BAAqD;AAErD,
|
|
1
|
+
{"version":3,"file":"UsersStore.js","sourceRoot":"","sources":["../../../src/User/Store/UsersStore.ts"],"names":[],"mappings":"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"}
|
package/dist/User/Users.d.ts
CHANGED
|
@@ -3,7 +3,6 @@ import Session from '../Services/Identity/Session';
|
|
|
3
3
|
import { UserGroupValue } from './Store/UsersStore';
|
|
4
4
|
import { AllDriversRepsonse, AllUsersKeysetPaginationResponse, AllUsersRepsonse } from './User.consts';
|
|
5
5
|
import { KeysetPaginationRequest } from '../utils/consts/keyset-pagination.consts';
|
|
6
|
-
export declare const UserKeys: string[];
|
|
7
6
|
export interface GetAllDriversOptions {
|
|
8
7
|
onlyOnlineDriver?: boolean;
|
|
9
8
|
onlyCustomers?: boolean;
|
|
@@ -41,10 +40,11 @@ export default class Users {
|
|
|
41
40
|
delete(userId: number): Promise<boolean>;
|
|
42
41
|
getProfileImage(userId: number): Promise<string>;
|
|
43
42
|
subscribeToGroupUpdates(fn: (groupValues?: UserGroupValue) => void): void;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
43
|
+
getOfflineDrivers(): Set<Bringg.User>;
|
|
44
|
+
getOnlineDrivers(): Set<Bringg.User>;
|
|
45
|
+
getAllLocalDrivers(): Bringg.User[];
|
|
46
|
+
getOnShiftDrivers(): Bringg.User[];
|
|
47
|
+
getAdmins(): Bringg.User[];
|
|
48
|
+
getDispatchers(): Bringg.User[];
|
|
49
49
|
messageDriver(userId: number, message: string): Promise<number>;
|
|
50
50
|
}
|
package/dist/User/Users.js
CHANGED
|
@@ -45,7 +45,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
45
45
|
}
|
|
46
46
|
};
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
|
-
exports.UserKeys = void 0;
|
|
49
48
|
var UsersStore_1 = require("./Store/UsersStore");
|
|
50
49
|
var BringgException_1 = require("../Core/BringgException");
|
|
51
50
|
var MethodsArgsDecorators_1 = require("../Core/MethodsArgsDecorators");
|
|
@@ -56,64 +55,6 @@ var keyset_pagination_consts_1 = require("../utils/consts/keyset-pagination.cons
|
|
|
56
55
|
var ALLOWED_KEYS = {
|
|
57
56
|
CREATE_USER: ['name', 'job_description', 'password', 'email', 'phone']
|
|
58
57
|
};
|
|
59
|
-
exports.UserKeys = [
|
|
60
|
-
'id',
|
|
61
|
-
'admin',
|
|
62
|
-
'driver',
|
|
63
|
-
'dispatcher',
|
|
64
|
-
'name',
|
|
65
|
-
'status',
|
|
66
|
-
'sub',
|
|
67
|
-
'lat',
|
|
68
|
-
'lng',
|
|
69
|
-
'phone',
|
|
70
|
-
'email',
|
|
71
|
-
'job_description',
|
|
72
|
-
'driver_current_sign_in_at',
|
|
73
|
-
'driver_sign_in_count',
|
|
74
|
-
'average_rating',
|
|
75
|
-
'num_ratings',
|
|
76
|
-
'last_sign_in_at',
|
|
77
|
-
'active_shift_id',
|
|
78
|
-
'created_at',
|
|
79
|
-
'feature_flags',
|
|
80
|
-
'authorization_flags',
|
|
81
|
-
'confirmed_at',
|
|
82
|
-
'confirmation_sent_at',
|
|
83
|
-
'battery',
|
|
84
|
-
'uuid',
|
|
85
|
-
'external_id',
|
|
86
|
-
'mobile_type',
|
|
87
|
-
'mobile_version',
|
|
88
|
-
'device_model',
|
|
89
|
-
'default_user_activity',
|
|
90
|
-
'language',
|
|
91
|
-
'merchant_id',
|
|
92
|
-
'user_type_id',
|
|
93
|
-
'privilege_id',
|
|
94
|
-
'estimated_last_address',
|
|
95
|
-
'estimated_last_lat',
|
|
96
|
-
'estimated_last_lng',
|
|
97
|
-
'estimated_last_etl',
|
|
98
|
-
'at_home',
|
|
99
|
-
'company',
|
|
100
|
-
'eta_to_home',
|
|
101
|
-
'private_vehicle',
|
|
102
|
-
'in_beacon_range',
|
|
103
|
-
'home_address',
|
|
104
|
-
'home_lat',
|
|
105
|
-
'home_lng',
|
|
106
|
-
'team_ids',
|
|
107
|
-
'allowed_user_type_ids',
|
|
108
|
-
'locked',
|
|
109
|
-
'beta',
|
|
110
|
-
'debug',
|
|
111
|
-
'profile_image',
|
|
112
|
-
'authentication_token',
|
|
113
|
-
'partner_user',
|
|
114
|
-
'password',
|
|
115
|
-
'skills'
|
|
116
|
-
];
|
|
117
58
|
var Users = /** @class */ (function () {
|
|
118
59
|
function Users(session) {
|
|
119
60
|
this.usersStore = new UsersStore_1.default(session);
|
|
@@ -221,20 +162,23 @@ var Users = /** @class */ (function () {
|
|
|
221
162
|
Users.prototype.subscribeToGroupUpdates = function (fn) {
|
|
222
163
|
this.usersStore.subscribeToGroupUpdates(fn);
|
|
223
164
|
};
|
|
224
|
-
Users.prototype.
|
|
225
|
-
return this.usersStore.
|
|
165
|
+
Users.prototype.getOfflineDrivers = function () {
|
|
166
|
+
return this.usersStore.getOfflineDrivers();
|
|
226
167
|
};
|
|
227
|
-
Users.prototype.
|
|
228
|
-
return this.usersStore.
|
|
168
|
+
Users.prototype.getOnlineDrivers = function () {
|
|
169
|
+
return this.usersStore.getOnlineDrivers();
|
|
229
170
|
};
|
|
230
|
-
Users.prototype.
|
|
231
|
-
return this.usersStore.
|
|
171
|
+
Users.prototype.getAllLocalDrivers = function () {
|
|
172
|
+
return this.usersStore.getAllLocalDrivers();
|
|
232
173
|
};
|
|
233
|
-
Users.prototype.
|
|
234
|
-
return this.usersStore.
|
|
174
|
+
Users.prototype.getOnShiftDrivers = function () {
|
|
175
|
+
return this.usersStore.getOnShiftDrivers();
|
|
235
176
|
};
|
|
236
|
-
Users.prototype.
|
|
237
|
-
return this.usersStore.
|
|
177
|
+
Users.prototype.getAdmins = function () {
|
|
178
|
+
return this.usersStore.getAdmins();
|
|
179
|
+
};
|
|
180
|
+
Users.prototype.getDispatchers = function () {
|
|
181
|
+
return this.usersStore.getDispatchers();
|
|
238
182
|
};
|
|
239
183
|
Users.prototype.messageDriver = function (userId, message) {
|
|
240
184
|
return this.usersStore.messageDriver(userId, message);
|
|
@@ -315,19 +259,22 @@ var Users = /** @class */ (function () {
|
|
|
315
259
|
], Users.prototype, "subscribeToGroupUpdates", null);
|
|
316
260
|
__decorate([
|
|
317
261
|
BringgException_1.logOnException
|
|
318
|
-
], Users.prototype, "
|
|
262
|
+
], Users.prototype, "getOfflineDrivers", null);
|
|
263
|
+
__decorate([
|
|
264
|
+
BringgException_1.logOnException
|
|
265
|
+
], Users.prototype, "getOnlineDrivers", null);
|
|
319
266
|
__decorate([
|
|
320
267
|
BringgException_1.logOnException
|
|
321
|
-
], Users.prototype, "
|
|
268
|
+
], Users.prototype, "getAllLocalDrivers", null);
|
|
322
269
|
__decorate([
|
|
323
270
|
BringgException_1.logOnException
|
|
324
|
-
], Users.prototype, "
|
|
271
|
+
], Users.prototype, "getOnShiftDrivers", null);
|
|
325
272
|
__decorate([
|
|
326
273
|
BringgException_1.logOnException
|
|
327
|
-
], Users.prototype, "
|
|
274
|
+
], Users.prototype, "getAdmins", null);
|
|
328
275
|
__decorate([
|
|
329
276
|
BringgException_1.logOnException
|
|
330
|
-
], Users.prototype, "
|
|
277
|
+
], Users.prototype, "getDispatchers", null);
|
|
331
278
|
__decorate([
|
|
332
279
|
BringgException_1.logOnException
|
|
333
280
|
], Users.prototype, "messageDriver", null);
|
package/dist/User/Users.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Users.js","sourceRoot":"","sources":["../../src/User/Users.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Users.js","sourceRoot":"","sources":["../../src/User/Users.ts"],"names":[],"mappings":"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"}
|
|
@@ -30216,7 +30216,7 @@ var axios_1 = __webpack_require__(146);
|
|
|
30216
30216
|
var Logger_1 = __webpack_require__(39);
|
|
30217
30217
|
var lodash_1 = __webpack_require__(11);
|
|
30218
30218
|
var BringgException_1 = __webpack_require__(15);
|
|
30219
|
-
var version = '0.
|
|
30219
|
+
var version = '0.5.0-pre';
|
|
30220
30220
|
function logErrorResponse(response) {
|
|
30221
30221
|
var data = response.data, status = response.status;
|
|
30222
30222
|
try {
|
|
@@ -48215,7 +48215,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
48215
48215
|
}
|
|
48216
48216
|
};
|
|
48217
48217
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48218
|
-
exports.UserKeys = void 0;
|
|
48219
48218
|
var UsersStore_1 = __webpack_require__(339);
|
|
48220
48219
|
var BringgException_1 = __webpack_require__(15);
|
|
48221
48220
|
var MethodsArgsDecorators_1 = __webpack_require__(343);
|
|
@@ -48226,64 +48225,6 @@ var keyset_pagination_consts_1 = __webpack_require__(103);
|
|
|
48226
48225
|
var ALLOWED_KEYS = {
|
|
48227
48226
|
CREATE_USER: ['name', 'job_description', 'password', 'email', 'phone']
|
|
48228
48227
|
};
|
|
48229
|
-
exports.UserKeys = [
|
|
48230
|
-
'id',
|
|
48231
|
-
'admin',
|
|
48232
|
-
'driver',
|
|
48233
|
-
'dispatcher',
|
|
48234
|
-
'name',
|
|
48235
|
-
'status',
|
|
48236
|
-
'sub',
|
|
48237
|
-
'lat',
|
|
48238
|
-
'lng',
|
|
48239
|
-
'phone',
|
|
48240
|
-
'email',
|
|
48241
|
-
'job_description',
|
|
48242
|
-
'driver_current_sign_in_at',
|
|
48243
|
-
'driver_sign_in_count',
|
|
48244
|
-
'average_rating',
|
|
48245
|
-
'num_ratings',
|
|
48246
|
-
'last_sign_in_at',
|
|
48247
|
-
'active_shift_id',
|
|
48248
|
-
'created_at',
|
|
48249
|
-
'feature_flags',
|
|
48250
|
-
'authorization_flags',
|
|
48251
|
-
'confirmed_at',
|
|
48252
|
-
'confirmation_sent_at',
|
|
48253
|
-
'battery',
|
|
48254
|
-
'uuid',
|
|
48255
|
-
'external_id',
|
|
48256
|
-
'mobile_type',
|
|
48257
|
-
'mobile_version',
|
|
48258
|
-
'device_model',
|
|
48259
|
-
'default_user_activity',
|
|
48260
|
-
'language',
|
|
48261
|
-
'merchant_id',
|
|
48262
|
-
'user_type_id',
|
|
48263
|
-
'privilege_id',
|
|
48264
|
-
'estimated_last_address',
|
|
48265
|
-
'estimated_last_lat',
|
|
48266
|
-
'estimated_last_lng',
|
|
48267
|
-
'estimated_last_etl',
|
|
48268
|
-
'at_home',
|
|
48269
|
-
'company',
|
|
48270
|
-
'eta_to_home',
|
|
48271
|
-
'private_vehicle',
|
|
48272
|
-
'in_beacon_range',
|
|
48273
|
-
'home_address',
|
|
48274
|
-
'home_lat',
|
|
48275
|
-
'home_lng',
|
|
48276
|
-
'team_ids',
|
|
48277
|
-
'allowed_user_type_ids',
|
|
48278
|
-
'locked',
|
|
48279
|
-
'beta',
|
|
48280
|
-
'debug',
|
|
48281
|
-
'profile_image',
|
|
48282
|
-
'authentication_token',
|
|
48283
|
-
'partner_user',
|
|
48284
|
-
'password',
|
|
48285
|
-
'skills'
|
|
48286
|
-
];
|
|
48287
48228
|
var Users = /** @class */ (function () {
|
|
48288
48229
|
function Users(session) {
|
|
48289
48230
|
this.usersStore = new UsersStore_1.default(session);
|
|
@@ -48391,20 +48332,23 @@ var Users = /** @class */ (function () {
|
|
|
48391
48332
|
Users.prototype.subscribeToGroupUpdates = function (fn) {
|
|
48392
48333
|
this.usersStore.subscribeToGroupUpdates(fn);
|
|
48393
48334
|
};
|
|
48394
|
-
Users.prototype.
|
|
48395
|
-
return this.usersStore.
|
|
48335
|
+
Users.prototype.getOfflineDrivers = function () {
|
|
48336
|
+
return this.usersStore.getOfflineDrivers();
|
|
48337
|
+
};
|
|
48338
|
+
Users.prototype.getOnlineDrivers = function () {
|
|
48339
|
+
return this.usersStore.getOnlineDrivers();
|
|
48396
48340
|
};
|
|
48397
|
-
Users.prototype.
|
|
48398
|
-
return this.usersStore.
|
|
48341
|
+
Users.prototype.getAllLocalDrivers = function () {
|
|
48342
|
+
return this.usersStore.getAllLocalDrivers();
|
|
48399
48343
|
};
|
|
48400
|
-
Users.prototype.
|
|
48401
|
-
return this.usersStore.
|
|
48344
|
+
Users.prototype.getOnShiftDrivers = function () {
|
|
48345
|
+
return this.usersStore.getOnShiftDrivers();
|
|
48402
48346
|
};
|
|
48403
|
-
Users.prototype.
|
|
48404
|
-
return this.usersStore.
|
|
48347
|
+
Users.prototype.getAdmins = function () {
|
|
48348
|
+
return this.usersStore.getAdmins();
|
|
48405
48349
|
};
|
|
48406
|
-
Users.prototype.
|
|
48407
|
-
return this.usersStore.
|
|
48350
|
+
Users.prototype.getDispatchers = function () {
|
|
48351
|
+
return this.usersStore.getDispatchers();
|
|
48408
48352
|
};
|
|
48409
48353
|
Users.prototype.messageDriver = function (userId, message) {
|
|
48410
48354
|
return this.usersStore.messageDriver(userId, message);
|
|
@@ -48485,19 +48429,22 @@ var Users = /** @class */ (function () {
|
|
|
48485
48429
|
], Users.prototype, "subscribeToGroupUpdates", null);
|
|
48486
48430
|
__decorate([
|
|
48487
48431
|
BringgException_1.logOnException
|
|
48488
|
-
], Users.prototype, "
|
|
48432
|
+
], Users.prototype, "getOfflineDrivers", null);
|
|
48433
|
+
__decorate([
|
|
48434
|
+
BringgException_1.logOnException
|
|
48435
|
+
], Users.prototype, "getOnlineDrivers", null);
|
|
48489
48436
|
__decorate([
|
|
48490
48437
|
BringgException_1.logOnException
|
|
48491
|
-
], Users.prototype, "
|
|
48438
|
+
], Users.prototype, "getAllLocalDrivers", null);
|
|
48492
48439
|
__decorate([
|
|
48493
48440
|
BringgException_1.logOnException
|
|
48494
|
-
], Users.prototype, "
|
|
48441
|
+
], Users.prototype, "getOnShiftDrivers", null);
|
|
48495
48442
|
__decorate([
|
|
48496
48443
|
BringgException_1.logOnException
|
|
48497
|
-
], Users.prototype, "
|
|
48444
|
+
], Users.prototype, "getAdmins", null);
|
|
48498
48445
|
__decorate([
|
|
48499
48446
|
BringgException_1.logOnException
|
|
48500
|
-
], Users.prototype, "
|
|
48447
|
+
], Users.prototype, "getDispatchers", null);
|
|
48501
48448
|
__decorate([
|
|
48502
48449
|
BringgException_1.logOnException
|
|
48503
48450
|
], Users.prototype, "messageDriver", null);
|
|
@@ -48577,6 +48524,7 @@ var UsersStore = /** @class */ (function (_super) {
|
|
|
48577
48524
|
var _this = _super.call(this) || this;
|
|
48578
48525
|
_this.groupUpdateEvents = [];
|
|
48579
48526
|
_this.groupedValues = new Map();
|
|
48527
|
+
_this.drivers = [];
|
|
48580
48528
|
_this.fetchedStatus = {
|
|
48581
48529
|
drivers: false,
|
|
48582
48530
|
customers: false,
|
|
@@ -48589,11 +48537,15 @@ var UsersStore = /** @class */ (function (_super) {
|
|
|
48589
48537
|
.pipe(operators_1.throttleTime(throttleTimeValue, rxjs_1.asyncScheduler, { trailing: true, leading: false }))
|
|
48590
48538
|
.subscribe(function (map) {
|
|
48591
48539
|
rxjs_1.from(map.values())
|
|
48592
|
-
.pipe(operators_1.groupBy(User_consts_1.userToGroupMapper, function (user) { return user
|
|
48540
|
+
.pipe(operators_1.groupBy(User_consts_1.userToGroupMapper, function (user) { return user; }), operators_1.mergeMap(function (group) { return rxjs_1.zip(rxjs_1.of(group.key), group.pipe(operators_1.toArray())); }))
|
|
48593
48541
|
.subscribe(function (_a) {
|
|
48594
48542
|
var groupId = _a[0], groupValues = _a[1];
|
|
48595
|
-
_this.groupedValues.set(groupId, groupValues);
|
|
48543
|
+
_this.groupedValues.set(groupId, new Set(groupValues));
|
|
48596
48544
|
_this.emitGroupEvents();
|
|
48545
|
+
if (groupId === User_consts_1.GROUP_VALUES.OfflineDrivers || groupId === User_consts_1.GROUP_VALUES.OnlineDrivers) {
|
|
48546
|
+
_this.drivers.length = 0;
|
|
48547
|
+
Array.prototype.push.apply(_this.drivers, _this.calcAllLocalDrivers());
|
|
48548
|
+
}
|
|
48597
48549
|
});
|
|
48598
48550
|
});
|
|
48599
48551
|
return _this;
|
|
@@ -48711,7 +48663,7 @@ var UsersStore = /** @class */ (function (_super) {
|
|
|
48711
48663
|
return __generator(this, function (_a) {
|
|
48712
48664
|
options = request.options;
|
|
48713
48665
|
if (lodash_1.get(options, 'onlyCustomers')) {
|
|
48714
|
-
return [2 /*return*/, this.getOrFetchUsers(request, this.fetchedStatus.customers, function (isAllCustomersFetched) { return (_this.fetchedStatus.customers = isAllCustomersFetched); }, this.usersService.getAllDrivers, function () { return _this.
|
|
48666
|
+
return [2 /*return*/, this.getOrFetchUsers(request, this.fetchedStatus.customers, function (isAllCustomersFetched) { return (_this.fetchedStatus.customers = isAllCustomersFetched); }, this.usersService.getAllDrivers, function () { return _this.getCustomers(); })];
|
|
48715
48667
|
}
|
|
48716
48668
|
return [2 /*return*/, this.getOrFetchUsers(request, this.fetchedStatus.drivers, function (isAllDriversFetched) { return (_this.fetchedStatus.drivers = isAllDriversFetched); }, function () {
|
|
48717
48669
|
var _a;
|
|
@@ -48901,43 +48853,38 @@ var UsersStore = /** @class */ (function (_super) {
|
|
|
48901
48853
|
UsersStore.prototype.subscribeToGroupUpdates = function (fn) {
|
|
48902
48854
|
this.groupUpdateEvents.push(fn);
|
|
48903
48855
|
};
|
|
48904
|
-
UsersStore.prototype.
|
|
48905
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.OfflineDrivers) ||
|
|
48856
|
+
UsersStore.prototype.getOfflineDrivers = function () {
|
|
48857
|
+
return this.groupedValues.get(User_consts_1.GROUP_VALUES.OfflineDrivers) || new Set();
|
|
48906
48858
|
};
|
|
48907
|
-
UsersStore.prototype.
|
|
48908
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.OnlineDrivers) ||
|
|
48859
|
+
UsersStore.prototype.getOnlineDrivers = function () {
|
|
48860
|
+
return this.groupedValues.get(User_consts_1.GROUP_VALUES.OnlineDrivers) || new Set();
|
|
48909
48861
|
};
|
|
48910
|
-
UsersStore.prototype.
|
|
48911
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.OnShiftDrivers) || [];
|
|
48862
|
+
UsersStore.prototype.getOnShiftDrivers = function () {
|
|
48863
|
+
return Array.from(this.groupedValues.get(User_consts_1.GROUP_VALUES.OnShiftDrivers) || []);
|
|
48912
48864
|
};
|
|
48913
|
-
UsersStore.prototype.
|
|
48914
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.Customers) || [];
|
|
48865
|
+
UsersStore.prototype.getCustomers = function () {
|
|
48866
|
+
return Array.from(this.groupedValues.get(User_consts_1.GROUP_VALUES.Customers) || []);
|
|
48915
48867
|
};
|
|
48916
|
-
UsersStore.prototype.
|
|
48917
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.Admins) || [];
|
|
48868
|
+
UsersStore.prototype.getAdmins = function () {
|
|
48869
|
+
return Array.from(this.groupedValues.get(User_consts_1.GROUP_VALUES.Admins) || []);
|
|
48918
48870
|
};
|
|
48919
|
-
UsersStore.prototype.
|
|
48920
|
-
return this.groupedValues.get(User_consts_1.GROUP_VALUES.Dispatchers) || [];
|
|
48871
|
+
UsersStore.prototype.getDispatchers = function () {
|
|
48872
|
+
return Array.from(this.groupedValues.get(User_consts_1.GROUP_VALUES.Dispatchers) || []);
|
|
48921
48873
|
};
|
|
48922
48874
|
UsersStore.prototype.emitGroupEvents = function () {
|
|
48923
48875
|
var _this = this;
|
|
48924
48876
|
this.groupUpdateEvents.forEach(function (fn) { return fn(_this.groupedValues); });
|
|
48925
48877
|
};
|
|
48926
|
-
UsersStore.prototype.
|
|
48927
|
-
var
|
|
48928
|
-
var
|
|
48929
|
-
var offlineDrivers = this.getOfflineDriversIds().map(function (driverId) { return _this.getItem(driverId); });
|
|
48878
|
+
UsersStore.prototype.calcAllLocalDrivers = function () {
|
|
48879
|
+
var onlineDrivers = Array.from(this.getOnlineDrivers());
|
|
48880
|
+
var offlineDrivers = Array.from(this.getOfflineDrivers());
|
|
48930
48881
|
return onlineDrivers.concat(offlineDrivers);
|
|
48931
48882
|
};
|
|
48932
|
-
UsersStore.prototype.
|
|
48933
|
-
|
|
48934
|
-
return this.getCustomersIds().map(function (driverId) { return _this.getItem(driverId); });
|
|
48883
|
+
UsersStore.prototype.getAllLocalDrivers = function () {
|
|
48884
|
+
return this.drivers;
|
|
48935
48885
|
};
|
|
48936
48886
|
UsersStore.prototype.getAllLocalAdminsAndDispatchers = function () {
|
|
48937
|
-
|
|
48938
|
-
return this.getAdminsIds()
|
|
48939
|
-
.concat(this.getDispatchersIds())
|
|
48940
|
-
.map(function (userId) { return _this.getItem(userId); });
|
|
48887
|
+
return this.getAdmins().concat(this.getDispatchers());
|
|
48941
48888
|
};
|
|
48942
48889
|
return UsersStore;
|
|
48943
48890
|
}(BaseStore_1.default));
|