@eeacms/volto-cca-policy 0.2.11 → 0.2.13

package/CHANGELOG.md

@@ -4,6 +4,34 @@ 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.13](https://github.com/eea/volto-cca-policy/compare/0.2.12...0.2.13) - 30 April 2024
+
+#### :rocket: New Features
+
+- feat(mission): add mission_tool search config [kreafox - [`96f2c20`](https://github.com/eea/volto-cca-policy/commit/96f2c205100ae3df652429ffaea833fb2aabb7b3)]
+
+#### :hammer_and_wrench: Others
+
+- Refs #269158 - adjust wording [Tripon Eugen - [`ede12a3`](https://github.com/eea/volto-cca-policy/commit/ede12a324689c5791e63c495b07dd9e3f2d29665)]
+- Refs #269158 - research project acetype [Tripon Eugen - [`f1b175c`](https://github.com/eea/volto-cca-policy/commit/f1b175c461c9811a34449b08e1fccffa910a4ebd)]
+### [0.2.12](https://github.com/eea/volto-cca-policy/compare/0.2.11...0.2.12) - 29 April 2024
+
+#### :bug: Bug Fixes
+
+- fix(search): cleanup [kreafox - [`6436c4e`](https://github.com/eea/volto-cca-policy/commit/6436c4e8fb98236253ef08dc2357a419bf4f1070)]
+
+#### :nail_care: Enhancements
+
+- change(search): move common facets [kreafox - [`c3375f3`](https://github.com/eea/volto-cca-policy/commit/c3375f3846ae9788a0f620575e3b1f0bc0302783)]
+
+#### :house: Internal changes
+
+- style: fix listings [kreafox - [`5782507`](https://github.com/eea/volto-cca-policy/commit/578250758523cf33b495959eb65d8e8b6a255fe3)]
+- style: fix alignment in tabs [kreafox - [`a1bdcc4`](https://github.com/eea/volto-cca-policy/commit/a1bdcc41a80ca53b070e0e21f66b8b0ff3c0184e)]
+
+#### :hammer_and_wrench: Others
+
+- Pin cypress version to 13 [kreafox - [`53cc434`](https://github.com/eea/volto-cca-policy/commit/53cc434057ce26caab5c46d20bae903250a05663)]
 ### [0.2.11](https://github.com/eea/volto-cca-policy/compare/0.2.10...0.2.11) - 26 April 2024
 
 #### :house: Internal changes
@@ -1052,13 +1080,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
@@ -1075,9 +1100,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)]
@@ -1294,7 +1316,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
 
@@ -1775,7 +1796,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.11",
+  "version": "0.2.13",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -49,6 +49,7 @@
     "react-visibility-sensor": "5.1.1"
   },
   "devDependencies": {
+    "cypress": "13.1.0",
     "@cypress/code-coverage": "^3.10.0",
     "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",

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

@@ -43,6 +43,7 @@ const portalTypesToSearchTypes = {
   'eea.climateadapt.c3sindicator': 'Indicator',
   'eea.climateadapt.informationportal': 'Information portal',
   'eea.climateadapt.publicationreport': 'Publication reference',
+  'eea.climateadapt.aceproject': 'Research and knowledge project',
   'eea.climateadapt.researchproject': 'Research and knowledge project',
   'eea.climateadapt.tool': 'Tool',
   'eea.climateadapt.video': 'Video',

package/src/components/manage/Blocks/TabsBlock/spotlight.less

@@ -23,7 +23,7 @@
 
   .image.icon {
     width: 48px;
-    max-height: 48px;
+    height: 48px;
     object-fit: contain;
   }
 

package/src/search/common.js

@@ -12,6 +12,28 @@ export const geographic_countries = {
   isMulti: true,
 };
 
+export const cca_climate_impacts = {
+  field: 'cca_climate_impacts.keyword',
+  factory: 'MultiTermFacet',
+  label: 'Climate Impacts',
+  showInFacetsList: true,
+  filterType: 'any',
+  isFilterable: false,
+  show: 10000,
+  isMulti: true,
+};
+
+export const cca_adaptation_sectors = {
+  field: 'cca_adaptation_sectors.keyword',
+  factory: 'MultiTermFacet',
+  label: 'Adaptation Sectors',
+  showInFacetsList: true,
+  filterType: 'any',
+  isFilterable: false,
+  show: 10000,
+  isMulti: true,
+};
+
 export const include_archived = booleanFacet(() => ({
   field: 'IncludeArchived',
   label: 'Include archived content',

package/src/search/config.js

@@ -1,6 +1,7 @@
 import { mergeConfig } from '@eeacms/search';
 import { build_runtime_mappings } from '@eeacms/volto-globalsearch/utils';
 import { getClientProxyAddress } from './utils';
+import vocabs from './vocabulary';
 
 import facets from './facets';
 
@@ -36,25 +37,8 @@ export default function installMainSearch(config) {
     elastic_index: '_es/globalsearch',
     index_name: 'data_searchui',
     host: process.env.RAZZLE_ES_PROXY_ADDR || 'http://localhost:3000',
-    vocab: {
-      cluster_name: {
-        cca: 'Climate-ADAPT',
-      },
-      'cca_key_type_measure.keyword': {
-        A1: 'A1: Policy Instruments',
-        A2: 'A2: Management and planning',
-        A3: 'A3: Coordination cooperation and networks',
-        B1: 'B1: Financing incentive instruments',
-        B2: 'B2: Insurance and risk sharing instruments',
-        C1: 'C1: Grey options',
-        C2: 'C2: Technological options',
-        D1: 'D1: Green options',
-        D2: 'D2: Blue options',
-        E1: 'E1: Information and awareness raising',
-        E2: 'E2: Capacity building empowering and lifestyle practices',
-      },
-    },
     runtime_mappings: build_runtime_mappings(clusters),
+    ...vocabs,
   };
 
   const { ccaSearch } = config.searchui;

package/src/search/index.js

@@ -2,6 +2,7 @@ import installMainSearch from './config';
 import installHealthSearch from './health_observatory/config-health';
 import installMissionStoriesSearch from './mission_stories/config-stories';
 import installMissionProjectsSearch from './mission_projects/config-projects';
+import installMissionToolsSearch from './mission_tools/config-tools';
 
 const extraQueryParams = {
   text_fields: [
@@ -36,10 +37,15 @@ const applyConfig = (config) => {
     installMainSearch(config.settings.searchlib),
   );
 
+  config.settings.searchlib = installMissionToolsSearch(
+    installMainSearch(config.settings.searchlib),
+  );
+
   config.settings.searchlib.searchui.ccaSearch.extraQueryParams = extraQueryParams;
   config.settings.searchlib.searchui.ccaHealthSearch.extraQueryParams = extraQueryParams;
   config.settings.searchlib.searchui.missionProjects.extraQueryParams = extraQueryParams;
   config.settings.searchlib.searchui.missionStoriesSearch.extraQueryParams = extraQueryParams;
+  config.settings.searchlib.searchui.missionToolsSearch.extraQueryParams = extraQueryParams;
 
   return config;
 };

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

@@ -5,6 +5,8 @@ import {
   language,
   issued_date,
   geographic_countries,
+  cca_climate_impacts,
+  cca_adaptation_sectors,
 } from './../common';
 
 const facets = [
@@ -16,20 +18,8 @@ const facets = [
     iconsFamily: 'Funding Programme',
     alwaysVisible: false,
   }),
-  multiTermFacet({
-    field: 'cca_climate_impacts.keyword',
-    isFilterable: false,
-    isMulti: true,
-    label: 'Climate Impacts',
-    alwaysVisible: false,
-  }),
-  multiTermFacet({
-    field: 'cca_adaptation_sectors.keyword',
-    isFilterable: false,
-    isMulti: true,
-    label: 'Adaptation Sectors',
-    alwaysVisible: false,
-  }),
+  cca_climate_impacts,
+  cca_adaptation_sectors,
   multiTermFacet({
     field: 'cca_adaptation_elements.keyword',
     isFilterable: false,

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

@@ -1,24 +1,11 @@
 import { multiTermFacet } from '@eeacms/search';
 
 import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
+import { cca_climate_impacts, cca_adaptation_sectors } from './../common';
 
 const facets = [
-  multiTermFacet({
-    field: 'cca_climate_impacts.keyword',
-    isFilterable: false,
-    isMulti: true,
-    label: 'Climate Impacts',
-    iconsFamily: 'Climate Impacts',
-    alwaysVisible: false,
-  }),
-  multiTermFacet({
-    field: 'cca_adaptation_sectors.keyword',
-    isFilterable: false,
-    isMulti: true,
-    label: 'Adaptation Sectors',
-    iconsFamily: 'Adaptation Sectors',
-    alwaysVisible: false,
-  }),
+  cca_climate_impacts,
+  cca_adaptation_sectors,
   multiTermFacet({
     field: 'key_system.keyword',
     isFilterable: false,

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

@@ -0,0 +1,57 @@
+import { mergeConfig } from '@eeacms/search';
+import { getClientProxyAddress, getSearchThumbUrl } from '../utils';
+import facets from './facets-tools';
+
+const missionToolsConfig = {
+  title: 'Mission Tools Search',
+  ...facets,
+};
+
+export default function installMissionToolsSearch(config) {
+  const envConfig = process.env.RAZZLE_ENV_CONFIG
+    ? JSON.parse(process.env.RAZZLE_ENV_CONFIG)
+    : missionToolsConfig;
+
+  const pjson = require('@eeacms/volto-cca-policy/../package.json');
+  envConfig.app_name = pjson.name;
+  envConfig.app_version = pjson.version;
+
+  config.searchui.missionToolsSearch = {
+    ...mergeConfig(envConfig, config.searchui.globalsearchbase),
+    elastic_index: '_es/globalsearch',
+    index_name: 'data_searchui',
+    host: process.env.RAZZLE_ES_PROXY_ADDR || 'http://localhost:3000',
+    vocab: {
+      cluster_name: {
+        cca: 'Mission Portal',
+      },
+    },
+  };
+
+  const { missionToolsSearch } = config.searchui;
+
+  missionToolsSearch.facets = facets;
+
+  if (typeof window !== 'undefined') {
+    config.searchui.missionToolsSearch.host =
+      process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress();
+  }
+
+  missionToolsSearch.resultItemModel = {
+    factory: 'ResultModel',
+    urlField: 'about',
+    titleField: 'title',
+    metatypeField: 'objectProvides',
+    descriptionField: 'description',
+    tagsField: 'topic',
+    issuedField: 'issued',
+    getThumbnailUrl: 'getSearchThumbUrl',
+    getIconUrl: 'getGlobalsearchIconUrl',
+    fallbackThumbUrl:
+      'https://react.semantic-ui.com/images/wireframe/white-image.png',
+  };
+
+  config.resolve.getSearchThumbUrl = getSearchThumbUrl();
+
+  return config;
+}

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

@@ -0,0 +1,47 @@
+import { multiTermFacet } from '@eeacms/search';
+
+import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
+import { cca_climate_impacts, cca_adaptation_sectors } from './../common';
+
+const facets = [
+  multiTermFacet({
+    field: 'cca_rast_steps.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'RAST step(s) of relevance',
+    alwaysVisible: false,
+  }),
+  multiTermFacet({
+    field: 'cca_geographical_scale.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Geographical scale',
+    alwaysVisible: false,
+  }),
+  cca_climate_impacts,
+  multiTermFacet({
+    field: 'cca_tool_language.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Language(s) of the tool',
+    alwaysVisible: false,
+  }),
+  cca_adaptation_sectors,
+  multiTermFacet({
+    field: 'cca_most_useful_for.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Most useful for',
+    alwaysVisible: false,
+  }),
+  multiTermFacet({
+    field: 'cca_user_requirements.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'User requirements',
+    alwaysVisible: false,
+  }),
+  ...globalSearchBaseConfig.facets,
+];
+
+export default facets;

package/src/search/utils.js

@@ -38,11 +38,7 @@ export function getClientProxyAddress() {
 export const getSearchThumbUrl = () => (result, config, fallback) => {
   let image = fallback;
 
-  if (
-    result.about?.raw?.indexOf('://cca-p6.devel5cph.eionet.europa.eu') !== -1 ||
-    result.about?.raw?.indexOf('://cca.devel5cph.eionet.europa.eu') !== -1 ||
-    result.about?.raw?.indexOf('://climate-adapt.eea.europa.eu') !== -1
-  ) {
+  if (result.about?.raw?.indexOf('://climate-adapt.eea.europa.eu') !== -1) {
     if (result.cca_preview_image) {
       image = result?.about?.raw + '/@@images/preview_image/preview';
     }

package/src/search/vocabulary.js

@@ -0,0 +1,24 @@
+const vocab = {
+  cluster_name: {
+    cca: 'Climate-ADAPT',
+  },
+  'cca_key_type_measure.keyword': {
+    A1: 'A1: Policy Instruments',
+    A2: 'A2: Management and planning',
+    A3: 'A3: Coordination cooperation and networks',
+    B1: 'B1: Financing incentive instruments',
+    B2: 'B2: Insurance and risk sharing instruments',
+    C1: 'C1: Grey options',
+    C2: 'C2: Technological options',
+    D1: 'D1: Green options',
+    D2: 'D2: Blue options',
+    E1: 'E1: Information and awareness raising',
+    E2: 'E2: Capacity building empowering and lifestyle practices',
+  },
+  objectProvides: {
+    'Publication reference': 'Publications and reports',
+    Video: 'Videos and podcasts',
+  },
+};
+
+export default { vocab };

package/theme/elements/list.overrides

@@ -0,0 +1,3 @@
+ol.ui.list, .ui.bulleted.list {
+  margin-left: 0;
+}

package/theme/globals/site.overrides

@@ -17,6 +17,14 @@
   @green-2 97.12%
 );
 
+[id='page-document'] > .ui.list,
+.view-wrapper > .ui.list,
+[id='page-document'] > .ui.bulleted.list,
+.view-wrapper > .ui.bulleted.list {
+  margin-left: auto !important;
+  margin-right: auto !important;
+}
+
 .ui.ordered.list,
 .ui.ordered.list .list,
 ol.ui.list,
@@ -185,8 +193,3 @@ body.subsite {
     font-size: 23px;
   }
 }
-
-
-ol.ui.list, .ui.bulleted.list {
-  margin-left: 0 !important;
-}