nodebb-plugin-calendar-onekite 11.1.3 → 11.1.4

package/library.js

@@ -27,31 +27,31 @@ Plugin.init = async function (params) {
   routeHelpers.setupPageRoute(router, '/calendar', mw([buildHeader]), controllers.renderCalendar);
 
   // Public API (read-only)
-  // NodeBB v4 uses the v3 API namespace. We register under /api/v3.
-  routeHelpers.setupApiRoute(router, 'get', '/api/v3/calendar-onekite/events', [], api.getEvents);
-  routeHelpers.setupApiRoute(router, 'get', '/api/v3/calendar-onekite/items', [], api.getItems);
+  // Use a plugin namespace under /api/v3/plugins/... (client-side api module expects this)
+  routeHelpers.setupApiRoute(router, 'get', '/plugins/calendar-onekite/events', [], api.getEvents);
+  routeHelpers.setupApiRoute(router, 'get', '/plugins/calendar-onekite/items', [], api.getItems);
 
   // Authenticated API
   // req.uid is provided by exposeUid; ensureLoggedIn blocks unauthenticated users.
-  routeHelpers.setupApiRoute(router, 'post', '/api/v3/calendar-onekite/reservations', mw([exposeUid, ensureLoggedIn]), api.createReservation);
+  routeHelpers.setupApiRoute(router, 'post', '/plugins/calendar-onekite/reservations', mw([exposeUid, ensureLoggedIn]), api.createReservation);
 
   // Admin ACP page
   routeHelpers.setupAdminPageRoute(router, '/admin/plugins/calendar-onekite', [], admin.renderAdmin);
 
-  // Admin API (under /api/v3/admin)
+  // Admin API (under /api)
   const adminMiddlewares = mw([
     exposeUid,
     ensureLoggedIn,
     middleware.admin && middleware.admin.checkPrivileges,
   ]);
 
-  // Note: setupApiRoute in NodeBB expects the method first (get/post/put/del), then the full path.
-  routeHelpers.setupApiRoute(router, 'get', '/api/v3/admin/plugins/calendar-onekite', adminMiddlewares, admin.getSettings);
-  routeHelpers.setupApiRoute(router, 'post', '/api/v3/admin/plugins/calendar-onekite', adminMiddlewares, admin.saveSettings);
-  routeHelpers.setupApiRoute(router, 'get', '/api/v3/admin/plugins/calendar-onekite/pending', adminMiddlewares, admin.listPending);
-  routeHelpers.setupApiRoute(router, 'put', '/api/v3/admin/plugins/calendar-onekite/reservations/:rid/approve', adminMiddlewares, admin.approveReservation);
-  routeHelpers.setupApiRoute(router, 'put', '/api/v3/admin/plugins/calendar-onekite/reservations/:rid/refuse', adminMiddlewares, admin.refuseReservation);
-  routeHelpers.setupApiRoute(router, 'post', '/api/v3/admin/plugins/calendar-onekite/purge', adminMiddlewares, admin.purgeByYear);
+  // Admin API (client uses /api/v3/admin/... via api module)
+  routeHelpers.setupApiRoute(router, 'get', '/admin/plugins/calendar-onekite', adminMiddlewares, admin.getSettings);
+  routeHelpers.setupApiRoute(router, 'post', '/admin/plugins/calendar-onekite', adminMiddlewares, admin.saveSettings);
+  routeHelpers.setupApiRoute(router, 'get', '/admin/plugins/calendar-onekite/pending', adminMiddlewares, admin.listPending);
+  routeHelpers.setupApiRoute(router, 'put', '/admin/plugins/calendar-onekite/reservations/:rid/approve', adminMiddlewares, admin.approveReservation);
+  routeHelpers.setupApiRoute(router, 'put', '/admin/plugins/calendar-onekite/reservations/:rid/refuse', adminMiddlewares, admin.refuseReservation);
+  routeHelpers.setupApiRoute(router, 'post', '/admin/plugins/calendar-onekite/purge', adminMiddlewares, admin.purgeByYear);
 
   // Background cleanup for expired "pending" reservations
   scheduler.start();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "description": "FullCalendar-based equipment reservation workflow with HelloAsso payment for NodeBB",
   "main": "library.js",
   "scripts": {

package/public/admin.js

@@ -1,9 +1,19 @@
-/* global define, app, $ */
 'use strict';
 
-define('calendar-onekite-admin', function () {
+/* globals define */
+
+define('admin/plugins/calendar-onekite', ['api', 'alerts', 'jquery'], function (api, alerts, $) {
+  function alertSuccess(msg) {
+    if (alerts && typeof alerts.success === 'function') return alerts.success(msg);
+    if (alerts && typeof alerts.alert === 'function') return alerts.alert({ type: 'success', message: msg });
+  }
+  function alertError(msg) {
+    if (alerts && typeof alerts.error === 'function') return alerts.error(msg);
+    if (alerts && typeof alerts.alert === 'function') return alerts.alert({ type: 'danger', message: msg });
+  }
+
   function fillForm($form, settings) {
-    Object.keys(settings).forEach((k) => {
+    Object.keys(settings || {}).forEach((k) => {
       const $el = $form.find(`[name="${k}"]`);
       if (!$el.length) return;
 
@@ -20,7 +30,7 @@ define('calendar-onekite-admin', function () {
       return '<div class="text-muted">Aucune demande en attente.</div>';
     }
 
-    return list.map(r => {
+    return list.map((r) => {
       const start = new Date(Number(r.start)).toLocaleString();
       const end = new Date(Number(r.end)).toLocaleString();
       const expires = new Date(Number(r.expiresAt)).toLocaleString();
@@ -50,7 +60,7 @@ define('calendar-onekite-admin', function () {
   }
 
   async function loadPending() {
-    const resp = await $.get('/api/v3/admin/plugins/calendar-onekite/pending');
+    const resp = await api.get('/admin/plugins/calendar-onekite/pending', {});
     return resp.pending || [];
   }
 
@@ -61,14 +71,11 @@ define('calendar-onekite-admin', function () {
     $container.on('click', '.js-approve', async function () {
       const rid = $(this).closest('[data-rid]').data('rid');
       try {
-        await $.ajax({
-          url: `/api/v3/admin/plugins/calendar-onekite/reservations/${rid}/approve`,
-          method: 'PUT',
-        });
-        app.alertSuccess('Réservation validée, email de paiement envoyé.');
+        await api.put(`/admin/plugins/calendar-onekite/reservations/${rid}/approve`, {});
+        alertSuccess('Réservation validée, email de paiement envoyé.');
         await refreshPending();
       } catch (e) {
-        app.alertError((e.responseJSON && e.responseJSON.error) || 'Erreur');
+        alertError((e && e.message) || 'Erreur');
       }
     });
 
@@ -76,15 +83,11 @@ define('calendar-onekite-admin', function () {
       const rid = $(this).closest('[data-rid]').data('rid');
       const note = prompt('Motif (optionnel) :') || '';
       try {
-        await $.ajax({
-          url: `/api/v3/admin/plugins/calendar-onekite/reservations/${rid}/refuse`,
-          method: 'PUT',
-          data: { note },
-        });
-        app.alertSuccess('Réservation refusée, email envoyé.');
+        await api.put(`/admin/plugins/calendar-onekite/reservations/${rid}/refuse`, { note });
+        alertSuccess('Réservation refusée, email envoyé.');
         await refreshPending();
       } catch (e) {
-        app.alertError((e.responseJSON && e.responseJSON.error) || 'Erreur');
+        alertError((e && e.message) || 'Erreur');
       }
     });
   }
@@ -100,7 +103,7 @@ define('calendar-onekite-admin', function () {
     const $form = $('#calendar-onekite-settings');
     const $saved = $('#calendar-onekite-saved');
 
-    const resp = await $.get('/api/v3/admin/plugins/calendar-onekite');
+    const resp = await api.get('/admin/plugins/calendar-onekite', {});
     fillForm($form, resp.settings || {});
 
     $form.on('submit', async function (e) {
@@ -110,12 +113,12 @@ define('calendar-onekite-admin', function () {
       data.showUsernamesOnCalendar = $('#showUsernamesOnCalendar').prop('checked');
 
       try {
-        await $.post('/api/v3/admin/plugins/calendar-onekite', data);
+        await api.post('/admin/plugins/calendar-onekite', data);
         $saved.removeClass('d-none');
         setTimeout(() => $saved.addClass('d-none'), 2000);
-        app.alertSuccess('Paramètres enregistrés.');
+        alertSuccess('Paramètres enregistrés.');
       } catch (err) {
-        app.alertError((err.responseJSON && err.responseJSON.error) || 'Erreur lors de la sauvegarde');
+        alertError((err && err.message) || 'Erreur lors de la sauvegarde');
       }
     });
 
@@ -123,10 +126,10 @@ define('calendar-onekite-admin', function () {
       e.preventDefault();
       const year = $(this).find('[name="year"]').val();
       try {
-        const resp2 = await $.post('/api/v3/admin/plugins/calendar-onekite/purge', { year });
+        const resp2 = await api.post('/admin/plugins/calendar-onekite/purge', { year });
         $('#calendar-onekite-purge-result').html(`<div class="alert alert-success">Année ${resp2.result.year}: ${resp2.result.purged} réservation(s) supprimée(s).</div>`);
       } catch (err) {
-        $('#calendar-onekite-purge-result').html(`<div class="alert alert-danger">${(err.responseJSON && err.responseJSON.error) || 'Erreur'}</div>`);
+        $('#calendar-onekite-purge-result').html(`<div class="alert alert-danger">${(err && err.message) || 'Erreur'}</div>`);
       }
     });
 

package/public/client.js

@@ -1,145 +1,168 @@
-/* global define, app, bootbox, ajaxify, FullCalendar, $ */
 'use strict';
 
-define('calendar-onekite', function () {
-  function fmt(dt) {
+/* globals define, ajaxify, FullCalendar */
+
+define('calendar-onekite', ['api', 'alerts', 'bootbox'], function (api, alerts, bootbox) {
+  function toLocale(dt) {
     try { return new Date(dt).toLocaleString(); } catch (e) { return String(dt); }
   }
 
+  function alertSuccess(msg) {
+    if (alerts && typeof alerts.success === 'function') {
+      return alerts.success(msg);
+    }
+    if (alerts && typeof alerts.alert === 'function') {
+      return alerts.alert({ type: 'success', message: msg });
+    }
+    console.log(msg);
+  }
+
+  function alertError(msg) {
+    if (alerts && typeof alerts.error === 'function') {
+      return alerts.error(msg);
+    }
+    if (alerts && typeof alerts.alert === 'function') {
+      return alerts.alert({ type: 'danger', message: msg });
+    }
+    console.error(msg);
+  }
+
   async function fetchItems() {
-    return await $.get('/api/v3/calendar-onekite/items');
+    // NodeBB client api module automatically prefixes /api/v3
+    return await api.get('/plugins/calendar-onekite/items', {});
+  }
+
+  function waitForFullCalendar(cb) {
+    if (typeof FullCalendar !== 'undefined' && FullCalendar && FullCalendar.Calendar) {
+      return cb();
+    }
+    setTimeout(function () { waitForFullCalendar(cb); }, 50);
   }
 
   function init(opts) {
-    const el = document.querySelector(opts.el);
+    const el = document.querySelector((opts && opts.el) || '#onekite-calendar');
     if (!el) return;
 
-    const calendar = new FullCalendar.Calendar(el, {
-      initialView: 'dayGridMonth',
-      selectable: true,
-      locale: opts.locale || 'fr',
-      headerToolbar: {
-        left: 'prev,next today',
-        center: 'title',
-        right: 'dayGridMonth,timeGridWeek,timeGridDay',
-      },
-      events: function (info, success, failure) {
-        $.get('/api/v3/calendar-onekite/events', { start: info.startStr, end: info.endStr })
-          .done(success)
-          .fail(function (xhr) {
-            failure(xhr);
-          });
-      },
-      select: function (selectionInfo) {
-        if (!ajaxify.data.loggedIn) {
-          return bootbox.alert('Vous devez être connecté pour faire une demande.');
-        }
-        openReservationDialog(selectionInfo.startStr, selectionInfo.endStr);
-      },
-      dateClick: function (info) {
-        if (!ajaxify.data.loggedIn) {
-          return bootbox.alert('Vous devez être connecté pour faire une demande.');
-        }
-        // One day by default (for month view)
-        const start = info.dateStr;
-        const end = new Date(info.date.getTime() + 60 * 60 * 1000).toISOString();
-        openReservationDialog(start, end);
-      },
-      eventClick: function (clickInfo) {
-        const ev = clickInfo.event;
-        const st = ev.extendedProps && ev.extendedProps.status;
-        const pay = ev.extendedProps && ev.extendedProps.paymentUrl;
-        let msg = `<p><strong>${ev.title}</strong></p>
-          <p>Du ${fmt(ev.start)}<br/>Au ${fmt(ev.end)}</p>
-          <p>Statut: <strong>${st}</strong></p>`;
-        if (pay) {
-          msg += `<p><a class="btn btn-primary" href="${pay}" target="_blank" rel="noopener">Payer sur HelloAsso</a></p>`;
+    waitForFullCalendar(function () {
+      const calendar = new FullCalendar.Calendar(el, {
+        initialView: 'dayGridMonth',
+        selectable: true,
+        locale: (opts && opts.locale) || 'fr',
+        headerToolbar: {
+          left: 'prev,next today',
+          center: 'title',
+          right: 'dayGridMonth,timeGridWeek,timeGridDay',
+        },
+        events: async function (info, success, failure) {
+          try {
+            const resp = await api.get('/plugins/calendar-onekite/events', { start: info.startStr, end: info.endStr });
+            success(resp.events || resp);
+          } catch (err) {
+            failure(err);
+            alertError((err && err.message) || 'Erreur lors du chargement du calendrier');
+          }
+        },
+        select: function (selectionInfo) {
+          if (!ajaxify || !ajaxify.data || !ajaxify.data.loggedIn) {
+            return bootbox.alert('Vous devez être connecté pour faire une demande.');
+          }
+          openReservationDialog(selectionInfo.startStr, selectionInfo.endStr);
+        },
+        dateClick: function (info) {
+          if (!ajaxify || !ajaxify.data || !ajaxify.data.loggedIn) {
+            return bootbox.alert('Vous devez être connecté pour faire une demande.');
+          }
+          const start = info.dateStr;
+          const end = new Date(info.date.getTime() + 60 * 60 * 1000).toISOString();
+          openReservationDialog(start, end);
+        },
+        eventClick: function (clickInfo) {
+          const ev = clickInfo.event;
+          const st = ev.extendedProps && ev.extendedProps.status;
+          const pay = ev.extendedProps && ev.extendedProps.paymentUrl;
+          let msg = `<p><strong>${ev.title}</strong></p>
+            <p>Du ${toLocale(ev.start)}<br/>Au ${toLocale(ev.end)}</p>
+            <p>Statut: <strong>${st}</strong></p>`;
+          if (pay) {
+            msg += `<p><a class="btn btn-primary" href="${pay}" target="_blank" rel="noopener">Payer sur HelloAsso</a></p>`;
+          }
+          bootbox.alert({ title: 'Réservation', message: msg });
+        },
+      });
+
+      calendar.render();
+
+      async function openReservationDialog(startStr, endStr) {
+        let itemsResp;
+        try {
+          itemsResp = await fetchItems();
+        } catch (e) {
+          return bootbox.alert('Impossible de récupérer la liste du matériel (HelloAsso). Vérifiez les paramètres dans l’ACP.');
         }
-        bootbox.alert({ title: 'Réservation', message: msg });
-      },
-    });
+        const items = (itemsResp && itemsResp.items) || [];
+        if (!items.length) return bootbox.alert('Aucun matériel disponible (liste HelloAsso vide).');
 
-    calendar.render();
+        const optionsHtml = items.map(function (it) {
+          const price = (it.price !== '' && it.price !== null && it.price !== undefined) ? ` — ${it.price}` : '';
+          const safeName = String(it.name || '').replace(/"/g, '&quot;');
+          return `<option value="${String(it.id)}" data-name="${safeName}" data-price="${String(it.price ?? '')}">${safeName}${price}</option>`;
+        }).join('');
 
-    async function openReservationDialog(startStr, endStr) {
-      let itemsResp;
-      try {
-        itemsResp = await fetchItems();
-      } catch (e) {
-        return bootbox.alert('Impossible de récupérer la liste du matériel (HelloAsso). Vérifiez les paramètres dans l’ACP.');
-      }
-      const items = (itemsResp && itemsResp.items) || [];
-      if (!items.length) return bootbox.alert('Aucun matériel disponible (liste HelloAsso vide).');
-
-      const optionsHtml = items.map(it => {
-        const price = (it.price !== '' && it.price !== null && it.price !== undefined) ? ` — ${it.price}` : '';
-        return `<option value="${String(it.id)}" data-name="${String(it.name).replace(/"/g, '&quot;')}" data-price="${String(it.price)}">${it.name}${price}</option>`;
-      }).join('');
-
-      const formHtml = `
-        <form id="onekite-reserve-form">
-          <div class="mb-2">
-            <label class="form-label">Matériel</label>
-            <select class="form-select" name="itemId">${optionsHtml}</select>
-          </div>
-          <div class="mb-2">
-            <label class="form-label">Début</label>
-            <input class="form-control" name="start" value="${startStr}" />
-          </div>
-          <div class="mb-2">
-            <label class="form-label">Fin</label>
-            <input class="form-control" name="end" value="${endStr}" />
-          </div>
-          <div class="alert alert-warning mt-3">
-            Votre demande sera <strong>en attente</strong> jusqu’à validation, et le matériel sera bloqué pendant la durée définie.
-          </div>
-        </form>
-      `;
-
-      const dlg = bootbox.dialog({
-        title: 'Nouvelle demande de réservation',
-        message: formHtml,
-        buttons: {
-          cancel: { label: 'Annuler', className: 'btn-secondary' },
-          ok: {
-            label: 'Envoyer la demande',
-            className: 'btn-primary',
-            callback: function () {
-              const $f = $('#onekite-reserve-form');
-              const itemId = $f.find('[name="itemId"]').val();
-              const $opt = $f.find('[name="itemId"] option:selected');
-              const itemName = $opt.data('name');
-              const itemPrice = $opt.data('price');
-
-              const payload = {
-                itemId,
-                itemName,
-                itemPrice,
-                start: $f.find('[name="start"]').val(),
-                end: $f.find('[name="end"]').val(),
-              };
-
-              return $.ajax({
-                url: '/api/v3/calendar-onekite/reservations',
-                method: 'POST',
-                data: payload,
-              }).done(function () {
-                app.alertSuccess('Demande envoyée (en attente de validation).');
-                calendar.refetchEvents();
-              }).fail(function (xhr) {
-                const err = (xhr.responseJSON && xhr.responseJSON.error) || 'Erreur';
-                app.alertError(err);
-              });
+        const formHtml = `
+          <form id="onekite-reserve-form">
+            <div class="mb-2">
+              <label class="form-label">Matériel</label>
+              <select class="form-select" name="itemId">${optionsHtml}</select>
+            </div>
+            <div class="mb-2">
+              <label class="form-label">Début</label>
+              <input class="form-control" name="start" value="${startStr}" />
+            </div>
+            <div class="mb-2">
+              <label class="form-label">Fin</label>
+              <input class="form-control" name="end" value="${endStr}" />
+            </div>
+            <div class="alert alert-warning mt-3">
+              Votre demande sera <strong>en attente</strong> jusqu’à validation, et le matériel sera bloqué pendant la durée définie.
+            </div>
+          </form>
+        `;
+
+        bootbox.dialog({
+          title: 'Nouvelle demande de réservation',
+          message: formHtml,
+          buttons: {
+            cancel: { label: 'Annuler', className: 'btn-secondary' },
+            ok: {
+              label: 'Envoyer la demande',
+              className: 'btn-primary',
+              callback: async function () {
+                const form = document.getElementById('onekite-reserve-form');
+                const itemSelect = form.querySelector('[name="itemId"]');
+                const selected = itemSelect.options[itemSelect.selectedIndex];
+
+                const payload = {
+                  itemId: itemSelect.value,
+                  itemName: selected.getAttribute('data-name'),
+                  itemPrice: selected.getAttribute('data-price'),
+                  start: form.querySelector('[name="start"]').value,
+                  end: form.querySelector('[name="end"]').value,
+                };
+
+                try {
+                  await api.post('/plugins/calendar-onekite/reservations', payload);
+                  alertSuccess('Demande envoyée (en attente de validation).');
+                  calendar.refetchEvents();
+                } catch (err) {
+                  alertError((err && err.message) || 'Erreur');
+                }
+                return false;
+              },
             },
           },
-        },
-      });
-
-      dlg.init(function () {
-        // focus select
-        $('#onekite-reserve-form select').focus();
-      });
-    }
+        });
+      }
+    });
   }
 
   return { init };

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

@@ -106,7 +106,7 @@
   (function () {
     function boot() {
       if (!window.require) return setTimeout(boot, 50);
-      window.require(['calendar-onekite-admin'], function (Admin) {
+      window.require(['admin/plugins/calendar-onekite'], function (Admin) {
         Admin.init();
       });
     }

package/templates/calendar-onekite/calendar.tpl

@@ -11,7 +11,7 @@
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.11/index.global.min.css" />
 
 <script defer src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.11/index.global.min.js"></script>
-<script defer src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.11/locales-all.global.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/@fullcalendar/core@6.1.11/locales-all.global.min.js"></script>
 
 <script>
   (function () {