@eeacms/volto-cca-policy 0.2.24 → 0.2.26

package/CHANGELOG.md

@@ -4,6 +4,27 @@ 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.26](https://github.com/eea/volto-cca-policy/compare/0.2.25...0.2.26) - 17 May 2024
+
+#### :house: Internal changes
+
+- style: improve styling for tiles listing [kreafox - [`731c9e3`](https://github.com/eea/volto-cca-policy/commit/731c9e39eefcba2739b2e2f52e1cd695882e2704)]
+
+#### :hammer_and_wrench: Others
+
+- test: update snapshots [kreafox - [`5e47286`](https://github.com/eea/volto-cca-policy/commit/5e47286700aa6b0a70e2636e988eaabb631e62c5)]
+- Fallback to effective in sort [Tiberiu Ichim - [`3c77aaa`](https://github.com/eea/volto-cca-policy/commit/3c77aaa9aca8280bf4df516b5adde6ab7e35d706)]
+### [0.2.25](https://github.com/eea/volto-cca-policy/compare/0.2.24...0.2.25) - 16 May 2024
+
+#### :bug: Bug Fixes
+
+- fix: facets order [kreafox - [`32b55a1`](https://github.com/eea/volto-cca-policy/commit/32b55a1f6db776d5ae6eef08eafa6daf463db34c)]
+- fix: countries order in funding search [kreafox - [`51139f6`](https://github.com/eea/volto-cca-policy/commit/51139f63e56bfc332b29034bca6167e3f9460edb)]
+- fix: warning messages [kreafox - [`e3e41a4`](https://github.com/eea/volto-cca-policy/commit/e3e41a42e491a4d1c0ebfcf60960254a01194e00)]
+
+#### :hammer_and_wrench: Others
+
+- test: update snapshots [kreafox - [`fcc582e`](https://github.com/eea/volto-cca-policy/commit/fcc582e6579e647e61c303cf6173045c0e13cc40)]
 ### [0.2.24](https://github.com/eea/volto-cca-policy/compare/0.2.23...0.2.24) - 15 May 2024
 
 #### :rocket: New Features

package/package.json

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

package/src/components/manage/Blocks/CollectionStatistics/index.js

@@ -24,10 +24,10 @@ const portalTypeIcons = {
   Guidance: 'compass',
   Indicator: 'area chart',
   'Information portal': 'info circle',
-  'Publication reference': 'newspaper',
+  'Publications and reports': 'newspaper',
   'Research and knowledge project': 'university',
   Tool: 'wrench',
-  Video: 'video play',
+  'Videos and podcasts': 'video play',
   // 'eea.climateadapt.aceproject': '',
   // 'eea.climateadapt.adaptationoption': '',
   // 'eea.climateadapt.c3sindicator': '',
@@ -42,11 +42,11 @@ const portalTypesToSearchTypes = {
   'eea.climateadapt.indicator': 'Indicator',
   'eea.climateadapt.c3sindicator': 'Indicator',
   'eea.climateadapt.informationportal': 'Information portal',
-  'eea.climateadapt.publicationreport': 'Publication reference',
+  'eea.climateadapt.publicationreport': 'Publications and reports',
   'eea.climateadapt.aceproject': 'Research and knowledge project',
   'eea.climateadapt.researchproject': 'Research and knowledge project',
   'eea.climateadapt.tool': 'Tool',
-  'eea.climateadapt.video': 'Video',
+  'eea.climateadapt.video': 'Videos and podcasts',
   // TODO: what about these?
   // 'eea.climateadapt.aceproject': '',
   // 'eea.climateadapt.mapgraphdataset': '',

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

@@ -8,7 +8,7 @@
   flex-direction: row;
   flex-wrap: wrap;
   margin: 1em 0;
-  gap: 1em;
+  gap: 0.7em;
 
   .semantic-icon {
     i.icon {

package/src/components/manage/Blocks/FilterAceContent/FilterAceContentView.jsx

@@ -102,7 +102,7 @@ const applyQuery = (id, data, currentLang, impacts, sectors) => {
     block: id,
     limit: data.nr_items,
     query: defaultQuery,
-    sort_on: data.sortBy,
+    sort_on: data.sortBy || 'effective',
     sort_order: 'descending',
     template: 'summary',
     itemModel: { '@type': 'simpleItem' },
@@ -151,7 +151,7 @@ const FilterAceContentView = (props) => {
 
   return (
     <div className="block filter-acecontent-block">
-      {data.title && <h3>{data.title}</h3>}
+      {data.title && <h4>{data.title}</h4>}
       <h5>
         <FormattedMessage id="Climate impact" defaultMessage="Climate impact" />
       </h5>

package/src/components/manage/Blocks/RelevantAceContent/RelevantAceContentView.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { List } from 'semantic-ui-react';
+import { List, ListItem, ListContent, ListIcon } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 import { flattenToAppURL } from '@plone/volto/helpers';
 
@@ -24,14 +24,20 @@ const RelevantAceContentView = (props) => {
   const showBlock = (items && items.length > 0) || results.length > 0;
 
   const itemList = (items || []).map((item, index) => (
-    <List.Item key={index}>
-      <Link to={flattenToAppURL(item.link)}>{item.item_title}</Link>
-    </List.Item>
+    <ListItem key={index}>
+      <ListIcon name="angle right" />
+      <ListContent>
+        <Link to={flattenToAppURL(item.link)}>{item.item_title}</Link>
+      </ListContent>
+    </ListItem>
   ));
   const resultsList = results.map((result, index) => (
-    <List.Item key={index} title={result[1]}>
-      <Link to={flattenToAppURL(result[4])}>{result[0]}</Link>
-    </List.Item>
+    <ListItem key={index} title={result[1]}>
+      <ListIcon name="angle right" />
+      <ListContent>
+        <Link to={flattenToAppURL(result[4])}>{result[0]}</Link>
+      </ListContent>
+    </ListItem>
   ));
   const showResults = hasAnyFilter || search_text != null;
 
@@ -40,14 +46,14 @@ const RelevantAceContentView = (props) => {
       {title && <h4>{title}</h4>}
 
       {combine_results ? (
-        <>
+        <List>
           {itemList}
           {!isEdit && showResults && resultsList}
-        </>
+        </List>
       ) : items && items.length > 0 ? (
-        itemList
+        <List>{itemList}</List>
       ) : (
-        !isEdit && showResults && resultsList
+        <List>{!isEdit && showResults && resultsList}</List>
       )}
     </div>
   ) : (

package/src/components/manage/Blocks/SearchAceContent/SearchAceContentView.jsx

@@ -1,4 +1,4 @@
-import { List, Icon } from 'semantic-ui-react';
+import { List, Icon, ListItem, ListContent, ListIcon } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 import { flattenToAppURL } from '@plone/volto/helpers';
 import { useIntl, FormattedMessage } from 'react-intl';
@@ -13,19 +13,25 @@ export default function SearchAceContentView(props) {
       {data.title && <h4>{data.title}</h4>}
       <List>
         {results.map((result, index) => (
-          <List.Item key={index}>
-            <Link to={flattenToAppURL(result[2])}>
-              {intl.formatMessage({ id: result[0], defaultMessage: result[0] })}{' '}
-              ({result[1]})
-            </Link>
-          </List.Item>
+          <ListItem key={index}>
+            <ListIcon name="angle right" />
+            <ListContent>
+              <Link to={flattenToAppURL(result[2])}>
+                {intl.formatMessage({
+                  id: result[0],
+                  defaultMessage: result[0],
+                })}{' '}
+                ({result[1]})
+              </Link>
+            </ListContent>
+          </ListItem>
         ))}
       </List>
       <Link
         to="/en/help/share-your-info"
         className="ui button icon left labeled primary"
       >
-        <Icon name="ri-share-line" />
+        <Icon className="ri-share-line" />
         <FormattedMessage
           id="Share your information"
           defaultMessage="Share your information"

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

@@ -15,7 +15,7 @@ const ShareInfoButton = (props) => {
               id="Share your information"
               defaultMessage="Share your information"
             />
-            <Icon name="ri-share-line" />
+            <Icon className="ri-share-line" />
           </Button>
         </Link>
       </div>

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

@@ -226,9 +226,9 @@ function C3SIndicatorView(props) {
             >
               <span>Visualisation and Navigation</span>
               {activeAccIndex === 0 ? (
-                <Icon name="ri-arrow-up-s-line" size="24px" />
+                <Icon className="ri-arrow-up-s-line" />
               ) : (
-                <Icon name="ri-arrow-down-s-line" size="24px" />
+                <Icon className="ri-arrow-down-s-line" />
               )}
             </Accordion.Title>
             <Accordion.Content active={activeAccIndex === 0}>

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

@@ -227,7 +227,7 @@ const PhotoGallery = (props) => {
               />
             </span>
             <span> ({cca_gallery.length}) </span>
-            <Icon name="ri-image-fill" />
+            <Icon className="ri-image-fill" />
           </div>
           <ImageGallery items={cca_gallery} />
         </div>

package/src/search/mission_funding/facets-funding.js

@@ -1,9 +1,9 @@
 import { multiTermFacet } from '@eeacms/search';
-
 import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
+import spatialWhitelist from '@eeacms/volto-globalsearch/config/json/spatialWhitelist';
 import { cca_adaptation_sectors } from './../common';
 
-const blacklist = ['IncludeArchived', 'issued.date'];
+const blacklist = ['IncludeArchived', 'issued.date', 'spatial'];
 
 const facets = [
   multiTermFacet({
@@ -21,6 +21,17 @@ const facets = [
     alwaysVisible: false,
   }),
   cca_adaptation_sectors,
+  multiTermFacet({
+    field: 'spatial',
+    isFilterable: true,
+    isMulti: true,
+    label: 'Countries',
+    spatialWhitelist: spatialWhitelist,
+    show: 10000,
+    iconsFamily: 'Countries',
+    enableExact: true,
+    alwaysVisible: false,
+  }),
 
   ...globalSearchBaseConfig.facets.filter((f) => !blacklist.includes(f.field)),
 ];

package/theme/globals/blocks.less

@@ -0,0 +1,78 @@
+.relevant-acecontent-block,
+.search-acecontent-block {
+  .ui.list > .item a,
+  .ui.list .list > .item a {
+    color: @linkColor;
+
+    &:hover {
+      color: @linkHoverColor;
+    }
+  }
+  .content {
+    padding-left: 6px !important;
+  }
+  .ui.list > .item > i.icon {
+    top: 5px;
+    position: relative;
+    padding: 0;
+    color: @linkColor;
+    font-size: 14px;
+  }
+}
+
+.filter-acecontent-block {
+  .react-select-container {
+    width: 230px;
+    border: 1px solid #bcbec0;
+
+    .react-select__control {
+      min-height: auto;
+      border: none;
+    }
+
+    .react-select__value-container {
+      padding: 5px !important;
+    }
+
+    .react-select__menu {
+      border: 1px solid #bcbec0;
+      width: 230px;
+      margin-left: -1px;
+      border-top: none;
+      margin-top: -1px;
+    }
+
+    .react-select__indicator {
+      top: 4px;
+      right: 6px;
+      position: relative;
+    }
+  }
+  .listing-body {
+    position: relative;
+    &:before {
+      position: absolute;
+      top: 2px;
+      left: 0;
+      font-family: 'Icons';
+      content: '\f105';
+      color: @linkColor;
+      font-size: 14px;
+    }
+  }
+
+  .listing-header {
+    display: inline-block !important;
+    padding-left: 13px;
+  }
+
+  .u-item.listing-item {
+    p {
+      color: @linkColor;
+    }
+
+    a:hover p {
+      color: @linkHoverColor;
+    }
+  }
+}

package/theme/globals/site.overrides

@@ -5,6 +5,7 @@
 @import './observatory.less';
 @import './views.less';
 @import './search.less';
+@import './blocks.less';
 
 // [class~='view-defaultview'] [id='page-document'] > *,
 // [class~='view-viewview'] [id='page-document'] > * {

package/theme/globals/site.variables

@@ -12,8 +12,8 @@
 @secondaryColor: #005c97;
 @ccaGreenColor: #8a9c39;
 
-// @linkColor: @secondaryColor;
-// @linkHoverColor: @primaryColor;
+@linkColor: #006bb8;
+@linkHoverColor: #004b7f;
 // @linkActiveColor: @linkHoverColor;
 
 // Toolbar