npm - @plone/volto - Versions diffs - 17.0.0-alpha.0 → 17.0.0-alpha.10 - Mend

@plone/volto 17.0.0-alpha.0 → 17.0.0-alpha.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (190) hide show

package/.yarn/install-state.gz +0 -0
package/CHANGELOG.md +451 -19
package/CONTRIBUTING.md +1 -1
package/README.md +12 -15
package/addon-registry.js +34 -0
package/create-theme-addons-loader.js +79 -0
package/cypress/support/commands.js +25 -0
package/locales/ca/LC_MESSAGES/volto.po +187 -6
package/locales/ca.json +1 -1
package/locales/de/LC_MESSAGES/volto.po +206 -25
package/locales/de.json +1 -1
package/locales/en/LC_MESSAGES/volto.po +186 -5
package/locales/en.json +1 -1
package/locales/es/LC_MESSAGES/volto.po +187 -6
package/locales/es.json +1 -1
package/locales/eu/LC_MESSAGES/volto.po +187 -6
package/locales/eu.json +1 -1
package/locales/fi/LC_MESSAGES/volto.po +4792 -0
package/locales/fi.json +1 -1
package/locales/fr/LC_MESSAGES/volto.po +187 -6
package/locales/fr.json +1 -1
package/locales/it/LC_MESSAGES/volto.po +187 -6
package/locales/it.json +1 -1
package/locales/ja/LC_MESSAGES/volto.po +187 -6
package/locales/ja.json +1 -1
package/locales/nl/LC_MESSAGES/volto.po +842 -649
package/locales/nl.json +1 -1
package/locales/pt/LC_MESSAGES/volto.po +187 -6
package/locales/pt.json +1 -1
package/locales/pt_BR/LC_MESSAGES/volto.po +195 -14
package/locales/pt_BR.json +1 -1
package/locales/ro/LC_MESSAGES/volto.po +187 -6
package/locales/ro.json +1 -1
package/locales/volto.pot +187 -6
package/locales/zh_CN/LC_MESSAGES/volto.po +187 -6
package/locales/zh_CN.json +1 -1
package/package-why.json +0 -1
package/package.json +9 -8
package/packages/volto-slate/build/messages/src/blocks/Table/TableBlockEdit.json +1 -1
package/packages/volto-slate/build/messages/src/blocks/Text/DefaultTextBlockEditor.json +1 -1
package/packages/volto-slate/build/messages/src/blocks/Text/DetachedTextBlockEditor.json +1 -1
package/packages/volto-slate/build/messages/src/blocks/Text/SlashMenu.json +1 -1
package/packages/volto-slate/build/messages/src/editor/plugins/AdvancedLink/index.json +1 -1
package/packages/volto-slate/build/messages/src/editor/plugins/Link/index.json +1 -1
package/packages/volto-slate/build/messages/src/editor/plugins/Table/index.json +1 -1
package/packages/volto-slate/build/messages/src/elementEditor/messages.json +1 -1
package/packages/volto-slate/build/messages/src/widgets/HtmlSlateWidget.json +1 -1
package/packages/volto-slate/build/messages/src/widgets/RichTextWidgetView.json +1 -1
package/packages/volto-slate/package.json +1 -1
package/packages/volto-slate/src/blocks/Table/TableBlockView.jsx +4 -4
package/packages/volto-slate/src/blocks/Table/index.js +2 -0
package/packages/volto-slate/src/blocks/Text/SlashMenu.jsx +4 -3
package/packages/volto-slate/src/editor/deserialize.js +0 -1
package/packages/volto-slate/src/editor/plugins/StyleMenu/StyleMenu.jsx +14 -4
package/razzle.config.js +28 -0
package/src/actions/index.js +6 -0
package/src/actions/language/language.js +9 -8
package/src/actions/querystringsearch/querystringsearch.js +20 -14
package/src/actions/relations/rebuild.js +25 -0
package/src/actions/relations/relations.js +86 -0
package/src/actions/relations/relations.test.js +15 -0
package/src/components/index.js +1 -0
package/src/components/manage/Add/Add.jsx +2 -2
package/src/components/manage/BlockChooser/BlockChooser.jsx +14 -5
package/src/components/manage/BlockChooser/BlockChooser.test.jsx +5 -0
package/src/components/manage/BlockChooser/BlockChooserButton.jsx +63 -29
package/src/components/manage/BlockChooser/BlockChooserSearch.jsx +0 -1
package/src/components/manage/Blocks/Listing/Edit.jsx +0 -19
package/src/components/manage/Blocks/Listing/ListingBody.jsx +77 -61
package/src/components/manage/Blocks/Listing/View.jsx +0 -4
package/src/components/manage/Blocks/Listing/getAsyncData.js +10 -2
package/src/components/manage/Blocks/Listing/withQuerystringResults.jsx +18 -13
package/src/components/manage/Blocks/Search/SearchBlockEdit.jsx +5 -4
package/src/components/manage/Blocks/Search/SearchBlockView.jsx +2 -1
package/src/components/manage/Blocks/Search/components/DateRangeFacet.jsx +4 -1
package/src/components/manage/Blocks/Search/components/Facets.jsx +58 -2
package/src/components/manage/Blocks/Search/hocs/withSearch.jsx +24 -11
package/src/components/manage/Blocks/Search/layout/LeftColumnFacets.jsx +17 -5
package/src/components/manage/Blocks/Search/layout/RightColumnFacets.jsx +17 -5
package/src/components/manage/Blocks/Search/layout/TopSideFacets.jsx +21 -5
package/src/components/manage/Blocks/Search/schema.js +16 -1
package/src/components/manage/Blocks/ToC/Edit.jsx +1 -0
package/src/components/manage/Contents/Contents.jsx +69 -33
package/src/components/manage/Contents/ContentsItem.jsx +6 -0
package/src/components/manage/Controlpanels/AddonsControlpanel.jsx +3 -3
package/src/components/manage/Controlpanels/Controlpanels.jsx +199 -224
package/src/components/manage/Controlpanels/Controlpanels.test.jsx +46 -7
package/src/components/manage/Controlpanels/Relations/BrokenRelations.jsx +66 -0
package/src/components/manage/Controlpanels/Relations/Relations.jsx +114 -0
package/src/components/manage/Controlpanels/Relations/RelationsListing.jsx +479 -0
package/src/components/manage/Controlpanels/Relations/RelationsMatrix.jsx +531 -0
package/src/components/manage/Controlpanels/Users/UserGroupMembershipControlPanel.jsx +3 -3
package/src/components/manage/Controlpanels/Users/UserGroupMembershipListing.jsx +51 -82
package/src/components/manage/Controlpanels/Users/UserGroupMembershipMatrix.jsx +79 -75
package/src/components/manage/DragDropList/DragDropList.jsx +63 -42
package/src/components/manage/Form/BlocksToolbar.jsx +5 -1
package/src/components/manage/Form/Form.jsx +11 -5
package/src/components/manage/Form/InlineForm.jsx +39 -9
package/src/components/manage/Form/InlineFormState.js +8 -0
package/src/components/manage/History/History.jsx +35 -18
package/src/components/manage/Multilingual/CreateTranslation.jsx +2 -2
package/src/components/manage/Multilingual/TranslationObject.jsx +4 -3
package/src/components/manage/Preferences/ChangePassword.jsx +2 -2
package/src/components/manage/Preferences/PersonalPreferences.jsx +2 -2
package/src/components/manage/Toast/Toast.jsx +1 -1
package/src/components/manage/Toolbar/Types.jsx +2 -2
package/src/components/manage/Widgets/DatetimeWidget.jsx +9 -5
package/src/components/manage/Widgets/ObjectListWidget.jsx +3 -8
package/src/components/manage/Widgets/RecurrenceWidget/ByDayField.jsx +2 -1
package/src/components/manage/Widgets/RecurrenceWidget/MonthOfTheYearField.jsx +2 -1
package/src/components/manage/Widgets/RecurrenceWidget/Occurences.jsx +2 -1
package/src/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.jsx +7 -2
package/src/components/manage/Widgets/RecurrenceWidget/WeekdayOfTheMonthField.jsx +2 -1
package/src/components/manage/Widgets/SelectUtils.js +1 -1
package/src/components/manage/Widgets/SelectWidget.jsx +1 -1
package/src/components/theme/Footer/Footer.jsx +2 -13
package/src/components/theme/Header/Header.jsx +37 -63
package/src/components/theme/Header/Header.test.jsx +18 -0
package/src/components/theme/Icon/Icon.jsx +2 -2
package/src/components/theme/LanguageSelector/LanguageSelector.js +8 -3
package/src/components/theme/Login/Login.jsx +1 -0
package/src/components/theme/Logo/Logo.jsx +2 -1
package/src/components/theme/MultilingualRedirector/MultilingualRedirector.jsx +2 -2
package/src/components/theme/Navigation/NavItem.jsx +4 -2
package/src/components/theme/NotFound/NotFound.jsx +55 -41
package/src/components/theme/PasswordReset/PasswordReset.jsx +7 -4
package/src/components/theme/PasswordReset/RequestPasswordReset.jsx +1 -1
package/src/components/theme/Sitemap/Sitemap.jsx +5 -3
package/src/components/theme/View/DefaultView.jsx +1 -1
package/src/components/theme/View/EventDatesInfo.jsx +2 -1
package/src/components/theme/View/EventView.jsx +1 -1
package/src/components/theme/View/NewsItemView.jsx +1 -1
package/src/components/theme/View/RenderBlocks.jsx +7 -1
package/src/components/theme/Widgets/DateWidget.jsx +2 -1
package/src/components/theme/Widgets/DatetimeWidget.jsx +2 -1
package/src/components/theme/Widgets/RelationsWidget.jsx +13 -11
package/src/config/ControlPanels.js +2 -0
package/src/config/Widgets.jsx +1 -0
package/src/config/index.js +3 -0
package/src/config/server.js +19 -0
package/src/constants/ActionTypes.js +4 -0
package/src/constants/Languages.js +8 -4
package/src/express-middleware/devproxy.js +4 -2
package/src/express-middleware/sitemap.js +36 -4
package/src/express-middleware/static.js +32 -0
package/src/helpers/Api/Api.js +1 -1
package/src/helpers/FormValidation/FormValidation.js +11 -2
package/src/helpers/FormValidation/FormValidation.test.js +73 -0
package/src/helpers/Html/Html.jsx +3 -1
package/src/helpers/Html/Html.test.jsx +5 -0
package/src/helpers/MessageLabels/MessageLabels.js +72 -0
package/src/helpers/Robots/Robots.js +24 -6
package/src/helpers/Sitemap/Sitemap.js +44 -2
package/src/helpers/Url/Url.js +27 -6
package/src/helpers/Url/Url.test.js +26 -0
package/src/helpers/Utils/Utils.js +38 -13
package/src/helpers/Utils/Utils.test.js +4 -4
package/src/helpers/index.js +7 -2
package/src/hooks/userSession/useToken.js +5 -0
package/src/middleware/Api.test.js +54 -0
package/src/middleware/api.js +8 -4
package/src/reducers/actions/actions.js +1 -1
package/src/reducers/breadcrumbs/breadcrumbs.js +1 -1
package/src/reducers/index.js +2 -0
package/src/reducers/navigation/navigation.js +1 -1
package/src/reducers/relations/relations.js +173 -0
package/src/reducers/types/types.js +1 -1
package/src/routes.js +5 -0
package/src/server.jsx +29 -30
package/src/start-server.js +4 -2
package/test-setup-config.js +1 -0
package/theme/themes/pastanaga/extras/blocks.less +0 -9
package/theme/themes/pastanaga/extras/contents.less +1 -0
package/theme/themes/pastanaga/extras/main.less +80 -1
package/theme/themes/pastanaga/extras/search.less +6 -0
package/theme/themes/pastanaga/extras/sidebar.less +4 -0
package/theme/themes/pastanaga/extras/userscontrolpanel.less +99 -76
package/.changelog.draft +0 -22
package/.editorconfig +0 -36
package/.storybook/main.js +0 -127
package/.storybook/manager.js +0 -15
package/.storybook/preview.js +0 -21
package/.storybook/static/previewImage.svg +0 -48
package/.yarnrc.yml +0 -5
package/jsdoc.json +0 -16
package/netlify.toml +0 -5
package/pyvenv.cfg +0 -3
package/share/man/man1/ttx.1 +0 -225
package/src/components/theme/Header/Header.md +0 -27
package/towncrier.toml +0 -33

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

@@ -5,6 +5,7 @@ const schema = {
   properties: {
     username: { title: 'Username', type: 'string', description: '' },
     email: { title: 'Email', type: 'string', widget: 'email', description: '' },
+    url: { title: 'url', type: 'string', widget: 'url', description: '' },
   },
   fieldsets: [
     { id: 'default', title: 'FIXME: User Data', fields: ['username'] },
@@ -65,6 +66,38 @@ describe('FormValidation', () => {
       });
     });
+    it('do not treat 0 as missing required value', () => {
+      let newSchema = {
+        ...schema,
+        properties: {
+          ...schema.properties,
+          age: {
+            title: 'age',
+            type: 'integer',
+            widget: 'number',
+            description: '',
+          },
+        },
+        required: ['age'],
+      };
+      expect(
+        FormValidation.validateFieldsPerFieldset({
+          schema: newSchema,
+          formData: { username: 'test username', age: null },
+          formatMessage,
+        }),
+      ).toEqual({
+        age: [messages.required.defaultMessage],
+      });
+      expect(
+        FormValidation.validateFieldsPerFieldset({
+          schema: newSchema,
+          formData: { username: 'test username', age: 0 },
+          formatMessage,
+        }),
+      ).toEqual({});
+    });
     it('validates incorrect email', () => {
       expect(
         FormValidation.validateFieldsPerFieldset({
@@ -87,5 +120,45 @@ describe('FormValidation', () => {
         }),
       ).toEqual({});
     });
+    it('validates incorrect url', () => {
+      formData.url = 'foo';
+      expect(
+        FormValidation.validateFieldsPerFieldset({
+          schema,
+          formData,
+          formatMessage,
+        }),
+      ).toEqual({ url: [messages.isValidURL.defaultMessage] });
+    });
+    it('validates url', () => {
+      formData.url = 'https://plone.org/';
+      expect(
+        FormValidation.validateFieldsPerFieldset({
+          schema,
+          formData,
+          formatMessage,
+        }),
+      ).toEqual({});
+    });
+    it('validates url with ip', () => {
+      formData.url = 'http://127.0.0.1:8080/Plone';
+      expect(
+        FormValidation.validateFieldsPerFieldset({
+          schema,
+          formData,
+          formatMessage,
+        }),
+      ).toEqual({});
+    });
+    it('validates url with localhost', () => {
+      formData.url = 'http://localhost:8080/Plone';
+      expect(
+        FormValidation.validateFieldsPerFieldset({
+          schema,
+          formData,
+          formatMessage,
+        }),
+      ).toEqual({});
+    });
   });
 });

package/src/helpers/Html/Html.jsx CHANGED Viewed

@@ -97,8 +97,10 @@ class Html extends Component {
     } = this.props;
     const head = Helmet.rewind();
     const bodyClass = join(BodyClass.rewind(), ' ');
+    const htmlAttributes = head.htmlAttributes.toComponent();
     return (
-      <html lang="en">
+      <html lang={htmlAttributes.lang}>
         <head>
           <meta charSet="utf-8" />
           {head.base.toComponent()}

package/src/helpers/Html/Html.test.jsx CHANGED Viewed

@@ -20,6 +20,11 @@ jest.mock('../Helmet/Helmet', () => ({
     script: {
       toComponent: () => '',
     },
+    htmlAttributes: {
+      toComponent: () => ({
+        lang: 'en',
+      }),
+    },
   }),
 }));

package/src/helpers/MessageLabels/MessageLabels.js CHANGED Viewed

@@ -260,4 +260,76 @@ export const messages = defineMessages({
     id: 'Show groups of users below',
     defaultMessage: 'Show groups of users below',
   },
+  inspectRelations: {
+    id: 'Inspect relations',
+    defaultMessage: 'Inspect relations',
+  },
+  relations: {
+    id: 'Relations',
+    defaultMessage: 'Relations',
+  },
+  fixRelations: {
+    id: 'Fix relations',
+    defaultMessage: 'Fix relations',
+  },
+  searchRelationSource: {
+    id: 'Search sources by title or path',
+    defaultMessage: 'Search sources by title or path',
+  },
+  searchRelationTarget: {
+    id: 'Search targets by title or path',
+    defaultMessage: 'Search targets by title or path',
+  },
+  createOrDeleteRelationsToTarget: {
+    id: 'Create or delete relations to target',
+    defaultMessage: 'Create or delete relations to target',
+  },
+  relationName: {
+    id: 'Relation name',
+    defaultMessage: 'relation',
+  },
+  selectRelation: {
+    id: 'Select relation',
+    defaultMessage: 'Select relation',
+  },
+  norelationfound: {
+    id: 'No relation found',
+    defaultMessage: 'No relation found',
+  },
+  toomanyrelationsfound: {
+    id: 'Many relations found. Please search.',
+    defaultMessage: 'Many relations found. Please search.',
+  },
+  rebuildRelations: {
+    id: 'rebuild relations',
+    defaultMessage: 'rebuild relations',
+  },
+  flushAndRebuildRelations: {
+    id: 'flush intIds and rebuild relations',
+    defaultMessage: 'flush intIds and rebuild relations',
+  },
+  addPotentialTargetsPath: {
+    id: 'target path',
+    defaultMessage: 'target path',
+  },
+  addPotentialSourcesPath: {
+    id: 'sources path',
+    defaultMessage: 'sources path',
+  },
+  relationsUpdated: {
+    id: 'Relations updated',
+    defaultMessage: 'Relations updated',
+  },
+  select: {
+    id: 'Select',
+    defaultMessage: 'Select',
+  },
+  selected: {
+    id: 'Selected',
+    defaultMessage: 'Selected',
+  },
+  filter: {
+    id: 'Filter',
+    defaultMessage: 'Filter',
+  },
 });

package/src/helpers/Robots/Robots.js CHANGED Viewed

@@ -15,12 +15,9 @@ import { addHeadersFactory } from '@plone/volto/helpers/Proxy/Proxy';
  */
 export const generateRobots = (req) =>
   new Promise((resolve) => {
-    //const url = `${req.protocol}://${req.get('Host')}`;
-    const request = superagent.get(
-      `${
-        config.settings.internalApiPath ?? config.settings.apiPath
-      }/robots.txt`,
-    );
+    const internalUrl =
+      config.settings.internalApiPath ?? config.settings.apiPath;
+    const request = superagent.get(`${internalUrl}/robots.txt`);
     request.set('Accept', 'text/plain');
     const authToken = req.universalCookies.get('auth_token');
     if (authToken) {
@@ -31,6 +28,27 @@ export const generateRobots = (req) =>
       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);
       }
     });

package/src/helpers/Sitemap/Sitemap.js CHANGED Viewed

@@ -11,19 +11,23 @@ import { addHeadersFactory } from '@plone/volto/helpers/Proxy/Proxy';
 import config from '@plone/volto/registry';
+export const SITEMAP_BATCH_SIZE = 5000;
 /**
  * Generate sitemap
  * @function generateSitemap
  * @param {Object} _req Request object
  * @return {string} Generated sitemap
  */
-export const generateSitemap = (_req) =>
+export const generateSitemap = (_req, start = 0, size = undefined) =>
   new Promise((resolve) => {
     const { settings } = config;
     const APISUFIX = settings.legacyTraverse ? '' : '/++api++';
     const apiPath = settings.internalApiPath ?? settings.apiPath;
     const request = superagent.get(
-      `${apiPath}${APISUFIX}/@search?metadata_fields=modified&b_size=100000000&use_site_search_settings=1`,
+      `${apiPath}${APISUFIX}/@search?metadata_fields=modified&b_start=${start}&b_size=${
+        size !== undefined ? size : 100000000
+      }&use_site_search_settings=1`,
     );
     request.set('Accept', 'application/json');
     request.use(addHeadersFactory(_req));
@@ -50,3 +54,41 @@ export const generateSitemap = (_req) =>
       }
     });
   });
+/**
+ * Generate sitemap
+ * @function generateSitemapIndex
+ * @param {Object} _req Request object
+ * @return {string} Generated sitemap index
+ */
+export const generateSitemapIndex = (_req) =>
+  new Promise((resolve) => {
+    const { settings } = config;
+    const APISUFIX = settings.legacyTraverse ? '' : '/++api++';
+    const apiPath = settings.internalApiPath ?? settings.apiPath;
+    const request = superagent.get(
+      `${apiPath}${APISUFIX}/@search?metadata_fields=modified&b_size=0&use_site_search_settings=1`,
+    );
+    request.set('Accept', 'application/json');
+    const authToken = _req.universalCookies.get('auth_token');
+    if (authToken) {
+      request.set('Authorization', `Bearer ${authToken}`);
+    }
+    request.end((error, { body } = {}) => {
+      if (error) {
+        resolve(body || error);
+      } else {
+        const items = Array.from(
+          { length: Math.ceil(body.items_total / SITEMAP_BATCH_SIZE) },
+          (_, i) =>
+            `  <sitemap>
+    <loc>${toPublicURL('/sitemap' + (i + 1) + '.xml.gz')}</loc>
+  </sitemap>`,
+        );
+        const result = `<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+${items.join('\n')}\n</sitemapindex>`;
+        resolve(result);
+      }
+    });
+  });

package/src/helpers/Url/Url.js CHANGED Viewed

@@ -7,6 +7,7 @@ import { last, memoize } from 'lodash';
 import { urlRegex, telRegex, mailRegex } from './urlRegex';
 import prependHttp from 'prepend-http';
 import config from '@plone/volto/registry';
+import { matchPath } from 'react-router';
 /**
  * Get base url.
@@ -213,7 +214,17 @@ export function expandToBackendURL(path) {
  */
 export function isInternalURL(url) {
   const { settings } = config;
-  return (
+  const isMatch = (config.settings.externalRoutes ?? []).find((route) => {
+    if (typeof route === 'object') {
+      return matchPath(flattenToAppURL(url), route.match);
+    }
+    return matchPath(flattenToAppURL(url), route);
+  });
+  const isExcluded = isMatch && Object.keys(isMatch)?.length > 0;
+  const internalURL =
     url &&
     (url.indexOf(settings.publicURL) !== -1 ||
       (settings.internalApiPath &&
@@ -221,8 +232,13 @@ export function isInternalURL(url) {
       url.indexOf(settings.apiPath) !== -1 ||
       url.charAt(0) === '/' ||
       url.charAt(0) === '.' ||
-      url.startsWith('#'))
-  );
+      url.startsWith('#'));
+  if (internalURL && isExcluded) {
+    return false;
+  }
+  return internalURL;
 }
 /**
@@ -264,14 +280,14 @@ export function isTelephone(text) {
 }
 export function normaliseMail(email) {
-  if (email.toLowerCase().startsWith('mailto:')) {
+  if (email?.toLowerCase()?.startsWith('mailto:')) {
     return email;
   }
   return `mailto:${email}`;
 }
 export function normalizeTelephone(tel) {
-  if (tel.toLowerCase().startsWith('tel:')) {
+  if (tel?.toLowerCase()?.startsWith('tel:')) {
     return tel;
   }
   return `tel:${tel}`;
@@ -294,12 +310,17 @@ export function checkAndNormalizeUrl(url) {
     res.url = URLUtils.normalizeTelephone(url);
   } else {
     //url
-    if (!res.url.startsWith('/') && !res.url.startsWith('#')) {
+    if (
+      res.url?.length >= 0 &&
+      !res.url.startsWith('/') &&
+      !res.url.startsWith('#')
+    ) {
       res.url = URLUtils.normalizeUrl(url);
       if (!URLUtils.isUrl(res.url)) {
         res.isValid = false;
       }
     }
+    if (res.url === undefined || res.url === null) res.isValid = false;
   }
   return res;
 }

package/src/helpers/Url/Url.test.js CHANGED Viewed

@@ -14,6 +14,9 @@ import {
   removeProtocol,
   addAppURL,
   expandToBackendURL,
+  checkAndNormalizeUrl,
+  normaliseMail,
+  normalizeTelephone,
 } from './Url';
 beforeEach(() => {
@@ -61,6 +64,17 @@ describe('Url', () => {
     it('return empty string if no url is empty string', () => {
       expect(getBaseUrl('')).toBe('');
     });
+    it('return a null/undefined mailto adress ', () => {
+      expect(normaliseMail(null)).toBe('mailto:null');
+      expect(normaliseMail(undefined)).toBe('mailto:undefined');
+    });
+    it('return a null/undefined telephone number', () => {
+      expect(normalizeTelephone(null)).toBe('tel:null');
+      expect(normalizeTelephone(undefined)).toBe('tel:undefined');
+    });
+    it('null returns an invalid link', () => {
+      expect(checkAndNormalizeUrl(null).isValid).toBe(false);
+    });
   });
   describe('getView', () => {
@@ -191,6 +205,7 @@ describe('Url', () => {
       expect(isInternalURL(href)).toBe(false);
       settings.internalApiPath = saved;
     });
     it('tells if an URL is internal if it is an anchor', () => {
       const href = '#anchor';
       expect(isInternalURL(href)).toBe(true);
@@ -211,6 +226,17 @@ describe('Url', () => {
       const href = undefined;
       expect(isInternalURL(href)).toBe(undefined);
     });
+    it('tells if an  URL is external if settings.externalroutes is persent.', () => {
+      const url = `https://localhost:3000/fb/my-page/contents`;
+      const blacklistedurl = '/blacklisted';
+      settings.externalRoutes = [
+        { title: 'My Page', match: '/fb' },
+        '/blacklisted',
+      ];
+      settings.publicURL = 'https://localhost:3000';
+      expect(isInternalURL(url)).toBe(false);
+      expect(isInternalURL(blacklistedurl)).toBe(false);
+    });
   });
   describe('isUrl', () => {
     it('isUrl test', () => {

package/src/helpers/Utils/Utils.js CHANGED Viewed

@@ -174,13 +174,13 @@ export const parseDateTime = (locale, value, format, moment) => {
 };
 /**
- * Converts a language code to the format `lang_region`
+ * Converts a language code like pt-br to the format `pt_BR` (`lang_region`)
  * Useful for passing from Plone's i18n lang names to Xnix locale names
- * eg. LC_MESSAGES/lang_region.po filenames
+ * eg. LC_MESSAGES/lang_region.po filenames. Also used in the I18N_LANGUAGE cookie.
  * @param {string} language Language to be converted
  * @returns {string} Language converted
  */
-export const normalizeLanguageName = (language) => {
+export const toGettextLang = (language) => {
   if (language.includes('-')) {
     let normalizedLang = language.split('-');
     normalizedLang = `${normalizedLang[0]}_${normalizedLang[1].toUpperCase()}`;
@@ -189,23 +189,35 @@ export const normalizeLanguageName = (language) => {
   return language;
 };
+export const normalizeLanguageName = toGettextLang;
 /**
- * Converts a language code to the format `lang-region`
- * `react-intl` only supports this syntax, so coming from the language
- * negotiation of the `locale` lib, one need to convert it first
+ * Converts a language code like pt-br or pt_BR to the format `pt-BR`.
+ * `react-intl` only supports this syntax. We also use it for the locales
+ * in the volto Redux store.
  * @param {string} language Language to be converted
  * @returns {string} Language converted
  */
-export const toLangUnderscoreRegion = (language) => {
-  if (language.includes('_')) {
-    let langCode = language.split('_');
+export const toReactIntlLang = (language) => {
+  if (language.includes('_') || language.includes('-')) {
+    let langCode = language.split(/[-_]/);
     langCode = `${langCode[0]}-${langCode[1].toUpperCase()}`;
     return langCode;
   }
   return language;
 };
+export const toLangUnderscoreRegion = toReactIntlLang; // old name for backwards-compat
+/**
+ * Converts a language code like pt_BR or pt-BR to the format `pt-br`.
+ * This format is used on the backend and in volto config settings.
+ * @param {string} language Language to be converted
+ * @returns {string} Language converted
+ */
+export const toBackendLang = (language) => {
+  return toReactIntlLang(language).toLowerCase();
+};
 /**
  * Lookup if a given expander is set in apiExpanders for the given path and action type
@@ -258,11 +270,11 @@ export const removeFromArray = (array, index) => {
 };
 /**
- * Reorder array
+ * Moves an item from origin to target inside an array in an immutable way
  * @param {Array} array Array with data
- * @param {number} origin Index of item to be reordered
- * @param {number} target Index of item to be reordered to
- * @returns {Array} Array with reordered elements
+ * @param {number} origin Index of item to be moved from
+ * @param {number} target Index of item to be moved to
+ * @returns {Array} Resultant array
  */
 export const reorderArray = (array, origin, target) => {
   const result = Array.from(array);
@@ -299,3 +311,16 @@ export const cloneDeepSchema = (object) => {
     }
   });
 };
+/**
+ * Creates an array given a range of numbers
+ * @param {number} start start number from
+ * @param {number} stop stop number at
+ * @param {number} step step every each number in the sequence
+ * @returns {array} The result, eg. [0, 1, 2, 3, 4]
+ */
+export const arrayRange = (start, stop, step) =>
+  Array.from(
+    { length: (stop - start) / step + 1 },
+    (value, index) => start + index * step,
+  );

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

@@ -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 CHANGED Viewed

@@ -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/hooks/userSession/useToken.js ADDED Viewed

@@ -0,0 +1,5 @@
+import { useSelector, shallowEqual } from 'react-redux';
+export function useToken() {
+  return useSelector((state) => state.userSession.token, shallowEqual);
+}

package/src/middleware/Api.test.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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));
             });