@plone/volto 16.8.0 → 16.9.0

package/src/helpers/FormValidation/FormValidation.js

@@ -4,27 +4,29 @@ import { messages } from '../MessageLabels/MessageLabels';
 /**
  * Will return the intl message if invalid
  * @param {boolean} isValid
- * @param {string} maxCriterion
+ * @param {string} criterion
  * @param {string | number} valueToCompare can compare '47' < 50
  * @param {Function} intlFunc
  */
-const validationMessage = (isValid, maxCriterion, valueToCompare, intlFunc) =>
+const validationMessage = (isValid, criterion, valueToCompare, intlFunc) =>
   !isValid
-    ? intlFunc(messages[maxCriterion], {
+    ? intlFunc(messages[criterion], {
         len: valueToCompare,
       })
     : null;
+
 /**
  * Returns if based on the criterion the value is lower or equal
  * @param {string | number} value can compare '47' < 50
  * @param {string | number} valueToCompare can compare '47' < 50
- * @param {string} minCriterion
+ * @param {string} maxCriterion
  * @param {Function} intlFunc
  */
-const isMaxPropertyValid = (value, valueToCompare, minCriterion, intlFunc) => {
+const isMaxPropertyValid = (value, valueToCompare, maxCriterion, intlFunc) => {
   const isValid = valueToCompare !== undefined ? value <= valueToCompare : true;
-  return validationMessage(isValid, minCriterion, valueToCompare, intlFunc);
+  return validationMessage(isValid, maxCriterion, valueToCompare, intlFunc);
 };
+
 /**
  * Returns if based on the criterion the value is higher or equal
  * @param {string | number} value can compare '47' < 50
@@ -32,9 +34,9 @@ const isMaxPropertyValid = (value, valueToCompare, minCriterion, intlFunc) => {
  * @param {string} minCriterion
  * @param {Function} intlFunc
  */
-const isMinPropertyValid = (value, valueToCompare, maxCriterion, intlFunc) => {
+const isMinPropertyValid = (value, valueToCompare, minCriterion, intlFunc) => {
   const isValid = valueToCompare !== undefined ? value >= valueToCompare : true;
-  return validationMessage(isValid, maxCriterion, valueToCompare, intlFunc);
+  return validationMessage(isValid, minCriterion, valueToCompare, intlFunc);
 };
 
 const widgetValidation = {
@@ -109,7 +111,7 @@ const widgetValidation = {
     maxLength: (value, itemObj, intlFunc) =>
       isMaxPropertyValid(
         value.length,
-        itemObj.maxLengthj,
+        itemObj.maxLength,
         'maxLength',
         intlFunc,
       ),

package/src/helpers/ScrollToTop/ScrollToTop.jsx

@@ -27,7 +27,10 @@ class ScrollToTop extends React.Component {
    * @memberof ScrollToTop
    */
   componentDidUpdate(prevProps) {
-    if (this.props.location?.pathname !== prevProps.location?.pathname) {
+    if (
+      !this.props.location?.pathname.hash &&
+      this.props.location?.pathname !== prevProps.location?.pathname
+    ) {
       window.scrollTo(0, 0);
     }
   }

package/src/helpers/Utils/Utils.js

@@ -208,9 +208,11 @@ export const toLangUnderscoreRegion = (language) => {
 };
 
 /**
- * Lookup if a given expander is set in apiExpanders
- * @param {string} language Language to be normalized
- * @returns {string} Language normalized
+ * Lookup if a given expander is set in apiExpanders for the given path and action type
+ * @param {string} expander The id literal of the expander eg. `navigation`
+ * @param {string} path The path (no URL) to check if the expander has effect
+ * @param {string} type The Redux action type
+ * @returns {boolean} Return if the expander is present for the path and the type given
  */
 export const hasApiExpander = (expander, path = '', type = 'GET_CONTENT') => {
   return flatten(

package/src/middleware/api.js

@@ -36,7 +36,7 @@ let socket = null;
  * @param {*} type The action type
  * @returns {string} The url/path with the configured expanders added to the query string
  */
-export function addExpandersToPath(path, type) {
+export function addExpandersToPath(path, type, isAnonymous) {
   const { settings } = config;
   const { apiExpanders = [] } = settings;
 
@@ -49,7 +49,9 @@ export function addExpandersToPath(path, type) {
     .filter((expand) => matchPath(url, expand.match) && expand[type])
     .map((expand) => expand[type]);
 
-  const expandMerge = compact(union([expand, ...flatten(expandersFromConfig)]));
+  const expandMerge = compact(
+    union([expand, ...flatten(expandersFromConfig)]),
+  ).filter((item) => !(item === 'types' && isAnonymous)); // Remove types expander if isAnonymous
 
   const stringifiedExpand = qs.stringify(
     { expand: expandMerge },
@@ -116,6 +118,8 @@ const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
 ) => {
   const { settings } = config;
 
+  const isAnonymous = !getState().userSession.token;
+
   if (typeof action === 'function') {
     return action(dispatch, getState);
   }
@@ -137,14 +141,14 @@ const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
           request.map((item) =>
             sendOnSocket({
               ...item,
-              path: addExpandersToPath(item.path, type),
+              path: addExpandersToPath(item.path, type, isAnonymous),
               id: type,
             }),
           ),
         )
       : sendOnSocket({
           ...request,
-          path: addExpandersToPath(request.path, type),
+          path: addExpandersToPath(request.path, type, isAnonymous),
           id: type,
         });
   } else {
@@ -152,22 +156,25 @@ const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
       ? mode === 'serial'
         ? request.reduce((prevPromise, item) => {
             return prevPromise.then((acc) => {
-              return api[item.op](addExpandersToPath(item.path, type), {
-                data: item.data,
-                type: item.type,
-                headers: item.headers,
-                params: request.params,
-                checkUrl: settings.actions_raising_api_errors.includes(
-                  action.type,
-                ),
-              }).then((reqres) => {
+              return api[item.op](
+                addExpandersToPath(item.path, type, isAnonymous),
+                {
+                  data: item.data,
+                  type: item.type,
+                  headers: item.headers,
+                  params: request.params,
+                  checkUrl: settings.actions_raising_api_errors.includes(
+                    action.type,
+                  ),
+                },
+              ).then((reqres) => {
                 return [...acc, reqres];
               });
             });
           }, Promise.resolve([]))
         : Promise.all(
             request.map((item) =>
-              api[item.op](addExpandersToPath(item.path, type), {
+              api[item.op](addExpandersToPath(item.path, type, isAnonymous), {
                 data: item.data,
                 type: item.type,
                 headers: item.headers,
@@ -178,7 +185,7 @@ const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
               }),
             ),
           )
-      : api[request.op](addExpandersToPath(request.path, type), {
+      : api[request.op](addExpandersToPath(request.path, type, isAnonymous), {
           data: request.data,
           type: request.type,
           headers: request.headers,

package/src/reducers/actions/actions.js

@@ -3,7 +3,12 @@
  * @module reducers/actions/actions
  */
 
-import { LIST_ACTIONS } from '@plone/volto/constants/ActionTypes';
+import { GET_CONTENT, LIST_ACTIONS } from '@plone/volto/constants/ActionTypes';
+import {
+  flattenToAppURL,
+  getBaseUrl,
+  hasApiExpander,
+} from '@plone/volto/helpers';
 
 const initialState = {
   error: null,
@@ -27,6 +32,7 @@ const initialState = {
  * @returns {Object} New state.
  */
 export default function actions(state = initialState, action = {}) {
+  let hasExpander;
   switch (action.type) {
     case `${LIST_ACTIONS}_PENDING`:
       return {
@@ -35,14 +41,36 @@ export default function actions(state = initialState, action = {}) {
         loaded: false,
         loading: true,
       };
+    case `${GET_CONTENT}_SUCCESS`:
+      hasExpander = hasApiExpander(
+        'actions',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (hasExpander) {
+        return {
+          ...state,
+          error: null,
+          actions: action.result['@components'].actions,
+          loaded: true,
+          loading: false,
+        };
+      }
+      return state;
     case `${LIST_ACTIONS}_SUCCESS`:
-      return {
-        ...state,
-        error: null,
-        actions: action.result,
-        loaded: true,
-        loading: false,
-      };
+      hasExpander = hasApiExpander(
+        'actions',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (!hasExpander) {
+        return {
+          ...state,
+          error: null,
+          actions: action.result,
+          loaded: true,
+          loading: false,
+        };
+      }
+      return state;
     case `${LIST_ACTIONS}_FAIL`:
       return {
         ...state,

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

@@ -1,5 +1,6 @@
 import actions from './actions';
-import { LIST_ACTIONS } from '@plone/volto/constants/ActionTypes';
+import { GET_CONTENT, LIST_ACTIONS } from '@plone/volto/constants/ActionTypes';
+import config from '@plone/volto/registry';
 
 describe('Actions reducer', () => {
   it('should return the initial state', () => {
@@ -122,3 +123,88 @@ describe('Actions reducer', () => {
     });
   });
 });
+
+describe('Actions reducer - (ACTIONS)GET_CONTENT', () => {
+  beforeEach(() => {
+    config.settings.apiExpanders = [
+      {
+        match: '',
+        GET_CONTENT: ['actions'],
+      },
+    ];
+  });
+
+  it('should handle (ACTIONS)GET_CONTENT', () => {
+    expect(
+      actions(undefined, {
+        type: `${GET_CONTENT}_SUCCESS`,
+        result: {
+          '@components': {
+            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: [],
+            },
+          },
+        },
+      }),
+    ).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/reducers/breadcrumbs/breadcrumbs.js

@@ -4,9 +4,16 @@
  */
 
 import { map } from 'lodash';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import {
+  flattenToAppURL,
+  getBaseUrl,
+  hasApiExpander,
+} from '@plone/volto/helpers';
 
-import { GET_BREADCRUMBS } from '@plone/volto/constants/ActionTypes';
+import {
+  GET_BREADCRUMBS,
+  GET_CONTENT,
+} from '@plone/volto/constants/ActionTypes';
 
 const initialState = {
   error: null,
@@ -24,6 +31,7 @@ const initialState = {
  * @returns {Object} New state.
  */
 export default function breadcrumbs(state = initialState, action = {}) {
+  let hasExpander;
   switch (action.type) {
     case `${GET_BREADCRUMBS}_PENDING`:
       return {
@@ -32,18 +40,47 @@ export default function breadcrumbs(state = initialState, action = {}) {
         loaded: false,
         loading: true,
       };
+    case `${GET_CONTENT}_SUCCESS`:
+      hasExpander = hasApiExpander(
+        'breadcrumbs',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (hasExpander) {
+        return {
+          ...state,
+          error: null,
+          items: map(
+            action.result['@components'].breadcrumbs.items,
+            (item) => ({
+              title: item.title,
+              url: flattenToAppURL(item['@id']),
+            }),
+          ),
+          root: flattenToAppURL(action.result['@components'].breadcrumbs.root),
+          loaded: true,
+          loading: false,
+        };
+      }
+      return state;
     case `${GET_BREADCRUMBS}_SUCCESS`:
-      return {
-        ...state,
-        error: null,
-        items: map(action.result.items, (item) => ({
-          title: item.title,
-          url: flattenToAppURL(item['@id']),
-        })),
-        root: flattenToAppURL(action.result.root),
-        loaded: true,
-        loading: false,
-      };
+      hasExpander = hasApiExpander(
+        'breadcrumbs',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (!hasExpander) {
+        return {
+          ...state,
+          error: null,
+          items: map(action.result.items, (item) => ({
+            title: item.title,
+            url: flattenToAppURL(item['@id']),
+          })),
+          root: flattenToAppURL(action.result.root),
+          loaded: true,
+          loading: false,
+        };
+      }
+      return state;
     case `${GET_BREADCRUMBS}_FAIL`:
       return {
         ...state,

package/src/reducers/breadcrumbs/breadcrumbs.test.js

@@ -1,6 +1,9 @@
 import config from '@plone/volto/registry';
 import breadcrumbs from './breadcrumbs';
-import { GET_BREADCRUMBS } from '@plone/volto/constants/ActionTypes';
+import {
+  GET_BREADCRUMBS,
+  GET_CONTENT,
+} from '@plone/volto/constants/ActionTypes';
 
 const { settings } = config;
 
@@ -72,3 +75,46 @@ describe('Breadcrumbs reducer', () => {
     });
   });
 });
+
+describe('Breadcrumbs reducer - (BREADCRUMBS)GET_CONTENT', () => {
+  beforeEach(() => {
+    config.settings.apiExpanders = [
+      {
+        match: '',
+        GET_CONTENT: ['breadcrumbs'],
+      },
+    ];
+  });
+
+  it('should handle (BREADCRUMBS)GET_CONTENT_SUCCESS', () => {
+    expect(
+      breadcrumbs(undefined, {
+        type: `${GET_CONTENT}_SUCCESS`,
+        result: {
+          '@components': {
+            breadcrumbs: {
+              items: [
+                {
+                  title: 'Welcome to Plone!',
+                  '@id': `${settings.apiPath}/front-page`,
+                },
+              ],
+              root: settings.apiPath,
+            },
+          },
+        },
+      }),
+    ).toEqual({
+      error: null,
+      items: [
+        {
+          title: 'Welcome to Plone!',
+          url: '/front-page',
+        },
+      ],
+      root: '',
+      loaded: true,
+      loading: false,
+    });
+  });
+});

package/src/reducers/navigation/navigation.js

@@ -4,9 +4,16 @@
  */
 
 import { map } from 'lodash';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import {
+  flattenToAppURL,
+  getBaseUrl,
+  hasApiExpander,
+} from '@plone/volto/helpers';
 
-import { GET_NAVIGATION } from '@plone/volto/constants/ActionTypes';
+import {
+  GET_CONTENT,
+  GET_NAVIGATION,
+} from '@plone/volto/constants/ActionTypes';
 
 const initialState = {
   error: null,
@@ -39,6 +46,7 @@ function getRecursiveItems(items) {
  * @returns {Object} New state.
  */
 export default function navigation(state = initialState, action = {}) {
+  let hasExpander;
   switch (action.type) {
     case `${GET_NAVIGATION}_PENDING`:
       return {
@@ -47,14 +55,38 @@ export default function navigation(state = initialState, action = {}) {
         loaded: false,
         loading: true,
       };
+    case `${GET_CONTENT}_SUCCESS`:
+      hasExpander = hasApiExpander(
+        'navigation',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (hasExpander) {
+        return {
+          ...state,
+          error: null,
+          items: getRecursiveItems(
+            action.result['@components'].navigation.items,
+          ),
+          loaded: true,
+          loading: false,
+        };
+      }
+      return state;
     case `${GET_NAVIGATION}_SUCCESS`:
-      return {
-        ...state,
-        error: null,
-        items: getRecursiveItems(action.result.items),
-        loaded: true,
-        loading: false,
-      };
+      hasExpander = hasApiExpander(
+        'navigation',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (!hasExpander) {
+        return {
+          ...state,
+          error: null,
+          items: getRecursiveItems(action.result.items),
+          loaded: true,
+          loading: false,
+        };
+      }
+      return state;
     case `${GET_NAVIGATION}_FAIL`:
       return {
         ...state,

package/src/reducers/navigation/navigation.test.js

@@ -1,4 +1,7 @@
-import { GET_NAVIGATION } from '@plone/volto/constants/ActionTypes';
+import {
+  GET_CONTENT,
+  GET_NAVIGATION,
+} from '@plone/volto/constants/ActionTypes';
 import config from '@plone/volto/registry';
 import navigation from './navigation';
 
@@ -125,3 +128,48 @@ describe('Navigation reducer', () => {
     });
   });
 });
+
+describe('Navigation reducer (NAVIGATION)GET_CONTENT', () => {
+  beforeEach(() => {
+    config.settings.apiExpanders = [
+      {
+        match: '',
+        GET_CONTENT: ['navigation'],
+      },
+    ];
+  });
+
+  it('should handle (NAVIGATION)GET_CONTENT_SUCCESS', () => {
+    expect(
+      navigation(undefined, {
+        type: `${GET_CONTENT}_SUCCESS`,
+        result: {
+          '@components': {
+            navigation: {
+              items: [
+                {
+                  title: 'Welcome to Plone!',
+                  description:
+                    'Congratulations! You have successfully installed Plone.',
+                  '@id': `${settings.apiPath}/front-page`,
+                },
+              ],
+            },
+          },
+        },
+      }),
+    ).toEqual({
+      error: null,
+      items: [
+        {
+          title: 'Welcome to Plone!',
+          description:
+            'Congratulations! You have successfully installed Plone.',
+          url: '/front-page',
+        },
+      ],
+      loaded: true,
+      loading: false,
+    });
+  });
+});

package/src/reducers/types/types.js

@@ -3,7 +3,12 @@
  * @module reducers/types/types
  */
 
-import { GET_TYPES } from '@plone/volto/constants/ActionTypes';
+import { GET_CONTENT, GET_TYPES } from '@plone/volto/constants/ActionTypes';
+import {
+  flattenToAppURL,
+  getBaseUrl,
+  hasApiExpander,
+} from '@plone/volto/helpers';
 
 const initialState = {
   error: null,
@@ -20,6 +25,7 @@ const initialState = {
  * @returns {Object} New state.
  */
 export default function types(state = initialState, action = {}) {
+  let hasExpander;
   switch (action.type) {
     case `${GET_TYPES}_PENDING`:
       return {
@@ -28,14 +34,36 @@ export default function types(state = initialState, action = {}) {
         loading: true,
         loaded: false,
       };
+    case `${GET_CONTENT}_SUCCESS`:
+      hasExpander = hasApiExpander(
+        'types',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (hasExpander) {
+        return {
+          ...state,
+          error: null,
+          loading: false,
+          loaded: true,
+          types: action.result['@components'].types,
+        };
+      }
+      return state;
     case `${GET_TYPES}_SUCCESS`:
-      return {
-        ...state,
-        error: null,
-        loading: false,
-        loaded: true,
-        types: action.result,
-      };
+      hasExpander = hasApiExpander(
+        'types',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (!hasExpander) {
+        return {
+          ...state,
+          error: null,
+          loading: false,
+          loaded: true,
+          types: action.result,
+        };
+      }
+      return state;
     case `${GET_TYPES}_FAIL`:
       return {
         ...state,