Interfaces fixes and test fixes(?)

NASA-AMMOS · Mar 27, 2024 · e897108 · e897108
1 parent e5d94fa
commit e897108
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/InitiatorsTestIT.java
@@ -130,7 +130,10 @@ public void runStartInitiatorTest() throws IOException {
 			driver.findElement(By.id("saveXmlBtn")).click();
 
 			waitForElementID("saveConfirmBtn");
-			driver.findElement(By.id("saveConfirmBtn")).click();
+			WebElement saveConfirmBtn = driver.findElement(By.id("saveConfirmBtn"));
+
+            js.executeScript("arguments[0].scrollIntoViewIfNeeded();", saveConfirmBtn);
+			saveConfirmBtn.click();
 
 			wait.until(ExpectedConditions.invisibilityOfElementLocated(By.id("saveConfirmBtn")));
 

diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/LoadTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/LoadTestIT.java
@@ -177,7 +177,10 @@ public void runStartLoadTest() throws IOException {
             driver.findElement(By.id("saveXmlBtn")).click();
 
             waitForElementID("saveConfirmBtn");
-            driver.findElement(By.id("saveConfirmBtn")).click();
+            WebElement saveConfirmBtn = driver.findElement(By.id("saveConfirmBtn"));
+
+            js.executeScript("arguments[0].scrollIntoViewIfNeeded();", saveConfirmBtn);
+            saveConfirmBtn.click();
 
             wait.until(ExpectedConditions.invisibilityOfElementLocated(By.id("saveConfirmBtn")));
 

diff --git a/cws-test/src/test/java/jpl/cws/test/integration/ui/WorkersTestIT.java b/cws-test/src/test/java/jpl/cws/test/integration/ui/WorkersTestIT.java
@@ -268,7 +268,11 @@ public void runThreadLimitTest() throws IOException {
 
 			waitForElementID("saveConfirmBtn");
 			log.info("Clicking on 'Save Confirm' button.");
-			driver.findElement(By.id("saveConfirmBtn")).click();
+			WebElement saveConfirmBtn = driver.findElement(By.id("saveConfirmBtn"));
+
+	  		js.executeScript("arguments[0].scrollIntoViewIfNeeded();", saveConfirmBtn);
+
+			saveConfirmBtn.click();
 
 			wait.until(ExpectedConditions.invisibilityOfElementLocated(By.id("saveConfirmBtn")));
 

diff --git a/cws-ui/src/main/webapp/css/deployments.css b/cws-ui/src/main/webapp/css/deployments.css
@@ -200,7 +200,7 @@
     display: flex;
     flex-direction: row;
     justify-content: center;
-    align-items: stretch;
+    align-items: center;
     align-content: space-between;
     gap: 10px;
 }

diff --git a/install/cws-ui/navbar.ftl b/install/cws-ui/navbar.ftl
@@ -9,7 +9,7 @@
 		<div class="collapse navbar-collapse" id="navbarText" style="justify-content: flex-end;">
 			<ul class="navbar-nav ml-auto" style="gap: 20px;">
 				<li class="nav-item"><a class="nav-link" href="/${base}/modeler" target="_blank"><img height="16" width="16" src="/${base}/images/edit.svg" />Modeler</a></li>
-				<li class="nav-item"><a class="nav-link" href="/camunda/app/tasklist"><img height="16" width="16" src="/${base}/images/checklist.svg" />Tasklist</a></li>
+				<li class="nav-item"><a class="nav-link" href="/camunda/app/tasklist"><img height="16" width="16" src="/${base}/images/checklist_light.svg" />Tasklist</a></li>
 				<li class="nav-item"><a class="nav-link" href="/camunda/app/cockpit"><img height="16" width="16" src="/${base}/images/helicopter.svg" />Cockpit</a></li>
 				<li class="nav-item"><a class="nav-link" href="/camunda/app/admin/default/#/authorization?resource=0"><img height="16" width="16" src="/${base}/images/person.svg"/>Admin</a></li>
 				__CWS_PROJECT_LINK__

diff --git a/install/cws-ui/processes.ftl b/install/cws-ui/processes.ftl
@@ -979,7 +979,7 @@
                 });
 
                 //add our action dropdown button to the div that datatables created (created in dom: above)
-                $('<div class="btn-group"><button id="menu3" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"><img height="16" width="16" src="/${base}/images/waterfall.svg" />&nbsp;Actions &nbsp;'
+                $('<div class="btn-group"><button id="menu3" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"><img height="16" width="16" src="/${base}/images/waterfall_light.svg" />&nbsp;Actions &nbsp;'
                     + '<span class="caret"></span>'
                     + '</button>'
                     + '<ul id="action-list" class="dropdown-menu" role="menu" aria-labelledby="menu3">'
@@ -996,7 +996,7 @@
                     + `</ul></div>`).appendTo(".above-table-buttons");
 
                 //add our download dropdown button to the div that datatables created (created in dom: above)
-                $('<div class="btn-group"><button id="action-download-group" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"><img height="16" width="16" src="/${base}/images/save.svg" />&nbsp;Download &nbsp;'
+                $('<div class="btn-group"><button id="action-download-group" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"><img height="16" width="16" src="/${base}/images/save_light.svg" />&nbsp;Download &nbsp;'
                     + '<span class="caret"></span>'
                     + '</button>'
                     + '<ul id="action-list" class="dropdown-menu" role="menu" aria-labelledby="action-download-group">'