@edgeiq/edgeiq-api-js 1.5.3 → 1.5.5

package/dist/__tests__/deviceTypes.test.js

@@ -66,6 +66,7 @@ describe('Device Types', function () {
             }
         });
     }); });
+    var testDevice = testConstants_1.EmptyDevice;
     var deviceType = testConstants_1.EmptyDeviceType;
     var deviceType2 = testConstants_1.EmptyDeviceType;
     it('Creates a device type', function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -82,6 +83,17 @@ describe('Device Types', function () {
             }
         });
     }); });
+    it('Prepare a device to assign a device type', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4, __1.Devices.create(__assign(__assign({}, testConstants_1.TestDevice), { device_type_id: deviceType._id }))];
+                case 1:
+                    testDevice = _a.sent();
+                    expect(testDevice._id).not.toBeNull();
+                    return [2];
+            }
+        });
+    }); });
     it('Creates a second device type', function () { return __awaiter(void 0, void 0, void 0, function () {
         var result;
         return __generator(this, function (_a) {
@@ -139,33 +151,60 @@ describe('Device Types', function () {
                     result = _a.sent();
                     expect(result.deviceTypes).toBeDefined();
                     expect(result.deviceTypes).toBeInstanceOf(Array);
-                    expect(result.deviceTypes).toHaveLength(2);
+                    expect(result.deviceTypes).toHaveLength(3);
                     expect(result.pagination.page).toBe(constants_1.DefaultPagination.page);
-                    expect(result.pagination.total).toBe(2);
+                    expect(result.pagination.total).toBe(3);
                     expect(result.pagination.itemsPerPage).toBe(constants_1.DefaultPagination.itemsPerPage);
                     return [2];
             }
         });
     }); });
-    it('Deletes the device types created', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var result, result;
+    it('Throw an error after a delete attempt of a deviceType with devices', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!deviceType._id) return [3, 2];
+                    _a.trys.push([0, 2, , 3]);
                     return [4, __1.DeviceTypes.delete(deviceType._id)];
+                case 1:
+                    _a.sent();
+                    return [3, 3];
+                case 2:
+                    error_1 = _a.sent();
+                    if ((0, helpers_1.isApiError)(error_1)) {
+                        expect(error_1.message).toBe("Device Type currently in use by Device(s): [" + testDevice._id + "]");
+                    }
+                    return [3, 3];
+                case 3: return [2];
+            }
+        });
+    }); });
+    it('Deletes the device types created', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result, result, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!testDevice._id) return [3, 2];
+                    return [4, __1.Devices.delete(testDevice._id)];
                 case 1:
                     result = _a.sent();
-                    expect(result).toBe((0, helpers_1.getReturnDeleteMessage)('device type'));
+                    expect(result).toBe((0, helpers_1.getReturnDeleteMessage)('device'));
                     _a.label = 2;
                 case 2:
-                    if (!deviceType2._id) return [3, 4];
-                    return [4, __1.DeviceTypes.delete(deviceType2._id)];
+                    if (!deviceType._id) return [3, 4];
+                    return [4, __1.DeviceTypes.delete(deviceType._id)];
                 case 3:
                     result = _a.sent();
                     expect(result).toBe((0, helpers_1.getReturnDeleteMessage)('device type'));
                     _a.label = 4;
-                case 4: return [2];
+                case 4:
+                    if (!deviceType2._id) return [3, 6];
+                    return [4, __1.DeviceTypes.delete(deviceType2._id)];
+                case 5:
+                    result = _a.sent();
+                    expect(result).toBe((0, helpers_1.getReturnDeleteMessage)('device type'));
+                    _a.label = 6;
+                case 6: return [2];
             }
         });
     }); });

package/dist/__tests__/translators.test.js

@@ -139,9 +139,9 @@ describe('Translators', function () {
                     result = _a.sent();
                     expect(result.translators).toBeDefined();
                     expect(result.translators).toBeInstanceOf(Array);
-                    expect(result.translators).toHaveLength(2);
+                    expect(result.translators).toHaveLength(4);
                     expect(result.pagination.page).toBe(constants_1.DefaultPagination.page);
-                    expect(result.pagination.total).toBe(2);
+                    expect(result.pagination.total).toBe(4);
                     expect(result.pagination.itemsPerPage).toBe(constants_1.DefaultPagination.itemsPerPage);
                     return [2];
             }

package/dist/core/handleResponseError.js

@@ -68,6 +68,7 @@ var handlePasswordReset = function (error) {
     }
     return Promise.reject(createError(constants_1.ResponseErrorsMessages.unexpected, constants_1.ResponseErrorsNames.unexpected));
 };
+var errorMessages = function (error) { var _a, _b; return (_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data.messages) === null || _b === void 0 ? void 0 : _b.join('\n'); };
 var handleOtherErrors = function (error) {
     var _a, _b;
     var path = null;
@@ -81,15 +82,16 @@ var handleOtherErrors = function (error) {
         model = path.split('?')[0];
         model = model.split('/')[0];
     }
+    var parseErrorMessages = errorMessages(error);
     switch ((_b = error.response) === null || _b === void 0 ? void 0 : _b.config.method) {
         case 'put':
-            if (model === constants_1.BaseEndpoints.deviceConfig &&
-                error.response.data.messages) {
-                error.response.data = error.response.data.messages.join('\n');
+            if (model === constants_1.BaseEndpoints.deviceConfig && parseErrorMessages) {
+                error.response.data = parseErrorMessages;
                 return Promise.reject(createError(error.response.data, constants_1.ResponseErrorsNames.deviceConfig));
             }
-            else if (error.response.data.error === constants_1.ResponseErrorsNames.validationError) {
-                return Promise.reject(createError(error.response.data.messages.join('\n'), constants_1.ResponseErrorsNames.validationError));
+            else if (error.response.data.error === constants_1.ResponseErrorsNames.validationError &&
+                parseErrorMessages) {
+                return Promise.reject(createError(parseErrorMessages, constants_1.ResponseErrorsNames.validationError));
             }
             action = constants_1.MethodsActions.put;
             break;
@@ -113,8 +115,8 @@ var handleOtherErrors = function (error) {
                         error.response.data = createError(constants_1.ResponseErrorsMessages.deviceCharacters, constants_1.ResponseErrorsNames.deviceCharacters);
                     }
                 }
-                else if (model === constants_1.BaseEndpoints.deviceConfig) {
-                    error.response.data = createError(error.response.data.messages.join('\n'), constants_1.ResponseErrorsNames.deviceConfig);
+                else if (model === constants_1.BaseEndpoints.deviceConfig && parseErrorMessages) {
+                    error.response.data = createError(parseErrorMessages, constants_1.ResponseErrorsNames.deviceConfig);
                 }
                 else if (text && text.indexOf(constants_1.ErrorParts.uniqueConstraint) !== -1) {
                     error.response.data = createError(constants_1.ResponseErrorsMessages.uniqueConstraint(model), constants_1.ResponseErrorsNames.uniqueConstraint);
@@ -122,8 +124,9 @@ var handleOtherErrors = function (error) {
                 else if (text && text.indexOf(constants_1.ErrorParts.duplicateKey) !== -1) {
                     error.response.data = createError(text, constants_1.ResponseErrorsNames.duplicateKey);
                 }
-                else if (error.response.data.error === constants_1.ResponseErrorsNames.createError) {
-                    error.response.data = createError(error.response.data.messages.join('\n'), constants_1.ResponseErrorsNames.createError);
+                else if (error.response.data.error === constants_1.ResponseErrorsNames.createError &&
+                    parseErrorMessages) {
+                    error.response.data = createError(parseErrorMessages, constants_1.ResponseErrorsNames.createError);
                 }
                 return Promise.reject(error.response.data);
             }
@@ -131,9 +134,15 @@ var handleOtherErrors = function (error) {
             break;
         case 'delete':
             action = constants_1.MethodsActions.delete;
+            if (parseErrorMessages) {
+                return Promise.reject(createError(parseErrorMessages, action));
+            }
             break;
         case 'get':
             action = constants_1.MethodsActions.get;
+            if (parseErrorMessages) {
+                return Promise.reject(createError(parseErrorMessages, action));
+            }
             break;
     }
     var errorMessage = mapModelError(model, action);

package/dist/scheduledJobs/models.d.ts

@@ -16,6 +16,8 @@ export interface ScheduledJobInput {
     company_id: string;
 }
 export interface ScheduledJob extends ScheduledJobInput, Base {
+    next_run_time: string;
+    last_run_time: string;
 }
 export interface ScheduledJobsFilters extends Filters {
     name?: Filter;

package/dist/testConstants.js

@@ -33,10 +33,10 @@ exports.TestAuth = {
 exports.TestDevice = {
     device_type_id: '',
     name: 'EdgeIQAPI Test Device',
-    unique_id: 'api_js_test_device',
+    unique_id: 'api_eiq_test_device',
     company_id: parentCompanyId,
 };
-exports.TestDevice2 = __assign(__assign({}, exports.TestDevice), { name: 'EdgeIQAPI Test Device 2', unique_id: 'api_js_test_device_2' });
+exports.TestDevice2 = __assign(__assign({}, exports.TestDevice), { name: 'EdgeIQAPI Test Device 2', unique_id: 'api_eiq_test_device_2' });
 exports.EmptyDevice = __assign(__assign({}, baseModel), { unique_id: '', device_type_id: '', name: '' });
 exports.NewTestDeviceName = 'Updated Test Device name';
 exports.TestUser = {
@@ -356,4 +356,4 @@ exports.TestScheduledJob = {
     command_id: '648a07c58fc32100018b1d34',
     company_id: parentCompanyId,
 };
-exports.EmptyScheduledJob = __assign(__assign({}, exports.TestScheduledJob), baseModel);
+exports.EmptyScheduledJob = __assign(__assign(__assign({}, exports.TestScheduledJob), baseModel), { last_run_time: '', next_run_time: '' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgeiq/edgeiq-api-js",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "author": "EdgeIQ",
   "license": "ISC",
   "description": "This project presents EdgeIQ API SDK.",