@plone/volto 17.0.0-alpha.9 → 17.0.0

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`:

package/src/reducers/site/site.js

@@ -0,0 +1,51 @@
+/**
+ * Site reducer.
+ * @module reducers/site/site
+ */
+
+import { GET_SITE } from '@plone/volto/constants/ActionTypes';
+
+const initialState = {
+  error: null,
+  loaded: false,
+  loading: false,
+  data: {},
+};
+
+/**
+ * Site reducer.
+ * @function site
+ * @param {Object} state Current state.
+ * @param {Object} action Action to be handled.
+ * @returns {Object} New state.
+ */
+export default function site(state = initialState, action = {}) {
+  switch (action.type) {
+    case `${GET_SITE}_PENDING`:
+      return {
+        ...state,
+        error: null,
+        loaded: false,
+        loading: true,
+        data: {},
+      };
+    case `${GET_SITE}_SUCCESS`:
+      return {
+        ...state,
+        error: null,
+        loaded: true,
+        loading: false,
+        data: action.result,
+      };
+    case `${GET_SITE}_FAIL`:
+      return {
+        ...state,
+        error: action.result,
+        loaded: false,
+        loading: false,
+        data: {},
+      };
+    default:
+      return state;
+  }
+}

package/src/reducers/site/site.test.js

@@ -0,0 +1,67 @@
+import { GET_SITE } from '@plone/volto/constants/ActionTypes';
+import config from '@plone/volto/registry';
+import site from './site';
+
+const { settings } = config;
+
+describe('Site reducer', () => {
+  it('should return the initial state', () => {
+    expect(site()).toEqual({
+      error: null,
+      data: {},
+      loaded: false,
+      loading: false,
+    });
+  });
+
+  it('should handle GET_SITE_PENDING', () => {
+    expect(
+      site(undefined, {
+        type: `${GET_SITE}_PENDING`,
+      }),
+    ).toEqual({
+      error: null,
+      data: {},
+      loaded: false,
+      loading: true,
+    });
+  });
+
+  it('should handle GET_SITE_SUCCESS', () => {
+    expect(
+      site(undefined, {
+        type: `${GET_SITE}_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_SITE_FAIL', () => {
+    expect(
+      site(undefined, {
+        type: `${GET_SITE}_FAIL`,
+        error: 'failed',
+      }),
+    ).toEqual({
+      error: undefined,
+      data: {},
+      loaded: false,
+      loading: false,
+    });
+  });
+});

package/src/reducers/userSession/userSession.js

@@ -3,7 +3,12 @@
  * @module reducers/userSession/userSession
  */
 
-import { LOGIN, LOGIN_RENEW, LOGOUT } from '@plone/volto/constants/ActionTypes';
+import {
+  LOGIN,
+  LOGIN_RENEW,
+  LOGOUT,
+  RESET_LOGIN_REQUEST,
+} from '@plone/volto/constants/ActionTypes';
 
 const initialState = {
   token: null,
@@ -61,6 +66,15 @@ export default function userSession(state = initialState, action = {}) {
         ...state,
         token: null,
       };
+    case `${RESET_LOGIN_REQUEST}`:
+      return {
+        ...state,
+        login: {
+          loading: false,
+          loaded: false,
+          error: null,
+        },
+      };
     default:
       return state;
   }

package/src/registry.js

@@ -123,8 +123,8 @@ class Config {
       // Try to set a displayName (useful for React dev tools) for the registered component
       // Only if it's a function and it's not set previously
       try {
-        const displayName = this._data.components[componentName].component
-          .displayName;
+        const displayName =
+          this._data.components[componentName].component.displayName;
 
         if (
           !displayName &&

package/src/routes.js

@@ -23,6 +23,7 @@ import {
   Diff,
   Edit,
   History,
+  LinksToItem,
   Login,
   Logout,
   ManageTranslations,
@@ -285,6 +286,14 @@ export const defaultRoutes = [
     path: '/**/manage-translations',
     component: ManageTranslations,
   },
+  {
+    path: '/links-to-item',
+    component: LinksToItem,
+  },
+  {
+    path: '/**/links-to-item',
+    component: LinksToItem,
+  },
   {
     path: '/register',
     component: Register,

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/src/start-server.js

@@ -4,7 +4,7 @@ import http from 'http';
 import app from './server';
 import debug from 'debug';
 
-export default () => {
+export default function server() {
   const server = http.createServer(app);
   // const host = process.env.HOST || 'localhost';
   const port = process.env.PORT || 3000;
@@ -46,4 +46,4 @@ export default () => {
       currentApp = newApp;
     });
   };
-};
+}