@eeacms/volto-cca-policy 0.2.48 → 0.2.49

package/CHANGELOG.md

@@ -4,11 +4,17 @@ 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.48](https://github.com/eea/volto-cca-policy/compare/0.2.47...0.2.48) - 2 July 2024
+### [0.2.49](https://github.com/eea/volto-cca-policy/compare/0.2.48...0.2.49) - 8 July 2024
 
 #### :hammer_and_wrench: Others
 
-- Update version for hero block [Tiberiu Ichim - [`24131f1`](https://github.com/eea/volto-cca-policy/commit/24131f1626e2e27169e737ac0ac0b369b4804064)]
+- Refs #271901 - text and link update [Tripon Eugen - [`6b65679`](https://github.com/eea/volto-cca-policy/commit/6b65679e7c8816bdada23d0fdca06b78f003179a)]
+- Refs #271901 - text update [Tripon Eugen - [`5802a0d`](https://github.com/eea/volto-cca-policy/commit/5802a0dd31e6c67981b6c163886842be90051b52)]
+- Refs #271901 - placeholder update [Tripon Eugen - [`2db9a1d`](https://github.com/eea/volto-cca-policy/commit/2db9a1dba66c42a23c4c1764315e0066a39d0c69)]
+- Refs #271901 - mission big top right magnifying lens path and text [Tripon Eugen - [`1ec0c0f`](https://github.com/eea/volto-cca-policy/commit/1ec0c0fa3be0a12e738d21ac33e185b9b0a1afcc)]
+- Refs #271901 - search all [Tripon Eugen - [`2724891`](https://github.com/eea/volto-cca-policy/commit/2724891523839591ba5f68f93bbeb0e14538c1a0)]
+### [0.2.48](https://github.com/eea/volto-cca-policy/compare/0.2.47...0.2.48) - 2 July 2024
+
 ### [0.2.47](https://github.com/eea/volto-cca-policy/compare/0.2.46...0.2.47) - 2 July 2024
 
 #### :hammer_and_wrench: Others
@@ -1425,13 +1431,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
@@ -1448,9 +1451,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)]
@@ -1667,7 +1667,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
 
@@ -2148,7 +2147,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.48",
+  "version": "0.2.49",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/index.js

@@ -170,11 +170,12 @@ const applyConfig = (config) => {
         isDefault: false,
         // to replace search path change path to whatever you want and match with the page in volto website
         matchpath: '/en/mission',
-        path: '/en/mission/knowledge-and-data/search-the-database',
-        placeholder: 'Search the Climate-ADAPT database',
-        description: 'Looking for more information?',
-        buttonTitle: 'Explore more on Climate-ADAPT',
-        buttonUrl: 'https://climate-adapt.eea.europa.eu/en/data-and-downloads/',
+        path: '/en/mission/advanced-search',
+        placeholder: 'Search the EU Mission on Adaptation',
+        description: 'For more search options',
+        buttonTitle: 'Go to advanced search',
+        buttonUrl:
+          'https://climate-adapt.eea.europa.eu/en/mission/advanced-search/',
       },
       {
         isDefault: false,

package/src/search/index.js

@@ -4,6 +4,7 @@ import installMissionStoriesSearch from './mission_stories/config-stories';
 import installMissionToolsSearch from './mission_tools/config-tools';
 import installMissionProjectsSearch from './mission_projects/config-projects';
 import installMissionFundingSearch from './mission_funding/config-funding';
+import installMissionAllSearch from './mission_all/config-all';
 
 const extraQueryParams = {
   text_fields: [
@@ -33,6 +34,7 @@ const applyConfig = (config) => {
     installMissionProjectsSearch,
     installMissionToolsSearch,
     installMissionFundingSearch,
+    installMissionAllSearch,
   ].reduce((acc, cur) => cur(acc), config.settings.searchlib);
 
   config.settings.searchlib.searchui.ccaSearch.extraQueryParams = extraQueryParams;
@@ -40,6 +42,7 @@ const applyConfig = (config) => {
   config.settings.searchlib.searchui.missionProjects.extraQueryParams = extraQueryParams;
   config.settings.searchlib.searchui.missionStoriesSearch.extraQueryParams = extraQueryParams;
   config.settings.searchlib.searchui.missionToolsSearch.extraQueryParams = extraQueryParams;
+  config.settings.searchlib.searchui.missionAll.extraQueryParams = extraQueryParams;
 
   // console.log(config.settings.searchlib);
 

package/src/search/mission_all/config-all.js

@@ -0,0 +1,113 @@
+import { mergeConfig } from '@eeacms/search';
+import { build_runtime_mappings } from '@eeacms/volto-globalsearch/utils';
+import { getClientProxyAddress } from '../utils';
+
+import facets from './facets-all';
+
+const missionAllConfig = {
+  title: 'Mission All',
+};
+
+export const clusters = {
+  name: 'op_cluster',
+  field: 'objectProvides',
+  clusters: [
+    // {
+    //   name: 'Type1',
+    //   icon: { name: 'bullhorn' },
+    //   values: ['Video', 'Guidance'],
+    //   defaultResultView: 'horizontalCard',
+    // },
+  ],
+};
+
+export default function installMainSearch(config) {
+  const envConfig = process.env.RAZZLE_ENV_CONFIG
+    ? JSON.parse(process.env.RAZZLE_ENV_CONFIG)
+    : missionAllConfig;
+
+  const pjson = require('@eeacms/volto-cca-policy/../package.json');
+
+  envConfig.app_name = pjson.name;
+  envConfig.app_version = pjson.version;
+
+  config.searchui.missionAll = {
+    ...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',
+      },
+    },
+    runtime_mappings: build_runtime_mappings(clusters),
+  };
+
+  const { missionAll } = config.searchui;
+
+  // missionAll.permanentFilters.push({
+  //   term: {
+  //     cca_include_in_mission: 'true',
+  //   },
+  // });
+  missionAll.permanentFilters.push({
+    bool: {
+      should: [
+        {
+          terms: {
+            objectProvides: [
+              'Mission tool',
+              'Mission story',
+              'Funding oportunity',
+            ],
+          },
+        },
+        {
+          term: {
+            cca_include_in_mission: 'true',
+          },
+        },
+        {
+          term: {
+            id: 'https://climate-adapt.eea.europa.eu/en/mission/*',
+          },
+        },
+      ],
+      minimum_should_match: 1,
+    },
+  });
+
+  // missionAll.permanentFilters.push({
+  //   terms: {
+  //     objectProvides: [
+  //       'Funding oportunity',
+  //       'Mission tool',
+  //       'Mission story',
+  //       'News',
+  //       'Events',
+  //       'Webpage',
+  //       // '',
+  //       'Adaptation option',
+  //       'Case study',
+  //       'Guidance',
+  //       'Video',
+  //       'Indicator',
+  //       'Information portal',
+  //       'Organisation',
+  //       'Publication reference',
+  //       'Research and knowledge project',
+  //       'Tool',
+  //     ],
+  //   },
+  // });
+
+  missionAll.facets = facets;
+
+  if (typeof window !== 'undefined') {
+    config.searchui.missionAll.host =
+      process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress();
+  }
+
+  return config;
+}

package/src/search/mission_all/facets-all.js

@@ -0,0 +1,37 @@
+import { multiTermFacet } from '@eeacms/search';
+import {
+  include_archived,
+  objectProvides,
+  language,
+  issued_date,
+  geographic_countries,
+  cca_climate_impacts,
+  cca_adaptation_sectors,
+} from '../common';
+
+const facets = [
+  multiTermFacet({
+    field: 'cca_funding_programme.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Funding Programme',
+    iconsFamily: 'Funding Programme',
+    alwaysVisible: false,
+  }),
+  cca_climate_impacts,
+  cca_adaptation_sectors,
+  multiTermFacet({
+    field: 'cca_adaptation_elements.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Adaptation Elements',
+    alwaysVisible: false,
+  }),
+  geographic_countries,
+  include_archived,
+  issued_date,
+  language,
+  objectProvides,
+];
+
+export default facets;