@eeacms/volto-cca-policy 0.1.75 → 0.1.76

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.1.76](https://github.com/eea/volto-cca-policy/compare/0.1.75...0.1.76) - 16 February 2024
+
+#### :nail_care: Enhancements
+
+- change: update mission search fields [kreafox - [`011be24`](https://github.com/eea/volto-cca-policy/commit/011be24eed371196ce8180a6ca058fc4b254e2e6)]
+- change: update mission stories search [kreafox - [`d077a11`](https://github.com/eea/volto-cca-policy/commit/d077a115001f8b8038531bcecb3306fb5b454da5)]
+
+#### :hammer_and_wrench: Others
+
+- Refs #265319 - Improve design for organisation cards. [GhitaB - [`da31fc1`](https://github.com/eea/volto-cca-policy/commit/da31fc1f1fa3b025be689cc77bb3cc0cb690b407)]
+- Refs #265325 - Use observatory url format for indicators listing, too. [GhitaB - [`0557783`](https://github.com/eea/volto-cca-policy/commit/0557783ef325bf1786e3c59ef85bf2a5c94e1f06)]
+- test: fix duplicated code issue [kreafox - [`0104638`](https://github.com/eea/volto-cca-policy/commit/01046385f54e58cc792ea06542c24b0bb4446c0f)]
 ### [0.1.75](https://github.com/eea/volto-cca-policy/compare/0.1.74...0.1.75) - 15 February 2024
 
 #### :rocket: New Features

package/package.json

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

package/src/components/manage/Blocks/Listing/IndicatorCardsListingView.jsx

@@ -5,6 +5,7 @@ import { compose } from 'redux';
 import cx from 'classnames';
 import { ConditionalLink } from '@plone/volto/components';
 import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers';
+import { observatoryURL } from './common';
 import './styles.less';
 
 const fixedTitles = {
@@ -27,7 +28,7 @@ const IndicatorCardsListingView = ({ items, isEditMode, token }) => {
           <div className="wrapper">
             <div className="slot-top">
               <ConditionalLink
-                to={flattenToAppURL(getBaseUrl(item['@id']))}
+                to={flattenToAppURL(getBaseUrl(observatoryURL(item)))}
                 condition={!isEditMode}
               >
                 <div className="listing-body">

package/src/components/manage/Blocks/Listing/OrganisationCardsListingView.jsx

@@ -2,13 +2,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
+import { observatoryURL } from './common';
 import './styles.less';
 
 const OrganisationCardsListingView = ({ items, isEditMode, token }) => {
-  const observatoryURL = (item) => {
-    return item['@id'].replace('/metadata/', '/observatory/++aq++metadata/');
-  };
-
   const contributionsURL = (item) => {
     const mapContributorValues = {
       'copernicus-climate-change-service-ecmw':
@@ -51,11 +48,13 @@ const OrganisationCardsListingView = ({ items, isEditMode, token }) => {
           <div className="content">
             <div className="header">
               <a className="image" href={observatoryURL(item)}>
-                <img
-                  src={item['@id'] + '/@@images/logo/preview'}
-                  alt={item.title}
-                  className="ui image"
-                ></img>
+                <div className="img-container">
+                  <img
+                    src={item['@id'] + '/@@images/logo/preview'}
+                    alt={item.title}
+                    className="ui image"
+                  ></img>
+                </div>
               </a>
               <a className="header-link org-name" href={observatoryURL(item)}>
                 {item.title}

package/src/components/manage/Blocks/Listing/common.js

@@ -0,0 +1,3 @@
+export const observatoryURL = (item) => {
+  return item['@id'].replace('/metadata/', '/observatory/++aq++metadata/');
+};

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

@@ -1,12 +1,28 @@
 // Organisation Cards Listing
 div.organisationCards {
-  a.org-name {
-    font-size: 0.7em;
-    text-transform: uppercase;
-  }
+  div.card.u-card {
+    border: 1px solid #ccc;
+    margin: 10px;
+
+    div.img-container {
+      min-height: 120px;
+      text-align: center;
+
+      img {
+        width: auto;
+        max-height: 100px;
+      }
+    }
+
+    a.org-name {
+      margin-top: 0.5em;
+      margin-bottom: 0.5em;
+      font-size: 1em;
+    }
 
-  a.org-site {
-    font-size: 0.7em;
+    a.org-site {
+      font-size: 0.7em;
+    }
   }
 }
 

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

@@ -1,16 +1,16 @@
 import React from 'react';
 import {
-  HTMLField,
   ContentMetadata,
-  LinksList,
   PublishedModifiedInfo,
   DocumentsList,
   ShareInfo,
+  ReferenceInfo,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
 function PublicationReportView(props) {
   const { content } = props;
+
   return (
     <div className="publication-report-view">
       <div className="ui container">
@@ -23,40 +23,8 @@ function PublicationReportView(props) {
               className="col-left"
             >
               <div className="ui label">Publications and Reports</div>
-              <h1>{content.title}</h1>
-              <h4>Description</h4>
-              <HTMLField
-                value={content.long_description}
-                className="long_description"
-              />
-              <hr />
-
-              <h4>Reference information</h4>
-
-              {content?.websites?.length > 0 && (
-                <LinksList title="Websites:" value={content.websites} />
-              )}
-
-              {content.source && (
-                <>
-                  <h4>Source:</h4>
-                  <HTMLField value={content.source} className="source" />
-                </>
-              )}
-              {content?.contributor_list?.length > 0 && (
-                <>
-                  <h4>Contributor:</h4>
-                  {content.contributor_list
-                    .map((item) => (
-                      <>
-                        {item.title}
-                        <br />
-                      </>
-                    ))
-                    .sort()}
-                </>
-              )}
 
+              <ReferenceInfo content={content} />
               <PublishedModifiedInfo {...props} />
               <ShareInfo {...props} />
             </Grid.Column>

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

@@ -1,9 +1,8 @@
 import React from 'react';
 import {
-  HTMLField,
   ContentMetadata,
-  LinksList,
   PublishedModifiedInfo,
+  ReferenceInfo,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
@@ -21,36 +20,8 @@ function ToolView(props) {
               className="col-left"
             >
               <div className="ui label">Tools</div>
-              <h1>{content.title}</h1>
-              <h4>Description</h4>
-              <HTMLField
-                value={content.long_description}
-                className="long_description"
-              />
-              <hr />
-              <h4>Reference information</h4>
 
-              {content?.websites?.length > 0 && (
-                <LinksList title="Websites:" value={content.websites} />
-              )}
-
-              {content.source && (
-                <>
-                  <h4>Source:</h4>
-                  <HTMLField value={content.source} className="source" />
-                </>
-              )}
-              {content?.contributor_list?.length > 0 && (
-                <>
-                  <h4>Contributor</h4>
-                  {content.contributor_list.sort().map((item) => (
-                    <>
-                      {item.title}
-                      <br />
-                    </>
-                  ))}
-                </>
-              )}
+              <ReferenceInfo content={content} />
 
               <PublishedModifiedInfo {...props} />
             </Grid.Column>

package/src/helpers/Utils.jsx

@@ -68,6 +68,45 @@ export const LinksList = (props) => {
   }
 };
 
+export const ReferenceInfo = (props) => {
+  const { content } = props;
+  return (
+    <>
+      <h1>{content.title}</h1>
+      <h4>Description</h4>
+      <HTMLField
+        value={content.long_description}
+        className="long_description"
+      />
+      <hr />
+      <h4>Reference information</h4>
+
+      {content?.websites?.length > 0 && (
+        <LinksList title="Websites:" value={content.websites} />
+      )}
+
+      {content.source && (
+        <>
+          <h4>Source:</h4>
+          <HTMLField value={content.source} className="source" />
+        </>
+      )}
+
+      {content?.contributor_list?.length > 0 && (
+        <>
+          <h4>Contributor</h4>
+          {content.contributor_list.sort().map((item) => (
+            <>
+              {item.title}
+              <br />
+            </>
+          ))}
+        </>
+      )}
+    </>
+  );
+};
+
 export const PublishedModifiedInfo = (props) => {
   const { content } = props;
 

package/src/helpers/index.js

@@ -9,6 +9,7 @@ export {
   PublishedModifiedInfo,
   LinksList,
   DocumentsList,
+  ReferenceInfo,
 } from './Utils';
 export ContentMetadata from './ContentMetadata';
 export ShareInfo from './ShareInfo';

package/src/search/mission_projects/config-projects.js

@@ -38,7 +38,7 @@ export default function installMainSearch(config) {
     host: process.env.RAZZLE_ES_PROXY_ADDR || 'http://localhost:3000',
     vocab: {
       cluster_name: {
-        cca: 'Climate-ADAPT',
+        cca: 'Mission Portal',
       },
     },
     runtime_mappings: build_runtime_mappings(clusters),

package/src/search/mission_stories/config-stories.js

@@ -21,6 +21,11 @@ export default function installMissionStoriesSearch(config) {
     elastic_index: '_es/missionStoriesSearch',
     index_name: 'ccatest_searchui',
     host: process.env.RAZZLE_ES_PROXY_ADDR || 'http://localhost:3000',
+    vocab: {
+      cluster_name: {
+        cca: 'Mission Portal',
+      },
+    },
   };
 
   const { missionStoriesSearch } = config.searchui;

package/src/search/mission_stories/facets-stories.js

@@ -36,6 +36,22 @@ const facets = [
     iconsFamily: 'Hazard Type',
     alwaysVisible: false,
   }),
+  multiTermFacet({
+    field: 'cca_climate_impacts.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Climate Impacts',
+    iconsFamily: 'Climate Impacts',
+    alwaysVisible: false,
+  }),
+  multiTermFacet({
+    field: 'cca_funding_programme.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Funding Programme',
+    iconsFamily: 'Funding Programme',
+    alwaysVisible: false,
+  }),
 ];
 
 export default facets;