Correction et refacto de l'affichage des questions

site/cypress/integration/mon-entreprise/simulateurs-generic/eirl-ir.js

@@ -0,0 +1,3 @@
+import { runSimulateurTest } from '../../../support/simulateur'
+
+runSimulateurTest('eirl', true)

site/cypress/integration/mon-entreprise/simulateurs-generic/eirl-is.js

@@ -0,0 +1,5 @@
+import { runSimulateurTest } from '../../../support/simulateur'
+
+runSimulateurTest('eirl', false, () =>
+	cy.contains('Impôt sur les sociétés').click()
+)

site/cypress/integration/mon-entreprise/simulateurs-generic/entreprise-individuelle.js

@@ -0,0 +1,3 @@
+import { runSimulateurTest } from '../../../support/simulateur'
+
+runSimulateurTest('entreprise-individuelle', true)

site/cypress/integration/mon-entreprise/simulateurs-generic/eurl-ir.js

@@ -0,0 +1,5 @@
+import { runSimulateurTest } from '../../../support/simulateur'
+
+runSimulateurTest('eurl', true, () =>
+	cy.contains('Impôt sur le revenu').click()
+)

site/cypress/integration/mon-entreprise/simulateurs-generic/eurl-is.js

@@ -0,0 +1,3 @@
+import { runSimulateurTest } from '../../../support/simulateur'
+
+runSimulateurTest('eurl')

site/cypress/integration/mon-entreprise/simulateurs-generic/indépendant.js

@@ -1,3 +1,3 @@
 import { runSimulateurTest } from '../../../support/simulateur'
 
-runSimulateurTest('indépendant')
+runSimulateurTest('indépendant', true)

site/cypress/integration/mon-entreprise/simulateurs-generic/profession-liberale.js

@@ -1,3 +1,3 @@
 import { runSimulateurTest } from '../../../support/simulateur'
 
-runSimulateurTest('profession-liberale')
+runSimulateurTest('profession-liberale', true)

site/cypress/integration/mon-entreprise/simulateurs-generic/profession-liberale/auxiliaire-medical.js

@@ -1,3 +1,3 @@
 import { runSimulateurTest } from '../../../../support/simulateur'
 
-runSimulateurTest('profession-liberale/auxiliaire-medical')
+runSimulateurTest('profession-liberale/auxiliaire-medical', true)

site/cypress/integration/mon-entreprise/simulateurs-generic/profession-liberale/avocat.js

@@ -0,0 +1,3 @@
+import { runSimulateurTest } from '../../../../support/simulateur'
+
+runSimulateurTest('profession-liberale/avocat', true)

site/cypress/integration/mon-entreprise/simulateurs-generic/profession-liberale/chirurgien-dentiste.js

@@ -1,3 +1,3 @@
 import { runSimulateurTest } from '../../../../support/simulateur'
 
-runSimulateurTest('profession-liberale/chirurgien-dentiste')
+runSimulateurTest('profession-liberale/chirurgien-dentiste', true)

site/cypress/integration/mon-entreprise/simulateurs-generic/profession-liberale/expert-comptable.js

@@ -0,0 +1,3 @@
+import { runSimulateurTest } from '../../../../support/simulateur'
+
+runSimulateurTest('profession-liberale/expert-comptable', true)

site/cypress/integration/mon-entreprise/simulateurs-generic/profession-liberale/medecin.js

@@ -1,3 +1,3 @@
 import { runSimulateurTest } from '../../../../support/simulateur'
 
-runSimulateurTest('profession-liberale/medecin')
+runSimulateurTest('profession-liberale/medecin', true)

site/cypress/integration/mon-entreprise/simulateurs-generic/profession-liberale/pharmacien.js

@@ -0,0 +1,3 @@
+import { runSimulateurTest } from '../../../../support/simulateur'
+
+runSimulateurTest('profession-liberale/pharmacien', true)

site/cypress/integration/mon-entreprise/simulateurs-generic/profession-liberale/sage-femme.js

@@ -1,3 +1,3 @@
 import { runSimulateurTest } from '../../../../support/simulateur'
 
-runSimulateurTest('profession-liberale/sage-femme')
+runSimulateurTest('profession-liberale/sage-femme', true)

site/cypress/support/simulateur.ts

@@ -7,6 +7,9 @@ const lang = Cypress.env('language') as 'fr' | 'en'
 
 type Simulateur =
 	| 'auto-entrepreneur'
+	| 'eirl'
+	| 'eurl'
+	| 'entreprise-individuelle'
 	| 'salaire-brut-net'
 	| 'salary'
 	| 'sasu'
@@ -16,6 +19,9 @@ type Simulateur =
 	| 'profession-liberale/chirurgien-dentiste'
 	| 'profession-liberale/médecin'
 	| 'profession-liberale/sage-femme'
+	| 'profession-liberale/pharmacien'
+	| 'profession-liberale/avocat'
+	| 'profession-liberale/expert-comptable'
 
 const variableNames = {
 	url: {
@@ -44,13 +50,18 @@ const variableNames = {
 	},
 }
 
-export const runSimulateurTest = (simulateur: Simulateur) => {
+export const runSimulateurTest = (
+	simulateur: Simulateur,
+	avecCharges = false,
+	beforeAction = () => {}
+) => {
 	describe(
 		`Le simulateur ${simulateur}`,
 		{ testIsolation: false },
 		function () {
 			before(function () {
 				cy.visit(encodeURI(`/${variableNames.url[lang]}/${simulateur}`))
+				beforeAction?.()
 			})
 
 			it("devrait s'afficher", function () {
@@ -67,7 +78,7 @@ export const runSimulateurTest = (simulateur: Simulateur) => {
 
 			it('devrait afficher un résultat pour chaque champ rempli', function () {
 				cy.contains(variableNames.yearTab[lang]).click()
-				if (['indépendant', 'profession-liberale'].includes(simulateur)) {
+				if (avecCharges) {
 					cy.get(chargeInputSelector).type('{selectall}1000')
 				}
 				cy.get(inputSelector).each(($testedInput) => {
@@ -91,7 +102,7 @@ export const runSimulateurTest = (simulateur: Simulateur) => {
 			it("devrait permettre de changer d'échelle temporelle", function () {
 				cy.contains(variableNames.yearTab[lang]).click()
 				cy.get(inputSelector).first().type('{selectall}12000')
-				if (['indépendant', 'profession-liberale'].includes(simulateur)) {
+				if (avecCharges) {
 					cy.get(chargeInputSelector).type('{selectall}6000')
 				}
 

site/source/components/GuichetInfo.tsx

@@ -54,7 +54,7 @@ export default function GuichetInfo({ codeApe }: { codeApe: string }) {
 	}
 
 	return (
-		<Ul noMarker>
+		<Ul $noMarker>
 			{guichetEntries.map((guichetEntry) => {
 				return (
 					<Li key={guichetEntry.code}>

site/source/components/Banner.tsx → site/source/components/Simulation/Banner.tsx

@@ -1,12 +1,10 @@
 import React from 'react'
-import { useSelector } from 'react-redux'
 
 import { Message } from '@/design-system'
 import { Emoji } from '@/design-system/emoji'
 import { SmallBody } from '@/design-system/typography/paragraphs'
-import { firstStepCompletedSelector } from '@/store/selectors/simulationSelectors'
 
-import { FadeIn } from './ui/animate'
+import { FadeIn } from '../ui/animate'
 
 type BannerProps = {
 	children: React.ReactNode
@@ -16,16 +14,11 @@ type BannerProps = {
 	className?: string
 }
 
-export default function Banner({
+export default function SimulationBanner({
 	children,
-	hidden: hiddenProp = false,
-	hideAfterFirstStep = true,
+	hidden = false,
 	icon,
 }: BannerProps) {
-	const hiddenState = useSelector(firstStepCompletedSelector)
-
-	const hidden = hiddenProp || (hideAfterFirstStep && hiddenState)
-
 	return !hidden ? (
 		<FadeIn>
 			<Message

site/source/components/PreviousSimulationBanner.tsx → site/source/components/Simulation/PreviousSimulationBanner.tsx

@@ -1,28 +1,22 @@
 import { Trans, useTranslation } from 'react-i18next'
 import { useDispatch, useSelector } from 'react-redux'
 
+import SimulationBanner from '@/components/Simulation/Banner'
 import { Link } from '@/design-system/typography/link'
 import { loadPreviousSimulation } from '@/store/actions/actions'
-import { RootState } from '@/store/reducers/rootReducer'
-import { firstStepCompletedSelector } from '@/store/selectors/simulationSelectors'
-
-import Banner from './Banner'
+import { previousSimulationSelector } from '@/store/selectors/simulationSelectors'
 
 export default function PreviousSimulationBanner() {
-	const previousSimulation = useSelector(
-		(state: RootState) => state.previousSimulation
-	)
-	const newSimulationStarted = useSelector(firstStepCompletedSelector)
+	const previousSimulation = useSelector(previousSimulationSelector)
 	const dispatch = useDispatch()
-
 	const { t } = useTranslation()
 
+	if (!previousSimulation) {
+		return null
+	}
+
 	return (
-		<Banner
-			className="print-hidden"
-			hidden={!previousSimulation || newSimulationStarted}
-			icon="💾"
-		>
+		<SimulationBanner className="print-hidden" icon="💾">
 			<Trans i18nKey="previousSimulationBanner.info">
 				Votre précédente simulation a été sauvegardée :
 			</Trans>{' '}
@@ -37,6 +31,6 @@ export default function PreviousSimulationBanner() {
 					Retrouver ma précédente simulation
 				</Trans>
 			</Link>
-		</Banner>
+		</SimulationBanner>
 	)
 }

site/source/components/SimulationPréremplieBanner.tsx → site/source/components/Simulation/SimulationPréremplieBanner.tsx

@@ -1,28 +1,34 @@
+import { difference } from 'effect/Array'
 import { Trans, useTranslation } from 'react-i18next'
 import { useSelector } from 'react-redux'
 import { styled } from 'styled-components'
 
+import SimulationBanner from '@/components/Simulation/Banner'
 import { PopoverWithTrigger } from '@/design-system'
 import { Link } from '@/design-system/typography/link'
-import { companySituationSelector } from '@/store/selectors/simulationSelectors'
+import {
+	companySituationSelector,
+	situationSelector,
+} from '@/store/selectors/simulationSelectors'
 
-import Banner from './Banner'
-import AnswerList from './conversation/AnswerList'
-import WrongSimulateurWarning from './WrongSimulateurWarning'
+import AnswerList from '../conversation/AnswerList'
+import WrongSimulateurWarning from '../WrongSimulateurWarning'
 
 export default function SimulationPréremplieBanner() {
-	const existingCompany = !!useSelector(companySituationSelector)[
-		'entreprise . SIREN'
-	]
+	const companySituation = useSelector(companySituationSelector)
+	const simulationSituation = useSelector(situationSelector)
+	const preexistingCompanySituation =
+		difference(Object.keys(companySituation), Object.keys(simulationSituation))
+			.length > 0
 
 	const { t } = useTranslation()
 
-	if (!existingCompany) {
+	if (!preexistingCompanySituation) {
 		return null
 	}
 
 	return (
-		<Banner icon="✏">
+		<SimulationBanner icon="✏">
 			<Trans i18nKey="simulationPréremplieBanner.info">
 				Ce simulateur a été prérempli avec la situation de votre entreprise.
 			</Trans>{' '}
@@ -47,7 +53,7 @@ export default function SimulationPréremplieBanner() {
 			<WrongSimulateurWarningContainer>
 				<WrongSimulateurWarning />
 			</WrongSimulateurWarningContainer>
-		</Banner>
+		</SimulationBanner>
 	)
 }
 

site/source/components/SelectSimulationYear.tsx → site/source/components/Simulation/YearSelectionBanner.tsx

@@ -2,25 +2,25 @@ import { Trans } from 'react-i18next'
 import { useDispatch } from 'react-redux'
 import { styled } from 'styled-components'
 
-import Banner from '@/components/Banner'
+import SimulationBanner from '@/components/Simulation/Banner'
 import { Link } from '@/design-system/typography/link'
 import { enregistreLaRéponse } from '@/store/actions/actions'
 import { getCurrentYear, getYearsBetween } from '@/utils/dates'
 
-import useYear from './utils/useYear'
+import useYear from '../utils/useYear'
 
 const Bold = styled.span<{ $bold: boolean }>`
 	${({ $bold }) => ($bold ? 'font-weight: bold;' : '')}
 `
 
-export const SelectSimulationYear = () => {
+export const YearSelectionBanner = () => {
 	const dispatch = useDispatch()
 	const currentYear = getCurrentYear()
 	const choices = getYearsBetween(2023, currentYear)
 	const currentEngineYear = useYear()
 
 	return (
-		<Banner hideAfterFirstStep={false} icon={'📅'}>
+		<SimulationBanner icon={'📅'}>
 			<Trans i18nKey="pages.simulateurs.select-year.info">
 				Cette simulation concerne l'année{' '}
 				<Bold $bold={currentEngineYear !== currentYear}>
@@ -52,7 +52,7 @@ export const SelectSimulationYear = () => {
 						</span>
 					))}
 			</>
-		</Banner>
+		</SimulationBanner>
 	)
 }
 

site/source/components/Simulation/index.tsx

@@ -1,3 +1,4 @@
+import { DottedName } from 'modele-social'
 import React from 'react'
 import { useSelector } from 'react-redux'
 import { useLocation } from 'react-router-dom'
@@ -10,17 +11,18 @@ import ShareOrSaveSimulationBanner, {
 import { Button } from '@/design-system/buttons'
 import { Grid, Spacing } from '@/design-system/layout'
 import { H3 } from '@/design-system/typography/heading'
+import { RootState } from '@/store/reducers/rootReducer'
 import { ilYADesQuestionsSelector } from '@/store/selectors/ilYADesQuestions.selector'
 import { firstStepCompletedSelector } from '@/store/selectors/simulationSelectors'
 
 import { TrackPage } from '../ATInternetTracking'
 import { Feedback, getShouldAskFeedback } from '../Feedback/Feedback'
 import PrintExportRecover from '../simulationExplanation/PrintExportRecover'
-import SimulationPréremplieBanner from '../SimulationPréremplieBanner'
-import PreviousSimulationBanner from './../PreviousSimulationBanner'
 import { FromTop } from './../ui/animate'
 import EntrepriseSelection from './EntrepriseSelection'
+import PreviousSimulationBanner from './PreviousSimulationBanner'
 import { Questions } from './Questions'
+import SimulationPréremplieBanner from './SimulationPréremplieBanner'
 
 export { Questions } from './Questions'
 export { SimulationGoal } from './SimulationGoal'
@@ -48,6 +50,7 @@ type SimulationProps = {
 	id?: string
 	customSimulationbutton?: CustomSimulationButton
 	entrepriseSelection?: boolean
+	firstStepCompletedExceptions?: DottedName[]
 }
 
 export default function Simulation({
@@ -62,10 +65,14 @@ export default function Simulation({
 	id,
 	customSimulationbutton,
 	entrepriseSelection = true,
+	firstStepCompletedExceptions,
 }: SimulationProps) {
-	const firstStepCompleted = useSelector(firstStepCompletedSelector)
+	const firstStepCompleted = useSelector((state: RootState) =>
+		firstStepCompletedSelector(state, firstStepCompletedExceptions)
+	)
 	const ilYADesQuestions = useSelector(ilYADesQuestionsSelector)
 	const shouldShowFeedback = getShouldAskFeedback(useLocation().pathname)
+	const showQuestions = showQuestionsFromBeginning || firstStepCompleted
 
 	return (
 		<>
@@ -75,24 +82,22 @@ export default function Simulation({
 				<PrintExportRecover />
 				{children}
 				<FromTop>
-					{(firstStepCompleted || showQuestionsFromBeginning) && (
+					{showQuestions && (
 						<>
-							{entrepriseSelection && <EntrepriseSelection />}
 							<div className="print-hidden">
 								<FromTop>{results}</FromTop>
 							</div>
+							{entrepriseSelection && <EntrepriseSelection />}
 							{ilYADesQuestions && (
 								<Questions customEndMessages={customEndMessages} />
 							)}
 						</>
 					)}
 					<Spacing md />
 
-					<SimulationPréremplieBanner />
+					{!entrepriseSelection && <SimulationPréremplieBanner />}
 
-					{!showQuestionsFromBeginning && !firstStepCompleted && (
-						<PreviousSimulationBanner />
-					)}
+					{!showQuestions && <PreviousSimulationBanner />}
 
 					{afterQuestionsSlot}
 

site/source/components/entreprise/EntrepriseSearchResults.tsx

@@ -76,7 +76,7 @@ export default function EntrepriseSearchResults({
 	) : (
 		<FromTop>
 			<ForceThemeProvider>
-				<Ul noMarker data-test-id="company-search-results">
+				<Ul $noMarker data-test-id="company-search-results">
 					{results.map((entreprise) => (
 						<Li key={entreprise.siren}>
 							<StyledCard

site/source/components/layout/Menu.tsx

@@ -44,7 +44,7 @@ export const Menu = () => {
 			)}
 		>
 			<Nav>
-				<StyledUl noMarker>
+				<StyledUl $noMarker>
 					<PlanContent />
 				</StyledUl>
 			</Nav>