cozy-sharing 12.2.0 → 13.0.0

package/dist/components/ShareByEmail.js

@@ -7,6 +7,7 @@ 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';
 import { ShareRecipientsLimitModal } from './ShareRecipientsLimitModal';
@@ -15,7 +16,6 @@ import ShareTypeSelect from './Sharetypeselect';
 import { getOrCreateFromArray } from '../helpers/contacts';
 import { mergeRecipients, spreadGroupAndMergeRecipients, hasReachRecipientsLimit } from '../helpers/recipients';
 import { getSuccessMessage } from '../helpers/successMessage';
-import { contactsResponseType, contactGroupsResponseType } from '../propTypes';
 import { isReadOnlySharing } from '../state';
 var styles = {
   "share-modal-content": "share__share-modal-content___1iqEq",
@@ -41,9 +41,7 @@ var styles = {
   "share-details-perm-desc": "share__share-details-perm-desc___3HyHu"
 };
 export var ShareByEmail = function ShareByEmail(_ref) {
-  var contacts = _ref.contacts,
-      contactGroups = _ref.contactGroups,
-      document = _ref.document,
+  var document = _ref.document,
       sharingDesc = _ref.sharingDesc,
       onShare = _ref.onShare,
       createContact = _ref.createContact,
@@ -55,6 +53,9 @@ export var ShareByEmail = function ShareByEmail(_ref) {
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
+  var _useAlert = useAlert(),
+      showAlert = _useAlert.showAlert;
+
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
       recipients = _useState2[0],
@@ -85,7 +86,7 @@ export var ShareByEmail = function ShareByEmail(_ref) {
   };
 
   var onRecipientPick = function onRecipientPick(recipient) {
-    var mergedRecipients = flag('sharing.show-recipient-groups') ? mergeRecipients(recipients, recipient) : spreadGroupAndMergeRecipients(recipients, recipient, contacts);
+    var mergedRecipients = flag('sharing.show-recipient-groups') ? mergeRecipients(recipients, recipient) : spreadGroupAndMergeRecipients(recipients, recipient);
     setRecipients(mergedRecipients);
   };
 
@@ -98,8 +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;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -130,14 +130,14 @@ export var ShareByEmail = function ShareByEmail(_ref) {
             return getOrCreateFromArray(client, recipients, createContact);
 
           case 10:
-            _contacts = _context.sent;
+            contacts = _context.sent;
             readWriteRecipients = [];
             readOnlyRecipients = [];
 
             if (selectedOption === 'readOnly') {
-              readOnlyRecipients = _contacts;
+              readOnlyRecipients = contacts;
             } else {
-              readWriteRecipients = _contacts;
+              readWriteRecipients = contacts;
             }
 
             _context.next = 16;
@@ -150,7 +150,11 @@ export var ShareByEmail = function ShareByEmail(_ref) {
             });
 
           case 16:
-            Alerter.success(t.apply(void 0, _toConsumableArray(getSuccessMessage(recipientsBefore, _contacts, documentType))));
+            showAlert({
+              message: t.apply(void 0, _toConsumableArray(getSuccessMessage(recipientsBefore, contacts, documentType))),
+              severity: 'success',
+              variant: 'filled'
+            });
             reset();
             _context.next = 25;
             break;
@@ -204,8 +208,6 @@ export var ShareByEmail = function ShareByEmail(_ref) {
     onRemove: function onRemove(recipient) {
       return onRecipientRemove(recipient);
     },
-    contacts: contacts,
-    contactGroups: contactGroups,
     recipients: recipients
   })), showShareControl && /*#__PURE__*/React.createElement("div", {
     className: styles['share-type-control']
@@ -226,8 +228,6 @@ export var ShareByEmail = function ShareByEmail(_ref) {
 };
 ShareByEmail.propTypes = {
   currentRecipients: PropTypes.arrayOf(PropTypes.object),
-  contacts: contactsResponseType.isRequired,
-  contactGroups: contactGroupsResponseType.isRequired,
   document: PropTypes.object.isRequired,
   documentType: PropTypes.string.isRequired,
   sharingDesc: PropTypes.string.isRequired,

package/dist/components/ShareByEmail.spec.js

@@ -31,12 +31,6 @@ describe('ShareByEmailComponent', function () {
         currentRecipients = _ref$currentRecipient === void 0 ? [] : _ref$currentRecipient;
 
     var props = {
-      contacts: {
-        data: []
-      },
-      contactGroups: {
-        data: []
-      },
       documentType: 'Files',
       onShare: onShare,
       document: document,

package/dist/components/ShareDialogCozyToCozy.js

@@ -38,9 +38,7 @@ var styles = {
  */
 
 var SharingContent = function SharingContent(_ref) {
-  var contacts = _ref.contacts,
-      contactGroups = _ref.contactGroups,
-      createContact = _ref.createContact,
+  var createContact = _ref.createContact,
       document = _ref.document,
       documentType = _ref.documentType,
       hasSharedParent = _ref.hasSharedParent,
@@ -80,8 +78,6 @@ var SharingContent = function SharingContent(_ref) {
     variant: "h6",
     className: "u-mb-1-half"
   }, t('Share.contacts.whoHasAccess')), showShareByEmail && /*#__PURE__*/React.createElement(DumbShareByEmail, {
-    contacts: contacts,
-    contactGroups: contactGroups,
     createContact: createContact,
     currentRecipients: recipients,
     document: document,

package/dist/components/ShareDialogCozyToCozy.spec.js

@@ -381,51 +381,6 @@ var deferablePromise = function deferablePromise() {
 
 var getMockProps = function getMockProps() {
   return {
-    contacts: {
-      id: 'contacts',
-      definition: {
-        doctype: 'io.cozy.contacts',
-        selector: {
-          _id: {
-            $gt: null
-          }
-        },
-        indexedFields: ['_id'],
-        partialFilter: {
-          trashed: {
-            $or: [{
-              $eq: false
-            }, {
-              $exists: false
-            }]
-          },
-          $or: [{
-            cozy: {
-              $not: {
-                $size: 0
-              }
-            }
-          }, {
-            email: {
-              $not: {
-                $size: 0
-              }
-            }
-          }]
-        },
-        limit: 1000
-      },
-      fetchStatus: 'pending',
-      lastFetch: null,
-      lastUpdate: null,
-      lastErrorUpdate: null,
-      lastError: null,
-      hasMore: false,
-      count: 0,
-      data: [],
-      bookmark: null,
-      options: null
-    },
     document: {
       id: 'SOME_DOCUMENT_ID',
       name: 'SOME_DOCUMENT_NAME',
@@ -433,22 +388,6 @@ var getMockProps = function getMockProps() {
       _id: 'SOME_DOCUMENT_ID'
     },
     documentType: 'Organizations',
-    contactGroups: {
-      id: 'groups',
-      definition: {
-        doctype: 'io.cozy.contacts.groups'
-      },
-      fetchStatus: 'pending',
-      lastFetch: null,
-      lastUpdate: null,
-      lastErrorUpdate: null,
-      lastError: null,
-      hasMore: false,
-      count: 0,
-      data: [],
-      bookmark: null,
-      options: null
-    },
     hasSharedParent: null,
     isOwner: true,
     link: null,

package/dist/components/ShareDialogTwoStepsConfirmationContainer.js

@@ -98,9 +98,7 @@ var RejectRecipientActions = function RejectRecipientActions(_ref3) {
 
 
 var ShareDialogTwoStepsConfirmationContainer = function ShareDialogTwoStepsConfirmationContainer(_ref4) {
-  var contacts = _ref4.contacts,
-      contactGroups = _ref4.contactGroups,
-      createContact = _ref4.createContact,
+  var createContact = _ref4.createContact,
       document = _ref4.document,
       documentType = _ref4.documentType,
       hasSharedParent = _ref4.hasSharedParent,
@@ -240,8 +238,6 @@ var ShareDialogTwoStepsConfirmationContainer = function ShareDialogTwoStepsConfi
     dialogContent = /*#__PURE__*/React.createElement(LoadingContent, null);
   } else if (status === 'sharing') {
     dialogContent = /*#__PURE__*/React.createElement(DialogContentOnShare, {
-      contacts: contacts,
-      contactGroups: contactGroups,
       createContact: createContact,
       document: document,
       documentType: documentType,

package/dist/components/ShareDialogTwoStepsConfirmationContainer.spec.js

@@ -403,51 +403,6 @@ var deferablePromise = function deferablePromise() {
 
 var getMockProps = function getMockProps() {
   return {
-    contacts: {
-      id: 'contacts',
-      definition: {
-        doctype: 'io.cozy.contacts',
-        selector: {
-          _id: {
-            $gt: null
-          }
-        },
-        indexedFields: ['_id'],
-        partialFilter: {
-          trashed: {
-            $or: [{
-              $eq: false
-            }, {
-              $exists: false
-            }]
-          },
-          $or: [{
-            cozy: {
-              $not: {
-                $size: 0
-              }
-            }
-          }, {
-            email: {
-              $not: {
-                $size: 0
-              }
-            }
-          }]
-        },
-        limit: 1000
-      },
-      fetchStatus: 'pending',
-      lastFetch: null,
-      lastUpdate: null,
-      lastErrorUpdate: null,
-      lastError: null,
-      hasMore: false,
-      count: 0,
-      data: [],
-      bookmark: null,
-      options: null
-    },
     document: {
       id: 'SOME_DOCUMENT_ID',
       name: 'SOME_DOCUMENT_NAME',
@@ -455,22 +410,6 @@ var getMockProps = function getMockProps() {
       _id: 'SOME_DOCUMENT_ID'
     },
     documentType: 'Organizations',
-    contactGroups: {
-      id: 'groups',
-      definition: {
-        doctype: 'io.cozy.contacts.groups'
-      },
-      fetchStatus: 'pending',
-      lastFetch: null,
-      lastUpdate: null,
-      lastErrorUpdate: null,
-      lastError: null,
-      hasMore: false,
-      count: 0,
-      data: [],
-      bookmark: null,
-      options: null
-    },
     hasSharedParent: null,
     isOwner: true,
     link: null,

package/dist/components/ShareModal/EditableSharingModal.js

@@ -3,22 +3,17 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["document"];
 import PropTypes from 'prop-types';
 import React from 'react';
-import { useClient, useQueryAll } from 'cozy-client';
+import { useClient } from 'cozy-client';
 import { useFetchDocumentPath } from '../../hooks/useFetchDocumentPath';
 import { useSharingContext } from '../../hooks/useSharingContext';
 import { Contact } from '../../models';
-import { buildContactsQuery, buildContactGroupsQuery } from '../../queries/queries';
-import { default as DumbShareModal } from '../ShareModal';
+import { ShareModal } from '../ShareModal';
 export var EditableSharingModal = function EditableSharingModal(_ref) {
   var document = _ref.document,
       rest = _objectWithoutProperties(_ref, _excluded);
 
   var client = useClient();
   var documentPath = useFetchDocumentPath(client, document);
-  var contactsQuery = buildContactsQuery();
-  var contactsResult = useQueryAll(contactsQuery.definition, contactsQuery.options);
-  var contactGroupsQuery = buildContactGroupsQuery();
-  var contactGroupsResult = useQueryAll(contactGroupsQuery.definition, contactGroupsQuery.options);
 
   var _useSharingContext = useSharingContext(),
       documentType = _useSharingContext.documentType,
@@ -36,9 +31,7 @@ export var EditableSharingModal = function EditableSharingModal(_ref) {
       shareByLink = _useSharingContext.shareByLink,
       updateDocumentPermissions = _useSharingContext.updateDocumentPermissions;
 
-  return /*#__PURE__*/React.createElement(DumbShareModal, _extends({
-    contacts: contactsResult,
-    contactGroups: contactGroupsResult,
+  return /*#__PURE__*/React.createElement(ShareModal, _extends({
     createContact: function createContact(contact) {
       return client.create(Contact.doctype, contact);
     },

package/dist/components/ShareModal/EditableSharingModal.spec.js

@@ -33,12 +33,6 @@ describe('EditableSharingModal', function () {
       client: client
     }, /*#__PURE__*/React.createElement(EditableSharingModal, {
       client: client,
-      contacts: {
-        data: []
-      },
-      contactGroups: {
-        data: []
-      },
       document: document,
       t: function t(x) {
         return x;

package/dist/components/ShareModal.js

@@ -3,11 +3,8 @@ import React from 'react';
 import flag from 'cozy-flags';
 import ShareDialogCozyToCozy from './ShareDialogCozyToCozy';
 import ShareDialogOnlyByLink from './ShareDialogOnlyByLink';
-import { contactsResponseType, contactGroupsResponseType } from '../propTypes';
 export var ShareModal = function ShareModal(_ref) {
-  var contacts = _ref.contacts,
-      contactGroups = _ref.contactGroups,
-      createContact = _ref.createContact,
+  var createContact = _ref.createContact,
       document = _ref.document,
       _ref$documentType = _ref.documentType,
       documentType = _ref$documentType === void 0 ? 'Document' : _ref$documentType,
@@ -47,8 +44,6 @@ export var ShareModal = function ShareModal(_ref) {
     onUpdateShareLinkPermissions: onUpdateShareLinkPermissions,
     permissions: permissions
   }) : /*#__PURE__*/React.createElement(ShareDialogCozyToCozy, {
-    contacts: contacts,
-    contactGroups: contactGroups,
     createContact: createContact,
     document: document,
     documentType: documentType,
@@ -76,8 +71,6 @@ export var ShareModal = function ShareModal(_ref) {
 };
 export default ShareModal;
 ShareModal.propTypes = {
-  contacts: contactsResponseType.isRequired,
-  contactGroups: contactGroupsResponseType.isRequired,
   createContact: PropTypes.func.isRequired,
   document: PropTypes.object.isRequired,
   documentType: PropTypes.string,

package/dist/components/ShareRecipientsInput.js

@@ -1,71 +1,70 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 
 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 get from 'lodash/get';
 import PropTypes from 'prop-types';
-import React, { useState, useEffect } from 'react';
+import React from 'react';
+import { useQueryAll, isQueryLoading } from 'cozy-client';
+import flag from 'cozy-flags';
 import ShareAutosuggest from './ShareAutosuggest';
-import { contactsResponseType, contactGroupsResponseType } from '../propTypes';
+import { getContactsFromGroupId } from '../helpers/contacts';
+import { buildReachableContactsQuery, buildContactGroupsByIdsQuery, buildUnreachableContactsWithGroupsQuery } from '../queries/queries';
+/**
+ * ShareRecipientsInput is responsible for fetching contacts and groups.
+ * We retrieve all the contacts that are reachable and the groups they belong to.
+ * In order to display the total number of members in each group, we also retrieve the contacts that are not reachable.
+ */
 
 var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
-  var contacts = _ref.contacts,
-      contactGroups = _ref.contactGroups,
-      recipients = _ref.recipients,
+  var recipients = _ref.recipients,
       placeholder = _ref.placeholder,
       onPick = _ref.onPick,
       onRemove = _ref.onRemove;
+  var reachableContactsQuery = buildReachableContactsQuery();
+  var reachableContactsResult = useQueryAll(reachableContactsQuery.definition, reachableContactsQuery.options);
+  var unreachableContactsWithGroupsQuery = buildUnreachableContactsWithGroupsQuery();
+  var unreachableContactsWithGroupsResult = useQueryAll(unreachableContactsWithGroupsQuery.definition, _objectSpread(_objectSpread({}, unreachableContactsWithGroupsQuery.options), {}, {
+    enabled: !!flag('sharing.show-recipient-groups')
+  }));
+  var contactGroupsByIdsQuery = buildContactGroupsByIdsQuery(_toConsumableArray(new Set((reachableContactsResult.data || []).flatMap(function (contact) {
+    var _contact$relationship;
 
-  var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      loading = _useState2[0],
-      setLoading = _useState2[1];
-
-  useEffect(function () {
-    if (loading && !contacts.hasMore && contacts.fetchStatus === 'loaded' && !contactGroups.hasMore && contactGroups.fetchStatus === 'loaded') {
-      setLoading(false);
-    }
-  }, [contacts, contactGroups, loading]);
-
-  var onShareAutosuggestFocus = function onShareAutosuggestFocus() {
-    if (contacts.hasMore || contacts.fetchStatus === 'loading' || contactGroups.hasMore || contactGroups.fetchStatus === 'loading') {
-      setLoading(true);
-    }
-  };
-
-  var getContactsAndGroups = function getContactsAndGroups() {
-    // we need contacts to be loaded to be able to add all group members to recipients
-    if (contacts.hasMore || contacts.fetchStatus === 'loading') {
-      return contacts.data;
-    } else {
-      var contactGroupsWithCount = contactGroups.data.map(function (contactGroup) {
-        return _objectSpread(_objectSpread({}, contactGroup), {}, {
-          membersCount: contacts.data.reduce(function (total, contact) {
-            if (get(contact, 'relationships.groups.data', []).map(function (group) {
-              return group._id;
-            }).includes(contactGroup._id)) {
-              return total + 1;
-            }
+    return (((_contact$relationship = contact.relationships) === null || _contact$relationship === void 0 || (_contact$relationship = _contact$relationship.groups) === null || _contact$relationship === void 0 ? void 0 : _contact$relationship.data) || []).map(function (group) {
+      return group._id;
+    });
+  }))));
+  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 reachableMembers = getContactsFromGroupId(reachableContactsResult.data, contactGroup.id).map(function (contact) {
+      return _objectSpread(_objectSpread({}, contact), {}, {
+        isReachable: true
+      });
+    });
 
-            return total;
-          }, 0)
-        });
-      }).filter(function (contactGroup) {
-        return contactGroup.membersCount > 0;
+    if (flag('sharing.show-recipient-groups') !== true) {
+      return _objectSpread(_objectSpread({}, contactGroup), {}, {
+        members: reachableMembers
       });
-      return [].concat(_toConsumableArray(contacts.data), _toConsumableArray(contactGroupsWithCount));
     }
-  };
 
+    var unreachableMembers = getContactsFromGroupId(unreachableContactsWithGroupsResult.data, contactGroup.id).map(function (contact) {
+      return _objectSpread(_objectSpread({}, contact), {}, {
+        isReachable: false
+      });
+    });
+    return _objectSpread(_objectSpread({}, contactGroup), {}, {
+      members: [].concat(_toConsumableArray(reachableMembers), _toConsumableArray(unreachableMembers))
+    });
+  });
+  var contactsAndGroups = [].concat(_toConsumableArray(reachableContactsResult.data || []), _toConsumableArray(contactGroups));
   return /*#__PURE__*/React.createElement(ShareAutosuggest, {
-    loading: loading,
-    contactsAndGroups: getContactsAndGroups(),
+    loading: isLoading,
+    contactsAndGroups: contactsAndGroups,
     recipients: recipients,
-    onFocus: onShareAutosuggestFocus,
     onPick: onPick,
     onRemove: onRemove,
     placeholder: placeholder
@@ -73,8 +72,6 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
 };
 
 ShareRecipientsInput.propTypes = {
-  contacts: contactsResponseType.isRequired,
-  contactGroups: contactGroupsResponseType.isRequired,
   recipients: PropTypes.array,
   placeholder: PropTypes.string,
   onPick: PropTypes.func.isRequired,