@eeacms/volto-clms-theme 1.0.111 → 1.0.112

package/CHANGELOG.md

@@ -4,8 +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).
 
+#### [1.0.112](https://github.com/eea/volto-clms-theme/compare/1.0.111...1.0.112)
+
+- import fields [`#284`](https://github.com/eea/volto-clms-theme/pull/284)
+- search filters checkbox unification [`0cd48bc`](https://github.com/eea/volto-clms-theme/commit/0cd48bc9a873ec1b3c4a082c4ec3519fbc3cef6d)
+- check also childless parents CLMS-987 [`641a887`](https://github.com/eea/volto-clms-theme/commit/641a887e9e36f0f2e04aa8eb5362065ed53380a3)
+- User profile form changes [`a7f7a63`](https://github.com/eea/volto-clms-theme/commit/a7f7a63a288f35037fc42a7af6761071c889e7ad)
+- added UniversalLink to relatedItems [`46cb0c5`](https://github.com/eea/volto-clms-theme/commit/46cb0c5e6abb6658d0ec8108ba1eb1cf136d5e2f)
+
 #### [1.0.111](https://github.com/eea/volto-clms-theme/compare/1.0.110...1.0.111)
 
+> 2 August 2022
+
+- Develop [`#283`](https://github.com/eea/volto-clms-theme/pull/283)
 - bump accordion block [`f64f037`](https://github.com/eea/volto-clms-theme/commit/f64f037cbcb1200f15d70590beaf4131f7bf464d)
 - Use Case view [`c60b74f`](https://github.com/eea/volto-clms-theme/commit/c60b74f110f98faff7d15a42167e45e410efeec1)
 - textWidget limit to 1000 characters and textAreaWidget show error with more than 8000 characters [`662f035`](https://github.com/eea/volto-clms-theme/commit/662f035fa9ecd7b61b7bb8aa17acb0ce89718df8)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.111",
+  "version": "1.0.112",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/actions/import_wms_fields/import_wms_fields.js

@@ -0,0 +1,20 @@
+/**
+ * Post meeting register actions.
+ * @module actions/postImportGeonetwork
+ */
+export const POST_IMPORT_WMS_FIELDS = 'POST_IMPORT_WMS_FIELDS';
+
+/**
+ * Post import geonetwork.
+ * @function postImportWMSFields
+ * @returns {Object} Get extra items action.
+ */
+export function postImportWMSFields(url, id, type) {
+  return {
+    type: POST_IMPORT_WMS_FIELDS,
+    request: {
+      op: 'post',
+      path: `${url}/@import-wms-fields`,
+    },
+  };
+}

package/src/actions/index.js

@@ -87,3 +87,8 @@ export {
   POST_IMPORT_WMS_LAYERS,
   postImportWMSLayers,
 } from './import_wms_layers/import_wms_layers';
+
+export {
+  POST_IMPORT_WMS_FIELDS,
+  postImportWMSFields,
+} from './import_wms_fields/import_wms_fields';

package/src/components/Blocks/CclHomeSearchBlock/CclHomeSearchBlockView.jsx

@@ -1,6 +1,5 @@
 import { defineMessages, useIntl } from 'react-intl';
 
-import { Link } from 'react-router-dom';
 import React from 'react';
 
 const messages = defineMessages({
@@ -14,20 +13,10 @@ const messages = defineMessages({
   },
 });
 
-function hasProtocol(url) {
-  if (url) {
-    return url.startsWith('https://') || url.startsWith('http://')
-      ? true
-      : false;
-  }
-  return false;
-}
-
 const CclHomeSearchBlockView = (props) => {
   const { data, searchText } = props;
   var SearchText = searchText || '';
   const intl = useIntl();
-  let url = data?.link?.[0]?.['@id'];
 
   function handleChange(event) {
     SearchText = event.target.value;
@@ -68,14 +57,6 @@ const CclHomeSearchBlockView = (props) => {
             </button>
           </form>
         </div>
-        <div className="home-datasets-text">
-          <span>{intl.formatMessage(messages.countText, { count: 999 })}</span>
-          {url && hasProtocol(url) ? (
-            <a href={url}>{data.linkText}</a>
-          ) : (
-            <Link to={url}>{data.linkText}</Link>
-          )}
-        </div>
       </div>
     </div>
   );

package/src/components/Blocks/CclHomeSearchBlock/HomeSearchSchema.js

@@ -4,7 +4,7 @@ export const HomeSearchSchema = () => ({
     {
       id: 'default',
       title: 'Default',
-      fields: ['title', 'linkText', 'link'],
+      fields: ['title'],
     },
   ],
   properties: {
@@ -12,19 +12,6 @@ export const HomeSearchSchema = () => ({
       title: 'Title',
       type: 'string',
     },
-    linkText: {
-      title: 'Link text',
-      description: 'Text for the link to the catalogue',
-      type: 'string',
-    },
-    link: {
-      title: 'Link',
-      description: 'Select site content or paste external url',
-      widget: 'object_browser',
-      mode: 'link',
-      selectedItemAttrs: ['Title', 'Description', '@type', '@id'],
-      allowExternals: true,
-    },
   },
   required: ['title'],
 });

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/AccordionFacet.jsx

@@ -1,4 +1,4 @@
-import { Checkbox } from 'semantic-ui-react';
+import { Checkbox, List } from 'semantic-ui-react';
 import React from 'react';
 import {
   selectFacetSchemaEnhancer,
@@ -47,38 +47,46 @@ const AccordionFacet = (props) => {
         <legend className="ccl-form-legend">{facet.title}</legend>
       </div>
       <Wrapper typeName={typeName}>
-        {choices.map((choice, i) => (
-          <div
-            className={
-              typeName === 'checkbox' ? 'ccl-form-group' : 'filters-tag'
-            }
-            key={choice.value}
-          >
-            <Checkbox
-              disabled={isEditMode}
-              label={choice.label}
-              radio={!isMulti}
-              checked={
-                isMulti
-                  ? !!facetValue?.find((f) => f.value === choice.value)
-                  : facetValue && facetValue.value === choice.value
-              }
-              onChange={(e, { checked }) =>
-                onChange(
-                  facet.field.value,
-                  isMulti
-                    ? [
-                        ...facetValue
-                          .filter((f) => f.value !== choice.value)
-                          .map((f) => f.value),
-                        ...(checked ? [choice.value] : []),
-                      ]
-                    : isChoiceValue(checked, choice.value),
-                )
-              }
-            />
-          </div>
-        ))}
+        <List>
+          {choices.map((choice, i) => (
+            <List.Item
+              key={choice.value}
+              style={{
+                paddingLeft: '15px',
+                paddingBottom: '15px',
+                paddingTop: '10px',
+              }}
+            >
+              <List.Content>
+                <List.Header>
+                  <Checkbox
+                    disabled={isEditMode}
+                    label={choice.label}
+                    radio={!isMulti}
+                    checked={
+                      isMulti
+                        ? !!facetValue?.find((f) => f.value === choice.value)
+                        : facetValue && facetValue.value === choice.value
+                    }
+                    onChange={(e, { checked }) =>
+                      onChange(
+                        facet.field.value,
+                        isMulti
+                          ? [
+                              ...facetValue
+                                .filter((f) => f.value !== choice.value)
+                                .map((f) => f.value),
+                              ...(checked ? [choice.value] : []),
+                            ]
+                          : isChoiceValue(checked, choice.value),
+                      )
+                    }
+                  />
+                </List.Header>
+              </List.Content>
+            </List.Item>
+          ))}
+        </List>
       </Wrapper>
     </fieldset>
   );

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/CheckboxTreeFacet.jsx

@@ -10,6 +10,7 @@ import {
   selectFacetStateToValue,
   selectFacetValueToQuery,
 } from '@plone/volto/components/manage/Blocks/Search/components/base';
+import { checkAllChildren } from './utils';
 
 const hasAllChildrensSelected = (value, childrens) => {
   var result = true;
@@ -24,20 +25,21 @@ const hasAllChildrensSelected = (value, childrens) => {
   return result;
 };
 
-const checkAllChildren = (value, childrens) => {
-  if (!childrens || childrens.length === 0) {
-    return value;
+const Wrapper = ({ typeName, children }) => {
+  if (typeName === 'checkbox') {
+    return <div className="ccl-form">{children}</div>;
+  } else if (typeName === 'label') {
+    return (
+      <div>
+        <div className="filters-tag-container">{children}</div>
+      </div>
+    );
   }
-  childrens.forEach((ch) => {
-    if (value.filter((v) => v.value === ch.value).length === 0) {
-      value.push(ch);
-    }
-  });
-  return value;
 };
 
 const CheckboxTreeFacet = (props) => {
-  const { facet, choices, onChange, value } = props;
+  const { facet, choices, onChange, value, typeName } = props;
+
   const facetValue = value;
   var [open, setOpen] = useState(false);
   let options = [];
@@ -56,7 +58,7 @@ const CheckboxTreeFacet = (props) => {
       >
         <legend className="ccl-form-legend">{facet.title}</legend>
       </div>
-      <div>
+      <Wrapper typeName={typeName}>
         <List>
           {options.map((option) => (
             <CheckboxListParent
@@ -68,7 +70,7 @@ const CheckboxTreeFacet = (props) => {
             />
           ))}
         </List>
-      </div>
+      </Wrapper>
     </fieldset>
   );
 };
@@ -88,9 +90,7 @@ const CheckboxListParent = ({ option, key, onChange, value, id }) => {
               checked
                 ? onChange(id, [
                     // if this option has children, check them all
-                    ...checkAllChildren(value, option.childrens).map(
-                      (f) => f.value,
-                    ),
+                    ...checkAllChildren(value, option).map((f) => f.value),
                   ])
                 : onChange(id, [
                     ...value

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/CheckboxTreeParentFacet.jsx

@@ -10,6 +10,7 @@ import {
   selectFacetStateToValue,
   selectFacetValueToQuery,
 } from '@plone/volto/components/manage/Blocks/Search/components/base';
+import { checkAllChildren } from './utils';
 
 const hasAllChildrensSelected = (value, childrens) => {
   var result = true;
@@ -24,20 +25,20 @@ const hasAllChildrensSelected = (value, childrens) => {
   return result;
 };
 
-const checkAllChildren = (value, childrens) => {
-  if (!childrens || childrens.length === 0) {
-    return value;
+const Wrapper = ({ typeName, children }) => {
+  if (typeName === 'checkbox') {
+    return <div className="ccl-form">{children}</div>;
+  } else if (typeName === 'label') {
+    return (
+      <div>
+        <div className="filters-tag-container">{children}</div>
+      </div>
+    );
   }
-  childrens.forEach((ch) => {
-    if (value.filter((v) => v.value === ch.value).length === 0) {
-      value.push(ch);
-    }
-  });
-  return value;
 };
 
 const CheckboxTreeParentFacet = (props) => {
-  const { facet, choices, onChange, value } = props;
+  const { facet, choices, onChange, value, typeName } = props;
   const facetValue = value;
   var [open, setOpen] = useState(false);
   let options = [];
@@ -56,7 +57,7 @@ const CheckboxTreeParentFacet = (props) => {
       >
         <legend className="ccl-form-legend">{facet.title}</legend>
       </div>
-      <div>
+      <Wrapper typeName={typeName}>
         <List>
           {options.map((option) => (
             <CheckboxListParent
@@ -68,7 +69,7 @@ const CheckboxTreeParentFacet = (props) => {
             />
           ))}
         </List>
-      </div>
+      </Wrapper>
     </fieldset>
   );
 };
@@ -85,12 +86,10 @@ const CheckboxListParent = ({ option, key, onChange, value, id }) => {
             key={option.value}
             name={`field-${option.value}`}
             onChange={(event, { checked }) => {
-              checked
+              return checked
                 ? onChange(id, [
                     // if this option has children, check them all
-                    ...checkAllChildren(value, option.childrens).map(
-                      (f) => f.value,
-                    ),
+                    ...checkAllChildren(value, option).map((f) => f.value),
                   ])
                 : onChange(id, [
                     ...value

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/utils.js

@@ -0,0 +1,11 @@
+export const checkAllChildren = (value, option) => {
+  if (!option?.childrens || option.childrens.length === 0) {
+    return [...value, { label: option.label, value: option.value }];
+  }
+  option.childrens.forEach((ch) => {
+    if (value.filter((v) => v.value === ch.value).length === 0) {
+      value.push(ch);
+    }
+  });
+  return value;
+};

package/src/components/Blocks/customBlocks.js

@@ -328,7 +328,7 @@ const customBlocks = (config) => ({
           {
             id: 'doubleRangeFacet',
             title: 'Double Range',
-            view: DoubleRangeFacet,
+            view: WithType(DoubleRangeFacet, 'range'),
             isDefault: false,
             schemaEnhancer: DoubleRangeFacet.schemaEnhancer,
             stateToValue: DoubleRangeFacet.stateToValue,
@@ -338,7 +338,7 @@ const customBlocks = (config) => ({
           {
             id: 'checkboxTreeFacet',
             title: 'Checkbox Tree',
-            view: CheckboxTreeFacet,
+            view: WithType(CheckboxTreeFacet, 'checkbox'),
             isDefault: false,
             schemaEnhancer: CheckboxTreeFacet.schemaEnhancer,
             stateToValue: CheckboxTreeFacet.stateToValue,
@@ -348,7 +348,7 @@ const customBlocks = (config) => ({
           {
             id: 'checkboxTreeParentFacet',
             title: 'Checkbox Tree Parents',
-            view: CheckboxTreeParentFacet,
+            view: WithType(CheckboxTreeParentFacet, 'checkbox'),
             isDefault: false,
             schemaEnhancer: CheckboxTreeParentFacet.schemaEnhancer,
             stateToValue: CheckboxTreeParentFacet.stateToValue,

package/src/components/CLMSDatasetDetailView/CLMSDatasetDetailView.jsx

@@ -11,7 +11,11 @@ import {
 } from '@eeacms/volto-clms-theme/components/CLMSDatasetDetailView';
 import { Modal, Segment } from 'semantic-ui-react';
 import { connect, useDispatch, useSelector } from 'react-redux';
-import { postImportGeonetwork, postImportWMSLayers } from '../../actions';
+import {
+  postImportGeonetwork,
+  postImportWMSLayers,
+  postImportWMSFields,
+} from '../../actions';
 
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
 import CclTabs from '@eeacms/volto-clms-theme/components/CclTab/CclTabs';
@@ -37,6 +41,7 @@ const CLMSDatasetDetailView = ({ content, token }) => {
     (state) => state.geonetwork_importation,
   );
   const wms_layers_importation = useSelector((state) => state.importWMSLayers);
+  const wms_fields_importation = useSelector((state) => state.importWMSFields);
   const user = useSelector((state) => state.users?.user);
   React.useEffect(() => {
     dispatch(getUser(token));
@@ -50,6 +55,10 @@ const CLMSDatasetDetailView = ({ content, token }) => {
     dispatch(postImportWMSLayers(location.pathname));
   }
 
+  function handleWMSFieldimport() {
+    dispatch(postImportWMSFields(location.pathname));
+  }
+
   const [open, setOpen] = React.useState({});
   const locale = useSelector((state) => state.intl.locale);
 
@@ -282,6 +291,100 @@ const CLMSDatasetDetailView = ({ content, token }) => {
         </Segment.Group>
       )}
 
+      {user?.roles && user.roles.includes('Manager') && (
+        <Segment.Group compact horizontal>
+          <Segment
+            padded={'very'}
+            color={'olive'}
+            key={'wms-fields-import'}
+            loading={wms_fields_importation?.loading}
+            circular
+          >
+            <Modal
+              onClose={() => {
+                setOpen({ ...open, 'wms-fields-import': false });
+              }}
+              onOpen={() => {
+                setOpen({ ...open, 'wms-fields-import': true });
+              }}
+              open={open['wms-fields-import']}
+              trigger={
+                <CclButton>
+                  <FormattedMessage
+                    id="Import WMS Fields"
+                    defaultMessage="Import WMS Fields"
+                  />
+                </CclButton>
+              }
+              className={'modal-clms'}
+            >
+              <div className={'modal-clms-background'}>
+                <div className={'modal-clms-container'}>
+                  <div className={'modal-close modal-clms-close'}>
+                    <span
+                      className="ccl-icon-close"
+                      aria-label="Close"
+                      onClick={() => {
+                        setOpen({ ...open, 'wms-fields-import': false });
+                      }}
+                      onKeyDown={() => {
+                        setOpen({ ...open, 'wms-fields-import': false });
+                      }}
+                      tabIndex="0"
+                      role="button"
+                    ></span>
+                  </div>
+                  <div className="modal-login-text">
+                    <h1>
+                      <FormattedMessage
+                        id="Import WMS Fields"
+                        defaultMessage="Import WMS Fields"
+                      />
+                    </h1>
+                    This action will import the WMS Fields from the view service
+                    defined in the dataset if this WMS service is Arcgis based
+                    <br />
+                    <br />
+                  </div>
+                  <CclButton
+                    onClick={() => {
+                      handleWMSFieldimport();
+                      setOpen({ ...open, 'wms-fields-import': false });
+                    }}
+                    mode="filled"
+                  >
+                    <FormattedMessage
+                      id="Import data"
+                      defaultMessage="Import data"
+                    />
+                  </CclButton>
+                </div>
+              </div>
+            </Modal>
+            {wms_fields_importation?.imported_wms_fields?.status && (
+              <p>
+                {wms_fields_importation?.loaded &&
+                  wms_fields_importation?.error === null && (
+                    <strong>
+                      {' '}
+                      {wms_fields_importation?.imported_wms_fields?.message}
+                    </strong>
+                  )}
+              </p>
+            )}
+            {wms_fields_importation?.imported_wms_fields?.status ===
+              'error' && (
+              <p>
+                <strong>
+                  {' '}
+                  {wms_fields_importation?.imported_wms_fields?.message}
+                </strong>
+              </p>
+            )}
+          </Segment>
+        </Segment.Group>
+      )}
+
       <CclTabs routing={true}>
         <div tabTitle="General Info">{DataSetInfoContent(content)}</div>
         <div tabTitle="Use cases">{RelatedUseCases(content)}</div>

package/src/components/CLMSNewsItemView/CLMSNewsItemView.jsx

@@ -45,7 +45,6 @@ const CLMSNewsItemView = (props) => {
       ? iTitleIcons.rightPosition
       : iTitleIcons.leftPosition;
   }
-
   return (
     <div className="ccl-container">
       {hasBlocksData(content) && content.blocks_layout?.items?.length > 4 ? (

package/src/components/CLMSRelatedItems/CLMSRelatedItems.jsx

@@ -1,5 +1,6 @@
 import { Grid, Image } from 'semantic-ui-react';
 import PlaceHolder from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-thumbnail-placeholder.jpg';
+import { UniversalLink } from '@plone/volto/components';
 
 const CLMSRelatedItems = (props) => {
   const { items } = props;
@@ -24,9 +25,12 @@ const CLMSRelatedItems = (props) => {
               )}
             </Grid.Column>
             <Grid.Column width={9}>
-              <a href={item['@id']}>
+              <UniversalLink href={`${item['@id']}`}>
+                <strong>{item?.title}</strong>
+              </UniversalLink>
+              {/* <a href={item['@id']}>
                 <strong>{item.title}</strong>
-              </a>
+              </a> */}
               {item?.description && <p>{item.description}</p>}
             </Grid.Column>
           </Grid>

package/src/components/CLMSSubscriptionView/SubscriptionView.jsx

@@ -24,8 +24,16 @@ import validator from 'validator';
 
 const messages = defineMessages({
   subscribeToThe: {
-    id: '{subscribe_or_unsubscribe} to receive the {type}',
-    defaultMessage: '{subscribe_or_unsubscribe} to receive the {type}',
+    id: 'subscribe to receive the {type}',
+    defaultMessage: 'Subscribe to receive the {type}',
+  },
+  unsubscribeFromThe: {
+    id: 'unsubscribe from the {type}',
+    defaultMessage: 'Unsubscribe from the {type}',
+  },
+  notifications: {
+    id: 'notifications',
+    defaultMessage: 'notifications',
   },
   emailTitle: {
     id: 'E-mail',
@@ -33,7 +41,7 @@ const messages = defineMessages({
   },
   emailDescription: {
     id: 'We will use this address to send you the {type}',
-    defaultMessage: 'We will use this address to send you the {type}',
+    defaultMessage: 'We will use this address to send you the {type} ',
   },
   saved: {
     id: 'Changes saved',
@@ -65,7 +73,8 @@ const messages = defineMessages({
   },
   invalid_email: {
     id: 'The entered email address is not valid',
-    defaultMessage: 'The entered email address is not valid',
+    defaultMessage:
+      'You must agree privacy policy and enter a valid email address',
   },
   subscribe: {
     id: 'Subscribe',
@@ -79,6 +88,14 @@ const messages = defineMessages({
     id: 'Write your email in the field',
     defaultMessage: 'Write your email in the field',
   },
+  agreePrivacyPolicy: {
+    id: 'agreePrivacyPolicy',
+    defaultMessage: 'I agree to the ',
+  },
+  agreePrivacyPolicyLinkText: {
+    id: 'agreePrivacyPolicyLinkText',
+    defaultMessage: 'privacy policy.',
+  },
 });
 
 /**
@@ -100,18 +117,26 @@ class SubscriptionView extends Component {
     super(props);
     this.handleChange = this.handleChange.bind(this);
     this.onSubmit = this.onSubmit.bind(this);
+    this.handleInputChange = this.handleInputChange.bind(this);
     this.state = {
       value: '',
       type_conf: null,
+      inputValue: false,
     };
   }
 
   componentDidMount() {
     const type_conf = getSubscriptionConfig(this.props.type);
-    this.setState({ type_conf });
+    this.setState({ type_conf, inputValue: this.state.inputValue });
     this.props.getExtraBreadcrumbItems([]);
   }
 
+  handleInputChange() {
+    this.setState({
+      inputValue: !this.state.inputValue,
+    });
+  }
+
   handleChange(event) {
     this.setState({
       value: event.target.value,
@@ -213,19 +238,28 @@ class SubscriptionView extends Component {
         {this.state.type_conf ? (
           <Container>
             <h1 className="page-title">
-              {this.props.intl.formatMessage(messages.subscribeToThe, {
-                type: this.props.type,
-                subscribe_or_unsubscribe: this.props.isUnsubscribe
-                  ? this.props.intl.formatMessage(messages.unsubscribe)
-                  : this.props.intl.formatMessage(messages.subscribe),
-              })}
+              {this.props.isUnsubscribe && this.props.type !== 'newsletter'
+                ? this.props.intl.formatMessage(messages.unsubscribeFromThe, {
+                    type: this.props.type,
+                  }) +
+                  ' ' +
+                  this.props.intl.formatMessage(messages.notifications)
+                : this.props.isUnsubscribe && this.props.type === 'newsletter'
+                ? this.props.intl.formatMessage(messages.unsubscribeFromThe, {
+                    type: this.props.type,
+                  })
+                : this.props.intl.formatMessage(messages.subscribeToThe, {
+                    type: this.props.type,
+                  })}
             </h1>
             <Form
               className="ccl-form user-form contact-form"
               size={'large'}
               onSubmit={
                 validator.isEmail(this.state.value)
-                  ? this.onSubmit
+                  ? this.state.inputValue === true
+                    ? this.onSubmit
+                    : this.invalidEmailErrorToast
                   : this.invalidEmailErrorToast
               }
             >
@@ -238,11 +272,20 @@ class SubscriptionView extends Component {
                     {this.props.intl.formatMessage(messages.emailTitle)}
                   </label>
                   <span className="label-required">*</span>
-                  <p>
-                    {this.props.intl.formatMessage(messages.emailDescription, {
-                      type: this.props.type,
-                    })}
-                  </p>
+                  {this.props.isUnsubscribe ? (
+                    ''
+                  ) : (
+                    <p>
+                      {this.props.intl.formatMessage(
+                        messages.emailDescription,
+                        {
+                          type: this.props.type,
+                        },
+                      )}
+                      {this.props.type !== 'newsletter' &&
+                        this.props.intl.formatMessage(messages.notifications)}
+                    </p>
+                  )}
                   <Form.Group inline widths="equal">
                     <Form.Input
                       maxLength={8000}
@@ -264,6 +307,34 @@ class SubscriptionView extends Component {
                   </Form.Group>
                 </div>
               </div>
+              {!this.props.isUnsubscribe && (
+                <div className="ccl-form footer-privacy-check ccl-profile-privacy">
+                  <div className="ccl-form-group">
+                    <input
+                      type="checkbox"
+                      id="footer_privacy"
+                      name="footerPrivacy"
+                      value={this.state.inputValue}
+                      onClick={this.handleInputChange}
+                      className="ccl-checkbox ccl-form-check-input"
+                      required={true}
+                    />
+                    <label
+                      className="ccl-form-check-label"
+                      htmlFor="footer_privacy"
+                    >
+                      {this.props.intl.formatMessage(
+                        messages.agreePrivacyPolicy,
+                      )}
+                      <Link to={`/${this.props.lang}/personal-data-protection`}>
+                        {this.props.intl.formatMessage(
+                          messages.agreePrivacyPolicyLinkText,
+                        )}
+                      </Link>
+                    </label>
+                  </div>
+                </div>
+              )}
             </Form>
             {!this.props.isUnsubscribe && (
               <>
@@ -272,7 +343,8 @@ class SubscriptionView extends Component {
                     pathname: `/${this.props.intl.locale}/unsubscribe/${this.props.type}`,
                   }}
                 >
-                  UNSUBSCRIBE
+                  {'Click here if you would like to unsubscribe from our'}{' '}
+                  {this.props.type} {'notifications'}
                 </Link>
               </>
             )}
@@ -289,6 +361,7 @@ export default compose(
   injectIntl,
   connect(
     (state, props) => ({
+      lang: state.intl.locale,
       loaded: state.subscription.loaded,
       loading: state.subscription.loading,
       error: state.subscription.error,

package/src/components/CLMSSubscriptionView/subscription_utils.js

@@ -1,16 +1,16 @@
 export const AVAILABLE_SUBSCRIPTIONS = [
   {
-    title: 'Subscribe to our newsletter',
+    title: 'Subscribe to the newsletter',
     type: 'newsletter',
     back_url: 'newsletter',
   },
   {
-    title: 'Subscribe to our news',
+    title: 'Subscribe to news notifications',
     type: 'news',
     back_url: 'newsitem',
   },
   {
-    title: 'Subscribe to our events',
+    title: 'Subscribe to event notifications',
     type: 'events',
     back_url: 'event',
   },

package/src/components/Widgets/MapLayersWidget.jsx

@@ -34,12 +34,25 @@ const ItemSchema = {
       type: 'string',
       default: '',
     },
+    fields: {
+      title: 'Fields to be shown in the mapviewer',
+      description: 'Enter the JSON representing the fields',
+      type: 'text',
+      default: '',
+    },
   },
   fieldsets: [
     {
       id: 'default',
       title: 'Layer',
-      fields: ['id', 'title', 'default_active', 'hide', 'static_legend_url'],
+      fields: [
+        'id',
+        'title',
+        'default_active',
+        'hide',
+        'static_legend_url',
+        'fields',
+      ],
     },
   ],
   required: [],

package/src/customizations/volto/components/theme/Footer/Footer.jsx

@@ -135,7 +135,7 @@ class Footer extends Component {
   componentDidMount() {
     this.setState({
       value: '',
-      inputValue: false,
+      inputValue: this.state.inputValue,
       lang: this.props.intl.locale,
     });
   }

package/src/reducers/import_wms_fields/import_wms_fields_reducer.js

@@ -0,0 +1,44 @@
+/**
+ * @module reducers/import_wms_fields
+ */
+
+import { POST_IMPORT_WMS_FIELDS } from '../../actions';
+
+const initialState = {
+  error: null,
+  loaded: false,
+  loading: false,
+  imported_wms_fields: {},
+};
+
+export const importWMSFieldsReducer = (state = initialState, action = {}) => {
+  switch (action?.type) {
+    case `${POST_IMPORT_WMS_FIELDS}_PENDING`:
+      return {
+        ...state,
+        error: null,
+        loaded: false,
+        loading: true,
+        imported_wms_fields: {},
+      };
+    case `${POST_IMPORT_WMS_FIELDS}_FAIL`:
+      return {
+        ...state,
+        error: action.error,
+        loaded: false,
+        loading: false,
+        imported_wms_fields: {},
+      };
+
+    case `${POST_IMPORT_WMS_FIELDS}_SUCCESS`:
+      return {
+        ...state,
+        error: null,
+        loaded: true,
+        loading: false,
+        imported_wms_fields: action.result,
+      };
+    default:
+      return state;
+  }
+};

package/src/reducers/index.js

@@ -16,6 +16,7 @@ import { subscribeToReducer } from './subscription/subscription_reducer';
 import tokens from './tokens/tokens';
 import { userschemaReducer } from './userschema/userschema';
 import { importWMSLayersReducer } from './import_wms_layers/import_wms_layers_reducer';
+import { importWMSFieldsReducer } from './import_wms_fields/import_wms_fields_reducer';
 
 /**
  * Root reducer.
@@ -41,6 +42,7 @@ const reducers = {
   newsletter_subscribers: newsletterSubscribersReducer,
   subscription: subscribeToReducer,
   importWMSLayers: importWMSLayersReducer,
+  importWMSFields: importWMSFieldsReducer,
 };
 
 export default reducers;

package/theme/clms/css/styles.less

@@ -702,6 +702,11 @@ body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
   margin-bottom: 2rem;
 }
 
+.ccl-profile-privacy {
+  margin-top: 2rem;
+  margin-bottom: 2rem;
+}
+
 .user-form .ccl-form-label {
   display: inline-block;
   font-size: 1.125rem;