cozy-harvest-lib 22.5.7 → 22.5.8

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [22.5.8](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@22.5.7...cozy-harvest-lib@22.5.8) (2024-03-27)
+
+
+### Bug Fixes
+
+* Use sourceAccountIdentifier and konnector slug to show viewer modal ([4d0957c](https://github.com/cozy/cozy-libs/commit/4d0957c657b5edc91c8557bd2404081f5dfbe42d))
+
+
+
+
+
 ## [22.5.7](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@22.5.6...cozy-harvest-lib@22.5.7) (2024-03-27)
 
 

package/dist/connections/accounts.js

@@ -67,25 +67,6 @@ export var createAccount = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-/**
- *  Build an account query for the given konnector.
- * ("getById" throws an error even if the query is not enabled)
- * @param {string} accountId - io.cozy.accounts document's id
- * @returns {object} - a query spec
- */
-
-export var buildAccountQueryById = function buildAccountQueryById(accountId) {
-  return {
-    definition: function definition() {
-      return Q(ACCOUNTS_DOCTYPE).where({
-        _id: accountId
-      });
-    },
-    options: {
-      as: "".concat(ACCOUNTS_DOCTYPE, "/").concat(accountId)
-    }
-  };
-};
 export var createAccountQuerySpec = function createAccountQuerySpec(accountId) {
   if (!accountId) {
     throw new Error('createAccountQuerySpec called with undefined accountId');

package/dist/datacards/ViewerModal.js

@@ -1,20 +1,45 @@
 import React, { useContext } from 'react';
 import { useParams } from 'react-router-dom';
+import { models, useQuery } from 'cozy-client';
 import Viewer from 'cozy-ui/transpiled/react/Viewer';
 import Overlay from 'cozy-ui/transpiled/react/deprecated/Overlay';
 import { useDataCardFiles } from './useDataCardFiles';
 import { MountPointContext } from '../components/MountPointContext';
+import { buildAccountQueryById } from '../helpers/queries';
 export var ViewerModal = function ViewerModal() {
+  var _accountResult$data;
+
   var _useParams = useParams(),
       accountId = _useParams.accountId,
       folderToSaveId = _useParams.folderToSaveId,
       fileIndex = _useParams.fileIndex;
 
+  var buildAccountQuery = buildAccountQueryById(accountId);
+  var accountResult = useQuery(buildAccountQuery.definition, buildAccountQuery.options);
+  var sourceAccountIdentifier = models.account.getAccountName(accountResult.data);
+  var konnectorSlug = (_accountResult$data = accountResult.data) === null || _accountResult$data === void 0 ? void 0 : _accountResult$data.account_type;
+  if (!sourceAccountIdentifier || !konnectorSlug) return /*#__PURE__*/React.createElement(Overlay, null);
+  return /*#__PURE__*/React.createElement(ViewerModalContent, {
+    sourceAccountIdentifier: sourceAccountIdentifier,
+    folderToSaveId: folderToSaveId,
+    konnectorSlug: konnectorSlug,
+    accountId: accountId,
+    fileIndex: fileIndex
+  });
+};
+
+var ViewerModalContent = function ViewerModalContent(_ref) {
+  var sourceAccountIdentifier = _ref.sourceAccountIdentifier,
+      folderToSaveId = _ref.folderToSaveId,
+      konnectorSlug = _ref.konnectorSlug,
+      accountId = _ref.accountId,
+      fileIndex = _ref.fileIndex;
+
   var _useContext = useContext(MountPointContext),
       pushHistory = _useContext.pushHistory,
       replaceHistory = _useContext.replaceHistory;
 
-  var _useDataCardFiles = useDataCardFiles(accountId, folderToSaveId),
+  var _useDataCardFiles = useDataCardFiles(sourceAccountIdentifier, folderToSaveId, konnectorSlug),
       data = _useDataCardFiles.data,
       fetchStatus = _useDataCardFiles.fetchStatus;
 

package/dist/helpers/queries.js

@@ -45,6 +45,25 @@ export var buildAccountQuery = function buildAccountQuery(_ref) {
     }
   };
 };
+/**
+ *  Build an account query for the given konnector.
+ * ("getById" throws an error even if the query is not enabled)
+ * @param {string} accountId - io.cozy.accounts document's id
+ * @returns {object} - a query spec
+ */
+
+export var buildAccountQueryById = function buildAccountQueryById(accountId) {
+  return {
+    definition: function definition() {
+      return Q('io.cozy.accounts').getById(accountId);
+    },
+    options: {
+      as: "io.cozy.accounts/".concat(accountId),
+      fetchPolicy: defaultFetchPolicy,
+      singleDocData: true
+    }
+  };
+};
 /**
  *
  * @param {string} accountId

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "22.5.7",
+  "version": "22.5.8",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -107,5 +107,5 @@
     "react-router-dom": ">=4.3.1"
   },
   "sideEffects": false,
-  "gitHead": "64907333a758e4bbaf3e28100bb968f22cba612a"
+  "gitHead": "3b3ca64c85bea9c98061b1dac7c234b0b3fba508"
 }

package/src/connections/accounts.js

@@ -24,24 +24,6 @@ export const createAccount = async (client, konnector, attributes) => {
   return data
 }
 
-/**
- *  Build an account query for the given konnector.
- * ("getById" throws an error even if the query is not enabled)
- * @param {string} accountId - io.cozy.accounts document's id
- * @returns {object} - a query spec
- */
-export const buildAccountQueryById = accountId => {
-  return {
-    definition: () =>
-      Q(ACCOUNTS_DOCTYPE).where({
-        _id: accountId
-      }),
-    options: {
-      as: `${ACCOUNTS_DOCTYPE}/${accountId}`
-    }
-  }
-}
-
 export const createAccountQuerySpec = accountId => {
   if (!accountId) {
     throw new Error('createAccountQuerySpec called with undefined accountId')

package/src/datacards/ViewerModal.jsx

@@ -1,16 +1,54 @@
 import React, { useContext } from 'react'
 import { useParams } from 'react-router-dom'
 
+import { models, useQuery } from 'cozy-client'
 import Viewer from 'cozy-ui/transpiled/react/Viewer'
 import Overlay from 'cozy-ui/transpiled/react/deprecated/Overlay'
 
 import { useDataCardFiles } from './useDataCardFiles'
 import { MountPointContext } from '../components/MountPointContext'
+import { buildAccountQueryById } from '../helpers/queries'
 
 export const ViewerModal = () => {
   const { accountId, folderToSaveId, fileIndex } = useParams()
+
+  const buildAccountQuery = buildAccountQueryById(accountId)
+  const accountResult = useQuery(
+    buildAccountQuery.definition,
+    buildAccountQuery.options
+  )
+
+  const sourceAccountIdentifier = models.account.getAccountName(
+    accountResult.data
+  )
+  const konnectorSlug = accountResult.data?.account_type
+
+  if (!sourceAccountIdentifier || !konnectorSlug) return <Overlay />
+
+  return (
+    <ViewerModalContent
+      sourceAccountIdentifier={sourceAccountIdentifier}
+      folderToSaveId={folderToSaveId}
+      konnectorSlug={konnectorSlug}
+      accountId={accountId}
+      fileIndex={fileIndex}
+    />
+  )
+}
+
+const ViewerModalContent = ({
+  sourceAccountIdentifier,
+  folderToSaveId,
+  konnectorSlug,
+  accountId,
+  fileIndex
+}) => {
   const { pushHistory, replaceHistory } = useContext(MountPointContext)
-  const { data, fetchStatus } = useDataCardFiles(accountId, folderToSaveId)
+  const { data, fetchStatus } = useDataCardFiles(
+    sourceAccountIdentifier,
+    folderToSaveId,
+    konnectorSlug
+  )
   const handleCloseViewer = () => replaceHistory(`/accounts/${accountId}`)
   const handleFileChange = (_file, newIndex) =>
     pushHistory(`/viewer/${accountId}/${folderToSaveId}/${newIndex}`)

package/src/helpers/queries.js

@@ -38,6 +38,24 @@ export const buildAccountQuery = ({ slug, sourceAccountIdentifier }) => ({
     fetchPolicy: defaultFetchPolicy
   }
 })
+
+/**
+ *  Build an account query for the given konnector.
+ * ("getById" throws an error even if the query is not enabled)
+ * @param {string} accountId - io.cozy.accounts document's id
+ * @returns {object} - a query spec
+ */
+export const buildAccountQueryById = accountId => {
+  return {
+    definition: () => Q('io.cozy.accounts').getById(accountId),
+    options: {
+      as: `io.cozy.accounts/${accountId}`,
+      fetchPolicy: defaultFetchPolicy,
+      singleDocData: true
+    }
+  }
+}
+
 /**
  *
  * @param {string} accountId