From 311ecbff82821de33d8629a403a0b9733477f4ab Mon Sep 17 00:00:00 2001 From: Johan Girod Date: Thu, 31 Jan 2019 19:43:20 +0100 Subject: [PATCH] =?UTF-8?q?:bug:=20r=C3=A9pare=20la=20sauvegarde=20automat?= =?UTF-8?q?ique=20de=20la=20situation=20sur=20mycompanyinfrance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/Provider.js | 3 ++- source/locales/en.yaml | 4 ++-- source/sites/mycompanyinfrance.fr/App.js | 2 +- .../pages/Company/AfterRegistration.js | 22 +++++++++---------- .../pages/Company/CreationChecklist.js | 1 - .../pages/Company/index.js | 1 - source/storage/persistEverything.js | 6 ++--- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/source/Provider.js b/source/Provider.js index 0130f511c..6769e8fcf 100644 --- a/source/Provider.js +++ b/source/Provider.js @@ -56,7 +56,8 @@ export default class Layout extends PureComponent { enableBatching(reducers), this.props.initialStore, storeEnhancer - ) + ) + console.log(this.props.initialStore, this.store.getState()) this.props.onStoreCreated && this.props.onStoreCreated(this.store) } render() { diff --git a/source/locales/en.yaml b/source/locales/en.yaml index 7eef79938..12880a4ba 100644 --- a/source/locales/en.yaml +++ b/source/locales/en.yaml @@ -517,8 +517,8 @@ path: démarcheEmbauche: index: '/hiring-process' -Auto-entrepreneur en EIRL: auto-entrepreneur with EIRL option -auto-entrepreneur-EIRL: auto-entrepreneur-with-EIRL-option +Auto-entrepreneur en EIRL: Auto-entrepreneur with EIRL option +auto-entrepreneur-EIRL: auto-entrepreneur-EIRL privacyContent: > <0>$t(Vie privée) <1> diff --git a/source/sites/mycompanyinfrance.fr/App.js b/source/sites/mycompanyinfrance.fr/App.js index e71632007..0213d5dba 100644 --- a/source/sites/mycompanyinfrance.fr/App.js +++ b/source/sites/mycompanyinfrance.fr/App.js @@ -60,7 +60,7 @@ class InFranceRoute extends Component { tracker={tracker} sitePaths={paths} reduxMiddlewares={middlewares} - onStoreCreated={persistEverything} + onStoreCreated={persistEverything()} initialStore={{ ...retrievePersistedState() }}>
diff --git a/source/sites/mycompanyinfrance.fr/pages/Company/AfterRegistration.js b/source/sites/mycompanyinfrance.fr/pages/Company/AfterRegistration.js index 8ae2e7e6c..06fec0ea1 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Company/AfterRegistration.js +++ b/source/sites/mycompanyinfrance.fr/pages/Company/AfterRegistration.js @@ -1,13 +1,13 @@ /* @flow */ -import { React, T } from 'Components' -import { ScrollToTop } from 'Components/utils/Scroll' -import withSitePaths from 'Components/utils/withSitePaths' -import { compose } from 'ramda' -import { withNamespaces } from 'react-i18next' -import { connect } from 'react-redux' -import { Link } from 'react-router-dom' -import Animate from 'Ui/animate' -import siret from './siret.jpg' +import { React, T } from 'Components'; +import { ScrollToTop } from 'Components/utils/Scroll'; +import withSitePaths from 'Components/utils/withSitePaths'; +import { compose } from 'ramda'; +import { withNamespaces } from 'react-i18next'; +import { connect } from 'react-redux'; +import { Link } from 'react-router-dom'; +import Animate from 'Ui/animate'; +import siret from './siret.jpg'; import type { TFunction } from 'react-i18next' type Props = { @@ -59,7 +59,7 @@ const AfterRegistration = ({ t, companyStatusChoice, sitePaths }: Props) => ( la nomenclature nationale d'activités françaises (code « NAF »).{' '} @@ -69,7 +69,7 @@ const AfterRegistration = ({ t, companyStatusChoice, sitePaths }: Props) => (

- {!companyStatusChoice.includes('auto-entrepreneur') && ( + {companyStatusChoice && !companyStatusChoice.includes('auto-entrepreneur') && ( <>

Le Kbis diff --git a/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js b/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js index 19a030785..c0f5222a2 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js +++ b/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js @@ -42,7 +42,6 @@ const CreateCompany = ({ const companyStatus = LANDING_LEGAL_STATUS_LIST.find( status => t(status) === match.params.status ) - console.log('yopyop', status, companyStatus) const isAutoentrepreneur = [ 'auto-entrepreneur', 'auto-entrepreneur-EIRL' diff --git a/source/sites/mycompanyinfrance.fr/pages/Company/index.js b/source/sites/mycompanyinfrance.fr/pages/Company/index.js index 4a5501b52..93d01709f 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Company/index.js +++ b/source/sites/mycompanyinfrance.fr/pages/Company/index.js @@ -32,7 +32,6 @@ const CreateMyCompany = ({ existingCompany, sitePaths }) => { - console.log('sitapath', sitePaths.entreprise.créer(':status')) return ( <> diff --git a/source/storage/persistEverything.js b/source/storage/persistEverything.js index 3afce7fa4..76dca13a0 100644 --- a/source/storage/persistEverything.js +++ b/source/storage/persistEverything.js @@ -12,12 +12,12 @@ const VERSION = 1 const LOCAL_STORAGE_KEY = 'mycompanyinfrance::persisted-everything:v' + VERSION type OptionsType = { - except: Array + except?: Array } -export const persistEverything = ({ except = [] }:OptionsType) => (store: Store): void => { +export const persistEverything = (options?:OptionsType = {}) => (store: Store): void => { const listener = () => { const state = store.getState() - safeLocalStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(omit(except, state))) + safeLocalStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(omit(options.except || [], state))) } store.subscribe(debounce(1000, listener)) }