X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fuser%2Fuser.datasource.ts;h=6b7805bc39f5527af1512377b4b8c503d6d1836b;hb=refs%2Fchanges%2F97%2F1197%2F3;hp=f53a2d3e7e282c06976a1d175eae05d51e520aba;hpb=3f812ea25d352ec33d07f5ffa4c2aa2a77e8e793;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/user/user.datasource.ts b/webapp-frontend/src/app/user/user.datasource.ts
index f53a2d3e..6b7805bc 100644
--- a/webapp-frontend/src/app/user/user.datasource.ts
+++ b/webapp-frontend/src/app/user/user.datasource.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.
@@ -20,19 +20,19 @@
 
 import { CollectionViewer, DataSource } from '@angular/cdk/collections';
 import { HttpErrorResponse } from '@angular/common/http';
-import { MatSort } from '@angular/material';
+import { MatSort } from '@angular/material/sort';
 import { Observable } from 'rxjs/Observable';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { merge } from 'rxjs';
 import { of } from 'rxjs/observable/of';
 import { catchError, finalize, map } from 'rxjs/operators';
-import { DashboardUser } from '../interfaces/dashboard.types';
+import { EcompUser } from '../interfaces/dashboard.types';
 import { DashboardService } from '../services/dashboard/dashboard.service';
 import { NotificationService } from '../services/ui/notification.service';
 
-export class UserDataSource extends DataSource<DashboardUser> {
+export class UserDataSource extends DataSource<EcompUser> {
 
-  private userSubject = new BehaviorSubject<DashboardUser[]>([]);
+  private userSubject = new BehaviorSubject<EcompUser[]>([]);
 
   private loadingSubject = new BehaviorSubject<boolean>(false);
 
@@ -57,13 +57,13 @@ export class UserDataSource extends DataSource<DashboardUser> {
         }),
         finalize(() => this.loadingSubject.next(false))
       )
-      .subscribe( (users: DashboardUser[]) => {
+      .subscribe( (users: EcompUser[]) => {
         this.rowCount = users.length;
         this.userSubject.next(users);
       });
   }
 
-  connect(collectionViewer: CollectionViewer): Observable<DashboardUser[]> {
+  connect(collectionViewer: CollectionViewer): Observable<EcompUser[]> {
     const dataMutations = [
       this.userSubject.asObservable(),
       this.sort.sortChange
@@ -78,18 +78,18 @@ export class UserDataSource extends DataSource<DashboardUser> {
     this.loadingSubject.complete();
   }
 
-  private getSortedData(data: DashboardUser[]) {
+  private getSortedData(data: EcompUser[]) {
     if (!this.sort.active || this.sort.direction === '') {
       return data;
     }
 
-    return data.sort((a: DashboardUser, b: DashboardUser) => {
+    return data.sort((a: EcompUser, b: EcompUser) => {
       const isAsc = this.sort.direction === 'asc';
       switch (this.sort.active) {
-        case 'id': return this.compare(a.id, b.id, isAsc);
+        case 'loginId': return this.compare(a.loginId, b.loginId, isAsc);
         case 'firstName': return this.compare(a.firstName, b.firstName, isAsc);
         case 'lastName': return this.compare(a.lastName, b.lastName, isAsc);
-        case 'status': return this.compare(a.status, b.status, isAsc);
+        case 'active': return this.compare(a.active, b.active, isAsc);
         default: return 0;
       }
     });