add fix

folio-org · Oct 27, 2024 · 01bef57 · 01bef57
1 parent 71b0fcb
commit 01bef57
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...nts/BulkEditPane/BulkEditListResult/BulkEditInAppPreviewModal/BulkEditPreviewModalList.js b/...nts/BulkEditPane/BulkEditListResult/BulkEditInAppPreviewModal/BulkEditPreviewModalList.js
@@ -54,6 +54,7 @@ export const BulkEditPreviewModalList = ({
   const { bulkDetails } = useBulkOperationDetails({ id: bulkOperationId, interval });
 
   const visibleColumnKeys = getVisibleColumnsKeys(visibleColumns);
+  const enabled = isPreviewEnabled && bulkDetails?.status === JOB_STATUSES.REVIEW_CHANGES;
 
   const {
     contentData,
@@ -65,7 +66,7 @@ export const BulkEditPreviewModalList = ({
     step: EDITING_STEPS.EDIT,
     capabilities: currentRecordType,
     queryOptions: {
-      enabled: bulkDetails?.status === JOB_STATUSES.REVIEW_CHANGES,
+      enabled,
       onSuccess: showErrorMessage,
       onError: (error) => {
         showErrorMessage(error);

diff --git a/src/hooks/api/useBulkOperationDetails.js b/src/hooks/api/useBulkOperationDetails.js
@@ -32,6 +32,10 @@ export const useBulkOperationDetails = ({
 
   useEffect(() => {
     setRefetchInterval(interval);
+
+    return () => {
+      clearInterval();
+    };
   }, [interval]);
 
   const { data, isLoading } = useQuery({

diff --git a/src/hooks/useConfirmChanges.js b/src/hooks/useConfirmChanges.js
@@ -1,8 +1,6 @@
 import { useState } from 'react';
 import { useQueryClient } from 'react-query';
 
-import { useNamespace } from '@folio/stripes/core';
-
 import {
   PREVIEW_MODAL_KEY,
   BULK_OPERATION_DETAILS_KEY,
@@ -29,7 +27,6 @@ export const useConfirmChanges = ({
   const queryClient = useQueryClient();
   const searchParams = useSearchParams();
   const { showErrorMessage } = useErrorMessages();
-  const [namespaceKey] = useNamespace({ key: BULK_OPERATION_DETAILS_KEY });
 
   const [isPreviewModalOpened, setIsPreviewModalOpened] = useState(false);
   const [isPreviewLoading, setIsPreviewLoading] = useState(false);
@@ -50,8 +47,8 @@ export const useConfirmChanges = ({
   const confirmChanges = (payload) => {
     // as backend reset a status to 'DATA_MODIFICATION' only after the job started
     // we need to set it manually to show the preview modal without a delay
-    queryClient.setQueryData(
-      [BULK_OPERATION_DETAILS_KEY, namespaceKey, bulkOperationId],
+    queryClient.setQueriesData(
+      BULK_OPERATION_DETAILS_KEY,
       (preBulkOperation) => ({ ...preBulkOperation, status: JOB_STATUSES.DATA_MODIFICATION }),
     );