fix: fixes some bug

aphp · Oct 11, 2023 · cca20a4 · cca20a4
1 parent 6d0bc86
commit cca20a4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/components/CreationCohort/Requeteur.tsx b/src/components/CreationCohort/Requeteur.tsx
@@ -203,7 +203,14 @@ const Requeteur = () => {
         onRedo={_canRedo() ? _onRedo : undefined}
       />
 
-      {!requestIdFromUrl && !requestId && <ModalCreateNewRequest onClose={() => dispatch(setSelectedRequest(null))} />}
+      {!requestIdFromUrl && !requestId && (
+        <ModalCreateNewRequest
+          onClose={() => {
+            dispatch(setSelectedRequest(null))
+            navigate('/home')
+          }}
+        />
+      )}
     </>
   )
 }

diff --git a/src/services/aphp/callApi.ts b/src/services/aphp/callApi.ts
@@ -788,7 +788,7 @@ const getCodeList = async (
     }
     const res = await apiFhir.post<FHIR_API_Response<ValueSet>>(`/ValueSet/$expand`, JSON.stringify(json))
     const valueSetExpansion = getApiResponseResourceOrThrow(res).expansion
-    return valueSetExpansion?.contains
+    return valueSetExpansion?.contains?.map((code) => ({ ...code, codeSystem: codeSystem }))
   }
 }
 

diff --git a/src/services/aphp/serviceCohorts.ts b/src/services/aphp/serviceCohorts.ts
@@ -572,11 +572,8 @@ const servicesCohorts: IServiceCohorts = {
 
   fetchCohortsRights: async (cohorts) => {
     try {
-      const ids = cohorts
-        .map((cohort) => {
-          return cohort.fhir_group_id
-        })
-        .filter((id) => id !== '')
+      const ids = cohorts.map((cohort) => cohort.fhir_group_id).filter((id) => id !== '')
+      if (ids.length === 0) return []
       const rightsResponse = await apiBackend.get(`cohort/cohorts/cohort-rights/?fhir_group_id=${ids}`)
       return cohorts.map((cohort) => {
         return {

diff --git a/src/services/aphp/serviceProjects.ts b/src/services/aphp/serviceProjects.ts
@@ -430,6 +430,7 @@ const servicesProjects: IServiceProjects = {
 
     // Récupère les droits
     const cohortList = await servicesCohorts.fetchCohortsRights(data.results)
+    if (cohortList.length === 0) return data
     return {
       ...data,
       results: cohortList