@eeacms/volto-eea-website-theme 1.28.0 → 1.28.2

package/CHANGELOG.md

@@ -4,7 +4,29 @@ 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.28.0](https://github.com/eea/volto-eea-website-theme/compare/1.27.2...1.28.0) - 16 February 2024
+### [1.28.2](https://github.com/eea/volto-eea-website-theme/compare/1.28.1...1.28.2) - 29 February 2024
+
+#### :bug: Bug Fixes
+
+- fix(event): add permalink in customization to the original volto component [kreafox - [`c662aae`](https://github.com/eea/volto-eea-website-theme/commit/c662aae7c271fa1170dd2dbd8cc9a374fed59a2f)]
+
+#### :nail_care: Enhancements
+
+- refactor: Remove volto-slate patch normalizeExternalData.js - requires Volto 16.28.1+ [alin - [`6ea61da`](https://github.com/eea/volto-eea-website-theme/commit/6ea61dabfae9a755f09dbd588a378c4a2b5338f5)]
+
+#### :hammer_and_wrench: Others
+
+- Allow hit Enter in the LayoutSettings block to create a new block [Tiberiu Ichim - [`ecde522`](https://github.com/eea/volto-eea-website-theme/commit/ecde52263ce6f989936962bda7bc1213b2750d7d)]
+### [1.28.1](https://github.com/eea/volto-eea-website-theme/compare/1.28.0...1.28.1) - 19 February 2024
+
+#### :bug: Bug Fixes
+
+- fix: Don't crash when rendering invalid slate [Tiberiu Ichim - [`9b7bc96`](https://github.com/eea/volto-eea-website-theme/commit/9b7bc9622d55f0912f13252ef80255f9cbb778d5)]
+
+#### :hammer_and_wrench: Others
+
+- update readme [Razvan - [`ba82be2`](https://github.com/eea/volto-eea-website-theme/commit/ba82be250e82120958d18137c5972150db977b6b)]
+### [1.28.0](https://github.com/eea/volto-eea-website-theme/compare/1.27.2...1.28.0) - 19 February 2024
 
 #### :bug: Bug Fixes
 

package/README.md

@@ -27,7 +27,9 @@ See [Storybook](https://eea.github.io/eea-storybook/).
 
 ## Volto customizations
 
-- `volto-slate/editor/SlateEditor` -> [ref](https://taskman.eionet.europa.eu/issues/264239#note-11) When two slates looks at the same prop changing one slate and updating the other should be handled properly. This change makes replacing the old value of slate work in sync with the other slates that watches the same prop.
+- `volto-slate/editor/SlateEditor` -> When two slates looks at the same prop changing one slate and updating the other should be handled properly. This change makes replacing the old value of slate work in sync with the other slates that watches the same prop [ref](https://taskman.eionet.europa.eu/issues/264239#note-11).
+
+  **!!IMPORTANT**: This change requires volto@^16.26.1
 
 - `volto/components/manage/Sidebar/SidebarPopup` -> https://github.com/plone/volto/pull/5520
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "1.28.0",
+  "version": "1.28.2",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -79,4 +79,4 @@
     "cypress:open": "make cypress-open",
     "prepare": "husky install"
   }
-}
+}

package/src/components/manage/Blocks/LayoutSettings/index.js

@@ -14,7 +14,6 @@ export default (config) => {
     schema: BlockSettingsSchema,
     restricted: false,
     mostUsed: false,
-    blockHasOwnFocusManagement: true,
     sidebarTab: 1,
   };
 

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

@@ -70,10 +70,11 @@ export const Leaf = ({ children, ...rest }) => {
     typeof children === 'string' ? (
       children.split('\n').map((t, i) => {
         // Softbreak support. Should do a plugin?
+        const hasSoftBreak =
+          children.indexOf('\n') > -1 && children.split('\n').length - 1 > i;
         return (
           <React.Fragment key={`${i}`}>
-            {children.indexOf('\n') > -1 &&
-            children.split('\n').length - 1 > i ? (
+            {hasSoftBreak ? (
               <>
                 {klass ? <span className={klass}>{t}</span> : t}
                 <br />
@@ -104,7 +105,20 @@ export const serializeNodes = (nodes, getAttributes, extras = {}) => {
   const editor = { children: nodes || [] };
 
   const _serializeNodes = (nodes) => {
-    return (nodes || []).map(([node, path], i) => {
+    return (nodes || []).map(([node, path]) => {
+      let _serialized;
+      const isTextNode = Text.isText(node);
+      try {
+        if (!isTextNode) {
+          _serialized = _serializeNodes(
+            Array.from(Node.children(editor, path)),
+          );
+        }
+      } catch {
+        // eslint-disable-next-line no-console
+        console.error('Error in serializing nodes', editor, path);
+      }
+
       return Text.isText(node) ? (
         <Leaf path={path} leaf={node} text={node} mode="view" key={path}>
           {node.text}
@@ -125,7 +139,7 @@ export const serializeNodes = (nodes, getAttributes, extras = {}) => {
           }
           extras={extras}
         >
-          {_serializeNodes(Array.from(Node.children(editor, path)))}
+          {_serialized}
         </Element>
       );
     });

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

@@ -138,6 +138,10 @@ class Form extends Component {
       text: uuid(),
     };
     let { formData } = props;
+    // TODO Tiberiu: customized here
+    formData = formData || {}; // when coming from login screen, formData is null
+    // this fixes a bug where, if you go to an /edit page, it will show login (you need to wait the 5 seconds timeout), after login you get redirected back to the edit, then it crashes
+    // end customized
     const blocksFieldname = getBlocksFieldname(formData);
     const blocksLayoutFieldname = getBlocksLayoutFieldname(formData);
 

package/src/customizations/volto/components/theme/Footer/Footer.jsx

@@ -62,7 +62,7 @@ const Footer = () => {
         url: flattenToAppURL(action.url),
         children:
           idx === 0
-            ? contactExtraActions.map((child) => ({
+            ? (contactExtraActions || []).map((child) => ({
                 text: child.title,
                 icon: child.icon,
                 url: flattenToAppURL(child.url),

package/src/customizations/volto/components/theme/View/EventDatesInfo.jsx

@@ -0,0 +1,149 @@
+/* Original: https://github.com/plone/volto/blob/16.x.x/src/components/theme/View/EventDatesInfo.jsx */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import { List } from 'semantic-ui-react';
+import cx from 'classnames';
+import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
+import config from '@plone/volto/registry';
+// import { toBackendLang } from '@plone/volto/helpers';
+// import { useSelector } from 'react-redux';
+
+export const datesForDisplay = (start, end, moment) => {
+  const mStart = moment(start);
+  const mEnd = moment(end);
+  if (!mStart.isValid() || !mEnd.isValid()) {
+    return null;
+  }
+  const sameDay = mStart.isSame(mEnd, 'day');
+  const sameTime = mStart.isSame(mEnd, 'minute');
+  return {
+    sameDay,
+    sameTime,
+    startDate: mStart.format('ll'),
+    startTime: mStart.format('LT'),
+    endDate: mEnd.format('ll'),
+    endTime: mEnd.format('LT'),
+  };
+};
+
+const When_ = ({ start, end, whole_day, open_end, moment: momentlib }) => {
+  // Customization:
+  // Fix date format by using dateLocale instead of language from Redux
+  // const lang = useSelector((state) => state.intl.locale);
+  const dateLocale = config.settings.dateLocale || 'en-gb';
+
+  const moment = momentlib.default;
+  moment.locale(dateLocale);
+  // end customization
+
+  const datesInfo = datesForDisplay(start, end, moment);
+  if (!datesInfo) {
+    return;
+  }
+  // TODO I18N INTL
+
+  return (
+    <p
+      className={cx('event-when', {
+        'same-day': datesInfo.sameDay,
+        'same-time': datesInfo.sameTime,
+        'whole-day': whole_day,
+        'open-end': open_end,
+      })}
+    >
+      {!datesInfo.sameDay ? (
+        <>
+          <span className="start">
+            <span className="start-date">{datesInfo.startDate}</span>
+            {!whole_day && (
+              <>
+                {/* Plone has an optional word based on locale here */}
+                <span> </span>
+                <span className="start-time">{datesInfo.startTime}</span>
+              </>
+            )}
+          </span>
+          {!open_end && (
+            <>
+              &nbsp;to&nbsp;
+              <span className="end">
+                <span className="end-date">{datesInfo.endDate}</span>
+                {!whole_day && (
+                  <>
+                    {/* Plone has an optional word based on locale here */}
+                    <span> </span>
+                    <span className="end-time">{datesInfo.endTime}</span>
+                  </>
+                )}
+              </span>
+            </>
+          )}
+        </>
+      ) : (
+        <>
+          {whole_day && (
+            <span className="start-date">{datesInfo.startDate}</span>
+          )}
+          {open_end && !whole_day && (
+            <>
+              <span className="start-date">{datesInfo.startDate}</span>
+              &nbsp;from&nbsp;
+              <span className="start-time">{datesInfo.startTime}</span>
+            </>
+          )}
+          {!(whole_day || open_end) && (
+            <>
+              <span className="start-date">{datesInfo.startDate}</span>
+              &nbsp;from&nbsp;
+              <span className="start-time">{datesInfo.startTime}</span>
+              &nbsp;to&nbsp;
+              <span className="end-time">{datesInfo.endTime}</span>
+            </>
+          )}
+        </>
+      )}
+    </p>
+  );
+};
+
+export const When = injectLazyLibs(['moment'])(When_);
+
+When.propTypes = {
+  start: PropTypes.string.isRequired,
+  end: PropTypes.string,
+  whole_day: PropTypes.bool,
+  open_end: PropTypes.bool,
+};
+
+export const Recurrence_ = ({
+  recurrence,
+  start,
+  moment: momentlib,
+  rrule,
+}) => {
+  const moment = momentlib.default;
+  const { RRule, rrulestr } = rrule;
+  if (recurrence.indexOf('DTSTART') < 0) {
+    var dtstart = RRule.optionsToString({
+      dtstart: new Date(start),
+    });
+    recurrence = dtstart + '\n' + recurrence;
+  }
+  const rule = rrulestr(recurrence, { unfold: true, forceset: true });
+
+  return (
+    <List
+      items={rule
+        .all()
+        .map((date) => datesForDisplay(date, undefined, moment))
+        .map((date) => date.startDate)}
+    />
+  );
+};
+export const Recurrence = injectLazyLibs(['moment', 'rrule'])(Recurrence_);
+
+Recurrence.propTypes = {
+  recurrence: PropTypes.string.isRequired,
+  start: PropTypes.string.isRequired,
+};

package/src/customizations/@plone/volto-slate/editor/extensions/normalizeExternalData.js

@@ -1,9 +0,0 @@
-// To be removed when https://github.com/plone/volto/pull/5347 is merged and released in Volto 16.x
-import { normalizeExternalData as normalize } from '@plone/volto-slate/utils';
-
-export function normalizeExternalData(editor) {
-  editor.normalizeExternalData = (fragment) => {
-    return normalize(editor, fragment);
-  };
-  return editor;
-}