@plone/volto 16.9.0 → 16.10.0

package/.changelog.draft

@@ -1,21 +1,18 @@
-## 16.9.0 (2023-01-27)
+## 16.10.0 (2023-02-06)
 
 ### Feature
 
-- Enable scrolling to ids via hashes in internal links @jackahl [#4165](https://github.com/plone/volto/issues/4165)
-- Read listing block schema from configuration registry @pnicolli [#4231](https://github.com/plone/volto/issues/4231)
-- Add displayName when registering a component @sneridagh [#4282](https://github.com/plone/volto/issues/4282)
-- Support for all default expanders (breadcrumbs, navigation, actions, types) in actions/reducers. Conditional loading of actions if the expanders are present. @sneridagh [#4285](https://github.com/plone/volto/issues/4285)
-- Add `addNewBlock` Cypress support command @sneridagh [#4313](https://github.com/plone/volto/issues/4313)
+- Option for opening /edit with the same vertical offset like the page in view mode before. @ksuess [#3662](https://github.com/plone/volto/issues/3662)
+- Add option to add an action button to the top of the toolbar and to add a menu button to the bottom of the toolbar. @ksuess [#4333](https://github.com/plone/volto/issues/4333)
+- Update to latest versions in the backend for testing and the convenience api folder @sneridagh [#4361](https://github.com/plone/volto/issues/4361)
+- Content Rules: Support server-provided schema for condition and action @ericof [#4368](https://github.com/plone/volto/issues/4368)
 
 ### Bugfix
 
-- Fixed maxLength validation for string type fields @pnicolli [#4189](https://github.com/plone/volto/issues/4189)
-- bugfix : add pathname as required proptype in Blocks/Edit @akshatgarg12 [#4194](https://github.com/plone/volto/issues/4194)
-- (Fix) Select Widgets scrolls the page when the options are not visible @dobri1408 [#4223](https://github.com/plone/volto/issues/4223)
-- Updated volto-slate to check for slateSettings before falling back to config @danalvrz [#4311](https://github.com/plone/volto/issues/4311)
+- Fix react-error-overlay resolution @sneridagh [#4360](https://github.com/plone/volto/issues/4360)
 
-### Internal
+### Documentation
 
-- Updated 4 Dependencies @SaiRev0 [#4104](https://github.com/plone/volto/issues/4104)
+- Add documentation for copy, cut, and paste blocks in Volto. @MAX-786 [#3827](https://github.com/plone/volto/issues/3827)
+- Fixed Grammar error @SaiRev0 [#4272](https://github.com/plone/volto/issues/4272)
 

package/CHANGELOG.md

@@ -8,6 +8,25 @@
 
 <!-- towncrier release notes start -->
 
+## 16.10.0 (2023-02-06)
+
+### Feature
+
+- Option for opening /edit with the same vertical offset like the page in view mode before. @ksuess [#3662](https://github.com/plone/volto/issues/3662)
+- Add option to add an action button to the top of the toolbar and to add a menu button to the bottom of the toolbar. @ksuess [#4333](https://github.com/plone/volto/issues/4333)
+- Update to latest versions in the backend for testing and the convenience api folder @sneridagh [#4361](https://github.com/plone/volto/issues/4361)
+- Content Rules: Support server-provided schema for condition and action @ericof [#4368](https://github.com/plone/volto/issues/4368)
+
+### Bugfix
+
+- Fix react-error-overlay resolution @sneridagh [#4360](https://github.com/plone/volto/issues/4360)
+
+### Documentation
+
+- Add documentation for copy, cut, and paste blocks in Volto. @MAX-786 [#3827](https://github.com/plone/volto/issues/3827)
+- Fixed Grammar error @SaiRev0 [#4272](https://github.com/plone/volto/issues/4272)
+
+
 ## 16.9.0 (2023-01-27)
 
 ### Feature
@@ -24,6 +43,7 @@
 - bugfix : add pathname as required proptype in Blocks/Edit @akshatgarg12 [#4194](https://github.com/plone/volto/issues/4194)
 - (Fix) Select Widgets scrolls the page when the options are not visible @dobri1408 [#4223](https://github.com/plone/volto/issues/4223)
 - Updated volto-slate to check for slateSettings before falling back to config @danalvrz [#4311](https://github.com/plone/volto/issues/4311)
+- Fix bug where label of search facet wasn't translated when the content object is being translated @robgietema [#4306](https://github.com/plone/volto/issues/4306)
 
 ### Internal
 
@@ -35,7 +55,6 @@
 ### Bugfix
 
 - Fix StyleWrapper extenders, the classNames were not being re-fed into the pipe @sneridagh [#4275](https://github.com/plone/volto/issues/4275)
-- Fix bug where label of search facet wasn't translated when the content object is being translated @robgietema
 
 
 ## 16.8.0 (2023-01-18)

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "16.9.0",
+  "version": "16.10.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -422,6 +422,7 @@
   "resolutions": {
     "clean-css": "5.3.1",
     "http-proxy": "^1.18.1",
+    "react-error-overlay": "6.0.9",
     "ua-parser-js": "0.7.28"
   },
   "volta": {

package/packages/volto-slate/package.json

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

package/src/components/manage/Controlpanels/Rules/components/VariableModal.jsx

@@ -339,6 +339,23 @@ const detectVocabulary = (type) => {
   }
 };
 
+const processSchema = (schema) => {
+  const properties = { ...schema.properties };
+  Object.keys(properties).forEach((key) => {
+    const value = properties[key];
+    const vocabId = value?.vocabulary?.['@id'];
+    if (vocabId?.includes('@sources')) {
+      value['widget'] = 'internal_url';
+      delete value['vocabulary'];
+    }
+  });
+  const newSchema = {
+    ...schema,
+    properties,
+  };
+  return newSchema;
+};
+
 const VariableModal = ({
   open,
   type,
@@ -371,17 +388,27 @@ const VariableModal = ({
   React.useEffect(() => {
     //reset input schema to rehydrate options
     setInputSchema('');
-    const vocabularyOptions =
-      vocabularyName &&
-      vocabularies &&
-      vocabularies[vocabularyName] &&
-      vocabularies[vocabularyName].items
-        ? vocabularies[vocabularyName].items.map((item, i) => {
-            return [item.value, item.label];
-          })
-        : [];
-    //set schema with the new options from vocabulary
-    setInputSchema(setSchema(value.title, vocabularyOptions));
+    // On creation, @schema is provided by value
+    // On update, @schema comes from formData
+    const rawSchema = value['@schema'] || formData['@schema'];
+    let schema;
+    if (rawSchema) {
+      schema = processSchema(rawSchema);
+    } else {
+      const vocabularyOptions =
+        vocabularyName &&
+        vocabularies &&
+        vocabularies[vocabularyName] &&
+        vocabularies[vocabularyName].items
+          ? vocabularies[vocabularyName].items.map((item, i) => {
+              return [item.value, item.label];
+            })
+          : [];
+      //set schema with the new options from vocabulary
+      schema = setSchema(value.title, vocabularyOptions);
+    }
+    setInputSchema(schema);
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [vocabularies, open, formData, value]);
 

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

@@ -180,10 +180,11 @@ class Form extends Component {
       formData.hasOwnProperty(blocksLayoutFieldname) &&
       formData[blocksLayoutFieldname].items.length > 0
     ) {
-      selectedBlock = formData[blocksLayoutFieldname].items[0];
-
-      if (config.blocks?.initialBlocksFocus?.[this.props.type]) {
-        //Default selected is not the first block, but the one from config.
+      if (config.blocks?.initialBlocksFocus === null) {
+        selectedBlock = null;
+      } else if (this.props.type in config.blocks?.initialBlocksFocus) {
+        // Default selected is not the first block, but the one from config.
+        // TODO Select first block and not an arbitrary one.
         Object.keys(formData[blocksFieldname]).forEach((b_key) => {
           if (
             formData[blocksFieldname][b_key]['@type'] ===
@@ -192,8 +193,11 @@ class Form extends Component {
             selectedBlock = b_key;
           }
         });
+      } else {
+        selectedBlock = formData[blocksLayoutFieldname].items[0];
       }
     }
+
     this.state = {
       formData,
       initialFormData: cloneDeep(formData),

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

@@ -109,7 +109,7 @@ const messages = defineMessages({
   },
 });
 
-const toolbarComponents = {
+let toolbarComponents = {
   personalTools: { component: PersonalTools, wrapper: null },
   more: { component: More, wrapper: null },
   types: { component: Types, wrapper: null, contentAsProps: true },
@@ -210,6 +210,12 @@ class Toolbar extends Component {
     if (!hasApiExpander('types', getBaseUrl(this.props.pathname))) {
       this.props.getTypes(getBaseUrl(this.props.pathname));
     }
+    toolbarComponents = {
+      ...(config.settings
+        ? config.settings.additionalToolbarComponents || {}
+        : {}),
+      ...toolbarComponents,
+    };
     this.props.setExpandedToolbar(this.state.expanded);
     document.addEventListener('mousedown', this.handleClickOutside, false);
   }
@@ -551,9 +557,13 @@ class Toolbar extends Component {
                     </button>
                   </>
                 )}
+                <Pluggable name="main.toolbar.top" />
               </div>
               <div className="toolbar-bottom">
-                <Pluggable name="main.toolbar.bottom" />
+                <Pluggable
+                  name="main.toolbar.bottom"
+                  params={{ onClickHandler: this.toggleMenu }}
+                />
                 {!this.props.hideDefaultViewButtons && (
                   <button
                     className="user"

package/src/helpers/ScrollToTop/ScrollToTop.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
+import config from '@plone/volto/registry';
 
 /**
  *
@@ -27,8 +28,14 @@ class ScrollToTop extends React.Component {
    * @memberof ScrollToTop
    */
   componentDidUpdate(prevProps) {
+    const noInitialBlocksFocus = // Do not scroll on /edit
+      config.blocks?.initialBlocksFocus === null
+        ? this.props.location?.pathname.slice(-5) !== '/edit'
+        : true;
     if (
+      !this.props.location?.hash &&
       !this.props.location?.pathname.hash &&
+      noInitialBlocksFocus &&
       this.props.location?.pathname !== prevProps.location?.pathname
     ) {
       window.scrollTo(0, 0);

package/news/4104.internal

@@ -1 +0,0 @@
-Updated 4 Dependencies @SaiRev0

package/news/4165.feature

@@ -1 +0,0 @@
-Enable scrolling to ids via hashes in internal links @jackahl

package/news/4189.bugfix

@@ -1 +0,0 @@
-Fixed maxLength validation for string type fields @pnicolli

package/news/4194.bugfix

@@ -1 +0,0 @@
-bugfix : add pathname as required proptype in Blocks/Edit @akshatgarg12

package/news/4223.bugfix

@@ -1 +0,0 @@
-(Fix) Select Widgets scrolls the page when the options are not visible @dobri1408

package/news/4231.feature

@@ -1 +0,0 @@
-Read listing block schema from configuration registry @pnicolli

package/news/4282.feature

@@ -1 +0,0 @@
-Add displayName when registering a component @sneridagh

package/news/4285.feature

@@ -1 +0,0 @@
-Support for all default expanders (breadcrumbs, navigation, actions, types) in actions/reducers. Conditional loading of actions if the expanders are present. @sneridagh

package/news/4311.bugfix

@@ -1 +0,0 @@
-Updated volto-slate to check for slateSettings before falling back to config @danalvrz

package/news/4313.feature

@@ -1 +0,0 @@
-Add `addNewBlock` Cypress support command @sneridagh