cozy-harvest-lib 8.1.1 → 8.3.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [8.3.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.2.1...cozy-harvest-lib@8.3.0) (2022-04-15)
+
+
+### Features
+
+* Implement ViewerModal as Route ([bdb6e88](https://github.com/cozy/cozy-libs/commit/bdb6e88e4c70217654f3b72828dee964aa2a4d1b))
+
+
+
+
+
+## [8.2.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.2.0...cozy-harvest-lib@8.2.1) (2022-04-13)
+
+
+### Bug Fixes
+
+* Get correct bi mapping for bnp_es and cic_es ([f304f89](https://github.com/cozy/cozy-libs/commit/f304f8978f1857f3f1d1e74c0c19385ab96dde24))
+
+
+
+
+
+# [8.2.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.1.1...cozy-harvest-lib@8.2.0) (2022-04-13)
+
+
+### Features
+
+* Fix back navigation ([89283ab](https://github.com/cozy/cozy-libs/commit/89283ab1beb06fa15625a7f108abbddf37216397))
+
+
+
+
+
 ## [8.1.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.1.0...cozy-harvest-lib@8.1.1) (2022-04-11)
 
 

package/dist/components/AccountModal.js

@@ -26,7 +26,7 @@ import * as triggersModel from '../helpers/triggers';
 import KonnectorAccountTabs from './KonnectorConfiguration/KonnectorAccountTabs';
 import AccountSelectBox from './AccountSelectBox/AccountSelectBox';
 import KonnectorModalHeader from './KonnectorModalHeader';
-import { withMountPointPushHistory } from './MountPointContext';
+import { withMountPointHistory } from './MountPointContext';
 import withLocales from './hoc/withLocales';
 import DialogContent from '@material-ui/core/DialogContent';
 /**
@@ -247,6 +247,7 @@ export var AccountModal = /*#__PURE__*/function (_Component) {
           accountsAndTriggers = _this$props2.accountsAndTriggers,
           t = _this$props2.t,
           pushHistory = _this$props2.pushHistory,
+          replaceHistory = _this$props2.replaceHistory,
           initialActiveTab = _this$props2.initialActiveTab,
           isMobile = _this$props2.breakpoints.isMobile,
           showAccountSelection = _this$props2.showAccountSelection,
@@ -293,7 +294,7 @@ export var AccountModal = /*#__PURE__*/function (_Component) {
         account: account,
         onAccountDeleted: onDismiss,
         addAccount: function addAccount() {
-          return pushHistory('/new');
+          return replaceHistory('/new');
         },
         showNewAccountButton: showNewAccountButton
       })));
@@ -324,7 +325,7 @@ AccountModal.propTypes = {
     trigger: PropTypes.object.isRequired
   })).isRequired,
   t: PropTypes.func.isRequired,
-  pushHistory: PropTypes.func.isRequired,
+  replaceHistory: PropTypes.func.isRequired,
   accountId: PropTypes.string.isRequired,
 
   /** @type {string} Can be set to force the initial active tab */
@@ -336,4 +337,4 @@ AccountModal.propTypes = {
   /** @type {Boolean} Whether to show the button to add a new account */
   showNewAccountButton: PropTypes.bool
 };
-export default flow(withClient, withLocales, withMountPointPushHistory, withBreakpoints())(AccountModal);
+export default flow(withClient, withLocales, withMountPointHistory, withBreakpoints())(AccountModal);

package/dist/components/AccountModal.spec.js

@@ -38,6 +38,7 @@ var accountIdMock = '123';
 describe('AccountModal', function () {
   var setup = function setup() {
     var mockHistoryPush = jest.fn();
+    var mockHistoryReplace = jest.fn();
     var component = shallow( /*#__PURE__*/React.createElement(AccountModal, {
       konnector: {},
       t: function t(x) {
@@ -46,6 +47,7 @@ describe('AccountModal', function () {
       accountId: accountIdMock,
       accountsAndTriggers: accountsAndTriggersMock,
       pushHistory: mockHistoryPush,
+      replaceHistory: mockHistoryReplace,
       breakpoints: {
         isMobile: true
       },
@@ -53,7 +55,8 @@ describe('AccountModal', function () {
     }));
     return {
       component: component,
-      mockHistoryPush: mockHistoryPush
+      mockHistoryPush: mockHistoryPush,
+      mockHistoryReplace: mockHistoryReplace
     };
   };
 

package/dist/components/AccountsListModal.js

@@ -13,7 +13,8 @@ var AccountsListModal = function AccountsListModal(_ref) {
       t = _ref.t;
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      pushHistory = _useContext.pushHistory,
+      replaceHistory = _useContext.replaceHistory;
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DialogContent, null, /*#__PURE__*/React.createElement(Stack, {
     className: "u-mb-3"
@@ -29,7 +30,7 @@ var AccountsListModal = function AccountsListModal(_ref) {
     accounts: accounts,
     konnector: konnector,
     onPick: function onPick(option) {
-      return pushHistory("/accounts/".concat(option.account._id));
+      return replaceHistory("/accounts/".concat(option.account._id));
     },
     addAccount: function addAccount() {
       return pushHistory('/new');

package/dist/components/EditAccountModal.js

@@ -27,7 +27,7 @@ import { DialogCloseButton, useCozyDialog } from 'cozy-ui/transpiled/react/CozyD
 import { fetchAccount as _fetchAccount } from '../connections/accounts';
 import * as triggersModel from '../helpers/triggers';
 import TriggerManager from './TriggerManager';
-import { withMountPointPushHistory } from './MountPointContext';
+import { withMountPointHistory } from './MountPointContext';
 import logger from '../logger';
 import { withTracker } from './hoc/tracking';
 import useTimeout from './hooks/useTimeout';
@@ -213,7 +213,7 @@ export var EditAccountModal = /*#__PURE__*/function (_Component) {
       var account = this.state.account;
 
       if (account) {
-        this.props.pushHistory("/accounts/".concat(account._id));
+        this.props.replaceHistory("/accounts/".concat(account._id));
       } else {
         this.props.pushHistory("/accounts");
       }
@@ -255,4 +255,4 @@ EditAccountModal.propTypes = {
   accounts: PropTypes.array.isRequired,
   reconnect: PropTypes.bool
 };
-export default flow(withClient, withMountPointPushHistory, withTracker)(EditAccountModal);
+export default flow(withClient, withMountPointHistory, withTracker)(EditAccountModal);

package/dist/components/HarvestModalRoot.js

@@ -8,13 +8,13 @@ var HarvestModalRoot = function HarvestModalRoot(_ref) {
       konnector = _ref.konnector;
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   if (accounts.length === 0) {
-    pushHistory('/new');
+    replaceHistory('/new');
     return null;
   } else if (accounts.length === 1) {
-    pushHistory("/accounts/".concat(accounts[0].account._id));
+    replaceHistory("/accounts/".concat(accounts[0].account._id));
     return null;
   } else {
     return /*#__PURE__*/React.createElement(AccountsListModal, {

package/dist/components/KonnectorConfiguration/ConfigurationTab/index.js

@@ -76,7 +76,7 @@ var ConfigurationTab = function ConfigurationTab(_ref2) {
       isMobile = _useBreakpoints.isMobile;
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   var client = useClient();
   var vaultClient = useVaultClient();
@@ -238,7 +238,7 @@ var ConfigurationTab = function ConfigurationTab(_ref2) {
     button: true,
     divider: true,
     onClick: function onClick() {
-      return pushHistory("/accounts/".concat(account._id, "/edit"));
+      return replaceHistory("/accounts/".concat(account._id, "/edit"));
     }
   }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Icon, {
     icon: KeyIcon,

package/dist/components/MountPointContext.js

@@ -26,20 +26,32 @@ export var RawMountPointProvider = /*#__PURE__*/function (_React$Component) {
 
     _this = _super.call(this, props);
     _this.pushHistory = _this.pushHistory.bind(_assertThisInitialized(_this));
+    _this.replaceHistory = _this.replaceHistory.bind(_assertThisInitialized(_this));
     _this.state = {
       baseRoute: props.baseRoute || '/',
-      pushHistory: _this.pushHistory
+      pushHistory: _this.pushHistory,
+      replaceHistory: _this.replaceHistory
     };
     return _this;
   }
 
   _createClass(RawMountPointProvider, [{
-    key: "pushHistory",
-    value: function pushHistory(route) {
+    key: "historyAction",
+    value: function historyAction(route, method) {
       var history = this.props.history;
       var baseRoute = this.state.baseRoute;
-      var segments = baseRoute.split('/').concat(route.split('/')).filter(Boolean);
-      history.push("/".concat(segments.join('/')));
+      var segments = '/'.concat(baseRoute.split('/').concat(route.split('/')).filter(Boolean).join('/'));
+      history[method](segments);
+    }
+  }, {
+    key: "pushHistory",
+    value: function pushHistory(route) {
+      this.historyAction(route, 'push');
+    }
+  }, {
+    key: "replaceHistory",
+    value: function replaceHistory(route) {
+      this.historyAction(route, 'replace');
     }
   }, {
     key: "render",
@@ -57,19 +69,21 @@ RawMountPointProvider.propTypes = {
   history: PropTypes.object
 };
 
-var withMountPointPushHistory = function withMountPointPushHistory(BaseComponent) {
+var withMountPointHistory = function withMountPointHistory(BaseComponent) {
   var Component = function Component(props) {
     var _useContext = useContext(MountPointContext),
-        pushHistory = _useContext.pushHistory;
+        pushHistory = _useContext.pushHistory,
+        replaceHistory = _useContext.replaceHistory;
 
     return /*#__PURE__*/React.createElement(BaseComponent, _extends({
-      pushHistory: pushHistory
+      pushHistory: pushHistory,
+      replaceHistory: replaceHistory
     }, props));
   };
 
-  Component.displayName = "withMountPointPushHistory(".concat(BaseComponent.displayName || BaseComponent.name, ")");
+  Component.displayName = "withMountPointHistory(".concat(BaseComponent.displayName || BaseComponent.name, ")");
   return Component;
 };
 
 var MountPointProvider = withRouter(RawMountPointProvider);
-export { MountPointContext, MountPointProvider, withMountPointPushHistory };
+export { MountPointContext, MountPointProvider, withMountPointHistory };

package/dist/components/MountPointContext.spec.js

@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import { RawMountPointProvider } from 'components/MountPointContext';
 describe('MountPointProvider', function () {
   var historyMock = {
-    push: jest.fn()
+    replace: jest.fn()
   };
   beforeEach(function () {
     jest.resetAllMocks();
@@ -13,33 +13,33 @@ describe('MountPointProvider', function () {
       baseRoute: "/root",
       history: historyMock
     }));
-    component.instance().pushHistory('/one');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one');
-    component.instance().pushHistory('/one/two');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one/two');
-    component.instance().pushHistory('no/slash');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/no/slash');
-    component.instance().pushHistory('too/many///slashes');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/too/many/slashes');
+    component.instance().replaceHistory('/one');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one');
+    component.instance().replaceHistory('/one/two');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one/two');
+    component.instance().replaceHistory('no/slash');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/no/slash');
+    component.instance().replaceHistory('too/many///slashes');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/too/many/slashes');
   });
   it('should handle a trailing slash in the base route', function () {
     var component = shallow( /*#__PURE__*/React.createElement(RawMountPointProvider, {
       baseRoute: "/root/",
       history: historyMock
     }));
-    component.instance().pushHistory('/one');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one');
-    component.instance().pushHistory('no/slash');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/no/slash');
+    component.instance().replaceHistory('/one');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one');
+    component.instance().replaceHistory('no/slash');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/no/slash');
   });
   it('should handle a base route with multiple segments', function () {
     var component = shallow( /*#__PURE__*/React.createElement(RawMountPointProvider, {
       baseRoute: "/base/route/",
       history: historyMock
     }));
-    component.instance().pushHistory('/one');
-    expect(historyMock.push).toHaveBeenCalledWith('/base/route/one');
-    component.instance().pushHistory('/one/two');
-    expect(historyMock.push).toHaveBeenCalledWith('/base/route/one/two');
+    component.instance().replaceHistory('/one');
+    expect(historyMock.replace).toHaveBeenCalledWith('/base/route/one');
+    component.instance().replaceHistory('/one/two');
+    expect(historyMock.replace).toHaveBeenCalledWith('/base/route/one/two');
   });
 });

package/dist/components/NewAccountModal.js

@@ -32,7 +32,7 @@ var NewAccountModal = function NewAccountModal(_ref) {
   var client = useClient();
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   var _useMaintenanceStatus = useMaintenanceStatus(client, konnector),
       fetchStatus = _useMaintenanceStatus.fetchStatus,
@@ -78,7 +78,7 @@ var NewAccountModal = function NewAccountModal(_ref) {
         path += '/success';
       }
 
-      pushHistory(path);
+      replaceHistory(path);
     },
     onSuccess: function onSuccess(trigger) {
       var accountId = triggersModel.getAccountId(trigger);
@@ -88,7 +88,7 @@ var NewAccountModal = function NewAccountModal(_ref) {
         path += '/success';
       }
 
-      pushHistory(path);
+      replaceHistory(path);
     },
     onVaultDismiss: onDismiss,
     fieldOptions: fieldOptions

package/dist/components/NewAccountModal.spec.js

@@ -27,9 +27,9 @@ jest.mock('./DialogContext', function () {
   };
 });
 describe('NewAccountModal', function () {
-  var pushHistory = jest.fn();
+  var replaceHistory = jest.fn();
   var mountPointContextValue = {
-    pushHistory: pushHistory
+    replaceHistory: replaceHistory
   };
   var konnectorTrigger = {
     worker: 'konnector',
@@ -58,7 +58,7 @@ describe('NewAccountModal', function () {
       }
     }))));
     onLoginSuccessFn(konnectorTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
   });
   it('should redirect to route without success on login success for client triggers', function () {
     render( /*#__PURE__*/React.createElement(AppLike, {
@@ -72,7 +72,7 @@ describe('NewAccountModal', function () {
       }
     }))));
     onLoginSuccessFn(clientTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
   });
   it('should redirect to success route on success for non client triggers', function () {
     render( /*#__PURE__*/React.createElement(AppLike, {
@@ -86,7 +86,7 @@ describe('NewAccountModal', function () {
       }
     }))));
     onSuccessFn(konnectorTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
   });
   it('should redirect to route without success on success for client triggers', function () {
     render( /*#__PURE__*/React.createElement(AppLike, {
@@ -100,6 +100,6 @@ describe('NewAccountModal', function () {
       }
     }))));
     onSuccessFn(clientTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
   });
 });

package/dist/components/RedirectToAccountFormButton.js

@@ -13,11 +13,11 @@ var RedirectToAccountFormButton = function RedirectToAccountFormButton(_ref) {
   var accountId = getAccountId(trigger);
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   var handleClick = useCallback(function () {
-    pushHistory("/accounts/".concat(accountId, "/edit?reconnect"));
-  }, [accountId, pushHistory]);
+    replaceHistory("/accounts/".concat(accountId, "/edit?reconnect"));
+  }, [accountId, replaceHistory]);
   return /*#__PURE__*/React.createElement(Button, {
     className: "u-ml-0",
     theme: "secondary",

package/dist/components/RedirectToAccountFormButton.spec.js

@@ -4,10 +4,10 @@ import { MountPointContext } from './MountPointContext';
 import RedirectToAccountFormButton from './RedirectToAccountFormButton';
 import AppLike from '../../test/AppLike';
 describe('redirect to account form button', function () {
-  it('should use pushHistory to navigate', function () {
-    var pushHistory = jest.fn();
+  it('should use replaceHistory to navigate', function () {
+    var replaceHistory = jest.fn();
     var mountPointContextValue = {
-      pushHistory: pushHistory
+      replaceHistory: replaceHistory
     };
     var trigger = {
       message: {
@@ -20,6 +20,6 @@ describe('redirect to account form button', function () {
       trigger: trigger
     }))));
     fireEvent.click(root.getByText('Reconnect'));
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/account-id-1337/edit?reconnect');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/account-id-1337/edit?reconnect');
   });
 });

package/dist/components/Routes.js

@@ -4,6 +4,7 @@ import { Switch, Route, Redirect } from 'react-router';
 import { withStyles } from '@material-ui/core/styles';
 import Dialog from 'cozy-ui/transpiled/react/Dialog';
 import { DialogCloseButton, useCozyDialog } from 'cozy-ui/transpiled/react/CozyDialogs';
+import { useVaultUnlockContext, VaultUnlockProvider, VaultUnlockPlaceholder } from 'cozy-keys-lib';
 import KonnectorAccounts from './KonnectorAccounts';
 import AccountModal from './AccountModal';
 import NewAccountModal from './NewAccountModal';
@@ -14,7 +15,7 @@ import HarvestVaultProvider from './HarvestVaultProvider';
 import { MountPointProvider } from './MountPointContext';
 import DialogContext from './DialogContext';
 import { DatacardOptions } from './Datacards/DatacardOptionsContext';
-import { useVaultUnlockContext, VaultUnlockProvider, VaultUnlockPlaceholder } from 'cozy-keys-lib';
+import { ViewerModal } from '../datacards/ViewerModal';
 /**
  * Dialog will not be centered vertically since we need the modal to "stay in place"
  * when changing tabs. Since tabs content's height is not the same between the data
@@ -98,6 +99,12 @@ var Routes = function Routes(_ref) {
           accounts: accountsAndTriggers
         });
       }
+    }), /*#__PURE__*/React.createElement(Route, {
+      path: "".concat(konnectorRoot, "/viewer/:accountId/:folderToSaveId/:fileIndex"),
+      exact: true,
+      render: function render(routeComponentProps) {
+        return /*#__PURE__*/React.createElement(ViewerModal, routeComponentProps);
+      }
     }), /*#__PURE__*/React.createElement(Route, {
       path: "".concat(konnectorRoot, "/new"),
       exact: true,

package/dist/datacards/FileDataCard.js

@@ -1,10 +1,7 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import React, { useState, useMemo } from 'react';
+import React, { useContext, useState } from 'react';
 import PropTypes from 'prop-types';
 import get from 'lodash/get';
-import sortBy from 'lodash/sortBy';
-import uniq from 'lodash/uniq';
 import keyBy from 'lodash/keyBy';
 import 'leaflet/dist/leaflet.css';
 import Skeleton from '@material-ui/lab/Skeleton';
@@ -12,13 +9,11 @@ import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
 import Slide from '@material-ui/core/Slide';
-import Modal from '@material-ui/core/Modal';
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText';
+import { RealTimeQueries } from 'cozy-client';
 import palette from 'cozy-ui/transpiled/react/palette';
 import { Media, Bd, Img } from 'cozy-ui/transpiled/react/Media';
 import Circle from 'cozy-ui/transpiled/react/Circle';
-import Portal from 'cozy-ui/transpiled/react/Portal';
-import Viewer from 'cozy-ui/transpiled/react/Viewer';
 import Card from 'cozy-ui/transpiled/react/Card';
 import Icon from 'cozy-ui/transpiled/react/Icon';
 import FileIcon from 'cozy-ui/transpiled/react/Icons/File';
@@ -26,8 +21,9 @@ import Typography from 'cozy-ui/transpiled/react/Typography';
 import { useI18n } from 'cozy-ui/transpiled/react/I18n';
 import AppLinkCard, { AppLinkButton } from '../components/cards/AppLinkCard';
 import appLinksProps from '../components/KonnectorConfiguration/DataTab/appLinksProps';
-import CozyClient, { Q, queryConnect, isQueryLoading, hasQueryBeenLoaded, RealTimeQueries } from 'cozy-client';
+import { MountPointContext } from '../components/MountPointContext';
 import { getFileIcon } from './mime-utils';
+import { useDataCardFiles } from './useDataCardFiles';
 
 var LoadingFileListItem = function LoadingFileListItem(_ref) {
   var divider = _ref.divider;
@@ -85,10 +81,14 @@ var FileCard = function FileCard(_ref4) {
   var files = _ref4.files,
       loading = _ref4.loading,
       konnector = _ref4.konnector,
-      trigger = _ref4.trigger;
+      trigger = _ref4.trigger,
+      accountId = _ref4.accountId;
 
   var _useI18n2 = useI18n(),
-      t = _useI18n2.t; // Remember files that were there initially so that we do not
+      t = _useI18n2.t;
+
+  var _useContext = useContext(MountPointContext),
+      pushHistory = _useContext.pushHistory; // Remember files that were there initially so that we do not
   // animate their ListItem.
   // Only files coming from realtime and that are added to files
   // while the component is mounted will be animated.
@@ -102,19 +102,6 @@ var FileCard = function FileCard(_ref4) {
       _useState2 = _slicedToArray(_useState, 1),
       initialFilesById = _useState2[0];
 
-  var _useState3 = useState(null),
-      _useState4 = _slicedToArray(_useState3, 2),
-      viewerIndex = _useState4[0],
-      setViewerIndex = _useState4[1];
-
-  var handleCloseViewer = function handleCloseViewer() {
-    return setViewerIndex(null);
-  };
-
-  var handleFileChange = function handleFileChange(file, newIndex) {
-    return setViewerIndex(newIndex);
-  };
-
   return /*#__PURE__*/React.createElement(Card, {
     className: "u-ph-0 u-pb-0 u-ov-hidden"
   }, /*#__PURE__*/React.createElement("div", {
@@ -149,21 +136,12 @@ var FileCard = function FileCard(_ref4) {
       key: file._id
     }, /*#__PURE__*/React.createElement(FileListItem, {
       onClick: function onClick() {
-        return setViewerIndex(i);
+        pushHistory("/viewer/".concat(accountId, "/").concat(get(trigger, 'message.folder_to_save'), "/").concat(i));
       },
       file: file,
       divider: i !== files.length - 1
     }));
-  })), viewerIndex !== null && /*#__PURE__*/React.createElement(Portal, {
-    into: "body"
-  }, /*#__PURE__*/React.createElement(Modal, {
-    open: true
-  }, /*#__PURE__*/React.createElement(Viewer, {
-    files: files,
-    currentIndex: viewerIndex,
-    onCloseRequest: handleCloseViewer,
-    onChangeRequest: handleFileChange
-  }))), /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement("div", {
     className: "u-ta-right u-mv-half u-mh-1"
   }, /*#__PURE__*/React.createElement(AppLinkButton, {
     slug: "drive",
@@ -171,63 +149,27 @@ var FileCard = function FileCard(_ref4) {
   })));
 };
 
-var makeFolderToSaveQueryFromProps = function makeFolderToSaveQueryFromProps(_ref5) {
-  var trigger = _ref5.trigger;
-  return {
-    query: Q('io.cozy.files').where({
-      dir_id: trigger.message.folder_to_save,
-      trashed: false
-    }).indexFields(['dir_id', 'cozyMetadata.createdAt']).sortBy([{
-      dir_id: 'desc'
-    }, {
-      'cozyMetadata.createdAt': 'desc'
-    }]).limitBy(5),
-    as: "fileDataCard_io.cozy.files/".concat(trigger.message.folder_to_save, "/io.cozy.files"),
-    fetchPolicy: CozyClient.fetchPolicies.olderThan(30 * 1000)
-  };
-};
+var FileDataCard = function FileDataCard(_ref5) {
+  var accountId = _ref5.accountId,
+      konnector = _ref5.konnector,
+      trigger = _ref5.trigger;
 
-var makeSourceAccountQueryFromProps = function makeSourceAccountQueryFromProps(_ref6) {
-  var accountId = _ref6.accountId;
-  return {
-    query: Q('io.cozy.files').where({
-      'cozyMetadata.sourceAccount': accountId,
-      trashed: false
-    }).indexFields(['cozyMetadata.sourceAccount', 'cozyMetadata.createdAt']).sortBy([{
-      'cozyMetadata.sourceAccount': 'desc'
-    }, {
-      'cozyMetadata.createdAt': 'desc'
-    }]).limitBy(5),
-    as: "fileDataCard_io.cozy.accounts/".concat(accountId, "/io.cozy.files"),
-    fetchPolicy: CozyClient.fetchPolicies.olderThan(30 * 1000)
-  };
-};
+  var _useDataCardFiles = useDataCardFiles(accountId, trigger.message.folder_to_save),
+      data = _useDataCardFiles.data,
+      fetchStatus = _useDataCardFiles.fetchStatus;
 
-var FileDataCard = function FileDataCard(_ref7) {
-  var folderToSaveFiles = _ref7.folderToSaveFiles,
-      sourceAccountFiles = _ref7.sourceAccountFiles,
-      konnector = _ref7.konnector,
-      trigger = _ref7.trigger;
-  var files1 = folderToSaveFiles.data;
-  var files2 = sourceAccountFiles.data;
-  var noFiles = hasQueryBeenLoaded(folderToSaveFiles) && files1.length === 0 && hasQueryBeenLoaded(sourceAccountFiles) && files2.length === 0;
-  var isLoading = isQueryLoading(folderToSaveFiles) || isQueryLoading(sourceAccountFiles);
-  var files = useMemo(function () {
-    return sortBy(uniq([].concat(_toConsumableArray(files1), _toConsumableArray(files2)), function (x) {
-      return x._id;
-    }), function (x) {
-      return get(x, 'cozyMetadata.createdAt');
-    }).reverse().slice(0, 5);
-  }, [files1, files2]);
+  var isLoading = fetchStatus === 'loading';
+  var noFiles = fetchStatus === 'empty' || fetchStatus === 'failed';
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(RealTimeQueries, {
     doctype: "io.cozy.files"
   }), noFiles ? /*#__PURE__*/React.createElement(AppLinkCard, appLinksProps.drive({
     trigger: trigger
   })) : /*#__PURE__*/React.createElement(FileCard, {
-    files: files,
+    files: data,
     loading: isLoading,
     konnector: konnector,
-    trigger: trigger
+    trigger: trigger,
+    accountId: accountId
   }));
 };
 
@@ -236,11 +178,4 @@ FileDataCard.propTypes = {
   accountId: PropTypes.string.isRequired,
   trigger: PropTypes.object.isRequired
 };
-export default queryConnect({
-  folderToSaveFiles: function folderToSaveFiles(props) {
-    return makeFolderToSaveQueryFromProps(props);
-  },
-  sourceAccountFiles: function sourceAccountFiles(props) {
-    return makeSourceAccountQueryFromProps(props);
-  }
-})(FileDataCard);
+export default FileDataCard;