Skip to content

Commit

Permalink
chore: update pnpm to v9.12.2, merge ItemSummaryPaginationResult with…
Browse files Browse the repository at this point in the history
… PaginationResult, and handle error in label generator more gracefully
  • Loading branch information
tonyaellie committed Oct 27, 2024
1 parent cda5770 commit a558147
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/partial-frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

- uses: pnpm/[email protected]
with:
version: 6.0.2
version: 9.12.2

- name: Install dependencies
run: pnpm install
Expand Down
6 changes: 1 addition & 5 deletions frontend/lib/api/types/non-generated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ export interface PaginationResult<T> {
total: number;
}

export interface ItemSummaryPaginationResult<T> {
items: T[];
page: number;
pageSize: number;
total: number;
export interface ItemSummaryPaginationResult<T> extends PaginationResult<T> {
totalPrice: number;
}
4 changes: 3 additions & 1 deletion frontend/pages/reports/label-generator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@
const { data, error } = await api.items.getAll();
if (error) {
return [] as unknown as typeof data;
return {
items: []
}
}
return data;
Expand Down

0 comments on commit a558147

Please sign in to comment.