@ricado/api-client 1.2.6 → 2.0.0

package/lib/index.js

@@ -3,44 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isDefined = isDefined;
-exports.getToken = getToken;
-exports.setToken = setToken;
-exports.hasToken = hasToken;
-exports.isInitialized = isInitialized;
-exports.isDebugMode = isDebugMode;
-exports.enableDebugMode = enableDebugMode;
-exports.disableDebugMode = disableDebugMode;
-exports.getBaseURL = getBaseURL;
-exports.setBaseURL = setBaseURL;
-exports.getWebSocketServer = getWebSocketServer;
-exports.setWebSocketServer = setWebSocketServer;
-exports.getWebSocketPort = getWebSocketPort;
-exports.setWebSocketPort = setWebSocketPort;
-exports.initialize = initialize;
-exports.userAccountLogin = userAccountLogin;
-exports.apiAccountLogin = apiAccountLogin;
-exports.pinCodeUnlock = pinCodeUnlock;
-exports.passwordUnlock = passwordUnlock;
-exports.lock = lock;
-exports.logout = logout;
-exports.ping = ping;
-Object.defineProperty(exports, "RequestHelper", {
+exports.BaseURL = void 0;
+Object.defineProperty(exports, "Controllers", {
   enumerable: true,
   get: function get() {
-    return _RequestHelper.default;
+    return _index.default;
   }
 });
-Object.defineProperty(exports, "WebSocketHelper", {
+Object.defineProperty(exports, "Errors", {
   enumerable: true,
   get: function get() {
-    return _WebSocketHelper.default;
+    return _index2.default;
   }
 });
-Object.defineProperty(exports, "Points", {
+exports.JWT = void 0;
+Object.defineProperty(exports, "Models", {
   enumerable: true,
   get: function get() {
-    return _Points.default;
+    return _index3.default;
   }
 });
 Object.defineProperty(exports, "NoAuthPaths", {
@@ -49,25 +29,48 @@ Object.defineProperty(exports, "NoAuthPaths", {
     return _NoAuthPaths.default;
   }
 });
-Object.defineProperty(exports, "Controllers", {
+Object.defineProperty(exports, "Points", {
   enumerable: true,
   get: function get() {
-    return _index.default;
+    return _Points.default;
   }
 });
-Object.defineProperty(exports, "Errors", {
+Object.defineProperty(exports, "RequestHelper", {
   enumerable: true,
   get: function get() {
-    return _index2.default;
+    return _RequestHelper.default;
   }
 });
-Object.defineProperty(exports, "Models", {
+exports.Version = void 0;
+Object.defineProperty(exports, "WebSocketHelper", {
   enumerable: true,
   get: function get() {
-    return _index3.default;
+    return _WebSocketHelper.default;
   }
 });
-exports.Version = exports.WebSocketPort = exports.WebSocketServer = exports.BaseURL = exports.JWT = void 0;
+exports.WebSocketServer = exports.WebSocketPort = void 0;
+exports.apiAccountLogin = apiAccountLogin;
+exports.disableDebugMode = disableDebugMode;
+exports.enableDebugMode = enableDebugMode;
+exports.getBaseURL = getBaseURL;
+exports.getToken = getToken;
+exports.getWebSocketPort = getWebSocketPort;
+exports.getWebSocketServer = getWebSocketServer;
+exports.hasToken = hasToken;
+exports.initialize = initialize;
+exports.isDebugMode = isDebugMode;
+exports.isDefined = isDefined;
+exports.isInitialized = isInitialized;
+exports.lock = lock;
+exports.logout = logout;
+exports.passwordUnlock = passwordUnlock;
+exports.pinCodeUnlock = pinCodeUnlock;
+exports.ping = ping;
+exports.setBaseURL = setBaseURL;
+exports.setToken = setToken;
+exports.setWebSocketPort = setWebSocketPort;
+exports.setWebSocketServer = setWebSocketServer;
+exports.userAccountLogin = userAccountLogin;
 
 var _RequestHelper = _interopRequireDefault(require("./RequestHelper"));
 
@@ -85,7 +88,7 @@ var _index2 = _interopRequireDefault(require("./Errors/index"));
 
 var _index3 = _interopRequireDefault(require("./Models/index"));
 
-var _isJwtValid = require("is-jwt-valid");
+var _jsBase = require("js-base64");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -137,7 +140,7 @@ function getToken() {
 
 
 function setToken(jwt) {
-  if ((0, _isJwtValid.parseJwtToken)(jwt)) {
+  if (isJwtValid(jwt)) {
     exports.JWT = JWT = jwt;
   } else {
     throw new Error("The JSON Web Token provided was not valid");
@@ -153,7 +156,7 @@ function setToken(jwt) {
 
 
 function hasToken() {
-  return isDefined(JWT) && (0, _isJwtValid.parseJwtToken)(JWT);
+  return isDefined(JWT) && isJwtValid(JWT);
 }
 /**
  * Initialized Status
@@ -511,6 +514,32 @@ function ping() {
     });
   });
 }
+/**
+ * 
+ * @param {string} jwt The JWT Token
+ * @return {boolean}
+ */
+
+
+function isJwtValid(jwt) {
+  if (jwt === null || typeof jwt !== 'string') {
+    return false;
+  }
+
+  var jwtSegments = jwt.split('.');
+
+  if (jwtSegments.length !== 3) {
+    return false;
+  }
+
+  try {
+    JSON.parse((0, _jsBase.decode)(jwtSegments[0]));
+    JSON.parse((0, _jsBase.decode)(jwtSegments[1]));
+    return true;
+  } catch (_unused) {
+    return false;
+  }
+}
 /**
  * The Library Version
  * 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ricado/api-client",
-    "version": "1.2.6",
+    "version": "2.0.0",
     "description": "RICADO Gen 4 API Client Library for NodeJS and Browsers",
     "author": {
         "name": "Ash Neilson"
@@ -41,7 +41,7 @@
         "analyze-webpack": "npm run generate-version-file && npm run babel && cross-env NODE_ENV=production webpack --profile --json > stats.json && webpack-bundle-analyzer ./stats.json"
     },
     "dependencies": {
-        "is-jwt-valid": "^1.0.2",
+        "js-base64": "^3.7.2",
         "node-fetch": "^2.6.1",
         "socket.io-client": "^2.4.0"
     },

package/src/Controllers/Packhouse/Site/BinTipWeightController.js

@@ -29,7 +29,7 @@ class BinTipWeightController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/bin-tip-weights/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return BinTipWeightModel.fromJSON(result, siteId);
+                    return BinTipWeightModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class BinTipWeightController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/bin-tip-weights/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return BinTipWeightModel.fromJSON(result, siteId);
+                    return BinTipWeightModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -569,7 +569,7 @@ class BinTipWeightController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return BinTipWeightModel.fromJSON(resultItem, siteId);
+                            return BinTipWeightModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -595,7 +595,7 @@ class BinTipWeightController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/bin-tip-weights`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return BinTipWeightModel.fromJSON(result, siteId);
+                    return BinTipWeightModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/CompacSizerBatchController.js

@@ -29,7 +29,7 @@ class CompacSizerBatchController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/compac-sizer-batches/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerBatchModel.fromJSON(result, siteId);
+                    return CompacSizerBatchModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class CompacSizerBatchController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/compac-sizer-batches/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerBatchModel.fromJSON(result, siteId);
+                    return CompacSizerBatchModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -569,7 +569,7 @@ class CompacSizerBatchController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return CompacSizerBatchModel.fromJSON(resultItem, siteId);
+                            return CompacSizerBatchModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -595,7 +595,7 @@ class CompacSizerBatchController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/compac-sizer-batches`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerBatchModel.fromJSON(result, siteId);
+                    return CompacSizerBatchModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/CompacSizerController.js

@@ -29,7 +29,7 @@ class CompacSizerController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/compac-sizers/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerModel.fromJSON(result, siteId);
+                    return CompacSizerModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class CompacSizerController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/compac-sizers/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerModel.fromJSON(result, siteId);
+                    return CompacSizerModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -105,7 +105,7 @@ class CompacSizerController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return CompacSizerModel.fromJSON(resultItem, siteId);
+                            return CompacSizerModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -131,7 +131,7 @@ class CompacSizerController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/compac-sizers`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerModel.fromJSON(result, siteId);
+                    return CompacSizerModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/CompacSizerOutletProductChangeController.js

@@ -29,7 +29,7 @@ class CompacSizerOutletProductChangeController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/compac-sizer-outlet-product-changes/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerOutletProductChangeModel.fromJSON(result, siteId);
+                    return CompacSizerOutletProductChangeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class CompacSizerOutletProductChangeController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/compac-sizer-outlet-product-changes/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerOutletProductChangeModel.fromJSON(result, siteId);
+                    return CompacSizerOutletProductChangeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -569,7 +569,7 @@ class CompacSizerOutletProductChangeController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return CompacSizerOutletProductChangeModel.fromJSON(resultItem, siteId);
+                            return CompacSizerOutletProductChangeModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -595,7 +595,7 @@ class CompacSizerOutletProductChangeController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/compac-sizer-outlet-product-changes`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerOutletProductChangeModel.fromJSON(result, siteId);
+                    return CompacSizerOutletProductChangeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/CompacSizerOutletTypeChangeController.js

@@ -29,7 +29,7 @@ class CompacSizerOutletTypeChangeController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/compac-sizer-outlet-type-changes/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerOutletTypeChangeModel.fromJSON(result, siteId);
+                    return CompacSizerOutletTypeChangeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class CompacSizerOutletTypeChangeController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/compac-sizer-outlet-type-changes/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerOutletTypeChangeModel.fromJSON(result, siteId);
+                    return CompacSizerOutletTypeChangeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -569,7 +569,7 @@ class CompacSizerOutletTypeChangeController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return CompacSizerOutletTypeChangeModel.fromJSON(resultItem, siteId);
+                            return CompacSizerOutletTypeChangeModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -595,7 +595,7 @@ class CompacSizerOutletTypeChangeController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/compac-sizer-outlet-type-changes`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerOutletTypeChangeModel.fromJSON(result, siteId);
+                    return CompacSizerOutletTypeChangeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/CompacSizerOutletTypeController.js

@@ -29,7 +29,7 @@ class CompacSizerOutletTypeController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/compac-sizer-outlet-types/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerOutletTypeModel.fromJSON(result, siteId);
+                    return CompacSizerOutletTypeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class CompacSizerOutletTypeController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/compac-sizer-outlet-types/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerOutletTypeModel.fromJSON(result, siteId);
+                    return CompacSizerOutletTypeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -105,7 +105,7 @@ class CompacSizerOutletTypeController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return CompacSizerOutletTypeModel.fromJSON(resultItem, siteId);
+                            return CompacSizerOutletTypeModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -131,7 +131,7 @@ class CompacSizerOutletTypeController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/compac-sizer-outlet-types`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerOutletTypeModel.fromJSON(result, siteId);
+                    return CompacSizerOutletTypeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/CompacSizerPackrunSummaryController.js

@@ -29,7 +29,7 @@ class CompacSizerPackrunSummaryController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/compac-sizer-packrun-summaries/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerPackrunSummaryModel.fromJSON(result, siteId);
+                    return CompacSizerPackrunSummaryModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class CompacSizerPackrunSummaryController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/compac-sizer-packrun-summaries/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerPackrunSummaryModel.fromJSON(result, siteId);
+                    return CompacSizerPackrunSummaryModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -569,7 +569,7 @@ class CompacSizerPackrunSummaryController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return CompacSizerPackrunSummaryModel.fromJSON(resultItem, siteId);
+                            return CompacSizerPackrunSummaryModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -595,7 +595,7 @@ class CompacSizerPackrunSummaryController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/compac-sizer-packrun-summaries`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return CompacSizerPackrunSummaryModel.fromJSON(result, siteId);
+                    return CompacSizerPackrunSummaryModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/DowntimeEventController.js

@@ -29,7 +29,7 @@ class DowntimeEventController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/downtime-events/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return DowntimeEventModel.fromJSON(result, siteId);
+                    return DowntimeEventModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class DowntimeEventController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/downtime-events/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return DowntimeEventModel.fromJSON(result, siteId);
+                    return DowntimeEventModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -569,7 +569,7 @@ class DowntimeEventController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return DowntimeEventModel.fromJSON(resultItem, siteId);
+                            return DowntimeEventModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -595,7 +595,7 @@ class DowntimeEventController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/downtime-events`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return DowntimeEventModel.fromJSON(result, siteId);
+                    return DowntimeEventModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/FreshPackPackrunSummaryController.js

@@ -29,7 +29,7 @@ class FreshPackPackrunSummaryController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/freshpack-packrun-summaries/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return FreshPackPackrunSummaryModel.fromJSON(result, siteId);
+                    return FreshPackPackrunSummaryModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class FreshPackPackrunSummaryController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/freshpack-packrun-summaries/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return FreshPackPackrunSummaryModel.fromJSON(result, siteId);
+                    return FreshPackPackrunSummaryModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -569,7 +569,7 @@ class FreshPackPackrunSummaryController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return FreshPackPackrunSummaryModel.fromJSON(resultItem, siteId);
+                            return FreshPackPackrunSummaryModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -595,7 +595,7 @@ class FreshPackPackrunSummaryController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/freshpack-packrun-summaries`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return FreshPackPackrunSummaryModel.fromJSON(result, siteId);
+                    return FreshPackPackrunSummaryModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/GrowingMethodController.js

@@ -29,7 +29,7 @@ class GrowingMethodController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/growing-methods/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return GrowingMethodModel.fromJSON(result, siteId);
+                    return GrowingMethodModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class GrowingMethodController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/growing-methods/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return GrowingMethodModel.fromJSON(result, siteId);
+                    return GrowingMethodModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -105,7 +105,7 @@ class GrowingMethodController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return GrowingMethodModel.fromJSON(resultItem, siteId);
+                            return GrowingMethodModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -131,7 +131,7 @@ class GrowingMethodController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/growing-methods`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return GrowingMethodModel.fromJSON(result, siteId);
+                    return GrowingMethodModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/PackTypeController.js

@@ -29,7 +29,7 @@ class PackTypeController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/pack-types/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PackTypeModel.fromJSON(result, siteId);
+                    return PackTypeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class PackTypeController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/pack-types/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PackTypeModel.fromJSON(result, siteId);
+                    return PackTypeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -105,7 +105,7 @@ class PackTypeController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return PackTypeModel.fromJSON(resultItem, siteId);
+                            return PackTypeModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -131,7 +131,7 @@ class PackTypeController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/pack-types`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PackTypeModel.fromJSON(result, siteId);
+                    return PackTypeModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/PackingLineController.js

@@ -29,7 +29,7 @@ class PackingLineController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/packing-lines/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PackingLineModel.fromJSON(result, siteId);
+                    return PackingLineModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class PackingLineController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/packing-lines/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PackingLineModel.fromJSON(result, siteId);
+                    return PackingLineModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -105,7 +105,7 @@ class PackingLineController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return PackingLineModel.fromJSON(resultItem, siteId);
+                            return PackingLineModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -131,7 +131,7 @@ class PackingLineController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/packing-lines`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PackingLineModel.fromJSON(result, siteId);
+                    return PackingLineModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/PackrunController.js

@@ -29,7 +29,7 @@ class PackrunController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/packruns/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PackrunModel.fromJSON(result, siteId);
+                    return PackrunModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class PackrunController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/packruns/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PackrunModel.fromJSON(result, siteId);
+                    return PackrunModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -1611,7 +1611,7 @@ class PackrunController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return PackrunModel.fromJSON(resultItem, siteId);
+                            return PackrunModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -1637,7 +1637,7 @@ class PackrunController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/packruns`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PackrunModel.fromJSON(result, siteId);
+                    return PackrunModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);