@eeacms/volto-cca-policy 1.0.6 → 1.0.8

package/src/components/theme/{MissionSignatoryProfile → Views/MissionSignatoryProfile}/TabSections/PlanningTab.test.jsx

@@ -2,7 +2,17 @@ import '@testing-library/jest-dom';
 import { render } from '@testing-library/react';
 import PlanningTab from './PlanningTab';
 
-jest.mock('@eeacms/volto-cca-policy/helpers', () => ({
+jest.mock('@eeacms/volto-cca-policy/components', () => ({
+  AccordionList: ({ accordions }) => (
+    <div>
+      {accordions.map((item, index) => (
+        <div key={index}>
+          <div>{item.title}</div>
+          <div>{item.content}</div>
+        </div>
+      ))}
+    </div>
+  ),
   HTMLField: ({ value }) => (
     <div dangerouslySetInnerHTML={{ __html: value.data }} />
   ),

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

@@ -1,8 +1,11 @@
 import React from 'react';
 import { Container } from 'semantic-ui-react';
 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 {
+  HTMLField,
+  PortalMessage,
+  SubjectTags,
+} from '@eeacms/volto-cca-policy/components';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 

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

@@ -1,15 +1,13 @@
 import React from 'react';
+import { Container, Divider, Grid } from 'semantic-ui-react';
 import {
-  HTMLField,
   ContentMetadata,
-  PublishedModifiedInfo,
+  HTMLField,
   ItemLogo,
+  PortalMessage,
+  PublishedModifiedInfo,
   ReferenceInfo,
-} from '@eeacms/volto-cca-policy/helpers';
-import { Container, Divider, Grid } from 'semantic-ui-react';
-import {
   ShareInfoButton,
-  PortalMessage,
 } from '@eeacms/volto-cca-policy/components';
 
 import { FormattedMessage } from 'react-intl';

package/src/constants.js

@@ -43,10 +43,17 @@ export const DOWNLOAD_FIELDS = [
   { field: 'cca_keywords', name: 'Keywords' },
   { field: 'cca_adaptation_sectors', name: 'Sectors' },
   { field: 'cca_climate_impacts', name: 'Climate impact' },
+  { field: 'cca_governance_level_list', name: 'Governance level' },
+  {
+    field: 'cca_geographic_characterisation',
+    name: 'Geographic characterization',
+  },
   {
     field: 'cca_geographic_transnational_region',
     name: 'Transnational regions',
   },
+  { field: 'cca_sub_nationals', name: 'Sub national regions' },
+  { field: 'cca_city', name: 'City' },
   { field: 'cca_adaptation_elements', name: 'Adaptation Approaches' },
   { field: 'cca_funding_programme', name: 'Funding programme' },
   { field: 'cca_key_type_measure', name: 'Key type measure' },

package/src/helpers/countryMap.js

@@ -1,6 +1,3 @@
-// import React, { useEffect } from 'react';
-// import flags from './flags.js';
-
 export const euCountryNames = [
   'Austria',
   'Belgium',
@@ -38,7 +35,7 @@ export const euCountryNames = [
   'Turkey',
 ];
 
-export const euCountryNamesEnergy = [
+const euCountryNamesEnergy = [
   'Albania',
   'Bosnia-Herzegovina',
   'Bosnia and Herzegovina',

package/src/helpers/embed.js

@@ -0,0 +1,11 @@
+export const fixEmbedURL = (url, is_cmshare_video) => {
+  const suffix = '/download';
+
+  if (!is_cmshare_video) return url;
+
+  const base = url.split('?')[0];
+
+  if (base.endsWith(suffix)) return base;
+
+  return base + suffix;
+};

package/src/helpers/index.js

@@ -1,102 +1,14 @@
-import { OBSERVATORY_PARTNERS } from '@eeacms/volto-cca-policy/constants';
+export { fixEmbedURL } from './embed';
+export { capitalizeFirstLetter } from './string';
 export {
-  HTMLField,
-  TextField,
-  BooleanField,
-  VocabularyField,
-  ExternalLink,
-  PublishedModifiedInfo,
-  LinksList,
-  DocumentsList,
-  ReferenceInfo,
-  BannerTitle,
-  LogoWrapper,
-  ContentRelatedItems,
-  ItemLogo,
-  SubjectTags,
-  EventDetails,
-  MetadataItemList,
-  LinkedMetadataItemList,
-} from './Utils';
-export { default as ContentMetadata } from './ContentMetadata';
-export { default as clientOnly } from './clientOnly';
-
-export const capitalizeFirstLetter = (str) =>
-  str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
-
-export const addFilterParams = (params, filters) => {
-  filters.forEach((f, i) => {
-    params.set(`filters[${i}][field]`, f.field);
-    params.set(`filters[${i}][type]`, f.type);
-    (f.values || []).forEach((val, vi) => {
-      params.set(`filters[${i}][values][${vi}]`, val);
-    });
-  });
-};
-
-export const makeContributionsSearchQuery = ({ id } = {}) => {
-  const organisation = OBSERVATORY_PARTNERS?.[id];
-  const base = '/en/observatory/advanced-search';
-
-  // If partner is missing, fall back to base (or return null if you prefer)
-  if (!organisation) return `${base}?size=n_10_n`;
-
-  const params = new URLSearchParams();
-  params.set('size', 'n_10_n');
-
-  addFilterParams(params, [
-    {
-      field: 'cca_partner_contributors.keyword',
-      type: 'any',
-      values: [organisation],
-    },
-    { field: 'issued.date', type: 'any', values: ['All time'] },
-    { field: 'language', type: 'any', values: ['en'] },
-  ]);
-
-  params.set('sort-field', 'issued.date');
-  params.set('sort-direction', 'desc');
-
-  return `${base}?${params.toString()}`;
-};
-
-export const makeAdvancedSearchQuery = ({ field, value }) => {
-  const base = '/en/data-and-downloads/';
-  const params = new URLSearchParams();
-  params.set('size', 'n_10_n');
-
-  const filters = [
-    { field: 'issued.date', values: ['All time'], type: 'any' },
-    { field: 'language', values: ['en'], type: 'any' },
-    // { field: 'objectProvides', values: [contentType], type: 'any' },
-  ];
-
-  if (field) {
-    filters.push({ field, values: [value], type: 'all' });
-  }
-
-  addFilterParams(params, filters);
-
-  params.set('sort-field', 'issued.date');
-  params.set('sort-direction', 'desc');
-
-  if (!field) {
-    params.set('q', value ?? '');
-  }
-
-  return `${base}?${params.toString()}`;
-};
-
-export const fixEmbedURL = (url, is_cmshare_video) => {
-  const suffix = '/download';
-
-  if (!is_cmshare_video) return url;
-
-  const base = url.split('?')[0];
-
-  if (base.endsWith(suffix)) return base;
-
-  return base + suffix;
-};
-
-export * from './countryMap';
+  adjustEuCountryNames,
+  euCountryNames,
+  euCountryNamesIncludingEnergy,
+  getClosestFeatureToCoordinate,
+  getFocusCountriesFeature,
+  getFocusCountryNames,
+  getImageUrl,
+  removeTooltip,
+  setTooltipVisibility,
+  tooltipStyle,
+} from './countryMap';

package/src/helpers/string.js

@@ -0,0 +1,4 @@
+export const capitalizeFirstLetter = (str) => {
+  if (!str || typeof str !== 'string') return '';
+  return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
+};

package/src/hocs/index.js

@@ -1,3 +1,4 @@
+export { default as withClientOnly } from './withClientOnly';
 export { default as withResponsiveContainer } from './withResponsiveContainer';
 export { default as withVisibilitySensor } from './withVisibilitySensor';
 export { withGeoJsonData } from './withGeoJsonData';

package/src/{helpers/clientOnly.jsx → hocs/withClientOnly.jsx}

@@ -1,4 +1,4 @@
-export default function clientOnly(WrappedComponent) {
+export default function withClientOnly(WrappedComponent) {
   const WithClientWrappedComponent = (props) => {
     return __SERVER__ ? null : <WrappedComponent {...props} />;
   };

package/src/index.js

@@ -46,8 +46,9 @@ import {
   NON_EU_LANGS,
 } from '@eeacms/volto-cca-policy/constants';
 
-import GeocharsWidget from './components/theme/Widgets/GeocharsWidget';
-import PromotionalImageWidget from './components/theme/Widgets/PromotionalImageWidget';
+import GeocharsWidget from './components/manage/Widgets/GeocharsWidget';
+import PromotionalImageWidget from './components/manage/Widgets/PromotionalImageWidget';
+import VisualizationsWidget from './components/manage/Widgets/VisualizationsWidget';
 import HealthHorizontalCardItem from './components/Search/Result/HealthHorizontalCardItem';
 import ClusterHorizontalCardItem from './components/Search/Result/ClusterHorizontalCardItem';
 import NavigatorCatalogueCardItem from './components/Search/NavigatorCatalogue/NavigatorCatalogueCardItem';
@@ -71,7 +72,7 @@ import eeaWhiteLogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/as
 import './slate-styles.less';
 import BrokenLinks from './components/theme/Views/BrokenLinks';
 
-import GeolocationWidget from './components/theme/Widgets/GeolocationWidget';
+import GeolocationWidget from './components/manage/Widgets/GeolocationWidget';
 // import MigrationButtons from './components/MigrationButtons';
 
 const getEnv = () => (typeof window !== 'undefined' ? window.env : process.env);
@@ -443,6 +444,7 @@ const applyConfig = (config) => {
   config.widgets.id.geochars = GeocharsWidget;
   config.widgets.id.geolocation = GeolocationWidget;
   config.widgets.id.promotional_image = PromotionalImageWidget;
+  config.widgets.id.visualizations = VisualizationsWidget;
   config.widgets.id.image = ImageWidget;
 
   if (config.widgets.views?.widget) {

package/src/search/queryUtils.js

@@ -0,0 +1,64 @@
+import { OBSERVATORY_PARTNERS } from '@eeacms/volto-cca-policy/constants';
+
+const addFilterParams = (params, filters) => {
+  filters.forEach((f, i) => {
+    params.set(`filters[${i}][field]`, f.field);
+    params.set(`filters[${i}][type]`, f.type);
+    (f.values || []).forEach((val, vi) => {
+      params.set(`filters[${i}][values][${vi}]`, val);
+    });
+  });
+};
+
+export const makeContributionsSearchQuery = ({ id } = {}) => {
+  const organisation = OBSERVATORY_PARTNERS?.[id];
+  const base = '/en/observatory/advanced-search';
+
+  // If partner is missing, fall back to base (or return null if you prefer)
+  if (!organisation) return `${base}?size=n_10_n`;
+
+  const params = new URLSearchParams();
+  params.set('size', 'n_10_n');
+
+  addFilterParams(params, [
+    {
+      field: 'cca_partner_contributors.keyword',
+      type: 'any',
+      values: [organisation],
+    },
+    { field: 'issued.date', type: 'any', values: ['All time'] },
+    { field: 'language', type: 'any', values: ['en'] },
+  ]);
+
+  params.set('sort-field', 'issued.date');
+  params.set('sort-direction', 'desc');
+
+  return `${base}?${params.toString()}`;
+};
+
+export const makeAdvancedSearchQuery = ({ field, value } = {}) => {
+  const base = '/en/data-and-downloads/';
+  const params = new URLSearchParams();
+  params.set('size', 'n_10_n');
+
+  const filters = [
+    { field: 'issued.date', values: ['All time'], type: 'any' },
+    { field: 'language', values: ['en'], type: 'any' },
+    // { field: 'objectProvides', values: [contentType], type: 'any' },
+  ];
+
+  if (field) {
+    filters.push({ field, values: [value], type: 'all' });
+  }
+
+  addFilterParams(params, filters);
+
+  params.set('sort-field', 'issued.date');
+  params.set('sort-direction', 'desc');
+
+  if (!field) {
+    params.set('q', value ?? '');
+  }
+
+  return `${base}?${params.toString()}`;
+};

package/src/components/theme/ShareInfoButton/ShareInfoButton.jsx

@@ -1,26 +0,0 @@
-import { Link } from 'react-router-dom';
-import { useSelector } from 'react-redux';
-import { Button, Icon } from 'semantic-ui-react';
-import { FormattedMessage } from 'react-intl';
-
-const ShareInfoButton = (props) => {
-  const currentLang = useSelector((state) => state.intl.locale);
-
-  return (
-    <>
-      <div className="share-info">
-        <Link to={`/${currentLang + '/help/share-your-info'}`}>
-          <Button icon primary labelPosition="left">
-            <FormattedMessage
-              id="Share your information"
-              defaultMessage="Share your information"
-            />
-            <Icon className="ri-share-line" />
-          </Button>
-        </Link>
-      </div>
-    </>
-  );
-};
-
-export default ShareInfoButton;

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

@@ -1,90 +0,0 @@
-import React from 'react';
-import { MemoryRouter } from 'react-router-dom';
-import { render } from '@testing-library/react';
-import '@testing-library/jest-dom';
-import { Provider } from 'react-intl-redux';
-import configureStore from 'redux-mock-store';
-
-import ImageWidget from './ImageWidget';
-
-global.__SERVER__ = false;
-
-// mock Dropzone (avoids drag/drop complexity)
-jest.mock(
-  'react-dropzone',
-  () => (props) =>
-    props.children({
-      getRootProps: () => ({}),
-      getInputProps: () => ({}),
-    }),
-);
-
-// mock loadable
-jest.mock('@loadable/component', () => (importFn) => {
-  const Component = (props) => {
-    const Loaded = require('react-dropzone');
-    return <Loaded {...props} />;
-  };
-  return Component;
-});
-
-const mockStore = configureStore();
-
-describe('ImageUploadWidget', () => {
-  it('renders empty state', () => {
-    const store = mockStore({
-      intl: {
-        locale: 'en',
-        messages: {},
-      },
-    });
-
-    const props = {
-      id: 'image',
-      title: 'Image',
-      value: null,
-      onChange: jest.fn(),
-    };
-
-    const { container } = render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <ImageWidget {...props} />
-        </MemoryRouter>
-      </Provider>,
-    );
-
-    expect(container).toBeTruthy();
-  });
-
-  it('renders with image value', () => {
-    const store = mockStore({
-      intl: {
-        locale: 'en',
-        messages: {},
-      },
-    });
-
-    const props = {
-      id: 'image',
-      title: 'Image',
-      value: {
-        data: 'fakebase64',
-        encoding: 'base64',
-        'content-type': 'image/png',
-        filename: 'test.png',
-      },
-      onChange: jest.fn(),
-    };
-
-    const { getByText } = render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <ImageWidget {...props} />
-        </MemoryRouter>
-      </Provider>,
-    );
-
-    expect(getByText('test.png')).toBeInTheDocument();
-  });
-});