cozy-viewer 28.1.2 → 28.1.4

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [28.1.4](https://github.com/cozy/cozy-libs/compare/cozy-viewer@28.1.3...cozy-viewer@28.1.4) (2026-06-10)
+
+### Bug Fixes
+
+- **cozy-viewer:** Show shared drive recipients in panel ([f58d29a](https://github.com/cozy/cozy-libs/commit/f58d29ad4a5ed3c7ef98b5cc95a6694f631d86d9))
+
+## [28.1.3](https://github.com/cozy/cozy-libs/compare/cozy-viewer@28.1.2...cozy-viewer@28.1.3) (2026-06-10)
+
+**Note:** Version bump only for package cozy-viewer
+
 ## [28.1.2](https://github.com/cozy/cozy-libs/compare/cozy-viewer@28.1.1...cozy-viewer@28.1.2) (2026-06-09)
 
 **Note:** Version bump only for package cozy-viewer

package/dist/Panel/Sharing.js

@@ -11,6 +11,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireDefault(require("react"));
 
+var _cozyClient = require("cozy-client");
+
 var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
 
 var _cozySharing = require("cozy-sharing");
@@ -38,22 +40,27 @@ var _ShareModalProvider = require("../providers/ShareModalProvider");
 var Sharing = function Sharing(_ref) {
   var file = _ref.file,
       t = _ref.t;
+  var client = (0, _cozyClient.useClient)();
 
   var _useShareModal = (0, _ShareModalProvider.useShareModal)(),
       setShowShareModal = _useShareModal.setShowShareModal;
 
   var _useSharingContext = (0, _cozySharing.useSharingContext)(),
-      isOwner = _useSharingContext.isOwner,
       getDocumentPermissions = _useSharingContext.getDocumentPermissions,
+      getSharingById = _useSharingContext.getSharingById,
       getSharingLink = _useSharingContext.getSharingLink,
       allLoaded = _useSharingContext.allLoaded,
-      getRecipients = _useSharingContext.getRecipients;
+      getRecipients = _useSharingContext.getRecipients,
+      isOwner = _useSharingContext.isOwner;
 
-  var recipients = getRecipients(file._id);
+  var sharedDriveSharing = file.driveId ? getSharingById(file.driveId) : null;
+  var recipients = sharedDriveSharing ? (0, _cozySharing.getRecipientsFromSharing)(sharedDriveSharing, file._id) : getRecipients(file._id);
   var permissions = getDocumentPermissions(file._id);
   var link = getSharingLink(file._id);
-
-  var _isOwner = isOwner(file._id);
+  var owner = recipients.find(function (recipient) {
+    return recipient.status === 'owner';
+  });
+  var isCurrentUserOwner = file.driveId ? (owner === null || owner === void 0 ? void 0 : owner.instance) === client.options.uri : isOwner(file._id);
 
   var showModal = function showModal() {
     if (!(0, _cozyFlags.default)('drive.new-file-viewer-ui.enabled')) {
@@ -84,7 +91,7 @@ var Sharing = function Sharing(_ref) {
     return /*#__PURE__*/_react.default.createElement(_cozySharing.MemberRecipientLite, {
       key: recipient.index,
       recipient: recipient,
-      isOwner: _isOwner
+      isOwner: isCurrentUserOwner
     });
   }) : /*#__PURE__*/_react.default.createElement(_cozySharing.OwnerRecipientDefaultLite, null), (0, _cozyFlags.default)('drive.new-file-viewer-ui.enabled') && /*#__PURE__*/_react.default.createElement(_ListItem.default, null, /*#__PURE__*/_react.default.createElement(_Buttons.default, {
     variant: "secondary",

package/dist/Panel/Sharing.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-viewer",
-  "version": "28.1.2",
+  "version": "28.1.4",
   "description": "Cozy-Viewer provides a component to show files in a viewer.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "babel-preset-cozy-app": "^2.8.4",
     "cozy-client": "^60.20.0",
     "cozy-device-helper": "2.0.0",
-    "cozy-harvest-lib": "^37.0.34",
+    "cozy-harvest-lib": "^37.0.36",
     "cozy-intent": "^2.31.1",
     "cozy-logger": "^1.18.1",
-    "cozy-sharing": "^33.2.1",
+    "cozy-sharing": "^33.3.0",
     "cozy-ui": "^138.1.0",
     "cozy-ui-plus": "^8.0.1",
     "identity-obj-proxy": "3.0.0",
@@ -71,5 +71,5 @@
     "react-router-dom": ">=6.14.2",
     "twake-i18n": ">=0.3.0"
   },
-  "gitHead": "107c14be0fb0677515062187e3fdadeab4e00350"
+  "gitHead": "4fe0199d7042ff150315bd4a097256b2364f200c"
 }

package/src/Panel/Sharing.jsx

@@ -1,12 +1,14 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 
+import { useClient } from 'cozy-client'
 import flag from 'cozy-flags'
 import {
-  useSharingContext,
+  getRecipientsFromSharing,
+  LinkRecipientLite,
   MemberRecipientLite,
   OwnerRecipientDefaultLite,
-  LinkRecipientLite
+  useSharingContext
 } from 'cozy-sharing'
 import Button from 'cozy-ui/transpiled/react/Buttons'
 import Icon from 'cozy-ui/transpiled/react/Icon'
@@ -21,19 +23,27 @@ import { withViewerLocales } from '../hoc/withViewerLocales'
 import { useShareModal } from '../providers/ShareModalProvider'
 
 const Sharing = ({ file, t }) => {
+  const client = useClient()
   const { setShowShareModal } = useShareModal()
   const {
-    isOwner,
     getDocumentPermissions,
+    getSharingById,
     getSharingLink,
     allLoaded,
-    getRecipients
+    getRecipients,
+    isOwner
   } = useSharingContext()
 
-  const recipients = getRecipients(file._id)
+  const sharedDriveSharing = file.driveId ? getSharingById(file.driveId) : null
+  const recipients = sharedDriveSharing
+    ? getRecipientsFromSharing(sharedDriveSharing, file._id)
+    : getRecipients(file._id)
   const permissions = getDocumentPermissions(file._id)
   const link = getSharingLink(file._id)
-  const _isOwner = isOwner(file._id)
+  const owner = recipients.find(recipient => recipient.status === 'owner')
+  const isCurrentUserOwner = file.driveId
+    ? owner?.instance === client.options.uri
+    : isOwner(file._id)
 
   const showModal = () => {
     if (!flag('drive.new-file-viewer-ui.enabled')) {
@@ -71,7 +81,7 @@ const Sharing = ({ file, t }) => {
             <MemberRecipientLite
               key={recipient.index}
               recipient={recipient}
-              isOwner={_isOwner}
+              isOwner={isCurrentUserOwner}
             />
           ))
         ) : (

package/src/Panel/Sharing.spec.jsx

@@ -0,0 +1,170 @@
+import { render } from '@testing-library/react'
+import React from 'react'
+
+import Sharing from './Sharing'
+
+const mockGetRecipientsFromSharing = jest.fn()
+const mockUseClient = jest.fn()
+const mockUseShareModal = jest.fn()
+const mockUseSharingContext = jest.fn()
+const mockMemberRecipientLite = jest.fn(({ recipient, isOwner }) => (
+  <div data-testid="member-recipient" data-is-owner={String(isOwner)}>
+    {recipient.name}
+  </div>
+))
+
+jest.mock('cozy-client', () => ({
+  useClient: () => mockUseClient()
+}))
+
+jest.mock('cozy-flags', () => jest.fn(() => false))
+jest.mock('cozy-sharing', () => ({
+  getRecipientsFromSharing: (...args) => mockGetRecipientsFromSharing(...args),
+  LinkRecipientLite: () => <div data-testid="link-recipient" />,
+  MemberRecipientLite: props => mockMemberRecipientLite(props),
+  OwnerRecipientDefaultLite: () => (
+    <div data-testid="owner-recipient-default" />
+  ),
+  useSharingContext: () => mockUseSharingContext()
+}))
+
+jest.mock('../hoc/withViewerLocales', () => ({
+  withViewerLocales: Component => props => (
+    <Component {...props} t={key => key} />
+  )
+}))
+
+jest.mock('../providers/ShareModalProvider', () => ({
+  useShareModal: () => mockUseShareModal()
+}))
+
+const file = { _id: 'file-id' }
+const sharedFile = { _id: 'shared-file-id' }
+const sharedDriveFile = { _id: 'file-id', driveId: 'drive-id' }
+const ownerRecipient = {
+  index: 'recipient-0',
+  name: 'Alice',
+  status: 'owner',
+  instance: 'http://alice.localhost:8080/'
+}
+const expectedOwnerRecipient = {
+  name: ownerRecipient.name,
+  status: ownerRecipient.status,
+  instance: ownerRecipient.instance
+}
+const sharedDriveSharing = {
+  id: 'drive-id',
+  attributes: {
+    drive: true,
+    members: [ownerRecipient]
+  }
+}
+
+const setup = ({
+  clientUri = 'http://bob.localhost:8080/',
+  targetFile = file,
+  userIsOwner = true
+} = {}) => {
+  const getDocumentPermissions = jest
+    .fn()
+    .mockImplementation(docId => (docId === 'file-id' ? ['perm'] : []))
+  const getSharingById = jest
+    .fn()
+    .mockImplementation(id => (id === 'drive-id' ? sharedDriveSharing : null))
+  const getRecipients = jest.fn().mockImplementation(docId => {
+    if (docId === 'file-id' || docId === 'shared-file-id') {
+      return [ownerRecipient]
+    }
+
+    return []
+  })
+  const getSharingLink = jest
+    .fn()
+    .mockImplementation(docId =>
+      docId === 'file-id' ? 'http://share-link' : null
+    )
+
+  mockGetRecipientsFromSharing.mockReturnValue([ownerRecipient])
+  mockUseClient.mockReturnValue({ options: { uri: clientUri } })
+  const isOwner = jest.fn().mockReturnValue(userIsOwner)
+
+  mockUseShareModal.mockReturnValue({ setShowShareModal: jest.fn() })
+  mockUseSharingContext.mockReturnValue({
+    allLoaded: true,
+    getDocumentPermissions,
+    getSharingById,
+    getRecipients,
+    getSharingLink,
+    isOwner
+  })
+
+  return render(<Sharing file={targetFile} />)
+}
+
+describe('Sharing', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('should use shared drive recipients when the file belongs to a shared drive', () => {
+    setup({ targetFile: sharedDriveFile })
+
+    expect(mockUseSharingContext().getSharingById).toHaveBeenCalledWith(
+      'drive-id'
+    )
+    expect(mockGetRecipientsFromSharing).toHaveBeenCalledWith(
+      sharedDriveSharing,
+      'file-id'
+    )
+    expect(mockUseSharingContext().getRecipients).not.toHaveBeenCalled()
+    expect(mockUseSharingContext().getDocumentPermissions).toHaveBeenCalledWith(
+      'file-id'
+    )
+    expect(mockUseSharingContext().getSharingLink).toHaveBeenCalledWith(
+      'file-id'
+    )
+    expect(mockUseSharingContext().isOwner).not.toHaveBeenCalled()
+    expect(mockMemberRecipientLite).toHaveBeenCalledWith(
+      expect.objectContaining({
+        recipient: expect.objectContaining(expectedOwnerRecipient),
+        isOwner: false
+      })
+    )
+  })
+
+  it('should use isOwner for a regular sharing', () => {
+    setup({ targetFile: sharedFile, userIsOwner: true })
+
+    expect(mockUseSharingContext().isOwner).toHaveBeenCalledWith(
+      'shared-file-id'
+    )
+    expect(mockMemberRecipientLite).toHaveBeenCalledWith(
+      expect.objectContaining({
+        recipient: expect.objectContaining(expectedOwnerRecipient),
+        isOwner: true
+      })
+    )
+  })
+
+  it('should not mark the owner as current user when the owner is remote', () => {
+    setup({ targetFile: sharedDriveFile })
+
+    expect(mockMemberRecipientLite).toHaveBeenCalledWith(
+      expect.objectContaining({
+        recipient: expect.objectContaining(expectedOwnerRecipient),
+        isOwner: false
+      })
+    )
+  })
+
+  it('should mark the owner as current user when the owner matches the current instance', () => {
+    setup({ clientUri: ownerRecipient.instance, targetFile: sharedDriveFile })
+
+    expect(mockMemberRecipientLite).toHaveBeenCalledWith(
+      expect.objectContaining({
+        recipient: expect.objectContaining(expectedOwnerRecipient),
+        isOwner: true
+      })
+    )
+  })
+})