@eeacms/volto-cca-policy 0.2.100 → 0.3.0

package/CHANGELOG.md

@@ -4,6 +4,19 @@ 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.3.0](https://github.com/eea/volto-cca-policy/compare/0.2.100...0.3.0) - 5 February 2025
+
+#### :bug: Bug Fixes
+
+- fix: test [kreafox - [`478fb27`](https://github.com/eea/volto-cca-policy/commit/478fb2701bee49dd191ba1c4542ce9c9faed9958)]
+- fix(UniversalLink): fix issue with @@download in url - refs #273406 [kreafox - [`544d91c`](https://github.com/eea/volto-cca-policy/commit/544d91cfcccf12a7eb6cc04ddf10313c2883ece7)]
+
+#### :hammer_and_wrench: Others
+
+- Bump version to 0.3.0 [kreafox - [`7380a83`](https://github.com/eea/volto-cca-policy/commit/7380a8312271bdda07dc7a2494c21ecddffa514a)]
+- Remove console log [Tiberiu Ichim - [`23e5f6e`](https://github.com/eea/volto-cca-policy/commit/23e5f6e395021504b4a955564eb46425933cf4e5)]
+- Make language default a function [Tiberiu Ichim - [`a96766e`](https://github.com/eea/volto-cca-policy/commit/a96766ec8b020f485a184ca77fb1aa3a91800afa)]
+- Add missing code [Tiberiu Ichim - [`b9d2b8d`](https://github.com/eea/volto-cca-policy/commit/b9d2b8ddfda6169ba748d9eed21bba685585e8ab)]
 ### [0.2.100](https://github.com/eea/volto-cca-policy/compare/0.2.99...0.2.100) - 4 February 2025
 
 #### :bug: Bug Fixes

package/package.json

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

package/src/customizations/volto/components/manage/UniversalLink/UniversalLink.jsx

@@ -58,10 +58,10 @@ const UniversalLink = ({
 
       //case: item of type 'File'
       if (
-        !token &&
+        download &&
         config.settings.downloadableObjects.includes(item['@type'])
       ) {
-        url = `${url}/@@download/file`;
+        url = url.includes('/@@download/file') ? url : `${url}/@@download/file`;
       }
 
       if (
@@ -73,15 +73,21 @@ const UniversalLink = ({
     }
   }
 
+  if (download && isInternalURL(url)) {
+    url = url.includes('/@@download/file') ? url : `${url}/@@download/file`;
+  }
+
   const isExternal = !isInternalURL(url);
+  const isDownload =
+    (!isExternal && url && url.includes('@@download')) || download;
 
-  const isDownload = (!isExternal && url.includes('@@download')) || download;
   const isDisplayFile =
     (!isExternal && url.includes('@@display-file')) || false;
-
   const checkedURL = URLUtils.checkAndNormalizeUrl(url);
 
-  url = checkedURL.url;
+  // we can receive an item with a linkWithHash property set from ObjectBrowserWidget
+  // if so, we use that instead of the url prop
+  url = (item && item['linkWithHash']) || checkedURL.url;
   let tag = (
     <Link
       to={flattenToAppURL(url)}
@@ -95,16 +101,18 @@ const UniversalLink = ({
     </Link>
   );
 
-  const isBlank =
-    (isExternal || openLinkInNewTab) &&
-    (!checkedURL.isMail || !checkedURL.isTelephone);
-
   if (isExternal) {
     tag = (
       <a
         href={url}
         title={title}
-        target={isBlank ? '_blank' : null}
+        target={
+          !checkedURL.isMail &&
+          !checkedURL.isTelephone &&
+          !(openLinkInNewTab === false)
+            ? '_blank'
+            : null
+        }
         rel="noopener"
         className={className}
         {...props}
@@ -129,6 +137,7 @@ const UniversalLink = ({
       <a
         href={flattenToAppURL(url)}
         title={title}
+        target={!(openLinkInNewTab === false) ? '_blank' : null}
         rel="noopener"
         className={className}
         {...props}

package/src/customizations/volto/components/manage/UniversalLink/UniversalLink.test.jsx

@@ -120,9 +120,9 @@ describe('UniversalLink', () => {
       </Provider>,
     );
 
-    expect(getByTitle('Volto GitHub repository').getAttribute('target')).toBe(
-      '_blank',
-    );
+    expect(
+      getByTitle('Volto GitHub repository').getAttribute('target'),
+    ).toBeNull();
   });
 
   it('check UniversalLink renders ext link for blacklisted urls', () => {

package/src/search/{config.js → cca/config.js}

@@ -1,6 +1,6 @@
 import { mergeConfig } from '@eeacms/search';
-import { getClientProxyAddress } from './utils';
-import vocabs from './vocabulary';
+import { getClientProxyAddress } from '../utils';
+import vocabs from '../vocabulary';
 
 import facets from './facets';
 import views from './views';
@@ -115,6 +115,19 @@ export default function installMainSearch(config) {
     },
   });
 
+  // ccaSearch.permanentFilters.push((filters) => {
+  //   const hasLanguageFilter = filters.find(({ field }) => field === 'language');
+  //   console.log('permanentFilters', hasLanguageFilter, filters);
+  //   if (!hasLanguageFilter) {
+  //     return {
+  //       terms: {
+  //         language: ['en'],
+  //       },
+  //     };
+  //   }
+  //   return null;
+  // });
+
   // ccaSearch.permanentFilters.push({
   //   terms: {
   //     objectProvides: [

package/src/search/{facets.js → cca/facets.js}

@@ -3,7 +3,7 @@ import {
   language,
   issued_date,
   geographic_countries,
-} from './common';
+} from '../common';
 
 const adaptation_sectors = {
   field: 'cca_adaptation_sectors.keyword',

package/src/search/common.js

@@ -136,9 +136,13 @@ export const language = {
   isFilterable: false,
   show: 10000,
   isMulti: true,
-  default: {
-    values: ['en'],
-    type: 'any',
+  default: (options) => {
+    const { language } = options || {};
+    // console.log('options', options);
+    return {
+      values: [language || 'en'],
+      type: 'any',
+    };
   },
   facetValues: [
     'de',

package/src/search/index.js

@@ -1,4 +1,4 @@
-import installMainSearch from './config';
+import installMainSearch from './cca/config';
 import installHealthSearch from './health_observatory/config-health';
 import installMissionStoriesSearch from './mission_stories/config-stories';
 import installMissionToolsSearch from './mission_tools/config-tools';
@@ -37,12 +37,13 @@ const applyConfig = (config) => {
     installMissionAllSearch,
   ].reduce((acc, cur) => cur(acc), 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;
-  config.settings.searchlib.searchui.missionAll.extraQueryParams = extraQueryParams;
+  const searchui = config.settings.searchlib.searchui;
+  searchui.ccaSearch.extraQueryParams = extraQueryParams;
+  searchui.ccaHealthSearch.extraQueryParams = extraQueryParams;
+  searchui.missionProjects.extraQueryParams = extraQueryParams;
+  searchui.missionStoriesSearch.extraQueryParams = extraQueryParams;
+  searchui.missionToolsSearch.extraQueryParams = extraQueryParams;
+  searchui.missionAll.extraQueryParams = extraQueryParams;
 
   // console.log(config.settings.searchlib);