From 76bfa69d448e589b86f536a2a60c3f044e78681c Mon Sep 17 00:00:00 2001 From: Hanna Prinz Date: Mon, 18 Dec 2023 14:22:54 +0100 Subject: [PATCH] Fix frontend style errors RISDEV-2961 --- .../routes/kitchensink/index/pagination.vue | 3 +- .../test/components/activeCitations.spec.ts | 3 +- .../components/documentUnitSearch.spec.ts | 3 +- .../test/components/ensuingDecisions.spec.ts | 3 +- .../test/components/previousDecisions.spec.ts | 3 +- .../procedures/procedureList.spec.ts | 6 +-- .../test/shared/components/pagination.spec.ts | 41 ++++++++----------- 7 files changed, 23 insertions(+), 39 deletions(-) diff --git a/frontend/src/routes/kitchensink/index/pagination.vue b/frontend/src/routes/kitchensink/index/pagination.vue index abcb5b832a..2fd6ca29b1 100644 --- a/frontend/src/routes/kitchensink/index/pagination.vue +++ b/frontend/src/routes/kitchensink/index/pagination.vue @@ -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, }, } } diff --git a/frontend/test/components/activeCitations.spec.ts b/frontend/test/components/activeCitations.spec.ts index 96faea169d..001da041ca 100644 --- a/frontend/test/components/activeCitations.spec.ts +++ b/frontend/test/components/activeCitations.spec.ts @@ -91,12 +91,11 @@ describe("Active Citations", () => { }), ], size: 0, - totalElements: 20, - totalPages: 2, number: 0, numberOfElements: 20, first: true, last: false, + empty: false, }, }), ) diff --git a/frontend/test/components/documentUnitSearch.spec.ts b/frontend/test/components/documentUnitSearch.spec.ts index 1f9ded3ccc..0ce047c12b 100644 --- a/frontend/test/components/documentUnitSearch.spec.ts +++ b/frontend/test/components/documentUnitSearch.spec.ts @@ -73,12 +73,11 @@ describe("Documentunit Search", () => { }), ], size: 0, - totalElements: 20, - totalPages: 2, number: 0, numberOfElements: 20, first: true, last: false, + empty: false, }, }), ) diff --git a/frontend/test/components/ensuingDecisions.spec.ts b/frontend/test/components/ensuingDecisions.spec.ts index f5c94500b4..9b6944397d 100644 --- a/frontend/test/components/ensuingDecisions.spec.ts +++ b/frontend/test/components/ensuingDecisions.spec.ts @@ -87,12 +87,11 @@ describe("EnsuingDecisions", () => { }), ], size: 0, - totalElements: 20, - totalPages: 2, number: 0, numberOfElements: 20, first: true, last: false, + empty: false, }, }), ) diff --git a/frontend/test/components/previousDecisions.spec.ts b/frontend/test/components/previousDecisions.spec.ts index 0c8c1d31ef..f5c1aa713c 100644 --- a/frontend/test/components/previousDecisions.spec.ts +++ b/frontend/test/components/previousDecisions.spec.ts @@ -85,12 +85,11 @@ describe("PreviousDecisions", () => { }), ], size: 0, - totalElements: 20, - totalPages: 2, number: 0, numberOfElements: 20, first: true, last: false, + empty: false, }, }), ) diff --git a/frontend/test/components/procedures/procedureList.spec.ts b/frontend/test/components/procedures/procedureList.spec.ts index 6c48dc1adb..65274b4455 100644 --- a/frontend/test/components/procedures/procedureList.spec.ts +++ b/frontend/test/components/procedures/procedureList.spec.ts @@ -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({ @@ -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, }, }) diff --git a/frontend/test/shared/components/pagination.spec.ts b/frontend/test/shared/components/pagination.spec.ts index aeec54838a..3e86597fd1 100644 --- a/frontend/test/shared/components/pagination.spec.ts +++ b/frontend/test/shared/components/pagination.spec.ts @@ -6,8 +6,6 @@ function renderComponent(options?: { currentPage?: number getInitialData?: boolean navigationPosition?: "top" | "bottom" - totalElements?: number - totalPages?: number last?: boolean first?: boolean }) { @@ -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, }, @@ -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 })