🚀RELEASE v1.4.7

This reverts commit b2648645e8.

CHANGELOG.md

@@ -2,8 +2,47 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [1.4.7](https://git.odit.services/lfk/frontend/compare/1.4.6...1.4.7)
+
+- 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)
+
+#### [1.4.6](https://git.odit.services/lfk/frontend/compare/1.4.5...1.4.6)
+
+> 4 May 2023
+
+- 🚀RELEASE v1.4.6 [`b6fed92`](https://git.odit.services/lfk/frontend/commit/b6fed92a176af1c975484d9146ee5634e0031401)
+- fix(donor/details): don't load donations [`a2ff5b8`](https://git.odit.services/lfk/frontend/commit/a2ff5b8a142ce4e6b8876f64935f9787ec44a51e)
+- fix(donor/detail): Set email to null to avoid vaidation errors [`97b57ae`](https://git.odit.services/lfk/frontend/commit/97b57aeb0cc9058542a36dea9c8b2852169c250f)
+- fix(donor/detail): Set phone to null to avoid vaidation errors [`e25ed1f`](https://git.odit.services/lfk/frontend/commit/e25ed1fff9b200605d5d2b78238b774ec7289aaa)
+
+#### [1.4.5](https://git.odit.services/lfk/frontend/compare/1.4.4...1.4.5)
+
+> 4 May 2023
+
+- Revert "revert: buggy pagination" [`dacb2f8`](https://git.odit.services/lfk/frontend/commit/dacb2f8ace373f6594fc64af133971af053f00c0)
+- fix: Removed dynamic pagesize adjustments [`803d64c`](https://git.odit.services/lfk/frontend/commit/803d64c78caa570d31d6055e70e2d2af6834f04b)
+- 🚀RELEASE v1.4.5 [`0284f18`](https://git.odit.services/lfk/frontend/commit/0284f18beb8b24d4d4d071eca13bc5868666232c)
+
+#### [1.4.4](https://git.odit.services/lfk/frontend/compare/1.4.3...1.4.4)
+
+> 4 May 2023
+
+- 🚀RELEASE v1.4.4 [`b7a5396`](https://git.odit.services/lfk/frontend/commit/b7a53960e5f37ae089d77bc11668d917145e2abb)
+- fix(AddDonationModal): missing toast dismiss on success distance donation [`66f1e6b`](https://git.odit.services/lfk/frontend/commit/66f1e6b4fe1350ee79673a0aff97e36f44179c92)
+
+#### [1.4.3](https://git.odit.services/lfk/frontend/compare/1.4.2...1.4.3)
+
+> 4 May 2023
+
+- revert: buggy pagination [`b264864`](https://git.odit.services/lfk/frontend/commit/b2648645e8fc05f8742ecfc592557f954261671b)
+- 🚀RELEASE v1.4.3 [`33166bf`](https://git.odit.services/lfk/frontend/commit/33166bfafcffb9d86dfc7dfcd2cb8ba5c85da7e7)
+
 #### [1.4.2](https://git.odit.services/lfk/frontend/compare/1.4.1...1.4.2)
 
+> 4 May 2023
+
+- 🚀RELEASE v1.4.2 [`53e3ddb`](https://git.odit.services/lfk/frontend/commit/53e3ddb751c1150a4640ae6302e4df5b88cedc51)
 - fix(GenerateRunnerCertificates): missing toast import [`d49f545`](https://git.odit.services/lfk/frontend/commit/d49f545d94acabc0c96860f212466b7a4cbe7dab)
 - fix(DonorDetail): missing toast import [`edc2dca`](https://git.odit.services/lfk/frontend/commit/edc2dcab92c3cace05335a283a849c3c978ec8ec)
 

index.html

@@ -13,7 +13,7 @@
 
   <body>
     <span style="display: none; visibility: hidden" id="buildinfo"
-      >RELEASE_INFO-1.4.2-RELEASE_INFO</span
+      >RELEASE_INFO-1.4.7-RELEASE_INFO</span
     >
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <script src="/env.js"></script>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/lfk-frontend",
-  "version": "1.4.2",
+  "version": "1.4.7",
   "type": "module",
   "scripts": {
     "i18n-order": "node order.js",

src/components/cards/CardsOverview.svelte

@@ -153,7 +153,7 @@
   onMount(async () => {
     toast.loading($_("loading-cards"));
     let page = 0;
-    let pagesize = 100;
+    let pagesize = 500;
     while (page >= 0) {
       const cards = await RunnerCardService.runnerCardControllerGetAll(
         page,
@@ -171,7 +171,6 @@
 
       dataLoaded = true;
       page++;
-      pagesize += 100;
     }
     toast.dismiss();
     toast.success($_("all-cards-loaded"));

src/components/donations/AddDonationModal.svelte

@@ -8,7 +8,7 @@
     RunnerService,
   } from "@odit/lfk-client-js";
   import Select from "svelte-select";
-  import { createEventDispatcher } from "svelte";
+  import { createEventDispatcher, onMount } from "svelte";
   import toast from "svelte-french-toast";
   export let modal_open;
   const dispatch = createEventDispatcher();
@@ -23,16 +23,6 @@
   $: runners = [];
   $: is_fixed = false;
   $: is_paid = false;
-  DonorService.donorControllerGetAll().then((val) => {
-    donors = val.map((r) => {
-      return { label: getDonorLabel(r), value: r };
-    });
-  });
-  RunnerService.runnerControllerGetAll().then((val) => {
-    runners = val.map((r) => {
-      return { label: getDonorLabel(r), value: r };
-    });
-  });
   $: amount_input = 0;
   $: processed_last_submit = true;
   $: is_amount_valid = amount_input > 0;
@@ -95,6 +85,7 @@
             amount_input = 0;
             modal_open = false;
             //
+            toast.dismiss();
             toast.success($_("donation_added"));
             dispatch("created", { donations: [result] });
           })
@@ -107,6 +98,35 @@
       }
     }
   }
+  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;
+      }
+
+      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++;
+    }
+  }
 </script>
 
 {#if modal_open}

src/components/donations/DonationsOverview.svelte

@@ -168,7 +168,7 @@
 
   onMount(async () => {
     let page = 0;
-    let pagesize = 100;
+    let pagesize = 300;
     while (page >= 0) {
       const donations = await DonationService.donationControllerGetAll(
         page,
@@ -186,7 +186,6 @@
 
       dataLoaded = true;
       page++;
-      pagesize += 100;
     }
   });
 </script>

src/components/donors/DonorDetail.svelte

@@ -12,7 +12,6 @@
   $: delete_triggered = false;
   $: original_data = {};
   $: editable = {};
-  $: current_donations = [];
   $: changes_performed = !(
     JSON.stringify(original_data) === JSON.stringify(editable)
   );
@@ -29,11 +28,6 @@
     isPhoneValidOrEmpty &&
     ((isAddress1Valid && iszipcodevalid && iscityvalid) ||
       editable.address_checked === false);
-  const donation_promise = DonationService.donationControllerGetAll().then(
-    (val) => {
-      current_donations = val;
-    }
-  );
   const promise = DonorService.donorControllerGetOne(params.donorid).then(
     (data) => {
       data_loaded = true;
@@ -69,7 +63,9 @@
         editable.address = null;
       }
       if (editable.email) editable.email = editable.email;
+      else editable.email = null;
       if (editable.phone) editable.phone = editable.phone;
+      else editable.phone = null;
       if (editable.middlename) editable.middlename = editable.middlename;
       editable.receiptNeeded = editable.address_checked;
       DonorService.donorControllerPut(original_data.id, editable)
@@ -96,7 +92,7 @@
 </script>
 
 <ConfirmDonorDeletion bind:modal_open bind:delete_donor />
-{#await promise && donation_promise}
+{#await promise}
   {$_("loading-donor-details")}
 {:then}
   <section class="container p-5 select-none">
@@ -206,8 +202,8 @@
       >
       <br />
       <span class="font-medium text-gray-700">{$_("donations")}:</span>
-      {#if current_donations.filter((d) => d.donor.id == editable.id).length > 0}
+      {#if original_data.donations.length > 0}
-        {#each current_donations.filter((o) => o.donor.id == editable.id) as d}
+        {#each original_data.donations as d}
           {#if d.responseType === "DISTANCEDONATION"}
             <a
               href="../donations/{d.id}"

src/components/donors/DonorsOverview.svelte

@@ -147,7 +147,7 @@
 
   onMount(async () => {
     let page = 0;
-    let pagesize = 100;
+    let pagesize = 300;
     while (page >= 0) {
       const donors = await DonorService.donorControllerGetAll(page, pagesize);
       if (donors.length == 0) {
@@ -162,7 +162,6 @@
 
       dataLoaded = true;
       page++;
-      pagesize += 100;
     }
   });
 </script>

src/components/scans/ScansOverview.svelte

@@ -179,7 +179,7 @@
 
   onMount(async () => {
     let page = 0;
-    let pagesize = 100;
+    let pagesize = 500;
     while (page >= 0) {
       const scans = await ScanService.scanControllerGetAll(page, pagesize);
       if (scans.length == 0) {
@@ -194,9 +194,6 @@
 
       dataLoaded = true;
       page++;
-      if (pagesize < 1000) {
-        pagesize += 100;
-      }
     }
   });
 </script>