@c8y/ng1-modules 1018.0.170 → 1018.0.174

package/core/core/services/measurements.js

@@ -1 +1 @@
-"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}!function(){function e(u,l,p,c,v,e,o,t){var g=window.c8y_testing?1:500,m=2083,a=v.clean,d="measurement/measurements",i={headers:v.contentHeaders("measurement")},f=t.getUnitHeaders(),n={status:"DEPLOYED",name:"c8yui_measurements",body:'insert into SendNotification\n        select\n          measurement as payload,\n          "c8yui/measurements" as channelName\n        from MeasurementCreated;'},h=1440;function s(e){var t=e.id||e;return"".concat(v.url(d),"/").concat(t)}var y=v.createEnum([{name:"stream",value:"application/json-stream"},{name:"csv",value:"text/csv"},{name:"xlsx",value:"application/vnd.ms-excel"}]);function b(e,t){var n,r=v.url(d),a=_.assign({},v.todayFilter({}),{pageSize:h},e),i={params:a};n=t?(i.responseType="blob",function(e){return e.data}):v.cleanListCallback("measurements",b,a);var o={Accept:function(e){return e&&_(y).map("value").includes(e.value)?e.value:"application/json"}(t||y.stream)};return f.then(function(e){return i.headers=_.assign({},e,o),u.get(r,i).then(function(e){return 202===e.status?l.reject({async:!0,data:e.data}):e})}).then(n)}function F(e){var t=h,n=v.url("".concat(d,"/series")),r=v.todayFilter(_.assign({pageSize:t,revert:!0},e||{}));r.dateFrom&&(r.dateFrom=moment(r.dateFrom).format(v.dateFullFormat)),r.dateTo&&(r.dateTo=moment(r.dateTo).format(v.dateFullFormat));var a={params:r},i=function(e){return e.data},o=_.findIndex(F._cacheFilter,_.partial(_.isEqual,r)),s=0<=o?F._cacheRequest[o]:null;return r.dateFrom&&(r.dateFrom=moment(r.dateFrom).format(v.dateFullFormat)),r.dateTo&&(r.dateTo=moment(r.dateTo).format(v.dateFullFormat)),function(e,t){return"".concat(v.absoluteUrl(e),"?").concat(c(t)).length>m}(n,r)&&_.unset(r,"series"),f.then(function(e){if(_.assign(a,{headers:e}),!s){s=u.get(n,a).then(i);var t=_.cloneDeep(r);F._cacheFilter.push(_.cloneDeep(t)),F._cacheRequest.push(s),moment(r.dateTo).isAfter(moment())&&setTimeout(function(){!function(e,t){_.remove(F._cacheFilter,e),_.remove(F._cacheRequest,t)}(t,s)},3e3)}return s})}function r(e){var t=v.url(d),n=e,r=_.cloneDeep(i);if(!n.source)throw new Error("c8yMeasurement: source must be defined");return u.post(t,n,r)}function T(e){var t=s(e),n=a(e),r=_.cloneDeep(i);return u.put(t,n,r)}F._cacheFilter=[],F._cacheRequest=[];var S=[];return{format:y,list:b,listPaged:function(e){var r=l.defer(),a=_.assign(e||{},{pageSize:1e3,withTotalPages:!0}),i=!1;return _.assign(r.promise,{cancel:function(){i=!0,r.reject("canceled")}}),b(a).then(function e(t){var n=!_.isUndefined(t.paging.next)&&t.length>=a.pageSize;return r.notify(t),n||r.resolve(!0),!!i||!n||t.paging.next().then(e)}),r.promise},listSeries:F,listSeriesPaged:function(e){var n=l.defer(),t=_.assign({revert:!0},e||{},{pageSize:1e3,withTotalPages:!0}),r=!1;return _.assign(n.promise,{cancel:function(){r=!0,n.reject("canceled")}}),F(t).then(function e(t){return n.notify(t),t.paging.next||n.resolve(!0),!!r||!t.paging.next||t.paging.next().then(e)}),n.promise},detail:function(e){var t=s(e);return u.get(t)},create:r,update:T,save:function(e){return e.id?T(e):r(e)},remove:function(e){var t=s(e);return u.delete(t)},activateCep:function(){return e.createOrDeploy(n)},latest:function(){var r=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},e=1<arguments.length?arguments[1]:void 0,a={};if(!r.device)throw new Error("filter.device must be defined");if(!r.fragment)throw new Error("filter.fragment must be defined");if(!r.series)throw new Error("filter.series must be defined");var t=b(_.assign(v.timeOrderFilter(),{revert:!0,valueFragmentType:r.fragment,valueFragmentSeries:r.series,source:r.device,pageSize:1,dateTo:void 0})).then(function(e){return _.assign(a,_.first(e)||{}),a});if(e){var n={ops:"CREATE",channel:"/measurements/".concat(r.device),onUpdate:function(e,t){var n=t[r.fragment];n&&n[r.series]&&_.assign(a,t)}},i=o.watch(n);t.stop=_.bind(i.stop,i)}return t},listForDataPoint:function(e,t,n,r,a){var i=S;"object"===_typeof(a)&&(i=a._cachedRequests||[],a._cachedRequests=i);var o=t,s=n,u=e.__target.id,c=("NONE"!==r?r:0)||void 0;if(o){switch(o=moment(o),r){case"HOURLY":o.subtract(1,"hour").startOf("hour");break;case"DAILY":o.subtract(1,"day").startOf("day");break;default:o.subtract(1,"minute").startOf("minute")}o=o.format(v.dateFullFormat)}if(s){switch(s=moment(s),r){case"HOURLY":s.add(1,"hour").startOf("hour");break;case"DAILY":s.add(1,"days").startOf("day");break;default:s.add(1,"minute").startOf("minute")}s=s.format(v.dateFullFormat)}var m={dateFrom:o,dateTo:s,source:u,aggregationType:c},d=_.find(i,function(e){return _.isMatch(e.filters,m)});d||(d={deferred:l.defer(),sendDebounced:function(){return d._sendDebounced(),d.deferred.promise},_sendDebounced:_.debounce(function(){F(d.filters).then(_.unary(d.deferred.resolve))},g),filters:m},i.push(d));var f=[e.fragment,e.series].join(".");return d.filters.series=_.uniq((d.filters.series||[]).concat([f])),p(function(){return d.sendDebounced().then(function(t){return function(e){var n=_.findIndex(e.series,function(e){return e.name===t.series&&e.type===t.fragment}),r=[];return-1<n&&_.forEach(e.values,function(e,t){_.isObjectLike(e[n])&&r.push({time:t,min:e[n].min&&Number(e[n].min),max:e[n].max&&Number(e[n].max)})}),{dataPoint:t,values:r,truncated:e.truncated}}}(e)).then(function(e){return e.aggregation=r,e.dateFrom=o,e.dateTo=s,e}).finally(function(){_.remove(i,d)})},5)},rtMeasurementForDatapoint:function(i){return function(e){var t=i.__target.id,n=i.fragment,r=i.series,a=_.get(e,[n,r]);return e.source.id===t&&!!a&&{dataPoint:i,values:[{time:e.time,min:a.value,max:a.value}]}}}}}e.$inject=["$http","$q","$timeout","$httpParamSerializer","c8yBase","c8yCepModule","c8yRealtime","c8yMeasurementUnits"],angular.module("c8y.core").factory("c8yMeasurements",e)}();
+"use strict";function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?Object(arguments[e]):{},n=Object.keys(r);"function"==typeof Object.getOwnPropertySymbols&&n.push.apply(n,Object.getOwnPropertySymbols(r).filter(function(e){return Object.getOwnPropertyDescriptor(r,e).enumerable})),n.forEach(function(e){_defineProperty(t,e,r[e])})}return t}function _defineProperty(e,t,r){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function _toPropertyKey(e){var t=_toPrimitive(e,"string");return"symbol"===_typeof(t)?t:String(t)}function _toPrimitive(e,t){if("object"!==_typeof(e)||null===e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);var n=r.call(e,t||"default");if("object"!==_typeof(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}!function(){function e(s,d,p,c,v,e,o,t){var g=window.c8y_testing?1:500,f=2083,a=v.clean,m="measurement/measurements",i={headers:v.contentHeaders("measurement")},l=t.getUnitHeaders(),r={status:"DEPLOYED",name:"c8yui_measurements",body:'insert into SendNotification\n        select\n          measurement as payload,\n          "c8yui/measurements" as channelName\n        from MeasurementCreated;'},y=1440;function u(e){var t=e.id||e;return"".concat(v.url(m),"/").concat(t)}var h=v.createEnum([{name:"stream",value:"application/json-stream"},{name:"csv",value:"text/csv"},{name:"xlsx",value:"application/vnd.ms-excel"}]);function b(e,t){var r,n=v.url(m),a=_.assign({},v.todayFilter({}),{pageSize:y},e),i={params:a};r=t?(i.responseType="blob",function(e){return e.data}):v.cleanListCallback("measurements",b,a);var o={Accept:function(e){return e&&_(h).map("value").includes(e.value)?e.value:"application/json"}(t||h.stream)};return l.then(function(e){return i.headers=_.assign({},e,o),s.get(n,i).then(function(e){return 202===e.status?d.reject({async:!0,data:e.data}):e})}).then(r)}function F(e){var t=y,r=v.url("".concat(m,"/series")),n=v.todayFilter(_.assign({pageSize:t,revert:!0},e||{}));n.dateFrom&&(n.dateFrom=moment(n.dateFrom).format(v.dateFullFormat)),n.dateTo&&(n.dateTo=moment(n.dateTo).format(v.dateFullFormat));var a={params:n},i=function(e){return e.data},o=_.findIndex(F._cacheFilter,_.partial(_.isEqual,n)),u=0<=o?F._cacheRequest[o]:null;return n.dateFrom&&(n.dateFrom=moment(n.dateFrom).format(v.dateFullFormat)),n.dateTo&&(n.dateTo=moment(n.dateTo).format(v.dateFullFormat)),function(e,t){return"".concat(v.absoluteUrl(e),"?").concat(c(t)).length>f}(r,n)&&_.unset(n,"series"),l.then(function(e){if(_.assign(a,{headers:e}),!u){u=s.get(r,a).then(i);var t=_.cloneDeep(n);F._cacheFilter.push(_.cloneDeep(t)),F._cacheRequest.push(u),moment(n.dateTo).isAfter(moment())&&setTimeout(function(){!function(e,t){_.remove(F._cacheFilter,e),_.remove(F._cacheRequest,t)}(t,u)},3e3)}return u})}function n(e){var t=v.url(m),r=e,n=_.cloneDeep(i);if(!r.source)throw new Error("c8yMeasurement: source must be defined");return s.post(t,r,n)}function S(e){var t=u(e),r=a(e),n=_.cloneDeep(i);return s.put(t,r,n)}F._cacheFilter=[],F._cacheRequest=[];var O=[];return{format:h,list:b,listPaged:function(e){var n=d.defer(),a=_.assign(e||{},{pageSize:1e3,withTotalPages:!0}),i=!1;return _.assign(n.promise,{cancel:function(){i=!0,n.reject("canceled")}}),b(a).then(function e(t){var r=!_.isUndefined(t.paging.next)&&t.length>=a.pageSize;return n.notify(t),r||n.resolve(!0),!!i||!r||t.paging.next().then(e)}),n.promise},listSeries:F,listSeriesPaged:function(e){var r=d.defer(),t=_.assign({revert:!0},e||{},{pageSize:1e3,withTotalPages:!0}),n=!1;return _.assign(r.promise,{cancel:function(){n=!0,r.reject("canceled")}}),F(t).then(function e(t){return r.notify(t),t.paging.next||r.resolve(!0),!!n||!t.paging.next||t.paging.next().then(e)}),r.promise},detail:function(e){var t=u(e);return s.get(t)},create:n,update:S,save:function(e){return e.id?S(e):n(e)},remove:function(e){var t=u(e);return s.delete(t)},activateCep:function(){return e.createOrDeploy(r)},latest:function(){var n=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},e=1<arguments.length?arguments[1]:void 0,a={};if(!n.device)throw new Error("filter.device must be defined");if(!n.fragment)throw new Error("filter.fragment must be defined");if(!n.series)throw new Error("filter.series must be defined");var t=b(_.assign(v.timeOrderFilter(),{revert:!0,valueFragmentType:n.fragment,valueFragmentSeries:n.series,source:n.device,pageSize:1,dateTo:void 0})).then(function(e){return _.assign(a,_.first(e)||{}),a});if(e){var r={ops:"CREATE",channel:"/measurements/".concat(n.device),onUpdate:function(e,t){var r=t[n.fragment];r&&r[n.series]&&_.assign(a,t)}},i=o.watch(r);t.stop=_.bind(i.stop,i)}return t},listForDataPoint:function(e,t,r,n,a){var i=O;"object"===_typeof(a)&&(i=a._cachedRequests||[],a._cachedRequests=i);var o=t,u=r,s=e.__target.id,c=("NONE"!==n?n:0)||void 0;if(o){switch(o=moment(o),n){case"HOURLY":o.subtract(1,"hour").startOf("hour");break;case"DAILY":o.subtract(1,"day").startOf("day");break;default:o.subtract(1,"minute").startOf("minute")}o=o.format(v.dateFullFormat)}if(u){switch(u=moment(u),n){case"HOURLY":u.add(1,"hour").startOf("hour");break;case"DAILY":u.add(1,"days").startOf("day");break;default:u.add(1,"minute").startOf("minute")}u=u.format(v.dateFullFormat)}var f={dateFrom:o,dateTo:u,source:s,aggregationType:c},m=_.find(i,function(e){return _.isMatch(e.filters,f)});m||(m={deferred:d.defer(),sendDebounced:function(){return m._sendDebounced(),m.deferred.promise},_sendDebounced:_.debounce(function(){F(m.filters).then(_.unary(m.deferred.resolve))},g),filters:f},i.push(m));var l=[e.fragment,e.series].join(".");return m.filters.series=_.uniq((m.filters.series||[]).concat([l])),p(function(){return m.sendDebounced().then(function(a){return function(e){var t,r=_.findIndex(e.series,function(e){return e.name===a.series&&e.type===a.fragment}),n=[];return-1<r&&(t=e.series[r].unit,_.forEach(e.values,function(e,t){_.isObjectLike(e[r])&&n.push({time:t,min:e[r].min&&Number(e[r].min),max:e[r].max&&Number(e[r].max)})})),{dataPoint:_objectSpread({},a,{unit:t}),values:n,truncated:e.truncated}}}(e)).then(function(e){return e.aggregation=n,e.dateFrom=o,e.dateTo=u,e}).finally(function(){_.remove(i,m)})},5)},rtMeasurementForDatapoint:function(i){return function(e){var t=i.__target.id,r=i.fragment,n=i.series,a=_.get(e,[r,n]);return e.source.id===t&&!!a&&{dataPoint:i,values:[{time:e.time,min:a.value,max:a.value}]}}}}}e.$inject=["$http","$q","$timeout","$httpParamSerializer","c8yBase","c8yCepModule","c8yRealtime","c8yMeasurementUnits"],angular.module("c8y.core").factory("c8yMeasurements",e)}();

package/dataPointExplorer/controllers/dataPointExplorer.js

@@ -1 +1 @@
-"use strict";function _toConsumableArray(t){return _arrayWithoutHoles(t)||_iterableToArray(t)||_unsupportedIterableToArray(t)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(t,a){if(t){if("string"==typeof t)return _arrayLikeToArray(t,a);var e=Object.prototype.toString.call(t).slice(8,-1);return"Object"===e&&t.constructor&&(e=t.constructor.name),"Map"===e||"Set"===e?Array.from(t):"Arguments"===e||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)?_arrayLikeToArray(t,a):void 0}}function _iterableToArray(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}function _arrayWithoutHoles(t){if(Array.isArray(t))return _arrayLikeToArray(t)}function _arrayLikeToArray(t,a){(null==a||a>t.length)&&(a=t.length);for(var e=0,n=new Array(a);e<a;e++)n[e]=t[e];return n}!function(){function t(o,t,n,a,e,r,i,d,c,s,l,u,f,m){var g,p;function h(t,a){var e;t&&a&&(o.data.datapoints.length=0,(e=o.data.datapoints).push.apply(e,_toConsumableArray(t)));o.data.graphDataPoints=t;var n=v(_.filter(t,"__active"));o.channel=n?"/measurements/".concat(n):""}function y(t){o.data.graphAlarmsEventsConfigs=t;var a=v(_.filter(t,"__active"));o.alarmsChannel=a?"/alarms/".concat(a):"",o.eventsChannel=a?"/events/".concat(a):""}function v(t){return _(t).map(function(t){return t.__target.id}).uniq().value().join(",")}function A(){var t=a.getContext();t.context&&(g="".concat(t.context,"_").concat(t.id)),function(){if(o.disableLocalStorage)return;var a=_.throttle(function(t,a){t!==a&&function(){if(!o.dontSave&&!o.disableLocalStorage){var t=_.pick(o.data,["dateFrom","dateTo","interval","aggregation","realtime","alarmsEventsConfigs"]);r.setSavedFilters(t,g)}}()},500,{leading:!1,trailing:!0});r.getSavedFilters(g).then(function(t){_.assign(o.data,t),o.$watch("data.realtime",a),o.$watch("data.dateFrom",a),o.$watch("data.dateTo",a),o.$watch("data.interval",a),o.$watch("data.aggregation",a),o.$watch("data.alarmsEventsConfigs",a,!0)})}()}function b(){var t,a=b._hasDashboard,e=a;if(_.isUndefined(a))try{2===(t=n.get("dashboardSvc")).VERSION&&(e=t)}catch(t){e=!1}return b._hasDashboard=e}function T(t){var a=b();a&&a[t]({name:"Data points graph",title:l.getString("Data points"),_width:12,_height:5,config:{datapoints:o.data.graphDataPoints,alarmsEventsConfigs:o.data.graphAlarmsEventsConfigs,dateTo:o.data.dateTo,dateFrom:o.data.dateFrom,aggregation:o.data.aggregation,realtime:o.data.realtime}}).then(S)}function S(){d.success(s("Widget created."))}function D(){T("addWidgetToSelectedDashboardInContext")}function w(){T("addWidgetToSelectedReport")}function F(t){o.chartBox=t}function C(){o.$watch("data.datapoints",function(){r.saveLocal(o.data.datapoints,g)},!0)}o.onRealtimeAlarmFn=function(t){o.onAlarm=t},o.onRealtimeEventFn=function(t){o.onEvent=t},!a.getContext().context&&t.path().match(/datapoint/)&&e.changeTitle({title:s("Data explorer")}),A(),p={text:s(g?"Send as widget to dashboard":"Send as widget to report"),action:g?D:w},b()&&!o.noActions&&i.addAction(p),_.get(o,"data.datapoints.length")||r.listLocal(g).then(function(t){t&&t.length&&h(t,!0)}).then(C),o.noActions||function(){function t(t,a){i.addAction({text:t,action:function(){var t={dateFrom:moment(o.data.dateFrom).format(c.dateFullFormat),dateTo:moment(o.data.dateTo).format(c.dateFullFormat)};f.downloadReportForDatapoints(a,o.data.graphDataPoints,t).catch(function(t){t&&t.message&&d.warning(t.message)})}})}t(s("Download as CSV"),u.format.csv),t(s("Download as Excel"),u.format.xlsx)}(),$(window).resize(function(){o.$broadcast("dashboardResize"),o.$apply()}),o.onBoxChanged=F,o.onUpdateDates=function(t,a){o.data.dateFrom=t;var e=moment().diff(moment(a),"seconds")<10;o.data.realtime&&!e&&(o.data.realtime=!1),o.data.dateTo=a},o.onUpdateDisplayedDates=function(t,a){o.data.displayedDateFrom=t,o.data.displayedDateTo=a},o.savedFilter={config:{},datapoints:[]},o.data=o.data||_.cloneDeep(o.savedFilter),function(){var a=o.data.interval;if(a&&"custom"!==a){var t=_.find(m.intervals,function(t){return t.id===a})||{};t.qty&&(o.data.dateFrom=moment().subtract(t.qty,t.unit).toDate(),o.data.dateTo=moment().toDate())}}(),o.$watch("data.datapoints",function(){return h(o.data.datapoints)},!0),o.$watch("data.alarmsEventsConfigs",y,!0)}t.$inject=["$scope","$location","$injector","c8yUiUtil","c8yTitle","c8yDataPointSvc","c8yActions","c8yAlert","c8yBase","gettext","gettextCatalog","c8yMeasurements","MeasurementsReportSvc","INTERVAL_CONSTANTS"],angular.module("c8y.cockpit.dataPointExplorer").controller("c8yDataPointExplorerCtrl",t)}();
+"use strict";function _toConsumableArray(t){return _arrayWithoutHoles(t)||_iterableToArray(t)||_unsupportedIterableToArray(t)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(t,a){if(t){if("string"==typeof t)return _arrayLikeToArray(t,a);var e=Object.prototype.toString.call(t).slice(8,-1);return"Object"===e&&t.constructor&&(e=t.constructor.name),"Map"===e||"Set"===e?Array.from(t):"Arguments"===e||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)?_arrayLikeToArray(t,a):void 0}}function _iterableToArray(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}function _arrayWithoutHoles(t){if(Array.isArray(t))return _arrayLikeToArray(t)}function _arrayLikeToArray(t,a){(null==a||a>t.length)&&(a=t.length);for(var e=0,n=new Array(a);e<a;e++)n[e]=t[e];return n}!function(){function t(o,t,n,a,e,r,i,d,c,s,l,u,f,m){var g,p;function h(t,a){var e;t&&a&&(o.data.datapoints.length=0,(e=o.data.datapoints).push.apply(e,_toConsumableArray(t)));o.data.graphDataPoints=t;var n=v(_.filter(t,"__active"));o.channel=n?"/measurements/".concat(n):""}function y(t){o.data.graphAlarmsEventsConfigs=t;var a=v(_.filter(t,"__active"));o.alarmsChannel=a?"/alarms/".concat(a):"",o.eventsChannel=a?"/events/".concat(a):""}function v(t){return _(t).map(function(t){return t.__target.id}).uniq().value().join(",")}function A(){var t=a.getContext();t.context&&(g="".concat(t.context,"_").concat(t.id)),function(){if(o.disableLocalStorage)return;var a=_.throttle(function(t,a){t!==a&&function(){if(!o.dontSave&&!o.disableLocalStorage){var t=_.pick(o.data,["dateFrom","dateTo","interval","aggregation","realtime","alarmsEventsConfigs"]);r.setSavedFilters(t,g)}}()},500,{leading:!1,trailing:!0});r.getSavedFilters(g).then(function(t){_.assign(o.data,t),o.$watch("data.realtime",a),o.$watch("data.dateFrom",a),o.$watch("data.dateTo",a),o.$watch("data.interval",a),o.$watch("data.aggregation",a),o.$watch("data.alarmsEventsConfigs",a,!0)})}()}function b(){var t,a=b._hasDashboard,e=a;if(_.isUndefined(a))try{2===(t=n.get("dashboardSvc")).VERSION&&(e=t)}catch(t){e=!1}return b._hasDashboard=e}function T(t){var a=b();a&&a[t]({name:"Data points graph",title:l.getString("Data points"),_width:12,_height:5,config:{datapoints:o.data.graphDataPoints,alarmsEventsConfigs:o.data.graphAlarmsEventsConfigs,dateTo:o.data.dateTo,dateFrom:o.data.dateFrom,aggregation:o.data.aggregation,realtime:o.data.realtime}}).then(S)}function S(){d.success(s("Widget created."))}function D(){T("addWidgetToSelectedDashboardInContext")}function w(){T("addWidgetToSelectedReport")}function F(t){o.chartBox=t}function C(){o.$watch("data.datapoints",function(){r.saveLocal(o.data.datapoints,g)},!0)}o.onRealtimeAlarmFn=function(t){o.onAlarm=t},o.onRealtimeEventFn=function(t){o.onEvent=t},!a.getContext().context&&t.path().match(/datapoint/)&&e.changeTitle({title:s("Data explorer")}),A(),p={text:s(g?"Send as widget to dashboard":"Send as widget to report"),action:g?D:w},b()&&!o.noActions&&i.addAction(p),_.get(o,"data.datapoints.length")||r.listLocal(g).then(function(t){t&&t.length&&h(t,!0)}).then(C),o.noActions||function(){function t(t,a){i.addAction({text:t,action:function(){var t={dateFrom:moment(o.data.dateFrom).format(c.dateFullFormat),dateTo:moment(o.data.dateTo).format(c.dateFullFormat)};f.downloadReportForDatapoints(a,o.data.graphDataPoints,t).catch(function(t){t&&t.message&&d.warning(t.message)})}})}t(s("Download as CSV"),u.format.csv),t(s("Download as Excel"),u.format.xlsx)}(),$(window).resize(function(){o.$broadcast("dashboardResize"),o.$apply()}),o.onBoxChanged=F,o.onUpdateDates=function(t,a){o.data.dateFrom=t;var e=moment().diff(moment(a),"seconds")<5;o.data.realtime&&!e&&(o.data.realtime=!1),o.data.dateTo=a},o.onUpdateDisplayedDates=function(t,a){o.data.displayedDateFrom=t,o.data.displayedDateTo=a},o.savedFilter={config:{},datapoints:[]},o.data=o.data||_.cloneDeep(o.savedFilter),function(){var a=o.data.interval;if(a&&"custom"!==a){var t=_.find(m.intervals,function(t){return t.id===a})||{};t.qty&&(o.data.dateFrom=moment().subtract(t.qty,t.unit).toDate(),o.data.dateTo=moment().toDate())}}(),o.$watch("data.datapoints",function(){return h(o.data.datapoints)},!0),o.$watch("data.alarmsEventsConfigs",y,!0)}t.$inject=["$scope","$location","$injector","c8yUiUtil","c8yTitle","c8yDataPointSvc","c8yActions","c8yAlert","c8yBase","gettext","gettextCatalog","c8yMeasurements","MeasurementsReportSvc","INTERVAL_CONSTANTS"],angular.module("c8y.cockpit.dataPointExplorer").controller("c8yDataPointExplorerCtrl",t)}();

package/dataPointExplorer/controllers/dataPointWidget.js

@@ -1 +1 @@
-"use strict";!function(){function n(e,n,t,a){e.onRealtimeAlarmFn=function(n){e.onAlarm=n},e.onRealtimeEventFn=function(n){e.onEvent=n};var i,o=200;function c(n,t){!1!==e.child.config.updateDates&&(e.child.config.dateFrom=n,e.child.config.dateTo=t)}function d(){if(e.child&&e.child.config){var n=e.child.config,t=n.interval,i=n.realtime;t&&(t!==a.custom.id||i)&&(t===a.custom.id&&i?function(){var n=new Date(e.child.config.dateFrom),t=new Date(e.child.config.dateTo)-n,i=moment();e.child.config.dateTo=i.toDate(),e.child.config.dateFrom=i.subtract(t,"milliseconds").toDate()}():function(t){var n=_.find(a.intervals,function(n){return n.id===t})||{};n.qty&&(e.child.config.dateFrom=moment().subtract(n.qty,n.unit).toDate(),e.child.config.dateTo=moment().toDate())}(t))}}function l(){var n=t.height();_.isUndefined(_.get(i,"height"))||(n-=i.height),e.dataPointsGraphHeight=_.max([o,n])}function r(){n(function(){e.$broadcast("dashboardResize")},500)}function f(n,t){e.alarmsEventsTimeline=e.alarmsEventsTimeline||{},e.alarmsEventsTimeline.displayedDateFrom=n,e.alarmsEventsTimeline.displayedDateTo=t}function h(n){return _(n).map(function(n){return n.__target.id}).uniq().value().join(",")}e.onUpdateDates=c,e.onUpdateDisplayedDates=f,e.onBoxChanged=function(n){e.chartBox=n},e.onTimelinesChartSizeChanged=function(n){i=n,l(),r()},e.dataPointsGraphHeight=t.height(),(e.recalculate=d)(),e.$watch("child.config.datapoints",function(n){var t=h(n);e.channel=t?"/measurements/".concat(t):""}),e.$watch("child.config.alarmsEventsConfigs",function(n){var t=h(n);e.alarmsChannel=t?"/alarms/".concat(t):"",e.eventsChannel=t?"/events/".concat(t):""}),e.$watchCollection(["child.config.dateFrom","child.config.dateTo"],function(){f(e.child.config.dateFrom,e.child.config.dateTo)}),e.$watch("child.config.date",function(){e.child.config.widgetInstanceGlobalTimeContext&&c(new Date(e.child.config.date[0]),new Date(e.child.config.date[1]))}),e.$on("dashboardResize",function(n){n.targetScope!==e&&(l(),r())})}n.$inject=["$scope","$timeout","$element","INTERVAL_CONSTANTS"],angular.module("c8y.cockpit.dataPointExplorer").controller("DataPointWidgetCtrl",n)}();
+"use strict";!function(){function i(n,i,t,a){n.onRealtimeAlarmFn=function(i){n.onAlarm=i},n.onRealtimeEventFn=function(i){n.onEvent=i};var e,o=200;function c(i,t){if(!1!==n.child.config.updateDates){n.child.config.dateFrom=i;var e=moment().diff(moment(t),"seconds")<5;n.child.config.widgetInstanceGlobalTimeContext||!n.viewRealtime||e||(n.viewRealtime=!1),n.child.config.dateTo=t}}function l(){if(n.child&&n.child.config){var i=n.child.config,t=i.interval,e=i.realtime;t&&(t!==a.custom.id||e)&&(t===a.custom.id&&e?function(){var i=new Date(n.child.config.dateFrom),t=new Date(n.child.config.dateTo)-i,e=moment();n.child.config.dateTo=e.toDate(),n.child.config.dateFrom=e.subtract(t,"milliseconds").toDate()}():function(t){var i=_.find(a.intervals,function(i){return i.id===t})||{};i.qty&&(n.child.config.dateFrom=moment().subtract(i.qty,i.unit).toDate(),n.child.config.dateTo=moment().toDate())}(t))}}function d(){var i=t.height();_.isUndefined(_.get(e,"height"))||(i-=e.height),n.dataPointsGraphHeight=_.max([o,i])}function f(){i(function(){n.$broadcast("dashboardResize")},500)}function h(i,t){n.alarmsEventsTimeline=n.alarmsEventsTimeline||{},n.alarmsEventsTimeline.displayedDateFrom=i,n.alarmsEventsTimeline.displayedDateTo=t}function m(i){return _(i).map(function(i){return i.__target.id}).uniq().value().join(",")}n.onUpdateDates=c,n.onUpdateDisplayedDates=h,n.onBoxChanged=function(i){n.chartBox=i},n.onTimelinesChartSizeChanged=function(i){e=i,d(),f()},n.dataPointsGraphHeight=t.height(),n.viewRealtime=n.child&&n.child.config&&n.child.config.realtime,n.onRealtimeToggle=function(){n.viewRealtime=!n.viewRealtime},(n.recalculate=l)(),n.$watch("child.config.datapoints",function(i){var t=m(i);n.channel=t?"/measurements/".concat(t):""}),n.$watch("child.config.alarmsEventsConfigs",function(i){var t=m(i);n.alarmsChannel=t?"/alarms/".concat(t):"",n.eventsChannel=t?"/events/".concat(t):""}),n.$watchCollection(["child.config.dateFrom","child.config.dateTo"],function(){h(n.child.config.dateFrom,n.child.config.dateTo)}),n.$watch("child.config.date",function(){n.child.config.widgetInstanceGlobalTimeContext&&c(new Date(n.child.config.date[0]),new Date(n.child.config.date[1]))}),n.$watch("child.config.realtime",function(){n.viewRealtime=n.child&&n.child.config&&n.child.config.realtime}),n.$on("dashboardResize",function(i){i.targetScope!==n&&(d(),f())})}i.$inject=["$scope","$timeout","$element","INTERVAL_CONSTANTS"],angular.module("c8y.cockpit.dataPointExplorer").controller("DataPointWidgetCtrl",i)}();

package/dataPointExplorer/views/widget.html

@@ -39,15 +39,17 @@
       datapoints-initial-display-limit="child.config.datapointsInitialDisplayLimit"
       date-from="child.config.dateFrom"
       date-to="child.config.dateTo"
-      realtime="child.config.realtime"
+      realtime="viewRealtime"
       aggregation="child.config.aggregation"
       show-time="child.config.displayDateSelection"
       on-data="onData"
       on-update-dates="onUpdateDates($dateFrom, $dateTo)"
       on-update-displayed-dates="onUpdateDisplayedDates($dateFrom, $dateTo)"
+      on-realtime-toggle="onRealtimeToggle()"
       on-box-changed="onBoxChanged(box)"
       selectable="child.config.selectable"
       selected="child.config.selected"
+      show-icon-bar="!child.config.widgetInstanceGlobalTimeContext"
     >
     </c8y-chart>
   </div>

package/measurements/fragmentChart/fragmentChart.component.js

@@ -1 +1 @@
-"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,n){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function _toPropertyKey(e){var t=_toPrimitive(e,"string");return"symbol"===_typeof(t)?t:String(t)}function _toPrimitive(e,t){if("object"!==_typeof(e)||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0===n)return("string"===t?String:Number)(e);var r=n.call(e,t||"default");if("object"!==_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}!function(){function e(a,r,e){var o,u=this,m=d3.scale.category10();function i(e){var t=e.currentValue,n=e.previousValue;return!_.isEmpty(t)&&!_.isEmpty(n)&&!_.isEqual(t,n)}function c(e){u.fragmentSeriesPairs=_.groupBy(e,"fragment")}function f(){u.channel="/measurements/".concat(o)}function s(){var e=function(e){var n=0,r=u.fragment,i={__target:{id:o},fragment:r,lineType:"line",renderType:"area"};return _.map(e,function(e,t){return _.assign({series:t,unit:e.unit,label:a.humanizeFragment("".concat(r," => ").concat(t)),color:m(n++),__active:!0},i)})}(function(e){return _.reduce(e,function(e,t){var n=t.series,r=t.unit;return _.assign(e,_defineProperty({},n,{unit:r}))},{})}(_.get(u.fragmentSeriesPairs,u.fragment)));_.set(u,"dataPoints",e)}u.aggregation="MINUTELY",u.interval=e._defaultDuration,_.assign(u,{$onChanges:function(e){var t=e.device,n=e.fragment;u.device&&u.fragment&&((i(t)||i(n))&&(u.fragmentSeriesPairs=void 0),o=a.getId(u.device),u.fragmentSeriesPairs?(f(),s()):r.getSupportedSeries(o,{withUnits:!0}).then(c).then(function(){f(),s()}))},$onInit:function(){u.dateFrom=moment().subtract(1,"hour").toDate(),u.dateTo=new Date},onUpdateDates:function(e,t){u.dateFrom=e;var n=moment().diff(moment(t),"seconds")<10;u.realtime&&!n&&(u.realtime=!1);u.dateTo=t},updateScale:function(e){_.forEach(e.series,function(e){var t=e.dataPoint,n=_.find(u.dataPoints,function(e){return e.fragment===t.fragment&&e.series===t.series});if(n){var r=e.values,i=_.minBy(r,"val.min").val.min,a=_.maxBy(r,"val.max").val.max;i===a&&(i-=1,a+=1),n.min=i,n.max=a}})}})}e.$inject=["c8yBase","c8yDevices","INTERVAL_CONSTANTS"],angular.module("c8y.core.measurements2").component("c8yMeasurementsFragmentChart",{templateUrl:":::PLUGIN_PATH:::/fragmentChart/fragmentChart.html",controllerAs:"vm",controller:e,bindings:{fragment:"<",device:"<",dateFrom:"=",dateTo:"=",realtime:"=?",hideRealtimeButton:"=?"}})}();
+"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,n){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function _toPropertyKey(e){var t=_toPrimitive(e,"string");return"symbol"===_typeof(t)?t:String(t)}function _toPrimitive(e,t){if("object"!==_typeof(e)||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0===n)return("string"===t?String:Number)(e);var r=n.call(e,t||"default");if("object"!==_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}!function(){function e(a,r,e){var o,u=this,m=d3.scale.category10();function i(e){var t=e.currentValue,n=e.previousValue;return!_.isEmpty(t)&&!_.isEmpty(n)&&!_.isEqual(t,n)}function c(e){u.fragmentSeriesPairs=_.groupBy(e,"fragment")}function f(){u.channel="/measurements/".concat(o)}function s(){var e=function(e){var n=0,r=u.fragment,i={__target:{id:o},fragment:r,lineType:"line",renderType:"area"};return _.map(e,function(e,t){return _.assign({series:t,unit:e.unit,label:a.humanizeFragment("".concat(r," => ").concat(t)),color:m(n++),__active:!0},i)})}(function(e){return _.reduce(e,function(e,t){var n=t.series,r=t.unit;return _.assign(e,_defineProperty({},n,{unit:r}))},{})}(_.get(u.fragmentSeriesPairs,u.fragment)));_.set(u,"dataPoints",e)}u.aggregation="MINUTELY",u.interval=e._defaultDuration,_.assign(u,{$onChanges:function(e){var t=e.device,n=e.fragment;u.device&&u.fragment&&((i(t)||i(n))&&(u.fragmentSeriesPairs=void 0),o=a.getId(u.device),u.fragmentSeriesPairs?(f(),s()):r.getSupportedSeries(o).then(c).then(function(){f(),s()}))},$onInit:function(){u.dateFrom=moment().subtract(1,"hour").toDate(),u.dateTo=new Date},onUpdateDates:function(e,t){u.dateFrom=e;var n=moment().diff(moment(t),"seconds")<5;u.realtime&&!n&&(u.realtime=!1);u.dateTo=t},updateScale:function(e){_.forEach(e.series,function(e){var t=e.dataPoint,n=_.find(u.dataPoints,function(e){return e.fragment===t.fragment&&e.series===t.series});if(n){var r=e.values,i=_.minBy(r,"val.min").val.min,a=_.maxBy(r,"val.max").val.max;i===a&&(i-=1,a+=1),n.min=i,n.max=a}})}})}e.$inject=["c8yBase","c8yDevices","INTERVAL_CONSTANTS"],angular.module("c8y.core.measurements2").component("c8yMeasurementsFragmentChart",{templateUrl:":::PLUGIN_PATH:::/fragmentChart/fragmentChart.html",controllerAs:"vm",controller:e,bindings:{fragment:"<",device:"<",dateFrom:"=",dateTo:"=",realtime:"=?",hideRealtimeButton:"=?"}})}();

package/measurements/measurements2/chart.directive.js

@@ -1 +1 @@
-"use strict";angular.module("c8y.core.measurements2").directive("c8yChart",["c8yChart",function(o){return{restrict:"E",link:function(t,e,a,r){var n=new o.Chart(e,{showTime:t.showTime()});r.init(n),t.$on("$destroy",function(){n.destroy()})},controller:"c8yChartCtrl",controllerAs:"ctrl",templateUrl:":::PLUGIN_PATH:::/measurements2/chart.html",scope:{dateFrom:"=?",dateTo:"=?",aggregation:"=?",realtime:"=?",datapoints:"=",datapointsInitialDisplayLimit:"<",onData:"=?",onUpdateDates:"&",onUpdateDisplayedDates:"&",onBoxChanged:"&",showTime:"&",selectable:"&",selected:"=?",onDataChange:"&"}}}]);
+"use strict";angular.module("c8y.core.measurements2").directive("c8yChart",["c8yChart",function(r){return{restrict:"E",link:function(e,t,a,o){var n=new r.Chart(t,{showTime:e.showTime()});o.init(n),e.$on("$destroy",function(){n.destroy()})},controller:"c8yChartCtrl",controllerAs:"ctrl",templateUrl:":::PLUGIN_PATH:::/measurements2/chart.html",scope:{dateFrom:"=?",dateTo:"=?",aggregation:"=?",showIconBar:"=?",realtime:"=?",datapoints:"=",datapointsInitialDisplayLimit:"<",onData:"=?",onUpdateDates:"&",onUpdateDisplayedDates:"&",onRealtimeToggle:"&",onBoxChanged:"&",showTime:"&",selectable:"&",selected:"=?",onDataChange:"&"}}}]);

package/measurements/measurements2/chart.html

@@ -4,6 +4,7 @@
 >
   <!-- icon bar -->
   <c8y-measurements-icon-bar
+    ng-show="showIconBar"
     class="measurement-icon-bar-wrapper p-static"
     aggregation="aggregation"
     realtime="realtime"
@@ -11,10 +12,12 @@
     show-loading="chart.loading"
     show-realtime="true"
     show-truncated="chart.truncated"
+    on-realtime-toggle="onRealtimeToggle()"
   ></c8y-measurements-icon-bar>
 
   <!-- datapoints selection -->
   <c8y-item-selector
+    class="m-l-auto"
     items="seriesAvailable"
     items-selected="seriesSelected"
     on-apply="onSeriesSelectionChanged(items)"

package/measurements/measurements2/iconBar.js

@@ -1 +1 @@
-"use strict";angular.module("c8y.core.measurements2").directive("c8yMeasurementsIconBar",function(){return{restrict:"E",templateUrl:":::PLUGIN_PATH:::/views/iconBar.html",scope:{realtime:"=",aggregation:"=",showAggregation:"=",showLoading:"=",showRealtime:"=",showTruncated:"="},controller:["$scope","gettext",function(e,t){var n={undefined:t("No aggregation"),MINUTELY:t("Minutely aggregation"),HOURLY:t("Hourly aggregation"),DAILY:t("Daily aggregation")},a={undefined:"line-chart",MINUTELY:"hourglass",HOURLY:"clock-o",DAILY:"calendar-o"};e.getRealtimeIconName=function(){return e.realtime?"check-circle-o":"circle-o"},e.getRealtimeIconText=function(){return e.realtime?t("Realtime active"):t("Realtime inactive")},e.getRealtimeClassName=function(){return e.realtime?"text-success":""},e.getAggregationIconName=function(){return a[e.aggregation]},e.getAggregationIconText=function(){return n[e.aggregation]}}]}});
+"use strict";angular.module("c8y.core.measurements2").directive("c8yMeasurementsIconBar",function(){return{restrict:"E",templateUrl:":::PLUGIN_PATH:::/views/iconBar.html",scope:{realtime:"=",onRealtimeToggle:"&",aggregation:"=",showAggregation:"=",showLoading:"=",showRealtime:"=",showTruncated:"="},controller:["$scope","gettext",function(e,t){var n={undefined:t("No aggregation"),MINUTELY:t("Minutely aggregation"),HOURLY:t("Hourly aggregation"),DAILY:t("Daily aggregation")},a={undefined:"line-chart",MINUTELY:"hourglass",HOURLY:"clock-o",DAILY:"calendar-o"};e.getRealtimeIconName=function(){return e.realtime?"check-circle-o":"circle-o"},e.getRealtimeIconText=function(){return e.realtime?t("Realtime active"):t("Realtime inactive")},e.getRealtimeClassName=function(){return e.realtime?"text-success":""},e.getAggregationIconName=function(){return a[e.aggregation]},e.getAggregationIconText=function(){return n[e.aggregation]}}]}});

package/measurements/measurements2/series.service.js

@@ -1 +1 @@
-"use strict";function _slicedToArray(e,t){return _arrayWithHoles(e)||_iterableToArrayLimit(e,t)||_unsupportedIterableToArray(e,t)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?_arrayLikeToArray(e,t):void 0}}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}function _iterableToArrayLimit(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var r,i,a,o,s=[],c=!0,l=!1;try{if(a=(n=n.call(e)).next,0===t){if(Object(n)!==n)return;c=!1}else for(;!(c=(r=a.call(n)).done)&&(s.push(r.value),s.length!==t);c=!0);}catch(e){l=!0,i=e}finally{try{if(!c&&null!=n.return&&(o=n.return(),Object(o)!==o))return}finally{if(l)throw i}}return s}}function _arrayWithHoles(e){if(Array.isArray(e))return e}!function(){function e(e,r,s,c){var a;function i(e,t,n,r,i){var a=i,o="NONE"!==r?r:void 0;return s.listForDataPoint(e,t,n,o,a)}function t(e,t){var n=this;return n.chart=e,n.dataPoint=t,n.hoverItems=[],n.values=[],n.implicitDomain={},n.bisect=d3.bisector(function(e){return e.time}).right,n.loadSeriesData=r.latest(i),n}return a=e.has("ngZone")?e.get("ngZone"):{runOutsideAngular:function(e){return e()}},t.prototype={defaultRenderType:"min",defaultLineType:"line",loadDataAndRender:function(e,t,n){var r=this;r.loadData(e,t,n).finally(function(){r.chart.render()})},loadData:function(e,t,n){var r=this,i=r.dataPoint,a=r._aggregation;return this.loadSeriesData(i,e,t,n,r.chart).then(function(e){return a!==n&&(r.values.length=0,r._aggregation=n,r.resetImplicitDomain()),r.appendValues(e.values),e})},appendValues:function(e){var a=this,o=a.values,s=a.implicitDomain;return _.forEach(e,function(e){if(_.isFinite(e.min)&&_.isFinite(e.max)){var t=new Date(e.time),n=t.getTime(),r=_.find(o,function(e){return n===e.time.getTime()}),i={time:t,val:{min:e.min,max:e.max}};o.length&&_.last(o).time.getTime()>n&&(a._valuesSortingNeeded=!0),r?_.assign(r,i):o.push(i),(_.isUndefined(s.min)||e.min<s.min)&&(s.min=e.min),(_.isUndefined(s.max)||e.max>s.max)&&(s.max=e.max)}}),o},destroy:function(){this.svg&&this.svg.remove(),this.hoverItems=[],delete this.svg},resetImplicitDomain:function(){this.implicitDomain.min=void 0,this.implicitDomain.max=void 0},domain:function(){var e=this.dataPoint,t=this.implicitDomain,n=_.isUndefined(e.min)||""===e.min||_.isNull(e.min)?t.min:Number(e.min),r=_.isUndefined(e.max)||""===e.max||_.isNull(e.max)?t.max:Number(e.max);return(_.isUndefined(n)||Number.isNaN(n))&&(n=d3.min(this.values,function(e){return e.val.min}),_.isUndefined(n)||(t.min=n),n=n||0),(_.isUndefined(r)||Number.isNaN(r))&&(r=d3.max(this.values,function(e){return e.val.max}),_.isUndefined(r)||(t.max=r),r=r||0),n===r&&(n-=1,r+=1),[n,r]},scale:function(){return this.chart.scaleY().domain(this.domain())},getRenderType:function(){return this.dataPoint.renderType||this.renderType||this.defaultRenderType},getLineType:function(){return this.dataPoint.lineType||this.lineType||this.defaultLineType},render:function(){var e=this,t=e.chart.svgSeries,n=e.getRenderType(),r=e.getLineType(),i=e.values,a=e.svg;if(!a||a.minOrMax===n&&a.chartType===n||e.destroy(),!e.svg){var o=e.chart.margins;e.svg=t.append("g").attr("transform",c.translate(o.l,o.t)).attr("class","series"),(a=e.svg).minOrMax=n,a.chartType=r}e._valuesSortingNeeded&&(delete e._valuesSortingNeeded,i.sort(function(e,t){return e.time>t.time?1:e.time<t.time?-1:0})),e.chart.allowSelectFocusTime||e.removeOldHiddenValues(),"bars"===r?e._render_bars():"area"!==n?e._render_path(n):e._render_area()},removeOldHiddenValues:function(){var e=this.values,n=this.chart.axisX._from,r=0;_.forEach(e,function(e,t){return!moment(e.time).isSameOrAfter(n)||(r=t-1,!1)}),r&&e.splice(0,r)},_render_path:function(t){var n=this,e=n.svg._path;function r(e){return n.chart.axisX.scale()(e.time)}function i(e){return n.scale()(e.val[t])}function a(){return n.dataPoint.color}e||(n.svg._path=n.svg.append("path"),(e=n.svg._path).style({"pointer-events":"none"})),n._create_update_focusPoint(1),n._render_path_line(e,r,i,a),n._render_path_points(r,i,a)},_render_path_line:function(e,t,n,r){var i=this,a=i.getLineType()||"linear",o=d3.svg.line().interpolate(a).x(t).y(n);_.includes(["bars","points"],i.getLineType())?(e.remove(),i.svg._path=void 0):e.attr("d",function(){return o(i.values)}).style({fill:"transparent",stroke:r})},_render_path_points:function(e,t,n){if(_.includes(["points","linePoints"],this.getLineType())){var r=this.svg.selectAll("circle.point").data(this.values);r.enter().append("circle").attr("class","point"),r.exit().remove(),r.attr("cx",e).attr("cy",t).attr("r",4).attr("fill","transparent").attr("stroke",n)}else this.svg.selectAll("circle.point").remove()},_render_bars:function(){var i=this,e=_.filter(i.chart.series,function(e){return e.getLineType()===i.getLineType()}),r=e.length,a=_.findIndex(e,function(e){return e===i}),o=i.svg.minOrMax,t=function(){var n=i.chart.axisX.scale();if(i._aggregation)return function(e){var t=n(e.time)-r*c()/2;return t+a*c()};return function(e){return n(e.time)}}(),n=l(),s=m(n),c=function(){var e=1;if(i._aggregation){var t=function(e){var t=i.chart.axisX.scale(),n=_slicedToArray(t.domain(),1)[0],r=moment(n).add(1,{MINUTELY:"minute",HOURLY:"hour",DAILY:"day"}[e]).toDate();return t(r)-t(n)}(i._aggregation);20<(e=t/(r+1))&&(e=20),e<1&&(e=1)}return _.constant(e)}();function l(e){var t=i.scale(),n=e;return n||(n="area"===o?"max":o),function(e){return t(e.val[n])}}function u(n){var r=_.max(i.scale().range());return function(e){var t=n(e);return r<t?r:t}}function m(t){var n=i.scale().range();return function(e){return Math.abs(_.max(n)-t(e))}}var d={x:t,y:u(n),width:c,height:s,fill:function(){return i.dataPoint.color}},v=i.svg.selectAll(".bars").data(i.values),f=v.enter().append("g").style("pointer-events","none").attr("class",function(e,t){return"bar index".concat(t)});if(f.append("rect").attr("class","barmain"),v.exit().remove(),v.select(".barmain").attr(d),"area"===o&&i._aggregation){f.append("rect").attr("class","barmin").style("opacity","0.2");var p=l("min"),h=_.defaults({fill:"#000",y:u(p),height:m(p)},d);v.select(".barmin").attr(h)}i._aggregation||i._create_update_focusPoint(1)},hover:function(e){var t=this,n=t.getRenderType(),r=t.getLineType(),i=t.values[e];(t.overPoint=i)&&(t._focusPointTime=i.time,"bars"===r&&this._hover_bars(e)),t._render_focusPoint(1,"area"!==n?n:"max"),t._render_focusPoint(2,"area"!==n?n:"min")},_hover_bars:function(e){this.svg.select(".hover").classed("hover",!1).style({opacity:1}),this.svg.select(".index".concat(e," .barmain")).classed("hover",!0).style({opacity:.5})},mouseleave:function(){"bars"===this.getLineType()&&this.svg.select(".hover").classed("hover",!1).style({opacity:1})},_create_update_focusPoint:function(e){var t=this,n="focusPoint".concat(e),r=t.svg[n];r||(t.svg[n]=t.svg.append("circle").style({visibility:t.chart.hoverItemsVisible?"visible":"hidden","pointer-events":"all"}).attr({cx:0,cy:0,r:3}),r=t.svg[n],t.addFocusPointEvent(r),t.hoverItems.push(r)),r.attr({fill:function(){return t.dataPoint.color}})},_render_focusPoint:function(e,t){var n=this.chart.axisX.scale(),r=this.scale(),i=this.svg,a=this.overPoint,o=i&&i["focusPoint".concat(e)];if(o)if(a){var s=i.xFocusScale?i.xFocusScale(a):n(a.time),c=r(a.val[t]);o.attr({cx:s,cy:c})}else o.style("visibility","hidden")},_render_area:function(){var t=this,e=t.getLineType()||"linear";function n(e){return t.chart.axisX.scale()(e.time)}function r(e){return t.scale()(e.val.max)}function i(e){return t.scale()(e.val.min)}function a(){return t.dataPoint.color}var o=d3.svg.area().interpolate(e).x(n).y0(r).y1(i),s=t.svg._path;s||(t.svg._path=t.svg.append("path").style({"pointer-events":"none",opacity:.8})),s=t.svg._path,t._create_update_focusPoint(1),t._create_update_focusPoint(2),s.attr("d",function(){return o(t.values)}).style({"pointer-events":"none",stroke:a,fill:a}),_.includes(["points","linePoints"],t.getLineType())?(t.svg.selectAll("circle.point.max").data(t.values).enter().append("circle").attr("class","point max"),t.svg.selectAll("circle.point.min").data(t.values).enter().append("circle").attr("class","point min"),t.svg.selectAll("circle.point.max").attr("cx",n).attr("cy",r).attr("r",4).attr("fill","transparent").attr("stroke",a),t.svg.selectAll("circle.point.min").attr("cx",n).attr("cy",i).attr("r",4).attr("fill","transparent").attr("stroke",a)):t.svg.selectAll("circle.point").remove()},onMove:function(e,t){var n=this.getNearIndex(e);this.hover(n,e,t)},hoverValue:function(){var e=this.getRenderType(),t=this.overPoint,n=this.dataPoint.unit||"",r=" -- ";if(t){var i=t.val,a=i.min,o=i.max;"min"===e&&(r="".concat(a," ").concat(n)),"max"===e&&(r="".concat(o," ").concat(n)),"area"===e&&(r="".concat(a," ").concat(n," — ").concat(o," ").concat(n))}return r},hoverTime:function(){var e=this.overPoint;return e?moment(e.time):"--"},getNearIndex:function(e){var t=e,n=this.values,r=n.length-1,i=this.bisect(n,e,1,r),a=n[i-1]&&n[i-1].time,o=n[i]&&n[i].time;return _.isUndefined(a)?i:_.isUndefined(o)?i-1:t-a<o-t?i-1:i},measurementFits:function(e){return s.rtMeasurementForDatapoint(this.dataPoint)(e)},addFocusPointEvent:function(e){var n=this,r=n.chart;e.on("click",function(){if(r.allowSelectFocusTime){var e={target:(n.dataPoint.__target||{}).id,date:moment(n._focusPointTime).format("YYYY-MM-DDTHH:mm:ss.SSSZ")},t=r.selectedPoint;t&&moment(e.date).isSame(moment(t.date))?r.clearSelectPoint():r.setSelectPoint(e)}}),e.on("mouseenter",function(){r.allowSelectFocusTime&&e.style({cursor:"pointer"}).attr({r:6})}),e.on("mouseleave",function(){r.allowSelectFocusTime&&e.style({cursor:"default"}).attr({r:3})})},realtimeMeasurement:function(e){var t=this,n=t.measurementFits(e),r=function(){t.appendValues(_.flattenDeep(t.__realtimeToAppend)),t.__realtimeToAppend=[],t.__realtimeToAppendTimout=void 0,t.chart.render()};if(n){t.__realtimeToAppend||(t.__realtimeToAppend=[]),t.__realtimeToAppend.push(n.values);var i=t.chart.axisX.getDebouncePreference();i.reset?(clearTimeout(t.__realtimeToAppendTimout),r()):t.__realtimeToAppendTimout||a.runOutsideAngular(function(){t.__realtimeToAppendTimout=setTimeout(r,i.debounceTime)})}return n}},t}e.$inject=["$injector","c8yBase","c8yMeasurements","c8yChartCommon"],angular.module("c8y.core.measurements2").factory("c8ySeries",e)}();
+"use strict";function _slicedToArray(e,t){return _arrayWithHoles(e)||_iterableToArrayLimit(e,t)||_unsupportedIterableToArray(e,t)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?_arrayLikeToArray(e,t):void 0}}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}function _iterableToArrayLimit(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var r,i,a,o,s=[],c=!0,l=!1;try{if(a=(n=n.call(e)).next,0===t){if(Object(n)!==n)return;c=!1}else for(;!(c=(r=a.call(n)).done)&&(s.push(r.value),s.length!==t);c=!0);}catch(e){l=!0,i=e}finally{try{if(!c&&null!=n.return&&(o=n.return(),Object(o)!==o))return}finally{if(l)throw i}}return s}}function _arrayWithHoles(e){if(Array.isArray(e))return e}!function(){function e(e,r,s,c){var a;function i(e,t,n,r,i){var a=i,o="NONE"!==r?r:void 0;return s.listForDataPoint(e,t,n,o,a)}function t(e,t){var n=this;return n.chart=e,n.dataPoint=t,n.hoverItems=[],n.values=[],n.implicitDomain={},n.bisect=d3.bisector(function(e){return e.time}).right,n.loadSeriesData=r.latest(i),n}return a=e.has("ngZone")?e.get("ngZone"):{runOutsideAngular:function(e){return e()}},t.prototype={defaultRenderType:"min",defaultLineType:"line",loadDataAndRender:function(e,t,n){var r=this;return r.loadData(e,t,n).finally(function(){r.chart.render()})},loadData:function(e,t,n){var r=this,i=r.dataPoint,a=r._aggregation;return this.loadSeriesData(i,e,t,n,r.chart).then(function(e){return a!==n&&(r.values.length=0,r._aggregation=n,r.resetImplicitDomain()),r.appendValues(e.values),i.unit=e.dataPoint.unit,e})},appendValues:function(e){var a=this,o=a.values,s=a.implicitDomain;return _.forEach(e,function(e){if(_.isFinite(e.min)&&_.isFinite(e.max)){var t=new Date(e.time),n=t.getTime(),r=_.find(o,function(e){return n===e.time.getTime()}),i={time:t,val:{min:e.min,max:e.max}};o.length&&_.last(o).time.getTime()>n&&(a._valuesSortingNeeded=!0),r?_.assign(r,i):o.push(i),(_.isUndefined(s.min)||e.min<s.min)&&(s.min=e.min),(_.isUndefined(s.max)||e.max>s.max)&&(s.max=e.max)}}),o},destroy:function(){this.svg&&this.svg.remove(),this.hoverItems=[],delete this.svg},resetImplicitDomain:function(){this.implicitDomain.min=void 0,this.implicitDomain.max=void 0},domain:function(){var e=this.dataPoint,t=this.implicitDomain,n=_.isUndefined(e.min)||""===e.min||_.isNull(e.min)?t.min:Number(e.min),r=_.isUndefined(e.max)||""===e.max||_.isNull(e.max)?t.max:Number(e.max);return(_.isUndefined(n)||Number.isNaN(n))&&(n=d3.min(this.values,function(e){return e.val.min}),_.isUndefined(n)||(t.min=n),n=n||0),(_.isUndefined(r)||Number.isNaN(r))&&(r=d3.max(this.values,function(e){return e.val.max}),_.isUndefined(r)||(t.max=r),r=r||0),n===r&&(n-=1,r+=1),[n,r]},scale:function(){return this.chart.scaleY().domain(this.domain())},getRenderType:function(){return this.dataPoint.renderType||this.renderType||this.defaultRenderType},getLineType:function(){return this.dataPoint.lineType||this.lineType||this.defaultLineType},render:function(){var e=this,t=e.chart.svgSeries,n=e.getRenderType(),r=e.getLineType(),i=e.values,a=e.svg;if(!a||a.minOrMax===n&&a.chartType===n||e.destroy(),!e.svg){var o=e.chart.margins;e.svg=t.append("g").attr("transform",c.translate(o.l,o.t)).attr("class","series"),(a=e.svg).minOrMax=n,a.chartType=r}e._valuesSortingNeeded&&(delete e._valuesSortingNeeded,i.sort(function(e,t){return e.time>t.time?1:e.time<t.time?-1:0})),e.chart.allowSelectFocusTime||e.removeOldHiddenValues(),"bars"===r?e._render_bars():"area"!==n?e._render_path(n):e._render_area()},removeOldHiddenValues:function(){var e=this.values,n=this.chart.axisX._from,r=0;_.forEach(e,function(e,t){return!moment(e.time).isSameOrAfter(n)||(r=t-1,!1)}),r&&e.splice(0,r)},_render_path:function(t){var n=this,e=n.svg._path;function r(e){return n.chart.axisX.scale()(e.time)}function i(e){return n.scale()(e.val[t])}function a(){return n.dataPoint.color}e||(n.svg._path=n.svg.append("path"),(e=n.svg._path).style({"pointer-events":"none"})),n._create_update_focusPoint(1),n._render_path_line(e,r,i,a),n._render_path_points(r,i,a)},_render_path_line:function(e,t,n,r){var i=this,a=i.getLineType()||"linear",o=d3.svg.line().interpolate(a).x(t).y(n);_.includes(["bars","points"],i.getLineType())?(e.remove(),i.svg._path=void 0):e.attr("d",function(){return o(i.values)}).style({fill:"transparent",stroke:r})},_render_path_points:function(e,t,n){if(_.includes(["points","linePoints"],this.getLineType())){var r=this.svg.selectAll("circle.point").data(this.values);r.enter().append("circle").attr("class","point"),r.exit().remove(),r.attr("cx",e).attr("cy",t).attr("r",4).attr("fill","transparent").attr("stroke",n)}else this.svg.selectAll("circle.point").remove()},_render_bars:function(){var i=this,e=_.filter(i.chart.series,function(e){return e.getLineType()===i.getLineType()}),r=e.length,a=_.findIndex(e,function(e){return e===i}),o=i.svg.minOrMax,t=function(){var n=i.chart.axisX.scale();if(i._aggregation)return function(e){var t=n(e.time)-r*c()/2;return t+a*c()};return function(e){return n(e.time)}}(),n=l(),s=m(n),c=function(){var e=1;if(i._aggregation){var t=function(e){var t=i.chart.axisX.scale(),n=_slicedToArray(t.domain(),1)[0],r=moment(n).add(1,{MINUTELY:"minute",HOURLY:"hour",DAILY:"day"}[e]).toDate();return t(r)-t(n)}(i._aggregation);20<(e=t/(r+1))&&(e=20),e<1&&(e=1)}return _.constant(e)}();function l(e){var t=i.scale(),n=e;return n||(n="area"===o?"max":o),function(e){return t(e.val[n])}}function u(n){var r=_.max(i.scale().range());return function(e){var t=n(e);return r<t?r:t}}function m(t){var n=i.scale().range();return function(e){return Math.abs(_.max(n)-t(e))}}var d={x:t,y:u(n),width:c,height:s,fill:function(){return i.dataPoint.color}},v=i.svg.selectAll(".bars").data(i.values),f=v.enter().append("g").style("pointer-events","none").attr("class",function(e,t){return"bar index".concat(t)});if(f.append("rect").attr("class","barmain"),v.exit().remove(),v.select(".barmain").attr(d),"area"===o&&i._aggregation){f.append("rect").attr("class","barmin").style("opacity","0.2");var p=l("min"),h=_.defaults({fill:"#000",y:u(p),height:m(p)},d);v.select(".barmin").attr(h)}i._aggregation||i._create_update_focusPoint(1)},hover:function(e){var t=this,n=t.getRenderType(),r=t.getLineType(),i=t.values[e];(t.overPoint=i)&&(t._focusPointTime=i.time,"bars"===r&&this._hover_bars(e)),t._render_focusPoint(1,"area"!==n?n:"max"),t._render_focusPoint(2,"area"!==n?n:"min")},_hover_bars:function(e){this.svg.select(".hover").classed("hover",!1).style({opacity:1}),this.svg.select(".index".concat(e," .barmain")).classed("hover",!0).style({opacity:.5})},mouseleave:function(){"bars"===this.getLineType()&&this.svg.select(".hover").classed("hover",!1).style({opacity:1})},_create_update_focusPoint:function(e){var t=this,n="focusPoint".concat(e),r=t.svg[n];r||(t.svg[n]=t.svg.append("circle").style({visibility:t.chart.hoverItemsVisible?"visible":"hidden","pointer-events":"all"}).attr({cx:0,cy:0,r:3}),r=t.svg[n],t.addFocusPointEvent(r),t.hoverItems.push(r)),r.attr({fill:function(){return t.dataPoint.color}})},_render_focusPoint:function(e,t){var n=this.chart.axisX.scale(),r=this.scale(),i=this.svg,a=this.overPoint,o=i&&i["focusPoint".concat(e)];if(o)if(a){var s=i.xFocusScale?i.xFocusScale(a):n(a.time),c=r(a.val[t]);o.attr({cx:s,cy:c})}else o.style("visibility","hidden")},_render_area:function(){var t=this,e=t.getLineType()||"linear";function n(e){return t.chart.axisX.scale()(e.time)}function r(e){return t.scale()(e.val.max)}function i(e){return t.scale()(e.val.min)}function a(){return t.dataPoint.color}var o=d3.svg.area().interpolate(e).x(n).y0(r).y1(i),s=t.svg._path;s||(t.svg._path=t.svg.append("path").style({"pointer-events":"none",opacity:.8})),s=t.svg._path,t._create_update_focusPoint(1),t._create_update_focusPoint(2),s.attr("d",function(){return o(t.values)}).style({"pointer-events":"none",stroke:a,fill:a}),_.includes(["points","linePoints"],t.getLineType())?(t.svg.selectAll("circle.point.max").data(t.values).enter().append("circle").attr("class","point max"),t.svg.selectAll("circle.point.min").data(t.values).enter().append("circle").attr("class","point min"),t.svg.selectAll("circle.point.max").attr("cx",n).attr("cy",r).attr("r",4).attr("fill","transparent").attr("stroke",a),t.svg.selectAll("circle.point.min").attr("cx",n).attr("cy",i).attr("r",4).attr("fill","transparent").attr("stroke",a)):t.svg.selectAll("circle.point").remove()},onMove:function(e,t){var n=this.getNearIndex(e);this.hover(n,e,t)},hoverValue:function(){var e=this.getRenderType(),t=this.overPoint,n=this.dataPoint.unit||"",r=" -- ";if(t){var i=t.val,a=i.min,o=i.max;"min"===e&&(r="".concat(a," ").concat(n)),"max"===e&&(r="".concat(o," ").concat(n)),"area"===e&&(r="".concat(a," ").concat(n," — ").concat(o," ").concat(n))}return r},hoverTime:function(){var e=this.overPoint;return e?moment(e.time):"--"},getNearIndex:function(e){var t=e,n=this.values,r=n.length-1,i=this.bisect(n,e,1,r),a=n[i-1]&&n[i-1].time,o=n[i]&&n[i].time;return _.isUndefined(a)?i:_.isUndefined(o)?i-1:t-a<o-t?i-1:i},measurementFits:function(e){return s.rtMeasurementForDatapoint(this.dataPoint)(e)},addFocusPointEvent:function(e){var n=this,r=n.chart;e.on("click",function(){if(r.allowSelectFocusTime){var e={target:(n.dataPoint.__target||{}).id,date:moment(n._focusPointTime).format("YYYY-MM-DDTHH:mm:ss.SSSZ")},t=r.selectedPoint;t&&moment(e.date).isSame(moment(t.date))?r.clearSelectPoint():r.setSelectPoint(e)}}),e.on("mouseenter",function(){r.allowSelectFocusTime&&e.style({cursor:"pointer"}).attr({r:6})}),e.on("mouseleave",function(){r.allowSelectFocusTime&&e.style({cursor:"default"}).attr({r:3})})},realtimeMeasurement:function(e){var t=this,n=t.measurementFits(e),r=function(){t.appendValues(_.flattenDeep(t.__realtimeToAppend)),t.__realtimeToAppend=[],t.__realtimeToAppendTimout=void 0,t.chart.render()};if(n){t.__realtimeToAppend||(t.__realtimeToAppend=[]),t.__realtimeToAppend.push(n.values);var i=t.chart.axisX.getDebouncePreference();i.reset?(clearTimeout(t.__realtimeToAppendTimout),r()):t.__realtimeToAppendTimout||a.runOutsideAngular(function(){t.__realtimeToAppendTimout=setTimeout(r,i.debounceTime)})}return n}},t}e.$inject=["$injector","c8yBase","c8yMeasurements","c8yChartCommon"],angular.module("c8y.core.measurements2").factory("c8ySeries",e)}();

package/measurements/views/iconBar.html

@@ -19,6 +19,7 @@
     tooltip-popup-delay="500"
     tooltip-append-to-body="true"
     ng-show="showRealtime"
+    ng-click="onRealtimeToggle()"
   >
     <!-- TODO: Fix hack
       change the function getRealtimeIconName to return 'active : inactive ' instead of icon name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c8y/ng1-modules",
-  "version": "1018.0.170",
+  "version": "1018.0.174",
   "license": "Apache-2.0",
   "author": "Cumulocity",
   "description": "AngularJS modules for Cumulocity IoT applications.",

package/simulators/detail/instructionDetail.component.js

@@ -1 +1 @@
-"use strict";!function(){function e(t,e,n,a,s){var u=this,r=_(a.Types.values()).filter("numeric").map("name").value();function o(){n(function(){e.find(".optionsForm input").first().trigger("focus")})}function i(){var e=u.selectedMessage||{},t=l(e);u.valuesData=[];var n=u.valuesData,s=0,i=a.findMessageForInstruction(u.instruction,u.messages);_.forEach(e.mandatoryValues,function(e){e.mandatory=!0}),_.forEach(t,function(e){s+=1,e.order=s,function(e){return!e.value&&e.type!==a.Types.DATE.name}(e)&&n.push(e)}),function(n){var e=l(u.selectedMessage||{});_.forEach(e,function(e,t){e.inputValue=n?void 0:u.values[t],_.includes(r,e.type)&&!_.isUndefined(e.inputValue)&&(e.inputValue=Number(e.inputValue))})}(!(e&&i===e)),o()}function l(e){var t=_.union(e.mandatoryValues,e.customValues,e.values);return _.reject(t,"value")}function c(e){var t=u.editInstruction;u.messages=e,u.selectedMessage=a.findMessageForInstruction(t,u.messages),"sleep"!==t.type&&i(),o()}_.assign(u,{$onInit:function(){_.assign(u,{icons:s.icons})},$onChanges:function(){u.editInstruction=_.clone(u.instruction);var e=u.editInstruction;e&&((u.messages?t.when(u.messages):a.listAllPublishMessages()).then(c),u.values=e.values||[]);delete u.valuesForm},onSelectedMessage:i,remove:function(){u.simulatorCtrl.remove(u.instruction)},canSave:function(e){var t=e.$valid,n=u.instruction,s=u.selectedMessage,i=_.includes(["message","builtin"],n&&n.type);(!n||i&&!s)&&(t=!1);return t},save:function(){var e=u.instruction,t=u.editInstruction;if(delete e.isNew,"sleep"===e.type)e.seconds=t.seconds;else{var n=u.selectedMessage,s=l(n);e.type=n._template?"message":"builtin",e.values=_.map(s,function(e){var t=_([e.value,e.inputValue]).reject(_.isNil).reject(function(e){return""===e}).head();return _.isUndefined(t)?"":t}),e.messageId=n.msgId,e.templateId=n._template?n._template.__externalId:void 0}u.simulatorCtrl.saveCurrentSimulatorCommands()},cancel:function(){u.instruction.isNew?u.simulatorCtrl.remove(u.instruction):u.simulatorCtrl.selectInstruction()}})}e.$inject=["$q","$element","$timeout","c8ySimulators","c8ySimulatorsUi"],angular.module("c8y.simulators").component("c8ySimulatorInstructionDetail",{templateUrl:":::PLUGIN_PATH:::/detail/instructionDetail.html",require:{simulatorCtrl:"^c8ySimulatorDetail"},bindings:{instruction:"<"},controllerAs:"vm",controller:e})}();
+"use strict";!function(){function e(t,e,n,i,s,a){var u=this,r=_(i.Types.values()).filter("numeric").map("name").value();function o(){n(function(){e.find(".optionsForm input").first().trigger("focus")})}function l(){var e=u.selectedMessage||{},t=c(e);u.valuesData=[];var n=u.valuesData,s=0,a=i.findMessageForInstruction(u.instruction,u.messages);_.forEach(e.mandatoryValues,function(e){e.mandatory=!0}),_.forEach(t,function(e){s+=1,e.order=s,function(e){return!e.value&&e.type!==i.Types.DATE.name}(e)&&n.push(e)}),function(n){var e=c(u.selectedMessage||{});_.forEach(e,function(e,t){e.inputValue=n?void 0:u.values[t],_.includes(r,e.type)&&!_.isUndefined(e.inputValue)&&(e.inputValue=Number(e.inputValue))})}(!(e&&a===e)),o()}function c(e){var t=_.union(e.mandatoryValues,e.customValues,e.values);return _.reject(t,"value")}function m(e){var t=u.editInstruction;u.messages=e,_.forEach(u.messages,function(e){"INVENTORY"===e.api&&("PUT"===e.method?e.byId?d(e.mandatoryValues,a("ID")):(d(e.mandatoryValues,a("External ID")),_.isEmpty(e.externalIdType)&&d(e.mandatoryValues,a("External ID type"))):"POST"===e.method&&(_.isEmpty(e.externalIdType)&&d(e.mandatoryValues,a("External ID type")),d(e.mandatoryValues,a("External ID"))))}),u.selectedMessage=i.findMessageForInstruction(t,u.messages),"sleep"!==t.type&&l(),o()}function d(e,t){_.some(e,function(e){return e.label===t})||e.unshift({label:t,type:"STRING"})}_.assign(u,{$onInit:function(){_.assign(u,{icons:s.icons})},$onChanges:function(){u.editInstruction=_.clone(u.instruction);var e=u.editInstruction;e&&((u.messages?t.when(u.messages):i.listAllPublishMessages()).then(m),u.values=e.values||[]);delete u.valuesForm},onSelectedMessage:l,remove:function(){u.simulatorCtrl.remove(u.instruction)},canSave:function(e){var t=e.$valid,n=u.instruction,s=u.selectedMessage,a=_.includes(["message","builtin"],n&&n.type);(!n||a&&!s)&&(t=!1);return t},save:function(){var e=u.instruction,t=u.editInstruction;if(delete e.isNew,"sleep"===e.type)e.seconds=t.seconds;else{var n=u.selectedMessage,s=c(n);e.type=n._template?"message":"builtin",e.values=_.map(s,function(e){var t=_([e.value,e.inputValue]).reject(_.isNil).reject(function(e){return""===e}).head();return _.isUndefined(t)?"":t}),e.messageId=n.msgId,e.templateId=n._template?n._template.__externalId:void 0}u.simulatorCtrl.saveCurrentSimulatorCommands()},cancel:function(){u.instruction.isNew?u.simulatorCtrl.remove(u.instruction):u.simulatorCtrl.selectInstruction()}})}e.$inject=["$q","$element","$timeout","c8ySimulators","c8ySimulatorsUi","gettext"],angular.module("c8y.simulators").component("c8ySimulatorInstructionDetail",{templateUrl:":::PLUGIN_PATH:::/detail/instructionDetail.html",require:{simulatorCtrl:"^c8ySimulatorDetail"},bindings:{instruction:"<"},controllerAs:"vm",controller:e})}();

package/simulators/detail/instructionDetail.html

@@ -91,7 +91,10 @@
 
   <div ng-switch-default>
     <div class="form-group" ng-repeat="val in vm.valuesData" ng-if="vm.editInstruction.type">
-      <label ng-bind="(val.path || val.label) | translate | humanize2" style="z-index: 0"></label>
+      <label
+        style="z-index: 0"
+        ng-bind="(val.path | translate | humanize2) || (val.label | translate)"
+      ></label>
       <c8y-smart-rest-value-input
         name="'field' + val.order"
         value="val.inputValue"