@eeacms/volto-cca-policy 0.2.63 → 0.2.65

package/CHANGELOG.md

@@ -4,11 +4,28 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [0.2.63](https://github.com/eea/volto-cca-policy/compare/0.2.62...0.2.63) - 27 August 2024
+### [0.2.65](https://github.com/eea/volto-cca-policy/compare/0.2.64...0.2.65) - 16 September 2024
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`b5f1f67`](https://github.com/eea/volto-cca-policy/commit/b5f1f677a8624cf2360c8a9df7cf9bacb6510e65)]
+
+#### :hammer_and_wrench: Others
+
+- Remove duplicate line [Tiberiu Ichim - [`f83f770`](https://github.com/eea/volto-cca-policy/commit/f83f770e75a5b5fd4644e382e272d3b4e4e5db99)]
+- Try to fix include archived error [Tiberiu Ichim - [`61dc5d4`](https://github.com/eea/volto-cca-policy/commit/61dc5d4e5840c84dadb55b615d4d5b11bdd64171)]
+- Add styling for image copyright [Tiberiu Ichim - [`eb81a90`](https://github.com/eea/volto-cca-policy/commit/eb81a906bd365916c121ad354d4badd0c8c2f0f0)]
+### [0.2.64](https://github.com/eea/volto-cca-policy/compare/0.2.63...0.2.64) - 2 September 2024
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-searchlib@2.0.3 [EEA Jenkins - [`7092fa0`](https://github.com/eea/volto-cca-policy/commit/7092fa0a104820239d05aa76cebbbeaa90222e25)]
 
 #### :hammer_and_wrench: Others
 
-- Upgrade version for volto-datablocks [Tiberiu Ichim - [`a22a03e`](https://github.com/eea/volto-cca-policy/commit/a22a03e59d27805a95ba9312905e893051f6a226)]
+- Add image rights to gallery [Tiberiu Ichim - [`8c1a716`](https://github.com/eea/volto-cca-policy/commit/8c1a716d95f4817a311af9a273409e0b1a1d9bf0)]
+### [0.2.63](https://github.com/eea/volto-cca-policy/compare/0.2.62...0.2.63) - 27 August 2024
+
 ### [0.2.62](https://github.com/eea/volto-cca-policy/compare/0.2.61...0.2.62) - 26 August 2024
 
 ### [0.2.61](https://github.com/eea/volto-cca-policy/compare/0.2.60...0.2.61) - 22 August 2024

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.2.63",
+  "version": "0.2.65",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -35,7 +35,7 @@
     "@eeacms/volto-globalsearch": "^1.1.0",
     "@eeacms/volto-hero-block": "^7.1.0",
     "@eeacms/volto-openlayers-map": "*",
-    "@eeacms/volto-searchlib": "2.0.2",
+    "@eeacms/volto-searchlib": "2.0.3",
     "@eeacms/volto-slate-label": "^0.6.0",
     "@eeacms/volto-tabs-block": "^7.5.1",
     "@elastic/search-ui": "1.21.2",

package/src/components/theme/ImageGallery/ImageGallery.jsx

@@ -5,6 +5,8 @@ import { Modal, Image } from 'semantic-ui-react';
 import 'slick-carousel/slick/slick.css';
 import 'slick-carousel/slick/slick-theme.css';
 
+import './styles.less';
+
 const Slider = loadable(() => import('react-slick'));
 
 const ImageGallery = (props) => {
@@ -40,6 +42,8 @@ const ImageGallery = (props) => {
     }
   };
 
+  const image = items[slideIndex];
+
   return (
     <div className="image-gallery">
       <div
@@ -63,11 +67,20 @@ const ImageGallery = (props) => {
         onOpen={() => setOpen(true)}
       >
         <Modal.Content>
-          <h3>{items[slideIndex]?.title}</h3>
-          <p>{items[slideIndex]?.description}</p>
+          <h3>{image?.title}</h3>
+          <p>{image?.description}</p>
           <Slider {...carouselSettings} ref={sliderRef}>
             {items.map((item, i) => {
-              return <Image key={i} src={item.url} alt={item?.title} />;
+              return image.rights ? (
+                <div>
+                  <div className="image-slide">
+                    <div className="image-rights">{image.rights}</div>
+                    <Image key={i} src={item.url} alt={item?.title} />
+                  </div>
+                </div>
+              ) : (
+                <Image key={i} src={item.url} alt={item?.title} />
+              );
             })}
           </Slider>
           <div className="slide-image-count">

package/src/components/theme/ImageGallery/styles.less

@@ -0,0 +1,17 @@
+.image-slide {
+  position: relative;
+  display: inline-block;
+
+  .image-rights {
+    position: absolute;
+    z-index: 100;
+    right: 1em;
+    bottom: 1em;
+    left: 1em;
+    padding: 5px;
+    background: rgba(0, 0, 0, 0.5); /* optional: semi-transparent background */
+    color: white; /* text color */
+    font-size: 14px; /* adjust font size as needed */
+    text-align: left; /* optional: center the text */
+  }
+}

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

@@ -1,28 +1,28 @@
-import React, { Fragment } from 'react';
 import {
-  HTMLField,
+  ImageGallery,
+  PortalMessage,
+  ShareInfoButton,
+} from '@eeacms/volto-cca-policy/components';
+import {
+  BannerTitle,
   ContentMetadata,
+  DocumentsList,
+  HTMLField,
   LinksList,
   PublishedModifiedInfo,
-  DocumentsList,
-  BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
+import React, { Fragment } from 'react';
+import AnchorLink from 'react-anchor-link-smooth-scroll';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import {
   Container,
   Divider,
   Grid,
   Icon,
   Image,
-  ListItem,
   List,
+  ListItem,
 } from 'semantic-ui-react';
-import {
-  ShareInfoButton,
-  ImageGallery,
-  PortalMessage,
-} from '@eeacms/volto-cca-policy/components';
-import AnchorLink from 'react-anchor-link-smooth-scroll';
-import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
 const messages = defineMessages({
   References: { id: 'References', defaultMessage: 'References' },

package/src/search/common.js

@@ -37,7 +37,7 @@ export const cca_adaptation_sectors = {
 export const include_archived = booleanFacet(() => ({
   field: 'IncludeArchived',
   label: 'Include archived content',
-  id: 'archived-facet',
+  id: 'IncludeArchived',
   showInFacetsList: false,
   showInSecondaryFacetsList: true,
   isFilter: true, // filters don't need facet options to show up

package/src/search/config.js

@@ -23,9 +23,7 @@ export const clusters = {
 };
 
 export default function installMainSearch(config) {
-  const envConfig = process.env.RAZZLE_ENV_CONFIG
-    ? JSON.parse(process.env.RAZZLE_ENV_CONFIG)
-    : ccaConfig;
+  const envConfig = ccaConfig;
 
   const pjson = require('@eeacms/volto-cca-policy/../package.json');
 
@@ -48,11 +46,6 @@ export default function installMainSearch(config) {
       cluster_name: 'cca',
     },
   });
-  // ccaSearch.permanentFilters.push({
-  //   term: {
-  //     cca_include_in_search: 'true',
-  //   },
-  // });
 
   ccaSearch.permanentFilters.push({
     terms: {