npm - @eeacms/volto-clms-theme - Versions diffs - 1.0.129 → 1.0.131 - Mend

@eeacms/volto-clms-theme 1.0.129 → 1.0.131

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -4,6 +4,30 @@ 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.131](https://github.com/eea/volto-clms-theme/compare/1.0.130...1.0.131) - 28 September 2022
+#### :bug: Bug Fixes
+- fix: change the text CLMS-1378 [Mikel Larreategi - [`01bd389`](https://github.com/eea/volto-clms-theme/commit/01bd38952280a9e60d38548a68f807ec757d2e1e)]
+- fix: show the filter whenever there is a prepackaged file [Mikel Larreategi - [`6fe7ad4`](https://github.com/eea/volto-clms-theme/commit/6fe7ad4508cb032d110b80c3e09d11b188856236)]
+#### :hammer_and_wrench: Others
+- filter items according to all attributes [Mikel Larreategi - [`c7d454f`](https://github.com/eea/volto-clms-theme/commit/c7d454f1f65f3b23666cbbc2cbb27506f5d01938)]
+### [1.0.130](https://github.com/eea/volto-clms-theme/compare/1.0.129...1.0.130) - 27 September 2022
+#### :bug: Bug Fixes
+- fix: mobile searchbar eventhandlers [joewdavies - [`d08ead4`](https://github.com/eea/volto-clms-theme/commit/d08ead4d05ccd491a51f4b232672e4e7d179a5cd)]
+- fix: when log out redirect to portal [Unai - [`d3dfc18`](https://github.com/eea/volto-clms-theme/commit/d3dfc18da26a493186edc7718552a26c2915b7a1)]
+- fix: CLMS-1405 - usecases are hidden in arcgis-block instead [joewdavies - [`69ea652`](https://github.com/eea/volto-clms-theme/commit/69ea65286b2bfc1ae13f27a87bcdfc4eae826c94)]
+- fix: CLMS-1306 - prevent 'related datasets' accordion overlapping event content [joewdavies - [`e5d8994`](https://github.com/eea/volto-clms-theme/commit/e5d8994407cbebd1e863a1d73be8ef467de15a00)]
+- fix: reformulate attachment format detection for ImageWidget used in volto-form-block CLMS-739 [Mikel Larreategi - [`44ffd90`](https://github.com/eea/volto-clms-theme/commit/44ffd90c6b22db24b8d14cab2584c0ae830faba9)]
+#### :hammer_and_wrench: Others
+- add an extra option to show/hide the dates [Mikel Larreategi - [`4f40640`](https://github.com/eea/volto-clms-theme/commit/4f406407e444c68b7f673bf9a663367d574ebb59)]
+- ESlint fix [joewdavies - [`ca6ce28`](https://github.com/eea/volto-clms-theme/commit/ca6ce2864f28cf71e63e6d6d7755c2110a782c30)]
 ### [1.0.129](https://github.com/eea/volto-clms-theme/compare/1.0.128...1.0.129) - 26 September 2022
 #### :bug: Bug Fixes

package/package.json CHANGED Viewed

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

package/src/components/Blocks/CclUseCaseList/CclUseCaseListEdit.jsx CHANGED Viewed

@@ -89,9 +89,9 @@ const CclUseCaseListEdit = (props) => {
                         {useCase.title}
                       </div>
                       <div className="use-case-element-description">
-                        {/* <span>
+                        <span>
                           {useCase.topics.map((topic) => topic.title)}
-                        </span> */}
+                        </span>
                         <span>{cclDateTimeFormat(useCase?.effective)}</span>
                         <span>{useCase.responsibleOrganization}</span>
                       </div>

package/src/components/Blocks/CclUseCaseList/CclUseCaseListView.jsx CHANGED Viewed

@@ -81,9 +81,9 @@ const CclUseCaseListView = (props) => {
                           {useCase.title}
                         </div>
                         <div className="use-case-element-description">
-                          {/* <span>
+                          <span>
                             {useCase.topics.map((topic) => topic.title)}
-                          </span> */}
+                          </span>
                           <span>
                             {new Date(useCase?.effective).toLocaleDateString()}
                           </span>

package/src/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingCards.jsx CHANGED Viewed

@@ -9,7 +9,14 @@ import { useSelector } from 'react-redux';
 import CclCard from '@eeacms/volto-clms-theme/components/CclCard/CclCard';
 const CclListingCards = (props) => {
-  const { items, linkHref, linkTitle, isEditMode, variation = 'doc' } = props;
+  const {
+    items,
+    linkHref,
+    linkTitle,
+    isEditMode,
+    variation = 'doc',
+    showDates = true,
+  } = props;
   let link = null;
   let href = linkHref?.[0]?.['@id'] || '';
   const user = useSelector((state) => state.users.user);
@@ -37,6 +44,7 @@ const CclListingCards = (props) => {
                 key={index}
                 type={variation}
                 card={item}
+                showDates={showDates}
                 showEditor={user?.roles?.includes('Manager')}
               />
             ))

package/src/components/CLMSMeetingView/CLMSMeetingView.jsx CHANGED Viewed

@@ -479,12 +479,13 @@ export const CLMSMeetingView = (props) => {
           <CclListingCards
             variation="file"
             items={files}
+            showDates={false}
             linkHref={`${files['@id']}/@@download/file`}
           />
         )}
         {is_manager && (
-          <div className="dataset-info-documents dropdown">
+          <div className="dataset-info-documents dropdown card-container">
             <div className="accordion-block"></div>
             {content?.products?.length > 0 && (
               <Accordion fluid styled>

package/src/components/CLMSNewsItemView/CLMSNewsItemView.jsx CHANGED Viewed

@@ -89,11 +89,12 @@ const CLMSNewsItemView = (props) => {
         <CclListingCards
           variation="file"
           items={files}
+          showDates={false}
           linkHref={`${files['@id']}/@@download/file`}
         />
       )}
       {is_manager && (
-        <div className="dataset-info-documents dropdown">
+        <div className="dataset-info-documents dropdown card-container">
           <div className="accordion-block"></div>
           {content?.products?.length > 0 && (
             <Accordion fluid styled>

package/src/components/CclCard/CclCard.jsx CHANGED Viewed

@@ -83,6 +83,7 @@ function CclCard(props) {
     card,
     showEditor = false,
     CclImageEditor = null,
+    showDates = true,
     onClickImage = () => {
       return '';
     },
@@ -142,11 +143,13 @@ function CclCard(props) {
                   <div className="card-file-title">
                     <CardLink url={url}>{card?.title}</CardLink>
                   </div>
-                  <div className="card-file-date">
-                    {card?.effective
-                      ? cclDateFormat(card?.effective)
-                      : cclDateFormat(card?.created)}
-                  </div>
+                  {showDates && (
+                    <div className="card-file-date">
+                      {card?.effective
+                        ? cclDateFormat(card?.effective)
+                        : cclDateFormat(card?.created)}
+                    </div>
+                  )}
                   {children}
                 </div>
               </>

package/src/components/CclDownloadTable/CclDownloadTable.jsx CHANGED Viewed

@@ -55,8 +55,19 @@ function CclDownloadTable(props) {
   }, [cartSelection, currentPage]);
   React.useEffect(() => {
-    let fItems = prePackagedCollection.filter((item) =>
-      item?.resolution?.toLowerCase().includes(filterText.toLocaleLowerCase()),
+    let fItems = prePackagedCollection.filter(
+      (item) =>
+        item?.title?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
+        item?.file?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
+        item?.area?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
+        item?.year?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
+        item?.version?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
+        item?.resolution
+          ?.toLowerCase()
+          .includes(filterText.toLocaleLowerCase()) ||
+        item?.type?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
+        item?.format?.toLowerCase().includes(filterText.toLocaleLowerCase()) ||
+        item?.size?.toLowerCase().includes(filterText.toLocaleLowerCase()),
     );
     if (filterText) {
       setCurrentPageItems(fItems.slice(0, 10));
@@ -203,13 +214,13 @@ function CclDownloadTable(props) {
         )}
         <Segment basic>
-          {prePackagedCollection.length > 10 && (
+          {prePackagedCollection.length > 1 && (
             <div className="block search">
               <div className="search-wrapper">
                 <div className="search-input">
                   <Input
                     id={`${props.id}-searchtext`}
-                    placeholder={'Filter by Resolution'}
+                    placeholder={'Search in the pre-packaged data collection'}
                     fluid
                     onChange={(event, { value }) => {
                       setFilterText(value);

package/src/components/Widgets/ImageWidget.jsx CHANGED Viewed

@@ -14,6 +14,9 @@ import loadable from '@loadable/component';
 import { flattenToAppURL } from '@plone/volto/helpers';
 import { defineMessages, useIntl } from 'react-intl';
+import { Toast } from '@plone/volto/components';
+import { toast } from 'react-toastify';
 const imageMimetypes = [
   'image/png',
   'image/jpeg',
@@ -91,6 +94,15 @@ const FileWidget = (props) => {
     ? `data:${value['content-type']};${value.encoding},${value.data}`
     : null;
+  const allowedFileTypes = [
+    'image/png',
+    'image/jpeg',
+    'image/webp',
+    'image/jpg',
+    'image/gif',
+    'image/svg+xml',
+  ];
   /**
    * Drop handler
    * @method onDrop
@@ -101,18 +113,14 @@ const FileWidget = (props) => {
     const file = files[0];
     readAsDataURL(file).then((data) => {
       const fields = data.match(/^data:(.*);(.*),(.*)$/);
-      if (
-        fields[0].indexOf(
-          'image/png' ||
-            'image/jpeg' ||
-            'image/webp' ||
-            'image/jpg' ||
-            'image/gif' ||
-            'image/svg+xml',
-        ) <= -1
-      ) {
-        // eslint-disable-next-line no-alert
-        alert(intl.formatMessage(messages.invalid_file));
+      if (!allowedFileTypes.includes(fields[1])) {
+        toast.error(
+          <Toast
+            autoClose={5000}
+            title={intl.formatMessage(messages.invalid_file)}
+          />,
+        );
         return;
       } else {
         onChange(id, {

package/src/customizations/volto/components/theme/Header/Header.jsx CHANGED Viewed

@@ -218,39 +218,18 @@ class Header extends Component {
                   </li>
                 </ul>
                 <div
-                  onMouseOut={(e) => {
-                    // this event might be a touch on the search button, make sure it isnt.
-                    // ccl-header-search-show
-                    if (
-                      !e.currentTarget.classList.contains(
-                        'ccl-header-search-show',
-                      ) &&
-                      !e.currentTarget.classList.contains(
-                        'ccl-header-search-hidden',
-                      )
-                    ) {
-                      this.setState({ mobileSearchBoxOpen: false });
-                    }
-                  }}
-                  onBlur={(e) => {
-                    if (
-                      !e.currentTarget.classList.contains(
-                        'ccl-header-search-show',
-                      ) &&
-                      !e.currentTarget.classList.contains(
-                        'ccl-header-search-hidden',
-                      )
-                    ) {
-                      this.setState({ mobileSearchBoxOpen: false });
-                    }
-                  }}
                   className={
                     this.state.mobileSearchBoxOpen
                       ? 'ccl-header-search-show'
                       : 'ccl-header-search-hidden'
                   }
                 >
-                  <SearchWidget pathname={this.props.pathname} />
+                  <SearchWidget
+                    pathname={this.props.pathname}
+                    setHeaderState={(p) => {
+                      this.setState(p);
+                    }}
+                  />
                 </div>
                 {/* Language selector wont be shown until translations are completed */}
                 {/* <CclLanguageSelector /> */}

package/src/customizations/volto/components/theme/Logout/Logout.jsx CHANGED Viewed

@@ -1,14 +1,16 @@
+import { Component } from 'react';
+import { connect } from 'react-redux';
+import { logout, purgeMessages } from '@plone/volto/actions';
+import PropTypes from 'prop-types';
+import qs from 'query-string';
 /**
  * Login container.
  * @module components/theme/Logout/Logout
  */
-import { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import qs from 'query-string';
-import { logout, purgeMessages } from '@plone/volto/actions';
 /**
  * Logout class.
  * @class Logout
@@ -39,7 +41,8 @@ class CclLogout extends Component {
   componentDidMount() {
     // eslint-disable-next-line no-restricted-globals
-    this.props.logout().then(history.back(1));
+    this.props.logout();
+    window.location.href = '/';
     this.props.purgeMessages();
   }

package/src/customizations/volto/components/theme/SearchWidget/SearchWidget.jsx CHANGED Viewed

@@ -105,7 +105,32 @@ class SearchWidget extends Component {
       <Form
         className="ccl-header-search"
         action="/global-search"
-        onSubmit={this.onSubmit}
+        onMouseOut={(e) => {
+          if (e.relatedTarget) {
+            if (
+              !e.relatedTarget.offsetParent.classList.contains(
+                'ccl-header-search',
+              )
+            ) {
+              this.props.setHeaderState({ mobileSearchBoxOpen: false });
+            }
+          } else {
+            this.props.setHeaderState({ mobileSearchBoxOpen: false });
+          }
+        }}
+        onBlur={(e) => {
+          if (e.relatedTarget) {
+            if (
+              !e.relatedTarget.offsetParent.classList.contains(
+                'ccl-header-search',
+              )
+            ) {
+              this.props.setHeaderState({ mobileSearchBoxOpen: false });
+            }
+          } else {
+            this.props.setHeaderState({ mobileSearchBoxOpen: false });
+          }
+        }}
       >
         <Input
           aria-label={this.props.intl.formatMessage(messages.search)}
@@ -119,8 +144,15 @@ class SearchWidget extends Component {
         <button
           type="submit"
           aria-label={this.props.intl.formatMessage(messages.search)}
+          onClick={this.onSubmit}
         >
-          <span className="ccl-icon-zoom"></span>
+          <span
+            className="ccl-icon-zoom"
+            role="button"
+            onClick={this.onSubmit}
+            onKeyDown={this.onSubmit}
+            tabIndex={0}
+          ></span>
         </button>
       </Form>
     );