cozy-sharing 13.1.2 → 13.2.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [13.2.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@13.1.2...cozy-sharing@13.2.0) (2024-04-18)
+
+
+### Bug Fixes
+
+* Only show add email suggestion when we can't send an email ([9212597](https://github.com/cozy/cozy-libs/commit/92125976900b939e985330682f9375ce22f2ab42))
+
+
+### Features
+
+* Allow to add empty group ([a16f535](https://github.com/cozy/cozy-libs/commit/a16f535008a4dbe9426ee026acdbd413280585dd))
+
+
+
+
+
 ## [13.1.2](https://github.com/cozy/cozy-libs/compare/cozy-sharing@13.1.1...cozy-sharing@13.1.2) (2024-04-17)
 
 

package/dist/components/Recipient/GroupRecipientDetail.js

@@ -1,5 +1,8 @@
 import React from 'react';
+import { useClient, generateWebLink } from 'cozy-client';
+import Buttons from 'cozy-ui/transpiled/react/Buttons';
 import { Dialog } from 'cozy-ui/transpiled/react/CozyDialogs';
+import Empty from 'cozy-ui/transpiled/react/Empty';
 import Typography from 'cozy-ui/transpiled/react/Typography';
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import { GroupRecipientDetailWithAccess } from './GroupRecipientDetailWithAccess';
@@ -11,6 +14,7 @@ var GroupRecipientDetail = function GroupRecipientDetail(_ref) {
       members = _ref.members,
       onClose = _ref.onClose,
       isOwner = _ref.isOwner;
+  var client = useClient();
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
@@ -22,6 +26,12 @@ var GroupRecipientDetail = function GroupRecipientDetail(_ref) {
     return ['revoked', 'mail-not-sent'].includes(member.status);
   });
   var ownerName = owner.public_name;
+  var contactsLink = generateWebLink({
+    cozyUrl: client.getStackClient().uri,
+    slug: 'contacts',
+    pathname: '/',
+    subDomainType: client.getInstanceOptions().subdomain
+  });
   return /*#__PURE__*/React.createElement(Dialog, {
     open: true,
     size: "small",
@@ -33,7 +43,16 @@ var GroupRecipientDetail = function GroupRecipientDetail(_ref) {
     })) : null),
     content: /*#__PURE__*/React.createElement("div", {
       className: "u-flex u-stack-xs u-flex-column"
-    }, withAccess.length > 0 ? /*#__PURE__*/React.createElement(GroupRecipientDetailWithAccess, {
+    }, members.length === 0 ? /*#__PURE__*/React.createElement(Empty, {
+      text: t('GroupRecipientDetail.empty.content')
+    }, /*#__PURE__*/React.createElement(Buttons, {
+      component: "a",
+      className: "u-mt-1",
+      href: contactsLink,
+      target: "_blank",
+      rel: "noopener noreferrer",
+      label: t('GroupRecipientDetail.empty.action')
+    })) : null, withAccess.length > 0 ? /*#__PURE__*/React.createElement(GroupRecipientDetailWithAccess, {
       withAccess: withAccess
     }) : null, withoutAccess.length > 0 ? /*#__PURE__*/React.createElement(GroupRecipientDetailWithoutAccess, {
       withoutAccess: withoutAccess,

package/dist/components/Recipient/GroupRecipientDetailWithoutAccess.js

@@ -41,7 +41,7 @@ var GroupRecipientDetailWithoutAccess = function GroupRecipientDetailWithoutAcce
         style: {
           marginRight: '0.25rem'
         }
-      }) : null, t("GroupRecipientDetail.withoutAccess.status.".concat(recipient.status)), isOwner ? " - ".concat(t('GroupRecipientDetail.withoutAccess.addEmail')) : null)
+      }) : null, t("GroupRecipientDetail.withoutAccess.status.".concat(recipient.status)), isOwner && recipient.status === 'mail-not-sent' ? " - ".concat(t('GroupRecipientDetail.withoutAccess.addEmail')) : null)
     }));
   })));
 };

package/dist/components/ShareRecipientsInput.js

@@ -11,7 +11,7 @@ import { useQueryAll, isQueryLoading } from 'cozy-client';
 import flag from 'cozy-flags';
 import ShareAutosuggest from './ShareAutosuggest';
 import { getContactsFromGroupId } from '../helpers/contacts';
-import { buildReachableContactsQuery, buildContactGroupsByIdsQuery, buildUnreachableContactsWithGroupsQuery } from '../queries/queries';
+import { buildReachableContactsQuery, buildContactGroupsQuery, 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.
@@ -30,20 +30,14 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
   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;
-
-    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 contactGroupsQuery = buildContactGroupsQuery();
+  var contactGroupsResult = useQueryAll(contactGroupsQuery.definition, contactGroupsQuery.options);
+  var isLoading = isQueryLoading(reachableContactsResult) || reachableContactsResult.hasMore || isQueryLoading(contactGroupsResult) || contactGroupsResult.hasMore || flag('sharing.show-recipient-groups') && (isQueryLoading(unreachableContactsWithGroupsResult) || unreachableContactsWithGroupsResult.hasMore);
   var currentRecipientGroups = currentRecipients.map(function (_ref2) {
     var id = _ref2.id;
     return id;
   }).filter(Boolean);
-  var contactGroups = (contactGroupsByIdsResult.data || []).filter(function (_ref3) {
+  var contactGroups = (contactGroupsResult.data || []).filter(function (_ref3) {
     var _id = _ref3._id;
     return !flag('sharing.show-recipient-groups') || !currentRecipientGroups.includes(_id);
   }).map(function (contactGroup) {

package/dist/components/ShareRecipientsInput.spec.js

@@ -44,7 +44,7 @@ describe('ShareRecipientsInput component', function () {
           doctype: 'io.cozy.contacts',
           data: contacts
         },
-        'io.cozy.contacts.groups/by-ids/fe86af20-c6c5': {
+        'io.cozy.contacts.groups': {
           doctype: 'io.cozy.contacts.groups',
           data: contactGroups
         },

package/dist/queries/queries.js

@@ -53,13 +53,12 @@ export var buildReachableContactsQuery = function buildReachableContactsQuery()
     }
   };
 };
-export var buildContactGroupsByIdsQuery = function buildContactGroupsByIdsQuery(ids) {
+export var buildContactGroupsQuery = function buildContactGroupsQuery() {
   return {
-    definition: Q(Group.doctype).getByIds(ids),
+    definition: Q(Group.doctype),
     options: {
-      as: "io.cozy.contacts.groups/by-ids/".concat(ids.join('/')),
-      fetchPolicy: defaultFetchPolicy,
-      enabled: ids.length > 0
+      as: "io.cozy.contacts.groups",
+      fetchPolicy: defaultFetchPolicy
     }
   };
 };

package/locales/en.json

@@ -30,7 +30,7 @@
     },
     "create-cozy": "Create my cozy",
     "members": {
-      "count": "1 member |||| %{smart_count} members",
+      "count": "%{smart_count} member |||| %{smart_count} members",
       "others": "and 1 other… |||| and %{smart_count} others…",
       "otherContacts": "other contact |||| other contacts"
     },
@@ -400,6 +400,10 @@
   },
   "GroupRecipientDetail": {
     "subtitle": "Managed by %{ownerName}",
+    "empty": {
+      "content": "Your contact group is empty! Quickly add members to start sharing your valuable documents with them!",
+      "action": "Open Contacts"
+    },
     "withAccess": {
       "title": "Access to item"
     },

package/locales/fr.json

@@ -30,7 +30,7 @@
     },
     "create-cozy": "Créer mon Cozy",
     "members": {
-      "count": "1 membre |||| %{smart_count} membres",
+      "count": "%{smart_count} membre |||| %{smart_count} membres",
       "others": "et 1 autre… |||| et %{smart_count} autres…",
       "otherContacts": "autre contact |||| autres contacts"
     },
@@ -398,6 +398,10 @@
   },
   "GroupRecipientDetail": {
     "subtitle": "Géré par %{ownerName}",
+    "empty": {
+      "content": "Votre groupe de contacts est vide ! Ajoutez rapidement des membres pour commencer à leur partager vos précieux documents !",
+      "action": "Ouvrir Contacts"
+    },
     "withAccess": {
       "title": "Accès à l’élément"
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "13.1.2",
+  "version": "13.2.0",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -71,5 +71,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "9fc3693859a59637e1bfb34d8a69f67e168a3811"
+  "gitHead": "bbc3235a02eab7e59b21a739816258618fffdf86"
 }

package/src/components/Recipient/GroupRecipientDetail.jsx

@@ -1,6 +1,9 @@
 import React from 'react'
 
+import { useClient, generateWebLink } from 'cozy-client'
+import Buttons from 'cozy-ui/transpiled/react/Buttons'
 import { Dialog } from 'cozy-ui/transpiled/react/CozyDialogs'
+import Empty from 'cozy-ui/transpiled/react/Empty'
 import Typography from 'cozy-ui/transpiled/react/Typography'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
@@ -8,6 +11,7 @@ import { GroupRecipientDetailWithAccess } from './GroupRecipientDetailWithAccess
 import { GroupRecipientDetailWithoutAccess } from './GroupRecipientDetailWithoutAccess'
 
 const GroupRecipientDetail = ({ name, owner, members, onClose, isOwner }) => {
+  const client = useClient()
   const { t } = useI18n()
   const withAccess = members.filter(
     member => !['revoked', 'mail-not-sent'].includes(member.status)
@@ -17,6 +21,12 @@ const GroupRecipientDetail = ({ name, owner, members, onClose, isOwner }) => {
   )
 
   const ownerName = owner.public_name
+  const contactsLink = generateWebLink({
+    cozyUrl: client.getStackClient().uri,
+    slug: 'contacts',
+    pathname: '/',
+    subDomainType: client.getInstanceOptions().subdomain
+  })
 
   return (
     <Dialog
@@ -35,6 +45,18 @@ const GroupRecipientDetail = ({ name, owner, members, onClose, isOwner }) => {
       }
       content={
         <div className="u-flex u-stack-xs u-flex-column">
+          {members.length === 0 ? (
+            <Empty text={t('GroupRecipientDetail.empty.content')}>
+              <Buttons
+                component="a"
+                className="u-mt-1"
+                href={contactsLink}
+                target="_blank"
+                rel="noopener noreferrer"
+                label={t('GroupRecipientDetail.empty.action')}
+              />
+            </Empty>
+          ) : null}
           {withAccess.length > 0 ? (
             <GroupRecipientDetailWithAccess withAccess={withAccess} />
           ) : null}

package/src/components/Recipient/GroupRecipientDetailWithoutAccess.jsx

@@ -48,7 +48,7 @@ const GroupRecipientDetailWithoutAccess = ({ withoutAccess, isOwner }) => {
                     {t(
                       `GroupRecipientDetail.withoutAccess.status.${recipient.status}`
                     )}
-                    {isOwner
+                    {isOwner && recipient.status === 'mail-not-sent'
                       ? ` - ${t('GroupRecipientDetail.withoutAccess.addEmail')}`
                       : null}
                   </div>

package/src/components/ShareRecipientsInput.jsx

@@ -8,7 +8,7 @@ import ShareAutosuggest from './ShareAutosuggest'
 import { getContactsFromGroupId } from '../helpers/contacts'
 import {
   buildReachableContactsQuery,
-  buildContactGroupsByIdsQuery,
+  buildContactGroupsQuery,
   buildUnreachableContactsWithGroupsQuery
 } from '../queries/queries'
 
@@ -40,25 +40,17 @@ const ShareRecipientsInput = ({
     }
   )
 
-  const contactGroupsByIdsQuery = buildContactGroupsByIdsQuery([
-    ...new Set(
-      (reachableContactsResult.data || []).flatMap(contact => {
-        return (contact.relationships?.groups?.data || []).map(
-          group => group._id
-        )
-      })
-    )
-  ])
-  const contactGroupsByIdsResult = useQueryAll(
-    contactGroupsByIdsQuery.definition,
-    contactGroupsByIdsQuery.options
+  const contactGroupsQuery = buildContactGroupsQuery()
+  const contactGroupsResult = useQueryAll(
+    contactGroupsQuery.definition,
+    contactGroupsQuery.options
   )
 
   const isLoading =
     isQueryLoading(reachableContactsResult) ||
     reachableContactsResult.hasMore ||
-    isQueryLoading(contactGroupsByIdsResult) ||
-    contactGroupsByIdsResult.hasMore ||
+    isQueryLoading(contactGroupsResult) ||
+    contactGroupsResult.hasMore ||
     (flag('sharing.show-recipient-groups') &&
       (isQueryLoading(unreachableContactsWithGroupsResult) ||
         unreachableContactsWithGroupsResult.hasMore))
@@ -66,7 +58,7 @@ const ShareRecipientsInput = ({
   const currentRecipientGroups = currentRecipients
     .map(({ id }) => id)
     .filter(Boolean)
-  const contactGroups = (contactGroupsByIdsResult.data || [])
+  const contactGroups = (contactGroupsResult.data || [])
     .filter(
       ({ _id }) =>
         !flag('sharing.show-recipient-groups') ||

package/src/components/ShareRecipientsInput.spec.jsx

@@ -45,7 +45,7 @@ describe('ShareRecipientsInput component', () => {
           doctype: 'io.cozy.contacts',
           data: contacts
         },
-        'io.cozy.contacts.groups/by-ids/fe86af20-c6c5': {
+        'io.cozy.contacts.groups': {
           doctype: 'io.cozy.contacts.groups',
           data: contactGroups
         },

package/src/queries/queries.js

@@ -59,12 +59,11 @@ export const buildReachableContactsQuery = () => ({
   }
 })
 
-export const buildContactGroupsByIdsQuery = ids => ({
-  definition: Q(Group.doctype).getByIds(ids),
+export const buildContactGroupsQuery = () => ({
+  definition: Q(Group.doctype),
   options: {
-    as: `io.cozy.contacts.groups/by-ids/${ids.join('/')}`,
-    fetchPolicy: defaultFetchPolicy,
-    enabled: ids.length > 0
+    as: `io.cozy.contacts.groups`,
+    fetchPolicy: defaultFetchPolicy
   }
 })