@eeacms/volto-eea-website-theme 1.8.1 → 1.8.2

package/CHANGELOG.md

@@ -4,6 +4,28 @@ 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.8.2](https://github.com/eea/volto-eea-website-theme/compare/1.8.1...1.8.2) - 14 February 2023
+
+#### :rocket: New Features
+
+- feat: use removeTrailingSlash [Mimi - [`2fa8e23`](https://github.com/eea/volto-eea-website-theme/commit/2fa8e23525af589efb13f5b04e52026a97245556)]
+- feat: compare pathname to contentId to show draft watermark [Mimi - [`de870d8`](https://github.com/eea/volto-eea-website-theme/commit/de870d8be85b7aa64e26697e1e19709c1c4721cb)]
+- feat: show or remove the draft watermark based on the value from the ENV file [Mimi - [`e5d2ce0`](https://github.com/eea/volto-eea-website-theme/commit/e5d2ce00f865cbe5ddb95030cb8ccd8a609ebf02)]
+- feat: remove draft image from control panel and login [Mimi - [`274891a`](https://github.com/eea/volto-eea-website-theme/commit/274891a0810102e445813bb59735c56403125895)]
+
+#### :bug: Bug Fixes
+
+- fix(search): Fix some issues in the search popup #107 from eea/fix-search-popup [ichim-david - [`07b03df`](https://github.com/eea/volto-eea-website-theme/commit/07b03df36022da21d4c80b220cf529840e00c707)]
+- fix(search): Fix undefined [kreafox - [`613d358`](https://github.com/eea/volto-eea-website-theme/commit/613d35860222ede3d40fc61acc0202b95e53108b)]
+- fix(search): Fix some issues in the search popup [kreafox - [`13b5e64`](https://github.com/eea/volto-eea-website-theme/commit/13b5e64b69eacffacf2e65b9c5336cbcb5a9dfa7)]
+
+#### :house: Internal changes
+
+- chore: clean up [Mimi - [`b80f1dc`](https://github.com/eea/volto-eea-website-theme/commit/b80f1dcc5e5cd1d369bdcea574dd8158785af6be)]
+- chore: use runtimeConfig for the RAZZLE_DISABLE_DRAFT_WATERMARK variable [Mimi - [`6b6cc83`](https://github.com/eea/volto-eea-website-theme/commit/6b6cc83dd0e6a4820d75acfdc8d41e092831261d)]
+- chore: clean up [Mimi - [`807ca82`](https://github.com/eea/volto-eea-website-theme/commit/807ca82820319c0d45096dcbe228eee4262b602c)]
+- chore: add missing code [Mimi - [`3a93e94`](https://github.com/eea/volto-eea-website-theme/commit/3a93e944613af0ee3ca1ed25c2439d9c504d4591)]
+
 ### [1.8.1](https://github.com/eea/volto-eea-website-theme/compare/1.8.0...1.8.1) - 9 February 2023
 
 #### :rocket: New Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/theme/DraftBackground/DraftBackground.jsx

@@ -2,15 +2,51 @@ import React from 'react';
 import { connect } from 'react-redux';
 import './draft.css';
 import { BodyClass } from '@plone/volto/helpers';
+import { withRouter } from 'react-router-dom';
+import { compose } from 'redux';
+import { runtimeConfig } from '@plone/volto/runtime_config';
+import { flattenToAppURL } from '@plone/volto/helpers';
 
-const DraftBackground = ({ review_state }) => {
-  const draftClass = `wf-state-${review_state}`;
-  return <BodyClass className={draftClass} />;
+const removeTrailingSlash = (str) => {
+  return str.replace(/\/+$/, '');
 };
-function propsAreEqual(prevProps, nextProps) {
-  return prevProps.review_state === nextProps.review_state;
-}
 
-export default connect((state) => ({
-  review_state: state.content.data?.review_state,
-}))(React.memo(DraftBackground, propsAreEqual));
+/**
+ * The review_state and id don't change everytime the page is changed and because of that the draft background
+ * will apear on pages that shouldn't have it. The RAZZLE_DISABLE_DRAFT_WATERMARK varible from ENV file should have two possible values:
+ * "Hide-No-Workflow" and "Hide-All". If the variable is not present, it should follow the current logic(show the draft image everywhere),
+ * if the value is "Hide-No-Workflow", then the draft image is not shown on pages like login or controlpanel and if the value is "Hide-All", then
+ * the draft image is not visible at all.
+ * For example, if the current page is /datatable (that has the draft background) and then we go to Content Types page,
+ * the review_state and id will be the same as the ones from /datatable, so the draft background will still be present. By checking
+ * if the pathname from (from withRouter) is different than the one from state.content.data and based on the varible from ENV,
+ * we decide if the draft backgound can be present or not.
+ * @param {Object} props
+ * @returns
+ */
+const DraftBackground = (props) => {
+  const draftClass = `wf-state-${props.review_state}`;
+  const razzleDraft =
+    runtimeConfig['RAZZLE_DISABLE_DRAFT_WATERMARK'] || 'default';
+  const isReviewableStateComponent =
+    props.review_state &&
+    props.contentId === removeTrailingSlash(props.pathname);
+
+  const draftOptions = {
+    'Hide-All': 'wf-state-published',
+    'Hide-No-Workflow': isReviewableStateComponent
+      ? draftClass
+      : 'wf-state-published',
+    default: draftClass,
+  };
+
+  return <BodyClass className={draftOptions[razzleDraft]} />;
+};
+
+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-design-system/ui/Header/HeaderSearchPopUp.js

@@ -1,13 +1,15 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Container, Input, List } from 'semantic-ui-react';
 import { withRouter } from 'react-router-dom';
 import { useClickOutside } from '@eeacms/volto-eea-design-system/helpers';
 import config from '@plone/volto/registry';
 
 const getRandomItems = (arr, max) => {
-  return arr.slice(0, max).map(function () {
-    return this.splice(Math.floor(Math.random() * this.length), 1)[0];
-  }, arr.slice());
+  return (
+    arr?.slice(0, max).map(function () {
+      return this.splice(Math.floor(Math.random() * this.length), 1)[0];
+    }, arr.slice()) || []
+  );
 };
 
 function HeaderSearchPopUp({
@@ -32,10 +34,15 @@ function HeaderSearchPopUp({
     searchSuggestions,
   } = activeView;
   const { suggestionsTitle, suggestions, maxToShow } = searchSuggestions || {};
+
   const [text, setText] = React.useState('');
-  const visibleSuggestions = suggestions
-    ? getRandomItems(suggestions, maxToShow)
-    : [];
+  const [visibleSuggestions, setVisibileSuggestions] = React.useState(
+    getRandomItems(suggestions, maxToShow),
+  );
+
+  useEffect(() => {
+    setVisibileSuggestions(getRandomItems(suggestions, maxToShow));
+  }, [maxToShow, suggestions]);
 
   useClickOutside({ targetRefs: [nodeRef, ...triggerRefs], callback: onClose });
 

package/src/icons/eraser.svg

@@ -0,0 +1,3 @@
+<svg width="36" height="36" version="1.1" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
+ <path d="m14.378 14.247-6.8402 6.8402 7.1774 7.1774h1.6168v-0.0028h1.6195l5.2207-5.2207zm1.954-1.9539 8.7942 8.7942 3.9079-3.9093-8.7942-8.7942zm5.5274 15.969h9.673v2.7637h-12.437l-5.5247 0.002764-8.9641-8.9641a1.3819 1.3819 0 0 1 0-1.954l14.655-14.657a1.3819 1.3819 0 0 1 1.9553 0l10.748 10.748a1.3819 1.3819 0 0 1 0 1.9539z" stroke-width="1.3819"/>
+</svg>

package/src/slate.js

@@ -3,10 +3,9 @@ import { List } from 'semantic-ui-react';
 import { MarkElementButton, ToolbarButton } from '@plone/volto-slate/editor/ui';
 import installCallout from '@plone/volto-slate/editor/plugins/Callout';
 import { Icon } from '@plone/volto/components';
-import { Editor, Transforms } from 'slate';
+import { Editor, Transforms, Text } from 'slate';
 import { useSlate } from 'slate-react';
 
-import formatClearIcon from '@plone/volto/icons/format-clear.svg';
 import paintSVG from '@plone/volto/icons/paint.svg';
 import alignLeftIcon from '@plone/volto/icons/align-left.svg';
 import alignRightIcon from '@plone/volto/icons/align-right.svg';
@@ -14,6 +13,7 @@ import alignCenterIcon from '@plone/volto/icons/align-center.svg';
 import alignJustifyIcon from '@plone/volto/icons/align-justify.svg';
 import lightIcon from './icons/light.svg';
 import smallIcon from './icons/small.svg';
+import clearIcon from './icons/eraser.svg';
 
 const toggleBlockClassFormat = (editor, format) => {
   const levels = Array.from(Editor.levels(editor, editor.selection));
@@ -59,6 +59,27 @@ function BlockClassButton({ format, icon, ...props }) {
 }
 
 const clearFormatting = (editor) => {
+  const sn = Array.from(
+    Editor.nodes(editor, {
+      mode: 'lowest',
+      match: (n, p) => {
+        // console.log('node', n, p);
+        return Text.isText(n);
+      },
+      at: [0], // uncomment if you want everything to be cleared
+    }),
+  );
+
+  // console.log('sn', sn);
+
+  sn.forEach(([n, at]) => {
+    const toRemove = Object.keys(n).filter((k) => k.startsWith('style-'));
+    if (toRemove.length) {
+      Transforms.unsetNodes(editor, toRemove, { at });
+      // console.log('unset', n, at, toRemove);
+    }
+  });
+
   Transforms.setNodes(editor, {
     type: 'p',
     styleName: null,
@@ -90,7 +111,7 @@ export default function installSlate(config) {
     config = installCallout(config);
 
     config.settings.slate.buttons.clearformatting = (props) => (
-      <ClearFormattingButton title="Clear formatting" icon={formatClearIcon} />
+      <ClearFormattingButton title="Clear formatting" icon={clearIcon} />
     );
 
     // Remove blockquote, italic, strikethrough slate button from toolbarButtons