cozy-sharing 40.1.7 → 40.1.8

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [40.1.8](https://github.com/cozy/cozy-libs/compare/cozy-sharing@40.1.7...cozy-sharing@40.1.8) (2026-10-27)
+
+**Note:** Version bump only for package cozy-sharing
+
 ## [40.1.7](https://github.com/cozy/cozy-libs/compare/cozy-sharing@40.1.6...cozy-sharing@40.1.7) (2026-10-27)
 
 **Note:** Version bump only for package cozy-sharing

package/dist/components/FederatedFolder/FederatedFolderModal.spec.js

@@ -80,9 +80,9 @@ jest.mock('../../hoc/withLocales', function () {
   };
 });
 jest.mock('../../helpers/contacts', function () {
-  return {
+  return _objectSpread(_objectSpread({}, jest.requireActual('../../helpers/contacts')), {}, {
     getOrCreateFromArray: jest.fn()
-  };
+  });
 });
 jest.mock('../../hooks/usePendingRecipients', function () {
   return {

package/dist/components/{ShareRecipientsInput.js → ShareAutosuggestWrapper.js}

@@ -1,4 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 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; }
@@ -8,23 +7,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import PropTypes from 'prop-types';
 import React from 'react';
 import { useQueryAll, isQueryLoading } from 'cozy-client';
-import { models } from 'cozy-client';
 import flag from 'cozy-flags';
 import ShareAutosuggest from './ShareAutosuggest';
-import { getContactsFromGroupId } from '../helpers/contacts';
+import { computeContactsAndGroups } from '../helpers/contacts';
 import { buildReachableContactsQuery, buildContactGroupsQuery, buildUnreachableContactsWithGroupsQuery } from '../queries/queries';
-var ContactModel = models.contact;
 /**
- * ShareRecipientsInput is responsible for fetching contacts and groups.
+ * ShareAutosuggestWrapper is responsible for fetching contacts and groups.
  * We retrieve all the contacts that are reachable and the groups they belong to.
  * In order to display the total number of members in each group, we also retrieve the contacts that are not reachable.
  */
 
-var isCurrentUser = function isCurrentUser(contact) {
-  return contact.me === true;
-};
-
-var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
+var ShareAutosuggestWrapper = function ShareAutosuggestWrapper(_ref) {
   var currentRecipients = _ref.currentRecipients,
       recipients = _ref.recipients,
       placeholder = _ref.placeholder,
@@ -43,48 +36,13 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
   var contactGroupsQuery = buildContactGroupsQuery();
   var contactGroupsResult = useQueryAll(contactGroupsQuery.definition, contactGroupsQuery.options);
   var isLoading = isQueryLoading(reachableContactsResult) || reachableContactsResult.hasMore || isQueryLoading(contactGroupsResult) || contactGroupsResult.hasMore || flag('sharing.show-recipient-groups') && (isQueryLoading(unreachableContactsWithGroupsResult) || unreachableContactsWithGroupsResult.hasMore);
-  var reachableContacts = (reachableContactsResult.data || []).filter(function (contact) {
-    return !isCurrentUser(contact) && // We do not want contact already in the sharing
-    !currentRecipients.find(function (r) {
-      return r.email === ContactModel.getPrimaryEmail(contact);
-    }) && // We do not want contact currently in pending contacts (in chips)
-    !recipients.find(function (r) {
-      return r._id === contact._id;
-    });
-  });
-  var unreachableContactsWithGroups = (unreachableContactsWithGroupsResult.data || []).filter(function (contact) {
-    return !isCurrentUser(contact);
-  });
-  var currentRecipientGroups = currentRecipients.map(function (_ref2) {
-    var id = _ref2.id;
-    return id;
-  }).filter(Boolean);
-  var contactGroups = (contactGroupsResult.data || []).filter(function (_ref3) {
-    var _id = _ref3._id;
-    return !flag('sharing.show-recipient-groups') || !currentRecipientGroups.includes(_id);
-  }).map(function (contactGroup) {
-    var reachableMembers = getContactsFromGroupId(reachableContacts, contactGroup.id).map(function (contact) {
-      return _objectSpread(_objectSpread({}, contact), {}, {
-        isReachable: true
-      });
-    });
-
-    if (flag('sharing.show-recipient-groups') !== true) {
-      return _objectSpread(_objectSpread({}, contactGroup), {}, {
-        members: reachableMembers
-      });
-    }
-
-    var unreachableMembers = getContactsFromGroupId(unreachableContactsWithGroups, contactGroup.id).map(function (contact) {
-      return _objectSpread(_objectSpread({}, contact), {}, {
-        isReachable: false
-      });
-    });
-    return _objectSpread(_objectSpread({}, contactGroup), {}, {
-      members: [].concat(_toConsumableArray(reachableMembers), _toConsumableArray(unreachableMembers))
-    });
+  var contactsAndGroups = computeContactsAndGroups({
+    reachableContacts: reachableContactsResult.data || [],
+    unreachableContactsWithGroups: unreachableContactsWithGroupsResult.data || [],
+    contactGroups: contactGroupsResult.data || [],
+    currentRecipients: currentRecipients,
+    pendingRecipients: recipients
   });
-  var contactsAndGroups = [].concat(_toConsumableArray(reachableContacts), _toConsumableArray(contactGroups));
   return /*#__PURE__*/React.createElement(ShareAutosuggest, {
     loading: isLoading,
     disabled: disabled,
@@ -99,7 +57,7 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
   });
 };
 
-ShareRecipientsInput.propTypes = {
+ShareAutosuggestWrapper.propTypes = {
   currentRecipients: PropTypes.array,
   recipients: PropTypes.array,
   placeholder: PropTypes.string,
@@ -110,8 +68,8 @@ ShareRecipientsInput.propTypes = {
   autoFocus: PropTypes.bool,
   endAdornment: PropTypes.node
 };
-ShareRecipientsInput.defaultProps = {
+ShareAutosuggestWrapper.defaultProps = {
   currentRecipients: [],
   recipients: []
 };
-export default ShareRecipientsInput;
+export default ShareAutosuggestWrapper;

package/dist/components/{ShareRecipientsInput.spec.js → ShareAutosuggestWrapper.spec.js}

@@ -4,7 +4,7 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { createMockClient } from 'cozy-client';
 import flag from 'cozy-flags';
-import ShareRecipientsInput from './ShareRecipientsInput';
+import ShareAutosuggestWrapper from './ShareAutosuggestWrapper';
 import AppLike from './SharingBanner/test/AppLike';
 jest.mock('cozy-flags', function () {
   return {
@@ -33,7 +33,7 @@ jest.mock('./ShareAutosuggest', function () {
     }
   };
 });
-describe('ShareRecipientsInput component', function () {
+describe('ShareAutosuggestWrapper component', function () {
   var setup = function setup(_ref2) {
     var contacts = _ref2.contacts,
         contactGroups = _ref2.contactGroups,
@@ -61,7 +61,7 @@ describe('ShareRecipientsInput component', function () {
     });
     render( /*#__PURE__*/React.createElement(AppLike, {
       client: mockClient
-    }, /*#__PURE__*/React.createElement(ShareRecipientsInput, {
+    }, /*#__PURE__*/React.createElement(ShareAutosuggestWrapper, {
       onPick: function onPick() {},
       onRemove: function onRemove() {},
       placeholder: "Enter recipients here",

package/dist/components/ShareByEmail.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import flag from 'cozy-flags';
 import { useI18n } from 'twake-i18n';
-import ShareRecipientsInput from './ShareRecipientsInput';
+import ShareAutosuggestWrapper from './ShareAutosuggestWrapper';
 import ShareTypeSelect from './Sharetypeselect';
 import { mergeRecipients, spreadGroupAndMergeRecipients } from '../helpers/recipients';
 import { isReadOnlySharing } from '../state';
@@ -69,7 +69,7 @@ export var ShareByEmail = function ShareByEmail(_ref) {
     className: styles['coz-form-group']
   }, /*#__PURE__*/React.createElement("div", {
     className: styles['coz-form']
-  }, /*#__PURE__*/React.createElement(ShareRecipientsInput, {
+  }, /*#__PURE__*/React.createElement(ShareAutosuggestWrapper, {
     placeholder: pendingRecipients.length === 0 ? t("".concat(documentType, ".share.shareByEmail.emailPlaceholder")) : '',
     onPick: onRecipientPick,
     onRemove: onRecipientRemove,

package/dist/components/SharingBanner/components/PublicBanner.js

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import snarkdown from 'snarkdown';
 import { Icon, SyncCozy, ToTheCloud } from '@linagora/twake-icons';
-import { useClient } from 'cozy-client';
 import flag from 'cozy-flags';
 import Alert from 'cozy-ui/transpiled/react/Alert';
 import Avatar from 'cozy-ui/transpiled/react/Avatar';
@@ -20,14 +19,13 @@ var getPublicNameFromSharing = function getPublicNameFromSharing(sharing) {
 };
 
 var PublicBannerCozyToCozyContent = function PublicBannerCozyToCozyContent(_ref) {
-  var sharing = _ref.sharing;
+  var sharing = _ref.sharing,
+      avatarURL = _ref.avatarURL;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
-  var client = useClient();
   var name = getPublicNameFromSharing(sharing);
-  var avatarURL = "".concat(client.options.uri, "/public/avatar?fallback=initials");
   var withAvatar = snarkdown(t('Share.banner.shared_from', {
     name: name,
     image: avatarURL
@@ -48,7 +46,8 @@ var PublicBannerCozyToCozyContent = function PublicBannerCozyToCozyContent(_ref)
 };
 
 PublicBannerCozyToCozyContent.propTypes = {
-  sharing: PropTypes.object.isRequired
+  sharing: PropTypes.object.isRequired,
+  avatarURL: PropTypes.string.isRequired
 };
 
 var openExternalLink = function openExternalLink(url) {
@@ -57,6 +56,7 @@ var openExternalLink = function openExternalLink(url) {
 
 var SharingBannerCozyToCozy = function SharingBannerCozyToCozy(_ref2) {
   var sharing = _ref2.sharing,
+      avatarURL = _ref2.avatarURL,
       isSharingShortcutCreated = _ref2.isSharingShortcutCreated,
       addSharingLink = _ref2.addSharingLink,
       onClose = _ref2.onClose;
@@ -101,7 +101,8 @@ var SharingBannerCozyToCozy = function SharingBannerCozyToCozy(_ref2) {
       onClick: onClose
     }))
   }, /*#__PURE__*/React.createElement(PublicBannerCozyToCozyContent, {
-    sharing: sharing
+    sharing: sharing,
+    avatarURL: avatarURL
   }));
 };
 
@@ -168,6 +169,7 @@ SharingBannerByLink.propTypes = {
 };
 SharingBannerCozyToCozy.propTypes = {
   sharing: PropTypes.object.isRequired,
+  avatarURL: PropTypes.string.isRequired,
   isSharingShortcutCreated: PropTypes.bool.isRequired,
   addSharingLink: PropTypes.string.isRequired,
   onClose: PropTypes.func.isRequired

package/dist/components/SharingBanner/components/PublicBanner.spec.js

@@ -1,19 +1,10 @@
 import { render } from '@testing-library/react';
 import React from 'react';
-import { useClient } from 'cozy-client';
 import { BreakpointsProvider } from 'cozy-ui/transpiled/react/providers/Breakpoints';
 import { useI18n } from 'twake-i18n';
 import { SharingBannerCozyToCozy } from './PublicBanner';
 jest.mock('twake-i18n');
-jest.mock('cozy-client');
 describe('PublicBanner', function () {
-  beforeEach(function () {
-    useClient.mockReturnValue({
-      options: {
-        uri: 'http://cozy.localhost:8080'
-      }
-    });
-  });
   it('should not add dangerous html', function () {
     // Given
     useI18n.mockReturnValue({
@@ -36,6 +27,7 @@ describe('PublicBanner', function () {
 
     var _render = render( /*#__PURE__*/React.createElement(BreakpointsProvider, null, /*#__PURE__*/React.createElement(SharingBannerCozyToCozy, {
       sharing: sharing,
+      avatarURL: "http://cozy.localhost:8080/public/avatar?fallback=initials",
       isSharingShortcutCreated: true,
       addSharingLink: "discoveryLink",
       onClose: function onClose() {}

package/dist/components/SharingBanner/components/SharingBanner.js

@@ -4,6 +4,7 @@ import React, { useState, useCallback } from 'react';
 import { SharingBannerByLink, SharingBannerCozyToCozy } from './PublicBanner';
 export var SharingBanner = function SharingBanner(_ref) {
   var sharingInfos = _ref.sharingInfos,
+      avatarURL = _ref.avatarURL,
       hideCreateCozyAction = _ref.hideCreateCozyAction;
 
   var _useState = useState(true),
@@ -25,12 +26,14 @@ export var SharingBanner = function SharingBanner(_ref) {
   }) : /*#__PURE__*/React.createElement(SharingBannerCozyToCozy, {
     isSharingShortcutCreated: isSharingShortcutCreated,
     sharing: sharing,
+    avatarURL: avatarURL,
     addSharingLink: addSharingLink,
     onClose: onClose
   }));
 };
 SharingBanner.propTypes = {
   sharingInfos: PropTypes.object,
+  avatarURL: PropTypes.string,
   hideCreateCozyAction: PropTypes.bool
 };
 export default SharingBanner;

package/dist/components/SharingBanner/index.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import { useClient } from 'cozy-client';
 import { SharingBanner } from './components/SharingBanner';
 import { useSharingInfos } from './hooks/useSharingInfos';
 import withLocales from '../../hoc/withLocales';
@@ -7,9 +8,11 @@ import withLocales from '../../hoc/withLocales';
 var Plugin = function Plugin(_ref) {
   var previewPath = _ref.previewPath,
       hideCreateCozyAction = _ref.hideCreateCozyAction;
+  var client = useClient();
   var sharingInfos = useSharingInfos(previewPath);
   return /*#__PURE__*/React.createElement(SharingBanner, {
     sharingInfos: sharingInfos,
+    avatarURL: "".concat(client.options.uri, "/public/avatar?fallback=initials"),
     hideCreateCozyAction: hideCreateCozyAction
   });
 };

package/dist/helpers/contacts.js

@@ -1,6 +1,16 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+
+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 _regeneratorRuntime from "@babel/runtime/regenerator";
-import { validateEmail } from '../helpers/email'; // Return the contact object if present
+import { models } from 'cozy-client';
+import flag from 'cozy-flags';
+import { validateEmail } from '../helpers/email';
+var ContactModel = models.contact; // Return the contact object if present
 // Else check if a contact exist with this email address, if yes return it
 // if not create it
 
@@ -114,4 +124,72 @@ export var getContactsFromGroupId = function getContactsFromGroupId() {
 
 export var isContactToBeCreated = function isContactToBeCreated(contact) {
   return !contact._id;
+};
+
+var isCurrentUser = function isCurrentUser(contact) {
+  return contact.me === true;
+};
+/**
+ * Computes the contacts and groups to suggest when adding recipients to a
+ * sharing. The unreachable contacts only count in the members of the groups,
+ * when flag sharing.show-recipient-groups is enabled.
+ *
+ * @param {object} params
+ * @param {object[]} params.reachableContacts - Contacts that can be shared with
+ * @param {object[]} params.unreachableContactsWithGroups - Contacts that cannot be shared with but belong to a group
+ * @param {object[]} params.contactGroups - Groups of contacts
+ * @param {object[]} params.currentRecipients - Recipients already in the sharing
+ * @param {object[]} params.pendingRecipients - Recipients picked but not yet shared with
+ * @returns {object[]} The contacts, then the groups with their members
+ */
+
+
+export var computeContactsAndGroups = function computeContactsAndGroups(_ref3) {
+  var reachableContacts = _ref3.reachableContacts,
+      unreachableContactsWithGroups = _ref3.unreachableContactsWithGroups,
+      contactGroups = _ref3.contactGroups,
+      currentRecipients = _ref3.currentRecipients,
+      pendingRecipients = _ref3.pendingRecipients;
+  var suggestedContacts = reachableContacts.filter(function (contact) {
+    return !isCurrentUser(contact) && // We do not want contact already in the sharing
+    !currentRecipients.find(function (r) {
+      return r.email === ContactModel.getPrimaryEmail(contact);
+    }) && // We do not want contact currently in pending contacts (in chips)
+    !pendingRecipients.find(function (r) {
+      return r._id === contact._id;
+    });
+  });
+  var unreachableContacts = unreachableContactsWithGroups.filter(function (contact) {
+    return !isCurrentUser(contact);
+  });
+  var currentRecipientGroups = currentRecipients.map(function (_ref4) {
+    var id = _ref4.id;
+    return id;
+  }).filter(Boolean);
+  var suggestedGroups = contactGroups.filter(function (_ref5) {
+    var _id = _ref5._id;
+    return !flag('sharing.show-recipient-groups') || !currentRecipientGroups.includes(_id);
+  }).map(function (contactGroup) {
+    var reachableMembers = getContactsFromGroupId(suggestedContacts, contactGroup.id).map(function (contact) {
+      return _objectSpread(_objectSpread({}, contact), {}, {
+        isReachable: true
+      });
+    });
+
+    if (flag('sharing.show-recipient-groups') !== true) {
+      return _objectSpread(_objectSpread({}, contactGroup), {}, {
+        members: reachableMembers
+      });
+    }
+
+    var unreachableMembers = getContactsFromGroupId(unreachableContacts, contactGroup.id).map(function (contact) {
+      return _objectSpread(_objectSpread({}, contact), {}, {
+        isReachable: false
+      });
+    });
+    return _objectSpread(_objectSpread({}, contactGroup), {}, {
+      members: [].concat(_toConsumableArray(reachableMembers), _toConsumableArray(unreachableMembers))
+    });
+  });
+  return [].concat(_toConsumableArray(suggestedContacts), _toConsumableArray(suggestedGroups));
 };

package/dist/helpers/contacts.spec.js

@@ -1,6 +1,22 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+
+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 _regeneratorRuntime from "@babel/runtime/regenerator";
-import { getOrCreateFromArray } from './contacts';
+import flag from 'cozy-flags';
+import { computeContactsAndGroups, getOrCreateFromArray } from './contacts';
+jest.mock('cozy-flags', function () {
+  return {
+    __esModule: true,
+    default: jest.fn(function () {
+      return null;
+    })
+  };
+});
 var findMock = jest.fn().mockReturnValueOnce({
   data: [{
     id: 2,
@@ -63,4 +79,109 @@ describe('getOrCreateFromArray', function () {
       }
     }, _callee);
   })));
+});
+describe('computeContactsAndGroups', function () {
+  var group = {
+    id: 'friends',
+    _id: 'friends',
+    name: 'Friends'
+  };
+  var inGroup = {
+    relationships: {
+      groups: {
+        data: [{
+          _id: 'friends'
+        }]
+      }
+    }
+  };
+
+  var alice = _objectSpread({
+    _id: 'alice',
+    email: [{
+      address: 'alice@cozy.cc',
+      primary: true
+    }]
+  }, inGroup);
+
+  var bob = _objectSpread({
+    _id: 'bob',
+    email: [{
+      address: 'bob@cozy.cc'
+    }]
+  }, inGroup);
+
+  var me = _objectSpread({
+    _id: 'me',
+    me: true
+  }, inGroup);
+
+  var carol = _objectSpread({
+    _id: 'carol'
+  }, inGroup);
+
+  var setup = function setup() {
+    var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        _ref2$currentRecipien = _ref2.currentRecipients,
+        currentRecipients = _ref2$currentRecipien === void 0 ? [] : _ref2$currentRecipien,
+        _ref2$pendingRecipien = _ref2.pendingRecipients,
+        pendingRecipients = _ref2$pendingRecipien === void 0 ? [] : _ref2$pendingRecipien,
+        _ref2$showRecipientGr = _ref2.showRecipientGroups,
+        showRecipientGroups = _ref2$showRecipientGr === void 0 ? null : _ref2$showRecipientGr;
+
+    flag.mockReturnValue(showRecipientGroups);
+    return computeContactsAndGroups({
+      reachableContacts: [alice, bob, me],
+      unreachableContactsWithGroups: [carol, me],
+      contactGroups: [group],
+      currentRecipients: currentRecipients,
+      pendingRecipients: pendingRecipients
+    });
+  };
+
+  it('suggests the contacts, then the groups with their reachable members', function () {
+    var _setup = setup(),
+        _setup2 = _slicedToArray(_setup, 3),
+        first = _setup2[0],
+        second = _setup2[1],
+        friends = _setup2[2];
+
+    expect([first._id, second._id, friends._id]).toEqual(['alice', 'bob', 'friends']);
+    expect(friends.members.map(function (m) {
+      return [m._id, m.isReachable];
+    })).toEqual([['alice', true], ['bob', true]]);
+  });
+  it('does not suggest the recipients already shared with or picked', function () {
+    var contactsAndGroups = setup({
+      currentRecipients: [{
+        email: 'alice@cozy.cc'
+      }],
+      pendingRecipients: [bob]
+    });
+    expect(contactsAndGroups.map(function (c) {
+      return c._id;
+    })).toEqual(['friends']);
+  });
+  it('adds the unreachable members when flag sharing.show-recipient-groups is enabled', function () {
+    var _setup3 = setup({
+      showRecipientGroups: true
+    }),
+        _setup4 = _slicedToArray(_setup3, 3),
+        friends = _setup4[2];
+
+    expect(friends.members.map(function (m) {
+      return [m._id, m.isReachable];
+    })).toEqual([['alice', true], ['bob', true], ['carol', false]]);
+  });
+  it('does not suggest the groups already in the sharing when flag sharing.show-recipient-groups is enabled', function () {
+    var contactsAndGroups = setup({
+      currentRecipients: [{
+        id: 'friends'
+      }],
+      showRecipientGroups: true
+    });
+    expect(contactsAndGroups.map(function (c) {
+      return c._id;
+    })).toEqual(['alice', 'bob']);
+  });
 });

package/docs/share-modal-architecture.md

@@ -20,8 +20,8 @@ flowchart TD
     SharingContent --> ShareByEmail
     ConfirmTrustedRecipientsDialog --> DumbConfirmTrustedRecipientsDialog
     DumbConfirmTrustedRecipientsDialog --> ShareDialogTwoStepsConfirmationContainer
-    ShareByEmail --> ShareRecipientsInput
-    ShareRecipientsInput --> ShareAutosuggest
+    ShareByEmail --> ShareAutosuggestWrapper
+    ShareAutosuggestWrapper --> ShareAutosuggest
 ```
 
 ### Specific case of `ShareDialogTwoStepsConfirmationContainer`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "40.1.7",
+  "version": "40.1.8",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -58,7 +58,7 @@
     "cozy-intent": "^2.31.1",
     "cozy-minilog": "^3.10.1",
     "cozy-ui": "^140.5.0",
-    "cozy-ui-plus": "^14.1.2",
+    "cozy-ui-plus": "^14.1.3",
     "jest": "30.3.0",
     "jest-environment-jsdom": "30.3.0",
     "react": "16.12.0",
@@ -84,5 +84,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "ff9d90f0000f5446b91840dbb4237b48336c3997"
+  "gitHead": "3d97a76d7d6b7a07f27fa4d25b17b26474e1fdc0"
 }

package/src/components/FederatedFolder/FederatedFolderModal.spec.jsx

@@ -61,6 +61,7 @@ jest.mock('cozy-ui/transpiled/react/providers/Alert', () => ({
 jest.mock('../../hoc/withLocales', () => Component => Component)
 
 jest.mock('../../helpers/contacts', () => ({
+  ...jest.requireActual('../../helpers/contacts'),
   getOrCreateFromArray: jest.fn()
 }))
 

package/src/components/{ShareRecipientsInput.jsx → ShareAutosuggestWrapper.jsx}

@@ -2,27 +2,22 @@ import PropTypes from 'prop-types'
 import React from 'react'
 
 import { useQueryAll, isQueryLoading } from 'cozy-client'
-import { models } from 'cozy-client'
 import flag from 'cozy-flags'
 
 import ShareAutosuggest from './ShareAutosuggest'
-import { getContactsFromGroupId } from '../helpers/contacts'
+import { computeContactsAndGroups } from '../helpers/contacts'
 import {
   buildReachableContactsQuery,
   buildContactGroupsQuery,
   buildUnreachableContactsWithGroupsQuery
 } from '../queries/queries'
 
-const ContactModel = models.contact
-
 /**
- * ShareRecipientsInput is responsible for fetching contacts and groups.
+ * ShareAutosuggestWrapper is responsible for fetching contacts and groups.
  * We retrieve all the contacts that are reachable and the groups they belong to.
  * In order to display the total number of members in each group, we also retrieve the contacts that are not reachable.
  */
-const isCurrentUser = contact => contact.me === true
-
-const ShareRecipientsInput = ({
+const ShareAutosuggestWrapper = ({
   currentRecipients,
   recipients,
   placeholder,
@@ -64,60 +59,14 @@ const ShareRecipientsInput = ({
       (isQueryLoading(unreachableContactsWithGroupsResult) ||
         unreachableContactsWithGroupsResult.hasMore))
 
-  const reachableContacts = (reachableContactsResult.data || []).filter(
-    contact =>
-      !isCurrentUser(contact) &&
-      // We do not want contact already in the sharing
-      !currentRecipients.find(
-        r => r.email === ContactModel.getPrimaryEmail(contact)
-      ) &&
-      // We do not want contact currently in pending contacts (in chips)
-      !recipients.find(r => r._id === contact._id)
-  )
-
-  const unreachableContactsWithGroups = (
-    unreachableContactsWithGroupsResult.data || []
-  ).filter(contact => !isCurrentUser(contact))
-  const currentRecipientGroups = currentRecipients
-    .map(({ id }) => id)
-    .filter(Boolean)
-  const contactGroups = (contactGroupsResult.data || [])
-    .filter(
-      ({ _id }) =>
-        !flag('sharing.show-recipient-groups') ||
-        !currentRecipientGroups.includes(_id)
-    )
-    .map(contactGroup => {
-      const reachableMembers = getContactsFromGroupId(
-        reachableContacts,
-        contactGroup.id
-      ).map(contact => ({
-        ...contact,
-        isReachable: true
-      }))
-
-      if (flag('sharing.show-recipient-groups') !== true) {
-        return {
-          ...contactGroup,
-          members: reachableMembers
-        }
-      }
-
-      const unreachableMembers = getContactsFromGroupId(
-        unreachableContactsWithGroups,
-        contactGroup.id
-      ).map(contact => ({
-        ...contact,
-        isReachable: false
-      }))
-
-      return {
-        ...contactGroup,
-        members: [...reachableMembers, ...unreachableMembers]
-      }
-    })
-
-  const contactsAndGroups = [...reachableContacts, ...contactGroups]
+  const contactsAndGroups = computeContactsAndGroups({
+    reachableContacts: reachableContactsResult.data || [],
+    unreachableContactsWithGroups:
+      unreachableContactsWithGroupsResult.data || [],
+    contactGroups: contactGroupsResult.data || [],
+    currentRecipients,
+    pendingRecipients: recipients
+  })
 
   return (
     <ShareAutosuggest
@@ -135,7 +84,7 @@ const ShareRecipientsInput = ({
   )
 }
 
-ShareRecipientsInput.propTypes = {
+ShareAutosuggestWrapper.propTypes = {
   currentRecipients: PropTypes.array,
   recipients: PropTypes.array,
   placeholder: PropTypes.string,
@@ -147,9 +96,9 @@ ShareRecipientsInput.propTypes = {
   endAdornment: PropTypes.node
 }
 
-ShareRecipientsInput.defaultProps = {
+ShareAutosuggestWrapper.defaultProps = {
   currentRecipients: [],
   recipients: []
 }
 
-export default ShareRecipientsInput
+export default ShareAutosuggestWrapper

package/src/components/{ShareRecipientsInput.spec.jsx → ShareAutosuggestWrapper.spec.jsx}

@@ -4,7 +4,7 @@ import React from 'react'
 import { createMockClient } from 'cozy-client'
 import flag from 'cozy-flags'
 
-import ShareRecipientsInput from './ShareRecipientsInput'
+import ShareAutosuggestWrapper from './ShareAutosuggestWrapper'
 import AppLike from './SharingBanner/test/AppLike'
 
 jest.mock('cozy-flags', () => ({
@@ -37,7 +37,7 @@ jest.mock('./ShareAutosuggest', () => ({
   }
 }))
 
-describe('ShareRecipientsInput component', () => {
+describe('ShareAutosuggestWrapper component', () => {
   const setup = (
     { contacts, contactGroups, unreachableContact },
     { currentRecipients, recipients } = {}
@@ -60,7 +60,7 @@ describe('ShareRecipientsInput component', () => {
     })
     render(
       <AppLike client={mockClient}>
-        <ShareRecipientsInput
+        <ShareAutosuggestWrapper
           onPick={() => {}}
           onRemove={() => {}}
           placeholder="Enter recipients here"

package/src/components/ShareByEmail.jsx

@@ -4,7 +4,7 @@ import React from 'react'
 import flag from 'cozy-flags'
 import { useI18n } from 'twake-i18n'
 
-import ShareRecipientsInput from './ShareRecipientsInput'
+import ShareAutosuggestWrapper from './ShareAutosuggestWrapper'
 import ShareTypeSelect from './Sharetypeselect'
 import {
   mergeRecipients,
@@ -60,7 +60,7 @@ export const ShareByEmail = ({
   return (
     <div className={styles['coz-form-group']}>
       <div className={styles['coz-form']}>
-        <ShareRecipientsInput
+        <ShareAutosuggestWrapper
           placeholder={
             pendingRecipients.length === 0
               ? t(`${documentType}.share.shareByEmail.emailPlaceholder`)

package/src/components/SharingBanner/components/PublicBanner.jsx

@@ -3,7 +3,6 @@ import React from 'react'
 import snarkdown from 'snarkdown'
 
 import { Icon, SyncCozy, ToTheCloud } from '@linagora/twake-icons'
-import { useClient } from 'cozy-client'
 import flag from 'cozy-flags'
 import Alert from 'cozy-ui/transpiled/react/Alert'
 import Avatar from 'cozy-ui/transpiled/react/Avatar'
@@ -17,11 +16,9 @@ import styles from '../../../styles/publicBanner.styl'
 const getPublicNameFromSharing = sharing =>
   sharing.attributes.members[0].public_name
 
-const PublicBannerCozyToCozyContent = ({ sharing }) => {
+const PublicBannerCozyToCozyContent = ({ sharing, avatarURL }) => {
   const { t } = useI18n()
-  const client = useClient()
   const name = getPublicNameFromSharing(sharing)
-  const avatarURL = `${client.options.uri}/public/avatar?fallback=initials`
 
   const withAvatar = snarkdown(
     t('Share.banner.shared_from', {
@@ -43,13 +40,15 @@ const PublicBannerCozyToCozyContent = ({ sharing }) => {
   )
 }
 PublicBannerCozyToCozyContent.propTypes = {
-  sharing: PropTypes.object.isRequired
+  sharing: PropTypes.object.isRequired,
+  avatarURL: PropTypes.string.isRequired
 }
 
 const openExternalLink = url => (window.location = url)
 
 const SharingBannerCozyToCozy = ({
   sharing,
+  avatarURL,
   isSharingShortcutCreated,
   addSharingLink,
   onClose
@@ -90,7 +89,7 @@ const SharingBannerCozyToCozy = ({
         </>
       }
     >
-      <PublicBannerCozyToCozyContent sharing={sharing} />
+      <PublicBannerCozyToCozyContent sharing={sharing} avatarURL={avatarURL} />
     </Alert>
   )
 }
@@ -162,6 +161,7 @@ SharingBannerByLink.propTypes = {
 }
 SharingBannerCozyToCozy.propTypes = {
   sharing: PropTypes.object.isRequired,
+  avatarURL: PropTypes.string.isRequired,
   isSharingShortcutCreated: PropTypes.bool.isRequired,
   addSharingLink: PropTypes.string.isRequired,
   onClose: PropTypes.func.isRequired

package/src/components/SharingBanner/components/PublicBanner.spec.jsx

@@ -1,22 +1,14 @@
 import { render } from '@testing-library/react'
 import React from 'react'
 
-import { useClient } from 'cozy-client'
 import { BreakpointsProvider } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 import { useI18n } from 'twake-i18n'
 
 import { SharingBannerCozyToCozy } from './PublicBanner'
 
 jest.mock('twake-i18n')
-jest.mock('cozy-client')
 
 describe('PublicBanner', () => {
-  beforeEach(() => {
-    useClient.mockReturnValue({
-      options: { uri: 'http://cozy.localhost:8080' }
-    })
-  })
-
   it('should not add dangerous html', () => {
     // Given
     useI18n.mockReturnValue({
@@ -35,6 +27,7 @@ describe('PublicBanner', () => {
       <BreakpointsProvider>
         <SharingBannerCozyToCozy
           sharing={sharing}
+          avatarURL="http://cozy.localhost:8080/public/avatar?fallback=initials"
           isSharingShortcutCreated={true}
           addSharingLink="discoveryLink"
           onClose={() => {}}

package/src/components/SharingBanner/components/SharingBanner.jsx

@@ -3,7 +3,11 @@ import React, { useState, useCallback } from 'react'
 
 import { SharingBannerByLink, SharingBannerCozyToCozy } from './PublicBanner'
 
-export const SharingBanner = ({ sharingInfos, hideCreateCozyAction }) => {
+export const SharingBanner = ({
+  sharingInfos,
+  avatarURL,
+  hideCreateCozyAction
+}) => {
   const [isOpened, setIsOpened] = useState(true)
   const onClose = useCallback(() => setIsOpened(false), [setIsOpened])
 
@@ -22,6 +26,7 @@ export const SharingBanner = ({ sharingInfos, hideCreateCozyAction }) => {
       <SharingBannerCozyToCozy
         isSharingShortcutCreated={isSharingShortcutCreated}
         sharing={sharing}
+        avatarURL={avatarURL}
         addSharingLink={addSharingLink}
         onClose={onClose}
       />
@@ -31,6 +36,7 @@ export const SharingBanner = ({ sharingInfos, hideCreateCozyAction }) => {
 
 SharingBanner.propTypes = {
   sharingInfos: PropTypes.object,
+  avatarURL: PropTypes.string,
   hideCreateCozyAction: PropTypes.bool
 }
 

package/src/components/SharingBanner/index.jsx

@@ -1,15 +1,19 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 
+import { useClient } from 'cozy-client'
+
 import { SharingBanner } from './components/SharingBanner'
 import { useSharingInfos } from './hooks/useSharingInfos'
 import withLocales from '../../hoc/withLocales'
 
 const Plugin = ({ previewPath, hideCreateCozyAction }) => {
+  const client = useClient()
   const sharingInfos = useSharingInfos(previewPath)
   return (
     <SharingBanner
       sharingInfos={sharingInfos}
+      avatarURL={`${client.options.uri}/public/avatar?fallback=initials`}
       hideCreateCozyAction={hideCreateCozyAction}
     />
   )

package/src/helpers/contacts.js

@@ -1,5 +1,10 @@
+import { models } from 'cozy-client'
+import flag from 'cozy-flags'
+
 import { validateEmail } from '../helpers/email'
 
+const ContactModel = models.contact
+
 // Return the contact object if present
 // Else check if a contact exist with this email address, if yes return it
 // if not create it
@@ -59,3 +64,81 @@ export const getContactsFromGroupId = (contacts = [], groupId) => {
 export const isContactToBeCreated = contact => {
   return !contact._id
 }
+
+const isCurrentUser = contact => contact.me === true
+
+/**
+ * Computes the contacts and groups to suggest when adding recipients to a
+ * sharing. The unreachable contacts only count in the members of the groups,
+ * when flag sharing.show-recipient-groups is enabled.
+ *
+ * @param {object} params
+ * @param {object[]} params.reachableContacts - Contacts that can be shared with
+ * @param {object[]} params.unreachableContactsWithGroups - Contacts that cannot be shared with but belong to a group
+ * @param {object[]} params.contactGroups - Groups of contacts
+ * @param {object[]} params.currentRecipients - Recipients already in the sharing
+ * @param {object[]} params.pendingRecipients - Recipients picked but not yet shared with
+ * @returns {object[]} The contacts, then the groups with their members
+ */
+export const computeContactsAndGroups = ({
+  reachableContacts,
+  unreachableContactsWithGroups,
+  contactGroups,
+  currentRecipients,
+  pendingRecipients
+}) => {
+  const suggestedContacts = reachableContacts.filter(
+    contact =>
+      !isCurrentUser(contact) &&
+      // We do not want contact already in the sharing
+      !currentRecipients.find(
+        r => r.email === ContactModel.getPrimaryEmail(contact)
+      ) &&
+      // We do not want contact currently in pending contacts (in chips)
+      !pendingRecipients.find(r => r._id === contact._id)
+  )
+
+  const unreachableContacts = unreachableContactsWithGroups.filter(
+    contact => !isCurrentUser(contact)
+  )
+  const currentRecipientGroups = currentRecipients
+    .map(({ id }) => id)
+    .filter(Boolean)
+  const suggestedGroups = contactGroups
+    .filter(
+      ({ _id }) =>
+        !flag('sharing.show-recipient-groups') ||
+        !currentRecipientGroups.includes(_id)
+    )
+    .map(contactGroup => {
+      const reachableMembers = getContactsFromGroupId(
+        suggestedContacts,
+        contactGroup.id
+      ).map(contact => ({
+        ...contact,
+        isReachable: true
+      }))
+
+      if (flag('sharing.show-recipient-groups') !== true) {
+        return {
+          ...contactGroup,
+          members: reachableMembers
+        }
+      }
+
+      const unreachableMembers = getContactsFromGroupId(
+        unreachableContacts,
+        contactGroup.id
+      ).map(contact => ({
+        ...contact,
+        isReachable: false
+      }))
+
+      return {
+        ...contactGroup,
+        members: [...reachableMembers, ...unreachableMembers]
+      }
+    })
+
+  return [...suggestedContacts, ...suggestedGroups]
+}

package/src/helpers/contacts.spec.js

@@ -1,4 +1,11 @@
-import { getOrCreateFromArray } from './contacts'
+import flag from 'cozy-flags'
+
+import { computeContactsAndGroups, getOrCreateFromArray } from './contacts'
+
+jest.mock('cozy-flags', () => ({
+  __esModule: true,
+  default: jest.fn(() => null)
+}))
 
 const findMock = jest
   .fn()
@@ -51,3 +58,73 @@ describe('getOrCreateFromArray', () => {
     ])
   })
 })
+
+describe('computeContactsAndGroups', () => {
+  const group = { id: 'friends', _id: 'friends', name: 'Friends' }
+  const inGroup = { relationships: { groups: { data: [{ _id: 'friends' }] } } }
+  const alice = {
+    _id: 'alice',
+    email: [{ address: 'alice@cozy.cc', primary: true }],
+    ...inGroup
+  }
+  const bob = { _id: 'bob', email: [{ address: 'bob@cozy.cc' }], ...inGroup }
+  const me = { _id: 'me', me: true, ...inGroup }
+  const carol = { _id: 'carol', ...inGroup }
+
+  const setup = ({
+    currentRecipients = [],
+    pendingRecipients = [],
+    showRecipientGroups = null
+  } = {}) => {
+    flag.mockReturnValue(showRecipientGroups)
+    return computeContactsAndGroups({
+      reachableContacts: [alice, bob, me],
+      unreachableContactsWithGroups: [carol, me],
+      contactGroups: [group],
+      currentRecipients,
+      pendingRecipients
+    })
+  }
+
+  it('suggests the contacts, then the groups with their reachable members', () => {
+    const [first, second, friends] = setup()
+
+    expect([first._id, second._id, friends._id]).toEqual([
+      'alice',
+      'bob',
+      'friends'
+    ])
+    expect(friends.members.map(m => [m._id, m.isReachable])).toEqual([
+      ['alice', true],
+      ['bob', true]
+    ])
+  })
+
+  it('does not suggest the recipients already shared with or picked', () => {
+    const contactsAndGroups = setup({
+      currentRecipients: [{ email: 'alice@cozy.cc' }],
+      pendingRecipients: [bob]
+    })
+
+    expect(contactsAndGroups.map(c => c._id)).toEqual(['friends'])
+  })
+
+  it('adds the unreachable members when flag sharing.show-recipient-groups is enabled', () => {
+    const [, , friends] = setup({ showRecipientGroups: true })
+
+    expect(friends.members.map(m => [m._id, m.isReachable])).toEqual([
+      ['alice', true],
+      ['bob', true],
+      ['carol', false]
+    ])
+  })
+
+  it('does not suggest the groups already in the sharing when flag sharing.show-recipient-groups is enabled', () => {
+    const contactsAndGroups = setup({
+      currentRecipients: [{ id: 'friends' }],
+      showRecipientGroups: true
+    })
+
+    expect(contactsAndGroups.map(c => c._id)).toEqual(['alice', 'bob'])
+  })
+})