@eeacms/volto-cca-policy 0.2.86 → 0.2.88

package/CHANGELOG.md

@@ -4,6 +4,21 @@ 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.88](https://github.com/eea/volto-cca-policy/compare/0.2.87...0.2.88) - 6 January 2025
+
+#### :hammer_and_wrench: Others
+
+- Fix facet for mission tools [Tiberiu Ichim - [`a4b5787`](https://github.com/eea/volto-cca-policy/commit/a4b578762eac8da26b01b5fef7cbddbebdd78eb6)]
+### [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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.2.86",
+  "version": "0.2.88",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

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,18 +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',
 ];

package/src/search/mission_tools/facets-tools.js

@@ -1,6 +1,7 @@
 import { multiTermFacet } from '@eeacms/search';
 
-// import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
+import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
+
 import {
   cca_climate_impacts,
   cca_adaptation_sectors,
@@ -46,7 +47,7 @@ const facets = [
     alwaysVisible: false,
   }),
   language,
-  // ...globalSearchBaseConfig.facets,
+  ...globalSearchBaseConfig.facets.filter((f) => f.field !== 'language'),
 ];
 
 export default facets;