feat: debug screen for executor pod

InseeFr · Feb 9, 2024 · c4230cd · c4230cd
1 parent b5315b9
commit c4230cd
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 37 deletions.
diff --git a/arc-utils/src/main/java/fr/insee/arc/utils/dao/UtilitaireDao.java b/arc-utils/src/main/java/fr/insee/arc/utils/dao/UtilitaireDao.java
@@ -335,7 +335,8 @@ public Boolean testResultRequest(Connection connexion, GenericPreparedStatementB
 		GenericPreparedStatementBuilder requeteLimit = new GenericPreparedStatementBuilder();
 		requeteLimit.append("SELECT * from (").append(requete).append(") dummy LIMIT 1");
 		try {
-			return hasResults(connexion, requeteLimit);
+			executeImmediate(connexion, requeteLimit);
+			return true;
 		} catch (Exception e) {
 			return false;
 		}

diff --git a/arc-web/src/main/java/fr/insee/arc/web/gui/query/dao/QueryDao.java b/arc-web/src/main/java/fr/insee/arc/web/gui/query/dao/QueryDao.java
@@ -15,7 +15,7 @@
 
 @Component
 public class QueryDao extends VObjectHelperDao {
-	
+
 	/**
 	 * dao call to build query vobject
 	 * 
@@ -24,42 +24,46 @@ public class QueryDao extends VObjectHelperDao {
 	public void initializeQuery(VObject viewQuery, Integer myDbConnection, String myQuery) {
 		Map<String, String> defaultInputFields = new HashMap<>();
 
-		if (myQuery!=null){
-			String m=myQuery.trim();
-			if (m.endsWith(";"))
-			{
-				m=m.substring(0, m.length()-1);
-			}
+		if (myQuery == null || myQuery.isEmpty()) {
+			this.vObjectService.destroy(viewQuery);
+			return;
+		}
 
-			ArcPreparedStatementBuilder query = new ArcPreparedStatementBuilder(m);
-
-			if (Boolean.TRUE.equals(UtilitaireDao.get(myDbConnection).testResultRequest(null, query)))
-			{
-				this.vObjectService.setConnectionIndex(myDbConnection);
-				this.vObjectService.initialize(viewQuery, query, "arc.ihm_query", defaultInputFields);
-			}
-			else
-			{
-				try {
-					UtilitaireDao.get(myDbConnection).executeImmediate(null, myQuery);
-					this.vObjectService.destroy(viewQuery);
-					viewQuery.setMessage("query.complete");
-				} catch (Exception e) {
-					this.vObjectService.destroy(viewQuery);
-					viewQuery.setMessage(e.getMessage());
-				}
+		String m = myQuery.trim();
+		if (m.endsWith(";")) {
+			m = m.substring(0, m.length() - 1);
+		}
+
+		ArcPreparedStatementBuilder query = new ArcPreparedStatementBuilder(m);
+
+		this.vObjectService.setConnectionIndex(myDbConnection);
 
+		if (Boolean.TRUE.equals(UtilitaireDao.get(myDbConnection).testResultRequest(null, query))) {
+			this.vObjectService.initialize(viewQuery, query, "arc.ihm_query", defaultInputFields);
+		} else {
+
+			query = new ArcPreparedStatementBuilder();
+
+			try {
+				UtilitaireDao.get(myDbConnection).executeImmediate(null, myQuery);
+				query.build(SQL.SELECT, query.quoteText("query succeed"), SQL.AS, "query_result");
+			} catch (Exception e) {
+				query.build(SQL.SELECT, query.quoteText(e.getMessage()), SQL.AS, "query_result");
 			}
+
+			this.vObjectService.initialize(viewQuery, query, "arc.ihm_query", defaultInputFields);
+
 		}
+
 	}
-	
+
 	/**
 	 * dao call to build tables vobject
 	 * 
 	 * @param viewWsContext
 	 */
 	public void initializeTable(VObject viewTable, Integer myDbConnection, String mySchema) {
-        ViewEnum dataModelTable = ViewEnum.PG_TABLES;
+		ViewEnum dataModelTable = ViewEnum.PG_TABLES;
 		String nameOfViewTable = dataObjectService.getView(dataModelTable);
 		// view query
 		ArcPreparedStatementBuilder query = new ArcPreparedStatementBuilder();
@@ -71,7 +75,7 @@ public void initializeTable(VObject viewTable, Integer myDbConnection, String my
 		vObjectService.setConnectionIndex(myDbConnection);
 		vObjectService.initialize(viewTable, query, "arc.ihm_table", defaultInputFields);
 	}
-	
+
 	public static String queryTableSelected(String mySchema, String tableName) {
 		return "select * from " + mySchema + "." + tableName + " limit 10 ";
 	}

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/gererQuery.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/gererQuery.jsp
@@ -16,26 +16,25 @@
 
 <div class="container-fluid">
 
-<div class="row">
+<div id="viewHeaders" class="row">
 <div class="col-md-1">
 <p>Connection index</p>
- <textarea class="border" rows="1" type="text" m="" name="myDbConnection">${myDbConnection}</textarea>
+ <textarea class="border" cols="4" rows="1" type="text" m="" name="myDbConnection">${myDbConnection}</textarea>
 </div>
 <div class="col-md-3">
 <p>Schema</p>
- <textarea class="border" rows="1" type="text" m="" name="mySchema">${mySchema}</textarea>
+ <textarea class="border" cols="10" rows="1" type="text" m="" name="mySchema">${mySchema}</textarea>
 </div>
 <div class="col-md-8" id="viewQuerySql">
 <p>Query</p>
 <textarea class="border" m="" cols="150" name="myQuery" aria-label="Query">${myQuery}</textarea>
 <br>
-<input id="viewQuery.selectFromTextBox" type="submit" doAction="selectQueryFromTextBox" scope="viewQuery;" value="Execute query"></input>
+<input id="viewQuery.selectFromTextBox" type="submit" doAction="selectQueryFromTextBox" scope="viewQuery;viewHeaders;" value="Execute query"></input>
 </div>
 </div>
- <div class="row align-items-start">
-
- <div class="col-md-4 border-right">
- <c:set var="view" value="${viewTable}"  scope="request"/>
+<div class="row align-items-start">
+<div class="col-md-4 border-right">
+<c:set var="view" value="${viewTable}"  scope="request"/>
 <c:import url="tiles/templateVObject.jsp">
 <c:param name="taille" value ="col-md4" />
 <c:param name="ligneAdd" value="false" />
@@ -45,6 +44,8 @@
 <c:param name="checkbox" value="true" />
 <c:param name="checkboxVisible" value="true" />
 <c:param name="allowResize" value="true" />
+<c:param name="extraScopeSelect" value="viewQuery;viewHeaders;" />
+<c:param name="extraScopeSee" value="viewQuery;viewHeaders;" />
 </c:import>
 </div>
 <div class="col-md-8">

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/tiles/templateVObject.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/tiles/templateVObject.jsp
@@ -381,7 +381,7 @@
 						class="btn btn-secondary btn-sm "
 						type="submit"
 						doAction="select${viewType}"
-						scope="${view.sessionName};"
+						scope="${view.sessionName};${param.extraScopeSelect}"
 						value="<spring:message code="gui.button.refresh"/>"
 						${btnSelect.equals('true') ? '' : "style='display:none'"}
 					><span class="fa fa-refresh">&nbsp;</span><spring:message code="gui.button.refresh"/></button>