cozy-sharing 12.1.0 → 12.3.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [12.3.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@12.2.0...cozy-sharing@12.3.0) (2024-03-25)
+
+
+### Features
+
+* Add GroupAvatar into AvatarList ([1c66999](https://github.com/cozy/cozy-libs/commit/1c669995b08d84a3aa8d6dd950fa4abf22566395))
+
+
+
+
+
+# [12.2.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@12.1.0...cozy-sharing@12.2.0) (2024-03-22)
+
+
+### Features
+
+* Allow to add group with only more than one member ([177dc4a](https://github.com/cozy/cozy-libs/commit/177dc4a4fbceefed1ce52f2a5275c67e46b6430f))
+
+
+
+
+
 # [12.1.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@12.0.0...cozy-sharing@12.1.0) (2024-03-22)
 
 

package/dist/components/Avatar/AvatarList.js

@@ -5,6 +5,7 @@ import { useClient } from 'cozy-client';
 import Avatar from 'cozy-ui/transpiled/react/Avatar';
 import LinkIcon from 'cozy-ui/transpiled/react/Icons/Link';
 import { ExtraAvatar } from './ExtraAvatar';
+import { GroupAvatar } from './GroupAvatar';
 import { MemberAvatar } from './MemberAvatar';
 import { getDisplayName } from '../../models';
 var styles = {
@@ -83,10 +84,20 @@ var AvatarList = function AvatarList(_ref2) {
     className: styles['recipients-avatars--plusX'],
     extraRecipients: extraRecipients,
     size: size
-  })), shownRecipients.map(function (recipient, idx) {
+  })), shownRecipients.map(function (recipient) {
+    if (recipient.members) {
+      return /*#__PURE__*/React.createElement("span", {
+        "data-testid": "AvatarList-avatar".concat(recipient.status === 'owner' ? '-owner' : ''),
+        key: recipient.index
+      }, /*#__PURE__*/React.createElement(GroupAvatar, {
+        size: size,
+        className: cx(styles['recipients-avatars--avatar'])
+      }));
+    }
+
     return /*#__PURE__*/React.createElement("span", {
       "data-testid": "AvatarList-avatar".concat(recipient.status === 'owner' ? '-owner' : ''),
-      key: idx
+      key: recipient.index
     }, /*#__PURE__*/React.createElement(MemberAvatar, {
       recipient: recipient,
       size: size,

package/dist/components/Avatar/AvatarList.spec.js

@@ -9,20 +9,25 @@ import { AvatarList, MAX_DISPLAYED_RECIPIENTS, excludeMeAsOwnerFromRecipients }
 import AppLike from '../../../test/AppLike';
 var mockRecipients = new Array(MAX_DISPLAYED_RECIPIENTS - 1).fill({
   status: 'owner',
-  public_name: 'cozy'
+  public_name: 'cozy',
+  index: 'sharing-123-member-0'
 }, 0, 1).fill({
   status: 'pending',
-  name: 'Mitch Young'
+  name: 'Mitch Young',
+  index: 'sharing-123-member-1'
 }, 1);
 var mockMoreRecipientsThanMaxDisplayed = [].concat(_toConsumableArray(mockRecipients), [{
   status: 'mail-not-send',
-  name: 'Lyn Webster'
+  name: 'Lyn Webster',
+  index: 'sharing-123-member-2'
 }, {
   status: 'ready',
-  name: 'Richelle Young'
+  name: 'Richelle Young',
+  index: 'sharing-123-member-3'
 }, {
   status: 'ready',
-  name: 'John Connor'
+  name: 'John Connor',
+  index: 'sharing-123-member-4'
 }]);
 describe('AvatarList', function () {
   var client = createMockClient({});
@@ -103,7 +108,7 @@ describe('AvatarList', function () {
   });
 });
 describe('excludeMeAsOwnerFromRecipients', function () {
-  test('excludeMeAsOwnerFromRecipients behavior', function () {
+  it('excludeMeAsOwnerFromRecipients behavior', function () {
     var recipients = [{
       status: 'owner',
       instance: 'http://foo1.cozy.bar'

package/dist/components/Avatar/AvatarList.stories.js

@@ -4,11 +4,23 @@ import { recipients } from '../../../.storybook/fixtures/recipients';
 var meta = {
   component: AvatarList,
   args: {
-    recipients: [].concat(_toConsumableArray(recipients), _toConsumableArray(recipients))
+    recipients: _toConsumableArray(recipients)
   }
 };
 export default meta;
 export var Default = {
   name: 'Default',
   args: {}
+};
+export var WithGroups = {
+  name: 'With groups',
+  args: {
+    recipients: [].concat(_toConsumableArray(recipients), [{
+      name: 'Group 1',
+      type: 'group',
+      members: [{
+        public_name: 'Alice'
+      }]
+    }])
+  }
 };

package/dist/components/Avatar/GroupAvatar.js

@@ -3,10 +3,12 @@ import Avatar from 'cozy-ui/transpiled/react/Avatar';
 import TeamIcon from 'cozy-ui/transpiled/react/Icons/Team';
 
 var GroupAvatar = function GroupAvatar(_ref) {
-  var size = _ref.size;
+  var size = _ref.size,
+      className = _ref.className;
   return /*#__PURE__*/React.createElement(Avatar, {
     icon: TeamIcon,
-    size: size
+    size: size,
+    className: className
   });
 };
 

package/dist/components/ContactSuggestion.js

@@ -1,4 +1,3 @@
-import get from 'lodash/get';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { models } from 'cozy-client';
@@ -10,8 +9,7 @@ import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import { Contact, Group, getDisplayName, getInitials } from '../models';
 var ContactModel = models.contact;
 export var ContactSuggestion = function ContactSuggestion(_ref) {
-  var contactOrGroup = _ref.contactOrGroup,
-      contacts = _ref.contacts;
+  var contactOrGroup = _ref.contactOrGroup;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
@@ -20,19 +18,10 @@ export var ContactSuggestion = function ContactSuggestion(_ref) {
 
   if (contactOrGroup._type === Group.doctype) {
     name = contactOrGroup.name;
-    var membersCount = contacts.reduce(function (total, contact) {
-      if (get(contact, 'relationships.groups.data', []).map(function (group) {
-        return group._id;
-      }).includes(contactOrGroup._id)) {
-        return total + 1;
-      }
-
-      return total;
-    }, 0).toString();
+    avatarText = 'G';
     details = t('Share.members.count', {
-      smart_count: membersCount
+      smart_count: contactOrGroup.membersCount.toString()
     });
-    avatarText = 'G';
   } else {
     name = getDisplayName(contactOrGroup);
     avatarText = getInitials(contactOrGroup);

package/dist/components/ContactSuggestion.spec.js

@@ -1,21 +1,17 @@
-import { mount } from 'enzyme';
+import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { ContactSuggestion } from './ContactSuggestion';
 import AppLike from '../../test/AppLike';
-
-var WrappingComponent = function WrappingComponent(_ref) {
-  var children = _ref.children;
-  return /*#__PURE__*/React.createElement(AppLike, null, children);
-};
-
 describe('ContactSuggestion component', function () {
-  var fakeT = jest.fn(function (s, args) {
-    if (s === 'Share.members.count') {
-      return "".concat(args.smart_count, " members");
-    }
+  var setup = function setup(_ref) {
+    var contactOrGroup = _ref.contactOrGroup;
+    return render( /*#__PURE__*/React.createElement(ContactSuggestion, {
+      contactOrGroup: contactOrGroup
+    }), {
+      wrapper: AppLike
+    });
+  };
 
-    return s;
-  });
   it('should display contact suggestion for a contact', function () {
     var jonSnow = {
       _id: 'f3a4e501-abbd',
@@ -34,17 +30,11 @@ describe('ContactSuggestion component', function () {
       }],
       _type: 'io.cozy.contacts'
     };
-    var contacts = [jonSnow];
-    var props = {
-      contactOrGroup: jonSnow,
-      contacts: contacts,
-      t: fakeT
-    };
-    var jsx = /*#__PURE__*/React.createElement(ContactSuggestion, props);
-    var wrapper = mount(jsx, {
-      wrappingComponent: WrappingComponent
+    setup({
+      contactOrGroup: jonSnow
     });
-    expect(wrapper).toMatchSnapshot();
+    expect(screen.getByText('Jon Snow')).toBeInTheDocument();
+    expect(screen.getByText('https://jonsnow.mycozy.cloud')).toBeInTheDocument();
   });
   it('should display contact suggestion for a contact without fullname (for example created by a share modal)', function () {
     var jonSnow = {
@@ -57,94 +47,22 @@ describe('ContactSuggestion component', function () {
       name: undefined,
       _type: 'io.cozy.contacts'
     };
-    var contacts = [jonSnow];
-    var props = {
-      contactOrGroup: jonSnow,
-      contacts: contacts,
-      t: fakeT
-    };
-    var jsx = /*#__PURE__*/React.createElement(ContactSuggestion, props);
-    var wrapper = mount(jsx, {
-      wrappingComponent: WrappingComponent
+    setup({
+      contactOrGroup: jonSnow
     });
-    expect(wrapper).toMatchSnapshot();
+    expect(screen.getByText('jon.snow@email.com')).toBeInTheDocument();
   });
   it('should display contact suggestion for a group', function () {
-    var jon = {
-      _id: 'f3a4e501-abbd',
-      fullname: 'Jon Snow',
-      name: {
-        givenName: 'Jon',
-        familyName: 'Snow'
-      },
-      email: [{
-        address: 'jon.snow@email.com',
-        type: 'primary'
-      }],
-      _type: 'io.cozy.contacts',
-      relationships: {
-        groups: {
-          data: [{
-            _id: '610718e6-2d7a',
-            _type: 'io.cozy.contacts.groups'
-          }]
-        }
-      }
-    };
-    var cersei = {
-      _id: '42dc490a-7878',
-      fullname: 'Cersei Lannister',
-      name: {
-        givenName: 'Cersei',
-        familyName: 'Lannister'
-      },
-      email: [{
-        address: 'cersei@email.com',
-        type: 'primary'
-      }],
-      _type: 'io.cozy.contacts',
-      relationships: {
-        groups: {
-          data: []
-        }
-      }
-    };
-    var sam = {
-      _id: 'b5bed853-93da',
-      fullname: 'Samwell Tarly',
-      name: {
-        givenName: 'Samwell',
-        familyName: 'Tarly'
-      },
-      email: [{
-        address: 'samwell@email.com',
-        type: 'primary'
-      }],
-      _type: 'io.cozy.contacts',
-      relationships: {
-        groups: {
-          data: [{
-            _id: '610718e6-2d7a',
-            _type: 'io.cozy.contacts.groups'
-          }]
-        }
-      }
-    };
-    var contacts = [jon, cersei, sam];
     var theNightsWatch = {
       _id: '610718e6-2d7a',
       name: "The Night's Watch",
-      _type: 'io.cozy.contacts.groups'
-    };
-    var props = {
-      contactOrGroup: theNightsWatch,
-      contacts: contacts,
-      t: fakeT
+      _type: 'io.cozy.contacts.groups',
+      membersCount: 2
     };
-    var jsx = /*#__PURE__*/React.createElement(ContactSuggestion, props);
-    var wrapper = mount(jsx, {
-      wrappingComponent: WrappingComponent
+    setup({
+      contactOrGroup: theNightsWatch
     });
-    expect(wrapper).toMatchSnapshot();
+    expect(screen.getByText("The Night's Watch")).toBeInTheDocument();
+    expect(screen.getByText('2 members')).toBeInTheDocument();
   });
 });

package/dist/components/ShareAutosuggest.js

@@ -174,9 +174,6 @@ var ShareAutocomplete = function ShareAutocomplete(_ref) {
 
   var renderSuggestion = function renderSuggestion(contactOrGroup) {
     return /*#__PURE__*/React.createElement(ContactSuggestion, {
-      contacts: contactsAndGroups.filter(function (item) {
-        return item._type === Contact.doctype;
-      }),
       contactOrGroup: contactOrGroup
     });
   };

package/dist/components/ShareRecipientsInput.js

@@ -1,5 +1,12 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+import get from 'lodash/get';
 import PropTypes from 'prop-types';
 import React, { useState, useEffect } from 'react';
 import ShareAutosuggest from './ShareAutosuggest';
@@ -35,7 +42,22 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
     if (contacts.hasMore || contacts.fetchStatus === 'loading') {
       return contacts.data;
     } else {
-      return [].concat(_toConsumableArray(contacts.data), _toConsumableArray(contactGroups.data));
+      var contactGroupsWithCount = contactGroups.data.map(function (contactGroup) {
+        return _objectSpread(_objectSpread({}, contactGroup), {}, {
+          membersCount: contacts.data.reduce(function (total, contact) {
+            if (get(contact, 'relationships.groups.data', []).map(function (group) {
+              return group._id;
+            }).includes(contactGroup._id)) {
+              return total + 1;
+            }
+
+            return total;
+          }, 0)
+        });
+      }).filter(function (contactGroup) {
+        return contactGroup.membersCount > 0;
+      });
+      return [].concat(_toConsumableArray(contacts.data), _toConsumableArray(contactGroupsWithCount));
     }
   };