cozy-sharing 12.1.0 → 12.3.0

package/src/components/ShareAutosuggest.jsx

@@ -165,12 +165,7 @@ const ShareAutocomplete = ({
   )
 
   const renderSuggestion = contactOrGroup => (
-    <ContactSuggestion
-      contacts={contactsAndGroups.filter(
-        item => item._type === Contact.doctype
-      )}
-      contactOrGroup={contactOrGroup}
-    />
+    <ContactSuggestion contactOrGroup={contactOrGroup} />
   )
 
   return (

package/src/components/ShareRecipientsInput.jsx

@@ -1,3 +1,4 @@
+import get from 'lodash/get'
 import PropTypes from 'prop-types'
 import React, { useState, useEffect } from 'react'
 
@@ -42,7 +43,24 @@ const ShareRecipientsInput = ({
     if (contacts.hasMore || contacts.fetchStatus === 'loading') {
       return contacts.data
     } else {
-      return [...contacts.data, ...contactGroups.data]
+      const contactGroupsWithCount = contactGroups.data
+        .map(contactGroup => ({
+          ...contactGroup,
+          membersCount: contacts.data.reduce((total, contact) => {
+            if (
+              get(contact, 'relationships.groups.data', [])
+                .map(group => group._id)
+                .includes(contactGroup._id)
+            ) {
+              return total + 1
+            }
+
+            return total
+          }, 0)
+        }))
+        .filter(contactGroup => contactGroup.membersCount > 0)
+
+      return [...contacts.data, ...contactGroupsWithCount]
     }
   }
 

package/src/components/ShareRecipientsInput.spec.jsx

@@ -1,138 +1,200 @@
-import { shallow } from 'enzyme'
+import { render, screen } from '@testing-library/react'
 import React from 'react'
 
 import ShareRecipientsInput from './ShareRecipientsInput'
 
-describe('ShareRecipientsInput component', () => {
-  it('should match snapshot', () => {
-    const props = {
-      client: '',
-      label: 'Recipients',
-      contacts: {
-        id: 'contacts',
-        fetchStatus: 'loaded',
-        hasMore: false,
-        data: [
-          {
-            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'
-            }
+jest.mock('./ShareAutosuggest', () => ({
+  __esModule: true,
+  default: ({ contactsAndGroups }) => {
+    return (
+      <ul>
+        {contactsAndGroups.map(contactOrGroup => {
+          if (contactOrGroup._type === 'io.cozy.contacts') {
+            return (
+              <li key={contactOrGroup.id}>
+                {contactOrGroup.name.givenName} {contactOrGroup.name.familyName}
+              </li>
+            )
+          } else {
+            return <li key={contactOrGroup.id}>{contactOrGroup.name}</li>
           }
-        ]
-      },
-      contactGroups: {
-        id: 'groups',
-        fetchStatus: 'loaded',
-        hasMore: false,
-        data: [
-          {
-            id: 'fe86af20-c6c5',
-            name: "The Night's Watch",
-            _id: 'fe86af20-c6c5',
-            _type: 'io.cozy.contacts.groups'
-          },
-          {
-            id: '3d8193ab-2ce4',
-            name: 'The North',
-            _id: '3d8193ab-2ce4',
-            _type: 'io.cozy.contacts.groups'
+        })}
+      </ul>
+    )
+  }
+}))
+
+describe('ShareRecipientsInput component', () => {
+  const setup = ({ contacts, contactGroups }) => {
+    render(
+      <ShareRecipientsInput
+        contacts={contacts}
+        contactGroups={contactGroups}
+        onPick={() => {}}
+        onRemove={() => {}}
+        placeholder="Enter recipients here"
+      />
+    )
+  }
+
+  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'
           }
-        ]
-      },
-      recipients: [
+        },
         {
           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'
+                }
+              ]
+            }
           }
         }
-      ],
-      onPick: jest.fn().mockName('onPick'),
-      onRemove: jest.fn().mockName('onRemove'),
-      placeholder: 'Enter recipients here'
+      ]
+    }
+    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 jsx = <ShareRecipientsInput {...props} />
-    const wrapper = shallow(jsx)
-    expect(wrapper).toMatchSnapshot()
+
+    setup({ contacts, contactGroups })
+
+    expect(screen.getByText('Michale Russel')).toBeInTheDocument()
+    expect(screen.getByText('Teagan Wolf')).toBeInTheDocument()
+    expect(screen.getByText("The Night's Watch")).toBeInTheDocument()
   })
 
-  it('should include groups only if all contacts are loaded', () => {
-    const props = {
-      client: '',
-      label: 'Recipients',
-      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 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'
+          }
+        },
+        {
+          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'
+                }
+              ]
             }
           }
-        ]
-      },
-      contactGroups: {
-        id: 'groups',
-        fetchStatus: 'loaded',
-        hasMore: false,
-        data: [
-          {
-            id: 'fe86af20-c6c5',
-            name: "The Night's Watch",
-            _id: 'fe86af20-c6c5',
-            _type: 'io.cozy.contacts.groups'
-          },
-          {
-            id: '3d8193ab-2ce4',
-            name: 'The North',
-            _id: '3d8193ab-2ce4',
-            _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 })
+
+    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'
           }
-        ]
-      },
-      recipients: [
+        },
         {
           id: '5a3b4ccf-c257',
+          _id: '5a3b4ccf-c257',
+          _type: 'io.cozy.contacts',
           name: {
             givenName: 'Teagan',
             familyName: 'Wolf'
           }
         }
-      ],
-      onPick: jest.fn().mockName('onPick'),
-      onRemove: jest.fn().mockName('onRemove'),
-      placeholder: 'Enter recipients here'
+      ]
     }
-    const jsx = <ShareRecipientsInput {...props} />
-    const wrapper = shallow(jsx)
-    expect(wrapper).toMatchSnapshot()
+    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 })
+
+    expect(screen.getByText('Michale Russel')).toBeInTheDocument()
+    expect(screen.getByText('Teagan Wolf')).toBeInTheDocument()
+    expect(screen.queryByText("The Night's Watch")).toBeNull()
   })
 })