Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Apr 4, 2023 · 50eb7e5 · 50eb7e5
2 parents 6c1d202 + de8d7ce
commit 50eb7e5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/Search.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/Search.java
@@ -224,6 +224,7 @@ public ObjectQuery createObjectQuery(VariablesMap variables, PageBase pageBase,
             LOGGER.trace("Cannot create query, not supported search box mode: {}", getSearchMode());
             return PrismContext.get().queryFactory().createQuery();
         }
+        queryWrapper.setAdvancedError(null);
 
         ObjectQuery query = null;
         try {

diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/AxiomSearchPanel.html b/...src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/AxiomSearchPanel.html
@@ -10,7 +10,7 @@
 <body>
 <wicket:panel>
     <div class="d-flex justify-content-end mp-w-8 mp-w-xxl-6">
-    <div class="d-flex flex-column flex-grow-1 align-items-end has-feedback">
+    <div class="d-flex flex-column flex-grow-1 align-items-end has-feedback form-group">
         <input wicket:id="axiomQueryField" type="text" class="form-control form-control-sm mp-w-12"/>
         <span class="text-wrap" wicket:id="advancedError"/>
     </div>

diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/AxiomSearchPanel.java b/...src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/AxiomSearchPanel.java
@@ -52,6 +52,8 @@ private void initLayout() {
 //            }
 //        });
 
+        queryDslField.add(AttributeAppender.append("class",
+                () -> StringUtils.isEmpty(getModelObject().getAdvancedError()) ? "is-valid" : "is-invalid"));
         queryDslField.add(AttributeAppender.append("placeholder", getPageBase().createStringResource("SearchPanel.insertAxiomQuery")));
         add(queryDslField);
 

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/XmlSearchPanel.html b/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/XmlSearchPanel.html
@@ -11,7 +11,7 @@
 <wicket:panel>
     <div class="d-flex justify-content-end mp-w-8 mp-w-xxl-6">
     <a class="btn btn-sm btn-link" wicket:id="debug" />
-    <div class="d-flex flex-column flex-grow-1 align-items-end has-feedback">
+    <div class="d-flex flex-column flex-grow-1 align-items-end has-feedback form-group">
         <textarea class="form-control form-control-sm mp-w-12" rows="2" wicket:id="advancedArea"></textarea>
         <span class="text-wrap" wicket:id="advancedError"/>
     </div>

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/XmlSearchPanel.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/XmlSearchPanel.java
@@ -59,6 +59,8 @@ public void onClick(AjaxRequestTarget target) {
         TextArea<?> advancedArea = new TextArea<>(ID_ADVANCED_AREA, new PropertyModel<>(getModel(), AdvancedQueryWrapper.F_ADVANCED_QUERY));
         advancedArea.add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
         advancedArea.add(AttributeAppender.append("placeholder", getPageBase().createStringResource("SearchPanel.insertFilterXml")));
+        advancedArea.add(AttributeAppender.append("class",
+                () -> StringUtils.isEmpty(getModelObject().getAdvancedError()) ? "is-valid" : "is-invalid"));
 //        advancedArea.add(createVisibleBehaviour(SearchBoxModeType.ADVANCED));
 //        advancedArea.add(AttributeAppender.append("class", createValidityStyle()));
         add(advancedArea);

diff --git a/tools/jenkins/midpoint-main-generic-pg-pipeline b/tools/jenkins/midpoint-main-generic-pg-pipeline
@@ -42,8 +42,8 @@ podTemplate(
                         command: 'cat',
                         resourceRequestCpu: params.BUILDER_CPU ?: '4',
                         resourceLimitCpu: params.BUILDER_CPU ?: '4',
-                        resourceRequestMemory: '8Gi',
-                        resourceLimitMemory: '8Gi') // see also -Xmx flag lower
+                        resourceRequestMemory: '10Gi',
+                        resourceLimitMemory: '10Gi') // see also -Xmx flag lower
         ]
 ) {
     node(POD_LABEL) {
@@ -89,7 +89,7 @@ podTemplate(
             }
             stage("tests-extra") {
                 container('maven') {
-                    // -Xmx6g should fit into 8GB of RAM, 4g is on the edge for some tests
+                    // -Xmx8g should fit into 10GB of RAM, 4g is not enough for some tests
                     sh """#!/bin/bash -ex
                         if [ "${verbose}" -ge 1 ]
                         then
@@ -103,7 +103,7 @@ podTemplate(
                             -Dmidpoint.repository.driverClassName=org.postgresql.Driver \
                             -Dmidpoint.repository.hibernateHbm2ddl=validate \
                             -Dmidpoint.repository.hibernateDialect=com.evolveum.midpoint.repo.sql.util.MidPointPostgreSQLDialect \
-                            -Dfailsafe.args="-Xms2g -Xmx6g -Duser.language=en --add-exports java.management/sun.management=ALL-UNNAMED"
+                            -Dfailsafe.args="-Xms2g -Xmx8g -Duser.language=en --add-exports java.management/sun.management=ALL-UNNAMED"
 
                         if [ "${verbose}" -ge 1 ]
                         then