cozy-ui 110.8.1 → 111.0.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [111.0.0](https://github.com/cozy/cozy-ui/compare/v110.8.2...v111.0.0) (2024-07-12)
+
+
+### Features
+
+* **ExpirationAlert:** Do not display expiration link for foreign file ([dfeaa6e](https://github.com/cozy/cozy-ui/commit/dfeaa6e))
+* Upgrade cozy-client to 48.8.0 ([03dbc6a](https://github.com/cozy/cozy-ui/commit/03dbc6a))
+
+
+### BREAKING CHANGES
+
+* you must have `cozy-client >= 48.8.0`
+
+## [110.8.2](https://github.com/cozy/cozy-ui/compare/v110.8.1...v110.8.2) (2024-07-11)
+
+
+### Bug Fixes
+
+* **ViewerControls:** children can contain undefined values ([506fd4c](https://github.com/cozy/cozy-ui/commit/506fd4c))
+
 ## [110.8.1](https://github.com/cozy/cozy-ui/compare/v110.8.0...v110.8.1) (2024-07-10)
 
 

package/jest.config.js

@@ -14,7 +14,9 @@ module.exports = {
     'react-pdf/dist/esm/entry.webpack': 'react-pdf',
     '^cozy-client$': 'cozy-client/dist/index'
   },
-  transformIgnorePatterns: ['node_modules/(?!(react-styleguidist)/)'],
+  transformIgnorePatterns: [
+    'node_modules/(?!(react-styleguidist|cozy-harvest-lib)/)'
+  ],
   testPathIgnorePatterns: ['/node_modules/', '/transpiled/', '/dist/'],
   transform: {
     '^.+\\.(ts|tsx|js|jsx)?$': 'babel-jest'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-ui",
-  "version": "110.8.1",
+  "version": "111.0.0",
   "description": "Cozy apps UI SDK",
   "main": "./index.js",
   "bin": {
@@ -90,7 +90,7 @@
     "babel-preset-cozy-app": "2.0.2",
     "browserslist-config-cozy": "0.4.0",
     "copyfiles": "2.4.1",
-    "cozy-client": "^47.6.0",
+    "cozy-client": "^48.8.0",
     "cozy-device-helper": "2.0.0",
     "cozy-flags": "^2.10.1",
     "cozy-harvest-lib": "^6.7.3",
@@ -180,7 +180,7 @@
     "rooks": "^5.11.2"
   },
   "peerDependencies": {
-    "cozy-client": ">=47.6.0",
+    "cozy-client": ">=48.8.0",
     "cozy-device-helper": "^2.0.0",
     "cozy-harvest-lib": "^6.7.3",
     "cozy-intent": ">=1.3.0",

package/react/Viewer/components/ExpirationAlert.jsx

@@ -1,7 +1,13 @@
 import React, { useState } from 'react'
 import PropTypes from 'prop-types'
 
-import { useClient, models } from 'cozy-client'
+import { useClient } from 'cozy-client'
+import {
+  isForeignPaper,
+  computeExpirationDate,
+  computeExpirationNoticeLink,
+  makeExpirationDescription
+} from 'cozy-client/dist/models/paper'
 
 import Alert from '../../Alert'
 import Button from '../../Buttons'
@@ -12,12 +18,6 @@ import { useI18n } from '../../providers/I18n'
 
 const FILES_DOCTYPE = 'io.cozy.files'
 
-const {
-  computeExpirationDate,
-  computeExpirationNoticeLink,
-  makeExpirationDescription
-} = models.paper
-
 const ExpirationAlert = ({ file }) => {
   const { t, lang } = useI18n()
   const client = useClient()
@@ -33,7 +33,9 @@ const ExpirationAlert = ({ file }) => {
   }
 
   const expirationDate = computeExpirationDate(file)
-  const expirationNoticeLink = computeExpirationNoticeLink(file)
+  const expirationNoticeLink = !isForeignPaper(file)
+    ? computeExpirationNoticeLink(file)
+    : null
 
   return (
     <Alert

package/react/Viewer/components/ViewerControls.jsx

@@ -95,8 +95,8 @@ class ViewerControls extends Component {
 
     return React.Children.map(children, child => {
       if (
-        child.type.name === 'ViewerByFile' ||
-        child.type.displayName === 'ViewerByFile'
+        child?.type?.name === 'ViewerByFile' ||
+        child?.type?.displayName === 'ViewerByFile'
       ) {
         return React.cloneElement(child, {
           gestures: this.state.gestures,

package/react/Viewer/components/ViewerControls.spec.jsx

@@ -0,0 +1,54 @@
+import React from 'react'
+import { render, screen } from '@testing-library/react'
+
+import ViewerControls from './ViewerControls'
+import ViewerByFile from './ViewerByFile'
+
+jest.mock('../ViewersByFile/AudioViewer', () => () => <div>AudioViewer</div>)
+jest.mock('../providers/EncryptedProvider', () => ({
+  useEncrypted: () => ({ url: 'random' })
+}))
+
+describe('ViewerControls', () => {
+  const file = {
+    _id: 'audio',
+    class: 'audio',
+    mime: 'audio/mp3',
+    name: 'sample.mp3'
+  }
+
+  const setup = ({ children } = {}) => {
+    render(
+      <ViewerControls
+        file={file}
+        onClose={() => {}}
+        hasPrevious={false}
+        hasNext={false}
+        onPrevious={() => {}}
+        onNext={() => {}}
+        expanded={false}
+        toolbarProps={{
+          showToolbar: false,
+          showClose: false,
+          showFilePath: false,
+          toolbarRef: undefined
+        }}
+        showNavigation={false}
+      >
+        {children}
+      </ViewerControls>
+    )
+  }
+
+  it('should only render children if they are ViewerByFile', () => {
+    setup({
+      children: [
+        undefined,
+        <div key="notViewer">not ViewerByFile</div>,
+        <ViewerByFile key="viewer" file={file} onClose={() => {}} />
+      ]
+    })
+    expect(screen.queryByText('not ViewerByFile')).not.toBeInTheDocument()
+    expect(screen.getByText('AudioViewer')).toBeInTheDocument()
+  })
+})

package/transpiled/react/Viewer/components/ExpirationAlert.js

@@ -9,7 +9,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { useClient, models } from 'cozy-client';
+import { useClient } from 'cozy-client';
+import { isForeignPaper, computeExpirationDate, computeExpirationNoticeLink, makeExpirationDescription } from 'cozy-client/dist/models/paper';
 import Alert from "cozy-ui/transpiled/react/Alert";
 import Button from "cozy-ui/transpiled/react/Buttons";
 import Link from "cozy-ui/transpiled/react/Link";
@@ -17,10 +18,6 @@ import Typography from "cozy-ui/transpiled/react/Typography";
 import { withViewerLocales } from "cozy-ui/transpiled/react/Viewer/hoc/withViewerLocales";
 import { useI18n } from "cozy-ui/transpiled/react/providers/I18n";
 var FILES_DOCTYPE = 'io.cozy.files';
-var _models$paper = models.paper,
-    computeExpirationDate = _models$paper.computeExpirationDate,
-    computeExpirationNoticeLink = _models$paper.computeExpirationNoticeLink,
-    makeExpirationDescription = _models$paper.makeExpirationDescription;
 
 var ExpirationAlert = function ExpirationAlert(_ref) {
   var file = _ref.file;
@@ -65,7 +62,7 @@ var ExpirationAlert = function ExpirationAlert(_ref) {
   }();
 
   var expirationDate = computeExpirationDate(file);
-  var expirationNoticeLink = computeExpirationNoticeLink(file);
+  var expirationNoticeLink = !isForeignPaper(file) ? computeExpirationNoticeLink(file) : null;
   return /*#__PURE__*/React.createElement(Alert, {
     severity: "warning",
     block: true,

package/transpiled/react/Viewer/components/ViewerControls.js

@@ -141,7 +141,9 @@ var ViewerControls = /*#__PURE__*/function (_Component) {
 
       if (!children) return null;
       return React.Children.map(children, function (child) {
-        if (child.type.name === 'ViewerByFile' || child.type.displayName === 'ViewerByFile') {
+        var _child$type, _child$type2;
+
+        if ((child === null || child === void 0 ? void 0 : (_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.name) === 'ViewerByFile' || (child === null || child === void 0 ? void 0 : (_child$type2 = child.type) === null || _child$type2 === void 0 ? void 0 : _child$type2.displayName) === 'ViewerByFile') {
           return /*#__PURE__*/React.cloneElement(child, {
             gestures: _this2.state.gestures,
             gesturesRef: _this2.wrapped,