nodebb-plugin-onekite-calendar 2.0.62 → 2.0.63

package/lib/api.js

@@ -3,7 +3,6 @@
 const crypto = require('crypto');
 
 const meta = require.main.require('./src/meta');
-const emailer = require.main.require('./src/emailer');
 const nconf = require.main.require('nconf');
 const user = require.main.require('./src/user');
 const groups = require.main.require('./src/groups');
@@ -13,193 +12,24 @@ const logger = require.main.require('./src/logger');
 const dbLayer = require('./db');
 const { getSettings } = require('./settings');
 
-// Resolve group identifiers from ACP.
-// Admins may enter a group *name* ("Test") or a *slug* ("onekite-ffvl-2026").
-// Depending on NodeBB version and group type (system/custom), some core methods
-// accept one or the other. We try both to be tolerant.
-async function getMembersByGroupIdentifier(groupIdentifier) {
-  const id = String(groupIdentifier || '').trim();
-  if (!id) return [];
-
-  // First try direct.
-  let members = [];
-  try {
-    members = await groups.getMembers(id, 0, -1);
-  } catch (e) {
-    members = [];
-  }
-  if (Array.isArray(members) && members.length) return members;
-
-  // Then try slug -> groupName mapping when available.
-  if (typeof groups.getGroupNameByGroupSlug === 'function') {
-    let groupName = null;
-    try {
-      if (groups.getGroupNameByGroupSlug.length >= 2) {
-        groupName = await new Promise((resolve) => {
-          groups.getGroupNameByGroupSlug(id, (err, name) => resolve(err ? null : name));
-        });
-      } else {
-        groupName = await groups.getGroupNameByGroupSlug(id);
-      }
-    } catch (e) {
-      groupName = null;
-    }
-
-    if (groupName && String(groupName).trim() && String(groupName).trim() !== id) {
-      try {
-        members = await groups.getMembers(String(groupName).trim(), 0, -1);
-      } catch (e) {
-        members = [];
-      }
-      if (Array.isArray(members) && members.length) return members;
-    }
-  }
-
-  return Array.isArray(members) ? members : [];
-}
-
-
-function normalizeUids(members) {
-  if (!Array.isArray(members)) return [];
-  const out = [];
-  for (const m of members) {
-    if (Number.isInteger(m)) { out.push(m); continue; }
-    if (typeof m === 'string' && m.trim() && !Number.isNaN(parseInt(m, 10))) { out.push(parseInt(m, 10)); continue; }
-    if (m && typeof m === 'object' && (Number.isInteger(m.uid) || (typeof m.uid === 'string' && m.uid.trim()))) {
-      const u = Number.isInteger(m.uid) ? m.uid : parseInt(m.uid, 10);
-      if (!Number.isNaN(u)) out.push(u);
-    }
-  }
-  // de-dupe
-  return Array.from(new Set(out));
-}
-
-// Fast membership check without N calls to groups.isMember.
-// NodeBB's groups.getUserGroups([uid]) returns an array (per uid) of group objects.
-// We compare against both group slugs and names to be tolerant with older settings.
-async function userInAnyGroup(uid, allowed) {
-  if (!uid || !Array.isArray(allowed) || !allowed.length) return false;
-  const ug = await groups.getUserGroups([uid]);
-  const list = (ug && ug[0]) ? ug[0] : [];
-  const seen = new Set();
-  for (const g of list) {
-    if (!g) continue;
-    if (g.slug) seen.add(String(g.slug));
-    if (g.name) seen.add(String(g.name));
-    if (g.groupName) seen.add(String(g.groupName));
-    if (g.displayName) seen.add(String(g.displayName));
-  }
-  return allowed.some(v => seen.has(String(v)));
-}
-
-
-function normalizeAllowedGroups(raw) {
-  if (!raw) return [];
-  if (Array.isArray(raw)) return raw.map(v => String(v).trim()).filter(Boolean);
-  const s = String(raw).trim();
-  if (!s) return [];
-  // Some admin UIs store JSON arrays as strings
-  if ((s.startsWith('[') && s.endsWith(']')) || (s.startsWith('"[') && s.endsWith(']"'))) {
-    try {
-      const parsed = JSON.parse(s.startsWith('"') ? JSON.parse(s) : s);
-      if (Array.isArray(parsed)) return parsed.map(v => String(v).trim()).filter(Boolean);
-    } catch (e) {}
-  }
-  return s.split(',').map(v => String(v).trim().replace(/^"+|"+$/g, '')).filter(Boolean);
-}
-
-function parseJsonArrayField(v) {
-  if (!v) return [];
-  if (Array.isArray(v)) return v;
-  const s = String(v).trim();
-  if (!s) return [];
-  try {
-    const parsed = JSON.parse(s);
-    return Array.isArray(parsed) ? parsed : [];
-  } catch (e) {
-    // legacy fallback: comma-separated
-    return s.split(',').map((x) => String(x).trim()).filter(Boolean);
-  }
-}
-
-function normalizeUidList(uids) {
-  const out = [];
-  const arr = Array.isArray(uids) ? uids : parseJsonArrayField(uids);
-  for (const u of arr) {
-    const n = Number.isInteger(u) ? u : parseInt(String(u || '').trim(), 10);
-    if (Number.isFinite(n) && n > 0) out.push(String(n));
-  }
-  return Array.from(new Set(out));
-}
-
-async function usernamesByUids(uids) {
-  const ids = normalizeUidList(uids);
-  if (!ids.length) return [];
-  try {
-    if (typeof user.getUsersFields === 'function') {
-      let rows = await user.getUsersFields(ids, ['username']);
-      if (Array.isArray(rows)) {
-        rows = rows.map((row, idx) => (row ? Object.assign({ uid: ids[idx] }, row) : null));
-      }
-      return (rows || []).map((r) => r && r.username ? String(r.username) : '').filter(Boolean);
-    }
-  } catch (e) {}
-  // Fallback (slower)
-  const rows = await Promise.all(ids.map(async (uid) => {
-    try {
-      const r = await user.getUserFields(uid, ['username']);
-      return r && r.username ? String(r.username) : '';
-    } catch (e) {
-      return '';
-    }
-  }));
-  return rows.filter(Boolean);
-}
-
-// NOTE: Avoid per-group async checks (groups.isMember) when possible.
-
+const nb = require("./nodebb-helpers");
+const {
+  normalizeAllowedGroups,
+  normalizeUids,
+  getMembersByGroupIdentifier,
+  userInAnyGroup,
+  forumBaseUrl,
+  sendEmail,
+  normalizeUidList,
+  usernamesByUids,
+} = nb;
 
 const helloasso = require('./helloasso');
 const discord = require('./discord');
 const realtime = require('./realtime');
 
-// Email helper (NodeBB 4.x): always send by uid.
-// Subject must be provided inside params.subject.
-async function sendEmail(template, uid, subject, data) {
-  const toUid = Number.isInteger(uid) ? uid : (uid ? parseInt(uid, 10) : NaN);
-  if (!Number.isInteger(toUid) || toUid <= 0) return;
-
-  const params = Object.assign({}, data || {}, subject ? { subject } : {});
-
-  try {
-    if (typeof emailer.send !== 'function') return;
-    // NodeBB 4.x: send(template, uid, params)
-    // NOTE: Do NOT branch on function.length: it is unreliable once the function
-    // is wrapped/bound (common in production builds) and can lead to params being
-    // dropped, resulting in empty email bodies and missing subjects.
-    await emailer.send(template, toUid, params);
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email', { template, uid: toUid, err: String((err && err.message) || err) });
-  }
-}
-
-function normalizeBaseUrl(meta) {
-  // Prefer meta.config.url, fallback to nconf.get('url')
-  let base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
-  if (!base) {
-    base = String(nconf.get('url') || '').trim();
-  }
-  base = String(base || '').trim().replace(/\/$/, '');
-  // Ensure absolute with scheme
-  if (base && !/^https?:\/\//i.test(base)) {
-    base = `https://${base.replace(/^\/\//, '')}`;
-  }
-  return base;
-}
-
 function normalizeCallbackUrl(configured, meta) {
-  const base = normalizeBaseUrl(meta);
+  const base = forumBaseUrl();
   let url = (configured || '').trim();
   if (!url) {
     // Default webhook endpoint (recommended): namespaced under /plugins
@@ -216,7 +46,7 @@ function normalizeCallbackUrl(configured, meta) {
 }
 
 function normalizeReturnUrl(meta) {
-  const base = normalizeBaseUrl(meta);
+  const base = forumBaseUrl();
   return base ? `${base}/calendar` : '';
 }
 
@@ -1589,7 +1419,7 @@ api.createReservation = async function (req, res) {
               total: resv.total || 0,
               // Link to the plugin ACP page so managers can process the request quickly.
               // Kept as `adminUrl` to match the email template placeholder.
-              adminUrl: `${normalizeBaseUrl(meta)}/admin/plugins/calendar-onekite`,
+              adminUrl: `${forumBaseUrl()}/admin/plugins/calendar-onekite`,
             });
           }
         }
@@ -1941,7 +1771,7 @@ api.cancelReservation = async function (req, res) {
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         cancelledBy: (r.cancelledByUsername || (canceller && canceller.username) || ''),
-        cancelledByUrl: ((r.cancelledByUsername || (canceller && canceller.username)) ? `${normalizeBaseUrl(meta)}/user/${encodeURIComponent(String(r.cancelledByUsername || canceller.username))}` : ''),
+        cancelledByUrl: ((r.cancelledByUsername || (canceller && canceller.username)) ? `${forumBaseUrl()}/user/${encodeURIComponent(String(r.cancelledByUsername || canceller.username))}` : ''),
       });
     }
   } catch (e) {}

package/lib/group-helpers.js

@@ -29,3 +29,5 @@ async function getGroupNameBySlug(slug) {
     }
   });
 }
+
+module.exports = { getGroupNameBySlug };

package/lib/nodebb-helpers.js

@@ -0,0 +1,179 @@
+'use strict';
+
+const nconf = require.main.require('nconf');
+const meta = require.main.require('./src/meta');
+const emailer = require.main.require('./src/emailer');
+const groups = require.main.require('./src/groups');
+const user = require.main.require('./src/user');
+
+const { getGroupNameBySlug } = require('./group-helpers');
+
+function normalizeAllowedGroups(raw) {
+  if (!raw) return [];
+  if (Array.isArray(raw)) {
+    return raw.map((v) => String(v || '').trim()).filter(Boolean);
+  }
+  const s = String(raw || '').trim();
+  if (!s) return [];
+
+  if (s.startsWith('[') && s.endsWith(']')) {
+    try {
+      const parsed = JSON.parse(s);
+      if (Array.isArray(parsed)) {
+        return parsed.map((v) => String(v || '').trim()).filter(Boolean);
+      }
+    } catch (e) {
+      // fall through
+    }
+  }
+
+  return s
+    .split(',')
+    .map((v) => String(v || '').trim().replace(/^"+|"+$/g, ''))
+    .filter(Boolean);
+}
+
+function normalizeUids(members) {
+  if (!Array.isArray(members)) return [];
+  const out = [];
+  for (const m of members) {
+    if (Number.isInteger(m)) {
+      out.push(m);
+      continue;
+    }
+    if (typeof m === 'string' && m.trim()) {
+      const n = parseInt(m, 10);
+      if (Number.isFinite(n)) out.push(n);
+      continue;
+    }
+    if (m && typeof m === 'object' && m.uid != null) {
+      const n = Number.isInteger(m.uid) ? m.uid : parseInt(String(m.uid).trim(), 10);
+      if (Number.isFinite(n)) out.push(n);
+    }
+  }
+  return Array.from(new Set(out)).filter((u) => Number.isInteger(u) && u > 0);
+}
+
+async function getMembersByGroupIdentifier(groupIdentifier) {
+  const id = String(groupIdentifier || '').trim();
+  if (!id) return [];
+
+  try {
+    const members = await groups.getMembers(id, 0, -1);
+    if (Array.isArray(members) && members.length) return members;
+  } catch (e) {
+    // ignore
+  }
+
+  const groupName = await getGroupNameBySlug(id);
+  if (groupName && String(groupName).trim() && String(groupName).trim() !== id) {
+    try {
+      const members = await groups.getMembers(String(groupName).trim(), 0, -1);
+      return Array.isArray(members) ? members : [];
+    } catch (e) {
+      return [];
+    }
+  }
+
+  return [];
+}
+
+async function userInAnyGroup(uid, allowedGroups) {
+  const allowed = normalizeAllowedGroups(allowedGroups);
+  if (!uid || !allowed.length) return false;
+
+  const ug = await groups.getUserGroups([uid]);
+  const list = (ug && ug[0]) ? ug[0] : [];
+
+  const seen = new Set();
+  for (const g of list) {
+    if (!g) continue;
+    if (g.slug) seen.add(String(g.slug));
+    if (g.name) seen.add(String(g.name));
+    if (g.groupName) seen.add(String(g.groupName));
+    if (g.displayName) seen.add(String(g.displayName));
+  }
+
+  return allowed.some((v) => seen.has(String(v)));
+}
+
+function forumBaseUrl() {
+  let base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
+  if (!base) base = String(nconf.get('url') || '').trim();
+  base = String(base || '').trim().replace(/\/$/, '');
+  if (base && !/^https?:\/\//i.test(base)) {
+    base = `https://${base.replace(/^\/\//, '')}`;
+  }
+  return base;
+}
+
+async function sendEmail(template, uid, subject, params) {
+  const toUid = Number.isInteger(uid) ? uid : parseInt(String(uid || '').trim(), 10);
+  if (!Number.isFinite(toUid) || toUid <= 0) return;
+
+  const payload = Object.assign({}, params || {}, subject ? { subject } : {});
+
+  try {
+    if (typeof emailer.send !== 'function') return;
+    await emailer.send(template, toUid, payload);
+  } catch (err) {
+    // eslint-disable-next-line no-console
+    console.warn('[calendar-onekite] Failed to send email', { template, uid: toUid, err: String((err && err.message) || err) });
+  }
+}
+
+function normalizeUidList(uids) {
+  if (!uids) return [];
+  const arr = Array.isArray(uids) ? uids : (() => {
+    const s = String(uids || '').trim();
+    if (!s) return [];
+    try {
+      const parsed = JSON.parse(s);
+      return Array.isArray(parsed) ? parsed : [];
+    } catch (e) {
+      return s.split(',').map((x) => String(x).trim()).filter(Boolean);
+    }
+  })();
+
+  const out = [];
+  for (const u of arr) {
+    const n = Number.isInteger(u) ? u : parseInt(String(u || '').trim(), 10);
+    if (Number.isFinite(n) && n > 0) out.push(String(n));
+  }
+  return Array.from(new Set(out));
+}
+
+async function usernamesByUids(uids) {
+  const ids = normalizeUidList(uids);
+  if (!ids.length) return [];
+
+  try {
+    if (typeof user.getUsersFields === 'function') {
+      const rows = await user.getUsersFields(ids, ['username']);
+      return (rows || []).map((r) => (r && r.username ? String(r.username) : '')).filter(Boolean);
+    }
+  } catch (e) {
+    // fall through
+  }
+
+  const rows = await Promise.all(ids.map(async (uid) => {
+    try {
+      const r = await user.getUserFields(uid, ['username']);
+      return r && r.username ? String(r.username) : '';
+    } catch (e) {
+      return '';
+    }
+  }));
+  return rows.filter(Boolean);
+}
+
+module.exports = {
+  normalizeAllowedGroups,
+  normalizeUids,
+  getMembersByGroupIdentifier,
+  userInAnyGroup,
+  forumBaseUrl,
+  sendEmail,
+  normalizeUidList,
+  usernamesByUids,
+};

package/lib/scheduler.js

@@ -6,8 +6,8 @@ const dbLayer = require('./db');
 const discord = require('./discord');
 const realtime = require('./realtime');
 const nconf = require.main.require('nconf');
-const groups = require.main.require('./src/groups');
-const utils = require('./utils');
+const utils = require("./utils");
+const nb = require("./nodebb-helpers");
 const { getSettings } = require('./settings');
 
 let timer = null;
@@ -53,50 +53,8 @@ async function addOnce(key, value) {
   }
 }
 
-const { getSetting, formatFR, forumBaseUrl, normalizeAllowedGroups, normalizeUids, arrayifyNames } = utils;
-
-// Resolve group identifiers from ACP (name or slug) and return UIDs.
-async function getMembersByGroupIdentifier(groupIdentifier) {
-  const id = String(groupIdentifier || '').trim();
-  if (!id) return [];
-
-  let members = [];
-  try {
-    members = await groups.getMembers(id, 0, -1);
-  } catch (e) {
-    members = [];
-  }
-  if (Array.isArray(members) && members.length) return members;
-
-  if (typeof groups.getGroupNameByGroupSlug === 'function') {
-    let groupName = null;
-    try {
-      if (groups.getGroupNameByGroupSlug.length >= 2) {
-        groupName = await new Promise((resolve) => {
-          groups.getGroupNameByGroupSlug(id, (err, name) => resolve(err ? null : name));
-        });
-      } else {
-        groupName = await groups.getGroupNameByGroupSlug(id);
-      }
-    } catch (e) {
-      groupName = null;
-    }
-
-    if (groupName && String(groupName).trim() && String(groupName).trim() !== id) {
-      try {
-        members = await groups.getMembers(String(groupName).trim(), 0, -1);
-      } catch (e) {
-        members = [];
-      }
-      if (Array.isArray(members) && members.length) return members;
-    }
-  }
-
-  return Array.isArray(members) ? members : [];
-}
-
-// normalizeUids/normalizeAllowedGroups are provided by utils
-
+const { getSetting, formatFR, arrayifyNames } = utils;
+const { forumBaseUrl, normalizeAllowedGroups, normalizeUids, getMembersByGroupIdentifier, sendEmail } = nb;
 async function getValidatorUids(settings) {
   const out = new Set();
   // Always include administrators
@@ -144,26 +102,8 @@ async function expirePending() {
   const validatorReminderMins = parseInt(getSetting(settings, 'validatorReminderMinutesPending', '0'), 10) || 0;
   const now = Date.now();
 
-  const emailer = require.main.require('./src/emailer');
   const user = require.main.require('./src/user');
 
-  async function sendEmail(template, uid, subject, data) {
-    const toUid = Number.isInteger(uid) ? uid : (uid ? parseInt(uid, 10) : NaN);
-    if (!Number.isInteger(toUid) || toUid <= 0) return;
-    const params = Object.assign({}, data || {}, subject ? { subject } : {});
-    try {
-      if (typeof emailer.send !== 'function') return;
-      await emailer.send(template, toUid, params);
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] Failed to send email (scheduler)', {
-        template,
-        uid: toUid,
-        err: String((err && err.message) || err),
-      });
-    }
-  }
-
   const adminUrl = (() => {
     const base = forumBaseUrl();
     return base ? `${base}/admin/plugins/calendar-onekite` : '/admin/plugins/calendar-onekite';
@@ -268,31 +208,8 @@ async function processAwaitingPayment() {
   const ids = await dbLayer.listAllReservationIds(5000);
   if (!ids || !ids.length) return;
 
-  const emailer = require.main.require('./src/emailer');
   const user = require.main.require('./src/user');
 
-  // NodeBB 4.x: always send by uid.
-  async function sendEmail(template, uid, subject, data) {
-    const toUid = Number.isInteger(uid) ? uid : (uid ? parseInt(uid, 10) : NaN);
-    if (!Number.isInteger(toUid) || toUid <= 0) return;
-
-    const params = Object.assign({}, data || {}, subject ? { subject } : {});
-
-    try {
-      if (typeof emailer.send !== 'function') return;
-      // NodeBB 4.x: send(template, uid, params)
-      // Do NOT branch on function.length (unreliable once wrapped/bound).
-      await emailer.send(template, toUid, params);
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] Failed to send email (scheduler)', {
-        template,
-        uid: toUid,
-        err: String((err && err.message) || err),
-      });
-    }
-  }
-
   const adminUrl = (() => {
     const base = forumBaseUrl();
     return base ? `${base}/admin/plugins/calendar-onekite` : '/admin/plugins/calendar-onekite';

package/package.json

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

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "2.0.62"
+  "version": "2.0.63"
 }

package/public/client.js

@@ -568,6 +568,25 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     alert(msg);
   }
 
+  function confirmDeletion(message) {
+    const msg = String(message || 'Confirmer la suppression ?');
+    return new Promise((resolve) => {
+      try {
+        bootbox.confirm({
+          title: 'Confirmation',
+          message: msg,
+          buttons: {
+            cancel: { label: 'Annuler', className: 'btn-secondary' },
+            confirm: { label: 'Supprimer', className: 'btn-danger' },
+          },
+          callback: (result) => resolve(!!result),
+        });
+      } catch (e) {
+        resolve(false);
+      }
+    });
+  }
+
   async function fetchJson(url, opts) {
     const res = await fetch(url, {
       credentials: 'same-origin',
@@ -1725,17 +1744,24 @@ function toDatetimeLocalValue(date) {
                 close: { label: 'Fermer', className: 'btn-secondary' },
                 ...(canDel ? {
                   del: {
-                    label: 'Annuler',
+                    label: 'Supprimer',
                     className: 'btn-danger',
-                    callback: async () => {
-                      try {
-                        const eid = String(p.eid || ev.id).replace(/^special:/, '');
-                        await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}`, { method: 'DELETE' });
-                        showAlert('success', 'Évènement supprimé.');
-                        calendar.refetchEvents();
-                      } catch (e) {
-                        showAlert('error', 'Suppression impossible.');
-                      }
+                    callback: () => {
+                      (async () => {
+                        const ok = await confirmDeletion('Supprimer cet évènement ?');
+                        if (!ok) return;
+                        try {
+                          const eid = String(p.eid || ev.id).replace(/^special:/, '');
+                          await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}`, { method: 'DELETE' });
+                          showAlert('success', 'Évènement supprimé.');
+                          invalidateEventsCache();
+                          scheduleRefetch(calendar);
+                          try { dlg.modal('hide'); } catch (e) { try { bootbox.hideAll(); } catch (e2) {} }
+                        } catch (e) {
+                          showAlert('error', 'Suppression impossible.');
+                        }
+                      })();
+                      return false;
                     },
                   },
                 } : {}),
@@ -1868,17 +1894,24 @@ function toDatetimeLocalValue(date) {
                 close: { label: 'Fermer', className: 'btn-secondary' },
                 ...(canDel ? {
                   del: {
-                    label: 'Annuler',
+                    label: 'Supprimer',
                     className: 'btn-danger',
-                    callback: async () => {
-                      try {
-                        const oid = String(p.oid || ev.id).replace(/^outing:/, '');
-                        await fetchJson(`/api/v3/plugins/calendar-onekite/outings/${encodeURIComponent(oid)}`, { method: 'DELETE' });
-                        showAlert('success', 'Prévision annulée.');
-                        calendar.refetchEvents();
-                      } catch (e) {
-                        showAlert('error', 'Annulation impossible.');
-                      }
+                    callback: () => {
+                      (async () => {
+                        const ok = await confirmDeletion('Supprimer cette sortie ?');
+                        if (!ok) return;
+                        try {
+                          const oid = String(p.oid || ev.id).replace(/^outing:/, '');
+                          await fetchJson(`/api/v3/plugins/calendar-onekite/outings/${encodeURIComponent(oid)}`, { method: 'DELETE' });
+                          showAlert('success', 'Sortie supprimée.');
+                          invalidateEventsCache();
+                          scheduleRefetch(calendar);
+                          try { dlg.modal('hide'); } catch (e) { try { bootbox.hideAll(); } catch (e2) {} }
+                        } catch (e) {
+                          showAlert('error', 'Suppression impossible.');
+                        }
+                      })();
+                      return false;
                     },
                   },
                 } : {}),
@@ -2041,18 +2074,24 @@ function toDatetimeLocalValue(date) {
         };
 
         const cancelBtn = showCancel ? {
-          label: 'Annuler',
+          label: 'Supprimer',
           className: 'btn-danger',
-          callback: async () => {
-            try {
-              if (!lockAction(`cancel:${rid}`, 1200)) return false;
-              await cancelReservation(rid);
-              showAlert('success', 'Réservation annulée.');
-              invalidateEventsCache();
-              scheduleRefetch(calendar);
-            } catch (e) {
-              showAlert('error', 'Annulation impossible.');
-            }
+          callback: () => {
+            (async () => {
+              const ok = await confirmDeletion('Supprimer cette location ?');
+              if (!ok) return;
+              try {
+                if (!lockAction(`cancel:${rid}`, 1200)) return;
+                await cancelReservation(rid);
+                showAlert('success', 'Location supprimée.');
+                invalidateEventsCache();
+                scheduleRefetch(calendar);
+                try { bootbox.hideAll(); } catch (e) {}
+              } catch (e) {
+                showAlert('error', 'Suppression impossible.');
+              }
+            })();
+            return false;
           },
         } : null;
         if (showPay) {