MID-7600 returned parameters field to query playground

Evolveum · Jan 27, 2022 · 3caf5b9 · 3caf5b9
1 parent c0c7b2a
commit 3caf5b9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.html b/...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.html
@@ -38,15 +38,13 @@ <h3><div wicket:id="repositoryQueryLabel"/></h3>
                 <div class="col-md-6">
                     <h3><div wicket:id="queryLabel"/></h3>
                     <textarea wicket:id="queryEditor"></textarea>
-                    <div wicket:id="hibernateParametersContainer">
-                        <h4>
-                            <wicket:message key="PageRepositoryQuery.hibernateParameters"/>
-                        </h4>
-                        <p class="small" wicket:id="hibernateParametersNote"/>
-                        <textarea wicket:id="hibernateParameters"></textarea>
-                        <div class="form-group" style="margin-top: 15px">
-                            <a class="btn btn-primary" wicket:id="executeHibernate"/>
-                        </div>
+                    <h4>
+                        <wicket:message key="PageRepositoryQuery.hibernateParameters"/>
+                    </h4>
+                    <p class="small" wicket:id="hibernateParametersNote"/>
+                    <textarea wicket:id="parameters"></textarea>
+                    <div class="form-group" style="margin-top: 15px">
+                        <a class="btn btn-primary" wicket:id="executeHibernate"/>
                     </div>
                 </div>
             </div>

diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java b/...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java
@@ -21,7 +21,6 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -108,13 +107,12 @@ public class PageRepositoryQuery extends PageAdminConfiguration {
     private static final String ID_EDITOR_MIDPOINT = "editorMidPoint";
     private static final String ID_QUERY_EDITOR = "queryEditor";
     private static final String ID_QUERY_LABEL = "queryLabel";
-    private static final String ID_HIBERNATE_PARAMETERS = "hibernateParameters";
+    private static final String ID_PARAMETERS = "parameters";
     private static final String ID_RESULT_LABEL = "resultLabel";
     private static final String ID_RESULT_TEXT = "resultText";
     private static final String ID_QUERY_SAMPLE = "querySample";
     private static final String ID_OBJECT_TYPE = "objectType";
     private static final String ID_DISTINCT = "distinct";
-    private static final String ID_HIBERNATE_PARAMETERS_CONTAINER = "hibernateParametersContainer";
     private static final String ID_HIBERNATE_PARAMETERS_NOTE = "hibernateParametersNote";
     private static final String ID_INCOMPLETE_RESULTS_NOTE = "incompleteResultsNote";
     private static final String ID_VIEW_BUTTON_PANEL = "viewButtonPanel";
@@ -219,22 +217,17 @@ protected void onUpdate(AjaxRequestTarget target) {
         editorHibernate.setMode(null);
         mainForm.add(editorHibernate);
 
-        WebMarkupContainer hibernateParametersContainer = new WebMarkupContainer(ID_HIBERNATE_PARAMETERS_CONTAINER);
-        hibernateParametersContainer.setOutputMarkupId(true);
-        hibernateParametersContainer.setVisible(!isNativeRepo());
-        mainForm.add(hibernateParametersContainer);
-
-        AceEditor hibernateParameters = new AceEditor(ID_HIBERNATE_PARAMETERS, new PropertyModel<>(model, RepoQueryDto.F_HIBERNATE_PARAMETERS));
+        AceEditor hibernateParameters = new AceEditor(ID_PARAMETERS, new PropertyModel<>(model, RepoQueryDto.F_HIBERNATE_PARAMETERS));
         hibernateParameters.setReadonly(true);
         hibernateParameters.setHeight(100);
         hibernateParameters.setResizeToMaxHeight(false);
         hibernateParameters.setMode(null);
-        hibernateParametersContainer.add(hibernateParameters);
+        mainForm.add(hibernateParameters);
 
         Label hibernateParametersNote = new Label(ID_HIBERNATE_PARAMETERS_NOTE, createStringResource("PageRepositoryQuery.hibernateParametersNote",
                 WebComponentUtil.getMidpointCustomSystemName(PageRepositoryQuery.this, "midPoint")));
         hibernateParametersNote.setVisible(isAdmin && !isNativeRepo());
-        hibernateParametersContainer.add(hibernateParametersNote);
+        mainForm.add(hibernateParametersNote);
 
         Label queryVsFilterNote = new Label(ID_QUERY_VS_FILTER_NOTE, createStringResource("PageRepositoryQuery.queryVsFilterNote",
                 WebComponentUtil.getMidpointCustomSystemName(PageRepositoryQuery.this, "midPoint")));
@@ -368,7 +361,7 @@ protected void onSubmit(AjaxRequestTarget target) {
             }
         };
         executeHibernate.setVisible(isAdmin && !isNativeRepo());
-        hibernateParametersContainer.add(executeHibernate);
+        mainForm.add(executeHibernate);
 
         Label resultLabel = new Label(ID_RESULT_LABEL, new IModel<String>() {
             @Override