@c8y/ng1-modules 1018.482.19 → 1018.482.34

package/core/ui/directives/keyShortcut.js

@@ -1 +1 @@
-"use strict";!function(){function n(o){return{restrict:"A",link:function(n,t,c){function e(n){t[0].disabled||n.key!==c.c8yKeyShortcut||t[0].click()}o.on("keydown",e),n.$on("$destroy",function(){o.off("keydown",e)})}}}n.$inject=["$document"],angular.module("c8y.ui").directive("c8yKeyShortcut",n)}();
+"use strict";!function(){function t(n){return{restrict:"A",link:function(t,u,r){function e(t){var e,n,o,c,i;e=u[0],n=e.getBoundingClientRect(),o=n.left+1,c=n.right-1,i=n.top+1,n=n.bottom-1,document.elementFromPoint(o,i)!==e||document.elementFromPoint(c,i)!==e||document.elementFromPoint(o,n)!==e||document.elementFromPoint(c,n)!==e||u[0].disabled||t.key!==r.c8yKeyShortcut||u[0].click()}n.on("keydown",e),t.$on("$destroy",function(){n.off("keydown",e)})}}}t.$inject=["$document"],angular.module("c8y.ui").directive("c8yKeyShortcut",t)}();

package/core/ui/views/editRetentionRuleModal.html

@@ -20,6 +20,7 @@
     class="btn btn-default"
     title="{{ 'Cancel' | translate }}"
     ng-click="$dismiss()"
+    c8y-key-shortcut="Escape"
   >
     {{ 'Cancel' | translate }}
   </button>
@@ -28,6 +29,7 @@
     title="{{ 'Save' | translate }}"
     ng-disabled="forms.retentionForm.$invalid || forms.retentionForm.$pristine"
     ng-click="saveWithConfirmation(rule)"
+    c8y-key-shortcut="Enter"
   >
     {{ 'Save' | translate }}
   </button>

package/dataBroker/connectors/connectorEditor.html

@@ -467,7 +467,6 @@
                 class="btn btn-default"
                 title="{{ 'Cancel' | translate }}"
                 type="button"
-                ng-if="!vm.connector.id"
                 ng-click="vm.cancel()"
               >
                 {{ 'Cancel' | translate }}

package/kpi/views/list.html

@@ -47,16 +47,16 @@
           <i c8y-icon="circle" ng-style="{ color: dp.color }"></i>
         </td>
 
-        <td ng-if="columnVisible(child.config.options.kpi)">
+        <td ng-if="columnVisible(child.config.options.kpi)" data-cy="datapointlist-kpi">
           {{ dp.label | translate }}
           <small class="text-muted">{{ dp.unit }}</small>
         </td>
 
-        <td class="text-right" ng-if="columnVisible(child.config.options.target)">
+        <td class="text-right" ng-if="columnVisible(child.config.options.target)" data-cy="datapointlist-target">
           <span>{{ dp.target }}</span>
         </td>
 
-        <td class="text-right" ng-if="columnVisible(child.config.options.current)">
+        <td class="text-right" ng-if="columnVisible(child.config.options.current)" data-cy="datapointlist-current">
           <span
             uib-tooltip="{{ times[dp.id] | absoluteDate }}"
             tooltip-popup-delay="500"
@@ -66,15 +66,15 @@
           </span>
         </td>
 
-        <td class="text-right" ng-if="columnVisible(child.config.options.diff)">
+        <td class="text-right" ng-if="columnVisible(child.config.options.diff)" data-cy="datapointlist-diff">
           <span>{{ diff(dp) | number: 2 }}</span>
         </td>
 
-        <td class="text-right" ng-if="columnVisible(child.config.options.diffPercentage)">
+        <td class="text-right" ng-if="columnVisible(child.config.options.diffPercentage)" data-cy="datapointlist-diffPercentage">
           <span>{{ diffPercent(dp) | number: 2 }}</span>
         </td>
 
-        <td class="text-right word-break" ng-if="columnVisible(child.config.options.asset)">
+        <td class="text-right word-break" ng-if="columnVisible(child.config.options.asset)" data-cy="datapointlist-asset">>
           <a class="text-muted" ng-href="#/device/{{ dp.__target.id }}">
             <small>
               <i c8y-icon="cog"></i>

package/package.json

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

package/users/userDetailView/userDetailView.component.js

@@ -1 +1 @@
-"use strict";!function(){function e(a,e,c,n,f,d,l,E,r,t,s,g,h,o,p,m){var i,u,w,R=this,N=(_.assign(R,{cancel:g.gotoList,shouldDisableGlobalRolesCheckbox:M,isUserAndRolesFormPristine:function(){return c.forms.userForm.$pristine&&c.forms.rolesForm.$pristine},isUserFormInvalid:function(){return!(!G(c.currentUser,c.user)||c.hasExternalOrigin)&&c.forms.userForm.$invalid},isRolesFormInvalid:function(){return!M()&&c.forms.rolesForm.$invalid}}),n.userId),T=["business"];function v(){N?d.detail(N).then(function(e){return e.data}).then(A).then(function(){return d.getUserTfaSettings(c.user).then(f.getResData).then(function(e){c.userTfaEnforced=!!e.tfaEnforced})}):(A({enabled:c.isNew=!0}),C(m("New user"),!0))}function A(e){u=e.email,e.devicePermissions=e.devicePermissions||{},c.user=e,c._groups=U(e),c.password.showPassword=c.isNew,c.hasExternalOrigin=d.hasExternalOrigin(e),c.isNew&&(_.forEach(c.groups,function(e){_.includes(T,e.name)&&(c._groups[e.id]=!0)}),w)&&E.warning(g.LOCAL_USER_TEXT),c.hasExternalOrigin&&o.isSsoClearingUserRolesOnEveryLogin().then(function(e){return c.userCanEditRoles=!e,c.userCanEditRoles}).then(function(e){e?E.warning(g.EXTERNAL_ORIGIN_DYNAMIC_ACCESS_MAPPING_EXCEPTION_TEXT):E.warning(g.EXTERNAL_ORIGIN_TEXT)})}function U(e){return _.reduce(_.get(e,"groups.references"),function(e,n){return e[n.group.id]=!0,e},{})}function I(e){c.groups=e}function O(e){c.currentUser=e}function y(n,e){function r(){return E.success(m("User saved."))}var t=1<arguments.length&&void 0!==e?e:"",e=(c.saving=!0,g.gotoList),s=!(n.id&&!n.groups),o=_(c._groups).map(function(e,n){return e&&parseInt(n,10)}).filter().value(),i=s?function(){return l.updateGroups(0<arguments.length&&void 0!==arguments[0]?arguments[0]:n,o)}:function(){return a.resolve()},s=c.forms.rolesForm.$dirty,u=c.password.showPassword;try{(c.hasExternalOrigin?g.warnAboutUserLogOutIfNeeded(n,{rolesChanged:s,passwordChanged:u}).then(function(){return i()}):g.warnAboutUserLogOutIfNeeded(n,{rolesChanged:s,passwordChanged:u}).then(function(){return n.password&&!c.isNew?d.changePassword(n,n.password,t):a.resolve()}).then(function(){return d.current()}).then(function(e){return _.isEqual(e.userName,n.userName)}).then(function(e){p.isActivatedFor("units-conversion")&&(e&&(e=n,e=_.get(n,"measurementUnit.value"),h.set("unit",e)),_.unset(n,"measurementUnit"))}).then(function(e){return d.save(_.omit(n,c.isNew?["measurementUnit"]:["measurementUnit","password"]),e)}).then(f.getResData).then(function(e){return i(e)}).then(function(){return d.setUserTfaSettings(n,{tfaEnforced:!!c.userTfaEnforced})})).then(r).then(e).finally(function(){c.saving=!1})}catch(e){E.danger(e.message),c.saving=!1}}function C(){return r.changeTitle({title:0<arguments.length&&void 0!==arguments[0]?arguments[0]:""},{skipTitleTranslation:!(1<arguments.length&&void 0!==arguments[1]&&arguments[1])})}function L(e){return d.hasRole(e,"ROLE_USER_MANAGEMENT_ADMIN")||d.hasRole(e,"ROLE_USER_MANAGEMENT_CREATE")}function G(e,n){return!(!e||!n)&&(!n.id||(e.id===n.id?d.hasRole(e,"ROLE_USER_MANAGEMENT_OWN_ADMIN"):d.hasRole(e,"ROLE_USER_MANAGEMENT_ADMIN")||d.hasRole(e,"ROLE_USER_MANAGEMENT_CREATE")))}function P(e){return _.get(c.user,"owner")&&i&&!i[e.id]}function M(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:null,n=L(c.currentUser),e=!e||!P(e),r=!!c.userCanEditRoles||!c.hasExternalOrigin;return!(n&&e&&r)}c.checkPassword=function(n){var e=!c.isNew,r=c.password.showPassword||function(e){return e.email!==u}(n);return e&&r?s.currentPassword().then(function(e){return y(n,e)}).catch(function(e){e&&E.danger(f.getResErrorMessage(e)),v()}):y(n)},c.$watch("user.userName",C),c.$watch("user.owner",function(e){e?d.detail(e).then(f.getResData).then(function(e){i=U(e),_.forEach(c._groups,function(e,n){c._groups[n]=e&&i[n]})}):i=null}),c.$watch("_groups",function(e){c.enforcedGroup&&(c.topLevelTfaEnforced=e[c.enforcedGroup.id])},!0),c.canEditUser=G,c.canEditUserGroups=L,c.canActivateUser=function(e,n){return!(!e||!n)&&e.id!==n.id},c.forms={},c.password={},c.saving=!1,c.showAcl=function(){var e=_.get(c.user,"devicePermissions"),e=_.keys(e);return f.getFlag("deprecated")||e.length},c.restrictedByOwner=P,c.$on("$destroy",function(){E.remove({text:g.EXTERNAL_ORIGIN_TEXT,type:"warning"}),E.remove({text:g.EXTERNAL_ORIGIN_DYNAMIC_ACCESS_MAPPING_EXCEPTION_TEXT,type:"warning"}),E.remove({text:g.LOCAL_USER_TEXT,type:"warning"})}),l.list(void 0).then(I).then(o.isSsoEnabled).then(function(e){w=e}).then(v).then(function(){return t.current().then(function(e){return d.getTenantTfaSettings(c.user,e.name)}).then(function(e){c.enforcedGroup=_.find(c.groups,{name:e.enforcedUsersGroup}),c.topLevelTfaEnforced=d.isEnforcedForUser(c.user,e)||c._groups[c.enforcedGroup.id]})}),d.current().then(O),g.userHierarchyActive().then(function(e){R.FEATURE_USER_HIERARCHY=e})}e.$inject=["$q","$injector","$scope","$routeParams","c8yBase","c8yUser","c8yUserGroup","c8yAlert","c8yTitle","c8yTenant","c8yUserUtil","c8yUsersUi","c8yUserPreferences","c8yLoginOptions","c8yBeta","gettext"],angular.module("c8y.users").component("c8yUserDetailView",{templateUrl:":::PLUGIN_PATH:::/userDetailView/userDetailView.html",controller:e,controllerAs:"vm"})}();
+"use strict";!function(){function e(a,D,c,e,f,d,l,E,n,r,t,g,h,s,p,m){var o,i,u,w=this,R=(_.assign(w,{cancel:g.gotoList,shouldDisableGlobalRolesCheckbox:$,isUserAndRolesFormPristine:A,isUserFormInvalid:U,isRolesFormInvalid:I,canSave:function(){return!(c.saving||A()||U()||I())}}),e.userId),v=["business"];function N(){R?d.detail(R).then(function(e){return e.data}).then(T).then(function(){return d.getUserTfaSettings(c.user).then(f.getResData).then(function(e){c.userTfaEnforced=!!e.tfaEnforced})}):(T({enabled:c.isNew=!0}),G(m("New user"),!0))}function T(e){i=e.email,e.devicePermissions=e.devicePermissions||{},c.user=e,c._groups=O(e),c.password.showPassword=c.isNew,c.hasExternalOrigin=d.hasExternalOrigin(e),c.isNew&&(_.forEach(c.groups,function(e){_.includes(v,e.name)&&(c._groups[e.id]=!0)}),u)&&E.warning(g.LOCAL_USER_TEXT),c.hasExternalOrigin&&s.isSsoClearingUserRolesOnEveryLogin().then(function(e){return c.userCanEditRoles=!e,c.userCanEditRoles}).then(function(e){e?E.warning(g.EXTERNAL_ORIGIN_DYNAMIC_ACCESS_MAPPING_EXCEPTION_TEXT):E.warning(g.EXTERNAL_ORIGIN_TEXT)})}function A(){return c.forms.userForm.$pristine&&c.forms.rolesForm.$pristine}function U(){return!!(M(c.currentUser,c.user)&&!c.hasExternalOrigin)&&c.forms.userForm.$invalid}function I(){return!$()&&c.forms.rolesForm.$invalid}function O(e){return _.reduce(_.get(e,"groups.references"),function(e,n){return e[n.group.id]=!0,e},{})}function y(e){c.groups=e}function C(e){c.currentUser=e}function L(n,e){function r(){return E.success(m("User saved."))}var t=1<arguments.length&&void 0!==e?e:"",e=(c.saving=!0,g.gotoList),s=!(n.id&&!n.groups),o=_(c._groups).map(function(e,n){return e&&parseInt(n,10)}).filter().value(),i=s?function(){return l.updateGroups(0<arguments.length&&void 0!==arguments[0]?arguments[0]:n,o)}:function(){return a.resolve()},s=c.forms.rolesForm.$dirty,u=c.password.showPassword;try{(c.hasExternalOrigin?g.warnAboutUserLogOutIfNeeded(n,{rolesChanged:s,passwordChanged:u}).then(function(){return i()}):g.warnAboutUserLogOutIfNeeded(n,{rolesChanged:s,passwordChanged:u}).then(function(){return n.password&&!c.isNew?d.changePassword(n,n.password,t):a.resolve()}).then(function(){return d.current()}).then(function(e){return _.isEqual(e.userName,n.userName)}).then(function(e){p.isActivatedFor("units-conversion")&&(e&&(e=n,e=_.get(n,"measurementUnit.value"),h.set("unit",e)),_.unset(n,"measurementUnit"))}).then(function(e){return d.save(_.omit(n,c.isNew?["measurementUnit"]:["measurementUnit","password"]),e)}).then(f.getResData).then(function(e){return i(e)}).then(function(){return d.setUserTfaSettings(n,{tfaEnforced:!!c.userTfaEnforced})})).then(r).then(e).finally(function(){c.saving=!1})}catch(e){E.danger(e.message),c.saving=!1}}function G(){return n.changeTitle({title:0<arguments.length&&void 0!==arguments[0]?arguments[0]:""},{skipTitleTranslation:!(1<arguments.length&&void 0!==arguments[1]&&arguments[1])})}function P(e){return d.hasRole(e,"ROLE_USER_MANAGEMENT_ADMIN")||d.hasRole(e,"ROLE_USER_MANAGEMENT_CREATE")}function M(e,n){return!(!e||!n)&&(!n.id||(e.id===n.id?d.hasRole(e,"ROLE_USER_MANAGEMENT_OWN_ADMIN"):d.hasRole(e,"ROLE_USER_MANAGEMENT_ADMIN")||d.hasRole(e,"ROLE_USER_MANAGEMENT_CREATE")))}function S(e){return _.get(c.user,"owner")&&o&&!o[e.id]}function $(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:null,n=P(c.currentUser),e=!e||!S(e),r=!!c.userCanEditRoles||!c.hasExternalOrigin;return!(n&&e&&r)}c.checkPassword=function(n){var e=!c.isNew,r=c.password.showPassword||function(e){return e.email!==i}(n);return e&&r?t.currentPassword().then(function(e){return L(n,e)}).catch(function(e){e&&E.danger(f.getResErrorMessage(e)),N()}):L(n)},c.$watch("user.userName",G),c.$watch("user.owner",function(e){e?d.detail(e).then(f.getResData).then(function(e){o=O(e),_.forEach(c._groups,function(e,n){c._groups[n]=e&&o[n]})}):o=null}),c.$watch("_groups",function(e){c.enforcedGroup&&(c.topLevelTfaEnforced=e[c.enforcedGroup.id])},!0),c.canEditUser=M,c.canEditUserGroups=P,c.canActivateUser=function(e,n){return!(!e||!n)&&e.id!==n.id},c.forms={},c.password={},c.saving=!1,c.showAcl=function(){var e=_.get(c.user,"devicePermissions"),e=_.keys(e);return f.getFlag("deprecated")||e.length},c.restrictedByOwner=S,c.$on("$destroy",function(){E.remove({text:g.EXTERNAL_ORIGIN_TEXT,type:"warning"}),E.remove({text:g.EXTERNAL_ORIGIN_DYNAMIC_ACCESS_MAPPING_EXCEPTION_TEXT,type:"warning"}),E.remove({text:g.LOCAL_USER_TEXT,type:"warning"})}),l.list(void 0).then(y).then(s.isSsoEnabled).then(function(e){u=e}).then(N).then(function(){return r.current().then(function(e){return d.getTenantTfaSettings(c.user,e.name)}).then(function(e){c.enforcedGroup=_.find(c.groups,{name:e.enforcedUsersGroup}),c.topLevelTfaEnforced=d.isEnforcedForUser(c.user,e)||c._groups[c.enforcedGroup.id]})}),d.current().then(C),g.userHierarchyActive().then(function(e){w.FEATURE_USER_HIERARCHY=e})}e.$inject=["$q","$injector","$scope","$routeParams","c8yBase","c8yUser","c8yUserGroup","c8yAlert","c8yTitle","c8yTenant","c8yUserUtil","c8yUsersUi","c8yUserPreferences","c8yLoginOptions","c8yBeta","gettext"],angular.module("c8y.users").component("c8yUserDetailView",{templateUrl:":::PLUGIN_PATH:::/userDetailView/userDetailView.html",controller:e,controllerAs:"vm"})}();

package/users/userDetailView/userDetailView.html

@@ -1,20 +1,29 @@
 <c8y-breadcrumbs-set>
   <c8y-breadcrumbs-item
+    icon="c8y-accounts"
     path="#users"
     label="{{ 'Users' | translate }}"
-    icon="c8y-accounts"
   ></c8y-breadcrumbs-item>
   <c8y-breadcrumbs-item
-    label="{{ 'Accounts' | translate }}"
     icon="c8y-accounts"
+    label="{{ 'Accounts' | translate }}"
   ></c8y-breadcrumbs-item>
 </c8y-breadcrumbs-set>
 
 <div class="card content-fullpage d-grid grid__col--6-6--md grid__row--auto-min-content">
-  <form name="forms.userForm" class="d-contents" novalidate>
+  <form
+    class="d-contents"
+    name="forms.userForm"
+    novalidate
+  >
     <div class="inner-scroll bg-level-0">
       <div class="card-header large-padding separator sticky-top">
-        <div class="card-title h4" translate>Identification</div>
+        <div
+          class="card-title h4"
+          translate
+        >
+          Identification
+        </div>
       </div>
       <div class="card-block large-padding">
         <c8y-ui-edit-user
@@ -33,13 +42,25 @@
     </div>
   </form>
 
-  <form name="forms.rolesForm" class="d-contents" novalidate>
+  <form
+    class="d-contents"
+    name="forms.rolesForm"
+    novalidate
+  >
     <div class="bg-level-1 inner-scroll">
       <div class="card-header sticky-top separator">
-        <div class="h4 card-title" translate>Global roles</div>
+        <div
+          class="h4 card-title"
+          translate
+        >
+          Global roles
+        </div>
       </div>
       <ul class="c8y-list__group p-l-16 p-r-16 no-border-last">
-        <li class="c8y-list__item bg-inherit" ng-repeat="group in groups | orderBy: 'name'">
+        <li
+          class="c8y-list__item bg-inherit"
+          ng-repeat="group in groups | orderBy: 'name'"
+        >
           <div class="c8y-list__item__block">
             <div class="c8y-list__item__body p-l-0">
               <label
@@ -49,21 +70,24 @@
                 }"
               >
                 <input
-                  type="checkbox"
                   id="{{ 'groupcheckbox' + $index }}"
+                  type="checkbox"
                   ng-model="_groups[group.id]"
                   ng-disabled="vm.shouldDisableGlobalRolesCheckbox(group)"
                 />
                 <span></span>
-                <span title="{{ ::group.name | translate }}" class="text-normal d-flex">
+                <span
+                  class="text-normal d-flex"
+                  title="{{ ::group.name | translate }}"
+                >
                   <div>
                     {{::group.name | translate}}
                     <p class="small text-muted">{{::group.description | translate}}</p>
                   </div>
                   <button
                     class="m-l-auto btn-clean"
-                    type="button"
                     aria-label="{{ 'Global roles' | translate }}"
+                    type="button"
                     uib-popover="{{
                       'Only global roles defined on the owner can be defined on the owned user.'
                         | translate
@@ -74,7 +98,10 @@
                     ng-click="$event.preventDefault()"
                     ng-show="restrictedByOwner(group)"
                   >
-                    <i c8y-icon="exclamation-circle" class="text-warning"></i>
+                    <i
+                      class="text-warning"
+                      c8y-icon="exclamation-circle"
+                    ></i>
                   </button>
                 </span>
               </label>
@@ -83,9 +110,17 @@
         </li>
       </ul>
 
-      <div ng-if="showAcl()" class="bg-inherit card--grid__separator-top--white">
+      <div
+        class="bg-inherit card--grid__separator-top--white"
+        ng-if="showAcl()"
+      >
         <div class="card-header large-padding sticky-top separator">
-          <div class="h4" translate>User permissions</div>
+          <div
+            class="h4"
+            translate
+          >
+            User permissions
+          </div>
         </div>
         <div class="card-block large-padding">
           <c8y-acl-editor acl="user.devicePermissions"></c8y-acl-editor>
@@ -96,21 +131,23 @@
 
   <div class="card-footer large-padding separator grid__col--fullspan">
     <button
+      class="btn btn-default"
       title="{{ 'Cancel' | translate }}"
       type="button"
-      class="btn btn-default"
       ng-click="vm.cancel()"
+      c8y-key-shortcut="Escape"
     >
       {{ 'Cancel' | translate }}
     </button>
     <button
       class="btn btn-primary"
-      type="button"
-      title="{{ 'Save' | translate }}"
       ng-class="{ 'btn-save': showPassword }"
+      title="{{ 'Save' | translate }}"
+      type="button"
       ng-if="canEditUser(currentUser, user)"
-      ng-disabled="saving || vm.isUserAndRolesFormPristine() || vm.isUserFormInvalid() || vm.isRolesFormInvalid()"
+      ng-disabled="!vm.canSave()"
       ng-click="checkPassword(user)"
+      c8y-key-shortcut="Enter"
     >
       {{ 'Save' | translate }}
     </button>