🎨 Affichage de la variation satisfaite

source/engine/mecanismViews/Variations.js

@@ -2,34 +2,44 @@ import React from 'react'
 import { Node } from './common'
 import { makeJsx } from '../evaluation'
 import './Variations.css'
+import { ShowValuesConsumer } from 'Components/rule/ShowValuesContext'
 
 export default function Variations(nodeValue, explanation) {
 	return (
-		<Node
-			classes="mecanism variations"
-			name="variations"
-			value={nodeValue}
-			child={
-				<ul>
-					{explanation.map(c => (
-						<li
-							className="variation"
-							key={JSON.stringify(c.condition | 'sinon')}>
-							<div className="condition">
-								{c.condition && (
-									<>
-										<span>Si</span> {makeJsx(c.condition)}
-									</>
-								)}
-								<div>
-									<span>{c.condition ? 'Alors : ' : 'Sinon : '}</span>
-									<span className="content">{makeJsx(c.consequence)}</span>
-								</div>
-							</div>
-						</li>
-					))}
-				</ul>
-			}
-		/>
+		<ShowValuesConsumer>
+			{showValues => (
+				<Node
+					classes="mecanism variations"
+					name="variations"
+					value={nodeValue}
+					child={
+						<ul>
+							{explanation.map(
+								c =>
+									console.log('c', c) || (
+										<li
+											className="variation"
+											key={JSON.stringify(c.condition | 'sinon')}>
+											<div className="condition">
+												{c.condition && (
+													<>
+														<span>Si</span> {makeJsx(c.condition)}
+													</>
+												)}
+												<div>
+													<span>{c.condition ? 'Alors : ' : 'Sinon : '}</span>
+													<span className="content">
+														{makeJsx(c.consequence)}
+													</span>
+												</div>
+											</div>
+										</li>
+									)
+							)}
+						</ul>
+					}
+				/>
+			)}
+		</ShowValuesConsumer>
 	)
 }

source/engine/mecanisms.js

@@ -162,17 +162,21 @@ export let mecanismVariations = (recurse, k, v, devariate) => {
 						: evaluateNode(cache, situationGate, parsedRules, prop)
 			),
 			evaluatedExplanation = map(evaluateVariation, node.explanation),
-			satisfiedVariation = reduce(
-				(_, variation) =>
-					variation.condition == undefined
-						? reduced(variation) // We've reached the eventual defaut case
-						: variation.condition.nodeValue === null
-							? reduced(null) // one case has missing variables => we can't go further
-							: variation.condition.nodeValue === true
-								? reduced(variation)
-								: null,
-				null
+			// mark the satisfied variation if any in the explanation
+			[, resolvedExplanation] = reduce(
+				([resolved, result], variation) =>
+					resolved
+						? [true, [...result, variation]]
+						: variation.condition == undefined
+							? [true, [...result, { ...variation, satisfied: true }]] // We've reached the eventual defaut case
+							: variation.condition.nodeValue === null
+								? [true, [...result, variation]] // one case has missing variables => we can't go further
+								: variation.condition.nodeValue === true
+									? [true, [...result, { ...variation, satisfied: true }]]
+									: [false, [...result, variation]],
+				[false, []]
 			)(evaluatedExplanation),
+			satisfiedVariation = resolvedExplanation.find(v => v.satisfied),
 			nodeValue = satisfiedVariation
 				? satisfiedVariation.consequence.nodeValue
 				: null
@@ -978,7 +982,8 @@ export let mecanismSynchronisation = (recurse, k, v) => {
 		let nodeValue =
 			val(APIExplanation) == null
 				? null
-				: path(v.chemin.split(' . '))(JSON.parse(val(APIExplanation)))
+				: console.log(APIExplanation) ||
+				  path(v.chemin.split(' . '))(JSON.parse(val(APIExplanation)))
 		let missingVariables =
 			val(APIExplanation) === null ? { [APIExplanation.dottedName]: 1 } : {}
 		let explanation = { ...v, API: APIExplanation }