Show theme upload messages (#28)

src/MyWebLog/Handlers/Helpers.fs

@@ -122,7 +122,6 @@ module ViewContext =
     let WebLog = "web_log"
 
 
-
 /// The HTTP item key for loading the session
 let private sessionLoadedKey = "session-loaded"
 

src/admin-theme/wwwroot/admin.js

@@ -334,16 +334,12 @@ this.Admin = {
       const theToast = new bootstrap.Toast(toast, options)
       theToast.show()
     })
-  }
-}
+  },
 
-htmx.on("htmx:afterOnLoad", function (evt) {
-  const hdrs = evt.detail.xhr.getAllResponseHeaders()
-  // Show messages if there were any in the response
-  if (hdrs.indexOf("x-message") >= 0) {
-    Admin.showMessage(evt.detail.xhr.getResponseHeader("x-message"))
-  }
-  // Initialize any toasts that were pre-rendered from the server
+  /**
+   * Initialize any toasts that were pre-rendered from the server
+   */
+  showPreRenderedMessages() {
     [...document.querySelectorAll(".toast")].forEach(el => {
       if (el.getAttribute("data-mwl-shown") === "true" && el.className.indexOf("hide") >= 0) {
         document.removeChild(el)
@@ -355,6 +351,17 @@ htmx.on("htmx:afterOnLoad", function (evt) {
         el.setAttribute("data-mwl-shown", "true")
       }
     })
+  }
+}
+
+htmx.on("htmx:afterOnLoad", function (evt) {
+  const hdrs = evt.detail.xhr.getAllResponseHeaders()
+  // Initialize any toasts that were pre-rendered from the server
+  Admin.showPreRenderedMessages()
+  // Show messages if there were any in the response
+  if (hdrs.indexOf("x-message") >= 0) {
+    Admin.showMessage(evt.detail.xhr.getResponseHeader("x-message"))
+  }
 })
 
 htmx.on("htmx:responseError", function (evt) {
@@ -365,3 +372,5 @@ htmx.on("htmx:responseError", function (evt) {
     Admin.showMessage(`danger|||${xhr.status}: ${xhr.statusText}`)
   }
 })
+
+document.addEventListener("DOMContentLoaded", Admin.showPreRenderedMessages, { once: true})