cozy-sharing 13.1.2 → 13.3.0

package/locales/en.json

@@ -30,7 +30,7 @@
     },
     "create-cozy": "Create my cozy",
     "members": {
-      "count": "1 member |||| %{smart_count} members",
+      "count": "%{smart_count} member |||| %{smart_count} members",
       "others": "and 1 other… |||| and %{smart_count} others…",
       "otherContacts": "other contact |||| other contacts"
     },
@@ -79,6 +79,7 @@
     "errors": {
       "errors": {
         "groupMemberAlreadyInSharing": "%{groupName} members have already been invited with %{sharingRights} rights. It is not possible to invite the same contact twice with different rights. |||| Contacts have already been invited with %{sharingRights} rights. It is not possible to invite the same contact twice with different rights.",
+        "contactAlreadyInSharing": "%{contactName} has already been invited in a group with %{sharingRights} rights. It is not possible to invite the same contact twice with different rights. |||| Contacts have already been invited with %{sharingRights} rights. It is not possible to invite the same contact twice with different rights.",
         "sharingRights": {
           "readOnly": "read",
           "readWrite": "write"
@@ -400,6 +401,10 @@
   },
   "GroupRecipientDetail": {
     "subtitle": "Managed by %{ownerName}",
+    "empty": {
+      "content": "Your contact group is empty! Quickly add members to start sharing your valuable documents with them!",
+      "action": "Open Contacts"
+    },
     "withAccess": {
       "title": "Access to item"
     },

package/locales/fr.json

@@ -30,7 +30,7 @@
     },
     "create-cozy": "Créer mon Cozy",
     "members": {
-      "count": "1 membre |||| %{smart_count} membres",
+      "count": "%{smart_count} membre |||| %{smart_count} membres",
       "others": "et 1 autre… |||| et %{smart_count} autres…",
       "otherContacts": "autre contact |||| autres contacts"
     },
@@ -78,6 +78,7 @@
     },
     "errors": {
       "groupMemberAlreadyInSharing": "Des membres de %{groupName} ont déjà été invités avec des droits de %{sharingRights}. Impossible d’inviter 2 fois le même contact avec des droits différents. |||| Des contacts ont déjà été invités avec des droits de %{sharingRights}. Impossible d’inviter 2 fois le même contact avec des droits différents.",
+      "contactAlreadyInSharing": "%{contactName} a déjà été invité dans un groupe avec des droits de %{sharingRights}. Impossible d’inviter 2 fois le même contact avec des droits différents. |||| Des contacts ont déjà été invités avec des droits de %{sharingRights}. Impossible d’inviter 2 fois le même contact avec des droits différents.",
       "sharingRights": {
         "readOnly": "lecture",
         "readWrite": "modification"
@@ -398,6 +399,10 @@
   },
   "GroupRecipientDetail": {
     "subtitle": "Géré par %{ownerName}",
+    "empty": {
+      "content": "Votre groupe de contacts est vide ! Ajoutez rapidement des membres pour commencer à leur partager vos précieux documents !",
+      "action": "Ouvrir Contacts"
+    },
     "withAccess": {
       "title": "Accès à l’élément"
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "13.1.2",
+  "version": "13.3.0",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -71,5 +71,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "9fc3693859a59637e1bfb34d8a69f67e168a3811"
+  "gitHead": "ffc77c3e7df6b4c206a3532359aead2722c54487"
 }

package/src/components/Recipient/GroupRecipientDetail.jsx

@@ -1,6 +1,9 @@
 import React from 'react'
 
+import { useClient, generateWebLink } from 'cozy-client'
+import Buttons from 'cozy-ui/transpiled/react/Buttons'
 import { Dialog } from 'cozy-ui/transpiled/react/CozyDialogs'
+import Empty from 'cozy-ui/transpiled/react/Empty'
 import Typography from 'cozy-ui/transpiled/react/Typography'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
@@ -8,6 +11,7 @@ import { GroupRecipientDetailWithAccess } from './GroupRecipientDetailWithAccess
 import { GroupRecipientDetailWithoutAccess } from './GroupRecipientDetailWithoutAccess'
 
 const GroupRecipientDetail = ({ name, owner, members, onClose, isOwner }) => {
+  const client = useClient()
   const { t } = useI18n()
   const withAccess = members.filter(
     member => !['revoked', 'mail-not-sent'].includes(member.status)
@@ -17,6 +21,12 @@ const GroupRecipientDetail = ({ name, owner, members, onClose, isOwner }) => {
   )
 
   const ownerName = owner.public_name
+  const contactsLink = generateWebLink({
+    cozyUrl: client.getStackClient().uri,
+    slug: 'contacts',
+    pathname: '/',
+    subDomainType: client.getInstanceOptions().subdomain
+  })
 
   return (
     <Dialog
@@ -35,6 +45,18 @@ const GroupRecipientDetail = ({ name, owner, members, onClose, isOwner }) => {
       }
       content={
         <div className="u-flex u-stack-xs u-flex-column">
+          {members.length === 0 ? (
+            <Empty text={t('GroupRecipientDetail.empty.content')}>
+              <Buttons
+                component="a"
+                className="u-mt-1"
+                href={contactsLink}
+                target="_blank"
+                rel="noopener noreferrer"
+                label={t('GroupRecipientDetail.empty.action')}
+              />
+            </Empty>
+          ) : null}
           {withAccess.length > 0 ? (
             <GroupRecipientDetailWithAccess withAccess={withAccess} />
           ) : null}

package/src/components/Recipient/GroupRecipientDetailWithoutAccess.jsx

@@ -48,7 +48,7 @@ const GroupRecipientDetailWithoutAccess = ({ withoutAccess, isOwner }) => {
                     {t(
                       `GroupRecipientDetail.withoutAccess.status.${recipient.status}`
                     )}
-                    {isOwner
+                    {isOwner && recipient.status === 'mail-not-sent'
                       ? ` - ${t('GroupRecipientDetail.withoutAccess.addEmail')}`
                       : null}
                   </div>

package/src/components/ShareByEmail.jsx

@@ -16,7 +16,7 @@ import {
   spreadGroupAndMergeRecipients,
   hasReachRecipientsLimit
 } from '../helpers/recipients'
-import { getSuccessMessage } from '../helpers/successMessage'
+import { getSuccessMessage, getErrorMessage } from '../helpers/share'
 import { isReadOnlySharing } from '../state'
 import styles from '../styles/share.styl'
 
@@ -104,40 +104,19 @@ export const ShareByEmail = ({
         variant: 'filled'
       })
     } catch (err) {
-      let showGenericAlert = true
-      if (err.name === 'FetchError' && err.status === 400) {
-        const detail = JSON.parse(err.message).errors[0].detail
-        if (
-          detail.startsWith(
-            'A group member cannot be added as they are already in'
-          )
-        ) {
-          // To know the sharing rights of the other group
-          const sharingRights =
-            selectedOption === 'readOnly' ? 'readWrite' : 'readOnly'
-          showAlert({
-            message: t('Share.errors.groupMemberAlreadyInSharing', {
-              smart_count: recipients.length,
-              groupName: recipients[0].name,
-              sharingRights: t(`Share.errors.sharingRights.${sharingRights}`),
-              icon: false
-            }),
-            severity: 'error',
-            variant: 'filled'
+      showAlert({
+        message: t(
+          ...getErrorMessage({
+            t,
+            err,
+            documentType,
+            recipients,
+            selectedOption
           })
-          showGenericAlert = false
-        }
-      }
-
-      if (showGenericAlert) {
-        showAlert({
-          message: t(`${documentType}.share.error.generic`),
-          severity: 'error',
-          variant: 'filled'
-        })
-      }
-
-      throw err
+        ),
+        severity: 'error',
+        variant: 'filled'
+      })
     } finally {
       reset()
     }

package/src/components/ShareRecipientsInput.jsx

@@ -8,7 +8,7 @@ import ShareAutosuggest from './ShareAutosuggest'
 import { getContactsFromGroupId } from '../helpers/contacts'
 import {
   buildReachableContactsQuery,
-  buildContactGroupsByIdsQuery,
+  buildContactGroupsQuery,
   buildUnreachableContactsWithGroupsQuery
 } from '../queries/queries'
 
@@ -40,25 +40,17 @@ const ShareRecipientsInput = ({
     }
   )
 
-  const contactGroupsByIdsQuery = buildContactGroupsByIdsQuery([
-    ...new Set(
-      (reachableContactsResult.data || []).flatMap(contact => {
-        return (contact.relationships?.groups?.data || []).map(
-          group => group._id
-        )
-      })
-    )
-  ])
-  const contactGroupsByIdsResult = useQueryAll(
-    contactGroupsByIdsQuery.definition,
-    contactGroupsByIdsQuery.options
+  const contactGroupsQuery = buildContactGroupsQuery()
+  const contactGroupsResult = useQueryAll(
+    contactGroupsQuery.definition,
+    contactGroupsQuery.options
   )
 
   const isLoading =
     isQueryLoading(reachableContactsResult) ||
     reachableContactsResult.hasMore ||
-    isQueryLoading(contactGroupsByIdsResult) ||
-    contactGroupsByIdsResult.hasMore ||
+    isQueryLoading(contactGroupsResult) ||
+    contactGroupsResult.hasMore ||
     (flag('sharing.show-recipient-groups') &&
       (isQueryLoading(unreachableContactsWithGroupsResult) ||
         unreachableContactsWithGroupsResult.hasMore))
@@ -66,7 +58,7 @@ const ShareRecipientsInput = ({
   const currentRecipientGroups = currentRecipients
     .map(({ id }) => id)
     .filter(Boolean)
-  const contactGroups = (contactGroupsByIdsResult.data || [])
+  const contactGroups = (contactGroupsResult.data || [])
     .filter(
       ({ _id }) =>
         !flag('sharing.show-recipient-groups') ||

package/src/components/ShareRecipientsInput.spec.jsx

@@ -45,7 +45,7 @@ describe('ShareRecipientsInput component', () => {
           doctype: 'io.cozy.contacts',
           data: contacts
         },
-        'io.cozy.contacts.groups/by-ids/fe86af20-c6c5': {
+        'io.cozy.contacts.groups': {
           doctype: 'io.cozy.contacts.groups',
           data: contactGroups
         },

package/src/helpers/{successMessage.js → share.js}

@@ -1,6 +1,6 @@
 import { models } from 'cozy-client'
 
-import { Contact, Group } from '../models'
+import { Contact, Group, getDisplayName } from '../models'
 
 export const countNewRecipients = (currentRecipients, newRecipients) => {
   const newRecipientsNotAlreadyIncluded = newRecipients.filter(recipient => {
@@ -106,3 +106,48 @@ export const getSuccessMessage = (
     }
   }
 }
+
+export const getErrorMessage = ({
+  t,
+  err,
+  documentType,
+  recipients,
+  selectedOption
+}) => {
+  if (err.name === 'FetchError' && err.status === 400) {
+    const detail = JSON.parse(err.message).errors[0].detail
+    if (
+      detail.startsWith('A group member cannot be added as they are already in')
+    ) {
+      const sharingRights = t(
+        `Share.errors.sharingRights.${
+          selectedOption === 'readOnly' ? 'readWrite' : 'readOnly'
+        }`
+      )
+
+      if (recipients.length === 1 && recipients[0]._type === Contact.doctype) {
+        return [
+          'Share.errors.contactAlreadyInSharing',
+          {
+            smart_count: recipients.length,
+            contactName: getDisplayName(recipients[0]),
+            sharingRights,
+            icon: false
+          }
+        ]
+      }
+
+      return [
+        'Share.errors.groupMemberAlreadyInSharing',
+        {
+          smart_count: recipients.length,
+          groupName: recipients[0].name,
+          sharingRights,
+          icon: false
+        }
+      ]
+    }
+  }
+
+  return [`${documentType}.share.error.generic`]
+}