Return error from RQ useFetchList hook, have better error handling (#…

…157382)
elastic · May 11, 2023 · dcf1c23 · dcf1c23
1 parent f9f4c1a
commit dcf1c23
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_fetch_slo_list.ts b/x-pack/plugins/observability/public/hooks/slo/use_fetch_slo_list.ts
@@ -13,6 +13,7 @@ import {
   useQuery,
   useQueryClient,
 } from '@tanstack/react-query';
+import { i18n } from '@kbn/i18n';
 import { FindSLOResponse } from '@kbn/slo-schema';
 
 import { useKibana } from '../../utils/kibana_react';
@@ -47,10 +48,15 @@ export function useFetchSloList({
   indicatorTypes = [],
   shouldRefetch,
 }: SLOListParams | undefined = {}): UseFetchSloListResponse {
-  const { http } = useKibana().services;
+  const {
+    http,
+    notifications: { toasts },
+  } = useKibana().services;
   const queryClient = useQueryClient();
 
-  const [stateRefetchInterval, setStateRefetchInterval] = useState(SHORT_REFETCH_INTERVAL);
+  const [stateRefetchInterval, setStateRefetchInterval] = useState<number | undefined>(
+    SHORT_REFETCH_INTERVAL
+  );
 
   const { isInitialLoading, isLoading, isError, isSuccess, isRefetching, data, refetch } = useQuery(
     {
@@ -72,13 +78,19 @@ export function useFetchSloList({
 
           return response;
         } catch (error) {
-          // ignore error
+          throw error;
         }
       },
       keepPreviousData: true,
       refetchOnWindowFocus: false,
       refetchInterval: shouldRefetch ? stateRefetchInterval : undefined,
       staleTime: 1000,
+      retry: (failureCount, error) => {
+        if (String(error) === 'Error: Forbidden') {
+          return false;
+        }
+        return failureCount < 4;
+      },
       onSuccess: ({ results }: FindSLOResponse) => {
         if (!shouldRefetch) {
           return;
@@ -102,6 +114,13 @@ export function useFetchSloList({
           exact: false,
         });
       },
+      onError: (error: Error) => {
+        toasts.addError(error, {
+          title: i18n.translate('xpack.observability.slo.list.errorNotification', {
+            defaultMessage: 'Something went wrong while fetching SLOs',
+          }),
+        });
+      },
     }
   );
 

diff --git a/x-pack/plugins/observability/public/pages/slos/slos.tsx b/x-pack/plugins/observability/public/pages/slos/slos.tsx
@@ -31,7 +31,7 @@ export function SlosPage() {
   const { hasWriteCapabilities } = useCapabilities();
   const { hasAtLeast } = useLicense();
 
-  const { isInitialLoading, isLoading, sloList } = useFetchSloList();
+  const { isInitialLoading, isLoading, isError, sloList } = useFetchSloList();
 
   const { total } = sloList || {};
 
@@ -46,6 +46,12 @@ export function SlosPage() {
     },
   ]);
 
+  useEffect(() => {
+    if ((!isLoading && total === 0) || hasAtLeast('platinum') === false || isError) {
+      navigateToUrl(basePath.prepend(paths.observability.slosWelcome));
+    }
+  }, [basePath, hasAtLeast, isError, isLoading, navigateToUrl, total]);
+
   const handleClickCreateSlo = () => {
     navigateToUrl(basePath.prepend(paths.observability.sloCreate));
   };
@@ -54,12 +60,6 @@ export function SlosPage() {
     setIsAutoRefreshing(!isAutoRefreshing);
   };
 
-  useEffect(() => {
-    if ((!isLoading && total === 0) || hasAtLeast('platinum') === false) {
-      navigateToUrl(basePath.prepend(paths.observability.slosWelcome));
-    }
-  }, [basePath, hasAtLeast, isLoading, navigateToUrl, total]);
-
   if (isInitialLoading) {
     return null;
   }