Skip to content

Commit b441201

Browse files
committed
Fixed issues related to lint- migration to devon4j
1 parent d28634f commit b441201

File tree

5 files changed

+21
-29
lines changed

5 files changed

+21
-29
lines changed

angular/src/app/cockpit-area/order-cockpit/order-cockpit.component.ts

+4-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class OrderCockpitComponent implements OnInit {
2424
private pageable: Pageable = {
2525
pageSize: 8,
2626
pageNumber: 0,
27-
//total: 1,
27+
// total: 1,
2828
};
2929
private sorting: any[] = [];
3030

@@ -69,10 +69,9 @@ export class OrderCockpitComponent implements OnInit {
6969
applyFilters(): void {
7070
this.waiterCockpitService.getOrders(this.pageable, this.sorting, this.filters)
7171
.subscribe((data: any) => {
72-
if (data == null) {
72+
if (!data) {
7373
this.orders = [];
74-
}
75-
else{
74+
} else {
7675
this.orders = data.content;
7776
}
7877
this.totalOrders = data.totalElements;
@@ -89,7 +88,6 @@ export class OrderCockpitComponent implements OnInit {
8988
pageSize: pagingEvent.pageSize,
9089
pageNumber: pagingEvent.page - 1,
9190
sort: this.pageable.sort,
92-
//total: 1,
9391
};
9492
this.applyFilters();
9593
}
@@ -100,7 +98,7 @@ export class OrderCockpitComponent implements OnInit {
10098
property: sortEvent.name,
10199
direction: '' + sortEvent.order,
102100
});
103-
this.applyFilters();
101+
this.applyFilters();
104102
}
105103

106104
selected(selection: ITdDataTableSelectAllEvent): void {

angular/src/app/cockpit-area/reservation-cockpit/reservation-cockpit.component.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class ReservationCockpitComponent implements OnInit {
2727
pageable: Pageable = {
2828
pageSize: 8,
2929
pageNumber: 0,
30-
//total: 1,
30+
// total: 1,
3131
};
3232

3333
reservations: ReservationView[];
@@ -74,9 +74,9 @@ export class ReservationCockpitComponent implements OnInit {
7474
applyFilters(): void {
7575
this.waiterCockpitService.getReservations(this.pageable, this.sorting, this.filters)
7676
.subscribe((data: any) => {
77-
if(data == null){
77+
if (!data) {
7878
this.reservations = [];
79-
}else{
79+
} else {
8080
this.reservations = data.content;
8181
}
8282
this.totalReservations = data.totalElements;
@@ -93,7 +93,7 @@ export class ReservationCockpitComponent implements OnInit {
9393
pageSize: pagingEvent.pageSize,
9494
pageNumber: pagingEvent.page - 1,
9595
sort: this.pageable.sort,
96-
//total: 1,
96+
// total: 1,
9797
};
9898
this.applyFilters();
9999
}

angular/src/app/menu/menu.component.ts

+7-13
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ export class MenuComponent {
2424

2525
dishes$: Observable<DishView[]>;
2626

27-
/*pageable: Pageable = {
28-
pageSize: 8,
29-
pageNumber: 0,
30-
};*/
31-
3227
constructor(
3328
private menuService: MenuService,
3429
) {}
@@ -39,16 +34,15 @@ export class MenuComponent {
3934
pageNumber: 0,
4035
sort: [{
4136
property: filters.sort.property,
42-
direction: filters.sort.direction
43-
}]
44-
};
45-
const composedFilters: Filter = this.menuService.composeFilters(pageable,filters);
37+
direction: filters.sort.direction,
38+
}],
39+
};
40+
const composedFilters: Filter = this.menuService.composeFilters(pageable, filters);
4641
this.dishes$ = this.menuService.getDishes(composedFilters).pipe(
47-
map((res) =>
48-
{
49-
if(res==null){
42+
map((res) => {
43+
if (!res) {
5044
return [];
51-
}else{
45+
} else {
5246
return res.content;
5347
}
5448
}),

angular/src/app/menu/shared/menu.service.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ export class MenuService {
3636
};
3737
}
3838

39-
composeFilters(pageable: Pageable,filters: FilterFormData): Filter {
39+
composeFilters(pageable: Pageable, filters: FilterFormData): Filter {
4040
const categories: { id: string }[] = Object.keys(filters.categories)
4141
.filter((categoryKey: string) => filters.categories[categoryKey])
4242
.map((categoryKey: string) => ({id: categoryNameToServerId[categoryKey].toString()}));
43-
if (filters.sort.property == null) {
44-
filters.sort = null;
45-
pageable.sort = null;
46-
}
43+
if (!filters.sort.property) {
44+
filters.sort = undefined;
45+
pageable.sort = undefined;
46+
}
4747

4848
return {
4949
categories,

java/mtsj/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<properties>
1414
<spring.boot.version>2.0.4.RELEASE</spring.boot.version>
15-
<devon4j.version>3.0.0-alpha.1</devon4j.version>
15+
<devon4j.version>3.0.0</devon4j.version>
1616
<java.version>1.8</java.version>
1717
<devon.port.range>81</devon.port.range>
1818
<devon.http.port>${devon.port.range}81</devon.http.port>

0 commit comments

Comments
 (0)