Merge pull request #21 from eea/develop

Patch
eea · Oct 6, 2021 · 2f597a3 · 2f597a3
2 parents 32d342e + 1265a41
commit 2f597a3
Show file tree

Hide file tree

Showing 8 changed files with 677 additions and 385 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/docker-image.txt b/docker-image.txt
@@ -1 +1 @@
-eeacms/eprtr-frontend
+eeacms/eprtr-frontend:2.2.0
diff --git a/locales/de.json b/locales/de.json
diff --git a/locales/en.json b/locales/en.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@eeacms/eprtr_frontend",
   "description": "Volto-based frontend server and SPA for the Industrial Emissions Portal website (former EPRTR) industry.eea.europa.eu",
   "license": "MIT",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
   "homepage": "https://github.com/eea/eprtr_frontend",
@@ -46,23 +46,23 @@
     "@eeacms/volto-tableau"
   ],
   "dependencies": {
-    "@eeacms/volto-eea-kitkat": "2.0.2",
-    "@material/react-linear-progress": "^0.15.0",
-    "@eeacms/volto-embed": "2.0.3",
-    "@eeacms/volto-datablocks": "2.0.12",
+    "@eeacms/volto-datablocks": "2.0.13",
+    "@eeacms/volto-eea-kitkat": "4.0.1",
+    "@eeacms/volto-embed": "2.0.4",
+    "@eeacms/volto-grid-block": "github:eea/volto-grid-block#centurion",
     "@eeacms/volto-openlayers-map": "0.1.2",
     "@eeacms/volto-tableau": "1.2.3",
-    "@eeacms/volto-grid-block": "github:eea/volto-grid-block#centurion",
+    "@material/react-linear-progress": "^0.15.0",
     "@plone/volto": "13.15.1",
-    "volto-addons": "github:eea/volto-addons#master",
     "axios": "^0.21.1",
     "jsonp": "^0.2.1",
     "performant-array-to-tree": "^1.7.1",
     "react-highlight-words": "^0.16.0",
     "react-iframe": "^1.8.0",
     "react-tooltip": "^4.2.9",
     "react-visibility-sensor": "^5.1.1",
-    "tableau-api-js": "github:eea/tableau-api-js#1.1.0"
+    "tableau-api-js": "github:eea/tableau-api-js#1.1.0",
+    "volto-addons": "github:eea/volto-addons#master"
   },
   "devDependencies": {
     "eslint-plugin-prettier": "3.1.3",

diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
@@ -521,7 +521,14 @@ const OpenlayersMapView = (props) => {
         },
         // Facility type
         facilityTypes: {
-          sql: `(facilityTypes LIKE ':options')`,
+          sql: (options) => {
+            const isEprtr = options.indexOf('EPRTR') !== -1;
+            const isNonEprtr = options.indexOf('NONEPRTR') !== -1;
+            if (isEprtr && isNonEprtr) return null;
+            if (isEprtr)
+              return `((facilityTypes LIKE 'EPRTR%') OR (facilityTypes LIKE '% EPRTR'))`;
+            return `((facilityTypes LIKE 'NONEPRTR%') OR (facilityTypes LIKE '% NONEPRTR'))`;
+          },
           type: 'multiple',
         },
         // Plant type
@@ -565,7 +572,9 @@ const OpenlayersMapView = (props) => {
       if (where.type === 'multiple') {
         options = isArray(options) ? options?.filter((option) => option) : [];
         const conditions = [];
-        if (options?.length) {
+        if (typeof where.sql === 'function' && options?.length) {
+          where.sql = where.sql(props.query[id]);
+        } else if (options?.length) {
           options.forEach((option) => {
             let baseSql = where.sql;
             option && conditions.push(baseSql.replace(/:options/g, option));

diff --git a/src/components/manage/Blocks/FiltersBlock/View.jsx b/src/components/manage/Blocks/FiltersBlock/View.jsx
@@ -2,7 +2,14 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import { Header, Modal, Select, Input, List } from 'semantic-ui-react';
+import {
+  Header,
+  Modal,
+  Select,
+  Input,
+  List,
+  Checkbox,
+} from 'semantic-ui-react';
 import { Portal } from 'react-portal';
 import _uniqueId from 'lodash/uniqueId';
 import axios from 'axios';
@@ -48,7 +55,6 @@ const View = ({ content, ...props }) => {
       'pollutant_groups',
       'pollutants',
       'reporting_years',
-      'facility_types',
       'plant_types',
       'bat_conclusions',
       'permit_types',
@@ -452,42 +458,6 @@ const View = ({ content, ...props }) => {
                 delete filtersMeta[key];
               }
             });
-            filtersMeta['facility_types'] = {
-              filteringInputs: [
-                {
-                  id: _uniqueId('select_'),
-                  type: 'select',
-                  position: 0,
-                },
-              ],
-              placeholder: 'Select facility type',
-              queryToSet: 'facilityTypes',
-              title: 'Facility type',
-              static: true,
-              options: [
-                { key: null, value: null, text: 'No value' },
-                {
-                  key: 'EPRTR',
-                  value: 'EPRTR',
-                  text: 'EPRTR',
-                },
-                {
-                  key: 'NONEPRTR',
-                  value: 'NONEPRTR',
-                  text: 'NONEPRTR',
-                },
-                {
-                  key: 'EPRTR, NONEPRTR',
-                  value: 'EPRTR, NONEPRTR',
-                  text: 'EPRTR, NONEPRTR',
-                },
-                {
-                  key: 'NONEPRTR, EPRTR',
-                  value: 'NONEPRTR, EPRTR',
-                  text: 'NONEPRTR, EPRTR',
-                },
-              ],
-            };
             response.forEach((res, index) => {
               const results = JSON.parse(res.request.response).results;
               let filteringInputs = [];
@@ -1224,6 +1194,34 @@ const View = ({ content, ...props }) => {
     </div>
   );
 
+  const setCheckboxValue = (_, data) => {
+    let values = props.discodata_query.search[data.name] || [];
+    const checked = data.checked;
+    const index = values.indexOf(data.label);
+    if (checked && index === -1) {
+      values.push(data.label);
+    }
+    if (!checked && index !== -1) {
+      values.splice(index, 1);
+    }
+    props.setQueryParam({
+      queryParam: {
+        [data.name]: values,
+        locationTerm: null,
+        siteTerm: null,
+        advancedFiltering: true,
+        filtersCounter: props.discodata_query.search['filtersCounter']
+          ? props.discodata_query.search['filtersCounter'] + 1
+          : 1,
+      },
+    });
+    setSearchTerm('');
+  };
+
+  const isChecked = (name, label) => {
+    return (props.discodata_query.search[name] || []).indexOf(label) !== -1;
+  };
+
   if (!__CLIENT__) return '';
   return (
     <div className="filters-container">
@@ -1566,6 +1564,25 @@ const View = ({ content, ...props }) => {
                         />
                       </form>
                     </div>
+
+                    <Header as="h3">Facility type</Header>
+                    <div className="input-container">
+                      <form autoComplete="facilityTypes">
+                        <Checkbox
+                          name="facilityTypes"
+                          label="EPRTR"
+                          style={{ marginRight: '1rem' }}
+                          checked={isChecked('facilityTypes', 'EPRTR')}
+                          onChange={setCheckboxValue}
+                        />
+                        <Checkbox
+                          name="facilityTypes"
+                          label="NONEPRTR"
+                          checked={isChecked('facilityTypes', 'NONEPRTR')}
+                          onChange={setCheckboxValue}
+                        />
+                      </form>
+                    </div>
                   </div>
                   <div className="dynamic-filter-actions">
                     <button