Release v2.4.2

src/web/public/js/slides/slide-form.js

@@ -21,7 +21,7 @@ import { createSlideFormPreviewHelpers } from '/assets/js/slides/slide-form-prev
   var templates = Array.isArray(slideEditorData.templates) ? slideEditorData.templates : [];
   var rssFeeds = Array.isArray(slideEditorData.rssFeeds) ? slideEditorData.rssFeeds : [];
   var apiSources = Array.isArray(slideEditorData.apiSources) ? slideEditorData.apiSources : [];
-  var scheduleGroups = Array.isArray(slideEditorData.scheduleGroups) ? slideEditorData.scheduleGroups : [];
+  var timetableGroups = Array.isArray(slideEditorData.timetableGroups) ? slideEditorData.timetableGroups : [];
   var fontStylesheetHref = String(slideEditorData.fontStylesheetHref || '').trim();
   var existingTemplateId = slideEditorData.existingTemplateId !== undefined ? slideEditorData.existingTemplateId : null;
   var existingContent = slideEditorData.existingContent || {};
@@ -37,7 +37,6 @@ import { createSlideFormPreviewHelpers } from '/assets/js/slides/slide-form-prev
   var slidePreviewEmpty = document.getElementById('slide-preview-empty');
   var slidePreviewOverlay = document.getElementById('slide-preview-overlay');
   var openPreviewPopupButton = document.getElementById('open-preview-popup');
-  var submitting = false;
   var uploadMaxBytes = 100 * 1024 * 1024;
   var uploadMaxLabel = '100 MB';
   var uploadVideoMaxBytes = 1024 * 1024 * 1024;
@@ -120,7 +119,7 @@ import { createSlideFormPreviewHelpers } from '/assets/js/slides/slide-form-prev
     existingContent: existingContent,
     rssFeeds: rssFeeds,
     apiSources: apiSources,
-    scheduleGroups: scheduleGroups,
+    timetableGroups: timetableGroups,
     defaultFontSize: DEFAULT_FONT_SIZE,
     uploadMaxLabel: uploadMaxLabel,
     uploadVideoMaxLabel: uploadVideoMaxLabel,
@@ -643,6 +642,12 @@ import { createSlideFormPreviewHelpers } from '/assets/js/slides/slide-form-prev
       return getRegionEditorCardHtml(region) || '<div class="muted">Region editor unavailable.</div>';
     }).join('') : '<div class="muted">This template has no regions.</div>';
 
+    if (window.adminlte && typeof window.adminlte.CardWidget === 'function') {
+      templateFields.querySelectorAll('.card-widget[data-region-id]').forEach(function (card) {
+        window.adminlte.CardWidget.getOrCreateInstance(card);
+      });
+    }
+
     templateFields.querySelectorAll('[data-region-media-type="video"]').forEach(function (card) {
       var regionId = card.getAttribute('data-region-id');
       var hidden = regionId ? card.querySelector('input[type="hidden"][name="existing_region_video_' + regionId + '"]') : null;
@@ -744,92 +749,25 @@ import { createSlideFormPreviewHelpers } from '/assets/js/slides/slide-form-prev
     requestPreviewRender();
   }
 
-  slideForm.addEventListener('submit', async function (event) {
-    if (submitting) {
+  slideForm.addEventListener('submit', function (event) {
+    if (!window.webAsyncSaveForm || typeof window.webAsyncSaveForm.submit !== 'function') {
       return;
     }
-    event.preventDefault();
-    var slideFormUrl = new URL(slideForm.action, window.location.href);
-    var isCreateForm = slideFormUrl.pathname === '/slides';
-    var submitterValue = event.submitter && event.submitter.name === 'save_action'
-      ? String(event.submitter.value || '').trim().toLowerCase()
-      : '';
-    submitting = true;
-    try {
-      if (hasPendingRegionImageUpload()) {
-        throw new Error('Wait for the image upload to finish before saving.');
-      }
-      await slideFormEditorController.syncEditors();
-      var formData = new FormData(slideForm);
-      if (event.submitter && event.submitter.name) {
-        formData.set(event.submitter.name, event.submitter.value || '');
-      }
-      var response = await fetch(slideForm.action, {
-        method: (slideForm.method || 'POST').toUpperCase(),
-        headers: {
-          'X-Requested-With': 'XMLHttpRequest',
-          'Accept': 'text/html, application/json, text/plain, */*'
-        },
-        body: formData,
-        credentials: 'same-origin'
-      });
 
-      if (!response.ok) {
-        throw new Error(await response.text() || 'Unable to save slide.');
-      }
-
-      if (submitterValue === 'close' || submitterValue === 'new') {
-        var redirectUrl = submitterValue === 'close'
-          ? String(slideForm.dataset.asyncSaveCloseUrl || response.url || slideForm.action)
-          : String(slideForm.dataset.asyncSaveNewUrl || response.url || slideForm.action);
-        window.location.replace(redirectUrl);
-        return;
-      }
-
-      if (isCreateForm) {
-        try {
-          if (response.url) {
-            if (regionMediaController) {
-              regionMediaController.clearPendingUploadCleanupPaths();
-            }
-            window.location.replace(response.url);
-            return;
-          }
-        } catch (_error) {
-          // Fall through and show a toast if the redirect URL cannot be resolved.
+    window.webAsyncSaveForm.submit(slideForm, event, {
+      beforeSubmit: async function () {
+        if (hasPendingRegionImageUpload()) {
+          throw new Error('Wait for the image upload to finish before saving.');
         }
-        slideForm.dataset.dirty = 'false';
-        showToast('Saved slide.', 'success');
-        return;
-      }
-
-      var responseText = await response.text();
-      var savedMessage = '';
-      try {
-        var doc = new DOMParser().parseFromString(responseText || '', 'text/html');
-        var toastBody = doc.querySelector('.toast-body');
-        if (toastBody && toastBody.textContent) {
-          savedMessage = toastBody.textContent.trim();
+        await slideFormEditorController.syncEditors();
+      },
+      fallbackSuccessMessage: 'Saved slide.',
+      afterSuccess: function () {
+        if (regionMediaController) {
+          regionMediaController.clearPendingUploadCleanupPaths();
         }
-      } catch (_error) {
-        savedMessage = '';
       }
-
-      showToast(savedMessage || 'Saved slide.', 'success');
-      slideForm.dataset.dirty = 'false';
-      if (regionMediaController) {
-        regionMediaController.clearPendingUploadCleanupPaths();
-      }
-    } catch (error) {
-      if (typeof showToast === 'function') {
-        var variant = Number(error && error.status) >= 400 && Number(error && error.status) < 500 ? 'warning' : 'danger';
-        showToast(error && error.message ? error.message : 'Unable to save slide.', variant);
-      } else {
-        window.alert(error && error.message ? error.message : 'Unable to save slide.');
-      }
-    } finally {
-      submitting = false;
-    }
+    });
   });
 
   slideForm.addEventListener('input', function () {