@plone/volto 18.32.4 → 18.33.0

package/src/express-middleware/devproxy.js

@@ -78,11 +78,13 @@ export default function devProxyMiddleware() {
     },
     pathRewrite: (path, req) => {
       const { apiPathURL, instancePath } = getEnv();
+      const port =
+        apiPathURL.port || (apiPathURL.protocol === 'https:' ? 443 : 80);
       const target =
         config.settings.proxyRewriteTarget ||
         `/VirtualHostBase/${apiPathURL.protocol.slice(0, -1)}/${
           apiPathURL.hostname
-        }:${apiPathURL.port}${instancePath}/++api++/VirtualHostRoot`;
+        }:${port}${instancePath}/++api++/VirtualHostRoot`;
 
       return `${target}${path.replace('/++api++', '')}`;
     },

package/src/express-middleware/files.js

@@ -3,6 +3,7 @@ import { getAPIResourceWithAuth } from '@plone/volto/helpers/Api/APIResourceWith
 
 const HEADERS = [
   'accept-ranges',
+  'cache-status',
   'cache-control',
   'content-disposition',
   'content-range',

package/src/express-middleware/files.test.js

@@ -0,0 +1,59 @@
+import filesMiddleware from './files';
+import { getAPIResourceWithAuth } from '@plone/volto/helpers/Api/APIResourceWithAuth';
+
+vi.mock('@plone/volto/helpers/Api/APIResourceWithAuth', () => ({
+  getAPIResourceWithAuth: vi.fn(),
+}));
+
+describe('files middleware', () => {
+  it('handles requests containing @@download and forwards headers/body', async () => {
+    getAPIResourceWithAuth.mockResolvedValue({
+      headers: {
+        'content-type': 'text/plain',
+        'cache-status': 'Souin; hit; ttl=664',
+      },
+      body: 'OK',
+      get(name) {
+        return this.headers[name];
+      },
+      statusCode: 200,
+    });
+
+    const mw = filesMiddleware();
+    const layer = mw.stack.find(
+      (l) => l.regexp && l.regexp.source.includes('@@download'),
+    );
+    expect(layer).toBeTruthy();
+
+    const req = {
+      path: '/some/@@download',
+      method: 'GET',
+      app: { locals: {} },
+    };
+    const res = {
+      headers: {},
+      set(name, val) {
+        this.headers[name] = val;
+      },
+      status(code) {
+        this.statusCode = code;
+        return this;
+      },
+      send(body) {
+        this.body = body;
+      },
+    };
+
+    // invoke the middleware handler for that layer
+    layer.handle(req, res, (err) => {
+      if (err) throw err;
+    });
+
+    await new Promise(process.nextTick);
+
+    expect(res.body).toBe('OK');
+    expect(res.statusCode).toBe(200);
+    expect(res.headers['content-type']).toBe('text/plain');
+    expect(res.headers['cache-status']).toBe('Souin; hit; ttl=664');
+  });
+});

package/src/express-middleware/images.js

@@ -4,6 +4,7 @@ import { getAPIResourceWithAuth } from '@plone/volto/helpers/Api/APIResourceWith
 const HEADERS = [
   'content-type',
   'content-disposition',
+  'cache-status',
   'cache-control',
   'x-sendfile',
   'x-accel-redirect',

package/src/express-middleware/images.test.js

@@ -0,0 +1,50 @@
+import imagesMiddleware from './images';
+import { getAPIResourceWithAuth } from '@plone/volto/helpers/Api/APIResourceWithAuth';
+
+vi.mock('@plone/volto/helpers/Api/APIResourceWithAuth', () => ({
+  getAPIResourceWithAuth: vi.fn(),
+}));
+
+describe('images middleware', () => {
+  it('handles requests containing @@images and forwards headers/body', async () => {
+    getAPIResourceWithAuth.mockResolvedValue({
+      headers: {
+        'content-type': 'image/png',
+        'cache-status': 'Souin; hit; ttl=664',
+      },
+      body: 'OK',
+    });
+
+    const mw = imagesMiddleware();
+    const layer = mw.stack.find(
+      (l) => l.regexp && l.regexp.source.includes('@@images'),
+    );
+    expect(layer).toBeTruthy();
+
+    const req = {
+      path: '/some/@@images/image',
+      method: 'GET',
+      app: { locals: {} },
+    };
+    const res = {
+      headers: {},
+      set(name, val) {
+        this.headers[name] = val;
+      },
+      send(body) {
+        this.body = body;
+      },
+    };
+
+    // invoke the middleware handler for that layer
+    layer.handle(req, res, (err) => {
+      if (err) throw err;
+    });
+
+    await new Promise(process.nextTick);
+
+    expect(res.body).toBe('OK');
+    expect(res.headers['content-type']).toBe('image/png');
+    expect(res.headers['cache-status']).toBe('Souin; hit; ttl=664');
+  });
+});

package/src/helpers/Blocks/Blocks.js

@@ -852,12 +852,12 @@ export const getBlocksHierarchy = (properties) => {
   const blocksLayoutFieldname = getBlocksLayoutFieldname(properties);
   return properties[blocksLayoutFieldname]?.items?.map((n) => ({
     id: n,
-    title: properties[blocksFieldName][n]?.['@type'],
-    data: properties[blocksFieldName][n],
-    children: isBlockContainer(properties[blocksFieldName][n])
-      ? properties[blocksFieldName][n].data
-        ? getBlocksHierarchy(properties[blocksFieldName][n].data)
-        : getBlocksHierarchy(properties[blocksFieldName][n])
+    title: properties?.[blocksFieldName]?.[n]?.['@type'],
+    data: properties?.[blocksFieldName]?.[n],
+    children: isBlockContainer(properties?.[blocksFieldName]?.[n])
+      ? properties?.[blocksFieldName]?.[n]?.data
+        ? getBlocksHierarchy(properties?.[blocksFieldName]?.[n]?.data)
+        : getBlocksHierarchy(properties?.[blocksFieldName]?.[n])
       : [],
   }));
 };

package/src/helpers/Utils/Utils.jsx

@@ -37,6 +37,23 @@ export const safeWrapper = (func) => (config) => {
   return res;
 };
 
+/**
+ * Extract a readable error message from several possible error shapes
+ * @param {object} error
+ * @returns {string} message
+ */
+export const getErrorMessage = (error) => {
+  const respBody = error?.response?.body;
+  if (respBody?.error?.message) return respBody.error.message;
+  if (respBody?.message) return respBody.message;
+  if (error?.message) return error.message;
+  try {
+    return JSON.stringify(error);
+  } catch (e) {
+    return String(error);
+  }
+};
+
 /**
  * A helper to pipe a configuration object through configuration loaders
  *

package/src/helpers/Utils/Utils.test.jsx

@@ -3,6 +3,7 @@ import config from '@plone/volto/registry';
 import {
   applyConfig,
   difference,
+  getErrorMessage,
   getColor,
   getInitials,
   hasApiExpander,
@@ -246,6 +247,44 @@ describe('Utils tests', () => {
     });
   });
 
+  describe('getErrorMessage', () => {
+    it('returns nested backend error message', () => {
+      const error = {
+        response: {
+          body: {
+            error: {
+              message: 'Backend nested message',
+            },
+          },
+        },
+      };
+
+      expect(getErrorMessage(error)).toEqual('Backend nested message');
+    });
+
+    it('returns body message when present', () => {
+      const error = {
+        response: {
+          body: {
+            message: 'Backend body message',
+          },
+        },
+      };
+
+      expect(getErrorMessage(error)).toEqual('Backend body message');
+    });
+
+    it('returns generic error.message fallback', () => {
+      expect(getErrorMessage(new Error('Generic message'))).toEqual(
+        'Generic message',
+      );
+    });
+
+    it('returns stringified object as final fallback', () => {
+      expect(getErrorMessage({ foo: 'bar' })).toEqual('{"foo":"bar"}');
+    });
+  });
+
   describe('safeWrapper', () => {
     it('calls the function with config', () => {
       expect(

package/src/middleware/api.js

@@ -251,9 +251,13 @@ const apiMiddlewareFactory =
               const langFileName = toGettextLang(lang);
               import(
                 /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
-              ).then((locale) => {
-                dispatch(changeLanguage(lang, locale.default));
-              });
+              )
+                .then((locale) => {
+                  dispatch(changeLanguage(lang, locale.default));
+                })
+                .catch(() => {
+                  dispatch(changeLanguage(lang, {}));
+                });
             }
           }
 

package/src/server.jsx

@@ -8,7 +8,6 @@ import express from 'express';
 import { renderToString } from 'react-dom/server';
 import { createMemoryHistory } from 'history';
 import { parse as parseUrl } from 'url';
-import keys from 'lodash/keys';
 import locale from 'locale';
 import { detect } from 'detect-browser';
 import path from 'path';
@@ -33,12 +32,8 @@ import {
 import { changeLanguage } from '@plone/volto/actions/language/language';
 
 import userSession from '@plone/volto/reducers/userSession/userSession';
-
-import ErrorPage from '@plone/volto/error';
-
-import languages from '@plone/volto/constants/Languages.cjs';
-
 import configureStore from '@plone/volto/store';
+import ErrorPage from '@plone/volto/error';
 import { ReduxAsyncConnect, loadOnServer } from './helpers/AsyncConnect';
 
 let locales = {};
@@ -46,11 +41,15 @@ let locales = {};
 if (config.settings) {
   config.settings.supportedLanguages.forEach((lang) => {
     const langFileName = toGettextLang(lang);
-    import(
-      /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
-    ).then((locale) => {
-      locales = { ...locales, [toReactIntlLang(lang)]: locale.default };
-    });
+    import(/* @vite-ignore */ '@root/../locales/' + langFileName + '.json')
+      .then((locale) => {
+        locales = { ...locales, [toReactIntlLang(lang)]: locale.default };
+      })
+      .catch(() => {
+        debug('i18n')(
+          `Locale file for ${lang} not found, using empty messages.`,
+        );
+      });
   });
 }
 
@@ -58,7 +57,10 @@ function reactIntlErrorHandler(error) {
   debug('i18n')(error);
 }
 
-const supported = new locale.Locales(keys(languages), 'en');
+const supported = new locale.Locales(
+  config.settings.supportedLanguages,
+  config.settings.defaultLanguage,
+);
 
 const server = express()
   .disable('x-powered-by')

package/test-setup-globals-vitest.js

@@ -44,3 +44,28 @@ vi.stubGlobal('sessionStorage', {
   removeItem: vi.fn(),
   clear: vi.fn(),
 });
+
+global.jest = {
+  fn: vi.fn.bind(vi),
+};
+
+// Mock IntersectionObserver for Vitest
+const IntersectionObserverMock = vi.fn((callback, options = {}) => {
+  const instance = {
+    thresholds: Array.isArray(options.threshold)
+      ? options.threshold
+      : [options.threshold ?? 0],
+    root: options.root ?? null,
+    rootMargin: options.rootMargin ?? '',
+    observe: vi.fn(),
+    unobserve: vi.fn(),
+    disconnect: vi.fn(),
+    takeRecords: vi.fn(() => []),
+  };
+
+  return instance;
+});
+
+vi.stubGlobal('IntersectionObserver', IntersectionObserverMock);
+global.IntersectionObserver = IntersectionObserverMock;
+window.IntersectionObserver = IntersectionObserverMock;

package/theme/themes/pastanaga/extras/widgets.less

@@ -280,6 +280,23 @@ body.babel-view .field.language-independent-field {
     }
   }
 }
+// FileWidget
+.file-widget-dropzone {
+  .label-file-widget-input {
+    .visually-hidden {
+      position: absolute;
+      overflow: hidden;
+      width: 1px;
+      height: 1px;
+      padding: 0;
+      border: 0;
+      margin: -1px;
+      clip: rect(1px, 1px, 1px, 1px); /* IE-style CSS for compatibility */
+      white-space: nowrap;
+      word-wrap: normal;
+    }
+  }
+}
 
 // ### FormFieldWrapper ###
 .language-independent-field .wrapper > label {

package/types/components/manage/Toolbar/Types.crash.test.d.ts

@@ -0,0 +1 @@
+export {};

package/types/helpers/Utils/Utils.d.ts

@@ -35,6 +35,7 @@ export function normalizeString(str: string): string;
  */
 export function isInteractiveElement(element: node, interactiveElements?: string[]): boolean;
 export function safeWrapper(func: Function): (config: any) => any;
+export function getErrorMessage(error: object): string;
 export function getInitials(title: any, limit: any): string;
 export function getColor(name: any): any;
 export function parseDateTime(locale: string, value: string, format: string, moment: any): any | string;

package/vitest.config.mjs

@@ -12,58 +12,103 @@ const __dirname = path.dirname(__filename);
 
 const projectRoot = path.resolve(__dirname);
 
-export default defineConfig({
-  plugins: [
-    react(),
-    svgLoader({
-      svgoConfig: {
-        plugins: [
-          {
-            name: 'preset-default',
-            params: {
-              overrides: {
-                convertPathData: false,
-                removeViewBox: false,
-              },
+const sharedAliases = {
+  '@plone/volto': path.resolve(__dirname, 'src'),
+  '@plone/volto-slate': path.resolve(__dirname, '../volto-slate/src'),
+  '@root': path.resolve(__dirname, 'src'),
+  '@plone/components': path.resolve(__dirname, '../components/src'),
+  'promise-file-reader': require.resolve('promise-file-reader'),
+  'react-dropzone': require.resolve('react-dropzone'),
+  'prop-types': require.resolve('prop-types'),
+  'react-intl-redux': require.resolve('react-intl-redux'),
+};
+
+// volto-slate specific aliases 
+const voltoSlateAliases = {
+  ...sharedAliases,
+  'react-test-renderer': require.resolve('react-test-renderer'),
+  'redux': require.resolve('redux'), 
+};
+
+const sharedPlugins = [
+  react(),
+  svgLoader({
+    svgoConfig: {
+      plugins: [
+        {
+          name: 'preset-default',
+          params: {
+            overrides: {
+              convertPathData: false,
+              removeViewBox: false,
             },
           },
-          'removeTitle',
-          'removeUselessStrokeAndFill',
-        ],
-      },
-    }),
-  ],
-  resolve: {
-    alias: {
-      '@plone/volto': path.resolve(__dirname, 'src'),
-      '@plone/volto-slate': path.resolve(__dirname, '../volto-slate/src'),
-      '@root': path.resolve(__dirname, 'src'),
-      'promise-file-reader': require.resolve('promise-file-reader'),
-      'react-dropzone': require.resolve('react-dropzone'),
-      'prop-types': require.resolve('prop-types'),
+        },
+        'removeTitle',
+        'removeUselessStrokeAndFill',
+      ],
     },
+  }),
+];
+
+export default defineConfig({
+  plugins: sharedPlugins,
+  resolve: {
+    alias: sharedAliases,
   },
   test: {
-    isolate: true,
-    deps: {
-      moduleDirectories: ['node_modules'],
-    },
-    snapshotFormat: { printBasicPrototype: false },
-    globals: true,
-    environment: 'jsdom',
-    setupFiles: [
-      `${projectRoot}/test-setup-globals-vitest.js`,
-      `${projectRoot}/test-setup-config.jsx`,
-      `${projectRoot}/jest-setup-afterenv.js`,
-      `${projectRoot}/jest-addons-loader.js`,
+    projects: [
+      // Volto main project
+      {
+        test: {
+          name: 'volto',
+          root: '.',
+          isolate: true,
+          globals: true,
+          environment: 'jsdom',
+          setupFiles: [
+            `${projectRoot}/test-setup-globals-vitest.js`,
+            `${projectRoot}/test-setup-config.jsx`,
+            `${projectRoot}/jest-setup-afterenv.js`,
+            `${projectRoot}/jest-addons-loader.js`,
+          ],
+          globalSetup: `${projectRoot}/global-test-setup.js`,
+        },
+        resolve: {
+          alias: sharedAliases,
+        },
+        plugins: sharedPlugins,
+      },
+      // volto-slate project
+      {
+        test: {
+          name: 'volto-slate',
+          root: '../volto-slate',
+          isolate: true,
+          globals: true,
+          environment: 'jsdom',
+          setupFiles: [
+            `${projectRoot}/test-setup-globals-vitest.js`,
+            `${projectRoot}/test-setup-config.jsx`,
+            `${projectRoot}/jest-setup-afterenv.js`,
+            `${projectRoot}/jest-addons-loader.js`,
+          ],
+          globalSetup: `${projectRoot}/global-test-setup.js`,
+        },
+        resolve: {
+          alias: voltoSlateAliases,
+        },
+        plugins: sharedPlugins,
+      },
     ],
-    globalSetup: `${projectRoot}/global-test-setup.js`,
+    snapshotFormat: { printBasicPrototype: false },
     coverage: {
       provider: 'v8',
       reporter: ['text', 'json', 'html'],
       include: [
         'src/**/*.{test,spec}.{js,ts,jsx,tsx}',
         '__test__/**/*.{test,spec}.{js,ts,jsx,tsx}',
+        '../volto-slate/src/**/*.{test,spec}.{js,ts,jsx,tsx}',
       ],
       exclude: [
         'node_modules/**',
@@ -75,3 +120,4 @@ export default defineConfig({
     css: true,
   },
 });
+