cozy-viewer 13.2.1 → 13.2.3

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.
 
+## [13.2.3](https://github.com/cozy/cozy-libs/compare/cozy-viewer@13.2.2...cozy-viewer@13.2.3) (2025-01-20)
+
+
+### Bug Fixes
+
+* **Viewer:** Now use the folder as a reference when sharing ([21f4d9a](https://github.com/cozy/cozy-libs/commit/21f4d9af0c926a780789483be800a7ed3f2882ae))
+
+
+
+
+
+## [13.2.2](https://github.com/cozy/cozy-libs/compare/cozy-viewer@13.2.1...cozy-viewer@13.2.2) (2025-01-16)
+
+
+### Bug Fixes
+
+* **Viewer:** Editing a contact use now the correct intent path ([44881c3](https://github.com/cozy/cozy-libs/commit/44881c3cefcc2bae3d331e789424cecf8a3ee126))
+
+
+
+
+
 ## [13.2.1](https://github.com/cozy/cozy-libs/compare/cozy-viewer@13.2.0...cozy-viewer@13.2.1) (2025-01-16)
 
 **Note:** Version bump only for package cozy-viewer

package/dist/Panel/ActionMenuWrapper.js

@@ -49,7 +49,7 @@ var ActionMenuWrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
       showAlert = _useAlert.showAlert;
 
   var isEditable = (0, _helpers.isEditableAttribute)(name, file) && !isReadOnly;
-  var editPath = "".concat(file.metadata.qualification.label, "/").concat(file._id, "/edit/information?metadata=").concat(optionFile.name);
+  var editPath = name === 'contact' ? "".concat(file.metadata.qualification.label, "/").concat(file._id, "/edit/contact") : "".concat(file.metadata.qualification.label, "/").concat(file._id, "/edit/information?metadata=").concat(optionFile.name);
 
   var handleCopy = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {

package/dist/Panel/Qualification.js

@@ -151,11 +151,11 @@ var Qualification = function Qualification(_ref) {
       variant: "inset"
     }));
   }), optionFile.name && /*#__PURE__*/_react.default.createElement(_ActionMenuWrapper.default, {
-    onClose: hideActionsMenu,
+    ref: actionBtnRef.current[optionFile.id],
     file: file,
     optionFile: optionFile,
-    ref: actionBtnRef.current[optionFile.id],
-    isReadOnly: isPublic ? true : isReadOnly
+    isReadOnly: isPublic ? true : isReadOnly,
+    onClose: hideActionsMenu
   })));
 };
 

package/dist/Panel/QualificationListItemContact.d.ts

@@ -1,12 +1,3 @@
 export default QualificationListItemContact;
-declare function QualificationListItemContact({ file, isReadOnly }: {
-    file: any;
-    isReadOnly: any;
-}): JSX.Element | null;
-declare namespace QualificationListItemContact {
-    namespace propTypes {
-        const file: PropTypes.Validator<object>;
-        const isReadOnly: PropTypes.Requireable<boolean>;
-    }
-}
-import PropTypes from "prop-types";
+declare const QualificationListItemContact: React.ForwardRefExoticComponent<React.RefAttributes<any>>;
+import React from "react";

package/dist/Panel/QualificationListItemContact.js

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -33,8 +31,6 @@ var _Spinner = _interopRequireDefault(require("cozy-ui/transpiled/react/Spinner"
 
 var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
 
-var _ActionMenuWrapper = _interopRequireDefault(require("./ActionMenuWrapper"));
-
 var _QualificationListItemText = _interopRequireDefault(require("./QualificationListItemText"));
 
 var _IntentOpener = _interopRequireDefault(require("../components/IntentOpener"));
@@ -45,23 +41,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var QualificationListItemContact = function QualificationListItemContact(_ref) {
+var QualificationListItemContact = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var file = _ref.file,
-      isReadOnly = _ref.isReadOnly;
+      isReadOnly = _ref.isReadOnly,
+      toggleActionsMenu = _ref.toggleActionsMenu;
 
   var _useI18n = (0, _I18n.useI18n)(),
       lang = _useI18n.lang;
 
-  var actionBtnRef = (0, _react.useRef)();
-
-  var _useState = (0, _react.useState)({
-    name: '',
-    value: ''
-  }),
-      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      optionFile = _useState2[0],
-      setOptionFile = _useState2[1];
-
   var _useReferencedContact = (0, _useReferencedContactName.default)(file),
       contacts = _useReferencedContact.contacts,
       isLoadingContacts = _useReferencedContact.isLoadingContacts;
@@ -82,27 +69,6 @@ var QualificationListItemContact = function QualificationListItemContact(_ref) {
     lang: lang
   });
   var qualificationLabel = file.metadata.qualification.label;
-
-  var hideActionsMenu = function hideActionsMenu() {
-    return setOptionFile({
-      name: '',
-      value: ''
-    });
-  };
-
-  var toggleActionsMenu = function toggleActionsMenu(name, value) {
-    return setOptionFile(function (prev) {
-      if (prev.value) return {
-        name: '',
-        value: ''
-      };
-      return {
-        name: name,
-        value: value
-      };
-    });
-  };
-
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_IntentOpener.default, {
     action: "OPEN",
     doctype: "io.cozy.files.paper",
@@ -118,21 +84,15 @@ var QualificationListItemContact = function QualificationListItemContact(_ref) {
     primary: formattedTitle,
     secondary: formattedValue
   }), /*#__PURE__*/_react.default.createElement(_ListItemSecondaryAction.default, null, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
-    ref: actionBtnRef,
+    ref: ref,
     onClick: function onClick() {
       return toggleActionsMenu('contact', formattedValue);
     }
   }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
     icon: _Dots.default
-  }))))), optionFile.value && /*#__PURE__*/_react.default.createElement(_ActionMenuWrapper.default, {
-    onClose: hideActionsMenu,
-    file: file,
-    optionFile: optionFile,
-    ref: actionBtnRef,
-    isReadOnly: isReadOnly
-  }));
-};
-
+  }))))));
+});
+QualificationListItemContact.displayName = 'QualificationListItemContact';
 QualificationListItemContact.propTypes = {
   file: _propTypes.default.object.isRequired,
   isReadOnly: _propTypes.default.bool

package/dist/Panel/Sharing.js

@@ -51,11 +51,16 @@ var Sharing = function Sharing(_ref) {
       getDocumentPermissions = _useSharingContext.getDocumentPermissions,
       getSharingLink = _useSharingContext.getSharingLink,
       allLoaded = _useSharingContext.allLoaded,
+      hasSharedParent = _useSharingContext.hasSharedParent,
       getRecipients = _useSharingContext.getRecipients;
 
-  var recipients = getRecipients(file._id);
-  var permissions = getDocumentPermissions(file._id);
-  var link = getSharingLink(file._id);
+  var shareFileRefId = hasSharedParent(file.path) ? file.dir_id : file._id;
+  var recipients = getRecipients(shareFileRefId);
+  var permissions = getDocumentPermissions(shareFileRefId);
+  var link = getSharingLink(shareFileRefId);
+
+  var _isOwner = isOwner(shareFileRefId);
+
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ListItem.default, {
     size: "large",
     divider: true,
@@ -81,7 +86,7 @@ var Sharing = function Sharing(_ref) {
     return /*#__PURE__*/_react.default.createElement(_cozySharing.MemberRecipientLite, {
       key: recipient.index,
       recipient: recipient,
-      isOwner: isOwner(file._id)
+      isOwner: _isOwner
     });
   }) : /*#__PURE__*/_react.default.createElement(_cozySharing.OwnerRecipientDefaultLite, null)), showModal && /*#__PURE__*/_react.default.createElement(_cozySharing.ShareModal, {
     document: file,

package/dist/ViewerContainer.js

@@ -94,7 +94,8 @@ var ViewerContainer = function ViewerContainer(props) {
   (0, _I18n.useExtendI18n)(_locales.locales);
 
   var _useSharingContext = (0, _cozySharing.useSharingContext)(),
-      hasWriteAccess = _useSharingContext.hasWriteAccess;
+      hasWriteAccess = _useSharingContext.hasWriteAccess,
+      hasSharedParent = _useSharingContext.hasSharedParent;
 
   var currentFile = files[currentIndex];
   var fileCount = files.length;
@@ -133,7 +134,7 @@ var ViewerContainer = function ViewerContainer(props) {
               break;
 
             case 6:
-              _context.t0 = !hasWriteAccess(currentFile._id);
+              _context.t0 = !hasWriteAccess(hasSharedParent(currentFile.path) ? currentFile.dir_id : currentFile._id);
 
             case 7:
               res = _context.t0;
@@ -152,7 +153,7 @@ var ViewerContainer = function ViewerContainer(props) {
     }();
 
     getIsReadOnly();
-  }, [client, currentFile, hasWriteAccess, isPublic]);
+  }, [client, currentFile, hasWriteAccess, hasSharedParent, isPublic]);
   return /*#__PURE__*/_react.default.createElement(_Alert.default, null, /*#__PURE__*/_react.default.createElement("div", {
     id: "viewer-wrapper",
     className: (0, _classnames.default)(styles['viewer-wrapper'], className)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-viewer",
-  "version": "13.2.1",
+  "version": "13.2.3",
   "description": "Cozy-Viewer provides a component to show files in a viewer.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "babel-preset-cozy-app": "^2.8.1",
     "cozy-client": "^52.1.0",
     "cozy-device-helper": "2.0.0",
-    "cozy-harvest-lib": "^32.2.11",
+    "cozy-harvest-lib": "^32.2.13",
     "cozy-intent": "^2.29.1",
     "cozy-logger": "^1.16.1",
     "cozy-sharing": "^19.0.0",
@@ -59,5 +59,5 @@
     "react": ">=16.12.0",
     "react-dom": ">=16.12.0"
   },
-  "gitHead": "92e93154d3679fb181f185c9963297efd0c69c2f"
+  "gitHead": "2f6508f4594f8bbed84b81fb99f76365d9ccabb9"
 }

package/src/Panel/ActionMenuWrapper.jsx

@@ -17,7 +17,10 @@ const ActionMenuWrapper = forwardRef(
     const { showAlert } = useAlert()
 
     const isEditable = isEditableAttribute(name, file) && !isReadOnly
-    const editPath = `${file.metadata.qualification.label}/${file._id}/edit/information?metadata=${optionFile.name}`
+    const editPath =
+      name === 'contact'
+        ? `${file.metadata.qualification.label}/${file._id}/edit/contact`
+        : `${file.metadata.qualification.label}/${file._id}/edit/information?metadata=${optionFile.name}`
 
     const handleCopy = async () => {
       try {

package/src/Panel/Qualification.jsx

@@ -120,11 +120,11 @@ const Qualification = ({ file, isPublic, isReadOnly }) => {
           })}
           {optionFile.name && (
             <ActionMenuWrapper
-              onClose={hideActionsMenu}
+              ref={actionBtnRef.current[optionFile.id]}
               file={file}
               optionFile={optionFile}
-              ref={actionBtnRef.current[optionFile.id]}
               isReadOnly={isPublic ? true : isReadOnly}
+              onClose={hideActionsMenu}
             />
           )}
         </List>

package/src/Panel/QualificationListItemContact.jsx

@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types'
-import React, { useRef, useState } from 'react'
+import React, { forwardRef } from 'react'
 
 import {
   getTranslatedNameForContact,
@@ -15,85 +15,66 @@ import ListItemSecondaryAction from 'cozy-ui/transpiled/react/ListItemSecondaryA
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
-import ActionMenuWrapper from './ActionMenuWrapper'
 import QualificationListItemText from './QualificationListItemText'
 import IntentOpener from '../components/IntentOpener'
 import useReferencedContactName from '../hooks/useReferencedContactName'
 
-const QualificationListItemContact = ({ file, isReadOnly }) => {
-  const { lang } = useI18n()
-  const actionBtnRef = useRef()
-  const [optionFile, setOptionFile] = useState({
-    name: '',
-    value: ''
-  })
-  const { contacts, isLoadingContacts } = useReferencedContactName(file)
+const QualificationListItemContact = forwardRef(
+  ({ file, isReadOnly, toggleActionsMenu }, ref) => {
+    const { lang } = useI18n()
+    const { contacts, isLoadingContacts } = useReferencedContactName(file)
 
-  if (isLoadingContacts) {
-    return (
-      <ListItem>
-        <Spinner color="var(--secondaryTextColor)" />
-      </ListItem>
-    )
-  }
-
-  const formattedValue = formatContactValue(contacts)
+    if (isLoadingContacts) {
+      return (
+        <ListItem>
+          <Spinner color="var(--secondaryTextColor)" />
+        </ListItem>
+      )
+    }
 
-  if (!formattedValue) {
-    return null
-  }
+    const formattedValue = formatContactValue(contacts)
 
-  const formattedTitle = getTranslatedNameForContact({ lang })
-  const qualificationLabel = file.metadata.qualification.label
+    if (!formattedValue) {
+      return null
+    }
 
-  const hideActionsMenu = () => setOptionFile({ name: '', value: '' })
-  const toggleActionsMenu = (name, value) =>
-    setOptionFile(prev => {
-      if (prev.value) return { name: '', value: '' }
-      return { name, value }
-    })
+    const formattedTitle = getTranslatedNameForContact({ lang })
+    const qualificationLabel = file.metadata.qualification.label
 
-  return (
-    <>
-      <IntentOpener
-        action="OPEN"
-        doctype="io.cozy.files.paper"
-        options={{
-          path: `${qualificationLabel}/${file._id}/edit/contact`
-        }}
-        disabled={!!formattedValue || isReadOnly}
-      >
-        <ListItem button={!formattedValue && !isReadOnly}>
-          <ListItemIcon>
-            <Icon icon={PeopleIcon} />
-          </ListItemIcon>
-          <QualificationListItemText
-            primary={formattedTitle}
-            secondary={formattedValue}
-          />
-          <ListItemSecondaryAction>
-            <IconButton
-              ref={actionBtnRef}
-              onClick={() => toggleActionsMenu('contact', formattedValue)}
-            >
-              <Icon icon={Dots} />
-            </IconButton>
-          </ListItemSecondaryAction>
-        </ListItem>
-      </IntentOpener>
+    return (
+      <>
+        <IntentOpener
+          action="OPEN"
+          doctype="io.cozy.files.paper"
+          options={{
+            path: `${qualificationLabel}/${file._id}/edit/contact`
+          }}
+          disabled={!!formattedValue || isReadOnly}
+        >
+          <ListItem button={!formattedValue && !isReadOnly}>
+            <ListItemIcon>
+              <Icon icon={PeopleIcon} />
+            </ListItemIcon>
+            <QualificationListItemText
+              primary={formattedTitle}
+              secondary={formattedValue}
+            />
+            <ListItemSecondaryAction>
+              <IconButton
+                ref={ref}
+                onClick={() => toggleActionsMenu('contact', formattedValue)}
+              >
+                <Icon icon={Dots} />
+              </IconButton>
+            </ListItemSecondaryAction>
+          </ListItem>
+        </IntentOpener>
+      </>
+    )
+  }
+)
 
-      {optionFile.value && (
-        <ActionMenuWrapper
-          onClose={hideActionsMenu}
-          file={file}
-          optionFile={optionFile}
-          ref={actionBtnRef}
-          isReadOnly={isReadOnly}
-        />
-      )}
-    </>
-  )
-}
+QualificationListItemContact.displayName = 'QualificationListItemContact'
 
 QualificationListItemContact.propTypes = {
   file: PropTypes.object.isRequired,

package/src/Panel/Sharing.jsx

@@ -26,12 +26,15 @@ const Sharing = ({ file, t }) => {
     getDocumentPermissions,
     getSharingLink,
     allLoaded,
+    hasSharedParent,
     getRecipients
   } = useSharingContext()
 
-  const recipients = getRecipients(file._id)
-  const permissions = getDocumentPermissions(file._id)
-  const link = getSharingLink(file._id)
+  const shareFileRefId = hasSharedParent(file.path) ? file.dir_id : file._id
+  const recipients = getRecipients(shareFileRefId)
+  const permissions = getDocumentPermissions(shareFileRefId)
+  const link = getSharingLink(shareFileRefId)
+  const _isOwner = isOwner(shareFileRefId)
 
   return (
     <>
@@ -56,7 +59,7 @@ const Sharing = ({ file, t }) => {
             <MemberRecipientLite
               key={recipient.index}
               recipient={recipient}
-              isOwner={isOwner(file._id)}
+              isOwner={_isOwner}
             />
           ))
         ) : (

package/src/ViewerContainer.jsx

@@ -35,7 +35,7 @@ const ViewerContainer = props => {
   const [isReadOnly, setIsReadOnly] = useState(true)
   const client = useClient()
   useExtendI18n(locales)
-  const { hasWriteAccess } = useSharingContext()
+  const { hasWriteAccess, hasSharedParent } = useSharingContext()
 
   const currentFile = files[currentIndex]
   const fileCount = files.length
@@ -59,13 +59,17 @@ const ViewerContainer = props => {
             document: currentFile,
             client
           })
-        : !hasWriteAccess(currentFile._id)
+        : !hasWriteAccess(
+            hasSharedParent(currentFile.path)
+              ? currentFile.dir_id
+              : currentFile._id
+          )
 
       setIsReadOnly(res)
     }
 
     getIsReadOnly()
-  }, [client, currentFile, hasWriteAccess, isPublic])
+  }, [client, currentFile, hasWriteAccess, hasSharedParent, isPublic])
 
   return (
     <AlertProvider>