@eeacms/volto-cca-policy 0.3.129 → 1.0.0

package/src/components/theme/Header/Header.jsx

@@ -8,15 +8,15 @@ import { Dropdown, Image } from 'semantic-ui-react';
 import { connect, useDispatch, useSelector } from 'react-redux';
 
 import { withRouter } from 'react-router-dom';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import {
   getBaseUrl,
-  hasApiExpander,
   flattenToAppURL,
   toPublicURL,
-  BodyClass,
-} from '@plone/volto/helpers';
-import { getNavigation } from '@plone/volto/actions';
+} from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
+import { getNavigation } from '@plone/volto/actions/navigation/navigation';
 import { Header, Logo } from '@eeacms/volto-eea-design-system/ui';
 import { usePrevious } from '@eeacms/volto-eea-design-system/helpers';
 import eeaFlag from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/images/Header/eea.png';

package/src/components/theme/Header/LanguageSwitch.jsx

@@ -1,10 +1,10 @@
 import React from 'react';
-import { find } from 'lodash';
+import find from 'lodash/find';
 import { useAtom } from 'jotai';
 import { useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
 import { Dropdown, Image } from 'semantic-ui-react';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import { Header } from '@eeacms/volto-eea-design-system/ui';
 import config from '@plone/volto/registry';
 import cx from 'classnames';
@@ -75,11 +75,11 @@ export default function LanguageSwitch({ history }) {
     });
 
   const euLanguages = eea.languages.filter(
-    (item) => eea.non_eu_langs.indexOf(item.code) === -1,
+    (item) => !eea.NON_EU_LANGS.includes(item.code),
   );
 
-  const nonEuLanguages = eea.languages.filter(
-    (item) => eea.non_eu_langs.indexOf(item.code) !== -1,
+  const nonEuLanguages = eea.languages.filter((item) =>
+    eea.NON_EU_LANGS.includes(item.code),
   );
 
   return (

package/src/components/theme/MissionSignatoryProfile/MissionSignatoryProfileView.jsx

@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import { Tab, Container, Divider, Button, Icon } from 'semantic-ui-react';
 import { formatTextToHTML } from '@eeacms/volto-cca-policy/utils';
 import { BannerTitle, HTMLField } from '@eeacms/volto-cca-policy/helpers';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 import GovernanceTab from './TabSections/GovernanceTab';
 import AssessmentTab from './TabSections/AssessmentTab';

package/src/components/theme/TranslationDisclaimer/TranslationDisclaimer.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { Container, Segment } from 'semantic-ui-react';
-import { isCmsUi } from '@plone/volto/helpers';
+import { isCmsUi } from '@plone/volto/helpers/Url/Url';
 import config from '@plone/volto/registry';
 
 import LanguagePreference from './LanguagePreference';

package/src/components/theme/TranslationDisclaimer/TranslationInfo.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState, useRef } from 'react';
 import { Icon, Button } from 'semantic-ui-react';
 import { FormattedMessage } from 'react-intl';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 
 const TranslationInfo = (props) => {
   const { defaultLanguage, currentLanguage } = props;

package/src/components/theme/Views/AdaptationOptionView.jsx

@@ -16,7 +16,7 @@ import {
 import { Callout } from '@eeacms/volto-eea-design-system/ui';
 import { Container, Grid, Image, Icon } from 'semantic-ui-react';
 import { getFilteredBlocks } from '@eeacms/volto-cca-policy/utils';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 
 const PhotoGallery = ({ content }) => {

package/src/components/theme/Views/AdaptationOptionView.test.jsx

@@ -45,9 +45,11 @@ jest.mock('@plone/volto/components/theme/View/RenderBlocks', () => () => (
   <div data-testid="render-blocks" />
 ));
 
-jest.mock('@plone/volto/components', () => ({
-  UniversalLink: ({ href, children }) => <a href={href}>{children}</a>,
-}));
+jest.mock(
+  '@plone/volto/components/manage/UniversalLink/UniversalLink',
+  () =>
+    ({ href, children }) => <a href={href}>{children}</a>,
+);
 
 jest.mock('semantic-ui-react', () => ({
   ...jest.requireActual('semantic-ui-react'),

package/src/components/theme/Views/ArchivedVersionListing.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import { AccordionList } from '@eeacms/volto-cca-policy/components';
 
 function ArchivedVersionListing({ content }) {

package/src/components/theme/Views/ArchivedVersionListing.test.jsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { IntlProvider } from 'react-intl';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { render, screen } from '@testing-library/react';
 import ArchivedVersionListing from './ArchivedVersionListing';
 
-jest.mock('@plone/volto/helpers', () => ({
+jest.mock('@plone/volto/helpers/Url/Url', () => ({
   flattenToAppURL: (url) => url.replace('http://localhost:3000', ''),
 }));
 

package/src/components/theme/Views/ArchivedVersionNotice.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { Message } from 'semantic-ui-react';
 import { FormattedMessage } from 'react-intl';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 function ArchivedVersionNotice({ content }) {
   if (content?.review_state !== 'archived') return null;

package/src/components/theme/Views/ArchivedVersionNotice.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 } from '@testing-library/react';
 import ArchivedVersionNotice from './ArchivedVersionNotice';

package/src/components/theme/Views/BrokenLinks.jsx

@@ -1,4 +1,4 @@
-import { expandToBackendURL } from '@plone/volto/helpers';
+import { expandToBackendURL } from '@plone/volto/helpers/Url/Url';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable';
 import React from 'react';
 import {

package/src/components/theme/Views/BrokenLinks.test.jsx

@@ -1,6 +1,6 @@
 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 { render, waitFor } from '@testing-library/react';
 import { Provider } from 'react-intl-redux';
 import { BrokenLinksComponent } from './BrokenLinks';

package/src/components/theme/Views/CaseStudyView.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 CaseStudyView from './CaseStudyView';
 import renderer from 'react-test-renderer';

package/src/components/theme/Views/DatabaseItemView.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 DatabaseItemView from './DatabaseItemView';
 import renderer from 'react-test-renderer';

package/src/components/theme/Views/NewsItemView.jsx

@@ -4,7 +4,7 @@ import { filterBlocks } from '@eeacms/volto-cca-policy/utils';
 import { HTMLField, SubjectTags } from '@eeacms/volto-cca-policy/helpers';
 import { PortalMessage } from '@eeacms/volto-cca-policy/components';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 
 const DescriptionText = ({ content }) => {
   return (

package/src/components/theme/Views/ProjectView.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 ProjectView from './ProjectView';
 import renderer from 'react-test-renderer';

package/src/components/theme/Views/VersionsGroup.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 function VersionsGroup({ content }) {
   const relatedItems = content?.relatedItems || [];

package/src/components/theme/Views/VersionsGroup.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 } from '@testing-library/react';
 import VersionsGroup from './VersionsGroup';

package/src/components/theme/Widgets/GeocharsWidget.jsx

@@ -9,7 +9,7 @@ import {
 } from './utils';
 
 import { injectIntl } from 'react-intl';
-import { FormFieldWrapper } from '@plone/volto/components';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 
 const SelectElement = (props) => {
   const { element, handleSelect } = props;

package/src/components/theme/Widgets/GeolocationWidget.jsx

@@ -4,7 +4,7 @@ import { Input, Label, Button } from 'semantic-ui-react';
 import config from '@plone/volto/registry';
 
 import { injectIntl } from 'react-intl';
-import { FormFieldWrapper } from '@plone/volto/components';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import MapContainer from '@eeacms/volto-cca-policy/components/theme/Widgets/GeolocationWidgetMapContainer';
 
 const defaultValue = {

package/src/components/theme/Widgets/GeolocationWidget.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 GeolocationWidget from './GeolocationWidget';

package/src/components/theme/Widgets/ImageWidget.jsx

@@ -7,13 +7,12 @@ import useLinkEditor from '@plone/volto/components/manage/AnchorPlugin/useLinkEd
 import withObjectBrowser from '@plone/volto/components/manage/Sidebar/ObjectBrowser';
 import NativeImageWidget from '@plone/volto/components/manage/Widgets/ImageWidget';
 
-import {
-  flattenToAppURL,
-  isInternalURL,
-  validateFileUploadSize,
-} from '@plone/volto/helpers';
+import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers/Url/Url';
+import { validateFileUploadSize } from '@plone/volto/helpers/FormValidation/FormValidation';
 import { readAsDataURL } from 'promise-file-reader';
-import { FormFieldWrapper, Icon } from '@plone/volto/components';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Image from '@plone/volto/components/theme/Image/Image';
 
 import imageBlockSVG from '@plone/volto/components/manage/Blocks/Image/block-image.svg';
 import deleteSVG from '@plone/volto/icons/delete.svg';
@@ -431,7 +430,7 @@ const UnconnectedImageInput = (props) => {
       )}
       {error && <Message negative>{error}</Message>}
       {previewSrc ? (
-        <img className={props.className} src={previewSrc} alt="" />
+        <Image className={props.className} src={previewSrc} alt="" />
       ) : (
         <Message warning>
           Existing value found, but no image preview could be resolved.
@@ -470,7 +469,7 @@ const UnconnectedImageInput = (props) => {
                 </Dimmer>
               )}
               {error && <Message negative>{error}</Message>}
-              <img src={imageBlockSVG} alt="" className="placeholder" />
+              <Image src={imageBlockSVG} alt="" className="placeholder" />
               <p>{intl.formatMessage(messages.addImage)}</p>
               {toolbar}
             </Message>

package/src/components/theme/Widgets/ImageWidget.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 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 configureStore from 'redux-mock-store';
 

package/src/components/theme/Widgets/PromotionalImageWidget.jsx

@@ -11,9 +11,11 @@ import { Button, Image, Dimmer } from 'semantic-ui-react';
 import { readAsDataURL } from 'promise-file-reader';
 import { injectIntl } from 'react-intl';
 import deleteSVG from '@plone/volto/icons/delete.svg';
-import { Icon, FormFieldWrapper } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import loadable from '@loadable/component';
-import { flattenToAppURL, validateFileUploadSize } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { validateFileUploadSize } from '@plone/volto/helpers/FormValidation/FormValidation';
 import { defineMessages, useIntl } from 'react-intl';
 
 const imageMimetypes = [
@@ -104,8 +106,8 @@ const FileWidget = (props) => {
   const imgsrc = value?.download
     ? `${flattenToAppURL(value?.download)}?id=${Date.now()}`
     : value?.data
-    ? `data:${value['content-type']};${value.encoding},${value.data}`
-    : null;
+      ? `data:${value['content-type']};${value.encoding},${value.data}`
+      : null;
 
   /**
    * Drop handler

package/src/components/theme/Widgets/utils.js

@@ -3,7 +3,7 @@ import {
   BIOREGIONS,
   SUBNATIONAL_REGIONS,
   EU_COUNTRIES,
-} from '@eeacms/volto-cca-policy/helpers';
+} from '@eeacms/volto-cca-policy/constants';
 
 export const WIDGET_COUNTRIES = Object.entries(ACE_COUNTRIES)
   .map(([code, name]) => ({