From 41f96dedcb4ce1e8af5fc3190bd98d2a298f1705 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 12 Jan 2021 11:36:33 +0100
Subject: [PATCH] fix: [js:bootstrap-helper] Correctly returns promise

---
 .../genericElements/ListTopBar/element_simple.php      | 10 +++++++---
 webroot/js/bootstrap-helper.js                         |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/templates/element/genericElements/ListTopBar/element_simple.php b/templates/element/genericElements/ListTopBar/element_simple.php
index d0bd940..c0262b5 100644
--- a/templates/element/genericElements/ListTopBar/element_simple.php
+++ b/templates/element/genericElements/ListTopBar/element_simple.php
@@ -2,7 +2,7 @@
     if (!isset($data['requirement']) || $data['requirement']) {
         if (!empty($data['popover_url'])) {
             $onClick = sprintf(
-                'onClick="openModalForButton(%s)"',
+                'onClick="openModalForButton(this, %s)"',
                 sprintf("'%s'", h($data['popover_url']))
             );
         }
@@ -69,7 +69,11 @@
 ?>
 
 <script>
-    function openModalForButton(url) {
-        UI.openModalFromURL(url, '<?= $this->Url->build(['action' => 'index']); ?>', '<?= $tableRandomValue ?>')
+    function openModalForButton(clicked, url) {
+        const loadingOverlay = new OverlayFactory(clicked);
+        loadingOverlay.show()
+        UI.openModalFromURL(url, '<?= $this->Url->build(['action' => 'index']); ?>', '<?= $tableRandomValue ?>').finally(() => {
+            loadingOverlay.hide()
+        })
     }
 </script>
\ No newline at end of file
diff --git a/webroot/js/bootstrap-helper.js b/webroot/js/bootstrap-helper.js
index fc9c303..025b6ee 100644
--- a/webroot/js/bootstrap-helper.js
+++ b/webroot/js/bootstrap-helper.js
@@ -52,7 +52,7 @@ class UIFactory {
      * @return {Promise<Object>} Promise object resolving to the ModalFactory object
      */
     openModalFromURL(url, reloadUrl=false, tableId=false) {
-        UI.modalFromURL(url, () => {
+        return UI.modalFromURL(url, () => {
             if (reloadUrl === false || tableId === false) { // Try to get information from the DOM
                 let $elligibleTable = $('table.table')
                 let currentModel = location.pathname.split('/')[1]