@eeacms/volto-marine-policy 1.1.9 → 1.1.10

package/CHANGELOG.md

@@ -4,7 +4,21 @@ 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.9](https://github.com/eea/volto-marine-policy/compare/1.1.8...1.1.9) - 17 May 2024
+### [1.1.10](https://github.com/eea/volto-marine-policy/compare/1.1.9...1.1.10) - 29 May 2024
+
+#### :rocket: New Features
+
+- feat: added indicators table view for marinemeasure search app [laszlocseh - [`491d177`](https://github.com/eea/volto-marine-policy/commit/491d1770294ed37ec450bef87c7216f5fa87d402)]
+
+#### :house: Internal changes
+
+- chore: remove Indicator content type view [laszlocseh - [`31d197d`](https://github.com/eea/volto-marine-policy/commit/31d197d68a345d450b07f14df982e9513d5f1430)]
+
+#### :hammer_and_wrench: Others
+
+- fix eslint error [laszlocseh - [`58a907c`](https://github.com/eea/volto-marine-policy/commit/58a907ca73546e01de3b51a61f9d454ca112001a)]
+- use tokenWidget for theme field in wise metadata [nileshgulia1 - [`ab49b98`](https://github.com/eea/volto-marine-policy/commit/ab49b98dc9a490a3a00941d6f68fbb1e29114bf4)]
+### [1.1.9](https://github.com/eea/volto-marine-policy/compare/1.1.8...1.1.9) - 20 May 2024
 
 #### :bug: Bug Fixes
 

package/package.json

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

package/src/components/Result/IndicatorsTableRowItem.jsx

@@ -0,0 +1,43 @@
+import React from 'react';
+import { useAppConfig } from '@eeacms/search/lib/hocs';
+import { Table } from 'semantic-ui-react';
+// import { ResultHeader } from '@eeacms/search/components/Result/ResultModal';
+
+const normalizeStr = (str) => {
+  if (typeof str === 'number') {
+    str = str.toLocaleString();
+  }
+
+  let tmp = document.createElement('DIV');
+  tmp.innerHTML = str;
+  str = tmp.textContent || tmp.innerText || '';
+  return str;
+};
+
+const WrappedRowItem = (props) => {
+  const { appConfig } = useAppConfig();
+  const { indicatorsTableViewParams } = appConfig;
+  const { result } = props;
+
+  return (
+    <Table.Row>
+      {indicatorsTableViewParams.columns.map((col, index) => (
+        <Table.Cell key={index}>
+          {col.title === 'Name of indicator' ? (
+            <a href={result['data_provenances'].raw.link}>{result['title']}</a>
+          ) : (
+            normalizeStr(
+              Array.isArray(result[col.field]?.raw)
+                ? result[col.field]?.raw.sort().join(', ')
+                : result[col.field]?.raw || '',
+            )
+          )}
+        </Table.Cell>
+      ))}
+    </Table.Row>
+  );
+};
+
+const IndicatorsTableRowItem = (props) => <WrappedRowItem {...props} />;
+
+export default IndicatorsTableRowItem;

package/src/components/Result/IndicatorsTableView.jsx

@@ -0,0 +1,26 @@
+import React from 'react';
+import { Table } from 'semantic-ui-react';
+import { useAppConfig } from '@eeacms/search/lib/hocs';
+
+const WrappedTable = (props) => {
+  const { appConfig } = useAppConfig();
+  const { indicatorsTableViewParams } = appConfig;
+
+  return (
+    <Table celled compact>
+      <Table.Header>
+        <Table.Row>
+          {indicatorsTableViewParams.columns.map((col, index) => (
+            <Table.HeaderCell key={index}>
+              {col.title || col.field}
+            </Table.HeaderCell>
+          ))}
+        </Table.Row>
+      </Table.Header>
+      <Table.Body>{props.children}</Table.Body>
+    </Table>
+  );
+};
+
+const IndicatorsTableView = (props) => <WrappedTable {...props} />;
+export default IndicatorsTableView;

package/src/index.js

@@ -19,7 +19,7 @@ import './slate-styles.less';
 
 import installSearchEngine from './search';
 
-// import TokenWidget from '@plone/volto/components/manage/Widgets/TokenWidget';
+import TokenWidget from '@plone/volto/components/manage/Widgets/TokenWidget';
 import linkSVG from '@plone/volto/icons/link.svg';
 import { makeInlineElementPlugin } from '@plone/volto-slate/elementEditor';
 import { LINK } from '@plone/volto-slate/constants';
@@ -99,7 +99,7 @@ const applyConfig = (config) => {
     dataset: DatabaseItemView,
     database: DatabaseItemView,
     publication_report: DatabaseItemView,
-    indicator: DatabaseItemView,
+    // indicator: DatabaseItemView,
     briefing: DatabaseItemView,
     // map_interactive: DatabaseItemView,
   };
@@ -111,9 +111,10 @@ const applyConfig = (config) => {
   };
 
   config.widgets.widget.text_align = TextAlignWidget;
-  // Disabled TokenWidget for 'theme', it breaks the 'theme' field in volto-tabs-block in the 'horizontal carousel' layout
+  // 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.theme = TokenWidget;
+  config.widgets.id.indicator_theme = TokenWidget;
 
   config.blocks.groupBlocksOrder = [
     ...config.blocks.groupBlocksOrder,

package/src/search/index.js

@@ -1,5 +1,7 @@
 import installMainSearch from './config';
 import MarineMeasureItem from '../components/Result/MarineMeasureItem';
+import IndicatorsTableView from '../components/Result/IndicatorsTableView';
+import IndicatorsTableRowItem from '../components/Result/IndicatorsTableRowItem';
 
 const applyConfig = (config) => {
   config.settings.searchlib = installMainSearch(config.settings.searchlib);
@@ -8,6 +10,13 @@ const applyConfig = (config) => {
 
   resolve.MarineMeasureItem = { component: MarineMeasureItem };
 
+  resolve.IndicatorsTableView = {
+    component: IndicatorsTableView,
+  };
+  resolve.IndicatorsTableRowItem = {
+    component: IndicatorsTableRowItem,
+  };
+
   // fix the query
   const marineMeasureConfig = config.settings.searchlib.searchui.marinemeasure;
   const index = marineMeasureConfig.permanentFilters.findIndex(

package/src/search/views.js

@@ -11,5 +11,43 @@ export default {
         item: 'MarineMeasureItem',
       },
     },
+    {
+      id: 'indicatorTable',
+      title: 'Indicators table',
+      icon: 'table',
+      render: null,
+      isDefault: false,
+      factories: {
+        view: 'IndicatorsTableView',
+        item: 'IndicatorsTableRowItem',
+      },
+    },
   ],
+  indicatorsTableViewParams: {
+    titleField: 'title',
+    urlField: 'about',
+    enabled: false,
+    columns: [
+      {
+        title: 'Source',
+        field: 'data_provenances_organisations',
+      },
+      {
+        title: 'Name of indicator',
+        field: 'label',
+      },
+      {
+        title: 'Type',
+        field: 'dpsir_type',
+      },
+      {
+        title: 'Theme',
+        field: 'indicator_theme',
+      },
+      {
+        title: 'Sub-theme',
+        field: 'wm_theme',
+      },
+    ],
+  },
 };