search config merging fix

Evolveum · Jan 18, 2022 · c0908fa · c0908fa
1 parent 4a79802
commit c0908fa
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 27 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
@@ -551,40 +551,46 @@ private static SearchBoxConfigurationType combineSearchBoxConfiguration(SearchBo
         config.setScopeConfiguration(combineScopeSearchItem(config.getScopeConfiguration(), customConfig.getScopeConfiguration()));
         if (customConfig.getObjectTypeConfiguration() != null) {
             ObjectTypeSearchItemConfigurationType objectTypeConfig = combineCustomUserInterfaceFeatureType(config.getObjectTypeConfiguration(), customConfig.getObjectTypeConfiguration());
-            if (customConfig.getObjectTypeConfiguration().getDefaultValue() != null) {
-                objectTypeConfig.setDefaultValue(customConfig.getObjectTypeConfiguration().getDefaultValue());
-            } else if (config.getObjectTypeConfiguration() != null) {
-                objectTypeConfig.setDefaultValue(config.getObjectTypeConfiguration().getDefaultValue());
-            }
-            if (CollectionUtils.isNotEmpty(customConfig.getObjectTypeConfiguration().getSupportedTypes())) {
-                objectTypeConfig.createSupportedTypesList().addAll(customConfig.getObjectTypeConfiguration().getSupportedTypes());
-            } else if (config.getObjectTypeConfiguration() != null) {
-                objectTypeConfig.createSupportedTypesList().addAll(config.getObjectTypeConfiguration().getSupportedTypes());
+            if (objectTypeConfig != customConfig.getObjectTypeConfiguration()) {
+                if (customConfig.getObjectTypeConfiguration().getDefaultValue() != null) {
+                    objectTypeConfig.setDefaultValue(customConfig.getObjectTypeConfiguration().getDefaultValue());
+                } else if (config.getObjectTypeConfiguration() != null) {
+                    objectTypeConfig.setDefaultValue(config.getObjectTypeConfiguration().getDefaultValue());
+                }
+                if (CollectionUtils.isNotEmpty(customConfig.getObjectTypeConfiguration().getSupportedTypes())) {
+                    objectTypeConfig.createSupportedTypesList().addAll(customConfig.getObjectTypeConfiguration().getSupportedTypes());
+                } else if (config.getObjectTypeConfiguration() != null) {
+                    objectTypeConfig.createSupportedTypesList().addAll(config.getObjectTypeConfiguration().getSupportedTypes());
+                }
             }
             config.setObjectTypeConfiguration(objectTypeConfig);
         }
         if (customConfig.getRelationConfiguration() != null) {
             RelationSearchItemConfigurationType relationConfig = combineCustomUserInterfaceFeatureType(config.getRelationConfiguration(),
                     customConfig.getRelationConfiguration());
-            if (customConfig.getRelationConfiguration().getDefaultValue() != null) {
-                relationConfig.setDefaultValue(customConfig.getRelationConfiguration().getDefaultValue());
-            } else if (config.getRelationConfiguration() != null) {
-                relationConfig.setDefaultValue(config.getRelationConfiguration().getDefaultValue());
-            }
-            if (CollectionUtils.isNotEmpty(customConfig.getRelationConfiguration().getSupportedRelations())) {
-                relationConfig.createSupportedRelationsList().addAll(customConfig.getRelationConfiguration().getSupportedRelations());
-            } else if (config.getRelationConfiguration() != null) {
-                relationConfig.createSupportedRelationsList().addAll(config.getRelationConfiguration().getSupportedRelations());
+            if (relationConfig != customConfig.getRelationConfiguration()) {
+                if (customConfig.getRelationConfiguration().getDefaultValue() != null) {
+                    relationConfig.setDefaultValue(customConfig.getRelationConfiguration().getDefaultValue());
+                } else if (config.getRelationConfiguration() != null) {
+                    relationConfig.setDefaultValue(config.getRelationConfiguration().getDefaultValue());
+                }
+                if (CollectionUtils.isNotEmpty(customConfig.getRelationConfiguration().getSupportedRelations())) {
+                    relationConfig.createSupportedRelationsList().addAll(customConfig.getRelationConfiguration().getSupportedRelations());
+                } else if (config.getRelationConfiguration() != null) {
+                    relationConfig.createSupportedRelationsList().addAll(config.getRelationConfiguration().getSupportedRelations());
+                }
             }
             config.setRelationConfiguration(relationConfig);
         }
         if (customConfig.getIndirectConfiguration() != null) {
             IndirectSearchItemConfigurationType indirectConfig = combineCustomUserInterfaceFeatureType(config.getIndirectConfiguration(),
                     customConfig.getIndirectConfiguration());
-            if (customConfig.getIndirectConfiguration().isIndirect() != null) {
-                indirectConfig.setIndirect(customConfig.getIndirectConfiguration().isIndirect());
-            } else if (config.getIndirectConfiguration() != null) {
-                indirectConfig.setIndirect(config.getIndirectConfiguration().isIndirect());
+            if (indirectConfig != config.getIndirectConfiguration()) {
+                if (customConfig.getIndirectConfiguration().isIndirect() != null) {
+                    indirectConfig.setIndirect(customConfig.getIndirectConfiguration().isIndirect());
+                } else if (config.getIndirectConfiguration() != null) {
+                    indirectConfig.setIndirect(config.getIndirectConfiguration().isIndirect());
+                }
             }
             config.setIndirectConfiguration(indirectConfig);
         }
@@ -615,10 +621,12 @@ private static SearchBoxConfigurationType combineSearchBoxConfiguration(SearchBo
 
     public static ScopeSearchItemConfigurationType combineScopeSearchItem(ScopeSearchItemConfigurationType scope1, ScopeSearchItemConfigurationType scope2) {
         ScopeSearchItemConfigurationType scopeConfig = combineCustomUserInterfaceFeatureType(scope1, scope2);
-        if (scope2 != null && scope2.getDefaultValue() != null) {
-            scopeConfig.setDefaultValue(scope2.getDefaultValue());
-        } else if (scope1 != null) {
-            scopeConfig.setDefaultValue(scope1.getDefaultValue());
+        if (scopeConfig != scope2) {
+            if (scope2 != null && scope2.getDefaultValue() != null) {
+                scopeConfig.setDefaultValue(scope2.getDefaultValue());
+            } else if (scope1 != null) {
+                scopeConfig.setDefaultValue(scope1.getDefaultValue());
+            }
         }
         return scopeConfig;
     }

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
@@ -192,7 +192,7 @@ private SearchBoxConfigurationType createSearchConfig(QName defaultValue) {
     private List<QName> getAllowedTypes() {
         List<QName> choices = new ArrayList<>();
         WebComponentUtil.createObjectTypesList().stream()
-                .forEach(type -> choices.add(WebComponentUtil.classToQName(PrismContext.get(), type.getClassDefinition())));
+                .forEach(type -> choices.add(type.getTypeQName()));
         return choices;
     }