From bd13767f1c6936fb96d44dcd4eacec87b00591bf Mon Sep 17 00:00:00 2001
From: Mael <mael.thomas@data.gouv.fr>
Date: Wed, 10 Apr 2019 11:42:55 +0200
Subject: [PATCH] =?UTF-8?q?On=20=C3=A9vite=20d'injecter=20dans=20la=20r?=
 =?UTF-8?q?=C3=A8gle=20enrichie=20la=20r=C3=A8gle=20brute?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

L'objet en mémoire en sera d'autant plus léger, et le contenu des règles
utilisées dans l'application sera moins imprévisible
---
 source/components/PaySlip.js       | 1 -
 source/engine/generateQuestions.js | 6 +++---
 source/engine/rules.js             | 5 +----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/source/components/PaySlip.js b/source/components/PaySlip.js
index 34c2e525c..ebeef585e 100644
--- a/source/components/PaySlip.js
+++ b/source/components/PaySlip.js
@@ -82,7 +82,6 @@ export default compose(
 					<h5 className="payslip__cotisationTitle">
 						<Trans>Réductions</Trans>
 					</h5>
-					<Line rule={getRule('')} />
 					<Line
 						sign="-"
 						rule={getRule('contrat salarié . réductions de cotisations')}
diff --git a/source/engine/generateQuestions.js b/source/engine/generateQuestions.js
index c86c7c0bc..810fe13b1 100644
--- a/source/engine/generateQuestions.js
+++ b/source/engine/generateQuestions.js
@@ -71,13 +71,13 @@ export let getNextSteps = missingVariablesByTarget => {
 export let collectMissingVariables = targets =>
 	getNextSteps(collectMissingVariablesByTarget(targets))
 
-let isVariant = rule => queryRule(rule.raw)('formule . une possibilité')
+let getVariant = rule => queryRule(rule)('formule . une possibilité')
 
 let buildVariantTree = (allRules, path) => {
 	let rec = path => {
 		let node = findRuleByDottedName(allRules, path)
 		if (!node) throw new Error(`La règle ${path} est introuvable`)
-		let variant = isVariant(node),
+		let variant = getVariant(node),
 			variants = variant && unless(is(Array), prop('possibilités'))(variant),
 			shouldBeExpanded = variant && true, //variants.find( v => relevantPaths.find(rp => contains(path + ' . ' + v)(rp) )),
 			canGiveUp = variant && !variant['choix obligatoire']
@@ -106,7 +106,7 @@ export let getInputComponent = rules => dottedName => {
 		...pick(['dottedName', 'title', 'question', 'defaultValue'], rule)
 	}
 
-	if (isVariant(rule))
+	if (getVariant(rule))
 		return (
 			<Question
 				{...{
diff --git a/source/engine/rules.js b/source/engine/rules.js
index 89bf97a9d..1746b5bfb 100644
--- a/source/engine/rules.js
+++ b/source/engine/rules.js
@@ -35,11 +35,9 @@ import { capitalise0 } from '../utils'
 import marked from './marked'
 import possibleVariableTypes from './possibleVariableTypes.yaml'
 
-// console.log('rawRules', rawRules.map(({espace, nom}) => espace + nom))
 /***********************************
- Méthodes agissant sur une règle */
+Functions working on one rule */
 
-// Enrichissement de la règle avec des informations évidentes pour un lecteur humain
 export let enrichRule = rule => {
 	try {
 		let formatKey = rule['format'] || 'booléen',
@@ -57,7 +55,6 @@ export let enrichRule = rule => {
 			dottedName: buildDottedName(rule),
 			subquestion: rule['sous-question'] && marked(rule['sous-question']),
 			defaultValue: rule['par défaut'],
-			raw: rule,
 			examples: rule['exemples'],
 			icons: rule['icônes'],
 			summary: rule['résumé'],