@eeacms/volto-clms-theme 1.0.201 → 1.0.203

package/CHANGELOG.md

@@ -4,6 +4,25 @@ 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.203](https://github.com/eea/volto-clms-theme/compare/1.0.202...1.0.203) - 12 May 2023
+
+#### :rocket: New Features
+
+- feat: CLMS-2068 spatial resolution filter counts as 1 [Unai - [`f4e0809`](https://github.com/eea/volto-clms-theme/commit/f4e0809606e4e87eb25780a863b614181708c807)]
+
+#### :hammer_and_wrench: Others
+
+- dashboard style [Unai - [`b6a5532`](https://github.com/eea/volto-clms-theme/commit/b6a5532fc3229124a04f613b9bcf9b8514bd4a20)]
+- Refactor Apply filters with Close [Unai - [`504cc76`](https://github.com/eea/volto-clms-theme/commit/504cc76c8eae7df3ed44e41d1650012cdb589404)]
+### [1.0.202](https://github.com/eea/volto-clms-theme/compare/1.0.201...1.0.202) - 11 May 2023
+
+#### :rocket: New Features
+
+- feat: CLMS-1556 cart datasets not doleted after downloading [Unai - [`d92704a`](https://github.com/eea/volto-clms-theme/commit/d92704ae8bb2d6346627767da894a2e0e755e2b2)]
+
+#### :hammer_and_wrench: Others
+
+- mediaquery in dashboards for big devices [Unai - [`ede6386`](https://github.com/eea/volto-clms-theme/commit/ede6386b1d30d5a0c9cd9be490df2eaba42ed4e9)]
 ### [1.0.201](https://github.com/eea/volto-clms-theme/compare/1.0.200...1.0.201) - 9 May 2023
 
 #### :rocket: New Features
@@ -15,7 +34,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - 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
 
@@ -1088,6 +1106,7 @@ 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)]
@@ -1238,6 +1257,7 @@ 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
@@ -2142,11 +2162,13 @@ 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.201",
+  "version": "1.0.203",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

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

@@ -29,6 +29,7 @@ const FilterList = (props) => {
           baseFacets.map((bf) => bf.field?.value).includes(v[0]),
       ),
   );
+
   const fieldsToAvoidChildren =
     data?.facets?.length > 0
       ? data.facets
@@ -61,10 +62,14 @@ const FilterList = (props) => {
   Object.keys(currentFilters).forEach((filterKey) => {
     if (typeof currentFilters[filterKey] === 'object') {
       currentFiltersToCount[filterKey] =
-        baseFacets.filter((facet) => facet.field.value === filterKey).length >
+        (baseFacets.filter((facet) => facet.field.value === filterKey).length >
+          0 &&
+          baseFacets.filter((facet) => facet.field.value === filterKey)[0]
+            .type === 'doubleRangeFacet') ||
+        (baseFacets.filter((facet) => facet.field.value === filterKey).length >
           0 &&
-        baseFacets.filter((facet) => facet.field.value === filterKey)[0]
-          .type === 'doubleRangeFacet'
+          baseFacets.filter((facet) => facet.field.value === filterKey)[0]
+            .type === 'doubleRangeSpatialFacet')
           ? ['placeholder']
           : currentFilters[filterKey].filter((filter) => {
               return !filtersToAvoidSet.has(filter);
@@ -76,6 +81,7 @@ const FilterList = (props) => {
 
   const totalFilters = [].concat.apply([], Object.values(currentFiltersToCount))
     .length;
+
   const intl = useIntl();
   return showFilterList && Object.keys(currentFilters).length ? (
     <div className="accordion ui filter-listing">

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -33,7 +33,7 @@ import './cart-table.less';
 const CLMSCartContent = (props) => {
   const { localSessionCart } = props;
   const dispatch = useDispatch();
-  const { removeCartItem, removeCartItems, updateCart } = useCartState();
+  const { removeCartItem, /* removeCartItems, */ updateCart } = useCartState();
 
   // state connections
   const cart = useSelector((state) => state.cart_items.items);
@@ -110,17 +110,17 @@ const CLMSCartContent = (props) => {
 
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const setCartItemInProgress = (in_progress_unique_ids) => {
-    let started_processing_items =
-      cartItems.length > 0
-        ? cartItems.filter((r) =>
-            in_progress_unique_ids.includes(r['unique_id']),
-          )
-        : [];
-    var items_to_remove =
-      started_processing_items.length > 0
-        ? started_processing_items.map((item) => item.unique_id)
-        : [];
-    removeCartItems(items_to_remove);
+    // let started_processing_items =
+    //   cartItems.length > 0
+    //     ? cartItems.filter((r) =>
+    //         in_progress_unique_ids.includes(r['unique_id']),
+    //       )
+    //     : [];
+    // var items_to_remove =
+    //   started_processing_items.length > 0
+    //     ? started_processing_items.map((item) => item.unique_id)
+    //     : [];
+    // removeCartItems(items_to_remove);
     dispatch(getDownloadtool());
   };
 

package/src/components/CclFiltersModal/CclFiltersModal.jsx

@@ -83,10 +83,7 @@ function CclFiltersModal(props) {
                 onClick={() => closeModal()}
                 onKeyDown={() => closeModal()}
               >
-                <FormattedMessage
-                  id="Apply filters"
-                  defaultMessage="Apply filters"
-                />
+                <FormattedMessage id="Close" defaultMessage="Close" />
               </button>
             </div>
           </div>

package/theme/clms/css/volto-block-style-override.css

@@ -41,7 +41,7 @@ body.is-anonymous main {
 /* detect if is logged in but in view with toolbar open */
 body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous)
   .stretch {
-  max-width: 1636px;
+  max-width: 100vw !important;
   margin: 0;
 }
 
@@ -49,6 +49,106 @@ body:not(.is-authenticated):not(.document_wide_view).stretch {
   padding: 0;
 }
 
+/* @media screen and (max-width: 1790px) {
+  body.section-stats.section-dashboards .stretch {
+    padding-left: 80px !important;
+    margin-left: -21vw !important;
+  }
+}
+ */
+
+@media screen and (max-width: 3900px) {
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous)
+    .stretch {
+    right: auto;
+    left: auto;
+    width: auto;
+    padding: 0;
+    transform: none;
+  }
+
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous):not(.has-toolbar-collapsed)
+    .stretch {
+    max-width: 100vw !important;
+    margin: 0 -26.54vw !important;
+  }
+
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous):not(.has-toolbar)
+    .stretch {
+    max-width: 100vw !important;
+    margin: 0 -26.5vw !important;
+  }
+}
+
+@media screen and (max-width: 3400px) {
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous)
+    .stretch {
+    right: auto;
+    left: auto;
+    width: auto;
+    padding: 0;
+    transform: none;
+  }
+
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous):not(.has-toolbar-collapsed)
+    .stretch {
+    max-width: 100vw !important;
+    margin: 0 -26.54vw !important;
+  }
+
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous):not(.has-toolbar)
+    .stretch {
+    max-width: 100vw !important;
+    margin: 0 -26.5vw !important;
+  }
+}
+
+@media screen and (max-width: 2600px) {
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous)
+    .stretch {
+    right: auto;
+    left: auto;
+    width: auto;
+    padding: 0;
+    transform: none;
+  }
+
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous):not(.has-toolbar-collapsed)
+    .stretch {
+    max-width: 100vw !important;
+    margin: 0 -19.54vw !important;
+  }
+
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous):not(.has-toolbar)
+    .stretch {
+    max-width: 100vw !important;
+    margin: 0 -19.5vw !important;
+  }
+}
+
+@media screen and (max-width: 2200px) {
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous)
+    .stretch {
+    right: auto;
+    left: auto;
+    width: auto;
+    padding: 0;
+    transform: none;
+  }
+
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous):not(.has-toolbar-collapsed)
+    .stretch {
+    max-width: 100vw !important;
+    margin: 0 -18 !important;
+  }
+
+  body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous):not(.has-toolbar)
+    .stretch {
+    max-width: 100vw !important;
+    margin: 0 -18 !important;
+  }
+}
+
 @media screen and (max-width: 1790px) {
   body:not(.view-editview):not(.view-addview):not(.document_wide_view):not(.is-anonymous)
     .stretch {