fix(dashboard): Don't show query errors for subscription/bridge

novuhq · Jan 22, 2025 · ac60f6a · ac60f6a
1 parent 6670ead
commit ac60f6a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 28 deletions.
diff --git a/apps/dashboard/src/hooks/use-billing-portal.ts b/apps/dashboard/src/hooks/use-billing-portal.ts
@@ -1,8 +1,8 @@
 import { useMutation } from '@tanstack/react-query';
-import { get } from '../api/api.client';
 import { toast } from 'sonner';
-import { useTelemetry } from './use-telemetry';
+import { get } from '../api/api.client';
 import { TelemetryEvent } from '../utils/telemetry';
+import { useTelemetry } from './use-telemetry';
 
 export function useBillingPortal(billingInterval?: 'month' | 'year') {
   const track = useTelemetry();

diff --git a/apps/dashboard/src/hooks/use-checkout-session.ts b/apps/dashboard/src/hooks/use-checkout-session.ts
@@ -1,9 +1,8 @@
-import { useMutation } from '@tanstack/react-query';
 import { ApiServiceLevelEnum } from '@novu/shared';
+import { useMutation } from '@tanstack/react-query';
 import { post } from '../api/api.client';
-import { toast } from 'sonner';
-import { useTelemetry } from './use-telemetry';
 import { TelemetryEvent } from '../utils/telemetry';
+import { useTelemetry } from './use-telemetry';
 
 interface CheckoutResponse {
   data: {
@@ -37,7 +36,6 @@ export function useCheckoutSession() {
         error: error.message,
         billingInterval,
       });
-      toast.error(error.message || 'Unexpected error');
     },
   });
 

diff --git a/apps/dashboard/src/hooks/use-fetch-bridge-health-check.ts b/apps/dashboard/src/hooks/use-fetch-bridge-health-check.ts
@@ -1,10 +1,10 @@
-import { ConnectionStatus } from '@/utils/types';
 import { getBridgeHealthCheck } from '@/api/bridge';
-import { QueryKeys } from '@/utils/query-keys';
 import { useEnvironment } from '@/context/environment/hooks';
-import { useMemo } from 'react';
-import { useQuery } from '@tanstack/react-query';
+import { QueryKeys } from '@/utils/query-keys';
+import { ConnectionStatus } from '@/utils/types';
 import type { HealthCheck } from '@novu/framework/internal';
+import { useQuery } from '@tanstack/react-query';
+import { useMemo } from 'react';
 
 const BRIDGE_STATUS_REFRESH_INTERVAL_IN_MS = 10 * 1000;
 
@@ -19,6 +19,9 @@ export const useFetchBridgeHealthCheck = () => {
     networkMode: 'always',
     refetchOnWindowFocus: true,
     refetchInterval: BRIDGE_STATUS_REFRESH_INTERVAL_IN_MS,
+    meta: {
+      showError: false,
+    },
   });
 
   const status = useMemo<ConnectionStatus>(() => {

diff --git a/apps/dashboard/src/hooks/use-fetch-subscription.ts b/apps/dashboard/src/hooks/use-fetch-subscription.ts
@@ -1,11 +1,11 @@
-import { differenceInDays, isSameDay } from 'date-fns';
 import { getSubscription } from '@/api/billing';
-import { QueryKeys } from '@/utils/query-keys';
 import { useAuth } from '@/context/auth/hooks';
 import { useEnvironment } from '@/context/environment/hooks';
-import { useMemo } from 'react';
-import { useQuery } from '@tanstack/react-query';
+import { QueryKeys } from '@/utils/query-keys';
 import type { GetSubscriptionDto } from '@novu/shared';
+import { useQuery } from '@tanstack/react-query';
+import { differenceInDays, isSameDay } from 'date-fns';
+import { useMemo } from 'react';
 
 const today = new Date();
 
@@ -19,6 +19,9 @@ export const useFetchSubscription = () => {
     queryKey: [QueryKeys.billingSubscription, currentOrganization?._id],
     queryFn: () => getSubscription({ environment: currentEnvironment! }),
     enabled: !!currentOrganization,
+    meta: {
+      showError: false,
+    },
   });
 
   const daysLeft = useMemo(() => {

diff --git a/apps/dashboard/src/routes/root.tsx b/apps/dashboard/src/routes/root.tsx
@@ -17,21 +17,25 @@ const queryClient = new QueryClient({
     },
   },
   queryCache: new QueryCache({
-    onError: (_, query) => {
-      showToast({
-        children: () => (
-          <>
-            <ToastIcon variant="error" />
-            <span className="text-sm">{(query.meta?.errorMessage as string | undefined) || 'Issue fetching.'}</span>
-          </>
-        ),
-        options: {
-          position: 'bottom-right',
-          classNames: {
-            toast: 'mb-4 right-0',
+    onError: (error, query) => {
+      if (query.meta?.showError !== false) {
+        showToast({
+          children: () => (
+            <>
+              <ToastIcon variant="error" />
+              <span className="text-sm">
+                {(query.meta?.errorMessage as string | undefined) || error.message || 'Issue fetching.'}
+              </span>
+            </>
+          ),
+          options: {
+            position: 'bottom-right',
+            classNames: {
+              toast: 'mb-4 right-0',
+            },
           },
-        },
-      });
+        });
+      }
     },
   }),
 });