From 3639ab7bc7105d0d984d0d305b9ee6fbd8eb77eb Mon Sep 17 00:00:00 2001
From: eirikhaugstulen <eirik.haugstulen@gmail.com>
Date: Mon, 4 Nov 2024 11:25:34 +0100
Subject: [PATCH] feat: update caching logic

---
 .../hooks/useBulkCompleteEvents.js            |  2 ++
 .../hooks/useCompleteBulkEnrollments.js       | 20 +++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.js b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.js
index 1c5d0b6fbb..45a22994a0 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.js
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.js
@@ -45,6 +45,8 @@ export const useBulkCompleteEvents = ({
         },
         {
             enabled: Object.keys(selectedRows).length > 0 && isCompleteDialogOpen,
+            staleTime: 0,
+            cacheTime: 0,
             select: (data: any) => {
                 const apiEvents = handleAPIResponse(REQUESTED_ENTITIES.events, data);
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.js
index 29560318b8..2380450afb 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.js
+++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.js
@@ -2,10 +2,10 @@
 
 import { useEffect, useMemo } from 'react';
 import { useAlert, useConfig, useDataEngine } from '@dhis2/app-runtime';
-import { useMutation } from 'react-query';
+import { useMutation, useQueryClient } from 'react-query';
 import i18n from '@dhis2/d2-i18n';
 import log from 'loglevel';
-import { useApiDataQuery } from '../../../../../../../utils/reactQueryHelpers';
+import { ReactQueryAppNamespace, useApiDataQuery } from '../../../../../../../utils/reactQueryHelpers';
 import { handleAPIResponse, REQUESTED_ENTITIES } from '../../../../../../../utils/api';
 import { errorCreator, FEATURES, hasAPISupportForFeature } from '../../../../../../../../capture-core-utils';
 import type { ProgramStage } from '../../../../../../../metaData';
@@ -91,11 +91,24 @@ export const useCompleteBulkEnrollments = ({
 }: Props) => {
     const { serverVersion: { minor } } = useConfig();
     const dataEngine = useDataEngine();
+    const queryClient = useQueryClient();
     const { show: showAlert } = useAlert(
         ({ message }) => message,
         { critical: true },
     );
 
+    const removeQueries = () => {
+        queryClient.removeQueries(
+            [
+                ReactQueryAppNamespace,
+                'WorkingLists',
+                'BulkActionBar',
+                'CompleteAction',
+                'trackedEntities',
+            ],
+        );
+    };
+
     const {
         data: trackedEntities,
         isError: isTrackedEntitiesError,
@@ -149,8 +162,10 @@ export const useCompleteBulkEnrollments = ({
         {
             onSuccess: () => {
                 onUpdateList();
+                removeQueries();
             },
             onError: (serverResponse, variables) => {
+                removeQueries();
                 showAlert({ message: i18n.t('An error occurred when completing the enrollments') });
                 log.error(
                     errorCreator('An error occurred when completing enrollments')({
@@ -172,6 +187,7 @@ export const useCompleteBulkEnrollments = ({
             onSuccess: (serverResponse, { enrollments }) => {
                 const enrollmentIds = enrollments.map(enrollment => enrollment.trackedEntity);
                 removeRowsFromSelection(enrollmentIds);
+                removeQueries();
                 onUpdateList(true);
             },
             onError: (serverResponse, variables) => {