fix: kubernetes test rest api

InseeFr · Feb 1, 2024 · e3661eb · e3661eb
1 parent fa9a562
commit e3661eb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/...main/java/fr/insee/arc/web/gui/maintenanceoperation/model/MaintenanceOperationsModel.java b/...main/java/fr/insee/arc/web/gui/maintenanceoperation/model/MaintenanceOperationsModel.java
@@ -7,15 +7,12 @@
 
 @Component
 public class MaintenanceOperationsModel implements ArcModel {
-
 
 	private String url;
 	private String httpType;
 	private String json;
 	private String httpOutput;
 
-
-
     private VObject viewOperations;
     private VObject viewKubernetes;
 

diff --git a/arc-web/src/main/java/fr/insee/arc/web/gui/maintenanceoperation/model/ViewKubernetes.java b/arc-web/src/main/java/fr/insee/arc/web/gui/maintenanceoperation/model/ViewKubernetes.java
@@ -17,7 +17,6 @@ public class ViewKubernetes extends VObject {
 		columnMap.put("key", new ColumnRendering(true, "label.key", "15%", "text", null, true));
 		columnMap.put("val", new ColumnRendering(true, "label.val", "15%", "text", null, true));
 		columnMap.put("description", new ColumnRendering(true, "label.description", "70%", "text", null, false));
-
 	}
 
 	public ViewKubernetes() {

diff --git a/...va/fr/insee/arc/web/gui/maintenanceoperation/service/InteractorMaintenanceOperations.java b/...va/fr/insee/arc/web/gui/maintenanceoperation/service/InteractorMaintenanceOperations.java
@@ -26,6 +26,12 @@ public class InteractorMaintenanceOperations extends ArcWebGenericService<Mainte
 
 	@Override
 	protected void putAllVObjects(MaintenanceOperationsModel arcModel) {
+
+		views.setUrl(arcModel.getUrl());
+		views.setHttpType(arcModel.getHttpType());
+		views.setJson(arcModel.getJson());
+		views.setHttpOutput(arcModel.getHttpOutput());
+
 		views.setViewOperations(this.vObjectService.preInitialize(arcModel.getViewOperations()));
 		views.setViewKubernetes(this.vObjectService.preInitialize(arcModel.getViewKubernetes()));
 

diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/maintenanceOperations.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/maintenanceOperations.jsp
@@ -60,25 +60,26 @@ Kubernetes
 <div id="viewKubernetes">
 
 <p>Url</p>
-<input type="text" m="" name="url" value="${url}" />
+<textarea cols="60" rows="1" class="border" type="text" m="" name="url">${url}</textarea>
 <p>Http Type</p>
-<input type="text" m="" name="httpType" value="${httpType}" />
+<textarea cols="10" rows="1" class="border" type="text" m="" name="httpType">${httpType}</textarea>
 <p>Content</p>
-<input type="text" m="" name="json" value="${json}" />
+<textarea cols="60" rows="20" class="border" type="text" m="" name="json">${json}</textarea>
 </br>
-<input type="submit" class="btn btn-primary btn-sm"
-id="viewKubernetes.createPods"
+
+<input type="submit" class="btn btn-primary btn-sm" id="viewKubernetes.createPods" 
 value="<spring:message code="gui.button.createPods"/>"
-scope="viewKubernetes;" doAction="createPods"
-onclick="return confirm('<spring:message code="gui.button.createPods.confirm" javaScriptEscape="true"/>');" />
+scope="viewKubernetes;" doAction="createPods" />
+
 <input type="submit" class="btn btn-primary btn-sm"
 id="viewKubernetes.deletePods"
 value="<spring:message code="gui.button.deletePods"/>"
 scope="viewKubernetes;" doAction="deletePods"
-onclick="return confirm('<spring:message code="gui.button.deletePods.confirm" javaScriptEscape="true"/>');" />
+/>
+
 </br>
 <p>output</p>
-<input type="text" m="" name="httpOutput" value="${httpOutput}" />
+<textarea cols="60" rows="20" class="border" type="text" m="" name="httpOutput">${httpOutput}</textarea>
 
 </div>
 </div>

diff --git a/arc-web/src/main/webapp/css/style.css b/arc-web/src/main/webapp/css/style.css
@@ -739,6 +739,10 @@ input.onglet_haut_actif {
 	-moz-border-radius-topleft: 3px 3px;
 }
 
+.border {
+	border: 1px solid #aaaaaa;
+}
+
 div.onglet_haut {
 	background-color: #f4ffff;
 	border: 1px solid #aaaaaa;