@eeacms/volto-cca-policy 0.2.40 → 0.2.42

package/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [0.2.42](https://github.com/eea/volto-cca-policy/compare/0.2.41...0.2.42) - 4 June 2024
+
+### [0.2.41](https://github.com/eea/volto-cca-policy/compare/0.2.40...0.2.41) - 4 June 2024
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-embed@10.0.1 [EEA Jenkins - [`7e807f4`](https://github.com/eea/volto-cca-policy/commit/7e807f45151eb7335a9f690a038bef8a9f1add80)]
+
 ### [0.2.40](https://github.com/eea/volto-cca-policy/compare/0.2.39...0.2.40) - 31 May 2024
 
 #### :bug: Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.2.40",
+  "version": "0.2.42",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -31,7 +31,7 @@
     "@eeacms/volto-datablocks": "*",
     "@eeacms/volto-eea-design-system": "*",
     "@eeacms/volto-eea-website-theme": "^1.33.2",
-    "@eeacms/volto-embed": "9.1.1",
+    "@eeacms/volto-embed": "10.0.1",
     "@eeacms/volto-globalsearch": "^1.1.0",
     "@eeacms/volto-openlayers-map": "*",
     "@eeacms/volto-searchlib": "^0.9.3",

package/src/components/index.js

@@ -4,6 +4,7 @@ export { default as PortalMessage } from './theme/PortalMessage/PortalMessage';
 export { default as TranslationDisclaimer } from './theme/TranslationDisclaimer/TranslationDisclaimer';
 export { default as ShareInfoButton } from './theme/ShareInfoButton/ShareInfoButton';
 export { default as ASTNavigation } from './theme/ASTNavigation/ASTNavigation';
+export { default as RedirectToLogin } from './theme/RedirectToLogin/RedirectToLogin';
 
 // Widgets
 export { default as RASTWidgetView } from './theme/Widgets/RASTWidgetView';

package/src/components/theme/RedirectToLogin/RedirectToLogin.jsx

@@ -0,0 +1,15 @@
+import React from 'react';
+
+export default function RedirectToLogin(props) {
+  const { token, location, history } = props;
+  const { pathname, search } = location;
+
+  React.useEffect(() => {
+    if (!token) {
+      const back = encodeURIComponent(`${pathname}${search}`);
+      history.push(`/login?return_url=${back}`);
+    }
+  }, [token, history, pathname, search]);
+
+  return null;
+}

package/src/components/theme/RedirectToLogin/RedirectToLogin.test.jsx

@@ -0,0 +1,75 @@
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+import { Provider } from 'react-intl-redux';
+import RedirectToLogin from './RedirectToLogin';
+import config from '@plone/volto/registry';
+import { render } from '@testing-library/react';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
+
+const mockStore = configureStore();
+
+describe('RedirectToLogin', () => {
+  it('redirects to login if no token', () => {
+    const store = mockStore({
+      userSession: { token: '1234' },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    const history = { push: jest.fn(() => null) };
+    const location = {
+      pathname: '/en/metadata/add',
+      search: '?type=NewsItem',
+    };
+
+    render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <RedirectToLogin history={history} token={null} location={location} />
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(history.push.mock.calls[0][0]).toBe(
+      '/login?return_url=%2Fen%2Fmetadata%2Fadd%3Ftype%3DNewsItem',
+    );
+  });
+
+  it('does not redirect to login if token', () => {
+    const store = mockStore({
+      userSession: { token: '1234' },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    const history = { push: jest.fn(() => null) };
+    const location = {
+      pathname: '/en/metadata/add',
+      search: '?type=NewsItem',
+    };
+
+    render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <RedirectToLogin
+            history={history}
+            token={'something'}
+            location={location}
+          />
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(history.push.mock.calls).toHaveLength(0);
+  });
+});

package/src/index.js

@@ -4,6 +4,7 @@ import DefaultView from '@plone/volto/components/theme/View/DefaultView';
 import {
   RASTWidgetView,
   TranslationDisclaimer,
+  RedirectToLogin,
 } from '@eeacms/volto-cca-policy/components';
 import { blockAvailableInMission } from '@eeacms/volto-cca-policy/utils';
 
@@ -382,6 +383,12 @@ const applyConfig = (config) => {
       match: '',
       component: TranslationDisclaimer,
     },
+    {
+      match: {
+        path: /(.*)\/add/,
+      },
+      component: RedirectToLogin,
+    },
   ];
 
   config.settings.apiExpanders = [
@@ -392,6 +399,12 @@ const applyConfig = (config) => {
       },
       GET_CONTENT: ['siblings'],
     },
+
+    {
+      match: '',
+      GET_CONTENT: ['navigation', 'breadcrumbs', 'actions'],
+      querystring: { 'expand.navigation.depth': '3' },
+    },
   ];
 
   // plug custom redux middleware