cozy-sharing 10.2.0 → 10.3.0

package/src/components/WhoHasAccess.jsx

@@ -6,9 +6,8 @@ import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
 import LinkRecipient from './Recipient/LinkRecipient'
 import OwnerRecipient from './Recipient/OwnerRecipient'
-import Recipient from './Recipient/Recipient'
+import { RecipientList } from './Recipient/RecipientList'
 import { usePrevious } from '../helpers/hooks'
-import { filterAndReworkRecipients } from '../helpers/recipients'
 
 /**
  * Displays a warning if some contacts are waiting for confirmation of their sharing
@@ -43,15 +42,8 @@ const WhoHasAccess = ({
   onRevokeLink
 }) => {
   const previousLink = usePrevious(link)
-  const previousRecipients = usePrevious(recipients)
-
   const linkHasBeenJustCreated = link && previousLink === null
 
-  const recipientsToDisplay = filterAndReworkRecipients(
-    recipients,
-    previousRecipients
-  )
-
   return (
     <div className={className}>
       <RecipientWaitingForConfirmationAlert
@@ -74,26 +66,16 @@ const WhoHasAccess = ({
 
         <OwnerRecipient recipients={recipients} />
 
-        {recipientsToDisplay.map(recipient => {
-          const recipientConfirmationData = recipientsToBeConfirmed.find(
-            user => user.email === recipient.email
-          )
-
-          return (
-            <Recipient
-              {...recipient}
-              key={`key_r_${recipient.index}`}
-              isOwner={isOwner}
-              document={document}
-              documentType={documentType}
-              onRevoke={onRevoke}
-              onRevokeSelf={onRevokeSelf}
-              recipientConfirmationData={recipientConfirmationData}
-              verifyRecipient={verifyRecipient}
-              fadeIn={recipient.hasBeenJustAdded}
-            />
-          )
-        })}
+        <RecipientList
+          recipients={recipients}
+          recipientsToBeConfirmed={recipientsToBeConfirmed}
+          isOwner={isOwner}
+          document={document}
+          documentType={documentType}
+          onRevoke={onRevoke}
+          onRevokeSelf={onRevokeSelf}
+          verifyRecipient={verifyRecipient}
+        />
       </List>
     </div>
   )

package/src/components/WhoHasAccessLight.jsx

@@ -3,7 +3,7 @@ import React from 'react'
 
 import RecipientPlusX from './Recipient/RecipientPlusX'
 import RecipientWithoutStatus from './Recipient/RecipientWithoutStatus'
-import styles from './recipient.styl'
+import styles from '../styles/recipient.styl'
 
 const MAX_DISPLAYED_RECIPIENTS = 2
 

package/src/{withLocales.jsx → hoc/withLocales.jsx}

@@ -3,8 +3,8 @@ import React from 'react'
 import { I18n, translate } from 'cozy-ui/transpiled/react/providers/I18n'
 
 const locales = {
-  en: require(`../locales/en.json`),
-  fr: require(`../locales/fr.json`)
+  en: require(`../../locales/en.json`),
+  fr: require(`../../locales/fr.json`)
 }
 
 /**

package/src/index.jsx

@@ -1,12 +1,14 @@
 import SharingProvider from './SharingProvider'
 import SharingContext from './context'
-import withLocales from './withLocales'
+import withLocales from './hoc/withLocales'
 
 export default SharingProvider
 
 export { SharingContext, withLocales }
 
 export { useSharingContext } from './hooks/useSharingContext'
+export { useFetchDocumentPath } from './hooks/useFetchDocumentPath'
+
 export { SharedDocument } from './SharedDocument'
 export { SharedStatus } from './SharedStatus'
 export { SharedBadge } from './SharedBadge'
@@ -14,12 +16,11 @@ export { SharingOwnerAvatar } from './SharingOwnerAvatar'
 export { SharedRecipients } from './SharedRecipients'
 export { SharedRecipientsList } from './SharedRecipientsList'
 export { ShareButton } from './ShareButton'
-export { ShareModal } from './ShareModal'
+export { ShareModal } from './components/ShareModal/ShareModal'
 export { RefreshableSharings } from './RefreshableSharings'
-export { useFetchDocumentPath } from './components/useFetchDocumentPath'
 export { CozyPassFingerprintDialogContent } from './components/CozyPassFingerprintDialogContent'
-export { SharingBannerPlugin } from './SharingBanner'
-export { useSharingInfos } from './SharingBanner/hooks/useSharingInfos'
+export { SharingBannerPlugin } from './components/SharingBanner'
+export { useSharingInfos } from './components/SharingBanner/hooks/useSharingInfos'
 export { ConfirmTrustedRecipientsDialog } from './ConfirmTrustedRecipientsDialog'
 export { ShareButtonWithRecipients } from './ShareButtonWithRecipients'
 export { DOCUMENT_TYPE } from './helpers/documentType'

package/src/{SharingBanner/components → styles}/publicBanner.styl

@@ -6,9 +6,9 @@
     img
         @extend $avatar
         @extend $circle
-        width rem(16)	  
-        height rem(16)	    
-        min-width rem(16)	
-        min-height rem(16)	
+        width rem(16)
+        height rem(16)
+        min-width rem(16)
+        min-height rem(16)
         font-size rem(7)
-        vertical-align text-bottom
+        vertical-align text-bottom

package/dist/ShareModal.js

@@ -1,50 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["document"];
-import omit from 'lodash/omit';
-import React from 'react';
-import { useLocation } from 'react-router';
-import { SharingDetailsModal } from './SharingDetailsModal';
-import EditableSharingModal from './components/EditableSharingModal';
-import SharingContext from './context';
-import withLocales from './withLocales';
-
-var SharingModal = function SharingModal(_ref) {
-  var document = _ref.document,
-      rest = _objectWithoutProperties(_ref, _excluded);
-
-  return /*#__PURE__*/React.createElement(SharingContext.Consumer, null, function (_ref2) {
-    var documentType = _ref2.documentType,
-        getOwner = _ref2.getOwner,
-        getSharingType = _ref2.getSharingType,
-        getRecipients = _ref2.getRecipients,
-        revokeSelf = _ref2.revokeSelf;
-    return /*#__PURE__*/React.createElement(SharingDetailsModal, _extends({
-      document: document,
-      documentType: documentType,
-      owner: getOwner(document.id),
-      sharingType: getSharingType(document.id),
-      recipients: getRecipients(document.id),
-      onRevoke: revokeSelf
-    }, rest));
-  });
-};
-
-export var ShareModal = withLocales(function (props) {
-  var _location$state;
-
-  var location = useLocation === null || useLocation === void 0 ? void 0 : useLocation();
-  var locationProps = location === null || location === void 0 || (_location$state = location.state) === null || _location$state === void 0 ? void 0 : _location$state.modalProps;
-  var document = (locationProps === null || locationProps === void 0 ? void 0 : locationProps.document) || props.document;
-  var rest = omit(locationProps || props, 'document');
-  return /*#__PURE__*/React.createElement(SharingContext.Consumer, null, function (_ref3) {
-    var byDocId = _ref3.byDocId,
-        isOwner = _ref3.isOwner,
-        canReshare = _ref3.canReshare;
-    return !byDocId[document.id] || isOwner(document.id) || canReshare(document.id) ? /*#__PURE__*/React.createElement(EditableSharingModal, _extends({
-      document: document
-    }, rest)) : /*#__PURE__*/React.createElement(SharingModal, _extends({
-      document: document
-    }, rest));
-  });
-});

package/src/ShareModal.jsx

@@ -1,51 +0,0 @@
-import omit from 'lodash/omit'
-import React from 'react'
-import { useLocation } from 'react-router'
-
-import { SharingDetailsModal } from './SharingDetailsModal'
-import EditableSharingModal from './components/EditableSharingModal'
-import SharingContext from './context'
-import withLocales from './withLocales'
-
-const SharingModal = ({ document, ...rest }) => (
-  <SharingContext.Consumer>
-    {({
-      documentType,
-      getOwner,
-      getSharingType,
-      getRecipients,
-      revokeSelf
-    }) => (
-      <SharingDetailsModal
-        document={document}
-        documentType={documentType}
-        owner={getOwner(document.id)}
-        sharingType={getSharingType(document.id)}
-        recipients={getRecipients(document.id)}
-        onRevoke={revokeSelf}
-        {...rest}
-      />
-    )}
-  </SharingContext.Consumer>
-)
-
-export const ShareModal = withLocales(props => {
-  const location = useLocation?.()
-  const locationProps = location?.state?.modalProps
-  const document = locationProps?.document || props.document
-  const rest = omit(locationProps || props, 'document')
-
-  return (
-    <SharingContext.Consumer>
-      {({ byDocId, isOwner, canReshare }) =>
-        !byDocId[document.id] ||
-        isOwner(document.id) ||
-        canReshare(document.id) ? (
-          <EditableSharingModal document={document} {...rest} />
-        ) : (
-          <SharingModal document={document} {...rest} />
-        )
-      }
-    </SharingContext.Consumer>
-  )
-})