@plone/volto 16.21.3 → 16.22.1

package/src/config/server.js

@@ -1,6 +1,7 @@
 import imagesMiddleware from '@plone/volto/express-middleware/images';
 import filesMiddleware from '@plone/volto/express-middleware/files';
 import robotstxtMiddleware from '@plone/volto/express-middleware/robotstxt';
+import okMiddleware from '@plone/volto/express-middleware/ok';
 import sitemapMiddleware from '@plone/volto/express-middleware/sitemap';
 import staticsMiddleware from '@plone/volto/express-middleware/static';
 import devProxyMiddleware from '@plone/volto/express-middleware/devproxy';
@@ -11,6 +12,7 @@ const settings = {
     filesMiddleware(),
     imagesMiddleware(),
     robotstxtMiddleware(),
+    okMiddleware(),
     sitemapMiddleware(),
     staticsMiddleware(),
   ],

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/express-middleware/ok.js

@@ -0,0 +1,16 @@
+import express from 'express';
+import config from '@plone/volto/registry';
+
+const ok = function (req, res, next) {
+  res.type('text/plain');
+  res.set('Expires', 'Sat, 1 Jan 2000 00:00:00 GMT');
+  res.set('Cache-Control', 'max-age=0, must-revalidate, private');
+  res.send('ok');
+};
+
+export default function () {
+  const middleware = express.Router();
+  middleware.all(config?.settings?.okRoute || '/ok', ok);
+  middleware.id = 'ok';
+  return middleware;
+}

package/src/helpers/Url/Url.js

@@ -3,7 +3,7 @@
  * @module helpers/Url
  */
 
-import { last, memoize } from 'lodash';
+import { last, memoize, isArray, isObject, isString } from 'lodash';
 import { urlRegex, telRegex, mailRegex } from './urlRegex';
 import prependHttp from 'prepend-http';
 import config from '@plone/volto/registry';
@@ -251,6 +251,27 @@ export function isUrl(url) {
   return urlRegex().test(url);
 }
 
+/**
+ * Get field url
+ * @method getFieldURL
+ * @param {object} data
+ * @returns {string | any} URL string value if field is of url type or any.
+ */
+export const getFieldURL = (data) => {
+  let url = data;
+  const _isObject = data && isObject(data) && !isArray(data);
+  if (_isObject && data['@type'] === 'URL') {
+    url = data['value'] ?? data['url'] ?? data['href'] ?? data;
+  } else if (_isObject) {
+    url = data['@id'] ?? data['url'] ?? data['href'] ?? data;
+  }
+  if (isArray(data)) {
+    url = data.map((item) => getFieldURL(item));
+  }
+  if (isString(url) && isInternalURL(url)) return flattenToAppURL(url);
+  return url;
+};
+
 /**
  * Normalize URL, adds protocol (if required eg. user has not entered the protocol)
  * @method normalizeUrl

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

@@ -10,6 +10,7 @@ import {
   isCmsUi,
   isInternalURL,
   isUrl,
+  getFieldURL,
   normalizeUrl,
   removeProtocol,
   addAppURL,
@@ -260,6 +261,46 @@ describe('Url', () => {
       expect(isUrl(href)).toBe(false);
     });
   });
+  describe('getFieldURL', () => {
+    it('returns app URL if the field is a string', () => {
+      const field = `${settings.apiPath}/foo/bar`;
+      expect(getFieldURL(field)).toBe('/foo/bar');
+    });
+    it('returns app URL if the field is an object with "@id"', () => {
+      const field = { '@id': '/foo/bar' };
+      expect(getFieldURL(field)).toBe('/foo/bar');
+    });
+    it('returns app URL if the field is an object with type URL', () => {
+      const field = { '@type': 'URL', value: '/foo/bar' };
+      expect(getFieldURL(field)).toBe('/foo/bar');
+    });
+    it('returns app URL if the field is an object with url or href properties', () => {
+      const fieldUrl = { url: '/foo/bar' };
+      const fieldHref = { href: '/foo/bar' };
+      expect(getFieldURL(fieldUrl)).toBe('/foo/bar');
+      expect(getFieldURL(fieldHref)).toBe('/foo/bar');
+    });
+    it('returns array of app URL if the field is an array of strings', () => {
+      const field = [
+        `${settings.apiPath}/foo/bar/1`,
+        `${settings.apiPath}/foo/bar/2`,
+      ];
+      expect(getFieldURL(field)).toStrictEqual(['/foo/bar/1', '/foo/bar/2']);
+    });
+    it('returns array of app URL if the field is an array of objects', () => {
+      const field = [
+        {
+          '@type': 'URL',
+          value: `${settings.apiPath}/foo/bar/1`,
+        },
+        {
+          '@type': 'URL',
+          value: `${settings.apiPath}/foo/bar/2`,
+        },
+      ];
+      expect(getFieldURL(field)).toStrictEqual(['/foo/bar/1', '/foo/bar/2']);
+    });
+  });
   describe('normalizeUrl', () => {
     it('normalizeUrl test', () => {
       const href = `www.example.com`;

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/theme/themes/pastanaga/extras/main.less

@@ -26,7 +26,7 @@ body {
   &.has-toolbar-menu-open,
   &.has-mobile-menu-open {
     // The body scroll locker when the toolbar or the mobile menu are active in mobile.
-    @media only screen and (max-width: @largestMobileScreen) {
+    @media only screen and (max-width: @largestTabletScreen) {
       overflow: hidden;
     }
   }
@@ -588,4 +588,5 @@ body.has-toolbar-collapsed .mobile-menu {
 @import 'login';
 @import 'language-selector';
 @import 'views';
+@import 'toc';
 .loadUIOverrides();

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

@@ -0,0 +1,29 @@
+.table-of-contents.horizontalMenu.sticky-toc {
+  position: sticky;
+  z-index: 1;
+  top: 0;
+}
+
+.table-of-contents.horizontalMenu .hidden {
+  z-index: -1;
+  pointer-events: none;
+  visibility: hidden;
+}
+
+.table-of-contents.horizontalMenu .hidden-dropdown {
+  display: none !important;
+}
+
+.table-of-contents.horizontalMenu .item.dropdown {
+  position: absolute !important;
+  right: 0;
+}
+
+.table-of-contents.horizontalMenu > .ui.menu {
+  position: relative;
+}
+
+.table-of-contents.horizontalMenu .item.dropdown .focused > a {
+  border: 2px solid black !important;
+  border-radius: 4px;
+}

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"
-  }
-]

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

@@ -1,30 +0,0 @@
-[
-  {
-    "id": "Delete table",
-    "defaultMessage": "Delete table"
-  },
-  {
-    "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"
-  }
-]

package/packages/volto-slate/build/messages/src/elementEditor/messages.json

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

package/packages/volto-slate/build/messages/src/widgets/HtmlSlateWidget.json

@@ -1,6 +0,0 @@
-[
-  {
-    "id": "An error has occurred while editing \"{name}\" field. We have been notified and we are looking into it. Please save your work and retry. If the issue persists please contact the site administrator.",
-    "defaultMessage": "An error has occurred while editing \"{name}\" field. We have been notified and we are looking into it. Please save your work and retry. If the issue persists please contact the site administrator."
-  }
-]

package/packages/volto-slate/build/messages/src/widgets/RichTextWidgetView.json

@@ -1,6 +0,0 @@
-[
-  {
-    "id": "An error has occurred while rendering \"{name}\" field. We have been notified and we are looking into it. If the issue persists please contact the site administrator.",
-    "defaultMessage": "An error has occurred while rendering \"{name}\" field. We have been notified and we are looking into it. If the issue persists please contact the site administrator."
-  }
-]

package/pyvenv.cfg

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