cozy-sharing 33.0.1 → 33.0.2

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [33.0.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.0.1...cozy-sharing@33.0.2) (2026-06-02)
+
+### Bug Fixes
+
+- Avoid suggesting an already added or a pending recipient ([a9f7b19](https://github.com/cozy/cozy-libs/commit/a9f7b1934ef9d666b9515fe1cf28538a466bf1ff))
+
 ## [33.0.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.0.0...cozy-sharing@33.0.1) (2026-06-02)
 
 ### Bug Fixes

package/dist/components/ShareAutosuggest.js

@@ -23,9 +23,9 @@ var styles = {
   "recipientChip": "autosuggest__recipientChip___d5I3R",
   "endAdornment": "autosuggest__endAdornment___2EwTN"
 };
-import { cozyUrlMatch, emailMatch, groupNameMatch, fullnameMatch } from '../suggestionMatchers';
+import { contactOrGroupMatch } from '../suggestionMatchers';
 
-var ShareAutocomplete = function ShareAutocomplete(_ref) {
+var ShareAutosuggest = function ShareAutosuggest(_ref) {
   var loading = _ref.loading,
       disabled = _ref.disabled,
       contactsAndGroups = _ref.contactsAndGroups,
@@ -62,7 +62,7 @@ var ShareAutocomplete = function ShareAutocomplete(_ref) {
   var computeSuggestions = function computeSuggestions(value) {
     var inputValue = value.trim().toLowerCase();
     return inputValue.length === 0 ? [] : contactsAndGroups.filter(function (contactOrGroup) {
-      return groupNameMatch(inputValue, contactOrGroup) || fullnameMatch(inputValue, contactOrGroup) || emailMatch(inputValue, contactOrGroup) || cozyUrlMatch(inputValue, contactOrGroup);
+      return contactOrGroupMatch(inputValue, contactOrGroup);
     });
   };
 
@@ -243,7 +243,7 @@ var ShareAutocomplete = function ShareAutocomplete(_ref) {
   }));
 };
 
-ShareAutocomplete.propTypes = {
+ShareAutosuggest.propTypes = {
   loading: PropTypes.bool,
   disabled: PropTypes.bool,
   contactsAndGroups: PropTypes.array,
@@ -254,4 +254,4 @@ ShareAutocomplete.propTypes = {
   placeholder: PropTypes.string,
   endAdornment: PropTypes.node
 };
-export default ShareAutocomplete;
+export default ShareAutosuggest;

package/dist/components/ShareRecipientsInput.js

@@ -8,10 +8,12 @@ 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 { buildReachableContactsQuery, buildContactGroupsQuery, buildUnreachableContactsWithGroupsQuery } from '../queries/queries';
+var ContactModel = models.contact;
 /**
  * ShareRecipientsInput is responsible for fetching contacts and groups.
  * We retrieve all the contacts that are reachable and the groups they belong to.
@@ -41,7 +43,13 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
   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);
+    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);

package/dist/components/ShareRecipientsInput.spec.js

@@ -38,6 +38,11 @@ describe('ShareRecipientsInput component', function () {
     var contacts = _ref2.contacts,
         contactGroups = _ref2.contactGroups,
         unreachableContact = _ref2.unreachableContact;
+
+    var _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+        currentRecipients = _ref3.currentRecipients,
+        recipients = _ref3.recipients;
+
     var mockClient = createMockClient({
       queries: {
         'io.cozy.contacts/reachable': {
@@ -59,7 +64,9 @@ describe('ShareRecipientsInput component', function () {
     }, /*#__PURE__*/React.createElement(ShareRecipientsInput, {
       onPick: function onPick() {},
       onRemove: function onRemove() {},
-      placeholder: "Enter recipients here"
+      placeholder: "Enter recipients here",
+      currentRecipients: currentRecipients,
+      recipients: recipients
     })));
   };
 
@@ -172,10 +179,66 @@ describe('ShareRecipientsInput component', function () {
       }
     }, _callee2);
   })));
-  it('should include unreachable members when flag sharing.show-recipient-groups is activated', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-    var contacts, contactGroups, unreachableContact;
+  it('should exclude already added recipients from suggestions', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    var contacts, contactGroups, currentRecipients, recipients;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          contacts = [{
+            id: 'df563cc4-6440',
+            _id: 'df563cc4-6440',
+            _type: 'io.cozy.contacts',
+            name: {
+              givenName: 'Michale',
+              familyName: 'Russel'
+            },
+            email: [{
+              address: 'michale@example.com',
+              primary: true
+            }]
+          }, {
+            id: '5a3b4ccf-c257',
+            _id: '5a3b4ccf-c257',
+            _type: 'io.cozy.contacts',
+            name: {
+              givenName: 'Teagan',
+              familyName: 'Wolf'
+            },
+            email: [{
+              address: 'teagan@example.com',
+              primary: true
+            }]
+          }];
+          contactGroups = [];
+          currentRecipients = [{
+            id: 'recipient-1',
+            email: 'michale@example.com'
+          }];
+          recipients = [{
+            _id: '5a3b4ccf-c257'
+          }];
+          setup({
+            contacts: contacts,
+            contactGroups: contactGroups
+          }, {
+            currentRecipients: currentRecipients,
+            recipients: recipients
+          }); // Michale is in currentRecipients by email, should be filtered out
+
+          expect(screen.queryByText('Michale Russel')).not.toBeInTheDocument(); // Teagan is in recipients by _id, should be filtered out
+
+          expect(screen.queryByText('Teagan Wolf')).not.toBeInTheDocument();
+
+        case 7:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+  it('should include unreachable members when flag sharing.show-recipient-groups is activated', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    var contacts, contactGroups, unreachableContact;
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           flag.mockReturnValue(true);
           contacts = [{
@@ -240,8 +303,8 @@ describe('ShareRecipientsInput component', function () {
 
         case 8:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3);
+    }, _callee4);
   })));
 });

package/dist/suggestionMatchers.js

@@ -40,4 +40,8 @@ var fullnameMatch = function fullnameMatch(input, contact) {
   return fullnameInput.test(contact.fullname);
 };
 
-export { emailMatch, cozyUrlMatch, groupNameMatch, fullnameMatch };
+var contactOrGroupMatch = function contactOrGroupMatch(input, contact) {
+  return groupNameMatch(input, contact) || fullnameMatch(input, contact) || emailMatch(input, contact) || cozyUrlMatch(input, contact);
+};
+
+export { emailMatch, cozyUrlMatch, groupNameMatch, fullnameMatch, contactOrGroupMatch };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "33.0.1",
+  "version": "33.0.2",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -83,5 +83,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "546412325d385a075b531e7c735a0082d6864040"
+  "gitHead": "0a14cfca6a608f4a40d2301c370b176ecbaeee4c"
 }

package/src/components/ShareAutosuggest.jsx

@@ -12,14 +12,9 @@ import { isContactToBeCreated } from '../helpers/contacts'
 import { extractEmails, validateEmail } from '../helpers/email'
 import { getDisplayName, getInitials, Contact, Group } from '../models'
 import styles from '../styles/autosuggest.styl'
-import {
-  cozyUrlMatch,
-  emailMatch,
-  groupNameMatch,
-  fullnameMatch
-} from '../suggestionMatchers'
-
-const ShareAutocomplete = ({
+import { contactOrGroupMatch } from '../suggestionMatchers'
+
+const ShareAutosuggest = ({
   loading,
   disabled,
   contactsAndGroups,
@@ -43,12 +38,8 @@ const ShareAutocomplete = ({
 
     return inputValue.length === 0
       ? []
-      : contactsAndGroups.filter(
-          contactOrGroup =>
-            groupNameMatch(inputValue, contactOrGroup) ||
-            fullnameMatch(inputValue, contactOrGroup) ||
-            emailMatch(inputValue, contactOrGroup) ||
-            cozyUrlMatch(inputValue, contactOrGroup)
+      : contactsAndGroups.filter(contactOrGroup =>
+          contactOrGroupMatch(inputValue, contactOrGroup)
         )
   }
 
@@ -226,7 +217,7 @@ const ShareAutocomplete = ({
   )
 }
 
-ShareAutocomplete.propTypes = {
+ShareAutosuggest.propTypes = {
   loading: PropTypes.bool,
   disabled: PropTypes.bool,
   contactsAndGroups: PropTypes.array,
@@ -238,4 +229,4 @@ ShareAutocomplete.propTypes = {
   endAdornment: PropTypes.node
 }
 
-export default ShareAutocomplete
+export default ShareAutosuggest

package/src/components/ShareRecipientsInput.jsx

@@ -2,6 +2,7 @@ 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'
@@ -12,6 +13,8 @@ import {
   buildUnreachableContactsWithGroupsQuery
 } from '../queries/queries'
 
+const ContactModel = models.contact
+
 /**
  * ShareRecipientsInput is responsible for fetching contacts and groups.
  * We retrieve all the contacts that are reachable and the groups they belong to.
@@ -61,8 +64,16 @@ const ShareRecipientsInput = ({
         unreachableContactsWithGroupsResult.hasMore))
 
   const reachableContacts = (reachableContactsResult.data || []).filter(
-    contact => !isCurrentUser(contact)
+    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))

package/src/components/ShareRecipientsInput.spec.jsx

@@ -38,7 +38,10 @@ jest.mock('./ShareAutosuggest', () => ({
 }))
 
 describe('ShareRecipientsInput component', () => {
-  const setup = ({ contacts, contactGroups, unreachableContact }) => {
+  const setup = (
+    { contacts, contactGroups, unreachableContact },
+    { currentRecipients, recipients } = {}
+  ) => {
     const mockClient = createMockClient({
       queries: {
         'io.cozy.contacts/reachable': {
@@ -61,6 +64,8 @@ describe('ShareRecipientsInput component', () => {
           onPick={() => {}}
           onRemove={() => {}}
           placeholder="Enter recipients here"
+          currentRecipients={currentRecipients}
+          recipients={recipients}
         />
       </AppLike>
     )
@@ -175,6 +180,44 @@ describe('ShareRecipientsInput component', () => {
     expect(screen.getByText('Friends - 1 members')).toBeInTheDocument()
   })
 
+  it('should exclude already added recipients from suggestions', async () => {
+    const contacts = [
+      {
+        id: 'df563cc4-6440',
+        _id: 'df563cc4-6440',
+        _type: 'io.cozy.contacts',
+        name: {
+          givenName: 'Michale',
+          familyName: 'Russel'
+        },
+        email: [{ address: 'michale@example.com', primary: true }]
+      },
+      {
+        id: '5a3b4ccf-c257',
+        _id: '5a3b4ccf-c257',
+        _type: 'io.cozy.contacts',
+        name: {
+          givenName: 'Teagan',
+          familyName: 'Wolf'
+        },
+        email: [{ address: 'teagan@example.com', primary: true }]
+      }
+    ]
+
+    const contactGroups = []
+    const currentRecipients = [
+      { id: 'recipient-1', email: 'michale@example.com' }
+    ]
+    const recipients = [{ _id: '5a3b4ccf-c257' }]
+
+    setup({ contacts, contactGroups }, { currentRecipients, recipients })
+
+    // Michale is in currentRecipients by email, should be filtered out
+    expect(screen.queryByText('Michale Russel')).not.toBeInTheDocument()
+    // Teagan is in recipients by _id, should be filtered out
+    expect(screen.queryByText('Teagan Wolf')).not.toBeInTheDocument()
+  })
+
   it('should include unreachable members when flag sharing.show-recipient-groups is activated', async () => {
     flag.mockReturnValue(true)
 

package/src/suggestionMatchers.js

@@ -34,4 +34,19 @@ const fullnameMatch = (input, contact) => {
   return fullnameInput.test(contact.fullname)
 }
 
-export { emailMatch, cozyUrlMatch, groupNameMatch, fullnameMatch }
+const contactOrGroupMatch = (input, contact) => {
+  return (
+    groupNameMatch(input, contact) ||
+    fullnameMatch(input, contact) ||
+    emailMatch(input, contact) ||
+    cozyUrlMatch(input, contact)
+  )
+}
+
+export {
+  emailMatch,
+  cozyUrlMatch,
+  groupNameMatch,
+  fullnameMatch,
+  contactOrGroupMatch
+}