X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fuser%2Fuser.component.ts;h=06a33307c0fe87b73806b88b15510f368f078f36;hb=9cf5b95a5bc9810d739d14d324dd7d80cbdb4a7d;hp=75cf1c2855748f5d38db57064ef859d54c34070b;hpb=44203c43bb16a87eb54cc97431a026e111842c97;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/user/user.component.ts b/webapp-frontend/src/app/user/user.component.ts
index 75cf1c28..06a33307 100644
--- a/webapp-frontend/src/app/user/user.component.ts
+++ b/webapp-frontend/src/app/user/user.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,11 +22,12 @@ import { MatDialog } from '@angular/material/dialog';
 import { MatSort } from '@angular/material/sort';
 import { DashboardService } from '../services/dashboard/dashboard.service';
 import { ErrorDialogService } from '../services/ui/error-dialog.service';
-import { DashboardUser } from './../interfaces/dashboard.types';
+import { EcompUser } from './../interfaces/dashboard.types';
 import { NotificationService } from './../services/ui/notification.service';
 import { UserDataSource } from './user.datasource';
 import { AddDashboardUserDialogComponent } from './add-dashboard-user-dialog/add-dashboard-user-dialog.component';
 import { EditDashboardUserDialogComponent } from './edit-dashboard-user-dialog/edit-dashboard-user-dialog.component';
+import { UiService } from '../services/ui/ui.service';
 
 @Component({
   selector: 'rd-user',
@@ -36,7 +37,9 @@ import { EditDashboardUserDialogComponent } from './edit-dashboard-user-dialog/e
 
 export class UserComponent implements OnInit {
 
-  displayedColumns: string[] = ['id', 'firstName', 'lastName', 'status', 'action'];
+  darkMode: boolean;
+  panelClass: string;
+  displayedColumns: string[] = ['loginId', 'firstName', 'lastName', 'active', 'action'];
   dataSource: UserDataSource;
   @ViewChild(MatSort, {static: true}) sort: MatSort;
 
@@ -44,15 +47,25 @@ export class UserComponent implements OnInit {
     private dashboardSvc: DashboardService,
     private errorService: ErrorDialogService,
     private notificationService: NotificationService,
-    public dialog: MatDialog) { }
+    public dialog: MatDialog,
+    public ui: UiService) { }
 
   ngOnInit() {
     this.dataSource = new UserDataSource(this.dashboardSvc, this.sort, this.notificationService);
     this.dataSource.loadTable();
+    this.ui.darkModeState.subscribe((isDark) => {
+      this.darkMode = isDark;
+    });
   }
 
-  editUser(user: DashboardUser) {
+  editUser(user: EcompUser) {
+    if (this.darkMode) {
+      this.panelClass = 'dark-theme';
+    } else {
+      this.panelClass = '';
+    }
     const dialogRef = this.dialog.open(EditDashboardUserDialogComponent, {
+      panelClass: this.panelClass,
       width: '450px',
       data: user
     });
@@ -67,7 +80,13 @@ export class UserComponent implements OnInit {
   }
 
   addUser() {
+    if (this.darkMode) {
+      this.panelClass = 'dark-theme';
+    } else {
+      this.panelClass = '';
+    }
     const dialogRef = this.dialog.open(AddDashboardUserDialogComponent, {
+      panelClass: this.panelClass,
       width: '450px'
     });
     dialogRef.afterClosed().subscribe(result => {