Skip to content

Commit f768607

Browse files
authored
refactor: [M3-9379] - Move networktransfer queries (linode#12381)
* Add networktransfer to queries package * update paths * remove networkTransfer query form manager package * Added changeset: Moved networktransfer queries and dependencies to shared `queries` package * Added changeset: Created `networktransfer/` directory and migrated relevant query keys and hooks * fix broken unit tests
1 parent 84e0a0e commit f768607

File tree

10 files changed

+29
-12
lines changed

10 files changed

+29
-12
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/manager": Removed
3+
---
4+
5+
Moved networktransfer queries and dependencies to shared `queries` package ([#12381](https://github.com/linode/manager/pull/12381))

packages/manager/src/features/ObjectStorage/BucketLanding/CreateBucketDrawer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
useAccountAgreements,
44
useAccountSettings,
55
useMutateAccountAgreements,
6+
useNetworkTransferPricesQuery,
67
useProfile,
78
useRegionsQuery,
89
} from '@linode/queries';
@@ -13,7 +14,6 @@ import * as React from 'react';
1314
import { Controller, useForm } from 'react-hook-form';
1415

1516
import { EUAgreementCheckbox } from 'src/features/Account/Agreements/EUAgreementCheckbox';
16-
import { useNetworkTransferPricesQuery } from 'src/queries/networkTransfer';
1717
import {
1818
useCreateBucketMutation,
1919
useObjectStorageBuckets,

packages/manager/src/features/ObjectStorage/BucketLanding/OMC_CreateBucketDrawer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
useAccountAgreements,
44
useAccountSettings,
55
useMutateAccountAgreements,
6+
useNetworkTransferPricesQuery,
67
useProfile,
78
} from '@linode/queries';
89
import {
@@ -20,7 +21,6 @@ import { Controller, useForm } from 'react-hook-form';
2021
import { Link } from 'src/components/Link';
2122
import { BucketRateLimitTable } from 'src/features/ObjectStorage/BucketLanding/BucketRateLimitTable';
2223
import { useObjectStorageRegions } from 'src/features/ObjectStorage/hooks/useObjectStorageRegions';
23-
import { useNetworkTransferPricesQuery } from 'src/queries/networkTransfer';
2424
import {
2525
useCreateBucketMutation,
2626
useObjectStorageBuckets,

packages/manager/src/features/ObjectStorage/BucketLanding/OveragePricing.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ vi.mock('src/queries/object-storage/queries', async () => {
3939
};
4040
});
4141

42-
vi.mock('src/queries/networkTransfer', async () => {
43-
const actual = await vi.importActual('src/queries/object-storage/queries');
42+
vi.mock('@linode/queries', async () => {
43+
const actual = await vi.importActual('@linode/queries');
4444
return {
4545
...actual,
4646
useNetworkTransferPricesQuery: queryMocks.useNetworkTransferPricesQuery,

packages/manager/src/features/ObjectStorage/BucketLanding/OveragePricing.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { useNetworkTransferPricesQuery } from '@linode/queries';
12
import { Box, CircleProgress, Typography } from '@linode/ui';
23
import { styled } from '@mui/material/styles';
34
import React from 'react';
45

56
import { TextTooltip } from 'src/components/TextTooltip';
6-
import { useNetworkTransferPricesQuery } from 'src/queries/networkTransfer';
77
import { useObjectStorageTypesQuery } from 'src/queries/object-storage/queries';
88
import { UNKNOWN_PRICE } from 'src/utilities/pricing/constants';
99
import { getDCSpecificPriceByType } from 'src/utilities/pricing/dynamicPricing';
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/queries": Added
3+
---
4+
5+
Created `networktransfer/` directory and migrated relevant query keys and hooks ([#12381](https://github.com/linode/manager/pull/12381))

packages/queries/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export * from './iam';
88
export * from './images';
99
export * from './linodes';
1010
export * from './networking';
11+
export * from './networktransfer';
1112
export * from './nodebalancers';
1213
export * from './placementGroups';
1314
export * from './profile';
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from './networkTransfer';
2+
export * from './requests';

packages/manager/src/queries/networkTransfer.ts renamed to packages/queries/src/networktransfer/networkTransfer.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
import { getNetworkTransferPrices } from '@linode/api-v4';
21
import { queryPresets } from '@linode/queries';
3-
import { getAll } from '@linode/utilities';
42
import { useQuery } from '@tanstack/react-query';
53

4+
import { getAllNetworkTransferPrices } from './requests';
5+
66
import type { APIError, PriceType } from '@linode/api-v4';
77

88
export const queryKey = 'network-transfer';
99

10-
const getAllNetworkTransferPrices = () =>
11-
getAll<PriceType>((params) => getNetworkTransferPrices(params))().then(
12-
(data) => data.data
13-
);
14-
1510
export const useNetworkTransferPricesQuery = (enabled = true) =>
1611
useQuery<PriceType[], APIError[]>({
1712
queryFn: getAllNetworkTransferPrices,
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { getNetworkTransferPrices } from '@linode/api-v4';
2+
import { getAll } from '@linode/utilities';
3+
4+
import type { PriceType } from '@linode/api-v4';
5+
6+
export const getAllNetworkTransferPrices = () =>
7+
getAll<PriceType>((params) => getNetworkTransferPrices(params))().then(
8+
(data) => data.data,
9+
);

0 commit comments

Comments
 (0)