[Bug #134969] Use correct columns for methods_of_release

jsconfig.json

@@ -16,6 +16,12 @@
             "@eeacms/volto-columns-block": [
                 "addons/volto-columns-block/src"
             ],
+            "@eeacms/volto-datablocks": [
+                "addons/volto-datablocks/src"
+            ],
+            "@eeacms/volto-embed": [
+                "addons/volto-embed/src"
+            ],
             "@eeacms/volto-grid-block": [
                 "addons/volto-grid-block/src"
             ],

mrs.developer.json

@@ -21,14 +21,16 @@
   },
   "volto-datablocks": {
     "url": "https://github.com/eea/volto-datablocks.git",
-    "branch": "master",
+    "branch": "develop",
     "path": "src",
+    "package": "@eeacms/volto-datablocks",
     "develop": true
   },
   "volto-embed": {
     "url": "https://github.com/eea/volto-embed.git",
-    "branch": "master",
+    "branch": "develop",
     "path": "src",
+    "package": "@eeacms/volto-embed",
     "develop": true
   },
   "volto-grid-block": {
@@ -42,14 +44,14 @@
     "url": "https://github.com/eea/volto-tableau.git",
     "path": "src",
     "package": "@eeacms/volto-tableau",
-    "branch": "master",
+    "branch": "develop",
     "develop": true
   },
   "volto-tabs-block": {
     "url": "https://github.com/eea/volto-tabs-block.git",
     "path": "src",
     "package": "@eeacms/volto-tabs-block",
-    "branch": "master",
+    "branch": "develop",
     "develop": true
   },
   "volto-openlayers-map": {

package.json

@@ -37,13 +37,12 @@
     "@eeacms/volto-widgets-view",
     "@eeacms/volto-widget-toggle",
     "@eeacms/volto-object-widget",
-    "@eeacms/volto-metadata-block",
     "@eeacms/volto-sentry-rancher-config",
     "@eeacms/volto-matomo",
     "@eeacms/volto-grid-block",
     "@eeacms/volto-columns-block",
-    "volto-datablocks",
-    "volto-embed",
+    "@eeacms/volto-datablocks",
+    "@eeacms/volto-embed",
     "volto-addons",
     "@eeacms/volto-openlayers-map",
     "@eeacms/volto-tableau",
@@ -52,7 +51,6 @@
   ],
   "dependencies": {
     "@eeacms/volto-matomo": "2.0.1",
-    "@eeacms/volto-metadata-block": "3.0.1",
     "@eeacms/volto-object-widget": "2.2.3",
     "@eeacms/volto-sentry-rancher-config": "2.1.2",
     "@eeacms/volto-slate-metadata-mentions": "2.2.2",

src/components/manage/Blocks/DetailedLink/View.jsx

@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import config from '@plone/volto/registry';
 import cx from 'classnames';
 import './style.css';
-import { deleteQueryParam } from 'volto-datablocks/actions';
+import { deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 
 const getPath = (url) => {
   if (!url) return '';

src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx

@@ -4,8 +4,8 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray } from 'lodash';
 import { Dropdown, Header } from 'semantic-ui-react';
-import { setQueryParam } from 'volto-datablocks/actions';
-import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import { DiscodataSqlBuilderView } from '@eeacms/volto-datablocks/components';
 import ReactTooltip from 'react-tooltip';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import moment from 'moment';

src/components/manage/Blocks/DiscodataComponents/List/View.jsx

@@ -4,7 +4,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray, isDate } from 'lodash';
 import { Link } from 'react-router-dom';
-import { setQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import moment from 'moment';
 import cx from 'classnames';

src/components/manage/Blocks/DiscodataComponents/Select/View.jsx

@@ -4,7 +4,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray } from 'lodash';
 import { Dropdown } from 'semantic-ui-react';
-import { setQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
 
 import cx from 'classnames';
 

src/components/manage/Blocks/DiscodataComponentsBlock/Edit.jsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import qs from 'query-string';
 import View from './View';
-import { DiscodataSqlBuilderEdit } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderEdit } from '@eeacms/volto-datablocks/components';
 
 const makeChoices = (keys) => keys && keys.map((k) => [k, k]);
 

src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx

@@ -8,8 +8,8 @@ import { arrayToTree } from 'performant-array-to-tree';
 import qs from 'query-string';
 import { Table, Dropdown, List, Header } from 'semantic-ui-react';
 import './style.css';
-import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { DiscodataSqlBuilderView } from '@eeacms/volto-datablocks/components';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import cx from 'classnames';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';

src/components/manage/Blocks/DiscodataOpenlayersMapBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import config from '@plone/volto/registry';
 

src/components/manage/Blocks/DiscodataOpenlayersMapBlock/PrivacyProtection.jsx

@@ -8,7 +8,7 @@ import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';
 import config from '@plone/volto/registry';
 
-import 'volto-embed/css/embed-styles.css';
+import '@eeacms/volto-embed/css/embed-styles.css';
 
 const key = (domain_key) => `accept-${domain_key}`;
 

src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx

@@ -17,7 +17,7 @@ import { getEncodedQueryString } from '~/utils';
 import { Icon as VoltoIcon, Toast } from '@plone/volto/components';
 import PrivacyProtection from './PrivacyProtection';
 // VOLTO-DATABLOCKS
-import { setQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
 // SEMANTIC REACT UI
 import { Grid, Header, Progress } from 'semantic-ui-react';
 // SVGs

src/components/manage/Blocks/DiscodataTableBlock/Edit.jsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { injectIntl } from 'react-intl';
 import View from './View';
-import { DiscodataSqlBuilderEdit } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderEdit } from '@eeacms/volto-datablocks/components';
 
 const schema = {
   itemsCountKey: {

src/components/manage/Blocks/DiscodataTableBlock/View.jsx

@@ -8,8 +8,8 @@ import { Table, Pagination } from 'semantic-ui-react';
 import downSVG from '@plone/volto/icons/down-key.svg';
 import upSVG from '@plone/volto/icons/up-key.svg';
 import { Icon } from '@plone/volto/components';
-import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
-import { setQueryParam } from 'volto-datablocks/actions';
+import { DiscodataSqlBuilderView } from '@eeacms/volto-datablocks/components';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
 import { Dimmer, Loader } from 'semantic-ui-react';
 import LinearProgress from '@material/react-linear-progress';
 

src/components/manage/Blocks/ExploreEprtr/Edit.jsx

@@ -3,7 +3,7 @@ import { SidebarPortal } from '@plone/volto/components';
 import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 import ExploreEprtrView from './View';
 import schema from './schema';
-import { connectBlockToProviderData } from 'volto-datablocks/hocs';
+import { connectBlockToProviderData } from '@eeacms/volto-datablocks/hocs';
 
 const Edit = (props) => {
   const { data = {}, block = null, selected = false, onChangeBlock } = props;

src/components/manage/Blocks/FiltersBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 
 const getSchema = (props) => {

src/components/manage/Blocks/FiltersBlock/View.jsx

@@ -8,8 +8,8 @@ import _uniqueId from 'lodash/uniqueId';
 import axios from 'axios';
 import Highlighter from 'react-highlight-words';
 import { Icon } from '@plone/volto/components';
-import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { DiscodataSqlBuilderView } from '@eeacms/volto-datablocks/components';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import config from '@plone/volto/registry';
 import { getEncodedQueryString } from '~/utils';
 

src/components/manage/Blocks/GlossarySearchBlock/View.jsx

@@ -13,7 +13,7 @@ import config from '@plone/volto/registry';
 import { quickResetSearchContent, quickSearchContent } from '~/actions';
 import Highlighter from 'react-highlight-words';
 import cx from 'classnames';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import './style.css';
 
 const messages = defineMessages({

src/components/manage/Blocks/Iframe/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import config from '@plone/volto/registry';
 import './style.css';

src/components/manage/Blocks/LinkButton/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import config from '@plone/volto/registry';
 

src/components/manage/Blocks/NavigationBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import config from '@plone/volto/registry';
 

src/components/manage/Blocks/NavigationBlock/View.jsx

@@ -8,7 +8,7 @@ import { Menu } from 'semantic-ui-react';
 /* HELPERS */
 import cx from 'classnames';
 import { isActive, getNavigationByParent, getBasePath } from '~/helpers';
-import { deleteQueryParam, setQueryParam } from 'volto-datablocks/actions';
+import { deleteQueryParam, setQueryParam } from '@eeacms/volto-datablocks/actions';
 import qs from 'querystring';
 
 const View = ({ content, ...props }) => {

src/components/manage/Blocks/PollutantIndex/View.jsx

@@ -2,8 +2,11 @@ import React, { useState, useEffect, useRef } from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { Tab, Dropdown, Table } from 'semantic-ui-react';
-import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { DiscodataSqlBuilderView } from '@eeacms/volto-datablocks/components';
+import {
+  setQueryParam,
+  deleteQueryParam,
+} from '@eeacms/volto-datablocks/actions';
 import cx from 'classnames';
 import './style.css';
 
@@ -12,10 +15,10 @@ const panes = [
     menuItem: 'General information',
     render: (props) => {
       const { pollutant = {} } = props.data;
-      const classification = pollutant.classification
-        ?.split('|')
-        .map((category) => category.replace(/['"]+/g, ''))
-        .join(', ');
+      // const classification = pollutant.classification
+      //   ?.split('|')
+      //   .map((category) => category.replace(/['"]+/g, ''))
+      //   .join(', ');
       const molecular_formula_sub = pollutant.molecular_formula_sub
         ?.split('|')
         .map((sub) => sub.replace(/['"]+/g, ''));
@@ -43,10 +46,7 @@ const panes = [
                   .replace('\n', `<sub>${health_affects_sub[index]}</sub>`)
               : item.replace(/['"]+/g, ''),
           ) || [];
-      const main_methods_of_release =
-        pollutant.health_affects
-          ?.split('|')
-          ?.map((item) => item.replace(/['"]+/g, '')) || [];
+      const main_methods_of_release = pollutant.main_methods_of_release;
       if (!props.data.pollutant) return '';
       return (
         <Tab.Pane>
@@ -91,17 +91,14 @@ const panes = [
           ) : (
             ''
           )}
-          {main_methods_of_release?.length > 0 ? (
+          {main_methods_of_release ? (
             <div className="mb-1">
               <h3>Where do the releases originate?</h3>
-              {main_methods_of_release.map((item, index) => (
-                <p
-                  key={`main_methods_of_release_${index}`}
-                  dangerouslySetInnerHTML={{
-                    __html: item,
-                  }}
-                />
-              ))}
+              <p
+                dangerouslySetInnerHTML={{
+                  __html: main_methods_of_release,
+                }}
+              />
             </div>
           ) : (
             ''
@@ -292,6 +289,7 @@ const View = (props) => {
         },
       });
     }
+    /* eslint-disable-next-line */
   }, [indexPollutantId, JSON.stringify(indexPollutants)]);
 
   useEffect(() => {
@@ -304,6 +302,7 @@ const View = (props) => {
         ? newPollutantGroup
         : undefined,
     );
+    /* eslint-disable-next-line */
   }, [indexPollutantGroupId, JSON.stringify(indexPollutantGroups)]);
 
   useEffect(() => {

src/components/manage/Blocks/QueryParamButton/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import config from '@plone/volto/registry';
 

src/components/manage/Blocks/QueryParamText/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import config from '@plone/volto/registry';
 import './style.css';

src/components/manage/Blocks/SidebarBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import config from '@plone/volto/registry';
 

src/components/manage/Blocks/SidebarBlock/View.jsx

@@ -8,7 +8,7 @@ import { Menu } from 'semantic-ui-react';
 /* HELPERS */
 import { getNavigationByParent, getBasePath } from '~/helpers';
 
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 
 import { getFacilities, getInstallations, getLcps } from '~/helpers/api';
 

src/components/manage/Blocks/SiteBlocks/Header/View.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { Grid, Dropdown } from 'semantic-ui-react';
-import { setQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
 import qs from 'querystring';
 import './style.css';
 

src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DiscodataSqlBuilderView } from 'volto-datablocks/components';
+import { DiscodataSqlBuilderView } from '@eeacms/volto-datablocks/components';
 import Flags from '~/components/manage/Blocks/Flags/View';
 
 const QueryBuilder = (props) => {

src/components/manage/Blocks/SiteLocationMap/Edit.jsx

@@ -3,7 +3,7 @@ import { SidebarPortal } from '@plone/volto/components';
 import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 import SiteLocationMapView from './View';
 import schema from './schema';
-import { connectBlockToProviderData } from 'volto-datablocks/hocs';
+import { connectBlockToProviderData } from '@eeacms/volto-datablocks/hocs';
 
 const Edit = (props) => {
   const { data = {}, block = null, selected = false, onChangeBlock } = props;