Skip to content
This repository has been archived by the owner on Mar 6, 2023. It is now read-only.

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

Merged
merged 2 commits into from
May 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ async function importEnqueteFile({
enqueteReponse.enquete_reponses_informations_mandataire_id,
informationsMandataire
);

logger.info(
`[IMPORT ENQUETE] informationsMandataireDb: ${JSON.stringify(
informationsMandataireDb,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ export const EnqueteIndividuel = props => {
return (
<MenuStepper
enqueteReponse={enquete_individuel}
enqueteId={enqueteId}
mandataireId={mandataireId}
sections={MENU_SECTIONS}
/>
Expand Down
16 changes: 8 additions & 8 deletions packages/app/src/components/EnqueteImport/EnqueteImportPanel.js
Original file line number Diff line number Diff line change
@@ -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 (
Expand All @@ -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 (
Expand Down
37 changes: 0 additions & 37 deletions packages/app/src/components/EnqueteImport/EnqueteImportResult.js

This file was deleted.

34 changes: 0 additions & 34 deletions packages/app/src/components/EnqueteImport/EnqueteImportResults.js

This file was deleted.

11 changes: 10 additions & 1 deletion packages/app/src/components/MenuStepper/MenuStepper.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand All @@ -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];
Expand Down Expand Up @@ -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}
Expand Down