Merge branch 'develop'

wcm-io · Aug 26, 2024 · 3a7e124 · 3a7e124
2 parents 090fcbf + 3079b4c
commit 3a7e124
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 14 deletions.
diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-    <version>1.16.2</version>
+    <version>1.16.4</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor</artifactId>
-  <version>1.16.2</version>
+  <version>1.16.4</version>
   <packaging>jar</packaging>
 
   <name>Context-Aware Configuration Editor</name>
@@ -42,7 +42,7 @@
     <site.url.module.prefix>caconfig/editor/bundle</site.url.module.prefix>
 
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2024-07-18T07:54:44Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-26T09:52:43Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>
@@ -119,7 +119,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.testing.aem-mock.junit5</artifactId>
-      <version>5.5.0</version>
+      <version>5.6.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...bapp/app-root/clientlibs/io.wcm.caconfig.editor/js/widgets/property-dropdown.directive.js b/...bapp/app-root/clientlibs/io.wcm.caconfig.editor/js/widgets/property-dropdown.directive.js
@@ -186,9 +186,16 @@
    */
   function setValue(selectWidget, value) {
     var newValues = angular.isArray(value) ? value.map(String) : [String(value)];
-
+    // de-select all existing items
     selectWidget.items.getAll().forEach(function(item) {
-      item.selected = newValues.indexOf(item.value) > -1;
+      item.selected = false;
+    });
+    // reselect items exactly in the order stored in the data
+    newValues.forEach(value => {
+      var matchingItem = selectWidget.items.getAll().find(item => item.value == value);
+      if (matchingItem) {
+        matchingItem.selected = true;
+      }
     });
   }
 

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.16.4" date="2024-08-26">
+      <action type="fix" dev="sseifert" issue="40">
+        Dropdown widget with multiple values: Preserve order of selected items when displaying configuration.
+      </action>
+    </release>
+
     <release version="1.16.2" date="2024-07-18">
       <action type="fix" dev="sseifert" issue="37">
         Prevent view reload when actual view parameters do not change (avoid issue e.g. with selecting item in pathbrowser first time when Unified Shell is active in AEMaaCS).

diff --git a/package/pom.xml b/package/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-    <version>1.16.2</version>
+    <version>1.16.4</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.package</artifactId>
-  <version>1.16.2</version>
+  <version>1.16.4</version>
   <packaging>content-package</packaging>
   <name>Context-Aware Configuration Editor Package</name>
   <url>${site.url}/caconfig/editor/</url>
@@ -41,7 +41,7 @@
     <contentPackage.group>wcm-io</contentPackage.group>
 
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2024-07-18T07:54:44Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-26T09:52:43Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>
@@ -50,7 +50,7 @@
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.caconfig.editor</artifactId>
       <scope>compile</scope>
-      <version>1.16.2</version>
+      <version>1.16.4</version>
     </dependency>
 
   </dependencies>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-  <version>1.16.2</version>
+  <version>1.16.4</version>
   <packaging>pom</packaging>
 
   <name>Context-Aware Configuration Editor Parent</name>
@@ -49,7 +49,7 @@
 
   <properties>
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2024-07-18T07:54:44Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-26T09:52:43Z</project.build.outputTimestamp>
   </properties>
 
   <build>

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-    <version>1.16.2</version>
+    <version>1.16.4</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.root</artifactId>
-  <version>1.16.2</version>
+  <version>1.16.4</version>
   <packaging>pom</packaging>
 
   <name>Context-Aware Configuration Editor Root</name>