From a8ccf42a9e8928bc39204a70f264b36b60bc31fa Mon Sep 17 00:00:00 2001
From: AlexisG <merkkur39@gmail.com>
Date: Mon, 14 Oct 2024 15:52:46 +0200
Subject: [PATCH] fix: Save a new paper from the Cozy filePicker

We also retrieve the original file name,
to display something consistent.
---
 src/components/ModelSteps/Scan/ScanWrapper.jsx   | 10 ++++++++--
 .../ModelSteps/widgets/SubmitButton.jsx          | 16 ++++++----------
 .../ModelSteps/widgets/SubmitButton.spec.jsx     |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/ModelSteps/Scan/ScanWrapper.jsx b/src/components/ModelSteps/Scan/ScanWrapper.jsx
index c27da9dc..45e11ac2 100644
--- a/src/components/ModelSteps/Scan/ScanWrapper.jsx
+++ b/src/components/ModelSteps/Scan/ScanWrapper.jsx
@@ -19,6 +19,7 @@ import {
   removeCreatePaperDataBackup,
   storeCreatePaperDataBackup
 } from 'src/helpers/paperDataBackup'
+import { buildFileQueryById } from 'src/queries'
 
 import { useClient } from 'cozy-client'
 import { fetchBlobFileById } from 'cozy-client/dist/models/file'
@@ -96,10 +97,15 @@ const ScanWrapper = ({ currentStep, onClose, onBack }) => {
   }
 
   const onChangeFilePicker = async cozyFileId => {
+    const buildedFileQueryById = buildFileQueryById(cozyFileId)
+    const { data: fileSelected } = await client.query(
+      buildedFileQueryById.definition,
+      buildedFileQueryById.options
+    )
     const blobFile = await fetchBlobFileById(client, cozyFileId)
     const file = makeFileFromBlob(blobFile, {
-      name: cozyFileId,
-      from: 'cozy'
+      name: fileSelected.name,
+      cozyId: cozyFileId
     })
     await onChangeFile(file)
   }
diff --git a/src/components/ModelSteps/widgets/SubmitButton.jsx b/src/components/ModelSteps/widgets/SubmitButton.jsx
index 82cdfc3a..43215414 100644
--- a/src/components/ModelSteps/widgets/SubmitButton.jsx
+++ b/src/components/ModelSteps/widgets/SubmitButton.jsx
@@ -13,7 +13,7 @@ import { createPdfAndSave } from 'src/helpers/createPdfAndSave'
 import getOrCreateAppFolderWithReference from 'src/helpers/getFolderWithReference'
 
 import { useClient } from 'cozy-client'
-import { models } from 'cozy-client'
+import { Qualification } from 'cozy-client/dist/models/document'
 import minilog from 'cozy-minilog'
 import Button from 'cozy-ui/transpiled/react/Buttons'
 import useEventListener from 'cozy-ui/transpiled/react/hooks/useEventListener'
@@ -22,10 +22,6 @@ import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
 const log = minilog('SubmitButton')
 
-const {
-  document: { Qualification }
-} = models
-
 const SubmitButton = ({ onSubmit, disabled, formData }) => {
   const [isBusy, setIsBusy] = useState(false)
   const [confirmReplaceFileModal, setConfirmReplaceFileModal] = useState(false)
@@ -35,7 +31,7 @@ const SubmitButton = ({ onSubmit, disabled, formData }) => {
   const { currentDefinition, stepperDialogTitle, isEdit } = useStepperDialog()
   const { showAlert } = useAlert()
 
-  const cozyFiles = formData.data.filter(d => d.file.from === 'cozy')
+  const filesFromCozy = formData.data.filter(d => d.file.cozyId)
   const blankFiles = formData.data.filter(d => d.file.isBlank)
   const wasInitiallyBlank =
     formData.metadata[FILES_DOCTYPE]?.paperProps?.isBlank ?? false
@@ -79,15 +75,15 @@ const SubmitButton = ({ onSubmit, disabled, formData }) => {
 
   const handleReplace = async isFileReplaced => {
     if (isFileReplaced) {
-      for (const { file } of cozyFiles) {
-        await client.destroy({ _id: file.id, _type: FILES_DOCTYPE })
+      for (const { file } of filesFromCozy) {
+        await client.destroy({ _id: file.cozyId, _type: FILES_DOCTYPE })
       }
     }
     submit()
   }
 
   const handleClick = async () => {
-    if (cozyFiles.length > 0) {
+    if (filesFromCozy.length > 0) {
       return setConfirmReplaceFileModal(true)
     }
 
@@ -140,7 +136,7 @@ const SubmitButton = ({ onSubmit, disabled, formData }) => {
         <ConfirmReplaceFile
           onClose={() => setConfirmReplaceFileModal(false)}
           onReplace={handleReplace}
-          cozyFilesCount={cozyFiles.length}
+          cozyFilesCount={filesFromCozy.length}
         />
       )}
     </>
diff --git a/src/components/ModelSteps/widgets/SubmitButton.spec.jsx b/src/components/ModelSteps/widgets/SubmitButton.spec.jsx
index 5e854dd3..dbb5146f 100644
--- a/src/components/ModelSteps/widgets/SubmitButton.spec.jsx
+++ b/src/components/ModelSteps/widgets/SubmitButton.spec.jsx
@@ -76,7 +76,7 @@ describe('ContactDialog', () => {
     const mockFormSubmit = jest.fn()
     const mockFetchCurrentUser = jest.fn(() => ({ _id: '1234' }))
     const cozyFile = new File([{}], 'cozyFile')
-    cozyFile.from = 'cozy'
+    cozyFile.cozyId = '1234'
     const { findByTestId, queryByTestId } = setup({
       formData: mockFormData({ data: [{ file: cozyFile }] }),
       mockFetchCurrentUser,