@plone/volto 14.0.0-alpha.13 → 14.0.0-alpha.14

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## 14.0.0-alpha.14 (2021-10-01)
+
+### Bugfix
+
+- Get `blocks` and `blocks_layout` defaults from existing behavior when enabling TTW editable DX Layout @avoinea
+
+### Internal
+
+- Add development dependency on use-trace-update, useful for performance debugging @tiberiuichim
+- Upgrade to `@plone/scripts` 1.0.3 @sneridagh
+
 ## 14.0.0-alpha.13 (2021-09-30)
 
 ### Feature

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "14.0.0-alpha.13",
+  "version": "14.0.0-alpha.14",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -247,7 +247,7 @@
     "@loadable/component": "5.14.1",
     "@loadable/server": "5.14.0",
     "@loadable/webpack-plugin": "5.14.0",
-    "@plone/scripts": "1.0.0",
+    "@plone/scripts": "1.0.3",
     "@sentry/browser": "5.12.1",
     "@sentry/integrations": "5.27.3",
     "@sentry/node": "5.12.3",
@@ -404,7 +404,8 @@
     "identity-obj-proxy": "3.0.0",
     "jest-environment-jsdom-sixteen": "1.0.3",
     "react-is": "^16.13.1",
-    "tmp": "0.2.1"
+    "tmp": "0.2.1",
+    "use-trace-update": "1.3.2"
   },
   "resolutions": {
     "http-proxy": "^1.18.1",

package/src/components/manage/Controlpanels/ContentTypeLayout.jsx

@@ -159,11 +159,10 @@ class ContentTypeLayout extends Component {
 
     // Schema GET
     if (this.props.schemaRequest.loading && nextProps.schemaRequest.loaded) {
-      let properties = nextProps.schema?.properties || {};
-      let content = {};
-      let value, key;
-      for (key in properties) {
-        value = properties[key].default;
+      const properties = nextProps.schema?.properties || {};
+      const content = {};
+      for (const key in properties) {
+        const value = properties[key].default;
         if (value) {
           content[key] = value;
         }
@@ -229,7 +228,7 @@ class ContentTypeLayout extends Component {
    * @returns {undefined}
    */
   onSubmit(data) {
-    let schema = { properties: {} };
+    const schema = { properties: {} };
     Object.keys(data)
       .filter((k) => data[k])
       .forEach((k) => (schema.properties[k] = { default: data[k] }));
@@ -242,7 +241,7 @@ class ContentTypeLayout extends Component {
    * @returns {undefined}
    */
   onCancel() {
-    let url = getParentUrl(this.props.pathname);
+    const url = getParentUrl(this.props.pathname);
     this.props.history.push(getParentUrl(url));
   }
 
@@ -252,7 +251,10 @@ class ContentTypeLayout extends Component {
    * @returns {undefined}
    */
   onEnableBlocks() {
-    let schema = {
+    const { properties = {} } = this.props.schema;
+    const blocksFieldName = getBlocksFieldname(properties);
+    const blocksLayoutFieldname = getBlocksLayoutFieldname(properties);
+    const schema = {
       fieldsets: [
         {
           id: 'layout',
@@ -266,12 +268,14 @@ class ContentTypeLayout extends Component {
           type: 'dict',
           widget: 'json',
           factory: 'JSONField',
+          default: properties[blocksFieldName]?.default || {},
         },
         blocks_layout: {
           title: 'Blocks Layout',
           type: 'dict',
           widget: 'json',
           factory: 'JSONField',
+          default: properties[blocksLayoutFieldname]?.default || { items: [] },
         },
       },
     };