@c8y/ng1-modules 1019.5.6 → 1019.6.3

package/core/ui/user/editUser.directive.html

@@ -26,9 +26,10 @@
       class="c8y-messages"
       ng-if="invalid('username')"
     >
-      <small class="form-control-feedback-message">
-        {{ getErrorFeedback('username') | translate }}
-      </small>
+      <small
+        class="form-control-feedback-message small"
+        ng-bind-html="getErrorFeedback('username') | translate"
+      ></small>
     </div>
   </div>
 
@@ -96,9 +97,10 @@
       class="c8y-messages"
       ng-if="invalid('displayName')"
     >
-      <small class="form-control-feedback-message">
-        {{ getErrorFeedback('displayName') | translate }}
-      </small>
+      <small
+        class="form-control-feedback-message small"
+        ng-bind-html="getErrorFeedback('displayName') | translate"
+      ></small>
     </div>
   </div>
 </div>
@@ -143,9 +145,10 @@
     ng-show="invalid('email')"
     data-cy="c8y-messages--invalid-email"
   >
-    <small class="form-control-feedback-message">
-      {{ getErrorFeedback('email') | translate }}
-    </small>
+    <small
+      class="form-control-feedback-message small"
+      ng-bind-html="getErrorFeedback('email') | translate"
+    ></small>
   </div>
 </div>
 
@@ -170,9 +173,10 @@
       class="c8y-messages"
       ng-if="invalid('firstName')"
     >
-      <small class="form-control-feedback-message">
-        {{ getErrorFeedback('firstName') | translate }}
-      </small>
+      <small
+        class="form-control-feedback-message small"
+        ng-bind-html="getErrorFeedback('firstName') | translate"
+      ></small>
     </div>
   </div>
 
@@ -196,9 +200,10 @@
       class="c8y-messages"
       ng-if="invalid('lastName')"
     >
-      <small class="form-control-feedback-message">
-        {{ getErrorFeedback('lastName') | translate }}
-      </small>
+      <small
+        class="form-control-feedback-message small"
+        ng-bind-html="getErrorFeedback('lastName') | translate"
+      ></small>
     </div>
   </div>
 </div>
@@ -224,9 +229,10 @@
     c8y-phone-number
   />
   <div class="c8y-messages">
-    <small class="form-control-feedback-message">
-      {{ getErrorFeedback('phone') | translate }}
-    </small>
+    <small
+      class="form-control-feedback-message small"
+      ng-bind-html="getErrorFeedback('phone') | translate"
+    ></small>
   </div>
 </div>
 
@@ -436,13 +442,14 @@
       <span></span>
       <span>
         {{ 'Two-factor authentication' | translate }}
+        <small
+          class="text-muted"
+          title="{{ vm.tfaStrategy || 'SMS' }}"
+        >
+          ({{ vm.tfaStrategy || 'SMS' }})
+        </small>
       </span>
-      <small
-        class="text-muted"
-        title="{{ vm.tfaStrategy || 'SMS' }}"
-      >
-        ({{ vm.tfaStrategy || 'SMS' }})
-      </small>
+
       <button
         class="btn-help btn-help--sm"
         aria-label="{{ 'Help' | translate }}"
@@ -632,7 +639,7 @@
     userCanChangePasswordAndEmail
   "
 >
-  <div class="col-7">
+  <div class="col-6">
     <div
       class="form-group"
       ng-class="{ 'has-error': invalid('password') }"
@@ -651,15 +658,15 @@
         class="c8y-messages"
         ng-if="invalid('password')"
       >
-        <div class="form-control-feedback-message">
-          {{ getErrorFeedback('password') | translate }}
-        </div>
+        <div
+          class="form-control-feedback-message small"
+          ng-bind-html="getErrorFeedback('password') | translate"
+        ></div>
       </div>
     </div>
     <div
       class="form-group"
       ng-class="{ 'has-error': isInvalidConfirmPassword() }"
-      ng-if="user.password"
     >
       <label for="confirmPassword">{{ 'Confirm password' | translate }}</label>
       <c8y-password-input
@@ -674,27 +681,19 @@
         class="c8y-messages"
         ng-if="isInvalidConfirmPassword()"
       >
-        <div class="form-control-feedback-message">
-          {{ getErrorFeedback('confirmPassword') | translate }}
-        </div>
+        <div
+          class="form-control-feedback-message small"
+          ng-bind-html="getErrorFeedback('confirmPassword') | translate"
+        ></div>
       </div>
     </div>
   </div>
 
-  <!-- Password strength checker should be shown only when highest prio requirement is achieved: password length -->
-  <div class="col-5">
-    <div
-      c8y-password-strength
-      user="user"
+  <div class="col-6">
+    <c8y-password-strength-checklist
+      strength-enforced="passwordStrengthEnforced"
       password="$parent.forms.userForm.password.$viewValue"
-    ></div>
-    <div
-      class="m-t-32"
-      ng-show="passwordStrengthEnforced"
-    >
-      <c8y-password-strength-checklist
-        password="$parent.forms.userForm.password.$viewValue"
-      ></c8y-password-strength-checklist>
-    </div>
+      requirements-fulfilled="onRequirementsFulfilledChange(value)"
+    ></c8y-password-strength-checklist>
   </div>
 </div>

package/core/ui/user/editUser.directive.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,g,f,p,m,w,h,E,A,S,y,v){return e.$inject=["$scope","$q"],{restrict:"EA",scope:{user:"=",forms:"=",password:"=",hideUsername:"=?",hideActive:"=?",hideFirstName:"=?",hideLastName:"=?",hideEmail:"=?",hideTelephone:"=?",hideCustomProperties:"=?",hideTfaOption:"=?",hidePasswordReset:"=?",hideChangePassword:"=?",hideOwner:"=?",hideDelegate:"=?",disabledEdit:"=?",hideLanguage:"=?",userTfaEnforced:"=?",topLevelTfaEnforced:"=?"},templateUrl:":::PLUGIN_PATH:::/ui/user/editUser.directive.html",controller:e,controllerAs:"vm",link:function(e,t){$(t).find("input[name=email]").bind("blur",function(){e.emailWarning=!(e.user&&e.user.email)})}};function e(o,r){var e="maxlength",a=y("Messaging application is not subscribed."),i={NEWUSERNAME:{type:"validation",text:y('Username "new" is not allowed.')},PATTERN:{type:"pattern",text:y("Invalid pattern.")},PATTERN_PASSWORD:{type:"pattern",text:v.getString(E.validation.password.message)},PATTERN_USERNAME:{type:"pattern",text:v.getString(E.validation.user.message)},PATTERN_DISPLAYNAME:{type:"pattern",text:v.getString(E.validation.loginAlias.message)},SAME_AS_CURRENT_PASSWORD:{type:"same_as_current",text:y("New password can't be the same as current one.")},PASSWORD_MISSMATCH:{type:"password_missmatch",text:y("Password confirmation does not match.")},REQUIRED:{type:"required",text:y("This field is required.")},EMAIL:{type:"email",text:y("Invalid email address.")},PASSWORD_STRENGTH:{type:"password_strength",text:y("Password not good enough, password must be stronger (green).")},INTERNATIONALPHONENUMBER_PHONE:{type:"internationalPhoneNumber",text:v.getString(E.validation.internationalPhoneNumber.message)},MAXLENGTH_FIRSTNAME:{type:e,text:"".concat(v.getString("Max length:")," 50")},MAXLENGTH_LASTNAME:{type:e,text:"".concat(v.getString("Max length:")," 50")},MAXLENGTH_USERNAME:{type:e,text:"".concat(v.getString("Max length:")," 254")},MAXLENGTH_DISPLAYNAME:{type:e,text:"".concat(v.getString("Max length:")," 254")},MAXLENGTH_PHONE:{type:e,text:"".concat(v.getString("Max length:")," 254")},MAXLENGTH_EMAIL:{type:e,text:"".concat(v.getString("Max length:")," 254")}},d=this,c=(_.assign(o,{confirmPassword:"",invalid:angular.bind(u,u.invalid,o.forms,"userForm"),isInvalidConfirmPassword:function(){var e=o.forms.userForm,t=e.password.$pristine,e=e.confirmPassword.$invalid;return!t&&e},changePasswordConfirm:function(){o.forms.userForm.confirmPassword&&o.forms.userForm.confirmPassword.$setValidity(i.PASSWORD_MISSMATCH.type,o.forms.userForm.confirmPassword.$viewValue===o.user.password)},getErrorFeedback:function(n){var a=o.forms.userForm[n]||{},s=[];return _.forEach(a.$error||{},function(e,t){var r;"parse"===t?o.forms.userForm.phone.$setValidity(t,!0):(t=t.toUpperCase(),r="".concat(t,"_").concat(n.toUpperCase()),e&&a.$touched&&(e=i[r]||i[t],s.push(v.getString(e.text))))}),s.join(" ")},getUserCustomProperties:function(e){var r={};e&&e.customProperties&&_.forEach(e.customProperties,function(e,t){"userOrigin"!==t&&(r[t]="object"===_typeof(e)?angular.toJson(e):e)});return r},humanize:u.humanizeFragment,passwordRegex:E.validation.password.pattern,resetPasswords:function(e){var t=v.getString("A user managed via your authorization server cannot change the password of the user.");l.current().then(function(e){e=l.hasExternalOrigin(e);o.password.showPassword&&e&&S.add({text:t,type:"warning"})}),o.password.showPassword=!o.password.showPassword,e.passwordStrength=o.password.strength,e.password=null,o.confirmPassword=""},tfaAvailable:!1,delegateTo:function(){l.current().then(function(e){o.user.delegatedBy=e.id}),n()},undelegate:function(){o.user.delegatedBy=null,n()},setOwner:function(e){o.user.owner=e,d.isParentDropDownOpen=!1,d.ownerHiddenForm.$setDirty()},userCanChangePasswordAndEmail:!1}),_.assign(d,{onToggleDropdown:function(e){e&&(d.ownerDropDownInitialized=!0)},twoFactorAuthenticationCheckboxDisabled:function(){return o.topLevelTfaEnforced||o.disabledEdit||"TOTP"===d.tfaStrategy||!o.smsMicroserviceAvailable||!o.notCurrentUser&&"SMS"===d.tfaStrategy},enforceTfaCheckboxDisbaled:function(){return o.topLevelTfaEnforced||o.disabledEdit||!o.notCurrentUser||s()},messagingWarningVisible:function(){return!o.smsMicroserviceAvailable&&"SMS"===d.tfaStrategy},shouldEnableRevokeTOTPSecretButton:s}),p.getStrongPasswordSettings().then(t),o.$watch("user",function(e,t){var n,s;e&&e!==t&&(s=!(n=e).id,o.password.strength=n.passwordStrength,o.changePasswordBtn=!o.password.showPassword,o.emailWarning=!n.email,o.smsWarningPopover=a,s&&(n.sendPasswordResetEmail=!0),delete o.confirmPassword,o.notCurrentUser=null,t=/.*/,(e=n)&&!e.id&&(t=E.validation.user.pattern),o.userNamePattern=t,o.loginAliasPattern=E.validation.loginAlias.pattern,o.hideLanguage||g.get("language").then(function(e){e&&(o.user.language={name:h.getLanguageNativeName(e),code:e}),o.languages=_.map(m.getSupportedLanguages(),function(e){return Object.assign({name:h.getLanguageNativeName(e),code:e},{})})}),A.isActivatedFor("units-conversion")&&(o.unitsConversionActive=!0),r.all({tfaAvailable:l.isTfaAvailable(),smsMicroserviceAvailable:w.isAvailable({contextPath:"messaging"}),twoFactorAuthenticationEnabled:l.isTfaActive(n),tfaStrategy:l.getTfaStrategy(),isCurrentUser:l.checkIfCurrent(n)}).then(function(e){var t=e.tfaAvailable,r=e.smsMicroserviceAvailable,n=e.twoFactorAuthenticationEnabled,a=e.tfaStrategy,e=e.isCurrentUser;o.notCurrentUser=!e,o.tfaAvailable=t,o.smsMicroserviceAvailable=!!r,d.tfaStrategy=a,o.user.twoFactorAuthenticationEnabled=!s&&n,o.userCanChangePasswordAndEmail=s||!l.hasExternalOrigin(o.user)&&e}),o.hideOwner||(o.ownerEditDisabled=!1,l.current().then(function(e){var t=f.hasRole(e,"ROLE_USER_MANAGEMENT_ADMIN"),r=f.hasRole(e,"ROLE_USER_MANAGEMENT_CREATE");!t&&r&&(d.rootOwner=[e],d.currentOwner=e.id,d.defaultOwner=e,s)&&(o.ownerEditDisabled=!0,n.owner=d.currentOwner)})),c())}));function t(e){var t=e.enforceStrength,e=e.strengthValidity,t=t||e;(o.passwordStrengthEnforced=t)&&o.$watch("user.passwordStrength",function(e){e&&o.password.showPassword&&o.forms.userForm.password.$setValidity(i.PASSWORD_STRENGTH.type,"GREEN"===o.user.passwordStrength)})}function n(){o.delegationHiddenForm.$setDirty()}function s(){return"TOTP"===d.tfaStrategy&&o.user.twoFactorAuthenticationEnabled}o.$watch("user.password",function(){o.forms.userForm&&o.forms.userForm.password&&o.forms.userForm.password.$setValidity(i.SAME_AS_CURRENT_PASSWORD.type,!o.notCurrentUser&&!l.isCurrentPassword(o.user.password)||o.notCurrentUser)})}}e.$inject=["c8yBase","c8yUser","c8yUserPreferences","c8yPermissions","c8yLoginOptions","c8yLocales","c8yApplication","LocalesUtil","c8yConfig","c8yBeta","c8yAlert","gettext","gettextCatalog"],angular.module("c8y.ui").directive("c8yEditUser",e).directive("c8yUiEditUser",e)}();
+"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,g,f,m,p,h,w,A,E,S,y,v){return e.$inject=["$scope","$q"],{restrict:"EA",scope:{user:"=",forms:"=",password:"=",hideUsername:"=?",hideActive:"=?",hideFirstName:"=?",hideLastName:"=?",hideEmail:"=?",hideTelephone:"=?",hideCustomProperties:"=?",hideTfaOption:"=?",hidePasswordReset:"=?",hideChangePassword:"=?",hideOwner:"=?",hideDelegate:"=?",disabledEdit:"=?",hideLanguage:"=?",userTfaEnforced:"=?",topLevelTfaEnforced:"=?"},templateUrl:":::PLUGIN_PATH:::/ui/user/editUser.directive.html",controller:e,controllerAs:"vm",link:function(e,t){$(t).find("input[name=email]").bind("blur",function(){e.emailWarning=!(e.user&&e.user.email)})}};function e(o,r){var e="maxlength",a=y("Messaging application is not subscribed."),i={NEWUSERNAME:{type:"validation",text:y('Username "new" is not allowed.')},PATTERN:{type:"pattern",text:y("Invalid pattern.")},PATTERN_PASSWORD:{type:"pattern",text:v.getString(A.validation.password.message)},PATTERN_USERNAME:{type:"pattern",text:v.getString(A.validation.user.message)},PATTERN_DISPLAYNAME:{type:"pattern",text:v.getString(A.validation.loginAlias.message)},SAME_AS_CURRENT_PASSWORD:{type:"same_as_current",text:y("New password can't be the same as current one.")},PASSWORD_MISSMATCH:{type:"password_missmatch",text:y("Passwords do not match.")},REQUIRED:{type:"required",text:y("This field is required.")},EMAIL:{type:"email",text:y("Invalid email address.")},PASSWORD_STRENGTH:{type:"password_strength",text:A.validation.passwordStrengthChecklist.message},INTERNATIONALPHONENUMBER_PHONE:{type:"internationalPhoneNumber",text:v.getString(A.validation.internationalPhoneNumber.message)},MAXLENGTH_FIRSTNAME:{type:e,text:"".concat(v.getString("Max length:")," 50")},MAXLENGTH_LASTNAME:{type:e,text:"".concat(v.getString("Max length:")," 50")},MAXLENGTH_USERNAME:{type:e,text:"".concat(v.getString("Max length:")," 254")},MAXLENGTH_DISPLAYNAME:{type:e,text:"".concat(v.getString("Max length:")," 254")},MAXLENGTH_PHONE:{type:e,text:"".concat(v.getString("Max length:")," 254")},MAXLENGTH_EMAIL:{type:e,text:"".concat(v.getString("Max length:")," 254")}},d=this,c=(_.assign(o,{confirmPassword:"",invalid:angular.bind(u,u.invalid,o.forms,"userForm"),isInvalidConfirmPassword:function(){var e=o.forms.userForm,t=e.password.$pristine,e=e.confirmPassword.$touched&&e.confirmPassword.$invalid;return!t&&e},changePasswordConfirm:function(){o.forms.userForm.confirmPassword&&o.forms.userForm.confirmPassword.$setValidity(i.PASSWORD_MISSMATCH.type,o.forms.userForm.confirmPassword.$viewValue===o.user.password)},getErrorFeedback:function(n){var a=o.forms.userForm[n]||{},s=[];return _.forEach(a.$error||{},function(e,t){var r;"parse"===t?o.forms.userForm.phone.$setValidity(t,!0):(t=t.toUpperCase(),r="".concat(t,"_").concat(n.toUpperCase()),e&&a.$touched&&(e=i[r]||i[t],s.push(v.getString(e.text))))}),s.join("<br>")},getUserCustomProperties:function(e){var r={};e&&e.customProperties&&_.forEach(e.customProperties,function(e,t){"userOrigin"!==t&&(r[t]="object"===_typeof(e)?angular.toJson(e):e)});return r},humanize:u.humanizeFragment,passwordRegex:A.validation.password.pattern,resetPasswords:function(e){var t=v.getString("A user managed via your authorization server cannot change the password of the user.");l.current().then(function(e){e=l.hasExternalOrigin(e);o.password.showPassword&&e&&S.add({text:t,type:"warning"})}),o.password.showPassword=!o.password.showPassword,e.passwordStrength=o.password.strength,e.password=null,o.confirmPassword=""},tfaAvailable:!1,delegateTo:function(){l.current().then(function(e){o.user.delegatedBy=e.id}),n()},undelegate:function(){o.user.delegatedBy=null,n()},setOwner:function(e){o.user.owner=e,d.isParentDropDownOpen=!1,d.ownerHiddenForm.$setDirty()},userCanChangePasswordAndEmail:!1,requirementsFulfilled:!0,onRequirementsFulfilledChange:function(e){e=o.requirementsFulfilled=e;e||o.forms.userForm.password.$setValidity(i.PATTERN_PASSWORD.type,!0),o.forms.userForm.password.$setValidity(i.PASSWORD_STRENGTH.type,e)}}),_.assign(d,{onToggleDropdown:function(e){e&&(d.ownerDropDownInitialized=!0)},twoFactorAuthenticationCheckboxDisabled:function(){return o.topLevelTfaEnforced||o.disabledEdit||"TOTP"===d.tfaStrategy||!o.smsMicroserviceAvailable||!o.notCurrentUser&&"SMS"===d.tfaStrategy},enforceTfaCheckboxDisbaled:function(){return o.topLevelTfaEnforced||o.disabledEdit||!o.notCurrentUser||s()},messagingWarningVisible:function(){return!o.smsMicroserviceAvailable&&"SMS"===d.tfaStrategy},shouldEnableRevokeTOTPSecretButton:s}),m.getStrongPasswordSettings().then(t),o.$watch("user",function(e,t){var n,s;e&&e!==t&&(s=!(n=e).id,o.password.strength=n.passwordStrength,o.changePasswordBtn=!o.password.showPassword,o.emailWarning=!n.email,o.smsWarningPopover=a,s&&(n.sendPasswordResetEmail=!0),delete o.confirmPassword,o.notCurrentUser=null,t=/.*/,(e=n)&&!e.id&&(t=A.validation.user.pattern),o.userNamePattern=t,o.loginAliasPattern=A.validation.loginAlias.pattern,o.hideLanguage||g.get("language").then(function(e){e&&(o.user.language={name:w.getLanguageNativeName(e),code:e}),o.languages=_.map(p.getSupportedLanguages(),function(e){return Object.assign({name:w.getLanguageNativeName(e),code:e},{})})}),E.isActivatedFor("units-conversion")&&(o.unitsConversionActive=!0),r.all({tfaAvailable:l.isTfaAvailable(),smsMicroserviceAvailable:h.isAvailable({contextPath:"messaging"}),twoFactorAuthenticationEnabled:l.isTfaActive(n),tfaStrategy:l.getTfaStrategy(),isCurrentUser:l.checkIfCurrent(n)}).then(function(e){var t=e.tfaAvailable,r=e.smsMicroserviceAvailable,n=e.twoFactorAuthenticationEnabled,a=e.tfaStrategy,e=e.isCurrentUser;o.notCurrentUser=!e,o.tfaAvailable=t,o.smsMicroserviceAvailable=!!r,d.tfaStrategy=a,o.user.twoFactorAuthenticationEnabled=!s&&n,o.userCanChangePasswordAndEmail=s||!l.hasExternalOrigin(o.user)&&e}),o.hideOwner||(o.ownerEditDisabled=!1,l.current().then(function(e){var t=f.hasRole(e,"ROLE_USER_MANAGEMENT_ADMIN"),r=f.hasRole(e,"ROLE_USER_MANAGEMENT_CREATE");!t&&r&&(d.rootOwner=[e],d.currentOwner=e.id,d.defaultOwner=e,s)&&(o.ownerEditDisabled=!0,n.owner=d.currentOwner)})),c())}));function t(e){var t=e.enforceStrength,e=e.strengthValidity;o.passwordStrengthEnforced=t||e}function n(){o.delegationHiddenForm.$setDirty()}function s(){return"TOTP"===d.tfaStrategy&&o.user.twoFactorAuthenticationEnabled}o.$watch("user.password",function(){o.forms.userForm&&o.forms.userForm.password&&o.forms.userForm.password.$setValidity(i.SAME_AS_CURRENT_PASSWORD.type,!o.notCurrentUser&&!l.isCurrentPassword(o.forms.userForm.password.$viewValue)||o.notCurrentUser)})}}e.$inject=["c8yBase","c8yUser","c8yUserPreferences","c8yPermissions","c8yLoginOptions","c8yLocales","c8yApplication","LocalesUtil","c8yConfig","c8yBeta","c8yAlert","gettext","gettextCatalog"],angular.module("c8y.ui").directive("c8yEditUser",e).directive("c8yUiEditUser",e)}();

package/device-protocol-deviceDatabase4/device-type-create-step.html

@@ -13,6 +13,7 @@
           name="name"
           class="form-control"
           ng-model="vm.model.name"
+          data-cy="device-type-create-step--name"
           ng-max="100"
           placeholder="{{ 'e.g. My protocol' | translate }}"
           required
@@ -27,6 +28,7 @@
           rows="7"
           class="form-control"
           ng-model="vm.model.description"
+          data-cy="device-type-create-step--description"
           ng-disabled="vm.pending"
         ></textarea>
       </div>
@@ -52,6 +54,7 @@
       title="{{ 'Create' | translate }}"
       class="btn btn-primary"
       ng-click="vm.create(vm.model)"
+      data-cy="device-type-create-step--create-button"
       ng-disabled="modelForm.$invalid || vm.pending"
     >
       {{ 'Create' | translate }}

package/device-protocols/deviceProtocolList.html

@@ -29,7 +29,7 @@
     </div>
   </div>
 
-  <div class="c8y-list__item" ng-repeat="protocol in vm.protocols | orderBy:['name', vm.getTitle]">
+  <div class="c8y-list__item" ng-repeat="protocol in vm.protocols | orderBy:['name', vm.getTitle]" data-cy="deviceProtocolSelect--Protocol-select">
     <div class="c8y-list__item__block">
       <div class="c8y-list__item__icon">
         <i c8y-icon="{{ vm.CONFIG.icon }}"></i>

package/device-protocols/deviceProtocolView.html

@@ -50,6 +50,7 @@
   <button
     class="btn btn-link"
     title="{{ 'Add device protocol' | translate }}"
+    data-cy="deviceProtocolView--Add-device-protocol"
     ng-click="vm.add()"
   >
     <i c8y-icon="plus-circle"></i>

package/deviceDatabase4/detail/holding-registers.html

@@ -161,7 +161,7 @@
     </div>
   </div>
   <div class="card-footer">
-    <button class="btn btn-default m-t-8" type="button" ng-click="vm.addHoldingRegister()">
+    <button class="btn btn-default m-t-8" type="button" ng-click="vm.addHoldingRegister()" data-cy="holding-registers--add-holding-register-button">
       <i c8y-icon="plus-circle"></i>
       <span
         title="{{ vm.features.holdingRegisters.addRegisterButtonLabel | translate }}"

package/deviceDatabase4/modals/configure-register.html

@@ -82,6 +82,7 @@
               id="name"
               name="name"
               ng-model="vm.element.name"
+              data-cy="configure-register--name"
               c8y-autocomplete="off"
               placeholder="{{ 'e.g. My element' | translate }}"
               required
@@ -102,6 +103,7 @@
               id="category"
               name="category"
               ng-model="vm.element.category"
+              data-cy="configure-register--category"
               c8y-autocomplete="off"
               uib-typeahead="category.name for category in vm.categories | filter:{name: $viewValue}"
               typeahead-template-url=":::PLUGIN_PATH:::/modals/category-typeahead.html"
@@ -215,6 +217,7 @@
               id="number"
               name="number"
               ng-model="vm.element.number"
+              data-cy="configure-register--number"
               ng-min="vm.getNumberMin()"
               ng-max="vm.getNumberMax()"
               step="1"
@@ -269,6 +272,7 @@
               id="startBit"
               name="startBit"
               ng-model="vm.element.startBit"
+              data-cy="configure-register--startBit"
               ng-min="0"
               ng-max="vm.startBitMax()"
               step="1"
@@ -293,6 +297,7 @@
               id="noBits"
               name="noBits"
               ng-model="vm.element.noBits"
+              data-cy="configure-register--noBits"
               ng-min="1"
               ng-max="vm.noBitsMax(vm.element.startBit)"
               step="1"
@@ -486,6 +491,7 @@
               id="multiplier"
               name="multiplier"
               ng-model="vm.element.multiplier"
+              data-cy="configure-register--multiplier"
               ng-min="vm.features.multiplier.min"
               step="{{ vm.features.multiplier.step }}"
               placeholder="{{ 'e.g.' | translate }} {{ vm.features.multiplier.min }}"
@@ -509,6 +515,7 @@
               id="divisor"
               name="divisor"
               ng-model="vm.element.divisor"
+              data-cy="configure-register--divisor"
               ng-min="1"
               step="1"
               placeholder="{{ 'e.g.' | translate }} 1"
@@ -570,6 +577,7 @@
               id="decimalPlaces"
               name="decimalPlaces"
               ng-model="vm.element.decimalPlaces"
+              data-cy="configure-register--decimal-places"
               ng-min="0"
               ng-max="5"
               step="1"
@@ -594,6 +602,7 @@
               id="unit"
               name="unit"
               ng-model="vm.element.unit"
+              data-cy="configure-register--unit"
               placeholder="{{ 'e.g.' | translate }} u"
               ng-required="vm.features.unit.requiredForSendMeasurement && vm.element.meta.sendMeasurement"
             />
@@ -671,7 +680,7 @@
         <div class="form-group">
           <div ng-if="vm.features.options.signed">
             <label title="{{ 'Signed' | translate }}" class="c8y-checkbox input-sm">
-              <input type="checkbox" ng-model="vm.element.signed" />
+              <input type="checkbox" ng-model="vm.element.signed" data-cy="configure-register--signed"/>
               <span></span>
               <span>{{ 'Signed' | translate }}</span>
               <i
@@ -1439,6 +1448,7 @@
     type="button"
     title="{{ 'Save' | translate }}"
     ng-disabled="vm.elementForm.$invalid"
+    data-cy="configure-register--save-button"
     ng-click="vm.save()"
   >
     {{ 'Save' | translate }}

package/devicemanagement-tracking/views/index.html

@@ -53,6 +53,7 @@
             <div
               class="list-group-item d-flex p-l-0 p-r-0"
               ng-repeat="event in ctrl.events()"
+              data-cy="index--event-list"
               ng-class="{ 'text-info': !!ctrl.markers['p' + $index] }"
               ng-click="ctrl.toggle($index, event)"
             >

package/measurements/views/timeInterval.html

@@ -1,12 +1,13 @@
 <form class="form-inline">
   <div class="form-group">
-    <div class="c8y-select-wrapper">
+    <div class="c8y-select-wrapper" data-cy="timeInterval--select-wrapper">
       <select
         aria-label="{{ 'Time interval' | translate }}"
         class="form-control"
         ng-hide="hideSelector"
         ng-options="(interval.txt | translate) for interval in timeIntervals"
         ng-model="selInterval"
+        data-cy="timeInterval--selInterval"
         ng-change="onChange()"
       ></select>
       <span></span>
@@ -19,6 +20,7 @@
       placeholder="{{ 'From`date`' | translate }}"
       is-open="openFrom"
       ng-model="dateFrom"
+      data-cy="timeInterval--dateFrom"
       uib-datepicker-popup
       datepicker-options="{ maxDate: dateTo, showWeeks: true }"
       datepicker-append-to-body="true"
@@ -33,6 +35,7 @@
       placeholder="{{ 'To`date`' | translate }}"
       is-open="openTo"
       ng-model="dateTo"
+      data-cy="timeInterval--dateTo"
       uib-datepicker-popup
       datepicker-options="{ minDate: dateFrom, showWeeks: true }"
       datepicker-append-to-body="true"

package/modbusConfiguration4/fieldbus-device-list.html

@@ -131,6 +131,7 @@
                     name="name"
                     placeholder="{{ 'Name' | translate }}"
                     ng-model="vm.newDevice.name"
+                    data-cy="fieldbus-device-list--name"
                     ng-disabled="vm.newDevice.adding"
                     required
                   />
@@ -262,6 +263,7 @@
               type="submit"
               ng-class="{ 'btn-pending': vm.newDevice.adding }"
               ng-click="vm.addNewDevice()"
+              data-cy="fieldbus-device-list--add-new-device"
               ng-disabled="vm.isFormInvalid() || vm.newDevice.adding"
             >
               <span title="{{ 'Add' | translate }}" ng-if="!vm.newDevice.adding">
@@ -277,6 +279,7 @@
             type="button"
             title="{{ 'Add device' | translate }}"
             ng-click="vm.startAddingNewDevice()"
+            data-cy="fieldbus-device-list--add-device"
           >
             <i c8y-icon="plus-circle"></i>
             <span translate>Add {{ vm.mode }} device</span>

package/package.json

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

package/smartRules/controllers/edit.js

@@ -1 +1 @@
-"use strict";!function(){function e(t,e,n,s,i,a,l,r,u,o,c,d,m){var g=_.isEmpty(c)?null:c,h="smartRuleForm",y={parent:null,mo:null,withChildren:{assets:!0,devices:!1}},p={inProgres:!1};function v(e){o=e,t.ruleTemplate=o,t.rule.name||(t.rule.name=m.getString(t.ruleTemplate.description))}function b(e){t.enabledSources=_.sortBy(e,"name")}function f(e){t.disabledSources=_.sortBy(e,"name")}function C(e){t.title=e}function S(){return T(),n.reject()}function R(){p.inProgress=!0}function T(){p.inProgress=!1}t.hasChildAssets=angular.bind(i,i.hasChildAssets),t.getChildAssetsCount=angular.bind(i,i.getChildAssetsCount),t.ruleTemplate=o,t.rule=c,t.save=function(){o.noTarget&&(y.withChildren={assets:!1,devices:!1}),n.when().then(R).then(angular.bind(r,r.save,c,o,y)).then(e.close,S).then(_.partial(_.unary(l.success),m.getString('Smart rule "{{name}}" saved.',{name:c.name}))).then(T)},t.savingStatus=p,t.cancel=e.dismiss,t.invalid=angular.bind(s,s.invalid,t,h);var A,E=t.$watch(h,function(e){g&&e.$setDirty(),e&&E()});c&&c.id?C(d("Edit global smart rule")):(C(d("New global smart rule")),c=_.assign(r.getEmpty(),c||{})),t.rule=c,o?v(o):u.getTemplateForRule(c).then(v),t.initialActivationCfg=y,h=_.get(c,"c8y_Context",a.getContext()),i.detail(h.id).then(s.getResData).then(function(e){y.mo=e}),c&&c.id&&(_.isEmpty(c.enabledSources)||(A=c.enabledSources.join(","),i.list({ids:A}).then(b)),_.isEmpty(c.disabledSources)||(A=c.disabledSources.join(","),i.list({ids:A}).then(f)))}e.$inject=["$scope","$uibModalInstance","$q","c8yBase","c8yInventory","c8yUiUtil","c8yAlert","smartRulesSvc","smartRuleTemplatesSvc","ruleTemplate","rule","gettext","gettextCatalog"],angular.module("c8y.smartRules").controller("SmartRuleEditCtrl",e)}();
+"use strict";!function(){function e(t,e,n,s,i,a,l,r,u,o,c,d){var m=_.isEmpty(c)?null:c,g="smartRuleForm",h={parent:null,mo:null,withChildren:{assets:!0,devices:!1}},y={inProgres:!1};function p(e){o=e,t.ruleTemplate=o,t.rule.name||(t.rule.name=d.getString(t.ruleTemplate.description))}function v(e){t.enabledSources=_.sortBy(e,"name")}function C(e){t.disabledSources=_.sortBy(e,"name")}function S(){return b(),n.reject()}function f(){y.inProgress=!0}function b(){y.inProgress=!1}t.hasChildAssets=angular.bind(i,i.hasChildAssets),t.getChildAssetsCount=angular.bind(i,i.getChildAssetsCount),t.ruleTemplate=o,t.rule=c,t.save=function(){o.noTarget&&(h.withChildren={assets:!1,devices:!1}),n.when().then(f).then(angular.bind(r,r.save,c,o,h)).then(e.close,S).then(_.partial(_.unary(l.success),d.getString('Smart rule "{{name}}" saved.',{name:c.name}))).then(b)},t.savingStatus=y,t.cancel=e.dismiss,t.invalid=angular.bind(s,s.invalid,t,g);var R,T=t.$watch(g,function(e){m&&e.$setDirty(),e&&T()});c&&c.id||(c=_.assign(r.getEmpty(),c||{})),t.rule=c,g=r.getRuleModalTitle(t.rule),t.title=g,o?p(o):u.getTemplateForRule(c).then(p),t.initialActivationCfg=h,g=_.get(c,"c8y_Context",a.getContext()),i.detail(g.id).then(s.getResData).then(function(e){h.mo=e}),c&&c.id&&(_.isEmpty(c.enabledSources)||(R=c.enabledSources.join(","),i.list({ids:R}).then(v)),_.isEmpty(c.disabledSources)||(R=c.disabledSources.join(","),i.list({ids:R}).then(C)))}e.$inject=["$scope","$uibModalInstance","$q","c8yBase","c8yInventory","c8yUiUtil","c8yAlert","smartRulesSvc","smartRuleTemplatesSvc","ruleTemplate","rule","gettextCatalog"],angular.module("c8y.smartRules").controller("SmartRuleEditCtrl",e)}();

package/smartRules/controllers/list.js

@@ -1 +1 @@
-"use strict";!function(){function e(i,r,e,o,t,n,a,j,c,u,l,s,d,f,h,g,v,m){var p,S=r.deviceId||r.groupId,A={},R={},b={done:!1,inProgress:!1},y={true:{text:v("Enabled`rule`"),icon:"check-circle",cls:"text-success"},false:{text:v("Disabled`rule`"),icon:"ban",cls:"text-danger"}},x=s.getContext(),C=v("Global smart rules");function I(){return o.when().then(E).then(M).then(N).then(U).then(w).catch(D)}function E(){b.inProgress=!0}function w(){b.inProgress=!1,b.done=!0,b.error=!1}function D(e){e.data&&e.data.message&&l.danger(e.data.message),b.inProgress=!1,b.done=!0,b.error=!0}function M(){return h.list().then(T)}function T(e){_.forEach(e||[],function(e){A[e.name]=e})}function N(){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=function(e){var t=e;S&&(t=_.reject(e,function(e){var n=new RegExp("".concat(e,"/dashboard"));return function(e){var t=_.get(e,"config.url","");return O(e)&&!n.test(t)}}(S)));return t}(_.concat(e.listByContext,e.list))})}function O(e){return"sendDashboardsViaEmail"===e.ruleTemplateName}function L(e){return g.hasSource(e,S)}function U(){var e;return Array.isArray(i.rules)&&0<i.rules.length&&null!==(e=s.getContext()).context?a.childAssets(e.id,{skipDetail:!0,params:{pageSize:2e3,withChildren:!1}}).then(function(e){i.children=e}).then(function(){i.ruleChildren={},_.forEach(i.rules,function(e){i.ruleChildren[e.id]=P(e)})}):o.resolve()}function P(t){return _.filter(i.children,function(e){return g.hasSource(t,e)})}_.assign(i,{isOpen:{},moId:S,loadingStatus:b,refresh:I,paging:{refresh:I},ruleTemplates:A,getLinkToDM:function(){var e={deviceId:S};return t(p||"")(e)},add:function(){g.addNewWithUI().then(I)},edit:function(e){g.editWithUI(e).then(I)},clone:function(e){g.cloneWithUI(e).then(I)},remove:function(e){u({title:v("Delete smart rule"),body:m.getString('You are about to delete smart rule "{{name}}". Do you want to proceed?',e),labels:{ok:v("Delete")},status:"danger"}).then(angular.bind(g,g.remove,e)).then(function(){return _.pull(i.rules,e)}).then(function(){return l.success(v("Smart rule deleted."))})},hasSource:L,getChildrenEnabledForSmartRule:P,toggleRuleActivationForContextMO:function(e){if(L(e))return g.deactivate(e,S,!1).then(function(){l.success(m.getString('Smart rule "{{name}}" deactivated.',e))});return g.activate(e,S,!1).then(function(){l.success(m.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(N).then(U).then(function(){l.success(m.getString('Smart rule "{{name}}" activated/deactivated for children.',e))})},tooltip:function(e){var t={activate:{"for group":v("Activate for this group"),"for device":v("Activate for this device"),"for object":v("Activate for this object")},deactivate:{"for group":v("Deactivate for this group"),"for device":v("Deactivate for this device"),"for object":v("Deactivate for this object")}},e=e.enabled&&L(e)?"deactivate":"activate",n=r.groupId?"group":"object";return n=r.deviceId?"device":n,t[e]["for ".concat(n)]},type:function(e){var t,e=A[e.ruleTemplateName];e&&(t=e.label.full?m.getString(e.label.full):"".concat(m.getString(e.label.input)," ").concat(m.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:C,context:x,inputIcon:function(e){var t,e=A[e.ruleTemplateName];e&&(t=e.paramGroups.input.icon);return t},outputIcon:function(e){var t,e=A[e.ruleTemplateName];e&&(t=e.paramGroups.output.icon);return t},canAddRules:function(e){var t=_.get(A,"".concat(_.get(e,"ruleTemplateName"),"._active")),n=R.canAddRules;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){var t=e.isAllowedInventory,e=e.isAllowedSmartRules;return t&&e}),R.canAddRules=e.then(function(e){return R.canAddRules=e,R.canAddRules}),n=!1);return n},canModify:function(t){R.rules=R.rules||{};var n=R.rules,e=n[t.id];_.isUndefined(e)&&(n[t.id]=c.isAllowed({adminMOs:[t.id]}).then(function(e){return n[t.id]=e,n[t.id]}),e=!1);return e},canApplyOnChildren:function(e){return!O(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}),i.isConfigurationGlobalSmartRulesContext=e.path().includes("/rules"),I(),null===s.getContext().context&&d.changeTitle({title:C}),"device"===x.context&&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)}();
+"use strict";!function(){function e(i,r,e,o,t,n,a,P,c,u,l,s,d,f,h,g,v,m){var p,S=r.deviceId||r.groupId,A={},R={},y={done:!1,inProgress:!1},b={true:{text:v("Enabled`rule`"),icon:"check-circle",cls:"text-success"},false:{text:v("Disabled`rule`"),icon:"ban",cls:"text-danger"}},x=s.getContext(),C=v("Global smart rules");function I(){return o.when().then(E).then(T).then(N).then(U).then(w).catch(D)}function E(){y.inProgress=!0}function w(){y.inProgress=!1,y.done=!0,y.error=!1}function D(e){e.data&&e.data.message&&l.danger(e.data.message),y.inProgress=!1,y.done=!0,y.error=!0}function T(){return h.list().then(M)}function M(e){_.forEach(e||[],function(e){A[e.name]=e})}function N(){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=function(e){var t=e;S&&(t=_.reject(e,function(e){var n=new RegExp("".concat(e,"/dashboard"));return function(e){var t=_.get(e,"config.url","");return O(e)&&!n.test(t)}}(S)));return t}(_.concat(e.listByContext,e.list))})}function O(e){return"sendDashboardsViaEmail"===e.ruleTemplateName}function L(e){return g.hasSource(e,S)}function U(){var e;return Array.isArray(i.rules)&&0<i.rules.length&&null!==(e=s.getContext()).context?a.childAssets(e.id,{skipDetail:!0,params:{pageSize:2e3,withChildren:!1}}).then(function(e){i.children=e}).then(function(){i.ruleChildren={},_.forEach(i.rules,function(e){i.ruleChildren[e.id]=G(e)})}):o.resolve()}function G(t){return _.filter(i.children,function(e){return g.hasSource(t,e)})}_.assign(i,{isOpen:{},moId:S,loadingStatus:y,refresh:I,paging:{refresh:I},ruleTemplates:A,getLinkToDM:function(){var e={deviceId:S};return t(p||"")(e)},add:function(){g.addNewWithUI().then(I)},edit:function(e){g.editWithUI(e).then(I)},clone:function(e){g.cloneWithUI(e).then(I)},remove:function(e){u({title:v("Delete smart rule"),body:m.getString('You are about to delete smart rule "{{name}}". Do you want to proceed?',e),labels:{ok:v("Delete")},status:"danger"}).then(angular.bind(g,g.remove,e)).then(function(){return _.pull(i.rules,e)}).then(function(){return l.success(v("Smart rule deleted."))})},hasSource:L,getChildrenEnabledForSmartRule:G,toggleRuleActivationForContextMO:function(e){if(L(e))return g.deactivate(e,S,!1).then(function(){l.success(m.getString('Smart rule "{{name}}" deactivated.',e))});return g.activate(e,S,!1).then(function(){l.success(m.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(N).then(U).then(function(){l.success(m.getString('Smart rule "{{name}}" activated/deactivated for children.',e))})},tooltip:function(e){var t={activate:{"for group":v("Activate for this group"),"for device":v("Activate for this device"),"for object":v("Activate for this object")},deactivate:{"for group":v("Deactivate for this group"),"for device":v("Deactivate for this device"),"for object":v("Deactivate for this object")}},e=e.enabled&&L(e)?"deactivate":"activate",n=r.groupId?"group":"object";return n=r.deviceId?"device":n,t[e]["for ".concat(n)]},type:function(e){var t,e=A[e.ruleTemplateName];e&&(t=e.label.full?m.getString(e.label.full):"".concat(m.getString(e.label.input)," ").concat(m.getString(e.label.output)));return t},status:function(e){return b[e.enabled].text},statusIcon:function(e){return b[e.enabled].icon},statusClass:function(e){return b[e.enabled].cls},showTitle:function(){return null!==s.getContext().context},title:C,context:x,inputIcon:function(e){var t,e=A[e.ruleTemplateName];e&&(t=e.paramGroups.input.icon);return t},outputIcon:function(e){var t,e=A[e.ruleTemplateName];e&&(t=e.paramGroups.output.icon);return t},canAddRules:function(e){var t=_.get(A,"".concat(_.get(e,"ruleTemplateName"),"._active")),n=R.canAddRules;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){var t=e.isAllowedInventory,e=e.isAllowedSmartRules;return t&&e}),R.canAddRules=e.then(function(e){return R.canAddRules=e,R.canAddRules}),n=!1);return n},canModify:function(t){R.rules=R.rules||{};var n=R.rules,e=n[t.id];_.isUndefined(e)&&(n[t.id]=c.isAllowed({adminMOs:[t.id]}).then(function(e){return n[t.id]=e,n[t.id]}),e=!1);return e},canApplyOnChildren:function(e){return!O(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?v("Global smart rule"):v("Local smart rule")}}),i.isConfigurationGlobalSmartRulesContext=e.path().includes("/rules"),I(),null===s.getContext().context&&d.changeTitle({title:C}),"device"===x.context&&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/services/smartRules.js

@@ -1 +1 @@
-"use strict";!function(){function e(i,u,o,r,n,a,t,c,l,s){var d=o.url("service/smartrule"),f="".concat(d,"/smartrules"),h=["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 u.get(f).then(o.getResData).then(_.property("rules")).then(m)},listByContext:function(e){return u.get(S({moId:e})).then(o.getResData).then(_.property("rules")).then(m)},detail:function(e){e=v({id:e});return u.get(e).then(o.getResData)},save:function(e,t,n){e=e.id?g(e):function(e,t,n){var r=v(e,!0);return function(e,t,n){return e.ruleTemplateName=t.name,function(e,t){var n=i.when(e);e.c8y_Context||t.mo?(e.enabledSources=[],e.disabledSources=void 0,n=y(e,t.mo,t.withChildren)):(e.enabledSources=void 0,e.disabledSources=[]);return n}(e,n)}(e,t,n).then(_.partial(u.post,r)).then(o.getResData)}(e,t,n);return e},remove:function(e){e=v(e,!0);return u.delete(e)},hasSource:function(e,t){t=t&&t.id||t;if(!t)return!1;if(e.disabledSources)return!R(e.disabledSources,t);if(e.enabledSources)return R(e.enabledSources,t);return!0},activate:function(e,t,n){return y(e,t,n).then(g)},deactivate:function(e,t,n){return b(e,t,n).then(g)},updateSources:function(e,t,r,u){return function(e,t,n){return t.reduce(function(e,t){return e.then(function(e){return y(e,t,n)})},i.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)})},i.resolve(e));var n}).then(g)},addNewWithUI:A,addNewForInputAlarmAndOutputUserWithUI:function(e,t){return A({inputAlarm:e,outputUser:t})},addNewForInputDataPointWithUI:function(e){return A({inputDataPoint:e})},addNewForOutputOperationWithUI:function(e){return A({outputOperation:{template:function(e){return o.cleanFields(e,["id","self","status","deviceId","creationTime","failureReason"])}(e)}})},createInstanceWithUI:E,createInstanceWithUIByName:function(e,t){return c.getTemplateByName(e).then(function(e){return E(e,t)})},editWithUI:function(e){return N(e,void 0)},cloneWithUI:function(e){return t.current().then(_.partial(D,e)).then(N)}};function m(e){return i.all(_.map(e,function(t){return c.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?S({moId:n}):f;return e.id&&(t+="/".concat(e.id)),t}function S(e){return"".concat(d,"/managedObjects/").concat(e.moId,"/smartrules")}function g(e){var t=v(e,!0),e=o.cleanFields(e,p);return u.put(t,e)}function y(n,e,t){return I(e,t).then(function(e){return _.forEach(e,function(t){_.isArray(n.enabledSources)&&!R(n.enabledSources,t)&&n.enabledSources.push(t),_.isArray(n.disabledSources)&&R(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)&&R(n.enabledSources,t)&&_.remove(n.enabledSources,function(e){return _.toString(e)===_.toString(t)}),_.isArray(n.disabledSources)&&!R(n.disabledSources,t)&&n.disabledSources.push(t)}),n})}function I(e,t){var e=e&&e.id||e,n=[];return e&&(n.push(i.when(e)),n.push(function(e,t){var n=[];!0!==t&&!0!==t.assets||n.push(r.childAssets(e));!0!==t&&!0!==t.devices||n.push(r.childDevices(e));return i.all(n).then(_.flattenDeep).then(_.partialRight(_.map,"id"))}(e,t))),i.all(n).then(_.flattenDeep)}function R(e,t){var n=t.id||t;return _.some(e,function(e){return _.toString(e)===_.toString(n)})}function A(){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:l("Add global smart rule"),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 E(e,t){return N(t,e)}function D(e,t){e=_.cloneDeep(e);return(e=o.cleanFields(e,h)).name=s.getString("Duplicate of {{name}}",e),t&&(e.owner=t.id),e}function N(e,t){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)}}})}}e.$inject=["$q","$http","c8yBase","c8yInventory","c8yUiUtil","c8yModal","c8yUser","smartRuleTemplatesSvc","gettext","gettextCatalog"],angular.module("c8y.smartRules").factory("smartRulesSvc",e)}();
+"use strict";!function(){function e(i,u,o,r,n,a,t,c,l,d,s){var f=o.url("service/smartrule"),h="".concat(f,"/smartrules"),p=["id","self","cepModuleId","lastUpdated","creationTime"],m=["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 u.get(h).then(o.getResData).then(_.property("rules")).then(v)},listByContext:function(e){return u.get(g({moId:e})).then(o.getResData).then(_.property("rules")).then(v)},detail:function(e){e=S({id:e});return u.get(e).then(o.getResData)},save:function(e,t,n){e=e.id?y(e):function(e,t,n){var r=S(e,!0);return function(e,t,n){return e.ruleTemplateName=t.name,function(e,t){var n=i.when(e);e.c8y_Context||t.mo?(e.enabledSources=[],e.disabledSources=void 0,n=b(e,t.mo,t.withChildren)):(e.enabledSources=void 0,e.disabledSources=[]);return n}(e,n)}(e,t,n).then(_.partial(u.post,r)).then(o.getResData)}(e,t,n);return e},remove:function(e){e=S(e,!0);return u.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(y)},deactivate:function(e,t,n){return R(e,t,n).then(y)},updateSources:function(e,t,r,u){return function(e,t,n){return t.reduce(function(e,t){return e.then(function(e){return b(e,t,n)})},i.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)})},i.resolve(e));var n}).then(y)},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:function(e){return o.cleanFields(e,["id","self","status","deviceId","creationTime","failureReason"])}(e)}})},createInstanceWithUI:N,createInstanceWithUIByName:function(e,t){return c.getTemplateByName(e).then(function(e){return N(e,t)})},editWithUI:function(e){return T(e,void 0)},cloneWithUI:function(e){return t.current().then(_.partial(U,e)).then(T)},getRuleModalTitle:E};function v(e){return i.all(_.map(e,function(t){return c.getTemplateForRule(t).then(function(e){return _.isUndefined(e)?null:t})})).then(_.flatten).then(_.filter)}function S(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 y(e){var t=S(e,!0),e=o.cleanFields(e,m);return u.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(i.when(e)),n.push(function(e,t){var n=[];!0!==t&&!0!==t.assets||n.push(r.childAssets(e));!0!==t&&!0!==t.devices||n.push(r.childDevices(e));return i.all(n).then(_.flattenDeep).then(_.partialRight(_.map,"id"))}(e,t))),i.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?l("Edit global smart rule"):l("Edit local smart rule"):"/rules"===s.path()?l("Add global smart rule"):l("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 N(e,t){return T(t,e)}function U(e,t){e=_.cloneDeep(e);return(e=o.cleanFields(e,p)).name=d.getString("Duplicate of {{name}}",e),t&&(e.owner=t.id),e}function T(e,t){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)}}})}}e.$inject=["$q","$http","c8yBase","c8yInventory","c8yUiUtil","c8yModal","c8yUser","smartRuleTemplatesSvc","gettext","gettextCatalog","$location"],angular.module("c8y.smartRules").factory("smartRulesSvc",e)}();

package/smartRules/views/list.html

@@ -208,7 +208,7 @@
                   <div class="card-header">
                     <label class="text-center text-muted m-b-16">
                       <i c8y-icon="c8y-smart-rules"></i>
-                      {{ 'Smart rule' | translate }}
+                      {{ getRuleCardTitle(rule) | translate }}
                     </label>
                     <div class="smart-rule-name card-title">
                       {{ rule.name }}

package/tenants/controllers/detail.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){var n;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(n="Object"===(n=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name: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,a,i,o,s=[],c=!0,l=!1;try{if(i=(n=n.call(e)).next,0===t){if(Object(n)!==n)return;c=!1}else for(;!(c=(r=i.call(n)).done)&&(s.push(r.value),s.length!==t);c=!0);}catch(e){l=!0,a=e}finally{try{if(!c&&null!=n.return&&(o=n.return(),Object(o)!==o))return}finally{if(l)throw a}}return s}}function _arrayWithHoles(e){if(Array.isArray(e))return e}!function(){function e(r,a,i,e,t,o,n,s,c,l,u,d,m,f){var h,e=e.tenantId,g=u("May contain lowercase letters, digits, and hyphens. Must start with a letter; hyphens only allowed in the middle; minimum 2 characters. ");(_.assign(a,{validation:m.validation,tenantIdDomainHelpText:g,maxStorageLimitPerDevice:(m=Number.MAX_SAFE_INTEGER||9007199254740991,Math.round(m/1024/1024)),passwordStrengthUser:{},cancel:function(){i.path("tenants")},save:function(e,n){a.isNew&&a.host&&(e.domain=e.id+a.host);e=_.cloneDeep(e);a.storageLimitation.storageLimitPerDeviceEnabled?e.storageLimitPerDevice=1024*e.storageLimitPerDevice*1024:e.storageLimitPerDevice=0;p(!0),o.save(e).then(function(e){var e=e.data,t=n;a.isNew&&i.path("/tenants/".concat(e.id)),_.assign(a.tenant,e),c.success(u("Tenant saved.")),t.$setPristine()}).finally(function(){p(!1)})},shouldShowSubtenantCheckbox:function(){var e=a.tenant&&o.isParentTopTenant(a.tenant);return a.isTopTenant&&(e||a.isNew)},storageLimitation:{storageLimitPerDeviceEnabled:!1,storageLimitFeatureEnabled:n.appOption("storageLimitationFeatureEnabled")},humanize:n.humanizeFragment,saveInProgress:!1,changePasswordConfirm:function(){var e=a.tenantForm,t=e.confirmPassword,e=e.adminPass;{var n;t&&(n=t.$modelValue,e=e.$modelValue,t.$setValidity("password-mismatch",n===e))}},changePassword:!1,resetPassword:function(){a.changePassword=!a.changePassword,a.changePassword||(a.tenant.adminPass=null)},shouldDisplayConfirmPassword:function(){return!_.isEmpty(a.tenant.adminPass)}}),a.$watchGroup(["passwordStrengthEnforced","passwordStrengthUser.passwordStrength"],function(e){var e=_slicedToArray(e,2),t=e[0],e=e[1];a.tenantForm&&a.tenantForm.adminPass&&a.tenantForm.adminPass.$setValidity("password-strength",!t||"GREEN"===e)}),a.$watch("tenant.tenantPolicyId",function(e){var t=l.getStrongPasswordSettings(),n=v(),e=_.find(a.tenantPolicies,{id:e});r.all({enforcedOnSystemLevel:t.then(function(e){return e.enforceStrength}),enforcedOnTenantLevel:t.then(function(e){return e.strengthValidity}),enforcedOnTenantPolicyLevel:n&&n.doesEnforceStrongPassword(e)}).then(function(e){var t=e.enforcedOnSystemLevel,n=e.enforcedOnTenantLevel,e=e.enforcedOnTenantPolicyLevel;a.isNew?a.passwordStrengthEnforced=t||e:a.passwordStrengthEnforced=t||n})}),o.current().then(function(e){e=e.domainName;return".".concat(e.split(".").slice(1).join("."))}).then(function(e){a.host=e}),o.isCurrentUserTopTenant().then(function(e){a.isTopTenant=e}),f.current(!1).then(function(e){(f.hasRole(e,"ROLE_SUPPORT_ADMIN")||f.hasRole(e,"ROLE_SUPPORT_READ"))&&(a.supportUser=encodeURIComponent("".concat(e.id,"$")))}),e&&"new"!==e)?o.detail(e).then(function(e){return e.data}).then(y):(y({sendPasswordResetEmail:a.isNew=!0}),s.changeTitle({title:u("New tenant")}),g=v(),m=!1,g&&(m=!0,g.list().then(P)),a.selectTenantPolicy=m);function y(e){var t,e=e||{};a.storageLimitation.storageLimitPerDeviceEnabled=(t=e,a.storageLimitation.storageLimitFeatureEnabled&&!!t.storageLimitPerDevice),e.storageLimitPerDevice=(e.storageLimitPerDevice||0)/1024/1024,a.tenant=e}function p(e){a.saveInProgress=e}function P(e){a.tenantPolicies=_.union([{name:d.getString("None")}],e)}function v(){var e="c8yTenantPolicies";return h=!h&&t.has(e)?t.get(e):h}o.isEnterpriseEditionTenant().then(function(e){a.isEnterpriseEditionTenant=e})}e.$inject=["$q","$scope","$location","$routeParams","$injector","c8yTenant","c8yBase","c8yTitle","c8yAlert","c8yLoginOptions","gettext","gettextCatalog","c8yConfig","c8yUser"],angular.module("c8y.tenants").controller("tenantDetailCtrl",e)}();
+"use strict";!function(){function e(a,i,s,e,n,o,t,r,c,l,d,u,m,g){var h,e=e.tenantId,f=d("May contain lowercase letters, digits, and hyphens. Must start with a letter; hyphens only allowed in the middle; minimum 2 characters. ");(_.assign(i,{validation:m.validation,tenantIdDomainHelpText:f,maxStorageLimitPerDevice:(m=Number.MAX_SAFE_INTEGER||9007199254740991,Math.round(m/1024/1024)),passwordStrengthUser:{},cancel:function(){s.path("tenants")},save:function(e,t){i.isNew&&i.host&&(e.domain=e.id+i.host);e=_.cloneDeep(e);i.storageLimitation.storageLimitPerDeviceEnabled?e.storageLimitPerDevice=1024*e.storageLimitPerDevice*1024:e.storageLimitPerDevice=0;v(!0),o.save(e).then(function(e){var e=e.data,n=t;i.isNew&&s.path("/tenants/".concat(e.id)),_.assign(i.tenant,e),c.success(d("Tenant saved.")),n.$setPristine()}).finally(function(){v(!1)})},shouldShowSubtenantCheckbox:function(){var e=i.tenant&&o.isParentTopTenant(i.tenant);return i.isTopTenant&&(e||i.isNew)},storageLimitation:{storageLimitPerDeviceEnabled:!1,storageLimitFeatureEnabled:t.appOption("storageLimitationFeatureEnabled")},humanize:t.humanizeFragment,saveInProgress:!1,changePasswordConfirm:function(){var e=i.tenantForm,n=e.confirmPassword,e=e.adminPass;{var t;n&&(t=n.$modelValue,e=e.$modelValue,n.$setValidity("password-mismatch",t===e))}},changePassword:!1,resetPassword:function(){i.changePassword=!i.changePassword,i.changePassword||(i.tenant.adminPass=null)},requirementsFulfilled:!0,onRequirementsFulfilledChange:function(e){e=i.requirementsFulfilled=e;!e&&i.tenantForm.adminPass.$viewValue&&i.tenantForm.adminPass.$setValidity("pattern",!0),i.tenantForm.adminPass.$viewValue&&i.tenantForm.adminPass.$setValidity("password-strength",e)}}),i.$watch("tenant.sendPasswordResetEmail",function(e){e&&(i.requirementsFulfilled=!0)}),i.$watch("tenant.tenantPolicyId",function(e){var n=l.getStrongPasswordSettings(),t=p(),e=_.find(i.tenantPolicies,{id:e});a.all({enforcedOnSystemLevel:n.then(function(e){return e.enforceStrength}),enforcedOnTenantLevel:n.then(function(e){return e.strengthValidity}),enforcedOnTenantPolicyLevel:t&&t.doesEnforceStrongPassword(e)}).then(function(e){var n=e.enforcedOnSystemLevel,t=e.enforcedOnTenantLevel,e=e.enforcedOnTenantPolicyLevel;i.isNew?i.passwordStrengthEnforced=n||e:i.passwordStrengthEnforced=n||t})}),o.current().then(function(e){e=e.domainName;return".".concat(e.split(".").slice(1).join("."))}).then(function(e){i.host=e}),o.isCurrentUserTopTenant().then(function(e){i.isTopTenant=e}),g.current(!1).then(function(e){(g.hasRole(e,"ROLE_SUPPORT_ADMIN")||g.hasRole(e,"ROLE_SUPPORT_READ"))&&(i.supportUser=encodeURIComponent("".concat(e.id,"$")))}),e&&"new"!==e)?o.detail(e).then(function(e){return e.data}).then(P):(P({sendPasswordResetEmail:i.isNew=!0}),r.changeTitle({title:d("New tenant")}),f=p(),m=!1,f&&(m=!0,f.list().then(w)),i.selectTenantPolicy=m);function P(e){var n,e=e||{};i.storageLimitation.storageLimitPerDeviceEnabled=(n=e,i.storageLimitation.storageLimitFeatureEnabled&&!!n.storageLimitPerDevice),e.storageLimitPerDevice=(e.storageLimitPerDevice||0)/1024/1024,i.tenant=e}function v(e){i.saveInProgress=e}function w(e){i.tenantPolicies=_.union([{name:u.getString("None")}],e)}function p(){var e="c8yTenantPolicies";return h=!h&&n.has(e)?n.get(e):h}o.isEnterpriseEditionTenant().then(function(e){i.isEnterpriseEditionTenant=e})}e.$inject=["$q","$scope","$location","$routeParams","$injector","c8yTenant","c8yBase","c8yTitle","c8yAlert","c8yLoginOptions","gettext","gettextCatalog","c8yConfig","c8yUser"],angular.module("c8y.tenants").controller("tenantDetailCtrl",e)}();

package/tenants/views/detail.html

@@ -222,7 +222,6 @@
         </div>
 
         <div ng-if="!tenant.sendPasswordResetEmail">
-
           <div
             class="row content-flex-50"
             ng-if="isNew"
@@ -249,15 +248,13 @@
                     ng-message="password-strength"
                     translate
                   >
-                    Password not good enough, password must be stronger (green).
+                    Password is not strong enough, use a stronger password. Check the requirements
+                    listed on the right.
                   </span>
                 </c8y-error-feedback>
               </div>
 
-              <div
-                class="form-group"
-                ng-if="shouldDisplayConfirmPassword()"
-              >
+              <div class="form-group">
                 <label translate>Confirm password</label>
                 <input
                   class="form-control"
@@ -280,23 +277,16 @@
               </div>
             </div>
             <div class="col-5">
-              <div
-                c8y-password-strength
-                user="passwordStrengthUser"
-                password="tenantForm.adminPass.$viewValue"
-              ></div>
-              <div
-                class="m-t-32"
-                ng-if="passwordStrengthEnforced"
-              >
+              <div class="m-t-32">
                 <c8y-password-strength-checklist
                   password="tenantForm.adminPass.$viewValue"
+                  strength-enforced="passwordStrengthEnforced"
+                  requirements-fulfilled="onRequirementsFulfilledChange(value)"
                 ></c8y-password-strength-checklist>
               </div>
             </div>
           </div>
         </div>
-
         <div
           class="form-group"
           ng-if="storageLimitation.storageLimitFeatureEnabled"
@@ -480,7 +470,7 @@
         type="submit"
         ng-click="save(tenant, tenantForm)"
         ng-show="tenant"
-        ng-disabled="tenantForm.$invalid || !tenantForm.$dirty || saveInProgress"
+        ng-disabled="tenantForm.$invalid || !tenantForm.$dirty || saveInProgress || !requirementsFulfilled"
       >
         {{ 'Save' | translate }}
       </button>