From b2648645e8fc05f8742ecfc592557f954261671b Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Thu, 4 May 2023 14:32:37 +0200 Subject: [PATCH] revert: buggy pagination --- .../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, 28 insertions(+), 75 deletions(-) diff --git a/src/components/donations/DonationsOverview.svelte b/src/components/donations/DonationsOverview.svelte index 4c279ff0..c395ff7f 100644 --- a/src/components/donations/DonationsOverview.svelte +++ b/src/components/donations/DonationsOverview.svelte @@ -167,27 +167,13 @@ } onMount(async () => { - 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; - } + const donations = await DonationService.donationControllerGetAll(); + current_donations = donations; + options.update((options) => ({ + ...options, + data: current_donations, + })); + dataLoaded = true; }); diff --git a/src/components/donors/DonorsOverview.svelte b/src/components/donors/DonorsOverview.svelte index d9780b50..ff3645a0 100644 --- a/src/components/donors/DonorsOverview.svelte +++ b/src/components/donors/DonorsOverview.svelte @@ -146,24 +146,13 @@ } onMount(async () => { - 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; - } + const donors = await DonorService.donorControllerGetAll(); + current_donors = donors; + options.update((options) => ({ + ...options, + data: donors, + })); + dataLoaded = true; }); diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte index 731cb2f5..3318c1c0 100644 --- a/src/components/runners/RunnersOverview.svelte +++ b/src/components/runners/RunnersOverview.svelte @@ -161,22 +161,13 @@ } ); - 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++; - } + const runners = await RunnerService.runnerControllerGetAll(); + current_runners = runners; + options.update((options) => ({ + ...options, + data: current_runners, + })); + dataLoaded = true; }); diff --git a/src/components/scans/ScansOverview.svelte b/src/components/scans/ScansOverview.svelte index 45a88010..a5e0c838 100644 --- a/src/components/scans/ScansOverview.svelte +++ b/src/components/scans/ScansOverview.svelte @@ -178,26 +178,13 @@ } onMount(async () => { - 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; - } - } + const scans = await ScanService.scanControllerGetAll(); + current_scans = scans; + options.update((options) => ({ + ...options, + data: current_scans, + })); + dataLoaded = true; });