Interactions sur TargetSelection

source/components/ProgressTip.js

@@ -25,7 +25,9 @@ export default class ProgressTip extends Component {
 			nbQuestions = nextSteps.length
 
 		if (selectingTargets && !conversationVisible)
-			return <p>Vous aurez {nextSteps.length} questions !</p>
+			return nbQuestions ? (
+				<p>Vous aurez {nextSteps.length} questions !</p>
+			) : null
 		if (!conversationVisible) return null
 		return (
 			<div className="tip">

source/components/TargetSelection.js

@@ -64,9 +64,7 @@ export default class TargetSelection extends Component {
 					<div id="action">
 						{this.props.selectingTargets ? (
 							!this.props.conversationVisible && (
-								<p style={{ color: this.props.colours.textColour }}>
-									Cochez un ou plusieurs objectifs
-								</p>
+								<p>Cochez un ou plusieurs objectifs</p>
 							)
 						) : (
 							<>

source/components/conversation/Conversation.js

@@ -2,13 +2,14 @@ import React, { Component } from 'react'
 import { Trans, translate } from 'react-i18next'
 import { isEmpty, map } from 'ramda'
 import Aide from '../Aide'
-import { reduxForm } from 'redux-form'
+import { reduxForm, reset } from 'redux-form'
 import { scroller, Element } from 'react-scroll'
 import { getInputComponent } from 'Engine/generateQuestions'
 import Satisfaction from '../Satisfaction'
 import { connect } from 'react-redux'
 import './conversation.css'
 
+import ReactPiwik from '../Tracker'
 let scroll = () =>
 	scroller.scrollTo('myScrollToElement', {
 		duration: 500,
@@ -21,17 +22,26 @@ let scroll = () =>
 	destroyOnUnmount: false
 })
 @translate()
-@connect(state => ({
-	currentQuestion: state.currentQuestion,
-	foldedSteps: state.foldedSteps,
-	themeColours: state.themeColours,
-	situationGate: state.situationGate,
-	targetNames: state.targetNames,
-	done: state.done,
-	nextSteps: state.nextSteps,
-	analysis: state.analysis,
-	parsedRules: state.parsedRules
-}))
+@connect(
+	state => ({
+		currentQuestion: state.currentQuestion,
+		foldedSteps: state.foldedSteps,
+		themeColours: state.themeColours,
+		situationGate: state.situationGate,
+		targetNames: state.targetNames,
+		done: state.done,
+		nextSteps: state.nextSteps,
+		analysis: state.analysis,
+		parsedRules: state.parsedRules
+	}),
+	dispatch => ({
+		reinitialise: () => {
+			ReactPiwik.push(['trackEvent', 'restart', ''])
+			dispatch(reset('conversation'))
+			dispatch({ type: 'SET_CONVERSATION_TARGETS', reset: true })
+		}
+	})
+)
 export default class Conversation extends Component {
 	componentWillReceiveProps(nextProps) {
 		if (nextProps.foldedSteps.length == this.props.foldedSteps.length)
@@ -45,7 +55,7 @@ export default class Conversation extends Component {
 			currentQuestion,
 			parsedRules,
 			targetNames,
-			reinitalise,
+			reinitialise,
 			textColourOnWhite
 		} = this.props
 		console.log(this.props)
@@ -55,7 +65,7 @@ export default class Conversation extends Component {
 					<div id="foldedSteps">
 						<div className="header">
 							<button
-								onClick={reinitalise}
+								onClick={reinitialise}
 								style={{ color: textColourOnWhite }}>
 								<i className="fa fa-trash" aria-hidden="true" />
 								<Trans i18nKey="resetAll">Tout effacer</Trans>

source/reducers.js

@@ -74,7 +74,7 @@ export let reduceSteps = (tracker, flatRules, answerSource) => (
 		return state
 
 	let conversationTargetNames =
-		action.type == 'SET_CONVERSATION_TARGETS'
+		action.type == 'SET_CONVERSATION_TARGETS' && action.targetNames
 			? action.targetNames
 			: state.conversationTargetNames
 
@@ -108,7 +108,11 @@ export let reduceSteps = (tracker, flatRules, answerSource) => (
 		situationGate: situationWithDefaults(state),
 		explainedVariable: null,
 		nextSteps,
-		currentQuestion: head(nextSteps)
+		currentQuestion: head(nextSteps),
+		foldedSteps:
+			action.type === 'SET_CONVERSATION_TARGETS' && action.reset
+				? []
+				: state.foldedSteps
 	}
 
 	if (action.type == 'SET_CONVERSATION_TARGETS') return newState