X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fuser%2Fuser.component.ts;h=a3573c0f79001a3e1526dde4063efefbed3a3b80;hb=59f2bcb96fad2d6faee48b4ca65da36249ec5297;hp=482a1c0f489e3843001158dc0fdaa81786b198fb;hpb=226fd436a085f717d4cbf81bf1719bdaf1468414;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 482a1c0f..a3573c0f 100644
--- a/webapp-frontend/src/app/user/user.component.ts
+++ b/webapp-frontend/src/app/user/user.component.ts
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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 => {