@plone/volto 18.0.0-alpha.41 → 18.0.0-alpha.43

package/src/config/Widgets.jsx

@@ -55,7 +55,6 @@ import ImageWidget from '@plone/volto/components/manage/Widgets/ImageWidget';
 // Widgets mapping
 export const widgetMapping = {
   id: {
-    schema: SchemaWidget,
     subjects: TokenWidget,
     query: QuerystringWidget,
     recurrence: RecurrenceWidget,
@@ -89,6 +88,7 @@ export const widgetMapping = {
     autocomplete: SelectAutoComplete,
     color_picker: ColorPickerWidget,
     select: SelectWidget,
+    schema: SchemaWidget,
   },
   vocabulary: {
     'plone.app.vocabularies.Catalog': ObjectBrowserWidget,

package/src/config/config.test.js

@@ -221,6 +221,7 @@ test('test navigation controlpanel fields', () => {
   const not_in_navigation = [
     'generate_tabs',
     'navigation_depth',
+    'nonfolderish_tabs',
     'sort_tabs_on',
     'sort_tabs_reversed',
     'sitemap_depth',

package/src/config/index.js

@@ -18,6 +18,7 @@ import {
 import { components } from './Components';
 import { loadables } from './Loadables';
 import { workflowMapping } from './Workflows';
+import slots from './slots';
 
 import { contentIcons } from './ContentIcons';
 import { styleClassNameConverters, styleClassNameExtenders } from './Style';
@@ -25,6 +26,7 @@ import {
   controlPanelsIcons,
   filterControlPanels,
   filterControlPanelsSchema,
+  unwantedControlPanelsFields,
 } from './ControlPanels';
 
 import applyAddonConfiguration, { addonsInfo } from 'load-volto-addons';
@@ -32,6 +34,7 @@ import applyAddonConfiguration, { addonsInfo } from 'load-volto-addons';
 import ConfigRegistry from '@plone/volto/registry';
 
 import { getSiteAsyncPropExtender } from '@plone/volto/helpers';
+import { registerValidators } from './validation';
 
 const host = process.env.HOST || 'localhost';
 const port = process.env.PORT || '3000';
@@ -97,7 +100,7 @@ let config = {
       process.env.RAZZLE_INTERNAL_API_PATH ||
       process.env.RAZZLE_API_PATH ||
       'http://localhost:8080/Plone', // Set it to '' for disabling the proxy
-    // proxyRewriteTarget Set it for set a custom target for the proxy or overide the internal VHM rewrite
+    // proxyRewriteTarget Set it for set a custom target for the proxy or override the internal VHM rewrite
     // proxyRewriteTarget: '/VirtualHostBase/http/localhost:8080/Plone/VirtualHostRoot/_vh_api'
     // proxyRewriteTarget: 'https://myvoltositeinproduction.com'
     proxyRewriteTarget: process.env.RAZZLE_PROXY_REWRITE_TARGET || undefined,
@@ -152,6 +155,7 @@ let config = {
     controlPanelsIcons,
     filterControlPanels,
     filterControlPanelsSchema,
+    unwantedControlPanelsFields,
     externalRoutes: [
       // URL to be considered as external
       // {
@@ -167,6 +171,7 @@ let config = {
     ],
     showSelfRegistration: false,
     contentMetadataTagsImageField: 'image',
+    contentPropertiesSchemaEnhancer: null,
     hasWorkingCopySupport: false,
     maxUndoLevels: 200, // undo history size for the main form
     addonsInfo: addonsInfo,
@@ -209,8 +214,9 @@ let config = {
   },
   addonRoutes: [],
   addonReducers: {},
-  slots: {},
   components,
+  slots: {},
+  utilities: {},
 };
 
 // The apiExpanders depends on a config of the object, so it's done here
@@ -238,5 +244,20 @@ ConfigRegistry.addonRoutes = config.addonRoutes;
 ConfigRegistry.addonReducers = config.addonReducers;
 ConfigRegistry.components = config.components;
 ConfigRegistry.slots = config.slots;
+ConfigRegistry.utilities = config.utilities;
+
+// Register slots
+Object.entries(slots).forEach(([slotName, components]) => {
+  components.forEach(({ name, component, predicates = [] }) => {
+    ConfigRegistry.registerSlotComponent({
+      slot: slotName,
+      name,
+      component,
+      predicates,
+    });
+  });
+});
+
+registerValidators(ConfigRegistry);
 
 applyAddonConfiguration(ConfigRegistry);

package/src/config/slots.js

@@ -0,0 +1,12 @@
+import { Tags } from '@plone/volto/components';
+
+const slots = {
+  belowContent: [
+    {
+      name: 'tags',
+      component: Tags,
+    },
+  ],
+};
+
+export default slots;

package/src/config/validation.ts

@@ -0,0 +1,155 @@
+import { ConfigType } from '@plone/registry';
+
+import {
+  minLengthValidator,
+  maxLengthValidator,
+  urlValidator,
+  emailValidator,
+  isNumberValidator,
+  maximumValidator,
+  minimumValidator,
+  isIntegerValidator,
+  maxItemsValidator,
+  minItemsValidator,
+  hasUniqueItemsValidator,
+  startEventDateRangeValidator,
+  endEventDateRangeValidator,
+  patternValidator,
+} from '@plone/volto/helpers/FormValidation/validators';
+
+const registerValidators = (config: ConfigType) => {
+  config.registerUtility({
+    name: 'minLength',
+    type: 'validator',
+    dependencies: { fieldType: 'string' },
+    method: minLengthValidator,
+  });
+
+  config.registerUtility({
+    name: 'maxLength',
+    type: 'validator',
+    dependencies: { fieldType: 'string' },
+    method: maxLengthValidator,
+  });
+
+  config.registerUtility({
+    name: 'pattern',
+    type: 'validator',
+    dependencies: { fieldType: 'string' },
+    method: patternValidator,
+  });
+
+  config.registerUtility({
+    name: 'minLength',
+    type: 'validator',
+    dependencies: { fieldType: 'password' },
+    method: minLengthValidator,
+  });
+
+  config.registerUtility({
+    name: 'maxLength',
+    type: 'validator',
+    dependencies: { fieldType: 'password' },
+    method: maxLengthValidator,
+  });
+
+  config.registerUtility({
+    name: 'pattern',
+    type: 'validator',
+    dependencies: { fieldType: 'password' },
+    method: patternValidator,
+  });
+
+  config.registerUtility({
+    name: 'email',
+    type: 'validator',
+    dependencies: { widget: 'email' },
+    method: emailValidator,
+  });
+
+  config.registerUtility({
+    name: 'url',
+    type: 'validator',
+    dependencies: { widget: 'url' },
+    method: urlValidator,
+  });
+
+  config.registerUtility({
+    name: 'number',
+    type: 'validator',
+    dependencies: { fieldType: 'number' },
+    method: isNumberValidator,
+  });
+
+  config.registerUtility({
+    name: 'minimum',
+    type: 'validator',
+    dependencies: { fieldType: 'number' },
+    method: minimumValidator,
+  });
+
+  config.registerUtility({
+    name: 'maximum',
+    type: 'validator',
+    dependencies: { fieldType: 'number' },
+    method: maximumValidator,
+  });
+
+  config.registerUtility({
+    name: 'integer',
+    type: 'validator',
+    dependencies: { fieldType: 'integer' },
+    method: isIntegerValidator,
+  });
+
+  config.registerUtility({
+    name: 'minimum',
+    type: 'validator',
+    dependencies: { fieldType: 'integer' },
+    method: minimumValidator,
+  });
+
+  config.registerUtility({
+    name: 'maximum',
+    type: 'validator',
+    dependencies: { fieldType: 'integer' },
+    method: maximumValidator,
+  });
+
+  config.registerUtility({
+    name: 'maxItems',
+    type: 'validator',
+    dependencies: { fieldType: 'array' },
+    method: maxItemsValidator,
+  });
+
+  config.registerUtility({
+    name: 'minItems',
+    type: 'validator',
+    dependencies: { fieldType: 'array' },
+    method: minItemsValidator,
+  });
+
+  config.registerUtility({
+    name: 'uniqueItems',
+    type: 'validator',
+    dependencies: { fieldType: 'array' },
+    method: hasUniqueItemsValidator,
+  });
+
+  config.registerUtility({
+    name: 'dateRangeValidator',
+    type: 'validator',
+    dependencies: { behaviorName: 'plone.eventbasic', fieldName: 'start' },
+    method: startEventDateRangeValidator,
+  });
+
+  config.registerUtility({
+    name: 'dateRangeValidator',
+    type: 'validator',
+    dependencies: { behaviorName: 'plone.eventbasic', fieldName: 'end' },
+    method: endEventDateRangeValidator,
+  });
+};
+
+export { registerValidators };

package/src/helpers/Blocks/Blocks.js

@@ -161,7 +161,7 @@ export function addBlock(formData, type, index, blocksConfig) {
 
   return [
     id,
-    _applyBlockInitialValue({
+    applyBlockInitialValue({
       id,
       value,
       blocksConfig,
@@ -197,8 +197,12 @@ export function addBlock(formData, type, index, blocksConfig) {
  * to call `onChangeBlock` at their creation time, as this is prone to racing
  * issue on block data storage.
  */
-const _applyBlockInitialValue = ({ id, value, blocksConfig, formData }) => {
-  const blocksFieldname = getBlocksFieldname(formData);
+export const applyBlockInitialValue = ({
+  id,
+  value,
+  blocksConfig,
+  formData,
+}) => {
   const type = value['@type'];
   blocksConfig = blocksConfig || config.blocks.blocksConfig;
 
@@ -208,6 +212,7 @@ const _applyBlockInitialValue = ({ id, value, blocksConfig, formData }) => {
       value,
       formData,
     });
+    const blocksFieldname = getBlocksFieldname(formData);
     formData[blocksFieldname][id] = value;
   }
 
@@ -238,7 +243,7 @@ export function mutateBlock(formData, id, value, blocksConfig) {
   const trailId = formData[blocksLayoutFieldname].items[index];
   if (trailId) {
     const block = formData[blocksFieldname][trailId];
-    newFormData = _applyBlockInitialValue({
+    newFormData = applyBlockInitialValue({
       id,
       value,
       blocksConfig,
@@ -256,7 +261,7 @@ export function mutateBlock(formData, id, value, blocksConfig) {
   }
 
   const idTrailingBlock = uuid();
-  newFormData = _applyBlockInitialValue({
+  newFormData = applyBlockInitialValue({
     id,
     value,
     blocksConfig,
@@ -307,8 +312,8 @@ export function insertBlock(
   });
 
   const newBlockId = uuid();
-  const newFormData = _applyBlockInitialValue({
-    id,
+  const newFormData = applyBlockInitialValue({
+    id: newBlockId,
     value,
     blocksConfig,
     formData: {

package/src/helpers/Blocks/Blocks.test.js

@@ -511,6 +511,21 @@ describe('Blocks', () => {
       });
     });
 
+    it('initializes data for new block with initialValue in insertBlock', () => {
+      const [newId, form] = insertBlock(
+        {
+          blocks: { a: { value: 1 }, b: { value: 2 } },
+          blocks_layout: { items: ['a', 'b'] },
+        },
+        'b',
+        { '@type': 'dummyText' },
+      );
+      expect(form.blocks[newId]).toStrictEqual({
+        '@type': 'dummyText',
+        marker: true,
+      });
+    });
+
     it('initializes data for new block based on schema defaults', () => {
       const [newId, form] = addBlock(
         {

package/src/helpers/Blocks/cloneBlocks.ts

@@ -4,7 +4,7 @@ import {
   getBlocksFieldname,
   getBlocksLayoutFieldname,
   hasBlocksData,
-} from './Blocks';
+} from '@plone/volto/helpers/Blocks/Blocks';
 import config from '@plone/registry';
 
 export function cloneBlocks(blocksData) {

package/src/helpers/Extensions/withBlockExtensions.jsx

@@ -51,7 +51,7 @@ export function resolveExtension(name, extensions, data) {
  * - extensions is the blocksConfig extensions object for that block
  * - resolvedExtensions is an object with
  *   `{ variation, <someExtensionA>, <someExtensionB> }` and each of these
- *   fields hold the coresponding definition object from the block's
+ *   fields hold the corresponding definition object from the block's
  *   configuration.
  */
 export function resolveBlockExtensions(data, blocksConfig) {