Merge branch 'develop' into feature/styling-device-profile

Author: Allan Asp Christensen

src/app/admin/organisation/organisation-edit/organisation-edit.component.html

@@ -1,11 +1,7 @@
 <app-form-header [backButton]="backButton" [title]="title"></app-form-header>
 <form (ngSubmit)="onSubmit()" class="os2-form p-3 mt-4">
-  <div *ngIf="errorMessages" class="error-messages p-3">
-    <ul class="mb-0">
-      <li *ngFor="let error of errorMessages">
-        {{error}}
-      </li>
-    </ul>
+  <div *ngIf="errorMessage" class="error-messages p-3">
+    {{errorMessage | translate}}
   </div>
 
   <div class="row mb-5">

src/app/admin/organisation/organisation-edit/organisation-edit.component.ts

@@ -18,7 +18,6 @@ import { Organisation } from '../organisation.model';
 export class OrganisationEditComponent implements OnInit {
   organisation = new Organisation();
   public errorMessage: string;
-  public errorMessages: any;
   public errorFields: string[];
   public formFailedSubmit = false;
   public form: FormGroup;
@@ -91,17 +90,10 @@ export class OrganisationEditComponent implements OnInit {
 
   private showError(error: HttpErrorResponse) {
     this.errorFields = [];
-    this.errorMessages = [];
-    if (error.error?.message?.length > 0) {
-      error.error.message[0].children.forEach((err) => {
-        this.errorFields.push(err.property);
-        this.errorMessages = this.errorMessages.concat(
-          Object.values(err.constraints)
-        );
-      });
-    } else {
-      this.errorMessage = error.message;
-    }
+    this.errorMessage = '';
+
+    this.errorMessage = error.error.message;
+    this.errorFields.push('name');
     this.formFailedSubmit = true;
   }
 

src/app/admin/permission/permission-detail/permission-detail.component.ts

@@ -15,7 +15,6 @@ import { PermissionResponse } from '../permission.model';
 export class PermissionDetailComponent implements OnInit {
   permission: PermissionResponse;
   permissions: PermissionResponse[];
-  @Output() deletePermission = new EventEmitter();
   public backButton: BackButton = {
     label: '',
     routerLink: '/admin/permissions',
@@ -61,8 +60,11 @@ export class PermissionDetailComponent implements OnInit {
   }
 
   onDeletePermission() {
-    this.deletePermission.emit(this.permission.id);
-    this.router.navigate(['admin/permissions']);
+    this.permissionService.deletePermission(this.id).subscribe((response) => {
+      if (response.ok && response.body.affected > 0) {
+        this.router.navigate(['admin/permissions']);
+      }
+    });
   }
 
   onEditPermission() {

src/app/admin/permission/permission-edit/permission-edit.component.ts

@@ -205,18 +205,18 @@ export class PermissionEditComponent implements OnInit {
     }
   }
 
-  private showError(error: HttpErrorResponse) {
+  private showError(err: HttpErrorResponse) {
     this.errorFields = [];
     this.errorMessages = [];
-    if (error.error?.message?.length > 0) {
-      error.error.message[0].children.forEach((err) => {
+    if (err.error?.message?.length > 0) {
+      err.error.message[0].children.forEach((err) => {
         this.errorFields.push(err.property);
         this.errorMessages = this.errorMessages.concat(
           Object.values(err.constraints)
         );
       });
     } else {
-      this.errorMessage = error.message;
+      this.errorMessage = err.error.message;
     }
     this.formFailedSubmit = true;
   }

src/app/admin/permission/permission-list/permission-tabel/permission-row/permission-row.component.html

@@ -24,7 +24,7 @@
     <ul class="dropdown-menu" attr.aria-labelledby="tableRowDropdown-{{permission.id}}">
       <li class="dropdown-item">
         <a [routerLink]="[permission.id, 'edit-permission']"
-          routerLinkActive="active">{{ 'PERMISSION.TABLE-ROW.EDIT' | translate }}
+          routerLinkActive="active">{{ 'USERS.TABLE-ROW.EDIT' | translate }}
         </a>
       </li>
       <li class="dropdown-item">

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

@@ -41,7 +41,7 @@
             {{'USERS.FORM.ACTIVE' | translate}}</mat-slide-toggle>
     </div>
     <div class="row mb-3">
-        <mat-slide-toggle [(ngModel)]="user.globalAdmin" id="permission" name="permission">
+        <mat-slide-toggle [(ngModel)]="user.globalAdmin" id="globalAdmin" name="globalAdmin">
             {{'USERS.FORM.GLOBAL-ADMIN' | translate}}</mat-slide-toggle>
     </div>
     <div class="form-group mt-5 clearfix">

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

@@ -44,7 +44,7 @@ export class UserEditComponent implements OnInit {
         this.title = translations['FORM.EDIT-USERS'];
         this.submitButton = translations['USERS.SAVE'];
       });
-    this.id = +this.route.snapshot.paramMap.get('org-id');
+    this.id = +this.route.snapshot.paramMap.get('user-id');
     if (this.id > 0) {
       this.getUser(this.id);
     }

src/app/app.module.ts

@@ -14,6 +14,8 @@ import { DatatargetModule } from './views/datatarget/datatarget.module';
 import { ProfilesModule } from './profiles/profiles.module';
 import { AuthJwtInterceptor } from '@shared/helpers/auth-jwt.interceptor';
 import { AuthModule } from './auth/auth.module';
+import { GlobalErrorHandler } from '@shared/helpers/global-error-handler';
+import { SharedVariableModule } from './shared-variable/shared-variable.module';
 import { DashboardModule } from './dashboard/dashboard.module';
 
 export function HttpLoaderFactory(http: HttpClient) {
@@ -23,6 +25,7 @@ export function HttpLoaderFactory(http: HttpClient) {
 @NgModule({
     declarations: [AppComponent],
     imports: [
+        SharedVariableModule.forRoot(),
         AuthModule,
         BrowserModule,
         BrowserAnimationsModule,

src/app/auth/auth.component.ts

@@ -52,10 +52,10 @@ export class AuthComponent implements OnInit {
     this.authService.login(username, password).subscribe(
       (x: any) => {
         console.log(x);
-        if (x == 401) {
-          this.fail();
-        } else {
+        if (x.accessToken) {
           this.success();
+        } else {
+          this.fail();
         }
       },
       (err) => {

src/app/auth/auth.service.ts

@@ -5,19 +5,28 @@ import { environment } from '@environments/environment';
 import * as jwtDecode from 'jwt-decode';
 import * as moment from 'moment';
 import { of } from 'rxjs/internal/observable/of';
+import { RestService } from '@shared/services/rest.service';
+import { Observable } from 'rxjs';
+import { Organisation } from '@app/admin/organisation/organisation.model';
+import { UserResponse } from '../admin/users/user.model';
 
 export interface AuthResponseData {
   accessToken: string;
 }
 
+export interface CurrentUserInfoResponse {
+  user: UserResponse;
+  organizations: Organisation[];
+}
+
 @Injectable({
   providedIn: 'root',
 })
 export class AuthService {
   private baseUrl = environment.baseUrl;
   private URL = 'auth/login';
 
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient, private restService: RestService) {}
 
   // [email protected]
   // hunter2
@@ -36,6 +45,10 @@ export class AuthService {
       );
   }
 
+  me(): Observable<CurrentUserInfoResponse> {
+    return this.restService.get('auth/me');
+  }
+
   private setSession(jwt: string) {
     localStorage.setItem('id_token', jwt);
   }