@eeacms/volto-eea-website-theme 3.5.3 → 3.5.5

package/locales/volto.pot

@@ -1,74 +1,134 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2023-12-05T09:30:23.741Z\n"
+"POT-Creation-Date: 2025-01-30T18:15:27.602Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
 "Language-Code: en\n"
 "Language-Name: English\n"
 "Preferred-Encodings: utf-8\n"
 "Domain: volto\n"
 
+#. Default: "Choices"
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "Choices"
+msgstr ""
+
+#. Default: "Close"
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "Close"
+msgstr ""
+
+#. Default: "Created"
 #: components/theme/Banner/View
-# defaultMessage: Created
 msgid "Created"
 msgstr ""
 
+#. Default: "Default"
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "Default"
+msgstr ""
+
+#. Default: "Description"
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "Description"
+msgstr ""
+
+#. Default: "Download"
 #: components/theme/Banner/View
-# defaultMessage: Download
 msgid "Download"
 msgstr ""
 
+#. Default: "European Environment Agency"
 #: components/theme/Logo
-# defaultMessage: European Environment Agency
 msgid "European Environment Agency"
 msgstr ""
 
+#. Default: "Invalid block - Will be removed on saving"
 #: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
-# defaultMessage: Invalid block - Will be removed on saving
 msgid "Invalid Block"
 msgstr ""
 
+#. Default: "Modified"
 #: components/theme/Banner/View
-# defaultMessage: Modified
 msgid "Modified"
 msgstr ""
 
+#. Default: "Navigation"
+#: components/manage/Blocks/ContextNavigation/variations/Accordion
+msgid "Navigation"
+msgstr ""
+
+#. Default: "No options"
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "No options"
+msgstr ""
+
+#. Default: "No value"
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "No value"
+msgstr ""
+
+#. Default: "Published"
 #: components/theme/Banner/View
-# defaultMessage: Published
 msgid "Published"
 msgstr ""
 
+#. Default: "Required"
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "Required"
+msgstr ""
+
+#. Default: "Select…"
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "Select…"
+msgstr ""
+
+#. Default: "Share"
 #: components/theme/Banner/View
-# defaultMessage: Share
 msgid "Share"
 msgstr ""
 
+#. Default: "Share to"
 #: components/theme/Banner/View
-# defaultMessage: Share to
 msgid "Share to"
 msgstr ""
 
+#. Default: "Short Name"
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "Short Name"
+msgstr ""
+
+#. Default: "Site"
 #: components/theme/Logo
-# defaultMessage: Site
 msgid "Site"
 msgstr ""
 
+#. Default: "Title"
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "Title"
+msgstr ""
+
+#. Default: "Type the title…"
 #: components/manage/Blocks/Title/Edit
-# defaultMessage: Type the title…
 msgid "Type the title…"
 msgstr ""
 
+#. Default: "Unknown Block {block}"
 #: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
-# defaultMessage: Unknown Block {block}
 msgid "Unknown Block"
 msgstr ""
 
+#. Default: "Used for programmatic access to the fieldset."
+#: components/theme/Widgets/CreatableSelectWidget
+msgid "Used for programmatic access to the fieldset."
+msgstr ""
+
+#. Default: "RSS Feed"
 #: components/theme/Banner/View
-# defaultMessage: RSS Feed
 msgid "rssFeed"
 msgstr ""

package/package.json

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

package/src/components/theme/Widgets/ImageViewWidget.jsx

@@ -0,0 +1,3 @@
+export default function ImageViewWidget({ value }) {
+  return <img src={value.download} alt={value.filename} />;
+}

package/src/customizations/volto/components/manage/Controlpanels/Groups/RenderGroups.diff

@@ -0,0 +1,15 @@
+diff --git a/src/customizations/volto/components/manage/Controlpanels/Groups/RenderGroups.jsx b/src/customizations/volto/components/manage/Controlpanels/Groups/RenderGroups.jsx
+index 816ad59..3b4df8f 100644
+--- a/src/customizations/volto/components/manage/Controlpanels/Groups/RenderGroups.jsx
++++ b/src/customizations/volto/components/manage/Controlpanels/Groups/RenderGroups.jsx
+@@ -77,7 +77,9 @@ class RenderGroups extends Component {
+   render() {
+     return (
+       <Table.Row key={this.props.group.title}>
+-        <Table.Cell>{this.props.group.groupname}</Table.Cell>
++        <Table.Cell>
++          {this.props.group.title || this.props.group.groupname}
++        </Table.Cell>
+         {this.props.roles.map((role) => (
+           <Table.Cell key={role.id}>
+             {this.props.inheritedRole &&

package/src/customizations/volto/components/manage/Controlpanels/Groups/RenderGroups.jsx

@@ -0,0 +1,125 @@
+/**
+ * Users controlpanel groups.
+ * @module components/manage/Controlpanels/UsersControlpanelGroups
+ */
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { FormattedMessage, injectIntl } from 'react-intl';
+import { Dropdown, Table, Checkbox } from 'semantic-ui-react';
+import trashSVG from '@plone/volto/icons/delete.svg';
+import ploneSVG from '@plone/volto/icons/plone.svg';
+import { Icon } from '@plone/volto/components';
+
+/**
+ * UsersControlpanelGroups class.
+ * @class UsersControlpanelGroups
+ * @extends Component
+ */
+class RenderGroups extends Component {
+  /**
+   * Property types.
+   * @property {Object} propTypes Property types.
+   * @static
+   */
+  static propTypes = {
+    //single group
+    group: PropTypes.shape({
+      title: PropTypes.string,
+      description: PropTypes.string,
+      email: PropTypes.string,
+      groupname: PropTypes.string,
+      roles: PropTypes.arrayOf(PropTypes.string),
+    }).isRequired,
+
+    roles: PropTypes.arrayOf(
+      PropTypes.shape({
+        id: PropTypes.string,
+      }),
+    ).isRequired,
+    inheritedRole: PropTypes.array,
+    onDelete: PropTypes.func.isRequired,
+  };
+
+  /**
+   * Constructor
+   * @method constructor
+   * @param {Object} props Component properties
+   * @constructs Sharing
+   */
+  constructor(props) {
+    super(props);
+    this.onChange = this.onChange.bind(this);
+  }
+
+  /**
+   * @param {*} event
+   * @param {*} { value }
+   * @memberof UsersControlpanelUser
+   */
+  onChange(event, { value }) {
+    const [group, role] = value.split('&role=');
+    this.props.updateGroups(group, role);
+  }
+
+  /**
+   *@param {*}
+   *@returns {Boolean}
+   *@memberof RenderGroups
+   */
+  isAuthGroup = (roleId) => {
+    return this.props.inheritedRole.includes(roleId);
+  };
+  /**
+   * Render method.
+   * @method render
+   * @returns {string} Markup for the component.
+   */
+  render() {
+    return (
+      <Table.Row key={this.props.group.title}>
+        <Table.Cell>
+          {this.props.group.title || this.props.group.groupname}
+        </Table.Cell>
+        {this.props.roles.map((role) => (
+          <Table.Cell key={role.id}>
+            {this.props.inheritedRole &&
+            this.props.inheritedRole.includes(role.id) &&
+            this.props.group.roles.includes('Authenticated') ? (
+              <Icon
+                name={ploneSVG}
+                size="20px"
+                color="#007EB1"
+                title={'plone-svg'}
+              />
+            ) : (
+              <Checkbox
+                checked={
+                  this.props.group.id === 'AuthenticatedUsers'
+                    ? this.isAuthGroup(role.id)
+                    : this.props.group.roles.includes(role.id)
+                }
+                onChange={this.onChange}
+                value={`${this.props.group.id}&role=${role.id}`}
+              />
+            )}
+          </Table.Cell>
+        ))}
+        <Table.Cell textAlign="right">
+          <Dropdown icon="ellipsis horizontal">
+            <Dropdown.Menu className="left">
+              <Dropdown.Item
+                onClick={this.props.onDelete}
+                value={this.props.group['@id']}
+              >
+                <Icon name={trashSVG} size="15px" />
+                <FormattedMessage id="Delete" defaultMessage="Delete" />
+              </Dropdown.Item>
+            </Dropdown.Menu>
+          </Dropdown>
+        </Table.Cell>
+      </Table.Row>
+    );
+  }
+}
+
+export default injectIntl(RenderGroups);

package/src/customizations/volto/components/manage/Controlpanels/Groups/RenderGroups.test.jsx

@@ -0,0 +1,58 @@
+import React from 'react';
+import renderer from 'react-test-renderer';
+import configureStore from 'redux-mock-store';
+import { Provider } from 'react-intl-redux';
+
+import RenderGroups from './RenderGroups';
+
+const mockStore = configureStore();
+
+const testGroups = {
+  '@id': 'http://localhost:55001/plone/@groups/Administrators',
+  description: '',
+  email: '',
+  groupname: 'Administrators',
+  id: 'Administrators',
+  title: 'Administrators',
+  roles: ['Manager'],
+};
+
+const testRoles = [
+  {
+    '@id': 'http://localhost:8080/Plone/@roles/Member',
+    '@type': 'role',
+    id: 'Member',
+  },
+  {
+    '@id': 'http://localhost:8080/Plone/@roles/Reader',
+    '@type': 'role',
+    id: 'Reader',
+  },
+  {
+    '@id': 'http://localhost:8080/Plone/@roles/Manager',
+    '@type': 'role',
+    id: 'Manager',
+  },
+];
+
+describe('UsersControlpanelGroups', () => {
+  it('renders a UsersControlpanelGroups component', () => {
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+    });
+    const component = renderer.create(
+      <Provider store={store}>
+        <RenderGroups
+          group={testGroups}
+          roles={testRoles}
+          onDelete={() => {}}
+        />
+      </Provider>,
+    );
+    const json = component.toJSON();
+    expect(json).toMatchSnapshot();
+  });
+});

package/src/customizations/volto/components/manage/Diff/DiffField.diff

@@ -0,0 +1,150 @@
+diff --git a/src/customizations/volto/components/manage/Diff/DiffField.jsx b/src/customizations/volto/components/manage/Diff/DiffField.jsx
+index a9bad2a..5d306e5 100644
+--- a/src/customizations/volto/components/manage/Diff/DiffField.jsx
++++ b/src/customizations/volto/components/manage/Diff/DiffField.jsx
+@@ -135,6 +135,17 @@ const formatDiffPart = (part, value, side) => {
+   }
+ };
+ 
++const getWidgetByBehavior = (behavior) =>
++  config.widgets.views.behavior?.[behavior] || null;
++
++const getWidgetByFactory = (factory) =>
++  config.widgets.views.factory?.[factory] || null;
++
++const getDefaultWidget =
++  () =>
++  ({ diff }) =>
++    diff;
++
+ /**
+  * Diff field component.
+  * @function DiffField
+@@ -164,8 +175,11 @@ const DiffField = ({
+       splitWords(String(twoStr)),
+     );
+   };
+-
+   let parts, oneArray, twoArray;
++  const Widget =
++    getWidgetByBehavior(schema.behavior) ||
++    getWidgetByFactory(schema.factory) ||
++    getDefaultWidget();
+   if (schema.widget) {
+     switch (schema.widget) {
+       case 'richtext':
+@@ -272,33 +286,49 @@ const DiffField = ({
+       {view === 'split' && (
+         <Grid.Row>
+           <Grid.Column width={6} verticalAlign="top">
+-            <span
+-              dangerouslySetInnerHTML={{
+-                __html: join(
+-                  map(parts, (part) => {
+-                    let combined = (part.value || []).reduce((acc, value) => {
+-                      return acc + formatDiffPart(part, value, 'left');
+-                    }, '');
+-                    return combined;
+-                  }),
+-                  '',
+-                ),
+-              }}
++            <Widget
++              value={one}
++              diff={
++                <span
++                  dangerouslySetInnerHTML={{
++                    __html: join(
++                      map(parts, (part) => {
++                        let combined = (part.value || []).reduce(
++                          (acc, value) => {
++                            return acc + formatDiffPart(part, value, 'left');
++                          },
++                          '',
++                        );
++                        return combined;
++                      }),
++                      '',
++                    ),
++                  }}
++                />
++              }
+             />
+           </Grid.Column>
+           <Grid.Column width={6} verticalAlign="top">
+-            <span
+-              dangerouslySetInnerHTML={{
+-                __html: join(
+-                  map(parts, (part) => {
+-                    let combined = (part.value || []).reduce((acc, value) => {
+-                      return acc + formatDiffPart(part, value, 'right');
+-                    }, '');
+-                    return combined;
+-                  }),
+-                  '',
+-                ),
+-              }}
++            <Widget
++              value={two}
++              diff={
++                <span
++                  dangerouslySetInnerHTML={{
++                    __html: join(
++                      map(parts, (part) => {
++                        let combined = (part.value || []).reduce(
++                          (acc, value) => {
++                            return acc + formatDiffPart(part, value, 'right');
++                          },
++                          '',
++                        );
++                        return combined;
++                      }),
++                      '',
++                    ),
++                  }}
++                />
++              }
+             />
+           </Grid.Column>
+         </Grid.Row>
+@@ -306,18 +336,28 @@ const DiffField = ({
+       {view === 'unified' && (
+         <Grid.Row>
+           <Grid.Column width={16} verticalAlign="top">
+-            <span
+-              dangerouslySetInnerHTML={{
+-                __html: join(
+-                  map(parts, (part) => {
+-                    let combined = (part.value || []).reduce((acc, value) => {
+-                      return acc + formatDiffPart(part, value, 'unified');
+-                    }, '');
+-                    return combined;
+-                  }),
+-                  '',
+-                ),
+-              }}
++            <Widget
++              value={two}
++              one={one}
++              two={two}
++              diff={
++                <span
++                  dangerouslySetInnerHTML={{
++                    __html: join(
++                      map(parts, (part) => {
++                        let combined = (part.value || []).reduce(
++                          (acc, value) => {
++                            return acc + formatDiffPart(part, value, 'unified');
++                          },
++                          '',
++                        );
++                        return combined;
++                      }),
++                      '',
++                    ),
++                  }}
++                />
++              }
+             />
+           </Grid.Column>
+         </Grid.Row>