feat(enquete): refresh validation after mutation (#1823)

SocialGouv · May 25, 2020 · bea7f88 · bea7f88
1 parent 559dfcc
commit bea7f88
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 7 deletions.
diff --git a/.../routes/hasura-actions/enquete-mandataire-individuel/enqueteMandataireIndividuelStatus.js b/.../routes/hasura-actions/enquete-mandataire-individuel/enqueteMandataireIndividuelStatus.js
@@ -22,12 +22,12 @@ async function enqueteMandataireIndividuelStatus(enqueteReponse) {
 
  const informationsFormationMandataireStatus = await getValidationStatus(
  enqueteReponse.enquete_reponses_agrements_formation,
- informationsAgrementsMandataireSchema
+ informationsFormationMandataireSchema
  );
 
  const informationsAgrementsMandataireStatus = await getValidationStatus(
  enqueteReponse.enquete_reponses_agrements_formation,
- informationsFormationMandataireSchema
+ informationsAgrementsMandataireSchema
  );
 
  // TODO

diff --git 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 (
  <MenuStepper
  enqueteReponse={enquete_individuel}
+ enqueteId={enqueteId}
  mandataireId={mandataireId}
  sections={MENU_SECTIONS}
  />

diff --git a/...app/src/components/Enquete/EnqueteIndividuelInformations/EnqueteIndividuelInformations.js b/...app/src/components/Enquete/EnqueteIndividuelInformations/EnqueteIndividuelInformations.js
@@ -2,12 +2,13 @@ import { useMutation, useQuery } from "@apollo/react-hooks";
 import React from "react";
 import { Box } from "rebass";
 
+import { ENQUETE_MANDATAIRE_INDIVIDUEL } from "../EnqueteIndividuel/queries";
 import { EnqueteIndividuelInformationsForm } from "./EnqueteIndividuelInformationsForm";
 import { UPDATE_ENQUETE_INDIVIDUEL_INFORMATIONS } from "./mutations";
 import { ENQUETE_INDIVIDUEL_INFORMATIONS_MANDATAIRE } from "./queries";
 
 export const EnqueteIndividuelInformations = props => {
- const { goToNextPage, goToPrevPage, enqueteReponse } = props;
+ const { goToNextPage, goToPrevPage, enqueteReponse, mandataireId, enqueteId } = props;
  const { enquete_reponses_informations_mandataire_id } = enqueteReponse;
 
  const { data, loading } = useQuery(ENQUETE_INDIVIDUEL_INFORMATIONS_MANDATAIRE, {
@@ -17,6 +18,10 @@ export const EnqueteIndividuelInformations = props => {
  });
  const [updateEnquete] = useMutation(UPDATE_ENQUETE_INDIVIDUEL_INFORMATIONS, {
  refetchQueries: [
+ {
+ query: ENQUETE_MANDATAIRE_INDIVIDUEL,
+ variables: { enqueteId, mandataireId }
+ },
  {
  query: ENQUETE_INDIVIDUEL_INFORMATIONS_MANDATAIRE,
  variables: { id: enquete_reponses_informations_mandataire_id }

diff --git a/...omponents/Enquete/EnqueteIndividuelInformations/EnqueteIndividuelInformationsAgrements.js b/...omponents/Enquete/EnqueteIndividuelInformations/EnqueteIndividuelInformationsAgrements.js
@@ -2,12 +2,13 @@ import { useMutation, useQuery } from "@apollo/react-hooks";
 import React from "react";
 import { Box } from "rebass";
 
+import { ENQUETE_MANDATAIRE_INDIVIDUEL } from "../EnqueteIndividuel/queries";
 import { EnqueteIndividuelInformationsAgrementsForm } from "./EnqueteIndividuelInformationsAgrementsForm";
 import { UPDATE_ENQUETE_INFORMATIONS_AGREMENTS } from "./mutations";
 import { ENQUETE_INDIVIDUEL_INFORMATIONS_AGREMENTS } from "./queries";
 
 export const EnqueteIndividuelInformationsAgrements = props => {
- const { goToNextPage, goToPrevPage, enqueteReponse } = props;
+ const { goToNextPage, goToPrevPage, enqueteReponse, mandataireId, enqueteId } = props;
  const { enquete_reponses_informations_mandataire_id } = enqueteReponse;
 
  const { data, loading } = useQuery(ENQUETE_INDIVIDUEL_INFORMATIONS_AGREMENTS, {
@@ -17,6 +18,10 @@ export const EnqueteIndividuelInformationsAgrements = props => {
  });
  const [updateEnquete] = useMutation(UPDATE_ENQUETE_INFORMATIONS_AGREMENTS, {
  refetchQueries: [
+ {
+ query: ENQUETE_MANDATAIRE_INDIVIDUEL,
+ variables: { enqueteId, mandataireId }
+ },
  {
  query: ENQUETE_INDIVIDUEL_INFORMATIONS_AGREMENTS,
  variables: { id: enquete_reponses_informations_mandataire_id }

diff --git a/...omponents/Enquete/EnqueteIndividuelInformations/EnqueteIndividuelInformationsFormation.js b/...omponents/Enquete/EnqueteIndividuelInformations/EnqueteIndividuelInformationsFormation.js
@@ -2,12 +2,13 @@ import { useMutation, useQuery } from "@apollo/react-hooks";
 import React from "react";
 import { Box } from "rebass";
 
+import { ENQUETE_MANDATAIRE_INDIVIDUEL } from "../EnqueteIndividuel/queries";
 import { EnqueteIndividuelInformationsFormationForm } from "./EnqueteIndividuelInformationsFormationForm";
 import { UPDATE_ENQUETE_INFORMATIONS_FORMATION } from "./mutations";
 import { ENQUETE_INDIVIDUEL_INFORMATIONS_FORMATION } from "./queries";
 
 export const EnqueteIndividuelInformationsFormation = props => {
- const { goToNextPage, goToPrevPage, enqueteReponse } = props;
+ const { goToNextPage, goToPrevPage, enqueteReponse, mandataireId, enqueteId } = props;
  const { enquete_reponses_agrements_formations_id } = enqueteReponse;
 
  const { data, loading } = useQuery(ENQUETE_INDIVIDUEL_INFORMATIONS_FORMATION, {
@@ -18,6 +19,10 @@ export const EnqueteIndividuelInformationsFormation = props => {
 
  const [updateEnquete] = useMutation(UPDATE_ENQUETE_INFORMATIONS_FORMATION, {
  refetchQueries: [
+ {
+ query: ENQUETE_MANDATAIRE_INDIVIDUEL,
+ variables: { enqueteId, mandataireId }
+ },
  {
  query: ENQUETE_INDIVIDUEL_INFORMATIONS_FORMATION,
  variables: { id: enquete_reponses_agrements_formations_id }

diff --git a/...ents/Enquete/EnqueteIndividuelPrestationsSociales/EnqueteIndividuelPrestationsSociales.js b/...ents/Enquete/EnqueteIndividuelPrestationsSociales/EnqueteIndividuelPrestationsSociales.js
@@ -2,12 +2,13 @@ import { useMutation, useQuery } from "@apollo/react-hooks";
 import React from "react";
 import { Box } from "rebass";
 
+import { ENQUETE_MANDATAIRE_INDIVIDUEL } from "../EnqueteIndividuel/queries";
 import { EnqueteIndividuelPrestationsSocialesForm } from "./EnqueteIndividuelPrestationsSocialesForm";
 import { UPDATE_ENQUETE_INDIVIDUEL_PRESTATIONS_SOCIALES } from "./mutations";
 import { ENQUETE_REPONSE_PRESTATIONS_SOCIALES } from "./queries";
 
 export const EnqueteIndividuelPrestationsSociales = props => {
- const { goToNextPage, goToPrevPage, enqueteReponse } = props;
+ const { goToNextPage, goToPrevPage, enqueteReponse, mandataireId, enqueteId } = props;
  const { enquete_reponses_prestations_sociale_id } = enqueteReponse;
 
  const { data, loading } = useQuery(ENQUETE_REPONSE_PRESTATIONS_SOCIALES, {
@@ -18,6 +19,10 @@ export const EnqueteIndividuelPrestationsSociales = props => {
 
  const [updateEnquete] = useMutation(UPDATE_ENQUETE_INDIVIDUEL_PRESTATIONS_SOCIALES, {
  refetchQueries: [
+ {
+ query: ENQUETE_MANDATAIRE_INDIVIDUEL,
+ variables: { enqueteId, mandataireId }
+ },
  {
  query: ENQUETE_REPONSE_PRESTATIONS_SOCIALES,
  variables: { id: enquete_reponses_prestations_sociale_id }

diff --git a/packages/app/src/components/Enquete/EnquetePopulations/EnquetePopulationsCuratelle.js b/packages/app/src/components/Enquete/EnquetePopulations/EnquetePopulationsCuratelle.js
@@ -2,12 +2,13 @@ import React from "react";
 import { useMutation, useQuery } from "react-apollo";
 import { Box } from "rebass";
 
+import { ENQUETE_MANDATAIRE_INDIVIDUEL } from "../EnqueteIndividuel/queries";
 import { EnquetePopulationsForm } from "./EnquetePopulationsForm";
 import { UPDATE_ENQUETE_POPULATIONS_CURATELLE } from "./mutations";
 import { ENQUETE_REPONSE_POPULATIONS_CURATELLE } from "./queries";
 
 export const EnquetePopulationsCuratelle = props => {
- const { goToPrevPage, goToNextPage, enqueteReponse } = props;
+ const { goToPrevPage, goToNextPage, enqueteReponse, mandataireId, enqueteId } = props;
  const { enquete_reponses_populations_id } = enqueteReponse;
 
  const { data, loading } = useQuery(ENQUETE_REPONSE_POPULATIONS_CURATELLE, {
@@ -18,6 +19,10 @@ export const EnquetePopulationsCuratelle = props => {
 
  const [updateEnquete] = useMutation(UPDATE_ENQUETE_POPULATIONS_CURATELLE, {
  refetchQueries: [
+ {
+ query: ENQUETE_MANDATAIRE_INDIVIDUEL,
+ variables: { enqueteId, mandataireId }
+ },
  {
  query: ENQUETE_REPONSE_POPULATIONS_CURATELLE,
  variables: { id: enquete_reponses_populations_id }