UIPQB-57 show error message from response (#66)

(cherry picked from commit 793ae30)
folio-org · Nov 10, 2023 · 7578801 · 7578801
1 parent 2e66107
commit 7578801
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/QueryBuilder/QueryBuilder/QueryBuilderModal/QueryBuilderModal.js b/src/QueryBuilder/QueryBuilder/QueryBuilderModal/QueryBuilderModal.js
@@ -77,9 +77,12 @@ export const QueryBuilderModal = ({
     onQueryTestSuccess: () => {
       setIsQueryRetrieved(false);
     },
-    onQueryTestFail: () => {
+    onQueryTestFail: async (err) => {
+      const response = await err?.response?.json();
+      const message = response?.message || <FormattedMessage id="ui-plugin-query-builder.error.sww" />;
+
       showCallout({
-        message: <FormattedMessage id="ui-plugin-query-builder.error.sww" />,
+        message,
         type: 'error',
       });
       setIsQueryRetrieved(false);

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