Merge 5e1f9d4 into 0294d22

src/hooks/useConsent.ts

@@ -1,10 +1,11 @@
 import { useActiveProject } from './useActiveProject';
 import { Consent, Questionnaire } from 'fhir/r3';
-import { useRestQuery, useRestMutation } from './rest-api';
+import { useRestQuery, useRestMutation, useRestCache } from './rest-api';
 import { RestAPIEndpoints } from '../types/rest-types';
 import { RequestPayloadOf } from '@lifeomic/one-query';
 import { useQueryClient } from '@tanstack/react-query';
 import { ACTIVITIES_QUERY_KEY } from './useActivities';
+import cloneDeep from 'lodash/cloneDeep';
 
 type PatchConsentDirectives =
   RestAPIEndpoints['PATCH /v1/consent/directives/me/:directiveId'];
@@ -29,6 +30,7 @@ export const createConsentPatch = (
 export const useConsent = () => {
   const queryClient = useQueryClient();
   const { activeProject } = useActiveProject();
+  const cache = useRestCache();
 
   const useConsentDirectives = () => {
     return useRestQuery('GET /v1/consent/directives/me', {
@@ -54,6 +56,27 @@ export const useConsent = () => {
          */
         queryClient.resetQueries({ queryKey: ACTIVITIES_QUERY_KEY });
         await options?.onSuccess?.(data, variables);
+
+        /**
+         * Update consent status in cache following a successful mutation
+         */
+        cache.updateCache(
+          'GET /v1/consent/directives/me',
+          { projectId: activeProject.id, includeForm: true },
+          (currentData) => {
+            if (!currentData) {
+              return currentData!;
+            }
+            const newData = cloneDeep(currentData);
+            for (const consent of newData?.items) {
+              if (consent.id === variables.directiveId) {
+                consent.status = variables.status;
+              }
+            }
+
+            return newData!;
+          },
+        );
       },
     });
   };

src/screens/ConsentScreen.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { View, ScrollView, Text, Alert } from 'react-native';
 import { t } from 'i18next';
 import Markdown from 'react-native-markdown-display';
@@ -23,14 +23,26 @@ export const ConsentScreen = ({
   const { CustomConsentScreen } = useDeveloperConfig();
   const { useShouldRenderConsentScreen, useUpdateProjectConsentDirective } =
     useConsent();
-  const { consentDirectives, isLoading: loadingDirectives } =
-    useShouldRenderConsentScreen();
+  const {
+    shouldRenderConsentScreen,
+    consentDirectives,
+    isLoading: loadingDirectives,
+  } = useShouldRenderConsentScreen();
   const updateConsentDirectiveMutation = useUpdateProjectConsentDirective({
     onSuccess: (_, { status }) => {
       if (status === 'rejected') {
         return logout({});
       }
+    },
+  });
+
+  const { logout } = useOAuthFlow();
+  const { shouldLaunchOnboardingCourse } = useOnboardingCourse();
 
+  // Handle navigation when there
+  // are no consents left to present
+  useEffect(() => {
+    if (!shouldRenderConsentScreen) {
       if (route.params?.noNavOnAccept) {
         navigation.pop();
         return;
@@ -39,12 +51,14 @@ export const ConsentScreen = ({
         ? 'screens/OnboardingCourseScreen'
         : 'app';
       navigation.replace(nextRoute);
-    },
-  });
-  const { logout } = useOAuthFlow();
-  const { shouldLaunchOnboardingCourse } = useOnboardingCourse();
+    }
+  }, [
+    navigation,
+    route.params?.noNavOnAccept,
+    shouldLaunchOnboardingCourse,
+    shouldRenderConsentScreen,
+  ]);
 
-  // TODO: If needed, allow for accepting multiple consents in a row.
   const consentToPresent = useMemo(
     () => consentDirectives?.[0],
     [consentDirectives],