@bringg/dashboard-sdk 9.8.2 → 9.8.4
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/Data/merge-mapper.js +9 -2
- package/dist/Data/merge-mapper.js.map +1 -1
- package/dist/DeliveryBlocks/DeliveryBlocksApi.d.ts +1 -1
- package/dist/DeliveryBlocks/DeliveryBlocksApi.js +2 -2
- package/dist/DeliveryBlocks/DeliveryBlocksApi.js.map +1 -1
- package/dist/DeliveryBlocks/Entity/DeliveryBlocksEntity.d.ts +1 -1
- package/dist/DeliveryBlocks/Entity/DeliveryBlocksEntity.js +7 -2
- package/dist/DeliveryBlocks/Entity/DeliveryBlocksEntity.js.map +1 -1
- package/dist/Services/ServiceRequest.js +1 -1
- package/dist/bringg-dashboard-sdk-cjs2.js +19 -7
- package/dist/bringg-dashboard-sdk-cjs2.js.map +1 -1
- package/dist/bringg-dashboard-sdk.js +4 -4
- package/dist/bringg-dashboard-sdk.min.js +1 -1
- package/dist/bringg-dashboard-sdk.min.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,8 +5,15 @@ var object_merger_1 = require("./object-merger");
|
|
|
5
5
|
function mergeIntoExisting(dataStore, item) {
|
|
6
6
|
var existing = dataStore.get(item.id);
|
|
7
7
|
if (existing) {
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
try {
|
|
9
|
+
var diff = object_merger_1.objectMerger.deepMerge(existing, item);
|
|
10
|
+
return { current: existing, diff: diff };
|
|
11
|
+
}
|
|
12
|
+
catch (e) {
|
|
13
|
+
console.error('failed to merge item update to existing', item, existing);
|
|
14
|
+
e.params = { existing: existing, item: item };
|
|
15
|
+
throw e;
|
|
16
|
+
}
|
|
10
17
|
}
|
|
11
18
|
return { current: item };
|
|
12
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-mapper.js","sourceRoot":"","sources":["../../src/Data/merge-mapper.ts"],"names":[],"mappings":";;;AAEA,iDAA+C;AAE/C,SAAS,iBAAiB,CAA6B,SAA6B,EAAE,IAAa;IAClG,IAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExC,IAAI,QAAQ,EAAE;QACb,IAAM,IAAI,GAAG,4BAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"merge-mapper.js","sourceRoot":"","sources":["../../src/Data/merge-mapper.ts"],"names":[],"mappings":";;;AAEA,iDAA+C;AAE/C,SAAS,iBAAiB,CAA6B,SAA6B,EAAE,IAAa;IAClG,IAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExC,IAAI,QAAQ,EAAE;QACb,IAAI;YACH,IAAM,IAAI,GAAG,4BAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAEpD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAe,EAAE,CAAC;SACpD;QAAC,OAAO,CAAC,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YACzE,CAAC,CAAC,MAAM,GAAG,EAAE,QAAQ,UAAA,EAAE,IAAI,MAAA,EAAE,CAAC;YAC9B,MAAM,CAAC,CAAC;SACR;KACD;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC1B,CAAC;AAEY,QAAA,WAAW,GAAG,EAAE,iBAAiB,mBAAA,EAAE,CAAC"}
|
|
@@ -8,7 +8,7 @@ export declare class DeliveryBlocksApi {
|
|
|
8
8
|
create(options: DeliveryBlockOptionsWithUsers | DeliveryBlockOptionsWithResources): Promise<DeliveryBlock>;
|
|
9
9
|
update(options: DeliveryBlockOptionsWithUsers | DeliveryBlockOptionsWithResources): Promise<DeliveryBlock>;
|
|
10
10
|
delete(id: number, recurring?: RecurringTypes): Promise<boolean>;
|
|
11
|
-
getByDriverId(driverId: number, startTime: number, endTime: number, teamId?: number): Promise<DeliveryBlock[]>;
|
|
11
|
+
getByDriverId(driverId: number, startTime: number, endTime: number, teamId?: number, dateRangeType?: DateRangeType): Promise<DeliveryBlock[]>;
|
|
12
12
|
getTemplates(): Promise<DeliveryBlockTemplate[]>;
|
|
13
13
|
getTemplateById(templateId: number): Promise<DeliveryBlockTemplate>;
|
|
14
14
|
createTemplate(template: DeliveryBlockTemplate): Promise<CreateDeliveryBlockTemplateResponse>;
|
|
@@ -80,10 +80,10 @@ var DeliveryBlocksApi = /** @class */ (function () {
|
|
|
80
80
|
});
|
|
81
81
|
});
|
|
82
82
|
};
|
|
83
|
-
DeliveryBlocksApi.prototype.getByDriverId = function (driverId, startTime, endTime, teamId) {
|
|
83
|
+
DeliveryBlocksApi.prototype.getByDriverId = function (driverId, startTime, endTime, teamId, dateRangeType) {
|
|
84
84
|
return __awaiter(this, void 0, void 0, function () {
|
|
85
85
|
return __generator(this, function (_a) {
|
|
86
|
-
return [2 /*return*/, this.deliveryBlocksEntity.getByDriverId(driverId, startTime, endTime, teamId)];
|
|
86
|
+
return [2 /*return*/, this.deliveryBlocksEntity.getByDriverId(driverId, startTime, endTime, teamId, dateRangeType)];
|
|
87
87
|
});
|
|
88
88
|
});
|
|
89
89
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryBlocksApi.js","sourceRoot":"","sources":["../../src/DeliveryBlocks/DeliveryBlocksApi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,2DAAyD;AAUzD,uFAAiE;AAEjE;IAGC,2BAAY,OAAgB;QAC3B,IAAI,CAAC,oBAAoB,GAAG,IAAI,8BAAoB,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAGY,+BAAG,GAAH,UACZ,MAAc,EACd,SAAiB,EACjB,OAAe,EACf,aAA6B;;;gBAE7B,sBAAO,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,CAAC,EAAC;;;KAChF;IAGY,kCAAM,GAAN,UACZ,OAA0E;;;gBAE1E,sBAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAC;;;KACjD;IAGY,kCAAM,GAAN,UACZ,OAA0E;;;gBAE1E,sBAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAC;;;KACjD;IAGY,kCAAM,GAAN,UAAO,EAAU,EAAE,SAA0B;;;gBACzD,sBAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,EAAC;;;KACvD;IAGY,yCAAa,GAAb,UACZ,QAAgB,EAChB,SAAiB,EACjB,OAAe,EACf,MAAe;;;
|
|
1
|
+
{"version":3,"file":"DeliveryBlocksApi.js","sourceRoot":"","sources":["../../src/DeliveryBlocks/DeliveryBlocksApi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,2DAAyD;AAUzD,uFAAiE;AAEjE;IAGC,2BAAY,OAAgB;QAC3B,IAAI,CAAC,oBAAoB,GAAG,IAAI,8BAAoB,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAGY,+BAAG,GAAH,UACZ,MAAc,EACd,SAAiB,EACjB,OAAe,EACf,aAA6B;;;gBAE7B,sBAAO,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,CAAC,EAAC;;;KAChF;IAGY,kCAAM,GAAN,UACZ,OAA0E;;;gBAE1E,sBAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAC;;;KACjD;IAGY,kCAAM,GAAN,UACZ,OAA0E;;;gBAE1E,sBAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAC;;;KACjD;IAGY,kCAAM,GAAN,UAAO,EAAU,EAAE,SAA0B;;;gBACzD,sBAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,EAAC;;;KACvD;IAGY,yCAAa,GAAb,UACZ,QAAgB,EAChB,SAAiB,EACjB,OAAe,EACf,MAAe,EACf,aAA6B;;;gBAE7B,sBAAO,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAC;;;KACpG;IAGY,wCAAY,GAAZ;;;gBACZ,sBAAO,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,EAAC;;;KAChD;IAGY,2CAAe,GAAf,UAAgB,UAAkB;;;gBAC9C,sBAAO,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,UAAU,CAAC,EAAC;;;KAC7D;IAGY,0CAAc,GAAd,UAAe,QAA+B;;;gBAC1D,sBAAO,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAC;;;KAC1D;IAGY,0CAAc,GAAd,UACZ,UAAkB,EAClB,OAA2C;;;gBAE3C,sBAAO,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,EAAC;;;KACrE;IAGY,0CAAc,GAAd,UAAe,UAAkB;;;gBAC7C,sBAAO,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,UAAU,CAAC,EAAC;;;KAC5D;IAjEY;QADZ,gCAAc;gDAQd;IAGY;QADZ,gCAAc;mDAKd;IAGY;QADZ,gCAAc;mDAKd;IAGY;QADZ,gCAAc;mDAGd;IAGY;QADZ,gCAAc;0DASd;IAGY;QADZ,gCAAc;yDAGd;IAGY;QADZ,gCAAc;4DAGd;IAGY;QADZ,gCAAc;2DAGd;IAGY;QADZ,gCAAc;2DAMd;IAGY;QADZ,gCAAc;2DAGd;IACF,wBAAC;CAAA,AA1ED,IA0EC;AA1EY,8CAAiB"}
|
|
@@ -8,7 +8,7 @@ export default class DeliveryBlocksEntity extends Entity<Bringg.DeliveryBlock> {
|
|
|
8
8
|
create(options: DeliveryBlockOptionsWithUsers | DeliveryBlockOptionsWithResources): Promise<DeliveryBlock>;
|
|
9
9
|
update(options: DeliveryBlockOptionsWithUsers | DeliveryBlockOptionsWithResources): Promise<DeliveryBlock>;
|
|
10
10
|
delete(id: number, recurring?: RecurringTypes): Promise<boolean>;
|
|
11
|
-
getByDriverId(driverId: number, startTime: number, endTime: number, teamId?: number): Promise<DeliveryBlock[]>;
|
|
11
|
+
getByDriverId(driverId: number, startTime: number, endTime: number, teamId?: number, dateRangeType?: DateRangeType): Promise<DeliveryBlock[]>;
|
|
12
12
|
getTemplates(): Promise<DeliveryBlockTemplate[]>;
|
|
13
13
|
getTemplateById(templateId: number): Promise<DeliveryBlockTemplate>;
|
|
14
14
|
createTemplate(payload: DeliveryBlockTemplate): Promise<CreateDeliveryBlockTemplateResponse>;
|
|
@@ -153,7 +153,7 @@ var DeliveryBlocksEntity = /** @class */ (function (_super) {
|
|
|
153
153
|
});
|
|
154
154
|
});
|
|
155
155
|
};
|
|
156
|
-
DeliveryBlocksEntity.prototype.getByDriverId = function (driverId, startTime, endTime, teamId) {
|
|
156
|
+
DeliveryBlocksEntity.prototype.getByDriverId = function (driverId, startTime, endTime, teamId, dateRangeType) {
|
|
157
157
|
return __awaiter(this, void 0, void 0, function () {
|
|
158
158
|
return __generator(this, function (_a) {
|
|
159
159
|
return [2 /*return*/, this.service.routeGenerator
|
|
@@ -161,7 +161,12 @@ var DeliveryBlocksEntity = /** @class */ (function (_super) {
|
|
|
161
161
|
.withExtractor(function (result) { return result.delivery_blocks; })
|
|
162
162
|
.withRouteParams({ id: driverId })
|
|
163
163
|
.setException("Could not fetch delivery block for user with id #".concat(driverId))
|
|
164
|
-
.withQueryString({
|
|
164
|
+
.withQueryString({
|
|
165
|
+
start_time: startTime,
|
|
166
|
+
end_time: endTime,
|
|
167
|
+
team_id: teamId,
|
|
168
|
+
date_range_type: dateRangeType
|
|
169
|
+
})
|
|
165
170
|
.invoke()];
|
|
166
171
|
});
|
|
167
172
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryBlocksEntity.js","sourceRoot":"","sources":["../../../src/DeliveryBlocks/Entity/DeliveryBlocksEntity.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DeliveryBlocksEntity.js","sourceRoot":"","sources":["../../../src/DeliveryBlocks/Entity/DeliveryBlocksEntity.ts"],"names":[],"mappings":"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"}
|
|
@@ -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.8.
|
|
59
|
+
var version = '9.8.4';
|
|
60
60
|
function logErrorResponse(response) {
|
|
61
61
|
var data = response.data, status = response.status;
|
|
62
62
|
try {
|
|
@@ -7505,8 +7505,15 @@ var object_merger_1 = __webpack_require__(7262);
|
|
|
7505
7505
|
function mergeIntoExisting(dataStore, item) {
|
|
7506
7506
|
var existing = dataStore.get(item.id);
|
|
7507
7507
|
if (existing) {
|
|
7508
|
-
|
|
7509
|
-
|
|
7508
|
+
try {
|
|
7509
|
+
var diff = object_merger_1.objectMerger.deepMerge(existing, item);
|
|
7510
|
+
return { current: existing, diff: diff };
|
|
7511
|
+
}
|
|
7512
|
+
catch (e) {
|
|
7513
|
+
console.error('failed to merge item update to existing', item, existing);
|
|
7514
|
+
e.params = { existing: existing, item: item };
|
|
7515
|
+
throw e;
|
|
7516
|
+
}
|
|
7510
7517
|
}
|
|
7511
7518
|
return { current: item };
|
|
7512
7519
|
}
|
|
@@ -7899,10 +7906,10 @@ var DeliveryBlocksApi = /** @class */ (function () {
|
|
|
7899
7906
|
});
|
|
7900
7907
|
});
|
|
7901
7908
|
};
|
|
7902
|
-
DeliveryBlocksApi.prototype.getByDriverId = function (driverId, startTime, endTime, teamId) {
|
|
7909
|
+
DeliveryBlocksApi.prototype.getByDriverId = function (driverId, startTime, endTime, teamId, dateRangeType) {
|
|
7903
7910
|
return __awaiter(this, void 0, void 0, function () {
|
|
7904
7911
|
return __generator(this, function (_a) {
|
|
7905
|
-
return [2 /*return*/, this.deliveryBlocksEntity.getByDriverId(driverId, startTime, endTime, teamId)];
|
|
7912
|
+
return [2 /*return*/, this.deliveryBlocksEntity.getByDriverId(driverId, startTime, endTime, teamId, dateRangeType)];
|
|
7906
7913
|
});
|
|
7907
7914
|
});
|
|
7908
7915
|
};
|
|
@@ -8137,7 +8144,7 @@ var DeliveryBlocksEntity = /** @class */ (function (_super) {
|
|
|
8137
8144
|
});
|
|
8138
8145
|
});
|
|
8139
8146
|
};
|
|
8140
|
-
DeliveryBlocksEntity.prototype.getByDriverId = function (driverId, startTime, endTime, teamId) {
|
|
8147
|
+
DeliveryBlocksEntity.prototype.getByDriverId = function (driverId, startTime, endTime, teamId, dateRangeType) {
|
|
8141
8148
|
return __awaiter(this, void 0, void 0, function () {
|
|
8142
8149
|
return __generator(this, function (_a) {
|
|
8143
8150
|
return [2 /*return*/, this.service.routeGenerator
|
|
@@ -8145,7 +8152,12 @@ var DeliveryBlocksEntity = /** @class */ (function (_super) {
|
|
|
8145
8152
|
.withExtractor(function (result) { return result.delivery_blocks; })
|
|
8146
8153
|
.withRouteParams({ id: driverId })
|
|
8147
8154
|
.setException("Could not fetch delivery block for user with id #".concat(driverId))
|
|
8148
|
-
.withQueryString({
|
|
8155
|
+
.withQueryString({
|
|
8156
|
+
start_time: startTime,
|
|
8157
|
+
end_time: endTime,
|
|
8158
|
+
team_id: teamId,
|
|
8159
|
+
date_range_type: dateRangeType
|
|
8160
|
+
})
|
|
8149
8161
|
.invoke()];
|
|
8150
8162
|
});
|
|
8151
8163
|
});
|
|
@@ -22049,7 +22061,7 @@ var lodash_1 = __webpack_require__(96486);
|
|
|
22049
22061
|
var BringgException_1 = __webpack_require__(43605);
|
|
22050
22062
|
var Logger_1 = __importDefault(__webpack_require__(55860));
|
|
22051
22063
|
var abort_1 = __webpack_require__(34179);
|
|
22052
|
-
var version = '9.8.
|
|
22064
|
+
var version = '9.8.4';
|
|
22053
22065
|
function logErrorResponse(response) {
|
|
22054
22066
|
var data = response.data, status = response.status;
|
|
22055
22067
|
try {
|