cozy-sharing 12.3.0 → 13.1.0

package/src/components/ShareDialogCozyToCozy.spec.jsx

@@ -257,57 +257,6 @@ const deferablePromise = () => {
 
 const getMockProps = () => {
   return {
-    contacts: {
-      id: 'contacts',
-      definition: {
-        doctype: 'io.cozy.contacts',
-        selector: {
-          _id: {
-            $gt: null
-          }
-        },
-        indexedFields: ['_id'],
-        partialFilter: {
-          trashed: {
-            $or: [
-              {
-                $eq: false
-              },
-              {
-                $exists: false
-              }
-            ]
-          },
-          $or: [
-            {
-              cozy: {
-                $not: {
-                  $size: 0
-                }
-              }
-            },
-            {
-              email: {
-                $not: {
-                  $size: 0
-                }
-              }
-            }
-          ]
-        },
-        limit: 1000
-      },
-      fetchStatus: 'pending',
-      lastFetch: null,
-      lastUpdate: null,
-      lastErrorUpdate: null,
-      lastError: null,
-      hasMore: false,
-      count: 0,
-      data: [],
-      bookmark: null,
-      options: null
-    },
     document: {
       id: 'SOME_DOCUMENT_ID',
       name: 'SOME_DOCUMENT_NAME',
@@ -315,22 +264,6 @@ const getMockProps = () => {
       _id: 'SOME_DOCUMENT_ID'
     },
     documentType: 'Organizations',
-    contactGroups: {
-      id: 'groups',
-      definition: {
-        doctype: 'io.cozy.contacts.groups'
-      },
-      fetchStatus: 'pending',
-      lastFetch: null,
-      lastUpdate: null,
-      lastErrorUpdate: null,
-      lastError: null,
-      hasMore: false,
-      count: 0,
-      data: [],
-      bookmark: null,
-      options: null
-    },
     hasSharedParent: null,
     isOwner: true,
     link: null,

package/src/components/ShareDialogTwoStepsConfirmationContainer.jsx

@@ -90,8 +90,6 @@ const RejectRecipientActions = ({ reject, cancel }) => {
  * Displays a sharing dialog that allows to share a document between multiple Cozy users
  */
 const ShareDialogTwoStepsConfirmationContainer = ({
-  contacts,
-  contactGroups,
   createContact,
   document,
   documentType,
@@ -210,8 +208,6 @@ const ShareDialogTwoStepsConfirmationContainer = ({
   } else if (status === 'sharing') {
     dialogContent = (
       <DialogContentOnShare
-        contacts={contacts}
-        contactGroups={contactGroups}
         createContact={createContact}
         document={document}
         documentType={documentType}

package/src/components/ShareDialogTwoStepsConfirmationContainer.spec.jsx

@@ -284,57 +284,6 @@ const deferablePromise = () => {
 
 const getMockProps = () => {
   return {
-    contacts: {
-      id: 'contacts',
-      definition: {
-        doctype: 'io.cozy.contacts',
-        selector: {
-          _id: {
-            $gt: null
-          }
-        },
-        indexedFields: ['_id'],
-        partialFilter: {
-          trashed: {
-            $or: [
-              {
-                $eq: false
-              },
-              {
-                $exists: false
-              }
-            ]
-          },
-          $or: [
-            {
-              cozy: {
-                $not: {
-                  $size: 0
-                }
-              }
-            },
-            {
-              email: {
-                $not: {
-                  $size: 0
-                }
-              }
-            }
-          ]
-        },
-        limit: 1000
-      },
-      fetchStatus: 'pending',
-      lastFetch: null,
-      lastUpdate: null,
-      lastErrorUpdate: null,
-      lastError: null,
-      hasMore: false,
-      count: 0,
-      data: [],
-      bookmark: null,
-      options: null
-    },
     document: {
       id: 'SOME_DOCUMENT_ID',
       name: 'SOME_DOCUMENT_NAME',
@@ -342,22 +291,6 @@ const getMockProps = () => {
       _id: 'SOME_DOCUMENT_ID'
     },
     documentType: 'Organizations',
-    contactGroups: {
-      id: 'groups',
-      definition: {
-        doctype: 'io.cozy.contacts.groups'
-      },
-      fetchStatus: 'pending',
-      lastFetch: null,
-      lastUpdate: null,
-      lastErrorUpdate: null,
-      lastError: null,
-      hasMore: false,
-      count: 0,
-      data: [],
-      bookmark: null,
-      options: null
-    },
     hasSharedParent: null,
     isOwner: true,
     link: null,

package/src/components/ShareModal/EditableSharingModal.jsx

@@ -1,33 +1,17 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 
-import { useClient, useQueryAll } from 'cozy-client'
+import { useClient } from 'cozy-client'
 
 import { useFetchDocumentPath } from '../../hooks/useFetchDocumentPath'
 import { useSharingContext } from '../../hooks/useSharingContext'
 import { Contact } from '../../models'
-import {
-  buildContactsQuery,
-  buildContactGroupsQuery
-} from '../../queries/queries'
-import { default as DumbShareModal } from '../ShareModal'
+import { ShareModal } from '../ShareModal'
 
 export const EditableSharingModal = ({ document, ...rest }) => {
   const client = useClient()
   const documentPath = useFetchDocumentPath(client, document)
 
-  const contactsQuery = buildContactsQuery()
-  const contactsResult = useQueryAll(
-    contactsQuery.definition,
-    contactsQuery.options
-  )
-
-  const contactGroupsQuery = buildContactGroupsQuery()
-  const contactGroupsResult = useQueryAll(
-    contactGroupsQuery.definition,
-    contactGroupsQuery.options
-  )
-
   const {
     documentType,
     getDocumentPermissions,
@@ -46,9 +30,7 @@ export const EditableSharingModal = ({ document, ...rest }) => {
   } = useSharingContext()
 
   return (
-    <DumbShareModal
-      contacts={contactsResult}
-      contactGroups={contactGroupsResult}
+    <ShareModal
       createContact={contact => client.create(Contact.doctype, contact)}
       document={document}
       documentType={documentType}

package/src/components/ShareModal/EditableSharingModal.spec.jsx

@@ -32,8 +32,6 @@ describe('EditableSharingModal', () => {
       <AppWrapper client={client}>
         <EditableSharingModal
           client={client}
-          contacts={{ data: [] }}
-          contactGroups={{ data: [] }}
           document={document}
           t={x => x}
           onClose={() => {}}

package/src/components/ShareModal.jsx

@@ -5,10 +5,8 @@ import flag from 'cozy-flags'
 
 import ShareDialogCozyToCozy from './ShareDialogCozyToCozy'
 import ShareDialogOnlyByLink from './ShareDialogOnlyByLink'
-import { contactsResponseType, contactGroupsResponseType } from '../propTypes'
+
 export const ShareModal = ({
-  contacts,
-  contactGroups,
   createContact,
   document,
   documentType = 'Document',
@@ -56,8 +54,6 @@ export const ShareModal = ({
     />
   ) : (
     <ShareDialogCozyToCozy
-      contacts={contacts}
-      contactGroups={contactGroups}
       createContact={createContact}
       document={document}
       documentType={documentType}
@@ -88,8 +84,6 @@ export const ShareModal = ({
 export default ShareModal
 
 ShareModal.propTypes = {
-  contacts: contactsResponseType.isRequired,
-  contactGroups: contactGroupsResponseType.isRequired,
   createContact: PropTypes.func.isRequired,
   document: PropTypes.object.isRequired,
   documentType: PropTypes.string,

package/src/components/ShareRecipientsInput.jsx

@@ -1,75 +1,117 @@
-import get from 'lodash/get'
 import PropTypes from 'prop-types'
-import React, { useState, useEffect } from 'react'
+import React from 'react'
+
+import { useQueryAll, isQueryLoading } from 'cozy-client'
+import flag from 'cozy-flags'
 
 import ShareAutosuggest from './ShareAutosuggest'
-import { contactsResponseType, contactGroupsResponseType } from '../propTypes'
+import { getContactsFromGroupId } from '../helpers/contacts'
+import {
+  buildReachableContactsQuery,
+  buildContactGroupsByIdsQuery,
+  buildUnreachableContactsWithGroupsQuery
+} from '../queries/queries'
 
+/**
+ * ShareRecipientsInput is responsible for fetching contacts and groups.
+ * We retrieve all the contacts that are reachable and the groups they belong to.
+ * In order to display the total number of members in each group, we also retrieve the contacts that are not reachable.
+ */
 const ShareRecipientsInput = ({
-  contacts,
-  contactGroups,
+  currentRecipients,
   recipients,
   placeholder,
   onPick,
   onRemove
 }) => {
-  const [loading, setLoading] = useState(false)
+  const reachableContactsQuery = buildReachableContactsQuery()
+  const reachableContactsResult = useQueryAll(
+    reachableContactsQuery.definition,
+    reachableContactsQuery.options
+  )
 
-  useEffect(() => {
-    if (
-      loading &&
-      !contacts.hasMore &&
-      contacts.fetchStatus === 'loaded' &&
-      !contactGroups.hasMore &&
-      contactGroups.fetchStatus === 'loaded'
-    ) {
-      setLoading(false)
+  const unreachableContactsWithGroupsQuery =
+    buildUnreachableContactsWithGroupsQuery()
+  const unreachableContactsWithGroupsResult = useQueryAll(
+    unreachableContactsWithGroupsQuery.definition,
+    {
+      ...unreachableContactsWithGroupsQuery.options,
+      enabled: !!flag('sharing.show-recipient-groups')
     }
-  }, [contacts, contactGroups, loading])
+  )
 
-  const onShareAutosuggestFocus = () => {
-    if (
-      contacts.hasMore ||
-      contacts.fetchStatus === 'loading' ||
-      contactGroups.hasMore ||
-      contactGroups.fetchStatus === 'loading'
-    ) {
-      setLoading(true)
-    }
-  }
+  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 getContactsAndGroups = () => {
-    // we need contacts to be loaded to be able to add all group members to recipients
-    if (contacts.hasMore || contacts.fetchStatus === 'loading') {
-      return contacts.data
-    } else {
-      const contactGroupsWithCount = contactGroups.data
-        .map(contactGroup => ({
+  const isLoading =
+    isQueryLoading(reachableContactsResult) ||
+    reachableContactsResult.hasMore ||
+    isQueryLoading(contactGroupsByIdsResult) ||
+    contactGroupsByIdsResult.hasMore ||
+    (flag('sharing.show-recipient-groups') &&
+      (isQueryLoading(unreachableContactsWithGroupsResult) ||
+        unreachableContactsWithGroupsResult.hasMore))
+
+  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
+      ).map(contact => ({
+        ...contact,
+        isReachable: true
+      }))
+
+      if (flag('sharing.show-recipient-groups') !== true) {
+        return {
           ...contactGroup,
-          membersCount: contacts.data.reduce((total, contact) => {
-            if (
-              get(contact, 'relationships.groups.data', [])
-                .map(group => group._id)
-                .includes(contactGroup._id)
-            ) {
-              return total + 1
-            }
+          members: reachableMembers
+        }
+      }
 
-            return total
-          }, 0)
-        }))
-        .filter(contactGroup => contactGroup.membersCount > 0)
+      const unreachableMembers = getContactsFromGroupId(
+        unreachableContactsWithGroupsResult.data,
+        contactGroup.id
+      ).map(contact => ({
+        ...contact,
+        isReachable: false
+      }))
 
-      return [...contacts.data, ...contactGroupsWithCount]
-    }
-  }
+      return {
+        ...contactGroup,
+        members: [...reachableMembers, ...unreachableMembers]
+      }
+    })
+
+  const contactsAndGroups = [
+    ...(reachableContactsResult.data || []),
+    ...contactGroups
+  ]
 
   return (
     <ShareAutosuggest
-      loading={loading}
-      contactsAndGroups={getContactsAndGroups()}
+      loading={isLoading}
+      contactsAndGroups={contactsAndGroups}
       recipients={recipients}
-      onFocus={onShareAutosuggestFocus}
       onPick={onPick}
       onRemove={onRemove}
       placeholder={placeholder}
@@ -78,8 +120,7 @@ const ShareRecipientsInput = ({
 }
 
 ShareRecipientsInput.propTypes = {
-  contacts: contactsResponseType.isRequired,
-  contactGroups: contactGroupsResponseType.isRequired,
+  currentRecipients: PropTypes.array,
   recipients: PropTypes.array,
   placeholder: PropTypes.string,
   onPick: PropTypes.func.isRequired,
@@ -87,6 +128,7 @@ ShareRecipientsInput.propTypes = {
 }
 
 ShareRecipientsInput.defaultProps = {
+  currentRecipients: [],
   recipients: []
 }