@plone/volto 17.0.0-alpha.8 → 17.0.0

package/src/middleware/storeProtectLoadUtils.test.js

@@ -26,54 +26,58 @@ describe('storeProtectLoadUtils', () => {
       expect(result).toBe('NEXT');
     });
 
-    const testLocationChange = ({ locationMap, resetBeforeFetch }) => () => {
-      const dispatch = jest.fn();
-      const getState = jest.fn(() => ({
-        router: {
-          location: {
-            pathname: '/PATH',
+    const testLocationChange =
+      ({ locationMap, resetBeforeFetch }) =>
+      () => {
+        const dispatch = jest.fn();
+        const getState = jest.fn(() => ({
+          router: {
+            location: {
+              pathname: '/PATH',
+            },
           },
-        },
-      }));
-      const next = jest.fn(() => 'NEXT');
-      const action = {
-        type: '@@router/LOCATION_CHANGE',
-        payload: { location: { pathname: '/NEW-PATH' } },
+        }));
+        const next = jest.fn(() => 'NEXT');
+        const action = {
+          type: '@@router/LOCATION_CHANGE',
+          payload: { location: { pathname: '/NEW-PATH' } },
+        };
+        Url.isCmsUi = jest.fn((path) => locationMap[path]);
+        const result = protectLoadStart({ dispatch, getState })(next)(action);
+        expect(dispatch).toBeCalledWith({
+          type: '@@loadProtector/START',
+          location: { pathname: '/NEW-PATH' },
+          resetBeforeFetch,
+        });
+        expect(next).toBeCalledWith(action);
+        expect(result).toBe('NEXT');
       };
-      Url.isCmsUi = jest.fn((path) => locationMap[path]);
-      const result = protectLoadStart({ dispatch, getState })(next)(action);
-      expect(dispatch).toBeCalledWith({
-        type: '@@loadProtector/START',
-        location: { pathname: '/NEW-PATH' },
-        resetBeforeFetch,
-      });
-      expect(next).toBeCalledWith(action);
-      expect(result).toBe('NEXT');
-    };
 
-    const testLocationSkipped = ({ locationMap }) => () => {
-      const dispatch = jest.fn();
-      const getState = jest.fn(() => ({
-        router: {
-          location: {
-            pathname: '/PATH',
+    const testLocationSkipped =
+      ({ locationMap }) =>
+      () => {
+        const dispatch = jest.fn();
+        const getState = jest.fn(() => ({
+          router: {
+            location: {
+              pathname: '/PATH',
+            },
           },
-        },
-      }));
-      const next = jest.fn(() => 'NEXT');
-      const action = {
-        type: '@@router/LOCATION_CHANGE',
-        payload: { location: { pathname: '/NEW-PATH' } },
+        }));
+        const next = jest.fn(() => 'NEXT');
+        const action = {
+          type: '@@router/LOCATION_CHANGE',
+          payload: { location: { pathname: '/NEW-PATH' } },
+        };
+        Url.isCmsUi = jest.fn((path) => locationMap[path]);
+        const result = protectLoadStart({ dispatch, getState })(next)(action);
+        expect(dispatch).toBeCalledWith({
+          type: '@@loadProtector/SKIPPED',
+          location: { pathname: '/NEW-PATH' },
+        });
+        expect(next).toBeCalledWith(action);
+        expect(result).toBe('NEXT');
       };
-      Url.isCmsUi = jest.fn((path) => locationMap[path]);
-      const result = protectLoadStart({ dispatch, getState })(next)(action);
-      expect(dispatch).toBeCalledWith({
-        type: '@@loadProtector/SKIPPED',
-        location: { pathname: '/NEW-PATH' },
-      });
-      expect(next).toBeCalledWith(action);
-      expect(result).toBe('NEXT');
-    };
 
     describe('location change', () => {
       test(

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/reducers/content/content.test.js

@@ -82,7 +82,7 @@ describe('Content reducer', () => {
       }),
     ).toMatchObject({
       subrequests: {
-        '1234': {
+        1234: {
           data: null,
           loaded: false,
           loading: true,
@@ -136,7 +136,7 @@ describe('Content reducer', () => {
       }),
     ).toMatchObject({
       subrequests: {
-        '1234': {
+        1234: {
           data: {
             items: [
               {
@@ -170,7 +170,7 @@ describe('Content reducer', () => {
       }),
     ).toMatchObject({
       subrequests: {
-        '1234': {
+        1234: {
           data: [
             {
               '@id': `${settings.apiPath}/home-page`,
@@ -214,7 +214,7 @@ describe('Content reducer', () => {
       }),
     ).toMatchObject({
       subrequests: {
-        '1234': {
+        1234: {
           data: null,
           loaded: false,
           loading: false,

package/src/reducers/index.js

@@ -50,6 +50,8 @@ import workingCopy from './workingcopy/workingcopy';
 import transactions from './transactions/transactions';
 import upgrade from './upgrade/upgrade';
 import userschema from './userschema/userschema';
+import site from './site/site';
+import navroot from './navroot/navroot';
 
 /**
  * Root reducer.
@@ -105,6 +107,8 @@ const reducers = {
   workingCopy,
   transactions,
   userschema,
+  site,
+  navroot,
 };
 
 export default reducers;

package/src/reducers/navigation/navigation.js

@@ -73,11 +73,11 @@ export default function navigation(state = initialState, action = {}) {
       }
       return state;
     case `${GET_NAVIGATION}_SUCCESS`:
-      hasExpander = hasApiExpander(
-        'navigation',
-        getBaseUrl(flattenToAppURL(action.result['@id'])),
-      );
-      if (!hasExpander) {
+      // Even if the expander is set or not, if the GET_NAVIGATION 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)
+      if (!action.result?.['@components'] && action.result?.items) {
         return {
           ...state,
           error: null,

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

@@ -172,4 +172,34 @@ describe('Navigation reducer (NAVIGATION)GET_CONTENT', () => {
       loading: false,
     });
   });
+
+  it('should handle (NAVIGATION)GET_NAVIGATION_SUCCESS (standalone with apiExpander enabled)', () => {
+    expect(
+      navigation(undefined, {
+        type: `${GET_NAVIGATION}_SUCCESS`,
+        result: {
+          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/navroot/navroot.js

@@ -0,0 +1,79 @@
+/**
+ * Navroot reducer.
+ * @module reducers/navroot/navroot
+ */
+import {
+  flattenToAppURL,
+  getBaseUrl,
+  hasApiExpander,
+} from '@plone/volto/helpers';
+
+import { GET_NAVROOT, GET_CONTENT } from '@plone/volto/constants/ActionTypes';
+
+const initialState = {
+  error: null,
+  loaded: false,
+  loading: false,
+  data: {},
+};
+
+/**
+ * navroot reducer.
+ * @function navroot
+ * @param {Object} state Current state.
+ * @param {Object} action Action to be handled.
+ * @returns {Object} New state.
+ */
+export default function navroot(state = initialState, action = {}) {
+  let hasExpander;
+  switch (action.type) {
+    case `${GET_NAVROOT}_PENDING`:
+      return {
+        ...state,
+        error: null,
+        loaded: false,
+        loading: true,
+        data: {},
+      };
+    case `${GET_CONTENT}_SUCCESS`:
+      hasExpander = hasApiExpander(
+        'navroot',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (hasExpander && !action.subrequest) {
+        return {
+          ...state,
+          error: null,
+          data: action.result['@components'].navroot,
+          loaded: true,
+          loading: false,
+        };
+      }
+      return state;
+    case `${GET_NAVROOT}_SUCCESS`:
+      hasExpander = hasApiExpander(
+        'navroot',
+        getBaseUrl(flattenToAppURL(action.result['@id'])),
+      );
+      if (!hasExpander) {
+        return {
+          ...state,
+          error: null,
+          loaded: true,
+          loading: false,
+          data: action.result,
+        };
+      }
+      return state;
+    case `${GET_NAVROOT}_FAIL`:
+      return {
+        ...state,
+        error: action.result,
+        loaded: false,
+        loading: false,
+        data: {},
+      };
+    default:
+      return state;
+  }
+}

package/src/reducers/navroot/navroot.test.js

@@ -0,0 +1,110 @@
+import { GET_CONTENT, GET_NAVROOT } from '@plone/volto/constants/ActionTypes';
+import config from '@plone/volto/registry';
+import navroot from './navroot';
+
+const { settings } = config;
+
+describe('Navroot reducer', () => {
+  it('should return the initial state', () => {
+    expect(navroot()).toEqual({
+      error: null,
+      data: {},
+      loaded: false,
+      loading: false,
+    });
+  });
+
+  it('should handle GET_NAVROOT_PENDING', () => {
+    expect(
+      navroot(undefined, {
+        type: `${GET_NAVROOT}_PENDING`,
+      }),
+    ).toEqual({
+      error: null,
+      data: {},
+      loaded: false,
+      loading: true,
+    });
+  });
+
+  it('should handle GET_NAVROOT_SUCCESS', () => {
+    expect(
+      navroot(undefined, {
+        type: `${GET_NAVROOT}_SUCCESS`,
+        result: {
+          title: 'Welcome to Plone!',
+          description:
+            'Congratulations! You have successfully installed Plone.',
+          '@id': `${settings.apiPath}/front-page`,
+        },
+      }),
+    ).toEqual({
+      error: null,
+      data: {
+        '@id': `${settings.apiPath}/front-page`,
+        title: 'Welcome to Plone!',
+        description: 'Congratulations! You have successfully installed Plone.',
+      },
+
+      loaded: true,
+      loading: false,
+    });
+  });
+
+  it('should handle GET_NAVROOT_FAIL', () => {
+    expect(
+      navroot(undefined, {
+        type: `${GET_NAVROOT}_FAIL`,
+        error: 'failed',
+      }),
+    ).toEqual({
+      error: undefined,
+      data: {},
+      loaded: false,
+      loading: false,
+    });
+  });
+});
+
+describe('Navroot reducer (NAVROOT)GET_CONTENT', () => {
+  beforeEach(() => {
+    config.settings.apiExpanders = [
+      {
+        match: '',
+        GET_CONTENT: ['navroot'],
+      },
+    ];
+  });
+
+  it('should handle (NAVROOT)GET_CONTENT_SUCCESS', () => {
+    expect(
+      navroot(undefined, {
+        type: `${GET_CONTENT}_SUCCESS`,
+        result: {
+          '@components': {
+            navroot: {
+              navroot: {
+                title: 'Welcome to Plone!',
+                description:
+                  'Congratulations! You have successfully installed Plone.',
+                '@id': `${settings.apiPath}/front-page`,
+              },
+            },
+          },
+        },
+      }),
+    ).toEqual({
+      error: null,
+      data: {
+        navroot: {
+          '@id': `${settings.apiPath}/front-page`,
+          title: 'Welcome to Plone!',
+          description:
+            'Congratulations! You have successfully installed Plone.',
+        },
+      },
+      loaded: true,
+      loading: false,
+    });
+  });
+});

package/src/reducers/relations/relations.js

@@ -7,23 +7,29 @@ import {
   CREATE_RELATIONS,
   DELETE_RELATIONS,
   LIST_RELATIONS,
+  STATS_RELATIONS,
   REBUILD_RELATIONS,
 } from '@plone/volto/constants/ActionTypes';
 
 const initialState = {
-  relations: null,
-  stats: null,
-  create: {
+  relations: {
     error: null,
     loaded: false,
     loading: false,
+    data: null,
   },
-  delete: {
+  stats: {
+    error: null,
+    loaded: false,
+    loading: false,
+    data: null,
+  },
+  create: {
     error: null,
     loaded: false,
     loading: false,
   },
-  list: {
+  delete: {
     error: null,
     loaded: false,
     loading: false,
@@ -55,17 +61,6 @@ function getRequestKey(actionType) {
  */
 export default function relations(state = initialState, action = {}) {
   switch (action.type) {
-    case `${CREATE_RELATIONS}_PENDING`:
-    case `${DELETE_RELATIONS}_PENDING`:
-    case `${REBUILD_RELATIONS}_PENDING`:
-      return {
-        ...state,
-        [getRequestKey(action.type)]: {
-          loading: true,
-          loaded: false,
-          error: null,
-        },
-      };
     case `${LIST_RELATIONS}_PENDING`:
       return action.subrequest
         ? {
@@ -73,10 +68,7 @@ export default function relations(state = initialState, action = {}) {
             subrequests: {
               ...state.subrequests,
               [action.subrequest]: {
-                ...(state.subrequests[action.subrequest] || {
-                  relations: null,
-                  stats: null,
-                }),
+                data: null,
                 loaded: false,
                 loading: true,
                 error: null,
@@ -85,7 +77,8 @@ export default function relations(state = initialState, action = {}) {
           }
         : {
             ...state,
-            [getRequestKey(action.type)]: {
+            relations: {
+              data: null,
               loading: true,
               loaded: false,
               error: null,
@@ -98,39 +91,22 @@ export default function relations(state = initialState, action = {}) {
             subrequests: {
               ...state.subrequests,
               [action.subrequest]: {
+                data: action.result.relations,
                 loading: false,
                 loaded: true,
                 error: null,
-                relations: action.result.relations
-                  ? action.result.relations
-                  : state.relations,
-                stats: null,
               },
             },
           }
         : {
             ...state,
-            relations: action.result.relations
-              ? action.result.relations
-              : state.relations,
-            stats: action.result.stats ? action.result : state.stats,
-            [getRequestKey(action.type)]: {
+            relations: {
+              data: action.result.relations,
               loading: false,
               loaded: true,
               error: null,
             },
           };
-    case `${CREATE_RELATIONS}_SUCCESS`:
-    case `${DELETE_RELATIONS}_SUCCESS`:
-    case `${REBUILD_RELATIONS}_SUCCESS`:
-      return {
-        ...state,
-        [getRequestKey(action.type)]: {
-          loading: false,
-          loaded: true,
-          error: null,
-        },
-      };
     case `${LIST_RELATIONS}_FAIL`:
       return action.subrequest
         ? {
@@ -138,8 +114,7 @@ export default function relations(state = initialState, action = {}) {
             subrequests: {
               ...state.subrequests,
               [action.subrequest]: {
-                relations: null,
-                stats: null,
+                data: null,
                 loading: false,
                 loaded: false,
                 error: action.error,
@@ -148,14 +123,67 @@ export default function relations(state = initialState, action = {}) {
           }
         : {
             ...state,
-            relations: null,
-            stats: null,
-            [getRequestKey(action.type)]: {
+            relations: {
+              data: null,
               loading: false,
               loaded: false,
               error: action.error,
             },
           };
+
+    case `${STATS_RELATIONS}_PENDING`:
+      return {
+        ...state,
+        [getRequestKey(action.type)]: {
+          loading: true,
+          loaded: false,
+          error: null,
+          data: null,
+        },
+      };
+    case `${STATS_RELATIONS}_SUCCESS`:
+      return {
+        ...state,
+        [getRequestKey(action.type)]: {
+          loading: false,
+          loaded: true,
+          error: null,
+          data: action.result,
+        },
+      };
+    case `${STATS_RELATIONS}_FAIL`:
+      return {
+        ...state,
+        [getRequestKey(action.type)]: {
+          loading: false,
+          loaded: false,
+          error: action.error,
+          data: null,
+        },
+      };
+
+    case `${CREATE_RELATIONS}_PENDING`:
+    case `${DELETE_RELATIONS}_PENDING`:
+    case `${REBUILD_RELATIONS}_PENDING`:
+      return {
+        ...state,
+        [getRequestKey(action.type)]: {
+          loading: true,
+          loaded: false,
+          error: null,
+        },
+      };
+    case `${CREATE_RELATIONS}_SUCCESS`:
+    case `${DELETE_RELATIONS}_SUCCESS`:
+    case `${REBUILD_RELATIONS}_SUCCESS`:
+      return {
+        ...state,
+        [getRequestKey(action.type)]: {
+          loading: false,
+          loaded: true,
+          error: null,
+        },
+      };
     case `${CREATE_RELATIONS}_FAIL`:
     case `${DELETE_RELATIONS}_FAIL`:
     case `${REBUILD_RELATIONS}_FAIL`: