From dacb2f8ace373f6594fc64af133971af053f00c0 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 4 May 2023 19:57:46 +0200 Subject: [PATCH] Revert "revert: buggy pagination" This reverts commit b2648645e8fc05f8742ecfc592557f954261671b. --- .../donations/DonationsOverview.svelte | 28 ++++++++++++++----- src/components/donors/DonorsOverview.svelte | 25 ++++++++++++----- src/components/runners/RunnersOverview.svelte | 23 ++++++++++----- src/components/scans/ScansOverview.svelte | 27 +++++++++++++----- 4 files changed, 75 insertions(+), 28 deletions(-) diff --git a/src/components/donations/DonationsOverview.svelte b/src/components/donations/DonationsOverview.svelte index c395ff7f..4c279ff0 100644 --- a/src/components/donations/DonationsOverview.svelte +++ b/src/components/donations/DonationsOverview.svelte @@ -167,13 +167,27 @@ } onMount(async () => { - const donations = await DonationService.donationControllerGetAll(); - current_donations = donations; - options.update((options) => ({ - ...options, - data: current_donations, - })); - dataLoaded = true; + let page = 0; + let pagesize = 100; + while (page >= 0) { + const donations = await DonationService.donationControllerGetAll( + page, + pagesize + ); + if (donations.length == 0) { + page = -2; + } + + current_donations = current_donations.concat(...donations); + options.update((options) => ({ + ...options, + data: current_donations, + })); + + dataLoaded = true; + page++; + pagesize += 100; + } }); diff --git a/src/components/donors/DonorsOverview.svelte b/src/components/donors/DonorsOverview.svelte index ff3645a0..d9780b50 100644 --- a/src/components/donors/DonorsOverview.svelte +++ b/src/components/donors/DonorsOverview.svelte @@ -146,13 +146,24 @@ } onMount(async () => { - const donors = await DonorService.donorControllerGetAll(); - current_donors = donors; - options.update((options) => ({ - ...options, - data: donors, - })); - dataLoaded = true; + let page = 0; + let pagesize = 100; + while (page >= 0) { + const donors = await DonorService.donorControllerGetAll(page, pagesize); + if (donors.length == 0) { + page = -2; + } + + current_donors = current_donors.concat(...donors); + options.update((options) => ({ + ...options, + data: current_donors, + })); + + dataLoaded = true; + page++; + pagesize += 100; + } }); diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte index 3318c1c0..731cb2f5 100644 --- a/src/components/runners/RunnersOverview.svelte +++ b/src/components/runners/RunnersOverview.svelte @@ -161,13 +161,22 @@ } ); - const runners = await RunnerService.runnerControllerGetAll(); - current_runners = runners; - options.update((options) => ({ - ...options, - data: current_runners, - })); - dataLoaded = true; + let page = 0; + while (page >= 0) { + const runners = await RunnerService.runnerControllerGetAll(page, 500); + if (runners.length == 0) { + page = -2; + } + + current_runners = current_runners.concat(...runners); + options.update((options) => ({ + ...options, + data: current_runners, + })); + + dataLoaded = true; + page++; + } }); diff --git a/src/components/scans/ScansOverview.svelte b/src/components/scans/ScansOverview.svelte index a5e0c838..45a88010 100644 --- a/src/components/scans/ScansOverview.svelte +++ b/src/components/scans/ScansOverview.svelte @@ -178,13 +178,26 @@ } onMount(async () => { - const scans = await ScanService.scanControllerGetAll(); - current_scans = scans; - options.update((options) => ({ - ...options, - data: current_scans, - })); - dataLoaded = true; + let page = 0; + let pagesize = 100; + while (page >= 0) { + const scans = await ScanService.scanControllerGetAll(page, pagesize); + if (scans.length == 0) { + page = -2; + } + + current_scans = current_scans.concat(...scans); + options.update((options) => ({ + ...options, + data: current_scans, + })); + + dataLoaded = true; + page++; + if (pagesize < 1000) { + pagesize += 100; + } + } });