diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index 6ea31769d..7f1fb97e3 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -5,7 +5,7 @@ inputs: node-version: description: "Node.js version to use" required: false - default: "20.19.0" + default: "26.0.0" runs: using: "composite" diff --git a/.github/actions/install-playwright/action.yml b/.github/actions/install-playwright/action.yml index b8028ef4d..351108cbb 100644 --- a/.github/actions/install-playwright/action.yml +++ b/.github/actions/install-playwright/action.yml @@ -5,7 +5,7 @@ inputs: node-version: description: "Node.js version to use" required: false - default: "20.19.0" + default: "26.0.0" runs: using: "composite" diff --git a/.github/actions/run-backend/action.yml b/.github/actions/run-backend/action.yml index 27563ff93..35438d2dc 100644 --- a/.github/actions/run-backend/action.yml +++ b/.github/actions/run-backend/action.yml @@ -5,7 +5,7 @@ inputs: node-version: description: "Node.js version to use" required: false - default: "20.19.0" + default: "26.0.0" runs: using: "composite" diff --git a/.github/actions/setup-database/action.yml b/.github/actions/setup-database/action.yml index fab234e61..937d82682 100644 --- a/.github/actions/setup-database/action.yml +++ b/.github/actions/setup-database/action.yml @@ -5,7 +5,7 @@ inputs: node-version: description: "Node.js version to use" required: false - default: "20.19.0" + default: "26.0.0" runs: using: "composite" diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 16b5ad532..bd719bfb3 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: - node-version: [20.19.0] + node-version: [26.0.0] services: postgres: diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml index 023413aea..4e2a6c567 100644 --- a/.github/workflows/lighthouse.yml +++ b/.github/workflows/lighthouse.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: - node-version: [20.19.0] + node-version: [26.0.0] services: postgres: diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 849b2bfb2..cf6353d8d 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - node-version: [20.19.0] + node-version: [26.0.0] steps: - uses: actions/checkout@v4 diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..bb0609d7d --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: bash scalingo/start.sh diff --git a/apps/backend/Procfile b/apps/backend/Procfile deleted file mode 100644 index 4905551d8..000000000 --- a/apps/backend/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: npm install && npm run start:prod diff --git a/apps/backend/package.json b/apps/backend/package.json index 1e1ec940a..44f76894f 100644 --- a/apps/backend/package.json +++ b/apps/backend/package.json @@ -8,7 +8,6 @@ }, "scripts": { "build": "npm run build:css && nest build", - "scalingo-postbuild": "npm run build && npm run migration:migrate", "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"", "start": "nest start -w", "start:dev": "concurrently \"nodemon\" \"npm run build:css:dev\"", diff --git a/apps/frontend/Procfile b/apps/frontend/Procfile deleted file mode 100644 index 28fe750b8..000000000 --- a/apps/frontend/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: npm run start diff --git a/apps/frontend/src/lib/components/pages/simulateur-eligibilite/steps/SearchInformations/AdditionalInformations.svelte b/apps/frontend/src/lib/components/pages/simulateur-eligibilite/steps/SearchInformations/AdditionalInformations.svelte index 3d957d118..16a86c53e 100644 --- a/apps/frontend/src/lib/components/pages/simulateur-eligibilite/steps/SearchInformations/AdditionalInformations.svelte +++ b/apps/frontend/src/lib/components/pages/simulateur-eligibilite/steps/SearchInformations/AdditionalInformations.svelte @@ -88,7 +88,12 @@ ...publicSectorSchema, }); } else if (employmentStatus === 'SALARIE_PUBLIC_OU_FONCTIONNAIRE') { - schema = schema.extend(publicSectorSchema); + schema = schema.extend({ + allowFinancingAndOwnershipAdvices: z.boolean({ + message: stepsContent.allowFinancingAndOwnershipAdvices.errorMessage, + }), + ...publicSectorSchema, + }); } else if (employmentStatus === 'SALARIE_PRIVE_NON_AGRICOLE') { schema = schema.extend({ hasCompanyMoreThan10Employees: z.boolean({ @@ -280,51 +285,6 @@ {@render publicSector()} {/snippet} -{#snippet publicSector()} -
- ({ - ...stepContent, - selected: positionStage === stepContent.value, - }))} - onChange={(e) => { - const { value } = e.target as HTMLSelectElement; - - if (value) { - delete errors.positionStage; - } - - eligibilitySimulatorManager.positionStage = - value === '' ? undefined : value === 'true' ? true : false; - }} - error={errors.positionStage} - errorDataTestId={stepsContent.positionStage.errorDataTestId} /> -
-{/snippet} - {#snippet privateSector()}
({ + ...stepContent, + selected: allowFinancingAndOwnershipAdvices === stepContent.value, + }), + )} + onChange={(e) => { + const { value } = e.target as HTMLSelectElement; + + if (value) { + delete errors.allowFinancingAndOwnershipAdvices; + } + + eligibilitySimulatorManager.allowFinancingAndOwnershipAdvices = + value === '' ? undefined : value === 'true' ? true : false; + }} + error={errors.allowFinancingAndOwnershipAdvices} + errorDataTestId={stepsContent.allowFinancingAndOwnershipAdvices + .errorDataTestId} /> + + {#if allowFinancingAndOwnershipAdvices} +

+ + Prendre rendez-vous avec un.e conseiller.e. + +

+ {/if} +
+{/snippet} + +{#snippet publicSector()} + {@render csfFinancingAndOwnershipAdvices()} + +
+ ({ + ...stepContent, + selected: positionStage === stepContent.value, + }))} + onChange={(e) => { + const { value } = e.target as HTMLSelectElement; + + if (value) { + delete errors.positionStage; + } + + eligibilitySimulatorManager.positionStage = + value === '' ? undefined : value === 'true' ? true : false; + }} + error={errors.positionStage} + errorDataTestId={stepsContent.positionStage.errorDataTestId} /> +
+{/snippet} + {#snippet positionContractTypeSnippet()}