@plone/volto 17.0.0-alpha.5 → 17.0.0-alpha.7

package/src/helpers/Utils/Utils.test.js

@@ -6,7 +6,7 @@ import {
   getColor,
   getInitials,
   hasApiExpander,
-  normalizeLanguageName,
+  toGettextLang,
   parseDateTime,
   removeFromArray,
   reorderArray,
@@ -284,12 +284,12 @@ describe('Utils tests', () => {
     });
   });
 
-  describe('normalizeLanguageName', () => {
+  describe('toGettextLang', () => {
     it('Normalizes an extended language (pt_BR)', () => {
-      expect(normalizeLanguageName('pt-br')).toStrictEqual('pt_BR');
+      expect(toGettextLang('pt-br')).toStrictEqual('pt_BR');
     });
     it('Normalizes a simple language (ca)', () => {
-      expect(normalizeLanguageName('ca')).toStrictEqual('ca');
+      expect(toGettextLang('ca')).toStrictEqual('ca');
     });
   });
 

package/src/helpers/index.js

@@ -80,11 +80,16 @@ export {
   applyConfig,
   withServerErrorCode,
   parseDateTime,
-  normalizeLanguageName,
-  toLangUnderscoreRegion,
+  toGettextLang,
+  normalizeLanguageName, // old name for toGettextLang
+  toReactIntlLang,
+  toLangUnderscoreRegion, // old name for toReactIntlLang
+  toBackendLang,
   hasApiExpander,
   replaceItemOfArray,
   cloneDeepSchema,
+  arrayRange,
+  reorderArray,
 } from '@plone/volto/helpers/Utils/Utils';
 export { messages } from './MessageLabels/MessageLabels';
 export {

package/src/middleware/Api.test.js

@@ -53,6 +53,60 @@ describe('api middleware helpers', () => {
     );
     expect(result).toEqual('/de/mypage/@navigation?expand.navigation.depth=3');
   });
+  it('addExpandersToPath - Path matching, preserve query', () => {
+    config.settings.apiExpanders = [
+      {
+        match: '/de/mypage',
+        GET_CONTENT: ['mycustomexpander', 'mycustomexpander2'],
+      },
+    ];
+
+    const result = addExpandersToPath(
+      '/de/mypage/@navigation?expand.navigation.depth=3',
+      GET_CONTENT,
+    );
+    expect(result).toEqual(
+      '/de/mypage/@navigation?expand=mycustomexpander,mycustomexpander2&expand.navigation.depth=3',
+    );
+  });
+  it('addExpandersToPath - Path matching, preserve query with multiple', () => {
+    config.settings.apiExpanders = [
+      {
+        match: '/de/mypage',
+        GET_CONTENT: ['mycustomexpander', 'mycustomexpander2'],
+      },
+    ];
+
+    const result = addExpandersToPath(
+      '/de/mypage/@navigation?expand.navigation.depth=3&expand.other=2',
+      GET_CONTENT,
+    );
+    expect(result).toEqual(
+      '/de/mypage/@navigation?expand=mycustomexpander,mycustomexpander2&expand.navigation.depth=3&expand.other=2',
+    );
+  });
+  it('addExpandersToPath - Path not matching, preserve encoded query', () => {
+    config.settings.apiExpanders = [
+      {
+        match: '/de/otherpath',
+        GET_CONTENT: ['mycustomexpander'],
+      },
+    ];
+
+    const result = addExpandersToPath('/de/mypage?query=a%26b', GET_CONTENT);
+    expect(result).toEqual('/de/mypage?query=a%26b');
+  });
+  it('addExpandersToPath - Path matching, preserve encoded query', () => {
+    config.settings.apiExpanders = [
+      {
+        match: '/de/mypage',
+        GET_CONTENT: ['mycustomexpander'],
+      },
+    ];
+
+    const result = addExpandersToPath('/de/mypage?query=a%26b', GET_CONTENT);
+    expect(result).toEqual('/de/mypage?expand=mycustomexpander&query=a%26b');
+  });
   it('addExpandersToPath - Two custom expanders from settings', () => {
     config.settings.apiExpanders = [
       {

package/src/middleware/api.js

@@ -18,7 +18,11 @@ import {
   SET_APIERROR,
 } from '@plone/volto/constants/ActionTypes';
 import { changeLanguage } from '@plone/volto/actions';
-import { normalizeLanguageName, getCookieOptions } from '@plone/volto/helpers';
+import {
+  toGettextLang,
+  toReactIntlLang,
+  getCookieOptions,
+} from '@plone/volto/helpers';
 let socket = null;
 
 /**
@@ -43,7 +47,7 @@ export function addExpandersToPath(path, type, isAnonymous) {
   const {
     url,
     query: { expand, ...query },
-  } = qs.parseUrl(path);
+  } = qs.parseUrl(path, { decode: false });
 
   const expandersFromConfig = apiExpanders
     .filter((expand) => matchPath(url, expand.match) && expand[type])
@@ -205,11 +209,11 @@ const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
           const lang = result?.language?.token;
           if (
             lang &&
-            getState().intl.language !== lang &&
+            getState().intl.locale !== toReactIntlLang(lang) &&
             !subrequest &&
             config.settings.supportedLanguages.includes(lang)
           ) {
-            const langFileName = normalizeLanguageName(lang);
+            const langFileName = toGettextLang(lang);
             import('~/../locales/' + langFileName + '.json').then((locale) => {
               dispatch(changeLanguage(lang, locale.default));
             });

package/src/server.jsx

@@ -26,8 +26,9 @@ import {
   Html,
   Api,
   persistAuthToken,
-  normalizeLanguageName,
-  toLangUnderscoreRegion,
+  toBackendLang,
+  toGettextLang,
+  toReactIntlLang,
 } from '@plone/volto/helpers';
 import { changeLanguage } from '@plone/volto/actions';
 
@@ -44,9 +45,9 @@ let locales = {};
 
 if (config.settings) {
   config.settings.supportedLanguages.forEach((lang) => {
-    const langFileName = normalizeLanguageName(lang);
+    const langFileName = toGettextLang(lang);
     import('@root/../locales/' + langFileName + '.json').then((locale) => {
-      locales = { ...locales, [lang]: locale.default };
+      locales = { ...locales, [toReactIntlLang(lang)]: locale.default };
     });
   });
 }
@@ -101,13 +102,15 @@ server.use(function (err, req, res, next) {
 function setupServer(req, res, next) {
   const api = new Api(req);
 
-  const lang = new locale.Locales(
-    req.universalCookies.get('I18N_LANGUAGE') ||
-      config.settings.defaultLanguage ||
-      req.headers['accept-language'],
-  )
-    .best(supported)
-    .toString();
+  const lang = toReactIntlLang(
+    new locale.Locales(
+      req.universalCookies.get('I18N_LANGUAGE') ||
+        config.settings.defaultLanguage ||
+        req.headers['accept-language'],
+    )
+      .best(supported)
+      .toString(),
+  );
 
   // Minimum initial state for the fake Redux store instance
   const initialState = {
@@ -176,13 +179,15 @@ server.get('/*', (req, res) => {
 
   const browserdetect = detect(req.headers['user-agent']);
 
-  const lang = new locale.Locales(
-    req.universalCookies.get('I18N_LANGUAGE') ||
-      config.settings.defaultLanguage ||
-      req.headers['accept-language'],
-  )
-    .best(supported)
-    .toString();
+  const lang = toReactIntlLang(
+    new locale.Locales(
+      req.universalCookies.get('I18N_LANGUAGE') ||
+        config.settings.defaultLanguage ||
+        req.headers['accept-language'],
+    )
+      .best(supported)
+      .toString(),
+  );
 
   const authToken = req.universalCookies.get('auth_token');
   const initialState = {
@@ -217,7 +222,7 @@ server.get('/*', (req, res) => {
 
   loadOnServer({ store, location, routes, api })
     .then(() => {
-      const cookie_lang =
+      const initialLang =
         req.universalCookies.get('I18N_LANGUAGE') ||
         config.settings.defaultLanguage ||
         req.headers['accept-language'];
@@ -230,15 +235,15 @@ server.get('/*', (req, res) => {
       // present the language token field, for some reason. In this case, we
       // should follow the cookie rather then switching the language
       const contentLang = store.getState().content.get?.error
-        ? cookie_lang
+        ? initialLang
         : store.getState().content.data?.language?.token ||
           config.settings.defaultLanguage;
 
-      if (cookie_lang !== contentLang) {
-        const newLocale = toLangUnderscoreRegion(
+      if (toBackendLang(initialLang) !== contentLang) {
+        const newLang = toReactIntlLang(
           new locale.Locales(contentLang).best(supported).toString(),
         );
-        store.dispatch(changeLanguage(newLocale, locales[newLocale], req));
+        store.dispatch(changeLanguage(newLang, locales[newLang], req));
       }
 
       const context = {};

package/test-setup-config.js

@@ -82,6 +82,7 @@ config.set('settings', {
   viewableInBrowserObjects: [],
   styleClassNameConverters,
   styleClassNameExtenders,
+  blockSettingsTabFieldsetsInitialStateOpen: true,
 });
 config.set('blocks', {
   blocksConfig: {

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

@@ -489,3 +489,7 @@
     margin-left: 5px;
   }
 }
+
+.formtabs {
+  flex-wrap: wrap;
+}

package/.changelog.draft

@@ -1,13 +0,0 @@
-## 17.0.0-alpha.5 (2023-04-14)
-
-### Bugfix
-
-- Generate a split sitemap @reebalazs [#4638](https://github.com/plone/volto/issues/4638)
-- Fix Move to top of folder ordering in folder content view @iFlameing [#4690](https://github.com/plone/volto/issues/4690)
-- Revert "Add current page parameter to the route in the listing and search block pagination (#4159)" @sneridagh [#4695](https://github.com/plone/volto/issues/4695)
-- Fix search block in edit mode re-queries multiple blocks with an empty search text @reebalazs [#4697](https://github.com/plone/volto/issues/4697)
-
-### Documentation
-
-- Update links for 2022 Training archive. @stevepiercy [#4635](https://github.com/plone/volto/issues/4635)
-

package/.editorconfig

@@ -1,36 +0,0 @@
-# EditorConfig Configurtaion file, for more details see:
-# http://EditorConfig.org
-# EditorConfig is a convention description, that could be interpreted
-# by multiple editors to enforce common coding conventions for specific
-# file types
-
-# top-most EditorConfig file:
-# Will ignore other EditorConfig files in Home directory or upper tree level.
-root = true
-
-
-[*]  # For All Files
-# Unix-style newlines with a newline ending every file
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-# Set default charset
-charset = utf-8
-# Indent style default
-indent_style = space
-# Max Line Length - a hard line wrap, should be disabled
-max_line_length = off
-
-[*.{py,cfg,ini}]
-# 4 space indentation
-indent_size = 4
-
-[*.{html,dtml,pt,zpt,xml,zcml,js,jsx,json,less,css,yaml,yml}]
-# 2 space indentation
-indent_size = 2
-
-[{Makefile,.gitmodules}]
-# Tab indentation (no size specified, but view as 4 spaces)
-indent_style = tab
-indent_size = unset
-tab_width = unset

package/.storybook/main.js

@@ -1,127 +0,0 @@
-const webpack = require('webpack');
-const fs = require('fs');
-const path = require('path');
-const makeLoaderFinder = require('razzle-dev-utils/makeLoaderFinder');
-const fileLoaderFinder = makeLoaderFinder('file-loader');
-const projectRootPath = path.resolve('.');
-const lessPlugin = require('../webpack-plugins/webpack-less-plugin');
-const createConfig = require('../node_modules/razzle/config/createConfigAsync.js');
-const razzleConfig = require(path.join(projectRootPath, 'razzle.config.js'));
-const SVGLOADER = {
-  test: /icons\/.*\.svg$/,
-  use: [
-    {
-      loader: 'svg-loader',
-    },
-    {
-      loader: 'svgo-loader',
-      options: {
-        plugins: [
-          {
-            name: 'preset-default',
-            params: {
-              overrides: {
-                convertPathData: false,
-                removeViewBox: false,
-              },
-            },
-          },
-          'removeTitle',
-          'removeUselessStrokeAndFill',
-        ],
-      },
-    },
-  ],
-};
-const defaultRazzleOptions = {
-  verbose: false,
-  debug: {},
-  buildType: 'iso',
-  cssPrefix: 'static/css',
-  jsPrefix: 'static/js',
-  enableSourceMaps: true,
-  enableReactRefresh: true,
-  enableTargetBabelrc: false,
-  enableBabelCache: true,
-  forceRuntimeEnvVars: [],
-  mediaPrefix: 'static/media',
-  staticCssInDev: false,
-  emitOnErrors: false,
-  disableWebpackbar: false,
-  browserslist: ['>1%', 'last 4 versions', 'Firefox ESR', 'not ie 11', 'not dead']
-};
-module.exports = {
-  stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
-  addons: ['@storybook/addon-links', '@storybook/addon-essentials'],
-  staticDirs: ['./static'],
-  webpackFinal: async (config, {
-    configType
-  }) => {
-    // `configType` has a value of 'DEVELOPMENT' or 'PRODUCTION'
-    // You can change the configuration based on that.
-    // 'PRODUCTION' is used when building the static version of storybook.
-
-    // Make whatever fine-grained changes you need
-    let baseConfig;
-    baseConfig = await createConfig('web', 'dev', {
-      // clearConsole: false,
-      modifyWebpackConfig: razzleConfig.modifyWebpackConfig,
-      plugins: razzleConfig.plugins
-    }, webpack, false, undefined, [], defaultRazzleOptions);
-    const AddonConfigurationRegistry = require('../addon-registry');
-    const registry = new AddonConfigurationRegistry(projectRootPath);
-    config = lessPlugin({
-      registry
-    }).modifyWebpackConfig({
-      env: {
-        target: 'web',
-        dev: 'dev'
-      },
-      webpackConfig: config,
-      webpackObject: webpack,
-      options: {}
-    });
-
-    // Put the SVG loader on top and prevent the asset/resource rule
-    // from processing the app's SVGs
-    config.module.rules.unshift(SVGLOADER);
-    const fileLoaderRule = config.module.rules.find(rule => rule.test.test('.svg'));
-    fileLoaderRule.exclude = /icons\/.*\.svg$/;
-    config.plugins.unshift(new webpack.DefinePlugin({
-      __DEVELOPMENT__: true,
-      __CLIENT__: true,
-      __SERVER__: false
-    }));
-    const resultConfig = {
-      ...config,
-      resolve: {
-        ...config.resolve,
-        alias: {
-          ...config.resolve.alias,
-          ...baseConfig.resolve.alias
-        }
-      }
-    };
-
-    // Addons have to be loaded with babel
-    const addonPaths = registry.addonNames.map(addon => fs.realpathSync(registry.packages[addon].modulePath));
-    resultConfig.module.rules[1].exclude = input =>
-      // exclude every input from node_modules except from @plone/volto
-      /node_modules\/(?!(@plone\/volto)\/)/.test(input) &&
-      // If input is in an addon, DON'T exclude it
-      !addonPaths.some(p => input.includes(p));
-    return resultConfig;
-  },
-  babel: async options => {
-    return {
-      ...options,
-      plugins: [...options.plugins, ['./node_modules/babel-plugin-root-import/build/index.js', {
-        rootPathSuffix: './src'
-      }]]
-      // any extra options you want to set
-    };
-  },
-  core: {
-    builder: 'webpack5'
-  }
-};

package/.storybook/manager.js

@@ -1,15 +0,0 @@
-import { addons } from '@storybook/addons';
-
-addons.setConfig({
-  isFullscreen: false,
-  showNav: true,
-  showPanel: true,
-  panelPosition: 'bottom',
-  sidebarAnimations: true,
-  enableShortcuts: true,
-  isToolshown: true,
-  theme: undefined,
-  selectedPanel: undefined,
-  initialActive: 'sidebar',
-  showRoots: true,
-});

package/.storybook/preview.js

@@ -1,21 +0,0 @@
-import '@plone/volto/config'; // This is the bootstrap for the global config - client side
-import React from 'react';
-import { StaticRouter } from 'react-router-dom';
-import { IntlProvider } from 'react-intl';
-import enMessages from '@root/../locales/en.json';
-
-import '@root/theme';
-
-export const parameters = {
-  actions: { argTypesRegex: '^on[A-Z].*' },
-};
-
-export const decorators = [
-  (Story) => (
-    <IntlProvider messages={enMessages} locale="en" defaultLocale="en">
-      <StaticRouter location="/">
-        <Story />
-      </StaticRouter>
-    </IntlProvider>
-  ),
-];

package/.storybook/static/previewImage.svg

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="158.253px" height="40.686px" viewBox="0 0 158.253 40.686" enable-background="new 0 0 158.253 40.686"
-	 xml:space="preserve">
-<g>
-	<path fill="#0095D3" d="M65.327,23.208h-6.589v11.388h-4.393V5.638h10.981c5.653,0,9.271,3.742,9.271,8.785
-		S70.979,23.208,65.327,23.208z M65.082,9.583h-6.345v9.639h6.345c3.05,0,5.124-1.749,5.124-4.799
-		C70.206,11.372,68.132,9.583,65.082,9.583z"/>
-	<path fill="#0095D3" d="M83.969,34.596c-3.904,0-5.652-2.644-5.652-5.693V5.638h4.148v23.021c0,1.587,0.567,2.399,2.235,2.399h1.83
-		v3.538H83.969z"/>
-	<path fill="#0095D3" d="M104.762,32.399c-1.344,1.384-3.377,2.44-6.184,2.44c-2.805,0-4.799-1.058-6.141-2.44
-		c-1.951-2.032-2.439-4.637-2.439-8.134c0-3.457,0.488-6.061,2.439-8.094c1.342-1.383,3.336-2.44,6.141-2.44
-		c2.807,0,4.84,1.059,6.184,2.44c1.951,2.033,2.439,4.637,2.439,8.094C107.203,27.763,106.713,30.366,104.762,32.399z
-		 M101.629,18.613c-0.773-0.773-1.83-1.181-3.051-1.181c-1.219,0-2.236,0.406-3.01,1.181c-1.26,1.261-1.422,3.416-1.422,5.652
-		s0.162,4.393,1.422,5.653c0.773,0.771,1.791,1.22,3.01,1.22c1.221,0,2.277-0.447,3.051-1.22c1.262-1.262,1.424-3.417,1.424-5.653
-		S102.891,19.873,101.629,18.613z"/>
-	<path fill="#0095D3" d="M123.643,34.596V22.029c0-3.214-1.83-4.597-4.147-4.597s-4.271,1.423-4.271,4.597v12.566h-4.147v-20.62
-		h4.065v2.074c1.425-1.546,3.416-2.318,5.49-2.318c2.115,0,3.865,0.691,5.084,1.871c1.586,1.545,2.074,3.497,2.074,5.815v13.178
-		L123.643,34.596L123.643,34.596z"/>
-	<path fill="#0095D3" d="M135.772,25.486c0,3.537,1.871,5.774,5.246,5.774c2.317,0,3.539-0.649,5.004-2.115l2.643,2.481
-		c-2.115,2.114-4.107,3.213-7.727,3.213c-5.166,0-9.273-2.725-9.273-10.574c0-6.671,3.457-10.534,8.744-10.534
-		c5.531,0,8.744,4.067,8.744,9.925v1.83H135.772z M144.475,19.791c-0.65-1.545-2.113-2.604-4.066-2.604
-		c-1.951,0-3.457,1.059-4.107,2.604c-0.406,0.936-0.488,1.546-0.529,2.807h9.273C145.003,21.337,144.883,20.726,144.475,19.791z"/>
-	<circle fill="#0095D3" cx="17.815" cy="11.516" r="4.402"/>
-	<path fill="#0095D3" d="M31.167,20.311c0,2.433-1.969,4.401-4.403,4.401c-2.427,0-4.401-1.97-4.401-4.401
-		c0-2.433,1.975-4.401,4.401-4.401C29.2,15.909,31.167,17.879,31.167,20.311z"/>
-	<circle fill="#0095D3" cx="17.801" cy="29.131" r="4.402"/>
-	<g>
-		<path fill="#0095D3" d="M20.441-0.045C9.207-0.044,0.1,9.063,0.099,20.298C0.1,31.532,9.207,40.639,20.441,40.641
-			c11.235-0.002,20.341-9.107,20.343-20.343C40.783,9.063,31.677-0.044,20.441-0.045z M31.891,31.747
-			c-2.937,2.934-6.972,4.742-11.45,4.743c-4.478-0.001-8.513-1.811-11.45-4.743C6.058,28.81,4.25,24.775,4.249,20.298
-			c0.001-4.478,1.809-8.513,4.743-11.45c2.937-2.934,6.972-4.742,11.45-4.743c4.478,0.001,8.513,1.81,11.45,4.743
-			c2.934,2.938,4.742,6.973,4.743,11.45C36.633,24.775,34.825,28.81,31.891,31.747z"/>
-	</g>
-	<g>
-		<path fill="#0095D3" d="M153.985,9.95c-1.195,0-2.164,0.971-2.164,2.168c0.002,1.197,0.969,2.168,2.164,2.168
-			c1.199,0,2.172-0.971,2.172-2.168S155.184,9.95,153.985,9.95z M153.985,13.968c-1.021-0.002-1.846-0.827-1.846-1.85
-			c0.002-1.021,0.825-1.849,1.846-1.851c1.023,0.002,1.852,0.828,1.854,1.851C155.836,13.141,155.008,13.966,153.985,13.968z"/>
-	</g>
-	<g>
-		<path fill="#0095D3" d="M154.507,13.409l-0.54-1.08h-0.486v1.08h-0.389v-2.564h0.994c0.484,0,0.796,0.313,0.796,0.75
-			c0,0.367-0.224,0.602-0.513,0.68l0.592,1.136L154.507,13.409L154.507,13.409z M154.056,11.195h-0.575v0.803h0.575
-			c0.261,0,0.437-0.147,0.437-0.399S154.317,11.195,154.056,11.195z"/>
-	</g>
-</g>
-</svg>

package/.vale.ini

@@ -1,10 +0,0 @@
-StylesPath = styles
-
-MinAlertLevel = suggestion
-
-Vocab = Base,Plone
-
-Packages = Microsoft
-
-[*.md]
-BasedOnStyles = Vale, Microsoft

package/.yarnrc.yml

@@ -1,5 +0,0 @@
-defaultSemverRangePrefix: ""
-
-nodeLinker: node-modules
-
-yarnPath: .yarn/releases/yarn-3.2.3.cjs

package/jsdoc.json

@@ -1,16 +0,0 @@
-{
-  "tags": {
-    "allowUnknownTags": true
-  },
-  "source": {
-    "include": ["./src"],
-    "includePattern": ".+\\.js$",
-    "excludePattern": ".+\\.(spec|e2e)\\.js$"
-  },
-  "opts": {
-    "encoding": "utf8",
-    "destination": "jsdoc",
-    "recurse": true,
-    "verbose": true
-  }
-}

package/netlify.toml

@@ -1,5 +0,0 @@
-[build.environment]
-  PYTHON_VERSION = "3.8"
-  NODE_VERSION = "16.17.1"
-[build]
-  ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ./docs/"

package/pyvenv.cfg

@@ -1,3 +0,0 @@
-home = /opt/homebrew/opt/python@3.9/bin
-include-system-site-packages = false
-version = 3.9.16