🚀RELEASE v1.4.8

Switched donor loading to non-paginated
2023-05-09 10:44:04 +02:00 · 2023-05-09 10:43:33 +02:00
6 changed files with 27 additions and 29 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,10 +2,17 @@

 All notable changes to this project will be documented in this file. Dates are displayed in UTC.

+#### [1.4.8](https://git.odit.services/lfk/frontend/compare/1.4.7...1.4.8)
+
+- Switched donor loading to non-paginated [`59fe2df`](https://git.odit.services/lfk/frontend/commit/59fe2dfabb224863876c4db31a965c34a51a9369)
+
 #### [1.4.7](https://git.odit.services/lfk/frontend/compare/1.4.6...1.4.7)

+> 4 May 2023
+
 - Paginated modal data loading [`a8a7711`](https://git.odit.services/lfk/frontend/commit/a8a771114df6eb57d5b1d5497a5be49e619d4102)
 - Moved loading to onmount [`4e0a2c8`](https://git.odit.services/lfk/frontend/commit/4e0a2c83015bde5e360c5fb2c0babbeaa03dc2b5)
+- 🚀RELEASE v1.4.7 [`6364536`](https://git.odit.services/lfk/frontend/commit/6364536dcd840c71f7cb6afb31bbc4f160ac4f73)

 #### [1.4.6](https://git.odit.services/lfk/frontend/compare/1.4.5...1.4.6)

--- a/index.html
+++ b/index.html
@ -13,7 +13,7 @@

  <body>
    <span style="display: none; visibility: hidden" id="buildinfo"
-      >RELEASE_INFO-1.4.7-RELEASE_INFO</span
+      >RELEASE_INFO-1.4.8-RELEASE_INFO</span
    >
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <script src="/env.js"></script>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@odit/lfk-frontend",
-  "version": "1.4.7",
+  "version": "1.4.8",
  "type": "module",
  "scripts": {
    "i18n-order": "node order.js",
--- a/src/components/donations/AddDonationModal.svelte
+++ b/src/components/donations/AddDonationModal.svelte
@ -98,35 +98,22 @@
      }
    }
  }
-  onMount(()=>{
-    loadDonorsAndRunnersPaginated();
-  })

-  async function loadDonorsAndRunnersPaginated() {
-    let page = 0;
-    let pagesize = 500;
-    while (page >= 0) {
-      const don = await DonorService.donorControllerGetAll(page, pagesize);
-      const run = await RunnerService.runnerControllerGetAll(page, pagesize);
-      if (don.length == 0 && run.length == 0) {
-        page = -2;
+  onMount(async () => {
+    toast.loading($_("loading-donors"));
+    donors = (await DonorService.donorControllerGetAll()).map(
+      (r) => {
+        return { label: getDonorLabel(r), value: r };
      }
-
-      donors = donors.concat(
-        ...run.map((r) => {
-          return { label: getDonorLabel(r), value: r };
-        })
-      );
-      runners = runners.concat(
-        ...run.map((r) => {
-          return { label: getDonorLabel(r), value: r };
-        })
-      );
-
-      dataLoaded = true;
-      page++;
-    }
-  }
+    );
+    runners = (await RunnerService.runnerControllerGetAll()).map(
+      (r) => {
+        return { label: getDonorLabel(r), value: r };
+      }
+    );
+    toast.dismiss();
+    toast.success($_("all-donors-loaded"));
+  });
 </script>

 {#if modal_open}
--- a/src/locales/de.json
+++ b/src/locales/de.json
@ -37,6 +37,7 @@
    "all-associated-scans-will-get-deleted-as-well": "Alle Scans dieser Station werden ebenfalls gelöscht",
    "all-associated-teams-and-runners-will-be-deleted-too": "Alle assoziierten Teams und Läufer werden auch gelöscht!",
    "all-cards-loaded": "Alle Karten geladen",
+    "all-donors-loaded": "Alle Sponsoren geladen",
    "already-paid": "Bereits bezahlt",
    "amount": "Anzahl",
    "amount-per-kilometer": "Betrag pro Kilometer",
@ -270,6 +271,7 @@
    "loading-contact-details": "Kontaktdaten werden geladen ...",
    "loading-donation-details": "Lade Sponsoringdetails",
    "loading-donor-details": "Lade Details",
+    "loading-donors": "Sponsoren werden geladen",
    "loading-group-detail": "Lade Gruppendetails...",
    "loading-profile-data": "Lade Profildaten",
    "loading-runners": "Läufer werden geladen...",
--- a/src/locales/en.json
+++ b/src/locales/en.json
@ -37,6 +37,7 @@
    "all-associated-scans-will-get-deleted-as-well": "All associated scans will get deleted as well",
    "all-associated-teams-and-runners-will-be-deleted-too": "All associated teams and runners will be deleted too!",
    "all-cards-loaded": "All cards loaded",
+    "all-donors-loaded": "All donors loaded",
    "already-paid": "Already paid",
    "amount": "Amount",
    "amount-per-kilometer": "Amount per kilometer",
@ -270,6 +271,7 @@
    "loading-contact-details": "Loading contact details...",
    "loading-donation-details": "Loading donation details",
    "loading-donor-details": "Loading donor details",
+    "loading-donors": "Loading donors",
    "loading-group-detail": "Loading group detail...",
    "loading-profile-data": "Loading profile data",
    "loading-runners": "loading runners...",
Author	SHA1	Message	Date
Nicolai Ort	4235758a6d	🚀RELEASE v1.4.8 All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-09 10:44:04 +02:00
Nicolai Ort	59fe2dfabb	Switched donor loading to non-paginated	2023-05-09 10:43:33 +02:00