cozy-sharing 12.3.0 → 13.1.0

package/dist/components/ShareRecipientsInput.spec.js

@@ -2,7 +2,18 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { render, screen } from '@testing-library/react';
 import React from 'react';
+import { createMockClient } from 'cozy-client';
+import flag from 'cozy-flags';
 import ShareRecipientsInput from './ShareRecipientsInput';
+import AppLike from './SharingBanner/test/AppLike';
+jest.mock('cozy-flags', function () {
+  return {
+    __esModule: true,
+    default: jest.fn(function () {
+      return null;
+    })
+  };
+});
 jest.mock('./ShareAutosuggest', function () {
   return {
     __esModule: true,
@@ -16,7 +27,7 @@ jest.mock('./ShareAutosuggest', function () {
         } else {
           return /*#__PURE__*/React.createElement("li", {
             key: contactOrGroup.id
-          }, contactOrGroup.name);
+          }, contactOrGroup.name, " - ", contactOrGroup.members.length, " members");
         }
       }));
     }
@@ -25,14 +36,31 @@ jest.mock('./ShareAutosuggest', function () {
 describe('ShareRecipientsInput component', function () {
   var setup = function setup(_ref2) {
     var contacts = _ref2.contacts,
-        contactGroups = _ref2.contactGroups;
-    render( /*#__PURE__*/React.createElement(ShareRecipientsInput, {
-      contacts: contacts,
-      contactGroups: contactGroups,
+        contactGroups = _ref2.contactGroups,
+        unreachableContact = _ref2.unreachableContact;
+    var mockClient = createMockClient({
+      queries: {
+        'io.cozy.contacts/reachable': {
+          doctype: 'io.cozy.contacts',
+          data: contacts
+        },
+        'io.cozy.contacts.groups/by-ids/fe86af20-c6c5': {
+          doctype: 'io.cozy.contacts.groups',
+          data: contactGroups
+        },
+        'io.cozy.contacts/unreachable-with-groups': {
+          doctype: 'io.cozy.contacts',
+          data: unreachableContact
+        }
+      }
+    });
+    render( /*#__PURE__*/React.createElement(AppLike, {
+      client: mockClient
+    }, /*#__PURE__*/React.createElement(ShareRecipientsInput, {
       onPick: function onPick() {},
       onRemove: function onRemove() {},
       placeholder: "Enter recipients here"
-    }));
+    })));
   };
 
   it('should include groups and contacts when are loaded', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -40,54 +68,44 @@ describe('ShareRecipientsInput component', function () {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          contacts = {
-            id: 'contacts',
-            fetchStatus: 'loaded',
-            hasMore: false,
-            data: [{
-              id: 'df563cc4-6440',
-              _id: 'df563cc4-6440',
-              _type: 'io.cozy.contacts',
-              name: {
-                givenName: 'Michale',
-                familyName: 'Russel'
-              }
-            }, {
-              id: '5a3b4ccf-c257',
-              _id: '5a3b4ccf-c257',
-              _type: 'io.cozy.contacts',
-              name: {
-                givenName: 'Teagan',
-                familyName: 'Wolf'
-              },
-              relationships: {
-                groups: {
-                  data: [{
-                    _id: 'fe86af20-c6c5',
-                    _type: 'io.cozy.contacts.groups'
-                  }]
-                }
+          contacts = [{
+            id: 'df563cc4-6440',
+            _id: 'df563cc4-6440',
+            _type: 'io.cozy.contacts',
+            name: {
+              givenName: 'Michale',
+              familyName: 'Russel'
+            }
+          }, {
+            id: '5a3b4ccf-c257',
+            _id: '5a3b4ccf-c257',
+            _type: 'io.cozy.contacts',
+            name: {
+              givenName: 'Teagan',
+              familyName: 'Wolf'
+            },
+            relationships: {
+              groups: {
+                data: [{
+                  _id: 'fe86af20-c6c5',
+                  _type: 'io.cozy.contacts.groups'
+                }]
               }
-            }]
-          };
-          contactGroups = {
-            id: 'groups',
-            fetchStatus: 'loaded',
-            hasMore: false,
-            data: [{
-              id: 'fe86af20-c6c5',
-              name: "The Night's Watch",
-              _id: 'fe86af20-c6c5',
-              _type: 'io.cozy.contacts.groups'
-            }]
-          };
+            }
+          }];
+          contactGroups = [{
+            id: 'fe86af20-c6c5',
+            name: "The Night's Watch",
+            _id: 'fe86af20-c6c5',
+            _type: 'io.cozy.contacts.groups'
+          }];
           setup({
             contacts: contacts,
             contactGroups: contactGroups
           });
           expect(screen.getByText('Michale Russel')).toBeInTheDocument();
           expect(screen.getByText('Teagan Wolf')).toBeInTheDocument();
-          expect(screen.getByText("The Night's Watch")).toBeInTheDocument();
+          expect(screen.getByText("The Night's Watch - 1 members")).toBeInTheDocument();
 
         case 6:
         case "end":
@@ -95,116 +113,76 @@ describe('ShareRecipientsInput component', function () {
       }
     }, _callee);
   })));
-  it('should include groups only if all contacts are loaded', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-    var contacts, contactGroups;
+  it('should include unreachable members when flag sharing.show-recipient-groups is activated', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var contacts, contactGroups, unreachableContact;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          contacts = {
-            id: 'contacts',
-            fetchStatus: 'loading',
-            hasMore: false,
-            data: [{
-              id: 'df563cc4-6440',
-              _id: 'df563cc4-6440',
-              _type: 'io.cozy.contacts',
-              name: {
-                givenName: 'Michale',
-                familyName: 'Russel'
+          flag.mockReturnValue(true);
+          contacts = [{
+            id: 'df563cc4-6440',
+            _id: 'df563cc4-6440',
+            _type: 'io.cozy.contacts',
+            name: {
+              givenName: 'Michale',
+              familyName: 'Russel'
+            }
+          }, {
+            id: '5a3b4ccf-c257',
+            _id: '5a3b4ccf-c257',
+            _type: 'io.cozy.contacts',
+            name: {
+              givenName: 'Teagan',
+              familyName: 'Wolf'
+            },
+            relationships: {
+              groups: {
+                data: [{
+                  _id: 'fe86af20-c6c5',
+                  _type: 'io.cozy.contacts.groups'
+                }]
               }
-            }, {
-              id: '5a3b4ccf-c257',
-              _id: '5a3b4ccf-c257',
-              _type: 'io.cozy.contacts',
-              name: {
-                givenName: 'Teagan',
-                familyName: 'Wolf'
-              },
-              relationships: {
-                groups: {
-                  data: [{
-                    _id: 'fe86af20-c6c5',
-                    _type: 'io.cozy.contacts.groups'
-                  }]
-                }
+            }
+          }];
+          contactGroups = [{
+            id: 'fe86af20-c6c5',
+            name: "The Night's Watch",
+            _id: 'fe86af20-c6c5',
+            _type: 'io.cozy.contacts.groups'
+          }];
+          unreachableContact = [{
+            id: 'df532cc4-6560',
+            _id: 'df532cc4-6560',
+            _type: 'io.cozy.contacts',
+            name: {
+              givenName: 'Tony',
+              familyName: 'Stark'
+            },
+            relationships: {
+              groups: {
+                data: [{
+                  _id: 'fe86af20-c6c5',
+                  _type: 'io.cozy.contacts.groups'
+                }]
               }
-            }]
-          };
-          contactGroups = {
-            id: 'groups',
-            fetchStatus: 'loaded',
-            hasMore: false,
-            data: [{
-              id: 'fe86af20-c6c5',
-              name: "The Night's Watch",
-              _id: 'fe86af20-c6c5',
-              _type: 'io.cozy.contacts.groups'
-            }]
-          };
+            }
+          }];
           setup({
             contacts: contacts,
-            contactGroups: contactGroups
+            contactGroups: contactGroups,
+            unreachableContact: unreachableContact
           });
           expect(screen.getByText('Michale Russel')).toBeInTheDocument();
-          expect(screen.getByText('Teagan Wolf')).toBeInTheDocument();
-          expect(screen.queryByText("The Night's Watch")).toBeNull();
+          expect(screen.getByText('Teagan Wolf')).toBeInTheDocument(); // 3 members because cozy-client replay the query with the new data
+          // so the unreachableContact is added to the reachable contact query
+          // TODO: improve createMockClient to handle this case
 
-        case 6:
+          expect(screen.getByText("The Night's Watch - 3 members")).toBeInTheDocument();
+
+        case 8:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
   })));
-  it('should include groups only if they have more than one member', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-    var contacts, contactGroups;
-    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          contacts = {
-            id: 'contacts',
-            fetchStatus: 'loaded',
-            hasMore: false,
-            data: [{
-              id: 'df563cc4-6440',
-              _id: 'df563cc4-6440',
-              _type: 'io.cozy.contacts',
-              name: {
-                givenName: 'Michale',
-                familyName: 'Russel'
-              }
-            }, {
-              id: '5a3b4ccf-c257',
-              _id: '5a3b4ccf-c257',
-              _type: 'io.cozy.contacts',
-              name: {
-                givenName: 'Teagan',
-                familyName: 'Wolf'
-              }
-            }]
-          };
-          contactGroups = {
-            id: 'groups',
-            fetchStatus: 'loaded',
-            hasMore: false,
-            data: [{
-              id: 'fe86af20-c6c5',
-              name: "The Night's Watch",
-              _id: 'fe86af20-c6c5',
-              _type: 'io.cozy.contacts.groups'
-            }]
-          };
-          setup({
-            contacts: contacts,
-            contactGroups: contactGroups
-          });
-          expect(screen.getByText('Michale Russel')).toBeInTheDocument();
-          expect(screen.getByText('Teagan Wolf')).toBeInTheDocument();
-          expect(screen.queryByText("The Night's Watch")).toBeNull();
-
-        case 6:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  })));
 });

package/dist/helpers/contacts.js

@@ -91,4 +91,15 @@ export var getOrCreateFromArray = /*#__PURE__*/function () {
   return function getOrCreateFromArray(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
-}();
+}();
+export var getContactsFromGroupId = function getContactsFromGroupId() {
+  var contacts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var groupId = arguments.length > 1 ? arguments[1] : undefined;
+  return contacts.filter(function (contact) {
+    var _contact$relationship;
+
+    return (_contact$relationship = contact.relationships) === null || _contact$relationship === void 0 || (_contact$relationship = _contact$relationship.groups) === null || _contact$relationship === void 0 || (_contact$relationship = _contact$relationship.data) === null || _contact$relationship === void 0 ? void 0 : _contact$relationship.some(function (group) {
+      return group._id === groupId;
+    });
+  });
+};

package/dist/helpers/recipients.js

@@ -5,9 +5,9 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import get from 'lodash/get';
 import flag from 'cozy-flags';
 import { Group } from '../models';
+export var DEFAULT_DISPLAY_NAME = 'Share.contacts.defaultDisplayName';
 export var filterAndReworkRecipients = function filterAndReworkRecipients(recipients, previousRecipients) {
   return recipients.filter(function (recipient) {
     return recipient.status !== 'owner';
@@ -56,23 +56,18 @@ export var hasReachRecipientsLimit = function hasReachRecipientsLimit(current, n
 };
 /**
  * Merges the recipients list with a new recipient and their associated contacts.
+ * Only used when flag sharing.show-recipient-groups is not enabled.
  * @param {object[]} recipients - The list of recipients.
  * @param {object} recipient - The new recipient.
  * @param {object[]} contacts - The list of contacts.
  * @returns {object[]} - The merged recipients list.
  */
 
-export var spreadGroupAndMergeRecipients = function spreadGroupAndMergeRecipients(recipients, newRecipient, contacts) {
+export var spreadGroupAndMergeRecipients = function spreadGroupAndMergeRecipients(recipients, newRecipient) {
   var contactsToAdd;
 
   if (newRecipient._type === Group.doctype) {
-    var groupId = newRecipient.id;
-    contactsToAdd = contacts.data.filter(function (contact) {
-      var contactGroupIds = get(contact, 'relationships.groups.data', []).map(function (group) {
-        return group._id;
-      });
-      return contactGroupIds.includes(groupId);
-    });
+    contactsToAdd = newRecipient.members;
   } else {
     contactsToAdd = [newRecipient];
   }
@@ -88,4 +83,16 @@ export var spreadGroupAndMergeRecipients = function spreadGroupAndMergeRecipient
 };
 export var mergeRecipients = function mergeRecipients(recipients, newRecipient) {
   return [].concat(_toConsumableArray(recipients), [newRecipient]);
+};
+export var getGroupRecipientSecondaryText = function getGroupRecipientSecondaryText(_ref) {
+  var nbMember = _ref.nbMember,
+      nbMemberReady = _ref.nbMemberReady,
+      t = _ref.t,
+      isUserInsideMembers = _ref.isUserInsideMembers;
+  var memberCount = nbMember === nbMemberReady ? nbMember : [nbMemberReady, nbMember].join('/');
+  var secondary = t('GroupRecipient.secondary', {
+    memberCount: memberCount,
+    smart_count: nbMember
+  });
+  return secondary + (isUserInsideMembers ? " (".concat(t('GroupRecipient.secondary_you'), ")") : '');
 };

package/dist/helpers/successMessage.js

@@ -1,36 +1,78 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 import { models } from 'cozy-client';
-import { Contact } from '../models';
+import { Contact, Group } from '../models';
 export var countNewRecipients = function countNewRecipients(currentRecipients, newRecipients) {
-  return newRecipients.filter(function (contact) {
-    var email = models.contact.getPrimaryEmail(contact);
-    var cozyUrl = models.contact.getPrimaryCozy(contact);
-    return !currentRecipients.find(function (r) {
-      return email && r.email && r.email === email || cozyUrl && r.instance && r.instance === cozyUrl;
-    });
-  }).length;
+  var newRecipientsNotAlreadyIncluded = newRecipients.filter(function (recipient) {
+    if (Contact.isContact(recipient)) {
+      var email = models.contact.getPrimaryEmail(recipient);
+      var cozyUrl = models.contact.getPrimaryCozy(recipient);
+      return !currentRecipients.find(function (r) {
+        return email && r.email && r.email === email || cozyUrl && r.instance && r.instance === cozyUrl;
+      });
+    }
+
+    return true;
+  });
+  return newRecipientsNotAlreadyIncluded.reduce(function (acc, recipient) {
+    if (recipient._type === Group.doctype) {
+      return _objectSpread(_objectSpread({}, acc), {}, {
+        group: acc.group + 1
+      });
+    } else {
+      return _objectSpread(_objectSpread({}, acc), {}, {
+        contact: acc.contact + 1
+      });
+    }
+  }, {
+    group: 0,
+    contact: 0
+  });
 };
 export var getSuccessMessage = function getSuccessMessage(recipientsBefore, recipientsAfter, documentType) {
   if (recipientsAfter.length === 1) {
     var recipient = recipientsAfter[0];
     var email = Contact.isContact(recipient) ? models.contact.getPrimaryEmail(recipient) : recipient.email;
     var cozyUrl = models.contact.getPrimaryCozy(recipient);
+    var isContactGroup = recipient._type === Group.doctype;
 
-    if (email) {
-      return ["".concat(documentType, ".share.shareByEmail.success"), {
+    if (isContactGroup) {
+      return ["".concat(documentType, ".share.shareByEmail.singleGroupSuccess"), {
+        groupName: recipient.name
+      }];
+    } else if (email) {
+      return ["".concat(documentType, ".share.shareByEmail.singleContactSuccess"), {
         email: email
       }];
     } else if (cozyUrl) {
-      return ["".concat(documentType, ".share.shareByEmail.success"), {
+      return ["".concat(documentType, ".share.shareByEmail.singleContactSuccess"), {
         email: cozyUrl
       }];
     } else {
-      return ["".concat(documentType, ".share.shareByEmail.genericSuccess"), {
-        count: 1
+      return ["".concat(documentType, ".share.shareByEmail.contactSuccess"), {
+        smart_count: 1
       }];
     }
   } else {
-    return ["".concat(documentType, ".share.shareByEmail.genericSuccess"), {
-      count: countNewRecipients(recipientsBefore, recipientsAfter)
-    }];
+    var count = countNewRecipients(recipientsBefore, recipientsAfter);
+
+    if (count.contact > 0 && count.group > 0) {
+      return ["".concat(documentType, ".share.shareByEmail.contactAndGroupSuccess"), {
+        nbContact: count.contact,
+        nbGroup: count.group
+      }];
+    } else if (count.group > 0) {
+      return ["".concat(documentType, ".share.shareByEmail.groupSuccess"), {
+        smart_count: count.group
+      }];
+    } else {
+      return ["".concat(documentType, ".share.shareByEmail.contactSuccess"), {
+        smart_count: count.contact
+      }];
+    }
   }
 };