@eeacms/volto-cca-policy 0.2.85 → 0.2.87

package/CHANGELOG.md

@@ -4,6 +4,22 @@ 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.87](https://github.com/eea/volto-cca-policy/compare/0.2.86...0.2.87) - 20 December 2024
+
+#### :nail_care: Enhancements
+
+- change(map): remove light blue dots for AdapteCCA from case study explorer map; code cleanup - refs #281701 [kreafox - [`046cf1b`](https://github.com/eea/volto-cca-policy/commit/046cf1bbe3e427757d30234bfdb310e10e689bc2)]
+
+#### :hammer_and_wrench: Others
+
+- Refs #281766 - rename Kosovo and Turkiye [Tripon Eugen - [`7728e62`](https://github.com/eea/volto-cca-policy/commit/7728e62c124f13762068bfb83a4995e38ff9844b)]
+- Refs #281766 - update country list [Tripon Eugen - [`314fc4a`](https://github.com/eea/volto-cca-policy/commit/314fc4affbc543c95a6fe164453c46fbe3eac8c3)]
+### [0.2.86](https://github.com/eea/volto-cca-policy/compare/0.2.85...0.2.86) - 18 December 2024
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-searchlib@2.0.6 [EEA Jenkins - [`05e0fe3`](https://github.com/eea/volto-cca-policy/commit/05e0fe3792bc2406b89c4e0a8c17941a661276ba)]
+
 ### [0.2.85](https://github.com/eea/volto-cca-policy/compare/0.2.84...0.2.85) - 18 December 2024
 
 #### :nail_care: Enhancements
@@ -1715,13 +1731,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #260715 rast-block wip [Tripon Eugen - [`f19d54e`](https://github.com/eea/volto-cca-policy/commit/f19d54e0b9a6a86bf344eb85b6a1cda7f3de91bf)]
 - Refs #260715 rast-block wip [Tripon Eugen - [`2828537`](https://github.com/eea/volto-cca-policy/commit/2828537b6c084cd1a82162d552fb4ef025b71f9f)]
 - Refs #260715 rast-block updates [Tripon Eugen - [`1e803e5`](https://github.com/eea/volto-cca-policy/commit/1e803e5bd3d3fb7558f261c76c68866be7beb8b5)]
-- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`0a15e1b`](https://github.com/eea/volto-cca-policy/commit/0a15e1b2ad081233685e80d5b3c60a8663f6b896)]
-- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`9554e44`](https://github.com/eea/volto-cca-policy/commit/9554e44c92a621a52b2adb5a4830fb084ee5734b)]
 ### [0.1.49](https://github.com/eea/volto-cca-policy/compare/0.1.48...0.1.49) - 15 November 2023
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7b820a6`](https://github.com/eea/volto-cca-policy/commit/7b820a6369c2ddd5203b1a4abe352cb4bb43db7a)]
 - chore: husky, lint-staged use fixed versions [valentinab25 - [`f0a8061`](https://github.com/eea/volto-cca-policy/commit/f0a8061c275c236deb00087c23fac9860a073106)]
 
 #### :hammer_and_wrench: Others
@@ -1738,9 +1751,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #259267 - jenkins test [Tripon Eugen - [`cacd31e`](https://github.com/eea/volto-cca-policy/commit/cacd31e7b1afe0983674ed5c7632d2e1d7fa752e)]
 - Refs #259267 - jenkins [Tripon Eugen - [`5b3affe`](https://github.com/eea/volto-cca-policy/commit/5b3affee8401239de10097884c1b7f2349d15ec0)]
 - Refs #259267 - add When, lead image and title to files [Tripon Eugen - [`2cedb23`](https://github.com/eea/volto-cca-policy/commit/2cedb237f898af9057e13fba94b615ef71077204)]
-- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`4d607a5`](https://github.com/eea/volto-cca-policy/commit/4d607a576e9d0a5c34e48c41b409e7df616ee3d6)]
-- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`b7f74d5`](https://github.com/eea/volto-cca-policy/commit/b7f74d53513a6edbfbca5cb6d19687929bb1e5db)]
-- test: [JENKINS] Improve cypress time [valentinab25 - [`db65617`](https://github.com/eea/volto-cca-policy/commit/db656173391f65157098d95d388c25f6429753d8)]
 - Refs #259267 - cca event blocks attachments and check not mandatoty fields [Tripon Eugen - [`3138e5a`](https://github.com/eea/volto-cca-policy/commit/3138e5afb5bfbdbed14e27ed457b16867b7fa414)]
 - Refs #256681 - Fix error in CCA Event view menu. ([React Intl] An id must be provided to format a message.) [GhitaB - [`517eeb8`](https://github.com/eea/volto-cca-policy/commit/517eeb817264a47bbfd6b9b7d22aaf22d44ed224)]
 - Refs #161485 - Fix ECDE name conflict. [GhitaB - [`8bfd99f`](https://github.com/eea/volto-cca-policy/commit/8bfd99ff68bb82a04d1c0ed625fa514fcf46289e)]
@@ -1957,7 +1967,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`ad1ced0`](https://github.com/eea/volto-cca-policy/commit/ad1ced0971ba116c13a3b5fcc039172cc915c919)]
 
 #### :hammer_and_wrench: Others
 
@@ -2438,7 +2447,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Refs #158294 - Update supported languages list. [GhitaB - [`0a4f91f`](https://github.com/eea/volto-cca-policy/commit/0a4f91f39b7edc367bd4c127d6a8f273c7788361)]
-- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`8f1f9ce`](https://github.com/eea/volto-cca-policy/commit/8f1f9ce6c22805670cc0800d3c779b6d619d0f31)]
 ### [0.1.1](https://github.com/eea/volto-cca-policy/compare/0.1.0...0.1.1) - 13 December 2022
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.2.85",
+  "version": "0.2.87",
   "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.5",
+    "@eeacms/volto-searchlib": "2.0.6",
     "@eeacms/volto-slate-label": "^0.6.0",
     "@eeacms/volto-tabs-block": "^7.5.1",
     "@elastic/search-ui": "1.21.2",

package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useIntl, FormattedMessage } from 'react-intl';
-import { Accordion, Icon, Checkbox } from 'semantic-ui-react';
+import { Accordion, Icon, Checkbox, Button } from 'semantic-ui-react';
 
 const AccordionIcon = ({ active }) => {
   return (
@@ -12,6 +12,7 @@ const AccordionIcon = ({ active }) => {
 };
 
 export default function CaseStudyFilters(props) {
+  const intl = useIntl();
   const {
     filters,
     activeFilters,
@@ -74,7 +75,6 @@ export default function CaseStudyFilters(props) {
     setQuerySectors(tempSectors);
   };
 
-  const intl = useIntl();
   return (
     <div className="casestudy-filters">
       <Accordion exclusive={false} className="secondary">
@@ -103,6 +103,7 @@ export default function CaseStudyFilters(props) {
             ),
           )}
         </Accordion.Content>
+
         <Accordion.Title
           active={activeIndex.includes(1)}
           index={1}
@@ -128,6 +129,7 @@ export default function CaseStudyFilters(props) {
             ),
           )}
         </Accordion.Content>
+
         <Accordion.Title
           active={activeIndex.includes(2)}
           index={2}
@@ -143,9 +145,7 @@ export default function CaseStudyFilters(props) {
           {Object.entries(filters?.measures || {}).map(
             ([key, values], index) => (
               <div className="subcategory" key={'ktm' + index}>
-                <p>
-                  <strong>{intl.formatMessage({ id: key })}</strong>
-                </p>
+                <h4>{intl.formatMessage({ id: key })}</h4>
                 {Object.entries(values).map(([_, valData]) => (
                   <Checkbox
                     label={intl.formatMessage({ id: valData.value })}
@@ -186,29 +186,28 @@ export default function CaseStudyFilters(props) {
           )}
         </Accordion.Content>
       </Accordion>
+
       {nrActiveFilters ? (
-        <button
-          className="ui primary button reset"
-          onClick={(_e) => resetFilters()}
-        >
+        <Button primary className="reset" onClick={(_e) => resetFilters()}>
           Reset
-        </button>
+        </Button>
       ) : null}
+
       <div className="case-study-legend">
         <p>
-          <span></span>
+          <span className="case-study-dot" />
           <FormattedMessage
             id="Climate-ADAPT case studies"
             defaultMessage="Climate-ADAPT case studies"
           />
         </p>
-        <p>
-          <span className="light-blue"></span>
+        {/* <p>
+          <span className="case-study-dot light-blue" />
           <FormattedMessage
             id="Case studies collected at national level in Spain, provided by AdapteCCA.es"
             defaultMessage="Case studies collected at national level in Spain, provided by AdapteCCA.es"
           />
-        </p>
+        </p> */}
       </div>
     </div>
   );

package/src/components/manage/Blocks/CaseStudyExplorer/FeatureDisplay.jsx

@@ -11,45 +11,57 @@ export default function FeatureDisplay({ feature }) {
           </a>
         </strong>
       </p>
-      <span className="img">
-        <center>
-          <img src={feature.image} alt={feature.title} />
-        </center>
-      </span>
-      <p style={{ marginBottom: '10px' }}>
-        <span className="blue">
-          <FormattedMessage
-            id="Adaptation sectors"
-            defaultMessage="Adaptation sectors"
-          />
-          {': '}
-        </span>
-        <span>{feature.adaptations}</span>
-      </p>
-      <p style={{ marginBottom: '10px' }}>
-        <span className="blue">
-          <FormattedMessage
-            id="Climate impacts"
-            defaultMessage="Climate impacts"
-          />
-          {': '}
-        </span>
-        <span>{feature.impacts}</span>
-      </p>
-      <p>
-        <span className="blue">
-          <FormattedMessage
-            id="Adaptation options"
-            defaultMessage="Adaptation options"
-          />
-          {': '}
+
+      {feature.image && (
+        <span className="img">
+          <center>
+            <img src={feature.image} alt={feature.title} />
+          </center>
         </span>
-        <span
-          dangerouslySetInnerHTML={{
-            __html: feature.adaptation_options_links.replaceAll('<>', '; '),
-          }}
-        ></span>
-      </p>
+      )}
+
+      {feature.adaptations && (
+        <p>
+          <span className="blue">
+            <FormattedMessage
+              id="Adaptation sectors"
+              defaultMessage="Adaptation sectors"
+            />
+            {': '}
+          </span>
+          <span>{feature.adaptations}</span>
+        </p>
+      )}
+
+      {feature.impacts && (
+        <p>
+          <span className="blue">
+            <FormattedMessage
+              id="Climate impacts"
+              defaultMessage="Climate impacts"
+            />
+            {': '}
+          </span>
+          <span>{feature.impacts}</span>
+        </p>
+      )}
+
+      {feature.adaptation_options_links && (
+        <p>
+          <span className="blue">
+            <FormattedMessage
+              id="Adaptation options"
+              defaultMessage="Adaptation options"
+            />
+            {': '}
+          </span>
+          <span
+            dangerouslySetInnerHTML={{
+              __html: feature.adaptation_options_links.replaceAll('<>', '; '),
+            }}
+          ></span>
+        </p>
+      )}
     </div>
   ) : null;
 }

package/src/components/manage/Blocks/CaseStudyExplorer/styles.less

@@ -1,12 +1,4 @@
-a.dbitem {
-  font-size: 14px;
-}
-
-#csepopup > span {
-  display: 'block';
-  margin-bottom: '10px';
-  background-color: '#ddd';
-}
+@mapHeight: 70vh;
 
 #csepopup {
   width: 300px;
@@ -14,14 +6,15 @@ a.dbitem {
   border-bottom: 6px solid #005c96;
   background-color: white;
 
+  a.dbitem {
+    font-size: 14px;
+    text-decoration: none;
+  }
+
   p {
-    padding: 0 10px 0 10px;
+    padding: 0 10px;
     font-size: 13px;
 
-    p {
-      margin-bottom: 10px;
-    }
-
     a {
       text-decoration: underline;
     }
@@ -37,26 +30,21 @@ a.dbitem {
     background-color: #ddd;
 
     img {
-      max-height: 133px;
+      max-height: 130px;
     }
   }
 }
 
 .section-case-study-explorer #popup-overlay {
-  width: 340px;
-  // max-height: 300px;
+  width: 300px;
   padding: 0;
   background-color: #fff;
 }
 
-@mapHeight: 70vh;
-
 .casestudy-explorer-map {
-  // height: @mapHeight;
   min-height: @mapHeight;
 
   .ol-map {
-    // height: @mapHeight;
     min-height: @mapHeight;
   }
 
@@ -68,54 +56,16 @@ a.dbitem {
 
   #cse-filter {
     h4 {
-      position: relative;
-      padding: 10px;
-      border-bottom: 1px solid #d8d8d8;
-      margin-top: 0 !important;
-      margin-bottom: 0 !important;
-      background-color: #fff;
-      clear: both;
-      color: #005c96;
-      cursor: pointer;
-      font-size: 14px;
-    }
-
-    p {
-      // padding: 2px;
-      padding-bottom: 10px;
-      clear: both;
-      line-height: 20px;
-
-      span {
-        float: left;
-        font-family: OpenSansM, sans-serif;
-        font-size: 12px;
-      }
-
-      input {
-        float: right;
-      }
-    }
-
-    div.title {
-      width: 100%;
+      font-size: 16px;
     }
 
     .ui.accordion {
-      & > .title > .icon {
-        line-height: 1rem;
-      }
-
-      p {
-        margin: 0;
-      }
-
       .content {
         overflow: auto;
         max-height: 400px;
 
         .subcategory {
-          margin-bottom: 30px;
+          margin-bottom: 20px;
         }
       }
     }
@@ -132,7 +82,7 @@ a.dbitem {
       padding-top: 20px;
       margin-top: auto;
 
-      span {
+      .case-study-dot {
         display: inline-block;
         width: 12px;
         height: 12px;
@@ -141,10 +91,10 @@ a.dbitem {
         background-color: #005c96 !important;
         background-color: #bbb;
         border-radius: 50%;
-      }
 
-      span.light-blue {
-        background-color: #00ffff !important;
+        // &.light-blue {
+        //   background-color: #00ffff !important;
+        // }
       }
     }
   }

package/src/helpers/Constants.jsx

@@ -47,14 +47,14 @@ export const ACE_COUNTRIES = {
   NL: 'Netherlands',
   PT: 'Portugal',
   NO: 'Norway',
-  TR: 'Turkey',
+  TR: 'Türkiye',
   LI: 'Liechtenstein',
   LV: 'Latvia',
   LT: 'Lithuania',
   LU: 'Luxembourg',
   RO: 'Romania',
   PL: 'Poland',
-  XK: 'Kosovo under UN Security Council Resolution 1244/99',
+  XK: 'Kosovo',
   CH: 'Switzerland',
   GR: 'Greece',
   EE: 'Estonia',
@@ -504,9 +504,12 @@ export const SUBNATIONAL_REGIONS = {
 };
 
 export const EU_COUNTRIES = [
+  'AL',
   'AT',
+  'BA',
   'BE',
   'BG',
+  'CH',
   'CY',
   'CZ',
   'DE',
@@ -519,17 +522,24 @@ export const EU_COUNTRIES = [
   'HR',
   'HU',
   'IE',
+  'IS',
   'IT',
+  'LI',
   'LT',
   'LU',
   'LV',
+  'ME',
+  'MK',
   'MT',
   'NL',
   'NO',
   'PL',
   'PT',
   'RO',
+  'RS',
   'SE',
   'SI',
   'SK',
+  'TR',
+  'XK',
 ];