cozy-sharing 6.0.4 → 6.0.5

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.5](https://github.com/cozy/cozy-libs/compare/cozy-sharing@6.0.4...cozy-sharing@6.0.5) (2023-03-07)
+
+
+### Bug Fixes
+
+* Display always instance address as secondary text for owner ([f6c89cf](https://github.com/cozy/cozy-libs/commit/f6c89cf54d723d695f0afe0a9fe9ab44f236376e))
+* Display correctly owner recipient when receiving sharing ([49a1c5a](https://github.com/cozy/cozy-libs/commit/49a1c5ac6aa029be3217fef93ce3f7bce6e21019))
+
+
+
+
+
 ## [6.0.4](https://github.com/cozy/cozy-libs/compare/cozy-sharing@6.0.3...cozy-sharing@6.0.4) (2023-03-01)
 
 

package/dist/components/Recipient/OwnerRecipient.js

@@ -0,0 +1,22 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Recipient from './Recipient';
+import OwnerRecipientDefault from './OwnerRecipientDefault';
+
+var OwnerRecipient = function OwnerRecipient(_ref) {
+  var recipients = _ref.recipients;
+  var ownerRecipient = recipients.find(function (recipient) {
+    return recipient.status === 'owner';
+  });
+
+  if (ownerRecipient) {
+    return /*#__PURE__*/React.createElement(Recipient, ownerRecipient);
+  }
+
+  return /*#__PURE__*/React.createElement(OwnerRecipientDefault, null);
+};
+
+OwnerRecipient.propTypes = {
+  recipients: PropTypes.array.isRequired
+};
+export default OwnerRecipient;

package/dist/components/Recipient/OwnerRecipientDefault.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import { useClient, useQuery, hasQueryBeenLoaded } from 'cozy-client';
+import Recipient from './Recipient';
+import { buildInstanceSettingsQuery } from '../../queries/queries';
+
+var OwnerRecipientDefault = function OwnerRecipientDefault() {
+  var _instanceSettingsResu, _instanceSettingsResu2;
+
+  var client = useClient();
+  var instanceSettingsQuery = buildInstanceSettingsQuery();
+  var instanceSettingsResult = useQuery(instanceSettingsQuery.definition, instanceSettingsQuery.options);
+  return hasQueryBeenLoaded(instanceSettingsResult) && /*#__PURE__*/React.createElement(Recipient, {
+    isOwner: true,
+    status: "owner",
+    instance: client.options.uri,
+    public_name: instanceSettingsResult === null || instanceSettingsResult === void 0 ? void 0 : (_instanceSettingsResu = instanceSettingsResult.data) === null || _instanceSettingsResu === void 0 ? void 0 : (_instanceSettingsResu2 = _instanceSettingsResu.attributes) === null || _instanceSettingsResu2 === void 0 ? void 0 : _instanceSettingsResu2.public_name
+  });
+};
+
+export default OwnerRecipientDefault;

package/dist/components/Recipient/RecipientStatus.js

@@ -35,7 +35,7 @@ var RecipientStatus = function RecipientStatus(_ref) {
       t = _useI18n.t;
 
   var isSendingEmail = !isMe && status === 'mail-not-sent';
-  var isReady = isMe || status === 'ready';
+  var isReady = isMe || status === 'ready' || status === 'owner';
   var text, icon;
 
   if (isReady) {

package/dist/components/ShareDialogCozyToCozy.spec.js

@@ -19,7 +19,14 @@ jest.mock('cozy-client', function () {
         public_name: 'Alice'
       }
     }),
-    hasQueryBeenLoaded: jest.fn().mockReturnValue(true)
+    hasQueryBeenLoaded: jest.fn().mockReturnValue(true),
+    useClient: function useClient() {
+      return {
+        options: {
+          uri: mockRecipientAlice.instance
+        }
+      };
+    }
   });
 });
 describe('ShareDialogCozyToCozy', function () {
@@ -66,9 +73,9 @@ describe('ShareDialogCozyToCozy', function () {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   resolve([{
-                    name: recipientBob.public_name,
+                    name: mockRecipientBob.public_name,
                     id: 'SOME_ID',
-                    email: recipientBob.email
+                    email: mockRecipientBob.email
                   }]);
                   _context.next = 3;
                   return promise;
@@ -111,9 +118,9 @@ describe('ShareDialogCozyToCozy', function () {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
                   resolve([{
-                    name: recipientBob.public_name,
+                    name: mockRecipientBob.public_name,
                     id: 'SOME_ID',
-                    email: recipientBob.email
+                    email: mockRecipientBob.email
                   }]);
                   _context3.next = 3;
                   return promise;
@@ -157,13 +164,13 @@ describe('ShareDialogCozyToCozy', function () {
               while (1) switch (_context5.prev = _context5.next) {
                 case 0:
                   resolve([{
-                    name: recipientBob.public_name,
+                    name: mockRecipientBob.public_name,
                     id: 'SOME_ID',
-                    email: recipientBob.email
+                    email: mockRecipientBob.email
                   }, {
-                    name: recipientClaude.public_name,
+                    name: mockRecipientClaude.public_name,
                     id: 'SOME_OTHER_ID',
-                    email: recipientClaude.email
+                    email: mockRecipientClaude.email
                   }]);
                   _context5.next = 3;
                   return promise;
@@ -253,9 +260,9 @@ describe('ShareDialogCozyToCozy', function () {
               while (1) switch (_context9.prev = _context9.next) {
                 case 0:
                   resolve([{
-                    name: recipientBob.public_name,
+                    name: mockRecipientBob.public_name,
                     id: 'SOME_ID',
-                    email: recipientBob.email,
+                    email: mockRecipientBob.email,
                     fingerprintPhrase: 'SOME_FINGERPRINT_PHRASE'
                   }]);
                   _context9.next = 3;
@@ -301,7 +308,7 @@ describe('ShareDialogCozyToCozy', function () {
           })));
 
         case 12:
-          expect(getByText("Do you really want to reject contact ".concat(recipientBob.public_name, " (").concat(recipientBob.email, ")?"))).toBeTruthy();
+          expect(getByText("Do you really want to reject contact ".concat(mockRecipientBob.public_name, " (").concat(mockRecipientBob.email, ")?"))).toBeTruthy();
           confirmRejectButton = getByText('Reject');
           _context13.next = 16;
           return act( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
@@ -327,7 +334,7 @@ describe('ShareDialogCozyToCozy', function () {
     }, _callee13);
   })));
 });
-var recipientAlice = {
+var mockRecipientAlice = {
   status: 'owner',
   public_name: 'Alice',
   email: 'me@alice.cozy.localhost',
@@ -337,7 +344,7 @@ var recipientAlice = {
   index: 0,
   avatarPath: '/sharings/SOME_SHARING_ID/recipients/0/avatar'
 };
-var recipientBob = {
+var mockRecipientBob = {
   status: 'ready',
   public_name: 'Claude',
   email: 'me@claude.cozy.localhost',
@@ -347,7 +354,7 @@ var recipientBob = {
   index: 1,
   avatarPath: '/sharings/SOME_SHARING_ID/recipients/1/avatar'
 };
-var recipientClaude = {
+var mockRecipientClaude = {
   status: 'ready',
   public_name: 'Bob',
   email: 'me@bob.cozy.localhost',
@@ -446,7 +453,7 @@ var getMockProps = function getMockProps() {
     isOwner: true,
     link: null,
     permissions: [],
-    recipients: [recipientAlice, recipientBob, recipientClaude, {
+    recipients: [mockRecipientAlice, mockRecipientBob, mockRecipientClaude, {
       status: 'pending',
       email: 'me@ben.cozy.localhost',
       type: 'two-way',

package/dist/components/WhoHasAccess.js

@@ -1,14 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useClient, useQuery, hasQueryBeenLoaded } from 'cozy-client';
 import Recipient from './Recipient/Recipient';
 import LinkRecipient from './Recipient/LinkRecipient';
 import { useI18n } from 'cozy-ui/transpiled/react/I18n';
 import List from 'cozy-ui/transpiled/react/MuiCozyTheme/List';
-import { buildInstanceSettingsQuery } from '../queries/queries';
 import { filterAndReworkRecipients } from '../helpers/recipients';
 import { usePrevious } from '../helpers/hooks';
+import OwnerRecipient from './Recipient/OwnerRecipient';
 /**
  * Displays a warning if some contacts are waiting for confirmation of their sharing
  *
@@ -31,8 +30,6 @@ var RecipientWaitingForConfirmationAlert = function RecipientWaitingForConfirmat
 };
 
 var WhoHasAccess = function WhoHasAccess(_ref2) {
-  var _instanceSettingsResu, _instanceSettingsResu2;
-
   var _ref2$isOwner = _ref2.isOwner,
       isOwner = _ref2$isOwner === void 0 ? false : _ref2$isOwner,
       recipients = _ref2.recipients,
@@ -48,14 +45,10 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
       permissions = _ref2.permissions,
       onUpdateShareLinkPermissions = _ref2.onUpdateShareLinkPermissions,
       onRevokeLink = _ref2.onRevokeLink;
-  var client = useClient();
-  var instanceSettingsQuery = buildInstanceSettingsQuery();
-  var instanceSettingsResult = useQuery(instanceSettingsQuery.definition, instanceSettingsQuery.options);
   var previousLink = usePrevious(link);
   var previousRecipients = usePrevious(recipients);
   var linkHasBeenJustCreated = link && previousLink === null;
   var recipientsToDisplay = filterAndReworkRecipients(recipients, previousRecipients);
-  var public_name = instanceSettingsResult === null || instanceSettingsResult === void 0 ? void 0 : (_instanceSettingsResu = instanceSettingsResult.data) === null || _instanceSettingsResu === void 0 ? void 0 : (_instanceSettingsResu2 = _instanceSettingsResu.attributes) === null || _instanceSettingsResu2 === void 0 ? void 0 : _instanceSettingsResu2.public_name;
   return /*#__PURE__*/React.createElement("div", {
     className: className
   }, /*#__PURE__*/React.createElement(RecipientWaitingForConfirmationAlert, {
@@ -72,11 +65,8 @@ var WhoHasAccess = function WhoHasAccess(_ref2) {
     onChangePermissions: onUpdateShareLinkPermissions,
     onDisable: onRevokeLink,
     fadeIn: linkHasBeenJustCreated
-  }), hasQueryBeenLoaded(instanceSettingsResult) && /*#__PURE__*/React.createElement(Recipient, {
-    isOwner: true,
-    status: "owner",
-    instance: client.options.uri,
-    public_name: public_name
+  }), /*#__PURE__*/React.createElement(OwnerRecipient, {
+    recipients: recipients
   }), recipientsToDisplay.map(function (recipient) {
     var recipientConfirmationData = recipientsToBeConfirmed.find(function (user) {
       return user.email === recipient.email;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -61,5 +61,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "cb40ff1333287ec2f4e7c8409247eaeb6b8f9ade"
+  "gitHead": "5198837dbb9f5ee395cbb67746b749ecd1121e45"
 }

package/src/components/Recipient/OwnerRecipient.jsx

@@ -0,0 +1,23 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+
+import Recipient from './Recipient'
+import OwnerRecipientDefault from './OwnerRecipientDefault'
+
+const OwnerRecipient = ({ recipients }) => {
+  const ownerRecipient = recipients.find(
+    recipient => recipient.status === 'owner'
+  )
+
+  if (ownerRecipient) {
+    return <Recipient {...ownerRecipient} />
+  }
+
+  return <OwnerRecipientDefault />
+}
+
+OwnerRecipient.propTypes = {
+  recipients: PropTypes.array.isRequired
+}
+
+export default OwnerRecipient

package/src/components/Recipient/OwnerRecipientDefault.jsx

@@ -0,0 +1,29 @@
+import React from 'react'
+
+import { useClient, useQuery, hasQueryBeenLoaded } from 'cozy-client'
+
+import Recipient from './Recipient'
+import { buildInstanceSettingsQuery } from '../../queries/queries'
+
+const OwnerRecipientDefault = () => {
+  const client = useClient()
+
+  const instanceSettingsQuery = buildInstanceSettingsQuery()
+  const instanceSettingsResult = useQuery(
+    instanceSettingsQuery.definition,
+    instanceSettingsQuery.options
+  )
+
+  return (
+    hasQueryBeenLoaded(instanceSettingsResult) && (
+      <Recipient
+        isOwner={true}
+        status="owner"
+        instance={client.options.uri}
+        public_name={instanceSettingsResult?.data?.attributes?.public_name}
+      />
+    )
+  )
+}
+
+export default OwnerRecipientDefault

package/src/components/Recipient/RecipientStatus.jsx

@@ -14,7 +14,7 @@ const RecipientStatus = ({ status, isMe, instance }) => {
   const { t } = useI18n()
 
   const isSendingEmail = !isMe && status === 'mail-not-sent'
-  const isReady = isMe || status === 'ready'
+  const isReady = isMe || status === 'ready' || status === 'owner'
   let text, icon
   if (isReady) {
     text = instance

package/src/components/ShareDialogCozyToCozy.spec.jsx

@@ -8,7 +8,8 @@ import { act, render, fireEvent } from '@testing-library/react'
 jest.mock('cozy-client', () => ({
   ...jest.requireActual('cozy-client'),
   useQuery: jest.fn().mockReturnValue({ data: { public_name: 'Alice' } }),
-  hasQueryBeenLoaded: jest.fn().mockReturnValue(true)
+  hasQueryBeenLoaded: jest.fn().mockReturnValue(true),
+  useClient: () => ({ options: { uri: mockRecipientAlice.instance } })
 }))
 
 describe('ShareDialogCozyToCozy', () => {
@@ -54,9 +55,9 @@ describe('ShareDialogCozyToCozy', () => {
     await act(async () => {
       resolve([
         {
-          name: recipientBob.public_name,
+          name: mockRecipientBob.public_name,
           id: 'SOME_ID',
-          email: recipientBob.email
+          email: mockRecipientBob.email
         }
       ])
       await promise
@@ -81,9 +82,9 @@ describe('ShareDialogCozyToCozy', () => {
     await act(async () => {
       resolve([
         {
-          name: recipientBob.public_name,
+          name: mockRecipientBob.public_name,
           id: 'SOME_ID',
-          email: recipientBob.email
+          email: mockRecipientBob.email
         }
       ])
       await promise
@@ -111,14 +112,14 @@ describe('ShareDialogCozyToCozy', () => {
     await act(async () => {
       resolve([
         {
-          name: recipientBob.public_name,
+          name: mockRecipientBob.public_name,
           id: 'SOME_ID',
-          email: recipientBob.email
+          email: mockRecipientBob.email
         },
         {
-          name: recipientClaude.public_name,
+          name: mockRecipientClaude.public_name,
           id: 'SOME_OTHER_ID',
-          email: recipientClaude.email
+          email: mockRecipientClaude.email
         }
       ])
       await promise
@@ -173,9 +174,9 @@ describe('ShareDialogCozyToCozy', () => {
     await act(async () => {
       resolve([
         {
-          name: recipientBob.public_name,
+          name: mockRecipientBob.public_name,
           id: 'SOME_ID',
-          email: recipientBob.email,
+          email: mockRecipientBob.email,
           fingerprintPhrase: 'SOME_FINGERPRINT_PHRASE'
         }
       ])
@@ -192,7 +193,7 @@ describe('ShareDialogCozyToCozy', () => {
 
     expect(
       getByText(
-        `Do you really want to reject contact ${recipientBob.public_name} (${recipientBob.email})?`
+        `Do you really want to reject contact ${mockRecipientBob.public_name} (${mockRecipientBob.email})?`
       )
     ).toBeTruthy()
 
@@ -203,7 +204,7 @@ describe('ShareDialogCozyToCozy', () => {
   })
 })
 
-const recipientAlice = {
+const mockRecipientAlice = {
   status: 'owner',
   public_name: 'Alice',
   email: 'me@alice.cozy.localhost',
@@ -214,7 +215,7 @@ const recipientAlice = {
   avatarPath: '/sharings/SOME_SHARING_ID/recipients/0/avatar'
 }
 
-const recipientBob = {
+const mockRecipientBob = {
   status: 'ready',
   public_name: 'Claude',
   email: 'me@claude.cozy.localhost',
@@ -225,7 +226,7 @@ const recipientBob = {
   avatarPath: '/sharings/SOME_SHARING_ID/recipients/1/avatar'
 }
 
-const recipientClaude = {
+const mockRecipientClaude = {
   status: 'ready',
   public_name: 'Bob',
   email: 'me@bob.cozy.localhost',
@@ -333,9 +334,9 @@ const getMockProps = () => {
     link: null,
     permissions: [],
     recipients: [
-      recipientAlice,
-      recipientBob,
-      recipientClaude,
+      mockRecipientAlice,
+      mockRecipientBob,
+      mockRecipientClaude,
       {
         status: 'pending',
         email: 'me@ben.cozy.localhost',

package/src/components/WhoHasAccess.jsx

@@ -1,14 +1,13 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { useClient, useQuery, hasQueryBeenLoaded } from 'cozy-client'
 import Recipient from './Recipient/Recipient'
 import LinkRecipient from './Recipient/LinkRecipient'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import List from 'cozy-ui/transpiled/react/MuiCozyTheme/List'
 
-import { buildInstanceSettingsQuery } from '../queries/queries'
 import { filterAndReworkRecipients } from '../helpers/recipients'
 import { usePrevious } from '../helpers/hooks'
+import OwnerRecipient from './Recipient/OwnerRecipient'
 
 /**
  * Displays a warning if some contacts are waiting for confirmation of their sharing
@@ -42,14 +41,6 @@ const WhoHasAccess = ({
   onUpdateShareLinkPermissions,
   onRevokeLink
 }) => {
-  const client = useClient()
-
-  const instanceSettingsQuery = buildInstanceSettingsQuery()
-  const instanceSettingsResult = useQuery(
-    instanceSettingsQuery.definition,
-    instanceSettingsQuery.options
-  )
-
   const previousLink = usePrevious(link)
   const previousRecipients = usePrevious(recipients)
 
@@ -60,8 +51,6 @@ const WhoHasAccess = ({
     previousRecipients
   )
 
-  const public_name = instanceSettingsResult?.data?.attributes?.public_name
-
   return (
     <div className={className}>
       <RecipientWaitingForConfirmationAlert
@@ -82,14 +71,7 @@ const WhoHasAccess = ({
           />
         )}
 
-        {hasQueryBeenLoaded(instanceSettingsResult) && (
-          <Recipient
-            isOwner={true}
-            status="owner"
-            instance={client.options.uri}
-            public_name={public_name}
-          />
-        )}
+        <OwnerRecipient recipients={recipients} />
 
         {recipientsToDisplay.map(recipient => {
           const recipientConfirmationData = recipientsToBeConfirmed.find(