From aa3618e3b4378522e921ef5a06a510c1d549444c Mon Sep 17 00:00:00 2001 From: Nicolas Toublanc Date: Mon, 25 May 2020 17:47:42 +0300 Subject: [PATCH 1/2] feat(enquete): link import to form page #1801 #1811 --- .../enquete-import/actionsEnqueteImporter.js | 1 + .../EnqueteIndividuel/EnqueteIndividuel.js | 1 + .../EnqueteImport/EnqueteImportPanel.js | 16 ++++---- .../EnqueteImport/EnqueteImportResult.js | 37 ------------------- .../EnqueteImport/EnqueteImportResults.js | 34 ----------------- .../src/components/MenuStepper/MenuStepper.js | 11 +++++- 6 files changed, 20 insertions(+), 80 deletions(-) delete mode 100644 packages/app/src/components/EnqueteImport/EnqueteImportResult.js delete mode 100644 packages/app/src/components/EnqueteImport/EnqueteImportResults.js diff --git a/packages/api/src/routes/hasura-actions/enquete-import/actionsEnqueteImporter.js b/packages/api/src/routes/hasura-actions/enquete-import/actionsEnqueteImporter.js index 2ca18afe23..d9d447a21d 100644 --- a/packages/api/src/routes/hasura-actions/enquete-import/actionsEnqueteImporter.js +++ b/packages/api/src/routes/hasura-actions/enquete-import/actionsEnqueteImporter.js @@ -32,6 +32,7 @@ async function importEnqueteFile({ enqueteReponse.enquete_reponses_informations_mandataire_id, informationsMandataire ); + logger.info( `[IMPORT ENQUETE] informationsMandataireDb: ${JSON.stringify( informationsMandataireDb, diff --git a/packages/app/src/components/Enquete/EnqueteIndividuel/EnqueteIndividuel.js b/packages/app/src/components/Enquete/EnqueteIndividuel/EnqueteIndividuel.js index bb27cc95b0..940c9bbcdf 100644 --- a/packages/app/src/components/Enquete/EnqueteIndividuel/EnqueteIndividuel.js +++ b/packages/app/src/components/Enquete/EnqueteIndividuel/EnqueteIndividuel.js @@ -193,6 +193,7 @@ export const EnqueteIndividuel = props => { return ( diff --git a/packages/app/src/components/EnqueteImport/EnqueteImportPanel.js b/packages/app/src/components/EnqueteImport/EnqueteImportPanel.js index 2ec33aa39f..5d66c98301 100644 --- a/packages/app/src/components/EnqueteImport/EnqueteImportPanel.js +++ b/packages/app/src/components/EnqueteImport/EnqueteImportPanel.js @@ -1,18 +1,18 @@ import { LoaderCircle } from "@styled-icons/boxicons-regular/LoaderCircle"; +import { useRouter } from "next/router"; import React, { Fragment } from "react"; import { Box } from "rebass"; -import { EnqueteImportResult } from "./EnqueteImportResult"; import { SingleImportFilePicker } from "./SingleImportFilePicker"; import { useEnqueteImportManager } from "./useEnqueteImportManager.hook"; export const EnqueteImportPanel = ({ enqueteId, userId }) => { - const { importEnqueteFile, importSummary, reset, enqueteImportLoading } = useEnqueteImportManager( - { - enqueteId, - userId - } - ); + const router = useRouter(); + + const { importEnqueteFile, importSummary, enqueteImportLoading } = useEnqueteImportManager({ + enqueteId, + userId + }); if (enqueteImportLoading) { return ( @@ -24,7 +24,7 @@ export const EnqueteImportPanel = ({ enqueteId, userId }) => { } if (importSummary && !importSummary.unexpectedError) { - return reset()} importSummary={importSummary} />; + router.push(`/mandataires/enquetes/${enqueteId}`); } return ( diff --git a/packages/app/src/components/EnqueteImport/EnqueteImportResult.js b/packages/app/src/components/EnqueteImport/EnqueteImportResult.js deleted file mode 100644 index 07eb16db24..0000000000 --- a/packages/app/src/components/EnqueteImport/EnqueteImportResult.js +++ /dev/null @@ -1,37 +0,0 @@ -import { Button, Heading2, Text } from "@emjpm/ui"; -import React from "react"; -import { Flex } from "rebass"; - -import { EnqueteImportErrors } from "./EnqueteImportErrors"; -import { ServiceEnqueteImportResultStyle } from "./style"; - -const EnqueteImportResult = ({ - reset, - importSummary: { creationNumber, updateNumber, errors } -}) => { - return ( -
- - - {`Résultat de l'import`} - {errors.length ? ( - {`Erreur lors de l'import des enquete (${ - errors.length - } erreurs sur ${errors.length + - creationNumber + - updateNumber} enquete). Aucune enquete n'a été importée.`} - ) : ( - {`${creationNumber + - updateNumber} enquete ont été importées (${creationNumber} nouvelles et ${updateNumber} mises à jour).`} - )} - - - - {!!errors.length && } -
- ); -}; - -export { EnqueteImportResult }; diff --git a/packages/app/src/components/EnqueteImport/EnqueteImportResults.js b/packages/app/src/components/EnqueteImport/EnqueteImportResults.js deleted file mode 100644 index 0d5d70b235..0000000000 --- a/packages/app/src/components/EnqueteImport/EnqueteImportResults.js +++ /dev/null @@ -1,34 +0,0 @@ -import { Button, Heading2, Text } from "@emjpm/ui"; -import React, { Fragment } from "react"; -import { Flex } from "rebass"; - -import { EnqueteImportErrors } from "./EnqueteImportErrors"; -import { ServiceEnqueteImportResultStyle } from "./style"; - -const EnqueteImportResults = props => { - const { errors, enquete, reset } = props; - - return ( - - - - {`Résultat de l'import`} - {`${enquete.length} enquete vont être importées ou mises à jour. Vous allez recevoir un email dans quelques instants.`} - {`${errors.length} enquete ne seront pas importées ou mises à jour. Les erreurs sont indiquées ci-dessous.`} - - - - {errors.length > 0 && } - - ); -}; - -export { EnqueteImportResults }; diff --git a/packages/app/src/components/MenuStepper/MenuStepper.js b/packages/app/src/components/MenuStepper/MenuStepper.js index 8ba7780023..dae1c328b6 100644 --- a/packages/app/src/components/MenuStepper/MenuStepper.js +++ b/packages/app/src/components/MenuStepper/MenuStepper.js @@ -1,8 +1,10 @@ +import { Heading1 } from "@emjpm/ui"; import { Cross } from "@styled-icons/entypo/Cross"; import { SquaredCross } from "@styled-icons/entypo/SquaredCross"; import React, { useState } from "react"; import { Box, Flex, Text } from "rebass"; +import { LinkButton } from "../../components/Commons"; import styles from "./style"; function goToNextPage(sections, currentStep, setCurrentStep) { @@ -27,7 +29,7 @@ function goToPrevPage(sections, currentStep, setCurrentStep) { } export const MenuStepper = props => { - const { sections, ...otherProps } = props; + const { sections, enqueteId, ...otherProps } = props; const [currentStep, setCurrentStep] = useState({ step: 0, substep: 0 }); const section = sections[currentStep.step]; @@ -140,6 +142,13 @@ export const MenuStepper = props => { })} + + + + Importez votre enquête + + + {ComponentForm && ( Date: Mon, 25 May 2020 17:18:14 +0200 Subject: [PATCH 2/2] fix(enquete): navigation after import --- packages/app/src/components/EnqueteImport/EnqueteImportPanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/components/EnqueteImport/EnqueteImportPanel.js b/packages/app/src/components/EnqueteImport/EnqueteImportPanel.js index 5d66c98301..8eb4a7b03c 100644 --- a/packages/app/src/components/EnqueteImport/EnqueteImportPanel.js +++ b/packages/app/src/components/EnqueteImport/EnqueteImportPanel.js @@ -24,7 +24,7 @@ export const EnqueteImportPanel = ({ enqueteId, userId }) => { } if (importSummary && !importSummary.unexpectedError) { - router.push(`/mandataires/enquetes/${enqueteId}`); + router.push("/mandataires/enquetes/[enquete_id]", `/mandataires/enquetes/${enqueteId}`); } return (