@eeacms/volto-clms-theme 1.1.153 → 1.1.154

package/CHANGELOG.md

@@ -4,6 +4,17 @@ 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.154](https://github.com/eea/volto-clms-theme/compare/1.1.153...1.1.154) - 23 May 2024
+
+#### :hammer_and_wrench: Others
+
+- fix [Mikel Larreategi - [`709240b`](https://github.com/eea/volto-clms-theme/commit/709240bc8ed40d07a11fbfc385f334a0bc9547e6)]
+- simplify conditions [Mikel Larreategi - [`37ae35d`](https://github.com/eea/volto-clms-theme/commit/37ae35dbdf1832e8d9cc2bc57d696ddef2d770d6)]
+- rename function [Mikel Larreategi - [`fa4efb0`](https://github.com/eea/volto-clms-theme/commit/fa4efb0fad0d0bdb745ec0821aa271b3fdfabe37)]
+- add tsets [Mikel Larreategi - [`68cd6d0`](https://github.com/eea/volto-clms-theme/commit/68cd6d0e4aaa084c1a723a4614cf2d1ca1fed41b)]
+- fix [Unai Etxaburu - [`95eaff9`](https://github.com/eea/volto-clms-theme/commit/95eaff909334117782059acb0fc815f217d7099d)]
+- isEmpty util created to secure no empty html is stored in dataset data [Unai Etxaburu - [`48f2143`](https://github.com/eea/volto-clms-theme/commit/48f21430975eaaf9f1f6ebdc2eea8cb62af449c9)]
+- add subject param to the on demand TL rendering link [Ion Lizarazu - [`8e90ff4`](https://github.com/eea/volto-clms-theme/commit/8e90ff4f84bc3e4d38db2e004f3d822c13f9a1af)]
 ### [1.1.153](https://github.com/eea/volto-clms-theme/compare/1.1.152...1.1.153) - 22 May 2024
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/CLMSDatasetDetailView/DataSetInfoContent.jsx

@@ -16,6 +16,7 @@ import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 import { hasBlocksData } from '@plone/volto/helpers';
 
 import './datasetinfocontent.less';
+import { sanitizedHTML } from '../CclUtils';
 
 const DataSetInfoContent = (props) => {
   const dispatch = useDispatch();
@@ -24,6 +25,12 @@ const DataSetInfoContent = (props) => {
   const searchSubrequests = useSelector((state) => state.search.subrequests);
   let libraries = searchSubrequests?.[id]?.items || [];
   let librariesPending = searchSubrequests?.[id]?.loading;
+  let validationClearHTMLTags = sanitizedHTML(validation?.data);
+  let citationClearHTMLTags = sanitizedHTML(citation?.data);
+  let technical_documents_accordion_text = sanitizedHTML(
+    props.technical_documents_accordion_text?.data,
+  );
+
   React.useEffect(() => {
     if (UID) {
       dispatch(
@@ -115,24 +122,20 @@ const DataSetInfoContent = (props) => {
           ''
         )}
       </CclInfoContainer>
-      {validation?.data &&
-        validation?.data !== '<p><br/></p>' &&
-        validation?.data !== '<p></p>' && (
-          <CclCitation
-            title="Validation status"
-            marginBottom={true}
-            children={<StringToHTML string={validation.data} />}
-          ></CclCitation>
-        )}
-      {citation?.data &&
-        citation?.data !== '<p><br/></p>' &&
-        citation?.data !== '<p></p>' && (
-          <CclCitation
-            title="Dataset citation"
-            marginBottom={true}
-            children={<StringToHTML string={citation?.data} />}
-          ></CclCitation>
-        )}
+      {validationClearHTMLTags !== '' && (
+        <CclCitation
+          title="Validation status"
+          marginBottom={true}
+          children={<StringToHTML string={validation.data} />}
+        ></CclCitation>
+      )}
+      {citationClearHTMLTags !== '' && (
+        <CclCitation
+          title="Dataset citation"
+          marginBottom={true}
+          children={<StringToHTML string={citation?.data} />}
+        ></CclCitation>
+      )}
       <div className="dataset-info-documents dropdown">
         <div className="accordion-block">
           {renderAccordion(geonetwork_identifiers?.items, libraries) && (
@@ -317,17 +320,13 @@ const DataSetInfoContent = (props) => {
                       duration={500}
                       height={'auto'}
                     >
-                      {props.technical_documents_accordion_text?.data &&
-                        props.technical_documents_accordion_text?.data !==
-                          '<p><br/></p>' &&
-                        props.technical_documents_accordion_text?.data !==
-                          '<p></p>' && (
-                          <StringToHTML
-                            string={
-                              props.technical_documents_accordion_text?.data
-                            }
-                          />
-                        )}
+                      {technical_documents_accordion_text !== '' && (
+                        <StringToHTML
+                          string={
+                            props.technical_documents_accordion_text?.data
+                          }
+                        />
+                      )}
                       <CclRelatedListingView
                         id={'dataset-info-technicals'}
                         properties={{ ...props }}

package/src/components/CLMSDatasetDetailView/DownloadDataSetContent.jsx

@@ -5,11 +5,23 @@ import { useSelector } from 'react-redux';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
 import CclDownloadTable from '@eeacms/volto-clms-theme/components/CclDownloadTable/CclDownloadTable';
 import CclLoginModal from '@eeacms/volto-clms-theme/components/CclLoginModal/CclLoginModal';
-import { StringToHTML } from '@eeacms/volto-clms-theme/components/CclUtils';
+import {
+  StringToHTML,
+  sanitizedHTML,
+} from '@eeacms/volto-clms-theme/components/CclUtils';
 
 const DownloadDataSetContent = (data, token) => {
   const user = useSelector((state) => state?.users?.user);
   const locale = useSelector((state) => state?.intl?.locale);
+  let download_other_ways_access_dataset = sanitizedHTML(
+    data.download_other_ways_access_dataset?.data,
+  );
+  let download_full_dataset_text = sanitizedHTML(
+    data.download_full_dataset_text?.data,
+  );
+  let download_by_area_extra_text = sanitizedHTML(
+    data.download_by_area_extra_text?.data,
+  );
 
   return (
     <div>
@@ -66,42 +78,31 @@ const DownloadDataSetContent = (data, token) => {
         </div>
       )}
 
-      {data?.downloadable_full_dataset &&
-        data.download_by_area_extra_text?.data &&
-        data.download_by_area_extra_text?.data !== '<p><br/><p>' &&
-        data.download_by_area_extra_text?.data !== '<p></p>' && (
-          <div className="dataset-download-area">
-            <StringToHTML
-              string={data.download_by_area_extra_text?.data || ''}
-            />
-          </div>
-        )}
+      {data?.downloadable_full_dataset && download_by_area_extra_text !== '' && (
+        <div className="dataset-download-area">
+          <StringToHTML string={data.download_by_area_extra_text?.data || ''} />
+        </div>
+      )}
 
-      {data.download_full_dataset_text?.data &&
-        data.download_full_dataset_text?.data !== '<p><br/><p>' &&
-        data.download_full_dataset_text?.data !== '<p></p>' && (
-          <div className="dataset-download-area">
-            <h2>Download full dataset</h2>
-            <StringToHTML
-              string={data.download_full_dataset_text?.data || ''}
-            />
-          </div>
-        )}
+      {download_full_dataset_text !== '' && (
+        <div className="dataset-download-area">
+          <h2>Download full dataset</h2>
+          <StringToHTML string={data.download_full_dataset_text?.data || ''} />
+        </div>
+      )}
 
       {data.downloadable_files?.items?.length > 0 && (
         <CclDownloadTable dataset={data}></CclDownloadTable>
       )}
 
-      {data?.download_other_ways_access_dataset?.data &&
-        data?.download_other_ways_access_dataset?.data !== '<p><br/><p>' &&
-        data?.download_other_ways_access_dataset?.data !== '<p></p>' && (
-          <div className="dataset-access-container">
-            <h2>You can also access this dataset</h2>
-            <StringToHTML
-              string={data?.download_other_ways_access_dataset?.data || ''}
-            />
-          </div>
-        )}
+      {download_other_ways_access_dataset !== '' && (
+        <div className="dataset-access-container">
+          <h2>You can also access this dataset</h2>
+          <StringToHTML
+            string={data?.download_other_ways_access_dataset?.data || ''}
+          />
+        </div>
+      )}
     </div>
   );
 };

package/src/components/CLMSTechnicalLibraryView/CLMSTechnicalLibraryView.jsx

@@ -7,6 +7,9 @@ const CLMSTechnicalLibraryView = (props) => {
   const textToForm = encodeURIComponent(
     `I want the following document ${content.title} ${content['@id']}`,
   );
+  const subjectToForm = encodeURIComponent(
+    'I want to ask for an on-demand document',
+  );
 
   return (
     <div className="ccl-container">
@@ -22,7 +25,9 @@ const CLMSTechnicalLibraryView = (props) => {
             <>
               <p>
                 You are requesting an on-demand document. Please contact the{' '}
-                <a href={`/en/contact-service-helpdesk?text=${textToForm}`}>
+                <a
+                  href={`/en/contact-service-helpdesk?text=${textToForm}&subject=${subjectToForm}`}
+                >
                   service desk
                 </a>{' '}
                 to obtain it.

package/src/components/CclUtils/index.js

@@ -11,3 +11,4 @@ export {
   cclTimeFormat,
 } from './dateFormats';
 export { helmetTitle } from './helmetTitle';
+export { sanitizedHTML } from './sanitizedHTML';

package/src/components/CclUtils/sanitizedHTML.js

@@ -0,0 +1,11 @@
+export const sanitizedHTML = (strToSanitize) => {
+  if (strToSanitize === undefined) {
+    return '';
+  }
+  const parser = new DOMParser();
+  let myHTML = parser.parseFromString(strToSanitize, 'text/html');
+  // let test = strToSanitize.replace(/(<([^>]+)>)/gi, '');
+  // console.log('myHTML', myHTML);
+  // console.log('test', test);
+  return myHTML.body.textContent || '';
+};

package/src/components/CclUtils/sanitizedHTML.test.js

@@ -0,0 +1,22 @@
+import { sanitizedHTML } from './sanitizedHTML';
+
+describe('Test empty things', () => {
+  it('Undefined', () => {
+    expect(sanitizedHTML(undefined)).toBe('');
+  });
+  it('Empty HTML P', () => {
+    expect(sanitizedHTML('<p></p>')).toBe('');
+  });
+  it('Empty HTML P with br', () => {
+    expect(sanitizedHTML('<p><br/></p>')).toBe('');
+  });
+  it('Empty HTML P with br and body', () => {
+    expect(sanitizedHTML('<html><body><p><br/></p></body></html>')).toBe('');
+  });
+  it('Some content', () => {
+    expect(sanitizedHTML('<strong>Some content</strong>')).toBe('Some content');
+  });
+  it('Some content with spaces', () => {
+    expect(sanitizedHTML('<strong>   </strong>')).toBe('   ');
+  });
+});