cozy-sharing 28.4.4 → 28.6.0

package/src/components/Recipient/actions/setReadOnlySharedPermission.js

@@ -8,7 +8,7 @@ import Radios from 'cozy-ui/transpiled/react/Radios'
 const makeComponent = ({ label, type, onClick }) => {
   const Component = forwardRef((props, ref) => {
     return (
-      <ActionsMenuItem {...props} ref={ref} button={false} onClick={onClick}>
+      <ActionsMenuItem {...props} ref={ref} onClick={onClick}>
         <ListItemIcon>
           <Radios checked={type === 'one-way'} />
         </ListItemIcon>

package/src/components/Recipient/actions/setReadOnlySharedPermission.spec.jsx

@@ -0,0 +1,95 @@
+import { render, screen, fireEvent } from '@testing-library/react'
+import React from 'react'
+
+import { setReadOnlySharedPermission } from './setReadOnlySharedPermission'
+import AppLike from '../../../../test/AppLike'
+
+const mockT = key => {
+  const translations = {
+    'Share.type.one-way': 'Can view',
+    'Share.type.two-way': 'Can change'
+  }
+  return translations[key] || key
+}
+
+describe('setReadOnlySharedPermission', () => {
+  let setType
+
+  beforeEach(() => {
+    setType = jest.fn()
+  })
+
+  it('should return correct action structure', () => {
+    const action = setReadOnlySharedPermission({
+      t: mockT,
+      type: 'one-way',
+      setType
+    })
+
+    expect(action.name).toBe('setReadOnlySharedPermission')
+    expect(action.label).toBe('Can view')
+    expect(action.icon).toBeNull()
+  })
+
+  it('should call setType with one-way when action is triggered', () => {
+    const action = setReadOnlySharedPermission({
+      t: mockT,
+      type: 'two-way',
+      setType
+    })
+
+    action.action()
+
+    expect(setType).toHaveBeenCalledWith('one-way')
+  })
+
+  it('should render radio as checked when type is one-way', () => {
+    const { Component } = setReadOnlySharedPermission({
+      t: mockT,
+      type: 'one-way',
+      setType
+    })
+
+    render(
+      <AppLike>
+        <Component />
+      </AppLike>
+    )
+
+    expect(screen.getByRole('radio')).toBeChecked()
+  })
+
+  it('should render radio as unchecked when type is two-way', () => {
+    const { Component } = setReadOnlySharedPermission({
+      t: mockT,
+      type: 'two-way',
+      setType
+    })
+
+    render(
+      <AppLike>
+        <Component />
+      </AppLike>
+    )
+
+    expect(screen.getByRole('radio')).not.toBeChecked()
+  })
+
+  it('should call setType with one-way when the component is clicked', () => {
+    const { Component } = setReadOnlySharedPermission({
+      t: mockT,
+      type: 'two-way',
+      setType
+    })
+
+    render(
+      <AppLike>
+        <Component />
+      </AppLike>
+    )
+
+    fireEvent.click(screen.getByText('Can view'))
+
+    expect(setType).toHaveBeenCalledWith('one-way')
+  })
+})

package/src/components/Recipient/actions/setReadWriteSharedPermission.js

@@ -8,7 +8,7 @@ import Radios from 'cozy-ui/transpiled/react/Radios'
 const makeComponent = ({ label, type, onClick }) => {
   const Component = forwardRef((props, ref) => {
     return (
-      <ActionsMenuItem {...props} ref={ref} button={false} onClick={onClick}>
+      <ActionsMenuItem {...props} ref={ref} onClick={onClick}>
         <ListItemIcon>
           <Radios checked={type === 'two-way'} />
         </ListItemIcon>

package/src/components/Recipient/actions/setReadWriteSharedPermission.spec.jsx

@@ -0,0 +1,95 @@
+import { render, screen, fireEvent } from '@testing-library/react'
+import React from 'react'
+
+import { setReadWriteSharedPermission } from './setReadWriteSharedPermission'
+import AppLike from '../../../../test/AppLike'
+
+const mockT = key => {
+  const translations = {
+    'Share.type.one-way': 'Can view',
+    'Share.type.two-way': 'Can change'
+  }
+  return translations[key] || key
+}
+
+describe('setReadWriteSharedPermission', () => {
+  let setType
+
+  beforeEach(() => {
+    setType = jest.fn()
+  })
+
+  it('should return correct action structure', () => {
+    const action = setReadWriteSharedPermission({
+      t: mockT,
+      type: 'two-way',
+      setType
+    })
+
+    expect(action.name).toBe('setReadWriteSharedPermission')
+    expect(action.label).toBe('Can change')
+    expect(action.icon).toBeNull()
+  })
+
+  it('should call setType with two-way when action is triggered', () => {
+    const action = setReadWriteSharedPermission({
+      t: mockT,
+      type: 'one-way',
+      setType
+    })
+
+    action.action()
+
+    expect(setType).toHaveBeenCalledWith('two-way')
+  })
+
+  it('should render radio as checked when type is two-way', () => {
+    const { Component } = setReadWriteSharedPermission({
+      t: mockT,
+      type: 'two-way',
+      setType
+    })
+
+    render(
+      <AppLike>
+        <Component />
+      </AppLike>
+    )
+
+    expect(screen.getByRole('radio')).toBeChecked()
+  })
+
+  it('should render radio as unchecked when type is one-way', () => {
+    const { Component } = setReadWriteSharedPermission({
+      t: mockT,
+      type: 'one-way',
+      setType
+    })
+
+    render(
+      <AppLike>
+        <Component />
+      </AppLike>
+    )
+
+    expect(screen.getByRole('radio')).not.toBeChecked()
+  })
+
+  it('should call setType with two-way when the component is clicked', () => {
+    const { Component } = setReadWriteSharedPermission({
+      t: mockT,
+      type: 'one-way',
+      setType
+    })
+
+    render(
+      <AppLike>
+        <Component />
+      </AppLike>
+    )
+
+    fireEvent.click(screen.getByText('Can change'))
+
+    expect(setType).toHaveBeenCalledWith('two-way')
+  })
+})

package/src/components/ShareByLink.jsx

@@ -23,7 +23,7 @@ const ShareByLink = ({ link, document, documentType }) => {
   const { isMobile } = useBreakpoints()
   const { showAlert } = useAlert()
   const client = useClient()
-  const { shareByLink } = useSharingContext()
+  const { shareByLink, getOwner, getSharingById } = useSharingContext()
   const [isGenerating, setIsGenerating] = useState(false)
 
   const canShare = typeof navigator?.share === 'function'
@@ -44,6 +44,8 @@ const ShareByLink = ({ link, document, documentType }) => {
         file: document,
         documentType,
         shareByLink,
+        getOwner,
+        getSharingById,
         t,
         showAlert,
         password: '',

package/src/components/ShareDialogCozyToCozy.spec.jsx

@@ -14,6 +14,12 @@ jest.mock('cozy-client', () => ({
   useClient: () => ({ options: { uri: mockRecipientAlice.instance } })
 }))
 
+jest.mock('../hooks/useSharingContext', () => ({
+  useSharingContext: () => ({
+    updateSharingMemberType: jest.fn()
+  })
+}))
+
 describe('ShareDialogCozyToCozy', () => {
   const client = createMockClient({})
   client.options = {

package/src/components/ShareRestrictionModal/helpers.js

@@ -2,6 +2,7 @@ import { generateWebLink } from 'cozy-client'
 import minilog from 'cozy-minilog'
 
 import { getAppSlugFromDocumentType } from '../../helpers/link'
+import { getShortcode } from '../../helpers/shortcodes'
 
 const log = minilog('ShareRestrictionModal/helpers')
 
@@ -28,6 +29,8 @@ export const createSharingLink = async ({
   file,
   documentType,
   shareByLink,
+  getOwner,
+  getSharingById,
   t,
   ttl,
   editingRights = 'readOnly',
@@ -44,13 +47,48 @@ export const createSharingLink = async ({
     shareByLink,
     showAlert
   })
-  if (!permsResult?.data?.attributes?.shortcodes?.code) {
+  const code = getShortcode(permsResult?.data)
+  if (!code) {
     return null
   }
-  const { data: perms } = permsResult
+  return generateShareLinkFromFile({
+    client,
+    file,
+    sharecode: code,
+    getOwner,
+    getSharingById,
+    documentType
+  })
+}
+
+/**
+ * Generate a sharing link from a file and sharecode
+ * @param {object} options
+ * @param {object} options.client - CozyClient instance
+ * @param {object} options.file - File to share
+ * @param {string} options.sharecode - Share code
+ * @param {Function} options.getOwner - Function to get the owner of a sharing
+ * @param {Function} options.getSharingById - Function to get a sharing by ID
+ * @param {string} options.documentType - Type of the document
+ * @returns {string} - The generated web link
+ */
+export const generateShareLinkFromFile = ({
+  client,
+  file,
+  sharecode,
+  getOwner,
+  getSharingById,
+  documentType
+}) => {
+  let cozyUrl = client.getStackClient().uri
+  if (file.driveId) {
+    const sharing = getSharingById(file.driveId)
+    const owner = getOwner(sharing?.rules?.[0]?.values?.[0])
+    cozyUrl = owner?.instance || client.getStackClient().uri
+  }
   return generateWebLink({
-    cozyUrl: client.getStackClient().uri,
-    searchParams: [['sharecode', perms.attributes.shortcodes.code]],
+    cozyUrl,
+    searchParams: [['sharecode', sharecode]],
     pathname: '/public',
     slug: getAppSlugFromDocumentType({ documentType }),
     subDomainType: client.capabilities.flat_subdomains ? 'flat' : 'nested'

package/src/components/SharedDrive/DumbSharedDriveModal.jsx

@@ -3,7 +3,7 @@ import React from 'react'
 import { useI18n } from 'twake-i18n'
 
 import withLocales from '../../hoc/withLocales'
-import DumbBatchSharedFolderModal from '../SharedFolder/DumbBatchSharedFolderModal'
+import { DumbBatchSharedFolderModal } from '../SharedFolder/DumbBatchSharedFolderModal'
 
 export const DumbSharedDriveModal = withLocales(
   ({

package/src/components/SharedFolder/DumbBatchSharedFolderModal.jsx

@@ -37,7 +37,8 @@ export const DumbBatchSharedFolderModal = withLocales(
     createLabel,
     shareLabel,
     saveLabel,
-    sharingDesc
+    sharingDesc,
+    showShareByEmail = true
   }) => {
     const hasRecipients = Boolean(recipients?.length)
 
@@ -52,6 +53,16 @@ export const DumbBatchSharedFolderModal = withLocales(
         )
       }
 
+      if (!showShareByEmail) {
+        return (
+          <ShareByLink
+            link={sharingLink}
+            document={document}
+            documentType="Files"
+          />
+        )
+      }
+
       if (!showNameField) {
         return (
           <>
@@ -111,19 +122,21 @@ export const DumbBatchSharedFolderModal = withLocales(
               <Typography variant="h6" className="u-mt-1-half u-mb-half">
                 {addPeopleLabel}
               </Typography>
-              <DumbShareByEmail
-                createContact={createContact}
-                currentRecipients={currentRecipients}
-                document={document}
-                documentType="Files"
-                sharedDrive
-                sharingDesc={sharingDesc}
-                onShare={params => {
-                  onShare(params)
-                }}
-                submitLabel={addButtonLabel}
-                showNotifications={false}
-              />
+              {showShareByEmail && (
+                <DumbShareByEmail
+                  createContact={createContact}
+                  currentRecipients={currentRecipients}
+                  document={document}
+                  documentType="Files"
+                  sharedDrive
+                  sharingDesc={sharingDesc}
+                  onShare={params => {
+                    onShare(params)
+                  }}
+                  submitLabel={addButtonLabel}
+                  showNotifications={false}
+                />
+              )}
             </div>
             <WhoHasAccess
               isOwner
@@ -168,7 +181,10 @@ DumbBatchSharedFolderModal.propTypes = {
   createLabel: PropTypes.string,
   shareLabel: PropTypes.string,
   saveLabel: PropTypes.string,
-  sharingDesc: PropTypes.string.isRequired
+  sharingDesc: PropTypes.string,
+  showShareByEmail: PropTypes.bool
 }
 
-export default DumbBatchSharedFolderModal
+DumbBatchSharedFolderModal.defaultProps = {
+  sharingDesc: ''
+}

package/src/components/WhoHasAccess.jsx

@@ -56,7 +56,6 @@ const WhoHasAccess = ({
             documentType={documentType}
             onRevoke={onRevoke}
             onRevokeSelf={onRevokeSelf}
-            link={link}
             permissions={permissions}
             fadeIn={linkHasBeenJustCreated}
           />

package/src/helpers/shortcodes.js

@@ -0,0 +1,28 @@
+/**
+ * Get the shortcode from a permission object
+ * The shortcode can be in different places depending on how the sharing was created:
+ * - attributes.shortcodes.email
+ * - attributes.shortcodes.code
+ * - attributes.codes.email
+ * - attributes.codes.code
+ *
+ * We used to use `email` as `codes` attribute for a sharingByLink.
+ * But when we use cozy-client to create a Permission, by default
+ * the codes attribute is set to `code`. MesPapiers app is using this
+ * default behavior... So the sharing by link created by mes papiers
+ * didn't appear correctly in cozy-sharing.
+ * This is a bit ugly, we should have a better way to know if this is
+ * a sharing by link or not.
+ *
+ * @param {object} permission - The permission object
+ * @returns {string|null} The shortcode or null if not found
+ */
+export const getShortcode = permission => {
+  return (
+    permission?.attributes?.shortcodes?.email ||
+    permission?.attributes?.shortcodes?.code ||
+    permission?.attributes?.codes?.email ||
+    permission?.attributes?.codes?.code ||
+    null
+  )
+}

package/src/state.js

@@ -1,7 +1,7 @@
-import get from 'lodash/get'
-
 import flag from 'cozy-flags'
 
+import { getShortcode } from './helpers/shortcodes'
+
 const RECEIVE_SHARINGS = 'RECEIVE_SHARINGS'
 const ADD_SHARING = 'ADD_SHARING'
 const UPDATE_SHARING = 'UPDATE_SHARING'
@@ -423,18 +423,7 @@ export const getSharingLink = (state, docId, documentType) => {
   const perms = getDocumentPermissions(state, docId)
   if (perms.length === 0) return null
   const perm = perms[0]
-  // We used to use `email` as `codes` attribute for a sharingByLink.
-  // But when we use cozy-client to create a Permission, by default
-  // the codes attribute is set to `code`. MesPapiers app is using this
-  // default behavior... So the sharing by link created by mes papiers
-  // didn't appear correctly in cozy-sharing.
-  // This is a bit ugly, we should have a better way to know if this is
-  // a sharing by link or not.
-  const code =
-    get(perm, 'attributes.shortcodes.email') ||
-    get(perm, 'attributes.shortcodes.code') ||
-    get(perm, 'attributes.codes.email') ||
-    get(perm, 'attributes.codes.code')
+  const code = getShortcode(perm)
   if (code) {
     return buildSharingLink(state, documentType, code)
   } else {