@eeacms/volto-cca-policy 0.3.131 → 1.0.0

package/src/customizations/volto/components/theme/Sitemap/Sitemap.jsx

@@ -7,13 +7,14 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import { asyncConnect, Helmet } from '@plone/volto/helpers';
+import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Container } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 import config from '@plone/volto/registry';
 import { BannerTitle } from '@eeacms/volto-cca-policy/components';
-import { getNavigation } from '@plone/volto/actions';
+import { getNavigation } from '@plone/volto/actions/navigation/navigation';
 
 const messages = defineMessages({
   Sitemap: {

package/src/customizations/volto/components/theme/View/DefaultView.jsx

@@ -14,12 +14,13 @@ import {
   Label,
 } from 'semantic-ui-react';
 import config from '@plone/volto/registry';
-import { getSchema } from '@plone/volto/actions';
+import { getSchema } from '@plone/volto/actions/schema/schema';
 import { getWidget } from '@plone/volto/helpers/Widget/utils';
 
-import { hasBlocksData, getBaseUrl } from '@plone/volto/helpers';
+import { hasBlocksData } from '@plone/volto/helpers/Blocks/Blocks';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import { useDispatch, useSelector } from 'react-redux';
-import { RenderBlocks } from '@plone/volto/components';
+import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 import ContextNavigation from '@plone/volto/components/theme/Navigation/ContextNavigation';
 import {
   BannerTitle,
@@ -27,7 +28,7 @@ import {
   PortalMessage,
 } from '@eeacms/volto-cca-policy/components';
 
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 
 /**
  * Component to display the default view.

package/src/customizations/volto/components/theme/View/LinkView.jsx

@@ -5,9 +5,9 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers';
+import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import { Container as SemanticContainer } from 'semantic-ui-react';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import { Redirect } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
 import config from '@plone/volto/registry';

package/src/customizations/volto/components/theme/View/View.jsx

@@ -12,22 +12,21 @@ import { Portal } from 'react-portal';
 import { injectIntl } from 'react-intl';
 import qs from 'query-string';
 
-import {
-  ContentMetadataTags,
-  Comments,
-  Tags,
-  Toolbar,
-} from '@plone/volto/components';
+import ContentMetadataTags from '@plone/volto/components/theme/ContentMetadataTags/ContentMetadataTags';
+import Comments from '@plone/volto/components/theme/Comments/Comments';
+import Tags from '@plone/volto/components/theme/Tags/Tags';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
 import { AlternateHrefLangs } from '@plone/volto/components/theme/AlternateHrefLangs/AlternateHrefLangs';
-import { listActions, getContent } from '@plone/volto/actions';
+import { listActions } from '@plone/volto/actions/actions/actions';
+import { getContent } from '@plone/volto/actions/content/content';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
 import {
-  BodyClass,
   getBaseUrl,
   flattenToAppURL,
-  getLayoutFieldname,
-  hasApiExpander,
   isInternalURL,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Url/Url';
+import { getLayoutFieldname } from '@plone/volto/helpers/Content/Content';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 
 import config from '@plone/volto/registry';
 

package/src/customizations/volto/helpers/Url/Url-old.js

@@ -3,7 +3,8 @@
  * @module helpers/Url
  */
 
-import { last, memoize } from 'lodash';
+import last from 'lodash/last';
+import memoize from 'lodash/memoize';
 import {
   urlRegex,
   telRegex,

package/src/customizations/volto/middleware/api.js

@@ -5,7 +5,9 @@
 
 import Cookies from 'universal-cookie';
 import jwtDecode from 'jwt-decode';
-import { compact, flatten, union } from 'lodash';
+import compact from 'lodash/compact';
+import flatten from 'lodash/flatten';
+import union from 'lodash/union';
 import { matchPath } from 'react-router';
 import qs from 'query-string';
 
@@ -17,12 +19,12 @@ import {
   RESET_APIERROR,
   SET_APIERROR,
 } from '@plone/volto/constants/ActionTypes';
-import { changeLanguage } from '@plone/volto/actions';
+import { changeLanguage } from '@plone/volto/actions/language/language';
 import {
   toGettextLang,
   toReactIntlLang,
-  getCookieOptions,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Utils/Utils';
+import { getCookieOptions } from '@plone/volto/helpers/Cookies/cookies';
 let socket = null;
 
 /**

package/src/customizations/volto/reducers/actions/actions.js

@@ -4,11 +4,8 @@
  */
 
 import { GET_CONTENT, LIST_ACTIONS } from '@plone/volto/constants/ActionTypes';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  hasApiExpander,
-} from '@plone/volto/helpers';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 
 const initialState = {
   error: null,

package/src/customizations/volto/reducers/breadcrumbs/breadcrumbs.js

@@ -3,12 +3,9 @@
  * @module reducers/breadcrumbs/breadcrumbs
  */
 
-import { map } from 'lodash';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  hasApiExpander,
-} from '@plone/volto/helpers';
+import map from 'lodash/map';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 
 import {
   GET_BREADCRUMBS,

package/src/customizations/volto/reducers/navigation/navigation.js

@@ -3,12 +3,9 @@
  * @module reducers/navigation/navigation
  */
 
-import { map } from 'lodash';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  hasApiExpander,
-} from '@plone/volto/helpers';
+import map from 'lodash/map';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 
 import {
   GET_CONTENT,

package/src/customizations/volto/server.jsx

@@ -8,7 +8,7 @@ import express from 'express';
 import { renderToString } from 'react-dom/server';
 import { createMemoryHistory } from 'history';
 import { parse as parseUrl } from 'url';
-import { keys } from 'lodash';
+import keys from 'lodash/keys';
 import locale from 'locale';
 import { detect } from 'detect-browser';
 import path from 'path';
@@ -22,22 +22,23 @@ import crypto from 'crypto';
 import routes from '@plone/volto/routes';
 import config from '@plone/volto/registry';
 
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import Html from '@plone/volto/helpers/Html/Html';
+import Api from '@plone/volto/helpers/Api/Api';
+import { persistAuthToken } from '@plone/volto/helpers/AuthToken/AuthToken';
 import {
-  flattenToAppURL,
-  Html,
-  Api,
-  persistAuthToken,
   toBackendLang,
   toGettextLang,
   toReactIntlLang,
-} from '@plone/volto/helpers';
-import { changeLanguage } from '@plone/volto/actions';
+} from '@plone/volto/helpers/Utils/Utils';
+import { changeLanguage } from '@plone/volto/actions/language/language';
 
 import userSession from '@plone/volto/reducers/userSession/userSession';
 
 import ErrorPage from '@plone/volto/error';
 
-import languages from '@plone/volto/constants/Languages';
+// import languages from '@plone/volto/constants/Languages';
+import languages from '@plone/volto/constants/Languages.cjs';
 
 import configureStore from '@plone/volto/store';
 import {

package/src/express-middleware.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { getAPIResourceWithAuth } from '@plone/volto/helpers';
+import { getAPIResourceWithAuth } from '@plone/volto/helpers/Api/APIResourceWithAuth';
 
 const HEADERS = [
   'Accept-Ranges',

package/src/helpers/ContentMetadata.jsx

@@ -2,9 +2,6 @@ import { Fragment } from 'react';
 import { Popup, Segment } from 'semantic-ui-react';
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import {
-  ACE_COUNTRIES,
-  BIOREGIONS,
-  SUBNATIONAL_REGIONS,
   MetadataItemList,
   LinkedMetadataItemList,
 } from '@eeacms/volto-cca-policy/helpers';
@@ -14,9 +11,12 @@ import {
   INDICATOR,
   PUBLICATION_REPORT,
   ADAPTATION_OPTION,
+  ACE_COUNTRIES,
+  BIOREGIONS,
+  SUBNATIONAL_REGIONS,
   // CONTENT_TYPE_LABELS,
 } from '@eeacms/volto-cca-policy/constants';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 
 const messages = defineMessages({
   default_info_tooltip: {

package/src/helpers/Utils.jsx

@@ -1,5 +1,5 @@
 import React, { Fragment } from 'react';
-import { expandToBackendURL } from '@plone/volto/helpers';
+import { expandToBackendURL } from '@plone/volto/helpers/Url/Url';
 import { Link } from 'react-router-dom';
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import {
@@ -11,7 +11,7 @@ import {
   Label,
   Button,
 } from 'semantic-ui-react';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import config from '@plone/volto/registry';
 import {
   CASE_STUDY,
@@ -181,11 +181,11 @@ export const ReferenceInfo = (props) => {
             <FormattedMessage id="Contributor:" defaultMessage="Contributor:" />
           </h5>
           {contributor_list
-            .map((item) => (
-              <>
+            .map((item, contributorIndex) => (
+              <React.Fragment key={item.title}>
                 {item.title}
                 <br />
-              </>
+              </React.Fragment>
             ))
             .sort()}
           {other_contributor}

package/src/helpers/index.js

@@ -1,4 +1,4 @@
-import { OBSERVATORY_PARTNERS } from './Constants';
+import { OBSERVATORY_PARTNERS } from '@eeacms/volto-cca-policy/constants';
 export {
   HTMLField,
   ExternalLink,
@@ -16,13 +16,6 @@ export {
   LinkedMetadataItemList,
 } from './Utils';
 export { default as ContentMetadata } from './ContentMetadata';
-export {
-  ACE_COUNTRIES,
-  BIOREGIONS,
-  OTHER_REGIONS,
-  SUBNATIONAL_REGIONS,
-  EU_COUNTRIES,
-} from './Constants';
 export { default as clientOnly } from './clientOnly';
 
 export const capitalizeFirstLetter = (str) =>

package/src/hocs/index.js

@@ -0,0 +1,2 @@
+export { default as withResponsiveContainer } from './withResponsiveContainer';
+export { default as withVisibilitySensor } from './withVisibilitySensor';

package/src/index.js

@@ -1,7 +1,9 @@
+/* eslint-disable react/jsx-filename-extension */
+
 import { defineMessages, FormattedMessage } from 'react-intl';
 import loadable from '@loadable/component';
 import { compose } from 'redux';
-import { Sitemap } from '@plone/volto/components';
+import Sitemap from '@plone/volto/components/theme/Sitemap/Sitemap';
 import DefaultView from '@plone/volto/components/theme/View/DefaultView';
 import SelectAutoCompleteWidget from '@plone/volto/components/manage/Widgets/SelectAutoComplete';
 import {
@@ -37,8 +39,8 @@ import {
   MISSION_SIGNATORY_PROFILE,
   NEWS_ITEM,
   EVENT,
-  eea_languages,
-  non_eu_langs,
+  EEA_LANGUAGES,
+  NON_EU_LANGS,
 } from '@eeacms/volto-cca-policy/constants';
 
 import GeocharsWidget from './components/theme/Widgets/GeocharsWidget';
@@ -119,8 +121,8 @@ const applyConfig = (config) => {
   ];
 
   if (!config.settings.loadables.reactTable)
-    config.settings.loadables.reactTable = loadable.lib(() =>
-      import('@tanstack/react-table'),
+    config.settings.loadables.reactTable = loadable.lib(
+      () => import('@tanstack/react-table'),
     );
 
   config.settings.dateLocale = 'en-gb';
@@ -162,8 +164,8 @@ const applyConfig = (config) => {
   // EEA customizations
   config.settings.eea = {
     ...(config.settings.eea || {}),
-    languages: eea_languages,
-    non_eu_langs,
+    languages: EEA_LANGUAGES,
+    NON_EU_LANGS,
     headerOpts: {
       ...(config.settings.eea?.headerOpts || {}),
       logo: ccaLogo,

package/src/search/common.js

@@ -1,4 +1,6 @@
-import { eea_languages } from '@eeacms/volto-cca-policy/constants';
+/* eslint-disable react/jsx-filename-extension */
+
+import { EEA_LANGUAGES } from '@eeacms/volto-cca-policy/constants';
 import { booleanFacet } from '@eeacms/search';
 import { getTodayWithTime } from './utils';
 
@@ -186,51 +188,12 @@ export const language = {
   isMulti: true,
   default: (options) => {
     const { language } = options || {};
-    // console.log('options', options);
-
     return {
       values: [language || 'en'],
       type: 'any',
     };
   },
-  facetValues: eea_languages.map(({ code }) => code),
+  facetValues: EEA_LANGUAGES.map(({ code }) => code),
   sortOn: 'custom',
   sortOnCustomLabel: 'Alphabetical',
 };
-
-// [
-//     'de',
-//     'en',
-//     'es',
-//     'fr',
-//     'it',
-//     'pl',
-//     // 'ar',
-//     // 'bg',
-//     // 'bs',
-//     // 'cs',
-//     // 'da',
-//     // 'el',
-//     // 'et',
-//     // 'fi',
-//     // 'ga',
-//     // 'hr',
-//     // 'hu',
-//     // 'is',
-//     // 'lt',
-//     // 'lv',
-//     // 'mk',
-//     // 'mt',
-//     // 'nl',
-//     // 'no',
-//     // 'pt',
-//     // 'ro',
-//     // 'ru',
-//     // 'sh',
-//     // 'sk',
-//     // 'sl',
-//     // 'sq',
-//     // 'sr',
-//     // 'sv',
-//     // 'tr',
-//   ]

package/src/search/utils.test.js

@@ -1,5 +1,5 @@
 import { getTodayWithTime } from './utils';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 
 describe('getTodayWithTime', () => {
   it('should return the current date in UTC format', () => {

package/src/search/vocabulary.js

@@ -1,4 +1,4 @@
-import { eea_languages } from '@eeacms/volto-cca-policy/constants';
+import { EEA_LANGUAGES } from '@eeacms/volto-cca-policy/constants';
 import { defineMessages } from 'react-intl';
 
 defineMessages({
@@ -35,6 +35,6 @@ export const vocab = {
   },
   language: Object.assign(
     {},
-    ...eea_languages.map(({ name, code }) => ({ [code]: name })),
+    ...EEA_LANGUAGES.map(({ name, code }) => ({ [code]: name })),
   ),
 };

package/src/store/reducers/physical-breadcrumbs.js

@@ -1,5 +1,5 @@
-import { map } from 'lodash';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import map from 'lodash/map';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 import { GET_PHYSICAL_BREADCRUMBS } from '../constants';
 

package/src/utils.js

@@ -1,4 +1,4 @@
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 export const blockAvailableInMission = (properties, block) => {
   const missionBlocks = ['mkh_map', 'rastBlock'];