design-comuni-plone-theme 11.23.2 → 11.24.1

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

@@ -0,0 +1,122 @@
+// CUSTOMIZATION:
+// - 97: changed condition check or uncheck Checkboxes
+/**
+ * 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.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.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/Diff/DiffField.jsx

@@ -114,7 +114,6 @@ const DiffField = ({
       const second = SSRRenderHtml(history, store, two, field);
       parts = diff2(first, second);
     } else if (schema.type === 'array') {
-      // debugger;
       const oneArray = (one || []).map((i) => i?.title || i).join(', ');
       const twoArray = (two || []).map((j) => j?.title || j).join(', ');
       parts = diff2(oneArray, twoArray);
@@ -150,8 +149,8 @@ const DiffField = ({
                     schema?.type === 'boolean'
                       ? booleanMapping[!!one]
                       : schema?.widget === 'json'
-                        ? contentOne
-                        : one,
+                      ? contentOne
+                      : one,
                     schema?.widget ??
                       (schema?.type === 'object' && field.includes('image')
                         ? field

package/src/customizations/volto/components/manage/Widgets/RecurrenceWidget/EndField.jsx

@@ -7,7 +7,7 @@
  * - added customization to have this changes https://github.com/plone/volto/pull/5555/files
  */
 
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Form, Grid, Input, Radio } from 'semantic-ui-react';
@@ -25,6 +25,12 @@ const messages = defineMessages({
  * @returns {string} Markup of the component.
  */
 const EndField = ({ value, count, until, onChange, intl }) => {
+  // Give state to fields, updating logic is convoluted,
+  // update only when/if needed
+  const [occurrenceValue, setOccurrenceValue] = useState(count);
+  const [untilValue, setUntilValue] = useState(until);
+  useEffect(() => setOccurrenceValue(count), [count]);
+  useEffect(() => setUntilValue(until), [until]);
   return (
     <Form.Field inline className="text">
       <Grid>
@@ -55,12 +61,12 @@ const EndField = ({ value, count, until, onChange, intl }) => {
                 <Input
                   id="count"
                   name="count"
-                  value={count || ''}
+                  value={occurrenceValue || ''}
                   onChange={({ target }) => {
-                    onChange(
-                      target.id,
-                      target.value === '' ? undefined : target.value,
-                    );
+                    setOccurrenceValue(target.value);
+                    if (target.value) {
+                      onChange(target.id, parseInt(target.value));
+                    }
                   }}
                 />
               </Form.Field>
@@ -86,15 +92,16 @@ const EndField = ({ value, count, until, onChange, intl }) => {
                   title={intl.formatMessage(messages.recurrenceEndsUntil)}
                   dateOnly={true}
                   value={
-                    until
-                      ? typeof until === 'string'
-                        ? until
-                        : until?.toISOString()
+                    untilValue
+                      ? typeof untilValue === 'string'
+                        ? untilValue
+                        : untilValue?.toISOString()
                       : ''
                   }
                   resettable={false}
                   onChange={(id, value) => {
-                    onChange(id, value === '' ? undefined : value);
+                    setUntilValue(value);
+                    if (value) onChange(id, value === '' ? undefined : value);
                   }}
                 />
               </Form.Field>