Merge pull request #14 from eea/develop

Release
eea · May 31, 2024 · 6c5f7b6 · 6c5f7b6
2 parents 6f75259 + d399dba
commit 6c5f7b6
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 5 deletions.
diff --git a/CHANGELOG.md b/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).
 
-### [1.1.12](https://github.com/eea/volto-marine-policy/compare/1.1.11...1.1.12) - 30 May 2024
+### [1.1.13](https://github.com/eea/volto-marine-policy/compare/1.1.12...1.1.13) - 31 May 2024
+
+#### :rocket: New Features
+
+- feat: updated fatets in Indicators table [laszlocseh - [`339d2af`](https://github.com/eea/volto-marine-policy/commit/339d2afba1fc8116316a4d7975703ba352dfb1d2)]
 
 #### :bug: Bug Fixes
 
-- fix: updated wm_dpsir_type field name [laszlocseh - [`80afa40`](https://github.com/eea/volto-marine-policy/commit/80afa401683223ab60c44a0ddd4f458c9b089ef8)]
+- fix: do not break tabs due to tokenWidget [nileshgulia1 - [`c7a16ae`](https://github.com/eea/volto-marine-policy/commit/c7a16aedb492fbbf45cbc1166189629d1b69eab4)]
+
+### [1.1.12](https://github.com/eea/volto-marine-policy/compare/1.1.11...1.1.12) - 30 May 2024
 
 ### [1.1.11](https://github.com/eea/volto-marine-policy/compare/1.1.10...1.1.11) - 30 May 2024
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-marine-policy",
-  "version": "1.1.12",
+  "version": "1.1.13",
   "description": "@eeacms/volto-marine-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/components/Result/IndicatorsTableRowItem.jsx b/src/components/Result/IndicatorsTableRowItem.jsx
@@ -25,6 +25,8 @@ const WrappedRowItem = (props) => {
         <Table.Cell key={index}>
           {col.title === 'Name of indicator' ? (
             <a href={result['data_provenances'].raw.link}>{result['title']}</a>
+          ) : col.title === 'Last updated' ? (
+            result[col.field]?.raw.substring(0, 4)
           ) : (
             normalizeStr(
               Array.isArray(result[col.field]?.raw)

diff --git a/src/index.js b/src/index.js
@@ -113,8 +113,8 @@ const applyConfig = (config) => {
   config.widgets.widget.text_align = TextAlignWidget;
   // check if it breaks the 'theme' field in volto-tabs-block in the 'horizontal carousel' layout
   // We have a 'theme' field in the wise catalogue metadata (CatalogueMetadata)
-  config.widgets.id.theme = TokenWidget;
   config.widgets.id.indicator_theme = TokenWidget;
+  // config.widgets.id.theme = TokenWidget;
 
   config.blocks.groupBlocksOrder = [
     ...config.blocks.groupBlocksOrder,

diff --git a/src/search/config.js b/src/search/config.js
@@ -70,6 +70,20 @@ export default function install(config) {
     runtime_mappings: build_runtime_mappings(clusters),
   };
 
+  config.searchui.marinemeasure.sortOptions = [
+    ...config.searchui.marinemeasure.sortOptions,
+    {
+      name: 'Source (A-Z)',
+      value: 'data_provenances_organisations.keyword',
+      direction: 'asc',
+    },
+    {
+      name: 'Source (Z-A)',
+      value: 'data_provenances_organisations.keyword',
+      direction: 'desc',
+    },
+  ];
+
   config.searchui.marinemeasure.facets = envConfig.facets;
 
   config.searchui.marinemeasure.contentSectionsParams = {

diff --git a/src/search/facets.js b/src/search/facets.js
@@ -1,9 +1,14 @@
 import { histogramFacet, makeRange, multiTermFacet } from '@eeacms/search';
 import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
 
+const sources = ['EEA', 'HELCOM', 'OSPAR', 'UNEP/MAP'];
+
 const facets = [
   ...globalSearchBaseConfig.facets.filter(
-    (facet) => facet.field !== 'time_coverage',
+    (facet) =>
+      !['time_coverage', 'data_provenances_organisations.keyword'].includes(
+        facet.field,
+      ),
   ),
   multiTermFacet({
     field: 'wm_spm_sector.keyword',
@@ -61,6 +66,17 @@ const facets = [
     iconsFamily: 'WISE topics',
     alwaysVisible: false,
   }),
+  multiTermFacet({
+    field: 'data_provenances_organisations.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Source',
+    iconsFamily: 'Sources topics',
+    alwaysVisible: false,
+    sortOn: 'custom',
+    sortOrder: 'ascending',
+    facetValues: sources,
+  }),
   multiTermFacet({
     field: 'legislative_reference.keyword',
     isFilterable: false,

diff --git a/src/search/views.js b/src/search/views.js
@@ -48,6 +48,10 @@ export default {
         title: 'Sub-theme',
         field: 'wm_theme',
       },
+      {
+        title: 'Last updated',
+        field: 'indicator_last_update',
+      },
     ],
   },
 };