fix problem on run modal

bcivel · bcivel · commit 76e371965f8f · 2026-02-06T17:19:14.000+01:00
diff --git a/source/src/main/webapp/TestCaseExecution.jsp b/source/src/main/webapp/TestCaseExecution.jsp
@@ -39,6 +39,7 @@
         <script type="text/javascript" src="js/transversalobject/File.js"></script>
         <script type="text/javascript" src="js/transversalobject/Robot.js"></script>
         <script type="text/javascript" src="js/transversalobject/Application.js"></script>
+        <script type="text/javascript" src="js/transversalobject/TestCaseSimpleExecution.js"></script>
         <link rel="stylesheet" type="text/css" href="css/pages/TestCaseExecution.css">
         <link href="https://cdn.jsdelivr.net/css-toggle-switch/latest/toggle-switch.css" rel="stylesheet"/>
 
diff --git a/source/src/main/webapp/TestCaseList.jsp b/source/src/main/webapp/TestCaseList.jsp
@@ -38,6 +38,7 @@
         <script type="text/javascript" src="js/pages/TestCaseList.js"></script>
         <script type="text/javascript" src="js/transversalobject/TestCase.js"></script>
         <script type="text/javascript" src="js/transversalobject/Application.js"></script>
+        <script type="text/javascript" src="js/transversalobject/TestCaseSimpleExecution.js"></script>
         <title id="pageTitle">Test Case</title>
     </head>
     <body x-data x-cloak class="crb_body">
diff --git a/source/src/main/webapp/TestCaseScript.jsp b/source/src/main/webapp/TestCaseScript.jsp
@@ -40,6 +40,7 @@
         <script type="text/javascript" src="js/transversalobject/AppService.js"></script>
         <script type="text/javascript" src="js/transversalobject/Application.js"></script>
         <script type="text/javascript" src="js/transversalobject/TestCaseExecutionQueue.js"></script>
+        <script type="text/javascript" src="js/transversalobject/TestCaseSimpleExecution.js"></script>
         <link rel="stylesheet" type="text/css" href="css/pages/TestCaseScript.css">
     </head>
     <body x-data x-cloak class="crb_body">
diff --git a/source/src/main/webapp/include/transversalobject/TestCaseSimpleExecution.html b/source/src/main/webapp/include/transversalobject/TestCaseSimpleExecution.html
@@ -26,7 +26,10 @@ <h3 class="text-2xl font-semibold">Run Test Case</h3>
         </div>
 
         <!-- BODY -->
-        <div class="p-8 space-y-8">
+        <div class="p-8">
+
+            <!-- NOTIFY ANCHOR -->
+            <div id="modalNotify"></div>
 
             <!-- TEST INFO -->
             <div>
@@ -187,9 +190,10 @@ <h4 class="font-semibold text-lg">Choose robot</h4>
                             <i data-lucide="sliders" class="text-orange-500 w-6 h-6"></i>
                         </div>
                         <h4 class="font-semibold text-foreground">Customize execution settings</h4>
-                        <i data-lucide="save"
-                           @click="saveSettings()"
-                           class="ml-auto w-5 h-5 text-gray-400 cursor-pointer hover:text-green-500"></i>
+                        <button @click="saveSettings()"
+                                class="ml-auto text-gray-400 hover:text-green-500 cursor-pointer">
+                            <i data-lucide="save" class="w-5 h-5"></i>
+                        </button>
                     </div>
 
                     <div class="space-y-3">
@@ -290,7 +294,7 @@ <h4 class="font-semibold text-foreground">Customize execution settings</h4>
             <!-- FOOTER -->
             <div class="flex justify-end gap-4 pt-6">
                 <button @click="close()"
-                        class="px-6 py-2 rounded-xl text-slate-700 bg-slate-200 hover:bg-slate-300">
+                        class="px-6 py-2 rounded-xl !text-slate-700 bg-slate-200 hover:bg-slate-300">
                     Close
                 </button>
 
@@ -374,7 +378,11 @@ <h4 class="font-semibold text-foreground">Customize execution settings</h4>
                     'executionSettings',
                     JSON.stringify(this.settings)
                 );
-                notifyInPage("success", "Settings successfully saved")
+                notifyInModal(
+                    "success",
+                    "Settings successfully saved",
+                    "#modalNotify"
+                );
             },
 
             loadSettings() {
diff --git a/source/src/main/webapp/js/global/notification.js b/source/src/main/webapp/js/global/notification.js
@@ -41,3 +41,17 @@ function notifyInline(message, type = 'info', targetQuerySelector, confirm) {
     });
 }
 
+function notifyInModal(type, message, targetQuerySelector) {
+    Swal.fire({
+        toast: true,
+        position: 'top-end',
+        icon: type,
+        title: message,
+        showConfirmButton: false,
+        timer: 2500,
+        target: document.querySelector(targetQuerySelector),
+        backdrop: false,
+        background: 'var(--crb-new-bg)',
+        color: 'var(--crb-black-color)'
+    });
+}
diff --git a/source/src/main/webapp/js/pages/TestCaseScript.js b/source/src/main/webapp/js/pages/TestCaseScript.js
@@ -360,7 +360,14 @@ $.when($.getScript("js/global/global.js")
                         $("#rerunFromQueueandSee").attr("data-original-title", "Last Execution was <span class='status" + data.contentTable.controlStatus + "'>" + data.contentTable.controlStatus + "</span> in <b>" + data.contentTable.env + "</b> in <b>" + data.contentTable.country + "</b><br> on " + new Date(data.contentTable.end).toLocaleString());
                         $("#runTestCase").unbind('click');
                         $("#runTestCase").on('click', function () {
-                            openModalExecutionSimple(application, test, testcase, description, data.contentTable.country, data.contentTable.env, data.contentTable.robot);
+                            window.dispatchEvent(new CustomEvent('open-execution', {
+                                detail: {
+                                    application: application,
+                                    test: test,
+                                    testcase: testcase,
+                                    description: description
+                                }
+                            }))
                         });
 
                         if (data.contentTable.queueId > 0) {
diff --git a/source/src/main/webapp/js/transversalobject/TestCaseSimpleExecution.js b/source/src/main/webapp/js/transversalobject/TestCaseSimpleExecution.js
