From 7aa0db3684b90689fecd1b9d3370d7f3777ac6f0 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 10 Apr 2025 08:29:25 +0200
Subject: [PATCH] enhance: prevent accidental newsletter job start

---
 .../NewsletterMailProgressModal.vue           |  2 +-
 .../NewsletterPrintingProgressModal.vue       |  2 +-
 .../club/newsletter/newsletterPrintout.ts     |  4 ++--
 .../club/newsletter/NewsletterPrintout.vue    | 20 +++++++++++++++----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/admin/club/newsletter/NewsletterMailProgressModal.vue b/src/components/admin/club/newsletter/NewsletterMailProgressModal.vue
index 27f1690..9f5250a 100644
--- a/src/components/admin/club/newsletter/NewsletterMailProgressModal.vue
+++ b/src/components/admin/club/newsletter/NewsletterMailProgressModal.vue
@@ -19,7 +19,7 @@
 
     <div class="flex flex-row justify-end">
       <div class="flex flex-row gap-4 py-2">
-        <button primary-outline @click="closeModal">abbrechen</button>
+        <button primary-outline @click="closeModal">schließen</button>
       </div>
     </div>
   </div>
diff --git a/src/components/admin/club/newsletter/NewsletterPrintingProgressModal.vue b/src/components/admin/club/newsletter/NewsletterPrintingProgressModal.vue
index 416c1e1..8e0b57f 100644
--- a/src/components/admin/club/newsletter/NewsletterPrintingProgressModal.vue
+++ b/src/components/admin/club/newsletter/NewsletterPrintingProgressModal.vue
@@ -19,7 +19,7 @@
 
     <div class="flex flex-row justify-end">
       <div class="flex flex-row gap-4 py-2">
-        <button primary-outline @click="closeModal">abbrechen</button>
+        <button primary-outline @click="closeModal">schließen</button>
       </div>
     </div>
   </div>
diff --git a/src/stores/admin/club/newsletter/newsletterPrintout.ts b/src/stores/admin/club/newsletter/newsletterPrintout.ts
index 0c7b17a..97bc4f3 100644
--- a/src/stores/admin/club/newsletter/newsletterPrintout.ts
+++ b/src/stores/admin/club/newsletter/newsletterPrintout.ts
@@ -124,7 +124,7 @@ export const useNewsletterPrintoutStore = defineStore("newsletterPrintout", {
         chunk.split("//").forEach((r) => {
           if (r.trim() != "") {
             let data = JSON.parse(r);
-            this.pdfSourceMessages.push(data);
+            this.pdfSourceMessages.unshift(data);
             let type: NotificationType = "info";
             let timeout = undefined;
             if (data.factor == "failed") {
@@ -146,7 +146,7 @@ export const useNewsletterPrintoutStore = defineStore("newsletterPrintout", {
         chunk.split("//").forEach((r) => {
           if (r.trim() != "") {
             let data = JSON.parse(r);
-            this.mailSourceMessages.push(data);
+            this.mailSourceMessages.unshift(data);
             let type: NotificationType = "info";
             let timeout = undefined;
             if (data.factor == "failed") {
diff --git a/src/views/admin/club/newsletter/NewsletterPrintout.vue b/src/views/admin/club/newsletter/NewsletterPrintout.vue
index 0580400..3fd49ef 100644
--- a/src/views/admin/club/newsletter/NewsletterPrintout.vue
+++ b/src/views/admin/club/newsletter/NewsletterPrintout.vue
@@ -27,7 +27,7 @@
         primary
         class="!w-fit whitespace-nowrap flex flex-row gap-2"
         :disabled="printing != undefined"
-        @click="createNewsletterPrintout"
+        @click="openPdfCommit"
       >
         Newsletter drucken
         <Spinner v-if="printing == 'loading'" class="my-auto" />
@@ -39,7 +39,7 @@
         primary
         class="!w-fit whitespace-nowrap flex flex-row gap-2"
         :disabled="sending != undefined"
-        @click="createNewsletterSend"
+        @click="openMailCommit"
       >
         Mails versenden
         <Spinner v-if="sending == 'loading'" class="my-auto" />
@@ -108,10 +108,8 @@ export default defineComponent({
     ...mapActions(useModalStore, ["openModal"]),
     ...mapActions(useNewsletterPrintoutStore, [
       "fetchNewsletterPrintout",
-      "createNewsletterPrintout",
       "fetchNewsletterPrintoutById",
       "createNewsletterMailPreview",
-      "createNewsletterSend",
     ]),
     openPdfShow(filename?: string) {
       this.openModal(
@@ -132,6 +130,20 @@ export default defineComponent({
         })
         .catch(() => {});
     },
+    openPdfCommit() {
+      this.openModal(
+        markRaw(
+          defineAsyncComponent(() => import("@/components/admin/club/newsletter/NewsletterPrintingRecipientsModal.vue"))
+        )
+      );
+    },
+    openMailCommit() {
+      this.openModal(
+        markRaw(
+          defineAsyncComponent(() => import("@/components/admin/club/newsletter/NewsletterMailRecipientsModal.vue"))
+        )
+      );
+    },
     openPdfLogs() {
       this.openModal(
         markRaw(