@plone/volto 16.0.0-alpha.35 → 16.0.0-alpha.36

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## 16.0.0-alpha.36 (2022-09-26)
+
+### Bugfix
+
+- Fix number widget when the value is 0 @iRohitSingh
+- Fix the typo in change workflow status dialog in "de" @iRohitSingh
+- Show unauthorized message when accessing the diff view without permission @robgietema
+- Fix i18n in title of Aliases control panel @sneridagh
+- The styling schema is now applied before the block variations schema enhancers, to allow those enhancers a chance to tweak the styling schema @tiberiuichim
+
+### Documentation
+
+- Added controls for the `actions` property of the `AlignWidget` storybook @JeffersonBledsoe #3671
+- Generic Setup -> `GenericSetup`. @stevepiercy
+
 ## 16.0.0-alpha.35 (2022-09-21)
 
 ### Breaking
@@ -13,6 +28,7 @@
 - Fix selection error when pressing backspace @robgietema
 - Fix sidebarTab in Toc Block @iRohitSingh
 - Fix virtualization (windowing) when displaying options with long titles for select widgets. (The virtualization happen when the number of options is greater than 25). Add dynamic height aware options using `react-virtualized`. @sneridagh
+- Fix email validation to ensure all addresses are correctly validated @instification
 
 ### Documentation
 
@@ -30,6 +46,7 @@
 
 ### Bugfix
 
+- Fix Press Enter in some blocks does not focus on the text block below #3647 @dobri1408
 - Add `matchAllRoutes` to AsyncConnect so that it matches all configured `asyncPropsExtenders` @tiberiuichim
 - Fix acceptence test groups controlpanel @ksuess
 

package/locales/ca/LC_MESSAGES/volto.po

@@ -3092,6 +3092,7 @@ msgstr "UID"
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/de/LC_MESSAGES/volto.po

@@ -3089,6 +3089,7 @@ msgstr "UID"
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/en/LC_MESSAGES/volto.po

@@ -3083,6 +3083,7 @@ msgstr ""
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/es/LC_MESSAGES/volto.po

@@ -3093,6 +3093,7 @@ msgstr "UID"
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/eu/LC_MESSAGES/volto.po

@@ -3090,6 +3090,7 @@ msgstr "UID"
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/fr/LC_MESSAGES/volto.po

@@ -3100,6 +3100,7 @@ msgstr "UID"
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/it/LC_MESSAGES/volto.po

@@ -3083,6 +3083,7 @@ msgstr "UID"
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/ja/LC_MESSAGES/volto.po

@@ -3091,6 +3091,7 @@ msgstr "UID"
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/nl/LC_MESSAGES/volto.po

@@ -3102,6 +3102,7 @@ msgstr ""
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/pt/LC_MESSAGES/volto.po

@@ -3091,6 +3091,7 @@ msgstr ""
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/pt_BR/LC_MESSAGES/volto.po

@@ -3093,6 +3093,7 @@ msgstr "UID"
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/ro/LC_MESSAGES/volto.po

@@ -3083,6 +3083,7 @@ msgstr "UID"
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2022-09-16T10:33:59.942Z\n"
+"POT-Creation-Date: 2022-09-23T09:41:15.663Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -3085,6 +3085,7 @@ msgstr ""
 
 #: components/manage/Aliases/Aliases
 #: components/manage/Controlpanels/Aliases
+#: components/manage/Controlpanels/Controlpanels
 #: components/manage/Toolbar/More
 # defaultMessage: URL Management
 msgid "URL Management"

package/package.json

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

package/src/components/manage/Blocks/Block/BlocksForm.jsx

@@ -77,7 +77,7 @@ const BlocksForm = (props) => {
       e.preventDefault();
     }
     if (e.key === 'Enter' && !disableEnter) {
-      onAddBlock(config.settings.defaultBlockType, index + 1);
+      onSelectBlock(onAddBlock(config.settings.defaultBlockType, index + 1));
       e.preventDefault();
     }
   };

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

@@ -78,6 +78,10 @@ const messages = defineMessages({
     id: 'User Group Membership',
     defaultMessage: 'User Group Membership',
   },
+  urlmanagement: {
+    id: 'URL Management',
+    defaultMessage: 'URL Management',
+  },
 });
 
 /**
@@ -175,8 +179,8 @@ class Controlpanels extends Component {
         },
         {
           '@id': '/aliases',
-          group: 'General',
-          title: 'URL Management',
+          group: this.props.intl.formatMessage(messages.general),
+          title: this.props.intl.formatMessage(messages.urlmanagement),
         },
         {
           '@id': '/moderate-comments',

package/src/components/manage/Diff/Diff.jsx

@@ -27,6 +27,7 @@ import {
   FormattedDate,
   Icon,
   Toolbar,
+  Unauthorized,
 } from '@plone/volto/components';
 
 import backSVG from '@plone/volto/icons/back.svg';
@@ -66,6 +67,7 @@ class Diff extends Component {
     getSchema: PropTypes.func.isRequired,
     getHistory: PropTypes.func.isRequired,
     schema: PropTypes.objectOf(PropTypes.any),
+    error: PropTypes.objectOf(PropTypes.any),
     pathname: PropTypes.string.isRequired,
     one: PropTypes.string.isRequired,
     two: PropTypes.string.isRequired,
@@ -205,7 +207,9 @@ class Diff extends Component {
       }),
     );
 
-    return (
+    return this.props.error?.status === 401 ? (
+      <Unauthorized />
+    ) : (
       <Container id="page-diff">
         <Helmet title={this.props.intl.formatMessage(messages.diff)} />
         <h1>
@@ -363,12 +367,13 @@ export default compose(
       data: state.diff.data,
       historyEntries: state.history.entries,
       schema: state.schema.schema,
+      error: state.diff.error,
       pathname: props.location.pathname,
       one: qs.parse(props.location.search).one,
       two: qs.parse(props.location.search).two,
       view: qs.parse(props.location.search).view || 'split',
-      title: state.content.data.title,
-      type: state.content.data['@type'],
+      title: state.content.data?.title,
+      type: state.content.data?.['@type'],
     }),
     { getDiff, getSchema, getHistory },
   ),

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

@@ -6,8 +6,8 @@ import {
 } from '@plone/volto/helpers';
 
 const BlockDataForm = compose(
-  withVariationSchemaEnhancer,
   withStylingSchemaEnhancer,
+  withVariationSchemaEnhancer,
 )(InlineForm);
 
 export default BlockDataForm;

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

@@ -28,6 +28,7 @@ beforeAll(() => {
     },
     testBlock: {
       id: 'testBlock',
+      // enableStyling: true,
       variations: [
         {
           id: 'default',
@@ -143,4 +144,77 @@ describe('BlockDataForm', () => {
     // schema is cloned, not mutated in place
     expect(testSchema.fieldsets[0].fields).toStrictEqual([]);
   });
+
+  it('should add styling field to schema', () => {
+    config.blocks.blocksConfig.testBlock.enableStyling = true;
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    const testSchema = {
+      fieldsets: [{ title: 'Default', id: 'default', fields: [] }],
+      properties: {},
+      required: [],
+    };
+    const formData = {
+      '@type': 'testBlock',
+    };
+    const { container } = render(
+      <Provider store={store}>
+        <BlockDataForm
+          formData={formData}
+          schema={testSchema}
+          onChangeField={(id, value) => {}}
+        />
+      </Provider>,
+    );
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should allow variations to enhance styling schema', () => {
+    config.blocks.blocksConfig.testBlock.enableStyling = true;
+    let finalSchema; // the schema is cloned during enhancing; we need it for tests because the ObjectWidget is not rendered properly in the test
+    config.blocks.blocksConfig.testBlock.variations[0].schemaEnhancer = ({
+      schema,
+    }) => {
+      const stylesSchema = schema.properties.styles.schema;
+      stylesSchema.properties.extraField = { title: 'Extra field' };
+      stylesSchema.fieldsets[0].fields.push('extraField');
+      finalSchema = schema;
+      return schema;
+    };
+
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    const testSchema = {
+      fieldsets: [{ title: 'Default', id: 'default', fields: [] }],
+      properties: {},
+      required: [],
+    };
+    const formData = {
+      '@type': 'testBlock',
+    };
+    const { container } = render(
+      <Provider store={store}>
+        <BlockDataForm
+          formData={formData}
+          schema={testSchema}
+          onChangeField={(id, value) => {}}
+        />
+      </Provider>,
+    );
+    expect(container).toMatchSnapshot();
+    expect(
+      finalSchema.properties.styles.schema.properties.extraField,
+    ).toStrictEqual({ title: 'Extra field' });
+    expect(
+      finalSchema.properties.styles.schema.fieldsets[0].fields,
+    ).toStrictEqual(['align', 'extraField']);
+  });
 });

package/src/components/manage/Widgets/AlignWidget.stories.jsx

@@ -18,5 +18,10 @@ export default {
       </div>
     ),
   ],
-  argTypes: {},
+  argTypes: {
+    actions: {
+      control: 'check',
+      options: ['left', 'right', 'center', 'wide', 'full'],
+    },
+  },
 };

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

@@ -44,7 +44,7 @@ const NumberWidget = (props) => {
         disabled={isDisabled}
         min={minimum || null}
         max={maximum || null}
-        value={value || defaultValue}
+        value={value ?? defaultValue}
         placeholder={placeholder}
         onChange={({ target }) =>
           onChange(id, target.value === '' ? undefined : target.value)

package/src/helpers/FormValidation/FormValidation.js

@@ -40,7 +40,9 @@ const isMinPropertyValid = (value, valueToCompare, maxCriterion, intlFunc) => {
 const widgetValidation = {
   email: {
     isValidEmail: (emailValue, emailObj, intlFunc) => {
-      const emailRegex = /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/;
+      // Email Regex taken from from WHATWG living standard:
+      // https://html.spec.whatwg.org/multipage/input.html#e-mail-state-(type=email)
+      const emailRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
       const isValid = emailRegex.test(emailValue);
       return !isValid ? intlFunc(messages.isValidEmail) : null;
     },

package/src/helpers/FormValidation/FormValidation.test.js

@@ -76,5 +76,16 @@ describe('FormValidation', () => {
         email: [messages.isValidEmail.defaultMessage],
       });
     });
+
+    it('validates correct email', () => {
+      formData.email = 'test@domain.name';
+      expect(
+        FormValidation.validateFieldsPerFieldset({
+          schema,
+          formData,
+          formatMessage,
+        }),
+      ).toEqual({});
+    });
   });
 });