cozy-viewer 13.0.2 → 13.1.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [13.1.0](https://github.com/cozy/cozy-libs/compare/cozy-viewer@13.0.2...cozy-viewer@13.1.0) (2025-01-13)
+
+
+### Bug Fixes
+
+* **Viewer:** Now hide edit option on mobile if read only ([ce2f287](https://github.com/cozy/cozy-libs/commit/ce2f287494a943547762d5f189a74d38554d9f05))
+* **Viewer:** Now isReadOnly manage public and private share ([6e0aba3](https://github.com/cozy/cozy-libs/commit/6e0aba3abd9dee753656e9aef82ecb53931e14aa))
+* **Viewer:** Now show edit option on qualification according to share ([73034bf](https://github.com/cozy/cozy-libs/commit/73034bf13bb18ba269aa70902902f214b31d87fb))
+
+
+### Features
+
+* **Viewer:** Disable qualification modification on public ([f41540e](https://github.com/cozy/cozy-libs/commit/f41540ea791d31878dfa2325bca4cc7f867c010a))
+
+
+
+
+
 ## [13.0.2](https://github.com/cozy/cozy-libs/compare/cozy-viewer@13.0.1...cozy-viewer@13.0.2) (2025-01-13)
 
 

package/dist/Footer/BottomSheetContent.d.ts

@@ -1,12 +1,14 @@
 export default BottomSheetContent;
-declare function BottomSheetContent({ file, isPublic }: {
+declare function BottomSheetContent({ file, isPublic, isReadOnly }: {
     file: any;
     isPublic: any;
+    isReadOnly: any;
 }): JSX.Element[];
 declare namespace BottomSheetContent {
     namespace propTypes {
         const file: PropTypes.Validator<object>;
         const isPublic: PropTypes.Requireable<boolean>;
+        const isReadOnly: PropTypes.Requireable<boolean>;
     }
 }
 import PropTypes from "prop-types";

package/dist/Footer/BottomSheetContent.js

@@ -21,7 +21,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var BottomSheetContent = function BottomSheetContent(_ref) {
   var file = _ref.file,
-      isPublic = _ref.isPublic;
+      isPublic = _ref.isPublic,
+      isReadOnly = _ref.isReadOnly;
   var panelBlocks = (0, _getPanelBlocks.default)({
     panelBlocksSpecs: (0, _getPanelBlocks.getPanelBlocksSpecs)(isPublic),
     file: file
@@ -33,14 +34,16 @@ var BottomSheetContent = function BottomSheetContent(_ref) {
       disableElevation: index === panelBlocks.length - 1
     }, /*#__PURE__*/_react.default.createElement(PanelBlock, {
       file: file,
-      isPublic: isPublic
+      isPublic: isPublic,
+      isReadOnly: isReadOnly
     }));
   });
 };
 
 BottomSheetContent.propTypes = {
   file: _propTypes.default.object.isRequired,
-  isPublic: _propTypes.default.bool
+  isPublic: _propTypes.default.bool,
+  isReadOnly: _propTypes.default.bool
 };
 
 var _default = exports.default = BottomSheetContent;

package/dist/Footer/FooterContent.d.ts

@@ -1,15 +1,17 @@
 export default FooterContent;
-declare function FooterContent({ file, toolbarRef, children, isPublic }: {
+declare function FooterContent({ file, toolbarRef, children, isPublic, isReadOnly }: {
     file: any;
     toolbarRef: any;
     children: any;
     isPublic: any;
+    isReadOnly: any;
 }): JSX.Element;
 declare namespace FooterContent {
     namespace propTypes {
         const file: PropTypes.Validator<object>;
         const toolbarRef: PropTypes.Requireable<object>;
         const isPublic: PropTypes.Requireable<boolean>;
+        const isReadOnly: PropTypes.Requireable<boolean>;
         const children: PropTypes.Requireable<string | number | boolean | {} | PropTypes.ReactElementLike | PropTypes.ReactNodeArray>;
     }
 }

package/dist/Footer/FooterContent.js

@@ -61,7 +61,8 @@ var FooterContent = function FooterContent(_ref2) {
   var file = _ref2.file,
       toolbarRef = _ref2.toolbarRef,
       children = _ref2.children,
-      isPublic = _ref2.isPublic;
+      isPublic = _ref2.isPublic,
+      isReadOnly = _ref2.isReadOnly;
   var styles = useStyles();
   var toolbarProps = (0, _react.useMemo)(function () {
     return {
@@ -90,7 +91,8 @@ var FooterContent = function FooterContent(_ref2) {
     FooterActionButtonsWithFile: FooterActionButtonsWithFile
   })), /*#__PURE__*/_react.default.createElement(_BottomSheetContent.default, {
     file: file,
-    isPublic: isPublic
+    isPublic: isPublic,
+    isReadOnly: isReadOnly
   }));
 };
 
@@ -98,6 +100,7 @@ FooterContent.propTypes = {
   file: _propTypes.default.object.isRequired,
   toolbarRef: _propTypes.default.object,
   isPublic: _propTypes.default.bool,
+  isReadOnly: _propTypes.default.bool,
   children: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.arrayOf(_propTypes.default.node)])
 };
 

package/dist/Panel/ActionMenuWrapper.js

@@ -34,6 +34,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var ActionMenuWrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var file = _ref.file,
       optionFile = _ref.optionFile,
+      isReadOnly = _ref.isReadOnly,
       onClose = _ref.onClose;
   var name = optionFile.name,
       value = optionFile.value;
@@ -47,7 +48,7 @@ var ActionMenuWrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
   var _useAlert = (0, _Alert.useAlert)(),
       showAlert = _useAlert.showAlert;
 
-  var isEditable = (0, _helpers.isEditableAttribute)(name, file);
+  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 handleCopy = /*#__PURE__*/function () {
@@ -134,6 +135,7 @@ ActionMenuWrapper.propTypes = {
     name: _propTypes.default.string,
     value: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
   }),
+  isReadOnly: _propTypes.default.bool,
   onClose: _propTypes.default.func
 };
 

package/dist/Panel/Qualification.js

@@ -59,6 +59,7 @@ var ComponentFromMetadataQualificationType = {
 
 var Qualification = function Qualification(_ref) {
   var file = _ref.file,
+      isPublic = _ref.isPublic,
       isReadOnly = _ref.isReadOnly;
   var _file$metadata = file.metadata,
       metadata = _file$metadata === void 0 ? {} : _file$metadata;
@@ -115,13 +116,13 @@ var Qualification = function Qualification(_ref) {
     file: file
   }), (0, _qualification.hasSupportedQualification)(file) ? /*#__PURE__*/_react.default.createElement(_QualificationListItemQualification.default, {
     file: file,
-    isReadOnly: isReadOnly,
+    isReadOnly: isPublic ? true : isReadOnly,
     onClick: function onClick() {
       return setShowQualifModal(true);
     }
   }) : /*#__PURE__*/_react.default.createElement(_QualificationListItemQualificationEmpty.default, {
     file: file,
-    isReadOnly: isReadOnly,
+    isReadOnly: isPublic ? true : isReadOnly,
     onClick: function onClick() {
       return setShowQualifModal(true);
     }
@@ -139,7 +140,7 @@ var Qualification = function Qualification(_ref) {
       key: idx
     }, /*#__PURE__*/_react.default.createElement(QualificationListItemComp, {
       file: file,
-      isReadOnly: isReadOnly,
+      isReadOnly: isPublic ? true : isReadOnly,
       ref: actionBtnRef.current[idx],
       formattedMetadataQualification: meta,
       toggleActionsMenu: function toggleActionsMenu(val) {
@@ -153,7 +154,8 @@ var Qualification = function Qualification(_ref) {
     onClose: hideActionsMenu,
     file: file,
     optionFile: optionFile,
-    ref: actionBtnRef.current[optionFile.id]
+    ref: actionBtnRef.current[optionFile.id],
+    isReadOnly: isPublic ? true : isReadOnly
   })));
 };
 

package/dist/Panel/QualificationListItemContact.js

@@ -128,7 +128,8 @@ var QualificationListItemContact = function QualificationListItemContact(_ref) {
     onClose: hideActionsMenu,
     file: file,
     optionFile: optionFile,
-    ref: actionBtnRef
+    ref: actionBtnRef,
+    isReadOnly: isReadOnly
   }));
 };
 

package/dist/ViewerContainer.js

@@ -29,6 +29,8 @@ var _cozyClient = require("cozy-client");
 
 var _permission = require("cozy-client/dist/models/permission");
 
+var _cozySharing = require("cozy-sharing");
+
 var _Modal = _interopRequireDefault(require("cozy-ui/transpiled/react/Modal"));
 
 var _proptypes = require("cozy-ui/transpiled/react/proptypes");
@@ -90,6 +92,10 @@ var ViewerContainer = function ViewerContainer(props) {
 
   var client = (0, _cozyClient.useClient)();
   (0, _I18n.useExtendI18n)(_locales.locales);
+
+  var _useSharingContext = (0, _cozySharing.useSharingContext)(),
+      hasWriteAccess = _useSharingContext.hasWriteAccess;
+
   var currentFile = files[currentIndex];
   var fileCount = files.length;
   var hasPrevious = currentIndex > 0;
@@ -110,17 +116,30 @@ var ViewerContainer = function ViewerContainer(props) {
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              if (!isPublic) {
+                _context.next = 6;
+                break;
+              }
+
+              _context.next = 3;
               return (0, _permission.isDocumentReadOnly)({
                 document: currentFile,
                 client: client
               });
 
-            case 2:
-              res = _context.sent;
+            case 3:
+              _context.t0 = _context.sent;
+              _context.next = 7;
+              break;
+
+            case 6:
+              _context.t0 = !hasWriteAccess(currentFile._id);
+
+            case 7:
+              res = _context.t0;
               setIsReadOnly(res);
 
-            case 4:
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -133,7 +152,7 @@ var ViewerContainer = function ViewerContainer(props) {
     }();
 
     getIsReadOnly();
-  }, [client, currentFile]);
+  }, [client, currentFile, hasWriteAccess, 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/dist/ViewerInformationsWrapper.js

@@ -50,7 +50,8 @@ var ViewerInformationsWrapper = function ViewerInformationsWrapper(_ref) {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !disableFooter && /*#__PURE__*/_react.default.createElement(_Footer.default, null, /*#__PURE__*/_react.default.createElement(_FooterContent.default, {
     file: currentFile,
     toolbarRef: toolbarRef,
-    isPublic: isPublic
+    isPublic: isPublic,
+    isReadOnly: isReadOnly
   }, children)), validForPanel && /*#__PURE__*/_react.default.createElement(_InformationPanel.default, null, /*#__PURE__*/_react.default.createElement(_PanelContent.default, {
     file: currentFile,
     isPublic: isPublic,

package/dist/components/ViewerControls.js

@@ -207,7 +207,7 @@ var ViewerControls = /*#__PURE__*/function (_Component) {
         showFilePath: showFilePath,
         onMouseEnter: this.showControls,
         onMouseLeave: this.hideControls,
-        onClose: showClose && onClose
+        onClose: showClose ? onClose : undefined
       }, children), showNavigation && isDesktop && hasPrevious && /*#__PURE__*/_react.default.createElement(_Navigation.default, {
         className: styles['viewer-nav--previous'],
         hidden: hidden,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-viewer",
-  "version": "13.0.2",
+  "version": "13.1.0",
   "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.8",
+    "cozy-harvest-lib": "^32.2.9",
     "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": "1f870295d2bbc0b0a74367d7b3e70c5606c4eec6"
+  "gitHead": "56e9eed8725f3adc458230177ed0f62cf970bc35"
 }

package/src/Footer/BottomSheetContent.jsx

@@ -5,7 +5,7 @@ import { BottomSheetItem } from 'cozy-ui/transpiled/react/BottomSheet'
 
 import getPanelBlocks, { getPanelBlocksSpecs } from '../Panel/getPanelBlocks'
 
-const BottomSheetContent = ({ file, isPublic }) => {
+const BottomSheetContent = ({ file, isPublic, isReadOnly }) => {
   const panelBlocks = getPanelBlocks({
     panelBlocksSpecs: getPanelBlocksSpecs(isPublic),
     file
@@ -17,14 +17,15 @@ const BottomSheetContent = ({ file, isPublic }) => {
       disableGutters
       disableElevation={index === panelBlocks.length - 1}
     >
-      <PanelBlock file={file} isPublic={isPublic} />
+      <PanelBlock file={file} isPublic={isPublic} isReadOnly={isReadOnly} />
     </BottomSheetItem>
   ))
 }
 
 BottomSheetContent.propTypes = {
   file: PropTypes.object.isRequired,
-  isPublic: PropTypes.bool
+  isPublic: PropTypes.bool,
+  isReadOnly: PropTypes.bool
 }
 
 export default BottomSheetContent

package/src/Footer/FooterContent.jsx

@@ -39,7 +39,13 @@ const useStyles = makeStyles(theme => ({
   }
 }))
 
-const FooterContent = ({ file, toolbarRef, children, isPublic }) => {
+const FooterContent = ({
+  file,
+  toolbarRef,
+  children,
+  isPublic,
+  isReadOnly
+}) => {
   const styles = useStyles()
 
   const toolbarProps = useMemo(() => ({ ref: toolbarRef }), [toolbarRef])
@@ -69,7 +75,11 @@ const FooterContent = ({ file, toolbarRef, children, isPublic }) => {
           FooterActionButtonsWithFile={FooterActionButtonsWithFile}
         />
       </BottomSheetHeader>
-      <BottomSheetContent file={file} isPublic={isPublic} />
+      <BottomSheetContent
+        file={file}
+        isPublic={isPublic}
+        isReadOnly={isReadOnly}
+      />
     </BottomSheet>
   )
 }
@@ -78,6 +88,7 @@ FooterContent.propTypes = {
   file: PropTypes.object.isRequired,
   toolbarRef: PropTypes.object,
   isPublic: PropTypes.bool,
+  isReadOnly: PropTypes.bool,
   children: PropTypes.oneOfType([
     PropTypes.node,
     PropTypes.arrayOf(PropTypes.node)

package/src/Panel/ActionMenuWrapper.jsx

@@ -9,38 +9,54 @@ import ActionMenuDesktop from './ActionMenuDesktop'
 import ActionMenuMobile from './ActionMenuMobile'
 import { isEditableAttribute } from '../helpers'
 
-const ActionMenuWrapper = forwardRef(({ file, optionFile, onClose }, ref) => {
-  const { name, value } = optionFile
-  const { isMobile } = useBreakpoints()
-  const { t } = useI18n()
-  const { showAlert } = useAlert()
+const ActionMenuWrapper = forwardRef(
+  ({ file, optionFile, isReadOnly, onClose }, ref) => {
+    const { name, value } = optionFile
+    const { isMobile } = useBreakpoints()
+    const { t } = useI18n()
+    const { showAlert } = useAlert()
 
-  const isEditable = isEditableAttribute(name, file)
-  const editPath = `${file.metadata.qualification.label}/${file._id}/edit/information?metadata=${optionFile.name}`
+    const isEditable = isEditableAttribute(name, file) && !isReadOnly
+    const editPath = `${file.metadata.qualification.label}/${file._id}/edit/information?metadata=${optionFile.name}`
 
-  const handleCopy = async () => {
-    try {
-      await navigator.clipboard.writeText(value)
-      showAlert({
-        message: t(`Viewer.snackbar.copiedToClipboard.success`),
-        severity: 'success',
-        variant: 'filled',
-        icon: false
-      })
-    } catch (error) {
-      showAlert({
-        message: t(`Viewer.snackbar.copiedToClipboard.error`),
-        severity: 'error',
-        variant: 'filled',
-        icon: false
-      })
+    const handleCopy = async () => {
+      try {
+        await navigator.clipboard.writeText(value)
+        showAlert({
+          message: t(`Viewer.snackbar.copiedToClipboard.success`),
+          severity: 'success',
+          variant: 'filled',
+          icon: false
+        })
+      } catch (error) {
+        showAlert({
+          message: t(`Viewer.snackbar.copiedToClipboard.error`),
+          severity: 'error',
+          variant: 'filled',
+          icon: false
+        })
+      }
+      onClose()
+    }
+
+    if (isMobile) {
+      return (
+        <ActionMenuMobile
+          file={file}
+          optionFile={optionFile}
+          actions={{
+            copy: { onClick: handleCopy },
+            edit: { path: editPath }
+          }}
+          isEditable={isEditable}
+          onClose={onClose}
+        />
+      )
     }
-    onClose()
-  }
 
-  if (isMobile) {
     return (
-      <ActionMenuMobile
+      <ActionMenuDesktop
+        ref={ref}
         file={file}
         optionFile={optionFile}
         actions={{
@@ -52,21 +68,7 @@ const ActionMenuWrapper = forwardRef(({ file, optionFile, onClose }, ref) => {
       />
     )
   }
-
-  return (
-    <ActionMenuDesktop
-      ref={ref}
-      file={file}
-      optionFile={optionFile}
-      actions={{
-        copy: { onClick: handleCopy },
-        edit: { path: editPath }
-      }}
-      isEditable={isEditable}
-      onClose={onClose}
-    />
-  )
-})
+)
 
 ActionMenuWrapper.displayName = 'ActionMenuWrapper'
 
@@ -76,6 +78,7 @@ ActionMenuWrapper.propTypes = {
     name: PropTypes.string,
     value: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
   }),
+  isReadOnly: PropTypes.bool,
   onClose: PropTypes.func
 }
 

package/src/Panel/Qualification.jsx

@@ -34,7 +34,7 @@ const ComponentFromMetadataQualificationType = {
   bills: QualificationListItemInformation
 }
 
-const Qualification = ({ file, isReadOnly }) => {
+const Qualification = ({ file, isPublic, isReadOnly }) => {
   const { metadata = {} } = file
   const actionBtnRef = useRef([])
   const [showQualifModal, setShowQualifModal] = useState(false)
@@ -75,13 +75,13 @@ const Qualification = ({ file, isReadOnly }) => {
       {hasSupportedQualification(file) ? (
         <QualificationListItemQualification
           file={file}
-          isReadOnly={isReadOnly}
+          isReadOnly={isPublic ? true : isReadOnly}
           onClick={() => setShowQualifModal(true)}
         />
       ) : (
         <QualificationListItemQualificationEmpty
           file={file}
-          isReadOnly={isReadOnly}
+          isReadOnly={isPublic ? true : isReadOnly}
           onClick={() => setShowQualifModal(true)}
         />
       )}
@@ -109,7 +109,7 @@ const Qualification = ({ file, isReadOnly }) => {
               <Fragment key={idx}>
                 <QualificationListItemComp
                   file={file}
-                  isReadOnly={isReadOnly}
+                  isReadOnly={isPublic ? true : isReadOnly}
                   ref={actionBtnRef.current[idx]}
                   formattedMetadataQualification={meta}
                   toggleActionsMenu={val => toggleActionsMenu(idx, name, val)}
@@ -124,6 +124,7 @@ const Qualification = ({ file, isReadOnly }) => {
               file={file}
               optionFile={optionFile}
               ref={actionBtnRef.current[optionFile.id]}
+              isReadOnly={isPublic ? true : isReadOnly}
             />
           )}
         </List>

package/src/Panel/QualificationListItemContact.jsx

@@ -88,6 +88,7 @@ const QualificationListItemContact = ({ file, isReadOnly }) => {
           file={file}
           optionFile={optionFile}
           ref={actionBtnRef}
+          isReadOnly={isReadOnly}
         />
       )}
     </>

package/src/ViewerContainer.jsx

@@ -4,6 +4,7 @@ import React, { createRef, useState, useEffect } from 'react'
 
 import { useClient } from 'cozy-client'
 import { isDocumentReadOnly } from 'cozy-client/dist/models/permission'
+import { useSharingContext } from 'cozy-sharing'
 import Modal from 'cozy-ui/transpiled/react/Modal'
 import { FileDoctype } from 'cozy-ui/transpiled/react/proptypes'
 import AlertProvider from 'cozy-ui/transpiled/react/providers/Alert'
@@ -34,6 +35,8 @@ const ViewerContainer = props => {
   const [isReadOnly, setIsReadOnly] = useState(true)
   const client = useClient()
   useExtendI18n(locales)
+  const { hasWriteAccess } = useSharingContext()
+
   const currentFile = files[currentIndex]
   const fileCount = files.length
   const hasPrevious = currentIndex > 0
@@ -51,16 +54,18 @@ const ViewerContainer = props => {
 
   useEffect(() => {
     const getIsReadOnly = async () => {
-      const res = await isDocumentReadOnly({
-        document: currentFile,
-        client
-      })
+      const res = isPublic
+        ? await isDocumentReadOnly({
+            document: currentFile,
+            client
+          })
+        : !hasWriteAccess(currentFile._id)
 
       setIsReadOnly(res)
     }
 
     getIsReadOnly()
-  }, [client, currentFile])
+  }, [client, currentFile, hasWriteAccess, isPublic])
 
   return (
     <AlertProvider>

package/src/ViewerInformationsWrapper.jsx

@@ -42,6 +42,7 @@ const ViewerInformationsWrapper = ({
             file={currentFile}
             toolbarRef={toolbarRef}
             isPublic={isPublic}
+            isReadOnly={isReadOnly}
           >
             {children}
           </FooterContent>

package/src/components/ViewerControls.jsx

@@ -141,7 +141,7 @@ class ViewerControls extends Component {
             showFilePath={showFilePath}
             onMouseEnter={this.showControls}
             onMouseLeave={this.hideControls}
-            onClose={showClose && onClose}
+            onClose={showClose ? onClose : undefined}
           >
             {children}
           </Toolbar>