Fix MID-9033 sort connector configuration panels

Evolveum · Sep 14, 2023 · 0fe6f5b · 0fe6f5b
1 parent 6ce0ae3
commit 0fe6f5b
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerValueWrapperImpl.java b/...ain/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerValueWrapperImpl.java
@@ -198,7 +198,7 @@ public boolean isSorted() {
     @Override
     public void setSorted(boolean sorted) {
         this.sorted = sorted;
-        sortContainers();
+        sortContainers(nonContainers);
     }
 
     @Override
@@ -249,6 +249,7 @@ public List<PrismContainerDefinition<C>> getChildContainers() throws SchemaExcep
     @Override
     public List<PrismContainerWrapper<? extends Containerable>> getContainers() {
         if (!containers.isEmpty()) {
+            sortContainers(containers);
             return containers;
         }
         for (ItemWrapper<?, ?> container : items) {
@@ -265,6 +266,7 @@ public List<PrismContainerWrapper<? extends Containerable>> getContainers() {
                 }
             }
         }
+        sortContainers(containers);
         return containers;
     }
 
@@ -301,13 +303,13 @@ public List<PrismContainerWrapper<? extends Containerable>> getContainers(Contai
     @Override
     public List<ItemWrapper<?, ?>> getNonContainers() {
         if (!nonContainers.isEmpty()) {
-            sortContainers();
+            sortContainers(nonContainers);
             return nonContainers;
         }
 
         collectContainers();
         collectVirtualContainers();
-        sortContainers();
+        sortContainers(nonContainers);
 
         return nonContainers;
     }
@@ -371,10 +373,10 @@ private void collectVirtualContainers() {
         }
     }
 
-    private void sortContainers() {
+    private void sortContainers(List<? extends ItemWrapper<?, ?>> items) {
         ItemWrapperComparator<?> comparator = new ItemWrapperComparator<>(WebComponentUtil.getCollator(), sorted);
-        if (CollectionUtils.isNotEmpty(nonContainers)) {
-            nonContainers.sort((Comparator) comparator);
+        if (CollectionUtils.isNotEmpty(items)) {
+            items.sort((Comparator) comparator);
         }
     }