feat(enquete): link import to form page #1801 #1811 (#1829)

* feat(enquete): link import to form page #1801 #1811 * fix(enquete): navigation after import Co-authored-by: Rémi Roycourt <remiroycourt@gmail.com>
SocialGouv · May 25, 2020 · 36a3ce1 · 36a3ce1
1 parent bea7f88
commit 36a3ce1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 80 deletions.
diff --git 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/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 <EnqueteImportResult reset={() => reset()} importSummary={importSummary} />;
+ router.push("/mandataires/enquetes/[enquete_id]", `/mandataires/enquetes/${enqueteId}`);
  }
 
  return (

diff --git a/packages/app/src/components/EnqueteImport/EnqueteImportResult.js b/packages/app/src/components/EnqueteImport/EnqueteImportResult.js
diff --git a/packages/app/src/components/EnqueteImport/EnqueteImportResults.js b/packages/app/src/components/EnqueteImport/EnqueteImportResults.js
diff --git 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 => {
  })}
  </Box>
  <Box py={"50px"} pl={"35px"} flex={1}>
+ <Flex flexDirection="row" justifyContent="flex-end">
+ <Box mr={1}>
+ <LinkButton href={`/mandataires/enquetes/${enqueteId}/import`}>
+ Importez votre enquête
+ </LinkButton>
+ </Box>
+ </Flex>
  {ComponentForm && (
  <ComponentForm
  {...otherProps}