cozy-sharing 33.4.3 → 33.5.1

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [33.5.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.5.0...cozy-sharing@33.5.1) (2026-06-17)
+
+### Bug Fixes
+
+- **cozy-sharing:** Avoid rendering email twice in recipient row ([800f091](https://github.com/cozy/cozy-libs/commit/800f0915853f167b47087b77ef1a4620a4615fa3))
+- **cozy-sharing:** Prioritize email over instance URL ([4814ab3](https://github.com/cozy/cozy-libs/commit/4814ab34ec13cd8f53641dd333107f2648fb8e76))
+
+# [33.5.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.4.3...cozy-sharing@33.5.0) (2026-06-17)
+
+### Features
+
+- Add isOrgSharedDrive and canLeave helpers ([f93d4bb](https://github.com/cozy/cozy-libs/commit/f93d4bb37cd748a7e18db3a3ac67e1b84e819440))
+
 ## [33.4.3](https://github.com/cozy/cozy-libs/compare/cozy-sharing@33.4.2...cozy-sharing@33.4.3) (2026-06-16)
 
 ### Bug Fixes

package/dist/SharingProvider.js

@@ -41,7 +41,7 @@ import { getSharingObject, createSharingInStore, updateSharingInStore } from './
 import { getShortcode } from './helpers/shortcodes';
 import { SynchronousJobQueue } from './helpers/synchronousJobQueue';
 import { fetchApps } from './queries/queries';
-import reducer, { receiveSharings, addSharing, updateSharing, addSharingLink, updateSharingLink, revokeSharingLink, revokeRecipient, revokeGroup as revokeGroupFromState, revokeSelf, receivePaths, isOwner as _isOwner, isSharedDrive as _isSharedDrive, canReshare as _canReshare, getOwner as _getOwner, getRecipients as _getRecipients, getSharingById as _getSharingById, getExternalSharingIds, getSharingForSelf as _getSharingForSelf, getSharingType as _getSharingType, getSharingLink as _getSharingLink, getSharedDocIdsBySharings, getDocumentSharing, getDocumentPermissions as _getDocumentPermissions, hasSharedParent as _hasSharedParent, hasSharedChild as _hasSharedChild, getSharedParentPath as _getSharedParentPath, getSharedDriveSharingType, SHARING_TYPE } from './state';
+import reducer, { receiveSharings, addSharing, updateSharing, addSharingLink, updateSharingLink, revokeSharingLink, revokeRecipient, revokeGroup as revokeGroupFromState, revokeSelf, receivePaths, isOwner as _isOwner, isSharedDrive as _isSharedDrive, isOrgSharedDrive as _isOrgSharedDrive, canLeave as _canLeave, canReshare as _canReshare, getOwner as _getOwner, getRecipients as _getRecipients, getSharingById as _getSharingById, getExternalSharingIds, getSharingForSelf as _getSharingForSelf, getSharingType as _getSharingType, getSharingLink as _getSharingLink, getSharedDocIdsBySharings, getDocumentSharing, getDocumentPermissions as _getDocumentPermissions, hasSharedParent as _hasSharedParent, hasSharedChild as _hasSharedChild, getSharedParentPath as _getSharedParentPath, getSharedDriveSharingType, SHARING_TYPE } from './state';
 var log = minilog('SharingProvider');
 var SHARING_DOCTYPE = 'io.cozy.sharings';
 var PERMISSION_DOCTYPE = 'io.cozy.permissions';
@@ -997,6 +997,12 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
       isSharedDrive: function isSharedDrive(docId) {
         return _isSharedDrive(_this2.state, docId);
       },
+      isOrgSharedDrive: function isOrgSharedDrive(docId) {
+        return _isOrgSharedDrive(_this2.state, docId);
+      },
+      canLeave: function canLeave(docId) {
+        return _canLeave(_this2.state, docId);
+      },
       canReshare: function canReshare(docId) {
         return _canReshare(_this2.state, docId, _instanceUri);
       },

package/dist/components/Recipient/GroupRecipientDetailWithAccess.js

@@ -33,7 +33,9 @@ var GroupRecipientDetailWithAccess = function GroupRecipientDetailWithAccess(_re
       secondary: /*#__PURE__*/React.createElement(MemberRecipientStatus, {
         status: recipient.status,
         isMe: isMe,
-        instance: recipient.instance
+        instance: recipient.instance,
+        email: recipient.email,
+        name: recipient.name || recipient.public_name
       })
     }));
   })));

package/dist/components/Recipient/MemberRecipient.js

@@ -60,7 +60,9 @@ var MemberRecipient = function MemberRecipient(props) {
     secondary: /*#__PURE__*/React.createElement(MemberRecipientStatus, {
       status: status,
       isMe: isMe,
-      instance: instance
+      instance: instance,
+      email: rest.email,
+      name: rest.name || rest.public_name
     })
   }), RightPart));
 };

package/dist/components/Recipient/MemberRecipientLite.js

@@ -40,6 +40,8 @@ var MemberRecipientLite = function MemberRecipientLite(_ref) {
       status: recipient.status,
       isMe: isMe,
       instance: recipient.instance,
+      email: recipient.email,
+      name: recipient.name || recipient.public_name,
       typographyProps: {
         noWrap: true
       }

package/dist/components/Recipient/MemberRecipientStatus.js

@@ -1,9 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
+import PropTypes from 'prop-types';
 import React from 'react';
-import Icon from 'cozy-ui/transpiled/react/Icon';
-import EyeIcon from 'cozy-ui/transpiled/react/Icons/Eye';
-import PaperplaneIcon from 'cozy-ui/transpiled/react/Icons/Paperplane';
-import ToTheCloudIcon from 'cozy-ui/transpiled/react/Icons/ToTheCloud';
 import Typography from 'cozy-ui/transpiled/react/Typography';
 import { useI18n } from 'twake-i18n';
 
@@ -11,6 +8,8 @@ var MemberRecipientStatus = function MemberRecipientStatus(_ref) {
   var status = _ref.status,
       isMe = _ref.isMe,
       instance = _ref.instance,
+      email = _ref.email,
+      name = _ref.name,
       typographyProps = _ref.typographyProps;
 
   var _useI18n = useI18n(),
@@ -18,29 +17,33 @@ var MemberRecipientStatus = function MemberRecipientStatus(_ref) {
 
   var isSendingEmail = !isMe && status === 'mail-not-sent';
   var isReady = isMe || status === 'ready' || status === 'owner';
-  var text, icon;
+  var text;
 
   if (isReady) {
-    text = instance;
-    icon = ToTheCloudIcon;
+    // Hide the email when the parent already uses it as the primary text
+    // (getDisplayName falls back to email when the recipient has no name).
+    // Keep the instance visible when there is no email at all, so the user
+    // can still tell the recipient lives on a different Cozy instance.
+    text = isMe || name || !email ? email || instance : '';
   } else if (isSendingEmail) {
     text = t('Share.status.mail-not-sent');
-    icon = PaperplaneIcon;
   } else {
     var supportedStatus = ['pending', 'seen'];
     text = supportedStatus.includes(status) ? t("Share.status.".concat(status)) : t('Share.status.pending');
-    icon = status === 'seen' ? EyeIcon : PaperplaneIcon;
   }
 
-  return /*#__PURE__*/React.createElement("div", {
-    className: "u-flex u-flex-items-center"
-  }, /*#__PURE__*/React.createElement(Icon, {
-    icon: icon,
-    size: 10
-  }), "\xA0", /*#__PURE__*/React.createElement(Typography, _extends({
+  return /*#__PURE__*/React.createElement(Typography, _extends({
     variant: "caption",
     color: "textSecondary"
-  }, typographyProps), text));
+  }, typographyProps), text);
 };
 
+MemberRecipientStatus.propTypes = {
+  status: PropTypes.string,
+  isMe: PropTypes.bool,
+  instance: PropTypes.string,
+  email: PropTypes.string,
+  name: PropTypes.string,
+  typographyProps: PropTypes.object
+};
 export default MemberRecipientStatus;

package/dist/components/Recipient/MemberRecipientStatus.spec.js

@@ -0,0 +1,102 @@
+import { render } from '@testing-library/react';
+import React from 'react';
+import MemberRecipientStatus from './MemberRecipientStatus';
+import AppLike from '../../../test/AppLike';
+describe('MemberRecipientStatus component', function () {
+  var setup = function setup(props) {
+    return render( /*#__PURE__*/React.createElement(AppLike, null, /*#__PURE__*/React.createElement(MemberRecipientStatus, props)));
+  };
+
+  it('should show email when status is ready and recipient has a name', function () {
+    var _setup = setup({
+      status: 'ready',
+      isMe: false,
+      email: 'other@example.com',
+      instance: 'foo.mycozy.cloud',
+      name: 'Other Person'
+    }),
+        getByText = _setup.getByText;
+
+    expect(getByText('other@example.com')).toBeTruthy();
+  });
+  it('should render nothing when recipient has no name and status is ready', function () {
+    var _setup2 = setup({
+      status: 'ready',
+      isMe: false,
+      email: 'other@example.com',
+      instance: 'foo.mycozy.cloud'
+    }),
+        queryByText = _setup2.queryByText;
+
+    expect(queryByText('other@example.com')).toBe(null);
+    expect(queryByText('foo.mycozy.cloud')).toBe(null);
+  });
+  it('should show email when isMe is true regardless of status', function () {
+    var _setup3 = setup({
+      status: 'pending',
+      isMe: true,
+      email: 'me@example.com'
+    }),
+        getByText = _setup3.getByText;
+
+    expect(getByText('me@example.com')).toBeTruthy();
+  });
+  it('should fallback to instance when email is missing and status is ready', function () {
+    var _setup4 = setup({
+      status: 'ready',
+      isMe: false,
+      instance: 'foo.mycozy.cloud'
+    }),
+        getByText = _setup4.getByText;
+
+    expect(getByText('foo.mycozy.cloud')).toBeTruthy();
+  });
+  it('should show email when status is owner, not isMe, and recipient has a name', function () {
+    var _setup5 = setup({
+      status: 'owner',
+      isMe: false,
+      email: 'owner@example.com',
+      instance: 'foo.mycozy.cloud',
+      name: 'Owner Person'
+    }),
+        getByText = _setup5.getByText;
+
+    expect(getByText('owner@example.com')).toBeTruthy();
+  });
+  it('should show "Sending invitation mail..." when status is mail-not-sent and not isMe', function () {
+    var _setup6 = setup({
+      status: 'mail-not-sent',
+      isMe: false
+    }),
+        getByText = _setup6.getByText;
+
+    expect(getByText('Sending invitation mail...')).toBeTruthy();
+  });
+  it('should show "Invitation sent" when status is pending', function () {
+    var _setup7 = setup({
+      status: 'pending',
+      isMe: false
+    }),
+        getByText = _setup7.getByText;
+
+    expect(getByText('Invitation sent')).toBeTruthy();
+  });
+  it('should show "Invitation seen" when status is seen', function () {
+    var _setup8 = setup({
+      status: 'seen',
+      isMe: false
+    }),
+        getByText = _setup8.getByText;
+
+    expect(getByText('Invitation seen')).toBeTruthy();
+  });
+  it('should fallback to "Invitation sent" for unknown status', function () {
+    var _setup9 = setup({
+      status: 'unknown-status',
+      isMe: false
+    }),
+        getByText = _setup9.getByText;
+
+    expect(getByText('Invitation sent')).toBeTruthy();
+  });
+});

package/dist/state.js

@@ -415,6 +415,21 @@ export var isSharedDrive = function isSharedDrive(state, docId) {
 
   return false;
 };
+export var isOrgSharedDrive = function isOrgSharedDrive(state, docId) {
+  if (state.byDocId[docId] && state.byDocId[docId].sharings.length !== 0) {
+    var sharing = getSharingById(state, state.byDocId[docId].sharings[0]);
+    return sharing.attributes.drive === true && sharing.attributes.org_drive === true;
+  }
+
+  return false;
+};
+export var canLeave = function canLeave(state, docId) {
+  if (isOrgSharedDrive(state, docId)) {
+    return false;
+  }
+
+  return true;
+};
 export var canReshare = function canReshare(state, docId, instanceUri) {
   var sharing = getDocumentSharing(state, docId);
   var me = sharing.attributes.members.find(matchingInstanceName(instanceUri));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "33.4.3",
+  "version": "33.5.1",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -83,5 +83,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "832c42dbcfdc5db673a0b225163b953031def5de"
+  "gitHead": "15b85b5aef628416e919342a040ec758783473f0"
 }

package/src/SharingProvider.jsx

@@ -28,6 +28,8 @@ import reducer, {
   receivePaths,
   isOwner,
   isSharedDrive,
+  isOrgSharedDrive,
+  canLeave,
   canReshare,
   getOwner,
   getRecipients,
@@ -66,6 +68,8 @@ export class SharingProvider extends Component {
       documentType,
       isOwner: docId => isOwner(this.state, docId),
       isSharedDrive: docId => isSharedDrive(this.state, docId),
+      isOrgSharedDrive: docId => isOrgSharedDrive(this.state, docId),
+      canLeave: docId => canLeave(this.state, docId),
       canReshare: docId => canReshare(this.state, docId, instanceUri),
       getOwner: docId => getOwner(this.state, docId),
       getSharingType: docId => getSharingType(this.state, docId, instanceUri),

package/src/components/Recipient/GroupRecipientDetailWithAccess.jsx

@@ -38,6 +38,8 @@ const GroupRecipientDetailWithAccess = ({ withAccess }) => {
                     status={recipient.status}
                     isMe={isMe}
                     instance={recipient.instance}
+                    email={recipient.email}
+                    name={recipient.name || recipient.public_name}
                   />
                 }
               />

package/src/components/Recipient/MemberRecipient.jsx

@@ -66,6 +66,8 @@ const MemberRecipient = props => {
               status={status}
               isMe={isMe}
               instance={instance}
+              email={rest.email}
+              name={rest.name || rest.public_name}
             />
           }
         />

package/src/components/Recipient/MemberRecipientLite.jsx

@@ -38,6 +38,8 @@ const MemberRecipientLite = ({ recipient, isOwner, ...props }) => {
             status={recipient.status}
             isMe={isMe}
             instance={recipient.instance}
+            email={recipient.email}
+            name={recipient.name || recipient.public_name}
             typographyProps={{ noWrap: true }}
           />
         }

package/src/components/Recipient/MemberRecipientStatus.jsx

@@ -1,42 +1,51 @@
+import PropTypes from 'prop-types'
 import React from 'react'
 
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import EyeIcon from 'cozy-ui/transpiled/react/Icons/Eye'
-import PaperplaneIcon from 'cozy-ui/transpiled/react/Icons/Paperplane'
-import ToTheCloudIcon from 'cozy-ui/transpiled/react/Icons/ToTheCloud'
 import Typography from 'cozy-ui/transpiled/react/Typography'
 import { useI18n } from 'twake-i18n'
 
-const MemberRecipientStatus = ({ status, isMe, instance, typographyProps }) => {
+const MemberRecipientStatus = ({
+  status,
+  isMe,
+  instance,
+  email,
+  name,
+  typographyProps
+}) => {
   const { t } = useI18n()
 
   const isSendingEmail = !isMe && status === 'mail-not-sent'
   const isReady = isMe || status === 'ready' || status === 'owner'
-  let text, icon
+  let text
   if (isReady) {
-    text = instance
-    icon = ToTheCloudIcon
+    // Hide the email when the parent already uses it as the primary text
+    // (getDisplayName falls back to email when the recipient has no name).
+    // Keep the instance visible when there is no email at all, so the user
+    // can still tell the recipient lives on a different Cozy instance.
+    text = isMe || name || !email ? email || instance : ''
   } else if (isSendingEmail) {
     text = t('Share.status.mail-not-sent')
-    icon = PaperplaneIcon
   } else {
     const supportedStatus = ['pending', 'seen']
     text = supportedStatus.includes(status)
       ? t(`Share.status.${status}`)
       : t('Share.status.pending')
-
-    icon = status === 'seen' ? EyeIcon : PaperplaneIcon
   }
 
   return (
-    <div className="u-flex u-flex-items-center">
-      <Icon icon={icon} size={10} />
-      &nbsp;
-      <Typography variant="caption" color="textSecondary" {...typographyProps}>
-        {text}
-      </Typography>
-    </div>
+    <Typography variant="caption" color="textSecondary" {...typographyProps}>
+      {text}
+    </Typography>
   )
 }
 
+MemberRecipientStatus.propTypes = {
+  status: PropTypes.string,
+  isMe: PropTypes.bool,
+  instance: PropTypes.string,
+  email: PropTypes.string,
+  name: PropTypes.string,
+  typographyProps: PropTypes.object
+}
+
 export default MemberRecipientStatus

package/src/components/Recipient/MemberRecipientStatus.spec.jsx

@@ -0,0 +1,97 @@
+import { render } from '@testing-library/react'
+import React from 'react'
+
+import MemberRecipientStatus from './MemberRecipientStatus'
+import AppLike from '../../../test/AppLike'
+
+describe('MemberRecipientStatus component', () => {
+  const setup = props =>
+    render(
+      <AppLike>
+        <MemberRecipientStatus {...props} />
+      </AppLike>
+    )
+
+  it('should show email when status is ready and recipient has a name', () => {
+    const { getByText } = setup({
+      status: 'ready',
+      isMe: false,
+      email: 'other@example.com',
+      instance: 'foo.mycozy.cloud',
+      name: 'Other Person'
+    })
+    expect(getByText('other@example.com')).toBeTruthy()
+  })
+
+  it('should render nothing when recipient has no name and status is ready', () => {
+    const { queryByText } = setup({
+      status: 'ready',
+      isMe: false,
+      email: 'other@example.com',
+      instance: 'foo.mycozy.cloud'
+    })
+    expect(queryByText('other@example.com')).toBe(null)
+    expect(queryByText('foo.mycozy.cloud')).toBe(null)
+  })
+
+  it('should show email when isMe is true regardless of status', () => {
+    const { getByText } = setup({
+      status: 'pending',
+      isMe: true,
+      email: 'me@example.com'
+    })
+    expect(getByText('me@example.com')).toBeTruthy()
+  })
+
+  it('should fallback to instance when email is missing and status is ready', () => {
+    const { getByText } = setup({
+      status: 'ready',
+      isMe: false,
+      instance: 'foo.mycozy.cloud'
+    })
+    expect(getByText('foo.mycozy.cloud')).toBeTruthy()
+  })
+
+  it('should show email when status is owner, not isMe, and recipient has a name', () => {
+    const { getByText } = setup({
+      status: 'owner',
+      isMe: false,
+      email: 'owner@example.com',
+      instance: 'foo.mycozy.cloud',
+      name: 'Owner Person'
+    })
+    expect(getByText('owner@example.com')).toBeTruthy()
+  })
+
+  it('should show "Sending invitation mail..." when status is mail-not-sent and not isMe', () => {
+    const { getByText } = setup({
+      status: 'mail-not-sent',
+      isMe: false
+    })
+    expect(getByText('Sending invitation mail...')).toBeTruthy()
+  })
+
+  it('should show "Invitation sent" when status is pending', () => {
+    const { getByText } = setup({
+      status: 'pending',
+      isMe: false
+    })
+    expect(getByText('Invitation sent')).toBeTruthy()
+  })
+
+  it('should show "Invitation seen" when status is seen', () => {
+    const { getByText } = setup({
+      status: 'seen',
+      isMe: false
+    })
+    expect(getByText('Invitation seen')).toBeTruthy()
+  })
+
+  it('should fallback to "Invitation sent" for unknown status', () => {
+    const { getByText } = setup({
+      status: 'unknown-status',
+      isMe: false
+    })
+    expect(getByText('Invitation sent')).toBeTruthy()
+  })
+})

package/src/state.js

@@ -329,6 +329,24 @@ export const isSharedDrive = (state, docId) => {
   return false
 }
 
+export const isOrgSharedDrive = (state, docId) => {
+  if (state.byDocId[docId] && state.byDocId[docId].sharings.length !== 0) {
+    const sharing = getSharingById(state, state.byDocId[docId].sharings[0])
+
+    return (
+      sharing.attributes.drive === true && sharing.attributes.org_drive === true
+    )
+  }
+  return false
+}
+
+export const canLeave = (state, docId) => {
+  if (isOrgSharedDrive(state, docId)) {
+    return false
+  }
+  return true
+}
+
 export const canReshare = (state, docId, instanceUri) => {
   const sharing = getDocumentSharing(state, docId)
   const me = sharing.attributes.members.find(matchingInstanceName(instanceUri))