{
expect(btn).toBeDefined()
})
+ describe('Submit', () => {
+ it('should submit button must exist if this is the last step.', async () => {
+ const { findByTestId } = setup({
+ currentFile: mockFile({ name: 'test.pdf' }),
+ isLastStep: jest.fn(() => true)
+ })
+ const btn = await findByTestId('ButtonSave')
+ expect(btn).toBeDefined()
+ })
+ })
+
describe('setCurrentFile', () => {
it('should setCurrentFile must be called once with null when restarting the file selection', async () => {
const mockSetCurrentFile = jest.fn()
@@ -245,7 +256,7 @@ describe('AcquisitionResult component:', () => {
const { getByTestId } = setup({
currentFile: mockFile({ name: 'test.pdf' }),
mockIsFlagshipOCRAvailable: true,
- isLastStep: jest.fn(() => true),
+ isLastStep: jest.fn(() => false),
currentDefinition: { ocrAttributes: [] },
allCurrentSteps: [{ isDisplayed: 'ocr' }]
})
@@ -262,7 +273,7 @@ describe('AcquisitionResult component:', () => {
const { findByTestId } = setup({
currentFile: mockFile({ name: FLAGSHIP_SCAN_TEMP_FILENAME }),
mockIsFlagshipOCRAvailable: true,
- isLastStep: jest.fn(() => true),
+ isLastStep: jest.fn(() => false),
mockGetAttributesFromOcr,
currentDefinition: { ocrAttributes: [] },
allCurrentSteps: [{ isDisplayed: 'ocr' }]
diff --git a/src/components/ModelSteps/ScanResult/ScanResultTitle.jsx b/src/components/ModelSteps/ScanResult/ScanResultTitle.jsx
index 0f369541..d6a24338 100644
--- a/src/components/ModelSteps/ScanResult/ScanResultTitle.jsx
+++ b/src/components/ModelSteps/ScanResult/ScanResultTitle.jsx
@@ -1,8 +1,8 @@
import React from 'react'
+import { isPDFFile } from 'src/components/ModelSteps/helpers'
import Icon from 'cozy-ui/transpiled/react/Icon'
import Typography from 'cozy-ui/transpiled/react/Typography'
-import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints'
import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
import { makeStyles } from 'cozy-ui/transpiled/react/styles'
@@ -13,12 +13,13 @@ const useStyles = makeStyles(() => ({
}
}))
-const ScanResultTitle = () => {
+const ScanResultTitle = ({ currentFile }) => {
const styles = useStyles()
const { t } = useI18n()
- const { isDesktop } = useBreakpoints()
- const device = isDesktop ? 'desktop' : 'mobile'
+ const title = t(
+ `Acquisition.${isPDFFile(currentFile) ? 'pdf' : 'image'}.success`
+ )
return (
@@ -28,7 +29,7 @@ const ScanResultTitle = () => {
aria-hidden="true"
/>
- {t(`Acquisition.${device}.success`)}
+ {title}
)
diff --git a/src/components/ModelSteps/helpers.js b/src/components/ModelSteps/helpers.js
index 94a58386..682e4eab 100644
--- a/src/components/ModelSteps/helpers.js
+++ b/src/components/ModelSteps/helpers.js
@@ -432,3 +432,10 @@ export const normalizeFormdataMetadata = ({
return merge({}, formData, metadataNormalized)
}
+
+/**
+ * Check if a file is a PDF file
+ * @param {File} file - File object
+ * @returns {boolean}
+ */
+export const isPDFFile = file => file.type === 'application/pdf'
diff --git a/src/components/Views/Edit.jsx b/src/components/Views/Edit.jsx
index c357a741..392ec2f4 100644
--- a/src/components/Views/Edit.jsx
+++ b/src/components/Views/Edit.jsx
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react'
-import { useNavigate, useParams } from 'react-router-dom'
+import { useNavigate, useParams, useSearchParams } from 'react-router-dom'
import { FormDataProvider } from 'src/components/Contexts/FormDataProvider'
import { useFormData } from 'src/components/Contexts/FormDataProvider'
import { StepperDialogProvider } from 'src/components/Contexts/StepperDialogProvider'
@@ -51,7 +51,14 @@ const EditPaperModal = ({ ioCozyFile, contacts, onClose, onSubmit }) => {
return
}
-export const EditLoader = ({ onClose, onSubmit }) => {
+/**
+ * Also used with the intent
+ * @param {object} props
+ * @param {Function} props.onClose
+ * @param {Function} props.onSubmit
+ * @param {Function} props.stepFilterFn
+ */
+export const EditLoader = ({ onClose, onSubmit, stepFilterFn }) => {
const { fileId } = useParams()
const buildedFilesQuery = buildFileQueryById(fileId)
@@ -61,11 +68,12 @@ export const EditLoader = ({ onClose, onSubmit }) => {
)
const { contacts, isLoadingContacts } = useReferencedContact(files || [])
- if (isQueryLoading(filesQueryResult) || isLoadingContacts)
+ if (isQueryLoading(filesQueryResult) || isLoadingContacts) {
return
+ }
return (
-
+
{
const EditWrapper = () => {
const navigate = useNavigate()
+ const [searchParams] = useSearchParams()
+ const stepModel = searchParams.get('model')
+
+ const stepFilterFn = step => {
+ if (!stepModel) {
+ return true
+ }
+ return step.model === stepModel
+ }
return (
navigate('..')}
onSubmit={() => navigate('..')}
+ stepFilterFn={stepFilterFn}
/>
)
}
diff --git a/src/helpers/filterSteps.js b/src/helpers/filterSteps.js
index 5acd3a0b..66cd16aa 100644
--- a/src/helpers/filterSteps.js
+++ b/src/helpers/filterSteps.js
@@ -5,13 +5,16 @@ import { isSomePaperStepsCompliantWithOCR } from 'src/helpers/isSomePaperStepsCo
* Filter a list of step with OCR contraint
* @param {object[]} steps list of step
* @param {Object} [webviewIntent] - The webview intent service to interact with the native environment.
- * @param {function} webviewIntent.call - A function to call native methods, expecting the method name and its arguments.
+ * @param {boolean} [isEdit] - True if the current view is an edit view
+ * @param {Function} [stepFilterFn] - The filter function to apply on the steps
+ * @param {boolean} [fromFlagshipUpload] - True if the current view is from the flagship upload
* @returns {Promise} list of step filtered
*/
export const filterSteps = async ({
steps,
webviewIntent,
isEdit,
+ stepFilterFn,
fromFlagshipUpload
}) => {
const isOCR =
@@ -19,11 +22,15 @@ export const filterSteps = async ({
!fromFlagshipUpload &&
isSomePaperStepsCompliantWithOCR(steps) &&
(await isFlagshipOCRAvailable(webviewIntent))
- return steps.filter(step => {
+ const stepsDisplayed = steps.filter(step => {
if (isOCR) {
return step.isDisplayed === 'all' || step.isDisplayed === 'ocr'
} else {
return step?.isDisplayed !== 'ocr'
}
})
+
+ return typeof stepFilterFn === 'function'
+ ? stepsDisplayed.filter(stepFilterFn)
+ : stepsDisplayed
}
diff --git a/src/locales/en.json b/src/locales/en.json
index 0eedcba9..3779d5a0 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -35,23 +35,23 @@
},
"Acquisition": {
"repeat": "Scan an additional page",
- "rotate": "Rotate the image 90 degrees counter-clockwise",
- "desktop": {
- "retry": "Change picture",
- "success": "The picture was added.",
+ "pdf": {
+ "success": "The document was added.",
+ "edit": "Change document",
"tooltip": {
- "back": "Check if it is indeed the back side and if the picture is well oriented as on the model",
- "default": "Check if the picture is well oriented as on the model",
- "front": "Check if it is indeed the front side and if the picture is well oriented as on the model"
+ "back": "Check if it is indeed the back side and if the document is well oriented as on the model",
+ "default": "Check if the document is well oriented as on the model",
+ "front": "Check if it is indeed the front side and if the document is well oriented as on the model"
}
},
- "mobile": {
- "retry": "Change photo",
- "success": "The photo was added.",
+ "image": {
+ "rotate": "Rotate the image 90 degrees counter-clockwise",
+ "success": "The image was added.",
+ "edit": "Change image",
"tooltip": {
- "back": "Check if it is indeed the back side and if the photo is well oriented as on the model",
- "default": "Check if the photo is well oriented as on the model",
- "front": "Check if it is indeed the front side and if the photo is well oriented as on the model"
+ "back": "Check if it is indeed the back side and if the image is well oriented as on the model",
+ "default": "Check if the image is well oriented as on the model",
+ "front": "Check if it is indeed the front side and if the image is well oriented as on the model"
}
}
},
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 545966d2..f47f3de2 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -35,24 +35,24 @@
},
"Acquisition": {
"repeat": "Scanner une page supplémentaire",
- "rotate": "Tourner l'image à 90 degrés dans le sens anti-horaire",
- "desktop": {
- "retry": "Changer l'image",
+ "pdf": {
+ "success": "Le document a bien été ajouté.",
+ "edit": "Modifier le document",
+ "tooltip": {
+ "back": "Vérifier s’il s’agit bien de la face arrière et si le document est bien orienté comme sur le modèle",
+ "default": "Vérifier si le document est bien orienté comme sur le modèle",
+ "front": "Vérifier s’il s’agit bien de la face avant et si le document est bien orienté comme sur le modèle"
+ }
+ },
+ "image": {
+ "rotate": "Tourner l'image à 90 degrés dans le sens anti-horaire",
"success": "L'image a bien été ajoutée.",
+ "edit": "Modifier l'image",
"tooltip": {
"back": "Vérifier s’il s’agit bien de la face arrière et si l'image est bien orientée comme sur le modèle",
"default": "Vérifier si l'image est bien orientée comme sur le modèle",
"front": "Vérifier s’il s’agit bien de la face avant et si l'image est bien orientée comme sur le modèle"
}
- },
- "mobile": {
- "retry": "Changer la photo",
- "success": "La photo a bien été ajoutée.",
- "tooltip": {
- "back": "Vérifier s’il s’agit bien de la face arrière et si la photo est bien orientée comme sur le modèle",
- "default": "Vérifier si la photo est bien orientée comme sur le modèle",
- "front": "Vérifier s’il s’agit bien de la face avant et si la photo est bien orientée comme sur le modèle"
- }
}
},
"action": {