cozy-viewer 1.1.2 → 2.0.0

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0](https://github.com/cozy/cozy-libs/compare/cozy-viewer@1.1.2...cozy-viewer@2.0.0) (2024-09-24)
+
+### Features
+
+- **cozy-viewer:** Upgrade cozy-client peerDependency to `49.0.0` ([113b598](https://github.com/cozy/cozy-libs/commit/113b598c40b3bbffa911955ce71be86a36e59f43)), closes [cozy/cozy-client#1507](https://github.com/cozy/cozy-client/issues/1507)
+- **cozy-viewer:** Use new `downloadFile()` method from cozy-client ([d654334](https://github.com/cozy/cozy-libs/commit/d6543349a7f4b7248d971ab52f1a7dacf41225ac)), closes [cozy/cozy-client#1518](https://github.com/cozy/cozy-client/issues/1518)
+
+### BREAKING CHANGES
+
+- **cozy-viewer:** `downloadFile()` method has been removed from
+  `cozy-viewer/src/helpers.js`. Use the one from
+  `cozy-client/dist/models/file` instead
+- **cozy-viewer:** cozy-viewer now requires cozy-client >= 49.0.0 (used
+  for offline support)
+
 ## [1.1.2](https://github.com/cozy/cozy-libs/compare/cozy-viewer@1.1.1...cozy-viewer@1.1.2) (2024-09-12)
 
 ### Bug Fixes

package/dist/NoViewer/DownloadButton.js

@@ -13,14 +13,16 @@ var _react = _interopRequireDefault(require("react"));
 
 var _cozyClient = require("cozy-client");
 
+var _file = require("cozy-client/dist/models/file");
+
+var _cozyIntent = require("cozy-intent");
+
 var _Button = _interopRequireDefault(require("cozy-ui/transpiled/react/deprecated/Button"));
 
 var _proptypes = require("cozy-ui/transpiled/react/proptypes");
 
 var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
 
-var _helpers = require("../helpers");
-
 var DownloadButton = function DownloadButton(_ref) {
   var client = _ref.client,
       file = _ref.file,
@@ -29,12 +31,14 @@ var DownloadButton = function DownloadButton(_ref) {
   var _useI18n = (0, _I18n.useI18n)(),
       t = _useI18n.t;
 
+  var webviewIntent = (0, _cozyIntent.useWebviewIntent)();
   return /*#__PURE__*/_react.default.createElement(_Button.default, {
     onClick: function onClick() {
-      return (0, _helpers.downloadFile)({
+      return (0, _file.downloadFile)({
         client: client,
         file: file,
-        url: url
+        url: url,
+        webviewIntent: webviewIntent
       });
     },
     label: t('Viewer.download')

package/dist/ViewersByFile/PdfMobileViewer.js

@@ -19,6 +19,10 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _cozyClient = require("cozy-client");
 
+var _file = require("cozy-client/dist/models/file");
+
+var _cozyIntent = require("cozy-intent");
+
 var _FileImageLoader = _interopRequireDefault(require("cozy-ui/transpiled/react/FileImageLoader"));
 
 var _Spinner = _interopRequireDefault(require("cozy-ui/transpiled/react/Spinner"));
@@ -76,6 +80,7 @@ var PdfMobileViewer = function PdfMobileViewer(_ref) {
       showAlert = _useAlert.showAlert;
 
   var client = (0, _cozyClient.useClient)();
+  var webviewIntent = (0, _cozyIntent.useWebviewIntent)();
 
   var onImageError = function onImageError() {
     setLoading(false);
@@ -94,7 +99,11 @@ var PdfMobileViewer = function PdfMobileViewer(_ref) {
             case 0:
               _context.prev = 0;
               _context.next = 3;
-              return client.collection('io.cozy.files').download(file);
+              return (0, _file.downloadFile)({
+                client: client,
+                file: file,
+                webviewIntent: webviewIntent
+              });
 
             case 3:
               _context.next = 8;
@@ -121,7 +130,7 @@ var PdfMobileViewer = function PdfMobileViewer(_ref) {
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
-  }(), [client, showAlert, t]);
+  }(), [client, showAlert, t, webviewIntent]);
   (0, _react.useEffect)(function () {
     if (gestures) {
       gestures.get('pinch').set({

package/dist/components/Toolbar.js

@@ -17,6 +17,10 @@ var _react = _interopRequireDefault(require("react"));
 
 var _cozyClient = require("cozy-client");
 
+var _file = require("cozy-client/dist/models/file");
+
+var _cozyIntent = require("cozy-intent");
+
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 
 var _IconButton = _interopRequireDefault(require("cozy-ui/transpiled/react/IconButton"));
@@ -41,8 +45,6 @@ var _ToolbarFilePath = require("./ToolbarFilePath");
 
 var _helpers = require("../Footer/helpers");
 
-var _helpers2 = require("../helpers");
-
 var _EncryptedProvider = require("../providers/EncryptedProvider");
 
 var styles = {
@@ -82,6 +84,8 @@ var Toolbar = function Toolbar(_ref) {
   var _useI18n = (0, _I18n.useI18n)(),
       t = _useI18n.t;
 
+  var webviewIntent = (0, _cozyIntent.useWebviewIntent)();
+
   var _useEncrypted = (0, _EncryptedProvider.useEncrypted)(),
       url = _useEncrypted.url;
 
@@ -121,10 +125,11 @@ var Toolbar = function Toolbar(_ref) {
     className: "u-white",
     "aria-label": t('Viewer.download'),
     onClick: function onClick() {
-      return (0, _helpers2.downloadFile)({
+      return (0, _file.downloadFile)({
         client: client,
         file: file,
-        url: url
+        url: url,
+        webviewIntent: webviewIntent
       });
     }
   }, /*#__PURE__*/_react.default.createElement(_Icon.default, {

package/dist/helpers.d.ts

@@ -2,11 +2,6 @@ export function getCurrentModel(metadataName: any): "information" | "contact" |
 export function isValidForPanel({ file }: {
     file: IOCozyFile;
 }): boolean;
-export function downloadFile({ client, file, url }: {
-    client: any;
-    file: any;
-    url: any;
-}): Promise<any>;
 export function isFileEncrypted(file: any): any;
 export function formatDate({ f, lang, date }: {
     f: any;

package/dist/helpers.js

@@ -5,14 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeFilenameFromPath = exports.normalizeAndSpreadAttributes = exports.makeWebLink = exports.isValidForPanel = exports.isFileEncrypted = exports.isEditableAttribute = exports.getCurrentModel = exports.formatDate = exports.downloadFile = exports.buildEditAttributePath = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+exports.removeFilenameFromPath = exports.normalizeAndSpreadAttributes = exports.makeWebLink = exports.isValidForPanel = exports.isFileEncrypted = exports.isEditableAttribute = exports.getCurrentModel = exports.formatDate = exports.buildEditAttributePath = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _cozyClient = require("cozy-client");
 
 var _file = require("cozy-client/dist/models/file");
@@ -58,50 +54,16 @@ var isValidForPanel = function isValidForPanel(_ref) {
 
 exports.isValidForPanel = isValidForPanel;
 
-var downloadFile = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref2) {
-    var client, file, url;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            client = _ref2.client, file = _ref2.file, url = _ref2.url;
-
-            if (!(0, _file.isEncrypted)(file)) {
-              _context.next = 3;
-              break;
-            }
-
-            return _context.abrupt("return", client.collection('io.cozy.files').forceFileDownload(url, file.name));
-
-          case 3:
-            return _context.abrupt("return", client.collection('io.cozy.files').download(file));
-
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function downloadFile(_x) {
-    return _ref3.apply(this, arguments);
-  };
-}();
-
-exports.downloadFile = downloadFile;
-
 var isFileEncrypted = function isFileEncrypted(file) {
   return (0, _file.isEncrypted)(file);
 };
 
 exports.isFileEncrypted = isFileEncrypted;
 
-var formatDate = function formatDate(_ref4) {
-  var f = _ref4.f,
-      lang = _ref4.lang,
-      date = _ref4.date;
+var formatDate = function formatDate(_ref2) {
+  var f = _ref2.f,
+      lang = _ref2.lang,
+      date = _ref2.date;
 
   if (lang === 'en') {
     return f(date, 'MM/DD/YYYY');
@@ -151,10 +113,10 @@ var normalizeAndSpreadAttributes = function normalizeAndSpreadAttributes(rawFile
 
 exports.normalizeAndSpreadAttributes = normalizeAndSpreadAttributes;
 
-var makeWebLink = function makeWebLink(_ref5) {
-  var client = _ref5.client,
-      slug = _ref5.slug,
-      path = _ref5.path;
+var makeWebLink = function makeWebLink(_ref3) {
+  var client = _ref3.client,
+      slug = _ref3.slug,
+      path = _ref3.path;
 
   try {
     var cozyURL = new URL(client.getStackClient().uri);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-viewer",
-  "version": "1.1.2",
+  "version": "2.0.0",
   "description": "Cozy-Viewer provides a component to show files in a viewer.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -50,7 +50,7 @@
     "react-pdf": "^5.7.2"
   },
   "peerDependencies": {
-    "cozy-client": ">=48.8.0",
+    "cozy-client": ">=49.0.0",
     "cozy-device-helper": ">=2.0.0",
     "cozy-harvest-lib": ">=6.7.3",
     "cozy-intent": ">=1.16.1",
@@ -60,5 +60,5 @@
     "react": ">=16.12.0",
     "react-dom": ">=16.12.0"
   },
-  "gitHead": "0a9671a836c3831f788d59d3ec7a8307ec0724da"
+  "gitHead": "85c208a18eabf2e7502b04362dc67342a30a6713"
 }

package/src/NoViewer/DownloadButton.jsx

@@ -2,18 +2,19 @@ import PropTypes from 'prop-types'
 import React from 'react'
 
 import { withClient } from 'cozy-client'
+import { downloadFile } from 'cozy-client/dist/models/file'
+import { useWebviewIntent } from 'cozy-intent'
 import Button from 'cozy-ui/transpiled/react/deprecated/Button'
 import { FileDoctype } from 'cozy-ui/transpiled/react/proptypes'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
-import { downloadFile } from '../helpers'
-
 const DownloadButton = ({ client, file, url }) => {
   const { t } = useI18n()
+  const webviewIntent = useWebviewIntent()
 
   return (
     <Button
-      onClick={() => downloadFile({ client, file, url })}
+      onClick={() => downloadFile({ client, file, url, webviewIntent })}
       label={t('Viewer.download')}
     />
   )

package/src/ViewersByFile/PdfMobileViewer.jsx

@@ -2,6 +2,8 @@ import PropTypes from 'prop-types'
 import React, { useState, useEffect, useRef, useCallback } from 'react'
 
 import { useClient } from 'cozy-client'
+import { downloadFile } from 'cozy-client/dist/models/file'
+import { useWebviewIntent } from 'cozy-intent'
 import FileImageLoader from 'cozy-ui/transpiled/react/FileImageLoader'
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
 import { FileDoctype } from 'cozy-ui/transpiled/react/proptypes'
@@ -19,6 +21,7 @@ export const PdfMobileViewer = ({ file, url, t, gestures }) => {
   const { showAlert } = useAlert()
 
   const client = useClient()
+  const webviewIntent = useWebviewIntent()
 
   const onImageError = () => {
     setLoading(false)
@@ -32,7 +35,7 @@ export const PdfMobileViewer = ({ file, url, t, gestures }) => {
   const handleOnClick = useCallback(
     async file => {
       try {
-        await client.collection('io.cozy.files').download(file)
+        await downloadFile({ client, file, webviewIntent })
       } catch (error) {
         showAlert({
           message: t('Viewer.error.generic'),
@@ -42,7 +45,7 @@ export const PdfMobileViewer = ({ file, url, t, gestures }) => {
         })
       }
     },
-    [client, showAlert, t]
+    [client, showAlert, t, webviewIntent]
   )
 
   useEffect(() => {

package/src/components/Toolbar.jsx

@@ -3,6 +3,8 @@ import PropTypes from 'prop-types'
 import React from 'react'
 
 import { useClient } from 'cozy-client'
+import { downloadFile } from 'cozy-client/dist/models/file'
+import { useWebviewIntent } from 'cozy-intent'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import IconButton from 'cozy-ui/transpiled/react/IconButton'
 import DownloadIcon from 'cozy-ui/transpiled/react/Icons/Download'
@@ -17,7 +19,6 @@ import PrintButton from './PrintButton'
 import { ToolbarFilePath } from './ToolbarFilePath'
 import styles from './styles.styl'
 import { extractChildrenCompByName } from '../Footer/helpers'
-import { downloadFile } from '../helpers'
 import { useEncrypted } from '../providers/EncryptedProvider'
 
 const useClasses = makeStyles(theme => ({
@@ -42,6 +43,7 @@ const Toolbar = ({
   const client = useClient()
   const classes = useClasses()
   const { t } = useI18n()
+  const webviewIntent = useWebviewIntent()
 
   const { url } = useEncrypted()
 
@@ -88,7 +90,7 @@ const Toolbar = ({
             <IconButton
               className="u-white"
               aria-label={t('Viewer.download')}
-              onClick={() => downloadFile({ client, file, url })}
+              onClick={() => downloadFile({ client, file, url, webviewIntent })}
             >
               <Icon icon={DownloadIcon} />
             </IconButton>

package/src/helpers.js

@@ -46,13 +46,6 @@ export const isValidForPanel = ({ file }) => {
   )
 }
 
-export const downloadFile = async ({ client, file, url }) => {
-  if (isEncrypted(file)) {
-    return client.collection('io.cozy.files').forceFileDownload(url, file.name)
-  }
-  return client.collection('io.cozy.files').download(file)
-}
-
 export const isFileEncrypted = file => isEncrypted(file)
 
 export const formatDate = ({ f, lang, date }) => {

package/src/helpers.spec.js

@@ -1,11 +1,9 @@
-import { createMockClient } from 'cozy-client'
 import {
   KNOWN_DATE_METADATA_NAMES,
   KNOWN_INFORMATION_METADATA_NAMES
 } from 'cozy-client/dist/models/paper'
 
 import {
-  downloadFile,
   getCurrentModel,
   buildEditAttributePath,
   isEditableAttribute,
@@ -13,29 +11,6 @@ import {
 } from './helpers'
 
 describe('helpers', () => {
-  describe('download', () => {
-    const client = new createMockClient({})
-    const mockDownload = jest.fn()
-    const mockForceFileDownload = jest.fn()
-    client.collection = jest.fn(() => ({
-      download: mockDownload,
-      forceFileDownload: mockForceFileDownload
-    }))
-
-    it('should call download when file is not encrypted', async () => {
-      const file = { name: 'toto.txt' }
-
-      await downloadFile({ client, file })
-      expect(mockDownload).toHaveBeenCalledWith(file)
-    })
-
-    it('should call forceFileDownload when file is encrypted', async () => {
-      const file = { name: 'encrypted-toto.txt', encrypted: true }
-      const url = 'blob:http://thedecryptedtoto'
-      await downloadFile({ client, file, url })
-      expect(mockForceFileDownload).toHaveBeenCalledWith(url, file.name)
-    })
-  })
   describe('getCurrentModel', () => {
     const expected = 'information'
     it.each([