cozy-viewer 28.1.16 → 28.1.18

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.18](https://github.com/cozy/cozy-libs/compare/cozy-viewer@28.1.17...cozy-viewer@28.1.18) (2026-06-23)
+
+### Bug Fixes
+
+- **cozy-viewer:** Show inherited sharing recipients ([5da160a](https://github.com/cozy/cozy-libs/commit/5da160afce3f81f10969607bee76e58197c466a8))
+
+## [28.1.17](https://github.com/cozy/cozy-libs/compare/cozy-viewer@28.1.16...cozy-viewer@28.1.17) (2026-06-22)
+
+**Note:** Version bump only for package cozy-viewer
+
 ## [28.1.16](https://github.com/cozy/cozy-libs/compare/cozy-viewer@28.1.15...cozy-viewer@28.1.16) (2026-06-17)
 
 **Note:** Version bump only for package cozy-viewer

package/dist/Panel/Sharing.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -37,7 +39,15 @@ var _withViewerLocales = require("../hoc/withViewerLocales");
 
 var _ShareModalProvider = require("../providers/ShareModalProvider");
 
+var _queries = require("../queries");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 var Sharing = function Sharing(_ref) {
+  var _sharedParentFolders$;
+
   var file = _ref.file,
       t = _ref.t;
   var client = (0, _cozyClient.useClient)();
@@ -51,16 +61,29 @@ var Sharing = function Sharing(_ref) {
       getSharingLink = _useSharingContext.getSharingLink,
       allLoaded = _useSharingContext.allLoaded,
       getRecipients = _useSharingContext.getRecipients,
+      getSharedParentPath = _useSharingContext.getSharedParentPath,
+      hasSharedParent = _useSharingContext.hasSharedParent,
       isOwner = _useSharingContext.isOwner;
 
   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 sharedParentPath = !sharedDriveSharing && file.path && hasSharedParent(file.path) ? getSharedParentPath(file.path) : null;
+  var sharedParentQuery = (0, _queries.buildFolderByPathQuery)(sharedParentPath);
+
+  var _useQuery = (0, _cozyClient.useQuery)(sharedParentQuery.definition, _objectSpread(_objectSpread({}, sharedParentQuery.options), {}, {
+    enabled: !!sharedParentPath
+  })),
+      sharedParentFolders = _useQuery.data,
+      sharedParentFetchStatus = _useQuery.fetchStatus;
+
+  var sharingReferenceId = !sharedDriveSharing && sharedParentPath && sharedParentFolders !== null && sharedParentFolders !== void 0 && (_sharedParentFolders$ = sharedParentFolders[0]) !== null && _sharedParentFolders$ !== void 0 && _sharedParentFolders$._id ? sharedParentFolders[0]._id : file._id;
+  if (sharedParentPath && sharedParentFetchStatus !== 'loaded') return null;
+  var recipients = sharedDriveSharing ? (0, _cozySharing.getRecipientsFromSharing)(sharedDriveSharing, file._id) : getRecipients(sharingReferenceId);
+  var permissions = getDocumentPermissions(sharingReferenceId);
+  var link = getSharingLink(sharingReferenceId);
   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 isCurrentUserOwner = file.driveId ? (owner === null || owner === void 0 ? void 0 : owner.instance) === client.options.uri : isOwner(sharingReferenceId);
 
   var showModal = function showModal() {
     if (!(0, _cozyFlags.default)('drive.new-file-viewer-ui.enabled')) {

package/dist/queries.d.ts

@@ -13,3 +13,10 @@ export function buildFileByIdQuery(fileId: any): {
         singleDocData: boolean;
     };
 };
+export function buildFolderByPathQuery(path: any): {
+    definition: () => import("cozy-client").QueryDefinition;
+    options: {
+        as: string;
+        fetchPolicy: Function;
+    };
+};

package/dist/queries.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildFileByIdQuery = exports.buildContactByIdsQuery = void 0;
+exports.buildFolderByPathQuery = exports.buildFileByIdQuery = exports.buildContactByIdsQuery = void 0;
 
 var _cozyClient = require("cozy-client");
 
@@ -37,4 +37,22 @@ var buildFileByIdQuery = function buildFileByIdQuery(fileId) {
   };
 };
 
-exports.buildFileByIdQuery = buildFileByIdQuery;
+exports.buildFileByIdQuery = buildFileByIdQuery;
+
+var buildFolderByPathQuery = function buildFolderByPathQuery(path) {
+  var folderPath = path || '';
+  return {
+    definition: function definition() {
+      return (0, _cozyClient.Q)('io.cozy.files').where({
+        type: 'directory',
+        path: folderPath
+      }).indexFields(['type', 'path']).limitBy(1);
+    },
+    options: {
+      as: "io.cozy.files/path/".concat(encodeURIComponent(folderPath)),
+      fetchPolicy: defaultFetchPolicy
+    }
+  };
+};
+
+exports.buildFolderByPathQuery = buildFolderByPathQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-viewer",
-  "version": "28.1.16",
+  "version": "28.1.18",
   "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.48",
+    "cozy-harvest-lib": "^37.0.50",
     "cozy-intent": "^2.31.1",
     "cozy-logger": "^1.18.1",
-    "cozy-sharing": "^33.6.0",
+    "cozy-sharing": "^33.6.1",
     "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": "fc451fb2e649fffe6bfc8f16ff812ba4c31531cf"
+  "gitHead": "137a6bc3214b34063dd418693c42682c0837782e"
 }

package/src/Panel/Sharing.jsx

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 
-import { useClient } from 'cozy-client'
+import { useClient, useQuery } from 'cozy-client'
 import flag from 'cozy-flags'
 import {
   getRecipientsFromSharing,
@@ -21,6 +21,7 @@ import Spinner from 'cozy-ui/transpiled/react/Spinner'
 
 import { withViewerLocales } from '../hoc/withViewerLocales'
 import { useShareModal } from '../providers/ShareModalProvider'
+import { buildFolderByPathQuery } from '../queries'
 
 const Sharing = ({ file, t }) => {
   const client = useClient()
@@ -31,19 +32,38 @@ const Sharing = ({ file, t }) => {
     getSharingLink,
     allLoaded,
     getRecipients,
+    getSharedParentPath,
+    hasSharedParent,
     isOwner
   } = useSharingContext()
 
   const sharedDriveSharing = file.driveId ? getSharingById(file.driveId) : null
+  const sharedParentPath =
+    !sharedDriveSharing && file.path && hasSharedParent(file.path)
+      ? getSharedParentPath(file.path)
+      : null
+  const sharedParentQuery = buildFolderByPathQuery(sharedParentPath)
+  const { data: sharedParentFolders, fetchStatus: sharedParentFetchStatus } =
+    useQuery(sharedParentQuery.definition, {
+      ...sharedParentQuery.options,
+      enabled: !!sharedParentPath
+    })
+  const sharingReferenceId =
+    !sharedDriveSharing && sharedParentPath && sharedParentFolders?.[0]?._id
+      ? sharedParentFolders[0]._id
+      : file._id
+
+  if (sharedParentPath && sharedParentFetchStatus !== 'loaded') return null
+
   const recipients = sharedDriveSharing
     ? getRecipientsFromSharing(sharedDriveSharing, file._id)
-    : getRecipients(file._id)
-  const permissions = getDocumentPermissions(file._id)
-  const link = getSharingLink(file._id)
+    : getRecipients(sharingReferenceId)
+  const permissions = getDocumentPermissions(sharingReferenceId)
+  const link = getSharingLink(sharingReferenceId)
   const owner = recipients.find(recipient => recipient.status === 'owner')
   const isCurrentUserOwner = file.driveId
     ? owner?.instance === client.options.uri
-    : isOwner(file._id)
+    : isOwner(sharingReferenceId)
 
   const showModal = () => {
     if (!flag('drive.new-file-viewer-ui.enabled')) {

package/src/Panel/Sharing.spec.jsx

@@ -5,6 +5,7 @@ import Sharing from './Sharing'
 
 const mockGetRecipientsFromSharing = jest.fn()
 const mockUseClient = jest.fn()
+const mockUseQuery = jest.fn()
 const mockUseShareModal = jest.fn()
 const mockUseSharingContext = jest.fn()
 const mockMemberRecipientLite = jest.fn(({ recipient, isOwner }) => (
@@ -14,7 +15,16 @@ const mockMemberRecipientLite = jest.fn(({ recipient, isOwner }) => (
 ))
 
 jest.mock('cozy-client', () => ({
-  useClient: () => mockUseClient()
+  Q: () => ({
+    where: jest.fn().mockReturnThis(),
+    indexFields: jest.fn().mockReturnThis(),
+    limitBy: jest.fn().mockReturnThis()
+  }),
+  fetchPolicies: {
+    olderThan: jest.fn(() => 'fetch-policy')
+  },
+  useClient: () => mockUseClient(),
+  useQuery: (...args) => mockUseQuery(...args)
 }))
 
 jest.mock('cozy-flags', () => jest.fn(() => false))
@@ -40,6 +50,15 @@ jest.mock('../providers/ShareModalProvider', () => ({
 
 const file = { _id: 'file-id' }
 const sharedFile = { _id: 'shared-file-id' }
+const fileInSharedFolder = {
+  _id: 'file-in-shared-folder-id',
+  path: '/shared-folder/subfolder/file.pdf'
+}
+const sharedFolder = {
+  _id: 'shared-folder-id',
+  path: '/shared-folder',
+  type: 'directory'
+}
 const sharedDriveFile = { _id: 'file-id', driveId: 'drive-id' }
 const ownerRecipient = {
   index: 'recipient-0',
@@ -60,19 +79,33 @@ const sharedDriveSharing = {
   }
 }
 
-const setup = ({
-  clientUri = 'http://bob.localhost:8080/',
-  targetFile = file,
-  userIsOwner = true
-} = {}) => {
+const setup = (options = {}) => {
+  const {
+    clientUri = 'http://bob.localhost:8080/',
+    sharedParentFetchStatus = 'loaded',
+    targetFile = file,
+    userIsOwner = true
+  } = options
+  const sharedParentFolders = Object.prototype.hasOwnProperty.call(
+    options,
+    'sharedParentFolders'
+  )
+    ? options.sharedParentFolders
+    : [sharedFolder]
   const getDocumentPermissions = jest
     .fn()
-    .mockImplementation(docId => (docId === 'file-id' ? ['perm'] : []))
+    .mockImplementation(docId =>
+      docId === 'file-id' || docId === 'shared-folder-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') {
+    if (
+      docId === 'file-id' ||
+      docId === 'shared-file-id' ||
+      docId === 'shared-folder-id'
+    ) {
       return [ownerRecipient]
     }
 
@@ -81,12 +114,26 @@ const setup = ({
   const getSharingLink = jest
     .fn()
     .mockImplementation(docId =>
-      docId === 'file-id' ? 'http://share-link' : null
+      docId === 'file-id' || docId === 'shared-folder-id'
+        ? 'http://share-link'
+        : null
     )
 
+  mockUseQuery.mockReturnValue({
+    data: sharedParentFolders,
+    fetchStatus: sharedParentFetchStatus
+  })
   mockGetRecipientsFromSharing.mockReturnValue([ownerRecipient])
   mockUseClient.mockReturnValue({ options: { uri: clientUri } })
   const isOwner = jest.fn().mockReturnValue(userIsOwner)
+  const hasSharedParent = jest
+    .fn()
+    .mockImplementation(path => path === '/shared-folder/subfolder/file.pdf')
+  const getSharedParentPath = jest
+    .fn()
+    .mockImplementation(path =>
+      path === '/shared-folder/subfolder/file.pdf' ? '/shared-folder' : null
+    )
 
   mockUseShareModal.mockReturnValue({ setShowShareModal: jest.fn() })
   mockUseSharingContext.mockReturnValue({
@@ -95,6 +142,8 @@ const setup = ({
     getSharingById,
     getRecipients,
     getSharingLink,
+    getSharedParentPath,
+    hasSharedParent,
     isOwner
   })
 
@@ -146,6 +195,66 @@ describe('Sharing', () => {
     )
   })
 
+  it('should use shared parent recipients when a file is inside a shared folder without driveId', () => {
+    setup({ targetFile: fileInSharedFolder })
+
+    expect(mockUseSharingContext().getSharedParentPath).toHaveBeenCalledWith(
+      '/shared-folder/subfolder/file.pdf'
+    )
+    expect(mockUseSharingContext().getRecipients).toHaveBeenCalledWith(
+      'shared-folder-id'
+    )
+    expect(mockUseSharingContext().getDocumentPermissions).toHaveBeenCalledWith(
+      'shared-folder-id'
+    )
+    expect(mockUseSharingContext().getSharingLink).toHaveBeenCalledWith(
+      'shared-folder-id'
+    )
+    expect(mockUseSharingContext().isOwner).toHaveBeenCalledWith(
+      'shared-folder-id'
+    )
+  })
+
+  it('should not display sharing section while shared parent folder is loading', () => {
+    const { queryByText } = setup({
+      sharedParentFetchStatus: 'loading',
+      sharedParentFolders: undefined,
+      targetFile: fileInSharedFolder
+    })
+
+    expect(queryByText('Viewer.panel.sharing')).toBeNull()
+  })
+
+  it('should not display sharing section while shared parent folder is in pending state', () => {
+    const { queryByText } = setup({
+      sharedParentFetchStatus: 'pending',
+      sharedParentFolders: undefined,
+      targetFile: fileInSharedFolder
+    })
+
+    expect(queryByText('Viewer.panel.sharing')).toBeNull()
+  })
+
+  it('should fallback to file recipients when no shared parent folder is found', () => {
+    setup({
+      sharedParentFolders: [],
+      targetFile: fileInSharedFolder
+    })
+
+    expect(mockUseSharingContext().getRecipients).toHaveBeenCalledWith(
+      'file-in-shared-folder-id'
+    )
+    expect(mockUseSharingContext().getDocumentPermissions).toHaveBeenCalledWith(
+      'file-in-shared-folder-id'
+    )
+    expect(mockUseSharingContext().getSharingLink).toHaveBeenCalledWith(
+      'file-in-shared-folder-id'
+    )
+    expect(mockUseSharingContext().isOwner).toHaveBeenCalledWith(
+      'file-in-shared-folder-id'
+    )
+  })
+
   it('should not mark the owner as current user when the owner is remote', () => {
     setup({ targetFile: sharedDriveFile })
 

package/src/queries.js

@@ -18,3 +18,19 @@ export const buildFileByIdQuery = fileId => ({
     singleDocData: true
   }
 })
+
+export const buildFolderByPathQuery = path => {
+  const folderPath = path || ''
+
+  return {
+    definition: () =>
+      Q('io.cozy.files')
+        .where({ type: 'directory', path: folderPath })
+        .indexFields(['type', 'path'])
+        .limitBy(1),
+    options: {
+      as: `io.cozy.files/path/${encodeURIComponent(folderPath)}`,
+      fetchPolicy: defaultFetchPolicy
+    }
+  }
+}