cozy-sharing 12.3.0 → 13.0.0

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
+        }
+      ]
+    }
   }
 }

package/src/helpers/successMessage.spec.js

@@ -2,18 +2,6 @@ import { getSuccessMessage, countNewRecipients } from './successMessage'
 
 describe('getSuccessMessage method', () => {
   const props = {
-    contacts: {
-      id: 'contacts',
-      data: [],
-      hasMore: false,
-      fetchStatus: 'loaded'
-    },
-    contactGroups: {
-      id: 'groups',
-      data: [],
-      hasMore: false,
-      fetchStatus: 'loaded'
-    },
     currentRecipients: [{ email: 'sansa.stark@winterfell.westeros' }],
     documentType: 'Files',
     sharingDesc: 'fake-doc.odt',
@@ -23,17 +11,17 @@ describe('getSuccessMessage method', () => {
 
   it('should return a success message and its params for multiple recipients', () => {
     const recipientsAfter = [
-      { email: 'jon.snow@thewall.westeros' },
-      { email: 'arya.stark@winterfell.westeros' },
-      { email: 'sansa.stark@winterfell.westeros' }
+      { _type: 'io.cozy.contacts', email: 'jon.snow@thewall.westeros' },
+      { _type: 'io.cozy.contacts', email: 'arya.stark@winterfell.westeros' },
+      { _type: 'io.cozy.contacts', email: 'sansa.stark@winterfell.westeros' }
     ]
     const [message, params] = getSuccessMessage(
       props.currentRecipients,
       recipientsAfter,
       props.documentType
     )
-    expect(message).toEqual('Files.share.shareByEmail.genericSuccess')
-    expect(params).toEqual({ count: 2 })
+    expect(message).toEqual('Files.share.shareByEmail.contactSuccess')
+    expect(params).toEqual({ smart_count: 2 })
   })
 
   it('should return a success message and its params for one recipient with email', () => {
@@ -43,7 +31,7 @@ describe('getSuccessMessage method', () => {
       [{ email: 'jon.snow@thewall.westeros' }],
       props.documentType
     )
-    expect(message).toEqual('Files.share.shareByEmail.success')
+    expect(message).toEqual('Files.share.shareByEmail.singleContactSuccess')
     expect(params).toEqual({ email: 'jon.snow@thewall.westeros' })
   })
 
@@ -70,7 +58,7 @@ describe('getSuccessMessage method', () => {
       ],
       props.documentType
     )
-    expect(message).toEqual('Files.share.shareByEmail.success')
+    expect(message).toEqual('Files.share.shareByEmail.singleContactSuccess')
     expect(params).toEqual({ email: 'jon.snow@thewall.westeros' })
   })
 
@@ -89,11 +77,11 @@ describe('getSuccessMessage method', () => {
       ],
       props.documentType
     )
-    expect(message).toEqual('Files.share.shareByEmail.success')
+    expect(message).toEqual('Files.share.shareByEmail.singleContactSuccess')
     expect(params).toEqual({ email: 'https://doranmartell.mycozy.cloud' })
   })
 
-  it('should use generic success message if recipient has no email and no cozy', () => {
+  it('should use contact success message if recipient has no email and no cozy', () => {
     const recipientsBefore = props.currentRecipients
     const [message, params] = getSuccessMessage(
       recipientsBefore,
@@ -104,12 +92,90 @@ describe('getSuccessMessage method', () => {
       ],
       props.documentType
     )
-    expect(message).toEqual('Files.share.shareByEmail.genericSuccess')
-    expect(params).toEqual({ count: 1 })
+    expect(message).toEqual('Files.share.shareByEmail.contactSuccess')
+    expect(params).toEqual({ smart_count: 1 })
+  })
+
+  it('should use single group success message if recipient is a group', () => {
+    const recipientsBefore = props.currentRecipients
+    const [message, params] = getSuccessMessage(
+      recipientsBefore,
+      [
+        {
+          _type: 'io.cozy.contacts.groups',
+          name: 'Stark family'
+        }
+      ],
+      props.documentType
+    )
+    expect(message).toEqual('Files.share.shareByEmail.singleGroupSuccess')
+    expect(params).toEqual({ groupName: 'Stark family' })
+  })
+
+  it('should use contact success message if recipient has only multiple contacts', () => {
+    const recipientsBefore = props.currentRecipients
+    const [message, params] = getSuccessMessage(
+      recipientsBefore,
+      [
+        {
+          _type: 'io.cozy.contacts'
+        },
+        {
+          _type: 'io.cozy.contacts'
+        },
+        {
+          _type: 'io.cozy.contacts'
+        }
+      ],
+      props.documentType
+    )
+    expect(message).toEqual('Files.share.shareByEmail.contactSuccess')
+    expect(params).toEqual({ smart_count: 3 })
+  })
+
+  it('should use group success message if recipient has only multiple groups', () => {
+    const recipientsBefore = props.currentRecipients
+    const [message, params] = getSuccessMessage(
+      recipientsBefore,
+      [
+        {
+          _type: 'io.cozy.contacts.groups'
+        },
+        {
+          _type: 'io.cozy.contacts.groups'
+        }
+      ],
+      props.documentType
+    )
+    expect(message).toEqual('Files.share.shareByEmail.groupSuccess')
+    expect(params).toEqual({ smart_count: 2 })
+  })
+
+  it('should use contact and group success message if recipient has multiple contacts and groups', () => {
+    const recipientsBefore = props.currentRecipients
+    const [message, params] = getSuccessMessage(
+      recipientsBefore,
+      [
+        {
+          _type: 'io.cozy.contacts'
+        },
+        {
+          _id: 'fcb16b9e-7421',
+          _type: 'io.cozy.contacts.groups'
+        },
+        {
+          _id: 'f45b16be-7523',
+          _type: 'io.cozy.contacts.groups'
+        }
+      ],
+      props.documentType
+    )
+    expect(message).toEqual('Files.share.shareByEmail.contactAndGroupSuccess')
+    expect(params).toEqual({ nbContact: 1, nbGroup: 2 })
   })
 })
 
-describe('countNewRecipients function', () => {
+describe('countNewRecipients', () => {
   const currentRecipients = [
     {
       email: 'arya.stark@winterfell.westeros'
@@ -123,64 +189,42 @@ describe('countNewRecipients function', () => {
   ]
   const addedRecipients = [
     {
-      id: '5d4916fa-e193',
+      _id: 'e8c0e15f-da7d',
+      _type: 'io.cozy.contacts',
+      fullname: 'Jon Snow',
       email: [
         {
           address: 'jon.snow@thewall.westeros',
-          type: 'primary'
+          primary: true
+        },
+        {
+          address: 'jon.snow@winterfell.westeros',
+          primary: false
         }
       ]
     },
     {
-      id: '4df64228-ce84',
-      email: [
-        {
-          address: 'sansa.stark@winterfell.westeros',
-          type: 'primary'
-        }
-      ]
+      _id: 'fcb16b9e-7421',
+      _type: 'io.cozy.contacts'
     },
     {
-      id: 'ff955bb1-f696',
-      email: [
+      _id: 'f45b16be-7523',
+      _type: 'io.cozy.contacts',
+      cozy: [
         {
-          address: 'bran.stark@winterfell.westeros',
-          type: 'primary'
+          url: 'https://doranmartell.mycozy.cloud'
         }
       ]
     }
   ]
 
-  it('should count only the new recipients using email', () => {
+  it('should count the new recipients with email', () => {
     const result = countNewRecipients(currentRecipients, addedRecipients)
-    expect(result).toEqual(1)
+    expect(result.contact).toEqual(2)
+    expect(result.group).toEqual(0)
   })
 
-  it('should count the new recipients when there are no current recipients', () => {
-    const result = countNewRecipients([], addedRecipients)
-    expect(result).toEqual(3)
-  })
-
-  it('should return 0 if there is no new recipients', () => {
-    const currentRecipients = [
-      {
-        email: 'arya.stark@winterfell.westeros'
-      },
-      {
-        email: 'sansa.stark@winterfell.westeros'
-      },
-      {
-        email: 'jon.snow@thewall.westeros'
-      },
-      {
-        email: 'bran.stark@winterfell.westeros'
-      }
-    ]
-    const result = countNewRecipients(currentRecipients, addedRecipients)
-    expect(result).toEqual(0)
-  })
-
-  it('should count the new recipients using cozy url', () => {
+  it('should count the new recipients with cozy url', () => {
     const currentRecipients = [
       {
         instance: 'https://bran.mycozy.cloud'
@@ -191,7 +235,7 @@ describe('countNewRecipients function', () => {
     ]
     const addedRecipients = [
       {
-        id: '5d4916fa-e193',
+        _type: 'io.cozy.contacts',
         cozy: [
           {
             url: 'https://jon.mycozy.cloud',
@@ -200,7 +244,7 @@ describe('countNewRecipients function', () => {
         ]
       },
       {
-        id: '4df64228-ce84',
+        _type: 'io.cozy.contacts',
         cozy: [
           {
             url: 'https://sansa.mycozy.cloud',
@@ -209,7 +253,7 @@ describe('countNewRecipients function', () => {
         ]
       },
       {
-        id: 'ff955bb1-f696',
+        _type: 'io.cozy.contacts',
         cozy: [
           {
             url: 'https://bran.mycozy.cloud',
@@ -218,7 +262,7 @@ describe('countNewRecipients function', () => {
         ]
       },
       {
-        id: '0761944a-c740',
+        _type: 'io.cozy.contacts',
         cozy: [
           {
             url: 'https://arya.mycozy.cloud',
@@ -228,6 +272,22 @@ describe('countNewRecipients function', () => {
       }
     ]
     const result = countNewRecipients(currentRecipients, addedRecipients)
-    expect(result).toEqual(2)
+    expect(result.contact).toEqual(2)
+    expect(result.group).toEqual(0)
+  })
+
+  it('should count the new recipients with groups', () => {
+    const result = countNewRecipients(currentRecipients, [
+      ...addedRecipients,
+      { _id: 'f45b16be-7523', _type: 'io.cozy.contacts.groups' }
+    ])
+    expect(result.contact).toEqual(2)
+    expect(result.group).toEqual(1)
+  })
+
+  it('should return 0 if there are no new recipients', () => {
+    const result = countNewRecipients(currentRecipients, [])
+    expect(result.contact).toEqual(0)
+    expect(result.group).toEqual(0)
   })
 })

package/src/queries/queries.js

@@ -24,7 +24,7 @@ export const buildSharingsByIdQuery = sharingId => ({
   }
 })
 
-export const buildContactsQuery = () => ({
+export const buildReachableContactsQuery = () => ({
   definition: Q(Contact.doctype)
     .where({
       _id: {
@@ -55,14 +55,45 @@ export const buildContactsQuery = () => ({
     .indexFields(['_id'])
     .limitBy(1000),
   options: {
-    as: 'io.cozy.contacts'
+    as: 'io.cozy.contacts/reachable'
   }
 })
 
-export const buildContactGroupsQuery = () => ({
-  definition: Q(Group.doctype),
+export const buildContactGroupsByIdsQuery = ids => ({
+  definition: Q(Group.doctype).getByIds(ids),
   options: {
-    as: 'io.cozy.contacts.groups'
+    as: `io.cozy.contacts.groups/by-ids/${ids.join('/')}`,
+    fetchPolicy: defaultFetchPolicy,
+    enabled: ids.length > 0
+  }
+})
+
+export const buildUnreachableContactsWithGroupsQuery = () => ({
+  definition: Q(Contact.doctype)
+    .where({
+      _id: {
+        $gt: null
+      }
+    })
+    .partialIndex({
+      trashed: {
+        $or: [{ $eq: false }, { $exists: false }]
+      },
+      cozy: {
+        $size: 0
+      },
+      email: {
+        $size: 0
+      },
+      'relationships.groups.data': {
+        $exists: true
+      }
+    })
+    .indexFields(['_id'])
+    .limitBy(1000),
+  options: {
+    as: 'io.cozy.contacts/unreachable-with-groups',
+    fetchPolicy: defaultFetchPolicy
   }
 })
 

package/src/styles/autosuggest.styl

@@ -33,6 +33,7 @@
 .recipientsContainer
     display flex
     flex-wrap wrap
+    align-items center
     padding .25rem .5rem
     border-radius .25rem
     border 1px solid var(--borderMainColor)
@@ -55,7 +56,7 @@
         &:hover
         &:focus
             border none
-        &:only-child
+        &:first-child
           padding .25rem .5rem
 
 .recipientChip

package/test/AppLike.jsx

@@ -1,6 +1,7 @@
 import React from 'react'
 
 import { CozyProvider, createMockClient } from 'cozy-client'
+import AlertProvider from 'cozy-ui/transpiled/react/providers/Alert'
 import { BreakpointsProvider } from 'cozy-ui/transpiled/react/providers/Breakpoints'
 import CozyTheme from 'cozy-ui/transpiled/react/providers/CozyTheme'
 import { I18n } from 'cozy-ui/transpiled/react/providers/I18n'
@@ -11,9 +12,11 @@ const AppLike = ({ children, client }) => (
   <BreakpointsProvider>
     <CozyTheme>
       <I18n lang="en" dictRequire={() => langEn}>
-        <CozyProvider client={client || createMockClient({})}>
-          {children}
-        </CozyProvider>
+        <AlertProvider>
+          <CozyProvider client={client || createMockClient({})}>
+            {children}
+          </CozyProvider>
+        </AlertProvider>
       </I18n>
     </CozyTheme>
   </BreakpointsProvider>