change input field for dsl query search mode

Evolveum · Feb 8, 2021 · d4b6450 · d4b6450
1 parent 193e1ca
commit d4b6450
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
@@ -40,12 +40,14 @@
             </div>
         </div>
 
-        <div class="form-group has-feedback" wicket:id="advancedGroup" style="float:right; padding-right: 5px;">
-            <label class="control-label" style="vertical-align: top; float:left; padding-right: 5px;">
-                <i class="fa fa-lg" wicket:id="advancedCheck"/>
-            </label>
+        <div class="form-group has-feedback col-lg-11 col-sm-10 col-xs-9" wicket:id="advancedGroup" style="float:right; padding-right: 5px;">
             <textarea class="form-control input-sm" rows="2" wicket:id="advancedArea"
                     style="width: 220px; height: 60px; overflow: hidden; float:right;"></textarea>
+            <input wicket:id="queryDslField" type="text" class="form-control input-sm"
+                    style="width: 91.6666667%; min-width: 300px; float:right;">
+            <label class="control-label col-lg-1" style="vertical-align: top; float:right; padding-right: 5px;">
+                <i class="fa fa-lg" wicket:id="advancedCheck"/>
+            </label>
             <span class="help-block" wicket:id="advancedError" style="float:right"/>
         </div>
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
@@ -101,6 +101,7 @@ public class SearchPanel<C extends Containerable> extends BasePanel<Search<C>> {
     private static final String ID_ADVANCED_GROUP = "advancedGroup";
     private static final String ID_MORE_GROUP = "moreGroup";
     private static final String ID_ADVANCED_AREA = "advancedArea";
+    private static final String ID_QUERY_DSL_FIELD = "queryDslField";
     private static final String ID_ADVANCED_CHECK = "advancedCheck";
     private static final String ID_ADVANCED_ERROR = "advancedError";
     private static final String ID_MENU_ITEM = "menuItem";
@@ -551,28 +552,29 @@ protected void onUpdate(AjaxRequestTarget target) {
         advancedCheck.add(AttributeAppender.append("class", createAdvancedGroupLabelStyle()));
         advancedGroup.add(advancedCheck);
 
+        TextArea<?> advancedArea = new TextArea<>(ID_ADVANCED_AREA, new PropertyModel<>(getModel(), Search.F_ADVANCED_QUERY));
+        advancedArea.add(new AjaxFormComponentUpdatingBehavior("keyup") {
 
-        IModel<String> advancedValueModel = new IModel<String>() {
             @Override
-            public String getObject() {
-                if (SearchBoxModeType.QUERY_DSL.equals(getModelObject().getSearchType())) {
-                    return getModelObject().getDslQuery();
-                }
-                return getModelObject().getAdvancedQuery();
+            protected void onUpdate(AjaxRequestTarget target) {
+                updateAdvancedArea(advancedArea, target);
             }
 
             @Override
-            public void setObject(String object) {
-                if (SearchBoxModeType.QUERY_DSL.equals(getModelObject().getSearchType())) {
-                    getModelObject().setDslQuery(object);
-                } else {
-                    getModelObject().setAdvancedQuery(object);
-                }
+            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+                super.updateAjaxAttributes(attributes);
+
+                attributes.setThrottlingSettings(
+                        new ThrottlingSettings(ID_ADVANCED_AREA, Duration.milliseconds(500), true));
             }
-        };
+        });
+        advancedArea.add(AttributeAppender.append("placeholder", getPageBase().createStringResource("SearchPanel.insertFilterXml")));
+        advancedArea.add(createVisibleBehaviour(SearchBoxModeType.ADVANCED));
+        advancedGroup.add(advancedArea);
 
-        TextArea<?> advancedArea = new TextArea<>(ID_ADVANCED_AREA, advancedValueModel);
-        advancedArea.add(new AjaxFormComponentUpdatingBehavior("keyup") {
+        TextField<String> queryDslField = new TextField<>(ID_QUERY_DSL_FIELD,
+                new PropertyModel<>(getModel(), Search.F_DSL_QUERY));
+        queryDslField.add(new AjaxFormComponentUpdatingBehavior("keyup") {
 
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
@@ -584,20 +586,12 @@ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
                 super.updateAjaxAttributes(attributes);
 
                 attributes.setThrottlingSettings(
-                        new ThrottlingSettings(ID_ADVANCED_AREA, Duration.milliseconds(500), true));
+                        new ThrottlingSettings(ID_QUERY_DSL_FIELD, Duration.milliseconds(500), true));
             }
         });
-        IModel<String> advanceAreaPlaceholderModel = new IModel<String>() {
-            @Override
-            public String getObject() {
-                if (SearchBoxModeType.QUERY_DSL.equals(getModelObject().getSearchType())) {
-                    return getPageBase().createStringResource("SearchPanel.insertQueryDsl").getString();
-                }
-                return getPageBase().createStringResource("SearchPanel.insertFilterXml").getString();
-            }
-        };
-        advancedArea.add(AttributeAppender.append("placeholder", advanceAreaPlaceholderModel));
-        advancedGroup.add(advancedArea);
+        queryDslField.add(AttributeAppender.append("placeholder", getPageBase().createStringResource("SearchPanel.insertQueryDsl")));
+        queryDslField.add(createVisibleBehaviour(SearchBoxModeType.QUERY_DSL));
+        advancedGroup.add(queryDslField);
 
         Label advancedError = new Label(ID_ADVANCED_ERROR,
                 new PropertyModel<String>(getModel(), Search.F_ADVANCED_ERROR));