@eeacms/volto-clms-theme 1.1.74 → 1.1.75

package/CHANGELOG.md

@@ -4,7 +4,23 @@ 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.1.74](https://github.com/eea/volto-clms-theme/compare/1.1.73...1.1.74) - 6 November 2023
+### [1.1.75](https://github.com/eea/volto-clms-theme/compare/1.1.74...1.1.75) - 8 November 2023
+
+#### :rocket: New Features
+
+- feat: allow Files in Global search [Mikel Larreategi - [`fd202e9`](https://github.com/eea/volto-clms-theme/commit/fd202e95810fbcfa369fda1e493265ac01e5c439)]
+
+#### :bug: Bug Fixes
+
+- fix: re-request relatedListings navigating between datasets [Ion Lizarazu - [`8f2c617`](https://github.com/eea/volto-clms-theme/commit/8f2c6177da3bfa4583d4292dcbad2edf49a128fe)]
+- fix:CLMS-2805 addition of two new boxes [Unai - [`31c3285`](https://github.com/eea/volto-clms-theme/commit/31c3285e8f06313919b8bb7492111c35633b0cde)]
+- fix: CLMS-2803 removed < and > buttons from main page's carousel [Unai - [`2b539f4`](https://github.com/eea/volto-clms-theme/commit/2b539f4e26a556bb55d0cf09b92d489786ae7ed3)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`95b48d1`](https://github.com/eea/volto-clms-theme/commit/95b48d109d48a633c614a9f26072b989ad7e6466)]
+
+### [1.1.74](https://github.com/eea/volto-clms-theme/compare/1.1.73...1.1.74) - 7 November 2023
 
 #### :rocket: New Features
 

package/package.json

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

package/src/components/Blocks/CclHomeBgImageBlock/CclHomeBgImageBlockEdit.jsx

@@ -44,6 +44,7 @@ const CclHomeBgImageBlockEdit = (props) => {
             config,
             data.hasButton,
             data.hasLocationInfo,
+            data.hasDatasetButton,
           )}
           title="Carousel Div block"
           onChangeField={(id, value) => {

package/src/components/Blocks/CclHomeBgImageBlock/CclHomeBgImageSchema.js

@@ -1,4 +1,9 @@
-export const HomeBgImageSchema = (config, hasButton, hasLocationInfo) => {
+export const HomeBgImageSchema = (
+  config,
+  hasButton,
+  hasLocationInfo,
+  hasDatasetButton,
+) => {
   const variationsConfig = config.blocks.blocksConfig['homeBgImage'].variations;
   const variations = Object.keys(variationsConfig).map((variation) => [
     variationsConfig[variation].id,
@@ -13,6 +18,20 @@ export const HomeBgImageSchema = (config, hasButton, hasLocationInfo) => {
         },
       ]
     : [];
+  const hasDatasetButtonFieldset = hasDatasetButton
+    ? [
+        {
+          id: 'datasetButtonStyle',
+          title: 'Dataset button style',
+          fields: [
+            'dataset_buttonTitle',
+            'dataset_href',
+            'dataset_style',
+            'dataset_disabled',
+          ],
+        },
+      ]
+    : [];
   const hasLocationFieldset = hasLocationInfo
     ? [
         {
@@ -36,10 +55,15 @@ export const HomeBgImageSchema = (config, hasButton, hasLocationInfo) => {
           'location',
           'hasLocationInfo',
           'hasButton',
+          'dataset_title',
+          'dataset_subtitle',
+          'dataset_description',
+          'hasDatasetButton',
         ],
       },
       ...hasLocationFieldset,
       ...hasButtonFieldset,
+      ...hasDatasetButtonFieldset,
     ],
     properties: {
       title: {
@@ -122,6 +146,52 @@ export const HomeBgImageSchema = (config, hasButton, hasLocationInfo) => {
         type: 'boolean',
         default: false,
       },
+      dataset_title: {
+        title: 'Dataset title',
+        description: 'Dataset div title',
+        type: 'string',
+      },
+      dataset_subtitle: {
+        title: 'Dataset subTitle',
+        description: 'Dataset div Subtitle',
+        type: 'string',
+      },
+      dataset_description: {
+        title: 'Dataset description',
+        description: 'Dataset div description',
+        type: 'string',
+      },
+      hasDatasetButton: {
+        title: 'Dataset button',
+        type: 'boolean',
+        default: false,
+      },
+      dataset_buttonTitle: {
+        title: 'Title',
+        description: 'Add button text',
+        type: 'string',
+      },
+      dataset_href: {
+        title: 'URL',
+        description: 'Select site content or paste external url',
+        widget: 'object_browser',
+        mode: 'link',
+        selectedItemAttrs: ['Title', 'Description', '@type', '@id'],
+        allowExternals: true,
+      },
+      dataset_style: {
+        title: 'Button style',
+        choices: [
+          ['default', 'Default'],
+          ['filled', 'Filled'],
+        ],
+        default: 'default',
+      },
+      dataset_disabled: {
+        title: 'Disabled',
+        type: 'boolean',
+        default: false,
+      },
     },
     required: [],
   };

package/src/components/Blocks/CclHomeBgImageBlock/CclWhiteBgView.jsx

@@ -38,6 +38,41 @@ const CclWhiteBgView = (props) => {
             </CclButton>
           )}
         </div>
+        {data?.dataset_title ||
+          data?.dataset_subtitle ||
+          (data?.dataset_description && (
+            <div className="home-dataset-banner">
+              {data.dataset_title && <h1>{data?.dataset_title}</h1>}
+              {data.dataset_subtitle && <h2>{data?.dataset_subtitle}</h2>}
+              {data.dataset_description && (
+                <h3>{data?.dataset_description} </h3>
+              )}
+              {data?.hasDatasetButton === true && (
+                <CclButton
+                  url={
+                    data?.download &&
+                    data?.dataset_href?.[0]?.['@type'] === 'File'
+                      ? data?.dataset_href?.[0]?.['@id'] + '/@@download/file'
+                      : data?.dataset_href?.[0]?.['@id']
+                  }
+                  disabled={data?.dataset_disabled}
+                  download={
+                    data?.download ||
+                    data?.dataset_href?.[0]?.['@type'] === 'File'
+                  }
+                  target={
+                    data?.target ||
+                    (data?.download &&
+                      data?.dataset_href[0]['@type'] === 'File' &&
+                      '_blank')
+                  }
+                  mode={data?.dataset_style}
+                >
+                  {data?.dataset_buttonTitle}
+                </CclButton>
+              )}
+            </div>
+          ))}
       </div>
     </div>
   );

package/src/components/Blocks/CclRelatedListingBlock/CclRelatedListingView.jsx

@@ -32,10 +32,10 @@ const CclRelatedListingView = (props) => {
   const { pagination, currentPage, paginationSize, dataList } = p_data;
 
   const dispatch = useDispatch();
+  const uid = metadata ? metadata['UID'] : properties['UID'];
   const searchSubrequests = useSelector(
-    (state) => state.search.subrequests?.[id],
+    (state) => state.search.subrequests?.[`${id}-${uid}`],
   );
-  const uid = metadata ? metadata['UID'] : properties['UID'];
 
   const associated = directRelation
     ? directQuery
@@ -96,6 +96,7 @@ const CclRelatedListingView = (props) => {
     }
 
     uid &&
+      id &&
       !searchSubrequests?.loading &&
       !searchSubrequests?.loaded &&
       !searchSubrequests?.error &&
@@ -110,11 +111,12 @@ const CclRelatedListingView = (props) => {
             sort_order: sort_order,
             b_size: 99999,
           },
-          id,
+          `${id}-${uid}`,
         ),
       );
+    return () => {};
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [data, id, uid, dispatch, searchSubrequests]);
+  }, [data, id, uid, dispatch]);
 
   return (
     <>

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

@@ -9,6 +9,7 @@ export const portal_types_labels = {
   TechnicalLibrary: 'Product documentation',
   Document: 'Other content',
   FAQ: 'FAQ',
+  File: 'Files',
 };
 
 export const category_labels = {
@@ -52,6 +53,7 @@ const rewriteOptions = (name, choices) => {
     'Tender',
     'WorkOpportunity',
     'Document',
+    'File',
   ];
 
   const dataset_geographical_classification = [

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/CclCarouselView.jsx

@@ -63,7 +63,7 @@ const View = (props) => {
     );
   };
 
-  const ArrowsGroup = (arrowProps) => {
+  /*   const ArrowsGroup = (arrowProps) => {
     return (
       <div className={'slick-arrows'}>
         <button
@@ -87,7 +87,7 @@ const View = (props) => {
         ></button>
       </div>
     );
-  };
+  }; */
 
   const [showInfo, setShowInfo] = React.useState(false);
   const panes = tabsList.map((tab, index) => {
@@ -113,7 +113,7 @@ const View = (props) => {
       <Slider {...settings} ref={slider} className="home-carousel">
         {panes.length ? panes.map((pane) => pane.renderItem) : ''}
       </Slider>
-      <ArrowsGroup activeTab={activeTab} tabsList={tabsList} slider={slider} />
+      {/* <ArrowsGroup activeTab={activeTab} tabsList={tabsList} slider={slider} /> */}
       <Dots
         dotActiveTab={activeTab}
         dotTabsList={tabsList}

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/custom.less

@@ -10,6 +10,7 @@ div.tabs-block.CCLCarousel {
     width: 100vw !important;
     max-width: initial !important;
     margin-right: -50vw !important;
+    margin-bottom: -2rem;
     margin-left: -50vw !important;
   }
 }

package/theme/site/extras/home.less

@@ -149,7 +149,7 @@
   padding: 0 2rem;
 }
 
-@media (max-width:770px) {
+@media (max-width: 770px) {
   .ccl-banner-top-main img {
     min-height: 550px;
     max-height: 550px;
@@ -174,6 +174,12 @@
   }
 }
 
+@media (max-width: 1200px) {
+  .home-carousel {
+    margin-bottom: -4rem;
+  }
+}
+
 .home-carousel .slick-dots {
   position: absolute;
   bottom: 3.75rem;
@@ -396,9 +402,32 @@
 .home-map-container > .ccl-container {
   position: absolute;
   bottom: 4rem;
+  display: flex;
   width: 100%;
   max-width: 1400px;
+  flex-wrap: wrap;
+  justify-content: center;
   padding: 0 2rem;
+  gap: 1rem;
+}
+
+@media (max-width: 990px) {
+  .home-map-container img {
+    min-height: 320px;
+  }
+}
+
+@media (max-width: 700px) {
+  .home-dataset-banner,
+  .home-map-banner {
+    min-width: 320px;
+  }
+
+  .home-map-container > .ccl-container {
+    bottom: 0;
+    height: 100%;
+    padding: 1rem 0;
+  }
 }
 
 @media (max-width: 480px) {
@@ -407,6 +436,8 @@
   }
 
   .home-map-container > .ccl-container {
+    bottom: 4rem;
+    height: auto;
     padding: 0;
   }
 }
@@ -424,8 +455,21 @@
   .home-map-banner {
     width: 40%;
   }
+
+  .home-dataset-banner {
+    width: 40%;
+  }
 }
 
+.home-dataset-banner {
+  max-width: 100%;
+  padding: 1.5rem;
+  background-color: fade(@white, 70%);
+}
+
+.home-dataset-banner h4 {
+  margin-bottom: 1rem;
+}
 /* Meet band */
 .home-meet-container {
   padding: 3rem 1rem;