diff --git a/Step/wwwroot/dist/1.build.js b/Step/wwwroot/dist/1.build.js index b2e69441..e0177b54 100644 --- a/Step/wwwroot/dist/1.build.js +++ b/Step/wwwroot/dist/1.build.js @@ -20,7 +20,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\n /***/ (function(module, exports, __webpack_require__) { "use strict"; -eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\nexports.Hub = undefined;\n\nvar _store = __webpack_require__(32);\n\nvar _izitoast = __webpack_require__(276);\n\nvar _izitoast2 = _interopRequireDefault(_izitoast);\n\nvar _base = __webpack_require__(25);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction recalcArrayId(prefix, alarms, processid) {\n if (processid === void 0) {\n processid = 0;\n }\n for (var key in alarms) {\n if (alarms.hasOwnProperty(key)) {\n var element = alarms[key];\n element.guid = prefix + \"__\" + element.id.toString();\n element.source = prefix.toUpperCase();\n }\n }\n}\nvar Hub = /** @class */function () {\n function Hub() {\n this._hub = $.connection.ncHub;\n // Registro le callback;\n this._hub.client.alarms = this.manageAlarmsCallbacks;\n this._hub.client.powerOn = this.managePowerCallbacks;\n this._hub.client.ncNetworkStatus = Hub.manageNcStatus;\n this._hub.client.logout = this.logout;\n $.connection.hub.start();\n }\n Hub.prototype.logout = function (e) {\n _store.appModelActions.CheckLogoff(_store.store, e.id);\n };\n Hub.manageNcStatus = function (status) {\n if (Hub._ncConnectionNotificationVisible && status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n var toast = document.querySelector('#ncConnection');\n _izitoast2.default.hide(toast);\n Hub._ncConnectionNotificationVisible = false;\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n return;\n }\n if (!Hub._ncConnectionNotificationVisible && !status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n _izitoast2.default.warning({\n id: \"ncConnection\", timeout: false, toastOnce: true, theme: \"dark\", title: \"nc offline\", close: false\n });\n Hub._ncConnectionNotificationVisible = true;\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n return;\n }\n if (_store.store.state.machineStatus.ncReady != status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n }\n };\n Hub.prototype.manageAlarmsCallbacks = function (alarms) {\n recalcArrayId(\"cn\", alarms.NcAlarms);\n recalcArrayId(\"plc\", alarms.PlcAlarms);\n recalcArrayId(\"cn\", alarms.ProcessAlarms);\n var tempList = alarms.NcAlarms.concat(alarms.PlcAlarms).concat(alarms.ProcessAlarms);\n for (var key in tempList) {\n if (tempList.hasOwnProperty(key)) {\n var element = tempList[key];\n if (element.isWarning) _store.alarmsModelActions.addWarning(_store.store, element);else _store.alarmsModelActions.addAlarm(_store.store, element);\n }\n }\n _store.alarmsModelActions.checkRemove(_store.store, tempList.map(function (i) {\n return i.guid;\n }));\n };\n Hub.prototype.managePowerCallbacks = function (power) {\n // Receiving messages so NC is connected\n Hub.manageNcStatus({ connected: true });\n // Pre-power on\n _store.machineStatusActions.setAirPressureAlarm(_store.store, power.prePowerOn.AirPressure.Active);\n _store.machineStatusActions.setPowerAlarm(_store.store, power.prePowerOn.PowerOn.Active);\n _store.machineStatusActions.setEmergencyAlarm(_store.store, power.prePowerOn.EmergencyButtons.Active);\n _store.machineStatusActions.setProtectionsAlarm(_store.store, power.prePowerOn.ProtectionStatus.Active);\n _store.machineStatusActions.setSettingsModeAlarm(_store.store, power.prePowerOn.SettingMode.Active);\n _store.machineStatusActions.setKeyReadyAlarm(_store.store, power.prePowerOn.StartingKey.Active);\n // Post-power on\n _store.machineStatusActions.setResetAxesAlarm(_store.store, power.postPowerOn.AxisReset.Active);\n _store.machineStatusActions.setWaterJet1Alarm(_store.store, power.postPowerOn.WaterjetPump.Active);\n };\n Hub.prototype.Hello = function () {\n this._hub.server.hello();\n };\n Hub._ncConnectionNotificationVisible = false;\n return Hub;\n}();\nexports.Hub = Hub;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg4LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL3NlcnZpY2VzL2h1Yi50cz9jOGIwIl0sInNvdXJjZXNDb250ZW50IjpbIlxuaW1wb3J0IEFsYXJtc01vZGVsQWN0aW9uc0ludGVyZmFjZSBmcm9tIFwiLi4vc3RvcmUvYWxhcm1zLnN0b3JlXCJcbmltcG9ydCB7IHNpZ25hbHIgfSBmcm9tIFwic3JjL0B0eXBlcy9zaWduYWxyLmFsYXJtc1wiO1xuaW1wb3J0IHsgc3RvcmUsIGFsYXJtc01vZGVsQWN0aW9ucywgbWFjaGluZVN0YXR1c0FjdGlvbnMsIG1hY2hpbmVJbmZvQWN0aW9ucywgQXBwTW9kZWwsIGFwcE1vZGVsQWN0aW9ucyB9IGZyb20gXCJzcmMvc3RvcmVcIjtcbmltcG9ydCB7IGFsYXJtRGV0YWlsIH0gZnJvbSBcInNyYy9tb2R1bGVzL2FsYXJtc1wiO1xuaW1wb3J0IGl6aVRvYXN0LCB7IEl6aVRvYXN0U2V0dGluZ3MgfSBmcm9tIFwiaXppdG9hc3RcIjtcbmltcG9ydCB7IEZhY3RvcnksIE1lc3NhZ2VTZXJ2aWNlIH0gZnJvbSBcInNyYy9fYmFzZVwiO1xuXG5kZWNsYXJlIGxldCAkOiBhbnk7XG5cbmZ1bmN0aW9uIHJlY2FsY0FycmF5SWQocHJlZml4OiBzdHJpbmcsIGFsYXJtczogQXJyYXk8c2lnbmFsci5nZW5lcmljQWxhcm0+LCBwcm9jZXNzaWQ6IG51bWJlciA9IDApIHtcbiAgZm9yIChjb25zdCBrZXkgaW4gYWxhcm1zKSB7XG4gICAgaWYgKGFsYXJtcy5oYXNPd25Qcm9wZXJ0eShrZXkpKSB7XG4gICAgICBjb25zdCBlbGVtZW50ID0gYWxhcm1zW2tleV07XG4gICAgICBlbGVtZW50Lmd1aWQgPSBwcmVmaXggKyBcIl9fXCIgKyBlbGVtZW50LmlkLnRvU3RyaW5nKCk7XG4gICAgICBlbGVtZW50LnNvdXJjZSA9IHByZWZpeC50b1VwcGVyQ2FzZSgpO1xuICAgIH1cbiAgfVxufVxuXG5leHBvcnQgY2xhc3MgSHViIHtcblxuICBzdGF0aWMgX25jQ29ubmVjdGlvbk5vdGlmaWNhdGlvblZpc2libGU/OiBib29sZWFuID0gZmFsc2U7XG5cbiAgcHJpdmF0ZSBfaHViOiBhbnk7XG5cbiAgY29uc3RydWN0b3IoKSB7XG5cbiAgICB0aGlzLl9odWIgPSAkLmNvbm5lY3Rpb24ubmNIdWI7XG5cbiAgICAvLyBSZWdpc3RybyBsZSBjYWxsYmFjaztcbiAgICB0aGlzLl9odWIuY2xpZW50LmFsYXJtcyA9IHRoaXMubWFuYWdlQWxhcm1zQ2FsbGJhY2tzO1xuICAgIHRoaXMuX2h1Yi5jbGllbnQucG93ZXJPbiA9IHRoaXMubWFuYWdlUG93ZXJDYWxsYmFja3M7XG4gICAgdGhpcy5faHViLmNsaWVudC5uY05ldHdvcmtTdGF0dXMgPSBIdWIubWFuYWdlTmNTdGF0dXM7XG5cbiAgICB0aGlzLl9odWIuY2xpZW50LmxvZ291dCA9IHRoaXMubG9nb3V0O1xuXG4gICAgJC5jb25uZWN0aW9uLmh1Yi5zdGFydCgpO1xuICB9XG5cbiAgcHJpdmF0ZSBsb2dvdXQoZSkge1xuICAgIGFwcE1vZGVsQWN0aW9ucy5DaGVja0xvZ29mZihzdG9yZSwgZS5pZCk7XG4gIH1cblxuICBwcml2YXRlIHN0YXRpYyBtYW5hZ2VOY1N0YXR1cyhzdGF0dXMpIHtcblxuICAgIGlmIChIdWIuX25jQ29ubmVjdGlvbk5vdGlmaWNhdGlvblZpc2libGUgJiYgc3RhdHVzLmNvbm5lY3RlZCkge1xuICAgICAgbWFjaGluZVN0YXR1c0FjdGlvbnMuc2V0TmNDb25uZWN0aW9uU3RhdHVzKHN0b3JlLCBzdGF0dXMuY29ubmVjdGVkKTtcbiAgICAgIHZhciB0b2FzdCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJyNuY0Nvbm5lY3Rpb24nKSBhcyBhbnk7XG4gICAgICAoaXppVG9hc3QgYXMgYW55KS5oaWRlKHRvYXN0KTtcbiAgICAgIEh1Yi5fbmNDb25uZWN0aW9uTm90aWZpY2F0aW9uVmlzaWJsZSA9IGZhbHNlO1xuICAgICAgRmFjdG9yeS5HZXQoTWVzc2FnZVNlcnZpY2UpLnB1Ymxpc2hUb0NoYW5uZWwoXCJmb3JjZS11aS11cGRhdGVcIiwgbnVsbCk7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgaWYgKCFIdWIuX25jQ29ubmVjdGlvbk5vdGlmaWNhdGlvblZpc2libGUgJiYgIXN0YXR1cy5jb25uZWN0ZWQpIHtcbiAgICAgIG1hY2hpbmVTdGF0dXNBY3Rpb25zLnNldE5jQ29ubmVjdGlvblN0YXR1cyhzdG9yZSwgc3RhdHVzLmNvbm5lY3RlZCk7XG4gICAgICBpemlUb2FzdC53YXJuaW5nKHtcbiAgICAgICAgaWQ6IFwibmNDb25uZWN0aW9uXCIsIHRpbWVvdXQ6IGZhbHNlLCB0b2FzdE9uY2U6IHRydWUsIHRoZW1lOiBcImRhcmtcIiwgdGl0bGU6IFwibmMgb2ZmbGluZVwiLCBjbG9zZTogZmFsc2VcbiAgICAgIH0gYXMgSXppVG9hc3RTZXR0aW5ncyk7XG4gICAgICBIdWIuX25jQ29ubmVjdGlvbk5vdGlmaWNhdGlvblZpc2libGUgPSB0cnVlO1xuICAgICAgRmFjdG9yeS5HZXQoTWVzc2FnZVNlcnZpY2UpLnB1Ymxpc2hUb0NoYW5uZWwoXCJmb3JjZS11aS11cGRhdGVcIiwgbnVsbCk7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgaWYgKChzdG9yZS5zdGF0ZSBhcyBBcHBNb2RlbCkubWFjaGluZVN0YXR1cy5uY1JlYWR5ICE9IHN0YXR1cy5jb25uZWN0ZWQpIHtcbiAgICAgIG1hY2hpbmVTdGF0dXNBY3Rpb25zLnNldE5jQ29ubmVjdGlvblN0YXR1cyhzdG9yZSwgc3RhdHVzLmNvbm5lY3RlZCk7XG4gICAgICBGYWN0b3J5LkdldChNZXNzYWdlU2VydmljZSkucHVibGlzaFRvQ2hhbm5lbChcImZvcmNlLXVpLXVwZGF0ZVwiLCBudWxsKTtcbiAgICB9XG4gIH1cblxuICBwcml2YXRlIG1hbmFnZUFsYXJtc0NhbGxiYWNrcyhhbGFybXM6IHNpZ25hbHIuYWxhcm1NZXNzYWdlKSB7XG5cbiAgICByZWNhbGNBcnJheUlkKFwiY25cIiwgYWxhcm1zLk5jQWxhcm1zKTtcbiAgICByZWNhbGNBcnJheUlkKFwicGxjXCIsIGFsYXJtcy5QbGNBbGFybXMpO1xuICAgIHJlY2FsY0FycmF5SWQoXCJjblwiLCBhbGFybXMuUHJvY2Vzc0FsYXJtcyk7XG5cbiAgICBsZXQgdGVtcExpc3QgPSBhbGFybXMuTmNBbGFybXMuY29uY2F0KGFsYXJtcy5QbGNBbGFybXMpLmNvbmNhdChhbGFybXMuUHJvY2Vzc0FsYXJtcyk7XG5cbiAgICBmb3IgKGNvbnN0IGtleSBpbiB0ZW1wTGlzdCkge1xuICAgICAgaWYgKHRlbXBMaXN0Lmhhc093blByb3BlcnR5KGtleSkpIHtcbiAgICAgICAgY29uc3QgZWxlbWVudCA9IHRlbXBMaXN0W2tleV07XG5cbiAgICAgICAgaWYgKGVsZW1lbnQuaXNXYXJuaW5nKVxuICAgICAgICAgIGFsYXJtc01vZGVsQWN0aW9ucy5hZGRXYXJuaW5nKHN0b3JlLCBlbGVtZW50KTtcbiAgICAgICAgZWxzZVxuICAgICAgICAgIGFsYXJtc01vZGVsQWN0aW9ucy5hZGRBbGFybShzdG9yZSwgZWxlbWVudCk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgYWxhcm1zTW9kZWxBY3Rpb25zLmNoZWNrUmVtb3ZlKHN0b3JlLCB0ZW1wTGlzdC5tYXAoaSA9PiBpLmd1aWQpKTtcbiAgfVxuXG5cbiAgcHJpdmF0ZSBtYW5hZ2VQb3dlckNhbGxiYWNrcyhwb3dlcjogc2lnbmFsci5wb3dlck1lc3NhZ2UpIHtcblxuICAgIC8vIFJlY2VpdmluZyBtZXNzYWdlcyBzbyBOQyBpcyBjb25uZWN0ZWRcbiAgICBIdWIubWFuYWdlTmNTdGF0dXMoeyBjb25uZWN0ZWQ6IHRydWUgfSk7XG5cbiAgICAvLyBQcmUtcG93ZXIgb25cbiAgICBtYWNoaW5lU3RhdHVzQWN0aW9ucy5zZXRBaXJQcmVzc3VyZUFsYXJtKHN0b3JlLCBwb3dlci5wcmVQb3dlck9uLkFpclByZXNzdXJlLkFjdGl2ZSk7XG4gICAgbWFjaGluZVN0YXR1c0FjdGlvbnMuc2V0UG93ZXJBbGFybShzdG9yZSwgcG93ZXIucHJlUG93ZXJPbi5Qb3dlck9uLkFjdGl2ZSk7XG4gICAgbWFjaGluZVN0YXR1c0FjdGlvbnMuc2V0RW1lcmdlbmN5QWxhcm0oc3RvcmUsIHBvd2VyLnByZVBvd2VyT24uRW1lcmdlbmN5QnV0dG9ucy5BY3RpdmUpO1xuICAgIG1hY2hpbmVTdGF0dXNBY3Rpb25zLnNldFByb3RlY3Rpb25zQWxhcm0oc3RvcmUsIHBvd2VyLnByZVBvd2VyT24uUHJvdGVjdGlvblN0YXR1cy5BY3RpdmUpO1xuICAgIG1hY2hpbmVTdGF0dXNBY3Rpb25zLnNldFNldHRpbmdzTW9kZUFsYXJtKHN0b3JlLCBwb3dlci5wcmVQb3dlck9uLlNldHRpbmdNb2RlLkFjdGl2ZSk7XG4gICAgbWFjaGluZVN0YXR1c0FjdGlvbnMuc2V0S2V5UmVhZHlBbGFybShzdG9yZSwgcG93ZXIucHJlUG93ZXJPbi5TdGFydGluZ0tleS5BY3RpdmUpO1xuXG4gICAgLy8gUG9zdC1wb3dlciBvblxuICAgIG1hY2hpbmVTdGF0dXNBY3Rpb25zLnNldFJlc2V0QXhlc0FsYXJtKHN0b3JlLCBwb3dlci5wb3N0UG93ZXJPbi5BeGlzUmVzZXQuQWN0aXZlKTtcbiAgICBtYWNoaW5lU3RhdHVzQWN0aW9ucy5zZXRXYXRlckpldDFBbGFybShzdG9yZSwgcG93ZXIucG9zdFBvd2VyT24uV2F0ZXJqZXRQdW1wLkFjdGl2ZSk7XG4gIH1cblxuICBwdWJsaWMgSGVsbG8oKSB7XG4gICAgdGhpcy5faHViLnNlcnZlci5oZWxsbygpO1xuICB9XG59XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvc2VydmljZXMvaHViLnRzIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBR0E7QUFDQTtBQUNBO0FBQ0E7OztBQUFBO0FBQ0E7OztBQUdBO0FBQUE7QUFBQTs7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBRUE7QUFNQTtBQUVBO0FBRUE7QUFDQTtBQUNBO0FBQ0E7QUFFQTtBQUVBO0FBQ0E7QUFFQTtBQUNBO0FBQ0E7QUFFQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQURBO0FBR0E7QUFDQTtBQUNBO0FBQ0E7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBRUE7QUFFQTtBQUNBO0FBQ0E7QUFFQTtBQUVBO0FBQ0E7QUFDQTtBQUVBO0FBSUE7QUFDQTtBQUVBO0FBQUE7QUFBQTtBQUNBO0FBR0E7QUFFQTtBQUNBO0FBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQTVGQTtBQTZGQTtBQS9GQTtBQUFBIiwic291cmNlUm9vdCI6IiJ9\n//# sourceURL=webpack-internal:///588\n"); +eval("\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\nexports.Hub = undefined;\n\nvar _store = __webpack_require__(32);\n\nvar _izitoast = __webpack_require__(276);\n\nvar _izitoast2 = _interopRequireDefault(_izitoast);\n\nvar _base = __webpack_require__(25);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nfunction recalcArrayId(prefix, alarms, processid) {\n if (processid === void 0) {\n processid = 0;\n }\n for (var key in alarms) {\n if (alarms.hasOwnProperty(key)) {\n var element = alarms[key];\n element.guid = prefix + \"__\" + element.id.toString();\n element.source = prefix.toUpperCase();\n }\n }\n}\nvar Hub = /** @class */function () {\n function Hub() {\n this._hub = $.connection.ncHub;\n // Registro le callback;\n this._hub.client.alarms = this.manageAlarmsCallbacks;\n this._hub.client.powerOn = this.managePowerCallbacks;\n this._hub.client.ncNetworkStatus = Hub.manageNcStatus;\n this._hub.client.logout = this.logout;\n $.connection.hub.start();\n }\n Hub.prototype.logout = function (e) {\n _store.appModelActions.CheckLogoff(_store.store, e.id);\n };\n Hub.manageNcStatus = function (status) {\n if (Hub._ncConnectionNotificationVisible && status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n var toast = document.querySelector('#ncConnection');\n _izitoast2.default.hide(toast);\n Hub._ncConnectionNotificationVisible = false;\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n return;\n }\n if (!Hub._ncConnectionNotificationVisible && !status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n _izitoast2.default.warning({\n id: \"ncConnection\", timeout: false, toastOnce: true, theme: \"dark\", title: \"nc offline\", close: false\n });\n Hub._ncConnectionNotificationVisible = true;\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n return;\n }\n if (_store.store.state.machineStatus.ncReady != status.connected) {\n _store.machineStatusActions.setNcConnectionStatus(_store.store, status.connected);\n _base.Factory.Get(_base.MessageService).publishToChannel(\"force-ui-update\", null);\n }\n };\n Hub.prototype.manageAlarmsCallbacks = function (alarms) {\n recalcArrayId(\"cn\", alarms.NcAlarms);\n recalcArrayId(\"plc\", alarms.PlcAlarms);\n recalcArrayId(\"cn\", alarms.ProcessAlarms);\n var tempList = alarms.NcAlarms.concat(alarms.PlcAlarms).concat(alarms.ProcessAlarms);\n for (var key in tempList) {\n if (tempList.hasOwnProperty(key)) {\n var element = tempList[key];\n if (element.isWarning) _store.alarmsModelActions.addWarning(_store.store, element);else _store.alarmsModelActions.addAlarm(_store.store, element);\n }\n }\n _store.alarmsModelActions.checkRemove(_store.store, tempList.map(function (i) {\n return i.guid;\n }));\n };\n Hub.prototype.managePowerCallbacks = function (power) {\n // Receiving messages so NC is connected\n Hub.manageNcStatus({ connected: true });\n // Pre-power on\n if (power.prePowerOn && power.prePowerOn.AirPressure) _store.machineStatusActions.setAirPressureAlarm(_store.store, power.prePowerOn.AirPressure.Active);\n if (power.prePowerOn && power.prePowerOn.PowerOn) _store.machineStatusActions.setPowerAlarm(_store.store, power.prePowerOn.PowerOn.Active);\n if (power.prePowerOn && power.prePowerOn.EmergencyButtons) _store.machineStatusActions.setEmergencyAlarm(_store.store, power.prePowerOn.EmergencyButtons.Active);\n if (power.prePowerOn && power.prePowerOn.ProtectionStatus) _store.machineStatusActions.setProtectionsAlarm(_store.store, power.prePowerOn.ProtectionStatus.Active);\n if (power.prePowerOn && power.prePowerOn.SettingMode) _store.machineStatusActions.setSettingsModeAlarm(_store.store, power.prePowerOn.SettingMode.Active);\n if (power.prePowerOn && power.prePowerOn.StartingKey) _store.machineStatusActions.setKeyReadyAlarm(_store.store, power.prePowerOn.StartingKey.Active);\n // Post-power on\n if (power.postPowerOn && power.postPowerOn.AxisReset) _store.machineStatusActions.setResetAxesAlarm(_store.store, power.postPowerOn.AxisReset.Active);\n if (power.postPowerOn && power.postPowerOn.WaterjetPump) _store.machineStatusActions.setWaterJet1Alarm(_store.store, power.postPowerOn.WaterjetPump.Active);\n };\n Hub.prototype.Hello = function () {\n this._hub.server.hello();\n };\n Hub._ncConnectionNotificationVisible = false;\n return Hub;\n}();\nexports.Hub = Hub;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiNTg4LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL3NlcnZpY2VzL2h1Yi50cz9jOGIwIl0sInNvdXJjZXNDb250ZW50IjpbIlxuaW1wb3J0IEFsYXJtc01vZGVsQWN0aW9uc0ludGVyZmFjZSBmcm9tIFwiLi4vc3RvcmUvYWxhcm1zLnN0b3JlXCJcbmltcG9ydCB7IHNpZ25hbHIgfSBmcm9tIFwic3JjL0B0eXBlcy9zaWduYWxyLmFsYXJtc1wiO1xuaW1wb3J0IHsgc3RvcmUsIGFsYXJtc01vZGVsQWN0aW9ucywgbWFjaGluZVN0YXR1c0FjdGlvbnMsIG1hY2hpbmVJbmZvQWN0aW9ucywgQXBwTW9kZWwsIGFwcE1vZGVsQWN0aW9ucyB9IGZyb20gXCJzcmMvc3RvcmVcIjtcbmltcG9ydCB7IGFsYXJtRGV0YWlsIH0gZnJvbSBcInNyYy9tb2R1bGVzL2FsYXJtc1wiO1xuaW1wb3J0IGl6aVRvYXN0LCB7IEl6aVRvYXN0U2V0dGluZ3MgfSBmcm9tIFwiaXppdG9hc3RcIjtcbmltcG9ydCB7IEZhY3RvcnksIE1lc3NhZ2VTZXJ2aWNlIH0gZnJvbSBcInNyYy9fYmFzZVwiO1xuXG5kZWNsYXJlIGxldCAkOiBhbnk7XG5cbmZ1bmN0aW9uIHJlY2FsY0FycmF5SWQocHJlZml4OiBzdHJpbmcsIGFsYXJtczogQXJyYXk8c2lnbmFsci5nZW5lcmljQWxhcm0+LCBwcm9jZXNzaWQ6IG51bWJlciA9IDApIHtcbiAgZm9yIChjb25zdCBrZXkgaW4gYWxhcm1zKSB7XG4gICAgaWYgKGFsYXJtcy5oYXNPd25Qcm9wZXJ0eShrZXkpKSB7XG4gICAgICBjb25zdCBlbGVtZW50ID0gYWxhcm1zW2tleV07XG4gICAgICBlbGVtZW50Lmd1aWQgPSBwcmVmaXggKyBcIl9fXCIgKyBlbGVtZW50LmlkLnRvU3RyaW5nKCk7XG4gICAgICBlbGVtZW50LnNvdXJjZSA9IHByZWZpeC50b1VwcGVyQ2FzZSgpO1xuICAgIH1cbiAgfVxufVxuXG5leHBvcnQgY2xhc3MgSHViIHtcblxuICBzdGF0aWMgX25jQ29ubmVjdGlvbk5vdGlmaWNhdGlvblZpc2libGU/OiBib29sZWFuID0gZmFsc2U7XG5cbiAgcHJpdmF0ZSBfaHViOiBhbnk7XG5cbiAgY29uc3RydWN0b3IoKSB7XG5cbiAgICB0aGlzLl9odWIgPSAkLmNvbm5lY3Rpb24ubmNIdWI7XG5cbiAgICAvLyBSZWdpc3RybyBsZSBjYWxsYmFjaztcbiAgICB0aGlzLl9odWIuY2xpZW50LmFsYXJtcyA9IHRoaXMubWFuYWdlQWxhcm1zQ2FsbGJhY2tzO1xuICAgIHRoaXMuX2h1Yi5jbGllbnQucG93ZXJPbiA9IHRoaXMubWFuYWdlUG93ZXJDYWxsYmFja3M7XG4gICAgdGhpcy5faHViLmNsaWVudC5uY05ldHdvcmtTdGF0dXMgPSBIdWIubWFuYWdlTmNTdGF0dXM7XG5cbiAgICB0aGlzLl9odWIuY2xpZW50LmxvZ291dCA9IHRoaXMubG9nb3V0O1xuXG4gICAgJC5jb25uZWN0aW9uLmh1Yi5zdGFydCgpO1xuICB9XG5cbiAgcHJpdmF0ZSBsb2dvdXQoZSkge1xuICAgIGFwcE1vZGVsQWN0aW9ucy5DaGVja0xvZ29mZihzdG9yZSwgZS5pZCk7XG4gIH1cblxuICBwcml2YXRlIHN0YXRpYyBtYW5hZ2VOY1N0YXR1cyhzdGF0dXMpIHtcblxuICAgIGlmIChIdWIuX25jQ29ubmVjdGlvbk5vdGlmaWNhdGlvblZpc2libGUgJiYgc3RhdHVzLmNvbm5lY3RlZCkge1xuICAgICAgbWFjaGluZVN0YXR1c0FjdGlvbnMuc2V0TmNDb25uZWN0aW9uU3RhdHVzKHN0b3JlLCBzdGF0dXMuY29ubmVjdGVkKTtcbiAgICAgIHZhciB0b2FzdCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJyNuY0Nvbm5lY3Rpb24nKSBhcyBhbnk7XG4gICAgICAoaXppVG9hc3QgYXMgYW55KS5oaWRlKHRvYXN0KTtcbiAgICAgIEh1Yi5fbmNDb25uZWN0aW9uTm90aWZpY2F0aW9uVmlzaWJsZSA9IGZhbHNlO1xuICAgICAgRmFjdG9yeS5HZXQoTWVzc2FnZVNlcnZpY2UpLnB1Ymxpc2hUb0NoYW5uZWwoXCJmb3JjZS11aS11cGRhdGVcIiwgbnVsbCk7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgaWYgKCFIdWIuX25jQ29ubmVjdGlvbk5vdGlmaWNhdGlvblZpc2libGUgJiYgIXN0YXR1cy5jb25uZWN0ZWQpIHtcbiAgICAgIG1hY2hpbmVTdGF0dXNBY3Rpb25zLnNldE5jQ29ubmVjdGlvblN0YXR1cyhzdG9yZSwgc3RhdHVzLmNvbm5lY3RlZCk7XG4gICAgICBpemlUb2FzdC53YXJuaW5nKHtcbiAgICAgICAgaWQ6IFwibmNDb25uZWN0aW9uXCIsIHRpbWVvdXQ6IGZhbHNlLCB0b2FzdE9uY2U6IHRydWUsIHRoZW1lOiBcImRhcmtcIiwgdGl0bGU6IFwibmMgb2ZmbGluZVwiLCBjbG9zZTogZmFsc2VcbiAgICAgIH0gYXMgSXppVG9hc3RTZXR0aW5ncyk7XG4gICAgICBIdWIuX25jQ29ubmVjdGlvbk5vdGlmaWNhdGlvblZpc2libGUgPSB0cnVlO1xuICAgICAgRmFjdG9yeS5HZXQoTWVzc2FnZVNlcnZpY2UpLnB1Ymxpc2hUb0NoYW5uZWwoXCJmb3JjZS11aS11cGRhdGVcIiwgbnVsbCk7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgaWYgKChzdG9yZS5zdGF0ZSBhcyBBcHBNb2RlbCkubWFjaGluZVN0YXR1cy5uY1JlYWR5ICE9IHN0YXR1cy5jb25uZWN0ZWQpIHtcbiAgICAgIG1hY2hpbmVTdGF0dXNBY3Rpb25zLnNldE5jQ29ubmVjdGlvblN0YXR1cyhzdG9yZSwgc3RhdHVzLmNvbm5lY3RlZCk7XG4gICAgICBGYWN0b3J5LkdldChNZXNzYWdlU2VydmljZSkucHVibGlzaFRvQ2hhbm5lbChcImZvcmNlLXVpLXVwZGF0ZVwiLCBudWxsKTtcbiAgICB9XG4gIH1cblxuICBwcml2YXRlIG1hbmFnZUFsYXJtc0NhbGxiYWNrcyhhbGFybXM6IHNpZ25hbHIuYWxhcm1NZXNzYWdlKSB7XG5cbiAgICByZWNhbGNBcnJheUlkKFwiY25cIiwgYWxhcm1zLk5jQWxhcm1zKTtcbiAgICByZWNhbGNBcnJheUlkKFwicGxjXCIsIGFsYXJtcy5QbGNBbGFybXMpO1xuICAgIHJlY2FsY0FycmF5SWQoXCJjblwiLCBhbGFybXMuUHJvY2Vzc0FsYXJtcyk7XG5cbiAgICBsZXQgdGVtcExpc3QgPSBhbGFybXMuTmNBbGFybXMuY29uY2F0KGFsYXJtcy5QbGNBbGFybXMpLmNvbmNhdChhbGFybXMuUHJvY2Vzc0FsYXJtcyk7XG5cbiAgICBmb3IgKGNvbnN0IGtleSBpbiB0ZW1wTGlzdCkge1xuICAgICAgaWYgKHRlbXBMaXN0Lmhhc093blByb3BlcnR5KGtleSkpIHtcbiAgICAgICAgY29uc3QgZWxlbWVudCA9IHRlbXBMaXN0W2tleV07XG5cbiAgICAgICAgaWYgKGVsZW1lbnQuaXNXYXJuaW5nKVxuICAgICAgICAgIGFsYXJtc01vZGVsQWN0aW9ucy5hZGRXYXJuaW5nKHN0b3JlLCBlbGVtZW50KTtcbiAgICAgICAgZWxzZVxuICAgICAgICAgIGFsYXJtc01vZGVsQWN0aW9ucy5hZGRBbGFybShzdG9yZSwgZWxlbWVudCk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgYWxhcm1zTW9kZWxBY3Rpb25zLmNoZWNrUmVtb3ZlKHN0b3JlLCB0ZW1wTGlzdC5tYXAoaSA9PiBpLmd1aWQpKTtcbiAgfVxuXG5cbiAgcHJpdmF0ZSBtYW5hZ2VQb3dlckNhbGxiYWNrcyhwb3dlcjogc2lnbmFsci5wb3dlck1lc3NhZ2UpIHtcblxuICAgIC8vIFJlY2VpdmluZyBtZXNzYWdlcyBzbyBOQyBpcyBjb25uZWN0ZWRcbiAgICBIdWIubWFuYWdlTmNTdGF0dXMoeyBjb25uZWN0ZWQ6IHRydWUgfSk7XG5cbiAgICAvLyBQcmUtcG93ZXIgb25cbiAgICBpZiAocG93ZXIucHJlUG93ZXJPbiAmJiBwb3dlci5wcmVQb3dlck9uLkFpclByZXNzdXJlKVxuICAgICAgbWFjaGluZVN0YXR1c0FjdGlvbnMuc2V0QWlyUHJlc3N1cmVBbGFybShzdG9yZSwgcG93ZXIucHJlUG93ZXJPbi5BaXJQcmVzc3VyZS5BY3RpdmUpO1xuICAgIGlmIChwb3dlci5wcmVQb3dlck9uICYmIHBvd2VyLnByZVBvd2VyT24uUG93ZXJPbilcbiAgICAgIG1hY2hpbmVTdGF0dXNBY3Rpb25zLnNldFBvd2VyQWxhcm0oc3RvcmUsIHBvd2VyLnByZVBvd2VyT24uUG93ZXJPbi5BY3RpdmUpO1xuICAgIGlmIChwb3dlci5wcmVQb3dlck9uICYmIHBvd2VyLnByZVBvd2VyT24uRW1lcmdlbmN5QnV0dG9ucylcbiAgICAgIG1hY2hpbmVTdGF0dXNBY3Rpb25zLnNldEVtZXJnZW5jeUFsYXJtKHN0b3JlLCBwb3dlci5wcmVQb3dlck9uLkVtZXJnZW5jeUJ1dHRvbnMuQWN0aXZlKTtcbiAgICBpZiAocG93ZXIucHJlUG93ZXJPbiAmJiBwb3dlci5wcmVQb3dlck9uLlByb3RlY3Rpb25TdGF0dXMpXG4gICAgICBtYWNoaW5lU3RhdHVzQWN0aW9ucy5zZXRQcm90ZWN0aW9uc0FsYXJtKHN0b3JlLCBwb3dlci5wcmVQb3dlck9uLlByb3RlY3Rpb25TdGF0dXMuQWN0aXZlKTtcbiAgICBpZiAocG93ZXIucHJlUG93ZXJPbiAmJiBwb3dlci5wcmVQb3dlck9uLlNldHRpbmdNb2RlKVxuICAgICAgbWFjaGluZVN0YXR1c0FjdGlvbnMuc2V0U2V0dGluZ3NNb2RlQWxhcm0oc3RvcmUsIHBvd2VyLnByZVBvd2VyT24uU2V0dGluZ01vZGUuQWN0aXZlKTtcbiAgICBpZiAocG93ZXIucHJlUG93ZXJPbiAmJiBwb3dlci5wcmVQb3dlck9uLlN0YXJ0aW5nS2V5KVxuICAgICAgbWFjaGluZVN0YXR1c0FjdGlvbnMuc2V0S2V5UmVhZHlBbGFybShzdG9yZSwgcG93ZXIucHJlUG93ZXJPbi5TdGFydGluZ0tleS5BY3RpdmUpO1xuXG4gICAgLy8gUG9zdC1wb3dlciBvblxuICAgIGlmIChwb3dlci5wb3N0UG93ZXJPbiAmJiBwb3dlci5wb3N0UG93ZXJPbi5BeGlzUmVzZXQpXG4gICAgICBtYWNoaW5lU3RhdHVzQWN0aW9ucy5zZXRSZXNldEF4ZXNBbGFybShzdG9yZSwgcG93ZXIucG9zdFBvd2VyT24uQXhpc1Jlc2V0LkFjdGl2ZSk7XG4gICAgaWYgKHBvd2VyLnBvc3RQb3dlck9uICYmIHBvd2VyLnBvc3RQb3dlck9uLldhdGVyamV0UHVtcClcbiAgICAgIG1hY2hpbmVTdGF0dXNBY3Rpb25zLnNldFdhdGVySmV0MUFsYXJtKHN0b3JlLCBwb3dlci5wb3N0UG93ZXJPbi5XYXRlcmpldFB1bXAuQWN0aXZlKTtcbiAgfVxuXG4gIHB1YmxpYyBIZWxsbygpIHtcbiAgICB0aGlzLl9odWIuc2VydmVyLmhlbGxvKCk7XG4gIH1cbn1cblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyAuL3NyYy9zZXJ2aWNlcy9odWIudHMiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFHQTtBQUNBO0FBQ0E7QUFDQTs7O0FBQUE7QUFDQTs7O0FBR0E7QUFBQTtBQUFBOztBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFFQTtBQU1BO0FBRUE7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBRUE7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUVBO0FBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBREE7QUFHQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFFQTtBQUVBO0FBQ0E7QUFDQTtBQUVBO0FBRUE7QUFDQTtBQUNBO0FBRUE7QUFJQTtBQUNBO0FBRUE7QUFBQTtBQUFBO0FBQ0E7QUFHQTtBQUVBO0FBQ0E7QUFFQTtBQUNBO0FBRUE7QUFFQTtBQUVBO0FBRUE7QUFFQTtBQUdBO0FBQ0E7QUFFQTtBQUVBO0FBRUE7QUFDQTtBQUNBO0FBcEdBO0FBcUdBO0FBdkdBO0FBQUEiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///588\n"); /***/ }), diff --git a/Step/wwwroot/src/services/hub.ts b/Step/wwwroot/src/services/hub.ts index 5cc3aa38..348374be 100644 --- a/Step/wwwroot/src/services/hub.ts +++ b/Step/wwwroot/src/services/hub.ts @@ -98,16 +98,24 @@ export class Hub { Hub.manageNcStatus({ connected: true }); // Pre-power on - machineStatusActions.setAirPressureAlarm(store, power.prePowerOn.AirPressure.Active); - machineStatusActions.setPowerAlarm(store, power.prePowerOn.PowerOn.Active); - machineStatusActions.setEmergencyAlarm(store, power.prePowerOn.EmergencyButtons.Active); - machineStatusActions.setProtectionsAlarm(store, power.prePowerOn.ProtectionStatus.Active); - machineStatusActions.setSettingsModeAlarm(store, power.prePowerOn.SettingMode.Active); - machineStatusActions.setKeyReadyAlarm(store, power.prePowerOn.StartingKey.Active); + if (power.prePowerOn && power.prePowerOn.AirPressure) + machineStatusActions.setAirPressureAlarm(store, power.prePowerOn.AirPressure.Active); + if (power.prePowerOn && power.prePowerOn.PowerOn) + machineStatusActions.setPowerAlarm(store, power.prePowerOn.PowerOn.Active); + if (power.prePowerOn && power.prePowerOn.EmergencyButtons) + machineStatusActions.setEmergencyAlarm(store, power.prePowerOn.EmergencyButtons.Active); + if (power.prePowerOn && power.prePowerOn.ProtectionStatus) + machineStatusActions.setProtectionsAlarm(store, power.prePowerOn.ProtectionStatus.Active); + if (power.prePowerOn && power.prePowerOn.SettingMode) + machineStatusActions.setSettingsModeAlarm(store, power.prePowerOn.SettingMode.Active); + if (power.prePowerOn && power.prePowerOn.StartingKey) + machineStatusActions.setKeyReadyAlarm(store, power.prePowerOn.StartingKey.Active); // Post-power on - machineStatusActions.setResetAxesAlarm(store, power.postPowerOn.AxisReset.Active); - machineStatusActions.setWaterJet1Alarm(store, power.postPowerOn.WaterjetPump.Active); + if (power.postPowerOn && power.postPowerOn.AxisReset) + machineStatusActions.setResetAxesAlarm(store, power.postPowerOn.AxisReset.Active); + if (power.postPowerOn && power.postPowerOn.WaterjetPump) + machineStatusActions.setWaterJet1Alarm(store, power.postPowerOn.WaterjetPump.Active); } public Hello() {