Merge branch 'develop' into feature/iot-422-styling-navbar

Author: Allan Asp Christensen

src/app/admin/users/user-edit/user-edit.component.html

@@ -5,6 +5,9 @@
             <li *ngFor="let error of errorMessages">
                 {{error}}
             </li>
+            <li *ngIf="errorMessage">
+                {{errorMessage | translate}}
+            </li>
         </ul>
     </div>
 

src/app/admin/users/user-edit/user-edit.component.ts

@@ -8,6 +8,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { UserService } from '../user.service';
 import { Subscription } from 'rxjs';
 import { Location } from '@angular/common';
+import { PermissionType } from '@app/admin/permission/permission.model';
 
 
 @Component({
@@ -58,9 +59,8 @@ export class UserEditComponent implements OnInit {
         this.user.email = response.email;
         this.user.id = response.id;
         this.user.active = response.active;
-        this.user.globalAdmin = response.globalAdmin;
+        this.user.globalAdmin = response.permissions.some(x => x.type == PermissionType.GlobalAdmin);
         // We cannot set the password.
-        this.user.password = '';
       });
   }
 
@@ -98,7 +98,13 @@ export class UserEditComponent implements OnInit {
   private showError(error: HttpErrorResponse) {
     this.errorFields = [];
     this.errorMessages = [];
-    if (error.error?.message?.length > 0) {
+
+    if (typeof error.error?.message === 'string') {
+      this.errorMessage = error.error.message;
+      if (error.error.message === 'MESSAGE.PASSWORD-DOES-NOT-MEET-REQUIREMENTS') {
+        this.errorFields.push('password');
+      }
+    } else if (error.error?.message?.length > 0) {
       error.error.message.forEach((err) => {
         this.errorFields.push(err.property);
         this.errorMessages = this.errorMessages.concat(

src/app/admin/users/user.model.ts

@@ -18,7 +18,6 @@ export interface UserResponse {
     active: boolean;
     lastLogin: Date;
     permissions: PermissionResponse[];
-    globalAdmin: boolean;
 }
 
 export interface UserGetManyResponse {

src/assets/i18n/da.json

@@ -317,7 +317,8 @@
   },
   "MESSAGE": {
     "NAME-INVALID-OR-ALREADY-IN-USE": "En applikation med det navn findes allerede",
-    "ORGANIZATION-ALREADY-EXISTS": "Navnet er forkert eller en organisation med det navn eksistere allerede"
+    "ORGANIZATION-ALREADY-EXISTS": "Navnet er forkert eller en organisation med det navn eksistere allerede",
+    "PASSWORD-DOES-NOT-MEET-REQUIREMENTS": "Password lever ikke op til kravene. Password skal minimum være 6 tegn"
   },
   "PROFILES": {
     "NAME": "LoRaWan Profiler",
@@ -435,5 +436,6 @@
     "WELCOME": "Velkommen til OS2 Internet of things",
     "WELCOME-MESSAGE": "Her kan du bla bla"
   },
-  "HTTP_PUSH": "HTTP Push"
+  "HTTP_PUSH": "HTTP Push",
+  "Forbidden": "Du har ikke rettigheder til at foretage denne handling"
 }