cozy-sharing 12.2.0 → 13.0.0

package/src/components/ShareRecipientsInput.spec.jsx

@@ -1,7 +1,16 @@
 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 AppLike from './SharingBanner/test/AppLike'
+
+jest.mock('cozy-flags', () => ({
+  __esModule: true,
+  default: jest.fn()
+}))
 
 jest.mock('./ShareAutosuggest', () => ({
   __esModule: true,
@@ -16,7 +25,11 @@ jest.mock('./ShareAutosuggest', () => ({
               </li>
             )
           } else {
-            return <li key={contactOrGroup.id}>{contactOrGroup.name}</li>
+            return (
+              <li key={contactOrGroup.id}>
+                {contactOrGroup.name} - {contactOrGroup.members.length} members
+              </li>
+            )
           }
         })}
       </ul>
@@ -25,176 +38,158 @@ jest.mock('./ShareAutosuggest', () => ({
 }))
 
 describe('ShareRecipientsInput component', () => {
-  const setup = ({ contacts, contactGroups }) => {
+  const setup = ({ contacts, contactGroups, unreachableContact }) => {
+    const mockClient = createMockClient({
+      queries: {
+        'io.cozy.contacts/reachable': {
+          doctype: 'io.cozy.contacts',
+          data: contacts
+        },
+        'io.cozy.contacts.groups/by-ids/fe86af20-c6c5': {
+          doctype: 'io.cozy.contacts.groups',
+          data: contactGroups
+        },
+        'io.cozy.contacts/unreachable-with-groups': {
+          doctype: 'io.cozy.contacts',
+          data: unreachableContact
+        }
+      }
+    })
     render(
-      <ShareRecipientsInput
-        contacts={contacts}
-        contactGroups={contactGroups}
-        onPick={() => {}}
-        onRemove={() => {}}
-        placeholder="Enter recipients here"
-      />
+      <AppLike client={mockClient}>
+        <ShareRecipientsInput
+          onPick={() => {}}
+          onRemove={() => {}}
+          placeholder="Enter recipients here"
+        />
+      </AppLike>
     )
   }
 
   it('should include groups and contacts when are loaded', async () => {
-    const contacts = {
-      id: 'contacts',
-      fetchStatus: 'loaded',
-      hasMore: false,
-      data: [
-        {
-          id: 'df563cc4-6440',
-          _id: 'df563cc4-6440',
-          _type: 'io.cozy.contacts',
-          name: {
-            givenName: 'Michale',
-            familyName: 'Russel'
-          }
+    const contacts = [
+      {
+        id: 'df563cc4-6440',
+        _id: 'df563cc4-6440',
+        _type: 'io.cozy.contacts',
+        name: {
+          givenName: 'Michale',
+          familyName: 'Russel'
+        }
+      },
+      {
+        id: '5a3b4ccf-c257',
+        _id: '5a3b4ccf-c257',
+        _type: 'io.cozy.contacts',
+        name: {
+          givenName: 'Teagan',
+          familyName: 'Wolf'
         },
-        {
-          id: '5a3b4ccf-c257',
-          _id: '5a3b4ccf-c257',
-          _type: 'io.cozy.contacts',
-          name: {
-            givenName: 'Teagan',
-            familyName: 'Wolf'
-          },
-          relationships: {
-            groups: {
-              data: [
-                {
-                  _id: 'fe86af20-c6c5',
-                  _type: 'io.cozy.contacts.groups'
-                }
-              ]
-            }
+        relationships: {
+          groups: {
+            data: [
+              {
+                _id: 'fe86af20-c6c5',
+                _type: 'io.cozy.contacts.groups'
+              }
+            ]
           }
         }
-      ]
-    }
-    const contactGroups = {
-      id: 'groups',
-      fetchStatus: 'loaded',
-      hasMore: false,
-      data: [
-        {
-          id: 'fe86af20-c6c5',
-          name: "The Night's Watch",
-          _id: 'fe86af20-c6c5',
-          _type: 'io.cozy.contacts.groups'
-        }
-      ]
-    }
+      }
+    ]
+
+    const contactGroups = [
+      {
+        id: 'fe86af20-c6c5',
+        name: "The Night's Watch",
+        _id: 'fe86af20-c6c5',
+        _type: 'io.cozy.contacts.groups'
+      }
+    ]
 
     setup({ contacts, contactGroups })
 
     expect(screen.getByText('Michale Russel')).toBeInTheDocument()
     expect(screen.getByText('Teagan Wolf')).toBeInTheDocument()
-    expect(screen.getByText("The Night's Watch")).toBeInTheDocument()
+    expect(
+      screen.getByText("The Night's Watch - 1 members")
+    ).toBeInTheDocument()
   })
 
-  it('should include groups only if all contacts are loaded', async () => {
-    const contacts = {
-      id: 'contacts',
-      fetchStatus: 'loading',
-      hasMore: false,
-      data: [
-        {
-          id: 'df563cc4-6440',
-          _id: 'df563cc4-6440',
-          _type: 'io.cozy.contacts',
-          name: {
-            givenName: 'Michale',
-            familyName: 'Russel'
-          }
+  it('should include unreachable members when flag sharing.show-recipient-groups is activated', async () => {
+    flag.mockReturnValue(true)
+
+    const contacts = [
+      {
+        id: 'df563cc4-6440',
+        _id: 'df563cc4-6440',
+        _type: 'io.cozy.contacts',
+        name: {
+          givenName: 'Michale',
+          familyName: 'Russel'
+        }
+      },
+      {
+        id: '5a3b4ccf-c257',
+        _id: '5a3b4ccf-c257',
+        _type: 'io.cozy.contacts',
+        name: {
+          givenName: 'Teagan',
+          familyName: 'Wolf'
         },
-        {
-          id: '5a3b4ccf-c257',
-          _id: '5a3b4ccf-c257',
-          _type: 'io.cozy.contacts',
-          name: {
-            givenName: 'Teagan',
-            familyName: 'Wolf'
-          },
-          relationships: {
-            groups: {
-              data: [
-                {
-                  _id: 'fe86af20-c6c5',
-                  _type: 'io.cozy.contacts.groups'
-                }
-              ]
-            }
+        relationships: {
+          groups: {
+            data: [
+              {
+                _id: 'fe86af20-c6c5',
+                _type: 'io.cozy.contacts.groups'
+              }
+            ]
           }
         }
-      ]
-    }
-    const contactGroups = {
-      id: 'groups',
-      fetchStatus: 'loaded',
-      hasMore: false,
-      data: [
-        {
-          id: 'fe86af20-c6c5',
-          name: "The Night's Watch",
-          _id: 'fe86af20-c6c5',
-          _type: 'io.cozy.contacts.groups'
-        }
-      ]
-    }
+      }
+    ]
 
-    setup({ contacts, contactGroups })
+    const contactGroups = [
+      {
+        id: 'fe86af20-c6c5',
+        name: "The Night's Watch",
+        _id: 'fe86af20-c6c5',
+        _type: 'io.cozy.contacts.groups'
+      }
+    ]
 
-    expect(screen.getByText('Michale Russel')).toBeInTheDocument()
-    expect(screen.getByText('Teagan Wolf')).toBeInTheDocument()
-    expect(screen.queryByText("The Night's Watch")).toBeNull()
-  })
-
-  it('should include groups only if they have more than one member', async () => {
-    const contacts = {
-      id: 'contacts',
-      fetchStatus: 'loaded',
-      hasMore: false,
-      data: [
-        {
-          id: 'df563cc4-6440',
-          _id: 'df563cc4-6440',
-          _type: 'io.cozy.contacts',
-          name: {
-            givenName: 'Michale',
-            familyName: 'Russel'
-          }
+    const unreachableContact = [
+      {
+        id: 'df532cc4-6560',
+        _id: 'df532cc4-6560',
+        _type: 'io.cozy.contacts',
+        name: {
+          givenName: 'Tony',
+          familyName: 'Stark'
         },
-        {
-          id: '5a3b4ccf-c257',
-          _id: '5a3b4ccf-c257',
-          _type: 'io.cozy.contacts',
-          name: {
-            givenName: 'Teagan',
-            familyName: 'Wolf'
+        relationships: {
+          groups: {
+            data: [
+              {
+                _id: 'fe86af20-c6c5',
+                _type: 'io.cozy.contacts.groups'
+              }
+            ]
           }
         }
-      ]
-    }
-    const contactGroups = {
-      id: 'groups',
-      fetchStatus: 'loaded',
-      hasMore: false,
-      data: [
-        {
-          id: 'fe86af20-c6c5',
-          name: "The Night's Watch",
-          _id: 'fe86af20-c6c5',
-          _type: 'io.cozy.contacts.groups'
-        }
-      ]
-    }
+      }
+    ]
 
-    setup({ contacts, contactGroups })
+    setup({ contacts, contactGroups, unreachableContact })
 
     expect(screen.getByText('Michale Russel')).toBeInTheDocument()
     expect(screen.getByText('Teagan Wolf')).toBeInTheDocument()
-    expect(screen.queryByText("The Night's Watch")).toBeNull()
+    // 3 members because cozy-client replay the query with the new data
+    // so the unreachableContact is added to the reachable contact query
+    // TODO: improve createMockClient to handle this case
+    expect(
+      screen.getByText("The Night's Watch - 3 members")
+    ).toBeInTheDocument()
   })
 })

package/src/helpers/contacts.js

@@ -39,3 +39,11 @@ export const getOrCreateFromArray = async (client, contacts, createContact) => {
     })
   )
 }
+
+export const getContactsFromGroupId = (contacts = [], groupId) => {
+  return contacts.filter(contact => {
+    return contact.relationships?.groups?.data?.some(
+      group => group._id === groupId
+    )
+  })
+}

package/src/helpers/recipients.js

@@ -1,9 +1,9 @@
-import get from 'lodash/get'
-
 import flag from 'cozy-flags'
 
 import { Group } from '../models'
 
+export const DEFAULT_DISPLAY_NAME = 'Share.contacts.defaultDisplayName'
+
 export const filterAndReworkRecipients = (recipients, previousRecipients) => {
   return recipients
     .filter(recipient => recipient.status !== 'owner')
@@ -52,26 +52,16 @@ export const hasReachRecipientsLimit = (current, next) => {
 
 /**
  * Merges the recipients list with a new recipient and their associated contacts.
+ * Only used when flag sharing.show-recipient-groups is not enabled.
  * @param {object[]} recipients - The list of recipients.
  * @param {object} recipient - The new recipient.
  * @param {object[]} contacts - The list of contacts.
  * @returns {object[]} - The merged recipients list.
  */
-export const spreadGroupAndMergeRecipients = (
-  recipients,
-  newRecipient,
-  contacts
-) => {
+export const spreadGroupAndMergeRecipients = (recipients, newRecipient) => {
   let contactsToAdd
   if (newRecipient._type === Group.doctype) {
-    const groupId = newRecipient.id
-    contactsToAdd = contacts.data.filter(contact => {
-      const contactGroupIds = get(contact, 'relationships.groups.data', []).map(
-        group => group._id
-      )
-
-      return contactGroupIds.includes(groupId)
-    })
+    contactsToAdd = newRecipient.members
   } else {
     contactsToAdd = [newRecipient]
   }
@@ -90,3 +80,22 @@ export const spreadGroupAndMergeRecipients = (
 export const mergeRecipients = (recipients, newRecipient) => {
   return [...recipients, newRecipient]
 }
+
+export const getGroupRecipientSecondaryText = ({
+  nbMember,
+  nbMemberReady,
+  t,
+  isUserInsideMembers
+}) => {
+  const memberCount =
+    nbMember === nbMemberReady ? nbMember : [nbMemberReady, nbMember].join('/')
+  const secondary = t('GroupRecipient.secondary', {
+    memberCount,
+    smart_count: nbMember
+  })
+
+  return (
+    secondary +
+    (isUserInsideMembers ? ` (${t('GroupRecipient.secondary_you')})` : '')
+  )
+}

package/src/helpers/successMessage.js

@@ -1,16 +1,40 @@
 import { models } from 'cozy-client'
 
-import { Contact } from '../models'
+import { Contact, Group } from '../models'
+
 export const countNewRecipients = (currentRecipients, newRecipients) => {
-  return newRecipients.filter(contact => {
-    const email = models.contact.getPrimaryEmail(contact)
-    const cozyUrl = models.contact.getPrimaryCozy(contact)
-    return !currentRecipients.find(
-      r =>
-        (email && r.email && r.email === email) ||
-        (cozyUrl && r.instance && r.instance === cozyUrl)
-    )
-  }).length
+  const newRecipientsNotAlreadyIncluded = newRecipients.filter(recipient => {
+    if (Contact.isContact(recipient)) {
+      const email = models.contact.getPrimaryEmail(recipient)
+      const cozyUrl = models.contact.getPrimaryCozy(recipient)
+      return !currentRecipients.find(
+        r =>
+          (email && r.email && r.email === email) ||
+          (cozyUrl && r.instance && r.instance === cozyUrl)
+      )
+    }
+    return true
+  })
+
+  return newRecipientsNotAlreadyIncluded.reduce(
+    (acc, recipient) => {
+      if (recipient._type === Group.doctype) {
+        return {
+          ...acc,
+          group: acc.group + 1
+        }
+      } else {
+        return {
+          ...acc,
+          contact: acc.contact + 1
+        }
+      }
+    },
+    {
+      group: 0,
+      contact: 0
+    }
+  )
 }
 
 export const getSuccessMessage = (
@@ -24,35 +48,61 @@ export const getSuccessMessage = (
       ? models.contact.getPrimaryEmail(recipient)
       : recipient.email
     const cozyUrl = models.contact.getPrimaryCozy(recipient)
+    const isContactGroup = recipient._type === Group.doctype
 
-    if (email) {
+    if (isContactGroup) {
       return [
-        `${documentType}.share.shareByEmail.success`,
+        `${documentType}.share.shareByEmail.singleGroupSuccess`,
+        {
+          groupName: recipient.name
+        }
+      ]
+    } else if (email) {
+      return [
+        `${documentType}.share.shareByEmail.singleContactSuccess`,
         {
           email
         }
       ]
     } else if (cozyUrl) {
       return [
-        `${documentType}.share.shareByEmail.success`,
+        `${documentType}.share.shareByEmail.singleContactSuccess`,
         {
           email: cozyUrl
         }
       ]
     } else {
       return [
-        `${documentType}.share.shareByEmail.genericSuccess`,
+        `${documentType}.share.shareByEmail.contactSuccess`,
         {
-          count: 1
+          smart_count: 1
         }
       ]
     }
   } else {
-    return [
-      `${documentType}.share.shareByEmail.genericSuccess`,
-      {
-        count: countNewRecipients(recipientsBefore, recipientsAfter)
-      }
-    ]
+    const count = countNewRecipients(recipientsBefore, recipientsAfter)
+    if (count.contact > 0 && count.group > 0) {
+      return [
+        `${documentType}.share.shareByEmail.contactAndGroupSuccess`,
+        {
+          nbContact: count.contact,
+          nbGroup: count.group
+        }
+      ]
+    } else if (count.group > 0) {
+      return [
+        `${documentType}.share.shareByEmail.groupSuccess`,
+        {
+          smart_count: count.group
+        }
+      ]
+    } else {
+      return [
+        `${documentType}.share.shareByEmail.contactSuccess`,
+        {
+          smart_count: count.contact
+        }
+      ]
+    }
   }
 }