UI - Misc Fixes 4 (#171)

wcgunter · web-flow · commit bb39410af9a2 · 2023-08-09T15:01:30.000-07:00
* Fix deployments download

* Add "none" to process table if no in/out vars

* Fix state for "Show stats for last ..."

* Fix null exception for input variables

* Fix error where worker status was opposite

* Update default order on proc page

* Update model to include more examples of imgs

* Fix deleting process resulting in ajax error

* When model is suspended, grey out line

* Process details table now changes size

* Adjust sizing

* Add message re: popup permission for open all

* Moved output var to local filter

* Make default for logs page to be "ERROR"

* Search on enter key press

* Add support for image urls, other file support

* Update to add support for other files, image urls

* Only show input vars (not vars during proc run)

* Update nested table on logs - make same font size

* Make hide all suspended processes check stateful

* Make warning hidden by default

* Add 3-way toggle: show all, log lines only, no log

* Update input var detection

* Add copy button to long stderr/stdout

* Searchbuilder is now encoded in url

* Update history test to be compat. with new btns

* Update caching behavior

* Update test model with relative paths

* Create cookie w/ username for stateful local vars

* Add tooltips to suspend/resume, edit, delete btns

* Fix timestamp, edit formatting of vars

* Support files that have mime type but not image

* Show var types on history page

* Update wording of log line filtering on history pg

* Edit var styling

* Fix formatting
diff --git a/cws-core/src/main/java/jpl/cws/core/db/SchedulerDbService.java b/cws-core/src/main/java/jpl/cws/core/db/SchedulerDbService.java
@@ -16,6 +16,7 @@
 import org.springframework.jdbc.support.lob.LobCreator;
 
 import java.io.ByteArrayOutputStream;
+import java.sql.Array;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Timestamp;
diff --git a/cws-core/src/main/java/jpl/cws/core/web/CwsSecurityFilter.java b/cws-core/src/main/java/jpl/cws/core/web/CwsSecurityFilter.java
@@ -41,6 +41,7 @@ public abstract class CwsSecurityFilter implements javax.servlet.Filter {
 	private static final Logger log = LoggerFactory.getLogger(CwsSecurityFilter.class);
 
 	public static final String CWS_TOKEN_COOKIE_NAME = "cwsToken";
+	public static final String CWS_USERNAME_COOKIE_NAME = "cwsUsername";
 	
 	static final String COOKIES_HEADER = "Set-Cookie";
 	
@@ -564,6 +565,7 @@ else if (resourceId.startsWith("process/")) {
 	protected void setCwsTokenCookie(HttpServletRequest req, HttpServletResponse resp) {
 		String cwsToken = req.getSession().getId();
 		WebUtils.addCookie(CWS_TOKEN_COOKIE_NAME, cwsToken, null, "/", resp);
+		WebUtils.addUnsecureCookie(CWS_USERNAME_COOKIE_NAME, getUsernameFromReq(req), null, "/", resp);
 		cwsSecurityService.addNewCwsTokenToDb(cwsToken, getUsernameFromReq(req));
 		//addCwsSessionId(getUsernameFromReq(req), req.getSession().getId());
 	}
diff --git a/cws-core/src/main/java/jpl/cws/core/web/WebUtils.java b/cws-core/src/main/java/jpl/cws/core/web/WebUtils.java
@@ -212,6 +212,15 @@ public static void addCookie(String name, String value, String domain, String pa
 		Cookie cookie = constructCookie(name, value, domain, path);
 		resp.addCookie(cookie);
 	}
+
+	public static void addUnsecureCookie(String name, String value, String domain, String path, HttpServletResponse resp) {
+		if (!isValidCookieString(name) || !isValidCookieString(value)) {
+			throw new IllegalArgumentException("Cookie name and/or value is invalid (contains unacceptable characters)!");
+		}
+		Cookie cookie = constructCookie(name, value, domain, path);
+		cookie.setHttpOnly(false);
+		resp.addCookie(cookie);
+	}
 	
 
 	
diff --git a/cws-service/src/main/java/jpl/cws/controller/RestService.java b/cws-service/src/main/java/jpl/cws/controller/RestService.java
@@ -55,11 +55,7 @@
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
diff --git a/cws-service/src/main/java/jpl/cws/service/CwsConsoleService.java b/cws-service/src/main/java/jpl/cws/service/CwsConsoleService.java
@@ -636,7 +636,15 @@ public Map<String, String> getInputVariablesForProcess(String processInstanceId)
                                 }
                                 inputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + " (" + varType + ", " + mimeType + ")", encodedString);
                             } else {
-                                inputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + " (" + varType + ")", fileName);
+                                InputStream fileInputStream = fileValue.getValue();
+                                String encodedString = "";
+                                try {
+                                    byte[] sourceBytes = IOUtils.toByteArray(fileInputStream);
+                                    encodedString += Base64.getEncoder().encodeToString(sourceBytes);
+                                } catch (IOException e) {
+                                    log.error("Error converting file to Base64");
+                                }
+                                inputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + "(" + varType + ") {" + fileName + "}", encodedString);
                             }
                         } else {
                             InputStream fileInputStream = fileValue.getValue();
@@ -647,7 +655,7 @@ public Map<String, String> getInputVariablesForProcess(String processInstanceId)
                             } catch (IOException e) {
                                 log.error("Error converting file to Base64");
                             }
-                            inputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + "(" + varType + ") {" + fileName + "}", encodedString);
+                            inputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + " (" + varType + ") {" + fileName + "}", encodedString);
                         }
                     }
                 }
@@ -699,7 +707,16 @@ public Map<String, String> getOutputVariablesForProcess(String processInstanceId
                                 }
                                 outputVarMap.put(varName + " (" + varType + ", " + mimeType + ")", encodedString);
                             } else {
-                                outputVarMap.put(varName + " (" + varType + ")", fileName);
+                                InputStream fileInputStream = fileValue.getValue();
+                                String encodedString = "";
+                                try {
+                                    byte[] sourceBytes = IOUtils.toByteArray(fileInputStream);
+                                    encodedString += Base64.getEncoder().encodeToString(sourceBytes);
+                                } catch (IOException e) {
+                                    log.error("Error converting file to Base64");
+                                }
+                                outputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + " (" + varType + ") {" + fileName + "}", encodedString);
+
                             }
                         } else {
                             InputStream fileInputStream = fileValue.getValue();
@@ -710,7 +727,7 @@ public Map<String, String> getOutputVariablesForProcess(String processInstanceId
                             } catch (IOException e) {
                                 log.error("Error converting file to Base64");
                             }
-                            outputVarMap.put(varName + "(" + varType + ") {" + fileName + "}", encodedString);
+                            outputVarMap.put(varName + " (" + varType + ") {" + fileName + "}", encodedString);
                         }
                     }
                 }
diff --git a/cws-ui/src/main/webapp/css/history.css b/cws-ui/src/main/webapp/css/history.css
@@ -69,10 +69,26 @@ summary {
     align-items: center;
 }
 
+.proc-var-flex-main-sub-1 {
+    align-self: start;
+    display: flex; 
+    flex-wrap: nowrap; 
+    justify-content: space-between;
+}
+
+.proc-var-flex-main-sub-2 {
+    width: 150px; 
+    word-wrap: break-word; 
+    overflow: hidden;
+}
+
+.proc-var-flex-main-sub-3 {
+    width: 200px;
+    word-wrap: break-word;
+}
+
 .proc-var-flex-btn {
     align-self: start; 
-    margin-top: auto; 
-    margin-bottom: auto;
 }
 
 #logDataNest {
diff --git a/cws-ui/src/main/webapp/css/processes.css b/cws-ui/src/main/webapp/css/processes.css
@@ -136,4 +136,25 @@ summary {
     justify-content: space-between;
     align-items: flex-start;
     gap: 0px;
+}
+
+.var-row-div-flex {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: flex-start;
+    align-content: center;
+}
+
+.var-row-div-flex-sub-1 {
+    width: 85%;
+    max-width: 300px;
+    min-height: 25px;
+    float:left;
+    overflow-wrap: break-word;
+}
+
+.var-row-div-flex-sub-2 {
+    flex-grow: 1;
 }
diff --git a/install/cws-ui/deployments.ftl b/install/cws-ui/deployments.ftl
@@ -12,11 +12,15 @@
 	<!-- Custom styles for this template -->
 	<link href="/${base}/css/dashboard.css" rel="stylesheet">
 	<link href="/${base}/css/deployments.css" rel="stylesheet">
+	<link href="/${base}/css/microtip.css" rel="stylesheet">
 
 	<script>
 
 		//STATE PERSISTANCE CONSTS
-		const username = "username"; //temporary, hardcoded value for now
+		var username = document.cookie.substring(document.cookie.indexOf("cwsUsername=") + 12);
+		if (username.indexOf(";") > 0) {
+			username = username.substring(0, username.indexOf(";"));
+		}
 		const lastNumHoursVar = "CWS_DASH_DEPLOY_LAST_NUM_HOURS-" + username;
 		const refreshRateVar = "CWS_DASH_DEPLOY_REFRESH_RATE-" + username;
 		const hideSuspendedProcVar = "CWS_DASH_DEPLOY_HIDE_SUS-" + username;
@@ -382,18 +386,20 @@
 
 								var returnVal = `<div class="proc-name-btns">`;
 								if (data.suspended == "true") {
-									returnVal += `<a id="btn-suspend-` + data.key + `" data-proc-id="` + data.key + `" onClick="resumeProcDef('` + data.id + `', '` + data.key + `')">`
+									returnVal += `<a id="btn-suspend-` + data.key + `" data-proc-id="` + data.key + `" onClick="resumeProcDef('` + data.id + `', '` + data.key + `')" aria-label="Resume" data-microtip-position="top-right" role="tooltip">`
 									+ `<span style="cursor: pointer; float: right; color: green;" id="suspend-` 
-									+ data.key + `" class="glyphicon glyphicon-play"></span></a>`;
+									+ data.key + `" class="glyphicon glyphicon-play"></span>`
+									+ `</a>`;
 								} else {
-									returnVal += `<a id="btn-suspend-` + data.key + `" data-proc-id="` + data.key + `" onClick="suspendProcDef('` + data.id + `', '` + data.key + `')">`
+									returnVal += `<a id="btn-suspend-` + data.key + `" data-proc-id="` + data.key + `" onClick="suspendProcDef('` + data.id + `', '` + data.key + `')" aria-label="Suspend" data-microtip-position="top-right" role="tooltip">`
 									+ `<span style="cursor: pointer; float: right; color: #d9534f;" id="suspend-` 
 									+ data.key + `" class="glyphicon glyphicon-pause"></span></a>`;
 								}
 								
-								returnVal += `<a href="/${base}/modeler?procDefKey=` + data.key + `" target="_blank">`
+								returnVal += `<a href="/${base}/modeler?procDefKey=` + data.key + `" target="_blank" aria-label="Edit" data-microtip-position="top-right" role="tooltip">`
 									+ `<span style="float: right;" id="edit-` + data.key + `" class="glyphicon glyphicon-pencil"></span></a>`
-									+ `<a data-proc-key="` + data.key + `" onClick="handleDeleteProcDef('` + data.key + `')"><span style="cursor: pointer; float: right; color: #d9534f;" id="delete-` 
+									+ `<a data-proc-key="` + data.key + `" onClick="handleDeleteProcDef('` + data.key + `')" aria-label="Delete" data-microtip-position="top-right" role="tooltip">`
+									+ `<span style="cursor: pointer; float: right; color: #d9534f;" id="delete-` 
 									+ data.key + `" class="glyphicon glyphicon-trash"></span></a>`;
 
 								returnVal += `</div>`;
diff --git a/install/cws-ui/history.ftl b/install/cws-ui/history.ftl
diff --git a/install/cws-ui/logs.ftl b/install/cws-ui/logs.ftl
diff --git a/install/cws-ui/processes.ftl b/install/cws-ui/processes.ftl
diff --git a/install/cws-ui/workers.ftl b/install/cws-ui/workers.ftl

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,15 @@ public Map<String, String> getInputVariablesForProcess(String processInstanceId)`
`636`	`636`	`}`
`637`	`637`	`inputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + " (" + varType + ", " + mimeType + ")", encodedString);`
`638`	`638`	`} else {`
`639`		`- inputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + " (" + varType + ")", fileName);`
	`639`	`+ InputStream fileInputStream = fileValue.getValue();`
	`640`	`+ String encodedString = "";`
	`641`	`+ try {`
	`642`	`+ byte[] sourceBytes = IOUtils.toByteArray(fileInputStream);`
	`643`	`+ encodedString += Base64.getEncoder().encodeToString(sourceBytes);`
	`644`	`+ } catch (IOException e) {`
	`645`	`+ log.error("Error converting file to Base64");`
	`646`	`+ }`
	`647`	`+ inputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + "(" + varType + ") {" + fileName + "}", encodedString);`
`640`	`648`	`}`
`641`	`649`	`} else {`
`642`	`650`	`InputStream fileInputStream = fileValue.getValue();`
`@@ -647,7 +655,7 @@ public Map<String, String> getInputVariablesForProcess(String processInstanceId)`
`647`	`655`	`} catch (IOException e) {`
`648`	`656`	`log.error("Error converting file to Base64");`
`649`	`657`	`}`
`650`		`- inputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + "(" + varType + ") {" + fileName + "}", encodedString);`
	`658`	`+ inputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + " (" + varType + ") {" + fileName + "}", encodedString);`
`651`	`659`	`}`
`652`	`660`	`}`
`653`	`661`	`}`
`@@ -699,7 +707,16 @@ public Map<String, String> getOutputVariablesForProcess(String processInstanceId`
`699`	`707`	`}`
`700`	`708`	`outputVarMap.put(varName + " (" + varType + ", " + mimeType + ")", encodedString);`
`701`	`709`	`} else {`
`702`		`- outputVarMap.put(varName + " (" + varType + ")", fileName);`
	`710`	`+ InputStream fileInputStream = fileValue.getValue();`
	`711`	`+ String encodedString = "";`
	`712`	`+ try {`
	`713`	`+ byte[] sourceBytes = IOUtils.toByteArray(fileInputStream);`
	`714`	`+ encodedString += Base64.getEncoder().encodeToString(sourceBytes);`
	`715`	`+ } catch (IOException e) {`
	`716`	`+ log.error("Error converting file to Base64");`
	`717`	`+ }`
	`718`	`+ outputVarMap.put("[" + historicVariableInstance.getCreateTime().toString() + "]" + varName + " (" + varType + ") {" + fileName + "}", encodedString);`
	`719`	`+`
`703`	`720`	`}`
`704`	`721`	`} else {`
`705`	`722`	`InputStream fileInputStream = fileValue.getValue();`
`@@ -710,7 +727,7 @@ public Map<String, String> getOutputVariablesForProcess(String processInstanceId`
`710`	`727`	`} catch (IOException e) {`
`711`	`728`	`log.error("Error converting file to Base64");`
`712`	`729`	`}`
`713`		`- outputVarMap.put(varName + "(" + varType + ") {" + fileName + "}", encodedString);`
	`730`	`+ outputVarMap.put(varName + " (" + varType + ") {" + fileName + "}", encodedString);`
`714`	`731`	`}`
`715`	`732`	`}`
`716`	`733`	`}`