Merge branch 'develop'

bundle/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-    <version>1.16.4</version>
+    <version>1.16.6</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor</artifactId>
-  <version>1.16.4</version>
+  <version>1.16.6</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-08-26T09:52:43Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-30T07:12:41Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>

bundle/src/main/resources/angularjs-partials/multifield.html

@@ -34,8 +34,14 @@
              ng-model="effectiveValue.value" />
       <span class="coral-Checkbox-checkmark"></span>
     </label>
+    <textarea is="coral-textarea"
+              bo-if="type==='textarea'"
+              disabled
+              readonly
+              ng-attr-rows="{{textareaRows}}"
+              ng-model="effectiveValue.value"></textarea>
     <input is="coral-textfield" type="type"
-           bo-if="type!=='checkbox'"
+           bo-if="type!=='checkbox' && type!=='textarea'"
            disabled
            readonly
            ng-model="effectiveValue.value" />
@@ -57,8 +63,14 @@
              ng-model="value.value" />
       <span class="coral-Checkbox-checkmark"></span>
     </label>
+    <textarea is="coral-textarea"
+              bo-if="type==='textarea'"
+              disabled
+              readonly
+              ng-attr-rows="{{textareaRows}}"
+              ng-model="value.value"></textarea>
     <input is="coral-textfield" type="type"
-           bo-if="type!=='checkbox'"
+           bo-if="type!=='checkbox' && type!=='textarea'"
            disabled
            readonly
            ng-model="value.value" />
@@ -81,8 +93,16 @@
       <span class="coral-Checkbox-checkmark"></span>
     </label>
     <div class="caconfig-textfield-wrapper">
+      <textarea is="coral-textarea"
+                bo-if="type==='textarea'"
+                ng-model="value.value"
+                ng-trim="false"
+                ng-required="{{property.metadata.properties.required && !property.overridden && !property.inherited && !property.readOnly}}"
+                caconfig-validation="{{validation}}"
+                ng-attr-rows="{{textareaRows}}"
+                name="inputField"></textarea>
       <input is="coral-textfield" type="type"
-             bo-if="type!=='checkbox'"
+             bo-if="type!=='checkbox' && type!=='textarea'"
              ng-model="value.value"
              ng-trim="false"
              ng-pattern="pattern"

bundle/src/main/resources/angularjs-partials/propertyInputTextarea.html

@@ -11,8 +11,10 @@
   </div>
   <textarea is="coral-textarea" class="caconfig-if-property-not-overridden-and-not-inherited-and-not-readonly caconfig-if-config-inherited"
             ng-model="property.value"
+            ng-attr-rows="{{textareaRows}}"
             disabled readonly></textarea>
   <textarea is="coral-textarea" class="caconfig-if-property-overridden-or-inherited-or-readonly"
             ng-model="property.effectiveValue"
+            ng-attr-rows="{{textareaRows}}"
             disabled readonly></textarea>
 </div>

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

@@ -60,7 +60,7 @@
     const currentController = current?.$$route?.controller;
     const currentConfigName = current?.pathParams?.configName;
     const nextController = next?.$$route?.controller;
-    const nextConfigName = current?.pathParams?.configName;
+    const nextConfigName = next?.pathParams?.configName;
     return currentController !== undefined && currentController === nextController && currentConfigName === nextConfigName;
   }
 

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

@@ -55,6 +55,12 @@
       scope.validation = props.validation;
       scope.validationMessage = props.validationMessage ? Granite.I18n.get(props.validationMessage) : undefined;
 
+      // special handling for textarea
+      if (props.widgetType === "textarea") {
+        scope.type = "textarea";
+        scope.textareaRows = props.textareaRows;
+      }
+
       setValueArray(scope.property.effectiveValue, scope.effectiveValues);
       setValueArray(scope.property.value, scope.values);
 

changes.xml

@@ -23,6 +23,18 @@
     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.6" date="2024-09-30">
+      <action type="update" dev="sseifert" issue="43">
+        Support textarea widget for multifield (array) properties.
+      </action>
+      <action type="fix" dev="sseifert" issue="44">
+        Textarea widget: Apply custom number of rows also in readonly/disabled state.
+      </action>
+      <action type="fix" dev="sseifert" issue="45">
+        Fix non-working edit button for nested configurations (Regression from version 1.16.2).
+      </action>
+    </release>
+
     <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.

package/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-    <version>1.16.4</version>
+    <version>1.16.6</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.package</artifactId>
-  <version>1.16.4</version>
+  <version>1.16.6</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-08-26T09:52:43Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-30T07:12:41Z</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.4</version>
+      <version>1.16.6</version>
     </dependency>
 
   </dependencies>

parent/pom.xml

@@ -31,7 +31,7 @@
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-  <version>1.16.4</version>
+  <version>1.16.6</version>
   <packaging>pom</packaging>
 
   <name>Context-Aware Configuration Editor Parent</name>
@@ -49,7 +49,7 @@
 
   <properties>
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2024-08-26T09:52:43Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-30T07:12:41Z</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.4</version>
+    <version>1.16.6</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.root</artifactId>
-  <version>1.16.4</version>
+  <version>1.16.6</version>
   <packaging>pom</packaging>
 
   <name>Context-Aware Configuration Editor Root</name>