fix: error

packages/code-du-travail-frontend/src/outils/CommonSteps/Agreement/index.tsx

@@ -130,9 +130,7 @@ function AgreementStep({
         </>
       )}
       {error?.errorPublicodes && (
-        <InlineError>
-          Une erreur liée au moteur de calcul bloque la simulation.
-        </InlineError>
+        <InlineError>{error.errorPublicodes}</InlineError>
       )}
     </>
   );

packages/code-du-travail-frontend/src/outils/CommonSteps/Agreement/store/store.ts

@@ -25,10 +25,9 @@ const initialState: Omit<
   input: {
     isAgreementSupportedIndemniteLicenciement: false,
     hasNoEnterpriseSelected: false,
+    informationError: false,
   },
-  error: {
-    errorPublicodes: false,
-  },
+  error: {},
   hasBeenSubmit: false,
   isStepValid: true,
 };
@@ -73,7 +72,7 @@ const createCommonAgreementStore: StoreSlicePublicode<
               set(
                 produce(
                   (state: CommonAgreementStoreSlice<PublicodesSimulator>) => {
-                    state.agreementData.error.errorPublicodes = isOk
+                    state.agreementData.input.informationError = isOk
                       ? false
                       : true;
                   }
@@ -101,7 +100,7 @@ const createCommonAgreementStore: StoreSlicePublicode<
       const isOk = get().informationsFunction.generatePublicodesQuestions();
       set(
         produce((state: CommonAgreementStoreSlice<PublicodesSimulator>) => {
-          state.agreementData.error.errorPublicodes = isOk ? false : true;
+          state.agreementData.input.informationError = isOk ? false : true;
         })
       );
     },
@@ -128,7 +127,7 @@ const createCommonAgreementStore: StoreSlicePublicode<
       const isOk = get().informationsFunction.generatePublicodesQuestions();
       set(
         produce((state: CommonAgreementStoreSlice<PublicodesSimulator>) => {
-          state.agreementData.error.errorPublicodes = isOk ? false : true;
+          state.agreementData.input.informationError = isOk ? false : true;
         })
       );
     },
@@ -143,7 +142,7 @@ const createCommonAgreementStore: StoreSlicePublicode<
     onNextStep: () => {
       const input = get().agreementData.input;
       const error = get().agreementData.error;
-      const { isValid, errorState } = validateStep(input, error);
+      const { isValid, errorState } = validateStep(input);
       const { route, agreement, enterprise } = input;
       if (isValid && route) {
         const isTreated = !!supportedCcn.find(
@@ -199,10 +198,7 @@ const applyGenericValidation = (
     const nextState = produce(get(), (draft) => {
       draft.agreementData.input[paramName] = value;
     });
-    const { isValid, errorState } = validateStep(
-      nextState.agreementData.input,
-      nextState.agreementData.error
-    );
+    const { isValid, errorState } = validateStep(nextState.agreementData.input);
     set(
       produce((state: CommonAgreementStoreSlice<PublicodesSimulator>) => {
         state.agreementData.error = errorState;

packages/code-du-travail-frontend/src/outils/CommonSteps/Agreement/store/types.ts

@@ -13,13 +13,14 @@ export type CommonAgreementStoreInput = {
   enterprise?: Enterprise;
   isAgreementSupportedIndemniteLicenciement: boolean;
   hasNoEnterpriseSelected: boolean;
+  informationError: boolean;
 };
 
 export type CommonAgreementStoreError = {
   route?: string;
   agreement?: string;
   enterprise?: string;
-  errorPublicodes: boolean;
+  errorPublicodes?: string;
 };
 
 export type CommonAgreementStoreData<T extends PublicodesSimulator> = {

packages/code-du-travail-frontend/src/outils/CommonSteps/Agreement/store/validator.ts

@@ -1,10 +1,7 @@
 import { deepEqualObject } from "../../../../lib";
 import { CommonAgreementStoreError, CommonAgreementStoreInput } from "./types";
 
-export const validateStep = (
-  state: CommonAgreementStoreInput,
-  error: CommonAgreementStoreError
-) => {
+export const validateStep = (state: CommonAgreementStoreInput) => {
   const errorState: CommonAgreementStoreError = {
     route: !state.route ? "Vous devez répondre à cette question" : undefined,
     agreement:
@@ -19,14 +16,16 @@ export const validateStep = (
         : state.route === "enterprise" && state.enterprise && !state.agreement
         ? "Vous devez sélectionner une convention collective"
         : undefined,
-    errorPublicodes: error.errorPublicodes,
+    errorPublicodes: state.informationError
+      ? "Une erreur liée au moteur de calcul bloque la simulation."
+      : undefined,
   };
   return {
     isValid: deepEqualObject(errorState, {
       route: undefined,
       agreement: undefined,
       enterprise: undefined,
-      errorPublicodes: false,
+      errorPublicodes: undefined,
     }),
     errorState,
   };

packages/code-du-travail-frontend/src/outils/CommonSteps/Informations/index.tsx

@@ -34,9 +34,7 @@ const CommonInformationStep = ({
       );
     })}
     {errors.errorPublicodes && (
-      <InlineError>
-        Une erreur liée au moteur de calcul bloque la simulation.
-      </InlineError>
+      <InlineError>{errors.errorPublicodes}</InlineError>
     )}
   </>
 );

packages/code-du-travail-frontend/src/outils/CommonSteps/Informations/store/store.ts

@@ -27,10 +27,10 @@ const initialState: CommonInformationsStoreData = {
     isStepHidden: true,
     isStepSalaryHidden: false,
     hasNoMissingQuestions: false,
+    informationError: false,
   },
   error: {
     errorInformations: {},
-    errorPublicodes: false,
   },
   hasBeenSubmit: false,
   isStepValid: true,
@@ -96,7 +96,7 @@ const createCommonInformationsStore: StoreSlice<
         Sentry.captureException(e);
         set(
           produce((state: CommonInformationsStoreSlice) => {
-            state.informationsData.error.errorPublicodes = true;
+            state.informationsData.input.informationError = true;
           })
         );
         return false;
@@ -105,6 +105,7 @@ const createCommonInformationsStore: StoreSlice<
     onInformationsChange: (key, value, type) => {
       let newPublicodesInformationsForNextQuestions: PublicodesInformation[];
       let hasNoMissingQuestions = false;
+      let informationError = false;
       const publicodesInformations =
         get().informationsData.input.publicodesInformations;
       const isLicenciementInaptitude =
@@ -150,11 +151,7 @@ const createCommonInformationsStore: StoreSlice<
             blockingNotification = notifBloquante[0].description;
           }
         } catch (e) {
-          set(
-            produce((state: CommonInformationsStoreSlice) => {
-              state.informationsData.error.errorPublicodes = true;
-            })
-          );
+          informationError = true;
           console.error(e);
         }
         set(
@@ -203,6 +200,7 @@ const createCommonInformationsStore: StoreSlice<
         "hasNoMissingQuestions",
         hasNoMissingQuestions
       );
+      applyGenericValidation(get, set, "informationError", informationError);
     },
     onSetStepHidden: () => {
       const publicodesInformations =
@@ -240,7 +238,7 @@ const createCommonInformationsStore: StoreSlice<
     onNextStep: () => {
       const state = get().informationsData.input;
       const currentError = get().informationsData.error;
-      const { isValid, errorState } = validateStep(state, currentError);
+      const { isValid, errorState } = validateStep(state);
       let errorEligibility;
 
       if (isValid) {
@@ -277,8 +275,7 @@ const applyGenericValidation = (
       draft.informationsData.input[paramName] = value;
     });
     const { isValid, errorState } = validateStep(
-      nextState.informationsData.input,
-      nextState.informationsData.error
+      nextState.informationsData.input
     );
     set(
       produce((state: CommonInformationsStoreSlice) => {

packages/code-du-travail-frontend/src/outils/CommonSteps/Informations/store/types.ts

@@ -18,12 +18,13 @@ export type CommonInformationsStoreInput = {
   isStepSalaryHidden: boolean;
   hasNoMissingQuestions: boolean;
   blockingNotification?: string;
+  informationError: boolean;
 };
 
 export type CommonInformationsStoreError = {
   errorInformations: Record<string, string>;
   errorEligibility?: string;
-  errorPublicodes: boolean;
+  errorPublicodes?: string;
 };
 
 export type CommonInformationsStoreData = {

packages/code-du-travail-frontend/src/outils/CommonSteps/Informations/store/validator.ts

@@ -6,10 +6,7 @@ import {
 import { RuleType } from "@socialgouv/modeles-social";
 import { isDate, isPositiveNumber } from "../../../common/validators";
 
-export const validateStep = (
-  state: CommonInformationsStoreInput,
-  error: CommonInformationsStoreError
-) => {
+export const validateStep = (state: CommonInformationsStoreInput) => {
   const informations = state.publicodesInformations;
   let errorInformations: Record<string, string> = {};
   informations.forEach((info) => {
@@ -21,12 +18,14 @@ export const validateStep = (
 
   let errorState: CommonInformationsStoreError = {
     errorInformations,
-    errorPublicodes: error.errorPublicodes,
+    errorPublicodes: state.informationError
+      ? "Une erreur liée au moteur de calcul bloque la simulation."
+      : undefined,
   };
 
   const isValid = deepEqualObject(errorState, {
     errorInformations: {},
-    errorPublicodes: false,
+    errorPublicodes: undefined,
   });
   return { isValid, errorState };
 };

packages/code-du-travail-frontend/src/outils/Components/SimulatorDecorator/index.tsx

@@ -1,5 +1,5 @@
 import { Fieldset, Legend, theme, Wrapper } from "@socialgouv/cdtn-ui";
-import React from "react";
+import React, { useContext } from "react";
 import { Form } from "react-final-form";
 import styled from "styled-components";
 
@@ -10,6 +10,7 @@ import type {
   TitleProps,
 } from "./Components/types";
 import { Decorator, FormApi, Mutator, ValidationErrors } from "final-form";
+import { InlineError } from "../../common/ErrorField";
 
 type Props<FormValues> = {
   title: TitleProps;
@@ -33,6 +34,7 @@ type Props<FormValues> = {
     annotations?: JSX.Element;
     debug?: JSX.Element;
   };
+  hasErrorPublicodes?: boolean;
 };
 
 const SimulatorDecorator = <FormValues,>({
@@ -45,6 +47,7 @@ const SimulatorDecorator = <FormValues,>({
   formOptions,
   renderStep,
   options,
+  hasErrorPublicodes,
 }: Props<FormValues>): JSX.Element => {
   const onPrevious = navigation.onPrevious;
 
@@ -80,15 +83,22 @@ const SimulatorDecorator = <FormValues,>({
                 renderStep(form)
               )}
 
+              {hasErrorPublicodes && (
+                <InlineError>
+                  Une erreur liée au moteur de calcul bloque la simulation.{" "}
+                </InlineError>
+              )}
+
               <Navigation
                 {...navigation}
-                hasError={invalid && submitFailed}
+                hasError={invalid && submitFailed && hasErrorPublicodes}
                 onPrevious={
                   onPrevious &&
                   (() => {
                     onPrevious(form.getState().values);
                   })
                 }
+                showNext={navigation.showNext && !hasErrorPublicodes}
               />
               {options?.annotations && <p>{options.annotations}</p>}
               {process.env.NODE_ENV !== "production" &&

packages/code-du-travail-frontend/src/outils/DureePreavisRetraite/Components/PreavisRetraiteSimulator/index.tsx

@@ -17,11 +17,12 @@ const PreavisRetraiteSimulator = ({
   displayTitle,
 }: Props): JSX.Element => {
   const store = useContext(PreavisRetraiteContext);
-  const { onChange, onStepChange } = usePreavisRetraiteStore(
+  const { onChange, onStepChange, errorPublicodes } = usePreavisRetraiteStore(
     store,
     (state) => ({
       onChange: state.onFormValuesChange,
       onStepChange: state.onStepChange,
+      errorPublicodes: state.errorPublicodes,
     })
   );
 
@@ -35,6 +36,7 @@ const PreavisRetraiteSimulator = ({
       onFormValuesChange={onChange}
       onStepChange={onStepChange}
       steps={steps}
+      hasErrorPublicodes={errorPublicodes}
     />
   );
 };

packages/code-du-travail-frontend/src/outils/DureePreavisRetraite/state/types.ts

@@ -23,6 +23,7 @@ export type PreavisRetraiteState = {
     result?: ResultStepProps;
   };
   formValues: PreavisRetraiteFormState;
+  errorPublicodes: boolean | undefined;
 };
 
 export type PublicodesState = {

packages/code-du-travail-frontend/src/outils/DureePreavisRetraite/state/usecases/computeNextQuestion.ts

@@ -2,6 +2,7 @@ import { stateToPublicode } from "./helpers";
 import { PreavisRetraiteStore, Question } from "../types";
 import { MissingArgs } from "@socialgouv/modeles-social";
 import validateInformationAgreement3239 from "./validateInformationAgreement3239";
+import * as Sentry from "@sentry/nextjs";
 
 const excludedRules = [
   "contrat salarié - ancienneté",
@@ -47,20 +48,30 @@ const computeNextQuestion = (
   }
   const currentQuestions = state.steps.informations.questions;
   const newSituation = stateToPublicode(state.formValues);
-  const missingQuestions = getNextQuestion(
-    state.publicodes.setSituation(newSituation).missingArgs,
-    currentQuestions
-  );
-  const newQuestions = currentQuestions.concat(missingQuestions);
-  return {
-    ...state,
-    steps: {
-      ...state.steps,
-      informations: {
-        questions: newQuestions,
+  try {
+    const missingQuestions = getNextQuestion(
+      state.publicodes.setSituation(newSituation).missingArgs,
+      currentQuestions
+    );
+    const newQuestions = currentQuestions.concat(missingQuestions);
+    return {
+      ...state,
+      steps: {
+        ...state.steps,
+        informations: {
+          questions: newQuestions,
+        },
       },
-    },
-  };
+      errorPublicodes: false,
+    };
+  } catch (e) {
+    Sentry.captureException(e);
+    console.error(e);
+    return {
+      ...state,
+      errorPublicodes: true,
+    };
+  }
 };
 
 export default computeNextQuestion;