Merge pull request #688 from aphp/hot-fix/noRightToAccessMyPatient

[2.19.3][Merge] - Merge hot-fix/rights into main
aphp · Jan 10, 2023 · 6509d4f · 6509d4f
2 parents 15a97b8 + 6c9ce9f
commit 6509d4f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cohort360_react",
-  "version": "2.19.2",
+  "version": "2.19.3",
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.7.0",

diff --git a/src/state/exploredCohort.ts b/src/state/exploredCohort.ts
@@ -41,7 +41,7 @@ const defaultInitialState = {
   importedPatients: [],
   includedPatients: [],
   excludedPatients: [],
-  loading: false,
+  loading: true,
   canMakeExport: false,
   deidentifiedBoolean: undefined
 }
@@ -324,20 +324,20 @@ const exploredCohortSlice = createSlice({
     builder.addCase(logout.fulfilled, () => defaultInitialState)
     builder.addCase(fetchExploredCohort.pending, (state) => ({ ...state, loading: true }))
     builder.addCase(fetchExploredCohort.fulfilled, (state, { payload }) => ({ ...state, ...payload, loading: false }))
-    builder.addCase(fetchExploredCohort.rejected, () => ({ ...defaultInitialState }))
+    builder.addCase(fetchExploredCohort.rejected, () => ({ ...defaultInitialState, loading: false }))
     builder.addCase(fetchExploredCohortInBackground.pending, (state) => ({ ...state, loading: true }))
     builder.addCase(fetchExploredCohortInBackground.fulfilled, (state, { payload }) => ({
       ...state,
       ...payload,
       loading: false
     }))
-    builder.addCase(fetchExploredCohortInBackground.rejected, () => ({ ...defaultInitialState }))
+    builder.addCase(fetchExploredCohortInBackground.rejected, () => ({ ...defaultInitialState, loading: false }))
     builder.addCase(favoriteExploredCohort.pending, (state) => ({ ...state }))
     builder.addCase(favoriteExploredCohort.fulfilled, (state, { payload }) => ({
       ...state,
       ...payload
     }))
-    builder.addCase(favoriteExploredCohort.rejected, () => ({ ...defaultInitialState }))
+    builder.addCase(favoriteExploredCohort.rejected, () => ({ ...defaultInitialState, loading: false }))
   }
 })
 

diff --git a/src/views/Dashboard/Dashboard.tsx b/src/views/Dashboard/Dashboard.tsx
@@ -121,7 +121,7 @@ const Dashboard: React.FC<{
     return <CohortCreation />
   }
 
-  if (dashboard.loading === false && dashboard.cohort === undefined) {
+  if (dashboard.loading === false && dashboard.cohort === undefined && dashboard.totalPatients === undefined) {
     return <CohortRightOrNotExist />
   } else if (dashboard.loading === false && dashboard.totalPatients === 0) {
     return <CohortNoPatient />