@plone/volto 18.7.0 → 18.8.1

package/src/helpers/Blocks/Blocks.js

@@ -120,9 +120,10 @@ export function moveBlock(formData, source, destination) {
  * @function deleteBlock
  * @param {Object} formData Form data
  * @param {string} blockId Block uid
+ * @param {Object} intl intl object.
  * @return {Object} New form data
  */
-export function deleteBlock(formData, blockId) {
+export function deleteBlock(formData, blockId, intl) {
   const blocksFieldname = getBlocksFieldname(formData);
   const blocksLayoutFieldname = getBlocksLayoutFieldname(formData);
 
@@ -135,7 +136,13 @@ export function deleteBlock(formData, blockId) {
   };
 
   if (newFormData[blocksLayoutFieldname].items.length === 0) {
-    newFormData = addBlock(newFormData, config.settings.defaultBlockType, 0);
+    newFormData = addBlock(
+      newFormData,
+      config.settings.defaultBlockType,
+      0,
+      {},
+      intl,
+    );
   }
 
   return newFormData;
@@ -147,9 +154,11 @@ export function deleteBlock(formData, blockId) {
  * @param {Object} formData Form data
  * @param {string} type Block type
  * @param {number} index Destination index
+ * @param {Object} blocksConfig Blocks configuration.
+ * @param {Object} intl intl object.
  * @return {Array} New block id, New form data
  */
-export function addBlock(formData, type, index, blocksConfig) {
+export function addBlock(formData, type, index, blocksConfig, intl) {
   const { settings } = config;
   const id = uuid();
   const idTrailingBlock = uuid();
@@ -192,6 +201,7 @@ export function addBlock(formData, type, index, blocksConfig) {
         },
         selected: id,
       },
+      intl,
     }),
   ];
 }
@@ -208,6 +218,7 @@ export const applyBlockInitialValue = ({
   value,
   blocksConfig,
   formData,
+  intl,
 }) => {
   const type = value['@type'];
   blocksConfig = blocksConfig || config.blocks.blocksConfig;
@@ -217,6 +228,7 @@ export const applyBlockInitialValue = ({
       id,
       value,
       formData,
+      intl,
     });
     const blocksFieldname = getBlocksFieldname(formData);
     formData[blocksFieldname][id] = value;
@@ -231,9 +243,11 @@ export const applyBlockInitialValue = ({
  * @param {Object} formData Form data
  * @param {string} id Block uid to mutate
  * @param {number} value Block's new value
+ * @param {Object} blocksConfig Blocks configuration.
+ * @param {Object} intl intl object.
  * @return {Object} New form data
  */
-export function mutateBlock(formData, id, value, blocksConfig) {
+export function mutateBlock(formData, id, value, blocksConfig, intl) {
   const { settings } = config;
   const blocksFieldname = getBlocksFieldname(formData);
   const blocksLayoutFieldname = getBlocksLayoutFieldname(formData);
@@ -260,6 +274,7 @@ export function mutateBlock(formData, id, value, blocksConfig) {
           [id]: value || null,
         },
       },
+      intl,
     });
     if (!blockHasValue(block)) {
       return newFormData;
@@ -288,6 +303,7 @@ export function mutateBlock(formData, id, value, blocksConfig) {
         ],
       },
     },
+    intl,
   });
   return newFormData;
 }
@@ -298,6 +314,10 @@ export function mutateBlock(formData, id, value, blocksConfig) {
  * @param {Object} formData Form data
  * @param {string} id Insert new block before the block with this id
  * @param {number} value New block's value
+ * @param {Object} current Current block
+ * @param {number} offset offset position
+ * @param {Object} blocksConfig Blocks configuration.
+ * @param {Object} intl intl object.
  * @return {Array} New block id, New form data
  */
 export function insertBlock(
@@ -307,6 +327,7 @@ export function insertBlock(
   current = {},
   offset = 0,
   blocksConfig,
+  intl,
 ) {
   const blocksFieldname = getBlocksFieldname(formData);
   const blocksLayoutFieldname = getBlocksLayoutFieldname(formData);
@@ -340,6 +361,7 @@ export function insertBlock(
         ],
       },
     },
+    intl,
   });
 
   return [newBlockId, newFormData];

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

@@ -568,6 +568,52 @@ describe('Blocks', () => {
         marker: true,
       });
     });
+
+    it('initialValue with intl', () => {
+      // Mock intl with formatMessage function
+      const intl = {
+        formatMessage: jest.fn(({ id }) => id),
+      };
+
+      const messages = {
+        intl: {
+          id: 'intl',
+          defaultMessage: 'intl',
+        },
+      };
+
+      config.blocks.blocksConfig.text.initialValue = ({
+        id,
+        value,
+        formData,
+        intl,
+      }) => {
+        return {
+          ...formData.blocks[id],
+          intl: intl.formatMessage(messages.intl),
+        };
+      };
+      const [newId, form] = addBlock(
+        {
+          blocks: { a: { value: 1 }, b: { value: 2 } },
+          blocks_layout: { items: ['a', 'b'] },
+        },
+        'text',
+        1,
+        config.blocks.blocksConfig,
+        intl,
+      );
+
+      delete config.blocks.blocksConfig.text.initialValue;
+
+      expect(form.blocks[newId]).toStrictEqual({
+        '@type': 'text',
+        booleanField: false,
+        description: 'Default description',
+        title: 'Default title',
+        intl: 'intl',
+      });
+    });
   });
 
   describe('moveBlock', () => {

package/src/helpers/FormValidation/validators.ts

@@ -171,7 +171,9 @@ export const patternValidator = ({
   }
   const regex = new RegExp(field.pattern);
   const isValid = regex.test(value);
-  return !isValid ? formatMessage(messages.pattern) : null;
+  return !isValid
+    ? formatMessage(messages.pattern, { pattern: field.pattern })
+    : null;
 };
 
 export const maxItemsValidator = ({

package/src/helpers/Robots/Robots.js

@@ -1,10 +1,12 @@
 /**
- * Sitemap helper.
- * @module helpers/Sitemap
+ * Robots helper.
+ * @module helpers/Robots
  */
 
 import superagent from 'superagent';
+
 import config from '@plone/volto/registry';
+import { formatUrl } from '@plone/volto/helpers/Api/Api';
 import { addHeadersFactory } from '@plone/volto/helpers/Proxy/Proxy';
 
 /**
@@ -15,43 +17,22 @@ import { addHeadersFactory } from '@plone/volto/helpers/Proxy/Proxy';
  */
 export const generateRobots = (req) =>
   new Promise((resolve) => {
-    const internalUrl =
-      config.settings.internalApiPath ??
-      config.settings.devProxyToApiPath ??
-      config.settings.apiPath;
-    const request = superagent.get(`${internalUrl}/robots.txt`);
-    request.set('Accept', 'text/plain');
+    const request = superagent.get(formatUrl('@site'));
+    request.set('Accept', 'application/json');
     const authToken = req.universalCookies.get('auth_token');
     if (authToken) {
       request.set('Authorization', `Bearer ${authToken}`);
     }
     request.use(addHeadersFactory(req));
-    request.end((error, { text }) => {
+    request.end((error, { text, body }) => {
       if (error) {
         resolve(text || error);
       } else {
-        // It appears that express does not take the x-forwarded headers into
-        // consideration, so we do it ourselves.
-        const {
-          'x-forwarded-proto': forwardedProto,
-          'x-forwarded-host': forwardedHost,
-          'x-forwarded-port': forwardedPort,
-        } = req.headers;
-        const proto = forwardedProto ?? req.protocol;
-        const host = forwardedHost ?? req.get('Host');
-        const portNum = forwardedPort ?? req.get('Port');
-        const port =
-          (proto === 'https' && '' + portNum === '443') ||
-          (proto === 'http' && '' + portNum === '80')
-            ? ''
-            : `:${portNum}`;
-        // Plone has probably returned the sitemap link with the internal url.
-        // If so, let's replace it with the current one.
-        const url = `${proto}://${host}${port}`;
-        text = text.replace(internalUrl, url);
-        // Replace the sitemap with the sitemap index.
-        text = text.replace('sitemap.xml.gz', 'sitemap-index.xml');
-        resolve(text);
+        resolve(
+          body['plone.robots_txt']
+            .replace('{portal_url}', config.settings.publicURL)
+            .replace('sitemap.xml.gz', 'sitemap-index.xml'),
+        );
       }
     });
   });

package/types/helpers/Api/Api.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Format the url.
+ * @function formatUrl
+ * @param {string} path Path (or URL) to be formatted.
+ * @returns {string} Formatted path.
+ */
+export function formatUrl(path: string): string;
 export default Api;
 /**
  * Api class.

package/types/helpers/Blocks/Blocks.d.ts

@@ -40,36 +40,45 @@ export function moveBlock(formData: any, source: number, destination: number): a
  * @function deleteBlock
  * @param {Object} formData Form data
  * @param {string} blockId Block uid
+ * @param {Object} intl intl object.
  * @return {Object} New form data
  */
-export function deleteBlock(formData: any, blockId: string): any;
+export function deleteBlock(formData: any, blockId: string, intl: any): any;
 /**
  * Adds a block to the blocks form
  * @function addBlock
  * @param {Object} formData Form data
  * @param {string} type Block type
  * @param {number} index Destination index
+ * @param {Object} blocksConfig Blocks configuration.
+ * @param {Object} intl intl object.
  * @return {Array} New block id, New form data
  */
-export function addBlock(formData: any, type: string, index: number, blocksConfig: any): any[];
+export function addBlock(formData: any, type: string, index: number, blocksConfig: any, intl: any): any[];
 /**
  * Mutate block, changes the block @type
  * @function mutateBlock
  * @param {Object} formData Form data
  * @param {string} id Block uid to mutate
  * @param {number} value Block's new value
+ * @param {Object} blocksConfig Blocks configuration.
+ * @param {Object} intl intl object.
  * @return {Object} New form data
  */
-export function mutateBlock(formData: any, id: string, value: number, blocksConfig: any): any;
+export function mutateBlock(formData: any, id: string, value: number, blocksConfig: any, intl: any): any;
 /**
  * Insert new block before another block
  * @function insertBlock
  * @param {Object} formData Form data
  * @param {string} id Insert new block before the block with this id
  * @param {number} value New block's value
+ * @param {Object} current Current block
+ * @param {number} offset offset position
+ * @param {Object} blocksConfig Blocks configuration.
+ * @param {Object} intl intl object.
  * @return {Array} New block id, New form data
  */
-export function insertBlock(formData: any, id: string, value: number, current: {}, offset: number, blocksConfig: any): any[];
+export function insertBlock(formData: any, id: string, value: number, current: any, offset: number, blocksConfig: any, intl: any): any[];
 /**
  * Change block
  * @function changeBlock
@@ -167,11 +176,12 @@ export function findBlocks(blocks: {}, types: any, result?: any[]): any[];
  */
 export function moveBlockEnhanced(formData: any, { source, destination }: number): any;
 export function getBlocks(properties: any): any[];
-export function applyBlockInitialValue({ id, value, blocksConfig, formData, }: {
+export function applyBlockInitialValue({ id, value, blocksConfig, formData, intl, }: {
     id: any;
     value: any;
     blocksConfig: any;
     formData: any;
+    intl: any;
 }): any;
 export function styleToClassName(key: any, value: any, prefix?: string): any;
 export function buildStyleClassNamesFromData(obj?: {}, prefix?: string): any;

package/.registry.loader.js

@@ -1,36 +0,0 @@
-/*
-This file is autogenerated. Don't change it directly.
-Instead, change the "addons" setting in your package.json file.
-*/
-
-const addonsInfo = [];
-export { addonsInfo };
-
-const safeWrapper = (func) => (config) => {
-  const res = func(config);
-  if (typeof res === 'undefined') {
-    throw new Error("Configuration function doesn't return config");
-  }
-  return res;
-};
-
-const projectConfigLoader = false;
-const projectConfig = (config) => {
-  return projectConfigLoader &&
-    typeof projectConfigLoader.default === 'function'
-    ? projectConfigLoader.default(config)
-    : config;
-};
-
-const load = (config) => {
-  const addonLoaders = [];
-  if (!addonLoaders.every((el) => typeof el === 'function')) {
-    throw new TypeError(
-      'Each addon has to provide a function applying its configuration to the projects configuration.',
-    );
-  }
-  return projectConfig(
-    addonLoaders.reduce((acc, apply) => safeWrapper(apply)(acc), config),
-  );
-};
-export default load;

package/public/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-