cozy-sharing 21.2.1 → 21.2.2

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [21.2.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@21.2.1...cozy-sharing@21.2.2) (2025-02-04)
+
+
+### Bug Fixes
+
+* **Sharing:** Show all share recipients in the “who has access” modal ([8669e6b](https://github.com/cozy/cozy-libs/commit/8669e6b8d8650bbd6645a9be94db403121059e70))
+* **Sharing:** Show correct sharing status by user ([55f5a43](https://github.com/cozy/cozy-libs/commit/55f5a43ca5426da991ab76c7f96faa6ccae00a11))
+
+
+### Reverts
+
+* Revert "fix(Sharing): Show correct sharing status by user" ([547a458](https://github.com/cozy/cozy-libs/commit/547a458b1dc4cb64724345c753eff153f7830a8a))
+
+
+
+
+
 ## [21.2.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@21.2.0...cozy-sharing@21.2.1) (2025-01-28)
 
 **Note:** Version bump only for package cozy-sharing

package/dist/components/Recipient/MemberRecipientLite.js

@@ -26,7 +26,8 @@ var MemberRecipientLite = function MemberRecipientLite(_ref) {
       t = _useI18n.t;
 
   var client = useClient();
-  var isMe = isOwner && recipient.status === 'owner' || recipient.instance === client.options.uri;
+  var recipientOwner = recipient.status === 'owner';
+  var isMe = isOwner && recipientOwner || recipient.instance === client.options.uri;
   return /*#__PURE__*/React.createElement(ListItem, {
     size: "small",
     ellipsis: true
@@ -46,7 +47,7 @@ var MemberRecipientLite = function MemberRecipientLite(_ref) {
   }), /*#__PURE__*/React.createElement(Typography, {
     className: "u-flex-shrink-0",
     variant: "body2"
-  }, isMe ? t("Share.status.".concat(recipient.status)).toLowerCase() : t("Share.type.".concat((_recipient$type = recipient.type) !== null && _recipient$type !== void 0 ? _recipient$type : 'one-way')).toLowerCase()));
+  }, recipientOwner ? t("Share.status.".concat(recipient.status)).toLowerCase() : t("Share.type.".concat((_recipient$type = recipient.type) !== null && _recipient$type !== void 0 ? _recipient$type : 'one-way')).toLowerCase()));
 };
 
 MemberRecipientLite.propTypes = {

package/dist/components/ShareModal/EditableSharingModal.js

@@ -28,6 +28,14 @@ export var EditableSharingModal = function EditableSharingModal(_ref) {
       revokeSelf = _useSharingContext.revokeSelf,
       share = _useSharingContext.share;
 
+  var shareFileRefId = hasSharedParent(document.path) ? document.dir_id : document._id;
+  var recipients = getRecipients(shareFileRefId);
+  var permissions = getDocumentPermissions(shareFileRefId);
+  var link = getSharingLink(shareFileRefId);
+  var sharing = getSharingForSelf(shareFileRefId);
+
+  var _isOwner = isOwner(shareFileRefId);
+
   return /*#__PURE__*/React.createElement(ShareModal, _extends({
     createContact: function createContact(contact) {
       return client.create(Contact.doctype, contact);
@@ -36,14 +44,14 @@ export var EditableSharingModal = function EditableSharingModal(_ref) {
     documentType: documentType,
     hasSharedChild: documentPath && hasSharedChild(documentPath),
     hasSharedParent: documentPath && hasSharedParent(documentPath),
-    isOwner: isOwner(document.id),
-    link: getSharingLink(document.id),
+    isOwner: _isOwner,
+    link: link,
     onRevoke: revoke,
     onRevokeSelf: revokeSelf,
     onShare: share,
-    permissions: getDocumentPermissions(document.id),
-    recipients: getRecipients(document.id),
-    sharing: getSharingForSelf(document.id)
+    permissions: permissions,
+    recipients: recipients,
+    sharing: sharing
   }, rest));
 };
 EditableSharingModal.propTypes = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "21.2.1",
+  "version": "21.2.2",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -78,5 +78,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "c5d78b5a602b3ec4f195ce1e80b717bb755d3f1a"
+  "gitHead": "b257fb0f869d9797d5222aa8481e7035a890aeb4"
 }

package/src/components/Recipient/MemberRecipientLite.jsx

@@ -18,9 +18,9 @@ const MemberRecipientLite = ({ recipient, isOwner, ...props }) => {
   const { t } = useI18n()
   const client = useClient()
 
+  const recipientOwner = recipient.status === 'owner'
   const isMe =
-    (isOwner && recipient.status === 'owner') ||
-    recipient.instance === client.options.uri
+    (isOwner && recipientOwner) || recipient.instance === client.options.uri
 
   return (
     <ListItem size="small" ellipsis>
@@ -43,7 +43,7 @@ const MemberRecipientLite = ({ recipient, isOwner, ...props }) => {
         }
       />
       <Typography className="u-flex-shrink-0" variant="body2">
-        {isMe
+        {recipientOwner
           ? t(`Share.status.${recipient.status}`).toLowerCase()
           : t(`Share.type.${recipient.type ?? 'one-way'}`).toLowerCase()}
       </Typography>

package/src/components/ShareModal/EditableSharingModal.jsx

@@ -26,6 +26,15 @@ export const EditableSharingModal = ({ document, ...rest }) => {
     share
   } = useSharingContext()
 
+  const shareFileRefId = hasSharedParent(document.path)
+    ? document.dir_id
+    : document._id
+  const recipients = getRecipients(shareFileRefId)
+  const permissions = getDocumentPermissions(shareFileRefId)
+  const link = getSharingLink(shareFileRefId)
+  const sharing = getSharingForSelf(shareFileRefId)
+  const _isOwner = isOwner(shareFileRefId)
+
   return (
     <ShareModal
       createContact={contact => client.create(Contact.doctype, contact)}
@@ -33,14 +42,14 @@ export const EditableSharingModal = ({ document, ...rest }) => {
       documentType={documentType}
       hasSharedChild={documentPath && hasSharedChild(documentPath)}
       hasSharedParent={documentPath && hasSharedParent(documentPath)}
-      isOwner={isOwner(document.id)}
-      link={getSharingLink(document.id)}
+      isOwner={_isOwner}
+      link={link}
       onRevoke={revoke}
       onRevokeSelf={revokeSelf}
       onShare={share}
-      permissions={getDocumentPermissions(document.id)}
-      recipients={getRecipients(document.id)}
-      sharing={getSharingForSelf(document.id)}
+      permissions={permissions}
+      recipients={recipients}
+      sharing={sharing}
       {...rest}
     />
   )