From f28541439105bfad29d7b78834135459bf0c3af8 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Thu, 4 May 2023 11:36:49 +0200
Subject: [PATCH] Add an additional message parameter to define if a message is
 dismissible.

---
 assets/js/utils/message.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/assets/js/utils/message.js b/assets/js/utils/message.js
index 8bab6d20..dcbf7e12 100644
--- a/assets/js/utils/message.js
+++ b/assets/js/utils/message.js
@@ -26,8 +26,9 @@ window.App.Utils.Message = (function () {
      * @param {String} title The title of the message box.
      * @param {String} message The message of the dialog.
      * @param {Array} [buttons] Contains the dialog buttons along with their functions.
+     * @param {Boolean} [isDismissible] If true, the button will show the close X in the header and close with the press of the Escape button.
      */
-    function show(title, message, buttons = null) {
+    function show(title, message, buttons = null, isDismissible = true) {
         if (!title || !message) {
             return;
         }
@@ -51,13 +52,14 @@ window.App.Utils.Message = (function () {
         $('#message-modal').remove();
 
         const $messageModal = $(`
-            <div class="modal" id="message-modal">
+            <div class="modal" id="message-modal" tabindex="-1">
                 <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
                     <div class="modal-content">
                         <div class="modal-header">
                             <h5 class="modal-title">
                                 ${title}
                             </h5>
+                            ${isDismissible ? '<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>' : ''}
                         </div>
                         <div class="modal-body">
                             <p>
@@ -93,7 +95,7 @@ window.App.Utils.Message = (function () {
         });
 
         messageModal = new bootstrap.Modal('#message-modal', {
-            keyboard: false,
+            keyboard: isDismissible,
             backdrop: 'static',
         });