cozy-sharing 11.0.1 → 12.0.0

package/dist/components/Recipient/GroupRecipientPermissions.stories.js

@@ -0,0 +1,37 @@
+import { GroupRecipientPermissions } from './GroupRecipientPermissions';
+var meta = {
+  component: GroupRecipientPermissions,
+  args: {
+    onRevoke: function onRevoke() {},
+    onRevokeSelf: function onRevokeSelf() {},
+    type: 'two-way',
+    status: 'ready',
+    groupIndex: 0
+  },
+  argTypes: {
+    status: {
+      control: 'select',
+      options: ['ready', 'mail-not-sent', 'pending', 'seen', 'owner'],
+      defaultValue: 'ready'
+    },
+    type: {
+      control: 'select',
+      options: ['one-way', 'two-way'],
+      defaultValue: 'two-way'
+    }
+  }
+};
+export default meta;
+export var Owner = {
+  name: 'Owner',
+  args: {
+    isOwner: true
+  }
+};
+export var Self = {
+  name: 'Self',
+  args: {
+    isOwner: false,
+    instance: 'http://alice.cozy.localhost:8080'
+  }
+};

package/dist/components/Recipient/MemberRecipient.stories.js

@@ -7,7 +7,10 @@ var meta = {
     status: 'ready',
     recipientConfirmationData: null,
     verifyRecipient: function verifyRecipient() {},
-    fadeIn: true
+    fadeIn: true,
+    type: 'two-way',
+    onRevoke: function onRevoke() {},
+    onRevokeSelf: function onRevokeSelf() {}
   },
   argTypes: {
     status: {
@@ -29,6 +32,13 @@ export var Owner = {
     status: 'owner'
   }
 };
+export var SameInstance = {
+  name: 'SameInstance',
+  args: {
+    isOwner: false,
+    instance: 'http://alice.cozy.localhost:8080'
+  }
+};
 export var RecipientConfirm = {
   name: 'RecipientConfirm',
   args: {

package/dist/components/Recipient/MemberRecipientPermissions.js

@@ -3,15 +3,14 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useRef, useCallback } from 'react';
 import { useClient } from 'cozy-client';
+import ActionsMenu from 'cozy-ui/transpiled/react/ActionsMenu';
+import { makeActions, divider } from 'cozy-ui/transpiled/react/ActionsMenu/Actions';
 import DropdownButton from 'cozy-ui/transpiled/react/DropdownButton';
-import Icon from 'cozy-ui/transpiled/react/Icon';
-import EyeIcon from 'cozy-ui/transpiled/react/Icons/Eye';
-import RenameIcon from 'cozy-ui/transpiled/react/Icons/Rename';
-import TrashIcon from 'cozy-ui/transpiled/react/Icons/Trash';
 import Spinner from 'cozy-ui/transpiled/react/Spinner';
 import Typography from 'cozy-ui/transpiled/react/Typography';
-import ActionMenu, { ActionMenuItem } from 'cozy-ui/transpiled/react/deprecated/ActionMenu';
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
+import { permission } from './actions/permission';
+import { revokeMember } from './actions/revokeMember';
 
 var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
   var isOwner = _ref.isOwner,
@@ -19,12 +18,11 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
       instance = _ref.instance,
       type = _ref.type,
       document = _ref.document,
-      documentType = _ref.documentType,
       className = _ref.className,
       onRevoke = _ref.onRevoke,
       onRevokeSelf = _ref.onRevokeSelf,
       sharingId = _ref.sharingId,
-      index = _ref.index;
+      memberIndex = _ref.memberIndex;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
@@ -40,21 +38,21 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
   var _useState3 = useState(false),
       _useState4 = _slicedToArray(_useState3, 2),
       isMenuDisplayed = _useState4[0],
-      setIsMenuDisplayed = _useState4[1];
+      setMenuDisplayed = _useState4[1];
 
   var instanceMatchesClient = instance !== undefined && instance === client.options.uri;
   var contactIsOwner = status === 'owner';
   var shouldShowMenu = !revoking && !contactIsOwner && (instanceMatchesClient && !isOwner || isOwner);
 
-  var showMenu = function showMenu() {
-    return setIsMenuDisplayed(true);
+  var toggleMenu = function toggleMenu() {
+    return setMenuDisplayed(!isMenuDisplayed);
   };
 
   var hideMenu = function hideMenu() {
-    return setIsMenuDisplayed(false);
+    return setMenuDisplayed(false);
   };
 
-  var onRevokeClick = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var handleRevocation = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -66,7 +64,7 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
           }
 
           _context.next = 4;
-          return onRevoke(document, sharingId, index);
+          return onRevoke(document, sharingId, memberIndex);
 
         case 4:
           _context.next = 8;
@@ -84,41 +82,34 @@ var MemberRecipientPermissions = function MemberRecipientPermissions(_ref) {
           return _context.stop();
       }
     }, _callee);
-  })), [isOwner, onRevoke, onRevokeSelf, document, sharingId, index]);
-  var PermissionIcon = type === 'two-way' ? RenameIcon : EyeIcon;
+  })), [isOwner, onRevoke, onRevokeSelf, document, sharingId, memberIndex]);
+  var actions = makeActions([permission, divider, revokeMember], {
+    t: t,
+    type: type,
+    isOwner: isOwner,
+    handleRevocation: handleRevocation
+  });
   return /*#__PURE__*/React.createElement("div", {
     className: className
   }, revoking && /*#__PURE__*/React.createElement(Spinner, null), !shouldShowMenu && !revoking && /*#__PURE__*/React.createElement(Typography, {
     variant: "body2"
   }, t("Share.status.".concat(status)).toLowerCase()), shouldShowMenu && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DropdownButton, {
-    onClick: showMenu,
     ref: buttonRef,
+    "aria-controls": "simple-menu",
+    "aria-haspopup": "true",
+    onClick: toggleMenu,
     textVariant: "body2"
-  }, t("Share.type.".concat(type)).toLowerCase()), isMenuDisplayed && /*#__PURE__*/React.createElement(ActionMenu, {
-    onClose: hideMenu,
-    popperOptions: {
-      placement: 'bottom-end',
-      strategy: 'fixed'
+  }, t("Share.type.".concat(type)).toLowerCase()), /*#__PURE__*/React.createElement(ActionsMenu, {
+    ref: buttonRef,
+    open: isMenuDisplayed,
+    actions: actions,
+    anchorOrigin: {
+      vertical: 'bottom',
+      horizontal: 'right'
     },
-    anchorElRef: buttonRef
-  }, /*#__PURE__*/React.createElement(ActionMenuItem, {
-    left: /*#__PURE__*/React.createElement(Icon, {
-      icon: PermissionIcon,
-      color: "var(--primaryTextColor)"
-    })
-  }, t("Share.type.".concat(type))), /*#__PURE__*/React.createElement("hr", null), /*#__PURE__*/React.createElement(ActionMenuItem, {
-    onClick: onRevokeClick,
-    left: /*#__PURE__*/React.createElement(Icon, {
-      icon: TrashIcon,
-      color: "var(--errorColor)"
-    })
-  }, /*#__PURE__*/React.createElement(Typography, {
-    className: "u-error",
-    variant: "body1"
-  }, isOwner ? t("".concat(documentType, ".share.revoke.title")) : t("".concat(documentType, ".share.revokeSelf.title"))), /*#__PURE__*/React.createElement(Typography, {
-    variant: "caption",
-    color: "textSecondary"
-  }, isOwner ? t("".concat(documentType, ".share.revoke.desc")) : t("".concat(documentType, ".share.revokeSelf.desc")))))));
+    autoClose: true,
+    onClose: hideMenu
+  })));
 };
 
 export default MemberRecipientPermissions;

package/dist/components/Recipient/MemberRecipientPermissions.stories.js

@@ -1,10 +1,36 @@
 import MemberRecipientPermissions from './MemberRecipientPermissions';
 var meta = {
   component: MemberRecipientPermissions,
-  args: {}
+  args: {
+    onRevoke: function onRevoke() {},
+    onRevokeSelf: function onRevokeSelf() {},
+    type: 'two-way',
+    status: 'ready'
+  },
+  argTypes: {
+    status: {
+      control: 'select',
+      options: ['ready', 'mail-not-sent', 'pending', 'seen', 'owner'],
+      defaultValue: 'ready'
+    },
+    type: {
+      control: 'select',
+      options: ['one-way', 'two-way'],
+      defaultValue: 'two-way'
+    }
+  }
 };
 export default meta;
-export var Default = {
-  name: 'Default',
-  args: {}
+export var Owner = {
+  name: 'Owner',
+  args: {
+    isOwner: true
+  }
+};
+export var Self = {
+  name: 'Self',
+  args: {
+    isOwner: false,
+    instance: 'http://alice.cozy.localhost:8080'
+  }
 };

package/dist/components/Recipient/RecipientList.js

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
+import { GroupRecipient } from './GroupRecipient';
 import MemberRecipient from './MemberRecipient';
 import { usePrevious } from '../../helpers/hooks';
 import { filterAndReworkRecipients } from '../../helpers/recipients';
@@ -19,8 +20,22 @@ var RecipientList = function RecipientList(_ref) {
     var recipientConfirmationData = recipientsToBeConfirmed.find(function (user) {
       return user.email === recipient.email;
     });
+    var isGroupRecipient = recipient.members;
+
+    if (isGroupRecipient) {
+      return /*#__PURE__*/React.createElement(GroupRecipient, _extends({}, recipient, {
+        isOwner: isOwner,
+        key: recipient.index,
+        document: document,
+        documentType: documentType,
+        onRevoke: onRevoke,
+        onRevokeSelf: onRevokeSelf,
+        fadeIn: recipient.hasBeenJustAdded
+      }));
+    }
+
     return /*#__PURE__*/React.createElement(MemberRecipient, _extends({}, recipient, {
-      key: "key_r_".concat(recipient.index),
+      key: recipient.index,
       isOwner: isOwner,
       document: document,
       documentType: documentType,

package/dist/components/Recipient/RecipientList.stories.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { RecipientList } from './RecipientList';
 import { recipients } from '../../../.storybook/fixtures/recipients';
 var meta = {
@@ -23,4 +24,31 @@ export var Owner = {
   args: {
     isOwner: true
   }
+};
+export var WithGroup = {
+  name: 'With group',
+  args: {
+    recipients: [].concat(_toConsumableArray(recipients), [{
+      id: '2c8d4d5abbec5b4606a1ebe01a021dfd',
+      name: 'Famille',
+      addedBy: 0,
+      read_only: false,
+      index: 0,
+      members: [{
+        status: 'pending',
+        email: 'ben@gmail.com',
+        only_in_groups: true,
+        groups: [0],
+        type: 'two-way',
+        index: 1
+      }, {
+        status: 'pending',
+        email: 'bob@gmail.com',
+        only_in_groups: true,
+        groups: [0],
+        type: 'two-way',
+        index: 2
+      }]
+    }])
+  }
 };

package/dist/components/Recipient/actions/permission.js

@@ -0,0 +1,30 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { forwardRef } from 'react';
+import ActionsMenuItem from 'cozy-ui/transpiled/react/ActionsMenu/ActionsMenuItem';
+import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon';
+import ListItemText from 'cozy-ui/transpiled/react/ListItemText';
+import Radios from 'cozy-ui/transpiled/react/Radios';
+
+var permission = function permission(_ref) {
+  var t = _ref.t,
+      type = _ref.type;
+  var title = t("Share.type.".concat(type));
+  return {
+    name: 'permission',
+    label: title,
+    icon: null,
+    action: null,
+    Component: /*#__PURE__*/forwardRef(function RevokeItem(props, ref) {
+      return /*#__PURE__*/React.createElement(ActionsMenuItem, _extends({}, props, {
+        ref: ref,
+        button: false
+      }), /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Radios, {
+        checked: true
+      })), /*#__PURE__*/React.createElement(ListItemText, {
+        primary: title
+      }));
+    })
+  };
+};
+
+export { permission };

package/dist/components/Recipient/actions/revokeGroup.js

@@ -0,0 +1,41 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { forwardRef } from 'react';
+import ActionsMenuItem from 'cozy-ui/transpiled/react/ActionsMenu/ActionsMenuItem';
+import Icon from 'cozy-ui/transpiled/react/Icon';
+import ForbiddenIcon from 'cozy-ui/transpiled/react/Icons/Forbidden';
+import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon';
+import ListItemText from 'cozy-ui/transpiled/react/ListItemText';
+import Typography from 'cozy-ui/transpiled/react/Typography';
+
+var revokeGroup = function revokeGroup(_ref) {
+  var t = _ref.t,
+      isOwner = _ref.isOwner,
+      handleRevocation = _ref.handleRevocation;
+  var revokeType = isOwner ? 'revoke' : 'revokeSelf';
+  var title = t("RevokeGroupItem.".concat(revokeType, ".title"));
+  var desc = t("RevokeGroupItem.".concat(revokeType, ".desc"));
+  var icon = ForbiddenIcon;
+  return {
+    name: 'revokeMember',
+    label: title,
+    icon: icon,
+    action: function action() {
+      handleRevocation();
+    },
+    Component: /*#__PURE__*/forwardRef(function RevokeMemberItem(props, ref) {
+      return /*#__PURE__*/React.createElement(ActionsMenuItem, _extends({}, props, {
+        ref: ref
+      }), /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Icon, {
+        icon: icon,
+        color: "var(--errorColor)"
+      })), /*#__PURE__*/React.createElement(ListItemText, {
+        primary: /*#__PURE__*/React.createElement(Typography, {
+          color: "error"
+        }, title),
+        secondary: desc
+      }));
+    })
+  };
+};
+
+export { revokeGroup };

package/dist/components/Recipient/actions/revokeMember.js

@@ -0,0 +1,41 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { forwardRef } from 'react';
+import ActionsMenuItem from 'cozy-ui/transpiled/react/ActionsMenu/ActionsMenuItem';
+import Icon from 'cozy-ui/transpiled/react/Icon';
+import TrashIcon from 'cozy-ui/transpiled/react/Icons/Trash';
+import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon';
+import ListItemText from 'cozy-ui/transpiled/react/ListItemText';
+import Typography from 'cozy-ui/transpiled/react/Typography';
+
+var revokeMember = function revokeMember(_ref) {
+  var t = _ref.t,
+      isOwner = _ref.isOwner,
+      handleRevocation = _ref.handleRevocation;
+  var revokeType = isOwner ? 'revoke' : 'revokeSelf';
+  var title = t("RevokeMemberItem.".concat(revokeType, ".title"));
+  var desc = t("RevokeMemberItem.".concat(revokeType, ".desc"));
+  var icon = TrashIcon;
+  return {
+    name: 'revokeMember',
+    label: title,
+    icon: icon,
+    action: function action() {
+      handleRevocation();
+    },
+    Component: /*#__PURE__*/forwardRef(function RevokeMemberItem(props, ref) {
+      return /*#__PURE__*/React.createElement(ActionsMenuItem, _extends({}, props, {
+        ref: ref
+      }), /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Icon, {
+        icon: icon,
+        color: "var(--errorColor)"
+      })), /*#__PURE__*/React.createElement(ListItemText, {
+        primary: /*#__PURE__*/React.createElement(Typography, {
+          color: "error"
+        }, title),
+        secondary: desc
+      }));
+    })
+  };
+};
+
+export { revokeMember };

package/dist/components/ShareByEmail.js

@@ -2,10 +2,10 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import get from 'lodash/get';
 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 { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import ShareRecipientsInput from './ShareRecipientsInput';
@@ -13,10 +13,9 @@ import { ShareRecipientsLimitModal } from './ShareRecipientsLimitModal';
 import ShareSubmit from './Sharesubmit';
 import ShareTypeSelect from './Sharetypeselect';
 import { getOrCreateFromArray } from '../helpers/contacts';
-import { hasReachRecipientsLimit } from '../helpers/recipients';
+import { mergeRecipients, spreadGroupAndMergeRecipients, hasReachRecipientsLimit } from '../helpers/recipients';
 import { getSuccessMessage } from '../helpers/successMessage';
-import { Group } from '../models';
-import { contactsResponseType, groupsResponseType } from '../propTypes';
+import { contactsResponseType, contactGroupsResponseType } from '../propTypes';
 import { isReadOnlySharing } from '../state';
 var styles = {
   "share-modal-content": "share__share-modal-content___1iqEq",
@@ -43,7 +42,7 @@ var styles = {
 };
 export var ShareByEmail = function ShareByEmail(_ref) {
   var contacts = _ref.contacts,
-      groups = _ref.groups,
+      contactGroups = _ref.contactGroups,
       document = _ref.document,
       sharingDesc = _ref.sharingDesc,
       onShare = _ref.onShare,
@@ -86,28 +85,8 @@ export var ShareByEmail = function ShareByEmail(_ref) {
   };
 
   var onRecipientPick = function onRecipientPick(recipient) {
-    var contactsToAdd;
-
-    if (recipient._type === Group.doctype) {
-      var groupId = recipient.id;
-      contactsToAdd = contacts.data.filter(function (contact) {
-        var contactGroupIds = get(contact, 'relationships.groups.data', []).map(function (group) {
-          return group._id;
-        });
-        return contactGroupIds.includes(groupId);
-      });
-    } else {
-      contactsToAdd = [recipient];
-    }
-
-    var filtered = contactsToAdd.filter(function (contact) {
-      return contact.email && contact.email.length > 0 || contact.cozy && contact.cozy.length > 0;
-    }).filter(function (contact) {
-      return !recipients.find(function (r) {
-        return r === contact;
-      });
-    });
-    setRecipients([].concat(_toConsumableArray(recipients), _toConsumableArray(filtered)));
+    var mergedRecipients = flag('sharing.show-recipient-groups') ? mergeRecipients(recipients, recipient) : spreadGroupAndMergeRecipients(recipients, recipient, contacts);
+    setRecipients(mergedRecipients);
   };
 
   var onRecipientRemove = function onRecipientRemove(recipient) {
@@ -226,7 +205,7 @@ export var ShareByEmail = function ShareByEmail(_ref) {
       return onRecipientRemove(recipient);
     },
     contacts: contacts,
-    groups: groups,
+    contactGroups: contactGroups,
     recipients: recipients
   })), showShareControl && /*#__PURE__*/React.createElement("div", {
     className: styles['share-type-control']
@@ -248,7 +227,7 @@ export var ShareByEmail = function ShareByEmail(_ref) {
 ShareByEmail.propTypes = {
   currentRecipients: PropTypes.arrayOf(PropTypes.object),
   contacts: contactsResponseType.isRequired,
-  groups: groupsResponseType.isRequired,
+  contactGroups: contactGroupsResponseType.isRequired,
   document: PropTypes.object.isRequired,
   documentType: PropTypes.string.isRequired,
   sharingDesc: PropTypes.string.isRequired,

package/dist/components/ShareByEmail.spec.js

@@ -34,7 +34,7 @@ describe('ShareByEmailComponent', function () {
       contacts: {
         data: []
       },
-      groups: {
+      contactGroups: {
         data: []
       },
       documentType: 'Files',

package/dist/components/ShareDialogCozyToCozy.js

@@ -38,10 +38,10 @@ var styles = {
 
 var SharingContent = function SharingContent(_ref) {
   var contacts = _ref.contacts,
+      contactGroups = _ref.contactGroups,
       createContact = _ref.createContact,
       document = _ref.document,
       documentType = _ref.documentType,
-      groups = _ref.groups,
       hasSharedParent = _ref.hasSharedParent,
       isOwner = _ref.isOwner,
       needsContactsPermission = _ref.needsContactsPermission,
@@ -75,11 +75,11 @@ var SharingContent = function SharingContent(_ref) {
     className: "u-mb-1-half"
   }, t('Share.contacts.whoHasAccess')), showShareByEmail && /*#__PURE__*/React.createElement(DumbShareByEmail, {
     contacts: contacts,
+    contactGroups: contactGroups,
     createContact: createContact,
     currentRecipients: recipients,
     document: document,
     documentType: documentType,
-    groups: groups,
     needsContactsPermission: needsContactsPermission,
     onShare: onShare,
     sharing: sharing,

package/dist/components/ShareDialogCozyToCozy.spec.js

@@ -433,7 +433,7 @@ var getMockProps = function getMockProps() {
       _id: 'SOME_DOCUMENT_ID'
     },
     documentType: 'Organizations',
-    groups: {
+    contactGroups: {
       id: 'groups',
       definition: {
         doctype: 'io.cozy.contacts.groups'

package/dist/components/ShareDialogTwoStepsConfirmationContainer.js

@@ -99,10 +99,10 @@ var RejectRecipientActions = function RejectRecipientActions(_ref3) {
 
 var ShareDialogTwoStepsConfirmationContainer = function ShareDialogTwoStepsConfirmationContainer(_ref4) {
   var contacts = _ref4.contacts,
+      contactGroups = _ref4.contactGroups,
       createContact = _ref4.createContact,
       document = _ref4.document,
       documentType = _ref4.documentType,
-      groups = _ref4.groups,
       hasSharedParent = _ref4.hasSharedParent,
       isOwner = _ref4.isOwner,
       link = _ref4.link,
@@ -241,10 +241,10 @@ var ShareDialogTwoStepsConfirmationContainer = function ShareDialogTwoStepsConfi
   } else if (status === 'sharing') {
     dialogContent = /*#__PURE__*/React.createElement(DialogContentOnShare, {
       contacts: contacts,
+      contactGroups: contactGroups,
       createContact: createContact,
       document: document,
       documentType: documentType,
-      groups: groups,
       hasSharedParent: hasSharedParent,
       isOwner: isOwner,
       needsContactsPermission: needsContactsPermission,

package/dist/components/ShareDialogTwoStepsConfirmationContainer.spec.js

@@ -455,7 +455,7 @@ var getMockProps = function getMockProps() {
       _id: 'SOME_DOCUMENT_ID'
     },
     documentType: 'Organizations',
-    groups: {
+    contactGroups: {
       id: 'groups',
       definition: {
         doctype: 'io.cozy.contacts.groups'