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

Fix: Login deleting old clients was conflicting with login history

Browse Source 
Chore: Moved to angular linting using the recommended plugins / settings
This commit is contained in:
Amritanshu Agrawal
2020-12-08 12:09:19 +05:30
parent d5048bc455
commit 57ef355170
176 changed files with 940 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overlord/src/app/product/product-detail/product-detail.component.spec.ts
View File

@ -1,6 +1,6 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { MatDialogModule } from '@angular/material/dialog';
import { ReactiveFormsModule } from '@angular/forms';
import { MatDialogModule } from '@angular/material/dialog';
import { RouterTestingModule } from '@angular/router/testing';
import { ProductDetailComponent } from './product-detail.component';

4
overlord/src/app/product/product-detail/product-detail.component.ts
View File

@ -73,7 +73,9 @@ export class ProductDetailComponent implements OnInit, AfterViewInit {
ngAfterViewInit() {
setTimeout(() => {
if (this.nameElement) this.nameElement.nativeElement.focus();
if (this.nameElement) {
this.nameElement.nativeElement.focus();
}
}, 0);
}

2
overlord/src/app/product/product-list-resolver.service.spec.ts
View File

@ -1,5 +1,5 @@
import { inject, TestBed } from '@angular/core/testing';
import { HttpClientModule } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { ProductListResolver } from './product-list-resolver.service';

24
overlord/src/app/product/product-list/product-list-datasource.ts
View File

@ -9,9 +9,7 @@ import { Product } from '../../core/product';
import { ProductGroup } from '../../core/product-group';
/** Simple sort comparator for example ID/Name columns (for client-side sorting). */
function compare(a: string | number, b: string | number, isAsc: boolean) {
return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
}
const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1);
export class ProductListDataSource extends DataSource<Product> {
private filterValue = '';
@ -36,14 +34,20 @@ export class ProductListDataSource extends DataSource<Product> {
| EventEmitter<PageEvent>
| EventEmitter<Sort>
)[] = [observableOf(this.data), this.filter];
if (this.paginator) dataMutations.push((this.paginator as MatPaginator).page);
if (this.sort) dataMutations.push((this.sort as MatSort).sortChange);
if (this.paginator) {
dataMutations.push((this.paginator as MatPaginator).page);
}
if (this.sort) {
dataMutations.push((this.sort as MatSort).sortChange);
}
return merge(...dataMutations)
.pipe(
map(() => this.getFilteredData([...this.data])),
tap((x: Product[]) => {
if (this.paginator) this.paginator.length = x.length;
if (this.paginator) {
this.paginator.length = x.length;
}
}),
)
.pipe(map((x: Product[]) => this.getPagedData(this.getSortedData(x))));
@ -65,13 +69,17 @@ export class ProductListDataSource extends DataSource<Product> {
}
private getPagedData(data: Product[]) {
if (this.paginator === undefined) return data;
if (this.paginator === undefined) {
return data;
}
const startIndex = this.paginator.pageIndex * this.paginator.pageSize;
return data.splice(startIndex, this.paginator.pageSize);
}
private getSortedData(data: Product[]) {
if (this.sort === undefined) return data;
if (this.sort === undefined) {
return data;
}
if (!this.sort.active || this.sort.direction === '') {
return data;
}

5
overlord/src/app/product/product-list/product-list.component.ts
View File

@ -69,11 +69,14 @@ export class ProductListComponent implements OnInit, AfterViewInit {
ngAfterViewInit() {
setTimeout(() => {
if (this.filterElement) this.filterElement.nativeElement.focus();
if (this.filterElement) {
this.filterElement.nativeElement.focus();
}
}, 0);
}
exportCsv() {
// eslint-disable-next-line @typescript-eslint/naming-convention
const headers = {
Code: 'code',
Name: 'name',

2
overlord/src/app/product/product-resolver.service.spec.ts
View File

@ -1,5 +1,5 @@
import { inject, TestBed } from '@angular/core/testing';
import { HttpClientModule } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { ProductResolver } from './product-resolver.service';

2
overlord/src/app/product/product.service.spec.ts
View File

@ -1,5 +1,5 @@
import { inject, TestBed } from '@angular/core/testing';
import { HttpClientModule } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { ProductService } from './product.service';

52
overlord/src/app/product/product.service.ts
View File

@ -6,10 +6,6 @@ import { catchError } from 'rxjs/operators';
import { ErrorLoggerService } from '../core/error-logger.service';
import { Product } from '../core/product';
const httpOptions = {
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
};
const url = '/api/products';
const serviceName = 'ProductService';
@ -19,35 +15,27 @@ export class ProductService {
get(id: string | null): Observable<Product> {
const getUrl: string = id === null ? `${url}` : `${url}/${id}`;
return <Observable<Product>>(
this.http
.get<Product>(getUrl)
.pipe(catchError(this.log.handleError(serviceName, `get id=${id}`)))
);
return this.http
.get<Product>(getUrl)
.pipe(catchError(this.log.handleError(serviceName, `get id as Observable<Product>=${id}`))) as Observable<Product>;
}
list(): Observable<Product[]> {
return <Observable<Product[]>>(
this.http
.get<Product[]>(`${url}/list`)
.pipe(catchError(this.log.handleError(serviceName, 'getList')))
);
return this.http
.get<Product[]>(`${url}/list`)
.pipe(catchError(this.log.handleError(serviceName, 'getList'))) as Observable<Product[]>;
}
save(product: Product): Observable<Product> {
return <Observable<Product>>(
this.http
.post<Product>(`${url}`, product, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'save')))
);
return this.http
.post<Product>(`${url}`, product)
.pipe(catchError(this.log.handleError(serviceName, 'save'))) as Observable<Product>;
}
update(product: Product): Observable<Product> {
return <Observable<Product>>(
this.http
.put<Product>(`${url}/${product.id}`, product, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'update')))
);
return this.http
.put<Product>(`${url}/${product.id}`, product)
.pipe(catchError(this.log.handleError(serviceName, 'update'))) as Observable<Product>;
}
saveOrUpdate(product: Product): Observable<Product> {
@ -58,19 +46,15 @@ export class ProductService {
}
delete(id: string): Observable<Product> {
return <Observable<Product>>(
this.http
.delete<Product>(`${url}/${id}`, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'delete')))
);
return this.http
.delete<Product>(`${url}/${id}`)
.pipe(catchError(this.log.handleError(serviceName, 'delete'))) as Observable<Product>;
}
autocomplete(query: string): Observable<Product[]> {
const options = { params: new HttpParams().set('q', query) };
return <Observable<Product[]>>(
this.http
.get<Product[]>(`${url}/query`, options)
.pipe(catchError(this.log.handleError(serviceName, 'autocomplete')))
);
return this.http
.get<Product[]>(`${url}/query`, options)
.pipe(catchError(this.log.handleError(serviceName, 'autocomplete'))) as Observable<Product[]>;
}
}