From 51d271265a7e86fb1592db5cce5d772e6a1b3aee Mon Sep 17 00:00:00 2001
From: Mael <mael.thomas@data.gouv.fr>
Date: Thu, 12 Apr 2018 18:25:30 +0200
Subject: [PATCH] :bug: Correction suite au rebase redesign sur traduction

---
 source/components/Explanation.js              |  5 ++---
 source/components/ResultsGrid.js              |  3 ++-
 source/components/TargetSelection.js          |  2 +-
 .../components/conversation/FormDecorator.js  |  2 +-
 .../components/conversation/InversionInput.js |  5 ++---
 source/components/pages/RulesList.js          | 22 +++++++++----------
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/source/components/Explanation.js b/source/components/Explanation.js
index 27f28dcd0..1ee080c11 100644
--- a/source/components/Explanation.js
+++ b/source/components/Explanation.js
@@ -8,10 +8,10 @@ import './Explanation.css'
 import { pluck } from 'ramda'
 import { connect } from 'react-redux'
 
-@translate()
 import SearchButton from './SearchButton'
 import withColours from './withColours'
 
+@translate()
 @withColours
 @connect(state => ({
 	analysis: state.analysis
@@ -27,8 +27,7 @@ export default class Explanation extends Component {
 					className="scrollIndication down"
 					style={{
 						color: this.props.colours.textColourOnWhite
-					}}
-				>
+					}}>
 					<i className="fa fa-long-arrow-down" aria-hidden="true" /> Comprendre
 					mes résultats
 				</h3>
diff --git a/source/components/ResultsGrid.js b/source/components/ResultsGrid.js
index 4b84f9d0d..d8f33938c 100644
--- a/source/components/ResultsGrid.js
+++ b/source/components/ResultsGrid.js
@@ -87,7 +87,8 @@ export default class ResultsGrid extends Component {
 				situationGate,
 				targetNames,
 				inversions,
-				flatRules
+				flatRules,
+				parsedRules
 			} = this.props,
 			rules = flatRules
 
diff --git a/source/components/TargetSelection.js b/source/components/TargetSelection.js
index b7282a97e..81a960b8b 100644
--- a/source/components/TargetSelection.js
+++ b/source/components/TargetSelection.js
@@ -71,7 +71,7 @@ export default class TargetSelection extends Component {
 
 	renderOutputList() {
 		let popularTargets = popularTargetNames.map(
-				curry(findRuleByName)(flatRules)
+				curry(findRuleByName)(this.props.flatRules)
 			),
 			{
 				missingVariablesByTarget,
diff --git a/source/components/conversation/FormDecorator.js b/source/components/conversation/FormDecorator.js
index dd71a8a45..528a438db 100644
--- a/source/components/conversation/FormDecorator.js
+++ b/source/components/conversation/FormDecorator.js
@@ -95,7 +95,7 @@ export var FormDecorator = formType => RenderField =>
 						// color: this.props.themeColours.textColourOnWhite,
 						maxWidth: wideQuestion ? '95%' : ''
 					}}>
-					{inversionQ ? i18n.t(inversionQ) : this.props.question}
+					{this.props.question}
 				</h1>
 			)
 			return (
diff --git a/source/components/conversation/InversionInput.js b/source/components/conversation/InversionInput.js
index dbc9af10c..c48fbc368 100644
--- a/source/components/conversation/InversionInput.js
+++ b/source/components/conversation/InversionInput.js
@@ -5,7 +5,7 @@ import HoverDecorator from '../HoverDecorator'
 import Explicable from './Explicable'
 import { Field, formValueSelector } from 'redux-form'
 import './InversionInput.css'
-import { Input } from './Input'
+import Input from './Input'
 import { connect } from 'react-redux'
 import { path, last } from 'ramda'
 import { change } from 'redux-form'
@@ -63,8 +63,7 @@ class Fields extends Component {
 								className={classNames({
 									selected: value === activeInversion,
 									unselected: activeInversion && value !== activeInversion
-								})}
-							>
+								})}>
 								<Field
 									name={'inversions.' + dottedName}
 									component="input"
diff --git a/source/components/pages/RulesList.js b/source/components/pages/RulesList.js
index ce3a874da..b0b6ed551 100644
--- a/source/components/pages/RulesList.js
+++ b/source/components/pages/RulesList.js
@@ -14,14 +14,12 @@ import { Redirect } from 'react-router-dom'
 import Highlighter from 'react-highlight-words'
 import { pick } from 'ramda'
 
-@connect(
-	state => ({
-		flatRules: state.flatRules
-	})
-)
+@connect(state => ({
+	flatRules: state.flatRules
+}))
 export default class RulesList extends Component {
 	render() {
-		let { flatRules } = this.props;
+		let { flatRules } = this.props
 		return (
 			<div id="RulesList" className="page">
 				<h1>Explorez notre base de règles</h1>
@@ -34,8 +32,8 @@ export default class RulesList extends Component {
 @translate()
 export class SearchBar extends React.Component {
 	static contextTypes = {
-      i18n: PropTypes.object.isRequired
-    }
+		i18n: PropTypes.object.isRequired
+	}
 	componentDidMount() {
 		this.inputElement.focus()
 	}
@@ -89,9 +87,9 @@ export class SearchBar extends React.Component {
 	)
 	filterOptions = (options, filter) => this.fuse.search(filter)
 	render() {
-		let { rules, finish = () => null  } = this.props,
+		let { rules, finish = () => null } = this.props,
 			{ i18n } = this.context,
-		{ selectedOption } = this.state,
+			{ selectedOption } = this.state
 
 		if (selectedOption != null) {
 			this.props.finally && this.props.finally()
@@ -111,7 +109,9 @@ export class SearchBar extends React.Component {
 					filterOptions={this.filterOptions}
 					optionRenderer={this.renderOption}
 					placeholder={i18n.t('Entrez des mots clefs ici')}
-					noResultsText={i18n.t("noresults",{defaultValue:"Nous n'avons rien trouvé…"})}
+					noResultsText={i18n.t('noresults', {
+						defaultValue: "Nous n'avons rien trouvé…"
+					})}
 					ref={el => {
 						this.inputElement = el
 					}}