cozy-viewer 13.2.2 → 13.2.3

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [13.2.3](https://github.com/cozy/cozy-libs/compare/cozy-viewer@13.2.2...cozy-viewer@13.2.3) (2025-01-20)
+
+
+### Bug Fixes
+
+* **Viewer:** Now use the folder as a reference when sharing ([21f4d9a](https://github.com/cozy/cozy-libs/commit/21f4d9af0c926a780789483be800a7ed3f2882ae))
+
+
+
+
+
 ## [13.2.2](https://github.com/cozy/cozy-libs/compare/cozy-viewer@13.2.1...cozy-viewer@13.2.2) (2025-01-16)
 
 

package/dist/Panel/Sharing.js

@@ -51,11 +51,16 @@ var Sharing = function Sharing(_ref) {
       getDocumentPermissions = _useSharingContext.getDocumentPermissions,
       getSharingLink = _useSharingContext.getSharingLink,
       allLoaded = _useSharingContext.allLoaded,
+      hasSharedParent = _useSharingContext.hasSharedParent,
       getRecipients = _useSharingContext.getRecipients;
 
-  var recipients = getRecipients(file._id);
-  var permissions = getDocumentPermissions(file._id);
-  var link = getSharingLink(file._id);
+  var shareFileRefId = hasSharedParent(file.path) ? file.dir_id : file._id;
+  var recipients = getRecipients(shareFileRefId);
+  var permissions = getDocumentPermissions(shareFileRefId);
+  var link = getSharingLink(shareFileRefId);
+
+  var _isOwner = isOwner(shareFileRefId);
+
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ListItem.default, {
     size: "large",
     divider: true,
@@ -81,7 +86,7 @@ var Sharing = function Sharing(_ref) {
     return /*#__PURE__*/_react.default.createElement(_cozySharing.MemberRecipientLite, {
       key: recipient.index,
       recipient: recipient,
-      isOwner: isOwner(file._id)
+      isOwner: _isOwner
     });
   }) : /*#__PURE__*/_react.default.createElement(_cozySharing.OwnerRecipientDefaultLite, null)), showModal && /*#__PURE__*/_react.default.createElement(_cozySharing.ShareModal, {
     document: file,

package/dist/ViewerContainer.js

@@ -94,7 +94,8 @@ var ViewerContainer = function ViewerContainer(props) {
   (0, _I18n.useExtendI18n)(_locales.locales);
 
   var _useSharingContext = (0, _cozySharing.useSharingContext)(),
-      hasWriteAccess = _useSharingContext.hasWriteAccess;
+      hasWriteAccess = _useSharingContext.hasWriteAccess,
+      hasSharedParent = _useSharingContext.hasSharedParent;
 
   var currentFile = files[currentIndex];
   var fileCount = files.length;
@@ -133,7 +134,7 @@ var ViewerContainer = function ViewerContainer(props) {
               break;
 
             case 6:
-              _context.t0 = !hasWriteAccess(currentFile._id);
+              _context.t0 = !hasWriteAccess(hasSharedParent(currentFile.path) ? currentFile.dir_id : currentFile._id);
 
             case 7:
               res = _context.t0;
@@ -152,7 +153,7 @@ var ViewerContainer = function ViewerContainer(props) {
     }();
 
     getIsReadOnly();
-  }, [client, currentFile, hasWriteAccess, isPublic]);
+  }, [client, currentFile, hasWriteAccess, hasSharedParent, isPublic]);
   return /*#__PURE__*/_react.default.createElement(_Alert.default, null, /*#__PURE__*/_react.default.createElement("div", {
     id: "viewer-wrapper",
     className: (0, _classnames.default)(styles['viewer-wrapper'], className)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-viewer",
-  "version": "13.2.2",
+  "version": "13.2.3",
   "description": "Cozy-Viewer provides a component to show files in a viewer.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "babel-preset-cozy-app": "^2.8.1",
     "cozy-client": "^52.1.0",
     "cozy-device-helper": "2.0.0",
-    "cozy-harvest-lib": "^32.2.12",
+    "cozy-harvest-lib": "^32.2.13",
     "cozy-intent": "^2.29.1",
     "cozy-logger": "^1.16.1",
     "cozy-sharing": "^19.0.0",
@@ -59,5 +59,5 @@
     "react": ">=16.12.0",
     "react-dom": ">=16.12.0"
   },
-  "gitHead": "fd145faacdefa1f529aaf8a45a2906066457512a"
+  "gitHead": "2f6508f4594f8bbed84b81fb99f76365d9ccabb9"
 }

package/src/Panel/Sharing.jsx

@@ -26,12 +26,15 @@ const Sharing = ({ file, t }) => {
     getDocumentPermissions,
     getSharingLink,
     allLoaded,
+    hasSharedParent,
     getRecipients
   } = useSharingContext()
 
-  const recipients = getRecipients(file._id)
-  const permissions = getDocumentPermissions(file._id)
-  const link = getSharingLink(file._id)
+  const shareFileRefId = hasSharedParent(file.path) ? file.dir_id : file._id
+  const recipients = getRecipients(shareFileRefId)
+  const permissions = getDocumentPermissions(shareFileRefId)
+  const link = getSharingLink(shareFileRefId)
+  const _isOwner = isOwner(shareFileRefId)
 
   return (
     <>
@@ -56,7 +59,7 @@ const Sharing = ({ file, t }) => {
             <MemberRecipientLite
               key={recipient.index}
               recipient={recipient}
-              isOwner={isOwner(file._id)}
+              isOwner={_isOwner}
             />
           ))
         ) : (

package/src/ViewerContainer.jsx

@@ -35,7 +35,7 @@ const ViewerContainer = props => {
   const [isReadOnly, setIsReadOnly] = useState(true)
   const client = useClient()
   useExtendI18n(locales)
-  const { hasWriteAccess } = useSharingContext()
+  const { hasWriteAccess, hasSharedParent } = useSharingContext()
 
   const currentFile = files[currentIndex]
   const fileCount = files.length
@@ -59,13 +59,17 @@ const ViewerContainer = props => {
             document: currentFile,
             client
           })
-        : !hasWriteAccess(currentFile._id)
+        : !hasWriteAccess(
+            hasSharedParent(currentFile.path)
+              ? currentFile.dir_id
+              : currentFile._id
+          )
 
       setIsReadOnly(res)
     }
 
     getIsReadOnly()
-  }, [client, currentFile, hasWriteAccess, isPublic])
+  }, [client, currentFile, hasWriteAccess, hasSharedParent, isPublic])
 
   return (
     <AlertProvider>