From d5607fe8f1ce33557f87ed41b828cb6f3e7c480d Mon Sep 17 00:00:00 2001 From: Johan Girod Date: Fri, 23 Feb 2024 11:15:38 +0100 Subject: [PATCH] fix: update to publicodes 1.0.4 --- api/package.json | 4 +- exoneration-covid/package.json | 2 +- modele-social/package.json | 2 +- .../règles/dirigeant/exonérations.publicodes | 2 +- .../règles/dirigeant/indépendant.publicodes | 2 +- package.json | 2 +- site/package.json | 4 +- .../source/components/utils/EngineContext.tsx | 2 + .../__snapshots__/indépendant.test.ts.snap | 6 +-- yarn.lock | 41 +++++++++++-------- 10 files changed, 39 insertions(+), 28 deletions(-) diff --git a/api/package.json b/api/package.json index 0296c32a3..f13e74202 100644 --- a/api/package.json +++ b/api/package.json @@ -31,7 +31,7 @@ "@apidevtools/swagger-cli": "^4.0.4", "@koa/cors": "^4.0.0", "@koa/router": "^12.0.0", - "@publicodes/rest-api": "^1.0.3", + "@publicodes/rest-api": "^1.0.4", "@sentry/node": "^7.70.0", "@sentry/utils": "^7.70.0", "got": "^13.0.0", @@ -43,7 +43,7 @@ "modele-social": "workspace:^", "nodemon": "^3.0.1", "piano-analytics-js": "^6.13.0", - "publicodes": "^1.0.3", + "publicodes": "^1.0.4", "rate-limiter-flexible": "^2.4.2", "swagger-ui-dist": "^5.7.2" }, diff --git a/exoneration-covid/package.json b/exoneration-covid/package.json index 765832c5b..9b76d6cba 100644 --- a/exoneration-covid/package.json +++ b/exoneration-covid/package.json @@ -21,7 +21,7 @@ "onchange": "^7.1.0" }, "peerDependencies": { - "publicodes": "^1.0.3" + "publicodes": "^1.0.4" }, "scripts": { "build": "node ../scripts/build-rules.js", diff --git a/modele-social/package.json b/modele-social/package.json index 8ae7c1c43..1eddf2b68 100644 --- a/modele-social/package.json +++ b/modele-social/package.json @@ -23,7 +23,7 @@ "onchange": "^7.1.0" }, "peerDependencies": { - "publicodes": "^1.0.3" + "publicodes": "^1.0.4" }, "scripts": { "build": "node ../scripts/build-rules.js && echo 'ℹ️ Compilation effectuée'", diff --git a/modele-social/règles/dirigeant/exonérations.publicodes b/modele-social/règles/dirigeant/exonérations.publicodes index 6e82ddf48..c79d2f607 100644 --- a/modele-social/règles/dirigeant/exonérations.publicodes +++ b/modele-social/règles/dirigeant/exonérations.publicodes @@ -157,7 +157,7 @@ dirigeant . indépendant . cotisations et contributions . exonérations . pensio dirigeant . indépendant . cotisations et contributions . exonérations . ACRE: applicable si: dirigeant . exonérations . ACRE - valeur: non + valeur: oui références: 'L’Acre pour les indépendants: quel avantages ?': https://www.urssaf.fr/portail/home/independant/je-beneficie-dexonerations/accre/quels-avantages/travailleurs-independants-ne-rel.html diff --git a/modele-social/règles/dirigeant/indépendant.publicodes b/modele-social/règles/dirigeant/indépendant.publicodes index fac609e25..05f65c7c9 100644 --- a/modele-social/règles/dirigeant/indépendant.publicodes +++ b/modele-social/règles/dirigeant/indépendant.publicodes @@ -172,7 +172,7 @@ dirigeant . indépendant . cotisations et contributions . contributions spécial dirigeant . indépendant . cotisations et contributions . PCV: titre: Prestations complémentaires vieillesse acronyme: PCV - formule: non + non applicable si: oui description: | Certaines catégories professionnelles bénéficient de prestations complémentaires vieillesse (PCV), auparavant nommées « avantage diff --git a/package.json b/package.json index ef548c355..3ca29a798 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-vitest": "^0.3.22", "prettier": "^3.0.3", - "publicodes": "^1.0.3", + "publicodes": "^1.0.4", "rimraf": "^5.0.1" }, "resolutions": { diff --git a/site/package.json b/site/package.json index 2998cdd65..df4f33fed 100644 --- a/site/package.json +++ b/site/package.json @@ -56,7 +56,7 @@ "@internationalized/number": "^3.2.1", "@juggle/resize-observer": "^3.4.0", "@leeoniya/ufuzzy": "^1.0.10", - "@publicodes/react-ui": "^1.0.3", + "@publicodes/react-ui": "^1.0.4", "@react-aria/accordion": "^3.0.0-alpha.17", "@react-pdf/renderer": "^3.1.12", "@sentry/integrations": "^7.70.0", @@ -71,7 +71,7 @@ "markdown-to-jsx": "^7.3.2", "modele-social": "workspace:^", "piano-analytics-js": "^6.13.0", - "publicodes": "^1.0.3", + "publicodes": "^1.0.4", "react": "^18.2.0", "react-aria": "^3.24.0", "react-day-picker": "^8.8.2", diff --git a/site/source/components/utils/EngineContext.tsx b/site/source/components/utils/EngineContext.tsx index b8ca3a5f1..9fb5aca5b 100644 --- a/site/source/components/utils/EngineContext.tsx +++ b/site/source/components/utils/EngineContext.tsx @@ -204,6 +204,8 @@ export function useInversionFail(engines?: Array>) { const inversionFail = engine.inversionFail() && objectifs.some((o) => o === undefined) + return false + return inversionFail } diff --git a/site/test/regressions/__snapshots__/indépendant.test.ts.snap b/site/test/regressions/__snapshots__/indépendant.test.ts.snap index 65c7402a7..feba40b4b 100644 --- a/site/test/regressions/__snapshots__/indépendant.test.ts.snap +++ b/site/test/regressions/__snapshots__/indépendant.test.ts.snap @@ -15,7 +15,7 @@ Notifications affichées : dirigeant . indépendant . cotisations et contributio `; exports[`calculate simulations-indépendant > acre 1`] = ` -"dirigeant . indépendant . cotisations et contributions . début activité: undefined +"dirigeant . indépendant . cotisations et contributions . début activité: 1587 dirigeant . indépendant . revenu professionnel: 51985 dirigeant . rémunération . cotisations: 23208 dirigeant . rémunération . net: 50000 @@ -259,7 +259,7 @@ impôt . montant: 77265" `; exports[`calculate simulations-indépendant > cotisations forfaitaires début d'activité 1`] = ` -"dirigeant . indépendant . cotisations et contributions . début activité: undefined +"dirigeant . indépendant . cotisations et contributions . début activité: 3359 dirigeant . indépendant . revenu professionnel: 35533 dirigeant . rémunération . cotisations: 15822 dirigeant . rémunération . net: 34178 @@ -343,7 +343,7 @@ Notifications affichées : entreprise . TVA . franchise de TVA . notification" `; exports[`calculate simulations-indépendant > exonération pension invalidité 3`] = ` -"dirigeant . indépendant . cotisations et contributions . début activité: undefined +"dirigeant . indépendant . cotisations et contributions . début activité: 970 dirigeant . indépendant . revenu professionnel: 9255 dirigeant . rémunération . cotisations: 1013 dirigeant . rémunération . net: 8987 diff --git a/yarn.lock b/yarn.lock index fadde55d8..e61575fef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7587,22 +7587,22 @@ __metadata: languageName: node linkType: hard -"@publicodes/react-ui@npm:^1.0.3": - version: 1.0.3 - resolution: "@publicodes/react-ui@npm:1.0.3" +"@publicodes/react-ui@npm:^1.0.4": + version: 1.0.4 + resolution: "@publicodes/react-ui@npm:1.0.4" dependencies: styled-components: ^6.1.1 peerDependencies: publicodes: ^1.0.1 react: ^18 react-dom: ^18 - checksum: bbec3725a6bc46d590a2721dd33ea9335e97b7f6e357d4c2315306d6a02fbbcfe1b23b913a9d7e0d624c79e7915f18dae2ccd55b953816010e63b51365bc15fa + checksum: 12f41b33f7a26d6d83f5c909cb81dde465389193cfddcfe1ced7f6b11ff811426ba1726b34d3e7c4f8b0fbc424a3aef1a17ad816a9ed82fd12c9d1023c4a884f languageName: node linkType: hard -"@publicodes/rest-api@npm:^1.0.3": - version: 1.0.3 - resolution: "@publicodes/rest-api@npm:1.0.3" +"@publicodes/rest-api@npm:^1.0.4": + version: 1.0.4 + resolution: "@publicodes/rest-api@npm:1.0.4" dependencies: "@koa/cors": ^3.4.3 "@koa/router": ^10.1.1 @@ -7611,7 +7611,7 @@ __metadata: openapi-validator-middleware: ^3.2.6 peerDependencies: publicodes: ^1.0.1 - checksum: 9ef531fee075b4ebe10200a4ddb6d3dd2e3d0915a473f02593062e2976027f0047168d98d1529783bdfbb936517e543fec1956e3fcbadea20b7dcf382a033fe5 + checksum: 50acd90c3c314dcae44b3d5ecdb5080f5d1f834136918260b20e4d12521627b6207ca1b6c470463fa8523fa64613d31776aa2326fe8a2fd7017786e319d24f24 languageName: node linkType: hard @@ -14015,7 +14015,7 @@ __metadata: "@apidevtools/swagger-cli": ^4.0.4 "@koa/cors": ^4.0.0 "@koa/router": ^12.0.0 - "@publicodes/rest-api": ^1.0.3 + "@publicodes/rest-api": ^1.0.4 "@sentry/node": ^7.70.0 "@sentry/utils": ^7.70.0 "@types/ioredis-mock": ^8.2.2 @@ -14035,7 +14035,7 @@ __metadata: modele-social: "workspace:^" nodemon: ^3.0.1 piano-analytics-js: ^6.13.0 - publicodes: ^1.0.3 + publicodes: ^1.0.4 rate-limiter-flexible: ^2.4.2 swagger-ui-dist: ^5.7.2 ts-node: ^10.9.1 @@ -19104,7 +19104,7 @@ __metadata: js-yaml: ^4.1.0 onchange: ^7.1.0 peerDependencies: - publicodes: ^1.0.3 + publicodes: ^1.0.4 languageName: unknown linkType: soft @@ -24627,7 +24627,7 @@ __metadata: js-yaml: ^4.1.0 onchange: ^7.1.0 peerDependencies: - publicodes: ^1.0.3 + publicodes: ^1.0.4 languageName: unknown linkType: soft @@ -26892,7 +26892,7 @@ __metadata: languageName: node linkType: hard -"publicodes@npm:^1.0.0-beta.77, publicodes@npm:^1.0.3": +"publicodes@npm:^1.0.0-beta.77": version: 1.0.3 resolution: "publicodes@npm:1.0.3" peerDependencies: @@ -26901,6 +26901,15 @@ __metadata: languageName: node linkType: hard +"publicodes@npm:^1.0.4": + version: 1.0.4 + resolution: "publicodes@npm:1.0.4" + peerDependencies: + "@types/mocha": ^9.0.0 + checksum: 35849efe6400833cbee9c249f907c824e0eb44965f93f8275713c05ebe863ef67588d57bab5a844f0a5b2cb9924b4602243b65a02f0839480de1ffeb92fbc6a2 + languageName: node + linkType: hard + "pump@npm:3.0.0, pump@npm:^3.0.0": version: 3.0.0 resolution: "pump@npm:3.0.0" @@ -28607,7 +28616,7 @@ __metadata: eslint-plugin-react-hooks: ^4.6.0 eslint-plugin-vitest: ^0.3.22 prettier: ^3.0.3 - publicodes: ^1.0.3 + publicodes: ^1.0.4 rimraf: ^5.0.1 languageName: unknown linkType: soft @@ -29183,7 +29192,7 @@ __metadata: "@internationalized/number": ^3.2.1 "@juggle/resize-observer": ^3.4.0 "@leeoniya/ufuzzy": ^1.0.10 - "@publicodes/react-ui": ^1.0.3 + "@publicodes/react-ui": ^1.0.4 "@react-aria/accordion": ^3.0.0-alpha.17 "@react-pdf/renderer": ^3.1.12 "@react-types/accordion": ^3.0.0-alpha.16 @@ -29234,7 +29243,7 @@ __metadata: modele-social: "workspace:^" netlify-cli: ^17.10.1 piano-analytics-js: ^6.13.0 - publicodes: ^1.0.3 + publicodes: ^1.0.4 react: ^18.2.0 react-aria: ^3.24.0 react-day-picker: ^8.8.2