newsletter : liste d'adresse de test, écriture des logs

site/blueprints/pages/email.yml

@@ -14,9 +14,17 @@ tabs:
       published:
         label: Date d'envoi
         type: date
-        default: today
         width: 1/3
         help: Affichée dans la version web
+      testAdressList:
+        label: Liste d'adresses de test
+        type: structure
+        width: 2/3
+        sortBy: email asc
+        help: Le bouton "Tester" ci-dessous tentera d'envoyer l'email aux adresses de cette liste
+        fields:
+          email:
+            type: email
       sendBtn:
         type: send-button
       body:

site/config/config.php

@@ -23,4 +23,7 @@ return [
     require __DIR__ . '/routes/subscribe.php',
     require __DIR__ . '/routes/virtual-pending.php',
   ],
+  'hooks' => [
+    'page.create:after' => require __DIR__ . '/hooks/prefill-test-adress-list.php',
+  ],
 ];

site/config/hooks/prefill-test-adress-list.php

@@ -0,0 +1,17 @@
+<?php
+
+return function ($page) {
+    if ($page->template() == 'email') {
+        $list = [
+          ['email' => 'fournelcecile@yahoo.fr'],
+          ['email' => 'payet.adrien@protonmail.com'],
+          ['email' => 'mazet.zaccardelli@free.fr'],
+          ['email' => 'wafaabida@hotmail.com'],
+          ['email' => 'elisegarraud@yahoo.fr'],
+          ['email' => 'pierre-damien.huyghe@univ-paris1.fr'],
+        ];
+        $page->update([
+          'testAdressList' => Yaml::encode($list),
+        ]);
+    }
+};

site/plugins/send-button/index.css

@@ -1 +1 @@
-.wrapper[data-v-ff7e61fa]{display:flex;gap:10vw}.k-field-footer[data-v-ff7e61fa]{width:15rem}@media screen and (max-width: 800px){.k-field-footer[data-v-ff7e61fa]{width:9rem}}@media screen and (min-width: 533px){button[data-v-ff7e61fa]{margin-top:2.15rem}}
+.wrapper[data-v-17f2f6fa]{display:flex;gap:10vw}.k-field-footer[data-v-17f2f6fa]{width:15rem}@media screen and (max-width: 800px){.k-field-footer[data-v-17f2f6fa]{width:9rem}}@media screen and (min-width: 533px){button[data-v-17f2f6fa]{margin-top:2.15rem}}

site/plugins/send-button/index.js

@@ -1,2 +1 @@
-(function(){"use strict";function f(t,e,r,n,o,c,i,l){var s=typeof t=="function"?t.options:t;return s.render=e,s.staticRenderFns=r,s._compiled=!0,s._scopeId="data-v-"+c,{exports:t,options:s}}const _={__name:"SendButtonField",props:{pageUri:String,pageStatus:String},setup(t){const{pageUri:e}=t,r=Vue.ref({icon:"plane",text:"Tester",theme:null,error:null}),n=Vue.ref({icon:"plane",text:"Envoyer",theme:"orange",error:null});async function o(c,i=!1){c.preventDefault();const l=i?r:n;l.value={theme:"blue",text:"En cours…",icon:"loader",error:null};const s={method:"POST",body:JSON.stringify({pageUri:e,isTest:i})};try{const a=await(await fetch("/send-newsletter.json",s)).json();if(console.log(a),a.status==="success")l.value={theme:"green",icon:"check",text:i?"Test envoyé":"Envoi réussi",error:null},setTimeout(()=>{location.href=location.href},2e3);else{let d=a.message||"Erreur inconnue";if(a.failed&&a.failed.length>0){const S=a.failed.map(g=>g.email).join(", ");d+=`
-Emails non envoyés : ${S}`}throw new Error(d)}}catch(u){l.value={theme:"red",icon:"alert",text:i?"Échec du test":"Erreur",error:u.message}}}return{__sfc:!0,testBtnState:r,sendBtnState:n,send:o}}};var p=function(){var e=this,r=e._self._c,n=e._self._setupProxy;return e.pageStatus!=="listed"?r("div",{staticClass:"wrapper"},[r("div",{staticClass:"test-wrapper"},[r("k-button",{staticStyle:{width:"max-content"},attrs:{variant:"filled",help:"test",theme:n.testBtnState.theme,icon:n.testBtnState.icon},on:{click:function(o){return n.send(o,!0)}}},[e._v(e._s(n.testBtnState.text))]),e._m(0),n.testBtnState.error?r("k-box",{staticStyle:{"margin-top":"var(--spacing-1)"},attrs:{theme:"error"}},[e._v(e._s(n.testBtnState.error))]):e._e()],1),r("div",{staticClass:"send-wrapper"},[r("k-button",{attrs:{variant:"filled",theme:n.sendBtnState.theme,icon:n.sendBtnState.icon},on:{click:function(o){return n.send(o)}}},[e._v(e._s(n.sendBtnState.text))]),n.sendBtnState.error?r("k-box",{staticStyle:{"margin-top":"var(--spacing-1)"},attrs:{theme:"error"}},[e._v(e._s(n.sendBtnState.error))]):e._e(),e._m(1)],1)]):e._e()},v=[function(){var t=this,e=t._self._c;return t._self._setupProxy,e("footer",{staticClass:"k-field-footer"},[e("div",{staticClass:"k-help k-field-help k-text"},[e("p",[t._v(" Envoie seulement aux "),e("a",{attrs:{href:"/panel/users",title:"voir la liste"}},[t._v("éditeurs")]),t._v(". ")])])])},function(){var t=this,e=t._self._c;return t._self._setupProxy,e("footer",{staticClass:"k-field-footer"},[e("div",{staticClass:"k-help k-field-help k-text"},[e("strong",[t._v("⚠ Envoie à tous les abonnés.")])])])}],m=f(_,p,v,!1,null,"ff7e61fa");const h=m.exports;window.panel.plugin("adrienpayet/send-button",{fields:{"send-button":h}})})();
+(function(){"use strict";function d(n,e,r,t,o,l,a,i){var s=typeof n=="function"?n.options:n;return s.render=e,s.staticRenderFns=r,s._compiled=!0,s._scopeId="data-v-"+l,{exports:n,options:s}}const _={__name:"SendButtonField",props:{pageUri:String,pageStatus:String},setup(n){const{pageUri:e}=n,r=Vue.ref({icon:"plane",text:"Tester",theme:null,error:null}),t=Vue.ref({icon:"plane",text:"Envoyer",theme:"orange",error:null});async function o(l,a=!1){l.preventDefault();const i=a?r:t;i.value={theme:"blue",text:"En cours…",icon:"loader",error:null};const s={method:"POST",body:JSON.stringify({pageUri:e,isTest:a})};try{const c=await(await fetch("/send-newsletter.json",s)).json();if(console.log(c),c.status==="success")i.value={theme:"green",icon:"check",text:a?"Test envoyé":"Envoi réussi",error:null},setTimeout(()=>{location.href=location.href},2e3);else{let h=c.message||"Erreur inconnue";throw new Error(h)}}catch(u){i.value={theme:"red",icon:"alert",text:a?"Échec du test":"Erreur",error:u.message}}}return{__sfc:!0,testBtnState:r,sendBtnState:t,send:o}}};var f=function(){var e=this,r=e._self._c,t=e._self._setupProxy;return e.pageStatus!=="listed"?r("div",{staticClass:"wrapper"},[r("div",{staticClass:"test-wrapper"},[r("k-button",{staticStyle:{width:"max-content"},attrs:{variant:"filled",help:"test",theme:t.testBtnState.theme,icon:t.testBtnState.icon},on:{click:function(o){return t.send(o,!0)}}},[e._v(e._s(t.testBtnState.text))]),e._m(0),t.testBtnState.error?r("k-box",{staticStyle:{"margin-top":"var(--spacing-1)"},attrs:{theme:"error"}},[e._v(e._s(t.testBtnState.error))]):e._e()],1),r("div",{staticClass:"send-wrapper"},[r("k-button",{attrs:{variant:"filled",theme:t.sendBtnState.theme,icon:t.sendBtnState.icon},on:{click:function(o){return t.send(o)}}},[e._v(e._s(t.sendBtnState.text))]),t.sendBtnState.error?r("k-box",{staticStyle:{"margin-top":"var(--spacing-1)"},attrs:{theme:"error"}},[e._v(e._s(t.sendBtnState.error))]):e._e(),e._m(1)],1)]):e._e()},p=[function(){var n=this,e=n._self._c;return n._self._setupProxy,e("footer",{staticClass:"k-field-footer"},[e("div",{staticClass:"k-help k-field-help k-text"},[e("p",[n._v("Envoie seulement à la liste ci-dessus")])])])},function(){var n=this,e=n._self._c;return n._self._setupProxy,e("footer",{staticClass:"k-field-footer"},[e("div",{staticClass:"k-help k-field-help k-text"},[e("strong",[n._v("⚠ Envoie à tous les abonnés.")])])])}],v=d(_,f,p,!1,null,"17f2f6fa");const m=v.exports;window.panel.plugin("adrienpayet/send-button",{fields:{"send-button":m}})})();

site/plugins/send-button/routes/send-newsletter.php

@@ -31,7 +31,7 @@ return [
         }
 
         $recipients = $data->isTest
-            ? $kirby->users()->pluck('email', null, true)
+            ? $emailPage->testAdressList()->toStructure()->pluck('email', ',', true)
             : page('lettre')->subscribers()->toStructure()->pluck('email', ',', true);
 
         if (empty($recipients)) {
@@ -45,9 +45,6 @@ return [
             ? '[TEST] - ' . $emailPage->title()->value()
             : $emailPage->title()->value();
 
-        $sentEmails = [];
-        $errors = [];
-
         $mailersend = new MailerSend(['api_key' => kirby()->option('mailerSendApiKey')]);
         $bulkEmailParams = [];
 
@@ -55,7 +52,7 @@ return [
             $bulkEmailParams[] = (new EmailParams())
                 ->setFrom('info@actuel-inactuel.fr')
                 ->setFromName('actuel-inactuel')
-                ->setRecipients(new Recipient($recipient, 'abonné'))
+                ->setRecipients([new Recipient($recipient, 'abonné')])
                 ->setSubject($subject)
                 ->setHtml($emailPage->body())
                 ->setReplyTo('info@actuel-inactuel.fr')
@@ -66,21 +63,31 @@ return [
 
         try {
             $response = $mailersend->bulkEmail->send($bulkEmailParams);
-            file_put_contents(__DIR__ . '/mailersend_log.json', json_encode($response, JSON_PRETTY_PRINT));
+            file_put_contents($emailPage->root() . '/mailersend_log.json', json_encode($response, JSON_PRETTY_PRINT));
+            return json_encode([
+                'status'  => 'success',
+                'message' => 'All emails sent successfully.',
+            ]);
         } catch (\Exception $e) {
-            file_put_contents(__DIR__ . '/mailersend_errors.log', $e->getMessage());
-            $error[] = 'Error. See https://developers.mailersend.com/general.html#api-response for explanations : ' . $e->getMessage();
+            $date = Kirby\Toolkit\Date::now(new DateTimeZone('Europe/Paris'));
+            file_put_contents(
+                $emailPage->root() . '/mailersend_errors.log',
+                $date->format('d/m/Y H:i:s') . ' ' . $e->getMessage() . PHP_EOL,
+                FILE_APPEND
+            );
+            return json_encode([
+                'status'  => 'error',
+                'message' => 'Erreur enregistrée dans le log : ' . $e->getMessage(),
+            ]);
         }
 
         if (!$data->isTest) {
+            $emailPage->update([
+                'published' => Kirby\Toolkit\Date::Today(),
+            ]);
             $emailPage->changeStatus('listed');
         } else {
             $emailPage->changeStatus('unlisted');
         }
-
-        return json_encode([
-            'status'  => empty($errors) ? 'success' : 'partial',
-            'message' => empty($errors) ? 'All emails sent successfully.' : $errors,
-        ]);
     },
 ];

site/plugins/send-button/src/components/SendButtonField.vue

@@ -12,10 +12,7 @@
       >
       <footer class="k-field-footer">
         <div class="k-help k-field-help k-text">
-          <p>
-            Envoie seulement aux
-            <a href="/panel/users" title="voir la liste">éditeurs</a>.
-          </p>
+          <p>Envoie seulement à la liste ci-dessus</p>
         </div>
       </footer>
       <k-box