cozy-sharing 25.2.0 → 25.3.1

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [25.3.1](https://github.com/cozy/cozy-libs/compare/cozy-sharing@25.3.0...cozy-sharing@25.3.1) (2025-05-07)
+
+### Bug Fixes
+
+- Do not rely on attributes ([a77602c](https://github.com/cozy/cozy-libs/commit/a77602cfbbce6b08296578b12863c631251f99a4))
+
+# [25.3.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@25.2.0...cozy-sharing@25.3.0) (2025-04-28)
+
+### Features
+
+- Allow to hide cozy to cozy sharing with a flag ([3836c83](https://github.com/cozy/cozy-libs/commit/3836c837713f3122b8657b4cff8a9274c7d949ed))
+- Enable again avatar display from cozy-stack ([9d716ab](https://github.com/cozy/cozy-libs/commit/9d716ab8eb64e0254386e1c572317a9f49fe21db))
+
 # [25.2.0](https://github.com/cozy/cozy-libs/compare/cozy-sharing@25.1.1...cozy-sharing@25.2.0) (2025-04-22)
 
 ### Features

package/__tests__/fixtures.js

@@ -326,8 +326,15 @@ export const PERM_WITHOUT_DOC = {
 
 export const APPS = [
   {
-    type: 'io.cozy.apps',
+    _type: 'io.cozy.apps',
     id: 'io.cozy.apps/drive',
+    _id: 'io.cozy.apps/drive',
+    name: 'Drive',
+    name_prefix: 'Cozy',
+    editor: 'Cozy',
+    type: 'webapp',
+    slug: 'drive',
+    state: 'ready',
     attributes: {
       name: 'Drive',
       name_prefix: 'Cozy',
@@ -343,8 +350,15 @@ export const APPS = [
     }
   },
   {
-    type: 'io.cozy.apps',
+    _type: 'io.cozy.apps',
     id: 'io.cozy.apps/photos',
+    _id: 'io.cozy.apps/photos',
+    name: 'Photos',
+    name_prefix: 'Cozy',
+    editor: 'Cozy',
+    type: 'webapp',
+    slug: 'photos',
+    state: 'ready',
     attributes: {
       name: 'Photos',
       name_prefix: 'Cozy',

package/dist/components/Avatar/MemberAvatar.js

@@ -1,4 +1,3 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["recipient"];
@@ -8,6 +7,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 React from 'react';
+import { useClient } from 'cozy-client';
 import Avatar from 'cozy-ui/transpiled/react/Avatar';
 import logger from '../../logger';
 import { getInitials } from '../../models';
@@ -16,10 +16,11 @@ var MemberAvatar = function MemberAvatar(_ref) {
   var recipient = _ref.recipient,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  // There are cases when due to apparent memory leaks, the recipient does not exist
+  var client = useClient(); // There are cases when due to apparent memory leaks, the recipient does not exist
   // This will trigger an unhanded error in the Avatar component and crash the app
   // At the moment, we are not sure where is the root cause of this cascading undefined props
   // Nevertheless, we can prevent the crash by returning null if the recipient is undefined
+
   if (!recipient) {
     // eslint-disable-next-line
     logger.warn('RecipientAvatar: recipient is missing, see props:', _objectSpread({
@@ -37,18 +38,14 @@ var MemberAvatar = function MemberAvatar(_ref) {
    * status in the url force the refresh of the image when the
    * status changes
    */
-  // we comment this part for now because it's not compliant with Twake theme
-  // const image =
-  //   recipient.avatarPath && recipient.status
-  //     ? `${client.options.uri}${recipient.avatarPath}?v=${recipient.status}`
-  //     : null
-
-
-  return /*#__PURE__*/React.createElement(Avatar // image={image}
-  , _extends({
-    border: true,
-    disabled: recipient.status === 'pending' || recipient.status === 'mail-not-send'
-  }, rest), getInitials(recipient));
+
+
+  var image = recipient.avatarPath && recipient.status ? "".concat(client.options.uri).concat(recipient.avatarPath, "?v=").concat(recipient.status) : null;
+  return /*#__PURE__*/React.createElement(Avatar, rest, image ? /*#__PURE__*/React.createElement("img", {
+    width: "100%",
+    height: "100%",
+    src: image
+  }) : getInitials(recipient));
 };
 
 export { MemberAvatar };

package/dist/components/ShareModal.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import flag from 'cozy-flags';
 import ShareDialogCozyToCozy from './ShareDialogCozyToCozy';
 import ShareDialogOnlyByLink from './ShareDialogOnlyByLink';
 export var ShareModal = function ShareModal(_ref) {
@@ -20,7 +21,7 @@ export var ShareModal = function ShareModal(_ref) {
       sharing = _ref.sharing,
       sharingDesc = _ref.sharingDesc,
       twoStepsConfirmationMethods = _ref.twoStepsConfirmationMethods;
-  var shareDialogOnlyByLink = documentType === 'Albums';
+  var shareDialogOnlyByLink = flag('cozy.hide-sharing-cozy-to-cozy') || documentType === 'Albums';
   var showShareByEmail = !hasSharedParent && !hasSharedChild;
   var showShareByLink = documentType !== 'Organizations';
   var showShareOnlyByLink = hasSharedParent || hasSharedChild;

package/dist/components/ShareModal.spec.js

@@ -37,12 +37,18 @@ describe('ShareModal component', function () {
     expect(root.getByText('ShareDialogOnlyByLink'));
   });
   it('should render ShareDialogCozyToCozy if type is Notes', function () {
+    var root = setup({
+      documentType: 'Notes'
+    });
+    expect(root.getByText('ShareDialogCozyToCozy'));
+  });
+  it('should render ShareDialogOnlyByLink if flag cozy.hide-sharing-cozy-to-cozy is true', function () {
     flag.mockImplementation(function () {
       return true;
     });
     var root = setup({
-      documentType: 'Notes'
+      documentType: 'Document'
     });
-    expect(root.getByText('ShareDialogCozyToCozy'));
+    expect(root.getByText('ShareDialogOnlyByLink'));
   });
 });

package/dist/state.js

@@ -743,7 +743,7 @@ var getAppUrlForDoctype = function getAppUrlForDoctype(state, documentType) {
 
 var getAppUrl = function getAppUrl(apps, appName) {
   var app = apps.find(function (a) {
-    return a.attributes.slug === appName && a.attributes.state === 'ready';
+    return (a === null || a === void 0 ? void 0 : a.slug) === appName && (a === null || a === void 0 ? void 0 : a.state) === 'ready';
   });
 
   if (!app) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "25.2.0",
+  "version": "25.3.1",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -79,5 +79,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "c7916744854d9a55265bf9e5aa21cbb6e0e90a38"
+  "gitHead": "61ca8961df0f9a50cf58348d90fbfdd67f36b22b"
 }

package/src/components/Avatar/MemberAvatar.jsx

@@ -1,11 +1,14 @@
 import React from 'react'
 
+import { useClient } from 'cozy-client'
 import Avatar from 'cozy-ui/transpiled/react/Avatar'
 
 import logger from '../../logger'
 import { getInitials } from '../../models'
 
 const MemberAvatar = ({ recipient, ...rest }) => {
+  const client = useClient()
+
   // There are cases when due to apparent memory leaks, the recipient does not exist
   // This will trigger an unhanded error in the Avatar component and crash the app
   // At the moment, we are not sure where is the root cause of this cascading undefined props
@@ -26,22 +29,18 @@ const MemberAvatar = ({ recipient, ...rest }) => {
    * status in the url force the refresh of the image when the
    * status changes
    */
-  // we comment this part for now because it's not compliant with Twake theme
-  // const image =
-  //   recipient.avatarPath && recipient.status
-  //     ? `${client.options.uri}${recipient.avatarPath}?v=${recipient.status}`
-  //     : null
+  const image =
+    recipient.avatarPath && recipient.status
+      ? `${client.options.uri}${recipient.avatarPath}?v=${recipient.status}`
+      : null
 
   return (
-    <Avatar
-      // image={image}
-      border
-      disabled={
-        recipient.status === 'pending' || recipient.status === 'mail-not-send'
-      }
-      {...rest}
-    >
-      {getInitials(recipient)}
+    <Avatar {...rest}>
+      {image ? (
+        <img width="100%" height="100%" src={image} />
+      ) : (
+        getInitials(recipient)
+      )}
     </Avatar>
   )
 }

package/src/components/ShareModal.jsx

@@ -1,6 +1,8 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 
+import flag from 'cozy-flags'
+
 import ShareDialogCozyToCozy from './ShareDialogCozyToCozy'
 import ShareDialogOnlyByLink from './ShareDialogOnlyByLink'
 
@@ -22,7 +24,8 @@ export const ShareModal = ({
   sharingDesc,
   twoStepsConfirmationMethods
 }) => {
-  const shareDialogOnlyByLink = documentType === 'Albums'
+  const shareDialogOnlyByLink =
+    flag('cozy.hide-sharing-cozy-to-cozy') || documentType === 'Albums'
 
   const showShareByEmail = !hasSharedParent && !hasSharedChild
   const showShareByLink = documentType !== 'Organizations'

package/src/components/ShareModal.spec.js

@@ -37,9 +37,16 @@ describe('ShareModal component', () => {
   })
 
   it('should render ShareDialogCozyToCozy if type is Notes', () => {
-    flag.mockImplementation(() => true)
     const root = setup({ documentType: 'Notes' })
 
     expect(root.getByText('ShareDialogCozyToCozy'))
   })
+
+  it('should render ShareDialogOnlyByLink if flag cozy.hide-sharing-cozy-to-cozy is true', () => {
+    flag.mockImplementation(() => true)
+
+    const root = setup({ documentType: 'Document' })
+
+    expect(root.getByText('ShareDialogOnlyByLink'))
+  })
 })

package/src/state.js

@@ -621,9 +621,7 @@ const getAppUrlForDoctype = (state, documentType) => {
 }
 
 const getAppUrl = (apps, appName) => {
-  const app = apps.find(
-    a => a.attributes.slug === appName && a.attributes.state === 'ready'
-  )
+  const app = apps.find(a => a?.slug === appName && a?.state === 'ready')
   if (!app) {
     throw new Error(`Sharing link: app ${appName} not installed`)
   }