@eeacms/volto-cca-policy 0.3.131 → 1.0.1

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';
@@ -117,13 +116,30 @@ const getImageFilename = (value) => {
 };
 
 const parseDataURL = (dataUrl) => {
-  const fields = dataUrl?.match(/^data:(.*);(.*),(.*)$/);
-  if (!fields) return null;
+  const DATA_URL_PREFIX = 'data:';
+
+  if (typeof dataUrl !== 'string' || !dataUrl.startsWith(DATA_URL_PREFIX)) {
+    return null;
+  }
+
+  const start = DATA_URL_PREFIX.length;
+  const dataSeparator = dataUrl.indexOf(',', start);
+
+  if (dataSeparator === -1) return null;
+
+  const encodingSeparator = dataUrl.lastIndexOf(';', dataSeparator);
+
+  if (encodingSeparator < start) return null;
+
+  const contentType = dataUrl.slice(start, encodingSeparator);
+  const encoding = dataUrl.slice(encodingSeparator + 1, dataSeparator);
+
+  if (!contentType || !encoding) return null;
 
   return {
-    'content-type': fields[1],
-    encoding: fields[2],
-    data: fields[3],
+    'content-type': contentType,
+    encoding,
+    data: dataUrl.slice(dataSeparator + 1),
   };
 };
 
@@ -431,7 +447,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 +486,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]) => ({