fix queryKey args, sort some imports alphabetically, general style

linode · Jul 13, 2023 · 7650e1c · 7650e1c
1 parent 2721659
commit 7650e1c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/packages/api-v4/src/account/betas.ts b/packages/api-v4/src/account/betas.ts
@@ -7,11 +7,7 @@ import Request, {
   setData,
 } from '../request';
 import { Filter, Params, ResourcePage } from '../types';
-import { AccountBeta } from './types';
-
-export interface EnrollInBetaData {
-  id: string;
-}
+import { AccountBeta, EnrollInBetaPayload } from './types';
 
 /**
  * getBetas
@@ -45,7 +41,7 @@ export const getAccountBeta = (betaId: string) =>
  * @param data.id { string } ID of the beta you want to be enrolled in.
  *
  */
-export const enrollInBeta = (data: EnrollInBetaData) =>
+export const enrollInBeta = (data: EnrollInBetaPayload) =>
   Request<{}>(
     setURL(`${API_ROOT}/account/betas`),
     setMethod('POST'),

diff --git a/packages/api-v4/src/account/types.ts b/packages/api-v4/src/account/types.ts
@@ -460,3 +460,7 @@ export interface AccountLogin {
 export interface AccountBeta extends Beta {
   enrolled: string;
 }
+
+export interface EnrollInBetaPayload {
+  id: string;
+}
diff --git a/packages/manager/src/factories/index.ts b/packages/manager/src/factories/index.ts
@@ -3,8 +3,8 @@ export * from './accountSettings';
 export * from './accountMaintenance';
 export * from './accountOAuth';
 export * from './accountPayment';
-export * from './billing';
 export * from './betas';
+export * from './billing';
 export * from './config';
 export * from './databases';
 export * from './disk';

diff --git a/packages/manager/src/queries/accountBetas.ts b/packages/manager/src/queries/accountBetas.ts
@@ -1,7 +1,7 @@
 import {
   AccountBeta,
   getAccountBetas,
-  EnrollInBetaData,
+  EnrollInBetaPayload,
   getAccountBeta,
   enrollInBeta,
 } from '@linode/api-v4/lib/account';
@@ -17,27 +17,27 @@ export const queryKey = 'account-beta';
 
 export const useAccountBetasQuery = (params?: Params, filter?: Filter) =>
   useQuery<ResourcePage<AccountBeta>, APIError[]>(
-    [`${queryKey}-list`, params, filter],
+    [queryKey, 'paginated', params, filter],
     () => getAccountBetas(params, filter),
     {
       keepPreviousData: true,
     }
   );
 
 export const useAccountBetaQuery = (id: string) =>
-  useQuery<AccountBeta, APIError[]>([queryKey, id], () => getAccountBeta(id), {
-    keepPreviousData: true,
-  });
+  useQuery<AccountBeta, APIError[]>([queryKey, 'account-beta', id], () =>
+    getAccountBeta(id)
+  );
 
 export const useCreateAccountBetaMutation = () => {
   const queryClient = useQueryClient();
-  return useMutation<{}, APIError[], EnrollInBetaData>(
+  return useMutation<{}, APIError[], EnrollInBetaPayload>(
     (data) => {
       return enrollInBeta(data);
     },
     {
       onSuccess() {
-        queryClient.invalidateQueries(`${queryKey}-list`);
+        queryClient.invalidateQueries([queryKey, 'paginated']);
       },
     }
   );