* ========================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.
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);
}),
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
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;
}
});