fix: stop retrying of features request at top level (#759)

SpecterOps · Aug 1, 2024 · 001f04c · 001f04c
1 parent be9fcf8
commit 001f04c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmd/ui/src/App.tsx b/cmd/ui/src/App.tsx
@@ -46,7 +46,7 @@ const Inner: React.FC = () => {
     const authState = useAppSelector((state) => state.auth);
     const queryClient = useQueryClient();
     const location = useLocation();
-    const featureFlagsRes = useFeatureFlags();
+    const featureFlagsRes = useFeatureFlags({ retry: false });
 
     const darkMode = useAppSelector((state) => state.global.view.darkMode);
 

diff --git a/cmd/ui/src/hooks/useFeatureFlags.tsx b/cmd/ui/src/hooks/useFeatureFlags.tsx
@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { RequestOptions } from 'js-client-library';
-import { useMutation, useQuery, useQueryClient } from 'react-query';
+import { QueryOptions, UseQueryResult, useMutation, useQuery, useQueryClient } from 'react-query';
 import { apiClient } from 'bh-shared-ui';
 
 export type Flag = {
@@ -39,7 +39,8 @@ export const toggleFeatureFlag = (flagId: string | number, options?: RequestOpti
     return apiClient.toggleFeatureFlag(flagId, options).then((response) => response.data);
 };
 
-export const useFeatureFlags = () => useQuery(featureFlagKeys.all, ({ signal }) => getFeatureFlags({ signal }));
+export const useFeatureFlags = (queryOptions?: QueryOptions): UseQueryResult<Flag[], unknown> =>
+    useQuery(featureFlagKeys.all, ({ signal }) => getFeatureFlags({ signal }), queryOptions);
 
 export const useFeatureFlag = (flagKey: string) =>
     useQuery(featureFlagKeys.all, ({ signal }) => getFeatureFlags({ signal }), {