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

package/src/config/config.test.js

@@ -0,0 +1,232 @@
+import config from '@plone/volto/registry';
+
+const navigation_controlpanel = {
+  '@id': '/@controlpanels/navigation',
+  data: {
+    displayed_types: [
+      {
+        title: 'Link',
+        token: 'Link',
+      },
+      {
+        title: 'News Item',
+        token: 'News Item',
+      },
+      {
+        title: 'Folder',
+        token: 'Folder',
+      },
+      {
+        title: 'Page',
+        token: 'Document',
+      },
+      {
+        title: 'Event',
+        token: 'Event',
+      },
+      {
+        title: 'Collection',
+        token: 'Collection',
+      },
+    ],
+    filter_on_workflow: false,
+    generate_tabs: true,
+    navigation_depth: 3,
+    nonfolderish_tabs: true,
+    parent_types_not_to_query: ['TempFolder'],
+    root: '/',
+    show_excluded_items: false,
+    sitemap_depth: 3,
+    sort_tabs_on: {
+      title: 'Position in Parent',
+      token: 'getObjPositionInParent',
+    },
+    sort_tabs_reversed: false,
+    workflow_states_to_show: [],
+  },
+  group: 'General',
+  schema: {
+    fieldsets: [
+      {
+        behavior: 'plone',
+        fields: [
+          'navigation_depth',
+          'generate_tabs',
+          'nonfolderish_tabs',
+          'sort_tabs_on',
+          'sort_tabs_reversed',
+          'displayed_types',
+          'filter_on_workflow',
+          'workflow_states_to_show',
+          'show_excluded_items',
+          'root',
+          'sitemap_depth',
+          'parent_types_not_to_query',
+        ],
+        id: 'default',
+        title: 'Default',
+      },
+    ],
+    properties: {
+      displayed_types: {
+        additionalItems: true,
+        default: [
+          'Link',
+          'News Item',
+          'Folder',
+          'Document',
+          'Event',
+          'Collection',
+        ],
+        description:
+          'The content types that should be shown in the navigation and site map.',
+        factory: 'Tuple',
+        items: {
+          description: '',
+          factory: 'Choice',
+          title: '',
+          type: 'string',
+          vocabulary: {
+            '@id':
+              'http://localhost:3000/@vocabularies/plone.app.vocabularies.ReallyUserFriendlyTypes',
+          },
+        },
+        title: 'Displayed content types',
+        type: 'array',
+        uniqueItems: true,
+      },
+      filter_on_workflow: {
+        default: false,
+        description:
+          'The workflow states that should be shown in the navigation and the site map.',
+        factory: 'Yes/No',
+        title: 'Filter on workflow state',
+        type: 'boolean',
+      },
+      generate_tabs: {
+        default: true,
+        description:
+          'By default, all items created at the root level will appear as tabs. You can turn this off if you prefer manually constructing this part of the navigation.',
+        factory: 'Yes/No',
+        title: 'Automatically generate tabs',
+        type: 'boolean',
+      },
+      navigation_depth: {
+        default: 3,
+        description: 'Number of folder levels to show in the navigation.',
+        factory: 'Integer',
+        title: 'Navigation depth',
+        type: 'integer',
+      },
+      nonfolderish_tabs: {
+        default: true,
+        description:
+          "By default, any content item in the root of the portal will appear as a tab. If you turn this option off, only folders will be shown. This only has an effect if 'automatically generate tabs' is enabled.",
+        factory: 'Yes/No',
+        title: 'Generate tabs for items other than folders.',
+        type: 'boolean',
+      },
+      parent_types_not_to_query: {
+        additionalItems: true,
+        default: ['TempFolder'],
+        description: 'Hide content inside the following types in Navigation.',
+        factory: 'List',
+        items: {
+          description: '',
+          factory: 'Text line (String)',
+          title: '',
+          type: 'string',
+        },
+        title: 'Hide children of these types',
+        type: 'array',
+        uniqueItems: false,
+      },
+      root: {
+        default: '/',
+        description:
+          "Path to be used as navigation root, relative to Plone site root.Starts with '/'",
+        factory: 'Text line (String)',
+        title: 'Root',
+        type: 'string',
+      },
+      show_excluded_items: {
+        default: false,
+        description:
+          'If an item has been excluded from navigation should it be shown in navigation when viewing content contained within it or within a subfolder.',
+        factory: 'Yes/No',
+        title:
+          'Show items normally excluded from navigation if viewing their children.',
+        type: 'boolean',
+      },
+      sitemap_depth: {
+        default: 3,
+        description: 'Number of folder levels to show in the site map.',
+        factory: 'Integer',
+        title: 'Sitemap depth',
+        type: 'integer',
+      },
+      sort_tabs_on: {
+        choices: [
+          ['getObjPositionInParent', 'Position in Parent'],
+          ['sortable_title', 'Title'],
+          ['getId', 'Short Name (ID)'],
+        ],
+        default: 'getObjPositionInParent',
+        description: 'Index used to sort the tabs',
+        enum: ['getObjPositionInParent', 'sortable_title', 'getId'],
+        enumNames: ['Position in Parent', 'Title', 'Short Name (ID)'],
+        factory: 'Choice',
+        title: 'Sort tabs on',
+        type: 'string',
+        vocabulary: {
+          '@id': 'http://localhost:3000/@sources/sort_tabs_on',
+        },
+      },
+      sort_tabs_reversed: {
+        default: false,
+        description: 'Sort tabs in descending.',
+        factory: 'Yes/No',
+        title: 'Reversed sort order for tabs.',
+        type: 'boolean',
+      },
+      workflow_states_to_show: {
+        additionalItems: true,
+        default: [],
+        description: '',
+        factory: 'Tuple',
+        items: {
+          description: '',
+          factory: 'Choice',
+          title: '',
+          type: 'string',
+          vocabulary: {
+            '@id':
+              'http://localhost:3000/@vocabularies/plone.app.vocabularies.WorkflowStates',
+          },
+        },
+        title: '',
+        type: 'array',
+        uniqueItems: true,
+      },
+    },
+    required: ['navigation_depth', 'sort_tabs_on', 'root', 'sitemap_depth'],
+    type: 'object',
+  },
+  title: 'Navigation',
+};
+
+test('test navigation controlpanel fields', () => {
+  const { filterControlPanelsSchema } = config.settings;
+  const result = filterControlPanelsSchema(navigation_controlpanel);
+  const not_in_navigation = [
+    'generate_tabs',
+    'navigation_depth',
+    'sort_tabs_on',
+    'sort_tabs_reversed',
+    'sitemap_depth',
+  ];
+  const hasField = result['fieldsets'][0]['fields'].some((field) =>
+    not_in_navigation.includes(field),
+  );
+  expect(hasField).toBe(false);
+});

package/src/config/index.js

@@ -27,8 +27,6 @@ import {
   filterControlPanelsSchema,
 } from './ControlPanels';
 
-import { richtextEditorSettings, richtextViewSettings } from './RichTextEditor';
-
 import applyAddonConfiguration, { addonsInfo } from 'load-volto-addons';
 
 import ConfigRegistry from '@plone/volto/registry';
@@ -75,7 +73,7 @@ let config = {
     okRoute: '/ok',
     apiPath,
     apiExpanders: [
-      // Added here for documentation purposes, addded at the end because it
+      // Added here for documentation purposes, added at the end because it
       // depends on a value of this object.
       // Add the following expanders for only issuing a single request.
       // https://6.docs.plone.org/volto/configuration/settings-reference.html#term-apiExpanders
@@ -112,8 +110,6 @@ let config = {
     legacyTraverse: process.env.RAZZLE_LEGACY_TRAVERSE || false,
     cookieExpires: 15552000, //in seconds. Default is 6 month (15552000)
     nonContentRoutes,
-    richtextEditorSettings, // Part of draftjs support, to be removed
-    richtextViewSettings, // Part of draftjs support, to be removed
     imageObjects: ['Image'],
     reservedIds: ['login', 'layout', 'plone', 'zip', 'properties'],
     downloadableObjects: ['File'], //list of content-types for which the direct download of the file will be carried out if the user is not authenticated
@@ -145,15 +141,6 @@ let config = {
         'reactBeautifulDnd',
         // 'diffLib',
       ],
-      draftEditor: [
-        'immutableLib',
-        'draftJs',
-        'draftJsLibIsSoftNewlineEvent',
-        'draftJsFilters',
-        'draftJsInlineToolbarPlugin',
-        'draftJsImportHtml',
-        'draftJsBlockBreakoutPlugin',
-      ],
     },
     appExtras: [],
     maxResponseSize: 2000000000, // This is superagent default (200 mb)
@@ -191,7 +178,6 @@ let config = {
     querystringSearchGet: false,
     blockSettingsTabFieldsetsInitialStateOpen: true,
     excludeLinksAndReferencesMenuItem: false,
-    containerBlockTypes: ['gridBlock'],
     siteTitleFormat: {
       includeSiteTitle: false,
       titleAndSiteTitleSeparator: '-',
@@ -223,6 +209,7 @@ let config = {
   },
   addonRoutes: [],
   addonReducers: {},
+  slots: {},
   components,
 };
 
@@ -250,5 +237,6 @@ ConfigRegistry.widgets = config.widgets;
 ConfigRegistry.addonRoutes = config.addonRoutes;
 ConfigRegistry.addonReducers = config.addonReducers;
 ConfigRegistry.components = config.components;
+ConfigRegistry.slots = config.slots;
 
 applyAddonConfiguration(ConfigRegistry);

package/src/config/server.js

@@ -18,7 +18,6 @@ const settings = {
   ],
   criticalCssPath: 'public/critical.css',
   readCriticalCss: null, // so it will be defaultReadCriticalCss
-  extractScripts: { errorPages: false },
   staticFiles: [
     {
       id: 'root_static',

package/src/constants/ActionTypes.js

@@ -82,6 +82,9 @@ export const REVERT_HISTORY = 'REVERT_HISTORY';
 export const REVERT_TRANSACTIONS = 'REVERT_TRANSACTIONS';
 export const SEARCH_CONTENT = 'SEARCH_CONTENT';
 export const SET_SIDEBAR_TAB = 'SET_SIDEBAR_TAB';
+export const SET_METADATA_FIELDSETS = 'SET_METADATA_FIELDSETS';
+export const SET_METADATA_FOCUS = 'SET_METADATA_FOCUS';
+export const RESET_METADATA_FOCUS = 'RESET_METADATA_FOCUS';
 export const TRANSITION_WORKFLOW = 'TRANSITION_WORKFLOW';
 export const UNINSTALL_ADDON = 'UNINSTALL_ADDON';
 export const UPDATE_CONTENT = 'UPDATE_CONTENT';
@@ -141,3 +144,6 @@ export const POST_UPGRADE = 'POST_UPGRADE';
 export const RESET_LOGIN_REQUEST = 'RESET_LOGIN_REQUEST';
 export const GET_SITE = 'GET_SITE';
 export const GET_NAVROOT = 'GET_NAVROOT';
+export const SET_FORM_DATA = 'SET_FORM_DATA';
+export const SET_UI_STATE = 'SET_UI_STATE';
+export const UPDATE_UPLOADED_FILES = 'UPDATE_UPLOADED_FILES';

package/src/constants/{Languages.js → Languages.cjs}

@@ -11,6 +11,7 @@ module.exports = {
   eu: 'Euskara',
   fi: 'Suomi',
   fr: 'Français',
+  hi: 'Hindi',
   it: 'Italiano',
   nl: 'Nederlands',
   ro: 'Română',
@@ -19,3 +20,5 @@ module.exports = {
   pt_BR: 'Português (Brasil)',
   zh_CN: '中文',
 };
+
+// export default languages;

package/src/express-middleware/files.js

@@ -9,6 +9,7 @@ const HEADERS = [
   'content-type',
   'x-sendfile',
   'x-accel-redirect',
+  'x-robots-tag',
 ];
 
 function filesMiddlewareFn(req, res, next) {

package/src/express-middleware/images.js

@@ -7,6 +7,7 @@ const HEADERS = [
   'cache-control',
   'x-sendfile',
   'x-accel-redirect',
+  'x-robots-tag',
 ];
 
 function imageMiddlewareFn(req, res, next) {

package/src/express-middleware/static.js

@@ -1,28 +1,46 @@
 import express from 'express';
 import path from 'path';
+import AddonConfigurationRegistry from '@plone/registry/src/addon-registry';
 import config from '@plone/volto/registry';
 
-const staticMiddlewareFn = express.static(
-  process.env.BUILD_DIR
-    ? path.join(process.env.BUILD_DIR, 'public')
-    : process.env.RAZZLE_PUBLIC_DIR,
-  {
-    setHeaders: function (res, path) {
-      const pathLib = require('path');
-      const base = pathLib.resolve(process.env.RAZZLE_PUBLIC_DIR);
-      const relpath = path.substr(base.length);
-      config.settings.serverConfig.staticFiles.some((elem) => {
-        if (relpath.match(elem.match)) {
-          for (const name in elem.headers) {
-            res.setHeader(name, elem.headers[name] || 'undefined');
-          }
-          return true;
+const projectRootPath = path.resolve('.');
+const registry = new AddonConfigurationRegistry(projectRootPath);
+
+const staticDirectory = () => {
+  if (process.env.BUILD_DIR) {
+    return path.join(process.env.BUILD_DIR, 'public');
+  }
+  // Only for development, when Volto detects that it's working on itself (not an
+  // old fashioned Volto project), there are add-ons (so it's the new setup) then
+  // point to the public folder in the root of the setup, instead of the inner Volto
+  // public folder.
+  if (
+    process.env.NODE_ENV !== 'production' &&
+    !registry.isVoltoProject &&
+    registry.addonNames.length > 0
+  ) {
+    return path.join(projectRootPath, '../../../public');
+  }
+  // Is always set (Razzle does it)
+  return process.env.RAZZLE_PUBLIC_DIR;
+};
+
+const staticMiddlewareFn = express.static(staticDirectory(), {
+  setHeaders: function (res, path) {
+    const pathLib = require('path');
+    const base = pathLib.resolve(process.env.RAZZLE_PUBLIC_DIR);
+    const relpath = path.substr(base.length);
+    config.settings.serverConfig.staticFiles.some((elem) => {
+      if (relpath.match(elem.match)) {
+        for (const name in elem.headers) {
+          res.setHeader(name, elem.headers[name] || 'undefined');
         }
-        return false;
-      });
-    },
+        return true;
+      }
+      return false;
+    });
   },
-);
+});
 
 export default function staticsMiddleware() {
   const middleware = express.Router();

package/src/helpers/Api/Api.js

@@ -80,6 +80,10 @@ class Api {
 
           Object.keys(headers).forEach((key) => request.set(key, headers[key]));
 
+          if (__SERVER__ && checkUrl && ['get', 'head'].includes(method)) {
+            request.redirects(0);
+          }
+
           if (data) {
             request.send(data);
           }
@@ -104,6 +108,14 @@ class Api {
                 url: request.xhr.responseURL,
               });
             }
+
+            if ([301, 302].includes(err?.status)) {
+              return reject({
+                code: err.status,
+                url: err.response.headers.location,
+              });
+            }
+
             return err ? reject(err) : resolve(response.body || response.text);
           });
         });

package/src/helpers/Api/Api.plone.rest.test.js

@@ -18,6 +18,7 @@ beforeAll(() => {
 
 const api = new Api();
 const { settings } = config;
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 test('get request', () => {});
 

package/src/helpers/Api/Api.test.js

@@ -24,6 +24,7 @@ beforeAll(() => {
 
 const api = new Api();
 const { settings } = config;
+global.__SERVER__ = true; // eslint-disable-line no-underscore-dangle
 
 test('get request', () => {});
 

package/src/helpers/AsyncConnect/AsyncConnect.test.js

@@ -12,8 +12,6 @@ import { AsyncConnectWithContext, AsyncConnect } from './AsyncConnect'; // , Asy
 import { asyncConnect, loadOnServer } from './';
 import { matchAllRoutes } from './utils';
 
-import '@testing-library/jest-dom/extend-expect';
-
 describe('<ReduxAsyncConnect />', () => {
   const initialEmptyState = {
     router: {

package/src/helpers/AsyncConnect/index.js

@@ -90,6 +90,16 @@ const applyExtenders = (asyncItems, pathname) => {
  * with the "object promises" and that's our "object promises" (which it calls
  * internally "asyncItems").
  */
+/**
+ * Higher-order function that enhances a React component with asynchronous data fetching and Redux integration.
+ *
+ * @param {Array} asyncItems - An array of async items to fetch.
+ * @param {Function} [mapStateToProps] - A function that maps the Redux state to component props.
+ * @param {Function} [mapDispatchToProps] - A function that maps Redux dispatch to component props.
+ * @param {Function} [mergeProps] - A function that merges the props from mapStateToProps, mapDispatchToProps, and the component's own props.
+ * @param {Object} [options] - Additional options for configuring the async connect behavior.
+ * @returns {Function} - A function that takes a React component and returns an enhanced component with async connect functionality.
+ */
 export function asyncConnect(
   asyncItems,
   mapStateToProps,

package/src/helpers/AuthToken/AuthToken.js

@@ -102,7 +102,7 @@ export function persistAuthToken(store, req) {
   handleChange(true);
 }
 
-if (module.hot) {
+if (module?.hot) {
   module.hot.dispose((data) => {
     data.reloaded = true;
   });