cozy-sharing 12.1.0 → 12.2.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [12.2.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@12.1.0...cozy-sharing@12.2.0) (2024-03-22)
+
+
+### Features
+
+* Allow to add group with only more than one member ([177dc4a](https://github.com/cozy/cozy-libs/commit/177dc4a4fbceefed1ce52f2a5275c67e46b6430f))
+
+
+
+
+
 # [12.1.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@12.0.0...cozy-sharing@12.1.0) (2024-03-22)
 
 

package/dist/components/ContactSuggestion.js

@@ -1,4 +1,3 @@
-import get from 'lodash/get';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { models } from 'cozy-client';
@@ -10,8 +9,7 @@ import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n';
 import { Contact, Group, getDisplayName, getInitials } from '../models';
 var ContactModel = models.contact;
 export var ContactSuggestion = function ContactSuggestion(_ref) {
-  var contactOrGroup = _ref.contactOrGroup,
-      contacts = _ref.contacts;
+  var contactOrGroup = _ref.contactOrGroup;
 
   var _useI18n = useI18n(),
       t = _useI18n.t;
@@ -20,19 +18,10 @@ export var ContactSuggestion = function ContactSuggestion(_ref) {
 
   if (contactOrGroup._type === Group.doctype) {
     name = contactOrGroup.name;
-    var membersCount = contacts.reduce(function (total, contact) {
-      if (get(contact, 'relationships.groups.data', []).map(function (group) {
-        return group._id;
-      }).includes(contactOrGroup._id)) {
-        return total + 1;
-      }
-
-      return total;
-    }, 0).toString();
+    avatarText = 'G';
     details = t('Share.members.count', {
-      smart_count: membersCount
+      smart_count: contactOrGroup.membersCount.toString()
     });
-    avatarText = 'G';
   } else {
     name = getDisplayName(contactOrGroup);
     avatarText = getInitials(contactOrGroup);

package/dist/components/ContactSuggestion.spec.js

@@ -1,21 +1,17 @@
-import { mount } from 'enzyme';
+import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { ContactSuggestion } from './ContactSuggestion';
 import AppLike from '../../test/AppLike';
-
-var WrappingComponent = function WrappingComponent(_ref) {
-  var children = _ref.children;
-  return /*#__PURE__*/React.createElement(AppLike, null, children);
-};
-
 describe('ContactSuggestion component', function () {
-  var fakeT = jest.fn(function (s, args) {
-    if (s === 'Share.members.count') {
-      return "".concat(args.smart_count, " members");
-    }
+  var setup = function setup(_ref) {
+    var contactOrGroup = _ref.contactOrGroup;
+    return render( /*#__PURE__*/React.createElement(ContactSuggestion, {
+      contactOrGroup: contactOrGroup
+    }), {
+      wrapper: AppLike
+    });
+  };
 
-    return s;
-  });
   it('should display contact suggestion for a contact', function () {
     var jonSnow = {
       _id: 'f3a4e501-abbd',
@@ -34,17 +30,11 @@ describe('ContactSuggestion component', function () {
       }],
       _type: 'io.cozy.contacts'
     };
-    var contacts = [jonSnow];
-    var props = {
-      contactOrGroup: jonSnow,
-      contacts: contacts,
-      t: fakeT
-    };
-    var jsx = /*#__PURE__*/React.createElement(ContactSuggestion, props);
-    var wrapper = mount(jsx, {
-      wrappingComponent: WrappingComponent
+    setup({
+      contactOrGroup: jonSnow
     });
-    expect(wrapper).toMatchSnapshot();
+    expect(screen.getByText('Jon Snow')).toBeInTheDocument();
+    expect(screen.getByText('https://jonsnow.mycozy.cloud')).toBeInTheDocument();
   });
   it('should display contact suggestion for a contact without fullname (for example created by a share modal)', function () {
     var jonSnow = {
@@ -57,94 +47,22 @@ describe('ContactSuggestion component', function () {
       name: undefined,
       _type: 'io.cozy.contacts'
     };
-    var contacts = [jonSnow];
-    var props = {
-      contactOrGroup: jonSnow,
-      contacts: contacts,
-      t: fakeT
-    };
-    var jsx = /*#__PURE__*/React.createElement(ContactSuggestion, props);
-    var wrapper = mount(jsx, {
-      wrappingComponent: WrappingComponent
+    setup({
+      contactOrGroup: jonSnow
     });
-    expect(wrapper).toMatchSnapshot();
+    expect(screen.getByText('jon.snow@email.com')).toBeInTheDocument();
   });
   it('should display contact suggestion for a group', function () {
-    var jon = {
-      _id: 'f3a4e501-abbd',
-      fullname: 'Jon Snow',
-      name: {
-        givenName: 'Jon',
-        familyName: 'Snow'
-      },
-      email: [{
-        address: 'jon.snow@email.com',
-        type: 'primary'
-      }],
-      _type: 'io.cozy.contacts',
-      relationships: {
-        groups: {
-          data: [{
-            _id: '610718e6-2d7a',
-            _type: 'io.cozy.contacts.groups'
-          }]
-        }
-      }
-    };
-    var cersei = {
-      _id: '42dc490a-7878',
-      fullname: 'Cersei Lannister',
-      name: {
-        givenName: 'Cersei',
-        familyName: 'Lannister'
-      },
-      email: [{
-        address: 'cersei@email.com',
-        type: 'primary'
-      }],
-      _type: 'io.cozy.contacts',
-      relationships: {
-        groups: {
-          data: []
-        }
-      }
-    };
-    var sam = {
-      _id: 'b5bed853-93da',
-      fullname: 'Samwell Tarly',
-      name: {
-        givenName: 'Samwell',
-        familyName: 'Tarly'
-      },
-      email: [{
-        address: 'samwell@email.com',
-        type: 'primary'
-      }],
-      _type: 'io.cozy.contacts',
-      relationships: {
-        groups: {
-          data: [{
-            _id: '610718e6-2d7a',
-            _type: 'io.cozy.contacts.groups'
-          }]
-        }
-      }
-    };
-    var contacts = [jon, cersei, sam];
     var theNightsWatch = {
       _id: '610718e6-2d7a',
       name: "The Night's Watch",
-      _type: 'io.cozy.contacts.groups'
-    };
-    var props = {
-      contactOrGroup: theNightsWatch,
-      contacts: contacts,
-      t: fakeT
+      _type: 'io.cozy.contacts.groups',
+      membersCount: 2
     };
-    var jsx = /*#__PURE__*/React.createElement(ContactSuggestion, props);
-    var wrapper = mount(jsx, {
-      wrappingComponent: WrappingComponent
+    setup({
+      contactOrGroup: theNightsWatch
     });
-    expect(wrapper).toMatchSnapshot();
+    expect(screen.getByText("The Night's Watch")).toBeInTheDocument();
+    expect(screen.getByText('2 members')).toBeInTheDocument();
   });
 });

package/dist/components/ShareAutosuggest.js

@@ -174,9 +174,6 @@ var ShareAutocomplete = function ShareAutocomplete(_ref) {
 
   var renderSuggestion = function renderSuggestion(contactOrGroup) {
     return /*#__PURE__*/React.createElement(ContactSuggestion, {
-      contacts: contactsAndGroups.filter(function (item) {
-        return item._type === Contact.doctype;
-      }),
       contactOrGroup: contactOrGroup
     });
   };

package/dist/components/ShareRecipientsInput.js

@@ -1,5 +1,12 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+import get from 'lodash/get';
 import PropTypes from 'prop-types';
 import React, { useState, useEffect } from 'react';
 import ShareAutosuggest from './ShareAutosuggest';
@@ -35,7 +42,22 @@ var ShareRecipientsInput = function ShareRecipientsInput(_ref) {
     if (contacts.hasMore || contacts.fetchStatus === 'loading') {
       return contacts.data;
     } else {
-      return [].concat(_toConsumableArray(contacts.data), _toConsumableArray(contactGroups.data));
+      var contactGroupsWithCount = contactGroups.data.map(function (contactGroup) {
+        return _objectSpread(_objectSpread({}, contactGroup), {}, {
+          membersCount: contacts.data.reduce(function (total, contact) {
+            if (get(contact, 'relationships.groups.data', []).map(function (group) {
+              return group._id;
+            }).includes(contactGroup._id)) {
+              return total + 1;
+            }
+
+            return total;
+          }, 0)
+        });
+      }).filter(function (contactGroup) {
+        return contactGroup.membersCount > 0;
+      });
+      return [].concat(_toConsumableArray(contacts.data), _toConsumableArray(contactGroupsWithCount));
     }
   };
 

package/dist/components/ShareRecipientsInput.spec.js

@@ -1,119 +1,210 @@
-import { shallow } from 'enzyme';
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { render, screen } from '@testing-library/react';
 import React from 'react';
 import ShareRecipientsInput from './ShareRecipientsInput';
-describe('ShareRecipientsInput component', function () {
-  it('should match snapshot', function () {
-    var props = {
-      client: '',
-      label: 'Recipients',
-      contacts: {
-        id: 'contacts',
-        fetchStatus: 'loaded',
-        hasMore: false,
-        data: [{
-          id: 'df563cc4-6440',
-          _id: 'df563cc4-6440',
-          _type: 'io.cozy.contacts',
-          name: {
-            givenName: 'Michale',
-            familyName: 'Russel'
-          }
-        }, {
-          id: '5a3b4ccf-c257',
-          _id: '5a3b4ccf-c257',
-          _type: 'io.cozy.contacts',
-          name: {
-            givenName: 'Teagan',
-            familyName: 'Wolf'
-          }
-        }]
-      },
-      contactGroups: {
-        id: 'groups',
-        fetchStatus: 'loaded',
-        hasMore: false,
-        data: [{
-          id: 'fe86af20-c6c5',
-          name: "The Night's Watch",
-          _id: 'fe86af20-c6c5',
-          _type: 'io.cozy.contacts.groups'
-        }, {
-          id: '3d8193ab-2ce4',
-          name: 'The North',
-          _id: '3d8193ab-2ce4',
-          _type: 'io.cozy.contacts.groups'
-        }]
-      },
-      recipients: [{
-        id: '5a3b4ccf-c257',
-        name: {
-          givenName: 'Teagan',
-          familyName: 'Wolf'
-        }
-      }],
-      onPick: jest.fn().mockName('onPick'),
-      onRemove: jest.fn().mockName('onRemove'),
-      placeholder: 'Enter recipients here'
-    };
-    var jsx = /*#__PURE__*/React.createElement(ShareRecipientsInput, props);
-    var wrapper = shallow(jsx);
-    expect(wrapper).toMatchSnapshot();
-  });
-  it('should include groups only if all contacts are loaded', function () {
-    var props = {
-      client: '',
-      label: 'Recipients',
-      contacts: {
-        id: 'contacts',
-        fetchStatus: 'loading',
-        hasMore: false,
-        data: [{
-          id: 'df563cc4-6440',
-          _id: 'df563cc4-6440',
-          _type: 'io.cozy.contacts',
-          name: {
-            givenName: 'Michale',
-            familyName: 'Russel'
-          }
-        }, {
-          id: '5a3b4ccf-c257',
-          _id: '5a3b4ccf-c257',
-          _type: 'io.cozy.contacts',
-          name: {
-            givenName: 'Teagan',
-            familyName: 'Wolf'
-          }
-        }]
-      },
-      contactGroups: {
-        id: 'groups',
-        fetchStatus: 'loaded',
-        hasMore: false,
-        data: [{
-          id: 'fe86af20-c6c5',
-          name: "The Night's Watch",
-          _id: 'fe86af20-c6c5',
-          _type: 'io.cozy.contacts.groups'
-        }, {
-          id: '3d8193ab-2ce4',
-          name: 'The North',
-          _id: '3d8193ab-2ce4',
-          _type: 'io.cozy.contacts.groups'
-        }]
-      },
-      recipients: [{
-        id: '5a3b4ccf-c257',
-        name: {
-          givenName: 'Teagan',
-          familyName: 'Wolf'
+jest.mock('./ShareAutosuggest', function () {
+  return {
+    __esModule: true,
+    default: function _default(_ref) {
+      var contactsAndGroups = _ref.contactsAndGroups;
+      return /*#__PURE__*/React.createElement("ul", null, contactsAndGroups.map(function (contactOrGroup) {
+        if (contactOrGroup._type === 'io.cozy.contacts') {
+          return /*#__PURE__*/React.createElement("li", {
+            key: contactOrGroup.id
+          }, contactOrGroup.name.givenName, " ", contactOrGroup.name.familyName);
+        } else {
+          return /*#__PURE__*/React.createElement("li", {
+            key: contactOrGroup.id
+          }, contactOrGroup.name);
         }
-      }],
-      onPick: jest.fn().mockName('onPick'),
-      onRemove: jest.fn().mockName('onRemove'),
-      placeholder: 'Enter recipients here'
-    };
-    var jsx = /*#__PURE__*/React.createElement(ShareRecipientsInput, props);
-    var wrapper = shallow(jsx);
-    expect(wrapper).toMatchSnapshot();
-  });
+      }));
+    }
+  };
+});
+describe('ShareRecipientsInput component', function () {
+  var setup = function setup(_ref2) {
+    var contacts = _ref2.contacts,
+        contactGroups = _ref2.contactGroups;
+    render( /*#__PURE__*/React.createElement(ShareRecipientsInput, {
+      contacts: contacts,
+      contactGroups: contactGroups,
+      onPick: function onPick() {},
+      onRemove: function onRemove() {},
+      placeholder: "Enter recipients here"
+    }));
+  };
+
+  it('should include groups and contacts when are loaded', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var contacts, contactGroups;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          contacts = {
+            id: 'contacts',
+            fetchStatus: 'loaded',
+            hasMore: false,
+            data: [{
+              id: 'df563cc4-6440',
+              _id: 'df563cc4-6440',
+              _type: 'io.cozy.contacts',
+              name: {
+                givenName: 'Michale',
+                familyName: 'Russel'
+              }
+            }, {
+              id: '5a3b4ccf-c257',
+              _id: '5a3b4ccf-c257',
+              _type: 'io.cozy.contacts',
+              name: {
+                givenName: 'Teagan',
+                familyName: 'Wolf'
+              },
+              relationships: {
+                groups: {
+                  data: [{
+                    _id: 'fe86af20-c6c5',
+                    _type: 'io.cozy.contacts.groups'
+                  }]
+                }
+              }
+            }]
+          };
+          contactGroups = {
+            id: 'groups',
+            fetchStatus: 'loaded',
+            hasMore: false,
+            data: [{
+              id: 'fe86af20-c6c5',
+              name: "The Night's Watch",
+              _id: 'fe86af20-c6c5',
+              _type: 'io.cozy.contacts.groups'
+            }]
+          };
+          setup({
+            contacts: contacts,
+            contactGroups: contactGroups
+          });
+          expect(screen.getByText('Michale Russel')).toBeInTheDocument();
+          expect(screen.getByText('Teagan Wolf')).toBeInTheDocument();
+          expect(screen.getByText("The Night's Watch")).toBeInTheDocument();
+
+        case 6:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it('should include groups only if all contacts are loaded', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var contacts, contactGroups;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          contacts = {
+            id: 'contacts',
+            fetchStatus: 'loading',
+            hasMore: false,
+            data: [{
+              id: 'df563cc4-6440',
+              _id: 'df563cc4-6440',
+              _type: 'io.cozy.contacts',
+              name: {
+                givenName: 'Michale',
+                familyName: 'Russel'
+              }
+            }, {
+              id: '5a3b4ccf-c257',
+              _id: '5a3b4ccf-c257',
+              _type: 'io.cozy.contacts',
+              name: {
+                givenName: 'Teagan',
+                familyName: 'Wolf'
+              },
+              relationships: {
+                groups: {
+                  data: [{
+                    _id: 'fe86af20-c6c5',
+                    _type: 'io.cozy.contacts.groups'
+                  }]
+                }
+              }
+            }]
+          };
+          contactGroups = {
+            id: 'groups',
+            fetchStatus: 'loaded',
+            hasMore: false,
+            data: [{
+              id: 'fe86af20-c6c5',
+              name: "The Night's Watch",
+              _id: 'fe86af20-c6c5',
+              _type: 'io.cozy.contacts.groups'
+            }]
+          };
+          setup({
+            contacts: contacts,
+            contactGroups: contactGroups
+          });
+          expect(screen.getByText('Michale Russel')).toBeInTheDocument();
+          expect(screen.getByText('Teagan Wolf')).toBeInTheDocument();
+          expect(screen.queryByText("The Night's Watch")).toBeNull();
+
+        case 6:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  it('should include groups only if they have more than one member', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    var contacts, contactGroups;
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          contacts = {
+            id: 'contacts',
+            fetchStatus: 'loaded',
+            hasMore: false,
+            data: [{
+              id: 'df563cc4-6440',
+              _id: 'df563cc4-6440',
+              _type: 'io.cozy.contacts',
+              name: {
+                givenName: 'Michale',
+                familyName: 'Russel'
+              }
+            }, {
+              id: '5a3b4ccf-c257',
+              _id: '5a3b4ccf-c257',
+              _type: 'io.cozy.contacts',
+              name: {
+                givenName: 'Teagan',
+                familyName: 'Wolf'
+              }
+            }]
+          };
+          contactGroups = {
+            id: 'groups',
+            fetchStatus: 'loaded',
+            hasMore: false,
+            data: [{
+              id: 'fe86af20-c6c5',
+              name: "The Night's Watch",
+              _id: 'fe86af20-c6c5',
+              _type: 'io.cozy.contacts.groups'
+            }]
+          };
+          setup({
+            contacts: contacts,
+            contactGroups: contactGroups
+          });
+          expect(screen.getByText('Michale Russel')).toBeInTheDocument();
+          expect(screen.getByText('Teagan Wolf')).toBeInTheDocument();
+          expect(screen.queryByText("The Night's Watch")).toBeNull();
+
+        case 6:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
 });

package/jest.config.js

@@ -2,7 +2,8 @@ module.exports = {
   collectCoverageFrom: [
     'src/**/*.{js,jsx}',
     '!**/node_modules/**',
-    '!**/vendor/**'
+    '!**/vendor/**',
+    '!**/*.stories.{js,jsx,ts,tsx}'
   ],
   snapshotSerializers: ['enzyme-to-json/serializer'],
   testPathIgnorePatterns: ['node_modules', 'dist', '__tests__'],

package/package.json

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

package/src/components/ContactSuggestion.jsx

@@ -1,4 +1,3 @@
-import get from 'lodash/get'
 import PropTypes from 'prop-types'
 import React from 'react'
 
@@ -13,28 +12,15 @@ import { Contact, Group, getDisplayName, getInitials } from '../models'
 
 const ContactModel = models.contact
 
-export const ContactSuggestion = ({ contactOrGroup, contacts }) => {
+export const ContactSuggestion = ({ contactOrGroup }) => {
   const { t } = useI18n()
   let avatarText, name, details
   if (contactOrGroup._type === Group.doctype) {
     name = contactOrGroup.name
-    const membersCount = contacts
-      .reduce((total, contact) => {
-        if (
-          get(contact, 'relationships.groups.data', [])
-            .map(group => group._id)
-            .includes(contactOrGroup._id)
-        ) {
-          return total + 1
-        }
-
-        return total
-      }, 0)
-      .toString()
+    avatarText = 'G'
     details = t('Share.members.count', {
-      smart_count: membersCount
+      smart_count: contactOrGroup.membersCount.toString()
     })
-    avatarText = 'G'
   } else {
     name = getDisplayName(contactOrGroup)
     avatarText = getInitials(contactOrGroup)