cozy-sharing 4.5.9 → 4.6.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.6.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@4.5.10...cozy-sharing@4.6.0) (2022-11-10)
+
+
+### Features
+
+* Reactivate sharing cozy to cozy for notes ([d54138e](https://github.com/cozy/cozy-libs/commit/d54138e29ed2d966f8b1da4b4b4caae2b17a3264))
+
+
+
+
+
+## 4.5.10 (2022-11-09)
+
+
+### Bug Fixes
+
+* Paginated permission were not normalized ([eac18f4](https://github.com/cozy/cozy-libs/commit/eac18f4cc90bf4b06d91b7e59343bb4efcf81dcd))
+
+
+
+
+
 ## [4.5.9](https://github.com/cozy/cozy-libs/compare/cozy-sharing@4.5.8...cozy-sharing@4.5.9) (2022-10-03)
 
 **Note:** Version bump only for package cozy-sharing

package/dist/SharingProvider.js

@@ -610,8 +610,6 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
     key: "fetchAllSharings",
     value: function () {
       var _fetchAllSharings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-        var _this2 = this;
-
         var _this$props5, doctype, client, _yield$Promise$all, _yield$Promise$all2, sharings, permissions, apps, sharedDocIds, resp, folderPaths, filePaths;
 
         return _regeneratorRuntime.wrap(function _callee12$(_context12) {
@@ -638,11 +636,9 @@ export var SharingProvider = /*#__PURE__*/function (_Component) {
                   hasLoadedAtLeastOnePage: true
                 }); // eslint-disable-next-line promise/catch-or-return
 
-                fetchNextPermissions(permissions, this.dispatch, client).then(function () {
-                  return _this2.setState({
-                    allLoaded: true
-                  });
-                });
+                fetchNextPermissions(permissions, this.dispatch, this.permissionCol).then(this.setState({
+                  allLoaded: true
+                }));
 
                 if (!(doctype !== 'io.cozy.files')) {
                   _context12.next = 13;

package/dist/components/ConfirmTrustedRecipientsDialog.js

@@ -1,3 +1,4 @@
+import _objectDestructuringEmpty from "@babel/runtime/helpers/objectDestructuringEmpty";
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { useI18n } from 'cozy-ui/transpiled/react/I18n';
@@ -45,7 +46,7 @@ var SharingTitle = function SharingTitle(_ref2) {
 };
 
 var ConfirmTrustedRecipientsDialog = function ConfirmTrustedRecipientsDialog(_ref3) {
-  var props = _extends({}, _ref3);
+  var props = _extends({}, (_objectDestructuringEmpty(_ref3), _ref3));
 
   return /*#__PURE__*/React.createElement(ShareDialogTwoStepsConfirmationContainer, _extends({}, props, {
     dialogContentOnShare: SharingContent,

package/dist/components/EditableSharingModal.spec.js

@@ -52,7 +52,9 @@ describe('EditableSharingModal', function () {
 
   it('will set to false the shared parent / child if the document has no path', function () {
     var _setup = setup({
-      document: {}
+      document: {
+        attributes: {}
+      }
     }),
         component = _setup.component;
 
@@ -66,7 +68,8 @@ describe('EditableSharingModal', function () {
 
     var _setup2 = setup({
       document: {
-        path: '/a'
+        path: '/a',
+        attributes: {}
       }
     }),
         component = _setup2.component;
@@ -81,7 +84,9 @@ describe('EditableSharingModal', function () {
   });
   it('will set to true the sharedChild if a child is shared and the document path fetched latter', function () {
     var _setup3 = setup({
-      document: {}
+      document: {
+        attributes: {}
+      }
     }),
         component = _setup3.component;
 

package/dist/components/ShareModal.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import flag from 'cozy-flags';
 import { contactsResponseType, groupsResponseType } from '../propTypes';
 import ShareDialogCozyToCozy from './ShareDialogCozyToCozy';
 import ShareDialogOnlyByLink from './ShareDialogOnlyByLink';
@@ -27,11 +28,12 @@ export var ShareModal = function ShareModal(_ref) {
       sharing = _ref.sharing,
       sharingDesc = _ref.sharingDesc,
       twoStepsConfirmationMethods = _ref.twoStepsConfirmationMethods;
-  var showShareByEmail = documentType !== 'Notes' && documentType !== 'Albums' && !hasSharedParent && !hasSharedChild;
+  var showShareCozyToCozyForNotes = flag('notes.sharing-cozy-to-cozy') !== null && flag('notes.sharing-cozy-to-cozy') && documentType === 'Notes';
+  var showShareByEmail = showShareCozyToCozyForNotes && documentType !== 'Albums' && !hasSharedParent && !hasSharedChild;
   var showShareByLink = documentType !== 'Organizations';
   var showShareOnlyByLink = hasSharedParent || hasSharedChild;
   var showWhoHasAccess = documentType !== 'Albums';
-  return /*#__PURE__*/React.createElement(React.Fragment, null, (documentType === 'Notes' || documentType === 'Albums') && /*#__PURE__*/React.createElement(ShareDialogOnlyByLink, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, (!showShareCozyToCozyForNotes || documentType === 'Albums') && /*#__PURE__*/React.createElement(ShareDialogOnlyByLink, {
     document: document,
     documentType: documentType,
     link: link,
@@ -40,7 +42,7 @@ export var ShareModal = function ShareModal(_ref) {
     onShareByLink: onShareByLink,
     onUpdateShareLinkPermissions: onUpdateShareLinkPermissions,
     permissions: permissions
-  }), documentType !== 'Notes' && documentType !== 'Albums' && /*#__PURE__*/React.createElement(ShareDialogCozyToCozy, {
+  }), showShareCozyToCozyForNotes && documentType !== 'Albums' && /*#__PURE__*/React.createElement(ShareDialogCozyToCozy, {
     contacts: contacts,
     createContact: createContact,
     document: document,

package/dist/fetchNextPermissions.js

@@ -10,7 +10,7 @@ import { addSharingLink } from './state';
  */
 
 export var fetchNextPermissions = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(permissions, dispatch, client) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(permissions, dispatch, permissionCol) {
     var resp;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -22,12 +22,12 @@ export var fetchNextPermissions = /*#__PURE__*/function () {
             }
 
             _context.next = 3;
-            return client.getStackClient().fetchJSON('GET', permissions.links.next);
+            return permissionCol.fetchPermissionsByLink(permissions);
 
           case 3:
             resp = _context.sent;
             dispatch(addSharingLink(resp.data));
-            return _context.abrupt("return", fetchNextPermissions(resp, dispatch, client));
+            return _context.abrupt("return", fetchNextPermissions(resp, dispatch, permissionCol));
 
           case 6:
           case "end":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "4.5.9",
+  "version": "4.6.0",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -41,7 +41,7 @@
     "babel-jest": "26.6.3",
     "babel-plugin-css-modules-transform": "1.6.2",
     "babel-plugin-inline-react-svg": "1.1.2",
-    "cozy-client": "23.19.1",
+    "cozy-client": "34.1.0",
     "cozy-ui": "62.1.2",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
@@ -53,7 +53,7 @@
   },
   "peerDependencies": {
     "@material-ui/core": "4",
-    "cozy-client": "^16",
+    "cozy-client": "^34.1.0",
     "cozy-realtime": "^3.11.0",
     "cozy-ui": "^45.1.0",
     "prop-types": "^15.7.2",
@@ -63,5 +63,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "8b93988a24a0601626891f874d09f335ff324b85"
+  "gitHead": "e216ec318820e96f5ee5ff6108ce77033d4d5c3e"
 }

package/src/SharingProvider.jsx

@@ -186,7 +186,7 @@ export class SharingProvider extends Component {
     )
     this.setState({ hasLoadedAtLeastOnePage: true })
     // eslint-disable-next-line promise/catch-or-return
-    fetchNextPermissions(permissions, this.dispatch, client).then(() =>
+    fetchNextPermissions(permissions, this.dispatch, this.permissionCol).then(
       this.setState({ allLoaded: true })
     )
     if (doctype !== 'io.cozy.files') return

package/src/components/EditableSharingModal.spec.jsx

@@ -44,7 +44,11 @@ describe('EditableSharingModal', () => {
   }
 
   it('will set to false the shared parent / child if the document has no path', () => {
-    const { component } = setup({ document: {} })
+    const { component } = setup({
+      document: {
+        attributes: {}
+      }
+    })
 
     const mod = component.find(DumbShareModal)
     expect(mod.length).toBe(1)
@@ -54,7 +58,12 @@ describe('EditableSharingModal', () => {
 
   it('will set to true the sharedChild if a child is shared and document has path from the beginning', () => {
     useFetchDocumentPath.mockReturnValue(['/a'])
-    const { component } = setup({ document: { path: '/a' } })
+    const { component } = setup({
+      document: {
+        path: '/a',
+        attributes: {}
+      }
+    })
 
     const provider = component.find(SharingProvider)
     provider.instance().dispatch(receivePaths(['/a/b']))
@@ -68,7 +77,11 @@ describe('EditableSharingModal', () => {
   })
 
   it('will set to true the sharedChild if a child is shared and the document path fetched latter', () => {
-    const { component } = setup({ document: {} })
+    const { component } = setup({
+      document: {
+        attributes: {}
+      }
+    })
     useFetchDocumentPath.mockReturnValue(['/a'])
 
     const provider = component.find(SharingProvider)

package/src/components/ShareModal.jsx

@@ -1,5 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import flag from 'cozy-flags'
 
 import { contactsResponseType, groupsResponseType } from '../propTypes'
 
@@ -29,8 +30,13 @@ export const ShareModal = ({
   sharingDesc,
   twoStepsConfirmationMethods
 }) => {
+  const showShareCozyToCozyForNotes =
+    flag('notes.sharing-cozy-to-cozy') !== null &&
+    flag('notes.sharing-cozy-to-cozy') &&
+    documentType === 'Notes'
+
   const showShareByEmail =
-    documentType !== 'Notes' &&
+    showShareCozyToCozyForNotes &&
     documentType !== 'Albums' &&
     !hasSharedParent &&
     !hasSharedChild
@@ -40,7 +46,7 @@ export const ShareModal = ({
 
   return (
     <>
-      {(documentType === 'Notes' || documentType === 'Albums') && (
+      {(!showShareCozyToCozyForNotes || documentType === 'Albums') && (
         <ShareDialogOnlyByLink
           document={document}
           documentType={documentType}
@@ -52,7 +58,7 @@ export const ShareModal = ({
           permissions={permissions}
         />
       )}
-      {documentType !== 'Notes' && documentType !== 'Albums' && (
+      {showShareCozyToCozyForNotes && documentType !== 'Albums' && (
         <ShareDialogCozyToCozy
           contacts={contacts}
           createContact={createContact}

package/src/fetchNextPermissions.js

@@ -6,12 +6,14 @@ import { addSharingLink } from './state'
  * @param {Function} dispatch
  * @param {Object} client
  */
-export const fetchNextPermissions = async (permissions, dispatch, client) => {
+export const fetchNextPermissions = async (
+  permissions,
+  dispatch,
+  permissionCol
+) => {
   if (permissions.links && permissions.links.next) {
-    const resp = await client
-      .getStackClient()
-      .fetchJSON('GET', permissions.links.next)
+    const resp = await permissionCol.fetchPermissionsByLink(permissions)
     dispatch(addSharingLink(resp.data))
-    return fetchNextPermissions(resp, dispatch, client)
+    return fetchNextPermissions(resp, dispatch, permissionCol)
   }
 }