refactor(publicodes-state): sync with preprod

incubateur-ademe · Nov 6, 2023 · d0ed2e1 · d0ed2e1
1 parent d6b27cb
commit d0ed2e1
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 18 deletions.
diff --git a/src/publicodes-state/hooks/useRule/index.ts b/src/publicodes-state/hooks/useRule/index.ts
@@ -2,8 +2,8 @@
 
 import { captureException } from '@sentry/react'
 import { useContext, useMemo } from 'react'
-import simulationContext from '../simulationProvider/context'
-import { NGCEvaluatedNode, NGCRuleNode, RuleName } from '../types'
+import simulationContext from '../../providers/simulationProvider/context'
+import { NGCEvaluatedNode, NGCRuleNode, RuleName } from '../../types'
 import useChoices from './useChoices'
 import useContent from './useContent'
 import useMissing from './useMissing'

diff --git a/src/publicodes-state/hooks/useRule/useMissing.ts b/src/publicodes-state/hooks/useRule/useMissing.ts
@@ -1,8 +1,8 @@
 'use client'
 
 import { useMemo } from 'react'
-import getIsMissing from '../helpers/getIsMissing'
-import { RuleName, Situation } from '../types'
+import getIsMissing from '../../helpers/getIsMissing'
+import { RuleName, Situation } from '../../types'
 
 type Props = {
   dottedName: RuleName

diff --git a/src/publicodes-state/hooks/useRule/useType.ts b/src/publicodes-state/hooks/useRule/useType.ts
@@ -1,13 +1,13 @@
 'use client'
 
 import { useMemo } from 'react'
-import getType from '../helpers/getType'
+import getType from '../../helpers/getType'
 import {
   NGCEvaluatedNode,
   NGCQuestionType,
   NGCRuleNode,
   RuleName,
-} from '../types'
+} from '../../types'
 
 type Props = {
   dottedName: RuleName

diff --git a/src/publicodes-state/hooks/useRule/useValue.ts b/src/publicodes-state/hooks/useRule/useValue.ts
@@ -1,15 +1,15 @@
 'use client'
 
 import { useMemo } from 'react'
-import getType from '../helpers/getType'
+import getType from '../../helpers/getType'
 import {
   NGCEvaluatedNode,
   NGCQuestionType,
   NGCRuleNode,
   NodeValue,
   RuleName,
   Situation,
-} from '../types'
+} from '../../types'
 type Props = {
   dottedName: RuleName
   safeGetRule: (rule: RuleName) => NGCRuleNode | null

diff --git a/src/publicodes-state/providers/simulationProvider/index.tsx b/src/publicodes-state/providers/simulationProvider/index.tsx
@@ -2,7 +2,7 @@
 
 import { PropsWithChildren } from 'react'
 
-import { RuleName, Rules, Situation } from '../types'
+import { RuleName, Rules, Situation } from '../../types'
 import SimulationContext from './context'
 import useCategories from './useCategories'
 import useEngine from './useEngine'
@@ -107,8 +107,7 @@ export default function SimulationProvider({
         everyMosaicChildWhoIsReallyInMosaic,
         categories,
         subcategories,
-      }}
-    >
+      }}>
       {initialized ? children : null}
     </SimulationContext.Provider>
   )

diff --git a/src/publicodes-state/providers/simulationProvider/useEngine.ts b/src/publicodes-state/providers/simulationProvider/useEngine.ts
@@ -1,7 +1,7 @@
 import Engine from 'publicodes'
 import { useMemo } from 'react'
-import { safeEvaluateHelper } from '../helpers/safeEvaluateHelper'
-import { NGCEvaluatedNode, NGCRuleNode, RuleName, Rules } from '../types'
+import { safeEvaluateHelper } from '../../helpers/safeEvaluateHelper'
+import { NGCEvaluatedNode, NGCRuleNode, RuleName, Rules } from '../../types'
 
 /**
  * Initiate the engine based on the rules we pass

diff --git a/src/publicodes-state/providers/simulationProvider/useRules.ts b/src/publicodes-state/providers/simulationProvider/useRules.ts
@@ -57,8 +57,8 @@ export default function useRules({ engine }: { engine: Engine }): {
   // FIXME(@EmileRolley): refactoring not tested yet
   const everyMosaicChildWhoIsReallyInMosaic = useMemo<RuleName[]>(
     () =>
-      everyQuestions.filter((question: RuleName) =>
-        everyMosaicEntries.find(([mosaicName, mosaicRule]) => {
+      everyQuestions.filter((question: RuleName) => {
+        return everyMosaicEntries.find(([mosaicName, mosaicRule]) => {
           const mosaicNode = mosaicRule.rawNode?.mosaique
           if (!mosaicNode) {
             return false
@@ -70,7 +70,7 @@ export default function useRules({ engine }: { engine: Engine }): {
             question.includes(key)
           )
         })
-      ),
+      }),
     [everyQuestions, everyMosaicEntries]
   )
 

diff --git a/src/publicodes-state/providers/simulationProvider/useSituation.ts b/src/publicodes-state/providers/simulationProvider/useSituation.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react'
-import { safeGetSituation } from '../helpers/safeGetSituation'
-import { Engine, RuleName, Situation } from '../types'
+import { safeGetSituation } from '../../helpers/safeGetSituation'
+import { Engine, RuleName, Situation } from '../../types'
 
 type Props = {
   engine: Engine