cozy-sharing 13.0.0 → 13.1.0

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.
 
+# [13.1.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@13.0.0...cozy-sharing@13.1.0) (2024-04-09)
+
+
+### Bug Fixes
+
+* Resetting sharing rights after a share ([5f3ebaa](https://github.com/cozy/cozy-libs/commit/5f3ebaa4b220655c97f07fa6918f2be830568fb5))
+
+
+### Features
+
+* Alert if group shared with members already in it with other rights ([786b1a0](https://github.com/cozy/cozy-libs/commit/786b1a08d9f30db3126e6d1b77c14f25b0f129a5))
+* Hide groups when they are already shared ([f64ee06](https://github.com/cozy/cozy-libs/commit/f64ee06637c0f74b776cde72bdea9ae693c26638))
+
+
+
+
+
 # [13.0.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@12.3.0...cozy-sharing@13.0.0) (2024-04-08)
 
 

package/dist/components/ShareByEmail.js

@@ -6,7 +6,6 @@ import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import { useClient } from 'cozy-client';
 import flag from 'cozy-flags';
-import Alerter from 'cozy-ui/transpiled/react/deprecated/Alerter';
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert';
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import ShareRecipientsInput from './ShareRecipientsInput';
@@ -66,7 +65,7 @@ export var ShareByEmail = function ShareByEmail(_ref) {
       loading = _useState4[0],
       setLoading = _useState4[1];
 
-  var _useState5 = useState(),
+  var _useState5 = useState('readWrite'),
       _useState6 = _slicedToArray(_useState5, 2),
       selectedOption = _useState6[0],
       setSelectedOption = _useState6[1];
@@ -77,6 +76,7 @@ export var ShareByEmail = function ShareByEmail(_ref) {
       setRecipientsLimit = _useState8[1];
 
   var reset = function reset() {
+    setSelectedOption('readWrite');
     setRecipients([]);
     setLoading(false);
   };
@@ -99,7 +99,7 @@ export var ShareByEmail = function ShareByEmail(_ref) {
 
   var share = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var recipientsBefore, contacts, readWriteRecipients, readOnlyRecipients;
+      var recipientsBefore, contacts, readWriteRecipients, readOnlyRecipients, showGenericAlert, detail, sharingRights;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -155,22 +155,54 @@ export var ShareByEmail = function ShareByEmail(_ref) {
               severity: 'success',
               variant: 'filled'
             });
-            reset();
             _context.next = 25;
             break;
 
-          case 20:
-            _context.prev = 20;
+          case 19:
+            _context.prev = 19;
             _context.t0 = _context["catch"](7);
-            Alerter.error('Error.generic');
-            reset();
+            showGenericAlert = true;
+
+            if (_context.t0.name === 'FetchError' && _context.t0.status === 400) {
+              detail = JSON.parse(_context.t0.message).errors[0].detail;
+
+              if (detail.startsWith('A group member cannot be added as they are already in')) {
+                // To know the sharing rights of the other group
+                sharingRights = selectedOption === 'readOnly' ? 'readWrite' : 'readOnly';
+                showAlert({
+                  message: t('Share.errors.groupMemberAlreadyInSharing', {
+                    smart_count: recipients.length,
+                    groupName: recipients[0].name,
+                    sharingRights: t("Share.errors.sharingRights.".concat(sharingRights)),
+                    icon: false
+                  }),
+                  severity: 'error',
+                  variant: 'filled'
+                });
+                showGenericAlert = false;
+              }
+            }
+
+            if (showGenericAlert) {
+              showAlert({
+                message: t("".concat(documentType, ".share.error.generic")),
+                severity: 'error',
+                variant: 'filled'
+              });
+            }
+
             throw _context.t0;
 
           case 25:
+            _context.prev = 25;
+            reset();
+            return _context.finish(25);
+
+          case 28:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[7, 20]]);
+      }, _callee, null, [[7, 19, 25, 28]]);
     }));
 
     return function share() {
@@ -208,10 +240,12 @@ export var ShareByEmail = function ShareByEmail(_ref) {
     onRemove: function onRemove(recipient) {
       return onRecipientRemove(recipient);
     },
+    currentRecipients: currentRecipients,
     recipients: recipients
   })), showShareControl && /*#__PURE__*/React.createElement("div", {
     className: styles['share-type-control']
   }, /*#__PURE__*/React.createElement(ShareTypeSelect, {
+    value: selectedOption,
     options: getSharingOptions(),
     onChange: onChange
   }), /*#__PURE__*/React.createElement(ShareSubmit, {

package/dist/components/ShareRecipientsInput.js

@@ -19,7 +19,8 @@ import { buildReachableContactsQuery, buildContactGroupsByIdsQuery, buildUnreach
  */
 
 var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
-  var recipients = _ref.recipients,
+  var currentRecipients = _ref.currentRecipients,
+      recipients = _ref.recipients,
       placeholder = _ref.placeholder,
       onPick = _ref.onPick,
       onRemove = _ref.onRemove;
@@ -38,7 +39,14 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
   }))));
   var contactGroupsByIdsResult = useQueryAll(contactGroupsByIdsQuery.definition, contactGroupsByIdsQuery.options);
   var isLoading = isQueryLoading(reachableContactsResult) || reachableContactsResult.hasMore || isQueryLoading(contactGroupsByIdsResult) || contactGroupsByIdsResult.hasMore || flag('sharing.show-recipient-groups') && (isQueryLoading(unreachableContactsWithGroupsResult) || unreachableContactsWithGroupsResult.hasMore);
-  var contactGroups = (contactGroupsByIdsResult.data || []).map(function (contactGroup) {
+  var currentRecipientGroups = currentRecipients.map(function (_ref2) {
+    var id = _ref2.id;
+    return id;
+  }).filter(Boolean);
+  var contactGroups = (contactGroupsByIdsResult.data || []).filter(function (_ref3) {
+    var _id = _ref3._id;
+    return !flag('sharing.show-recipient-groups') || !currentRecipientGroups.includes(_id);
+  }).map(function (contactGroup) {
     var reachableMembers = getContactsFromGroupId(reachableContactsResult.data, contactGroup.id).map(function (contact) {
       return _objectSpread(_objectSpread({}, contact), {}, {
         isReachable: true
@@ -72,12 +80,14 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
 };
 
 ShareRecipientsInput.propTypes = {
+  currentRecipients: PropTypes.array,
   recipients: PropTypes.array,
   placeholder: PropTypes.string,
   onPick: PropTypes.func.isRequired,
   onRemove: PropTypes.func.isRequired
 };
 ShareRecipientsInput.defaultProps = {
+  currentRecipients: [],
   recipients: []
 };
 export default ShareRecipientsInput;

package/dist/components/ShareRecipientsInput.spec.js

@@ -9,7 +9,9 @@ import AppLike from './SharingBanner/test/AppLike';
 jest.mock('cozy-flags', function () {
   return {
     __esModule: true,
-    default: jest.fn()
+    default: jest.fn(function () {
+      return null;
+    })
   };
 });
 jest.mock('./ShareAutosuggest', function () {

package/locales/en.json

@@ -75,6 +75,15 @@
       "deactivate": "Deactivate link",
       "cancel": "Cancel",
       "confirm": "OK"
+    },
+    "errors": {
+      "errors": {
+        "groupMemberAlreadyInSharing": "%{groupName} members have already been invited with %{sharingRights} rights. It is not possible to invite the same contact twice with different rights. |||| Contacts have already been invited with %{sharingRights} rights. It is not possible to invite the same contact twice with different rights.",
+        "sharingRights": {
+          "readOnly": "read",
+          "readWrite": "write"
+        }
+      }
     }
   },
   "Sharings": {

package/locales/fr.json

@@ -75,6 +75,13 @@
       "deactivate": "Désactiver le lien",
       "cancel": "Annuler",
       "confirm": "OK"
+    },
+    "errors": {
+      "groupMemberAlreadyInSharing": "Des membres de %{groupName} ont déjà été invités avec des droits de %{sharingRights}. Impossible d’inviter 2 fois le même contact avec des droits différents. |||| Des contacts ont déjà été invités avec des droits de %{sharingRights}. Impossible d’inviter 2 fois le même contact avec des droits différents.",
+      "sharingRights": {
+        "readOnly": "lecture",
+        "readWrite": "modification"
+      }
     }
   },
   "Sharings": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -71,5 +71,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "ba86f000e46844edb26e07edec601bc7669fcda9"
+  "gitHead": "2adcaf791db8f6760bd6e0067068ca2e92d8bb6a"
 }

package/src/components/ShareByEmail.jsx

@@ -3,7 +3,6 @@ import React, { useState } from 'react'
 
 import { useClient } from 'cozy-client'
 import flag from 'cozy-flags'
-import Alerter from 'cozy-ui/transpiled/react/deprecated/Alerter'
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
@@ -36,10 +35,11 @@ export const ShareByEmail = ({
 
   const [recipients, setRecipients] = useState([])
   const [loading, setLoading] = useState(false)
-  const [selectedOption, setSelectedOption] = useState()
+  const [selectedOption, setSelectedOption] = useState('readWrite')
   const [showRecipientsLimit, setRecipientsLimit] = useState(false)
 
   const reset = () => {
+    setSelectedOption('readWrite')
     setRecipients([])
     setLoading(false)
   }
@@ -103,11 +103,43 @@ export const ShareByEmail = ({
         severity: 'success',
         variant: 'filled'
       })
-      reset()
     } catch (err) {
-      Alerter.error('Error.generic')
-      reset()
+      let showGenericAlert = true
+      if (err.name === 'FetchError' && err.status === 400) {
+        const detail = JSON.parse(err.message).errors[0].detail
+        if (
+          detail.startsWith(
+            'A group member cannot be added as they are already in'
+          )
+        ) {
+          // To know the sharing rights of the other group
+          const sharingRights =
+            selectedOption === 'readOnly' ? 'readWrite' : 'readOnly'
+          showAlert({
+            message: t('Share.errors.groupMemberAlreadyInSharing', {
+              smart_count: recipients.length,
+              groupName: recipients[0].name,
+              sharingRights: t(`Share.errors.sharingRights.${sharingRights}`),
+              icon: false
+            }),
+            severity: 'error',
+            variant: 'filled'
+          })
+          showGenericAlert = false
+        }
+      }
+
+      if (showGenericAlert) {
+        showAlert({
+          message: t(`${documentType}.share.error.generic`),
+          severity: 'error',
+          variant: 'filled'
+        })
+      }
+
       throw err
+    } finally {
+      reset()
     }
   }
 
@@ -143,12 +175,17 @@ export const ShareByEmail = ({
           }
           onPick={recipient => onRecipientPick(recipient)}
           onRemove={recipient => onRecipientRemove(recipient)}
+          currentRecipients={currentRecipients}
           recipients={recipients}
         />
       </div>
       {showShareControl && (
         <div className={styles['share-type-control']}>
-          <ShareTypeSelect options={getSharingOptions()} onChange={onChange} />
+          <ShareTypeSelect
+            value={selectedOption}
+            options={getSharingOptions()}
+            onChange={onChange}
+          />
           <ShareSubmit
             label={t(`${documentType}.share.shareByEmail.send`)}
             onSubmit={share}

package/src/components/ShareRecipientsInput.jsx

@@ -18,6 +18,7 @@ import {
  * In order to display the total number of members in each group, we also retrieve the contacts that are not reachable.
  */
 const ShareRecipientsInput = ({
+  currentRecipients,
   recipients,
   placeholder,
   onPick,
@@ -62,8 +63,16 @@ const ShareRecipientsInput = ({
       (isQueryLoading(unreachableContactsWithGroupsResult) ||
         unreachableContactsWithGroupsResult.hasMore))
 
-  const contactGroups = (contactGroupsByIdsResult.data || []).map(
-    contactGroup => {
+  const currentRecipientGroups = currentRecipients
+    .map(({ id }) => id)
+    .filter(Boolean)
+  const contactGroups = (contactGroupsByIdsResult.data || [])
+    .filter(
+      ({ _id }) =>
+        !flag('sharing.show-recipient-groups') ||
+        !currentRecipientGroups.includes(_id)
+    )
+    .map(contactGroup => {
       const reachableMembers = getContactsFromGroupId(
         reachableContactsResult.data,
         contactGroup.id
@@ -91,8 +100,7 @@ const ShareRecipientsInput = ({
         ...contactGroup,
         members: [...reachableMembers, ...unreachableMembers]
       }
-    }
-  )
+    })
 
   const contactsAndGroups = [
     ...(reachableContactsResult.data || []),
@@ -112,6 +120,7 @@ const ShareRecipientsInput = ({
 }
 
 ShareRecipientsInput.propTypes = {
+  currentRecipients: PropTypes.array,
   recipients: PropTypes.array,
   placeholder: PropTypes.string,
   onPick: PropTypes.func.isRequired,
@@ -119,6 +128,7 @@ ShareRecipientsInput.propTypes = {
 }
 
 ShareRecipientsInput.defaultProps = {
+  currentRecipients: [],
   recipients: []
 }
 

package/src/components/ShareRecipientsInput.spec.jsx

@@ -9,7 +9,7 @@ import AppLike from './SharingBanner/test/AppLike'
 
 jest.mock('cozy-flags', () => ({
   __esModule: true,
-  default: jest.fn()
+  default: jest.fn(() => null)
 }))
 
 jest.mock('./ShareAutosuggest', () => ({