nodebb-plugin-calendar-onekite 11.1.73 → 11.1.74

package/lib/api.js

@@ -15,15 +15,12 @@ const helloasso = require('./helloasso');
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
   const emailer = require.main.require('./src/emailer');
+  const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
   try {
-    // Newer NodeBB builds expose sendToEmail
+    // NodeBB's Emailer API differs across versions; the most reliable approach is to pass `subject` inside `data`.
     if (typeof emailer.sendToEmail === 'function') {
-      if (emailer.sendToEmail.length >= 4) {
-        await emailer.sendToEmail(template, toEmail, subject, data);
-        return;
-      }
-      if (emailer.sendToEmail.length === 3) {
-        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
+      // Prefer 3-args (template, email, data) when possible
+      if (emailer.sendToEmail.length >= 3) {
         await emailer.sendToEmail(template, toEmail, dataWithSubject);
         return;
       }
@@ -32,28 +29,20 @@ async function sendEmail(template, toEmail, subject, data) {
       return;
     }
     if (typeof emailer.send === 'function') {
-      // Common: (template, email, subject, data)
-      if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, subject, data);
-        return;
-      }
-      // Some builds: (template, email, data)
-      // In that case, subject is expected inside `data.subject`.
-      if (emailer.send.length === 3) {
-        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
+      if (emailer.send.length >= 3) {
         await emailer.send(template, toEmail, dataWithSubject);
         return;
       }
-      // Fallback: try 4-args anyway
       await emailer.send(template, toEmail, subject, data);
       return;
     }
   } catch (err) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err && err.message || err) });
+    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String((err && err.message) || err) });
   }
 }
 
+
 function normalizeBaseUrl(meta) {
   // Prefer meta.config.url, fallback to nconf.get('url')
   let base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
@@ -507,7 +496,7 @@ api.createReservation = async function (req, res) {
             await sendEmail(
               'calendar-onekite_pending',
               md.email,
-              'Location matériel - Demande de réservation',
+              'Location - Demande de réservation',
               {
                 username: md.username,
                 requester: requester.username,
@@ -605,7 +594,7 @@ api.approveReservation = async function (req, res) {
     const mapUrl = (Number.isFinite(latNum) && Number.isFinite(lonNum))
       ? `https://www.openstreetmap.org/?mlat=${encodeURIComponent(String(latNum))}&mlon=${encodeURIComponent(String(lonNum))}#map=18/${encodeURIComponent(String(latNum))}/${encodeURIComponent(String(lonNum))}`
       : '';
-    await sendEmail('calendar-onekite_approved', requester.email, 'Location matériel - Réservation validée', {
+    await sendEmail('calendar-onekite_approved', requester.email, 'Location - Réservation validée', {
       username: requester.username,
       itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
@@ -641,7 +630,7 @@ api.refuseReservation = async function (req, res) {
 
   const requester = await user.getUserFields(r.uid, ['username', 'email']);
   if (requester && requester.email) {
-    await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Demande de réservation', {
+    await sendEmail('calendar-onekite_refused', requester.email, 'Location - Demande de réservation', {
       username: requester.username,
       itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),

package/library.js

@@ -77,12 +77,12 @@ Plugin.renderMiniWidget = async function (hookData, callback) {
     // Note: We render client-side to avoid extra server-side queries. The widget fetches
     // events via the existing public API endpoint.
     widget.html = `
-<div class="calendar-onekite-widget" id="${widgetId}">
+<div class="calendar-onekite-widget" id="${widgetId}" data-show-special="${showSpecial ? '1' : '0'}">
   <div class="calendar-onekite-widget__header">
     <strong>${escapeHtml(title)}</strong>
     <a class="calendar-onekite-widget__link" href="/calendar">Ouvrir</a>
   </div>
-  <div class="calendar-onekite-widget__month" data-show-special="${showSpecial ? '1' : '0'}"></div>
+  <div class="calendar-onekite-widget__month"></div>
   <div class="calendar-onekite-widget__legend">
     <span class="calendar-onekite-dot calendar-onekite-dot--pending"></span> en attente
     <span class="calendar-onekite-dot calendar-onekite-dot--paid"></span> payée
@@ -108,87 +108,6 @@ Plugin.renderMiniWidget = async function (hookData, callback) {
 .calendar-onekite-badge--special{background:#fd7e14}
 .calendar-onekite-widget__legend{margin-top:8px;font-size:12px;opacity:.8}
 </style>
-<script>
-(function(){
-  const widgetEl = document.getElementById(${JSON.stringify(widgetId)});
-  if (!widgetEl) return;
-
-  const monthEl = widgetEl.querySelector('.calendar-onekite-widget__month');
-  const showSpecial = monthEl.getAttribute('data-show-special') === '1';
-
-  const now = new Date();
-  const year = now.getFullYear();
-  const month = now.getMonth();
-  const first = new Date(year, month, 1);
-  const last = new Date(year, month + 1, 0);
-  const start = new Date(year, month, 1);
-  start.setDate(start.getDate() - ((start.getDay() + 6) % 7)); // Monday-start
-  const end = new Date(start);
-  end.setDate(end.getDate() + 41);
-
-  function iso(d){ return d.toISOString(); }
-  function ymd(d){ return d.toISOString().slice(0,10); }
-
-  const apiUrl = window.location.origin + '/api/v3/plugins/calendar-onekite/events?from=' + encodeURIComponent(iso(start)) + '&to=' + encodeURIComponent(iso(end));
-
-  fetch(apiUrl, { credentials: 'same-origin' })
-    .then(r => r.ok ? r.json() : Promise.reject(r))
-    .then(payload => {
-      const events = Array.isArray(payload) ? payload : (payload.events || payload.data || []);
-      const dayMap = new Map();
-      for (const ev of events) {
-        if (!ev || !ev.start) continue;
-        const d = new Date(ev.start);
-        const key = ymd(d);
-        const props = ev.extendedProps || {};
-        const isSpecial = props.type === 'special' || ev.type === 'special' || (ev.classNames || []).includes('onekite-special');
-        if (isSpecial && !showSpecial) continue;
-        const status = props.status || ev.status || '';
-        const bucket = dayMap.get(key) || { pending: 0, paid: 0, special: 0 };
-        if (isSpecial) bucket.special++;
-        else if (status === 'paid') bucket.paid++;
-        else bucket.pending++;
-        dayMap.set(key, bucket);
-      }
-      render(dayMap);
-    })
-    .catch(() => render(new Map()));
-
-  function render(dayMap){
-    const grid = document.createElement('div');
-    grid.className = 'calendar-onekite-widget__grid';
-    const labels = ['L','M','M','J','V','S','D'];
-    for (const l of labels){
-      const el = document.createElement('div');
-      el.className = 'calendar-onekite-widget__cell calendar-onekite-widget__cell--muted';
-      el.textContent = l;
-      grid.appendChild(el);
-    }
-    for (let i=0;i<42;i++){
-      const d = new Date(start);
-      d.setDate(start.getDate()+i);
-      const cell = document.createElement('a');
-      cell.href = '/calendar';
-      cell.className = 'calendar-onekite-widget__cell';
-      if (d.getMonth() !== month) cell.classList.add('calendar-onekite-widget__cell--muted');
-      if (ymd(d) === ymd(now)) cell.classList.add('calendar-onekite-widget__cell--today');
-      cell.textContent = d.getDate();
-      const b = dayMap.get(ymd(d));
-      if (b && (b.pending || b.paid || b.special)){
-        const badges = document.createElement('div');
-        badges.className = 'calendar-onekite-badges';
-        if (b.pending) { const s=document.createElement('span'); s.className='calendar-onekite-badge calendar-onekite-badge--pending'; badges.appendChild(s); }
-        if (b.paid) { const s=document.createElement('span'); s.className='calendar-onekite-badge calendar-onekite-badge--paid'; badges.appendChild(s); }
-        if (showSpecial && b.special) { const s=document.createElement('span'); s.className='calendar-onekite-badge calendar-onekite-badge--special'; badges.appendChild(s); }
-        cell.appendChild(badges);
-      }
-      grid.appendChild(cell);
-    }
-    monthEl.innerHTML = '';
-    monthEl.appendChild(grid);
-  }
-})();
-</script>
 `;
 
     hookData.widget = widget;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.73",
+  "version": "11.1.74",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -37,5 +37,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.48"
+  "version": "1.0.49"
 }

package/public/client.js

@@ -18,7 +18,15 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
 
   async function openSpecialEventDialog(selectionInfo) {
     const start = selectionInfo.start;
-    const end = selectionInfo.end;
+    let end = selectionInfo.end;
+    // FullCalendar all-day selection uses an exclusive end (next day 00:00). For a single-day click,
+    // this looks like a 2-day range. Default to a 1-hour duration in that case.
+    try {
+      if (selectionInfo && selectionInfo.allDay && start && end && (end.getTime() - start.getTime()) <= 86400000 + 1000) {
+        end = new Date(start.getTime() + 60 * 60 * 1000);
+      }
+    } catch (e) {}
+
     const html = `
       <div class="mb-3">
         <label class="form-label">Titre</label>
@@ -51,7 +59,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     `;
 
     return await new Promise((resolve) => {
-      bootbox.dialog({
+      const dlg = bootbox.dialog({
         title: 'Créer un évènement',
         message: html,
         buttons: {
@@ -78,14 +86,18 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         },
       });
 
-      // init leaflet
-      setTimeout(async () => {
+      // init leaflet once the modal is visible (Leaflet needs a laid-out container)
+      dlg.on('shown.bs.modal', async () => {
         try {
           const mapEl = document.getElementById('onekite-se-map');
           if (!mapEl) return;
           const L = await loadLeaflet();
           const map = L.map(mapEl).setView([46.5, 2.5], 5);
           L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { maxZoom: 19, attribution: '&copy; OpenStreetMap' }).addTo(map);
+
+          setTimeout(() => {
+            try { map.invalidateSize(); } catch (e) {}
+          }, 50);
           let marker = null;
           function setMarker(lat, lon) {
             if (marker) map.removeLayer(marker);
@@ -114,7 +126,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         } catch (e) {
           // ignore leaflet errors
         }
-      }, 0);
+      });
     });
   }
 
@@ -125,12 +137,12 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       ${safeAddr ? `<div class="mb-2">${escapeHtml(safeAddr)}</div>` : ''}
       <div id="${mapId}" style="height:260px; border:1px solid #ddd; border-radius:6px;"></div>
     `;
-    bootbox.dialog({
+    const dlg = bootbox.dialog({
       title: title || 'Carte',
       message: html,
       buttons: { close: { label: 'Fermer', className: 'btn-secondary' } },
     });
-    setTimeout(async () => {
+    dlg.on('shown.bs.modal', async () => {
       try {
         const el = document.getElementById(mapId);
         if (!el) return;
@@ -156,10 +168,14 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           }
         }
         map.setView([46.5, 2.5], 5);
+
+        setTimeout(() => {
+          try { map.invalidateSize(); } catch (e) {}
+        }, 50);
       } catch (e) {
         // ignore leaflet errors
       }
-    }, 0);
+    });
   }
 
   // Click handler for map links in popups
@@ -536,9 +552,10 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
             isDialogOpen = false;
             return;
           }
-          // Send date strings (no hours) so reservations are day-based.
-          const startDate = new Date(info.start).toISOString().slice(0, 10);
-          const endDate = new Date(info.end).toISOString().slice(0, 10);
+          // Send date-only strings from FullCalendar to avoid timezone shifts.
+          // For all-day selections, startStr/endStr are YYYY-MM-DD (end is exclusive).
+          const startDate = info.startStr;
+          const endDate = info.endStr;
           await requestReservation({
             start: startDate,
             end: endDate,
@@ -806,6 +823,12 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
                   // Default view (France-ish)
                   map.setView([46.7, 2.5], 5);
 
+                  // Bootbox/Bootstrap modal layouts can report a zero-sized container on first paint.
+                  // Force Leaflet to recompute sizes once the modal is fully displayed.
+                  setTimeout(() => {
+                    try { map.invalidateSize(); } catch (e) {}
+                  }, 50);
+
                   let marker = null;
                   function setMarker(lat, lon, zoom) {
                     const ll = [lat, lon];
@@ -903,6 +926,95 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   // call once after current tick.
   setTimeout(() => autoInit({ template: (ajaxify && ajaxify.data && ajaxify.data.template) || { name: '' } }), 0);
 
+  // Render mini widgets (ACP Widgets) without inline scripts (CSP-friendly).
+  async function renderMiniWidgets() {
+    const widgets = Array.from(document.querySelectorAll('.calendar-onekite-widget'));
+    if (!widgets.length) return;
+
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = now.getMonth();
+
+    const start = new Date(year, month, 1);
+    start.setDate(start.getDate() - ((start.getDay() + 6) % 7)); // Monday-start
+    const end = new Date(start);
+    end.setDate(end.getDate() + 41);
+
+    function iso(d){ return d.toISOString(); }
+    function ymd(d){ return d.toISOString().slice(0, 10); }
+
+    let events = [];
+    try {
+      const qs = new URLSearchParams({ start: iso(start), end: iso(end) });
+      events = await fetchJson(`/api/v3/plugins/calendar-onekite/events?${qs.toString()}`)
+        .catch(() => fetchJson(`/api/plugins/calendar-onekite/events?${qs.toString()}`));
+    } catch (e) {
+      events = [];
+    }
+
+    const dayMap = new Map();
+    for (const ev of (events || [])) {
+      if (!ev || !ev.start) continue;
+      const d = new Date(ev.start);
+      const key = ymd(d);
+      const props = ev.extendedProps || {};
+      const isSpecial = props.type === 'special' || ev.type === 'special' || (ev.classNames || []).includes('onekite-special');
+      const status = props.status || ev.status || '';
+      const bucket = dayMap.get(key) || { pending: 0, paid: 0, special: 0 };
+      if (isSpecial) bucket.special++;
+      else if (status === 'paid') bucket.paid++;
+      else bucket.pending++;
+      dayMap.set(key, bucket);
+    }
+
+    for (const widgetEl of widgets) {
+      const monthEl = widgetEl.querySelector('.calendar-onekite-widget__month');
+      if (!monthEl) continue;
+      const showSpecial = widgetEl.getAttribute('data-show-special') === '1';
+
+      const grid = document.createElement('div');
+      grid.className = 'calendar-onekite-widget__grid';
+      const labels = ['L','M','M','J','V','S','D'];
+      for (const l of labels) {
+        const el = document.createElement('div');
+        el.className = 'calendar-onekite-widget__cell calendar-onekite-widget__cell--muted';
+        el.textContent = l;
+        grid.appendChild(el);
+      }
+      for (let i = 0; i < 42; i++) {
+        const d = new Date(start);
+        d.setDate(start.getDate() + i);
+        const cell = document.createElement('a');
+        cell.href = '/calendar';
+        cell.className = 'calendar-onekite-widget__cell';
+        if (d.getMonth() !== month) cell.classList.add('calendar-onekite-widget__cell--muted');
+        if (ymd(d) === ymd(now)) cell.classList.add('calendar-onekite-widget__cell--today');
+        cell.textContent = d.getDate();
+
+        const b = dayMap.get(ymd(d));
+        if (b && (b.pending || b.paid || (showSpecial && b.special))) {
+          const badges = document.createElement('div');
+          badges.className = 'calendar-onekite-badges';
+          if (b.pending) { const s = document.createElement('span'); s.className = 'calendar-onekite-badge calendar-onekite-badge--pending'; badges.appendChild(s); }
+          if (b.paid) { const s = document.createElement('span'); s.className = 'calendar-onekite-badge calendar-onekite-badge--paid'; badges.appendChild(s); }
+          if (showSpecial && b.special) { const s = document.createElement('span'); s.className = 'calendar-onekite-badge calendar-onekite-badge--special'; badges.appendChild(s); }
+          cell.appendChild(badges);
+        }
+
+        grid.appendChild(cell);
+      }
+
+      monthEl.innerHTML = '';
+      monthEl.appendChild(grid);
+    }
+  }
+
+  // Re-render widgets on every page load/end.
+  if (hooks && typeof hooks.on === 'function') {
+    hooks.on('action:ajaxify.end', () => { renderMiniWidgets().catch(() => {}); });
+  }
+  setTimeout(() => { renderMiniWidgets().catch(() => {}); }, 0);
+
 
 
 // Live refresh when a reservation changes (e.g., payment confirmed by webhook)

package/templates/admin/plugins/calendar-onekite.tpl

@@ -6,19 +6,19 @@
 
     <ul class="nav nav-tabs mt-3" role="tablist">
       <li class="nav-item" role="presentation">
-        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#onekite-tab-settings" type="button" role="tab">Locations</button>
+        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#onekite-tab-settings" type="button" role="tab" aria-controls="onekite-tab-settings" aria-selected="true">Locations</button>
       </li>
       <li class="nav-item" role="presentation">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-events" type="button" role="tab">Évènements</button>
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-events" type="button" role="tab" aria-controls="onekite-tab-events" aria-selected="false">Évènements</button>
       </li>
       <li class="nav-item" role="presentation">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-pending" type="button" role="tab">Demandes en attente</button>
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-pending" type="button" role="tab" aria-controls="onekite-tab-pending" aria-selected="false">Demandes en attente</button>
       </li>
       <li class="nav-item" role="presentation">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-debug" type="button" role="tab">Debug HelloAsso</button>
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-debug" type="button" role="tab" aria-controls="onekite-tab-debug" aria-selected="false">Debug HelloAsso</button>
       </li>
       <li class="nav-item" role="presentation">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-accounting" type="button" role="tab">Comptabilisation</button>
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-accounting" type="button" role="tab" aria-controls="onekite-tab-accounting" aria-selected="false">Comptabilisation</button>
       </li>
     </ul>
 
@@ -183,4 +183,4 @@
   });
 </script>
 
-<!-- IMPORT admin/partials/settings/footer.tpl -->
+<!-- IMPORT admin/partials/settings/footer.tpl -->