@eeacms/volto-clms-theme 1.0.199 → 1.0.201

package/CHANGELOG.md

@@ -4,11 +4,37 @@ 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.199](https://github.com/eea/volto-clms-theme/compare/1.0.198...1.0.199) - 26 April 2023
+### [1.0.201](https://github.com/eea/volto-clms-theme/compare/1.0.200...1.0.201) - 9 May 2023
+
+#### :rocket: New Features
+
+- feat: CLMS-1882 [Unai - [`5509bc6`](https://github.com/eea/volto-clms-theme/commit/5509bc638817d5121e16bdadc6f5e084e363d9ed)]
+- feat: CLMS-2019 ? used for undefined schemas [Unai - [`3440b26`](https://github.com/eea/volto-clms-theme/commit/3440b26e9677410c531b26e10d6f2b7519dd8120)]
 
 #### :bug: Bug Fixes
 
-- fix: CLMS-2053 style changes in home page [Mikel Larreategi - [`ea163d1`](https://github.com/eea/volto-clms-theme/commit/ea163d14e0e051f18f37746ffe959bb7963fe41e)]
+- fix: clms-1714 remove button when no search button is selected [Mikel Larreategi - [`c3d72e5`](https://github.com/eea/volto-clms-theme/commit/c3d72e53355546019ca1e727b39d477f16079011)]
+- fix: clms-2143 coordinates and direction were split [Mikel Larreategi - [`1c5c000`](https://github.com/eea/volto-clms-theme/commit/1c5c00003e323ef3fbf9911a415ca9143cf992ca)]
+- fix: clms-2053 CSS fixes [Mikel Larreategi - [`5b3098f`](https://github.com/eea/volto-clms-theme/commit/5b3098fdf42529e4d9bfaa026ed9a587ec5ff3d1)]
+
+#### :hammer_and_wrench: Others
+
+- snaphot update [Unai - [`1afab8d`](https://github.com/eea/volto-clms-theme/commit/1afab8d8087c613a9db53dfad7df4e20fa57e77b)]
+- register/login link working to open modal [Unai - [`a43ff7e`](https://github.com/eea/volto-clms-theme/commit/a43ff7ed10b02facc7906c7d7378e0065b50ef9c)]
+- grab cursor on handle hover [Unai - [`0e57ca8`](https://github.com/eea/volto-clms-theme/commit/0e57ca8bcad6eea5b35b90952ff9a4bd1b047cf9)]
+- code cleaning [Unai - [`2ff7638`](https://github.com/eea/volto-clms-theme/commit/2ff7638bdef58a70c1ab17339d49c80c58e7dfbe)]
+- draggable modal style fixes [Unai - [`6882fb9`](https://github.com/eea/volto-clms-theme/commit/6882fb90884b10dfd92d41713dd6d22d8c0d9177)]
+- draggable-modal fixes [Unai - [`b95ee14`](https://github.com/eea/volto-clms-theme/commit/b95ee14231490e18227b9037fea38716a194a57c)]
+- some fixes [Unai - [`e56229c`](https://github.com/eea/volto-clms-theme/commit/e56229c5c74c8a179bd43d5a48168616c82228e7)]
+- lint [Mikel Larreategi - [`e4fc5d1`](https://github.com/eea/volto-clms-theme/commit/e4fc5d170c96d0b2870d4eba164c32c26005d44a)]
+- modal closes on button click amd eslint fix [Unai - [`6a29ab6`](https://github.com/eea/volto-clms-theme/commit/6a29ab6b37f53df54b912210dd41cee42779b16e)]
+### [1.0.200](https://github.com/eea/volto-clms-theme/compare/1.0.199...1.0.200) - 27 April 2023
+
+#### :hammer_and_wrench: Others
+
+- fix clms-2048 change footer newsletter subscription message when the user is already subscribed [Mikel Larreategi - [`4fb9df6`](https://github.com/eea/volto-clms-theme/commit/4fb9df663254ab0aa038067c8805dea68d1bc0cd)]
+- clms-2008 show bounding box coordinates [Mikel Larreategi - [`d0fdcf2`](https://github.com/eea/volto-clms-theme/commit/d0fdcf2fa74862bf861d869550d134fa86f5be30)]
+### [1.0.199](https://github.com/eea/volto-clms-theme/compare/1.0.198...1.0.199) - 26 April 2023
 
 ### [1.0.198](https://github.com/eea/volto-clms-theme/compare/1.0.197...1.0.198) - 17 April 2023
 
@@ -1062,7 +1088,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - related products and datasets added to news and meeting views and login-plone route created [Unai - [`5704a1a`](https://github.com/eea/volto-clms-theme/commit/5704a1a766148746162b60efaf232ea90dc20cf4)]
-- Revert "[JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`46eb694`](https://github.com/eea/volto-clms-theme/commit/46eb69415280a3c982405299135027ae4221426a)]
 - sort items according to the lowercased label and put those with special meaning at the end [Mikel Larreategi - [`6410abe`](https://github.com/eea/volto-clms-theme/commit/6410abe096f60dcad54dced2026c9df9b7946d68)]
 - lint fix [Unai - [`1264a7a`](https://github.com/eea/volto-clms-theme/commit/1264a7adfe8d679fea1bd821ad087add20f4271d)]
 - footer newsletter subscription change, global search maxLength change from 8000 to 200 and /login design change [Unai - [`a09d24a`](https://github.com/eea/volto-clms-theme/commit/a09d24adbb6fa053fb2a2cc0071506b906593b42)]
@@ -1213,7 +1238,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - search block new features [ionlizarazu - [`8e814cb`](https://github.com/eea/volto-clms-theme/commit/8e814cbd359782540c21fe37b37ef146d331f0d6)]
 - language selector cookie management [ionlizarazu - [`1385ac9`](https://github.com/eea/volto-clms-theme/commit/1385ac95795702206d3623ba6e780faa43a89e0a)]
 - toolbar cookie management [ionlizarazu - [`5c23200`](https://github.com/eea/volto-clms-theme/commit/5c23200790b20e1d4f1bc966463c37bf4c808f47)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0316a0d`](https://github.com/eea/volto-clms-theme/commit/0316a0d8b6fb0fa14af13002415f3c95d9f8ede3)]
 ### [1.0.84](https://github.com/eea/volto-clms-theme/compare/1.0.83...1.0.84) - 18 March 2022
 
 #### :hammer_and_wrench: Others
@@ -2118,13 +2142,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - replace @collective/volto-dropdownmenu with volto-dropdownmenu [ionlizarazu - [`07f004f`](https://github.com/eea/volto-clms-theme/commit/07f004fe0219e403fb51bc045c83d34f3b981f76)]
-- yarn.lock [ionlizarazu - [`fe1ca04`](https://github.com/eea/volto-clms-theme/commit/fe1ca04889d29fe7b653db4c69af2751b84b8a1a)]
 - add NODE_ENV parameter [ionlizarazu - [`101f27c`](https://github.com/eea/volto-clms-theme/commit/101f27c25b8fbd192e1b11865e95cf5ffee08c1b)]
 - upgrade volto-dropdownmenu version [ionlizarazu - [`2081855`](https://github.com/eea/volto-clms-theme/commit/2081855301f4c708776e0dbab39db143cee00dbc)]
 - HomeSearch block missing url behaviour [ionlizarazu - [`d20a378`](https://github.com/eea/volto-clms-theme/commit/d20a378ce3f254b8343692348f314bf281974542)]
 - babel configuration [ionlizarazu - [`203ea2d`](https://github.com/eea/volto-clms-theme/commit/203ea2de07f99ca3403e4ca220ca74d7ce69b61d)]
 - prettier [ionlizarazu - [`e79e26b`](https://github.com/eea/volto-clms-theme/commit/e79e26bf2fa40ba7b4eb53a24dabd87928221c28)]
-- add yarn lock [ionlizarazu - [`e1ab28b`](https://github.com/eea/volto-clms-theme/commit/e1ab28b060d5a74431c368b0de82a68dabce1eab)]
 - Jenkinsfile cypress test [ionlizarazu - [`b385d65`](https://github.com/eea/volto-clms-theme/commit/b385d65986f717c60f8c434a08fc11b829d08eb4)]
 - cypress [ionlizarazu - [`a243cf0`](https://github.com/eea/volto-clms-theme/commit/a243cf0182fa3dd113c16ff495c71e310252d83b)]
 - some fixes [ionlizarazu - [`046279b`](https://github.com/eea/volto-clms-theme/commit/046279b9d05bea8a64eca03eed493e02621534c9)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.199",
+  "version": "1.0.201",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -55,6 +55,7 @@
     "lightgallery": "^2.4.0",
     "razzle-plugin-scss": "4.2.18",
     "react-csv": "2.2.2",
+    "react-draggable": "4.4.5",
     "react-input-range": "^1.3.0",
     "react-native-mime-types": "2.3.0",
     "react-slick": "0.28.1",

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

@@ -1,8 +1,6 @@
 import React from 'react';
-import { Button, Input } from 'semantic-ui-react';
+import { Input } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
-import { Icon } from '@plone/volto/components';
-import loupeSVG from '@plone/volto/icons/zoom.svg';
 
 const messages = defineMessages({
   search: {
@@ -50,11 +48,6 @@ const SearchInput = (props) => {
           }
         }}
       />
-      {isLive && (
-        <Button basic icon className="search-input-live-icon-button">
-          <Icon name={loupeSVG} />
-        </Button>
-      )}
     </div>
   );
 };

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -189,9 +189,15 @@ const CLMSCartContent = (props) => {
           <>
             <span>Bounding Box</span>
             <br />
-            <span>
-              {'('} {item.area.value.map((item) => item.toFixed(3)).join(', ')}
-              {')'}
+            <span class="cart-bounding-boxes">
+              <span class="cart-bounding-box-row">
+                <span>{`N: ${item.area.value[0].toFixed(1)}º `}</span>&nbsp;
+                <span>{`E: ${item.area.value[1].toFixed(1)}º `}</span>
+              </span>
+              <span class="cart-bounding-box-row">
+                <span>{`S: ${item.area.value[2].toFixed(1)}º `}</span>&nbsp;
+                <span>{`W: ${item.area.value[3].toFixed(1)}º `}</span>
+              </span>
             </span>
           </>
         );

package/src/components/CclDownloadTable/CclDownloadTable.jsx

@@ -289,28 +289,31 @@ function CclDownloadTable(props) {
                 </>
               )}
               {props.dataset.show_legend_on_prepackages && (
-                <CclModal
-                  trigger={
-                    <CclButton
-                      className="ccl-button ccl-button--default show_legend_on_prepackages"
-                      to="#download"
-                    >
-                      {intl.formatMessage(messages.prePackages_location_map)}
-                    </CclButton>
-                  }
-                  size={'medium'}
-                >
-                  <div className="image-modal">
-                    <img
-                      src={
-                        prepackage_grid_image
-                          ? prepackage_grid_image
-                          : PlaceHolder
-                      }
-                      alt={'Placeholder'}
-                    />
-                  </div>
-                </CclModal>
+                <>
+                  <CclModal
+                    draggable={true}
+                    trigger={
+                      <CclButton
+                        className="ccl-button ccl-button--default show_legend_on_prepackages"
+                        to="#download"
+                      >
+                        {intl.formatMessage(messages.prePackages_location_map)}
+                      </CclButton>
+                    }
+                    size={'medium'}
+                  >
+                    <div className="image-modal">
+                      <img
+                        src={
+                          prepackage_grid_image
+                            ? prepackage_grid_image
+                            : PlaceHolder
+                        }
+                        alt={'Placeholder'}
+                      />
+                    </div>
+                  </CclModal>
+                </>
               )}
               {cartSelection.length !== prePackagedCollection.length && (
                 <>

package/src/components/CclModal/CclModal.jsx

@@ -1,6 +1,9 @@
 import React from 'react';
-import { Modal } from 'semantic-ui-react';
+import { Segment, Modal } from 'semantic-ui-react';
 import './modal.less';
+import Draggable from 'react-draggable';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faGripHorizontal } from '@fortawesome/free-solid-svg-icons';
 
 function CclModal(props) {
   let {
@@ -9,13 +12,10 @@ function CclModal(props) {
     size = 'fullscreen',
     modalStatus = () => {},
     onCloseExtra = () => {},
+    draggable = false,
   } = props;
   const [open, setOpen] = React.useState(false);
 
-  // React.useEffect(() => {
-  //   setOpen(openState);
-  // }, [openState]);
-
   function openModal() {
     setOpen(true);
     modalStatus(true);
@@ -27,7 +27,40 @@ function CclModal(props) {
     onCloseExtra();
   }
 
-  return (
+  return draggable ? (
+    <>
+      {open && (
+        <Draggable handle=".handle">
+          <div className="dragable-modal-dialog">
+            <div className={'modal-close modal-clms-close'}>
+              <span
+                className="ccl-icon-close"
+                aria-label="Close"
+                onClick={() => closeModal()}
+                onKeyDown={() => closeModal()}
+                tabIndex="0"
+                role="button"
+              ></span>
+            </div>
+            <Segment compact className="handle">
+              <FontAwesomeIcon icon={faGripHorizontal} size="lg" />
+            </Segment>
+
+            {children}
+          </div>
+        </Draggable>
+      )}
+      <Segment
+        basic
+        compact
+        onClick={() => {
+          !open ? openModal() : closeModal();
+        }}
+      >
+        {trigger}
+      </Segment>
+    </>
+  ) : (
     <Modal
       onClose={() => closeModal()}
       onOpen={() => openModal()}

package/src/components/CclModal/modal.less

@@ -248,6 +248,20 @@
 .modal .ccl-container {
   max-width: 100%;
 }
+
+.dragable-modal-dialog {
+  position: absolute;
+  z-index: 9999 !important;
+  width: auto;
+  max-width: 700px;
+  border: 1px solid #acbe39;
+  background-color: white;
+}
+
+.handle {
+  cursor: grab;
+}
+
 @media (min-width: 576px) {
   .modal .ccl-container {
     max-width: 540px;

package/src/components/Widgets/DownloadableFilesTableWidget.jsx

@@ -8,8 +8,8 @@ import './DownloadableFilesTableWidget.less';
 
 const DownloadableFilesTableWidget = (props) => {
   const { functions, data } = useSchema(
-    props.value.schema,
-    props.value.uiSchema,
+    props?.value?.schema,
+    props?.value?.uiSchema,
   );
   const { schema, uiSchema, ready } = data;
   const { setSchema, setUISchema, setSchemaHandler } = functions;
@@ -34,8 +34,8 @@ const DownloadableFilesTableWidget = (props) => {
     }
     props.onChange(id, {
       items: value.items,
-      ...props.schema,
-      ...props.uiSchema,
+      ...props?.schema,
+      ...props?.uiSchema,
     });
   };
 

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

@@ -193,7 +193,10 @@ class Footer extends Component {
               <Toast
                 error
                 title={this.props.intl.formatMessage(messages.error)}
-                content={this.props.intl.formatMessage(messages.errorMessage)}
+                content={
+                  this.props.subscribe_error_message ||
+                  this.props.intl.formatMessage(messages.errorMessage)
+                }
               />,
             );
         });
@@ -501,6 +504,7 @@ export default compose(
       subscribe_loaded: state.subscription.loaded,
       subscribe_loading: state.subscription.loading,
       subscribe_error: state.subscription.error,
+      subscribe_error_message: state.subscription.error_message,
     }),
     {
       subscribeTo,

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

@@ -1,12 +1,12 @@
 /**
  * @module components/theme/Unauthorized/Unauthorized
  */
-
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
+import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { Container } from 'semantic-ui-react';
-import { useSelector } from 'react-redux';
+
 import { withServerErrorCode } from '@plone/volto/helpers/Utils/Utils';
 import CclLoginModal from '@eeacms/volto-clms-theme/components/CclLoginModal/CclLoginModal';
 
@@ -29,7 +29,18 @@ const Unauthorized = () => {
           id="You are trying to access a protected resource, please {login} first."
           defaultMessage="You are trying to access a protected resource, please {login} first."
           values={{
-            login: <CclLoginModal classname={'green-login-link'} />,
+            login: (
+              <CclLoginModal
+                triggerComponent={() => (
+                  <Link to={'#'}>
+                    <FormattedMessage
+                      id="register-login"
+                      defaultMessage="Register / Login"
+                    />
+                  </Link>
+                )}
+              />
+            ),
           }}
         />
       </p>

package/src/customizations/volto/components/theme/Unauthorized/__snapshots__/Unauthorized.test.jsx.snap

@@ -14,16 +14,16 @@ exports[`Unauthorized renders a not found component 1`] = `
     className="description"
   >
     You are trying to access a protected resource, please 
-    <span
-      className="green-login-link"
+    <a
+      href="/"
       onBlur={[Function]}
       onClick={[Function]}
       onFocus={[Function]}
       onMouseEnter={[Function]}
       onMouseLeave={[Function]}
     >
-      Register/Login
-    </span>
+      Register / Login
+    </a>
      first.
   </p>
   <p>

package/theme/clms/css/home.css

@@ -222,7 +222,7 @@
     height: 30vw;
   }
 }
-@media (max-width: 380px) {
+@media (max-width: 420px) {
   .home-products-container {
     margin-top: 3.6rem;
   }

package/theme/clms/css/styles.less

@@ -1281,6 +1281,18 @@ div#page-document h1.documentFirstHeading {
   min-width: 7rem !important;
 }
 
+.cart-bounding-boxes {
+  display: flex;
+  flex-direction: column;
+
+  .cart-bounding-box-row {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+
+
+
 .Toastify__toast--success {
   background-color: #fafbf3 !important;
 }