@plone/volto 16.22.0 → 16.22.1

package/src/components/manage/Controlpanels/Users/UsersControlpanel.jsx

@@ -107,6 +107,7 @@ class UsersControlpanel extends Component {
       isClient: false,
       currentPage: 0,
       pageSize: 10,
+      loginUsingEmail: false,
     };
   }
 
@@ -122,6 +123,14 @@ class UsersControlpanel extends Component {
     }
   };
 
+  // Because username field needs to be disabled if email login is enabled!
+  checkLoginUsingEmailStatus = async () => {
+    await this.props.getControlpanel('security');
+    this.setState({
+      loginUsingEmail: this.props.controlPanelData?.data.use_email_as_login,
+    });
+  };
+
   /**
    * Component did mount
    * @method componentDidMount
@@ -132,6 +141,7 @@ class UsersControlpanel extends Component {
       isClient: true,
     });
     this.fetchData();
+    this.checkLoginUsingEmailStatus();
   }
 
   UNSAFE_componentWillReceiveProps(nextProps) {
@@ -425,7 +435,7 @@ class UsersControlpanel extends Component {
                     id: 'default',
                     title: 'FIXME: User Data',
                     fields: [
-                      'username',
+                      ...(!this.state.loginUsingEmail ? ['username'] : []),
                       'fullname',
                       'email',
                       'password',
@@ -436,15 +446,19 @@ class UsersControlpanel extends Component {
                   },
                 ],
                 properties: {
-                  username: {
-                    title: this.props.intl.formatMessage(
-                      messages.addUserFormUsernameTitle,
-                    ),
-                    type: 'string',
-                    description: this.props.intl.formatMessage(
-                      messages.addUserFormUsernameDescription,
-                    ),
-                  },
+                  ...(!this.state.loginUsingEmail
+                    ? {
+                        username: {
+                          title: this.props.intl.formatMessage(
+                            messages.addUserFormUsernameTitle,
+                          ),
+                          type: 'string',
+                          description: this.props.intl.formatMessage(
+                            messages.addUserFormUsernameDescription,
+                          ),
+                        },
+                      }
+                    : {}),
                   fullname: {
                     title: this.props.intl.formatMessage(
                       messages.addUserFormFullnameTitle,
@@ -670,6 +684,7 @@ export default compose(
       createRequest: state.users.create,
       loadRolesRequest: state.roles,
       inheritedRole: state.authRole.authenticatedRole,
+      controlPanelData: state.controlpanels?.controlpanel,
     }),
     (dispatch) =>
       bindActionCreators(

package/src/components/manage/Widgets/SelectUtils.js

@@ -111,7 +111,7 @@ export function normalizeValue(choices, value, intl) {
 
   if (Array.isArray(value)) {
     // a list of values, like ['foo', 'bar'];
-    return value.map((v) => normalizeValue(choices, v));
+    return value.map((v) => normalizeValue(choices, v, intl));
   }
 
   if (isObject(value)) {

package/src/components/theme/Error/ServerError.jsx

@@ -0,0 +1,29 @@
+/**
+ * @module components/theme/Error/ServerError
+ */
+
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import { Container } from 'semantic-ui-react';
+import { withServerErrorCode } from '@plone/volto/helpers/Utils/Utils';
+
+/**
+ * server error
+ * @function ServerError
+ * @returns {string} Markup of the server error page.
+ */
+const ServerError = () => (
+  <Container className="view-wrapper">
+    <h1>
+      <FormattedMessage id="Server Error" defaultMessage="Server Error" />
+    </h1>
+    <p className="description">
+      <FormattedMessage
+        id="We apologize for the inconvenience, but there was an unexpected error on the server."
+        defaultMessage="We apologize for the inconvenience, but there was an unexpected error on the server."
+      />
+    </p>
+  </Container>
+);
+
+export default withServerErrorCode(500)(ServerError);

package/src/config/Views.jsx

@@ -16,6 +16,7 @@ import RequestTimeout from '@plone/volto/components/theme/RequestTimeout/Request
 import AlbumView from '@plone/volto/components/theme/View/AlbumView';
 import Unauthorized from '@plone/volto/components/theme/Unauthorized/Unauthorized';
 import Forbidden from '@plone/volto/components/theme/Forbidden/Forbidden';
+import ServerError from '@plone/volto/components/theme/Error/ServerError';
 
 const EventView = loadable(() =>
   import('@plone/volto/components/theme/View/EventView'),
@@ -114,6 +115,7 @@ export const errorViews = {
   '401': Unauthorized,
   '403': Forbidden,
   '408': RequestTimeout,
+  '500': ServerError,
   ECONNREFUSED: ConnectionRefused,
   corsError: CorsError,
 };

package/src/config/index.js~

@@ -0,0 +1,223 @@
+/**
+ * Config.
+ * @module config
+ */
+import { parse as parseUrl } from 'url';
+import { defaultWidget, widgetMapping } from './Widgets';
+import {
+  layoutViews,
+  contentTypesViews,
+  defaultView,
+  errorViews,
+  layoutViewsNamesMapping,
+} from './Views';
+import { nonContentRoutes } from './NonContentRoutes';
+import {
+  groupBlocksOrder,
+  requiredBlocks,
+  blocksConfig,
+  initialBlocks,
+  initialBlocksFocus,
+} from './Blocks';
+import { components } from './Components';
+import { loadables } from './Loadables';
+import { workflowMapping } from './Workflows';
+
+import { contentIcons } from './ContentIcons';
+import { styleClassNameConverters, styleClassNameExtenders } from './Style';
+import {
+  controlPanelsIcons,
+  filterControlPanels,
+  filterControlPanelsSchema,
+} from './ControlPanels';
+
+import { richtextEditorSettings, richtextViewSettings } from './RichTextEditor';
+
+import applyAddonConfiguration, { addonsInfo } from 'load-volto-addons';
+
+import ConfigRegistry from '@plone/volto/registry';
+
+const host = process.env.HOST || 'localhost';
+const port = process.env.PORT || '3000';
+
+const apiPath =
+  process.env.RAZZLE_API_PATH ||
+  (__DEVELOPMENT__ ? `http://${host}:${port}` : '');
+
+const getServerURL = (url) => {
+  if (!url) return;
+  const apiPathURL = parseUrl(url);
+  return `${apiPathURL.protocol}//${apiPathURL.hostname}${
+    apiPathURL.port ? `:${apiPathURL.port}` : ''
+  }`;
+};
+
+// Sensible defaults for publicURL
+// if RAZZLE_PUBLIC_URL is present, use it
+// if in DEV, use the host/port combination by default
+// if in PROD, assume it's RAZZLE_API_PATH server name (no /api or alikes) or fallback
+// to DEV settings if RAZZLE_API_PATH is not present
+const publicURL =
+  process.env.RAZZLE_PUBLIC_URL ||
+  (__DEVELOPMENT__
+    ? `http://${host}:${port}`
+    : getServerURL(process.env.RAZZLE_API_PATH) || `http://${host}:${port}`);
+
+const serverConfig =
+  typeof __SERVER__ !== 'undefined' && __SERVER__
+    ? require('./server').default
+    : {};
+
+let config = {
+  settings: {
+    host,
+    port,
+    // The URL Volto is going to be served (see sensible defaults above)
+    publicURL,
+    apiPath,
+    apiExpanders: [
+      // Add the following expanders for only issuing a single request.
+      // https://6.docs.plone.org/volto/configuration/settings-reference.html#term-apiExpanders
+      // {
+      //   match: '',
+      //   GET_CONTENT: ['breadcrumbs', 'navigation', 'actions', 'types'],
+      // },
+    ],
+    // Internal proxy to bypass CORS *while developing*. NOT intended for production use.
+    // In production is recommended you use a Seamless mode deployment using a web server in
+    // front of both the frontend and the backend so you can bypass CORS safely.
+    // https://6.docs.plone.org/volto/deploying/seamless-mode.html
+    devProxyToApiPath:
+      process.env.RAZZLE_DEV_PROXY_API_PATH ||
+      process.env.RAZZLE_INTERNAL_API_PATH ||
+      process.env.RAZZLE_API_PATH ||
+      'http://localhost:8080/Plone', // Set it to '' for disabling the proxy
+    // proxyRewriteTarget Set it for set a custom target for the proxy or overide the internal VHM rewrite
+    // proxyRewriteTarget: '/VirtualHostBase/http/localhost:8080/Plone/VirtualHostRoot/_vh_api'
+    // proxyRewriteTarget: 'https://myvoltositeinproduction.com'
+    proxyRewriteTarget: process.env.RAZZLE_PROXY_REWRITE_TARGET || undefined,
+    // apiPath: process.env.RAZZLE_API_PATH || 'http://localhost:8000', // for Volto reference
+    // apiPath: process.env.RAZZLE_API_PATH || 'http://localhost:8081/db/web', // for guillotina
+    actions_raising_api_errors: ['GET_CONTENT', 'UPDATE_CONTENT'],
+    internalApiPath: process.env.RAZZLE_INTERNAL_API_PATH || undefined,
+    websockets: process.env.RAZZLE_WEBSOCKETS || false,
+    // TODO: legacyTraverse to be removed when the use of the legacy traverse is deprecated.
+    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
+    viewableInBrowserObjects: [], //ex: ['File']. List of content-types for which the file will be displayed in browser if the user is not authenticated
+    listingPreviewImageField: 'image', // deprecated from Volto 14 onwards
+    openExternalLinkInNewTab: false,
+    notSupportedBrowsers: ['ie'],
+    defaultPageSize: 25,
+    isMultilingual: false,
+    supportedLanguages: ['en'],
+    defaultLanguage: 'en',
+    navDepth: 1,
+    expressMiddleware: serverConfig.expressMiddleware, // BBB
+    defaultBlockType: 'slate',
+    verticalFormTabs: false,
+    useEmailAsLogin: false,
+    persistentReducers: ['blocksClipboard'],
+    initialReducersBlacklist: [], // reducers in this list won't be hydrated in windows.__data
+    asyncPropsExtenders: [], // per route asyncConnect customizers
+    contentIcons: contentIcons,
+    loadables,
+    lazyBundles: {
+      cms: [
+        'prettierStandalone',
+        'prettierParserHtml',
+        'prismCore',
+        'toastify',
+        'reactSelect',
+        'reactBeautifulDnd',
+        // 'diffLib',
+      ],
+      draftEditor: [
+        'immutableLib',
+        'draftJs',
+        'draftJsLibIsSoftNewlineEvent',
+        'draftJsFilters',
+        'draftJsInlineToolbarPlugin',
+        'draftJsImportHtml',
+        'draftJsBlockBreakoutPlugin',
+      ],
+    },
+    appExtras: [],
+    maxResponseSize: 2000000000, // This is superagent default (200 mb)
+    serverConfig,
+    storeExtenders: [],
+    showTags: true,
+    controlpanels: [],
+    controlPanelsIcons,
+    filterControlPanels,
+    filterControlPanelsSchema,
+    externalRoutes: [
+      // URL to be considered as external
+      // {
+      //   match: {
+      //     path: '/news',
+      //     exact: false,
+      //     strict: false,
+      //   },
+      //   url(payload) {
+      //     return payload.location.pathname;
+      //   },
+      // },
+    ],
+    showSelfRegistration: false,
+    contentMetadataTagsImageField: 'image',
+    hasWorkingCopySupport: false,
+    maxUndoLevels: 200, // undo history size for the main form
+    addonsInfo: addonsInfo,
+    workflowMapping,
+    errorHandlers: [], // callables for unhandled errors
+    styleClassNameConverters,
+    hashLinkSmoothScroll: false,
+    styleClassNameExtenders,
+    querystringSearchGet: false,
+  },
+  experimental: {
+    addBlockButton: {
+      enabled: false,
+    },
+  },
+  widgets: {
+    ...widgetMapping,
+    default: defaultWidget,
+  },
+  views: {
+    layoutViews,
+    contentTypesViews,
+    defaultView,
+    errorViews,
+    layoutViewsNamesMapping,
+  },
+  blocks: {
+    requiredBlocks,
+    blocksConfig,
+    groupBlocksOrder,
+    initialBlocks,
+    initialBlocksFocus,
+    showEditBlocksInBabelView: false,
+  },
+  addonRoutes: [],
+  addonReducers: {},
+  components,
+};
+
+ConfigRegistry.settings = config.settings;
+ConfigRegistry.experimental = config.experimental;
+ConfigRegistry.blocks = config.blocks;
+ConfigRegistry.views = config.views;
+ConfigRegistry.widgets = config.widgets;
+ConfigRegistry.addonRoutes = config.addonRoutes;
+ConfigRegistry.addonReducers = config.addonReducers;
+ConfigRegistry.components = config.components;
+
+applyAddonConfiguration(ConfigRegistry);

package/src/express-middleware/files.js

@@ -2,11 +2,13 @@ import express from 'express';
 import { getAPIResourceWithAuth } from '@plone/volto/helpers';
 
 const HEADERS = [
-  'Accept-Ranges',
-  'Cache-Control',
-  'Content-Disposition',
-  'Content-Range',
-  'Content-Type',
+  'accept-ranges',
+  'cache-control',
+  'content-disposition',
+  'content-range',
+  'content-type',
+  'x-sendfile',
+  'x-accel-redirect',
 ];
 
 function filesMiddlewareFn(req, res, next) {
@@ -14,7 +16,7 @@ function filesMiddlewareFn(req, res, next) {
     .then((resource) => {
       // Just forward the headers that we need
       HEADERS.forEach((header) => {
-        if (resource.get(header)) {
+        if (resource.headers[header]) {
           res.set(header, resource.get(header));
         }
       });

package/src/express-middleware/images.js

@@ -1,7 +1,13 @@
 import express from 'express';
 import { getAPIResourceWithAuth } from '@plone/volto/helpers';
 
-const HEADERS = ['content-type', 'content-disposition', 'cache-control'];
+const HEADERS = [
+  'content-type',
+  'content-disposition',
+  'cache-control',
+  'x-sendfile',
+  'x-accel-redirect',
+];
 
 function imageMiddlewareFn(req, res, next) {
   getAPIResourceWithAuth(req)

package/src/middleware/api.js

@@ -250,10 +250,22 @@ const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
             };
           });
         }
-        return next({ ...rest, result, type: `${type}_SUCCESS` });
+        try {
+          return next({ ...rest, result, type: `${type}_SUCCESS` });
+        } catch (error) {
+          // There was an exception while processing reducers or downstream middleware.
+          next({
+            ...rest,
+            error: { status: 500, error },
+            type: `${type}_FAIL`,
+          });
+          // Rethrow the original exception on the client side only,
+          // so it doesn't fall through to express on the server.
+          if (__CLIENT__) throw error;
+        }
       },
       (error) => {
-        // Only SRR can set ECONNREFUSED
+        // Only SSR can set ECONNREFUSED
         if (error.code === 'ECONNREFUSED') {
           next({
             ...rest,

package/src/reducers/actions/actions.js

@@ -57,11 +57,13 @@ export default function actions(state = initialState, action = {}) {
       }
       return state;
     case `${LIST_ACTIONS}_SUCCESS`:
-      hasExpander = hasApiExpander(
-        'actions',
-        getBaseUrl(flattenToAppURL(action.result['@id'])),
-      );
-      if (!hasExpander) {
+      // Even if the expander is set or not, if the LIST_ACTIONS is
+      // called, we want it to store the data if the actions data is
+      // not set in the expander data (['@components']) but in the "normal"
+      // action result (we look for the object property returned by the endpoint)
+      // Unfortunately, this endpoint returns all the actions in a plain object
+      // with no structure :(
+      if (action.result.object) {
         return {
           ...state,
           error: null,

package/src/reducers/actions/actions.test.js

@@ -207,4 +207,74 @@ describe('Actions reducer - (ACTIONS)GET_CONTENT', () => {
       loading: false,
     });
   });
+
+  it('should handle (ACTIONS)LIST_ACTIONS (standalone with apiExpander enabled)', () => {
+    expect(
+      actions(undefined, {
+        type: `${LIST_ACTIONS}_SUCCESS`,
+        result: {
+          object: [],
+          object_buttons: [],
+          site_actions: [],
+          user: [
+            {
+              icon: '',
+              id: 'preferences',
+              title: 'Preferences',
+            },
+            {
+              icon: '',
+              id: 'dashboard',
+              title: 'Dashboard',
+            },
+            {
+              icon: '',
+              id: 'plone_setup',
+              title: 'Site Setup',
+            },
+            {
+              icon: '',
+              id: 'logout',
+              title: 'Log out',
+            },
+          ],
+          document_actions: [],
+          portal_tabs: [],
+        },
+      }),
+    ).toEqual({
+      error: null,
+      actions: {
+        object: [],
+        object_buttons: [],
+        site_actions: [],
+        user: [
+          {
+            icon: '',
+            id: 'preferences',
+            title: 'Preferences',
+          },
+          {
+            icon: '',
+            id: 'dashboard',
+            title: 'Dashboard',
+          },
+          {
+            icon: '',
+            id: 'plone_setup',
+            title: 'Site Setup',
+          },
+          {
+            icon: '',
+            id: 'logout',
+            title: 'Log out',
+          },
+        ],
+        document_actions: [],
+        portal_tabs: [],
+      },
+      loaded: true,
+      loading: false,
+    });
+  });
 });

package/src/server.jsx

@@ -263,6 +263,15 @@ server.get('/*', (req, res) => {
       const readCriticalCss =
         config.settings.serverConfig.readCriticalCss || defaultReadCriticalCss;
 
+      // If we are showing an "old browser" warning,
+      // make sure it doesn't get cached in a shared cache
+      const browserdetect = store.getState().browserdetect;
+      if (config.settings.notSupportedBrowsers.includes(browserdetect?.name)) {
+        res.set({
+          'Cache-Control': 'private',
+        });
+      }
+
       if (context.url) {
         res.redirect(flattenToAppURL(context.url));
       } else if (context.error_code) {

package/packages/volto-slate/build/messages/src/blocks/Table/TableBlockEdit.json

@@ -1,90 +0,0 @@
-[
-  {
-    "id": "Insert row before",
-    "defaultMessage": "Insert row before"
-  },
-  {
-    "id": "Insert row after",
-    "defaultMessage": "Insert row after"
-  },
-  {
-    "id": "Delete row",
-    "defaultMessage": "Delete row"
-  },
-  {
-    "id": "Insert col before",
-    "defaultMessage": "Insert col before"
-  },
-  {
-    "id": "Insert col after",
-    "defaultMessage": "Insert col after"
-  },
-  {
-    "id": "Delete col",
-    "defaultMessage": "Delete col"
-  },
-  {
-    "id": "Hide headers",
-    "defaultMessage": "Hide headers"
-  },
-  {
-    "id": "Make the table sortable",
-    "defaultMessage": "Make the table sortable"
-  },
-  {
-    "id": "Visible only in view mode",
-    "defaultMessage": "Visible only in view mode"
-  },
-  {
-    "id": "Fixed width table cells",
-    "defaultMessage": "Fixed width table cells"
-  },
-  {
-    "id": "Make the table compact",
-    "defaultMessage": "Make the table compact"
-  },
-  {
-    "id": "Reduce complexity",
-    "defaultMessage": "Reduce complexity"
-  },
-  {
-    "id": "Divide each row into separate cells",
-    "defaultMessage": "Divide each row into separate cells"
-  },
-  {
-    "id": "Table color inverted",
-    "defaultMessage": "Table color inverted"
-  },
-  {
-    "id": "Stripe alternate rows with color",
-    "defaultMessage": "Stripe alternate rows with color"
-  },
-  {
-    "id": "Left",
-    "defaultMessage": "Left"
-  },
-  {
-    "id": "Center",
-    "defaultMessage": "Center"
-  },
-  {
-    "id": "Right",
-    "defaultMessage": "Right"
-  },
-  {
-    "id": "Bottom",
-    "defaultMessage": "Bottom"
-  },
-  {
-    "id": "Middle",
-    "defaultMessage": "Middle"
-  },
-  {
-    "id": "Top",
-    "defaultMessage": "Top"
-  },
-  {
-    "id": "Table",
-    "defaultMessage": "Table"
-  }
-]

package/packages/volto-slate/build/messages/src/blocks/Text/DefaultTextBlockEditor.json

@@ -1,6 +0,0 @@
-[
-  {
-    "id": "Type text…",
-    "defaultMessage": "Type text…"
-  }
-]

package/packages/volto-slate/build/messages/src/blocks/Text/DetachedTextBlockEditor.json

@@ -1,6 +0,0 @@
-[
-  {
-    "id": "Type text…",
-    "defaultMessage": "Type text…"
-  }
-]

package/packages/volto-slate/build/messages/src/blocks/Text/SlashMenu.json

@@ -1,6 +0,0 @@
-[
-  {
-    "id": "No matching blocks",
-    "defaultMessage": "No matching blocks"
-  }
-]

package/packages/volto-slate/build/messages/src/editor/plugins/AdvancedLink/index.json

@@ -1,10 +0,0 @@
-[
-  {
-    "id": "Edit link",
-    "defaultMessage": "Edit link"
-  },
-  {
-    "id": "Remove link",
-    "defaultMessage": "Remove link"
-  }
-]

package/packages/volto-slate/build/messages/src/editor/plugins/Link/index.json

@@ -1,10 +0,0 @@
-[
-  {
-    "id": "Add link",
-    "defaultMessage": "Add link"
-  },
-  {
-    "id": "Edit link",
-    "defaultMessage": "Edit link"
-  }
-]