cozy-sharing 40.1.6 → 40.1.8

package/src/components/Recipient/MemberRecipient.spec.jsx

@@ -6,16 +6,6 @@ import { createMockClient } from 'cozy-client'
 import MemberRecipient from './MemberRecipient'
 import AppLike from '../../../test/AppLike'
 
-const mockUpdateDocumentPermissions = jest.fn()
-const mockUpdateSharingMemberType = jest.fn()
-
-jest.mock('../../hooks/useSharingContext', () => ({
-  useSharingContext: () => ({
-    updateDocumentPermissions: mockUpdateDocumentPermissions,
-    updateSharingMemberType: mockUpdateSharingMemberType
-  })
-}))
-
 describe('MemberRecipient component', () => {
   const client = createMockClient({})
   client.options = {
@@ -51,6 +41,7 @@ describe('MemberRecipient component', () => {
   it('should render if isMe ', () => {
     const { getByText } = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way'
     })
@@ -61,6 +52,7 @@ describe('MemberRecipient component', () => {
   it('should match snapshot if isOwner', () => {
     const { getByText } = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way',
       isOwner: true
@@ -75,6 +67,7 @@ describe('MemberRecipient component', () => {
 
     const { getByLabelText } = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way',
       documentType: 'Files',
@@ -93,6 +86,7 @@ describe('MemberRecipient component', () => {
 
     const { getByLabelText } = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way',
       isOwner: true,
@@ -112,6 +106,7 @@ describe('MemberRecipient component', () => {
 
     const { getByText } = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way',
       isOwner: false,
@@ -132,6 +127,7 @@ describe('MemberRecipient component', () => {
 
     const { queryByText } = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way',
       isOwner: false,
@@ -149,6 +145,7 @@ describe('MemberRecipient component', () => {
 
     const { getByText } = setup({
       instance: 'foo.mycozy.cloud',
+      isCurrentUser: true,
       status: 'ready',
       type: 'two-way',
       isOwner: false,

package/src/components/Recipient/MemberRecipientPermissions.jsx

@@ -1,46 +1,50 @@
 import React, { useState, useCallback } from 'react'
 
 import { Icon, CrossCircleOutline } from '@linagora/twake-icons'
-import { useClient } from 'cozy-client'
 import IconButton from 'cozy-ui/transpiled/react/IconButton'
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
 import Typography from 'cozy-ui/transpiled/react/Typography'
 import { useI18n } from 'twake-i18n'
 
-import { PermissionTypeMenu } from './PermissionTypeMenu'
+import PermissionTypeMenu from './PermissionTypeMenu'
+import { hasMemberActions } from '../../helpers/recipients'
 
 const MemberRecipientPermissions = ({
   isOwner,
   canManageSharing = isOwner,
   canManageMembers = true,
   status,
-  instance,
+  isCurrentUser = false,
   type,
   document,
+  isInsideSharedParent,
+  sharedParentName,
   onRevoke,
   onRevokeSelf,
+  onSetMemberType,
   sharingId,
   memberIndex,
   ...recipient
 }) => {
   const { t } = useI18n()
-  const client = useClient()
 
   const [revoking, setRevoking] = useState(false)
 
-  const instanceMatchesClient =
-    instance !== undefined && instance === client.options.uri
   const contactIsOwner = status === 'owner'
   const shouldShowMenu =
-    canManageMembers &&
     !revoking &&
-    !contactIsOwner &&
-    ((instanceMatchesClient && !isOwner) || canManageSharing)
+    hasMemberActions({
+      status,
+      isCurrentUser,
+      isOwner,
+      canManageSharing,
+      canManageMembers
+    })
 
   const handleRevocation = useCallback(async () => {
     setRevoking(true)
     try {
-      if (instanceMatchesClient && !isOwner) {
+      if (isCurrentUser && !isOwner) {
         await onRevokeSelf(document)
       } else {
         await onRevoke(document, sharingId, memberIndex)
@@ -50,7 +54,7 @@ const MemberRecipientPermissions = ({
     }
   }, [
     document,
-    instanceMatchesClient,
+    isCurrentUser,
     isOwner,
     memberIndex,
     onRevoke,
@@ -71,11 +75,23 @@ const MemberRecipientPermissions = ({
       {shouldShowMenu && (
         <>
           <PermissionTypeMenu
-            sharingId={sharingId}
-            memberIndex={memberIndex}
             type={type ?? 'one-way'}
             document={document}
             recipient={recipient}
+            isInsideSharedParent={isInsideSharedParent}
+            sharedParentName={sharedParentName}
+            onSetType={(newType, options) =>
+              onSetMemberType(
+                {
+                  sharingId,
+                  memberIndex,
+                  type: type ?? 'one-way',
+                  recipient
+                },
+                newType,
+                options
+              )
+            }
           />
           <IconButton
             onClick={handleRevocation}

package/src/components/Recipient/MemberRecipientPermissions.spec.jsx

@@ -6,15 +6,8 @@ import { createMockClient } from 'cozy-client'
 import MemberRecipientPermissions from './MemberRecipientPermissions'
 import AppLike from '../../../test/AppLike'
 
-const mockUpdateSharingMemberType = jest.fn()
 const mockShowAlert = jest.fn()
 
-jest.mock('../../hooks/useSharingContext', () => ({
-  useSharingContext: () => ({
-    updateSharingMemberType: mockUpdateSharingMemberType
-  })
-}))
-
 jest.mock('cozy-ui/transpiled/react/providers/Alert', () => ({
   __esModule: true,
   default: ({ children }) => children,
@@ -33,13 +26,14 @@ describe('MemberRecipientPermissions component', () => {
     isOwner: true,
     isSharedDrive: false,
     status: 'ready',
-    instance: 'http://cozy.local:8080',
+    isCurrentUser: true,
     type: 'two-way',
     document: { id: 'doc-123', type: 'io.cozy.files', path: '/test' },
     sharingId: 'sharing-123',
     memberIndex: 1,
     onRevoke: jest.fn(),
-    onRevokeSelf: jest.fn()
+    onRevokeSelf: jest.fn(),
+    onSetMemberType: jest.fn()
   }
 
   beforeEach(() => {
@@ -75,7 +69,7 @@ describe('MemberRecipientPermissions component', () => {
   it('should not render menu when user is not owner and not the shared drive contact', () => {
     const { queryByRole } = setup({
       isOwner: false,
-      instance: 'http://other-cozy.local:8080'
+      isCurrentUser: false
     })
 
     expect(queryByRole('button', { name: 'Editor' })).not.toBeInTheDocument()
@@ -91,7 +85,7 @@ describe('MemberRecipientPermissions component', () => {
   it('should render menu for the user themselves', () => {
     const { getByRole } = setup({
       isOwner: false,
-      instance: 'http://cozy.local:8080'
+      isCurrentUser: true
     })
 
     expect(getByRole('button', { name: 'Editor' })).toBeInTheDocument()

package/src/components/Recipient/MemberRecipientPermissions.stories.jsx

@@ -5,6 +5,7 @@ const meta = {
   args: {
     onRevoke: () => {},
     onRevokeSelf: () => {},
+    onSetMemberType: () => {},
     type: 'two-way',
     status: 'ready'
   },
@@ -35,6 +36,6 @@ export const Self = {
   name: 'Self',
   args: {
     isOwner: false,
-    instance: 'http://alice.cozy.localhost:8080'
+    isCurrentUser: true
   }
 }

package/src/components/Recipient/OwnerRecipient.jsx

@@ -2,28 +2,15 @@ import PropTypes from 'prop-types'
 import React from 'react'
 
 import MemberRecipient from './MemberRecipient'
-import OwnerRecipientDefault from './OwnerRecipientDefault'
 
-const OwnerRecipient = ({ recipients, isOrgSharedDrive }) => {
-  const ownerRecipient = recipients.find(
-    recipient => recipient.status === 'owner'
-  )
+const OwnerRecipient = ({ owner }) => {
+  if (!owner) return null
 
-  if (ownerRecipient) {
-    return (
-      <MemberRecipient
-        {...ownerRecipient}
-        isOrgSharedDrive={isOrgSharedDrive}
-      />
-    )
-  }
-
-  return <OwnerRecipientDefault />
+  return <MemberRecipient {...owner} />
 }
 
 OwnerRecipient.propTypes = {
-  recipients: PropTypes.array.isRequired,
-  isOrgSharedDrive: PropTypes.bool
+  owner: PropTypes.object
 }
 
 export default OwnerRecipient

package/src/components/Recipient/OwnerRecipient.stories.jsx

@@ -4,7 +4,7 @@ import { recipients } from '../../../.storybook/fixtures/recipients'
 const meta = {
   component: OwnerRecipient,
   args: {
-    recipients
+    owner: recipients.find(recipient => recipient.status === 'owner')
   }
 }
 

package/src/components/Recipient/OwnerRecipientDefaultLite.jsx

@@ -6,7 +6,7 @@ import MemberRecipientLite from './MemberRecipientLite'
 import withLocales from '../../hoc/withLocales'
 import { buildInstanceSettingsQuery } from '../../queries/queries'
 
-// See OwnerRecipientDefault: show the instance public avatar (with an initials
+// See containers/WhoHasAccess: show the instance public avatar (with an initials
 // fallback) when the owner has no per-sharing avatar to reference.
 const OWNER_PUBLIC_AVATAR_PATH = '/public/avatar?fallback=initials'
 

package/src/components/Recipient/PermissionTypeMenu.jsx

@@ -1,7 +1,6 @@
+import PropTypes from 'prop-types'
 import React, { useCallback, useRef, useState } from 'react'
 
-import { useClient } from 'cozy-client'
-import flag from 'cozy-flags'
 import minilog from 'cozy-minilog'
 import ActionsMenu from 'cozy-ui/transpiled/react/ActionsMenu'
 import { makeActions } from 'cozy-ui/transpiled/react/ActionsMenu/Actions'
@@ -12,86 +11,32 @@ import { useI18n } from 'twake-i18n'
 import DowngradePermissionConfirmDialog from './DowngradePermissionConfirmDialog'
 import { setReadOnlySharedPermission } from './actions/setReadOnlySharedPermission'
 import { setReadWriteSharedPermission } from './actions/setReadWriteSharedPermission'
-import { getOrCreateFromArray } from '../../helpers/contacts'
-import withLocales from '../../hoc/withLocales'
-import { useFetchDocumentPath } from '../../hooks/useFetchDocumentPath'
-import { useSharingContext } from '../../hooks/useSharingContext'
-import { getSharingDocIds } from '../../state'
 
 const log = minilog('PermissionTypeMenu')
 
-const PermissionTypeMenuComponent = ({
-  sharingId,
-  memberIndex,
+const PermissionTypeMenu = ({
   type,
   document,
-  recipient
+  recipient,
+  isInsideSharedParent,
+  sharedParentName,
+  onSetType
 }) => {
   const { t } = useI18n()
-  const client = useClient()
   const buttonRef = useRef()
-  const { hasSharedParent, updateSharingMemberType, getSharingById, share } =
-    useSharingContext()
   const { showAlert } = useAlert()
 
   const [isMenuDisplayed, setMenuDisplayed] = useState(false)
   const [pendingType, setPendingType] = useState(null)
 
-  const documentPath = useFetchDocumentPath(client, document)
-
   const hideMenu = useCallback(() => {
     setMenuDisplayed(false)
   }, [])
 
   const applyType = useCallback(
-    async (newType, { withAncestors = false } = {}) => {
+    async (newType, options) => {
       try {
-        if (withAncestors) {
-          // Ancestors first: only the target's own update refetches its
-          // effective recipients, which must already see them downgraded.
-          const ancestors = (recipient?.sources || []).filter(
-            s => s.kind === 'ancestor' && !s.read_only
-          )
-          for (const ancestor of ancestors) {
-            await updateSharingMemberType(
-              ancestor.sharing_id,
-              ancestor.member_index,
-              newType
-            )
-          }
-        }
-
-        const documentId = document?._id || document?.id
-        if (
-          flag('drive.federated-shared-folder.enabled') &&
-          type === 'one-way' &&
-          newType === 'two-way' &&
-          documentId
-        ) {
-          const sourceSharing = getSharingById(sharingId)
-          if (
-            sourceSharing &&
-            !getSharingDocIds(sourceSharing).includes(documentId)
-          ) {
-            const contacts = await getOrCreateFromArray(
-              client,
-              [recipient],
-              contact => client.create('io.cozy.contacts', contact)
-            )
-            if (!contacts[0]) throw new Error('Recipient contact not found')
-            await share({
-              document: { ...document, id: documentId },
-              description: document.name,
-              recipients: contacts,
-              readOnlyRecipients: [],
-              sharedDrive: true,
-              openSharing: false
-            })
-            return
-          }
-        }
-
-        await updateSharingMemberType(sharingId, memberIndex, newType, document)
+        await onSetType(newType, options)
       } catch (error) {
         log.error('Failed to change member permission type', error)
         showAlert({
@@ -101,27 +46,12 @@ const PermissionTypeMenuComponent = ({
         })
       }
     },
-    [
-      client,
-      document,
-      getSharingById,
-      memberIndex,
-      recipient,
-      share,
-      sharingId,
-      showAlert,
-      t,
-      type,
-      updateSharingMemberType
-    ]
+    [onSetType, showAlert, t]
   )
 
   // Downgrading to viewer on a folder inside a shared parent also reduces
   // the member's rights on the parent: require explicit confirmation first.
-  const shouldConfirmDowngrade =
-    type === 'two-way' &&
-    Boolean(documentPath) &&
-    hasSharedParent?.(documentPath)
+  const shouldConfirmDowngrade = type === 'two-way' && isInsideSharedParent
 
   const setType = useCallback(
     newType => {
@@ -177,6 +107,7 @@ const PermissionTypeMenuComponent = ({
         <DowngradePermissionConfirmDialog
           document={document}
           recipient={recipient}
+          sharedParentName={sharedParentName}
           onCancel={handleCancelDowngrade}
           onConfirm={handleConfirmDowngrade}
         />
@@ -185,4 +116,13 @@ const PermissionTypeMenuComponent = ({
   )
 }
 
-export const PermissionTypeMenu = withLocales(PermissionTypeMenuComponent)
+PermissionTypeMenu.propTypes = {
+  type: PropTypes.oneOf(['one-way', 'two-way']),
+  document: PropTypes.object,
+  recipient: PropTypes.object,
+  isInsideSharedParent: PropTypes.bool,
+  sharedParentName: PropTypes.string,
+  onSetType: PropTypes.func.isRequired
+}
+
+export default PermissionTypeMenu

package/src/components/Recipient/PermissionTypeMenuWrapper.jsx

@@ -0,0 +1,32 @@
+import React from 'react'
+
+import PermissionTypeMenu from './PermissionTypeMenu'
+import withLocales from '../../hoc/withLocales'
+import { useMemberPermissionType } from '../../hooks/useMemberPermissionType'
+
+const PermissionTypeMenuWrapper = ({
+  sharingId,
+  memberIndex,
+  type,
+  document,
+  recipient
+}) => {
+  const { isInsideSharedParent, sharedParentName, setMemberType } =
+    useMemberPermissionType(document)
+
+  const handleSetType = (newType, options) =>
+    setMemberType({ sharingId, memberIndex, type, recipient }, newType, options)
+
+  return (
+    <PermissionTypeMenu
+      type={type}
+      document={document}
+      recipient={recipient}
+      isInsideSharedParent={isInsideSharedParent}
+      sharedParentName={sharedParentName}
+      onSetType={handleSetType}
+    />
+  )
+}
+
+export default withLocales(PermissionTypeMenuWrapper)

package/src/components/Recipient/{PermissionTypeMenu.spec.jsx → PermissionTypeMenuWrapper.spec.jsx}

@@ -4,7 +4,7 @@ import React from 'react'
 import { createMockClient } from 'cozy-client'
 import flag from 'cozy-flags'
 
-import { PermissionTypeMenu } from './PermissionTypeMenu'
+import PermissionTypeMenuWrapper from './PermissionTypeMenuWrapper'
 import AppLike from '../../../test/AppLike'
 
 const mockUpdateSharingMemberType = jest.fn()
@@ -56,7 +56,7 @@ describe('PermissionTypeMenu component', () => {
   const setup = props => {
     return render(
       <AppLike client={client}>
-        <PermissionTypeMenu {...defaultProps} {...props} />
+        <PermissionTypeMenuWrapper {...defaultProps} {...props} />
       </AppLike>
     )
   }

package/src/components/Recipient/RecipientList.jsx

@@ -14,8 +14,13 @@ const RecipientList = ({
   isSharedDrive,
   document,
   documentType,
+  isInsideSharedParent,
+  sharedParentName,
   onRevoke,
   onRevokeSelf,
+  onRevokeGroup,
+  onLeaveGroup,
+  onSetMemberType,
   verifyRecipient
 }) => {
   const previousRecipients = usePrevious(recipients)
@@ -41,6 +46,8 @@ const RecipientList = ({
           documentType={documentType}
           onRevoke={onRevoke}
           onRevokeSelf={onRevokeSelf}
+          onRevokeGroup={onRevokeGroup}
+          onLeaveGroup={onLeaveGroup}
           fadeIn={recipient.hasBeenJustAdded}
         />
       )
@@ -56,8 +63,11 @@ const RecipientList = ({
         isSharedDrive={isSharedDrive}
         document={document}
         documentType={documentType}
+        isInsideSharedParent={isInsideSharedParent}
+        sharedParentName={sharedParentName}
         onRevoke={onRevoke}
         onRevokeSelf={onRevokeSelf}
+        onSetMemberType={onSetMemberType}
         recipientConfirmationData={recipientConfirmationData}
         verifyRecipient={verifyRecipient}
         fadeIn={recipient.hasBeenJustAdded}

package/src/components/Recipient/RecipientList.stories.jsx

@@ -9,6 +9,9 @@ const meta = {
     isOwner: false,
     onRevoke: () => {},
     onRevokeSelf: () => {},
+    onRevokeGroup: () => {},
+    onLeaveGroup: () => {},
+    onSetMemberType: () => {},
     verifyRecipient: () => true
   }
 }

package/src/components/{ShareRecipientsInput.jsx → ShareAutosuggestWrapper.jsx}

@@ -2,27 +2,22 @@ import PropTypes from 'prop-types'
 import React from 'react'
 
 import { useQueryAll, isQueryLoading } from 'cozy-client'
-import { models } from 'cozy-client'
 import flag from 'cozy-flags'
 
 import ShareAutosuggest from './ShareAutosuggest'
-import { getContactsFromGroupId } from '../helpers/contacts'
+import { computeContactsAndGroups } from '../helpers/contacts'
 import {
   buildReachableContactsQuery,
   buildContactGroupsQuery,
   buildUnreachableContactsWithGroupsQuery
 } from '../queries/queries'
 
-const ContactModel = models.contact
-
 /**
- * ShareRecipientsInput is responsible for fetching contacts and groups.
+ * ShareAutosuggestWrapper 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 isCurrentUser = contact => contact.me === true
-
-const ShareRecipientsInput = ({
+const ShareAutosuggestWrapper = ({
   currentRecipients,
   recipients,
   placeholder,
@@ -64,60 +59,14 @@ const ShareRecipientsInput = ({
       (isQueryLoading(unreachableContactsWithGroupsResult) ||
         unreachableContactsWithGroupsResult.hasMore))
 
-  const reachableContacts = (reachableContactsResult.data || []).filter(
-    contact =>
-      !isCurrentUser(contact) &&
-      // We do not want contact already in the sharing
-      !currentRecipients.find(
-        r => r.email === ContactModel.getPrimaryEmail(contact)
-      ) &&
-      // We do not want contact currently in pending contacts (in chips)
-      !recipients.find(r => r._id === contact._id)
-  )
-
-  const unreachableContactsWithGroups = (
-    unreachableContactsWithGroupsResult.data || []
-  ).filter(contact => !isCurrentUser(contact))
-  const currentRecipientGroups = currentRecipients
-    .map(({ id }) => id)
-    .filter(Boolean)
-  const contactGroups = (contactGroupsResult.data || [])
-    .filter(
-      ({ _id }) =>
-        !flag('sharing.show-recipient-groups') ||
-        !currentRecipientGroups.includes(_id)
-    )
-    .map(contactGroup => {
-      const reachableMembers = getContactsFromGroupId(
-        reachableContacts,
-        contactGroup.id
-      ).map(contact => ({
-        ...contact,
-        isReachable: true
-      }))
-
-      if (flag('sharing.show-recipient-groups') !== true) {
-        return {
-          ...contactGroup,
-          members: reachableMembers
-        }
-      }
-
-      const unreachableMembers = getContactsFromGroupId(
-        unreachableContactsWithGroups,
-        contactGroup.id
-      ).map(contact => ({
-        ...contact,
-        isReachable: false
-      }))
-
-      return {
-        ...contactGroup,
-        members: [...reachableMembers, ...unreachableMembers]
-      }
-    })
-
-  const contactsAndGroups = [...reachableContacts, ...contactGroups]
+  const contactsAndGroups = computeContactsAndGroups({
+    reachableContacts: reachableContactsResult.data || [],
+    unreachableContactsWithGroups:
+      unreachableContactsWithGroupsResult.data || [],
+    contactGroups: contactGroupsResult.data || [],
+    currentRecipients,
+    pendingRecipients: recipients
+  })
 
   return (
     <ShareAutosuggest
@@ -135,7 +84,7 @@ const ShareRecipientsInput = ({
   )
 }
 
-ShareRecipientsInput.propTypes = {
+ShareAutosuggestWrapper.propTypes = {
   currentRecipients: PropTypes.array,
   recipients: PropTypes.array,
   placeholder: PropTypes.string,
@@ -147,9 +96,9 @@ ShareRecipientsInput.propTypes = {
   endAdornment: PropTypes.node
 }
 
-ShareRecipientsInput.defaultProps = {
+ShareAutosuggestWrapper.defaultProps = {
   currentRecipients: [],
   recipients: []
 }
 
-export default ShareRecipientsInput
+export default ShareAutosuggestWrapper

package/src/components/{ShareRecipientsInput.spec.jsx → ShareAutosuggestWrapper.spec.jsx}

@@ -4,7 +4,7 @@ import React from 'react'
 import { createMockClient } from 'cozy-client'
 import flag from 'cozy-flags'
 
-import ShareRecipientsInput from './ShareRecipientsInput'
+import ShareAutosuggestWrapper from './ShareAutosuggestWrapper'
 import AppLike from './SharingBanner/test/AppLike'
 
 jest.mock('cozy-flags', () => ({
@@ -37,7 +37,7 @@ jest.mock('./ShareAutosuggest', () => ({
   }
 }))
 
-describe('ShareRecipientsInput component', () => {
+describe('ShareAutosuggestWrapper component', () => {
   const setup = (
     { contacts, contactGroups, unreachableContact },
     { currentRecipients, recipients } = {}
@@ -60,7 +60,7 @@ describe('ShareRecipientsInput component', () => {
     })
     render(
       <AppLike client={mockClient}>
-        <ShareRecipientsInput
+        <ShareAutosuggestWrapper
           onPick={() => {}}
           onRemove={() => {}}
           placeholder="Enter recipients here"