Merge remote-tracking branch 'origin/preprod' into NGC-1004

incubateur-ademe · Jul 8, 2024 · 209363d · 209363d
2 parents aee9be2 + 0a299b5
commit 209363d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/src/helpers/simulation/generateSimulation.ts b/src/helpers/simulation/generateSimulation.ts
@@ -42,7 +42,7 @@ export function generateSimulation({
  try {
  simulation = migrateSimulation(simulation, migrationInstructions)
  } catch (error) {
- console.warn('Error trying to migrate LocalStorage:', error)
+ console.warn('Error trying to migrate Simulation:', error)
  captureException(error)
  }
 

diff --git a/src/publicodes-state/hooks/useUser/useSimulations.ts b/src/publicodes-state/hooks/useUser/useSimulations.ts
@@ -37,11 +37,9 @@ export default function useSimulations({
  }: Partial<Simulation> = {}) => {
  resetAideSaisie()
 
- let newCurrentId = id
-
  setSimulations((prevSimulations: Simulation[]) => {
- if (prevSimulations.find((simulation) => simulation.id === id)) {
- setCurrentSimulationId(id ?? '')
+ if (id && prevSimulations.find((simulation) => simulation.id === id)) {
+ setCurrentSimulationId(id)
  return prevSimulations
  }
 
@@ -61,12 +59,10 @@ export default function useSimulations({
  migrationInstructions,
  })
 
- newCurrentId = migratedSimulation.id
+ setCurrentSimulationId(migratedSimulation.id)
 
  return [...prevSimulations, migratedSimulation]
  })
-
- setCurrentSimulationId(newCurrentId ?? '')
  },
  [migrationInstructions, setSimulations, setCurrentSimulationId]
  )

diff --git a/src/publicodes-state/providers/userProvider/index.tsx b/src/publicodes-state/providers/userProvider/index.tsx
@@ -43,6 +43,7 @@ export default function UserProvider({
  setCurrentSimulationId,
  } = usePersistentSimulations({ storageKey, migrationInstructions })
 
+ // We don't display the app while the simulations are not loaded from the localstorage (or generated)
  return (
  <UserContext.Provider
  value={{
@@ -56,7 +57,7 @@ export default function UserProvider({
  setCurrentSimulationId,
  migrationInstructions,
  }}>
- {children}
+ {simulations.length > 0 ? children : null}
  </UserContext.Provider>
  )
 }
diff --git a/src/publicodes-state/providers/userProvider/usePersistentSimulations.ts b/src/publicodes-state/providers/userProvider/usePersistentSimulations.ts
@@ -15,9 +15,7 @@ export default function usePersistentSimulations({
  migrationInstructions,
 }: Props) {
  const [initialized, setInitialized] = useState<boolean>(false)
- const [simulations, setSimulations] = useState<Simulation[]>([
- generateSimulation(),
- ])
+ const [simulations, setSimulations] = useState<Simulation[]>([])
  const [currentSimulationId, setCurrentSimulationId] = useState<string>('')
 
  useEffect(() => {