feat: Hide groups when they are already shared

This prevents the user from adding the same group several times and the stack returning an error.
cozy · Apr 9, 2024 · f64ee06 · f64ee06
1 parent 786b1a0
commit f64ee06
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/packages/cozy-sharing/src/components/ShareByEmail.jsx b/packages/cozy-sharing/src/components/ShareByEmail.jsx
@@ -174,6 +174,7 @@ export const ShareByEmail = ({
           }
           onPick={recipient => onRecipientPick(recipient)}
           onRemove={recipient => onRecipientRemove(recipient)}
+          currentRecipients={currentRecipients}
           recipients={recipients}
         />
       </div>

diff --git a/packages/cozy-sharing/src/components/ShareRecipientsInput.jsx b/packages/cozy-sharing/src/components/ShareRecipientsInput.jsx
@@ -18,6 +18,7 @@ import {
  * In order to display the total number of members in each group, we also retrieve the contacts that are not reachable.
  */
 const ShareRecipientsInput = ({
+  currentRecipients,
   recipients,
   placeholder,
   onPick,
@@ -62,8 +63,16 @@ const ShareRecipientsInput = ({
       (isQueryLoading(unreachableContactsWithGroupsResult) ||
         unreachableContactsWithGroupsResult.hasMore))
 
-  const contactGroups = (contactGroupsByIdsResult.data || []).map(
-    contactGroup => {
+  const currentRecipientGroups = currentRecipients
+    .map(({ id }) => id)
+    .filter(Boolean)
+  const contactGroups = (contactGroupsByIdsResult.data || [])
+    .filter(
+      ({ _id }) =>
+        !flag('sharing.show-recipient-groups') ||
+        !currentRecipientGroups.includes(_id)
+    )
+    .map(contactGroup => {
       const reachableMembers = getContactsFromGroupId(
         reachableContactsResult.data,
         contactGroup.id
@@ -91,8 +100,7 @@ const ShareRecipientsInput = ({
         ...contactGroup,
         members: [...reachableMembers, ...unreachableMembers]
       }
-    }
-  )
+    })
 
   const contactsAndGroups = [
     ...(reachableContactsResult.data || []),
@@ -112,13 +120,15 @@ const ShareRecipientsInput = ({
 }
 
 ShareRecipientsInput.propTypes = {
+  currentRecipients: PropTypes.array,
   recipients: PropTypes.array,
   placeholder: PropTypes.string,
   onPick: PropTypes.func.isRequired,
   onRemove: PropTypes.func.isRequired
 }
 
 ShareRecipientsInput.defaultProps = {
+  currentRecipients: [],
   recipients: []
 }
 

diff --git a/packages/cozy-sharing/src/components/ShareRecipientsInput.spec.jsx b/packages/cozy-sharing/src/components/ShareRecipientsInput.spec.jsx
@@ -9,7 +9,7 @@ import AppLike from './SharingBanner/test/AppLike'
 
 jest.mock('cozy-flags', () => ({
   __esModule: true,
-  default: jest.fn()
+  default: jest.fn(() => null)
 }))
 
 jest.mock('./ShareAutosuggest', () => ({