@c8y/ng1-modules 1021.81.0 → 1022.4.2

package/scada/views/componentConfig.html

@@ -1,9 +1,8 @@
 <div
-  class="p-t-8"
   ng-controller="ScadaWidgetConfigCtrl as ctrl"
 >
-  <div>
-    <label>
+  <fieldset class="c8y-fieldset">
+    <legend class="d-flex a-i-center">
       <span translate>SVG</span>
       <button
         class="btn-help btn-help--sm"
@@ -15,7 +14,7 @@
         popover-append-to-body="true"
         ng-click="svgTooltipVisible = !svgTooltipVisible"
       ></button>
-    </label>
+    </legend>
 
     <div
       class="alert alert-info text-left"
@@ -24,33 +23,33 @@
       <p translate>
         For placeholder to be recognized it needs to be used at least once in curly braces with no
         other expression, for example,
-        <var ng-bind-html="'\{\{&nbsp;placeholderName`KEEP_ORIGINAL`&nbsp;\}\}'"></var>
+        <code ng-bind-html="'\{\{&nbsp;placeholderName`KEEP_ORIGINAL`&nbsp;\}\}'"></code>
         . Then you can use this placeholderName`KEEP_ORIGINAL` in bindings handled by Angular. There
         are also predefined functions available:
       </p>
-      <ul>
+      <ul class="p-l-16">
         <li>
-          <var ng-non-bindable>goToGroupDetails(groupId)</var>
+          <code ng-non-bindable>goToGroupDetails(groupId)</code>
           &ndash;
           <translate>
             takes the group ID and redirects the user to the group details view, for example:
           </translate>
           <br />
-          <var ng-non-bindable>&lt;… ng-click="goToGroupDetails(groupId)"&gt;</var>
+          <code ng-non-bindable>&lt;… ng-click="goToGroupDetails(groupId)"&gt;</code>
           ,
         </li>
         <li>
-          <var ng-non-bindable>goToDeviceDetails(deviceId)</var>
+          <code ng-non-bindable>goToDeviceDetails(deviceId)</code>
           &ndash;
           <translate>
             takes the device ID and redirects the user to the device details view, for example:
           </translate>
           <br />
-          <var ng-non-bindable>&lt;… ng-click="goToDeviceDetails(deviceId)"&gt;</var>
+          <code ng-non-bindable>&lt;… ng-click="goToDeviceDetails(deviceId)"&gt;</code>
           ,
         </li>
         <li>
-          <var ng-non-bindable>getActiveAlarmsStatusClass(alarmsStatus)</var>
+          <code ng-non-bindable>getActiveAlarmsStatusClass(alarmsStatus)</code>
           &ndash;
           <translate>
             takes the alarm status object and returns a CSS class that can be used for styling:
@@ -58,13 +57,21 @@
             critical`KEEP_ORIGINAL`, for example:
           </translate>
           <br />
-          <var ng-non-bindable>&lt;… ng-class="getActiveAlarmsStatusClass(alarmsStatus)"&gt;</var>
+          <code ng-non-bindable>&lt;… ng-class="getActiveAlarmsStatusClass(alarmsStatus)"&gt;</code>
           .
         </li>
       </ul>
     </div>
-
     <div class="form-group">
+      <file-picker
+        files="ctrl.files"
+        multiple="false"
+        display-drop-zone="false"
+        on-file-selected="ctrl.onSelectFile(ctrl.files[0].file)"
+      ></file-picker>
+      <input type="hidden" />
+    </div>
+    <div class="form-group form-group-sm">
       <label
         for="sanitization"
         translate
@@ -100,16 +107,8 @@
         </select>
       </div>
     </div>
-    <div class="form-group">
-      <file-picker
-        files="ctrl.files"
-        multiple="false"
-        display-drop-zone="false"
-        on-file-selected="ctrl.onSelectFile(ctrl.files[0].file)"
-      ></file-picker>
-      <input type="hidden" />
-    </div>
-  </div>
+  </fieldset>
+
   <div class="form-group p-t-16">
     <label class="input-group">{{ 'Preview' | translate }}</label>
     <span
@@ -149,6 +148,7 @@
       </div>
     </div>
   </div>
+  
   <div
     name="mapping"
     c8y-scada-mapping

package/scada/views/mapping.html

@@ -1,5 +1,5 @@
-<div class="svg-mappings">
-  <label>{{ 'Mappings' | translate }}</label>
+<fieldset class="c8y-fieldset svg-mappings">
+  <legend>{{ 'Mappings' | translate }}</legend>
   <ul class="c8y-list__group c8y-list__group--strip">
     <li class="c8y-list__item" ng-repeat="mapping in mappings | orderBy:'placeholder'">
       <div class="c8y-list__item__block d-block">
@@ -60,7 +60,7 @@
                 </span>
               </div>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-8">
               <label class="text-label-small d-block" translate>Current value</label>
               <div class="form-control-static" title="{{ propertyValueFor(mapping) }}">
                 <span class="text-truncate text-monospace">
@@ -68,46 +68,48 @@
                 </span>
               </div>
             </div>
-            <div class="col-md-4">
+            <div class="col-xs-12">
               <label class="text-label-small d-block" translate>Actions</label>
-              <button
-                class="btn btn-default btn-sm"
-                type="button"
-                uib-tooltip="{{ 'Clear mapping' | translate }}"
-                tooltip-append-to-body="true"
-                tooltip-popup-delay="500"
-                aria-label="{{ 'Clear mapping' | translate }}"
-                ng-click="clearMapping(mapping)"
-                ng-disabled="!mapping.config"
-              >
-                <i c8y-icon="delete-document"></i>
-              </button>
-              <button
-                class="btn btn-default btn-sm"
-                type="button"
-                uib-tooltip="{{ 'Assign fieldbus property' | translate }}"
-                tooltip-append-to-body="true"
-                tooltip-popup-delay="500"
-                aria-label="{{ 'Assign fieldbus property' | translate }}"
-                ng-click="setFieldbusMapping(mapping)"
-              >
-                <i c8y-icon="tasks"></i>
-              </button>
-              <button
-                class="btn btn-default btn-sm"
-                type="button"
-                uib-tooltip="{{ 'Assign device property' | translate }}"
-                tooltip-append-to-body="true"
-                tooltip-popup-delay="500"
-                aria-label="{{ 'Assign device property' | translate }}"
-                ng-click="setMapping(mapping)"
-              >
-                <i c8y-icon="edit"></i>
-              </button>
+              <div class="btn-group">
+                <button
+                  class="btn btn-default btn-sm"
+                  type="button"
+                  uib-tooltip="{{ 'Clear mapping' | translate }}"
+                  tooltip-append-to-body="true"
+                  tooltip-popup-delay="500"
+                  aria-label="{{ 'Clear mapping' | translate }}"
+                  ng-click="clearMapping(mapping)"
+                  ng-disabled="!mapping.config"
+                >
+                  <i c8y-icon="delete-document"></i>
+                </button>
+                <button
+                  class="btn btn-default btn-sm"
+                  type="button"
+                  uib-tooltip="{{ 'Assign fieldbus property' | translate }}"
+                  tooltip-append-to-body="true"
+                  tooltip-popup-delay="500"
+                  aria-label="{{ 'Assign fieldbus property' | translate }}"
+                  ng-click="setFieldbusMapping(mapping)"
+                >
+                  <i c8y-icon="tasks"></i>
+                </button>
+                <button
+                  class="btn btn-default btn-sm"
+                  type="button"
+                  uib-tooltip="{{ 'Assign device property' | translate }}"
+                  tooltip-append-to-body="true"
+                  tooltip-popup-delay="500"
+                  aria-label="{{ 'Assign device property' | translate }}"
+                  ng-click="setMapping(mapping)"
+                >
+                  <i c8y-icon="edit"></i>
+                </button>
+              </div>
             </div>
           </div>
         </div>
       </div>
     </li>
   </ul>
-</div>
+</fieldset>

package/smartRules/controllers/add.js

@@ -1 +1 @@
-(()=>{function n(n,e,o,c,t,l,r,u){var i=[],a={loading:!0};function s(){a.loading=!1}function f(n){return _.filter(n,function(n){return!n.hideFromList})}function h(n){var t,e=_.keys(l);return 0===e.length?n:_.filter(n,function(n){return!!(n.contexts&&(t=_.keys(n.contexts),0<_.intersection(e,t).length))})}function m(n){return _.filter(n,function(n){return!r||r(n)})}function d(n){n.forEach(function(n){i.push(n)})}function g(){1===i.length&&i[0]._active&&v(i[0])}function v(n){var t,r,i;return t=n._active?c.createInstanceWithUI(n,(i={},n=(r=n).contexts&&_.intersection(_.keys(l),_.keys(r.contexts))||[],_.forEach(n,function(n){var e={obj:l[n]},c={rule:i};_.forEach(r.contexts[n],function(n,t){t=o("obj.".concat(t)),n=o("rule.".concat(n)),t=t(e);null!=t&&n.assign(c,t)})}),_.assign(i,u))).then(e.close):t}n.ruleTemplates=i,n.cancel=function(){e.dismiss()},n.createInstance=v,n.loading=a,t.list().then(f).then(h).then(m).then(d).then(g).finally(s)}n.$inject=["$scope","$uibModalInstance","$parse","smartRulesSvc","smartRuleTemplatesSvc","context","ruleTemplatesFilterFn","ruleInitialObj"],angular.module("c8y.smartRules").controller("SmartRuleAddCtrl",n)})();
+(()=>{function n(n,e,o,c,t,l,r,u){var i=[],a={loading:!0};function s(){a.loading=!1}function f(n){return _.filter(n,function(n){return!n.hideFromList})}function h(n){var t,e=_.keys(l);return 0===e.length?n:_.filter(n,function(n){return!!(n.contexts&&(t=_.keys(n.contexts),0<_.intersection(e,t).length))})}function g(n){return _.filter(n,function(n){return!r||r(n)})}function m(n){n.forEach(function(n){i.push(n)})}function d(){1===i.length&&i[0]._active&&v(i[0])}function v(n){var t,r,i;return t=n._active?c.createInstanceWithUI(n,(i={},n=(r=n).contexts&&_.intersection(_.keys(l),_.keys(r.contexts))||[],_.forEach(n,function(n){var e={obj:l[n]},c={rule:i};_.forEach(r.contexts[n],function(n,t){t=o("obj.".concat(t)),n=o("rule.".concat(n)),t=t(e);null!=t&&n.assign(c,t)})}),_.assign(i,u))).then(e.close):t}n.ruleTemplates=i,n.cancel=function(){e.dismiss()},n.createInstance=v,n.loading=a,n.icon=c.getRuleIcon(),t.list().then(f).then(h).then(g).then(m).then(d).finally(s)}n.$inject=["$scope","$uibModalInstance","$parse","smartRulesSvc","smartRuleTemplatesSvc","context","ruleTemplatesFilterFn","ruleInitialObj"],angular.module("c8y.smartRules").controller("SmartRuleAddCtrl",n)})();

package/smartRules/controllers/list.js

@@ -1 +1 @@
-(()=>{function e(i,r,e,o,t,n,a,P,c,u,l,s,d,f,h,g,m,v){var p,S=r.deviceId||r.groupId,C={},A={},R={done:!1,inProgress:!1},y={true:{text:m("Enabled`rule`"),icon:"check-circle",cls:"text-success"},false:{text:m("Disabled`rule`"),icon:"ban",cls:"text-danger"}},x=s.getContext(),E=m("Global smart rules");function b(){return o.when().then(T).then(k).then(D).then(w).then(I).catch(j)}function T(){R.inProgress=!0}function I(){R.inProgress=!1,R.done=!0,R.error=!1}function j(e){e.data&&e.data.message&&l.danger(e.data.message),R.inProgress=!1,R.done=!0,R.error=!0}function k(){return h.list().then($)}function $(e){_.forEach(e||[],function(e){C[e.name]=e})}function D(){var e=S?g.listByContext(S):o.resolve([]),t=f.hasPermissions().then(function(e){return e?g.list():o.when([])});return o.all({listByContext:e,list:t}).then(function(e){i.rules=(e=>{var t=e;return t=S?_.reject(e,(e=>{var n=new RegExp("".concat(e,"/dashboard"));return function(e){var t=_.get(e,"config.url","");return N(e)&&!n.test(t)}})(S)):t})(_.concat(e.listByContext,e.list))})}function N(e){return"sendDashboardsViaEmail"===e.ruleTemplateName}function O(e){return g.hasSource(e,S)}function w(){var e,t;return!(Array.isArray(i.rules)&&0<i.rules.length)||null===(t=s.getContext()).context?o.resolve():(e=a.childAssets(t.id,{skipDetail:!0,params:{pageSize:2e3,withChildren:!1}}),t=a.childDevices(t.id,{params:{pageSize:2e3,withChildren:!1}}),o.all([e,t]).then(_.flatten).then(function(e){i.children=e}).then(function(){i.ruleChildren={},_.forEach(i.rules,function(e){i.ruleChildren[e.id]=M(e)})}))}function M(t){return _.filter(i.children,function(e){return g.hasSource(t,e)})}function U(e){var t=_.get(C,"".concat(_.get(e,"ruleTemplateName"),"._active")),n=A.canAddRules;return e&&!t&&(n=!1),_.isUndefined(n)&&(e=i.context?c.isAllowed({adminMOs:[i.context.id]}):o.all({isAllowedInventory:c.isAllowed({anyRole:["ROLE_INVENTORY_ADMIN","ROLE_MANAGED_OBJECT_ADMIN"]}),isAllowedSmartRules:c.isAllowed({anyRole:["ROLE_SMARTRULE_ADMIN","ROLE_CEP_MANAGEMENT_ADMIN"]})}).then(function(e){return e.isAllowedInventory&&e.isAllowedSmartRules}),A.canAddRules=e.then(function(e){return A.canAddRules=e,A.canAddRules}),n=!1),n}function G(t){A.rules=A.rules||{};var n=A.rules,e=n[t.id];return _.isUndefined(e)&&(n[t.id]=c.isAllowed({adminMOs:[t.id]}).then(function(e){return n[t.id]=e,n[t.id]}),e=!1),e}function L(e){var t=!0;return t=x.context!==s.CONTEXT.DEVICE&&x.context!==s.CONTEXT.GROUP?t:t&&e&&"c8y_SmartRule"!==e.type}_.assign(i,{isOpen:{},moId:S,loadingStatus:R,refresh:b,paging:{refresh:b},ruleTemplates:C,getLinkToDM:function(){var e={deviceId:S};return t(p||"")(e)},add:function(){g.addNewWithUI().then(b)},edit:function(e){g.editWithUI(e).then(b)},clone:function(e){var t=e&&e.c8y_Context&&e.c8y_Context.id;(t?g.cloneWithUI(e,t,!0):g.cloneWithUI(e)).then(b)},remove:function(e){u({title:m("Delete smart rule"),body:v.getString('You are about to delete smart rule "{{name}}". Do you want to proceed?',e),labels:{ok:m("Delete")},status:"danger"}).then(angular.bind(g,g.remove,e)).then(function(){return _.pull(i.rules,e)}).then(function(){return l.success(m("Smart rule deleted."))})},hasSource:O,getChildrenEnabledForSmartRule:M,toggleRuleActivationForContextMO:function(e){if(O(e))return g.deactivate(e,S,!1).then(function(){l.success(v.getString('Smart rule "{{name}}" deactivated.',e))});return g.activate(e,S,!1).then(function(){l.success(v.getString('Smart rule "{{name}}" activated.',e))})},toggleRuleActivationForChildrenMOs:function(e,n){var t=_.filter(n,function(t){return!_.find(i.ruleChildren[e.id],function(e){return e.id===t.id})}),r=_.filter(i.ruleChildren[e.id],function(t){return!_.find(n,function(e){return t.id===e.id})});return g.updateSources(e,t,r,!1).then(D).then(w).then(function(){l.success(v.getString('Smart rule "{{name}}" activated/deactivated for children.',e))})},tooltip:function(e){var t={activate:{"for group":m("Activate for this group"),"for device":m("Activate for this device"),"for object":m("Activate for this object")},deactivate:{"for group":m("Deactivate for this group"),"for device":m("Deactivate for this device"),"for object":m("Deactivate for this object")}},e=e.enabled&&O(e)?"deactivate":"activate",n=r.groupId?s.CONTEXT.GROUP:"object";return n=r.deviceId?s.CONTEXT.DEVICE:n,t[e]["for ".concat(n)]},type:function(e){var t,e=C[e.ruleTemplateName];e&&(t=e.label.full?v.getString(e.label.full):"".concat(v.getString(e.label.input)," ").concat(v.getString(e.label.output)));return t},status:function(e){return y[e.enabled].text},statusIcon:function(e){return y[e.enabled].icon},statusClass:function(e){return y[e.enabled].cls},showTitle:function(){return null!==s.getContext().context},title:E,context:x,inputIcon:function(e){var t,e=C[e.ruleTemplateName];e&&(t=e.paramGroups.input.icon);return t},outputIcon:function(e){var t,e=C[e.ruleTemplateName];e&&(t=e.paramGroups.output.icon);return t},canAddRules:U,canDuplicate:function(e){return U(e)&&L(e)},canEdit:function(e){return G(e)&&L(e)},canRemove:G,canModify:G,canApplyOnChildren:function(e){return!N(e)},canSeeSection:function(){var e=A.canSeeSection;_.isUndefined(e)&&(A.canSeeSection=(n.checkIfModulesExist(["c8y.cockpit.config"])?f.shouldShowLocalSmartRules():o.when(!1)).then(function(e){return A.canSeeSection=e,A.canSeeSection}),e=!1);return e},isConfigurationGlobalSmartRulesContext:void 0,getRuleCardTitle:function(e){return"c8y_SmartRule"===e.type?m("Global smart rule"):m("Local smart rule")}}),i.isConfigurationGlobalSmartRulesContext=e.path().includes("/rules"),b(),null===s.getContext().context&&d.changeTitle({title:E}),x.context===s.CONTEXT.DEVICE&&n.getStaticLinkTemplate("devicemanagementDeviceDetails").then(function(e){p=e})}e.$inject=["$scope","$routeParams","$location","$q","$interpolate","c8yBase","c8yInventory","c8yApplication","c8yPermissions","c8yModal","c8yAlert","c8yUiUtil","c8yTitle","c8ySmartRulesAvailability","smartRuleTemplatesSvc","smartRulesSvc","gettext","gettextCatalog"],angular.module("c8y.smartRules").controller("SmartRulesListCtrl",e)})();
+(()=>{function e(i,r,e,o,t,n,a,P,c,u,l,s,d,f,h,g,m,v){var p,S=r.deviceId||r.groupId,C={},R={},A={done:!1,inProgress:!1},y={true:{text:m("Enabled`rule`"),icon:"check-circle",cls:"text-success"},false:{text:m("Disabled`rule`"),icon:"ban",cls:"text-danger"}},x=s.getContext(),E=m("Global smart rules");function b(){return o.when().then(I).then(k).then(D).then(w).then(T).catch(j)}function I(){A.inProgress=!0}function T(){A.inProgress=!1,A.done=!0,A.error=!1}function j(e){e.data&&e.data.message&&l.danger(e.data.message),A.inProgress=!1,A.done=!0,A.error=!0}function k(){return h.list().then($)}function $(e){_.forEach(e||[],function(e){C[e.name]=e})}function D(){var e=S?g.listByContext(S):o.resolve([]),t=f.hasPermissions().then(function(e){return e?g.list():o.when([])});return o.all({listByContext:e,list:t}).then(function(e){i.rules=(e=>{var t=e;return t=S?_.reject(e,(e=>{var n=new RegExp("".concat(e,"/dashboard"));return function(e){var t=_.get(e,"config.url","");return N(e)&&!n.test(t)}})(S)):t})(_.concat(e.listByContext,e.list))})}function N(e){return"sendDashboardsViaEmail"===e.ruleTemplateName}function O(e){return g.hasSource(e,S)}function w(){var e,t;return!(Array.isArray(i.rules)&&0<i.rules.length)||null===(t=s.getContext()).context?o.resolve():(e=a.childAssets(t.id,{skipDetail:!0,params:{pageSize:2e3,withChildren:!1}}),t=a.childDevices(t.id,{params:{pageSize:2e3,withChildren:!1}}),o.all([e,t]).then(_.flatten).then(function(e){i.children=e}).then(function(){i.ruleChildren={},_.forEach(i.rules,function(e){i.ruleChildren[e.id]=M(e)})}))}function M(t){return _.filter(i.children,function(e){return g.hasSource(t,e)})}function U(e){var t=_.get(C,"".concat(_.get(e,"ruleTemplateName"),"._active")),n=R.canAddRules;return e&&!t&&(n=!1),_.isUndefined(n)&&(e=i.context?c.isAllowed({adminMOs:[i.context.id]}):o.all({isAllowedInventory:c.isAllowed({anyRole:["ROLE_INVENTORY_ADMIN","ROLE_MANAGED_OBJECT_ADMIN"]}),isAllowedSmartRules:c.isAllowed({anyRole:["ROLE_SMARTRULE_ADMIN","ROLE_CEP_MANAGEMENT_ADMIN"]})}).then(function(e){return e.isAllowedInventory&&e.isAllowedSmartRules}),R.canAddRules=e.then(function(e){return R.canAddRules=e,R.canAddRules}),n=!1),n}function G(t){R.rules=R.rules||{};var n=R.rules,e=n[t.id];return _.isUndefined(e)&&(n[t.id]=c.isAllowed({adminMOs:[t.id]}).then(function(e){return n[t.id]=e,n[t.id]}),e=!1),e}function L(e){var t=!0;return t=x.context!==s.CONTEXT.DEVICE&&x.context!==s.CONTEXT.GROUP?t:t&&e&&"c8y_SmartRule"!==e.type}_.assign(i,{isOpen:{},moId:S,loadingStatus:A,refresh:b,paging:{refresh:b},ruleTemplates:C,getLinkToDM:function(){var e={deviceId:S};return t(p||"")(e)},add:function(){g.addNewWithUI().then(b)},edit:function(e){g.editWithUI(e).then(b)},clone:function(e){var t=e&&e.c8y_Context&&e.c8y_Context.id;(t?g.cloneWithUI(e,t,!0):g.cloneWithUI(e)).then(b)},remove:function(e){u({title:m("Delete smart rule"),body:v.getString('You are about to delete smart rule "{{name}}". Do you want to proceed?',e),labels:{ok:m("Delete")},status:"danger"}).then(angular.bind(g,g.remove,e)).then(function(){return _.pull(i.rules,e)}).then(function(){return l.success(m("Smart rule deleted."))})},hasSource:O,getChildrenEnabledForSmartRule:M,toggleRuleActivationForContextMO:function(e){if(O(e))return g.deactivate(e,S,!1).then(function(){l.success(v.getString('Smart rule "{{name}}" deactivated.',e))});return g.activate(e,S,!1).then(function(){l.success(v.getString('Smart rule "{{name}}" activated.',e))})},toggleRuleActivationForChildrenMOs:function(e,n){var t=_.filter(n,function(t){return!_.find(i.ruleChildren[e.id],function(e){return e.id===t.id})}),r=_.filter(i.ruleChildren[e.id],function(t){return!_.find(n,function(e){return t.id===e.id})});return g.updateSources(e,t,r,!1).then(D).then(w).then(function(){l.success(v.getString('Smart rule "{{name}}" activated/deactivated for children.',e))})},tooltip:function(e){var t={activate:{"for group":m("Activate for this group"),"for device":m("Activate for this device"),"for object":m("Activate for this object")},deactivate:{"for group":m("Deactivate for this group"),"for device":m("Deactivate for this device"),"for object":m("Deactivate for this object")}},e=e.enabled&&O(e)?"deactivate":"activate",n=r.groupId?s.CONTEXT.GROUP:"object";return n=r.deviceId?s.CONTEXT.DEVICE:n,t[e]["for ".concat(n)]},type:function(e){var t,e=C[e.ruleTemplateName];e&&(t=e.label.full?v.getString(e.label.full):"".concat(v.getString(e.label.input)," ").concat(v.getString(e.label.output)));return t},status:function(e){return y[e.enabled].text},statusIcon:function(e){return y[e.enabled].icon},statusClass:function(e){return y[e.enabled].cls},showTitle:function(){return null!==s.getContext().context},title:E,context:x,inputIcon:function(e){var t,e=C[e.ruleTemplateName];e&&(t=e.paramGroups.input.icon);return t},outputIcon:function(e){var t,e=C[e.ruleTemplateName];e&&(t=e.paramGroups.output.icon);return t},canAddRules:U,canDuplicate:function(e){return U(e)&&L(e)},canEdit:function(e){return G(e)&&L(e)},canRemove:G,canModify:G,canApplyOnChildren:function(e){return!N(e)},canSeeSection:function(){var e=R.canSeeSection;_.isUndefined(e)&&(R.canSeeSection=(n.checkIfModulesExist(["c8y.cockpit.config"])?f.shouldShowLocalSmartRules():o.when(!1)).then(function(e){return R.canSeeSection=e,R.canSeeSection}),e=!1);return e},isConfigurationGlobalSmartRulesContext:void 0,getRuleCardTitle:function(e){return"c8y_SmartRule"===e.type?m("Global smart rule"):m("Local smart rule")},getRuleIcon:function(e){return g.getRuleIcon(e)}}),i.isConfigurationGlobalSmartRulesContext=e.path().includes("/rules"),b(),null===s.getContext().context&&d.changeTitle({title:E}),x.context===s.CONTEXT.DEVICE&&n.getStaticLinkTemplate("devicemanagementDeviceDetails").then(function(e){p=e})}e.$inject=["$scope","$routeParams","$location","$q","$interpolate","c8yBase","c8yInventory","c8yApplication","c8yPermissions","c8yModal","c8yAlert","c8yUiUtil","c8yTitle","c8ySmartRulesAvailability","smartRuleTemplatesSvc","smartRulesSvc","gettext","gettextCatalog"],angular.module("c8y.smartRules").controller("SmartRulesListCtrl",e)})();

package/smartRules/list/smartRulesList.component.js

@@ -1 +1 @@
-(()=>{function e(e,r,i,t,n,o,c,a,u,l,s,d,f,h){var m=this,v={},g={},p={done:!1,inProgress:!1},A={true:{text:f("Active`rule`"),icon:"check-circle",cls:"text-success"},false:{text:f("Inactive`rule`"),icon:"ban",cls:"text-warning"}};function R(){return i.when().then(S).then(x).then(b).then(N).then(C).catch(E)}function S(){p.inProgress=!0}function C(){p.inProgress=!1,p.done=!0,p.error=!1}function E(e){e.data&&e.data.message&&a.danger(e.data.message),p.inProgress=!1,p.done=!0,p.error=!0}function x(){return s.list().then(y)}function y(e){_.forEach(e,function(e){v[e.name]=e})}function b(){var e=m.mo?d.listByContext(m.mo):i.resolve([]),t=l.hasPermissions().then(function(e){return e?d.list():i.when([])});return i.all({listByContext:e,list:t}).then(function(e){m.rules=(e=>(m.mo&&(e=_.reject(e,(e=>{var n=new RegExp("".concat(e,"/dashboard"));return function(e){var t=_.get(e,"config.url","");return I(e)&&!n.test(t)}})(m.mo))),e=m.filter?_.filter(e,m.filter):e))(_.concat(e.listByContext,e.list)),"function"==typeof m.onRules&&m.onRules()(m.rules)})}function I(e){return"sendDashboardsViaEmail"===e.ruleTemplateName}function T(e){return d.hasSource(e,m.mo)}function N(){var e,t;return Array.isArray(m.rules)&&0<m.rules.length&&(e=u.getContext(),t=(e=>(e=e.id,m.mo?_.get(m,"mo.id")||m.mo:e))(e),null!==e.context)?n.childAssets(t,{skipDetail:!0,params:{pageSize:2e3,withChildren:!1}}).then(function(e){m.children=e}).then(function(){m.ruleChildren={},_.forEach(m.rules,function(e){m.ruleChildren[e.id]=O(e)})}):i.resolve()}function O(t){return _.filter(m.children,function(e){return t.enabled&&d.hasSource(t,e)})}function w(){var e,t=g.canAddRules;return _.isUndefined(t)&&(e=m.context?c.isAllowed({adminMOs:[m.context.id]}):i.all({isAllowedInventory:c.isAllowed({anyRole:["ROLE_INVENTORY_ADMIN","ROLE_MANAGED_OBJECT_ADMIN"]}),isAllowedSmartRules:c.isAllowed({anyRole:["ROLE_SMARTRULE_ADMIN","ROLE_CEP_MANAGEMENT_ADMIN"]})}).then(function(e){return e.isAllowedInventory&&e.isAllowedSmartRules}),g.canAddRules=e.then(function(e){return g.canAddRules=e,g.canAddRules}),t=!1),t}function D(t){g.rules=g.rules||{};var n=g.rules,e=n[t.id];return _.isUndefined(e)&&(n[t.id]=c.isAllowed({adminMOs:[t.id]}).then(function(e){return n[t.id]=e,n[t.id]}),e=!1),e}function M(e){var t=!0;return t=m.context.context!==u.CONTEXT.DEVICE&&m.context.context!==u.CONTEXT.GROUP&&m.context.context!==u.CONTEXT.APPLICATION&&"ecosystem/microservice/microservices"!==m.context.context?t:t&&e&&"c8y_SmartRule"!==e.type}_.assign(m,{ruleTemplates:v,loadingStatus:p,isOpen:{},listClass:"interact-list",$onInit:function(){m.context=u.getContext(),e.$on("smartRulesListReload",R),R()},add:function(){d.addNewWithUI().then(R)},edit:function(e){d.editWithUI(e,m.mo).then(R)},clone:function(e){d.cloneWithUI(e,m.mo).then(R)},remove:function(e){t({title:f("Delete smart rule"),body:h.getString('You are about to delete smart rule "{{name}}". Do you want to proceed?',e),status:"danger",labels:{ok:f("Delete")}}).then(d.remove.bind(d,e)).then(function(){return _.pull(m.rules,e)}).then(function(){return a.success(f("Smart rule deleted."))})},hasSource:T,getChildrenEnabledForSmartRule:O,toggleRuleActivationForContextMO:function(e){if(e.enabled&&T(e))return d.deactivate(e,m.mo,!1).then(function(){a.success(h.getString('Smart rule "{{name}}" deactivated.',e))});return d.activate(e,m.mo,!1).then(function(){a.success(h.getString('Smart rule "{{name}}" activated.',e))})},toggleRuleActivationForChildrenMOs:function(t,n){var r=[];return _.forEach(n,function(e){_.find(m.ruleChildren[t.id],{id:e.id})||r.push(d.activate(t,e,!1))}),_.forEach(m.ruleChildren[t.id],function(e){_.find(n,{id:e.id})||r.push(d.deactivate(t,e,!1))}),i.all(r).then(b).then(N).then(function(){a.success(h.getString('Smart rule "{{name}}" activated/deactivated for children.',t))})},tooltip:function(e){var t,n={activate:{"for group":f("Activate for this group."),"for device":f("Activate for this device."),"for object":f("Activate for this object.")},deactivate:{"for group":f("Deactivate for this group."),"for device":f("Deactivate for this device."),"for object":f("Deactivate for this object.")}},e=e.enabled&&T(e)?"deactivate":"activate";t=r.deviceId?u.CONTEXT.DEVICE:r.groupId?u.CONTEXT.GROUP:"object";return n[e]["for ".concat(t)]},type:function(e){var t,e=v[e.ruleTemplateName];e&&(t=e.label.full?h.getString(e.label.full):"".concat(h.getString(e.label.input)," ").concat(h.getString(e.label.output)));return t},status:function(e){e=e.enabled&&T(e);return A[e].text},statusIcon:function(e){e=e.enabled&&T(e);return A[e].icon},statusClass:function(e){e=e.enabled&&T(e);return A[e].cls},context:u.getContext(),inputIcon:function(e){var t,e=v[e.ruleTemplateName];e&&(t=e.paramGroups.input.icon);return t},outputIcon:function(e){var t,e=v[e.ruleTemplateName];e&&(t=e.paramGroups.output.icon);return t},canDuplicate:function(e){return w()&&M(e)},canEdit:function(e){return D(e)&&M(e)},canRemove:D,canAddRules:w,canModify:D,canApplyOnChildren:function(e){return!I(e)},canSeeSection:function(){var e=g.canSeeSection;_.isUndefined(e)&&(g.canSeeSection=l.shouldShowLocalSmartRules().then(function(e){return g.canSeeSection=e,g.canSeeSection}),e=!1);return e}}),_.assign(e,{refresh:R,paging:{refresh:R}})}e.$inject=["$scope","$routeParams","$q","c8yModal","c8yInventory","c8yApplication","c8yPermissions","c8yAlert","c8yUiUtil","c8ySmartRulesAvailability","smartRuleTemplatesSvc","smartRulesSvc","gettext","gettextCatalog"],angular.module("c8y.smartRules").component("smartRulesList",{bindings:{mo:"<?",filter:"<?",disableEditAndCreate:"<?",onRules:"&?"},templateUrl:":::PLUGIN_PATH:::/list/smartRulesList.html",controller:e,controllerAs:"vm"})})();
+(()=>{function e(e,r,i,t,n,o,c,a,u,l,s,d,f,h){var m=this,v={},g={},p={done:!1,inProgress:!1},A={true:{text:f("Active`rule`"),icon:"check-circle",cls:"text-success"},false:{text:f("Inactive`rule`"),icon:"ban",cls:"text-warning"}};function R(){return i.when().then(S).then(x).then(b).then(N).then(C).catch(E)}function S(){p.inProgress=!0}function C(){p.inProgress=!1,p.done=!0,p.error=!1}function E(e){e.data&&e.data.message&&a.danger(e.data.message),p.inProgress=!1,p.done=!0,p.error=!0}function x(){return s.list().then(y)}function y(e){_.forEach(e,function(e){v[e.name]=e})}function b(){var e=m.mo?d.listByContext(m.mo):i.resolve([]),t=l.hasPermissions().then(function(e){return e?d.list():i.when([])});return i.all({listByContext:e,list:t}).then(function(e){m.rules=(e=>(m.mo&&(e=_.reject(e,(e=>{var n=new RegExp("".concat(e,"/dashboard"));return function(e){var t=_.get(e,"config.url","");return I(e)&&!n.test(t)}})(m.mo))),e=m.filter?_.filter(e,m.filter):e))(_.concat(e.listByContext,e.list)),"function"==typeof m.onRules&&m.onRules()(m.rules)})}function I(e){return"sendDashboardsViaEmail"===e.ruleTemplateName}function T(e){return d.hasSource(e,m.mo)}function N(){var e,t;return Array.isArray(m.rules)&&0<m.rules.length&&(e=u.getContext(),t=(e=>(e=e.id,m.mo?_.get(m,"mo.id")||m.mo:e))(e),null!==e.context)?n.childAssets(t,{skipDetail:!0,params:{pageSize:2e3,withChildren:!1}}).then(function(e){m.children=e}).then(function(){m.ruleChildren={},_.forEach(m.rules,function(e){m.ruleChildren[e.id]=O(e)})}):i.resolve()}function O(t){return _.filter(m.children,function(e){return t.enabled&&d.hasSource(t,e)})}function w(){var e,t=g.canAddRules;return _.isUndefined(t)&&(e=m.context?c.isAllowed({adminMOs:[m.context.id]}):i.all({isAllowedInventory:c.isAllowed({anyRole:["ROLE_INVENTORY_ADMIN","ROLE_MANAGED_OBJECT_ADMIN"]}),isAllowedSmartRules:c.isAllowed({anyRole:["ROLE_SMARTRULE_ADMIN","ROLE_CEP_MANAGEMENT_ADMIN"]})}).then(function(e){return e.isAllowedInventory&&e.isAllowedSmartRules}),g.canAddRules=e.then(function(e){return g.canAddRules=e,g.canAddRules}),t=!1),t}function D(t){g.rules=g.rules||{};var n=g.rules,e=n[t.id];return _.isUndefined(e)&&(n[t.id]=c.isAllowed({adminMOs:[t.id]}).then(function(e){return n[t.id]=e,n[t.id]}),e=!1),e}function M(e){var t=!0;return t=m.context.context!==u.CONTEXT.DEVICE&&m.context.context!==u.CONTEXT.GROUP&&m.context.context!==u.CONTEXT.APPLICATION&&"ecosystem/microservice/microservices"!==m.context.context?t:t&&e&&"c8y_SmartRule"!==e.type}_.assign(m,{ruleTemplates:v,loadingStatus:p,isOpen:{},listClass:"interact-list",$onInit:function(){m.context=u.getContext(),e.$on("smartRulesListReload",R),R()},add:function(){d.addNewWithUI().then(R)},edit:function(e){d.editWithUI(e,m.mo).then(R)},clone:function(e){d.cloneWithUI(e,m.mo).then(R)},remove:function(e){t({title:f("Delete smart rule"),body:h.getString('You are about to delete smart rule "{{name}}". Do you want to proceed?',e),status:"danger",labels:{ok:f("Delete")}}).then(d.remove.bind(d,e)).then(function(){return _.pull(m.rules,e)}).then(function(){return a.success(f("Smart rule deleted."))})},hasSource:T,getChildrenEnabledForSmartRule:O,toggleRuleActivationForContextMO:function(e){if(e.enabled&&T(e))return d.deactivate(e,m.mo,!1).then(function(){a.success(h.getString('Smart rule "{{name}}" deactivated.',e))});return d.activate(e,m.mo,!1).then(function(){a.success(h.getString('Smart rule "{{name}}" activated.',e))})},toggleRuleActivationForChildrenMOs:function(t,n){var r=[];return _.forEach(n,function(e){_.find(m.ruleChildren[t.id],{id:e.id})||r.push(d.activate(t,e,!1))}),_.forEach(m.ruleChildren[t.id],function(e){_.find(n,{id:e.id})||r.push(d.deactivate(t,e,!1))}),i.all(r).then(b).then(N).then(function(){a.success(h.getString('Smart rule "{{name}}" activated/deactivated for children.',t))})},tooltip:function(e){var t,n={activate:{"for group":f("Activate for this group."),"for device":f("Activate for this device."),"for object":f("Activate for this object.")},deactivate:{"for group":f("Deactivate for this group."),"for device":f("Deactivate for this device."),"for object":f("Deactivate for this object.")}},e=e.enabled&&T(e)?"deactivate":"activate";t=r.deviceId?u.CONTEXT.DEVICE:r.groupId?u.CONTEXT.GROUP:"object";return n[e]["for ".concat(t)]},type:function(e){var t,e=v[e.ruleTemplateName];e&&(t=e.label.full?h.getString(e.label.full):"".concat(h.getString(e.label.input)," ").concat(h.getString(e.label.output)));return t},status:function(e){e=e.enabled&&T(e);return A[e].text},statusIcon:function(e){e=e.enabled&&T(e);return A[e].icon},statusClass:function(e){e=e.enabled&&T(e);return A[e].cls},context:u.getContext(),inputIcon:function(e){var t,e=v[e.ruleTemplateName];e&&(t=e.paramGroups.input.icon);return t},outputIcon:function(e){var t,e=v[e.ruleTemplateName];e&&(t=e.paramGroups.output.icon);return t},canDuplicate:function(e){return w()&&M(e)},canEdit:function(e){return D(e)&&M(e)},canRemove:D,canAddRules:w,canModify:D,canApplyOnChildren:function(e){return!I(e)},canSeeSection:function(){var e=g.canSeeSection;_.isUndefined(e)&&(g.canSeeSection=l.shouldShowLocalSmartRules().then(function(e){return g.canSeeSection=e,g.canSeeSection}),e=!1);return e},getRuleIcon:function(e){return d.getRuleIcon(e)}}),_.assign(e,{refresh:R,paging:{refresh:R}})}e.$inject=["$scope","$routeParams","$q","c8yModal","c8yInventory","c8yApplication","c8yPermissions","c8yAlert","c8yUiUtil","c8ySmartRulesAvailability","smartRuleTemplatesSvc","smartRulesSvc","gettext","gettextCatalog"],angular.module("c8y.smartRules").component("smartRulesList",{bindings:{mo:"<?",filter:"<?",disableEditAndCreate:"<?",onRules:"&?"},templateUrl:":::PLUGIN_PATH:::/list/smartRulesList.html",controller:e,controllerAs:"vm"})})();

package/smartRules/list/smartRulesList.html

@@ -239,7 +239,7 @@
                         ng-if="rule.type !== 'c8y_SmartRule'"
                       >
                         <i
-                          c8y-icon="user-account"
+                          c8y-icon="{{::vm.getRuleIcon(rule)}}"
                           uib-tooltip="{{ 'Local smart rule' | translate }}"
                           tooltip-append-to-body="true"
                         ></i>
@@ -249,7 +249,7 @@
                         ng-if="rule.type === 'c8y_SmartRule'"
                       >
                         <i
-                          c8y-icon="people"
+                          c8y-icon="{{::vm.getRuleIcon(rule)}}"
                           uib-tooltip="{{ 'Global smart rule' | translate }}"
                           tooltip-append-to-body="true"
                         ></i>

package/smartRules/services/smartRules.js

@@ -1 +1 @@
-(()=>{function e(o,r,u,i,n,a,c,l,t,d,s){var f=u.url("service/smartrule"),h="".concat(f,"/smartrules"),m=["id","self","cepModuleId","lastUpdated","creationTime"],p=["type","cepModuleId","creationTime","lastUpdated"];return{permissionsCfgs:{create:[{anyRole:["ROLE_INVENTORY_ADMIN","ROLE_INVENTORY_CREATE","ROLE_MANAGED_OBJECT_ADMIN","ROLE_MANAGED_OBJECT_CREATE"]},{anyRole:["ROLE_CEP_MANAGEMENT_ADMIN","ROLE_SMARTRULE_ADMIN"]}]},getEmpty:function(e){var e=e||n.getContext(),t={type:"c8y_SmartRule",name:"",enabled:!0,config:{}};e.context&&e.id&&(t.c8y_Context=e,t.type="c8y_PrivateSmartRule");return t},list:function(){return r.get(h).then(u.getResData).then(_.property("rules")).then(v)},listByContext:function(e){return r.get(g({moId:e})).then(u.getResData).then(_.property("rules")).then(v)},detail:function(e){e=y({id:e});return r.get(e).then(u.getResData)},save:function(e,t,n){e=e.id?S(e):((e,t,n)=>((e,t,n)=>{n.useMoAsContext&&(e.c8y_Context={id:n.mo.id,context:n.mo.isDevice?"device":"group"}),e.ruleTemplateName=t.name,T(e);t=e,e=n,n=o.when(t);return t.c8y_Context||e.mo?(t.enabledSources=[],t.disabledSources=void 0,n=b(t,e.mo,e.withChildren)):(t.enabledSources=void 0,t.disabledSources=[]),n})(e,t,n).then(_.partial(r.post,y(e,!0))).then(u.getResData))(e,t,n);return e},remove:function(e){e=y(e,!0);return r.delete(e)},hasSource:function(e,t){t=t&&t.id||t;if(!t)return!1;if(e.disabledSources)return!A(e.disabledSources,t);if(e.enabledSources)return A(e.enabledSources,t);return!0},activate:function(e,t,n){return b(e,t,n).then(S)},deactivate:function(e,t,n){return R(e,t,n).then(S)},updateSources:function(e,t,r,u){return((e,t,n)=>t.reduce(function(e,t){return e.then(function(e){return b(e,t,n)})},o.resolve(e)))(e,t,u).then(function(e){return n=u,r.reduce(function(e,t){return e.then(function(e){return R(e,t,n)})},o.resolve(e));var n}).then(S)},addNewWithUI:D,addNewForInputAlarmAndOutputUserWithUI:function(e,t){return D({inputAlarm:e,outputUser:t})},addNewForInputDataPointWithUI:function(e){return D({inputDataPoint:e})},addNewForOutputOperationWithUI:function(e){return D({outputOperation:{template:(e=>u.cleanFields(e,["id","self","status","deviceId","creationTime","failureReason"]))(e)}})},createInstanceWithUI:C,createInstanceWithUIByName:function(e,t){return l.getTemplateByName(e).then(function(e){return C(e,t)})},editWithUI:function(e,t){return U(e,void 0,t)},cloneWithUI:function(e,t,n){return c.current().then(_.partial(N,e)).then(function(e){return U(e,void 0,t,n)})},getRuleModalTitle:E};function v(e){return o.all(_.map(e,function(t){return l.getTemplateForRule(t).then(function(e){return _.isUndefined(e)?null:t})})).then(_.flatten).then(_.filter)}function y(e,t){var n=_.get(e,"c8y_Context.id"),t=t&&n?g({moId:n}):h;return e.id&&(t+="/".concat(e.id)),t}function g(e){return"".concat(f,"/managedObjects/").concat(e.moId,"/smartrules")}function S(e){T(e);var t=y(e,!0),e=u.cleanFields(e,p);return r.put(t,e)}function b(n,e,t){return I(e,t).then(function(e){return _.forEach(e,function(t){_.isArray(n.enabledSources)&&!A(n.enabledSources,t)&&n.enabledSources.push(t),_.isArray(n.disabledSources)&&A(n.disabledSources,t)&&_.remove(n.disabledSources,function(e){return _.toString(e)===_.toString(t)})}),n})}function R(n,e,t){return I(e,t).then(function(e){return _.forEach(e,function(t){_.isArray(n.enabledSources)&&A(n.enabledSources,t)&&_.remove(n.enabledSources,function(e){return _.toString(e)===_.toString(t)}),_.isArray(n.disabledSources)&&!A(n.disabledSources,t)&&n.disabledSources.push(t)}),n})}function I(e,t){var e=e&&e.id||e,n=[];return e&&(n.push(o.when(e)),n.push(((e,t)=>{var n=[];return!0!==t&&!0!==t.assets||n.push(i.childAssets(e)),!0!==t&&!0!==t.devices||n.push(i.childDevices(e)),o.all(n).then(_.flattenDeep).then(_.partialRight(_.map,"id"))})(e,t))),o.all(n).then(_.flattenDeep)}function A(e,t){var n=t.id||t;return _.some(e,function(e){return _.toString(e)===_.toString(n)})}function E(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},e=e.id?"c8y_SmartRule"===e.type?t("Edit global smart rule"):t("Edit local smart rule"):"/rules"===s.path()?t("Add global smart rule"):t("Add local smart rule");return e}function D(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},t=1<arguments.length?arguments[1]:void 0,n=2<arguments.length?arguments[2]:void 0;return a({title:E(),templateUrl:":::PLUGIN_PATH:::/views/add.html",controller:"SmartRuleAddCtrl",ariaLabelledBy:"modal-title",ariaDescribedBy:"modal-body",size:"lg",keyboard:!1,resolve:{context:function(){return _.cloneDeep(e)},ruleInitialObj:function(){return _.cloneDeep(n)},ruleTemplatesFilterFn:function(){return t}}})}function C(e,t){return U(t,e)}function N(e,t){e=_.cloneDeep(e);return(e=u.cleanFields(e,m)).name=d.getString("Duplicate of {{name}}",e),t&&(e.owner=t.id),e}function U(e,t,n,r){return a({templateUrl:":::PLUGIN_PATH:::/views/edit.html",controller:"SmartRuleEditCtrl",size:"sm",keyboard:!1,resolve:{ruleTemplate:function(){return _.cloneDeep(t)},rule:function(){return _.cloneDeep(e)},contextMoId:function(){return _.clone(n)},isCloned:function(){return _.clone(r)}}})}function T(e){e.c8y_Context&&e.c8y_Context.contextData&&delete e.c8y_Context.contextData}}e.$inject=["$q","$http","c8yBase","c8yInventory","c8yUiUtil","c8yModal","c8yUser","smartRuleTemplatesSvc","gettext","gettextCatalog","$location"],angular.module("c8y.smartRules").factory("smartRulesSvc",e)})();
+(()=>{function e(o,r,u,i,n,a,c,l,t,d,s){var f=u.url("service/smartrule"),p="".concat(f,"/smartrules"),m=["id","self","cepModuleId","lastUpdated","creationTime"],h=["type","cepModuleId","creationTime","lastUpdated"];return{permissionsCfgs:{create:[{anyRole:["ROLE_INVENTORY_ADMIN","ROLE_INVENTORY_CREATE","ROLE_MANAGED_OBJECT_ADMIN","ROLE_MANAGED_OBJECT_CREATE"]},{anyRole:["ROLE_CEP_MANAGEMENT_ADMIN","ROLE_SMARTRULE_ADMIN"]}]},getEmpty:function(e){var e=e||n.getContext(),t={type:"c8y_SmartRule",name:"",enabled:!0,config:{}};e.context&&e.id&&(t.c8y_Context=e,t.type="c8y_PrivateSmartRule");return t},list:function(){return r.get(p).then(u.getResData).then(_.property("rules")).then(y)},listByContext:function(e){return r.get(g({moId:e})).then(u.getResData).then(_.property("rules")).then(y)},detail:function(e){e=v({id:e});return r.get(e).then(u.getResData)},save:function(e,t,n){e=e.id?S(e):((e,t,n)=>((e,t,n)=>{n.useMoAsContext&&(e.c8y_Context={id:n.mo.id,context:n.mo.isDevice?"device":"group"}),e.ruleTemplateName=t.name,T(e);t=e,e=n,n=o.when(t);return t.c8y_Context||e.mo?(t.enabledSources=[],t.disabledSources=void 0,n=R(t,e.mo,e.withChildren)):(t.enabledSources=void 0,t.disabledSources=[]),n})(e,t,n).then(_.partial(r.post,v(e,!0))).then(u.getResData))(e,t,n);return e},remove:function(e){e=v(e,!0);return r.delete(e)},hasSource:function(e,t){t=t&&t.id||t;if(!t)return!1;if(e.disabledSources)return!A(e.disabledSources,t);if(e.enabledSources)return A(e.enabledSources,t);return!0},activate:function(e,t,n){return R(e,t,n).then(S)},deactivate:function(e,t,n){return b(e,t,n).then(S)},updateSources:function(e,t,r,u){return((e,t,n)=>t.reduce(function(e,t){return e.then(function(e){return R(e,t,n)})},o.resolve(e)))(e,t,u).then(function(e){return n=u,r.reduce(function(e,t){return e.then(function(e){return b(e,t,n)})},o.resolve(e));var n}).then(S)},addNewWithUI:D,addNewForInputAlarmAndOutputUserWithUI:function(e,t){return D({inputAlarm:e,outputUser:t})},addNewForInputDataPointWithUI:function(e){return D({inputDataPoint:e})},addNewForOutputOperationWithUI:function(e){return D({outputOperation:{template:(e=>u.cleanFields(e,["id","self","status","deviceId","creationTime","failureReason"]))(e)}})},createInstanceWithUI:C,createInstanceWithUIByName:function(e,t){return l.getTemplateByName(e).then(function(e){return C(e,t)})},editWithUI:function(e,t){return U(e,void 0,t)},cloneWithUI:function(e,t,n){return c.current().then(_.partial(N,e)).then(function(e){return U(e,void 0,t,n)})},getRuleModalTitle:E,getRuleIcon:function(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};e=e.id?"c8y_SmartRule"===e.type?"c8y-smart-rules":"installing-updates":"/rules"===s.path()?"c8y-smart-rules":"installing-updates";return e}};function y(e){return o.all(_.map(e,function(t){return l.getTemplateForRule(t).then(function(e){return _.isUndefined(e)?null:t})})).then(_.flatten).then(_.filter)}function v(e,t){var n=_.get(e,"c8y_Context.id"),t=t&&n?g({moId:n}):p;return e.id&&(t+="/".concat(e.id)),t}function g(e){return"".concat(f,"/managedObjects/").concat(e.moId,"/smartrules")}function S(e){T(e);var t=v(e,!0),e=u.cleanFields(e,h);return r.put(t,e)}function R(n,e,t){return I(e,t).then(function(e){return _.forEach(e,function(t){_.isArray(n.enabledSources)&&!A(n.enabledSources,t)&&n.enabledSources.push(t),_.isArray(n.disabledSources)&&A(n.disabledSources,t)&&_.remove(n.disabledSources,function(e){return _.toString(e)===_.toString(t)})}),n})}function b(n,e,t){return I(e,t).then(function(e){return _.forEach(e,function(t){_.isArray(n.enabledSources)&&A(n.enabledSources,t)&&_.remove(n.enabledSources,function(e){return _.toString(e)===_.toString(t)}),_.isArray(n.disabledSources)&&!A(n.disabledSources,t)&&n.disabledSources.push(t)}),n})}function I(e,t){var e=e&&e.id||e,n=[];return e&&(n.push(o.when(e)),n.push(((e,t)=>{var n=[];return!0!==t&&!0!==t.assets||n.push(i.childAssets(e)),!0!==t&&!0!==t.devices||n.push(i.childDevices(e)),o.all(n).then(_.flattenDeep).then(_.partialRight(_.map,"id"))})(e,t))),o.all(n).then(_.flattenDeep)}function A(e,t){var n=t.id||t;return _.some(e,function(e){return _.toString(e)===_.toString(n)})}function E(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},e=e.id?"c8y_SmartRule"===e.type?t("Edit global smart rule"):t("Edit local smart rule"):"/rules"===s.path()?t("Add global smart rule"):t("Add local smart rule");return e}function D(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},t=1<arguments.length?arguments[1]:void 0,n=2<arguments.length?arguments[2]:void 0;return a({title:E(),templateUrl:":::PLUGIN_PATH:::/views/add.html",controller:"SmartRuleAddCtrl",ariaLabelledBy:"modal-title",ariaDescribedBy:"modal-body",size:"lg",keyboard:!1,resolve:{context:function(){return _.cloneDeep(e)},ruleInitialObj:function(){return _.cloneDeep(n)},ruleTemplatesFilterFn:function(){return t}}})}function C(e,t){return U(t,e)}function N(e,t){e=_.cloneDeep(e);return(e=u.cleanFields(e,m)).name=d.getString("Duplicate of {{name}}",e),t&&(e.owner=t.id),e}function U(e,t,n,r){return a({templateUrl:":::PLUGIN_PATH:::/views/edit.html",controller:"SmartRuleEditCtrl",size:"sm",keyboard:!1,resolve:{ruleTemplate:function(){return _.cloneDeep(t)},rule:function(){return _.cloneDeep(e)},contextMoId:function(){return _.clone(n)},isCloned:function(){return _.clone(r)}}})}function T(e){e.c8y_Context&&e.c8y_Context.contextData&&delete e.c8y_Context.contextData}}e.$inject=["$q","$http","c8yBase","c8yInventory","c8yUiUtil","c8yModal","c8yUser","smartRuleTemplatesSvc","gettext","gettextCatalog","$location"],angular.module("c8y.smartRules").factory("smartRulesSvc",e)})();

package/smartRules/views/add.html

@@ -1,12 +1,19 @@
 <div class="viewport-modal">
   <div class="modal-header text-center separator">
-    <h1 id="modal-title" class="h3" data-cy="smartRuleAdd--card-header">
-      <i class="c8y-icon c8y-icon-smart-rules c8y-icon-duocolor"></i>
+    <h1
+      class="h3"
+      id="modal-title"
+      data-cy="smartRuleAdd--card-header"
+    >
+      <i c8y-icon="{{ icon }}"></i>
       {{ title | translate }}
     </h1>
   </div>
 
-  <div class="inner-scroll" id="modal-body">
+  <div
+    class="inner-scroll"
+    id="modal-body"
+  >
     <div
       class="alert alert-warning"
       ng-show="ruleTemplates.length == 0 && !loading.loading"
@@ -14,14 +21,17 @@
     >
       No matching smart rules available.
     </div>
-    <div class="d-flex a-i-center j-c-center" ng-show="loading.loading">
+    <div
+      class="d-flex a-i-center j-c-center"
+      ng-show="loading.loading"
+    >
       <c8y-loading></c8y-loading>
     </div>
     <div class="card-group-block smart-rule-templates-list interact-grid">
       <button
-        ng-repeat="ruleTemplate in ruleTemplates"
         class="col-md-4 col-sm-6 col-xs-12 card btn-clean"
         ng-class="{ 'not-active': !ruleTemplate._active, interact: ruleTemplate._active }"
+        ng-repeat="ruleTemplate in ruleTemplates"
         ng-click="createInstance(ruleTemplate)"
       >
         <div class="card-block text-center">
@@ -30,13 +40,25 @@
             <i c8y-icon="arrow-right"></i>
             <span class="dot"><i c8y-icon="{{ ruleTemplate.paramGroups.output.icon }}"></i></span>
           </div>
-          <div ng-if="ruleTemplate.label.full" class="text-pre-normal">
-            <span class="caption" title="{{ ruleTemplate.label.full | translate }}">
+          <div
+            class="text-pre-normal"
+            ng-if="ruleTemplate.label.full"
+          >
+            <span
+              class="caption"
+              title="{{ ruleTemplate.label.full | translate }}"
+            >
               {{ ruleTemplate.label.full | translate }}
             </span>
           </div>
-          <div ng-if="!ruleTemplate.label.full" class="text-pre-normal">
-            <span class="caption caption-input" title="{{ ruleTemplate.label.input | translate }}">
+          <div
+            class="text-pre-normal"
+            ng-if="!ruleTemplate.label.full"
+          >
+            <span
+              class="caption caption-input"
+              title="{{ ruleTemplate.label.input | translate }}"
+            >
               {{ ruleTemplate.label.input | translate }}
             </span>
             <span
@@ -56,9 +78,9 @@
 
   <div class="modal-footer">
     <button
+      class="btn btn-default"
       title="{{ 'Cancel' | translate }}"
       type="button"
-      class="btn btn-default"
       ng-click="cancel()"
     >
       {{ 'Cancel' | translate }}

package/smartRules/views/list.html

@@ -216,9 +216,10 @@
                       class="text-center text-muted m-b-16"
                       data-cy="smartRulesList--card-header"
                     >
-                      <i c8y-icon="c8y-smart-rules"></i>
+                      <i c8y-icon="{{::getRuleIcon(rule)}}"></i>
                       {{ getRuleCardTitle(rule) | translate }}
                     </label>
+
                     <div class="smart-rule-name card-title">
                       {{ rule.name }}
                     </div>
@@ -301,7 +302,7 @@
                         ng-if="rule.type !== 'c8y_SmartRule'"
                       >
                         <i
-                          c8y-icon="user-account"
+                          c8y-icon="{{::getRuleIcon(rule)}}"
                           uib-tooltip="{{ 'Local smart rule' | translate }}"
                           tooltip-popup-delay="500"
                           tooltip-append-to-body="true"
@@ -312,7 +313,7 @@
                         ng-if="rule.type === 'c8y_SmartRule'"
                       >
                         <i
-                          c8y-icon="people"
+                          c8y-icon="{{::getRuleIcon(rule)}}"
                           uib-tooltip="{{ 'Global smart rule' | translate }}"
                           tooltip-popup-delay="500"
                           tooltip-append-to-body="true"

package/trafficLightWidget/states-mapping.html

@@ -1,69 +1,82 @@
-<div class="card-header separator">
-  <div class="card-title h4" translate>States mapping</div>
-</div>
-<div class="alert alert-warning" ng-show="!vm.deviceId || vm.hasInvalidMapping" translate>
-  Select a device and complete the mapping for all light states.
-</div>
-<div class="table-responsive">
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th translate>State</th>
-        <th>
-          <span translate>Property</span>
-          <button
-            class="btn-help btn-help--sm"
-            type="button"
-            aria-label="{{ 'Help' | translate }}"
-            uib-popover="{{
-              'The value of the selected data point or property must be one of the following to have the respective light on: true, 1, any non-empty string or any non-null number.'
-                | translate
-            }}"
-            popover-trigger="'focus'"
-            popover-placement="right"
-            popover-append-to-body="true"
-          ></button>
-        </th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr
-        ng-repeat="(state, stateText) in vm.states"
-        ng-class="{ danger: vm.isMappingInvalidForState(state) }"
-      >
-        <td>{{ stateText | translate }}</td>
-        <td ng-switch="vm.mapping[state].computed">
-          <button
-            class="btn btn-xs btn-default"
-            type="button"
-            ng-switch-when="true"
-            ng-click="vm.editComputedProperty(vm.mapping[state])"
-          >
-            <i c8y-icon="bolt"></i>
-            {{ vm.humanizeProperty(vm.mapping[state]) }}
-          </button>
-          <span ng-switch-default>{{ vm.humanizeProperty(vm.mapping[state]) }}</span>
-        </td>
-        <td class="text-right">
-          <button
-            class="btn btn-primary btn-xs showOnHover"
-            type="button"
-            title="{{ 'Select device property' | translate }}"
-            ng-click="vm.selectDevicePropertyForState(state)"
-          >
-            <i c8y-icon="pencil"></i>
-          </button>
-          <button
-            class="btn btn-primary btn-xs showOnHover"
-            type="button"
-            title="{{ 'Select fieldbus property' | translate }}"
-            ng-click="vm.selectFieldbusPropertyForState(state)"
-          >
-            <i c8y-icon="tasks"></i>
-          </button>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</div>
+<fieldset class="c8y-fieldset">
+  <legend translate>States mapping</legend>
+  <div class="alert alert-warning" ng-show="!vm.deviceId || vm.hasInvalidMapping" translate>
+    Select a device and complete the mapping for all light states.
+  </div>
+
+  <div class="table-responsive">
+    <table class="table table-condensed bg-inherit" style="table-layout: fixed">
+      <colgroup>
+        <col style="width: 25%" />
+        <col style="width: 50%" />
+        <col style="width: 25%" />
+      <thead>
+        <tr>
+          <th translate>State</th>
+          <th>
+            <span translate>Property</span>
+            <button
+              class="btn-help btn-help--sm"
+              type="button"
+              aria-label="{{ 'Help' | translate }}"
+              uib-popover="{{
+                'The value of the selected data point or property must be one of the following to have the respective light on: true, 1, any non-empty string or any non-null number.'
+                  | translate
+              }}"
+              popover-trigger="'focus'"
+              popover-placement="right"
+              popover-append-to-body="true"
+            ></button>
+          </th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr
+          ng-repeat="(state, stateText) in vm.states"
+          ng-class="{ danger: vm.isMappingInvalidForState(state) }"
+        >
+          <td>{{ stateText | translate }}</td>
+          <td ng-switch="vm.mapping[state].computed">
+            <button
+              class="btn btn-xs btn-default"
+              type="button"
+              ng-switch-when="true"
+              ng-click="vm.editComputedProperty(vm.mapping[state])"
+            >
+              <i c8y-icon="bolt"></i>
+              {{ vm.humanizeProperty(vm.mapping[state]) }}
+            </button>
+            <span ng-switch-default>{{ vm.humanizeProperty(vm.mapping[state]) }}</span>
+          </td>
+          <td class="">
+            <div class="d-flex j-c-end">
+              <button
+                class="btn btn-dot"
+                type="button"
+                aria-label="{{ 'Select device property' | translate }}"
+                uib-tooltip="{{ 'Select device property' | translate }}"
+                tooltip-append-to-body="true"
+                tooltip-popup-delay="500"
+                ng-click="vm.selectDevicePropertyForState(state)"
+              >
+                <i c8y-icon="edit"></i>
+              </button>
+              <button
+                class="btn btn-dot"
+                type="button"
+                uib-tooltip="{{ 'Assign fieldbus property' | translate }}"
+                tooltip-append-to-body="true"
+                tooltip-popup-delay="500"
+                aria-label="{{ 'Select fieldbus property' | translate }}"
+                ng-click="vm.selectFieldbusPropertyForState(state)"
+              >
+                <i c8y-icon="tasks"></i>
+              </button>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</fieldset>

package/administration-config/administration-config.module.js

@@ -1 +0,0 @@
-(()=>{function e(e){e.provideSettingsPage()}e.$inject=["c8yRemoteAccessUIProvider"],angular.module("c8y.administrationConfig",["c8y.remoteAccess"]).config(e)})();

package/administration-config/cumulocity.json

@@ -1,13 +0,0 @@
-{
-  "name": "Administration config",
-  "ngModules": [
-    "c8y.administrationConfig"
-  ],
-  "icon": "c8y-shield",
-  "color": "#F2DF0F",
-  "category": "Administration",
-  "description": "Administration config",
-  "js": [
-    "administration-config.module.js"
-  ]
-}