UIPQB-47: 400 error blocks save or further action in query builder (#59)

folio-org · Sep 27, 2023 · 7146c3b · 7146c3b
1 parent 5b3f068
commit 7146c3b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,3 +28,4 @@
 * [UIPQB-46](https://issues.folio.org/browse/UIPQB-46) Incorrect text when no options available in the query builder's search bar.
 * [UIPQB-50](https://issues.folio.org/browse/UIPQB-50)Add 'in-progress' handling to plugin-query-builder
 * [UIPQB-48](https://issues.folio.org/browse/UIPQB-48) "Show columns" dropdown doesn't fit in the screen.
+* [UIPQB-47](https://issues.folio.org/browse/UIPQB-47) 400 error blocks save or further action in query builder.
diff --git a/src/QueryBuilder/QueryBuilder/QueryBuilderModal/QueryBuilderModal.js b/src/QueryBuilder/QueryBuilder/QueryBuilderModal/QueryBuilderModal.js
@@ -102,8 +102,11 @@ export const QueryBuilderModal = ({
       await cancelQuery({ queryId });
     }
   };
-  const handleCloseModal = async () => {
-    await handleCancelQuery();
+
+  const handleCloseModal = async (isCancel = true) => {
+    if (isCancel) {
+      await handleCancelQuery();
+    }
 
     const src = await getSourceValue({
       initialValues,
@@ -123,7 +126,7 @@ export const QueryBuilderModal = ({
       fqlQuery,
     });
 
-    await handleCloseModal();
+    await handleCloseModal(false);
   };
 
   const handleQueryRetrieved = (data) => {

diff --git a/src/hooks/useTestQuery.js b/src/hooks/useTestQuery.js
@@ -13,7 +13,10 @@ export const useTestQuery = ({ testQueryDataSource, onQueryTestSuccess, onQueryT
   } = useMutation({
     mutationFn: ({ entityTypeId, fqlQuery }) => testQueryDataSource({ entityTypeId, fqlQuery }),
     onSuccess: onQueryTestSuccess,
-    onError: onQueryTestFail,
+    onError: () => {
+      setIsTestQueryInProgress(false);
+      onQueryTestFail();
+    },
   });
 
   const { queryId } = testQueryData || {};