@plone/volto 16.31.12 → 16.32.1

package/.changelog.draft

@@ -1,8 +1,7 @@
-## 16.31.12 (2024-08-12)
+## 16.32.1 (2024-08-28)
 
 ### Bugfix
 
-- Return a 302 response for server-side rendering of the Link view for unauthenticated users. @davisagli [#6235](https://github.com/plone/volto/issues/6235)
-- In the URL Management control panel, allow external URLs as targets. @davisagli [#6247](https://github.com/plone/volto/issues/6247)
+- Fix error in `SortOn` component when no sort is selected. @davisagli [#6273](https://github.com/plone/volto/issues/6273)
 
 

package/CHANGELOG.md

@@ -8,6 +8,19 @@
 
 <!-- towncrier release notes start -->
 
+## 16.32.1 (2024-08-28)
+
+### Bugfix
+
+- Fix error in `SortOn` component when no sort is selected. @davisagli [#6273](https://github.com/plone/volto/issues/6273)
+
+## 16.32.0 (2024-08-16)
+
+### Feature
+
+- The schema for the `ContentsPropertiesModal` can be enhanced using the `contentPropertiesSchemaEnhancer` setting.
+  Also, the properties form is now prepopulated with values if all selected items share the same value. @davisagli [#6248](https://github.com/plone/volto/issues/6248)
+
 ## 16.31.12 (2024-08-12)
 
 ### Bugfix

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "16.31.12",
+  "version": "16.32.1",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"

package/packages/volto-slate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "16.31.12",
+  "version": "16.32.1",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/manage/Blocks/Search/components/SortOn.jsx

@@ -60,7 +60,7 @@ const SortOn = (props) => {
 
   const showSelectField = sortOnOptions.length > 1;
   if (!showSelectField && !activeSortOn) {
-    return;
+    return null;
   }
   const value = {
     value: activeSortOn || intl.formatMessage(messages.noSelection),

package/src/components/manage/Contents/Contents.jsx

@@ -1524,6 +1524,9 @@ class Contents extends Component {
                     onCancel={this.onPropertiesCancel}
                     onOk={this.onPropertiesOk}
                     items={this.state.selected}
+                    values={map(this.state.selected, (id) =>
+                      find(this.state.items, { '@id': id }),
+                    ).filter((item) => item)}
                   />
                   {this.state.showWorkflow && (
                     <ContentsWorkflowModal

package/src/components/manage/Contents/ContentsPropertiesModal.jsx

@@ -3,15 +3,17 @@
  * @module components/manage/Contents/ContentsPropertiesModal
  */
 
-import React, { Component } from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { isEmpty, map } from 'lodash';
 import { defineMessages, injectIntl } from 'react-intl';
 
+import { cloneDeepSchema } from '@plone/volto/helpers/Utils/Utils';
 import { updateContent } from '@plone/volto/actions';
 import { ModalForm } from '@plone/volto/components';
+import config from '@plone/volto/registry';
 
 const messages = defineMessages({
   properties: {
@@ -124,13 +126,19 @@ class ContentsPropertiesModal extends Component {
    * @param {Object} data Form data
    * @returns {undefined}
    */
-  onSubmit(data) {
-    if (isEmpty(data)) {
+  onSubmit(initialData, data) {
+    let changes = {};
+    for (const name of Object.keys(data)) {
+      if (data[name] !== initialData[name]) {
+        changes[name] = data[name];
+      }
+    }
+    if (isEmpty(changes)) {
       this.props.onOk();
     } else {
       this.props.updateContent(
         this.props.items,
-        map(this.props.items, () => data),
+        map(this.props.items, () => changes),
       );
     }
   }
@@ -141,71 +149,96 @@ class ContentsPropertiesModal extends Component {
    * @returns {string} Markup for the component.
    */
   render() {
+    const baseSchema = {
+      fieldsets: [
+        {
+          id: 'default',
+          title: this.props.intl.formatMessage(messages.default),
+          fields: [
+            'effective',
+            'expires',
+            'rights',
+            'creators',
+            'exclude_from_nav',
+          ],
+        },
+      ],
+      properties: {
+        effective: {
+          description: this.props.intl.formatMessage(
+            messages.effectiveDescription,
+          ),
+          title: this.props.intl.formatMessage(messages.effectiveTitle),
+          type: 'string',
+          widget: 'datetime',
+        },
+        expires: {
+          description: this.props.intl.formatMessage(
+            messages.expiresDescription,
+          ),
+          title: this.props.intl.formatMessage(messages.expiresTitle),
+          type: 'string',
+          widget: 'datetime',
+        },
+        rights: {
+          description: this.props.intl.formatMessage(
+            messages.rightsDescription,
+          ),
+          title: this.props.intl.formatMessage(messages.rightsTitle),
+          type: 'string',
+          widget: 'textarea',
+        },
+        creators: {
+          description: this.props.intl.formatMessage(
+            messages.creatorsDescription,
+          ),
+          title: this.props.intl.formatMessage(messages.creatorsTitle),
+          type: 'array',
+        },
+        exclude_from_nav: {
+          description: this.props.intl.formatMessage(
+            messages.excludeFromNavDescription,
+          ),
+          title: this.props.intl.formatMessage(messages.excludeFromNavTitle),
+          type: 'boolean',
+        },
+      },
+      required: [],
+    };
+    const schemaEnhancer = config.settings.contentPropertiesSchemaEnhancer;
+    let schema = schemaEnhancer
+      ? schemaEnhancer({
+          schema: cloneDeepSchema(baseSchema),
+          intl: this.props.intl,
+        })
+      : baseSchema;
+
+    const initialData = {};
+    if (this.props.values?.length) {
+      for (const name of Object.keys(schema.properties)) {
+        const firstValue = this.props.values[0][name];
+        // should not show floor or ceiling dates
+        if (
+          (name === 'effective' && firstValue && firstValue <= '1970') ||
+          (name === 'expires' && firstValue && firstValue >= '2499')
+        ) {
+          continue;
+        }
+        if (this.props.values.every((item) => item[name] === firstValue)) {
+          initialData[name] = firstValue;
+        }
+      }
+    }
+
     return (
       this.props.open && (
         <ModalForm
           open={this.props.open}
-          onSubmit={this.onSubmit}
+          onSubmit={this.onSubmit.bind(this, initialData)}
           onCancel={this.props.onCancel}
           title={this.props.intl.formatMessage(messages.properties)}
-          schema={{
-            fieldsets: [
-              {
-                id: 'default',
-                title: this.props.intl.formatMessage(messages.default),
-                fields: [
-                  'effective',
-                  'expires',
-                  'rights',
-                  'creators',
-                  'exclude_from_nav',
-                ],
-              },
-            ],
-            properties: {
-              effective: {
-                description: this.props.intl.formatMessage(
-                  messages.effectiveDescription,
-                ),
-                title: this.props.intl.formatMessage(messages.effectiveTitle),
-                type: 'string',
-                widget: 'datetime',
-              },
-              expires: {
-                description: this.props.intl.formatMessage(
-                  messages.expiresDescription,
-                ),
-                title: this.props.intl.formatMessage(messages.expiresTitle),
-                type: 'string',
-                widget: 'datetime',
-              },
-              rights: {
-                description: this.props.intl.formatMessage(
-                  messages.rightsDescription,
-                ),
-                title: this.props.intl.formatMessage(messages.rightsTitle),
-                type: 'string',
-                widget: 'textarea',
-              },
-              creators: {
-                description: this.props.intl.formatMessage(
-                  messages.creatorsDescription,
-                ),
-                title: this.props.intl.formatMessage(messages.creatorsTitle),
-                type: 'array',
-              },
-              exclude_from_nav: {
-                description: this.props.intl.formatMessage(
-                  messages.excludeFromNavDescription,
-                ),
-                title: this.props.intl.formatMessage(
-                  messages.excludeFromNavTitle,
-                ),
-                type: 'boolean',
-              },
-            },
-            required: [],
-          }}
+          schema={schema}
+          formData={initialData}
         />
       )
     );

package/src/config/index.js

@@ -174,6 +174,7 @@ let config = {
     ],
     showSelfRegistration: false,
     contentMetadataTagsImageField: 'image',
+    contentPropertiesSchemaEnhancer: null,
     hasWorkingCopySupport: false,
     maxUndoLevels: 200, // undo history size for the main form
     addonsInfo: addonsInfo,