From 2aef3d0fad24ee6d53f96192e05c9fb78129bcb0 Mon Sep 17 00:00:00 2001
From: mama <mael.thomas@data.gouv.fr>
Date: Tue, 13 Feb 2018 18:51:53 +0100
Subject: [PATCH] =?UTF-8?q?Harmonisation=20des=20URL=20de=20/r=C3=A8gle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/components/pages/RulesList.js  | 6 ++++--
 source/engine/mecanismViews/common.js | 6 +++---
 source/engine/traverse.js             | 7 ++++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/source/components/pages/RulesList.js b/source/components/pages/RulesList.js
index 6dd539484..60715191d 100644
--- a/source/components/pages/RulesList.js
+++ b/source/components/pages/RulesList.js
@@ -62,8 +62,10 @@ export class SearchBar extends React.Component {
 		let { selectedOption } = this.state
 
 		if (selectedOption != null) {
-			this.props.finally()
-			return <Redirect to={'/règle/' + selectedOption.dottedName} />
+			this.props.finally && this.props.finally()
+			return (
+				<Redirect to={'/règle/' + encodeRuleName(selectedOption.dottedName)} />
+			)
 		}
 		return (
 			<>
diff --git a/source/engine/mecanismViews/common.js b/source/engine/mecanismViews/common.js
index bdcacee76..f5d4a4857 100644
--- a/source/engine/mecanismViews/common.js
+++ b/source/engine/mecanismViews/common.js
@@ -45,11 +45,11 @@ export class Node extends React.Component {
 }
 
 // Un élément du graphe de calcul qui a une valeur interprétée (à afficher)
-export let Leaf = ({ classes, name, value }) => (
+export let Leaf = ({ classes, dottedName, name, value }) => (
 	<span className={classNames(classes, 'leaf')}>
-		{name && (
+		{dottedName && (
 			<span className="nodeHead">
-				<Link to={'/règle/' + encodeRuleName(name)}>
+				<Link to={'/règle/' + encodeRuleName(dottedName)}>
 					<span className="name">
 						{capitalise0(name)}
 						<NodeValuePointer data={value} />
diff --git a/source/engine/traverse.js b/source/engine/traverse.js
index 41fbdd68a..810196fc8 100644
--- a/source/engine/traverse.js
+++ b/source/engine/traverse.js
@@ -183,7 +183,12 @@ let fillVariableNode = (rules, rule, filter) => parseResult => {
 		dottedName = disambiguateRuleReference(rules, rule, variablePartialName)
 
 	let jsx = nodeValue => (
-		<Leaf classes="variable" name={fragments.join(' . ')} value={nodeValue} />
+		<Leaf
+			classes="variable"
+			name={fragments.join(' . ')}
+			dottedName={dottedName}
+			value={nodeValue}
+		/>
 	)
 
 	return {