Modernize Run Modal

bcivel · bcivel · commit 66046887681a · 2026-02-06T13:35:05.000+01:00
diff --git a/source/src/main/webapp/TestCaseExecution.jsp b/source/src/main/webapp/TestCaseExecution.jsp
@@ -37,7 +37,6 @@
         <script type="text/javascript" src="js/transversalobject/TestCaseExecutionQueue.js"></script>
         <script type="text/javascript" src="js/transversalobject/TestCase.js"></script>
         <script type="text/javascript" src="js/transversalobject/File.js"></script>
-        <script type="text/javascript" src="js/transversalobject/TestCaseSimpleExecution.js"></script>
         <script type="text/javascript" src="js/transversalobject/Robot.js"></script>
         <script type="text/javascript" src="js/transversalobject/Application.js"></script>
         <link rel="stylesheet" type="text/css" href="css/pages/TestCaseExecution.css">
@@ -52,7 +51,7 @@
         <%@ include file="include/transversalobject/TestCaseExecutionQueue.html" %>
         <%@ include file="include/transversalobject/TestCase.html" %>
         <%@ include file="include/transversalobject/File.html" %>
-        <%@ include file="include/transversalobject/TestCaseSimpleExecution.html" %>
+        <jsp:include page="include/transversalobject/TestCaseSimpleExecution.html"/>
         <%@ include file="include/transversalobject/Robot.html" %>
         <%@ include file="include/transversalobject/Application.html" %>
         <%@ include file="include/transversalobject/Invariant.html" %>
diff --git a/source/src/main/webapp/TestCaseList.jsp b/source/src/main/webapp/TestCaseList.jsp
@@ -37,7 +37,6 @@
         <script type="text/javascript" src="dependencies/Bootstrap-treeview-1.2.0/js/bootstrap-treeview.js"></script>
         <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/TestCaseSimpleExecution.js"></script>
         <script type="text/javascript" src="js/transversalobject/Application.js"></script>
         <title id="pageTitle">Test Case</title>
     </head>
@@ -50,7 +49,7 @@
                 <%@ include file="include/utils/modal-confirmation.html"%>
                 <%@ include file="include/transversalobject/TestCase.html"%>
                 <jsp:include page="include/transversalobject/TestCaseSimpleCreation.html"/>
-                <%@ include file="include/transversalobject/TestCaseSimpleExecution.html"%>
+                <jsp:include page="include/transversalobject/TestCaseSimpleExecution.html"/>
                 <%@ include file="include/transversalobject/Application.html"%>
                 <%@ include file="include/pages/testcaselist/importTestCaseFromTestLink.html"%>
                 <jsp:include page="include/transversalobject/TestCaseListMassActionUpdate.html"/>
diff --git a/source/src/main/webapp/TestCaseScript.jsp b/source/src/main/webapp/TestCaseScript.jsp
@@ -40,7 +40,6 @@
         <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">
@@ -60,7 +59,7 @@
             <%@ include file="include/transversalobject/Application.html"%>
             <%@ include file="include/transversalobject/Property.html"%>
             <%@ include file="include/transversalobject/TestCaseExecutionQueue.html"%>
-            <%@ include file="include/transversalobject/TestCaseSimpleExecution.html"%>
+            <jsp:include page="include/transversalobject/TestCaseSimpleExecution.html"/>
             <%@ include file="include/utils/modal-generic.html"%>
 
             <div class="flex gap-3">
diff --git a/source/src/main/webapp/include/transversalobject/TestCaseSimpleExecution.html b/source/src/main/webapp/include/transversalobject/TestCaseSimpleExecution.html
diff --git a/source/src/main/webapp/js/pages/TestCaseExecution.js b/source/src/main/webapp/js/pages/TestCaseExecution.js
@@ -565,7 +565,14 @@ function updatePage(data, steps) {
 
         $("#runTestCase").attr("disabled", false);
         $("#runTestCase").on('click', function () {
-            openModalExecutionSimple(data.application, data.test, data.testcase, data.description, data.country, data.environment, data.robot);
+            window.dispatchEvent(new CustomEvent('open-execution', {
+                detail: {
+                    application: data.application,
+                    test: data.test,
+                    testcase: data.testcase,
+                    description: data.description
+                }
+            }))
         });
         //$("#runTestCase").parent().attr("href", "RunTests.jsp?test=" + data.test + "&testcase=" + data.testcase);
         $("#rerunTestCase").attr("disabled", false);
diff --git a/source/src/main/webapp/js/pages/TestCaseList.js b/source/src/main/webapp/js/pages/TestCaseList.js
@@ -1024,7 +1024,16 @@ function aoColumnsFunc(countries, tableId) {
                     id: `testcase_action_runtest_${row}`,
                     name: "runTestcase",
                     title: doc.getDocLabel("page_testcaselist", "btn_runTest"),
-                    onClick: `openModalExecutionSimple('${data.application}','${obj.test}','${obj.testcase}','${data.description}')`,
+                    onClick: `
+                        window.dispatchEvent(new CustomEvent('open-execution', {
+                            detail: {
+                                application: '${data.application}',
+                                test: '${obj.test}',
+                                testcase: '${obj.testcase}',
+                                description: '${data.description}'
+                            }
+                        }))
+                    `,
                     extraClass: "group-hover:!text-green-500",
                     icon: icons.run
                 }));
diff --git a/source/src/main/webapp/js/pages/TestCaseScript.js b/source/src/main/webapp/js/pages/TestCaseScript.js
@@ -328,7 +328,14 @@ $.when($.getScript("js/global/global.js")
             $("#seeTest").parent().attr("href", "./TestCaseList.jsp?test=" + encodeURI(test));
             //$("#runTestCase").parent().attr("href", "./RunTests.jsp?test=" + encodeURI(test) + "&testcase=" + encodeURI(testcase));
             $("#runTestCase").on('click', function () {
-                openModalExecutionSimple(application, test, testcase, description);
+                window.dispatchEvent(new CustomEvent('open-execution', {
+                    detail: {
+                        application: application,
+                        test: test,
+                        testcase: testcase,
+                        description: description
+                    }
+                }))
             });
 
             $.ajax({
diff --git a/source/src/main/webapp/js/transversalobject/TestCaseSimpleExecution.js b/source/src/main/webapp/js/transversalobject/TestCaseSimpleExecution.js
