Updated to angular 11

Now compiling with strict mode in typescript
Need to error checking now
This commit is contained in:
2020-11-22 10:13:37 +05:30
parent cabd6f2ea1
commit 6567f560ab
187 changed files with 1709 additions and 1184 deletions

View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { ModifierDetailComponent } from './modifier-detail.component';
@ -6,11 +6,13 @@ describe('ModifierDetailComponent', () => {
let component: ModifierDetailComponent;
let fixture: ComponentFixture<ModifierDetailComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ModifierDetailComponent],
}).compileComponents();
}));
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ModifierDetailComponent],
}).compileComponents();
}),
);
beforeEach(() => {
fixture = TestBed.createComponent(ModifierDetailComponent);

View File

@ -15,10 +15,10 @@ import { ModifierService } from '../modifier.service';
styleUrls: ['./modifier-detail.component.css'],
})
export class ModifierDetailComponent implements OnInit, AfterViewInit {
@ViewChild('name', { static: true }) nameElement: ElementRef;
@ViewChild('name', { static: true }) nameElement?: ElementRef;
form: FormGroup;
modifierCategories: ModifierCategory[];
item: Modifier;
modifierCategories: ModifierCategory[] = [];
item: Modifier = new Modifier();
constructor(
private route: ActivatedRoute,
@ -28,10 +28,7 @@ export class ModifierDetailComponent implements OnInit, AfterViewInit {
private toaster: ToasterService,
private ser: ModifierService,
) {
this.createForm();
}
createForm() {
// Create form
this.form = this.fb.group({
name: '',
showInBill: '',
@ -42,12 +39,11 @@ export class ModifierDetailComponent implements OnInit, AfterViewInit {
}
ngOnInit() {
this.route.data.subscribe(
(data: { item: Modifier; modifierCategories: ModifierCategory[] }) => {
this.modifierCategories = data.modifierCategories;
this.showItem(data.item);
},
);
this.route.data.subscribe((value) => {
const data = value as { item: Modifier; modifierCategories: ModifierCategory[] };
this.modifierCategories = data.modifierCategories;
this.showItem(data.item);
});
}
showItem(item: Modifier) {
@ -63,7 +59,9 @@ export class ModifierDetailComponent implements OnInit, AfterViewInit {
ngAfterViewInit() {
setTimeout(() => {
this.nameElement.nativeElement.focus();
if (this.nameElement !== undefined) {
this.nameElement.nativeElement.focus();
}
}, 0);
}
@ -80,7 +78,7 @@ export class ModifierDetailComponent implements OnInit, AfterViewInit {
}
delete() {
this.ser.delete(this.item.id).subscribe(
this.ser.delete(this.item.id as string).subscribe(
() => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/modifiers');

View File

@ -16,6 +16,7 @@ export class ModifierListDataSource extends DataSource<Modifier> {
super();
this.data = [];
this.viewData = [];
this.filterValue = '';
this.filter = filter.pipe(
tap((x) => {
this.filterValue = x;

View File

@ -15,13 +15,13 @@ import { ModifierListDataSource } from './modifier-list-datasource';
styleUrls: ['./modifier-list.component.css'],
})
export class ModifierListComponent implements OnInit {
@ViewChild('table', { static: true }) table: MatTable<Modifier>;
dataSource: ModifierListDataSource;
filter: BehaviorSubject<string>;
@ViewChild('table', { static: true }) table?: MatTable<Modifier>;
filter: BehaviorSubject<string> = new BehaviorSubject('');
data: BehaviorSubject<Modifier[]> = new BehaviorSubject<Modifier[]>([]);
dataSource: ModifierListDataSource = new ModifierListDataSource(this.filter, this.data);
form: FormGroup;
list: Modifier[];
data: BehaviorSubject<Modifier[]>;
modifierCategories: ModifierCategory[];
list: Modifier[] = [];
modifierCategories: ModifierCategory[] = [];
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
displayedColumns: string[] = ['name', 'showInBill', 'price', 'isActive', 'modifierCategory'];
@ -29,8 +29,6 @@ export class ModifierListComponent implements OnInit {
this.form = this.fb.group({
modifierCategory: '',
});
this.filter = new BehaviorSubject('');
this.data = new BehaviorSubject([]);
this.data.subscribe((data: Modifier[]) => {
this.list = data;
});
@ -41,12 +39,11 @@ export class ModifierListComponent implements OnInit {
}
ngOnInit() {
this.route.data.subscribe(
(data: { list: Modifier[]; modifierCategories: ModifierCategory[] }) => {
this.data.next(data.list);
this.modifierCategories = data.modifierCategories;
},
);
this.route.data.subscribe((value) => {
const data = value as { list: Modifier[]; modifierCategories: ModifierCategory[] };
this.data.next(data.list);
this.modifierCategories = data.modifierCategories;
});
this.dataSource = new ModifierListDataSource(this.filter, this.data);
}
}

View File

@ -17,7 +17,7 @@ const serviceName = 'ModifierService';
export class ModifierService {
constructor(private http: HttpClient, private log: ErrorLoggerService) {}
get(id: string): Observable<Modifier> {
get(id: string | null): Observable<Modifier> {
const getUrl: string = id === null ? url : `${url}/${id}`;
return <Observable<Modifier>>(
this.http