refactor: [M3-9416] - Move feature flag code out of Kubernetes queries file

packages/manager/.changeset/pr-11922-tech-stories-1742933251448.md

@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+Move feature flag code out of Kubernetes queries file ([#11922](https://github.com/linode/manager/pull/11922))

packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubernetesClusterDetail.tsx

@@ -1,15 +1,16 @@
+import { useAccount, useRegionsQuery } from '@linode/queries';
 import { Box, CircleProgress, ErrorState, Stack } from '@linode/ui';
 import { createLazyRoute } from '@tanstack/react-router';
 import * as React from 'react';
 import { useLocation, useParams } from 'react-router-dom';
 
 import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import { LandingHeader } from 'src/components/LandingHeader';
+import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
 import {
   getKubeHighAvailability,
   useAPLAvailability,
 } from 'src/features/Kubernetes/kubeUtils';
-import { useAccount, useRegionsQuery } from '@linode/queries';
 import {
   useKubernetesClusterMutation,
   useKubernetesClusterQuery,
@@ -29,7 +30,12 @@ export const KubernetesClusterDetail = () => {
   const location = useLocation();
   const { showAPL } = useAPLAvailability();
 
-  const { data: cluster, error, isLoading } = useKubernetesClusterQuery(id);
+  const { useBetaEndpoint } = useKubernetesBetaEndpoint();
+
+  const { data: cluster, error, isLoading } = useKubernetesClusterQuery({
+    id,
+    useBetaEndpoint,
+  });
   const { data: regionsData } = useRegionsQuery();
 
   const { mutateAsync: updateKubernetesCluster } = useKubernetesClusterMutation(

packages/manager/src/features/Kubernetes/KubernetesLanding/KubernetesLanding.tsx

@@ -1,3 +1,4 @@
+import { useProfile } from '@linode/queries';
 import { CircleProgress, ErrorState, Typography } from '@linode/ui';
 import { createLazyRoute } from '@tanstack/react-router';
 import * as React from 'react';
@@ -23,11 +24,11 @@ import { TransferDisplay } from 'src/components/TransferDisplay/TransferDisplay'
 import { useOrder } from 'src/hooks/useOrder';
 import { usePagination } from 'src/hooks/usePagination';
 import { useKubernetesClustersQuery } from 'src/queries/kubernetes';
-import { useProfile } from '@linode/queries';
 import { getErrorStringOrDefault } from 'src/utilities/errorUtils';
 
 import { KubernetesClusterRow } from '../ClusterList/KubernetesClusterRow';
 import { DeleteKubernetesClusterDialog } from '../KubernetesClusterDetail/DeleteKubernetesClusterDialog';
+import { useKubernetesBetaEndpoint } from '../kubeUtils';
 import UpgradeVersionModal from '../UpgradeVersionModal';
 import { KubernetesEmptyState } from './KubernetesLandingEmptyState';
 
@@ -98,14 +99,16 @@ export const KubernetesLanding = () => {
 
   const isRestricted = profile?.restricted ?? false;
 
-  const { data, error, isLoading } = useKubernetesClustersQuery(
-    {
+  const { useBetaEndpoint } = useKubernetesBetaEndpoint();
+  const { data, error, isLoading } = useKubernetesClustersQuery({
+    enabled: !isRestricted,
+    filter,
+    params: {
       page: pagination.page,
       page_size: pagination.pageSize,
     },
-    filter,
-    !isRestricted
-  );
+    useBetaEndpoint,
+  });
 
   const {
     isDiskEncryptionFeatureEnabled,

packages/manager/src/features/Kubernetes/kubeUtils.ts

@@ -266,3 +266,14 @@ export const useLkeStandardOrEnterpriseVersions = (
     versionsError: enterpriseTierVersionsError || versionsError,
   };
 };
+
+export const useKubernetesBetaEndpoint = () => {
+  const { isLoading: isAPLAvailabilityLoading, showAPL } = useAPLAvailability();
+  const { isLkeEnterpriseLAFeatureEnabled } = useIsLkeEnterpriseEnabled();
+  const useBetaEndpoint = showAPL || isLkeEnterpriseLAFeatureEnabled;
+
+  return {
+    isAPLAvailabilityLoading,
+    useBetaEndpoint,
+  };
+};

packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx

@@ -15,12 +15,13 @@ import {
 } from 'src/components/Encryption/constants';
 import { useIsDiskEncryptionFeatureEnabled } from 'src/components/Encryption/utils';
 import { Link } from 'src/components/Link';
+import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
 import { AccessTable } from 'src/features/Linodes/AccessTable';
 import { useKubernetesClusterQuery } from 'src/queries/kubernetes';
 import { useIsLinodeInterfacesEnabled } from 'src/utilities/linodes';
 
-import { EncryptedStatus } from '../Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable';
 import { encryptionStatusTestId } from '../Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable';
+import { EncryptedStatus } from '../Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable';
 import { HighPerformanceVolumeIcon } from './HighPerformanceVolumeIcon';
 import {
   StyledBodyGrid,
@@ -155,10 +156,16 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => {
   const secondAddress = ipv6 ? ipv6 : ipv4.length > 1 ? ipv4[1] : null;
   const matchesLgUp = useMediaQuery(theme.breakpoints.up('lg'));
 
-  const { data: cluster } = useKubernetesClusterQuery(
-    linodeLkeClusterId ?? -1,
-    Boolean(linodeLkeClusterId)
-  );
+  const {
+    isAPLAvailabilityLoading,
+    useBetaEndpoint,
+  } = useKubernetesBetaEndpoint();
+
+  const { data: cluster } = useKubernetesClusterQuery({
+    enabled: Boolean(linodeLkeClusterId) && !isAPLAvailabilityLoading,
+    id: linodeLkeClusterId ?? -1,
+    useBetaEndpoint,
+  });
 
   return (
     <>

packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx

@@ -40,7 +40,10 @@ import * as React from 'react';
 import { FormLabel } from 'src/components/FormLabel';
 import { Link } from 'src/components/Link';
 import { LKE_ENTERPRISE_LINODE_VPC_CONFIG_WARNING } from 'src/features/Kubernetes/constants';
-import { useIsLkeEnterpriseEnabled } from 'src/features/Kubernetes/kubeUtils';
+import {
+  useIsLkeEnterpriseEnabled,
+  useKubernetesBetaEndpoint,
+} from 'src/features/Kubernetes/kubeUtils';
 import { DeviceSelection } from 'src/features/Linodes/LinodesDetail/LinodeRescue/DeviceSelection';
 import { titlecase } from 'src/features/Linodes/presentation';
 import {
@@ -254,10 +257,20 @@ export const LinodeConfigDialog = (props: Props) => {
   const { isLinodeInterfacesEnabled } = useIsLinodeInterfacesEnabled();
 
   const { isLkeEnterpriseLAFeatureEnabled } = useIsLkeEnterpriseEnabled();
-  const { data: cluster } = useKubernetesClusterQuery(
-    linode?.lke_cluster_id ?? -1,
-    isLkeEnterpriseLAFeatureEnabled && Boolean(linode?.lke_cluster_id)
-  );
+
+  const {
+    isAPLAvailabilityLoading,
+    useBetaEndpoint,
+  } = useKubernetesBetaEndpoint();
+
+  const { data: cluster } = useKubernetesClusterQuery({
+    enabled:
+      isLkeEnterpriseLAFeatureEnabled &&
+      Boolean(linode?.lke_cluster_id) &&
+      !isAPLAvailabilityLoading,
+    id: linode?.lke_cluster_id ?? -1,
+    useBetaEndpoint,
+  });
 
   const { enqueueSnackbar } = useSnackbar();
 

packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/SummaryPanel.tsx

@@ -13,6 +13,7 @@ import * as React from 'react';
 
 import { Link } from 'src/components/Link';
 import { TagCell } from 'src/components/TagCell/TagCell';
+import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
 import { IPAddress } from 'src/features/Linodes/LinodesLanding/IPAddress';
 import { useIsResourceRestricted } from 'src/hooks/useIsResourceRestricted';
 import { useKubernetesClusterQuery } from 'src/queries/kubernetes';
@@ -41,17 +42,20 @@ export const SummaryPanel = () => {
     id: nodebalancer?.id,
   });
 
+  const { useBetaEndpoint } = useKubernetesBetaEndpoint();
+
   // If we can't get the cluster (status === 'error'), we can assume it's been deleted
-  const { status: clusterStatus } = useKubernetesClusterQuery(
-    nodebalancer?.lke_cluster?.id ?? -1,
-    nodebalancer && Boolean(nodebalancer.lke_cluster),
-    {
+  const { status: clusterStatus } = useKubernetesClusterQuery({
+    enabled: nodebalancer && Boolean(nodebalancer.lke_cluster),
+    id: nodebalancer?.lke_cluster?.id ?? -1,
+    options: {
       refetchOnMount: false,
       refetchOnReconnect: false,
       refetchOnWindowFocus: false,
       retry: false,
-    }
-  );
+    },
+    useBetaEndpoint,
+  });
 
   const configPorts = configs?.reduce((acc, config) => {
     return [...acc, { configId: config.id, port: config.port }];

packages/manager/src/features/Search/useClientSideSearch.ts

@@ -1,8 +1,9 @@
-import { useAllVolumesQuery } from '@linode/queries';
+import { useAllLinodesQuery } from '@linode/queries';
 import { useAllFirewallsQuery } from '@linode/queries';
+import { useAllVolumesQuery } from '@linode/queries';
 import { useAllNodeBalancersQuery } from '@linode/queries';
-import { useAllLinodesQuery } from '@linode/queries';
 
+import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
 import { useAllDatabasesQuery } from 'src/queries/databases/databases';
 import { useAllDomainsQuery } from 'src/queries/domains';
 import { useAllImagesQuery } from 'src/queries/images';
@@ -41,11 +42,12 @@ export const useClientSideSearch = ({ enabled, query }: Props) => {
     error: domainsError,
     isLoading: domainsLoading,
   } = useAllDomainsQuery(enabled);
+  const { useBetaEndpoint } = useKubernetesBetaEndpoint();
   const {
     data: clusters,
     error: lkeClustersError,
     isLoading: lkeClustersLoading,
-  } = useAllKubernetesClustersQuery(enabled);
+  } = useAllKubernetesClustersQuery(enabled, useBetaEndpoint);
   const {
     data: volumes,
     error: volumesError,

packages/manager/src/features/Support/SupportTickets/SupportTicketProductSelectionFields.tsx

@@ -9,6 +9,7 @@ import { Autocomplete, FormHelperText, TextField } from '@linode/ui';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
+import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
 import { useAllDatabasesQuery } from 'src/queries/databases/databases';
 import { useAllDomainsQuery } from 'src/queries/domains';
 import { useAllKubernetesClustersQuery } from 'src/queries/kubernetes';
@@ -70,11 +71,15 @@ export const SupportTicketProductSelectionFields = (props: Props) => {
     isLoading: nodebalancersLoading,
   } = useAllNodeBalancersQuery(entityType === 'nodebalancer_id');
 
+  const { useBetaEndpoint } = useKubernetesBetaEndpoint();
   const {
     data: clusters,
     error: clustersError,
     isLoading: clustersLoading,
-  } = useAllKubernetesClustersQuery(entityType === 'lkecluster_id');
+  } = useAllKubernetesClustersQuery(
+    entityType === 'lkecluster_id',
+    useBetaEndpoint
+  );
 
   const {
     data: linodes,

packages/manager/src/queries/kubernetes.ts

@@ -36,11 +36,6 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
-import {
-  useAPLAvailability,
-  useIsLkeEnterpriseEnabled,
-} from 'src/features/Kubernetes/kubeUtils';
-
 import type {
   CreateKubeClusterPayload,
   CreateNodePoolData,
@@ -99,8 +94,8 @@ export const kubernetesQueries = createQueryKeys('kubernetes', {
             return decodedKubeConfig;
           } catch (error) {
             const err = error as {
-              response?: { status?: number };
               reason?: string;
+              response?: { status?: number };
             };
             const serviceUnavailableStatus = 503;
             if (
@@ -186,18 +181,15 @@ export const kubernetesQueries = createQueryKeys('kubernetes', {
   },
 });
 
-export const useKubernetesClusterQuery = (
-  id: number,
+export const useKubernetesClusterQuery = ({
   enabled = true,
-  options = {}
-) => {
-  const { isLoading: isAPLAvailabilityLoading, showAPL } = useAPLAvailability();
-  const { isLkeEnterpriseLAFeatureEnabled } = useIsLkeEnterpriseEnabled();
-  const useBetaEndpoint = showAPL || isLkeEnterpriseLAFeatureEnabled;
-
+  id = -1,
+  options = {},
+  useBetaEndpoint = false,
+}) => {
   return useQuery<KubernetesCluster, APIError[]>({
     ...kubernetesQueries.cluster(id)._ctx.cluster(useBetaEndpoint),
-    enabled: enabled && !isAPLAvailabilityLoading,
+    enabled,
     ...options,
   });
 };
@@ -220,14 +212,19 @@ export const useKubernetesClustersInfiniteQuery = (
   });
 };
 
-export const useKubernetesClustersQuery = (
-  params: Params,
-  filter: Filter,
-  enabled = true
-) => {
-  const { isLkeEnterpriseLAFeatureEnabled } = useIsLkeEnterpriseEnabled();
-  const useBetaEndpoint = isLkeEnterpriseLAFeatureEnabled;
+interface KubernetesClustersQueryOptions {
+  enabled: boolean;
+  filter: Filter;
+  params: Params;
+  useBetaEndpoint: boolean;
+}
 
+export const useKubernetesClustersQuery = ({
+  enabled = true,
+  filter,
+  params,
+  useBetaEndpoint = false,
+}: KubernetesClustersQueryOptions) => {
   return useQuery<ResourcePage<KubernetesCluster>, APIError[]>({
     ...kubernetesQueries.lists._ctx.paginated(params, filter, useBetaEndpoint),
     enabled,
@@ -477,10 +474,10 @@ export const useKubernetesTieredVersionsQuery = (
  * Avoiding fetching all Kubernetes Clusters if possible.
  * Before you use this, consider implementing infinite scroll instead.
  */
-export const useAllKubernetesClustersQuery = (enabled = false) => {
-  const { isLkeEnterpriseLAFeatureEnabled } = useIsLkeEnterpriseEnabled();
-  const useBetaEndpoint = isLkeEnterpriseLAFeatureEnabled;
-
+export const useAllKubernetesClustersQuery = (
+  enabled = false,
+  useBetaEndpoint = false
+) => {
   return useQuery<KubernetesCluster[], APIError[]>({
     ...kubernetesQueries.lists._ctx.all(useBetaEndpoint),
     enabled,