cozy-sharing 4.9.0 → 6.0.0

package/CHANGELOG.md

@@ -3,6 +3,96 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 6.0.0 (2023-01-31)
+
+
+### Bug Fixes
+
+* ActionMenu could not be closed after closing and reopening modal ([f9c638f](https://github.com/cozy/cozy-libs/commit/f9c638f11eec4c618985e70a6764c6c22c3ed0b0))
+* Allow content to go full size in share by email select box ([6dc210e](https://github.com/cozy/cozy-libs/commit/6dc210edecefe7dbddc79c6b64a1b8b03797fdc0))
+* Copy to clipboard when link is created ([517ce10](https://github.com/cozy/cozy-libs/commit/517ce10e76beee9067132a2323260c38fb3aec3e))
+* Don't call PermissionCol.findApps ([08073da](https://github.com/cozy/cozy-libs/commit/08073da3271c906fd45e74928efe7e742ed7dc35)), closes [cozy/cozy-client#1293](https://github.com/cozy/cozy-client/issues/1293)
+* Highlight again current suggestion in grey ([122491a](https://github.com/cozy/cozy-libs/commit/122491a75b8104e78a75587ec91579d1f2bbe6b1))
+* Realtime order issue caused invalid recipient status ([8ec1f4b](https://github.com/cozy/cozy-libs/commit/8ec1f4b68298530241cd3119402a60c1f29cf6f5))
+* Remove duplicate use of t causing translation warnings ([8aef46d](https://github.com/cozy/cozy-libs/commit/8aef46d3421d8506e2ee63d9952c0f2d7371e022))
+* Remove pick on input blur when a suggestion is highlighted ([5f5cc21](https://github.com/cozy/cozy-libs/commit/5f5cc21eb7b4da6e116d18dd60c128a4d2525ed2))
+* Update wording to see file/folder ([b815daa](https://github.com/cozy/cozy-libs/commit/b815daa7964437f4129d512867e5c3dc26022397))
+* Use strategy: fixed in popper options to show overflow ([73b159a](https://github.com/cozy/cozy-libs/commit/73b159aa91fd4feb84b2377d10001774c30ad7df))
+
+
+### Code Refactoring
+
+* Move Recipient related components in a Recipient folder ([518bff1](https://github.com/cozy/cozy-libs/commit/518bff1748f9e8466203ec5f3152ac653253b439))
+
+
+### Features
+
+* Accept options argument in shareByLink function ([93d75d8](https://github.com/cozy/cozy-libs/commit/93d75d8cb80a630dd1160899015916fff9fc1828))
+* Add "Who has access?" title in Dialog ([33cb6b3](https://github.com/cozy/cozy-libs/commit/33cb6b320220e239cc030c98729d984deae62ab8))
+* Add and export DOCUMENT_TYPE constant ([959881a](https://github.com/cozy/cozy-libs/commit/959881a654d7605267914dde14d038877bfd412f))
+* Add SynchronousJobQueue ([b654c40](https://github.com/cozy/cozy-libs/commit/b654c40c9f81a7931476bab82fe54033a24fbaf0))
+* Add usePrevious hook ([32e4a26](https://github.com/cozy/cozy-libs/commit/32e4a2624fb8865c42209164f7fba66470ac19b2))
+* Align horizontally share by email buttons on mobile ([bd212b6](https://github.com/cozy/cozy-libs/commit/bd212b61ab9ee40f97bd3386f93b1629727640e9))
+* **ContactSuggestion:** Use ListItemText from cozy-ui ([2680feb](https://github.com/cozy/cozy-libs/commit/2680febce956d0b1cfdfbfa92bf7e7bc17208d87))
+* Create sharing link after choosing permission in modal ([554b912](https://github.com/cozy/cozy-libs/commit/554b9120ee4396259c6d22107b2eaa1ee3a2b36c))
+* Display only one button to copy link in desktop ([8ef090b](https://github.com/cozy/cozy-libs/commit/8ef090b91ab13f747b2190212006254686756d13))
+* Display owner recipient everytime in WhoHasAccess list ([f680913](https://github.com/cozy/cozy-libs/commit/f6809138eff78d6c5a617840914387fea7d59b8e))
+* Display share by email buttons only when recipients not empty ([139b6ad](https://github.com/cozy/cozy-libs/commit/139b6ad8fc0735565e7c5897bc8be1ff4c723c6b))
+* Display sharing link in WhoHasAccess ([8eaa8ee](https://github.com/cozy/cozy-libs/commit/8eaa8ee5b313195e6334b920d0f349d381cb4827))
+* Fade in recipient when link created or recipient added ([d6d84b0](https://github.com/cozy/cozy-libs/commit/d6d84b0c4c5b10243cb08760e6c6e5bf1bec17f1))
+* Hide ShareByEmail controls when input not focused or empty ([7feb150](https://github.com/cozy/cozy-libs/commit/7feb1502ca755b7cea5df252f3333d327f8f1d2f))
+* Improve spacing between Who has access title and components ([14d4619](https://github.com/cozy/cozy-libs/commit/14d46196435f1b96401317f903a8e74a27467372))
+* Link icon in a circle in WhoHasAccess ([513efff](https://github.com/cozy/cozy-libs/commit/513efff434676dd3350797f80b56ad70bbcd5568))
+* Modify share by link creation and edit ([56b2bb4](https://github.com/cozy/cozy-libs/commit/56b2bb465a42db4c4bda076d01375988d01db245))
+* Prevent apps with only read only link to create read write link ([94094dd](https://github.com/cozy/cozy-libs/commit/94094ddc6afabf99dbc2ad231d23e430a1698756))
+* Propose in autosuggest unknown email ([85ad899](https://github.com/cozy/cozy-libs/commit/85ad899cc4ce0d5611cc526a238878ba0f24c87c))
+* Remove ShareByEmail label and update placeholder ([772dc5c](https://github.com/cozy/cozy-libs/commit/772dc5c2e04b090ce0fcf0f275aa1eba0c216eb4))
+* **ShareAutosuggest:** Add Chip and keyboard delete mechanism ([b6edd71](https://github.com/cozy/cozy-libs/commit/b6edd713b925be2b3ea430c34bfe1012ae8b6751))
+* Update and lowercase text in RecipientPermissions ([073c600](https://github.com/cozy/cozy-libs/commit/073c600affe7f6e5fcceefb69b4e34eb79f2fc17))
+* Update cozy-client and cozy-ui ([6ae3b04](https://github.com/cozy/cozy-libs/commit/6ae3b04925ae64fa30f3ec8b6e716453d0a630fe))
+* Update react-autosuggest package ([92abd2c](https://github.com/cozy/cozy-libs/commit/92abd2c87d809b71e7e229d5abde1d0aa4b629a0))
+* Update wording when modifying file or folder ([e9e12aa](https://github.com/cozy/cozy-libs/commit/e9e12aaa4593bf11fada3cf83931d86e8abe0987))
+* Use List instead of CompositeRow for WhoHasAccess ([d9f7cc6](https://github.com/cozy/cozy-libs/commit/d9f7cc6610255b9b4ce202428c4777320dfba7a7))
+* Use navigator.share in mobile to share link ([9da57c6](https://github.com/cozy/cozy-libs/commit/9da57c65e91c43df1b5f2a4c1546c5461eaf057a))
+
+
+### BREAKING CHANGES
+
+* If you imported component directly from
+'cozy-sharing/dist/components/... '
+especially from ' 'cozy-sharing/dist/components/Recipient',
+you will need to update your import.
+
+Drive example (the only one I found) :
+`import { RecipientsAvatars } from 'cozy-sharing/dist/components/Recipient'`
+=>
+`import RecipientsAvatars from 'cozy-sharing/dist/components/Recipient/RecipientsAvatars'`
+
+
+
+
+
+# 5.0.0 (2023-01-09)
+
+
+### Bug Fixes
+
+* Color for badge with me ([bd7def0](https://github.com/cozy/cozy-libs/commit/bd7def03e0db9d8771a1e96965684d8785f6c91b))
+
+
+### Features
+
+* **harvest:** Update router packages ([3f08dd2](https://github.com/cozy/cozy-libs/commit/3f08dd2a99fb516c45ff938ca528dece63d10ca3))
+
+
+### BREAKING CHANGES
+
+* **harvest:** `react-router-dom` is `>=4` as peer dependencies.
+
+
+
+
+
 # [4.9.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@4.8.2...cozy-sharing@4.9.0) (2022-12-20)
 
 

package/dist/SharedRecipients.js

@@ -4,7 +4,7 @@ var _excluded = ["docId", "onClick"];
 import React from 'react';
 import SharingContext from './context';
 import withLocales from './withLocales';
-import { RecipientsAvatars } from './components/Recipient';
+import RecipientsAvatars from './components/Recipient/RecipientsAvatars';
 export var SharedRecipients = withLocales(function (_ref) {
   var docId = _ref.docId,
       onClick = _ref.onClick,

package/dist/SharedStatus.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import SharingContext from './context';
 import withLocales from './withLocales';
-import { RecipientsAvatars } from './components/Recipient';
+import RecipientsAvatars from './components/Recipient/RecipientsAvatars';
 export var SharedStatus = withLocales(function (_ref) {
   var docId = _ref.docId,
       className = _ref.className,

package/dist/SharingBanner/hooks/useSharingInfos.js

@@ -5,7 +5,7 @@ import { useState, useEffect } from 'react';
 import { useClient, models } from 'cozy-client';
 import getQueryParameter from '../helpers/QueryParameter';
 import logger from '../../logger';
-import { buildSharingsByIdQuery } from '../helpers/queries';
+import { buildSharingsByIdQuery } from '../../queries/queries';
 
 var getSharingId = function getSharingId(permission) {
   var sourceId = permission.data.attributes.source_id;

package/dist/SharingDetailsModal.js

@@ -30,7 +30,7 @@ import PropTypes from 'prop-types';
 import { useI18n } from 'cozy-ui/transpiled/react/I18n';
 import { Dialog } from 'cozy-ui/transpiled/react/CozyDialogs';
 import Divider from 'cozy-ui/transpiled/react/MuiCozyTheme/Divider';
-import { OwnerIdentity } from './components/Recipient';
+import OwnerIdentity from './components/Recipient/OwnerIdentity';
 import WhoHasAccess from './components/WhoHasAccess';
 import { getDisplayName } from './models';
 export var SharingDetailsModal = function SharingDetailsModal(_ref) {

package/dist/SharingOwnerAvatar.js

@@ -4,7 +4,7 @@ var _excluded = ["docId"];
 import React from 'react';
 import SharingContext from './context';
 import withLocales from './withLocales';
-import { RecipientAvatar } from './components/Recipient';
+import RecipientAvatar from './components/Recipient/RecipientAvatar';
 export var SharingOwnerAvatar = withLocales(function (_ref) {
   var docId = _ref.docId,
       rest = _objectWithoutProperties(_ref, _excluded);

package/dist/SharingProvider.js

@@ -24,7 +24,9 @@ import SharingContext from './context';
 import reducer, { receiveSharings, addSharing, updateSharing, addSharingLink, updateSharingLink, revokeSharingLink, revokeRecipient, revokeSelf, receivePaths, isOwner as _isOwner, canReshare as _canReshare, getOwner as _getOwner, getRecipients as _getRecipients, getSharingById, getSharingDocIds, getSharingForSelf as _getSharingForSelf, getSharingType as _getSharingType, getSharingLink as _getSharingLink, getSharedDocIdsBySharings, getDocumentSharing, getDocumentPermissions as _getDocumentPermissions, hasSharedParent as _hasSharedParent, hasSharedChild as _hasSharedChild } from './state';
 import { fetchNextPermissions } from './fetchNextPermissions';
 import { fetchFilesPaths } from './helpers/files';
+import { SynchronousJobQueue } from './helpers/synchronousJobQueue';
 import { getSharingObject, createSharingInStore, updateSharingInStore } from './helpers/sharings';
+import { fetchApps } from './queries/queries';
 var SHARING_DOCTYPE = 'io.cozy.sharings';
 var PERMISSION_DOCTYPE = 'io.cozy.permissions';
 export var SharingProvider = /*#__PURE__*/function (_Component) {
@@ -81,7 +83,17 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
                   updateSharingInStore(_this.dispatch, newSharing);
                 } else {
                   docsId = getSharingDocIds(newSharing);
-                  createSharingInStore(client, doctype, _this.dispatch, docsId, newSharing);
+
+                  _this.synchronousJobQueue.push({
+                    function: createSharingInStore,
+                    arguments: {
+                      client: client,
+                      doctype: doctype,
+                      dispatch: _this.dispatch,
+                      docsId: docsId,
+                      sharing: newSharing
+                    }
+                  });
                 }
 
               case 4:
@@ -376,14 +388,14 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
     }());
 
     _defineProperty(_assertThisInitialized(_this), "shareByLink", /*#__PURE__*/function () {
-      var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(document) {
+      var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(document, options) {
         var resp;
         return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) {
             switch (_context8.prev = _context8.next) {
               case 0:
                 _context8.next = 2;
-                return _this.permissionCol.createSharingLink(document);
+                return _this.permissionCol.createSharingLink(document, options);
 
               case 2:
                 resp = _context8.sent;
@@ -400,7 +412,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee8);
       }));
 
-      return function (_x11) {
+      return function (_x11, _x12) {
         return _ref10.apply(this, arguments);
       };
     }());
@@ -443,7 +455,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
                     }, _callee9);
                   }));
 
-                  return function (_x14) {
+                  return function (_x15) {
                     return _ref12.apply(this, arguments);
                   };
                 }()));
@@ -460,7 +472,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee10);
       }));
 
-      return function (_x12, _x13) {
+      return function (_x13, _x14) {
         return _ref11.apply(this, arguments);
       };
     }());
@@ -491,7 +503,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
         }, _callee11);
       }));
 
-      return function (_x15) {
+      return function (_x16) {
         return _ref13.apply(this, arguments);
       };
     }());
@@ -558,6 +570,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
     };
     _this.realtime = null;
     _this.isInitialized = false;
+    _this.synchronousJobQueue = new SynchronousJobQueue();
     var _client = props.client;
     _this.sharingCol = _client.collection(SHARING_DOCTYPE);
     _this.permissionCol = _client.collection(PERMISSION_DOCTYPE);
@@ -596,7 +609,7 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
               case 0:
                 _this$props5 = this.props, doctype = _this$props5.doctype, client = _this$props5.client;
                 _context12.next = 3;
-                return Promise.all([this.sharingCol.findByDoctype(doctype), this.permissionCol.findLinksByDoctype(doctype), this.permissionCol.findApps()]);
+                return Promise.all([this.sharingCol.findByDoctype(doctype), this.permissionCol.findLinksByDoctype(doctype), client.query(fetchApps().definition, fetchApps().options)]);
 
               case 3:
                 _yield$Promise$all = _context12.sent;

package/dist/components/ContactSuggestion.js

@@ -2,29 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import get from 'lodash/get';
 import { models } from 'cozy-client';
-var ContactModel = models.contact;
 import { useI18n } from 'cozy-ui/transpiled/react/I18n';
 import Avatar from 'cozy-ui/transpiled/react/Avatar';
-var styles = {
-  "CozyTheme--inverted": "recipient__CozyTheme--inverted___2anJa",
-  "CozyTheme--normal": "recipient__CozyTheme--normal___994FQ",
-  "recipient": "recipient__recipient___2FlkK",
-  "recipients-list-light": "recipient__recipients-list-light___1Rt5q",
-  "recipient-idents": "recipient__recipient-idents___3-fjp",
-  "recipient-status-icon": "recipient__recipient-status-icon___J4sIm",
-  "recipient-user": "recipient__recipient-user___2cNHW",
-  "recipient-details": "recipient__recipient-details___4SMW5",
-  "avatar": "recipient__avatar___pPmxN",
-  "recipients-avatars": "recipient__recipients-avatars___2Qth2",
-  "--interactive": "recipient__--interactive___1V89N",
-  "recipients-avatars--link": "recipient__recipients-avatars--link___12LyR",
-  "recipients-avatars--plusX": "recipient__recipients-avatars--plusX___28dFs",
-  "recipients-avatars--avatar": "recipient__recipients-avatars--avatar___15hBo",
-  "spin": "recipient__spin___2cogO",
-  "shake": "recipient__shake___3lxk5"
-};
+import ListItem from 'cozy-ui/transpiled/react/MuiCozyTheme/ListItem';
+import ListItemIcon from 'cozy-ui/transpiled/react/MuiCozyTheme/ListItemIcon';
+import ListItemText from 'cozy-ui/transpiled/react/ListItemText';
 import { Contact, Group, getDisplayName, getInitials } from '../models';
-import Identity from './Identity';
+var ContactModel = models.contact;
 export var ContactSuggestion = function ContactSuggestion(_ref) {
   var contactOrGroup = _ref.contactOrGroup,
       contacts = _ref.contacts;
@@ -55,18 +39,22 @@ export var ContactSuggestion = function ContactSuggestion(_ref) {
     details = ContactModel.getPrimaryCozy(contactOrGroup);
   }
 
-  return /*#__PURE__*/React.createElement("div", {
-    className: styles['recipient']
-  }, /*#__PURE__*/React.createElement(Avatar, {
+  return /*#__PURE__*/React.createElement(ListItem, {
+    button: true
+  }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Avatar, {
     text: avatarText,
     size: "small"
-  }), /*#__PURE__*/React.createElement(Identity, {
-    name: name,
-    details: details === '' ? undefined : details
+  })), /*#__PURE__*/React.createElement(ListItemText, {
+    primary: name,
+    secondary: details && details !== '' ? details : '-'
   }));
 };
+var newUnknownContactProptypes = PropTypes.shape({
+  _type: PropTypes.string.isRequired,
+  email: PropTypes.string.isRequired
+});
 ContactSuggestion.propTypes = {
-  contactOrGroup: PropTypes.oneOfType([Contact.propType, Group.propType]).isRequired,
+  contactOrGroup: PropTypes.oneOfType([Contact.propType, Group.propType, newUnknownContactProptypes]).isRequired,
   contacts: PropTypes.arrayOf(Contact.propType)
 };
 export default ContactSuggestion;

package/dist/components/EditLinkPermissionDialog.js

@@ -0,0 +1,72 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { useI18n } from 'cozy-ui/transpiled/react/I18n';
+import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
+import Button from 'cozy-ui/transpiled/react/Buttons';
+import Radio from 'cozy-ui/transpiled/react/Radios';
+import RadioGroup from 'cozy-ui/transpiled/react/RadioGroup';
+import FormControlLabel from 'cozy-ui/transpiled/react/FormControlLabel';
+
+var EditLinkPermissionDialog = function EditLinkPermissionDialog(_ref) {
+  var open = _ref.open,
+      onClose = _ref.onClose,
+      document = _ref.document,
+      onPermissionsSelected = _ref.onPermissionsSelected;
+
+  var _useI18n = useI18n(),
+      t = _useI18n.t;
+
+  var _useState = useState(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      isReadOnlyPermissions = _useState2[0],
+      setIsReadOnlyPermissions = _useState2[1];
+
+  var onChange = function onChange(event) {
+    setIsReadOnlyPermissions(event.target.value === 'true');
+  };
+
+  var onConfirm = function onConfirm() {
+    var verbs = isReadOnlyPermissions ? ['GET'] : ['GET', 'POST', 'PUT', 'PATCH'];
+    onPermissionsSelected({
+      verbs: verbs
+    });
+    onClose();
+  };
+
+  return /*#__PURE__*/React.createElement(ConfirmDialog, {
+    open: open,
+    onClose: onClose,
+    title: t('Share.permissionLink.title'),
+    content: /*#__PURE__*/React.createElement(RadioGroup, {
+      "aria-label": "radio",
+      value: isReadOnlyPermissions.toString(),
+      onChange: onChange
+    }, /*#__PURE__*/React.createElement(FormControlLabel, {
+      value: "true",
+      label: (document === null || document === void 0 ? void 0 : document.type) === 'directory' ? t("Share.permissionLink.seeFolder") : t("Share.permissionLink.seeFile"),
+      control: /*#__PURE__*/React.createElement(Radio, null)
+    }), /*#__PURE__*/React.createElement(FormControlLabel, {
+      value: "false",
+      label: (document === null || document === void 0 ? void 0 : document.type) === 'directory' ? t("Share.permissionLink.modifyFolder") : t("Share.permissionLink.modifyFile"),
+      control: /*#__PURE__*/React.createElement(Radio, null)
+    })),
+    actions: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
+      variant: "secondary",
+      label: t('Share.permissionLink.cancel'),
+      onClick: onClose
+    }), /*#__PURE__*/React.createElement(Button, {
+      variant: "primary",
+      label: t('Share.permissionLink.confirm'),
+      onClick: onConfirm
+    }))
+  });
+};
+
+EditLinkPermissionDialog.propTypes = {
+  open: PropTypes.bool.isRequired,
+  onClose: PropTypes.func.isRequired,
+  document: PropTypes.object.isRequired,
+  onPermissionsSelected: PropTypes.func.isRequired
+};
+export default EditLinkPermissionDialog;

package/dist/components/EditLinkPermissionDialog.spec.js

@@ -0,0 +1,48 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react';
+import { createMockClient } from 'cozy-client';
+import AppLike from '../../test/AppLike';
+import EditLinkPermissionDialog from './EditLinkPermissionDialog';
+describe('EditLinkPermissionDialog', function () {
+  var client = createMockClient({});
+
+  var setup = function setup(props) {
+    return render( /*#__PURE__*/React.createElement(AppLike, {
+      client: client
+    }, /*#__PURE__*/React.createElement(EditLinkPermissionDialog, _extends({
+      open: true,
+      onClose: function onClose() {}
+    }, props))));
+  };
+
+  it('should select read permissions', function () {
+    var onPermissionsSelected = jest.fn();
+    var props = {
+      onPermissionsSelected: onPermissionsSelected
+    };
+
+    var _setup = setup(props),
+        getByText = _setup.getByText;
+
+    fireEvent.click(getByText('OK'));
+    expect(onPermissionsSelected).toHaveBeenCalledWith({
+      verbs: ['GET']
+    });
+  });
+  it('should select write permissions', function () {
+    var onPermissionsSelected = jest.fn();
+    var props = {
+      onPermissionsSelected: onPermissionsSelected
+    };
+
+    var _setup2 = setup(props),
+        getByText = _setup2.getByText;
+
+    fireEvent.click(getByText('Modify file'));
+    fireEvent.click(getByText('OK'));
+    expect(onPermissionsSelected).toHaveBeenCalledWith({
+      verbs: ['GET', 'POST', 'PUT', 'PATCH']
+    });
+  });
+});

package/dist/components/EditableSharingModal.js

@@ -1,27 +1,25 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["contacts", "document", "groups"];
+var _excluded = ["document"];
 import React from 'react';
 import PropTypes from 'prop-types';
-import { queryConnect, useClient, Q } from 'cozy-client';
-import { Contact, Group } from '../models';
-import { contactsResponseType, groupsResponseType } from '../propTypes';
+import { useClient, useQueryAll } from 'cozy-client';
+import { Contact } from '../models';
 import SharingContext from '../context';
-import ContactsAndGroupsDataLoader from './ContactsAndGroupsDataLoader';
 import { default as DumbShareModal } from './ShareModal';
 import { useFetchDocumentPath } from './useFetchDocumentPath';
+import { buildContactsQuery, buildGroupsQuery } from '../queries/queries';
 export var EditableSharingModal = function EditableSharingModal(_ref) {
-  var contacts = _ref.contacts,
-      document = _ref.document,
-      groups = _ref.groups,
+  var document = _ref.document,
       rest = _objectWithoutProperties(_ref, _excluded);
 
   var client = useClient();
   var documentPath = useFetchDocumentPath(client, document);
-  return /*#__PURE__*/React.createElement(ContactsAndGroupsDataLoader, {
-    contacts: contacts,
-    groups: groups
-  }, /*#__PURE__*/React.createElement(SharingContext.Consumer, null, function (_ref2) {
+  var contactsQuery = buildContactsQuery();
+  var contactsResult = useQueryAll(contactsQuery.definition, contactsQuery.options);
+  var groupsQuery = buildGroupsQuery();
+  var groupsResult = useQueryAll(groupsQuery.definition, groupsQuery.options);
+  return /*#__PURE__*/React.createElement(SharingContext.Consumer, null, function (_ref2) {
     var documentType = _ref2.documentType,
         getDocumentPermissions = _ref2.getDocumentPermissions,
         getRecipients = _ref2.getRecipients,
@@ -37,13 +35,13 @@ export var EditableSharingModal = function EditableSharingModal(_ref) {
         shareByLink = _ref2.shareByLink,
         updateDocumentPermissions = _ref2.updateDocumentPermissions;
     return /*#__PURE__*/React.createElement(DumbShareModal, _extends({
-      contacts: contacts,
+      contacts: contactsResult,
       createContact: function createContact(contact) {
         return client.create(Contact.doctype, contact);
       },
       document: document,
       documentType: documentType,
-      groups: groups,
+      groups: groupsResult,
       hasSharedChild: documentPath && hasSharedChild(documentPath),
       hasSharedParent: documentPath && hasSharedParent(documentPath),
       isOwner: isOwner(document.id),
@@ -58,54 +56,9 @@ export var EditableSharingModal = function EditableSharingModal(_ref) {
       recipients: getRecipients(document.id),
       sharing: getSharingForSelf(document.id)
     }, rest));
-  }));
+  });
 };
 EditableSharingModal.propTypes = {
-  contacts: contactsResponseType,
-  document: PropTypes.object,
-  groups: groupsResponseType
+  document: PropTypes.object
 };
-
-var contactsQuery = function contactsQuery() {
-  return Q(Contact.doctype).where({
-    _id: {
-      $gt: null
-    }
-  }).partialIndex({
-    trashed: {
-      $or: [{
-        $eq: false
-      }, {
-        $exists: false
-      }]
-    },
-    $or: [{
-      cozy: {
-        $not: {
-          $size: 0
-        }
-      }
-    }, {
-      email: {
-        $not: {
-          $size: 0
-        }
-      }
-    }]
-  }).indexFields(['_id']).limitBy(1000);
-};
-
-var groupsQuery = function groupsQuery() {
-  return Q(Group.doctype);
-};
-
-export default queryConnect({
-  contacts: {
-    query: contactsQuery,
-    as: 'contacts'
-  },
-  groups: {
-    query: groupsQuery,
-    as: 'groups'
-  }
-})(EditableSharingModal);
+export default EditableSharingModal;

package/dist/components/{AvatarPlusX.js → Recipient/AvatarPlusX.js}

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import uniqueId from 'lodash/uniqueId';
 import Avatar from 'cozy-ui/transpiled/react/Avatar';
-import { SharingTooltip, TooltipRecipientList } from './Tooltip';
+import { SharingTooltip, TooltipRecipientList } from '../Tooltip';
 
 var AvatarPlusX = function AvatarPlusX(_ref) {
   var className = _ref.className,

package/dist/components/{Identity.js → Recipient/Identity.js}

@@ -2,22 +2,23 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 var styles = {
-  "CozyTheme--inverted": "recipient__CozyTheme--inverted___2anJa",
-  "CozyTheme--normal": "recipient__CozyTheme--normal___994FQ",
-  "recipient": "recipient__recipient___2FlkK",
-  "recipients-list-light": "recipient__recipients-list-light___1Rt5q",
-  "recipient-idents": "recipient__recipient-idents___3-fjp",
-  "recipient-status-icon": "recipient__recipient-status-icon___J4sIm",
-  "recipient-user": "recipient__recipient-user___2cNHW",
-  "recipient-details": "recipient__recipient-details___4SMW5",
-  "avatar": "recipient__avatar___pPmxN",
-  "recipients-avatars": "recipient__recipients-avatars___2Qth2",
-  "--interactive": "recipient__--interactive___1V89N",
-  "recipients-avatars--link": "recipient__recipients-avatars--link___12LyR",
-  "recipients-avatars--plusX": "recipient__recipients-avatars--plusX___28dFs",
-  "recipients-avatars--avatar": "recipient__recipients-avatars--avatar___15hBo",
-  "spin": "recipient__spin___2cogO",
-  "shake": "recipient__shake___3lxk5"
+  "CozyTheme--inverted": "recipient__CozyTheme--inverted___2Hb9c",
+  "CozyTheme--normal": "recipient__CozyTheme--normal___3WdEw",
+  "recipient": "recipient__recipient___2zWmH",
+  "recipients-list-light": "recipient__recipients-list-light___1-dkI",
+  "recipient-idents": "recipient__recipient-idents___3F3zL",
+  "recipient-status-icon": "recipient__recipient-status-icon___1GvS9",
+  "recipient-user": "recipient__recipient-user___3hOyK",
+  "recipient-details": "recipient__recipient-details___3fmFE",
+  "avatar": "recipient__avatar___2NIEb",
+  "link-recipient-icon-circle": "recipient__link-recipient-icon-circle___3gmgy",
+  "recipients-avatars": "recipient__recipients-avatars___MXhiL",
+  "--interactive": "recipient__--interactive___1gDjM",
+  "recipients-avatars--link": "recipient__recipients-avatars--link___2s02h",
+  "recipients-avatars--plusX": "recipient__recipients-avatars--plusX___WRllr",
+  "recipients-avatars--avatar": "recipient__recipients-avatars--avatar___3j3_A",
+  "spin": "recipient__spin___3_Uja",
+  "shake": "recipient__shake___TrWC0"
 };
 
 var Identity = function Identity(_ref) {