From 009fe610aea4f70d016e18a7f3b88f4b3792e76a Mon Sep 17 00:00:00 2001 From: Maxime Quandalle Date: Mon, 31 Aug 2020 07:39:31 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Ne=20pas=20remonter=20les?= =?UTF-8?q?=20missingVariables=20des=20r=C3=A8gles=20rendues=20non=20appli?= =?UTF-8?q?cables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publicodes/source/evaluateRule.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/publicodes/source/evaluateRule.ts b/publicodes/source/evaluateRule.ts index fafc31f30..b2e973a6b 100644 --- a/publicodes/source/evaluateRule.ts +++ b/publicodes/source/evaluateRule.ts @@ -1,4 +1,4 @@ -import { map, mergeAll, pick, pipe } from 'ramda' +import { map, pick, pipe } from 'ramda' import { typeWarning } from './error' import { bonus, @@ -41,10 +41,10 @@ export const evaluateApplicability = ( nodeValue: false, missingVariables: notApplicable.missingVariables } + : disabled?.nodeValue === true + ? { nodeValue: false } : applicable?.nodeValue === false ? { nodeValue: false, missingVariables: applicable.missingVariables } - : disabled?.nodeValue === true - ? { nodeValue: false, missingVariables: disabled.missingVariables } : { nodeValue: [notApplicable, applicable, ...parentDependencies].some( n => n?.nodeValue === null