cozy-sharing 6.0.3 → 6.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "6.0.3",
+  "version": "6.0.5",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -61,5 +61,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "d999a80061d173dcf25e6715cad4db1cb032f38f"
+  "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(

package/src/components/badge.styl

@@ -1,4 +1,4 @@
-@require 'settings/palette.styl'
+palette=json('settings/palette.json', { hash: true })
 
 .shared-badge
     display flex
@@ -8,7 +8,8 @@
     background-clip padding-box
 
     &.--small
-        border .125rem solid var(--white)
+        border .125rem solid 
+        border-color: palette['white']
         width 1.5rem
         height 1.5rem
 
@@ -17,7 +18,8 @@
             height .75rem
 
     &.--xsmall
-        border .0625rem solid var(--white)
+        border .0625rem solid 
+        border-color: palette['white']
         width .75rem
         height .75rem
 
@@ -26,7 +28,7 @@
             height .375rem
 
     &.--by-me
-        background-color var(--emerald)
+        background-color: palette['emerald']
 
     &.--with-me
-        background-color #9169F2
+        background-color: palette['portage']

package/src/components/button.styl

@@ -1,23 +1,22 @@
-@require 'settings/palette.styl'
-
+palette=json('settings/palette.json', { hash: true })
 .coz-btn-shared
-    border-color     var(--emerald)
-    background-color var(--emerald)
-    color            var(--white)
+    border-color: palette['emerald']
+    background-color: palette['emerald']
+    color: palette['white']
     transition all .2s ease-out
 
     &:focus
     &:not([disabled]):not([aria-disabled=true]):hover
-        border-color var(--malachite)
-        background-color var(--malachite)
+        border-color: palette['malachite']
+        background-color: palette['malachite']
 
 .coz-btn-sharedWithMe
-    border-color     var(--lightishPurple)
-    background-color var(--lightishPurple)
-    color            var(--white)
+    border-color: palette['lightishPurple']
+    background-color: palette['lightishPurple']
+    color: palette['white']
     transition all .2s ease-out
 
     &:focus
     &:not([disabled]):not([aria-disabled=true]):hover
-        border-color var(--barney)
-        background-color var(--barney)
+        border-color: palette['barney']
+        background-color: palette['barney']