Merge branch 'develop'

.gitattributes

@@ -1,10 +1,14 @@
 # Declare text files with unix file ending
+*.any text eol=lf
+*.cfg text eol=lf
 *.conf text eol=lf
 *.config text eol=lf
 *.css text eol=lf
 *.dtd text eol=lf
 *.esp text eol=lf
 *.ecma text eol=lf
+*.farm text eol=lf
+*.gdsl text eol=lf
 *.groovy text eol=lf
 *.hbrs text eol=lf
 *.hbs text eol=lf
@@ -15,6 +19,7 @@
 *.js text eol=lf
 *.json text eol=lf
 *.jsp text eol=lf
+*.md text eol=lf
 *.mustache text eol=lf
 *.tld text eol=lf
 *.launch text eol=lf
@@ -24,14 +29,19 @@
 *.project text eol=lf
 *.properties text eol=lf
 *.props text eol=lf
+*.py text eol=lf
+*.rules text eol=lf
 *.sass text eol=lf
 *.scss text eol=lf
 *.sh text eol=lf
 *.shtm text eol=lf
 *.shtml text eol=lf
 *.sql text eol=lf
 *.svg text eol=lf
+*.tf text eol=lf
+*.ts text eol=lf
 *.txt text eol=lf
+*.vhost text eol=lf
 *.vm text eol=lf
 *.xml text eol=lf
 *.xsd text eol=lf

.gitignore

@@ -33,3 +33,4 @@ npm-debug.log
 .vlt
 .vlt-sync*
 .brackets.json
+.aio

bundle/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-    <version>1.16.0</version>
+    <version>1.16.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor</artifactId>
-  <version>1.16.0</version>
+  <version>1.16.2</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-04-17T07:55:21Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-18T07:54:44Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>

bundle/src/main/java/io/wcm/caconfig/editor/impl/ConfigPersistServlet.java

@@ -194,7 +194,7 @@ private ConfigurationPersistData parseConfigData(JsonNode item, ConfigurationMet
         // skip nested configuration and empty properties
         continue;
       }
-      else if (propertyType == null) {
+      if (propertyType == null) {
         JsonNode value = properties.get(propertyName);
         if (value.isArray()) {
           ArrayNode arrayValue = (ArrayNode)value;

bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/editor/editor.module.js

@@ -47,6 +47,21 @@
     $rootScope.i18n = function (key) {
       return Granite.I18n.get("io.wcm.caconfig.editor." + key);
     };
+
+    $rootScope.$on('$routeChangeStart', function(event, next, current) {
+      if (isSameRoute(current, next)) {
+        // avoid reload when route is the same as before
+        event.preventDefault();
+      }
+    });
+  }
+
+  function isSameRoute(current, next) {
+    const currentController = current?.$$route?.controller;
+    const currentConfigName = current?.pathParams?.configName;
+    const nextController = next?.$$route?.controller;
+    const nextConfigName = current?.pathParams?.configName;
+    return currentController !== undefined && currentController === nextController && currentConfigName === nextConfigName;
   }
 
 }(angular, Granite));

bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/js/widgets/pathbrowser.directive.js

@@ -84,11 +84,13 @@
 
           // Add change event listener
           $(pathfieldWidget).on("change", function onChange() {
-            scope.property.value = pathfieldWidget.value;
-            if ($rootScope.configForm.$pristine) {
-              $rootScope.configForm.$setDirty();
+            if (scope.property.value != pathfieldWidget.value) {
+              scope.property.value = pathfieldWidget.value;
+              if ($rootScope.configForm.$pristine) {
+                $rootScope.configForm.$setDirty();
+              }
+              scope.$digest();
             }
-            scope.$digest();
           });
         });
       });

bundle/src/test/java/io/wcm/caconfig/editor/impl/DropdownOptionProviderServiceTest.java

@@ -31,6 +31,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Mock.Strictness;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.wcm.caconfig.editor.DropdownOptionItem;
@@ -46,16 +47,16 @@ class DropdownOptionProviderServiceTest {
 
   @Mock
   private Resource resource;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private DropdownOptionProvider provider1;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private DropdownOptionProvider provider2;
 
   private DropdownOptionProviderService underTest;
 
   @BeforeEach
   @SuppressWarnings("null")
-  void setUp() throws Exception {
+  void setUp() {
     when(provider1.getDropdownOptions(resource)).thenReturn(List.of(
         new DropdownOptionItem("v1", "desc1"),
         new DropdownOptionItem("v2", "desc2")));

bundle/src/test/java/io/wcm/caconfig/editor/impl/PathBrowserRootPathProviderServiceTest.java

@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Mock.Strictness;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.wcm.caconfig.editor.PathBrowserRootPathProvider;
@@ -42,15 +43,15 @@ class PathBrowserRootPathProviderServiceTest {
 
   @Mock
   private Resource resource;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private PathBrowserRootPathProvider provider1;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private PathBrowserRootPathProvider provider2;
 
   private PathBrowserRootPathProviderService underTest;
 
   @BeforeEach
-  void setUp() throws Exception {
+  void setUp() {
     when(provider1.getRootPath(resource)).thenReturn("/content/root1");
     context.registerService(PathBrowserRootPathProvider.class, provider1, PathBrowserRootPathProvider.PROPERTY_SELECTOR, "provider1");
     when(provider2.getRootPath(resource)).thenReturn("/content/root2");

bundle/src/test/java/io/wcm/caconfig/editor/impl/TagBrowserRootPathProviderServiceTest.java

@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Mock.Strictness;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.wcm.caconfig.editor.TagBrowserRootPathProvider;
@@ -42,15 +43,15 @@ class TagBrowserRootPathProviderServiceTest {
 
   @Mock
   private Resource resource;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private TagBrowserRootPathProvider provider1;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private TagBrowserRootPathProvider provider2;
 
   private TagBrowserRootPathProviderService underTest;
 
   @BeforeEach
-  void setUp() throws Exception {
+  void setUp() {
     when(provider1.getRootPath(resource)).thenReturn("/content/root1");
     context.registerService(TagBrowserRootPathProvider.class, provider1, TagBrowserRootPathProvider.PROPERTY_SELECTOR, "provider1");
     when(provider2.getRootPath(resource)).thenReturn("/content/root2");

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.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).
+      </action>
+    </release>
+
     <release version="1.16.0" date="2024-04-17">
       <action type="add" dev="sseifert" issue="31">
         Check permissions of configuration persistence path and render configuration as read-only if current user does not have write permissions.

package/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-    <version>1.16.0</version>
+    <version>1.16.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.package</artifactId>
-  <version>1.16.0</version>
+  <version>1.16.2</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-04-17T07:55:21Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-18T07:54:44Z</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.0</version>
+      <version>1.16.2</version>
     </dependency>
 
   </dependencies>

parent/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.parent_toplevel</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.2</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-  <version>1.16.0</version>
+  <version>1.16.2</version>
   <packaging>pom</packaging>
 
   <name>Context-Aware Configuration Editor Parent</name>
@@ -49,7 +49,7 @@
 
   <properties>
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2024-04-17T07:55:21Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-18T07:54:44Z</project.build.outputTimestamp>
   </properties>
 
   <build>

pom.xml

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

src/site/markdown/usage.md

@@ -33,7 +33,7 @@ on the needs of the application.
 
 Only the template has to be defined, the page component resource type can be referenced. Example:
 
-```json
+```json-jcr
 {
   "jcr:primaryType": "cq:Template",
   "jcr:title": "Configuration Editor",