@eeacms/volto-cca-policy 0.3.54 → 0.3.56

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).
 
+### [0.3.56](https://github.com/eea/volto-cca-policy/compare/0.3.55...0.3.56) - 25 June 2025
+
+#### :nail_care: Enhancements
+
+- change: better draft background handling by excluding 'archived' state [kreafox - [`1181696`](https://github.com/eea/volto-cca-policy/commit/1181696f724e1852eba80de3368cfafdabd1eff2)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`3ca17fb`](https://github.com/eea/volto-cca-policy/commit/3ca17fb185321b363081de02876f1b10e6e7a009)]
+
+#### :hammer_and_wrench: Others
+
+- format code [kreafox - [`92fe10f`](https://github.com/eea/volto-cca-policy/commit/92fe10f50961faaf4604f64bfdaddad19e991a58)]
+### [0.3.55](https://github.com/eea/volto-cca-policy/compare/0.3.54...0.3.55) - 25 June 2025
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-openlayers-map@1.0.1 [EEA Jenkins - [`a7882a3`](https://github.com/eea/volto-cca-policy/commit/a7882a3c97f75188b7a5c8546dfd2d8647772923)]
+
 ### [0.3.54](https://github.com/eea/volto-cca-policy/compare/0.3.53...0.3.54) - 24 June 2025
 
 #### :bug: Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.3.54",
+  "version": "0.3.56",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -34,7 +34,7 @@
     "@eeacms/volto-embed": "^9.1.1",
     "@eeacms/volto-globalsearch": "2.1.2",
     "@eeacms/volto-hero-block": "^7.1.0",
-    "@eeacms/volto-openlayers-map": "1.0.0",
+    "@eeacms/volto-openlayers-map": "1.0.1",
     "@eeacms/volto-searchlib": "2.0.16",
     "@eeacms/volto-slate-label": "^0.6.0",
     "@eeacms/volto-tabs-block": "^7.5.1",

package/src/customizations/@eeacms/volto-eea-website-theme/components/theme/DraftBackground/DraftBackground.jsx

@@ -0,0 +1,95 @@
+import { BodyClass, flattenToAppURL } from '@plone/volto/helpers';
+import { connect } from 'react-redux';
+import { withRouter } from 'react-router-dom';
+import { compose } from 'redux';
+import '@eeacms/volto-eea-website-theme/components/theme/DraftBackground/draft.css';
+
+/**
+ * Removes any trailing slashes from the given string.
+ *
+ * @param {string} str - The input string to remove trailing slashes from.
+ * @returns {string} The input string with any trailing slashes removed.
+ */
+const removeTrailingSlash = (str) => {
+  return str.replace(/\/+$/, '');
+};
+
+/**
+ * Checks if a given date is in the future.
+ *
+ * @param {string} date - The date to check.
+ * @returns {boolean} `true` if the date is in the future, `false` otherwise.
+ */
+const dateIsInFuture = (date) => {
+  return (
+    date && date !== 'None' && new Date(date).getTime() > new Date().getTime()
+  );
+};
+
+/**
+ * Checks if the current content is published.
+ *
+ * This function checks the review state and effective date of the current content
+ * to determine if it should be considered published. It handles various cases,
+ * such as when the review state is null, when the content has a parent, and when
+ * the effective date is in the future.
+ *
+ * @param {object} props - The props object containing information about the current content.
+ * @param {string} props.contentId - The ID of the current content.
+ * @param {string} props.pathname - The current URL pathname.
+ * @param {object} props.content - The content object.
+ * @param {string} props.review_state - The review state of the current content.
+ * @returns {boolean} - True if the content is considered published, false otherwise.
+ */
+export const checkIfPublished = (props) => {
+  //case 0: the state is not for the current content-type eg: Go to /contents from a page
+  if (props.contentId !== removeTrailingSlash(props.pathname)) return true;
+
+  // set draft image if effective date is set and is in the future
+  // regardless of review_state
+  const effectiveDate = props?.content?.effective;
+  if (dateIsInFuture(effectiveDate)) {
+    return false;
+  }
+
+  const reviewState = props?.review_state;
+
+  //case 1 : review_state published or archived (customization)
+  if (reviewState === 'published' || reviewState === 'archived') return true;
+
+  //case 2: review_state null, but parent is published eg:Image in published folder
+  // is marked as published, or not published if the effective date of parent
+  // is in the future
+  const parent = props?.content?.parent;
+  const parentReviewState = parent?.review_state;
+  if (!reviewState && parentReviewState === 'published') {
+    if (dateIsInFuture(parent?.effective)) {
+      return false;
+    }
+    return true;
+  }
+
+  //case 3: review_state null, but there is no parent eg: PloneSite
+  if (!reviewState && Object.keys(parent || {}).length === 0) return true;
+
+  //case 4: review_state null, and review state of parent is null, eg: Image in PloneSite
+  if (!reviewState && !parentReviewState) return true;
+  return false;
+};
+
+const DraftBackground = (props) => {
+  let draftClass = 'wf-state-is-draft';
+
+  if (checkIfPublished(props)) {
+    draftClass = '';
+  }
+  return draftClass ? <BodyClass className={draftClass} /> : '';
+};
+
+export default compose(
+  withRouter,
+  connect((state, props) => ({
+    review_state: state.content.data?.review_state,
+    contentId: flattenToAppURL(state.content.data?.['@id']),
+  })),
+)(DraftBackground);

package/src/customizations/@eeacms/volto-eea-website-theme/components/theme/DraftBackground/README.md

@@ -0,0 +1 @@
+Included the 'archived' review state in the published check to ensure archived content does not display the draft background.

package/theme/globals/views.less

@@ -337,6 +337,3 @@ hr {
 }
 
 
-body.view-viewview.wf-state-is-draft {
-  background-image: none !important;
-}