From a306d15fb09bfaf2f698848f9b1aaf6407e15e94 Mon Sep 17 00:00:00 2001
From: Mehdi-BOUYAHIA <63298037+Mehdi-BOUYAHIA@users.noreply.github.com>
Date: Wed, 5 Jul 2023 10:42:09 +0200
Subject: [PATCH] fix: @Mehdi-BOUYAHIA fix: call to the right valueSet for
 medication and biology - Ref gestion-de-projet#2154

* build: set release version to 2.22.0

* fix: call to the right valueSet for medication and biology - Ref gestion-de-projet#2154

* fix: call to the right valueSet for medication and biology - Ref gestion-de-projet#2154

---------

Co-authored-by: Paul Bui-Quang <paul.bui-quang@aphp.fr>
---
 package-lock.json                                            | 4 ++--
 .../components/CriteriaRightPanel/BiologyForm/index.tsx      | 5 +++--
 .../components/CriteriaRightPanel/MedicationForm/index.tsx   | 4 ++--
 .../CriteriaRightPanel/RequestForm/RequestForm.tsx           | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eab9e2044..0158e1394 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "cohort360_react",
-  "version": "2.22.0-SNAPSHOT",
+  "version": "2.23.0-SNAPSHOT",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "cohort360_react",
-      "version": "2.22.0-SNAPSHOT",
+      "version": "2.23.0-SNAPSHOT",
       "dependencies": {
         "@apollo/client": "^3.7.10",
         "@apollo/react-hooks": "^4.0.0",
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx
index 2fb555844..d1e5bc347 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx
@@ -7,7 +7,8 @@ import BiologyForm from './components/Form/BiologyForm'
 import BiologyHierarchy from './components/Hierarchy/BiologyHierarchy'
 import BiologySearch from './components/BiologySearch/BiologySearch'
 import { initSyncHierarchyTableEffect, OBSERVATION, syncOnChangeFormValue } from 'utils/pmsi'
-import { fetchProcedure, PmsiListType } from 'state/pmsi'
+import { PmsiListType } from 'state/pmsi'
+import { fetchBiology } from 'state/biology'
 import { useAppDispatch, useAppSelector } from 'state'
 
 export const defaultBiology = {
@@ -57,7 +58,7 @@ const Index = (props: any) => {
       biologyHierarchy,
       selectedCriteria,
       defaultCriteria && defaultCriteria.code ? defaultCriteria.code : [],
-      fetchProcedure,
+      fetchBiology,
       defaultBiology.type,
       dispatch
     )
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx
index 9b49b4c7a..07acb2756 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx
@@ -9,7 +9,7 @@ import { MedicationDataType } from 'types'
 import useStyles from './styles'
 import { useAppDispatch, useAppSelector } from 'state'
 import { initSyncHierarchyTableEffect, MEDICATION_REQUEST, syncOnChangeFormValue } from 'utils/pmsi'
-import { initMedicationHierarchy } from 'state/medication'
+import { fetchMedication } from 'state/medication'
 import { PmsiListType } from 'state/pmsi'
 
 export const defaultMedication: MedicationDataType = {
@@ -58,7 +58,7 @@ const Index = (props: any) => {
       medicationHierarchy,
       selectedCriteria,
       defaultCriteria && defaultCriteria.code ? defaultCriteria.code : [],
-      initMedicationHierarchy,
+      fetchMedication,
       defaultMedication.type,
       dispatch,
       criteria && criteria.data?.atcHierarchy !== 'loading'
diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm.tsx
index 6ce29b3bc..7fadfb674 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm.tsx
@@ -51,13 +51,13 @@ const RequestForm: React.FC<RequestFormProps> = ({ parentId, goBack }) => {
       </Grid>
 
       <Grid className={classes.formContainer}>
-        {error && <Alert severity="error">Merci de selectionner une requête</Alert>}
+        {error && <Alert severity="error">Merci de sélectionner une requête</Alert>}
 
         <Grid className={classes.inputContainer} container>
           <Typography variant="h6">Mes requêtes</Typography>
 
           <FormLabel style={{ padding: '1em' }} component="legend">
-            Veuillez selectionner la requête que vous voulez integrer à votre requête actuelle :
+            Veuillez sélectionner la requête que vous voulez intégrer à votre requête actuelle :
           </FormLabel>
 
           <RequestList