nodebb-plugin-calendar-onekite 12.0.2 → 12.0.3

package/lib/admin.js

@@ -202,13 +202,40 @@ 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, 100000);
-  let count = 0;
-  for (const rid of ids) {
-    await dbLayer.removeReservation(rid);
-    count++;
+  const ids = await dbLayer.listReservationIdsByStartRange(startTs, endTs, 200000);
+  const ts = Date.now();
+  let removed = 0;
+  let keptForAccounting = 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;
+      }
+
+      // 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) {
+        r.calendarPurgedAt = ts;
+        await dbLayer.saveReservation(r);
+        keptForAccounting++;
+      } else {
+        await dbLayer.removeReservation(rid);
+        removed++;
+      }
+    }
   }
-  res.json({ ok: true, removed: count });
+
+  res.json({ ok: true, removed, keptForAccounting });
 };
 
 admin.purgeSpecialEventsByYear = async function (req, res) {

package/lib/api.js

@@ -153,9 +153,17 @@ 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 = [];
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
-    if (!r) continue;
+
+  // 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;
     // Only show active statuses
     if (!['pending', 'awaiting_payment', 'paid'].includes(r.status)) continue;
     const rStart = parseInt(r.start, 10);
@@ -192,6 +200,7 @@ api.getEvents = async function (req, res) {
         }
       }
       out.push(minimal);
+      }
     }
   }
 

package/package.json

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

package/public/client.js

@@ -36,6 +36,10 @@ 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, '&')
@@ -887,34 +891,48 @@ function toDatetimeLocalValue(date) {
 
   async function init(selector) {
 
-const container = typeof selector === 'string' ? document.querySelector(selector) : selector;
-if (!container) 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';
+    const container = typeof selector === 'string' ? document.querySelector(selector) : selector;
+    if (!container) 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 = document.querySelector(selector);
-    if (!el) {
+    // FullCalendar is loaded via <script> tags in the template. On ajaxify navigation,
+    // action:ajaxify.end can fire before those scripts finish downloading.
+    // IMPORTANT: do NOT mark the container as initialised until FullCalendar exists,
+    // otherwise we permanently block init and the calendar never loads.
+    if (typeof FullCalendar === 'undefined') {
+      // Retry for a short time.
+      const startedAt = Date.now();
+      const retry = () => {
+        if (typeof FullCalendar !== 'undefined') {
+          init(selector);
+          return;
+        }
+        if (Date.now() - startedAt > 6000) {
+          showAlert('error', 'FullCalendar non chargé');
+          return;
+        }
+        setTimeout(retry, 100);
+      };
+      setTimeout(retry, 0);
       return;
     }
 
-    if (typeof FullCalendar === 'undefined') {
-      showAlert('error', 'FullCalendar non chargé');
+    // Prevent double-init (ajaxify + initial load, or return from payment)
+    if (container.dataset && container.dataset.onekiteCalendarInit === '1') {
+      try { refreshDesktopModeButton(); } catch (e) {}
       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;
+
     const items = await loadItems();
     const caps = await loadCapabilities().catch(() => ({}));
     const canCreateSpecial = !!caps.canCreateSpecial;
@@ -1159,6 +1177,9 @@ try {
           });
 
           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) {
           failureCallback(e);
         }
@@ -1689,6 +1710,9 @@ try {
     // 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
@@ -1824,6 +1848,9 @@ 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) {}
     });