nodebb-plugin-calendar-onekite 12.0.4 → 12.0.5

package/lib/admin.js

@@ -202,40 +202,34 @@ admin.purgeByYear = async function (req, res) {
   const startTs = new Date(Date.UTC(y, 0, 1)).getTime();
   const endTs = new Date(Date.UTC(y + 1, 0, 1)).getTime() - 1;
 
-  const ids = await dbLayer.listReservationIdsByStartRange(startTs, endTs, 200000);
+  // IMPORTANT:
+  // Purging "locations" (reservations) must NOT wipe accounting.
+  // Accounting is computed from paid reservations, so for paid ones we keep the
+  // reservation object but mark it as hidden from the calendar.
+  // Non-paid reservations can be safely removed.
+  const ids = await dbLayer.listReservationIdsByStartRange(startTs, endTs, 100000);
   const ts = Date.now();
   let removed = 0;
-  let keptForAccounting = 0;
+  let archivedForAccounting = 0;
 
-  // Bulk fetch to avoid one-by-one DB reads.
-  const chunkSize = 500;
-  for (let i = 0; i < ids.length; i += chunkSize) {
-    const chunk = ids.slice(i, i + chunkSize);
-    const objs = await dbLayer.getReservations(chunk);
-    for (let j = 0; j < chunk.length; j++) {
-      const rid = chunk[j];
-      const r = objs[j];
-      if (!r) {
-        // Ensure index doesn't keep dangling ids
-        try { await dbLayer.removeReservation(rid); } catch (e) {}
-        removed++;
-        continue;
-      }
+  for (const rid of ids) {
+    const r = await dbLayer.getReservation(rid);
+    if (!r) continue;
 
-      // IMPORTANT: Do not purge accounting. If the reservation was paid,
-      // keep the object for exports and mark it as hidden from the calendar.
-      if (String(r.status) === 'paid' || r.paidAt) {
+    if (String(r.status) === 'paid') {
+      if (!r.calendarPurgedAt) {
         r.calendarPurgedAt = ts;
         await dbLayer.saveReservation(r);
-        keptForAccounting++;
-      } else {
-        await dbLayer.removeReservation(rid);
-        removed++;
       }
+      archivedForAccounting++;
+      continue;
     }
+
+    await dbLayer.removeReservation(rid);
+    removed++;
   }
 
-  res.json({ ok: true, removed, keptForAccounting });
+  res.json({ ok: true, removed, archivedForAccounting });
 };
 
 admin.purgeSpecialEventsByYear = async function (req, res) {

package/lib/api.js

@@ -153,17 +153,12 @@ api.getEvents = async function (req, res) {
   const wideStart = Math.max(0, startTs - 366 * 24 * 3600 * 1000);
   const ids = await dbLayer.listReservationIdsByStartRange(wideStart, endTs, 5000);
   const out = [];
-
-  // Bulk fetch to avoid one-by-one DB reads.
-  const chunkSize = 500;
-  for (let i = 0; i < ids.length; i += chunkSize) {
-    const chunk = ids.slice(i, i + chunkSize);
-    const objs = await dbLayer.getReservations(chunk);
-    for (let j = 0; j < chunk.length; j++) {
-      const r = objs[j];
-      if (!r) continue;
-      // Hidden by year purge (kept for accounting, not shown on calendar)
-      if (r.calendarPurgedAt) continue;
+  for (const rid of ids) {
+    const r = await dbLayer.getReservation(rid);
+    if (!r) continue;
+    // If the reservation was purged from the calendar (but kept for accounting),
+    // do not show it in the calendar UI.
+    if (r.calendarPurgedAt) continue;
     // Only show active statuses
     if (!['pending', 'awaiting_payment', 'paid'].includes(r.status)) continue;
     const rStart = parseInt(r.start, 10);
@@ -200,7 +195,6 @@ api.getEvents = async function (req, res) {
         }
       }
       out.push(minimal);
-      }
     }
   }
 

package/package.json

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

package/public/admin.js

@@ -636,7 +636,10 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
           if (!ok) return;
           try {
             const r = await purge(year);
-            showAlert('success', `Purge OK (${r.removed || 0} supprimées).`);
+            const removed = r.removed || 0;
+            const archived = r.archivedForAccounting || 0;
+            const extra = archived ? `, ${archived} archivée(s) (compta conservée)` : '';
+            showAlert('success', `Purge OK (${removed} supprimée(s)${extra}).`);
             await refreshPending();
           } catch (e) {
             showAlert('error', 'Purge impossible.');

package/public/client.js

@@ -36,10 +36,6 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   // interactions or quick re-renders.
   let isDialogOpen = false;
 
-  // Used to avoid a visible "flash" of events when a live update triggers
-  // a refetch during the very first load.
-  let hasLoadedEventsOnce = false;
-
   function escapeHtml(str) {
     return String(str)
       .replace(/&/g, '&')
@@ -438,73 +434,6 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     return await res.json();
   }
 
-  // Load FullCalendar from CDN when templates are rendered via ajaxify.
-  // NodeBB does not reliably execute <script> tags from ajaxified templates,
-  // so we must ensure the scripts are present before initialising.
-  const FULLCALENDAR_ASSETS = {
-    css: 'https://cdn.jsdelivr.net/npm/fullcalendar@latest/main.min.css',
-    jsMain: 'https://cdn.jsdelivr.net/npm/fullcalendar@latest/index.global.min.js',
-    jsLocales: 'https://cdn.jsdelivr.net/npm/@fullcalendar/core@latest/locales-all.global.min.js',
-  };
-
-  function loadCssOnce(href, id) {
-    return new Promise((resolve) => {
-      try {
-        if (id && document.getElementById(id)) return resolve();
-        const existing = [...document.querySelectorAll('link[rel="stylesheet"]')].find(l => l.href === href);
-        if (existing) return resolve();
-        const link = document.createElement('link');
-        link.rel = 'stylesheet';
-        link.href = href;
-        if (id) link.id = id;
-        link.onload = () => resolve();
-        link.onerror = () => resolve();
-        document.head.appendChild(link);
-        // resolve even if browser doesn't fire onload for cached assets
-        setTimeout(resolve, 300);
-      } catch (e) {
-        resolve();
-      }
-    });
-  }
-
-  function loadScriptOnce(src, id) {
-    return new Promise((resolve) => {
-      try {
-        if (id && document.getElementById(id)) return resolve();
-        const existing = [...document.querySelectorAll('script')].find(s => s.src === src);
-        if (existing) return resolve();
-        const s = document.createElement('script');
-        if (id) s.id = id;
-        s.src = src;
-        s.async = true;
-        s.onload = () => resolve();
-        s.onerror = () => resolve();
-        document.head.appendChild(s);
-      } catch (e) {
-        resolve();
-      }
-    });
-  }
-
-  async function ensureFullCalendarLoaded(timeoutMs) {
-    const started = Date.now();
-    if (typeof FullCalendar !== 'undefined') return true;
-
-    // Inject assets (safe to call multiple times).
-    await loadCssOnce(FULLCALENDAR_ASSETS.css, 'onekite-fc-css');
-    await loadScriptOnce(FULLCALENDAR_ASSETS.jsMain, 'onekite-fc-js');
-    await loadScriptOnce(FULLCALENDAR_ASSETS.jsLocales, 'onekite-fc-locales');
-
-    // Wait until FullCalendar becomes available.
-    const limit = typeof timeoutMs === 'number' ? timeoutMs : 8000;
-    while (Date.now() - started < limit) {
-      if (typeof FullCalendar !== 'undefined') return true;
-      await new Promise(r => setTimeout(r, 50));
-    }
-    return typeof FullCalendar !== 'undefined';
-  }
-
   // Simple in-memory cache for JSON endpoints (used for events prefetch + ETag).
   const jsonCache = new Map(); // url -> { etag, data, ts }
 
@@ -958,36 +887,33 @@ function toDatetimeLocalValue(date) {
 
   async function init(selector) {
 
-    const container = typeof selector === 'string' ? document.querySelector(selector) : selector;
-    if (!container) return;
+const container = typeof selector === 'string' ? document.querySelector(selector) : selector;
+if (!container) return;
 
-    // FullCalendar must exist before we can render. When the page is loaded via ajaxify,
-    // NodeBB does not consistently execute <script> tags in templates.
-    // We therefore load the CDN assets here as a fallback.
-    if (typeof FullCalendar === 'undefined') {
-      const ok = await ensureFullCalendarLoaded(9000);
-      if (!ok) {
-        showAlert('error', 'Le calendrier ne peut pas se charger (FullCalendar indisponible)');
-        return;
-      }
-    }
+// Prevent double-init (ajaxify + initial load, or return from payment)
+if (container.dataset && container.dataset.onekiteCalendarInit === '1') {
+  // Still refresh the custom button label in case FC rerendered
+  try { refreshDesktopModeButton(); } catch (e) {}
+  return;
+}
+if (container.dataset) container.dataset.onekiteCalendarInit = '1';
 
-    // Prevent double-init (ajaxify + initial load, or return from payment)
-    if (container.dataset && container.dataset.onekiteCalendarInit === '1') {
-      try { refreshDesktopModeButton(); } catch (e) {}
+// If a previous instance exists (shouldn't, but happens in some navigation flows), destroy it.
+try {
+  if (window.oneKiteCalendar && typeof window.oneKiteCalendar.destroy === 'function') {
+    window.oneKiteCalendar.destroy();
+  }
+  window.oneKiteCalendar = null;
+} catch (e) {}
+    const el = document.querySelector(selector);
+    if (!el) {
       return;
     }
 
-    // If a previous instance exists (shouldn't, but happens in some navigation flows), destroy it.
-    try {
-      if (window.oneKiteCalendar && typeof window.oneKiteCalendar.destroy === 'function') {
-        window.oneKiteCalendar.destroy();
-      }
-      window.oneKiteCalendar = null;
-    } catch (e) {}
-
-    const el = typeof selector === 'string' ? document.querySelector(selector) : container;
-    if (!el) return;
+    if (typeof FullCalendar === 'undefined') {
+      showAlert('error', 'FullCalendar non chargé');
+      return;
+    }
 
     const items = await loadItems();
     const caps = await loadCapabilities().catch(() => ({}));
@@ -1186,15 +1112,10 @@ function toDatetimeLocalValue(date) {
           }
           const abort = new AbortController();
           window.__onekiteEventsAbort = abort;
-          // Hard timeout so FullCalendar doesn't appear to load forever if the API hangs
-          const timeout = setTimeout(() => {
-            try { abort.abort(); } catch (e) {}
-          }, 15000);
 
           const qs = new URLSearchParams({ start: info.startStr, end: info.endStr });
           const url = `/api/v3/plugins/calendar-onekite/events?${qs.toString()}`;
           const data = await fetchJsonCached(url, { signal: abort.signal });
-          clearTimeout(timeout);
 
           // Prefetch adjacent range (previous/next) for snappier navigation.
           try {
@@ -1238,18 +1159,7 @@ function toDatetimeLocalValue(date) {
           });
 
           successCallback(mapped);
-          // Mark first successful events load. We use this to prevent a
-          // refetch-on-socket-update from flashing the UI during initial load.
-          hasLoadedEventsOnce = true;
         } catch (e) {
-          try {
-            // Stop the spinner and give the user feedback.
-            successCallback([]);
-          } catch (e2) {}
-          try {
-            const status = (e && (e.status || e.name)) ? String(e.status || e.name) : '';
-            showAlert('error', status === 'AbortError' ? 'Chargement du calendrier trop long (timeout)' : 'Erreur de chargement du calendrier');
-          } catch (e3) {}
           failureCallback(e);
         }
       },
@@ -1779,9 +1689,6 @@ function toDatetimeLocalValue(date) {
     // Expose for live updates
     try { window.oneKiteCalendar = calendar; } catch (e) {}
 
-    // Mark initialised only after we have a valid FullCalendar instance.
-    try { if (container.dataset) container.dataset.onekiteCalendarInit = '1'; } catch (e) {}
-
     calendar.render();
 
 // Keep the custom button label stable even if FullCalendar rerenders the toolbar
@@ -1917,9 +1824,6 @@ try {
     socket.on('event:calendar-onekite.reservationUpdated', function () {
       try {
         const cal = window.oneKiteCalendar;
-        // Avoid a visible "flash" on first load (e.g. returning from payment
-        // while a live update is emitted right away).
-        if (!hasLoadedEventsOnce) return;
         scheduleRefetch(cal);
       } catch (e) {}
     });