From f7e7e337f8a1ad4e72ccff61d88717e84c06752d Mon Sep 17 00:00:00 2001
From: Jean-Marc Millet <jean-marc.millet@scality.com>
Date: Tue, 3 Sep 2024 15:59:51 +0200
Subject: [PATCH] add a parameter to query options to update the ref use to
 ensure Accesstoken is valid and then use in queryFn of useQuery. The ref was
 only update when the token change, and was not update when the selected
 bucket changes causing the query to be potentially called for the wrong
 bucket

---
 src/react/ui-elements/EmptyBucket/index.tsx | 5 +++--
 src/react/utils/IAMhooks.ts                 | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/react/ui-elements/EmptyBucket/index.tsx b/src/react/ui-elements/EmptyBucket/index.tsx
index d1ec3892f..c5d756f99 100644
--- a/src/react/ui-elements/EmptyBucket/index.tsx
+++ b/src/react/ui-elements/EmptyBucket/index.tsx
@@ -147,6 +147,7 @@ export const EmptyBucket = ({ bucketName }: EmptyBucketProps) => {
       refetchOnWindowFocus: false,
       refetchOnMount: true,
       refetchOnReconnect: false,
+      additionalDepsToUpdateQueryFn: [bucketName],
     },
     (data) => createDeleteObjectsData(data.DeleteMarkers, data.Versions),
   );
@@ -209,12 +210,12 @@ export const EmptyBucket = ({ bucketName }: EmptyBucketProps) => {
         }
         overlayStyle={{
           width: '9rem',
-          display: isBucketEmpty ? 'none' : undefined,
+          display: isBucketEmpty ? undefined : 'none',
         }}
       >
         <Button
           icon={<Icon name="Eraser" />}
-          disabled={!isBucketEmpty}
+          disabled={isBucketEmpty}
           variant="danger"
           onClick={handleEmptyClick}
           label={EMPTY_CONFIRMATION_MODAL_TITLE}
diff --git a/src/react/utils/IAMhooks.ts b/src/react/utils/IAMhooks.ts
index 1fe4fabbd..d0e9918e7 100644
--- a/src/react/utils/IAMhooks.ts
+++ b/src/react/utils/IAMhooks.ts
@@ -53,7 +53,7 @@ export const useAwsPaginatedEntities = <
     ENTITY,
     TError,
     MARKER_TYPE
-  >,
+  > & { additionalDepsToUpdateQueryFn?: unknown[] },
   getEntitiesFromResult: (data: API_RESPONSE) => ENTITY[],
   preventNextPagesRetrieval = false,
 ): AWS_PAGINATED_ENTITIES<ENTITY> => {
@@ -96,7 +96,7 @@ export const useAwsPaginatedEntities = <
     >();
   useEffect(() => {
     ref.current = reactQueryOptions?.queryFn;
-  }, [token]);
+  }, [token, ...(reactQueryOptions.additionalDepsToUpdateQueryFn || [])]);
   //--------------------------------------------------------------------
 
   const {
@@ -116,16 +116,19 @@ export const useAwsPaginatedEntities = <
       return ref.current?.(ctx, ctx.pageParam);
     },
   });
+
   const pageIndex = data?.pageParams?.length || 0;
   const entities =
     data &&
     data.pages &&
     data.pages.flatMap((page) => getEntitiesFromResult(page));
+
   useMemo(() => {
     if (pageIndex === 0 || (pageIndex === 1 && internalStatus === 'success')) {
       setFirstPageStatus(internalStatus);
     }
   }, [internalStatus, pageIndex]);
+
   useMemo(() => {
     if (
       internalStatus === 'idle' ||
@@ -165,11 +168,13 @@ export const useAwsPaginatedEntities = <
     firstPageStatus,
   } as AWS_PAGINATED_ENTITIES<ENTITY>;
 };
+
 type AccessKeyObject = {
   accessKey: string;
   createdOn: string;
   status: string;
 };
+
 export const useAccessKeyOutdatedStatus = (
   accessKeyObject: AccessKeyObject,
 ) => {