Editor: Publish modal button needs loading status (#2324)

* Editor: Publish modal button needs loading status relates to xibosignage/xibo#3296 * Remove cog when request fails from dialog relates to xibosignage/xibo#3296
xibosignage · Jan 24, 2024 · ab734f2 · ab734f2
1 parent 83bab28
commit ab734f2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/ui/src/layout-editor/layout.js b/ui/src/layout-editor/layout.js
@@ -468,8 +468,11 @@ Layout.prototype.publish = function() {
       } else {
         toastr.error(res.message);
 
-        // Close dialog
-        bootbox.hideAll();
+        // Remove loading icon from publish dialog
+        $(
+          '[data-test="publishFormLayoutForm"] ' +
+          '.btn-bb-Publish i.fa-cog',
+        ).remove();
       }
     }
   }).fail(function(jqXHR, textStatus, errorThrown) {
@@ -517,8 +520,11 @@ Layout.prototype.discard = function() {
       } else {
         toastr.error(res.message);
 
-        // Close dialog
-        bootbox.hideAll();
+        // Remove loading icon from publish dialog
+        $(
+          '[data-test="discardFormLayoutForm"] ' +
+          '.btn-bb-Discard i.fa-cog',
+        ).remove();
       }
     }
 
@@ -568,8 +574,11 @@ Layout.prototype.delete = function() {
       } else {
         toastr.error(res.message);
 
-        // Close dialog
-        bootbox.hideAll();
+        // Remove loading icon from publish dialog
+        $(
+          '[data-test="deleteFormLayoutForm"] ' +
+          '.btn-bb-Yes i.fa-cog',
+        ).remove();
       }
     }
 

diff --git a/ui/src/layout-editor/main.js b/ui/src/layout-editor/main.js
@@ -1035,7 +1035,12 @@ lD.loadFormFromAPI = function(
               generatedButtons[button] = {
                 label: button,
                 className: buttonType + ' btn-bb-' + button,
-                callback: function() {
+                callback: function(ev) {
+                  // Show loading cog
+                  $(ev.currentTarget).append(
+                    '&nbsp;<i class="fa fa-cog fa-spin"></i>',
+                  );
+
                   // Call global function by the function name
                   if (mainActionCallback != null && mainButtonAction) {
                     eval(mainActionCallback);