@plone/volto 17.18.1 → 17.19.0

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

@@ -1,12 +1,14 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { isEmpty, map } from 'lodash';
 import { defineMessages, useIntl } from 'react-intl';
 
 import { usePrevious } from '@plone/volto/helpers';
+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: {
@@ -65,12 +67,83 @@ const messages = defineMessages({
 });
 
 const ContentsPropertiesModal = (props) => {
-  const { onCancel, onOk, open, items } = props;
+  const { onCancel, onOk, open, items, values } = props;
   const intl = useIntl();
   const dispatch = useDispatch();
   const request = useSelector((state) => state.content.update);
   const prevrequestloading = usePrevious(request.loading);
 
+  const baseSchema = {
+    fieldsets: [
+      {
+        id: 'default',
+        title: intl.formatMessage(messages.default),
+        fields: [
+          'effective',
+          'expires',
+          'rights',
+          'creators',
+          'exclude_from_nav',
+        ],
+      },
+    ],
+    properties: {
+      effective: {
+        description: intl.formatMessage(messages.effectiveDescription),
+        title: intl.formatMessage(messages.effectiveTitle),
+        type: 'string',
+        widget: 'datetime',
+      },
+      expires: {
+        description: intl.formatMessage(messages.expiresDescription),
+        title: intl.formatMessage(messages.expiresTitle),
+        type: 'string',
+        widget: 'datetime',
+      },
+      rights: {
+        description: intl.formatMessage(messages.rightsDescription),
+        title: intl.formatMessage(messages.rightsTitle),
+        type: 'string',
+        widget: 'textarea',
+      },
+      creators: {
+        description: intl.formatMessage(messages.creatorsDescription),
+        title: intl.formatMessage(messages.creatorsTitle),
+        type: 'array',
+      },
+      exclude_from_nav: {
+        description: intl.formatMessage(messages.excludeFromNavDescription),
+        title: intl.formatMessage(messages.excludeFromNavTitle),
+        type: 'boolean',
+      },
+    },
+    required: [],
+  };
+  const schemaEnhancer = config.settings.contentPropertiesSchemaEnhancer;
+  let schema = schemaEnhancer
+    ? schemaEnhancer({
+        schema: cloneDeepSchema(baseSchema),
+        intl,
+      })
+    : baseSchema;
+
+  const initialData = {};
+  if (values?.length) {
+    for (const name of Object.keys(schema.properties)) {
+      const firstValue = values[0][name];
+      // should not show floor or ceiling dates
+      if (
+        (name === 'effective' && firstValue && firstValue <= '1970') ||
+        (name === 'expires' && firstValue && firstValue >= '2499')
+      ) {
+        continue;
+      }
+      if (values.every((item) => item[name] === firstValue)) {
+        initialData[name] = firstValue;
+      }
+    }
+  }
+
   useEffect(() => {
     if (prevrequestloading && request.loaded) {
       onOk();
@@ -78,13 +151,19 @@ const ContentsPropertiesModal = (props) => {
   }, [onOk, prevrequestloading, request.loaded]);
 
   const onSubmit = (data) => {
-    if (isEmpty(data)) {
+    let changes = {};
+    for (const name of Object.keys(data)) {
+      if (data[name] !== initialData[name]) {
+        changes[name] = data[name];
+      }
+    }
+    if (isEmpty(changes)) {
       onOk();
     } else {
       dispatch(
         updateContent(
           items,
-          map(items, () => data),
+          map(items, () => changes),
         ),
       );
     }
@@ -97,54 +176,8 @@ const ContentsPropertiesModal = (props) => {
         onSubmit={onSubmit}
         onCancel={onCancel}
         title={intl.formatMessage(messages.properties)}
-        schema={{
-          fieldsets: [
-            {
-              id: 'default',
-              title: intl.formatMessage(messages.default),
-              fields: [
-                'effective',
-                'expires',
-                'rights',
-                'creators',
-                'exclude_from_nav',
-              ],
-            },
-          ],
-          properties: {
-            effective: {
-              description: intl.formatMessage(messages.effectiveDescription),
-              title: intl.formatMessage(messages.effectiveTitle),
-              type: 'string',
-              widget: 'datetime',
-            },
-            expires: {
-              description: intl.formatMessage(messages.expiresDescription),
-              title: intl.formatMessage(messages.expiresTitle),
-              type: 'string',
-              widget: 'datetime',
-            },
-            rights: {
-              description: intl.formatMessage(messages.rightsDescription),
-              title: intl.formatMessage(messages.rightsTitle),
-              type: 'string',
-              widget: 'textarea',
-            },
-            creators: {
-              description: intl.formatMessage(messages.creatorsDescription),
-              title: intl.formatMessage(messages.creatorsTitle),
-              type: 'array',
-            },
-            exclude_from_nav: {
-              description: intl.formatMessage(
-                messages.excludeFromNavDescription,
-              ),
-              title: intl.formatMessage(messages.excludeFromNavTitle),
-              type: 'boolean',
-            },
-          },
-          required: [],
-        }}
+        schema={schema}
+        formData={initialData}
       />
     )
   );

package/src/components/manage/Form/Form.jsx

@@ -695,6 +695,7 @@ class Form extends Component {
             properties={formData}
             navRoot={navRoot}
             type={type}
+            errors={this.state.errors}
             pathname={this.props.pathname}
             selectedBlock={this.state.selected}
             multiSelected={this.state.multiSelected}

package/src/components/manage/Toolbar/Toolbar.jsx

@@ -590,7 +590,7 @@ class Toolbar extends Component {
                 aria-label={this.props.intl.formatMessage(
                   messages.shrinkToolbar,
                 )}
-                className={cx({
+                className={cx('toolbar-handler-button', {
                   [this.props.content?.review_state]:
                     this.props.content?.review_state,
                 })}

package/src/components/manage/Widgets/InternalUrlWidget.jsx

@@ -4,10 +4,10 @@
  */
 
 import React, { useState } from 'react';
-import { compose } from 'redux';
 import PropTypes from 'prop-types';
 import { Input, Button } from 'semantic-ui-react';
-import { FormFieldWrapper, Icon } from '@plone/volto/components';
+import { Icon } from '@plone/volto/components';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import { isInternalURL, flattenToAppURL, URLUtils } from '@plone/volto/helpers';
 import withObjectBrowser from '@plone/volto/components/manage/Sidebar/ObjectBrowser';
 import clearSVG from '@plone/volto/icons/clear.svg';
@@ -15,13 +15,13 @@ import navTreeSVG from '@plone/volto/icons/nav.svg';
 
 /** Widget to edit urls
  *
- * This is the default widget used for the `remoteUrl` field. You can also use
+ * This is a widget used for getting and setting an internal url. You can also use
  * it by declaring a field like:
  *
  * ```jsx
  * {
  *  title: "URL",
- *  widget: 'url',
+ *  widget: 'internal_url',
  * }
  * ```
  */
@@ -35,20 +35,20 @@ export const InternalUrlWidget = (props) => {
     maxLength,
     placeholder,
     isDisabled,
+    value,
   } = props;
   const inputId = `field-${id}`;
 
-  const [value, setValue] = useState(flattenToAppURL(props.value));
   const [isInvalid, setIsInvalid] = useState(false);
+
   /**
    * Clear handler
    * @method clear
    * @param {Object} value Value
-   * @returns {undefined}
+   * @returns {string} Empty string
    */
   const clear = () => {
-    setValue('');
-    onChange(id, undefined);
+    onChange(id, '');
   };
 
   const onChangeValue = (_value) => {
@@ -63,8 +63,6 @@ export const InternalUrlWidget = (props) => {
       }
     }
 
-    setValue(newValue);
-
     newValue = isInternalURL(newValue) ? flattenToAppURL(newValue) : newValue;
 
     if (!isInternalURL(newValue) && newValue.length > 0) {
@@ -75,7 +73,7 @@ export const InternalUrlWidget = (props) => {
       }
     }
 
-    onChange(id, newValue === '' ? undefined : newValue);
+    onChange(id, newValue);
   };
 
   return (
@@ -89,12 +87,10 @@ export const InternalUrlWidget = (props) => {
           disabled={isDisabled}
           placeholder={placeholder}
           onChange={({ target }) => onChangeValue(target.value)}
-          onBlur={({ target }) =>
-            onBlur(id, target.value === '' ? undefined : target.value)
-          }
+          onBlur={({ target }) => onBlur(id, target.value)}
           onClick={() => onClick()}
-          minLength={minLength || null}
-          maxLength={maxLength || null}
+          minLength={minLength}
+          maxLength={maxLength}
           error={isInvalid}
         />
         {value?.length > 0 ? (
@@ -177,4 +173,4 @@ InternalUrlWidget.defaultProps = {
   maxLength: null,
 };
 
-export default compose(withObjectBrowser)(InternalUrlWidget);
+export default withObjectBrowser(InternalUrlWidget);

package/src/components/theme/View/View.jsx

@@ -205,8 +205,10 @@ class View extends Component {
    */
   render() {
     const { views } = config;
-    if (this.props.error && this.props.error.code === 301) {
-      const redirect = flattenToAppURL(this.props.error.url).split('?')[0];
+    if ([301, 302].includes(this.props.error?.code)) {
+      const redirect = flattenToAppURL(this.props.error.url)
+        .split('?')[0]
+        .replace('/++api++', '');
       return <Redirect to={`${redirect}${this.props.location.search}`} />;
     } else if (this.props.error && !this.props.connectionRefused) {
       let FoundView;

package/src/components/theme/View/View.test.jsx

@@ -22,6 +22,7 @@ beforeAll(() => {
   });
   config.settings.publicURL = 'https://plone.org';
 });
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 const mockStore = configureStore();
 

package/src/config/index.js

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

package/src/helpers/Api/Api.js

@@ -80,6 +80,10 @@ class Api {
 
           Object.keys(headers).forEach((key) => request.set(key, headers[key]));
 
+          if (__SERVER__ && checkUrl && ['get', 'head'].includes(method)) {
+            request.redirects(0);
+          }
+
           if (data) {
             request.send(data);
           }
@@ -104,6 +108,14 @@ class Api {
                 url: request.xhr.responseURL,
               });
             }
+
+            if ([301, 302].includes(err?.status)) {
+              return reject({
+                code: err.status,
+                url: err.response.headers.location,
+              });
+            }
+
             return err ? reject(err) : resolve(response.body || response.text);
           });
         });

package/src/helpers/Api/Api.plone.rest.test.js

@@ -18,6 +18,7 @@ beforeAll(() => {
 
 const api = new Api();
 const { settings } = config;
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 test('get request', () => {});
 

package/src/helpers/Api/Api.test.js

@@ -24,6 +24,7 @@ beforeAll(() => {
 
 const api = new Api();
 const { settings } = config;
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 test('get request', () => {});
 

package/theme/themes/pastanaga/extras/blocks.less

@@ -1119,6 +1119,12 @@ div.image-upload-widget-image {
     flex-direction: row;
     align-items: center;
     margin-right: 0.5em;
+
+    .sorted-label-value {
+      margin-right: 0.5em;
+      margin-left: 0.7em;
+      color: @lightGrey;
+    }
   }
 
   .sort-label {

package/theme/themes/pastanaga/extras/toolbar.less

@@ -129,7 +129,7 @@ body:not(.has-sidebar):not(.has-sidebar-collapsed) {
     }
 
     .toolbar-handler {
-      button {
+      .toolbar-handler-button {
         opacity: 0.3;
       }
 
@@ -243,7 +243,7 @@ body:not(.has-sidebar):not(.has-sidebar-collapsed) {
       width: 100%;
       justify-content: center;
 
-      button {
+      .toolbar-handler-button {
         width: @toolbarWidth;
         height: 20px;
         padding: 0;
@@ -428,7 +428,7 @@ body:not(.has-sidebar):not(.has-sidebar-collapsed) {
         flex-direction: column;
         justify-content: center;
 
-        button {
+        .toolbar-handler-button {
           width: @toolbarWidthMin;
           height: @toolbarWidth;
 
@@ -752,3 +752,10 @@ body:not(.has-sidebar):not(.has-sidebar-collapsed) {
   }
 }
 // End Orphaned CSS
+
+// Toolbar handler color in homepage
+.contenttype-plone-site {
+  #toolbar .toolbar-handler .toolbar-handler-button:before {
+    background: @teal-blue;
+  }
+}