@eeacms/volto-clms-theme 1.1.184 → 1.1.186

package/CHANGELOG.md

@@ -4,15 +4,22 @@ 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.186](https://github.com/eea/volto-clms-theme/compare/1.1.185...1.1.186) - 19 September 2024
+
+#### :hammer_and_wrench: Others
+
+- Refs #277384 - Keep file url for admins, use @@download/file for anonymous. [GhitaB - [`a550b19`](https://github.com/eea/volto-clms-theme/commit/a550b19ad1f03409830d44003b6e9d98a9c0eab2)]
+- Refs #277384 - Add isFileDownload customization for File in UniversalLink, to solve @@download/file case. [GhitaB - [`ed61153`](https://github.com/eea/volto-clms-theme/commit/ed6115360c80d12bae399f6fb4ec7eb08c2319eb)]
+- Refs #277384 - Add isFileDownload customization for File in UniversalLink, to solve @@download/file case. [GhitaB - [`65c339a`](https://github.com/eea/volto-clms-theme/commit/65c339a198c89eb31a27224a2dc1c00d276d0964)]
+- Add override [Tiberiu Ichim - [`0874ed6`](https://github.com/eea/volto-clms-theme/commit/0874ed6f47505e7d8c18ea0bff300c8ff9800538)]
+### [1.1.185](https://github.com/eea/volto-clms-theme/compare/1.1.184...1.1.185) - 4 September 2024
+
 ### [1.1.184](https://github.com/eea/volto-clms-theme/compare/1.1.183...1.1.184) - 3 September 2024
 
 #### :house: Internal changes
 
 - style: Automated code fix [eea-jenkins - [`8302cad`](https://github.com/eea/volto-clms-theme/commit/8302cad711d1ce5ff6998004cbb6824ea133b008)]
 
-#### :hammer_and_wrench: Others
-
-- Set root node and depth for contextnavigation [Tiberiu Ichim - [`b7e4ed7`](https://github.com/eea/volto-clms-theme/commit/b7e4ed7c55e00c70f084d92ad340e4fd943156af)]
 ### [1.1.183](https://github.com/eea/volto-clms-theme/compare/1.1.182...1.1.183) - 2 September 2024
 
 #### :house: Internal changes

package/package.json

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

package/src/@plone/volto/packages/volto-slate/editor/plugins/AdvancedLink/render.jsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import { UniversalLink } from '@plone/volto/components';
+import '@plone/volto-slate/editor/plugins/AdvancedLink/styles.less';
+
+export const LinkElement = ({ attributes, children, element, mode }) => {
+  // TODO: handle title on internal links
+  let url = element.url;
+  const { link } = element.data || {};
+
+  const internal_link = link?.internal?.internal_link?.[0]?.['@id'];
+  const isDownload = link?.internal?.internal_link?.[0]?.['download'];
+  const external_link = link?.external?.external_link;
+  const email = link?.email;
+
+  const href = email
+    ? `mailto:${email.email_address}${
+        email.email_subject ? `?subject=${email.email_subject}` : ''
+      }`
+    : external_link || internal_link || url;
+
+  const { title } = element?.data || {};
+
+  return mode === 'view' ? (
+    <>
+      <UniversalLink
+        href={href || '#'}
+        openLinkInNewTab={link?.external?.target === '_blank'}
+        title={title}
+        download={isDownload}
+      >
+        {children}
+      </UniversalLink>
+    </>
+  ) : (
+    <span {...attributes} className="slate-editor-link">
+      {children}
+    </span>
+  );
+};

package/src/components/CLMSDownloadCartView/Fields/TimeseriesPicker.jsx

@@ -100,10 +100,12 @@ export const TimeseriesPicker = (props) => {
               showMonthDropdown
               showYearDropdown
             >
-              {(startValue || endValue) && (
+              {(item?.TemporalFilter?.StartDate ||
+                item?.TemporalFilter?.EndDate) && (
                 <span>
-                  {cclDateFormat(startValue)} -{' '}
-                  {endValue && cclDateFormat(endValue)}
+                  {cclDateFormat(item?.TemporalFilter?.StartDate)} -{' '}
+                  {item?.TemporalFilter?.EndDate &&
+                    cclDateFormat(item?.TemporalFilter?.EndDate)}
                 </span>
               )}
               <br />

package/src/customizations/@plone/volto-slate/editor/plugins/AdvancedLink/render.jsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import { UniversalLink } from '@plone/volto/components';
+import '@plone/volto-slate/editor/plugins/AdvancedLink/styles.less';
+
+export const LinkElement = ({ attributes, children, element, mode }) => {
+  // TODO: handle title on internal links
+  let url = element.url;
+  const { link } = element.data || {};
+
+  const internal_link = link?.internal?.internal_link?.[0]?.['@id'];
+  const isDownload = link?.internal?.internal_link?.[0]?.['download'];
+  const external_link = link?.external?.external_link;
+  const email = link?.email;
+
+  const href = email
+    ? `mailto:${email.email_address}${
+        email.email_subject ? `?subject=${email.email_subject}` : ''
+      }`
+    : external_link || internal_link || url;
+
+  const { title } = element?.data || {};
+
+  return mode === 'view' ? (
+    <>
+      <UniversalLink
+        href={href || '#'}
+        openLinkInNewTab={link?.external?.target === '_blank'}
+        title={title}
+        isFileDownload={isDownload}
+      >
+        {children}
+      </UniversalLink>
+    </>
+  ) : (
+    <span {...attributes} className="slate-editor-link">
+      {children}
+    </span>
+  );
+};

package/src/customizations/volto/components/manage/UniversalLink/UniversalLink.jsx

@@ -21,6 +21,7 @@ const UniversalLink = ({
   item = null,
   openLinkInNewTab,
   download = false,
+  isFileDownload = false,
   children,
   className = null,
   title = null,
@@ -29,6 +30,11 @@ const UniversalLink = ({
   const token = useSelector((state) => state.userSession?.token);
 
   let url = href;
+
+  if (!token && isFileDownload) {
+    url = `${url}/@@download/file`;
+  }
+
   if (!href && item) {
     if (!item['@id']) {
       // eslint-disable-next-line no-console