nodebb-plugin-equipment-calendar 10.0.7 → 10.0.9

package/library.js

@@ -54,6 +54,18 @@ plugin.init = async function (params) {
   // ACP ajaxify endpoint must render the template (not res.json), otherwise admin.min.js crashes
 router.get('/api/admin/plugins/equipment-calendar', middleware.admin.checkPrivileges, async (req, res) => {
   res.render('admin/plugins/equipment-calendar', {});
+// Settings JSON endpoints (robust, works with MongoDB+Redis cache setups)
+router.get('/api/admin/plugins/equipment-calendar/settings', middleware.admin.checkPrivileges, async (req, res) => {
+  const settings = await getSettings();
+  res.json({ settings });
+});
+
+router.post('/api/admin/plugins/equipment-calendar/settings', middleware.admin.checkPrivileges, middleware.applyCSRF, async (req, res) => {
+  const values = (req.body && req.body.values) ? req.body.values : {};
+  // Persist with NodeBB meta.settings (stored in DB, cached in Redis if enabled)
+  await meta.settings.set(SETTINGS_KEY, values);
+  res.json({ ok: true });
+});
 });
 
   const renderCal = async (req, res) => {

package/package.json

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

package/public/js/admin.js

@@ -1,40 +1,86 @@
 'use strict';
-/* globals ajaxify, app, require, $ */
+/* globals ajaxify, app, $ */
 
 (function () {
-  const HASH = 'equipmentCalendar';
-
   function onPage() {
     try {
       const url = (ajaxify && ajaxify.data && typeof ajaxify.data.url === 'string') ? ajaxify.data.url : '';
       return url === 'admin/plugins/equipment-calendar' || url.startsWith('admin/plugins/equipment-calendar?');
-    } catch (e) {
-      return false;
-    }
+    } catch (e) { return false; }
   }
 
-  function init() {
-    if (!onPage()) return;
+  function getCsrf() {
+    // NodeBB ACP exposes csrf_token in ajaxify.data in most themes
+    try { if (ajaxify && ajaxify.data && ajaxify.data.csrf_token) return ajaxify.data.csrf_token; } catch (e) {}
+    // fallback: meta tag
+    const meta = document.querySelector('meta[name="csrf-token"]');
+    return meta ? meta.getAttribute('content') : '';
+  }
 
+  function fields($container) {
+    return $container.find('[name]');
+  }
+
+  function setValues($container, values) {
+    values = values || {};
+    fields($container).each(function () {
+      const $el = $(this);
+      const key = $el.attr('name');
+      const val = values[key];
+      $el.val(val != null ? String(val) : '');
+    });
+  }
+
+  function getValues($container) {
+    const out = {};
+    fields($container).each(function () {
+      const $el = $(this);
+      out[$el.attr('name')] = $el.val();
+    });
+    return out;
+  }
+
+  async function apiGet() {
+    const res = await fetch(config.relative_path + '/api/admin/plugins/equipment-calendar/settings', { credentials: 'same-origin' });
+    if (!res.ok) throw new Error('Load failed: ' + res.status);
+    return res.json();
+  }
+
+  async function apiSave(values) {
+    const csrf = getCsrf();
+    const res = await fetch(config.relative_path + '/api/admin/plugins/equipment-calendar/settings', {
+      method: 'POST',
+      credentials: 'same-origin',
+      headers: { 'Content-Type': 'application/json', 'x-csrf-token': csrf },
+      body: JSON.stringify({ values }),
+    });
+    let data = {};
+    try { data = await res.json(); } catch (e) {}
+    if (!res.ok) throw new Error((data && data.message) ? data.message : ('Save failed: ' + res.status));
+    return data;
+  }
+
+  async function init() {
+    if (!onPage()) return;
     const $container = $('.equipment-calendar-settings');
     if (!$container.length) return;
 
-    if (typeof require !== 'function') {
-      console.error('[equipment-calendar] require() indisponible dans l’ACP, impossible d’utiliser le module settings.');
-      return;
+    try {
+      const data = await apiGet();
+      setValues($container, data.settings || {});
+    } catch (e) {
+      console.warn('[equipment-calendar] load settings error', e);
     }
 
-    require(['settings'], function (Settings) {
-      Settings.load(HASH, $container);
-
-      $('#save').off('click.equipment-calendar').on('click.equipment-calendar', function (e) {
-        e.preventDefault();
-        Settings.save(HASH, $container, function () {
-          if (app && app.alertSuccess) {
-            app.alertSuccess('[[admin/settings:settings-saved]]');
-          }
-        });
-      });
+    $('#ec-save').off('click.equipment-calendar').on('click.equipment-calendar', async function (e) {
+      e.preventDefault();
+      try {
+        await apiSave(getValues($container));
+        if (app && app.alertSuccess) app.alertSuccess('[[admin/settings:settings-saved]]');
+      } catch (err) {
+        if (app && app.alertError) app.alertError(err.message || String(err));
+        else console.error(err);
+      }
     });
   }
 

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

@@ -1,23 +1,23 @@
-<form class="acp-page-container settings equipment-calendar-settings">
+<div class="acp-page-container equipment-calendar-settings">
   <h1 class="mb-3">Equipment Calendar</h1>
 
   <div class="alert alert-info mb-3">
-    ACP style “Composer” : champs avec <code>name</code> uniquement + sauvegarde via module <code>settings</code>.
+    Sauvegarde ACP via endpoint admin JSON + CSRF (fallback robuste).
   </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">
+      <input class="form-control" type="text" name="creatorGroups" data-field="creatorGroups">
     </div>
     <div class="mb-3">
       <label class="form-label">Groupe valideur (approverGroup)</label>
-      <input class="form-control" type="text" name="approverGroup">
+      <input class="form-control" type="text" name="approverGroup" data-field="approverGroup">
     </div>
     <div class="mb-0">
       <label class="form-label">Groupe notifié (notifyGroup)</label>
-      <input class="form-control" type="text" name="notifyGroup">
+      <input class="form-control" type="text" name="notifyGroup" data-field="notifyGroup">
     </div>
   </div>
 
@@ -26,31 +26,31 @@
     <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" placeholder="https://api.helloasso.com ou https://api.helloasso-sandbox.com">
+        <input class="form-control" type="text" name="ha_apiBaseUrl" data-field="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">
+        <input class="form-control" type="text" name="ha_organizationSlug" data-field="ha_organizationSlug">
       </div>
       <div class="col-md-6">
         <label class="form-label">Client ID</label>
-        <input class="form-control" type="text" name="ha_clientId">
+        <input class="form-control" type="text" name="ha_clientId" data-field="ha_clientId">
       </div>
       <div class="col-md-6">
         <label class="form-label">Client Secret</label>
-        <input class="form-control" type="password" name="ha_clientSecret">
+        <input class="form-control" type="password" name="ha_clientSecret" data-field="ha_clientSecret">
       </div>
       <div class="col-md-6">
         <label class="form-label">Form Type</label>
-        <input class="form-control" type="text" name="ha_itemsFormType" placeholder="shop">
+        <input class="form-control" type="text" name="ha_itemsFormType" 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" name="ha_itemsFormSlug" placeholder="locations-materiel-2026">
+        <input class="form-control" type="text" name="ha_itemsFormSlug" 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" name="ha_returnUrl" placeholder="https://www.onekite.com">
+        <input class="form-control" type="text" name="ha_returnUrl" data-field="ha_returnUrl" placeholder="https://www.onekite.com">
       </div>
     </div>
   </div>
@@ -60,11 +60,11 @@
     <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">
+        <input class="form-control" type="number" min="1" name="paymentTimeoutMinutes" data-field="paymentTimeoutMinutes">
       </div>
       <div class="col-md-6">
         <label class="form-label">Vue par défaut</label>
-        <select class="form-select" name="defaultView">
+        <select class="form-select" name="defaultView" data-field="defaultView">
           <option value="dayGridMonth">Mois</option>
           <option value="timeGridWeek">Semaine</option>
           <option value="listWeek">Liste</option>
@@ -73,5 +73,5 @@
     </div>
   </div>
 
-  <button id="save" class="btn btn-primary" type="button">Enregistrer</button>
-</form>
+  <button id="ec-save" class="btn btn-primary" type="button">Enregistrer</button>
+</div>