@eeacms/volto-cca-policy 0.3.129 → 1.0.0

package/src/components/manage/Blocks/RASTBlock/RASTView.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import './styles.less';
 import ContextNavigation from './ContextNavigation';
 import { useDispatch, useSelector } from 'react-redux';
-import { getContent } from '@plone/volto/actions';
+import { getContent } from '@plone/volto/actions/content/content';
 
 function useChildren(location) {
   const dispatch = useDispatch();

package/src/components/manage/Blocks/ReadMore/ReadMoreEdit.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 import ReadMoreView from './ReadMoreView';
 import schema from './schema';

package/src/components/manage/Blocks/ReadMore/ReadMoreView.jsx

@@ -1,6 +1,6 @@
 import React, { useRef, useState, useEffect } from 'react';
 import { Button, Icon } from 'semantic-ui-react';
-import { BodyClass } from '@plone/volto/helpers';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
 import cx from 'classnames';
 
 import './style.less';

package/src/components/manage/Blocks/ReadMore/ReadMoreView.test.jsx

@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { render, screen, fireEvent } from '@testing-library/react';
 import ReadMoreView from './ReadMoreView';
 

package/src/components/manage/Blocks/RedirectBlock/{RedirectBlock.test.js → RedirectBlock.test.jsx}

@@ -2,7 +2,7 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 import { render } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { Provider } from 'react-intl-redux';
 import { RedirectBlockDetails } from './RedirectBlockView';
 

package/src/components/manage/Blocks/RedirectBlock/RedirectBlockEdit.jsx

@@ -1,4 +1,5 @@
-import { BlockDataForm, SidebarPortal } from '@plone/volto/components';
+import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import { RedirectBlockDetails } from './RedirectBlockView';
 import Schema from './schema';
 

package/src/components/manage/Blocks/RedirectBlock/RedirectBlockView.jsx

@@ -1,7 +1,7 @@
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 export function RedirectBlockDetails({ data, token }) {
   return token ? (

package/src/components/manage/Blocks/RelevantAceContent/RelevantAceContentEdit.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 
 import schema from './schema';

package/src/components/manage/Blocks/RelevantAceContent/RelevantAceContentView.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { List, ListItem, ListContent, ListIcon } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 const RelevantAceContentView = (props) => {
   const { data, mode = 'view' } = props;

package/src/components/manage/Blocks/RelevantAceContent/RelevantAceContentView.test.jsx

@@ -3,7 +3,7 @@ import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 import renderer from 'react-test-renderer';
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { Provider } from 'react-intl-redux';
 import RelevantAceContentView from './RelevantAceContentView';
 

package/src/components/manage/Blocks/SearchAceContent/SearchAceContentEdit.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 
 import schema from './schema';

package/src/components/manage/Blocks/SearchAceContent/SearchAceContentView.jsx

@@ -1,6 +1,6 @@
 import { List, Icon, ListItem, ListContent, ListIcon } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import { useIntl, FormattedMessage } from 'react-intl';
 
 export default function SearchAceContentView(props) {

package/src/components/manage/Blocks/SearchAceContent/SearchAceContentView.test.jsx

@@ -3,7 +3,7 @@ import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 import renderer from 'react-test-renderer';
 
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { Provider } from 'react-intl-redux';
 import SearchAceContentView from './SearchAceContentView';
 

package/src/components/manage/Blocks/TabsBlock/Spotlight.jsx

@@ -3,14 +3,14 @@ import { compose } from 'redux';
 import { withRouter } from 'react-router';
 import cx from 'classnames';
 import { Menu, Tab, Container, Icon, Image } from 'semantic-ui-react';
-import { RenderBlocks } from '@plone/volto/components';
+import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 import { withScrollToTarget } from '@eeacms/volto-tabs-block/hocs';
 import {
   SimpleMarkdown,
   getMenuPosition,
 } from '@eeacms/volto-tabs-block/utils';
 
-import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers';
+import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 import '@eeacms/volto-tabs-block/less/menu.less';
 import './spotlight.less';

package/src/components/manage/Blocks/TabsBlock/Spotlight.test.jsx

@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 
 import { render } from '@testing-library/react';
 import React from 'react';
@@ -8,6 +8,12 @@ import { Provider } from 'react-intl-redux';
 
 import Spotlight from './Spotlight';
 
+jest.mock('@eeacms/volto-tabs-block/hocs', () => ({
+  withScrollToTarget: (WrappedComponent) => (props) => (
+    <WrappedComponent {...props} scrollToTarget={jest.fn()} />
+  ),
+}));
+
 const mockStore = configureStore();
 
 describe('Filter', () => {

package/src/components/manage/Blocks/TransRegionSelect/TransRegionSelectEdit.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 
 import schema from './schema';

package/src/components/manage/Blocks/TransRegionSelect/TransRegionSelectView.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { Dropdown } from 'semantic-ui-react';
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 const messages = defineMessages({
   chooseARegion: {

package/src/components/manage/Blocks/TransRegionSelect/TransRegionSelectView.test.jsx

@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { Provider } from 'react-intl-redux';

package/src/components/manage/CreateArchivedCopyButton/CreateArchivedCopyButton.jsx

@@ -4,8 +4,11 @@ import { Plug } from '@plone/volto/components/manage/Pluggable';
 import { Modal, Button, Form, Message } from 'semantic-ui-react';
 import superagent from 'superagent';
 import { toast } from 'react-toastify';
-import { Toast } from '@plone/volto/components';
-import { flattenToAppURL, expandToBackendURL } from '@plone/volto/helpers';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import {
+  flattenToAppURL,
+  expandToBackendURL,
+} from '@plone/volto/helpers/Url/Url';
 import { INDICATOR } from '@eeacms/volto-cca-policy/constants';
 
 function CreateArchivedCopyButton(props) {

package/src/components/manage/CreateArchivedCopyButton/CreateArchivedCopyButton.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { Provider } from 'react-intl-redux';
 import { render, fireEvent } from '@testing-library/react';
 import CreateArchivedCopyButton from './CreateArchivedCopyButton';
@@ -29,11 +29,8 @@ jest.mock('react-toastify', () => ({
   toast: { success: jest.fn(), error: jest.fn() },
 }));
 
-jest.mock('@plone/volto/components', () => ({
-  Toast: () => null,
-}));
-
-jest.mock('@plone/volto/helpers', () => ({
+jest.mock('@plone/volto/components/manage/Toast/Toast', () => () => null);
+jest.mock('@plone/volto/helpers/Url/Url', () => ({
   flattenToAppURL: (url) => url.replace('http://localhost:3000', ''),
   expandToBackendURL: (url) =>
     url.replace('http://localhost:3000', 'http://localhost:8080/Plone'),

package/src/components/manage/Workflow/WorkflowLinkIntegrityModal.jsx

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 const messages = defineMessages({
   confirmHeader: {

package/src/components/manage/Workflow/WorkflowLinkIntegrityModal.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { Provider } from 'react-intl-redux';
 import { render, screen } from '@testing-library/react';
 import WorkflowLinkIntegrityModal from './WorkflowLinkIntegrityModal';

package/src/components/theme/ASTNavigation/ASTAccordion.test.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 import { render } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { Provider } from 'react-intl-redux';
 import ASTAccordion from './ASTAccordion';
 

package/src/components/theme/ASTNavigation/ASTLogoMap.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { LinkWrap } from './utils';
+import { LinkWrap } from './LinkWrap';
 
 export default function ASTLogoMap(props) {
   const { pathname, items, href } = props;

package/src/components/theme/ASTNavigation/ASTLogoMap.test.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 import { render } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { Provider } from 'react-intl-redux';
 import ASTLogoMap from './ASTLogoMap';
 

package/src/components/theme/ASTNavigation/ASTNavigation.jsx

@@ -1,14 +1,18 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { searchContent } from '@plone/volto/actions';
+import { searchContent } from '@plone/volto/actions/search/search';
 import { useLocation } from 'react-router-dom';
 import ASTAccordion from './ASTAccordion';
-import {
-  isAdaptationSupportToolURL,
-  isUrbanAdaptationSupportToolURL,
-} from './utils';
 import './styles.less';
 
+const isAdaptationSupportToolURL = (url) => {
+  return url.includes('/knowledge/tools/adaptation-support-tool');
+};
+
+const isUrbanAdaptationSupportToolURL = (url) => {
+  return url.includes('/knowledge/tools/urban-ast');
+};
+
 const ASTNavigation = (props) => {
   const dispatch = useDispatch();
   const location = useLocation();

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

@@ -0,0 +1,323 @@
+import React from 'react';
+import '@testing-library/jest-dom';
+import { render } from '@testing-library/react';
+import { Provider } from 'react-redux';
+import { MemoryRouter } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+import { IntlProvider } from 'react-intl';
+import ASTNavigation from './ASTNavigation';
+import * as searchActions from '@plone/volto/actions/search/search';
+
+const mockStore = configureStore();
+
+jest.mock('@plone/volto/actions/search/search', () => ({
+  searchContent: jest.fn(() => ({
+    type: 'SEARCH_CONTENT',
+    payload: {},
+  })),
+}));
+
+jest.mock('./ASTAccordion', () => {
+  return function MockASTAccordion() {
+    return <div data-testid="ast-accordion">ASTAccordion</div>;
+  };
+});
+
+describe('ASTNavigation', () => {
+  const defaultProps = {
+    astNavigation: {
+      root_path: 'knowledge/tools/adaptation-support-tool',
+    },
+  };
+
+  const mockLocation = {
+    pathname: '/en/knowledge/tools/adaptation-support-tool',
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render the navigation wrapper with ASTAccordion when items exist', () => {
+    const items = [
+      {
+        '@id': '/en/knowledge/tools/adaptation-support-tool/step-1',
+        title: 'Step 1',
+      },
+      {
+        '@id': '/en/knowledge/tools/adaptation-support-tool/step-2',
+        title: 'Step 2',
+      },
+    ];
+
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+      search: {
+        subrequests: {
+          ast: {
+            items: items,
+          },
+        },
+      },
+    });
+
+    const { container, getByTestId } = render(
+      <Provider store={store}>
+        <MemoryRouter initialEntries={[mockLocation.pathname]}>
+          <IntlProvider locale="en" messages={{}}>
+            <ASTNavigation {...defaultProps} />
+          </IntlProvider>
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    const navigationDiv = container.querySelector('.ast-navigation');
+    expect(navigationDiv).toBeInTheDocument();
+    expect(getByTestId('ast-accordion')).toBeInTheDocument();
+  });
+
+  it('should not render anything when no items exist', () => {
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+      search: {
+        subrequests: {
+          ast: {
+            items: [],
+          },
+        },
+      },
+    });
+
+    const { container } = render(
+      <Provider store={store}>
+        <MemoryRouter initialEntries={[mockLocation.pathname]}>
+          <IntlProvider locale="en" messages={{}}>
+            <ASTNavigation {...defaultProps} />
+          </IntlProvider>
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(container.querySelector('.ast-navigation')).not.toBeInTheDocument();
+  });
+
+  it('should not render anything when items are undefined', () => {
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+      search: {
+        subrequests: null,
+      },
+    });
+
+    const { container } = render(
+      <Provider store={store}>
+        <MemoryRouter initialEntries={[mockLocation.pathname]}>
+          <IntlProvider locale="en" messages={{}}>
+            <ASTNavigation {...defaultProps} />
+          </IntlProvider>
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(container.querySelector('.ast-navigation')).not.toBeInTheDocument();
+  });
+
+  it('should dispatch searchContent for adaptation support tool', () => {
+    const items = [
+      {
+        '@id': '/en/knowledge/tools/adaptation-support-tool/step-1',
+        title: 'Step 1',
+      },
+    ];
+
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+      search: {
+        subrequests: {
+          ast: {
+            items: items,
+          },
+        },
+      },
+    });
+
+    store.dispatch = jest.fn();
+
+    render(
+      <Provider store={store}>
+        <MemoryRouter
+          initialEntries={['/en/knowledge/tools/adaptation-support-tool']}
+        >
+          <IntlProvider locale="en" messages={{}}>
+            <ASTNavigation
+              {...defaultProps}
+              astNavigation={{
+                root_path: 'knowledge/tools/adaptation-support-tool',
+              }}
+            />
+          </IntlProvider>
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(searchActions.searchContent).toHaveBeenCalledWith(
+      '/en/knowledge/tools/adaptation-support-tool',
+      {
+        'path.depth': 1,
+        portal_type: ['Folder'],
+        object_provides: 'eea.climateadapt.interfaces.ICover',
+        review_state: 'published',
+        b_size: 100,
+      },
+      'ast',
+    );
+  });
+
+  it('should dispatch searchContent for urban adaptation support tool', () => {
+    const items = [
+      {
+        '@id': '/en/knowledge/tools/urban-ast/step-1',
+        title: 'Step 1',
+      },
+    ];
+
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+      search: {
+        subrequests: {
+          ast: {
+            items: items,
+          },
+        },
+      },
+    });
+
+    store.dispatch = jest.fn();
+
+    render(
+      <Provider store={store}>
+        <MemoryRouter initialEntries={['/en/knowledge/tools/urban-ast']}>
+          <IntlProvider locale="en" messages={{}}>
+            <ASTNavigation
+              {...defaultProps}
+              astNavigation={{
+                root_path: 'knowledge/tools/urban-ast',
+              }}
+            />
+          </IntlProvider>
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(searchActions.searchContent).toHaveBeenCalledWith(
+      '/en/knowledge/tools/urban-ast',
+      {
+        'path.depth': 1,
+        portal_type: ['Folder'],
+        review_state: 'published',
+        b_size: 100,
+      },
+      'ast',
+    );
+  });
+
+  it('should pass correct props to ASTAccordion', () => {
+    const items = [
+      {
+        '@id': '/en/knowledge/tools/adaptation-support-tool/step-1',
+        title: 'Step 1',
+      },
+    ];
+
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+      search: {
+        subrequests: {
+          ast: {
+            items: items,
+          },
+        },
+      },
+    });
+
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MemoryRouter initialEntries={[mockLocation.pathname]}>
+          <IntlProvider locale="en" messages={{}}>
+            <ASTNavigation {...defaultProps} />
+          </IntlProvider>
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(getByTestId('ast-accordion')).toBeInTheDocument();
+  });
+
+  it('should handle different language locales', () => {
+    const items = [
+      {
+        '@id': '/fr/knowledge/tools/adaptation-support-tool/step-1',
+        title: 'Étape 1',
+      },
+    ];
+
+    const store = mockStore({
+      intl: {
+        locale: 'fr',
+        messages: {},
+      },
+      search: {
+        subrequests: {
+          ast: {
+            items: items,
+          },
+        },
+      },
+    });
+
+    store.dispatch = jest.fn();
+
+    const { container } = render(
+      <Provider store={store}>
+        <MemoryRouter
+          initialEntries={['/fr/knowledge/tools/adaptation-support-tool']}
+        >
+          <IntlProvider locale="fr" messages={{}}>
+            <ASTNavigation
+              {...defaultProps}
+              astNavigation={{
+                root_path: 'knowledge/tools/adaptation-support-tool',
+              }}
+            />
+          </IntlProvider>
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(searchActions.searchContent).toHaveBeenCalledWith(
+      '/fr/knowledge/tools/adaptation-support-tool',
+      expect.any(Object),
+      'ast',
+    );
+
+    expect(container.querySelector('.ast-navigation')).toBeInTheDocument();
+  });
+});

package/src/components/theme/ASTNavigation/{utils.js → LinkWrap.jsx}

@@ -1,14 +1,7 @@
-import { UniversalLink } from '@plone/volto/components';
+import React from 'react';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import cx from 'classnames';
 
-export const isAdaptationSupportToolURL = (url) => {
-  return url.indexOf('/knowledge/tools/adaptation-support-tool') > -1;
-};
-
-export const isUrbanAdaptationSupportToolURL = (url) => {
-  return url.indexOf('/knowledge/tools/urban-ast') > -1;
-};
-
 export const LinkWrap = ({ item, pathname, children, className }) => {
   const substeps = item?.items || [];
   const activeSubstep = substeps.some((obj) => obj['@id'] === pathname);
@@ -29,3 +22,5 @@ export const LinkWrap = ({ item, pathname, children, className }) => {
     <g>{children}</g>
   );
 };
+
+export default LinkWrap;

package/src/components/theme/ASTNavigation/UASTLogoMap.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { LinkWrap } from './utils';
+import { LinkWrap } from './LinkWrap';
 
 export default function UASTLogoMap(props) {
   const { pathname, items, href } = props;

package/src/components/theme/ASTNavigation/UASTLogoMap.test.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 import { render } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { Provider } from 'react-intl-redux';
 import UASTLogoMap from './UASTLogoMap';