nodebb-plugin-equipment-calendar 9.1.9 → 10.0.0

package/library.js

@@ -2,8 +2,8 @@
 
 const meta = require.main.require('./src/meta');
 const db = require.main.require('./src/database');
-const groups = require.main.require('./src/groups');
 
+const plugin = {};
 const SETTINGS_KEY = 'equipmentCalendar';
 
 const DEFAULT_SETTINGS = {
@@ -29,40 +29,9 @@ async function getSettings() {
   return s;
 }
 
-async function saveSettingsFromBody(body) {
-  const current = await getSettings();
-  const next = Object.assign({}, current, body || {});
-  next.paymentTimeoutMinutes = parseInt(next.paymentTimeoutMinutes, 10) || DEFAULT_SETTINGS.paymentTimeoutMinutes;
-  next.defaultView = next.defaultView || DEFAULT_SETTINGS.defaultView;
-  await meta.settings.set(SETTINGS_KEY, next);
-  return next;
-}
-
-async function isUserInAnyGroups(uid, groupCsv) {
-  if (!uid || !groupCsv) return false;
-  const names = String(groupCsv).split(',').map(s => s.trim()).filter(Boolean);
-  for (const name of names) {
-    if (await groups.isMember(uid, name)) return true;
-  }
-  return false;
-}
-
-function genRid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
-    const r = Math.random() * 16 | 0;
-    const v = c === 'x' ? r : (r & 0x3 | 0x8);
-    return v.toString(16);
-  });
-}
-
 function reservationKey(rid) { return `equipmentCalendar:reservation:${rid}`; }
 const reservationsZset = 'equipmentCalendar:reservations';
 
-async function saveReservation(r) {
-  await db.setObject(reservationKey(r.rid), r);
-  await db.sortedSetAdd(reservationsZset, r.createdAt || Date.now(), r.rid);
-}
-
 async function listReservations(limit=1000) {
   const rids = await db.getSortedSetRevRange(reservationsZset, 0, limit - 1);
   const objs = await Promise.all(rids.map(id => db.getObject(reservationKey(id))));
@@ -70,75 +39,34 @@ async function listReservations(limit=1000) {
 }
 
 function toEvent(r) {
-  const start = String(r.startIso).slice(0,10);
-  const end = new Date(String(r.endIso).slice(0,10) + 'T00:00:00Z');
-  end.setUTCDate(end.getUTCDate() + 1);
-  const endExcl = end.toISOString().slice(0,10);
-  const status = r.status || 'pending';
-  const title = status === 'paid' ? '[PAID] Reservation' : (status === 'approved' ? '[APPROVED] Reservation' : '[PENDING] Reservation');
-  return { id: r.rid, title, start, end: endExcl, allDay: true };
+  const start = String(r.startIso || '').slice(0,10);
+  const end = String(r.endIso || '').slice(0,10);
+  return { id: r.rid, title: '[PENDING] Reservation', start, end, allDay: true };
 }
 
-const plugin = {};
-
 plugin.init = async function (params) {
   const { router, middleware } = params;
 
   router.get('/admin/plugins/equipment-calendar', middleware.admin.buildHeader, async (req, res) => {
-    const settings = await getSettings();
-    res.render('admin/plugins/equipment-calendar', {
-      settings,
-      savedFlag: (req.query && req.query.saved === '1') ? 'true' : 'false',
-      selected_dayGridMonth: settings.defaultView === 'dayGridMonth' ? 'selected' : '',
-      selected_timeGridWeek: settings.defaultView === 'timeGridWeek' ? 'selected' : '',
-      selected_listWeek: settings.defaultView === 'listWeek' ? 'selected' : '',
-    });
+    res.render('admin/plugins/equipment-calendar', {});
   });
-// NodeBB ACP ajaxify expects this route for plugin pages
-router.get('/api/admin/plugins/equipment-calendar', middleware.admin.checkPrivileges, async (req, res) => {
-  const settings = await getSettings();
-  res.json({ settings });
-});
 
-
-
-  router.post('/admin/plugins/equipment-calendar', middleware.admin.checkPrivileges, middleware.applyCSRF, async (req, res) => {
-    await saveSettingsFromBody(req.body || {});
-    res.redirect(`${req.baseUrl}${req.path}?saved=1`);
-  });
-
-  router.get('/equipment/calendar', middleware.buildHeader, async (req, res) => {
+  router.get('/api/admin/plugins/equipment-calendar', middleware.admin.checkPrivileges, async (req, res) => {
     const settings = await getSettings();
-    res.render('equipment-calendar/calendar', { defaultView: settings.defaultView });
+    res.json({ settings });
   });
-  router.get('/calendar', middleware.buildHeader, async (req, res) => {
+
+  const renderCal = async (req, res) => {
     const settings = await getSettings();
     res.render('equipment-calendar/calendar', { defaultView: settings.defaultView });
-  });
+  };
+  router.get('/calendar', middleware.buildHeader, renderCal);
+  router.get('/equipment/calendar', middleware.buildHeader, renderCal);
 
   router.get('/api/plugins/equipment-calendar/events', async (req, res) => {
     const list = await listReservations(1000);
     res.json({ events: list.map(toEvent) });
   });
-
-  router.post('/api/plugins/equipment-calendar/reservations', middleware.applyCSRF, async (req, res) => {
-    const uid = req.uid;
-    if (!uid) return res.status(403).json({ message: 'forbidden' });
-
-    const settings = await getSettings();
-    const canCreate = await isUserInAnyGroups(uid, settings.creatorGroups) || await groups.isMember(uid, 'administrators');
-    if (!canCreate) return res.status(403).json({ message: 'forbidden' });
-
-    const startIso = String(req.body.startIso || '').slice(0,10);
-    const endIso = String(req.body.endIso || '').slice(0,10);
-    const itemIds = Array.isArray(req.body.itemIds) ? req.body.itemIds : [];
-    if (!startIso || !endIso) return res.status(400).json({ message: 'dates required' });
-    if (!itemIds.length) return res.status(400).json({ message: 'items required' });
-
-    const r = { rid: genRid(), uid, startIso, endIso, itemIds: itemIds.map(String), status: 'pending', createdAt: Date.now() };
-    await saveReservation(r);
-    res.json({ ok: true, rid: r.rid });
-  });
 };
 
 plugin.addAdminMenu = async function (header) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "9.1.9",
+  "version": "10.0.0",
   "main": "library.js",
   "license": "MIT"
 }

package/plugin.json

@@ -14,5 +14,8 @@
   ],
   "staticDirs": {
     "public": "public"
-  }
+  },
+  "acpScripts": [
+    "public/js/admin.js"
+  ]
 }

package/public/js/admin.js

@@ -0,0 +1,97 @@
+'use strict';
+/* globals ajaxify, socket, app */
+
+(function () {
+  const HASH = 'equipmentCalendar';
+
+  function isOnPage() {
+    try {
+      const url = (ajaxify && ajaxify.data && ajaxify.data.url) ? ajaxify.data.url : '';
+      return url.startsWith('admin/plugins/equipment-calendar');
+    } catch (e) { return false; }
+  }
+
+  function rootEl() {
+    return document.querySelector('.equipment-calendar-settings');
+  }
+
+  function fields() {
+    return Array.from(document.querySelectorAll('.equipment-calendar-settings [data-field]'));
+  }
+
+  function setValues(values) {
+    const map = values || {};
+    fields().forEach((el) => {
+      const key = el.getAttribute('data-field');
+      let val = map[key];
+      if (val === undefined || val === null) val = '';
+      el.value = String(val);
+    });
+  }
+
+  function getValues() {
+    const out = {};
+    fields().forEach((el) => {
+      const key = el.getAttribute('data-field');
+      out[key] = el.value;
+    });
+    return out;
+  }
+
+  function alertSuccess(msg) {
+    if (window.app && typeof app.alertSuccess === 'function') return app.alertSuccess(msg);
+    console.log('[success]', msg);
+  }
+  function alertError(msg) {
+    if (window.app && typeof app.alertError === 'function') return app.alertError(msg);
+    console.error('[error]', msg);
+  }
+
+  function socketEmit(name, payload) {
+    return new Promise((resolve, reject) => {
+      if (!window.socket) return reject(new Error('socket not available'));
+      socket.emit(name, payload, (err, data) => {
+        if (err) return reject(err);
+        resolve(data);
+      });
+    });
+  }
+
+  async function load() {
+    const data = await socketEmit('admin.settings.get', { hash: HASH });
+    const values = (data && (data.values || data)) || {};
+    setValues(values);
+  }
+
+  async function save() {
+    const values = getValues();
+    await socketEmit('admin.settings.save', { hash: HASH, values });
+  }
+
+  async function init() {
+    if (!isOnPage()) return;
+    if (!rootEl()) return;
+
+    try { await load(); } catch (e) {}
+
+    const btn = document.getElementById('ec-save');
+    if (btn && !btn.__bound) {
+      btn.__bound = true;
+      btn.addEventListener('click', async (e) => {
+        e.preventDefault();
+        try {
+          await save();
+          alertSuccess('[[admin/settings:settings-saved]]');
+        } catch (err) {
+          alertError(err && err.message ? err.message : String(err));
+        }
+      });
+    }
+  }
+
+  if (window.jQuery) {
+    window.jQuery(window).on('action:ajaxify.end', init);
+  } else {
+    window.addEventListener('load', init);
+  }
+})();

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

@@ -1,86 +1,77 @@
-<div class="acp-page-container">
+<div class="acp-page-container equipment-calendar-settings">
   <h1 class="mb-3">Equipment Calendar</h1>
 
-  <form method="post" action="{config.relative_path}/admin/plugins/equipment-calendar">
-    <input type="hidden" name="_csrf" value="{csrf_token}">
+  <div class="alert alert-info mb-3">
+    Sauvegarde via l’API Socket NodeBB (comme les plugins officiels).
+  </div>
 
-    <div class="card card-body mb-3">
-      <h5 class="mb-3">Permissions</h5>
-      <div class="mb-3">
-        <label class="form-label">Groupes autorisés à créer (creatorGroups, séparés par virgule)</label>
-        <input class="form-control" type="text" name="creatorGroups" value="{settings.creatorGroups}">
+  <div class="card card-body mb-3">
+    <h5 class="mb-3">Permissions</h5>
+    <div class="mb-3">
+      <label class="form-label">Groupes autorisés à créer (creatorGroups, séparés par virgule)</label>
+      <input class="form-control" type="text" data-field="creatorGroups">
+    </div>
+    <div class="mb-3">
+      <label class="form-label">Groupe valideur (approverGroup)</label>
+      <input class="form-control" type="text" data-field="approverGroup">
+    </div>
+    <div class="mb-0">
+      <label class="form-label">Groupe notifié (notifyGroup)</label>
+      <input class="form-control" type="text" data-field="notifyGroup">
+    </div>
+  </div>
+
+  <div class="card card-body mb-3">
+    <h5 class="mb-3">HelloAsso</h5>
+    <div class="row g-3">
+      <div class="col-md-6">
+        <label class="form-label">API Base URL (prod/sandbox)</label>
+        <input class="form-control" type="text" data-field="ha_apiBaseUrl" placeholder="https://api.helloasso.com ou https://api.helloasso-sandbox.com">
       </div>
-      <div class="mb-3">
-        <label class="form-label">Groupe valideur (approverGroup)</label>
-        <input class="form-control" type="text" name="approverGroup" value="{settings.approverGroup}">
+      <div class="col-md-6">
+        <label class="form-label">Organization slug</label>
+        <input class="form-control" type="text" data-field="ha_organizationSlug">
       </div>
-      <div class="mb-0">
-        <label class="form-label">Groupe notifié (notifyGroup)</label>
-        <input class="form-control" type="text" name="notifyGroup" value="{settings.notifyGroup}">
+      <div class="col-md-6">
+        <label class="form-label">Client ID</label>
+        <input class="form-control" type="text" data-field="ha_clientId">
       </div>
-    </div>
-
-    <div class="card card-body mb-3">
-      <h5 class="mb-3">HelloAsso</h5>
-      <div class="row g-3">
-        <div class="col-md-6">
-          <label class="form-label">API Base URL (prod/sandbox)</label>
-          <input class="form-control" type="text" name="ha_apiBaseUrl" value="{settings.ha_apiBaseUrl}" placeholder="https://api.helloasso.com ou https://api.helloasso-sandbox.com">
-        </div>
-        <div class="col-md-6">
-          <label class="form-label">Organization slug</label>
-          <input class="form-control" type="text" name="ha_organizationSlug" value="{settings.ha_organizationSlug}">
-        </div>
-        <div class="col-md-6">
-          <label class="form-label">Client ID</label>
-          <input class="form-control" type="text" name="ha_clientId" value="{settings.ha_clientId}">
-        </div>
-        <div class="col-md-6">
-          <label class="form-label">Client Secret</label>
-          <input class="form-control" type="password" name="ha_clientSecret" value="{settings.ha_clientSecret}">
-        </div>
-        <div class="col-md-6">
-          <label class="form-label">Form Type</label>
-          <input class="form-control" type="text" name="ha_itemsFormType" value="{settings.ha_itemsFormType}" placeholder="shop">
-        </div>
-        <div class="col-md-6">
-          <label class="form-label">Form Slug</label>
-          <input class="form-control" type="text" name="ha_itemsFormSlug" value="{settings.ha_itemsFormSlug}" placeholder="locations-materiel-2026">
-        </div>
-        <div class="col-12">
-          <label class="form-label">Return URL base (callback)</label>
-          <input class="form-control" type="text" name="ha_returnUrl" value="{settings.ha_returnUrl}" placeholder="https://www.onekite.com">
-        </div>
+      <div class="col-md-6">
+        <label class="form-label">Client Secret</label>
+        <input class="form-control" type="password" data-field="ha_clientSecret">
+      </div>
+      <div class="col-md-6">
+        <label class="form-label">Form Type</label>
+        <input class="form-control" type="text" data-field="ha_itemsFormType" placeholder="shop">
+      </div>
+      <div class="col-md-6">
+        <label class="form-label">Form Slug</label>
+        <input class="form-control" type="text" data-field="ha_itemsFormSlug" placeholder="locations-materiel-2026">
+      </div>
+      <div class="col-12">
+        <label class="form-label">Return URL base (callback)</label>
+        <input class="form-control" type="text" data-field="ha_returnUrl" placeholder="https://www.onekite.com">
       </div>
     </div>
+  </div>
 
-    <div class="card card-body mb-3">
-      <h5 class="mb-3">Calendrier</h5>
-      <div class="row g-3">
-        <div class="col-md-6">
-          <label class="form-label">Timeout paiement (minutes)</label>
-          <input class="form-control" type="number" min="1" name="paymentTimeoutMinutes" value="{settings.paymentTimeoutMinutes}">
-        </div>
-        <div class="col-md-6">
-          <label class="form-label">Vue par défaut</label>
-          <select class="form-select" name="defaultView">
-            <option value="dayGridMonth" {selected_dayGridMonth}>Mois</option>
-            <option value="timeGridWeek" {selected_timeGridWeek}>Semaine</option>
-            <option value="listWeek" {selected_listWeek}>Liste</option>
-          </select>
-        </div>
+  <div class="card card-body mb-3">
+    <h5 class="mb-3">Calendrier</h5>
+    <div class="row g-3">
+      <div class="col-md-6">
+        <label class="form-label">Timeout paiement (minutes)</label>
+        <input class="form-control" type="number" min="1" data-field="paymentTimeoutMinutes">
+      </div>
+      <div class="col-md-6">
+        <label class="form-label">Vue par défaut</label>
+        <select class="form-select" data-field="defaultView">
+          <option value="dayGridMonth">Mois</option>
+          <option value="timeGridWeek">Semaine</option>
+          <option value="listWeek">Liste</option>
+        </select>
       </div>
     </div>
+  </div>
 
-    <button class="btn btn-primary" type="submit">Enregistrer</button>
-  </form>
+  <button id="ec-save" class="btn btn-primary" type="button">Enregistrer</button>
 </div>
-
-<script>
-(function () {
-  var saved = {savedFlag};
-  if (saved && window.app && typeof window.app.alertSuccess === 'function') {
-    window.app.alertSuccess('[[admin/settings:settings-saved]]');
-  }
-})();
-</script>

package/templates/equipment-calendar/calendar.tpl

@@ -1,83 +1,25 @@
 <div class="container-fluid px-3 equipment-calendar-page">
   <h1 class="mb-3">Calendrier des réservations</h1>
-
   <div id="ec-calendar"></div>
-
-  <div class="modal fade" id="ecModal" tabindex="-1" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered">
-      <div class="modal-content">
-        <form id="ec-form">
-          <div class="modal-header">
-            <h5 class="modal-title">Nouvelle demande</h5>
-            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Fermer"></button>
-          </div>
-          <div class="modal-body">
-            <input type="hidden" name="_csrf" value="{csrf_token}">
-            <div class="mb-3">
-              <label class="form-label">Du</label>
-              <input class="form-control" type="date" id="ec-start" required>
-            </div>
-            <div class="mb-3">
-              <label class="form-label">Au</label>
-              <input class="form-control" type="date" id="ec-end" required>
-            </div>
-            <div class="mb-3">
-              <label class="form-label">Matériel (IDs, séparés par virgule)</label>
-              <input class="form-control" type="text" id="ec-items" placeholder="ex: item123,item456" required>
-            </div>
-          </div>
-          <div class="modal-footer">
-            <button class="btn btn-secondary" type="button" data-bs-dismiss="modal">Annuler</button>
-            <button class="btn btn-primary" type="submit">Réserver</button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
 </div>
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fullcalendar/index.global.min.css">
-<script src="https://cdn.jsdelivr.net/npm/fullcalendar/index.global.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.css">
+<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.js"></script>
 
 <script>
 (function () {
-  function isoDate(s) { return String(s || '').slice(0, 10); }
-  function alertSuccess(msg){ if (window.app && app.alertSuccess) app.alertSuccess(msg); }
-  function alertError(msg){ if (window.app && app.alertError) app.alertError(msg); else console.error(msg); }
-
   async function apiGet(path) {
     var res = await fetch(config.relative_path + path, { credentials: 'same-origin' });
     if (!res.ok) throw new Error('API error');
     return res.json();
   }
-  async function apiPost(path, body, csrf) {
-    var res = await fetch(config.relative_path + path, {
-      method: 'POST',
-      credentials: 'same-origin',
-      headers: { 'Content-Type': 'application/json', 'x-csrf-token': csrf || '' },
-      body: JSON.stringify(body || {}),
-    });
-    var data = {};
-    try { data = await res.json(); } catch (e) {}
-    if (!res.ok) throw new Error(data.message || 'Erreur');
-    return data;
-  }
-
-  function openModal(startIso, endIso) {
-    document.getElementById('ec-start').value = startIso;
-    document.getElementById('ec-end').value = endIso;
-    var modalEl = document.getElementById('ecModal');
-    if (window.bootstrap && modalEl) {
-      window.bootstrap.Modal.getOrCreateInstance(modalEl).show();
-    }
-  }
 
   async function init() {
     var el = document.getElementById('ec-calendar');
     if (!el) return;
 
     if (!window.FullCalendar || !window.FullCalendar.Calendar) {
-      el.innerHTML = '<div class="alert alert-danger">FullCalendar non chargé (CDN). Vérifie la CSP et l’accès à cdn.jsdelivr.net.</div>';
+      el.innerHTML = '<div class="alert alert-danger">FullCalendar non chargé (CDN bloqué ?).</div>';
       return;
     }
 
@@ -88,54 +30,14 @@
       initialView: '{defaultView}',
       headerToolbar: { left: 'prev,next today', center: 'title', right: 'dayGridMonth,timeGridWeek,listWeek' },
       selectable: true,
-      selectMirror: true,
       displayEventTime: false,
-      select: function (info) {
-        var start = isoDate(info.startStr);
-        var endExcl = isoDate(info.endStr);
-        var end = endExcl;
-        if (endExcl) {
-          var d = new Date(endExcl + 'T00:00:00Z');
-          d.setUTCDate(d.getUTCDate() - 1);
-          end = d.toISOString().slice(0, 10);
-        }
-        openModal(start, end);
-        calendar.unselect();
-      },
-      dateClick: function (info) {
-        var d = isoDate(info.dateStr);
-        openModal(d, d);
-      },
       events: events,
     });
     calendar.render();
-
-    var form = document.getElementById('ec-form');
-    if (form && !form.__bound) {
-      form.__bound = true;
-      form.addEventListener('submit', async function (e) {
-        e.preventDefault();
-        var startIso = document.getElementById('ec-start').value;
-        var endIso = document.getElementById('ec-end').value;
-        var itemIds = String(document.getElementById('ec-items').value || '').split(',').map(function (s) { return s.trim(); }).filter(Boolean);
-        var csrf = form.querySelector('input[name="_csrf"]').value;
-
-        try {
-          await apiPost('/api/plugins/equipment-calendar/reservations', { startIso: startIso, endIso: endIso, itemIds: itemIds }, csrf);
-          alertSuccess('Demande envoyée');
-          var modalEl = document.getElementById('ecModal');
-          if (window.bootstrap && modalEl) window.bootstrap.Modal.getOrCreateInstance(modalEl).hide();
-
-          var data2 = await apiGet('/api/plugins/equipment-calendar/events');
-          calendar.removeAllEvents();
-          (data2.events || []).forEach(function (ev) { calendar.addEvent(ev); });
-        } catch (err) {
-          alertError(err.message || 'Erreur');
-        }
-      });
-    }
   }
 
-  init().catch(function () {});
+  init().catch(function (e) {
+    console.error(e);
+  });
 })();
 </script>