tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Chore: Upgraded to Angular, Angular Material and Angular Flex layout 8.0

Browse Source
This commit is contained in:
Amritanshu
2019-06-12 17:25:10 +05:30
parent 40eaa25c76
commit fea48e1a3e
114 changed files with 749 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlord/src/app/account/account-list/account-list-datasource.ts
+2 -1
View File
@@ -1,5 +1,6 @@
import {DataSource} from '@angular/cdk/collections';
import {MatPaginator, MatSort} from '@angular/material';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import {map, tap} from 'rxjs/operators';
import {merge, Observable, of as observableOf} from 'rxjs';
import {Account} from '../account';
overlord/src/app/account/account-list/account-list.component.ts
+5 -4
View File
@@ -1,5 +1,6 @@
import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import {MatPaginator, MatSort} from '@angular/material';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import {AccountListDataSource} from './account-list-datasource';
import {Account} from '../account';
import {ActivatedRoute} from '@angular/router';
@@ -13,9 +14,9 @@ import {debounceTime, distinctUntilChanged, startWith} from 'rxjs/operators';
styleUrls: ['./account-list.component.css']
})
export class AccountListComponent implements OnInit, AfterViewInit {
@ViewChild('filterElement') filterElement: ElementRef;
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
@ViewChild('filterElement', { static: true }) filterElement: ElementRef;
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@ViewChild(MatSort, { static: true }) sort: MatSort;
dataSource: AccountListDataSource;
filter: Observable<string>;
form: FormGroup;