Skip to content

Commit

Permalink
Fix frontend style errors
Browse files Browse the repository at this point in the history
RISDEV-2961
  • Loading branch information
HPrinz committed Dec 18, 2023
1 parent 81701be commit 76bfa69
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 39 deletions.
3 changes: 1 addition & 2 deletions frontend/src/routes/kitchensink/index/pagination.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ async function mockedItemService(page: number, size: number) {
data: {
content: Array.from({ length: end - start }, (_, i) => start + i),
size: size,
totalElements,
totalPages: totalElements / size,
number: page,
numberOfElements: 100,
first: page === 0,
last: page + 1 >= totalElements / size,
empty: false,
},
}
}
Expand Down
3 changes: 1 addition & 2 deletions frontend/test/components/activeCitations.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,11 @@ describe("Active Citations", () => {
}),
],
size: 0,
totalElements: 20,
totalPages: 2,
number: 0,
numberOfElements: 20,
first: true,
last: false,
empty: false,
},
}),
)
Expand Down
3 changes: 1 addition & 2 deletions frontend/test/components/documentUnitSearch.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,11 @@ describe("Documentunit Search", () => {
}),
],
size: 0,
totalElements: 20,
totalPages: 2,
number: 0,
numberOfElements: 20,
first: true,
last: false,
empty: false,
},
}),
)
Expand Down
3 changes: 1 addition & 2 deletions frontend/test/components/ensuingDecisions.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,11 @@ describe("EnsuingDecisions", () => {
}),
],
size: 0,
totalElements: 20,
totalPages: 2,
number: 0,
numberOfElements: 20,
first: true,
last: false,
empty: false,
},
}),
)
Expand Down
3 changes: 1 addition & 2 deletions frontend/test/components/previousDecisions.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,11 @@ describe("PreviousDecisions", () => {
}),
],
size: 0,
totalElements: 20,
totalPages: 2,
number: 0,
numberOfElements: 20,
first: true,
last: false,
empty: false,
},
}),
)
Expand Down
6 changes: 2 additions & 4 deletions frontend/test/components/procedures/procedureList.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,11 @@ async function renderComponent(options?: { procedures: Procedure[][] }) {
},
],
size: 1,
totalElements: 10,
totalPages: 10,
number: 1,
numberOfElements: 200,
first: true,
last: false,
empty: false,
},
})
.mockResolvedValueOnce({
Expand All @@ -73,12 +72,11 @@ async function renderComponent(options?: { procedures: Procedure[][] }) {
},
],
size: 1,
totalElements: 10,
totalPages: 10,
number: 1,
numberOfElements: 200,
first: true,
last: false,
empty: false,
},
})

Expand Down
41 changes: 16 additions & 25 deletions frontend/test/shared/components/pagination.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ function renderComponent(options?: {
currentPage?: number
getInitialData?: boolean
navigationPosition?: "top" | "bottom"
totalElements?: number
totalPages?: number
last?: boolean
first?: boolean
}) {
Expand All @@ -16,10 +14,7 @@ function renderComponent(options?: {
page: {
content: [1, 2, 3, 4, 5],
size: 100,
totalElements: options?.totalElements ?? 5,
totalPages: options?.totalPages ?? 1,
number: options?.currentPage ?? 0,
numberOfElements: options?.totalElements ?? 5,
first: options?.first ?? true,
last: options?.last ?? true,
},
Expand Down Expand Up @@ -59,36 +54,32 @@ describe("Pagination", () => {
})

// TODO test slice instead of page
// eslint-disable-next-line playwright/no-skipped-test
test.skip("displays correct max Items", async () => {
renderComponent({ getInitialData: true, totalElements: 1337 })
// test.skip("displays correct max Items", async () => {
// renderComponent({ getInitialData: true, totalElements: 1337 })

await screen.findByText("1337 Ergebnisse gefunden.")
})
// await screen.findByText("1337 Ergebnisse gefunden.")
// })

// TODO test slice instead of page
// eslint-disable-next-line playwright/no-skipped-test
test.skip("updates string correctly for one result", async () => {
renderComponent({ getInitialData: true, totalElements: 1 })
// test.skip("updates string correctly for one result", async () => {
// renderComponent({ getInitialData: true, totalElements: 1 })

await screen.findByText("1 Ergebnis gefunden.")
})
// await screen.findByText("1 Ergebnis gefunden.")
// })

// TODO test slice instead of page
// eslint-disable-next-line playwright/no-skipped-test
test.skip("displays correct max Pages", async () => {
renderComponent({ totalPages: 200 })
// test.skip("displays correct max Pages", async () => {
// renderComponent({ totalPages: 200 })

await screen.findByText("1 von 200")
})
// await screen.findByText("1 von 200")
// })

// TODO test slice instead of page
// eslint-disable-next-line playwright/no-skipped-test
test.skip("displays 0 pages if there a no pages", async () => {
renderComponent({ totalPages: 0 })
// test.skip("displays 0 pages if there a no pages", async () => {
// renderComponent({ totalPages: 0 })

await screen.findByText("0 von 0")
})
// await screen.findByText("0 von 0")
// })

test("next button disabled if on last page", async () => {
renderComponent({ last: true })
Expand Down

0 comments on commit 76bfa69

Please sign in to comment.