fix: [M3-9737] - NodeBalancer queries (linode#12217)

* initial nodebalancer querys clean up

* Added changeset: Made `lke_cluster` and `type` defined in the `NodeBalancer` type

* Added changeset: NodeBalancer label and connection throttle not updating until page refresh

* Added changeset: `isUsingBetaEndpoint` parameter from `useNodeBalancerQuery`

---------

Co-authored-by: Banks Nussman <[email protected]>

Author: 2 people

packages/api-v4/.changeset/pr-12217-changed-1747239928776.md

@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Changed
+---
+
+Made `lke_cluster` and `type` defined in the `NodeBalancer` type ([#12217](https://github.com/linode/manager/pull/12217))

packages/api-v4/src/nodebalancers/types.ts

@@ -42,11 +42,11 @@ export interface NodeBalancer {
    * If the NB is associated with a cluster (active or deleted), return its info
    * If the NB is not associated with a cluster, return null
    */
-  lke_cluster?: LKEClusterInfo | null;
+  lke_cluster: LKEClusterInfo | null;
   region: string;
   tags: string[];
   transfer: BalancerTransfer;
-  type?: NodeBalancerType;
+  type: NodeBalancerType;
   updated: string;
 }
 

packages/manager/.changeset/pr-12217-fixed-1747241027159.md

@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+NodeBalancer label and connection throttle not updating until page refresh ([#12217](https://github.com/linode/manager/pull/12217))

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

@@ -13,26 +13,18 @@ import * as React from 'react';
 
 import { Link } from 'src/components/Link';
 import { TagCell } from 'src/components/TagCell/TagCell';
-import {
-  useIsLkeEnterpriseEnabled,
-  useKubernetesBetaEndpoint,
-} from 'src/features/Kubernetes/kubeUtils';
+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';
 
 export const SummaryPanel = () => {
   const { isUsingBetaEndpoint } = useKubernetesBetaEndpoint();
-  const { isLkeEnterpriseLAFeatureEnabled } = useIsLkeEnterpriseEnabled();
 
   const { id } = useParams({
     from: '/nodebalancers/$id/summary',
   });
-  const { data: nodebalancer } = useNodeBalancerQuery(
-    Number(id),
-    Boolean(id),
-    isLkeEnterpriseLAFeatureEnabled
-  );
+  const { data: nodebalancer } = useNodeBalancerQuery(Number(id), Boolean(id));
   const { data: configs } = useAllNodeBalancerConfigsQuery(Number(id));
   const { data: regions } = useRegionsQuery();
   const { data: attachedFirewallData } = useNodeBalancersFirewallsQuery(

packages/queries/.changeset/pr-12217-removed-1747241598724.md

@@ -0,0 +1,5 @@
+---
+"@linode/queries": Removed
+---
+
+`isUsingBetaEndpoint` parameter from `useNodeBalancerQuery` ([#12217](https://github.com/linode/manager/pull/12217))

packages/queries/src/nodebalancers/index.ts

@@ -1 +1,2 @@
+export * from './keys';
 export * from './nodebalancers';

packages/queries/src/nodebalancers/keys.ts

@@ -0,0 +1,61 @@
+import {
+  getNodeBalancer,
+  getNodeBalancerFirewalls,
+  getNodeBalancers,
+  getNodeBalancerStats,
+} from '@linode/api-v4';
+import { createQueryKeys } from '@lukemorales/query-key-factory';
+
+import {
+  getAllNodeBalancerConfigs,
+  getAllNodeBalancers,
+  getAllNodeBalancerTypes,
+} from './requests';
+
+import type { Filter, Params } from '@linode/api-v4';
+
+export const nodebalancerQueries = createQueryKeys('nodebalancers', {
+  nodebalancer: (id: number) => ({
+    contextQueries: {
+      configurations: {
+        queryFn: () => getAllNodeBalancerConfigs(id),
+        queryKey: null,
+      },
+      firewalls: {
+        queryFn: () => getNodeBalancerFirewalls(id),
+        queryKey: null,
+      },
+      stats: {
+        queryFn: () => getNodeBalancerStats(id),
+        queryKey: null,
+      },
+    },
+    queryFn: () => getNodeBalancer(id),
+    queryKey: [id],
+  }),
+  nodebalancers: {
+    contextQueries: {
+      all: {
+        queryFn: getAllNodeBalancers,
+        queryKey: null,
+      },
+      infinite: (filter: Filter = {}) => ({
+        queryFn: ({ pageParam }) =>
+          getNodeBalancers(
+            { page: pageParam as number, page_size: 25 },
+            filter,
+          ),
+        queryKey: [filter],
+      }),
+      paginated: (params: Params = {}, filter: Filter = {}) => ({
+        queryFn: () => getNodeBalancers(params, filter),
+        queryKey: [params, filter],
+      }),
+    },
+    queryKey: null,
+  },
+  types: {
+    queryFn: getAllNodeBalancerTypes,
+    queryKey: null,
+  },
+});

packages/queries/src/nodebalancers/nodebalancers.ts

@@ -3,18 +3,9 @@ import {
   createNodeBalancerConfig,
   deleteNodeBalancer,
   deleteNodeBalancerConfig,
-  getNodeBalancer,
-  getNodeBalancerBeta,
-  getNodeBalancerConfigs,
-  getNodeBalancerFirewalls,
-  getNodeBalancers,
-  getNodeBalancerStats,
-  getNodeBalancerTypes,
   updateNodeBalancer,
   updateNodeBalancerConfig,
 } from '@linode/api-v4';
-import { getAll } from '@linode/utilities';
-import { createQueryKeys } from '@lukemorales/query-key-factory';
 import {
   keepPreviousData,
   useInfiniteQuery,
@@ -26,6 +17,7 @@ import {
 import { queryPresets } from '../base';
 import { firewallQueries } from '../firewalls';
 import { profileQueries } from '../profile';
+import { nodebalancerQueries } from './keys';
 
 import type { EventHandlerData } from '../eventHandlers';
 import type {
@@ -42,72 +34,6 @@ import type {
   ResourcePage,
 } from '@linode/api-v4';
 
-const getAllNodeBalancerTypes = () =>
-  getAll<PriceType>((params) => getNodeBalancerTypes(params))().then(
-    (results) => results.data,
-  );
-
-export const getAllNodeBalancerConfigs = (id: number) =>
-  getAll<NodeBalancerConfig>((params) =>
-    getNodeBalancerConfigs(id, params),
-  )().then((data) => data.data);
-
-export const getAllNodeBalancers = () =>
-  getAll<NodeBalancer>((params) => getNodeBalancers(params))().then(
-    (data) => data.data,
-  );
-
-export const nodebalancerQueries = createQueryKeys('nodebalancers', {
-  nodebalancer: (id: number) => ({
-    contextQueries: {
-      configurations: {
-        queryFn: () => getAllNodeBalancerConfigs(id),
-        queryKey: null,
-      },
-      firewalls: {
-        queryFn: () => getNodeBalancerFirewalls(id),
-        queryKey: null,
-      },
-      nodebalancer: (isUsingBetaEndpoint: boolean = false) => ({
-        queryFn: () =>
-          isUsingBetaEndpoint ? getNodeBalancerBeta(id) : getNodeBalancer(id),
-        queryKey: [isUsingBetaEndpoint ? 'v4beta' : 'v4'],
-      }),
-      stats: {
-        queryFn: () => getNodeBalancerStats(id),
-        queryKey: null,
-      },
-    },
-    queryFn: () => getNodeBalancer(id),
-    queryKey: [id],
-  }),
-  nodebalancers: {
-    contextQueries: {
-      all: {
-        queryFn: getAllNodeBalancers,
-        queryKey: null,
-      },
-      infinite: (filter: Filter = {}) => ({
-        queryFn: ({ pageParam }) =>
-          getNodeBalancers(
-            { page: pageParam as number, page_size: 25 },
-            filter,
-          ),
-        queryKey: [filter],
-      }),
-      paginated: (params: Params = {}, filter: Filter = {}) => ({
-        queryFn: () => getNodeBalancers(params, filter),
-        queryKey: [params, filter],
-      }),
-    },
-    queryKey: null,
-  },
-  types: {
-    queryFn: getAllNodeBalancerTypes,
-    queryKey: null,
-  },
-});
-
 export const useNodeBalancerStatsQuery = (id: number) => {
   return useQuery<NodeBalancerStats, APIError[]>({
     ...nodebalancerQueries.nodebalancer(id)._ctx.stats,
@@ -122,15 +48,9 @@ export const useNodeBalancersQuery = (params: Params, filter: Filter) =>
     placeholderData: keepPreviousData,
   });
 
-export const useNodeBalancerQuery = (
-  id: number,
-  enabled = true,
-  isUsingBetaEndpoint = false,
-) => {
+export const useNodeBalancerQuery = (id: number, enabled = true) => {
   return useQuery<NodeBalancer, APIError[]>({
-    ...nodebalancerQueries
-      .nodebalancer(id)
-      ._ctx.nodebalancer(isUsingBetaEndpoint),
+    ...nodebalancerQueries.nodebalancer(id),
     enabled,
   });
 };

packages/queries/src/nodebalancers/requests.ts

@@ -0,0 +1,27 @@
+import {
+  getNodeBalancerConfigs,
+  getNodeBalancers,
+  getNodeBalancerTypes,
+} from '@linode/api-v4';
+import { getAll } from '@linode/utilities';
+
+import type {
+  NodeBalancer,
+  NodeBalancerConfig,
+  PriceType,
+} from '@linode/api-v4';
+
+export const getAllNodeBalancerTypes = () =>
+  getAll<PriceType>((params) => getNodeBalancerTypes(params))().then(
+    (results) => results.data,
+  );
+
+export const getAllNodeBalancerConfigs = (id: number) =>
+  getAll<NodeBalancerConfig>((params) =>
+    getNodeBalancerConfigs(id, params),
+  )().then((data) => data.data);
+
+export const getAllNodeBalancers = () =>
+  getAll<NodeBalancer>((params) => getNodeBalancers(params))().then(
+    (data) => data.data,
+  );

packages/utilities/src/factories/nodebalancer.ts

@@ -6,7 +6,7 @@ import type {
   NodeBalancerConfig,
   NodeBalancerConfigNode,
   NodeBalancerStats,
-} from '@linode/api-v4/lib/nodebalancers/types';
+} from '@linode/api-v4';
 
 export const nodeBalancerFactory = Factory.Sync.makeFactory<NodeBalancer>({
   client_conn_throttle: 0,
@@ -24,6 +24,8 @@ export const nodeBalancerFactory = Factory.Sync.makeFactory<NodeBalancer>({
     total: 0,
   },
   updated: '2019-12-13T00:00:00',
+  lke_cluster: null,
+  type: 'common',
 });
 
 export const nodeBalancerConfigFactory =