Bug fixes: Flash messages not appearing in some cases (#6670)

MarkUsProject · Jul 22, 2023 · 646210a · 646210a
1 parent 25d0be8
commit 646210a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -28,6 +28,7 @@
 - Added a button allowing graders to view a random incomplete submission (#6641)
 - Add icons to submission and result grading action buttons (#6666)
 - Remove group name maximum length constraint (#6668)
+- Fix bug where in some cases flash messages were not being rendered correctly (#6670)
 
 ## [v2.2.3]
 - Fix bug where in some circumstances the wrong result would be displayed to students (#6465)

diff --git a/app/assets/javascripts/ajax_events.js b/app/assets/javascripts/ajax_events.js
@@ -12,7 +12,7 @@ export function renderFlash(event, request, headers) {
   }
   let discard = [];
   let discardMessage;
-  if (headers.xhr) {
+  if (request) {
     discardMessage = request.getResponseHeader("X-Message-Discard");
   } else {
     discardMessage = headers.get("X-Message-Discard");
@@ -29,7 +29,7 @@ export function renderFlash(event, request, headers) {
       flashDiv.style.display = "none";
     } else {
       let flashMessage;
-      if (headers.xhr) {
+      if (request) {
         flashMessage = request.getResponseHeader(`X-Message-${key}`);
       } else {
         flashMessage = headers.get(`X-Message-${key}`);

diff --git a/app/assets/javascripts/job_poller.js b/app/assets/javascripts/job_poller.js
@@ -11,6 +11,7 @@ export function poll_job(job_id, onSuccess, onFailure, onComplete, interval) {
   fetch(Routes.get_job_message_path(job_id), {
     headers: {
       Accept: "application/json",
+      "X-requested-with": "XMLHttpRequest",
     },
   })
     .then(response => {

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -92,7 +92,9 @@ def flash_to_headers
         response.headers["X-Message-#{key}"] = str
       end
     end
-    flash.discard
+    if request.xhr?
+      flash.discard
+    end
   end
 
   # dynamically hide a flash message (for HTTP requests)