[] = [
'backups_cancel',
@@ -107,6 +112,14 @@ const events: Event[] = eventActions.map((action) => {
});
describe('verify notification types and icons', () => {
+ before(() => {
+ // TODO eventMessagesV2: delete when flag is removed and update test
+ mockAppendFeatureFlags({
+ eventMessagesV2: makeFeatureFlagData(false),
+ });
+ mockGetFeatureFlagClientstream();
+ });
+
it(`notifications`, () => {
mockGetEvents(events).as('mockEvents');
cy.visitWithLogin('/linodes');
diff --git a/packages/manager/src/components/Snackbar/ToastNotifications.stories.tsx b/packages/manager/src/components/Snackbar/ToastNotifications.stories.tsx
index d12d5a8539f..ac8d4b13f96 100644
--- a/packages/manager/src/components/Snackbar/ToastNotifications.stories.tsx
+++ b/packages/manager/src/components/Snackbar/ToastNotifications.stories.tsx
@@ -3,6 +3,7 @@ import React from 'react';
import { Button } from 'src/components/Button/Button';
import { Snackbar } from 'src/components/Snackbar/Snackbar';
+import { getEventMessage } from 'src/features/Events/utils';
import type { Meta, StoryObj } from '@storybook/react';
@@ -96,3 +97,48 @@ function Example() {
);
}
+
+export const WithEventMessage: Story = {
+ args: {
+ anchorOrigin: { horizontal: 'right', vertical: 'bottom' },
+ hideIconVariant: true,
+ maxSnack: 5,
+ },
+ render: (args) => {
+ const WithEventMessage = () => {
+ const { enqueueSnackbar } = useSnackbar();
+ const message = getEventMessage({
+ action: 'placement_group_assign',
+ entity: {
+ label: 'Entity',
+ url: 'https://google.com',
+ },
+ secondary_entity: {
+ label: 'Secondary Entity',
+ url: 'https://google.com',
+ },
+ status: 'notification',
+ });
+
+ const showToast = (variant: any) =>
+ enqueueSnackbar(message, {
+ variant,
+ });
+ return (
+
+ );
+ };
+
+ return (
+
+
+
+ );
+ },
+};
diff --git a/packages/manager/src/dev-tools/FeatureFlagTool.tsx b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
index 69ab0b57250..dfc7908ec46 100644
--- a/packages/manager/src/dev-tools/FeatureFlagTool.tsx
+++ b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
@@ -22,6 +22,7 @@ const options: { flag: keyof Flags; label: string }[] = [
{ flag: 'aclbFullCreateFlow', label: 'ACLB Full Create Flow' },
{ flag: 'aclp', label: 'CloudPulse' },
{ flag: 'disableLargestGbPlans', label: 'Disable Largest GB Plans' },
+ { flag: 'eventMessagesV2', label: 'Event Messages V2' },
{ flag: 'gecko2', label: 'Gecko' },
{ flag: 'linodeCreateRefactor', label: 'Linode Create v2' },
{ flag: 'linodeDiskEncryption', label: 'Linode Disk Encryption (LDE)' },
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
index 1ee3379a571..76e40d150bb 100644
--- a/packages/manager/src/featureFlags.ts
+++ b/packages/manager/src/featureFlags.ts
@@ -67,6 +67,7 @@ export interface Flags {
databaseResize: boolean;
databases: boolean;
disableLargestGbPlans: boolean;
+ eventMessagesV2: boolean;
gecko: boolean; // @TODO gecko: delete this after next release
gecko2: GeckoFlag;
gpuv2: gpuV2;
diff --git a/packages/manager/src/features/Events/Event.helpers.test.ts b/packages/manager/src/features/Events/Event.helpers.test.ts
index cb2acd4fbd8..2d17f4fa9ef 100644
--- a/packages/manager/src/features/Events/Event.helpers.test.ts
+++ b/packages/manager/src/features/Events/Event.helpers.test.ts
@@ -1,3 +1,4 @@
+// TODO eventMessagesV2: delete when flag is removed
import { eventFactory } from 'src/factories/events';
import {
diff --git a/packages/manager/src/features/Events/Event.helpers.ts b/packages/manager/src/features/Events/Event.helpers.ts
index 714206fb423..8ca4f216904 100644
--- a/packages/manager/src/features/Events/Event.helpers.ts
+++ b/packages/manager/src/features/Events/Event.helpers.ts
@@ -1,3 +1,4 @@
+// TODO eventMessagesV2: delete when flag is removed
import { Event, EventAction } from '@linode/api-v4/lib/account';
export const maybeRemoveTrailingPeriod = (string: string) => {
diff --git a/packages/manager/src/features/Events/EventLink.test.tsx b/packages/manager/src/features/Events/EventLink.test.tsx
new file mode 100644
index 00000000000..19417271229
--- /dev/null
+++ b/packages/manager/src/features/Events/EventLink.test.tsx
@@ -0,0 +1,65 @@
+import { screen } from '@testing-library/react';
+import * as React from 'react';
+
+import { eventFactory } from 'src/factories';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { EventLink } from './EventLink';
+
+import type { Event } from '@linode/api-v4';
+
+const queryMocks = vi.hoisted(() => ({
+ getLinkForEvent: vi.fn().mockReturnValue('mockEntityUrl'),
+}));
+
+vi.mock('src/utilities/getEventsActionLink', async () => {
+ const actual = await vi.importActual('src/utilities/getEventsActionLink');
+ return {
+ ...actual,
+ getLinkForEvent: queryMocks.getLinkForEvent,
+ };
+});
+
+describe('EventLink', () => {
+ it('renders null when provided with invalid props', () => {
+ const { container } = renderWithTheme(
+
+ );
+
+ expect(container).toBeEmptyDOMElement();
+ });
+
+ it('renders the entity label when provided with valid props', () => {
+ queryMocks.getLinkForEvent.mockReturnValue('mockEntityUrl');
+ const mockEvent: Event = eventFactory.build({
+ entity: {
+ label: 'mockEntityLabel',
+ url: 'mockEntityUrl',
+ },
+ });
+ renderWithTheme();
+
+ expect(screen.getByText('mockEntityLabel')).toBeInTheDocument();
+ });
+
+ it('renders the secondary entity label when provided with valid props', () => {
+ queryMocks.getLinkForEvent.mockReturnValue('mockSecondaryEntityUrl');
+ const mockEvent = eventFactory.build({
+ entity: null,
+ secondary_entity: {
+ label: 'mockSecondaryEntityLabel',
+ url: 'mockSecondaryEntityUrl',
+ },
+ });
+
+ renderWithTheme();
+
+ expect(screen.getByText('mockSecondaryEntityLabel')).toBeInTheDocument();
+ });
+});
diff --git a/packages/manager/src/features/Events/EventLink.tsx b/packages/manager/src/features/Events/EventLink.tsx
new file mode 100644
index 00000000000..fedfd69fb7b
--- /dev/null
+++ b/packages/manager/src/features/Events/EventLink.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+
+import { Link } from 'src/components/Link';
+import { getLinkForEvent } from 'src/utilities/getEventsActionLink';
+
+import type { Event } from '@linode/api-v4';
+
+interface MessageLinkEntity {
+ event: Event;
+ to: 'entity' | 'secondaryEntity';
+}
+
+/**
+ * A component that renders a link to an entity or secondary entity.
+ * Meant to be used in the context of an event message.
+ */
+export const EventLink = (props: MessageLinkEntity) => {
+ const { event, to } = props;
+ const entity = to === 'entity' ? event.entity : event.secondary_entity;
+
+ const renderDefault = () => {
+ // eslint-disable-next-line react/jsx-no-useless-fragment
+ return <>{entity?.label ?? ''};
+ };
+
+ if (!entity?.url || !entity?.label) {
+ return renderDefault();
+ }
+
+ const link = getLinkForEvent(event.action, entity);
+
+ return link ? {entity.label} : renderDefault();
+};
diff --git a/packages/manager/src/features/Events/EventMessage.test.tsx b/packages/manager/src/features/Events/EventMessage.test.tsx
new file mode 100644
index 00000000000..cf0b7ad69f9
--- /dev/null
+++ b/packages/manager/src/features/Events/EventMessage.test.tsx
@@ -0,0 +1,31 @@
+import * as React from 'react';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { EventMessage } from './EventMessage';
+
+describe('EventMessage', () => {
+ it('renders null when message is null', () => {
+ const { queryByRole } = renderWithTheme();
+
+ expect(queryByRole('pre')).toBeNull();
+ });
+
+ it('renders message without ticks as plain text', () => {
+ const { getByText, queryByRole } = renderWithTheme(
+
+ );
+
+ expect(getByText('Hello, world!')).toBeInTheDocument();
+ expect(queryByRole('pre')).toBeNull();
+ });
+
+ it('renders message with ticks as inline code blocks', () => {
+ const { container, getByText } = renderWithTheme(
+
+ );
+
+ expect(getByText(/Hello,/)).toBeInTheDocument();
+ expect(container.querySelector('pre')).toHaveTextContent('world');
+ });
+});
diff --git a/packages/manager/src/features/Events/EventMessage.tsx b/packages/manager/src/features/Events/EventMessage.tsx
new file mode 100644
index 00000000000..d555fb04eb1
--- /dev/null
+++ b/packages/manager/src/features/Events/EventMessage.tsx
@@ -0,0 +1,45 @@
+import { styled } from '@mui/material/styles';
+import * as React from 'react';
+
+interface MessageLinkEntity {
+ message: null | string;
+}
+
+/**
+ * Renders a message with inline code blocks.
+ * Meant to be used in the context of an event message.
+ * This component is only used to render {e.message} in the case of potential ticks we want to render as .
+ */
+export const EventMessage = (props: MessageLinkEntity) => {
+ const { message } = props;
+
+ if (!message) {
+ return null;
+ }
+
+ return formatTicks(message);
+};
+
+const formatTicks = (message: string): JSX.Element => {
+ const parts = message.split(/(`[^`]*`)/g);
+
+ return (
+ <>
+ {parts.map((part, i) =>
+ part.startsWith('`') && part.endsWith('`') ? (
+ {part.slice(1, -1)}
+ ) : (
+ part
+ )
+ )}
+
+ );
+};
+
+const StyledPre = styled('pre')(({ theme }) => ({
+ backgroundColor: theme.name === 'dark' ? '#222' : '#f4f4f4',
+ borderRadius: 4,
+ display: 'inline',
+ fontSize: '0.75rem',
+ padding: '0.15rem 0.25rem',
+}));
diff --git a/packages/manager/src/features/Events/EventRow.test.tsx b/packages/manager/src/features/Events/EventRow.test.tsx
index 4ca94ba6f7f..15c8ce4cc3b 100644
--- a/packages/manager/src/features/Events/EventRow.test.tsx
+++ b/packages/manager/src/features/Events/EventRow.test.tsx
@@ -1,3 +1,4 @@
+// TODO eventMessagesV2: delete when flag is removed
import { DateTime } from 'luxon';
import * as React from 'react';
diff --git a/packages/manager/src/features/Events/EventRow.tsx b/packages/manager/src/features/Events/EventRow.tsx
index cc403c8cb29..1df3708daf4 100644
--- a/packages/manager/src/features/Events/EventRow.tsx
+++ b/packages/manager/src/features/Events/EventRow.tsx
@@ -1,3 +1,4 @@
+// TODO eventMessagesV2: delete when flag is removed
import { Event, EventAction } from '@linode/api-v4/lib/account';
import { DateTime } from 'luxon';
import { pathOr } from 'ramda';
diff --git a/packages/manager/src/features/Events/EventRowV2.test.tsx b/packages/manager/src/features/Events/EventRowV2.test.tsx
new file mode 100644
index 00000000000..357876fadf0
--- /dev/null
+++ b/packages/manager/src/features/Events/EventRowV2.test.tsx
@@ -0,0 +1,35 @@
+// TODO eventMessagesV2: rename to EventRow.test.tsx when flag is removed
+import * as React from 'react';
+
+import { eventFactory } from 'src/factories';
+import {
+ renderWithTheme,
+ resizeScreenSize,
+ wrapWithTableBody,
+} from 'src/utilities/testHelpers';
+
+import { EventRowV2 } from './EventRowV2';
+
+import type { Event } from '@linode/api-v4/lib/account';
+
+describe('EventRowV2', () => {
+ const mockEvent: Event = eventFactory.build({
+ action: 'tfa_enabled',
+ status: 'notification',
+ username: 'test_user',
+ });
+
+ it('displays the correct data', () => {
+ resizeScreenSize(1600);
+ const { getByRole } = renderWithTheme(
+ wrapWithTableBody()
+ );
+
+ expect(
+ getByRole('cell', {
+ name: /Two-factor authentication has been enabled./i,
+ })
+ ).toBeInTheDocument();
+ expect(getByRole('cell', { name: 'test_user' })).toBeInTheDocument();
+ });
+});
diff --git a/packages/manager/src/features/Events/EventRowV2.tsx b/packages/manager/src/features/Events/EventRowV2.tsx
new file mode 100644
index 00000000000..7a37cd42767
--- /dev/null
+++ b/packages/manager/src/features/Events/EventRowV2.tsx
@@ -0,0 +1,60 @@
+// TODO eventMessagesV2: rename to EventRow.tsx when flag is removed
+import { Event } from '@linode/api-v4/lib/account';
+import * as React from 'react';
+
+import { Box } from 'src/components/Box';
+import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
+import { Hidden } from 'src/components/Hidden';
+import { TableCell } from 'src/components/TableCell';
+import { TableRow } from 'src/components/TableRow';
+import { getEventTimestamp } from 'src/utilities/eventUtils';
+
+import { getEventMessage } from './utils';
+
+interface EventRowProps {
+ entityId?: number;
+ event: Event;
+}
+
+export const EventRowV2 = (props: EventRowProps) => {
+ const { event } = props;
+ const timestamp = getEventTimestamp(event);
+ const { action, message, username } = {
+ action: event.action,
+ message: getEventMessage(event),
+ username: event.username,
+ };
+
+ if (!message) {
+ return null;
+ }
+
+ return (
+
+
+ {message}
+
+
+
+ {username ?? 'Linode'}
+
+
+
+ {timestamp.toRelative()}
+ {username && (
+
+
+
+ by {username}
+
+
+ )}
+
+
+
+
+
+
+
+ );
+};
diff --git a/packages/manager/src/features/Events/Events.stories.tsx b/packages/manager/src/features/Events/Events.stories.tsx
deleted file mode 100644
index eaca057df99..00000000000
--- a/packages/manager/src/features/Events/Events.stories.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import React from 'react';
-
-import { Chip } from 'src/components/Chip';
-import { Table } from 'src/components/Table';
-import { TableBody } from 'src/components/TableBody';
-import { TableCell } from 'src/components/TableCell';
-import { TableHead } from 'src/components/TableHead';
-import { TableRow } from 'src/components/TableRow';
-import { Typography } from 'src/components/Typography';
-import { eventFactory } from 'src/factories/events';
-import { formatEventWithUsername } from 'src/features/Events/Event.helpers';
-import { unsafe_MarkdownIt } from 'src/utilities/markdown';
-
-import { EVENT_ACTIONS, EVENT_STATUSES } from './constants';
-import {
- applyBolding,
- applyLinking,
- eventMessageCreators,
- generateEventMessage,
-} from './eventMessageGenerator';
-
-import type { CreatorsForStatus } from './eventMessageGenerator';
-import type { Event } from '@linode/api-v4/lib/account';
-import type { Meta, StoryObj } from '@storybook/react';
-
-const event: Event = eventFactory.build({
- action: 'linode_boot',
- entity: { id: 1, label: '{Entity}', type: 'any', url: 'https://google.com' },
- message: '{Message}',
- secondary_entity: {
- id: 1,
- label: '{Secondary Entity}',
- type: 'linode',
- url: 'https://google.com',
- },
- status: '{Status}' as Event['status'],
- username: '{Username}',
-});
-
-const renderEventMessages = (eventMessageCreators: {
- [index: string]: CreatorsForStatus;
-}) => {
- return (
-
- {Object.entries(eventMessageCreators).map(([eventKey, statuses]) => (
-
-
- {eventKey}
-
-
-
-
- Status
- Message
-
-
-
- {Object.keys(statuses).map((status, key) => {
- const messageCreator = statuses[status];
-
- let message = messageCreator(event);
- message = applyBolding(message);
- message = formatEventWithUsername(
- event.action,
- event.username,
- message
- );
- // eslint-disable-next-line xss/no-mixed-html
- message = unsafe_MarkdownIt.render(message);
- message = applyLinking(event, message);
-
- return (
-
-
- {' '}
-
-
-
-
-
- );
- })}
-
-
-
- ))}
-
-
-
-
+ {!flags.eventMessagesV2 && (
+
+
+
+ )}
Event
- Relative Date
+ {flags.eventMessagesV2 && (
+
+
+ User
+
+
+ )}
+ Relative Date
-
+
Absolute Date
diff --git a/packages/manager/src/features/Events/EventsMessages.stories.tsx b/packages/manager/src/features/Events/EventsMessages.stories.tsx
new file mode 100644
index 00000000000..72325c69c1f
--- /dev/null
+++ b/packages/manager/src/features/Events/EventsMessages.stories.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+
+import { Chip } from 'src/components/Chip';
+import { Table } from 'src/components/Table';
+import { TableBody } from 'src/components/TableBody';
+import { TableCell } from 'src/components/TableCell';
+import { TableHead } from 'src/components/TableHead';
+import { TableRow } from 'src/components/TableRow';
+import { Typography } from 'src/components/Typography';
+import { eventFactory } from 'src/factories/events';
+import { eventMessages } from 'src/features/Events/factory';
+
+import type { Event } from '@linode/api-v4/lib/account';
+import type { Meta, StoryObj } from '@storybook/react';
+
+const event: Event = eventFactory.build({
+ action: 'linode_boot',
+ entity: {
+ id: 1,
+ label: '{entity}',
+ type: 'linode',
+ url: 'https://google.com',
+ },
+ message: 'message with a `ticked` word',
+ secondary_entity: {
+ id: 1,
+ label: '{secondary entity}',
+ type: 'linode',
+ url: 'https://google.com',
+ },
+ status: '{status}' as Event['status'],
+ username: '{username}',
+});
+
+/**
+ * This story loops through all the known event messages keys, and displays their Cloud Manager message in a table.
+ */
+export const EventMessages: StoryObj = {
+ render: () => (
+
+ {Object.entries(eventMessages).map(([eventKey, statuses]) => (
+
+
+ {eventKey}
+
+
+
+
+ Status
+ Message
+
+
+
+ {Object.keys(statuses).map((status, key) => {
+ const message = statuses[status](event);
+
+ return (
+
+
+
+
+
+ {message}
+
+
+ );
+ })}
+
+
+
+ ))}
+
+
+ {header && (
+
+ {header}
+
+ )}
+ {docsLink}
+
+ {error && (
+
+ {error}
+
+ )}
+ {copy && {copy}}
+ {renderTable()}
+
+
+ );
+ }
+);
+
+const StyledTypography = styled(Typography)(({ theme }) => ({
+ fontSize: '0.875rem',
+ marginTop: theme.spacing(1),
+}));
diff --git a/packages/manager/src/features/components/PlansPanel/EdgePlanTable.tsx b/packages/manager/src/features/components/PlansPanel/EdgePlanTable.tsx
deleted file mode 100644
index 932ac4d2f41..00000000000
--- a/packages/manager/src/features/components/PlansPanel/EdgePlanTable.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { styled } from '@mui/material/styles';
-import { SxProps } from '@mui/system';
-import React from 'react';
-
-import { Box } from 'src/components/Box';
-import { Notice } from 'src/components/Notice/Notice';
-import { Paper } from 'src/components/Paper';
-import { Typography } from 'src/components/Typography';
-
-interface EdgePlanTableProps {
- copy?: string;
- docsLink?: JSX.Element;
- error?: JSX.Element | string;
- header: string;
- innerClass?: string;
- renderTable: () => React.JSX.Element;
- rootClass?: string;
- sx?: SxProps;
-}
-
-export const EdgePlanTable = React.memo((props: EdgePlanTableProps) => {
- const {
- copy,
- docsLink,
- error,
- header,
- innerClass,
- renderTable,
- rootClass,
- sx,
- } = props;
-
- return (
-
-
-
- {header && (
-
- {header}
-
- )}
- {docsLink}
-
- {error && (
-
- {error}
-
- )}
- {copy && {copy}}
- {renderTable()}
-
-
- );
-});
-
-const StyledTypography = styled(Typography)(({ theme }) => ({
- fontSize: '0.875rem',
- marginTop: theme.spacing(1),
-}));
diff --git a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
index f29b3361440..b516c11e678 100644
--- a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
@@ -2,15 +2,15 @@ import * as React from 'react';
import { useLocation } from 'react-router-dom';
import { Notice } from 'src/components/Notice/Notice';
-import { getIsLinodeCreateTypeEdgeSupported } from 'src/components/RegionSelect/RegionSelect.utils';
-import { getIsEdgeRegion } from 'src/components/RegionSelect/RegionSelect.utils';
+import { isDistributedRegionSupported } from 'src/components/RegionSelect/RegionSelect.utils';
+import { getIsDistributedRegion } from 'src/components/RegionSelect/RegionSelect.utils';
import { TabbedPanel } from 'src/components/TabbedPanel/TabbedPanel';
import { useFlags } from 'src/hooks/useFlags';
import { useRegionAvailabilityQuery } from 'src/queries/regions/regions';
import { plansNoticesUtils } from 'src/utilities/planNotices';
import { getQueryParamsFromQueryString } from 'src/utilities/queryParams';
-import { EdgePlanTable } from './EdgePlanTable';
+import { DistributedRegionPlanTable } from './DistributedRegionPlanTable';
import { PlanContainer } from './PlanContainer';
import { PlanInformation } from './PlanInformation';
import {
@@ -83,44 +83,26 @@ export const PlansPanel = (props: PlansPanelProps) => {
flags.disableLargestGbPlans ? _types : types
);
- const hideEdgeRegions =
+ const hideDistributedRegions =
!flags.gecko2?.enabled ||
- !getIsLinodeCreateTypeEdgeSupported(params.type as LinodeCreateType);
-
- const showEdgePlanTable =
- !hideEdgeRegions &&
- getIsEdgeRegion(regionsData ?? [], selectedRegionID ?? '');
-
- const getDedicatedEdgePlanType = () => {
- const edgePlans = types.filter((type) => type.class === 'edge');
- if (edgePlans.length) {
- return edgePlans;
- }
-
- // @TODO Remove fallback once edge plans are activated
- // 256GB and 512GB plans will not be supported for Edge
- const plansUpTo128GB = (_plans.dedicated ?? []).filter(
- (planType) =>
- !['Dedicated 256 GB', 'Dedicated 512 GB'].includes(
- planType.formattedLabel
- )
+ !isDistributedRegionSupported(params.type as LinodeCreateType);
+
+ const showDistributedRegionPlanTable =
+ !hideDistributedRegions &&
+ getIsDistributedRegion(regionsData ?? [], selectedRegionID ?? '');
+
+ const getDedicatedDistributedRegionPlanType = () => {
+ return types.filter(
+ (type) =>
+ type.id.includes('dedicated-edge') ||
+ type.id.includes('nanode-edge') ||
+ type.class === 'edge'
);
-
- return plansUpTo128GB.map((plan) => {
- delete plan.transfer;
- return {
- ...plan,
- price: {
- hourly: 0,
- monthly: 0,
- },
- };
- });
};
- const plans = showEdgePlanTable
+ const plans = showDistributedRegionPlanTable
? {
- dedicated: getDedicatedEdgePlanType(),
+ dedicated: getDedicatedDistributedRegionPlanType(),
}
: _plans;
@@ -156,7 +138,7 @@ export const PlansPanel = (props: PlansPanelProps) => {
<>
{
planType={plan}
regionsData={regionsData || []}
/>
- {showEdgePlanTable && (
+ {showDistributedRegionPlanTable && (
)}
@@ -200,9 +182,9 @@ export const PlansPanel = (props: PlansPanelProps) => {
currentPlanHeading
);
- if (showEdgePlanTable) {
+ if (showDistributedRegionPlanTable) {
return (
-
Date: Tue, 4 Jun 2024 17:59:53 -0400
Subject: [PATCH 052/163] =?UTF-8?q?upcoming:=20[M3-8019]=20=E2=80=93=20Add?=
=?UTF-8?q?=20Encrypted/Not=20Encrypted=20status=20to=20Linode=20Detail=20?=
=?UTF-8?q?summary=20header=20(#10537)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pr-10537-changed-1717182754934.md | 5 ++
packages/api-v4/src/linodes/types.ts | 1 +
...r-10537-upcoming-features-1717182633416.md | 5 ++
packages/manager/src/__data__/linodes.ts | 4 ++
packages/manager/src/assets/icons/lock.svg | 1 +
packages/manager/src/assets/icons/unlock.svg | 1 +
.../components/DiskEncryption/constants.tsx | 3 +
packages/manager/src/factories/linodes.ts | 1 +
.../NodePoolsDisplay/NodeTable.tsx | 6 +-
.../Linodes/LinodeEntityDetail.test.tsx | 59 +++++++++++++++++++
.../features/Linodes/LinodeEntityDetail.tsx | 2 +
.../Linodes/LinodeEntityDetailBody.tsx | 54 +++++++++++++++--
.../LinodesCreate/AddonsPanel.test.tsx | 3 +
.../LinodeRow/LinodeRow.test.tsx | 1 +
.../Linodes/LinodesLanding/ListView.tsx | 3 +-
15 files changed, 142 insertions(+), 7 deletions(-)
create mode 100644 packages/api-v4/.changeset/pr-10537-changed-1717182754934.md
create mode 100644 packages/manager/.changeset/pr-10537-upcoming-features-1717182633416.md
diff --git a/packages/api-v4/.changeset/pr-10537-changed-1717182754934.md b/packages/api-v4/.changeset/pr-10537-changed-1717182754934.md
new file mode 100644
index 00000000000..15cf633a71e
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-10537-changed-1717182754934.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Changed
+---
+
+Add lke_cluster_id to Linode interface ([#10537](https://github.com/linode/manager/pull/10537))
diff --git a/packages/api-v4/src/linodes/types.ts b/packages/api-v4/src/linodes/types.ts
index 05f52e39d96..c3e1f6be296 100644
--- a/packages/api-v4/src/linodes/types.ts
+++ b/packages/api-v4/src/linodes/types.ts
@@ -27,6 +27,7 @@ export interface Linode {
ipv4: string[];
ipv6: string | null;
label: string;
+ lke_cluster_id: number | null;
placement_group?: PlacementGroupPayload; // If not in a placement group, this will be excluded from the response.
type: string | null;
status: LinodeStatus;
diff --git a/packages/manager/.changeset/pr-10537-upcoming-features-1717182633416.md b/packages/manager/.changeset/pr-10537-upcoming-features-1717182633416.md
new file mode 100644
index 00000000000..0ffeb21d36f
--- /dev/null
+++ b/packages/manager/.changeset/pr-10537-upcoming-features-1717182633416.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add Encrypted / Not Encrypted status to Linode Detail header ([#10537](https://github.com/linode/manager/pull/10537))
diff --git a/packages/manager/src/__data__/linodes.ts b/packages/manager/src/__data__/linodes.ts
index 22ffdfee42d..ab5ad7a97ca 100644
--- a/packages/manager/src/__data__/linodes.ts
+++ b/packages/manager/src/__data__/linodes.ts
@@ -24,6 +24,7 @@ export const linode1: Linode = {
ipv4: ['97.107.143.78', '98.107.143.78', '99.107.143.78'],
ipv6: '2600:3c03::f03c:91ff:fe0a:109a/64',
label: 'test',
+ lke_cluster_id: null,
placement_group: {
affinity_type: 'anti_affinity:local',
id: 1,
@@ -69,6 +70,7 @@ export const linode2: Linode = {
ipv4: ['97.107.143.49'],
ipv6: '2600:3c03::f03c:91ff:fe0a:0d7a/64',
label: 'another-test',
+ lke_cluster_id: null,
placement_group: {
affinity_type: 'anti_affinity:local',
id: 1,
@@ -114,6 +116,7 @@ export const linode3: Linode = {
ipv4: ['97.107.143.49'],
ipv6: '2600:3c03::f03c:91ff:fe0a:0d7a/64',
label: 'another-test',
+ lke_cluster_id: null,
placement_group: {
affinity_type: 'anti_affinity:local',
id: 1,
@@ -159,6 +162,7 @@ export const linode4: Linode = {
ipv4: ['97.107.143.49'],
ipv6: '2600:3c03::f03c:91ff:fe0a:0d7a/64',
label: 'another-test-eu',
+ lke_cluster_id: null,
placement_group: {
affinity_type: 'anti_affinity:local',
id: 1,
diff --git a/packages/manager/src/assets/icons/lock.svg b/packages/manager/src/assets/icons/lock.svg
index ca135909b4f..62caf228e55 100644
--- a/packages/manager/src/assets/icons/lock.svg
+++ b/packages/manager/src/assets/icons/lock.svg
@@ -1,3 +1,4 @@
diff --git a/packages/manager/src/assets/icons/unlock.svg b/packages/manager/src/assets/icons/unlock.svg
index ce413046282..ae99e8d9a24 100644
--- a/packages/manager/src/assets/icons/unlock.svg
+++ b/packages/manager/src/assets/icons/unlock.svg
@@ -1,4 +1,5 @@
diff --git a/packages/manager/src/components/DiskEncryption/constants.tsx b/packages/manager/src/components/DiskEncryption/constants.tsx
index a9799ec1c80..539b19d3a6c 100644
--- a/packages/manager/src/components/DiskEncryption/constants.tsx
+++ b/packages/manager/src/components/DiskEncryption/constants.tsx
@@ -23,5 +23,8 @@ export const DISK_ENCRYPTION_BACKUPS_CAVEAT_COPY =
export const DISK_ENCRYPTION_NODE_POOL_GUIDANCE_COPY =
'To enable disk encryption, delete the node pool and create a new node pool. New node pools are always encrypted.';
+export const UNENCRYPTED_STANDARD_LINODE_GUIDANCE_COPY =
+ 'Rebuild this Linode to enable or disable disk encryption.';
+
export const DISK_ENCRYPTION_IMAGES_CAVEAT_COPY =
'Virtual Machine Images are not encrypted.';
diff --git a/packages/manager/src/factories/linodes.ts b/packages/manager/src/factories/linodes.ts
index 63f5b0e8ad0..735dac98182 100644
--- a/packages/manager/src/factories/linodes.ts
+++ b/packages/manager/src/factories/linodes.ts
@@ -263,6 +263,7 @@ export const linodeFactory = Factory.Sync.makeFactory({
ipv4: ['50.116.6.212', '192.168.203.1'],
ipv6: '2600:3c00::f03c:92ff:fee2:6c40/64',
label: Factory.each((i) => `linode-${i}`),
+ lke_cluster_id: null,
placement_group: placementGroupFactory.build({
affinity_type: 'anti_affinity:local',
id: 1,
diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx
index be95c8ab1df..3ba84624448 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx
@@ -214,8 +214,10 @@ export const EncryptedStatus = ({
) : encryptionStatus === 'disabled' ? (
<>
-
- Not Encrypted
+
+
+ Not Encrypted
+
{tooltipText ? : null}
) : null;
diff --git a/packages/manager/src/features/Linodes/LinodeEntityDetail.test.tsx b/packages/manager/src/features/Linodes/LinodeEntityDetail.test.tsx
index 54c368bab8d..981cca15e03 100644
--- a/packages/manager/src/features/Linodes/LinodeEntityDetail.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodeEntityDetail.test.tsx
@@ -13,6 +13,7 @@ import { HttpResponse, http, server } from 'src/mocks/testServer';
import { queryClientFactory } from 'src/queries/base';
import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers';
+import { encryptionStatusTestId } from '../Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable';
import { LinodeEntityDetail } from './LinodeEntityDetail';
import { getSubnetsString } from './LinodeEntityDetailBody';
import { LinodeHandlers } from './LinodesLanding/LinodesLanding';
@@ -34,6 +35,29 @@ describe('Linode Entity Detail', () => {
const vpcSectionTestId = 'vpc-section-title';
const assignedVPCLabelTestId = 'assigned-vpc-label';
+ const mocks = vi.hoisted(() => {
+ return {
+ useIsDiskEncryptionFeatureEnabled: vi.fn(),
+ };
+ });
+
+ vi.mock('src/components/DiskEncryption/utils.ts', async () => {
+ const actual = await vi.importActual(
+ 'src/components/DiskEncryption/utils.ts'
+ );
+ return {
+ ...actual,
+ __esModule: true,
+ useIsDiskEncryptionFeatureEnabled: mocks.useIsDiskEncryptionFeatureEnabled.mockImplementation(
+ () => {
+ return {
+ isDiskEncryptionFeatureEnabled: false, // indicates the feature flag is off or account capability is absent
+ };
+ }
+ ),
+ };
+ });
+
it('should not display the VPC section if the linode is not assigned to a VPC', async () => {
const account = accountFactory.build({
capabilities: [...accountCapabilitiesWithoutVPC, 'VPCs'],
@@ -104,6 +128,41 @@ describe('Linode Entity Detail', () => {
expect(getByTestId(assignedVPCLabelTestId).innerHTML).toEqual('test-vpc');
});
});
+
+ it('should not display the encryption status of the linode if the account lacks the capability or the feature flag is off', () => {
+ // situation where isDiskEncryptionFeatureEnabled === false
+ const { queryByTestId } = renderWithTheme(
+
+ );
+ const encryptionStatusFragment = queryByTestId(encryptionStatusTestId);
+
+ expect(encryptionStatusFragment).not.toBeInTheDocument();
+ });
+
+ it('should display the encryption status of the linode when Disk Encryption is enabled and the user has the account capability', () => {
+ mocks.useIsDiskEncryptionFeatureEnabled.mockImplementationOnce(() => {
+ return {
+ isDiskEncryptionFeatureEnabled: true,
+ };
+ });
+
+ const { queryByTestId } = renderWithTheme(
+
+ );
+ const encryptionStatusFragment = queryByTestId(encryptionStatusTestId);
+
+ expect(encryptionStatusFragment).toBeInTheDocument();
+ });
});
describe('getSubnetsString function', () => {
diff --git a/packages/manager/src/features/Linodes/LinodeEntityDetail.tsx b/packages/manager/src/features/Linodes/LinodeEntityDetail.tsx
index ffcaf1e4a7b..bdef9ccca51 100644
--- a/packages/manager/src/features/Linodes/LinodeEntityDetail.tsx
+++ b/packages/manager/src/features/Linodes/LinodeEntityDetail.tsx
@@ -111,10 +111,12 @@ export const LinodeEntityDetail = (props: Props) => {
body={
{
const {
configInterfaceWithVPC,
+ encryptionStatus,
gbRAM,
gbStorage,
ipv4,
ipv6,
+ isLKELinode,
isVPCOnlyLinode,
linodeId,
linodeIsInDistributedRegion,
@@ -77,6 +93,14 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => {
const theme = useTheme();
+ const {
+ isDiskEncryptionFeatureEnabled,
+ } = useIsDiskEncryptionFeatureEnabled();
+
+ // @ TODO LDE: Remove usages of this variable once LDE is fully rolled out (being used to determine formatting adjustments currently)
+ const isDisplayingEncryptedStatus =
+ isDiskEncryptionFeatureEnabled && Boolean(encryptionStatus);
+
// Filter and retrieve subnets associated with a specific Linode ID
const linodeAssociatedSubnets = vpcLinodeIsAssignedTo?.subnets.filter(
(subnet) => subnet.linodes.some((linode) => linode.id === linodeId)
@@ -97,11 +121,14 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => {
-
+
Summary
@@ -121,9 +148,28 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => {
{pluralize('Volume', 'Volumes', numVolumes)}
+ {isDiskEncryptionFeatureEnabled && encryptionStatus && (
+
+
+
+
+
+ )}
-
+
{
ipv6={linode.ipv6 || ''}
key={`linode-row-${1}`}
label={linode.label}
+ lke_cluster_id={linode.lke_cluster_id}
placement_group={linode.placement_group}
region={linode.region}
specs={linode.specs}
diff --git a/packages/manager/src/features/Linodes/LinodesLanding/ListView.tsx b/packages/manager/src/features/Linodes/LinodesLanding/ListView.tsx
index ac316735313..d8b35d2adf8 100644
--- a/packages/manager/src/features/Linodes/LinodesLanding/ListView.tsx
+++ b/packages/manager/src/features/Linodes/LinodesLanding/ListView.tsx
@@ -46,6 +46,8 @@ export const ListView = (props: RenderLinodesProps) => {
ipv6={linode.ipv6 || ''}
key={`linode-row-${idx}`}
label={linode.label}
+ lke_cluster_id={linode.lke_cluster_id}
+ maintenance={linode.maintenance}
placement_group={linode.placement_group}
region={linode.region}
specs={linode.specs}
@@ -54,7 +56,6 @@ export const ListView = (props: RenderLinodesProps) => {
type={linode.type}
updated={linode.updated}
watchdog_enabled={linode.watchdog_enabled}
- maintenance={linode.maintenance}
/>
))}
From 684c38cf9baca6297676923710f5d51fca04ea52 Mon Sep 17 00:00:00 2001
From: jdamore-linode <97627410+jdamore-linode@users.noreply.github.com>
Date: Wed, 5 Jun 2024 08:16:02 -0400
Subject: [PATCH 053/163] test: [M3-8108, M3-8113] - Improve security of
Linodes created by tests (#10538)
* Use `createTestLinode` to create Linodes, remove deprecated util
* Improve security of test Linode creation
* Add utils to find or create Firewall for test Linodes
* Fix failing tests by specifying a security method that is compatible with the test flow
* Temporarily skip Longview test
* Add changeset
---
.../pr-10538-tests-1717187190983.md | 5 +
.../e2e/core/account/service-transfer.spec.ts | 13 +-
.../core/firewalls/create-firewall.spec.ts | 14 +-
.../migrate-linode-with-firewall.spec.ts | 10 +-
.../e2e/core/linodes/backup-linode.spec.ts | 6 +-
.../e2e/core/linodes/clone-linode.spec.ts | 6 +-
.../e2e/core/linodes/linode-config.spec.ts | 9 +-
.../e2e/core/linodes/linode-storage.spec.ts | 12 +-
.../e2e/core/linodes/rebuild-linode.spec.ts | 9 +-
.../e2e/core/linodes/rescue-linode.spec.ts | 4 +-
.../e2e/core/linodes/resize-linode.spec.ts | 164 +++++++++---------
.../core/linodes/smoke-delete-linode.spec.ts | 12 +-
.../core/linodes/switch-linode-state.spec.ts | 32 +++-
.../core/linodes/update-linode-labels.spec.ts | 11 +-
.../e2e/core/longview/longview.spec.ts | 8 +-
.../smoke-create-nodebal.spec.ts | 63 ++++---
.../stackscripts/create-stackscripts.spec.ts | 7 +-
.../smoke-community-stackscrips.spec.ts | 2 +-
.../e2e/core/volumes/attach-volume.spec.ts | 7 +-
.../e2e/core/volumes/create-volume.spec.ts | 98 ++++++-----
.../create-machine-image-from-linode.spec.ts | 35 +---
.../e2e/region/linodes/delete-linode.spec.ts | 5 +-
.../e2e/region/linodes/update-linode.spec.ts | 9 +-
.../manager/cypress/support/api/firewalls.ts | 64 ++++++-
.../manager/cypress/support/api/linodes.ts | 49 +-----
.../cypress/support/constants/cypress.ts | 2 +-
.../manager/cypress/support/util/linodes.ts | 90 +++++++---
27 files changed, 427 insertions(+), 319 deletions(-)
create mode 100644 packages/manager/.changeset/pr-10538-tests-1717187190983.md
diff --git a/packages/manager/.changeset/pr-10538-tests-1717187190983.md b/packages/manager/.changeset/pr-10538-tests-1717187190983.md
new file mode 100644
index 00000000000..13ed2f1b676
--- /dev/null
+++ b/packages/manager/.changeset/pr-10538-tests-1717187190983.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tests
+---
+
+Improve test Linode security ([#10538](https://github.com/linode/manager/pull/10538))
diff --git a/packages/manager/cypress/e2e/core/account/service-transfer.spec.ts b/packages/manager/cypress/e2e/core/account/service-transfer.spec.ts
index 7a71dfe0fb9..9268d097c88 100644
--- a/packages/manager/cypress/e2e/core/account/service-transfer.spec.ts
+++ b/packages/manager/cypress/e2e/core/account/service-transfer.spec.ts
@@ -2,7 +2,6 @@
* @file Tests for service transfer functionality between accounts.
*/
-import { createLinode } from '@linode/api-v4/lib/linodes';
import { getProfile } from '@linode/api-v4/lib/profile';
import { EntityTransfer, Linode, Profile } from '@linode/api-v4';
import { entityTransferFactory } from 'src/factories/entityTransfers';
@@ -19,6 +18,7 @@ import {
} from 'support/intercepts/account';
import { mockGetLinodes } from 'support/intercepts/linodes';
import { ui } from 'support/ui';
+import { createTestLinode } from 'support/util/linodes';
import { pollLinodeStatus } from 'support/util/polling';
import { randomLabel, randomUuid } from 'support/util/random';
import { visitUrlWithManagedEnabled } from 'support/api/managed';
@@ -244,15 +244,18 @@ describe('Account service transfers', () => {
* - Confirms that users can cancel a service transfer
*/
it('can initiate and cancel a service transfer', () => {
- // Create a Linode to transfer and wait for it to boot.
+ // Create a Linode to transfer.
const setupLinode = async (): Promise => {
const payload = createLinodeRequestFactory.build({
label: randomLabel(),
region: chooseRegion().id,
});
- const linode: Linode = await createLinode(payload);
- await pollLinodeStatus(linode.id, 'running', {
+ const linode: Linode = await createTestLinode(payload, {
+ securityMethod: 'powered_off',
+ });
+
+ await pollLinodeStatus(linode.id, 'offline', {
initialDelay: 15000,
});
@@ -320,7 +323,7 @@ describe('Account service transfers', () => {
cy.get('[data-qa-close-drawer]').should('be.visible').click();
});
- // Attempt to receive the an invalid token.
+ // Attempt to receive an invalid token.
redeemToken(randomUuid());
assertReceiptError('Not found');
diff --git a/packages/manager/cypress/e2e/core/firewalls/create-firewall.spec.ts b/packages/manager/cypress/e2e/core/firewalls/create-firewall.spec.ts
index 43a92c8c3ca..298417a1a72 100644
--- a/packages/manager/cypress/e2e/core/firewalls/create-firewall.spec.ts
+++ b/packages/manager/cypress/e2e/core/firewalls/create-firewall.spec.ts
@@ -1,7 +1,6 @@
-import { createLinode } from '@linode/api-v4/lib/linodes';
+import { createTestLinode } from 'support/util/linodes';
import { createLinodeRequestFactory } from 'src/factories/linodes';
import { authenticate } from 'support/api/authentication';
-import { containsClick, getClick } from 'support/helpers';
import { interceptCreateFirewall } from 'support/intercepts/firewalls';
import { randomString, randomLabel } from 'support/util/random';
import { ui } from 'support/ui';
@@ -33,10 +32,10 @@ describe('create firewall', () => {
.should('be.visible')
.within(() => {
// An error message appears when attempting to create a Firewall without a label
- getClick('[data-testid="submit"]');
+ cy.get('[data-testid="submit"]').click();
cy.findByText('Label is required.');
// Fill out and submit firewall create form.
- containsClick('Label').type(firewall.label);
+ cy.contains('Label').click().type(firewall.label);
ui.buttonGroup
.findButtonByTitle('Create Firewall')
.should('be.visible')
@@ -75,7 +74,10 @@ describe('create firewall', () => {
label: randomLabel(),
};
- cy.defer(createLinode(linodeRequest), 'creating Linode').then((linode) => {
+ cy.defer(
+ createTestLinode(linodeRequest, { securityMethod: 'powered_off' }),
+ 'creating Linode'
+ ).then((linode) => {
interceptCreateFirewall().as('createFirewall');
cy.visitWithLogin('/firewalls/create');
@@ -84,7 +86,7 @@ describe('create firewall', () => {
.should('be.visible')
.within(() => {
// Fill out and submit firewall create form.
- containsClick('Label').type(firewall.label);
+ cy.contains('Label').click().type(firewall.label);
cy.findByLabelText('Linodes')
.should('be.visible')
.click()
diff --git a/packages/manager/cypress/e2e/core/firewalls/migrate-linode-with-firewall.spec.ts b/packages/manager/cypress/e2e/core/firewalls/migrate-linode-with-firewall.spec.ts
index 8763f5bd8fe..2ff4bd31f67 100644
--- a/packages/manager/cypress/e2e/core/firewalls/migrate-linode-with-firewall.spec.ts
+++ b/packages/manager/cypress/e2e/core/firewalls/migrate-linode-with-firewall.spec.ts
@@ -6,7 +6,6 @@ import {
regionFactory,
} from '@src/factories';
import { authenticate } from 'support/api/authentication';
-import { createLinode } from '@linode/api-v4';
import {
interceptCreateFirewall,
interceptGetFirewalls,
@@ -23,6 +22,7 @@ import { cleanUp } from 'support/util/cleanup';
import { randomLabel, randomNumber } from 'support/util/random';
import type { Linode, Region } from '@linode/api-v4';
import { chooseRegions } from 'support/util/regions';
+import { createTestLinode } from 'support/util/linodes';
const mockRegions: Region[] = [
regionFactory.build({
@@ -66,7 +66,7 @@ const migrationNoticeSubstrings = [
authenticate();
describe('Migrate Linode With Firewall', () => {
before(() => {
- cleanUp('firewalls');
+ cleanUp(['firewalls', 'linodes']);
});
/*
@@ -144,7 +144,9 @@ describe('Migrate Linode With Firewall', () => {
interceptGetFirewalls().as('getFirewalls');
// Create a Linode, then navigate to the Firewalls landing page.
- cy.defer(createLinode(linodePayload)).then((linode: Linode) => {
+ cy.defer(
+ createTestLinode(linodePayload, { securityMethod: 'powered_off' })
+ ).then((linode: Linode) => {
interceptMigrateLinode(linode.id).as('migrateLinode');
cy.visitWithLogin('/firewalls');
cy.wait('@getFirewalls');
@@ -194,7 +196,7 @@ describe('Migrate Linode With Firewall', () => {
// Make sure Linode is running before attempting to migrate.
cy.get('[data-qa-linode-status]').within(() => {
- cy.findByText('RUNNING');
+ cy.findByText('OFFLINE');
});
ui.actionMenu
diff --git a/packages/manager/cypress/e2e/core/linodes/backup-linode.spec.ts b/packages/manager/cypress/e2e/core/linodes/backup-linode.spec.ts
index 01694c1fa4a..4fd976daa48 100644
--- a/packages/manager/cypress/e2e/core/linodes/backup-linode.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/backup-linode.spec.ts
@@ -1,6 +1,5 @@
/* eslint-disable sonarjs/no-duplicate-string */
import type { Linode } from '@linode/api-v4';
-import { createLinode } from '@linode/api-v4';
import {
linodeFactory,
linodeBackupsFactory,
@@ -27,6 +26,7 @@ import { randomLabel } from 'support/util/random';
import { dcPricingMockLinodeTypesForBackups } from 'support/constants/dc-specific-pricing';
import { chooseRegion } from 'support/util/regions';
import { expectManagedDisabled } from 'support/api/managed';
+import { createTestLinode } from 'support/util/linodes';
authenticate();
describe('linode backups', () => {
@@ -53,7 +53,7 @@ describe('linode backups', () => {
booted: false,
});
- cy.defer(createLinode(createLinodeRequest), 'creating Linode').then(
+ cy.defer(createTestLinode(createLinodeRequest), 'creating Linode').then(
(linode: Linode) => {
interceptGetLinode(linode.id).as('getLinode');
interceptEnableLinodeBackups(linode.id).as('enableBackups');
@@ -116,7 +116,7 @@ describe('linode backups', () => {
const snapshotName = randomLabel();
- cy.defer(createLinode(createLinodeRequest), 'creating Linode').then(
+ cy.defer(createTestLinode(createLinodeRequest), 'creating Linode').then(
(linode: Linode) => {
interceptGetLinode(linode.id).as('getLinode');
interceptCreateLinodeSnapshot(linode.id).as('createSnapshot');
diff --git a/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts b/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts
index 3e4901afb86..afc1c505ac4 100644
--- a/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/clone-linode.spec.ts
@@ -1,4 +1,3 @@
-import { Linode, createLinode } from '@linode/api-v4';
import { linodeFactory, createLinodeRequestFactory } from '@src/factories';
import {
interceptCloneLinode,
@@ -18,6 +17,8 @@ import { chooseRegion, getRegionById } from 'support/util/regions';
import { randomLabel } from 'support/util/random';
import { authenticate } from 'support/api/authentication';
import { cleanUp } from 'support/util/cleanup';
+import { createTestLinode } from 'support/util/linodes';
+import type { Linode } from '@linode/api-v4';
/**
* Returns the Cloud Manager URL to clone a given Linode.
@@ -49,12 +50,13 @@ describe('clone linode', () => {
region: linodeRegion.id,
// Specifying no image allows the Linode to provision and clone faster.
image: undefined,
+ booted: false,
type: 'g6-nanode-1',
});
const newLinodeLabel = `${linodePayload.label}-clone`;
- cy.defer(createLinode(linodePayload)).then((linode: Linode) => {
+ cy.defer(createTestLinode(linodePayload)).then((linode: Linode) => {
const linodeRegion = getRegionById(linodePayload.region!);
interceptCloneLinode(linode.id).as('cloneLinode');
diff --git a/packages/manager/cypress/e2e/core/linodes/linode-config.spec.ts b/packages/manager/cypress/e2e/core/linodes/linode-config.spec.ts
index 51b32e4ca54..81ec20da2d5 100644
--- a/packages/manager/cypress/e2e/core/linodes/linode-config.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/linode-config.spec.ts
@@ -234,7 +234,10 @@ describe('Linode Config management', () => {
*/
it('Boots a config', () => {
cy.defer(
- createLinodeAndGetConfig(null, { waitForBoot: true }),
+ createLinodeAndGetConfig(
+ { booted: true },
+ { waitForBoot: true, securityMethod: 'vlan_no_internet' }
+ ),
'Creating and booting test Linode'
).then(([linode, config]: [Linode, Config]) => {
const kernel = findKernelById(kernels, config.kernel);
@@ -281,8 +284,8 @@ describe('Linode Config management', () => {
// Create clone source and destination Linodes.
const createCloneTestLinodes = async () => {
return Promise.all([
- createTestLinode(null, { waitForBoot: true }),
- createTestLinode(),
+ createTestLinode({ booted: true }, { waitForBoot: true }),
+ createTestLinode({ booted: true }),
]);
};
diff --git a/packages/manager/cypress/e2e/core/linodes/linode-storage.spec.ts b/packages/manager/cypress/e2e/core/linodes/linode-storage.spec.ts
index 41c59858748..de3d7603a40 100644
--- a/packages/manager/cypress/e2e/core/linodes/linode-storage.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/linode-storage.spec.ts
@@ -1,7 +1,7 @@
/* eslint-disable sonarjs/no-duplicate-string */
import { Linode } from '@linode/api-v4';
import { authenticate } from 'support/api/authentication';
-import { createLinode } from 'support/api/linodes';
+import { createTestLinode } from 'support/util/linodes';
import { containsVisible, fbtClick, fbtVisible } from 'support/helpers';
import { ui } from 'support/ui';
import { cleanUp } from 'support/util/cleanup';
@@ -103,8 +103,8 @@ describe('linode storage tab', () => {
});
it('try to delete in use disk', () => {
- const diskName = 'Debian 10 Disk';
- createLinode().then((linode) => {
+ const diskName = 'Debian 11 Disk';
+ cy.defer(createTestLinode({ booted: true })).then((linode) => {
cy.intercept(
'DELETE',
apiMatcher(`linode/instances/${linode.id}/disks/*`)
@@ -127,7 +127,7 @@ describe('linode storage tab', () => {
it('delete disk', () => {
const diskName = 'cy-test-disk';
- createLinode({ image: null }).then((linode: Linode) => {
+ cy.defer(createTestLinode({ image: null })).then((linode) => {
cy.intercept(
'DELETE',
apiMatcher(`linode/instances/${linode.id}/disks/*`)
@@ -157,7 +157,7 @@ describe('linode storage tab', () => {
it('add a disk', () => {
const diskName = 'cy-test-disk';
- createLinode({ image: null }).then((linode: Linode) => {
+ cy.defer(createTestLinode({ image: null })).then((linode: Linode) => {
cy.intercept(
'POST',
apiMatcher(`/linode/instances/${linode.id}/disks`)
@@ -171,7 +171,7 @@ describe('linode storage tab', () => {
it('resize disk', () => {
const diskName = 'Debian 10 Disk';
- createLinode({ image: null }).then((linode: Linode) => {
+ cy.defer(createTestLinode({ image: null })).then((linode: Linode) => {
cy.intercept(
'POST',
apiMatcher(`linode/instances/${linode.id}/disks`)
diff --git a/packages/manager/cypress/e2e/core/linodes/rebuild-linode.spec.ts b/packages/manager/cypress/e2e/core/linodes/rebuild-linode.spec.ts
index 55b5e951243..0e6f00e2ffa 100644
--- a/packages/manager/cypress/e2e/core/linodes/rebuild-linode.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/rebuild-linode.spec.ts
@@ -1,4 +1,4 @@
-import { createLinode, CreateLinodeRequest, Linode } from '@linode/api-v4';
+import { CreateLinodeRequest, Linode } from '@linode/api-v4';
import { ui } from 'support/ui';
import { randomString, randomLabel } from 'support/util/random';
import { authenticate } from 'support/api/authentication';
@@ -12,6 +12,7 @@ import {
mockGetLinodeDetails,
mockRebuildLinodeError,
} from 'support/intercepts/linodes';
+import { createTestLinode } from 'support/util/linodes';
/**
* Creates a Linode and StackScript.
@@ -27,7 +28,7 @@ const createStackScriptAndLinode = async (
) => {
return Promise.all([
createStackScript(stackScriptRequestPayload),
- createLinode(linodeRequestPayload),
+ createTestLinode(linodeRequestPayload),
]);
};
@@ -117,7 +118,7 @@ describe('rebuild linode', () => {
region: chooseRegion().id,
});
- cy.defer(createLinode(linodeCreatePayload), 'creating Linode').then(
+ cy.defer(createTestLinode(linodeCreatePayload), 'creating Linode').then(
(linode: Linode) => {
interceptRebuildLinode(linode.id).as('linodeRebuild');
@@ -171,7 +172,7 @@ describe('rebuild linode', () => {
region: chooseRegion().id,
});
- cy.defer(createLinode(linodeCreatePayload), 'creating Linode').then(
+ cy.defer(createTestLinode(linodeCreatePayload), 'creating Linode').then(
(linode: Linode) => {
interceptRebuildLinode(linode.id).as('linodeRebuild');
interceptGetStackScripts().as('getStackScripts');
diff --git a/packages/manager/cypress/e2e/core/linodes/rescue-linode.spec.ts b/packages/manager/cypress/e2e/core/linodes/rescue-linode.spec.ts
index 2d62584aa8e..658de76da84 100644
--- a/packages/manager/cypress/e2e/core/linodes/rescue-linode.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/rescue-linode.spec.ts
@@ -1,5 +1,4 @@
import type { Linode } from '@linode/api-v4';
-import { createLinode } from '@linode/api-v4';
import { createLinodeRequestFactory, linodeFactory } from '@src/factories';
import { authenticate } from 'support/api/authentication';
import {
@@ -12,6 +11,7 @@ import {
} from 'support/intercepts/linodes';
import { ui } from 'support/ui';
import { cleanUp } from 'support/util/cleanup';
+import { createTestLinode } from 'support/util/linodes';
import { randomLabel } from 'support/util/random';
import { chooseRegion } from 'support/util/regions';
@@ -43,7 +43,7 @@ describe('Rescue Linodes', () => {
region: chooseRegion().id,
});
- cy.defer(createLinode(linodePayload), 'creating Linode').then(
+ cy.defer(createTestLinode(linodePayload), 'creating Linode').then(
(linode: Linode) => {
interceptGetLinodeDetails(linode.id).as('getLinode');
interceptRebootLinodeIntoRescueMode(linode.id).as(
diff --git a/packages/manager/cypress/e2e/core/linodes/resize-linode.spec.ts b/packages/manager/cypress/e2e/core/linodes/resize-linode.spec.ts
index d55affe595c..69e0f3980b0 100644
--- a/packages/manager/cypress/e2e/core/linodes/resize-linode.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/resize-linode.spec.ts
@@ -1,4 +1,4 @@
-import { createLinode } from 'support/api/linodes';
+import { createTestLinode } from 'support/util/linodes';
import { containsVisible, fbtVisible, getClick } from 'support/helpers';
import { ui } from 'support/ui';
import { cleanUp } from 'support/util/cleanup';
@@ -15,7 +15,7 @@ describe('resize linode', () => {
it('resizes a linode by increasing size: warm migration', () => {
mockGetFeatureFlagClientstream().as('getClientStream');
- createLinode().then((linode) => {
+ cy.defer(createTestLinode({ booted: true })).then((linode) => {
interceptLinodeResize(linode.id).as('linodeResize');
cy.visitWithLogin(`/linodes/${linode.id}?resize=true`);
cy.findByText('Shared CPU').click({ scrollBehavior: false });
@@ -35,7 +35,7 @@ describe('resize linode', () => {
it('resizes a linode by increasing size: cold migration', () => {
mockGetFeatureFlagClientstream().as('getClientStream');
- createLinode().then((linode) => {
+ cy.defer(createTestLinode({ booted: true })).then((linode) => {
interceptLinodeResize(linode.id).as('linodeResize');
cy.visitWithLogin(`/linodes/${linode.id}?resize=true`);
cy.findByText('Shared CPU').click({ scrollBehavior: false });
@@ -56,7 +56,7 @@ describe('resize linode', () => {
it('resizes a linode by increasing size when offline: cold migration', () => {
mockGetFeatureFlagClientstream().as('getClientStream');
- createLinode().then((linode) => {
+ cy.defer(createTestLinode({ booted: true })).then((linode) => {
cy.visitWithLogin(`/linodes/${linode.id}`);
// Turn off the linode to resize the disk
@@ -97,83 +97,87 @@ describe('resize linode', () => {
});
});
- it('resizes a linode by decreasing size', () => {
- createLinode().then((linode) => {
- const diskName = 'Debian 10 Disk';
- const size = '50000'; // 50 GB
-
- // Error flow when attempting to resize a linode to a smaller size without
- // resizing the disk to the requested size first.
- interceptLinodeResize(linode.id).as('linodeResize');
- cy.visitWithLogin(`/linodes/${linode.id}?resize=true`);
- cy.findByText('Shared CPU').click({ scrollBehavior: false });
- containsVisible('Linode 2 GB');
- getClick('[id="g6-standard-1"]');
- cy.get('[data-testid="textfield-input"]').type(linode.label);
- cy.get('[data-qa-resize="true"]').should('be.enabled').click();
- cy.wait('@linodeResize');
- // Failed to reduce the size of the linode
- cy.contains(
- 'The current disk size of your Linode is too large for the new service plan. Please resize your disk to accommodate the new plan. You can read our Resize Your Linode guide for more detailed instructions.'
- )
- .scrollIntoView()
- .should('be.visible');
-
- // Normal flow when resizing a linode to a smaller size after first resizing
- // its disk.
- cy.visitWithLogin(`/linodes/${linode.id}`);
-
- // Turn off the linode to resize the disk
- ui.button.findByTitle('Power Off').should('be.visible').click();
-
- ui.dialog
- .findByTitle(`Power Off Linode ${linode.label}?`)
- .should('be.visible')
- .then(() => {
- ui.button
- .findByTitle(`Power Off Linode`)
- .should('be.visible')
- .click();
+ it.only('resizes a linode by decreasing size', () => {
+ cy.defer(createTestLinode({ booted: true, type: 'g6-standard-2' })).then(
+ (linode) => {
+ const diskName = 'Debian 11 Disk';
+ const size = '50000'; // 50 GB
+
+ // Error flow when attempting to resize a linode to a smaller size without
+ // resizing the disk to the requested size first.
+ interceptLinodeResize(linode.id).as('linodeResize');
+ cy.visitWithLogin(`/linodes/${linode.id}?resize=true`);
+ cy.findByText('Shared CPU').click({ scrollBehavior: false });
+ containsVisible('Linode 2 GB');
+ getClick('[id="g6-standard-1"]');
+ cy.get('[data-testid="textfield-input"]').type(linode.label);
+ cy.get('[data-qa-resize="true"]').should('be.enabled').click();
+ cy.wait('@linodeResize');
+ // Failed to reduce the size of the linode
+ cy.contains(
+ 'The current disk size of your Linode is too large for the new service plan. Please resize your disk to accommodate the new plan. You can read our Resize Your Linode guide for more detailed instructions.'
+ )
+ .scrollIntoView()
+ .should('be.visible');
+
+ // Normal flow when resizing a linode to a smaller size after first resizing
+ // its disk.
+ cy.visitWithLogin(`/linodes/${linode.id}`);
+
+ // Turn off the linode to resize the disk
+ ui.button.findByTitle('Power Off').should('be.visible').click();
+
+ ui.dialog
+ .findByTitle(`Power Off Linode ${linode.label}?`)
+ .should('be.visible')
+ .then(() => {
+ ui.button
+ .findByTitle(`Power Off Linode`)
+ .should('be.visible')
+ .click();
+ });
+
+ containsVisible('OFFLINE');
+
+ cy.visitWithLogin(`linodes/${linode.id}/storage`);
+ fbtVisible(diskName);
+
+ cy.get(`[data-qa-disk="${diskName}"]`).within(() => {
+ cy.contains('Resize').should('be.enabled').click();
});
- containsVisible('OFFLINE');
-
- cy.visitWithLogin(`linodes/${linode.id}/storage`);
- fbtVisible(diskName);
-
- cy.get(`[data-qa-disk="${diskName}"]`).within(() => {
- cy.contains('Resize').should('be.enabled').click();
- });
-
- ui.drawer.findByTitle(`Resize Debian 10 Disk`);
-
- ui.drawer
- .findByTitle(`Resize ${diskName}`)
- .should('be.visible')
- .within(() => {
- cy.get('[id="size"]').should('be.visible').click().clear().type(size);
-
- ui.buttonGroup
- .findButtonByTitle('Resize')
- .should('be.visible')
- .should('be.enabled')
- .click();
- });
-
- // Wait until the disk resize is done.
- ui.toast.assertMessage(`Disk ${diskName} successfully resized.`);
-
- interceptLinodeResize(linode.id).as('linodeResize');
- cy.visitWithLogin(`/linodes/${linode.id}?resize=true`);
- cy.findByText('Shared CPU').click({ scrollBehavior: false });
- containsVisible('Linode 2 GB');
- getClick('[id="g6-standard-1"]');
- cy.get('[data-testid="textfield-input"]').type(linode.label);
- cy.get('[data-qa-resize="true"]').should('be.enabled').click();
- cy.wait('@linodeResize');
- cy.contains(
- 'Your Linode will soon be automatically powered off, migrated, and restored to its previous state (booted or powered off).'
- ).should('be.visible');
- });
+ ui.drawer
+ .findByTitle(`Resize ${diskName}`)
+ .should('be.visible')
+ .within(() => {
+ cy.get('[id="size"]')
+ .should('be.visible')
+ .click()
+ .clear()
+ .type(size);
+
+ ui.buttonGroup
+ .findButtonByTitle('Resize')
+ .should('be.visible')
+ .should('be.enabled')
+ .click();
+ });
+
+ // Wait until the disk resize is done.
+ ui.toast.assertMessage(`Disk ${diskName} successfully resized.`);
+
+ interceptLinodeResize(linode.id).as('linodeResize');
+ cy.visitWithLogin(`/linodes/${linode.id}?resize=true`);
+ cy.findByText('Shared CPU').click({ scrollBehavior: false });
+ containsVisible('Linode 2 GB');
+ getClick('[id="g6-standard-1"]');
+ cy.get('[data-testid="textfield-input"]').type(linode.label);
+ cy.get('[data-qa-resize="true"]').should('be.enabled').click();
+ cy.wait('@linodeResize');
+ cy.contains(
+ 'Your Linode will soon be automatically powered off, migrated, and restored to its previous state (booted or powered off).'
+ ).should('be.visible');
+ }
+ );
});
});
diff --git a/packages/manager/cypress/e2e/core/linodes/smoke-delete-linode.spec.ts b/packages/manager/cypress/e2e/core/linodes/smoke-delete-linode.spec.ts
index 403ff604712..cac96713e76 100644
--- a/packages/manager/cypress/e2e/core/linodes/smoke-delete-linode.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/smoke-delete-linode.spec.ts
@@ -1,5 +1,5 @@
import { authenticate } from 'support/api/authentication';
-import { createLinode } from '@linode/api-v4/lib/linodes';
+import { createTestLinode } from 'support/util/linodes';
import { createLinodeRequestFactory } from '@src/factories/linodes';
import { ui } from 'support/ui';
import { cleanUp } from 'support/util/cleanup';
@@ -73,7 +73,7 @@ describe('delete linode', () => {
const linodeCreatePayload = createLinodeRequestFactory.build({
label: randomLabel(),
});
- cy.defer(createLinode(linodeCreatePayload)).then((linode) => {
+ cy.defer(createTestLinode(linodeCreatePayload)).then((linode) => {
// catch delete request
interceptDeleteLinode(linode.id).as('deleteLinode');
cy.visitWithLogin(`/linodes/${linode.id}`);
@@ -120,7 +120,7 @@ describe('delete linode', () => {
const linodeCreatePayload = createLinodeRequestFactory.build({
label: randomLabel(),
});
- cy.defer(createLinode(linodeCreatePayload)).then((linode) => {
+ cy.defer(createTestLinode(linodeCreatePayload)).then((linode) => {
// catch delete request
interceptDeleteLinode(linode.id).as('deleteLinode');
cy.visitWithLogin(`/linodes/${linode.id}`);
@@ -171,7 +171,7 @@ describe('delete linode', () => {
const linodeCreatePayload = createLinodeRequestFactory.build({
label: randomLabel(),
});
- cy.defer(createLinode(linodeCreatePayload)).then((linode) => {
+ cy.defer(createTestLinode(linodeCreatePayload)).then((linode) => {
// catch delete request
interceptDeleteLinode(linode.id).as('deleteLinode');
cy.visitWithLogin(`/linodes`);
@@ -219,10 +219,10 @@ describe('delete linode', () => {
const createTwoLinodes = async (): Promise<[Linode, Linode]> => {
return Promise.all([
- createLinode(
+ createTestLinode(
createLinodeRequestFactory.build({ label: randomLabel() })
),
- createLinode(
+ createTestLinode(
createLinodeRequestFactory.build({ label: randomLabel() })
),
]);
diff --git a/packages/manager/cypress/e2e/core/linodes/switch-linode-state.spec.ts b/packages/manager/cypress/e2e/core/linodes/switch-linode-state.spec.ts
index 848aeb2fc87..ec8cbeab797 100644
--- a/packages/manager/cypress/e2e/core/linodes/switch-linode-state.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/switch-linode-state.spec.ts
@@ -17,7 +17,13 @@ describe('switch linode state', () => {
* - Does not wait for Linode to finish being shut down before succeeding.
*/
it('powers off a linode from landing page', () => {
- cy.defer(createTestLinode()).then((linode: Linode) => {
+ // Use `vlan_no_internet` security method.
+ // This works around an issue where the Linode API responds with a 400
+ // when attempting to reboot shortly after booting up when the Linode is
+ // attached to a Cloud Firewall.
+ cy.defer(
+ createTestLinode({ booted: true }, { securityMethod: 'vlan_no_internet' })
+ ).then((linode: Linode) => {
cy.visitWithLogin('/linodes');
cy.get(`[data-qa-linode="${linode.label}"]`)
.should('be.visible')
@@ -58,7 +64,13 @@ describe('switch linode state', () => {
* - Waits for Linode to fully shut down before succeeding.
*/
it('powers off a linode from details page', () => {
- cy.defer(createTestLinode()).then((linode: Linode) => {
+ // Use `vlan_no_internet` security method.
+ // This works around an issue where the Linode API responds with a 400
+ // when attempting to reboot shortly after booting up when the Linode is
+ // attached to a Cloud Firewall.
+ cy.defer(
+ createTestLinode({ booted: true }, { securityMethod: 'vlan_no_internet' })
+ ).then((linode: Linode) => {
cy.visitWithLogin(`/linodes/${linode.id}`);
cy.contains('RUNNING').should('be.visible');
cy.findByText(linode.label).should('be.visible');
@@ -156,7 +168,13 @@ describe('switch linode state', () => {
* - Does not wait for Linode to finish rebooting before succeeding.
*/
it('reboots a linode from landing page', () => {
- cy.defer(createTestLinode()).then((linode: Linode) => {
+ // Use `vlan_no_internet` security method.
+ // This works around an issue where the Linode API responds with a 400
+ // when attempting to reboot shortly after booting up when the Linode is
+ // attached to a Cloud Firewall.
+ cy.defer(
+ createTestLinode({ booted: true }, { securityMethod: 'vlan_no_internet' })
+ ).then((linode: Linode) => {
cy.visitWithLogin('/linodes');
cy.get(`[data-qa-linode="${linode.label}"]`)
.should('be.visible')
@@ -197,7 +215,13 @@ describe('switch linode state', () => {
* - Waits for Linode to finish rebooting before succeeding.
*/
it('reboots a linode from details page', () => {
- cy.defer(createTestLinode()).then((linode: Linode) => {
+ // Use `vlan_no_internet` security method.
+ // This works around an issue where the Linode API responds with a 400
+ // when attempting to reboot shortly after booting up when the Linode is
+ // attached to a Cloud Firewall.
+ cy.defer(
+ createTestLinode({ booted: true }, { securityMethod: 'vlan_no_internet' })
+ ).then((linode: Linode) => {
cy.visitWithLogin(`/linodes/${linode.id}`);
cy.contains('RUNNING').should('be.visible');
cy.findByText(linode.label).should('be.visible');
diff --git a/packages/manager/cypress/e2e/core/linodes/update-linode-labels.spec.ts b/packages/manager/cypress/e2e/core/linodes/update-linode-labels.spec.ts
index ee944990f44..31e0ed477b6 100644
--- a/packages/manager/cypress/e2e/core/linodes/update-linode-labels.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/update-linode-labels.spec.ts
@@ -1,5 +1,4 @@
-import { createLinode } from 'support/api/linodes';
-import { containsVisible } from 'support/helpers';
+import { createTestLinode } from 'support/util/linodes';
import { ui } from 'support/ui';
import { cleanUp } from 'support/util/cleanup';
import { authenticate } from 'support/api/authentication';
@@ -12,10 +11,10 @@ describe('update linode label', () => {
});
it('updates a linode label from details page', () => {
- createLinode().then((linode) => {
+ cy.defer(createTestLinode({ booted: true })).then((linode) => {
const newLinodeLabel = randomLabel();
cy.visitWithLogin(`/linodes/${linode.id}`);
- containsVisible('RUNNING');
+ cy.contains('RUNNING').should('be.visible');
cy.get(`[aria-label="Edit ${linode.label}"]`).click();
cy.get(`[id="edit-${linode.label}-label"]`)
@@ -29,10 +28,10 @@ describe('update linode label', () => {
});
it('updates a linode label from the "Settings" tab', () => {
- createLinode().then((linode) => {
+ cy.defer(createTestLinode({ booted: true })).then((linode) => {
const newLinodeLabel = randomLabel();
cy.visitWithLogin(`/linodes/${linode.id}`);
- containsVisible('RUNNING');
+ cy.contains('RUNNING').should('be.visible');
cy.visitWithLogin(`/linodes/${linode.id}/settings`);
cy.get('[id="label"]').click().clear().type(`${newLinodeLabel}{enter}`);
diff --git a/packages/manager/cypress/e2e/core/longview/longview.spec.ts b/packages/manager/cypress/e2e/core/longview/longview.spec.ts
index 06c8ee71061..ebccb894f55 100644
--- a/packages/manager/cypress/e2e/core/longview/longview.spec.ts
+++ b/packages/manager/cypress/e2e/core/longview/longview.spec.ts
@@ -18,7 +18,7 @@ import {
} from 'support/intercepts/longview';
import { ui } from 'support/ui';
import { cleanUp } from 'support/util/cleanup';
-import { createAndBootLinode } from 'support/util/linodes';
+import { createTestLinode } from 'support/util/linodes';
import { randomLabel, randomString } from 'support/util/random';
// Timeout if Linode creation and boot takes longer than 1 and a half minutes.
@@ -111,7 +111,8 @@ describe('longview', () => {
* - Creates a Linode, connects to it via SSH, and installs Longview using the given cURL command.
* - Confirms that Cloud Manager UI updates to reflect Longview installation and data.
*/
- it('can install Longview client on a Linode', () => {
+ // TODO Unskip for M3-8107.
+ it.skip('can install Longview client on a Linode', () => {
const linodePassword = randomString(32, {
symbols: false,
lowercase: true,
@@ -122,9 +123,10 @@ describe('longview', () => {
const createLinodeAndClient = async () => {
return Promise.all([
- createAndBootLinode({
+ createTestLinode({
root_pass: linodePassword,
type: 'g6-standard-1',
+ booted: true,
}),
createLongviewClient(randomLabel()),
]);
diff --git a/packages/manager/cypress/e2e/core/nodebalancers/smoke-create-nodebal.spec.ts b/packages/manager/cypress/e2e/core/nodebalancers/smoke-create-nodebal.spec.ts
index 0672c1accd1..3cd493d1c1b 100644
--- a/packages/manager/cypress/e2e/core/nodebalancers/smoke-create-nodebal.spec.ts
+++ b/packages/manager/cypress/e2e/core/nodebalancers/smoke-create-nodebal.spec.ts
@@ -1,12 +1,5 @@
import { entityTag } from 'support/constants/cypress';
-import { createLinode } from 'support/api/linodes';
-import {
- containsClick,
- fbtClick,
- fbtVisible,
- getClick,
- getVisible,
-} from 'support/helpers';
+import { createTestLinode } from 'support/util/linodes';
import { randomLabel } from 'support/util/random';
import { chooseRegion, getRegionById } from 'support/util/regions';
@@ -34,8 +27,12 @@ const createNodeBalancerWithUI = (
const regionName = getRegionById(nodeBal.region).label;
cy.visitWithLogin('/nodebalancers/create');
- getVisible('[id="nodebalancer-label"]').click().clear().type(nodeBal.label);
- containsClick('create a tag').type(entityTag);
+ cy.get('[id="nodebalancer-label"]')
+ .should('be.visible')
+ .click()
+ .clear()
+ .type(nodeBal.label);
+ cy.contains('create a tag').click().type(entityTag);
if (isDcPricingTest) {
const newRegion = getRegionById('br-gru');
@@ -66,7 +63,7 @@ const createNodeBalancerWithUI = (
ui.regionSelect.find().click().clear().type(`${regionName}{enter}`);
// node backend config
- fbtClick('Label').type(randomLabel());
+ cy.findByText('Label').click().type(randomLabel());
cy.findByLabelText('IP Address')
.should('be.visible')
@@ -85,9 +82,14 @@ describe('create NodeBalancer', () => {
});
it('creates a NodeBalancer in a region with base pricing', () => {
- // create a linode in NW where the NB will be created
const region = chooseRegion();
- createLinode({ region: region.id }).then((linode) => {
+ const linodePayload = {
+ region: region.id,
+ // NodeBalancers require Linodes with private IPs.
+ private_ip: true,
+ };
+
+ cy.defer(createTestLinode(linodePayload)).then((linode) => {
const nodeBal = nodeBalancerFactory.build({
label: randomLabel(),
region: region.id,
@@ -109,7 +111,12 @@ describe('create NodeBalancer', () => {
*/
it('displays API errors for NodeBalancer Create form fields', () => {
const region = chooseRegion();
- createLinode({ region: region.id }).then((linode) => {
+ const linodePayload = {
+ region: region.id,
+ // NodeBalancers require Linodes with private IPs.
+ private_ip: true,
+ };
+ cy.defer(createTestLinode(linodePayload)).then((linode) => {
const nodeBal = nodeBalancerFactory.build({
label: `${randomLabel()}-^`,
ipv4: linode.ipv4[1],
@@ -120,15 +127,21 @@ describe('create NodeBalancer', () => {
interceptCreateNodeBalancer().as('createNodeBalancer');
createNodeBalancerWithUI(nodeBal);
- fbtVisible(`Label can't contain special characters or spaces.`);
- getVisible('[id="nodebalancer-label"]')
+ cy.findByText(`Label can't contain special characters or spaces.`).should(
+ 'be.visible'
+ );
+ cy.get('[id="nodebalancer-label"]')
+ .should('be.visible')
.click()
.clear()
.type(randomLabel());
- getClick('[data-qa-protocol-select="true"]').type('TCP{enter}');
- getClick('[data-qa-session-stickiness-select]').type(
- 'HTTP Cookie{enter}'
- );
+
+ cy.get('[data-qa-protocol-select="true"]').click().type('TCP{enter}');
+
+ cy.get('[data-qa-session-stickiness-select]')
+ .click()
+ .type('HTTP Cookie{enter}');
+
deployNodeBalancer();
const errMessage = `Stickiness http_cookie requires protocol 'http' or 'https'`;
cy.wait('@createNodeBalancer')
@@ -136,7 +149,8 @@ describe('create NodeBalancer', () => {
.should('deep.equal', {
errors: [{ field: 'configs[0].stickiness', reason: errMessage }],
});
- fbtVisible(errMessage);
+
+ cy.findByText(errMessage).should('be.visible');
});
});
@@ -146,7 +160,12 @@ describe('create NodeBalancer', () => {
*/
it('shows DC-specific pricing information when creating a NodeBalancer', () => {
const initialRegion = getRegionById('us-west');
- createLinode({ region: initialRegion.id }).then((linode) => {
+ const linodePayload = {
+ region: initialRegion.id,
+ // NodeBalancers require Linodes with private IPs.
+ private_ip: true,
+ };
+ cy.defer(createTestLinode(linodePayload)).then((linode) => {
const nodeBal = nodeBalancerFactory.build({
label: randomLabel(),
region: initialRegion.id,
diff --git a/packages/manager/cypress/e2e/core/stackscripts/create-stackscripts.spec.ts b/packages/manager/cypress/e2e/core/stackscripts/create-stackscripts.spec.ts
index 1edfb9845ca..23587b19b95 100644
--- a/packages/manager/cypress/e2e/core/stackscripts/create-stackscripts.spec.ts
+++ b/packages/manager/cypress/e2e/core/stackscripts/create-stackscripts.spec.ts
@@ -12,12 +12,11 @@ import {
import { interceptCreateLinode } from 'support/intercepts/linodes';
import { ui } from 'support/ui';
import { createLinodeRequestFactory } from 'src/factories';
-import { createLinode, getLinodeDisks } from '@linode/api-v4/lib/linodes';
-import { createImage } from '@linode/api-v4/lib/images';
+import { createImage, getLinodeDisks, resizeLinodeDisk } from '@linode/api-v4';
import { chooseRegion } from 'support/util/regions';
import { SimpleBackoffMethod } from 'support/util/backoff';
import { cleanUp } from 'support/util/cleanup';
-import { resizeLinodeDisk } from '@linode/api-v4/lib';
+import { createTestLinode } from 'support/util/linodes';
// StackScript fixture paths.
const stackscriptBasicPath = 'stackscripts/stackscript-basic.sh';
@@ -113,7 +112,7 @@ const createLinodeAndImage = async () => {
// 1.5GB
// Shout out to Debian for fitting on a 1.5GB disk.
const resizedDiskSize = 1536;
- const linode = await createLinode(
+ const linode = await createTestLinode(
createLinodeRequestFactory.build({
label: randomLabel(),
region: chooseRegion().id,
diff --git a/packages/manager/cypress/e2e/core/stackscripts/smoke-community-stackscrips.spec.ts b/packages/manager/cypress/e2e/core/stackscripts/smoke-community-stackscrips.spec.ts
index 2ebd072b40e..7d827e662ad 100644
--- a/packages/manager/cypress/e2e/core/stackscripts/smoke-community-stackscrips.spec.ts
+++ b/packages/manager/cypress/e2e/core/stackscripts/smoke-community-stackscrips.spec.ts
@@ -11,7 +11,7 @@ import { randomLabel, randomString } from 'support/util/random';
import { chooseRegion } from 'support/util/regions';
import { cleanUp } from 'support/util/cleanup';
import { interceptCreateLinode } from 'support/intercepts/linodes';
-import { getProfile } from '@linode/api-v4/lib';
+import { getProfile } from '@linode/api-v4';
import { Profile, StackScript } from '@linode/api-v4';
import { formatDate } from '@src/utilities/formatDate';
diff --git a/packages/manager/cypress/e2e/core/volumes/attach-volume.spec.ts b/packages/manager/cypress/e2e/core/volumes/attach-volume.spec.ts
index 42adfdfd0ec..647a53a42cd 100644
--- a/packages/manager/cypress/e2e/core/volumes/attach-volume.spec.ts
+++ b/packages/manager/cypress/e2e/core/volumes/attach-volume.spec.ts
@@ -1,4 +1,3 @@
-import { createLinode } from '@linode/api-v4/lib/linodes';
import { createVolume } from '@linode/api-v4/lib/volumes';
import { Linode, Volume } from '@linode/api-v4';
import { createLinodeRequestFactory } from 'src/factories/linodes';
@@ -13,6 +12,7 @@ import { ui } from 'support/ui';
import { chooseRegion } from 'support/util/regions';
import { interceptGetLinodeConfigs } from 'support/intercepts/configs';
import { cleanUp } from 'support/util/cleanup';
+import { createTestLinode } from 'support/util/linodes';
// Local storage override to force volume table to list up to 100 items.
// This is a workaround while we wait to get stuck volumes removed.
@@ -48,7 +48,7 @@ const pageSizeOverride = {
authenticate();
describe('volume attach and detach flows', () => {
before(() => {
- cleanUp('volumes');
+ cleanUp(['volumes', 'linodes']);
});
/*
@@ -66,11 +66,12 @@ describe('volume attach and detach flows', () => {
label: randomLabel(),
region: commonRegion.id,
root_pass: randomString(32),
+ booted: false,
});
const entityPromise = Promise.all([
createVolume(volumeRequest),
- createLinode(linodeRequest),
+ createTestLinode(linodeRequest),
]);
cy.defer(entityPromise, 'creating Volume and Linode').then(
diff --git a/packages/manager/cypress/e2e/core/volumes/create-volume.spec.ts b/packages/manager/cypress/e2e/core/volumes/create-volume.spec.ts
index 5304208c626..6131cd87cde 100644
--- a/packages/manager/cypress/e2e/core/volumes/create-volume.spec.ts
+++ b/packages/manager/cypress/e2e/core/volumes/create-volume.spec.ts
@@ -1,5 +1,5 @@
import type { Linode } from '@linode/api-v4';
-import { createLinode } from '@linode/api-v4/lib/linodes';
+import { createTestLinode } from 'support/util/linodes';
import { createLinodeRequestFactory } from 'src/factories/linodes';
import { authenticate } from 'support/api/authentication';
import { cleanUp } from 'support/util/cleanup';
@@ -76,6 +76,7 @@ describe('volume create flow', () => {
label: randomLabel(),
region: region.id,
root_pass: randomString(16),
+ booted: false,
});
const volume = {
@@ -85,54 +86,56 @@ describe('volume create flow', () => {
regionLabel: region.label,
};
- cy.defer(createLinode(linodeRequest), 'creating Linode').then((linode) => {
- interceptCreateVolume().as('createVolume');
+ cy.defer(createTestLinode(linodeRequest), 'creating Linode').then(
+ (linode) => {
+ interceptCreateVolume().as('createVolume');
- cy.visitWithLogin('/volumes/create', {
- localStorageOverrides: pageSizeOverride,
- });
-
- // Fill out and submit volume create form.
- containsClick('Label').type(volume.label);
- containsClick('Size').type(`{selectall}{backspace}${volume.size}`);
- ui.regionSelect.find().click().type(`${volume.region}{enter}`);
-
- cy.findByLabelText('Linode')
- .should('be.visible')
- .click()
- .type(linode.label);
-
- ui.autocompletePopper
- .findByTitle(linode.label)
- .should('be.visible')
- .click();
-
- fbtClick('Create Volume');
- cy.wait('@createVolume');
-
- // Confirm volume configuration drawer opens, then close it.
- fbtVisible('Volume scheduled for creation.');
- getClick('[data-qa-close-drawer="true"]');
-
- // Confirm that volume is listed on landing page with expected configuration.
- cy.findByText(volume.label)
- .closest('tr')
- .within(() => {
- cy.findByText(volume.label).should('be.visible');
- cy.findByText(`${volume.size} GB`).should('be.visible');
- cy.findByText(volume.regionLabel).should('be.visible');
- cy.findByText(linode.label).should('be.visible');
+ cy.visitWithLogin('/volumes/create', {
+ localStorageOverrides: pageSizeOverride,
});
- // Confirm that volume is listed on Linode 'Storage' details page.
- cy.visitWithLogin(`/linodes/${linode.id}/storage`);
- cy.findByText(volume.label)
- .closest('tr')
- .within(() => {
- fbtVisible(volume.label);
- fbtVisible(`${volume.size} GB`);
- });
- });
+ // Fill out and submit volume create form.
+ containsClick('Label').type(volume.label);
+ containsClick('Size').type(`{selectall}{backspace}${volume.size}`);
+ ui.regionSelect.find().click().type(`${volume.region}{enter}`);
+
+ cy.findByLabelText('Linode')
+ .should('be.visible')
+ .click()
+ .type(linode.label);
+
+ ui.autocompletePopper
+ .findByTitle(linode.label)
+ .should('be.visible')
+ .click();
+
+ fbtClick('Create Volume');
+ cy.wait('@createVolume');
+
+ // Confirm volume configuration drawer opens, then close it.
+ fbtVisible('Volume scheduled for creation.');
+ getClick('[data-qa-close-drawer="true"]');
+
+ // Confirm that volume is listed on landing page with expected configuration.
+ cy.findByText(volume.label)
+ .closest('tr')
+ .within(() => {
+ cy.findByText(volume.label).should('be.visible');
+ cy.findByText(`${volume.size} GB`).should('be.visible');
+ cy.findByText(volume.regionLabel).should('be.visible');
+ cy.findByText(linode.label).should('be.visible');
+ });
+
+ // Confirm that volume is listed on Linode 'Storage' details page.
+ cy.visitWithLogin(`/linodes/${linode.id}/storage`);
+ cy.findByText(volume.label)
+ .closest('tr')
+ .within(() => {
+ fbtVisible(volume.label);
+ fbtVisible(`${volume.size} GB`);
+ });
+ }
+ );
});
/*
@@ -145,9 +148,10 @@ describe('volume create flow', () => {
label: randomLabel(),
root_pass: randomString(16),
region: chooseRegion().id,
+ booted: false,
});
- cy.defer(createLinode(linodeRequest), 'creating Linode').then(
+ cy.defer(createTestLinode(linodeRequest), 'creating Linode').then(
(linode: Linode) => {
const volume = {
label: randomLabel(),
diff --git a/packages/manager/cypress/e2e/region/images/create-machine-image-from-linode.spec.ts b/packages/manager/cypress/e2e/region/images/create-machine-image-from-linode.spec.ts
index e324a416e03..dacc00ad54c 100644
--- a/packages/manager/cypress/e2e/region/images/create-machine-image-from-linode.spec.ts
+++ b/packages/manager/cypress/e2e/region/images/create-machine-image-from-linode.spec.ts
@@ -1,43 +1,17 @@
-import type { CreateLinodeRequest, Disk, Linode } from '@linode/api-v4';
-import { createLinode, getLinodeDisks } from '@linode/api-v4';
+import type { Disk, Linode } from '@linode/api-v4';
+import { createTestLinode } from 'support/util/linodes';
import { createLinodeRequestFactory } from '@src/factories';
import { authenticate } from 'support/api/authentication';
import { imageCaptureProcessingTimeout } from 'support/constants/images';
import { ui } from 'support/ui';
-import { SimpleBackoffMethod } from 'support/util/backoff';
import { cleanUp } from 'support/util/cleanup';
-import { depaginate } from 'support/util/paginate';
-import { pollLinodeStatus } from 'support/util/polling';
import { randomLabel, randomPhrase, randomString } from 'support/util/random';
import { testRegions } from 'support/util/regions';
-/**
- * Creates a Linode, waits for it to boot, and returns the Linode and its disk.
- *
- * @param linodePayload - Linode create API request payload.
- *
- * @returns Promise that resolves to a tuple containing the created Linode and its disk.
- */
-const createAndBootLinode = async (
- linodePayload: CreateLinodeRequest
-): Promise<[Linode, Disk]> => {
- const linode = await createLinode(linodePayload);
- // Wait 25 seconds to begin polling, then poll every 5 seconds until Linode boots.
- await pollLinodeStatus(
- linode.id,
- 'running',
- new SimpleBackoffMethod(5000, {
- initialDelay: 25000,
- })
- );
- const disks = await depaginate((page) => getLinodeDisks(linode.id, { page }));
- return [linode, disks[0]];
-};
-
authenticate();
describe('Capture Machine Images', () => {
before(() => {
- cleanUp('images');
+ cleanUp(['images', 'linodes']);
});
/*
@@ -54,10 +28,11 @@ describe('Capture Machine Images', () => {
label: randomLabel(),
root_pass: randomString(32),
region: region.id,
+ booted: true,
});
cy.defer(
- createAndBootLinode(linodePayload),
+ createTestLinode(linodePayload, { waitForBoot: true }),
'creating and booting Linode'
).then(([linode, disk]: [Linode, Disk]) => {
cy.visitWithLogin('/images/create/disk');
diff --git a/packages/manager/cypress/e2e/region/linodes/delete-linode.spec.ts b/packages/manager/cypress/e2e/region/linodes/delete-linode.spec.ts
index 0c92f09ce01..dec88cbe6cc 100644
--- a/packages/manager/cypress/e2e/region/linodes/delete-linode.spec.ts
+++ b/packages/manager/cypress/e2e/region/linodes/delete-linode.spec.ts
@@ -2,7 +2,6 @@ import { createLinodeRequestFactory } from '@src/factories';
import { describeRegions } from 'support/util/regions';
import { randomLabel, randomString } from 'support/util/random';
import { Region } from '@linode/api-v4';
-import { createLinode } from '@linode/api-v4';
import type { Linode } from '@linode/api-v4';
import { ui } from 'support/ui';
import { authenticate } from 'support/api/authentication';
@@ -11,6 +10,7 @@ import {
interceptGetLinodes,
} from 'support/intercepts/linodes';
import { cleanUp } from 'support/util/cleanup';
+import { createTestLinode } from 'support/util/linodes';
authenticate();
describeRegions('Delete Linodes', (region: Region) => {
@@ -28,11 +28,12 @@ describeRegions('Delete Linodes', (region: Region) => {
label: randomLabel(),
region: region.id,
root_pass: randomString(32),
+ booted: false,
});
// Create a Linode before navigating to its details page to delete it.
cy.defer(
- createLinode(linodeCreatePayload),
+ createTestLinode(linodeCreatePayload),
`creating Linode in ${region.label}`
).then((linode: Linode) => {
interceptGetLinodeDetails(linode.id).as('getLinode');
diff --git a/packages/manager/cypress/e2e/region/linodes/update-linode.spec.ts b/packages/manager/cypress/e2e/region/linodes/update-linode.spec.ts
index a62e9e7bdd5..6850c680e42 100644
--- a/packages/manager/cypress/e2e/region/linodes/update-linode.spec.ts
+++ b/packages/manager/cypress/e2e/region/linodes/update-linode.spec.ts
@@ -1,5 +1,5 @@
import type { Disk, Linode } from '@linode/api-v4';
-import { createLinode, getLinodeDisks } from '@linode/api-v4';
+import { getLinodeDisks } from '@linode/api-v4';
import { createLinodeRequestFactory } from '@src/factories';
import { authenticate } from 'support/api/authentication';
import { interceptGetLinodeDetails } from 'support/intercepts/linodes';
@@ -8,6 +8,7 @@ import { cleanUp } from 'support/util/cleanup';
import { depaginate } from 'support/util/paginate';
import { randomLabel, randomString } from 'support/util/random';
import { describeRegions } from 'support/util/regions';
+import { createTestLinode } from 'support/util/linodes';
/*
* Returns a Linode create payload for the given region.
@@ -34,7 +35,7 @@ describeRegions('Can update Linodes', (region) => {
*/
it('can update a Linode label', () => {
cy.defer(
- createLinode(makeLinodePayload(region.id, true)),
+ createTestLinode(makeLinodePayload(region.id, true)),
'creating Linode'
).then((linode: Linode) => {
const newLabel = randomLabel();
@@ -89,7 +90,9 @@ describeRegions('Can update Linodes', (region) => {
const newPassword = randomString(32);
const createLinodeAndGetDisk = async (): Promise<[Linode, Disk]> => {
- const linode = await createLinode(makeLinodePayload(region.id, false));
+ const linode = await createTestLinode(
+ makeLinodePayload(region.id, false)
+ );
const disks = await depaginate((page) =>
getLinodeDisks(linode.id, { page })
);
diff --git a/packages/manager/cypress/support/api/firewalls.ts b/packages/manager/cypress/support/api/firewalls.ts
index 4c48bf3c16d..5a31465b87d 100644
--- a/packages/manager/cypress/support/api/firewalls.ts
+++ b/packages/manager/cypress/support/api/firewalls.ts
@@ -1,9 +1,71 @@
-import { Firewall, deleteFirewall, getFirewalls } from '@linode/api-v4';
+import {
+ Firewall,
+ deleteFirewall,
+ getFirewalls,
+ createFirewall,
+ FirewallRules,
+} from '@linode/api-v4';
import { pageSize } from 'support/constants/api';
import { depaginate } from 'support/util/paginate';
+import { randomLabel } from 'support/util/random';
import { isTestLabel } from './common';
+/**
+ * Determines if Firewall rules are sufficiently locked down to use for a test resource.
+ *
+ * Returns `true` if the rules have default inbound and outbound policies to
+ * drop connections and do not have any additional rules.
+ *
+ * @param rules - Firewall rules to assess.
+ *
+ * @returns `true` if Firewall rules are locked down, `false` otherwise.
+ */
+export const areFirewallRulesLockedDown = (rules: FirewallRules) => {
+ const { outbound, outbound_policy, inbound, inbound_policy } = rules;
+
+ const hasOutboundRules = !!outbound && outbound.length > 0;
+ const hasInboundRules = !!inbound && inbound.length > 0;
+
+ return (
+ outbound_policy === 'DROP' &&
+ inbound_policy === 'DROP' &&
+ !hasInboundRules &&
+ !hasOutboundRules
+ );
+};
+
+/**
+ * Returns a firewall to use for a test resource, creating it if one does not already exist.
+ *
+ * @returns Promise that resolves to existing or new Firewall.
+ */
+export const findOrCreateDependencyFirewall = async () => {
+ const firewalls = await depaginate((page: number) =>
+ getFirewalls({ page, page_size: pageSize })
+ );
+
+ const suitableFirewalls = firewalls.filter(
+ ({ label, rules }: Firewall) =>
+ isTestLabel(label) && areFirewallRulesLockedDown(rules)
+ );
+
+ if (suitableFirewalls.length > 0) {
+ return suitableFirewalls[0];
+ }
+
+ // No suitable firewalls exist, so we'll create one and return it.
+ return createFirewall({
+ label: randomLabel(),
+ rules: {
+ inbound: [],
+ outbound: [],
+ inbound_policy: 'DROP',
+ outbound_policy: 'DROP',
+ },
+ });
+};
+
/**
* Deletes all Firewalls whose labels are prefixed "cy-test-".
*
diff --git a/packages/manager/cypress/support/api/linodes.ts b/packages/manager/cypress/support/api/linodes.ts
index 6865519b8ac..9fbe30f3302 100644
--- a/packages/manager/cypress/support/api/linodes.ts
+++ b/packages/manager/cypress/support/api/linodes.ts
@@ -1,14 +1,10 @@
import { Linode, deleteLinode, getLinodes } from '@linode/api-v4';
-import { CreateLinodeRequest } from '@linode/api-v4';
import { linodeFactory } from '@src/factories';
import { makeResourcePage } from '@src/mocks/serverHandlers';
-import { oauthToken, pageSize } from 'support/constants/api';
-import { entityTag } from 'support/constants/cypress';
+import { pageSize } from 'support/constants/api';
import { depaginate } from 'support/util/paginate';
-import { randomLabel, randomString } from 'support/util/random';
-import { chooseRegion } from 'support/util/regions';
-import { apiCheckErrors, deleteById, isTestLabel } from './common';
+import { deleteById, isTestLabel } from './common';
export const createMockLinodeList = (data?: {}, listNumber: number = 1) => {
return makeResourcePage(
@@ -18,47 +14,6 @@ export const createMockLinodeList = (data?: {}, listNumber: number = 1) => {
);
};
-const defaultLinodeRequestBody = {
- authorized_users: [],
- backups_enabled: false,
- booted: true,
- image: 'linode/debian10',
- private_ip: true,
- region: chooseRegion().id,
- root_pass: randomString(32),
- tags: [entityTag],
- type: 'g6-standard-2',
-};
-
-const linodeRequest = (linodeData: CreateLinodeRequest) => {
- return cy.request({
- auth: {
- bearer: oauthToken,
- },
- body: linodeData,
- method: 'POST',
- url: Cypress.env('REACT_APP_API_ROOT') + '/linode/instances',
- });
-};
-
-export const requestBody = (data: Partial) => {
- const label = randomLabel();
- return linodeRequest({ label, ...defaultLinodeRequestBody, ...data });
-};
-
-/**
- * Deprecated. Use `createTestLinode()` with `cy.defer()` instead.
- *
- * @deprecated
- */
-export const createLinode = (data = {}) => {
- return requestBody(data).then((resp) => {
- apiCheckErrors(resp);
- console.log(`Created Linode ${resp.body.label} successfully`, resp);
- return resp.body;
- });
-};
-
export const deleteLinodeById = (linodeId: number) =>
deleteById('linode/instances', linodeId);
diff --git a/packages/manager/cypress/support/constants/cypress.ts b/packages/manager/cypress/support/constants/cypress.ts
index 3df9ce61a59..c5ab5c563da 100644
--- a/packages/manager/cypress/support/constants/cypress.ts
+++ b/packages/manager/cypress/support/constants/cypress.ts
@@ -3,7 +3,7 @@
*/
/**
- * Tag to use to identify test entities, resources, etc.
+ * Tag to identify test entities, resources, etc.
*/
export const entityTag = 'cy-test';
diff --git a/packages/manager/cypress/support/util/linodes.ts b/packages/manager/cypress/support/util/linodes.ts
index 68d33007a7b..76186a2ccc0 100644
--- a/packages/manager/cypress/support/util/linodes.ts
+++ b/packages/manager/cypress/support/util/linodes.ts
@@ -2,13 +2,29 @@ import { createLinode, getLinodeConfigs } from '@linode/api-v4';
import { createLinodeRequestFactory } from '@src/factories';
import { SimpleBackoffMethod } from 'support/util/backoff';
import { pollLinodeDiskStatuses, pollLinodeStatus } from 'support/util/polling';
-import { randomLabel } from 'support/util/random';
+import { randomLabel, randomString } from 'support/util/random';
import { chooseRegion } from 'support/util/regions';
import { depaginate } from './paginate';
import { pageSize } from 'support/constants/api';
-import type { Config, Linode } from '@linode/api-v4';
-import type { CreateLinodeRequest } from '@linode/api-v4';
+import type { Config, CreateLinodeRequest, Linode } from '@linode/api-v4';
+import { findOrCreateDependencyFirewall } from 'support/api/firewalls';
+
+/**
+ * Methods used to secure test Linodes.
+ *
+ * - `firewall`: A firewall is used to secure the created Linode. If a suitable
+ * firewall does not exist, one is created first.
+ *
+ * - `vlan_no_internet`: The created Linode's `eth0` network interface is set to
+ * a VLAN, and no public internet interface is configured.
+ *
+ * - `powered_off`: The created Linode is not booted upon creation.
+ */
+export type CreateTestLinodeSecurityMethod =
+ | 'firewall'
+ | 'vlan_no_internet'
+ | 'powered_off';
/**
* Options to control the behavior of test Linode creation.
@@ -19,6 +35,9 @@ export interface CreateTestLinodeOptions {
/** Whether to wait for created Linode to boot before resolving. */
waitForBoot: boolean;
+
+ /** Method to use to secure the test Linode. */
+ securityMethod: CreateTestLinodeSecurityMethod;
}
/**
@@ -27,6 +46,7 @@ export interface CreateTestLinodeOptions {
export const defaultCreateTestLinodeOptions = {
waitForDisks: false,
waitForBoot: false,
+ securityMethod: 'firewall',
};
/**
@@ -46,13 +66,52 @@ export const createTestLinode = async (
...(options || {}),
};
+ const securityMethodPayload: Partial = await (async () => {
+ switch (resolvedOptions.securityMethod) {
+ case 'firewall':
+ default:
+ const firewall = await findOrCreateDependencyFirewall();
+ return {
+ firewall_id: firewall.id,
+ };
+
+ case 'vlan_no_internet':
+ return {
+ interfaces: [
+ {
+ purpose: 'vlan',
+ primary: false,
+ label: randomLabel(),
+ ipam_address: null,
+ },
+ ],
+ };
+
+ case 'powered_off':
+ return {
+ booted: false,
+ };
+ }
+ })();
+
const resolvedCreatePayload = {
...createLinodeRequestFactory.build({
label: randomLabel(),
image: 'linode/debian11',
region: chooseRegion().id,
+ booted: false,
}),
...(createRequestPayload || {}),
+ ...securityMethodPayload,
+
+ // Override given root password; mitigate against using default factory password, inadvertent logging, etc.
+ root_pass: randomString(64, {
+ spaces: true,
+ symbols: true,
+ numbers: true,
+ lowercase: true,
+ uppercase: true,
+ }),
};
// Display warnings for certain combinations of options/request payloads...
@@ -105,7 +164,10 @@ export const createTestLinode = async (
consoleProps: () => {
return {
options: resolvedOptions,
- payload: resolvedCreatePayload,
+ payload: {
+ ...resolvedCreatePayload,
+ root_pass: '(redacted)',
+ },
linode,
};
},
@@ -114,26 +176,6 @@ export const createTestLinode = async (
return linode;
};
-/**
- * Creates a Linode and waits for it to be in "running" state.
- *
- * Deprecated. Use `createTestLinode` with `waitForBoot` set to `true`.
- *
- * @param createPayload - Optional Linode create payload options.
- *
- * @deprecated
- *
- * @returns Promis that resolves when Linode is created and booted.
- */
-export const createAndBootLinode = async (
- createPayload?: Partial
-): Promise => {
- console.warn(
- '`createAndBootLinode()` is deprecated. Use `createTestLinode()` instead.'
- );
- return createTestLinode(createPayload, { waitForBoot: true });
-};
-
/**
* Retrieves all Config objects belonging to a Linode.
*
From c13f58e9b0080d5d1a118351860031e81f0648cc Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:03:02 -0400
Subject: [PATCH 054/163] change: [M3-8159] - Modify limited availability
banner display logic (#10536)
* Modify limited availability banner display logic
* Update class copy
* Added changeset: Modify limited availability banner display logic
* Add comments
* Update packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>
* feedback @mjac0bs
---------
Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>
---
.../pr-10536-changed-1717183226858.md | 5 +
.../e2e/core/linodes/plan-selection.spec.ts | 62 ++++----
.../KubernetesPlansPanel.tsx | 3 +-
.../PlansPanel/PlanInformation.test.tsx | 4 +-
.../components/PlansPanel/PlanInformation.tsx | 136 +++++++-----------
.../components/PlansPanel/PlansPanel.tsx | 15 +-
.../features/components/PlansPanel/utils.ts | 1 -
7 files changed, 105 insertions(+), 121 deletions(-)
create mode 100644 packages/manager/.changeset/pr-10536-changed-1717183226858.md
diff --git a/packages/manager/.changeset/pr-10536-changed-1717183226858.md b/packages/manager/.changeset/pr-10536-changed-1717183226858.md
new file mode 100644
index 00000000000..d7d6297562e
--- /dev/null
+++ b/packages/manager/.changeset/pr-10536-changed-1717183226858.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Changed
+---
+
+Modify limited availability banner display logic ([#10536](https://github.com/linode/manager/pull/10536))
diff --git a/packages/manager/cypress/e2e/core/linodes/plan-selection.spec.ts b/packages/manager/cypress/e2e/core/linodes/plan-selection.spec.ts
index 86838505220..5a6480c18ec 100644
--- a/packages/manager/cypress/e2e/core/linodes/plan-selection.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/plan-selection.spec.ts
@@ -44,6 +44,11 @@ const mockDedicatedLinodeTypes = [
label: 'dedicated-3',
class: 'dedicated',
}),
+ linodeTypeFactory.build({
+ id: 'dedicated-4',
+ label: 'dedicated-4',
+ class: 'dedicated',
+ }),
];
const mockSharedLinodeTypes = [
@@ -98,11 +103,21 @@ const mockRegionAvailability = [
available: false,
region: 'us-east',
}),
+ regionAvailabilityFactory.build({
+ plan: 'dedicated-4',
+ available: false,
+ region: 'us-east',
+ }),
regionAvailabilityFactory.build({
plan: 'highmem-1',
available: false,
region: 'us-east',
}),
+ regionAvailabilityFactory.build({
+ plan: 'shared-3',
+ available: false,
+ region: 'us-east',
+ }),
];
const linodePlansPanel = '[data-qa-tp="Linode Plan"]';
@@ -110,7 +125,7 @@ const k8PlansPanel = '[data-qa-tp="Add Node Pools"]';
const planSelectionTable = 'List of Linode Plans';
const notices = {
- limitedAvailability: '[data-testid="disabled-plan-tooltip"]',
+ limitedAvailability: '[data-testid="limited-availability-banner"]',
unavailable: '[data-testid="notice-error"]',
};
@@ -136,15 +151,15 @@ describe('displays linode plans panel based on availability', () => {
// Dedicated CPU tab
// Should be selected/open by default
// Should have the limited availability notice
- // Should contain 4 plans (5 rows including the header row)
- // Should have 2 plans disabled
- // Should have tooltips for the disabled plans (not more than half disabled plans in the panel)
+ // Should contain 5 plans (6 rows including the header row)
+ // Should have 3 plans disabled
+ // Should not have tooltips for the disabled plans (more than half disabled plans in the panel)
cy.get(linodePlansPanel).within(() => {
cy.findAllByRole('alert').should('have.length', 1);
cy.get(notices.limitedAvailability).should('be.visible');
cy.findByRole('table', { name: planSelectionTable }).within(() => {
- cy.findAllByRole('row').should('have.length', 5);
+ cy.findAllByRole('row').should('have.length', 6);
cy.get('[id="dedicated-1"]').should('be.enabled');
cy.get('[id="dedicated-2"]').should('be.enabled');
cy.get(
@@ -152,15 +167,15 @@ describe('displays linode plans panel based on availability', () => {
);
cy.get('[id="dedicated-3"]').should('be.disabled');
cy.get('[id="g6-dedicated-64"]').should('be.disabled');
- cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 2);
+ cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 0);
});
});
// Shared CPU tab
// Should have no notices
// Should contain 3 plans (4 rows including the header row)
- // Should have 0 disabled plan
- // Should have no tooltip for the disabled plan
+ // Should have 1 disabled plan
+ // Should have one tooltip for the disabled plan
cy.findByText('Shared CPU').click();
cy.get(linodePlansPanel).within(() => {
cy.findAllByRole('alert').should('have.length', 0);
@@ -169,8 +184,8 @@ describe('displays linode plans panel based on availability', () => {
cy.findAllByRole('row').should('have.length', 4);
cy.get('[id="shared-1"]').should('be.enabled');
cy.get('[id="shared-2"]').should('be.enabled');
- cy.get('[id="shared-3"]').should('be.enabled');
- cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 0);
+ cy.get('[id="shared-3"]').should('be.disabled');
+ cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 1);
});
});
@@ -178,7 +193,7 @@ describe('displays linode plans panel based on availability', () => {
// Should have the limited availability notice
// Should contain 1 plan (2 rows including the header row)
// Should have one disabled plan
- // Should have tooltip for the disabled plan (more than half disabled plans in the panel, but only one plan)
+ // Should have no tooltip for the disabled plan (more than half disabled plans in the panel)
cy.findByText('High Memory').click();
cy.get(linodePlansPanel).within(() => {
cy.findAllByRole('alert').should('have.length', 1);
@@ -187,7 +202,7 @@ describe('displays linode plans panel based on availability', () => {
cy.findByRole('table', { name: planSelectionTable }).within(() => {
cy.findAllByRole('row').should('have.length', 2);
cy.get('[id="highmem-1"]').should('be.disabled');
- cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 1);
+ cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 0);
});
});
@@ -232,9 +247,9 @@ describe('displays kubernetes plans panel based on availability', () => {
// Dedicated CPU tab
// Should be selected/open by default
// Should have the limited availability notice
- // Should contain 4 plans (5 rows including the header row)
- // Should have 2 plans disabled
- // Should have tooltips for the disabled plans (not more than half disabled plans in the panel)
+ // Should contain 5 plans (6 rows including the header row)
+ // Should have 3 plans disabled
+ // Should have no tooltips for the disabled plans (more than half disabled plans in the panel)
// All inputs for a row should be enabled if row is enabled (only testing one row in suite)
// All inputs for a disabled row should be disabled (only testing one row in suite)
cy.get(k8PlansPanel).within(() => {
@@ -242,7 +257,7 @@ describe('displays kubernetes plans panel based on availability', () => {
cy.get(notices.limitedAvailability).should('be.visible');
cy.findByRole('table', { name: planSelectionTable }).within(() => {
- cy.findAllByRole('row').should('have.length', 5);
+ cy.findAllByRole('row').should('have.length', 6);
cy.get('[data-qa-plan-row="dedicated-1"]').should(
'not.have.attr',
'disabled'
@@ -270,14 +285,14 @@ describe('displays kubernetes plans panel based on availability', () => {
)
.should('be.disabled');
});
- cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 2);
+ cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 0);
});
});
// Shared CPU tab
// Should have no notices
// Should contain 3 plans (4 rows including the header row)
- // Should have 1 disabled plan
+ // Should have 2 disabled plans
// Should have tooltip for the disabled plan (not more than half disabled plans in the panel)
cy.findByText('Shared CPU').click();
cy.get(k8PlansPanel).within(() => {
@@ -293,11 +308,8 @@ describe('displays kubernetes plans panel based on availability', () => {
'not.have.attr',
'disabled'
);
- cy.get('[data-qa-plan-row="shared-3"]').should(
- 'not.have.attr',
- 'disabled'
- );
- cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 0);
+ cy.get('[data-qa-plan-row="shared-3"]').should('have.attr', 'disabled');
+ cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 1);
});
});
@@ -305,7 +317,7 @@ describe('displays kubernetes plans panel based on availability', () => {
// Should have the limited availability notice
// Should contain 1 plan (2 rows including the header row)
// Should have one disabled plan
- // Should have tooltip for the disabled plan (more than half disabled plans in the panel, but only one plan)
+ // Should have no tooltip for the disabled plan (more than half disabled plans in the panel)
cy.findByText('High Memory').click();
cy.get(k8PlansPanel).within(() => {
cy.findAllByRole('alert').should('have.length', 1);
@@ -317,7 +329,7 @@ describe('displays kubernetes plans panel based on availability', () => {
'have.attr',
'disabled'
);
- cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 1);
+ cy.findAllByTestId('disabled-plan-tooltip').should('have.length', 0);
});
});
diff --git a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
index 6660f315360..fffc1efc25b 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesPlansPanel/KubernetesPlansPanel.tsx
@@ -76,7 +76,6 @@ export const KubernetesPlansPanel = (props: Props) => {
const plansMap: PlanSelectionType[] = plans[plan];
const {
allDisabledPlans,
- hasDisabledPlans,
hasMajorityOfPlansDisabled,
plansForThisLinodeTypeClass,
} = extractPlansInformation({
@@ -94,7 +93,7 @@ export const KubernetesPlansPanel = (props: Props) => {
isSelectedRegionEligibleForPlan={isSelectedRegionEligibleForPlan(
plan
)}
- hasDisabledPlans={hasDisabledPlans}
+ hasMajorityOfPlansDisabled={hasMajorityOfPlansDisabled}
hasSelectedRegion={hasSelectedRegion}
planType={plan}
regionsData={regionsData}
diff --git a/packages/manager/src/features/components/PlansPanel/PlanInformation.test.tsx b/packages/manager/src/features/components/PlansPanel/PlanInformation.test.tsx
index a48c0fcff31..089a59d27ad 100644
--- a/packages/manager/src/features/components/PlansPanel/PlanInformation.test.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlanInformation.test.tsx
@@ -11,7 +11,7 @@ import {
import type { PlanInformationProps } from './PlanInformation';
const mockProps: PlanInformationProps = {
- hasDisabledPlans: false,
+ hasMajorityOfPlansDisabled: false,
hasSelectedRegion: true,
isSelectedRegionEligibleForPlan: false,
planType: 'standard',
@@ -38,7 +38,7 @@ describe('PlanInformation', () => {
renderWithTheme(
diff --git a/packages/manager/src/features/components/PlansPanel/PlanInformation.tsx b/packages/manager/src/features/components/PlansPanel/PlanInformation.tsx
index 399074560ce..2f9bd20478d 100644
--- a/packages/manager/src/features/components/PlansPanel/PlanInformation.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlanInformation.tsx
@@ -22,7 +22,7 @@ import type { Region } from '@linode/api-v4';
export interface PlanInformationProps {
disabledClasses?: LinodeTypeClass[];
- hasDisabledPlans: boolean;
+ hasMajorityOfPlansDisabled: boolean;
hasSelectedRegion: boolean;
hideLimitedAvailabilityBanner?: boolean;
isSelectedRegionEligibleForPlan: boolean;
@@ -31,10 +31,9 @@ export interface PlanInformationProps {
}
export const PlanInformation = (props: PlanInformationProps) => {
- const theme = useTheme();
const {
disabledClasses,
- hasDisabledPlans,
+ hasMajorityOfPlansDisabled,
hasSelectedRegion,
hideLimitedAvailabilityBanner,
isSelectedRegionEligibleForPlan,
@@ -72,111 +71,72 @@ export const PlanInformation = (props: PlanInformationProps) => {
) : null}
{hasSelectedRegion &&
isSelectedRegionEligibleForPlan &&
- !hideLimitedAvailabilityBanner && (
-
+ !hideLimitedAvailabilityBanner &&
+ hasMajorityOfPlansDisabled && (
+ ({
+ marginBottom: theme.spacing(3),
+ marginLeft: 0,
+ marginTop: 0,
+ padding: `${theme.spacing(0.5)} ${theme.spacing(2)}`,
+ })}
+ dataTestId={limitedAvailabilityBannerTestId}
+ variant="warning"
+ >
+
+ These plans have limited deployment availability.
+
+
)}
-
- {planTabInfoContent[planType]?.typography}
-
+
);
};
export const limitedAvailabilityBannerTestId = 'limited-availability-banner';
-interface LimitedAvailabilityNoticeProps {
- hasDisabledPlans: boolean;
+interface ClassDescriptionCopyProps {
planType: 'shared' | LinodeTypeClass;
}
-export const LimitedAvailabilityNotice = (
- props: LimitedAvailabilityNoticeProps
-) => {
- const { hasDisabledPlans, planType } = props;
+export const ClassDescriptionCopy = (props: ClassDescriptionCopyProps) => {
+ const { planType } = props;
+ const theme = useTheme();
+ let planTypeLabel: null | string;
+ let docLink: null | string;
switch (planType) {
case 'dedicated':
- return (
-
- );
-
+ planTypeLabel = 'Dedicated CPU';
+ docLink = DEDICATED_COMPUTE_INSTANCES_LINK;
+ break;
case 'shared':
- return (
-
- );
-
+ planTypeLabel = 'Shared CPU';
+ docLink = SHARED_COMPUTE_INSTANCES_LINK;
+ break;
case 'highmem':
- return (
-
- );
-
+ planTypeLabel = 'High Memory';
+ docLink = HIGH_MEMORY_COMPUTE_INSTANCES_LINK;
+ break;
case 'premium':
- return (
-
- );
-
+ planTypeLabel = 'Premium CPU';
+ docLink = PREMIUM_COMPUTE_INSTANCES_LINK;
+ break;
case 'gpu':
- return (
-
- );
-
+ planTypeLabel = 'GPU';
+ docLink = GPU_COMPUTE_INSTANCES_LINK;
+ break;
default:
- return null;
+ planTypeLabel = null;
+ docLink = null;
}
-};
-
-interface LimitedAvailabilityNoticeCopyProps {
- docsLink: string;
- hasDisabledPlans: boolean;
- planTypeLabel: string;
-}
-
-export const LimitedAvailabilityNoticeCopy = (
- props: LimitedAvailabilityNoticeCopyProps
-) => {
- const { docsLink, hasDisabledPlans, planTypeLabel } = props;
- return hasDisabledPlans ? (
- ({
- marginBottom: theme.spacing(3),
- marginLeft: 0,
- marginTop: 0,
- padding: `${theme.spacing(0.5)} ${theme.spacing(2)}`,
- })}
- dataTestId={limitedAvailabilityBannerTestId}
- variant="warning"
+ return planTypeLabel && docLink ? (
+
-
- These plans have limited deployment availability.{' '}
- Learn more about our {planTypeLabel} plans.
-
-
+ {planTabInfoContent[planType]?.typography}{' '}
+ Learn more about our {planTypeLabel} plans.
+
) : null;
};
diff --git a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
index b516c11e678..432a1670a0c 100644
--- a/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
+++ b/packages/manager/src/features/components/PlansPanel/PlansPanel.tsx
@@ -48,6 +48,14 @@ export interface PlansPanelProps {
types: PlanSelectionType[];
}
+/**
+ * PlansPanel is a tabbed panel that displays a list of plans for a Linode.
+ * It is used in the Linode create, Kubernetes and Database create flows.
+ * It contains ample logic to determine which plans are available based on the selected region availability and display related visual indicators:
+ * - If the region is not supported, show an error notice and disable all plans.
+ * - If more than half the plans are disabled, show the limited availability banner and hide the limited availability tooltip
+ * - If less than half the plans are disabled, hide the limited availability banner and show the limited availability tooltip
+ */
export const PlansPanel = (props: PlansPanelProps) => {
const {
className,
@@ -119,7 +127,6 @@ export const PlansPanel = (props: PlansPanelProps) => {
const plansMap: PlanSelectionType[] = plans[plan];
const {
allDisabledPlans,
- hasDisabledPlans,
hasMajorityOfPlansDisabled,
plansForThisLinodeTypeClass,
} = extractPlansInformation({
@@ -138,13 +145,15 @@ export const PlansPanel = (props: PlansPanelProps) => {
<>
0;
const hasMajorityOfPlansDisabled =
- plans.length !== 1 &&
allDisabledPlans.length > plansForThisLinodeTypeClass.length / 2;
return {
From b78edb7a0acb9aba729a11fb96ea99ec1869e175 Mon Sep 17 00:00:00 2001
From: Banks Nussman <115251059+bnussman-akamai@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:03:18 -0400
Subject: [PATCH 055/163] refactor: [M3-7437] - Query Key Factory for Security
Questions and Preferences (#10543)
* use factory for security questions and preferences
* Added changeset: Query Key Factory for Security Questions and Preferences
* try to fix unit tests
* fix typo @abailly-akamai
---------
Co-authored-by: Banks Nussman
---
.../pr-10543-tech-stories-1717514648816.md | 5 ++
packages/manager/src/MainContent.tsx | 7 +-
.../AccessPanel/UserSSHKeyPanel.tsx | 2 +-
.../DateTimeDisplay/DateTimeDisplay.tsx | 2 +-
.../DeletionDialog/DeletionDialog.tsx | 2 +-
.../src/components/MainContentBanner.tsx | 5 +-
.../MaintenanceBanner/MaintenanceBanner.tsx | 2 +-
packages/manager/src/components/OrderBy.tsx | 5 +-
.../PreferenceToggle/PreferenceToggle.tsx | 5 +-
.../manager/src/components/TagCell/AddTag.tsx | 2 +-
.../src/components/TagsInput/TagsInput.tsx | 2 +-
.../TypeToConfirmDialog.tsx | 2 +-
.../src/containers/preferences.container.ts | 5 +-
.../src/containers/profile.container.ts | 2 +-
.../src/features/Account/AccountLanding.tsx | 2 +-
.../src/features/Account/AccountLogins.tsx | 2 +-
.../Account/AccountLoginsTableRow.tsx | 2 +-
.../features/Account/CloseAccountDialog.tsx | 2 +-
.../Account/CloseAccountSetting.test.tsx | 4 +-
.../features/Account/CloseAccountSetting.tsx | 2 +-
.../features/Account/EnableObjectStorage.tsx | 2 +-
.../Maintenance/MaintenanceTableRow.tsx | 2 +-
.../src/features/Backups/BackupsCTA.tsx | 7 +-
.../src/features/Billing/BillingDetail.tsx | 2 +-
.../BillingActivityPanel.tsx | 2 +-
.../BillingSummary/BillingSummary.tsx | 2 +-
.../PaymentDrawer/PaymentDrawer.tsx | 2 +-
.../ContactInformation.test.tsx | 4 +-
.../UpdateContactInformationForm.tsx | 2 +-
.../AddPaymentMethodDrawer.tsx | 2 +-
.../PaymentInformation.test.tsx | 4 +-
.../RestoreFromBackupDialog.tsx | 2 +-
.../DatabaseSettings/DatabaseSettings.tsx | 2 +-
.../Databases/DatabaseLanding/DatabaseRow.tsx | 2 +-
.../features/Domains/CloneDomainDrawer.tsx | 2 +-
.../Domains/CreateDomain/CreateDomain.tsx | 2 +-
.../Domains/DomainZoneImportDrawer.tsx | 2 +-
.../src/features/Domains/DomainsLanding.tsx | 2 +-
.../src/features/Domains/EditDomainDrawer.tsx | 2 +-
.../ConfirmTransferDialog.tsx | 2 +-
.../Devices/AddLinodeDrawer.tsx | 2 +-
.../Devices/AddNodebalancerDrawer.tsx | 2 +-
.../Firewalls/FirewallDetail/index.tsx | 2 +-
.../FirewallLanding/CreateFirewallDrawer.tsx | 2 +-
.../FirewallLanding/FirewallActionMenu.tsx | 2 +-
.../GlobalNotifications/EmailBounce.tsx | 2 +-
.../GlobalNotifications.tsx | 4 +-
.../manager/src/features/Images/ImageRow.tsx | 2 +-
.../src/features/Images/ImageUpload.tsx | 2 +-
.../Images/ImagesCreate/CreateImageTab.tsx | 2 +-
packages/manager/src/features/Images/utils.ts | 2 +-
.../KubeCheckoutBar/KubeCheckoutBar.tsx | 2 +-
.../Linodes/LinodeEntityDetailBody.tsx | 2 +-
.../Linodes/LinodeEntityDetailFooter.tsx | 2 +-
.../LinodesCreate/SelectBackupPanel.tsx | 2 +-
.../LinodeBackup/LinodeBackups.tsx | 2 +-
.../LinodeBackup/ScheduleSettings.tsx | 2 +-
.../LinodeConfigs/LinodeConfigs.tsx | 2 +-
.../LinodeFirewallsActionMenu.tsx | 2 +-
.../TransferHistory.tsx | 2 +-
.../LinodeRebuild/LinodeRebuildDialog.tsx | 2 +-
.../LinodeRebuild/RebuildFromImage.tsx | 2 +-
.../LinodeRebuild/RebuildFromStackScript.tsx | 2 +-
.../LinodeRescue/StandardRescueDialog.tsx | 2 +-
.../LinodeResize/LinodeResize.tsx | 2 +-
.../LinodeSettings/ImageAndPassword.tsx | 2 +-
.../LinodeSettings/LinodeSettings.tsx | 2 +-
.../LinodeStorage/LinodeDisks.tsx | 2 +-
.../LinodeSummary/LinodeSummary.tsx | 2 +-
.../MigrationNotification.tsx | 2 +-
.../Linodes/LinodesLanding/CardView.tsx | 2 +-
.../Linodes/MigrateLinode/MigrateLinode.tsx | 2 +-
.../LongviewDetail/LongviewDetail.tsx | 2 +-
.../LongviewLanding/LongviewClientHeader.tsx | 2 +-
.../LongviewLanding/LongviewClientRow.tsx | 2 +-
.../LongviewLanding/LongviewClients.tsx | 2 +-
.../LongviewLanding/LongviewPlans.tsx | 2 +-
.../Longview/shared/TimeRangeSelect.tsx | 5 +-
.../ManagedChartPanel.tsx | 2 +-
.../Managed/Monitors/IssueCalendar.tsx | 2 +-
.../NodeBalancers/NodeBalancerCreate.tsx | 2 +-
.../NodeBalancerDetail/NodeBalancerDetail.tsx | 2 +-
.../NodeBalancerFirewallsActionMenu.tsx | 2 +-
.../NodeBalancerSummary/TablesPanel.tsx | 2 +-
.../useFormattedNotifications.tsx | 2 +-
.../BucketDetail/ObjectDetailsDrawer.tsx | 2 +-
.../BucketLanding/BucketDetailsDrawer.tsx | 2 +-
.../BucketLanding/BucketLanding.tsx | 2 +-
.../BucketLanding/CreateBucketDrawer.tsx | 2 +-
.../BucketLanding/OMC_BucketLanding.tsx | 2 +-
.../BucketLanding/OMC_CreateBucketDrawer.tsx | 2 +-
.../Profile/APITokens/APITokenTable.tsx | 4 +-
.../APITokens/CreateAPITokenDrawer.test.tsx | 12 +--
.../APITokens/CreateAPITokenDrawer.tsx | 4 +-
.../Profile/APITokens/EditAPITokenDrawer.tsx | 2 +-
.../Profile/APITokens/RevokeTokenDialog.tsx | 2 +-
.../APITokens/ViewAPITokenDrawer.test.tsx | 4 +-
.../Profile/APITokens/ViewAPITokenDrawer.tsx | 2 +-
.../AuthenticationSettings.tsx | 2 +-
.../PhoneVerification/PhoneVerification.tsx | 2 +-
.../RevokeTrustedDevicesDialog.tsx | 2 +-
.../AuthenticationSettings/SMSMessaging.tsx | 4 +-
.../SecurityQuestions/SecurityQuestions.tsx | 2 +-
.../AuthenticationSettings/TrustedDevices.tsx | 2 +-
.../TwoFactor/DisableTwoFactorDialog.tsx | 2 +-
.../TwoFactor/TwoFactor.tsx | 4 +-
.../DisplaySettings/DisplaySettings.test.tsx | 4 +-
.../DisplaySettings/DisplaySettings.tsx | 2 +-
.../Profile/DisplaySettings/TimezoneForm.tsx | 2 +-
.../Profile/LishSettings/LishSettings.tsx | 2 +-
.../features/Profile/Referrals/Referrals.tsx | 2 +-
.../Profile/SSHKeys/CreateSSHKeyDrawer.tsx | 2 +-
.../Profile/SSHKeys/DeleteSSHKeyDialog.tsx | 2 +-
.../Profile/SSHKeys/EditSSHKeyDrawer.tsx | 2 +-
.../src/features/Profile/SSHKeys/SSHKeys.tsx | 2 +-
.../Profile/Settings/PreferenceEditor.tsx | 5 +-
.../features/Profile/Settings/Settings.tsx | 7 +-
.../SelectStackScriptsSection.tsx | 2 +-
.../StackScriptCreate/StackScriptCreate.tsx | 2 +-
.../StackScriptActionMenu.tsx | 2 +-
.../StackScriptPanel/StackScriptPanel.tsx | 2 +-
.../StackScriptPanel/StackScriptsSection.tsx | 2 +-
.../StackScripts/StackScriptsDetail.tsx | 2 +-
.../SupportTicketDetail.tsx | 2 +-
.../SupportTicketDetail/TicketStatus.tsx | 2 +-
.../features/TopMenu/UserMenu/UserMenu.tsx | 2 +-
.../manager/src/features/Users/UserDetail.tsx | 2 +-
.../src/features/Users/UserProfile.tsx | 2 +-
.../manager/src/features/Users/UserRow.tsx | 2 +-
.../src/features/Users/UsersActionMenu.tsx | 2 +-
.../src/features/Users/UsersLanding.tsx | 2 +-
.../VPCDetail/SubnetAssignLinodesDrawer.tsx | 2 +-
.../VPCs/VPCDetail/SubnetCreateDrawer.tsx | 2 +-
.../VPCs/VPCDetail/SubnetEditDrawer.tsx | 2 +-
.../VPCDetail/SubnetUnassignLinodesDrawer.tsx | 2 +-
.../VPCs/VPCLanding/VPCEditDrawer.tsx | 2 +-
.../features/Volumes/AttachVolumeDrawer.tsx | 2 +-
.../features/Volumes/CloneVolumeDrawer.tsx | 2 +-
.../src/features/Volumes/EditVolumeDrawer.tsx | 2 +-
.../features/Volumes/ResizeVolumeDrawer.tsx | 2 +-
.../src/features/Volumes/VolumeCreate.tsx | 2 +-
.../VolumeDrawer/LinodeVolumeAttachForm.tsx | 2 +-
.../manager/src/hooks/useAccountManagement.ts | 2 +-
packages/manager/src/hooks/useCreateVPC.ts | 2 +-
.../src/hooks/useDismissibleNotifications.ts | 5 +-
.../manager/src/hooks/useEventHandlers.ts | 4 +-
.../src/hooks/useGlobalKeyboardListener.ts | 5 +-
.../manager/src/hooks/useInitialRequests.ts | 2 +-
.../src/hooks/useIsResourceRestricted.ts | 2 +-
packages/manager/src/hooks/useOrder.test.tsx | 2 +-
packages/manager/src/hooks/useOrder.ts | 5 +-
packages/manager/src/hooks/usePagination.ts | 5 +-
.../useRestrictedGlobalGrantCheck.test.ts | 4 +-
.../hooks/useRestrictedGlobalGrantCheck.ts | 2 +-
.../manager/src/queries/account/account.ts | 2 +-
.../manager/src/queries/account/agreements.ts | 2 +-
.../manager/src/queries/account/payment.ts | 2 +-
.../manager/src/queries/account/settings.ts | 2 +-
packages/manager/src/queries/account/users.ts | 2 +-
.../src/queries/databases/databases.ts | 2 +-
packages/manager/src/queries/domains.ts | 2 +-
.../manager/src/queries/entityTransfers.ts | 2 +-
packages/manager/src/queries/firewalls.ts | 2 +-
packages/manager/src/queries/images.ts | 2 +-
packages/manager/src/queries/kubernetes.ts | 2 +-
.../manager/src/queries/linodes/linodes.ts | 2 +-
packages/manager/src/queries/nodebalancers.ts | 2 +-
.../manager/src/queries/placementGroups.ts | 2 +-
.../src/queries/{ => profile}/preferences.ts | 29 +++----
.../src/queries/{ => profile}/profile.ts | 40 +++++----
.../src/queries/profile/securityQuestions.ts | 79 +++++++++++++++++
.../src/queries/{ => profile}/tokens.ts | 0
.../manager/src/queries/securityQuestions.ts | 87 -------------------
.../manager/src/queries/volumes/volumes.ts | 2 +-
packages/manager/src/useSetupFeatureFlags.ts | 2 +-
packages/manager/src/utilities/theme.ts | 2 +-
176 files changed, 347 insertions(+), 312 deletions(-)
create mode 100644 packages/manager/.changeset/pr-10543-tech-stories-1717514648816.md
rename packages/manager/src/queries/{ => profile}/preferences.ts (66%)
rename packages/manager/src/queries/{ => profile}/profile.ts (94%)
create mode 100644 packages/manager/src/queries/profile/securityQuestions.ts
rename packages/manager/src/queries/{ => profile}/tokens.ts (100%)
delete mode 100644 packages/manager/src/queries/securityQuestions.ts
diff --git a/packages/manager/.changeset/pr-10543-tech-stories-1717514648816.md b/packages/manager/.changeset/pr-10543-tech-stories-1717514648816.md
new file mode 100644
index 00000000000..63ab16b1ed6
--- /dev/null
+++ b/packages/manager/.changeset/pr-10543-tech-stories-1717514648816.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+Query Key Factory for Security Questions and Preferences ([#10543](https://github.com/linode/manager/pull/10543))
diff --git a/packages/manager/src/MainContent.tsx b/packages/manager/src/MainContent.tsx
index e60ef779999..c74fd368483 100644
--- a/packages/manager/src/MainContent.tsx
+++ b/packages/manager/src/MainContent.tsx
@@ -21,7 +21,10 @@ import {
} from 'src/features/NotificationCenter/NotificationContext';
import { TopMenu } from 'src/features/TopMenu/TopMenu';
import { useFlags } from 'src/hooks/useFlags';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
import { ENABLE_MAINTENANCE_MODE } from './constants';
import { complianceUpdateContext } from './context/complianceUpdateContext';
@@ -32,7 +35,7 @@ import { useIsACLBEnabled } from './features/LoadBalancers/utils';
import { useIsPlacementGroupsEnabled } from './features/PlacementGroups/utils';
import { useGlobalErrors } from './hooks/useGlobalErrors';
import { useAccountSettings } from './queries/account/settings';
-import { useProfile } from './queries/profile';
+import { useProfile } from './queries/profile/profile';
const useStyles = makeStyles()((theme: Theme) => ({
activationWrapper: {
diff --git a/packages/manager/src/components/AccessPanel/UserSSHKeyPanel.tsx b/packages/manager/src/components/AccessPanel/UserSSHKeyPanel.tsx
index ac3d3805786..c3c8d41ebf4 100644
--- a/packages/manager/src/components/AccessPanel/UserSSHKeyPanel.tsx
+++ b/packages/manager/src/components/AccessPanel/UserSSHKeyPanel.tsx
@@ -15,7 +15,7 @@ import { Typography } from 'src/components/Typography';
import { CreateSSHKeyDrawer } from 'src/features/Profile/SSHKeys/CreateSSHKeyDrawer';
import { usePagination } from 'src/hooks/usePagination';
import { useAccountUsers } from 'src/queries/account/users';
-import { useProfile, useSSHKeysQuery } from 'src/queries/profile';
+import { useProfile, useSSHKeysQuery } from 'src/queries/profile/profile';
import { truncateAndJoinList } from 'src/utilities/stringUtils';
import { GravatarByEmail } from '../GravatarByEmail';
diff --git a/packages/manager/src/components/DateTimeDisplay/DateTimeDisplay.tsx b/packages/manager/src/components/DateTimeDisplay/DateTimeDisplay.tsx
index d40e6deabb7..33d66afc056 100644
--- a/packages/manager/src/components/DateTimeDisplay/DateTimeDisplay.tsx
+++ b/packages/manager/src/components/DateTimeDisplay/DateTimeDisplay.tsx
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Typography } from 'src/components/Typography';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { TimeInterval, formatDate } from 'src/utilities/formatDate';
export interface DateTimeDisplayProps {
diff --git a/packages/manager/src/components/DeletionDialog/DeletionDialog.tsx b/packages/manager/src/components/DeletionDialog/DeletionDialog.tsx
index 3fa23cb336d..b33df97103d 100644
--- a/packages/manager/src/components/DeletionDialog/DeletionDialog.tsx
+++ b/packages/manager/src/components/DeletionDialog/DeletionDialog.tsx
@@ -7,7 +7,7 @@ import { Notice } from 'src/components/Notice/Notice';
import { TypeToConfirm } from 'src/components/TypeToConfirm/TypeToConfirm';
import { Typography } from 'src/components/Typography';
import { titlecase } from 'src/features/Linodes/presentation';
-import { usePreferences } from 'src/queries/preferences';
+import { usePreferences } from 'src/queries/profile/preferences';
import { capitalize } from 'src/utilities/capitalize';
import { DialogProps } from '../Dialog/Dialog';
diff --git a/packages/manager/src/components/MainContentBanner.tsx b/packages/manager/src/components/MainContentBanner.tsx
index e639ce257b6..1746e4107fd 100644
--- a/packages/manager/src/components/MainContentBanner.tsx
+++ b/packages/manager/src/components/MainContentBanner.tsx
@@ -5,7 +5,10 @@ import * as React from 'react';
import { Link } from 'src/components/Link';
import { Typography } from 'src/components/Typography';
import { useFlags } from 'src/hooks/useFlags';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
import { Box } from './Box';
diff --git a/packages/manager/src/components/MaintenanceBanner/MaintenanceBanner.tsx b/packages/manager/src/components/MaintenanceBanner/MaintenanceBanner.tsx
index 19668bd69bf..c01acbaf9ba 100644
--- a/packages/manager/src/components/MaintenanceBanner/MaintenanceBanner.tsx
+++ b/packages/manager/src/components/MaintenanceBanner/MaintenanceBanner.tsx
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
import { Notice } from 'src/components/Notice/Notice';
import { Typography } from 'src/components/Typography';
import { useAllAccountMaintenanceQuery } from 'src/queries/account/maintenance';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { formatDate } from 'src/utilities/formatDate';
import { isPast } from 'src/utilities/isPast';
diff --git a/packages/manager/src/components/OrderBy.tsx b/packages/manager/src/components/OrderBy.tsx
index a4afc094d55..f1fca35a051 100644
--- a/packages/manager/src/components/OrderBy.tsx
+++ b/packages/manager/src/components/OrderBy.tsx
@@ -5,7 +5,10 @@ import { useHistory, useLocation } from 'react-router-dom';
import { debounce } from 'throttle-debounce';
import { usePrevious } from 'src/hooks/usePrevious';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
import { ManagerPreferences } from 'src/types/ManagerPreferences';
import { getQueryParamsFromQueryString } from 'src/utilities/queryParams';
import {
diff --git a/packages/manager/src/components/PreferenceToggle/PreferenceToggle.tsx b/packages/manager/src/components/PreferenceToggle/PreferenceToggle.tsx
index b279ec36f83..b4494ec9a26 100644
--- a/packages/manager/src/components/PreferenceToggle/PreferenceToggle.tsx
+++ b/packages/manager/src/components/PreferenceToggle/PreferenceToggle.tsx
@@ -1,4 +1,7 @@
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
export interface PreferenceToggleProps {
preference: T;
diff --git a/packages/manager/src/components/TagCell/AddTag.tsx b/packages/manager/src/components/TagCell/AddTag.tsx
index a03008278e2..94ded840506 100644
--- a/packages/manager/src/components/TagCell/AddTag.tsx
+++ b/packages/manager/src/components/TagCell/AddTag.tsx
@@ -1,7 +1,7 @@
import { useQueryClient } from '@tanstack/react-query';
import * as React from 'react';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { updateTagsSuggestionsData, useTagSuggestions } from 'src/queries/tags';
import { Autocomplete } from '../Autocomplete/Autocomplete';
diff --git a/packages/manager/src/components/TagsInput/TagsInput.tsx b/packages/manager/src/components/TagsInput/TagsInput.tsx
index e58aa7c6951..0d82a178a4e 100644
--- a/packages/manager/src/components/TagsInput/TagsInput.tsx
+++ b/packages/manager/src/components/TagsInput/TagsInput.tsx
@@ -7,7 +7,7 @@ import Select, {
Item,
NoOptionsMessageProps,
} from 'src/components/EnhancedSelect/Select';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { updateTagsSuggestionsData, useTagSuggestions } from 'src/queries/tags';
import { getErrorMap } from 'src/utilities/errorUtils';
diff --git a/packages/manager/src/components/TypeToConfirmDialog/TypeToConfirmDialog.tsx b/packages/manager/src/components/TypeToConfirmDialog/TypeToConfirmDialog.tsx
index 0a4c937fac3..55e555abe50 100644
--- a/packages/manager/src/components/TypeToConfirmDialog/TypeToConfirmDialog.tsx
+++ b/packages/manager/src/components/TypeToConfirmDialog/TypeToConfirmDialog.tsx
@@ -10,7 +10,7 @@ import {
TypeToConfirm,
TypeToConfirmProps,
} from 'src/components/TypeToConfirm/TypeToConfirm';
-import { usePreferences } from 'src/queries/preferences';
+import { usePreferences } from 'src/queries/profile/preferences';
interface EntityInfo {
action?:
diff --git a/packages/manager/src/containers/preferences.container.ts b/packages/manager/src/containers/preferences.container.ts
index dbc04852d30..48736a01f65 100644
--- a/packages/manager/src/containers/preferences.container.ts
+++ b/packages/manager/src/containers/preferences.container.ts
@@ -1,6 +1,9 @@
import React from 'react';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
import { ManagerPreferences } from 'src/types/ManagerPreferences';
export interface PreferencesStateProps {
preferences?: ManagerPreferences;
diff --git a/packages/manager/src/containers/profile.container.ts b/packages/manager/src/containers/profile.container.ts
index 0e8a0d986cb..0ba0c0d0b29 100644
--- a/packages/manager/src/containers/profile.container.ts
+++ b/packages/manager/src/containers/profile.container.ts
@@ -3,7 +3,7 @@ import { APIError } from '@linode/api-v4/lib/types';
import * as React from 'react';
import { UseQueryResult } from '@tanstack/react-query';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
export interface WithProfileProps {
grants: UseQueryResult;
diff --git a/packages/manager/src/features/Account/AccountLanding.tsx b/packages/manager/src/features/Account/AccountLanding.tsx
index 165b7665143..df7e7fc20b4 100644
--- a/packages/manager/src/features/Account/AccountLanding.tsx
+++ b/packages/manager/src/features/Account/AccountLanding.tsx
@@ -16,7 +16,7 @@ import { useIsParentTokenExpired } from 'src/features/Account/SwitchAccounts/use
import { getRestrictedResourceText } from 'src/features/Account/utils';
import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
import { useAccount } from 'src/queries/account/account';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { sendSwitchAccountEvent } from 'src/utilities/analytics/customEventAnalytics';
import AccountLogins from './AccountLogins';
diff --git a/packages/manager/src/features/Account/AccountLogins.tsx b/packages/manager/src/features/Account/AccountLogins.tsx
index bbcf658fa40..055a28e1a32 100644
--- a/packages/manager/src/features/Account/AccountLogins.tsx
+++ b/packages/manager/src/features/Account/AccountLogins.tsx
@@ -19,7 +19,7 @@ import { Typography } from 'src/components/Typography';
import { useOrder } from 'src/hooks/useOrder';
import { usePagination } from 'src/hooks/usePagination';
import { useAccountLoginsQuery } from 'src/queries/account/logins';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import AccountLoginsTableRow from './AccountLoginsTableRow';
import { getRestrictedResourceText } from './utils';
diff --git a/packages/manager/src/features/Account/AccountLoginsTableRow.tsx b/packages/manager/src/features/Account/AccountLoginsTableRow.tsx
index 5763a6c8227..1fa71109e86 100644
--- a/packages/manager/src/features/Account/AccountLoginsTableRow.tsx
+++ b/packages/manager/src/features/Account/AccountLoginsTableRow.tsx
@@ -9,7 +9,7 @@ import { Link } from 'src/components/Link';
import { Status, StatusIcon } from 'src/components/StatusIcon/StatusIcon';
import { TableCell } from 'src/components/TableCell';
import { TableRow } from 'src/components/TableRow';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { capitalize } from 'src/utilities/capitalize';
import { formatDate } from 'src/utilities/formatDate';
diff --git a/packages/manager/src/features/Account/CloseAccountDialog.tsx b/packages/manager/src/features/Account/CloseAccountDialog.tsx
index e4d3cf748ae..9513c701954 100644
--- a/packages/manager/src/features/Account/CloseAccountDialog.tsx
+++ b/packages/manager/src/features/Account/CloseAccountDialog.tsx
@@ -9,7 +9,7 @@ import { Notice } from 'src/components/Notice/Notice';
import { TextField } from 'src/components/TextField';
import { TypeToConfirmDialog } from 'src/components/TypeToConfirmDialog/TypeToConfirmDialog';
import { Typography } from 'src/components/Typography';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
interface Props {
closeDialog: () => void;
diff --git a/packages/manager/src/features/Account/CloseAccountSetting.test.tsx b/packages/manager/src/features/Account/CloseAccountSetting.test.tsx
index 9117221c428..03555a3e0da 100644
--- a/packages/manager/src/features/Account/CloseAccountSetting.test.tsx
+++ b/packages/manager/src/features/Account/CloseAccountSetting.test.tsx
@@ -16,8 +16,8 @@ const queryMocks = vi.hoisted(() => ({
useProfile: vi.fn().mockReturnValue({}),
}));
-vi.mock('src/queries/profile', async () => {
- const actual = await vi.importActual('src/queries/profile');
+vi.mock('src/queries/profile/profile', async () => {
+ const actual = await vi.importActual('src/queries/profile/profile');
return {
...actual,
useProfile: queryMocks.useProfile,
diff --git a/packages/manager/src/features/Account/CloseAccountSetting.tsx b/packages/manager/src/features/Account/CloseAccountSetting.tsx
index 23e260969bb..8ef0230b21e 100644
--- a/packages/manager/src/features/Account/CloseAccountSetting.tsx
+++ b/packages/manager/src/features/Account/CloseAccountSetting.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
import { Accordion } from 'src/components/Accordion';
import { Button } from 'src/components/Button/Button';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import CloseAccountDialog from './CloseAccountDialog';
import {
diff --git a/packages/manager/src/features/Account/EnableObjectStorage.tsx b/packages/manager/src/features/Account/EnableObjectStorage.tsx
index f6562865e36..66f4b2ca586 100644
--- a/packages/manager/src/features/Account/EnableObjectStorage.tsx
+++ b/packages/manager/src/features/Account/EnableObjectStorage.tsx
@@ -13,7 +13,7 @@ import { TypeToConfirmDialog } from 'src/components/TypeToConfirmDialog/TypeToCo
import { Typography } from 'src/components/Typography';
import { updateAccountSettingsData } from 'src/queries/account/settings';
import { queryKey } from 'src/queries/objectStorage';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
interface Props {
object_storage: AccountSettings['object_storage'];
}
diff --git a/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx b/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
index 8848c6ad16a..6b40b3ced15 100644
--- a/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
+++ b/packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx
@@ -8,7 +8,7 @@ import { Status, StatusIcon } from 'src/components/StatusIcon/StatusIcon';
import { TableCell } from 'src/components/TableCell';
import { TableRow } from 'src/components/TableRow';
import { Tooltip } from 'src/components/Tooltip';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { capitalize } from 'src/utilities/capitalize';
import { parseAPIDate } from 'src/utilities/date';
import { formatDate } from 'src/utilities/formatDate';
diff --git a/packages/manager/src/features/Backups/BackupsCTA.tsx b/packages/manager/src/features/Backups/BackupsCTA.tsx
index 62a833ff4fb..6920e171d3e 100644
--- a/packages/manager/src/features/Backups/BackupsCTA.tsx
+++ b/packages/manager/src/features/Backups/BackupsCTA.tsx
@@ -6,8 +6,11 @@ import { StyledLinkButton } from 'src/components/Button/StyledLinkButton';
import { Typography } from 'src/components/Typography';
import { useAccountSettings } from 'src/queries/account/settings';
import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
-import { useProfile } from 'src/queries/profile';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
+import { useProfile } from 'src/queries/profile/profile';
import { BackupDrawer } from './BackupDrawer';
import { StyledPaper } from './BackupsCTA.styles';
diff --git a/packages/manager/src/features/Billing/BillingDetail.tsx b/packages/manager/src/features/Billing/BillingDetail.tsx
index dd2e7dd4807..6102f09b7c8 100644
--- a/packages/manager/src/features/Billing/BillingDetail.tsx
+++ b/packages/manager/src/features/Billing/BillingDetail.tsx
@@ -11,7 +11,7 @@ import { ErrorState } from 'src/components/ErrorState/ErrorState';
import { PAYPAL_CLIENT_ID } from 'src/constants';
import { useAccount } from 'src/queries/account/account';
import { useAllPaymentMethodsQuery } from 'src/queries/account/payment';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import BillingActivityPanel from './BillingPanels/BillingActivityPanel/BillingActivityPanel';
diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.tsx
index 8cbb72aa281..c0891c7d83d 100644
--- a/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/BillingActivityPanel/BillingActivityPanel.tsx
@@ -39,7 +39,7 @@ import {
useAllAccountInvoices,
useAllAccountPayments,
} from 'src/queries/account/billing';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { parseAPIDate } from 'src/utilities/date';
import { formatDate } from 'src/utilities/formatDate';
diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx
index b18adbaa7d2..b2ceee1d0cc 100644
--- a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx
@@ -14,7 +14,7 @@ import { TooltipIcon } from 'src/components/TooltipIcon';
import { Typography } from 'src/components/Typography';
import { useAccountManagement } from 'src/hooks/useAccountManagement';
import { useNotificationsQuery } from 'src/queries/account/notifications';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { isWithinDays } from 'src/utilities/date';
import { BillingPaper } from '../../BillingDetail';
diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx
index 56ce8a853e5..9ee3fec3f06 100644
--- a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx
@@ -23,7 +23,7 @@ import { Typography } from 'src/components/Typography';
import { getRestrictedResourceText } from 'src/features/Account/utils';
import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
import { useAccount } from 'src/queries/account/account';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { isCreditCardExpired } from 'src/utilities/creditCard';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
diff --git a/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/ContactInformation.test.tsx b/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/ContactInformation.test.tsx
index 59a2e8b65ec..f536dda3c10 100644
--- a/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/ContactInformation.test.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/ContactInformation.test.tsx
@@ -29,8 +29,8 @@ const props = {
zip: '19106',
};
-vi.mock('src/queries/profile', async () => {
- const actual = await vi.importActual('src/queries/profile');
+vi.mock('src/queries/profile/profile', async () => {
+ const actual = await vi.importActual('src/queries/profile/profile');
return {
...actual,
useGrants: queryMocks.useGrants,
diff --git a/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx b/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx
index 7fb93414ed6..3c2fe20117d 100644
--- a/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx
@@ -12,7 +12,7 @@ import { getRestrictedResourceText } from 'src/features/Account/utils';
import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
import { useAccount, useMutateAccount } from 'src/queries/account/account';
import { useNotificationsQuery } from 'src/queries/account/notifications';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getErrorMap } from 'src/utilities/errorUtils';
interface Props {
diff --git a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx
index ee1d2bbed88..de74330f0df 100644
--- a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx
@@ -13,7 +13,7 @@ import { Typography } from 'src/components/Typography';
import { MAXIMUM_PAYMENT_METHODS } from 'src/constants';
import { getRestrictedResourceText } from 'src/features/Account/utils';
import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import GooglePayChip from '../GooglePayChip';
import { PayPalChip } from '../PayPalChip';
diff --git a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PaymentInformation.test.tsx b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PaymentInformation.test.tsx
index 69ab5d5627d..44253932d73 100644
--- a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PaymentInformation.test.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PaymentInformation.test.tsx
@@ -25,8 +25,8 @@ const queryMocks = vi.hoisted(() => ({
useProfile: vi.fn().mockReturnValue({}),
}));
-vi.mock('src/queries/profile', async () => {
- const actual = await vi.importActual('src/queries/profile');
+vi.mock('src/queries/profile/profile', async () => {
+ const actual = await vi.importActual('src/queries/profile/profile');
return {
...actual,
useGrants: queryMocks.useGrants,
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/RestoreFromBackupDialog.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/RestoreFromBackupDialog.tsx
index 96f69df113b..f4ea747f158 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/RestoreFromBackupDialog.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseBackups/RestoreFromBackupDialog.tsx
@@ -8,7 +8,7 @@ import { Notice } from 'src/components/Notice/Notice';
import { TypeToConfirmDialog } from 'src/components/TypeToConfirmDialog/TypeToConfirmDialog';
import { Typography } from 'src/components/Typography';
import { useRestoreFromBackupMutation } from 'src/queries/databases/databases';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { formatDate } from 'src/utilities/formatDate';
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx
index 5f7674501e9..70594ad618c 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx
@@ -4,7 +4,7 @@ import * as React from 'react';
import { Divider } from 'src/components/Divider';
import { Typography } from 'src/components/Typography';
import { Paper } from 'src/components/Paper';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import AccessControls from '../AccessControls';
import DatabaseSettingsDeleteClusterDialog from './DatabaseSettingsDeleteClusterDialog';
diff --git a/packages/manager/src/features/Databases/DatabaseLanding/DatabaseRow.tsx b/packages/manager/src/features/Databases/DatabaseLanding/DatabaseRow.tsx
index 7ce00cb3ed6..5646cb54753 100644
--- a/packages/manager/src/features/Databases/DatabaseLanding/DatabaseRow.tsx
+++ b/packages/manager/src/features/Databases/DatabaseLanding/DatabaseRow.tsx
@@ -11,7 +11,7 @@ import { Chip } from 'src/components/Chip';
import { Hidden } from 'src/components/Hidden';
import { TableCell } from 'src/components/TableCell';
import { TableRow } from 'src/components/TableRow';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { isWithinDays, parseAPIDate } from 'src/utilities/date';
import { formatDate } from 'src/utilities/formatDate';
diff --git a/packages/manager/src/features/Domains/CloneDomainDrawer.tsx b/packages/manager/src/features/Domains/CloneDomainDrawer.tsx
index dc5158b9fec..ff6345ffe27 100644
--- a/packages/manager/src/features/Domains/CloneDomainDrawer.tsx
+++ b/packages/manager/src/features/Domains/CloneDomainDrawer.tsx
@@ -11,7 +11,7 @@ import { TextField } from 'src/components/TextField';
import { FormControlLabel } from 'src/components/FormControlLabel';
import { RadioGroup } from 'src/components/RadioGroup';
import { useCloneDomainMutation } from 'src/queries/domains';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
interface CloneDomainDrawerProps {
domain: Domain | undefined;
diff --git a/packages/manager/src/features/Domains/CreateDomain/CreateDomain.tsx b/packages/manager/src/features/Domains/CreateDomain/CreateDomain.tsx
index b96d33aaefa..a92bb23da93 100644
--- a/packages/manager/src/features/Domains/CreateDomain/CreateDomain.tsx
+++ b/packages/manager/src/features/Domains/CreateDomain/CreateDomain.tsx
@@ -30,7 +30,7 @@ import { reportException } from 'src/exceptionReporting';
import { LinodeSelect } from 'src/features/Linodes/LinodeSelect/LinodeSelect';
import { NodeBalancerSelect } from 'src/features/NodeBalancers/NodeBalancerSelect';
import { useCreateDomainMutation } from 'src/queries/domains';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { sendCreateDomainEvent } from 'src/utilities/analytics/customEventAnalytics';
import { getErrorMap } from 'src/utilities/errorUtils';
import {
diff --git a/packages/manager/src/features/Domains/DomainZoneImportDrawer.tsx b/packages/manager/src/features/Domains/DomainZoneImportDrawer.tsx
index fa574a15065..0a59f0428a7 100644
--- a/packages/manager/src/features/Domains/DomainZoneImportDrawer.tsx
+++ b/packages/manager/src/features/Domains/DomainZoneImportDrawer.tsx
@@ -8,7 +8,7 @@ import { Drawer } from 'src/components/Drawer';
import { Notice } from 'src/components/Notice/Notice';
import { TextField } from 'src/components/TextField';
import { useImportZoneMutation } from 'src/queries/domains';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { getErrorMap } from 'src/utilities/errorUtils';
interface DomainZoneImportDrawerProps {
diff --git a/packages/manager/src/features/Domains/DomainsLanding.tsx b/packages/manager/src/features/Domains/DomainsLanding.tsx
index c93915fb91f..d50380ec715 100644
--- a/packages/manager/src/features/Domains/DomainsLanding.tsx
+++ b/packages/manager/src/features/Domains/DomainsLanding.tsx
@@ -27,7 +27,7 @@ import {
useUpdateDomainMutation,
} from 'src/queries/domains';
import { useLinodesQuery } from 'src/queries/linodes/linodes';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { CloneDomainDrawer } from './CloneDomainDrawer';
diff --git a/packages/manager/src/features/Domains/EditDomainDrawer.tsx b/packages/manager/src/features/Domains/EditDomainDrawer.tsx
index bec7a26e1c7..14c2c3c0c31 100644
--- a/packages/manager/src/features/Domains/EditDomainDrawer.tsx
+++ b/packages/manager/src/features/Domains/EditDomainDrawer.tsx
@@ -12,7 +12,7 @@ import { RadioGroup } from 'src/components/RadioGroup';
import { TagsInput } from 'src/components/TagsInput/TagsInput';
import { TextField } from 'src/components/TextField';
import { useUpdateDomainMutation } from 'src/queries/domains';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { getErrorMap } from 'src/utilities/errorUtils';
import { handleFormikBlur } from 'src/utilities/formikTrimUtil';
import {
diff --git a/packages/manager/src/features/EntityTransfers/EntityTransfersLanding/ConfirmTransferDialog.tsx b/packages/manager/src/features/EntityTransfers/EntityTransfersLanding/ConfirmTransferDialog.tsx
index 3b935f3511e..27f7057130d 100644
--- a/packages/manager/src/features/EntityTransfers/EntityTransfersLanding/ConfirmTransferDialog.tsx
+++ b/packages/manager/src/features/EntityTransfers/EntityTransfersLanding/ConfirmTransferDialog.tsx
@@ -17,7 +17,7 @@ import {
queryKey,
useTransferQuery,
} from 'src/queries/entityTransfers';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { sendEntityTransferReceiveEvent } from 'src/utilities/analytics/customEventAnalytics';
import { capitalize } from 'src/utilities/capitalize';
import { parseAPIDate } from 'src/utilities/date';
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx
index 1ae36cb4743..5efc15e910b 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx
@@ -14,7 +14,7 @@ import {
useAddFirewallDeviceMutation,
useAllFirewallsQuery,
} from 'src/queries/firewalls';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { getEntityIdsByPermission } from 'src/utilities/grants';
import { sanitizeHTML } from 'src/utilities/sanitizeHTML';
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.tsx
index c867c4c1f67..b2698e00c3a 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.tsx
@@ -17,7 +17,7 @@ import {
useAllFirewallsQuery,
} from 'src/queries/firewalls';
import { queryKey } from 'src/queries/nodebalancers';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { getEntityIdsByPermission } from 'src/utilities/grants';
import { sanitizeHTML } from 'src/utilities/sanitizeHTML';
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/index.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/index.tsx
index 3b44b84ab13..f0e58906668 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/index.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/index.tsx
@@ -12,7 +12,7 @@ import { TabPanels } from 'src/components/Tabs/TabPanels';
import { Tabs } from 'src/components/Tabs/Tabs';
import { useAllFirewallDevicesQuery } from 'src/queries/firewalls';
import { useFirewallQuery, useMutateFirewall } from 'src/queries/firewalls';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { getErrorStringOrDefault } from 'src/utilities/errorUtils';
import { checkIfUserCanModifyFirewall } from '../shared';
diff --git a/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.tsx
index 24b0e3efdb5..08be0d94aae 100644
--- a/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.tsx
@@ -34,7 +34,7 @@ import {
} from 'src/queries/firewalls';
import { queryKey as linodesQueryKey } from 'src/queries/linodes/linodes';
import { queryKey as nodebalancersQueryKey } from 'src/queries/nodebalancers';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { sendLinodeCreateFormStepEvent } from 'src/utilities/analytics/formEventAnalytics';
import { getErrorMap } from 'src/utilities/errorUtils';
import {
diff --git a/packages/manager/src/features/Firewalls/FirewallLanding/FirewallActionMenu.tsx b/packages/manager/src/features/Firewalls/FirewallLanding/FirewallActionMenu.tsx
index 26611f72110..1d97f27a09e 100644
--- a/packages/manager/src/features/Firewalls/FirewallLanding/FirewallActionMenu.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallLanding/FirewallActionMenu.tsx
@@ -5,7 +5,7 @@ import * as React from 'react';
import { Action, ActionMenu } from 'src/components/ActionMenu/ActionMenu';
import { InlineMenuAction } from 'src/components/InlineMenuAction/InlineMenuAction';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { checkIfUserCanModifyFirewall } from '../shared';
diff --git a/packages/manager/src/features/GlobalNotifications/EmailBounce.tsx b/packages/manager/src/features/GlobalNotifications/EmailBounce.tsx
index 48167eb63ce..65d4a952805 100644
--- a/packages/manager/src/features/GlobalNotifications/EmailBounce.tsx
+++ b/packages/manager/src/features/GlobalNotifications/EmailBounce.tsx
@@ -10,7 +10,7 @@ import { Notice } from 'src/components/Notice/Notice';
import { Typography } from 'src/components/Typography';
import { useAccount, useMutateAccount } from 'src/queries/account/account';
import { useNotificationsQuery } from 'src/queries/account/notifications';
-import { useMutateProfile, useProfile } from 'src/queries/profile';
+import { useMutateProfile, useProfile } from 'src/queries/profile/profile';
import { StyledGrid } from './EmailBounce.styles';
diff --git a/packages/manager/src/features/GlobalNotifications/GlobalNotifications.tsx b/packages/manager/src/features/GlobalNotifications/GlobalNotifications.tsx
index 69613c55293..756ad8b912e 100644
--- a/packages/manager/src/features/GlobalNotifications/GlobalNotifications.tsx
+++ b/packages/manager/src/features/GlobalNotifications/GlobalNotifications.tsx
@@ -7,8 +7,8 @@ import { switchAccountSessionContext } from 'src/context/switchAccountSessionCon
import { SwitchAccountSessionDialog } from 'src/features/Account/SwitchAccounts/SwitchAccountSessionDialog';
import { useDismissibleNotifications } from 'src/hooks/useDismissibleNotifications';
import { useFlags } from 'src/hooks/useFlags';
-import { useProfile } from 'src/queries/profile';
-import { useSecurityQuestions } from 'src/queries/securityQuestions';
+import { useProfile } from 'src/queries/profile/profile';
+import { useSecurityQuestions } from 'src/queries/profile/securityQuestions';
import { SessionExpirationDialog } from '../Account/SwitchAccounts/SessionExpirationDialog';
import { APIMaintenanceBanner } from './APIMaintenanceBanner';
diff --git a/packages/manager/src/features/Images/ImageRow.tsx b/packages/manager/src/features/Images/ImageRow.tsx
index e3eee26d2fc..f4cec9bf9f1 100644
--- a/packages/manager/src/features/Images/ImageRow.tsx
+++ b/packages/manager/src/features/Images/ImageRow.tsx
@@ -6,7 +6,7 @@ import { Hidden } from 'src/components/Hidden';
import { TableCell } from 'src/components/TableCell';
import { TableRow } from 'src/components/TableRow';
import { Typography } from 'src/components/Typography';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { capitalizeAllWords } from 'src/utilities/capitalize';
import { formatDate } from 'src/utilities/formatDate';
diff --git a/packages/manager/src/features/Images/ImageUpload.tsx b/packages/manager/src/features/Images/ImageUpload.tsx
index 704a0bce61a..16f1a318504 100644
--- a/packages/manager/src/features/Images/ImageUpload.tsx
+++ b/packages/manager/src/features/Images/ImageUpload.tsx
@@ -32,7 +32,7 @@ import {
useMutateAccountAgreements,
} from 'src/queries/account/agreements';
import { useUploadImageMutation } from 'src/queries/images';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { setPendingUpload } from 'src/store/pendingUpload';
import { getGDPRDetails } from 'src/utilities/formatRegion';
diff --git a/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.tsx b/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.tsx
index 9bd56e55c8b..d32eca891ae 100644
--- a/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.tsx
+++ b/packages/manager/src/features/Images/ImagesCreate/CreateImageTab.tsx
@@ -29,7 +29,7 @@ import { useEventsPollingActions } from 'src/queries/events/events';
import { useCreateImageMutation } from 'src/queries/images';
import { useAllLinodeDisksQuery } from 'src/queries/linodes/disks';
import { useLinodeQuery } from 'src/queries/linodes/linodes';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
export const CreateImageTab = () => {
diff --git a/packages/manager/src/features/Images/utils.ts b/packages/manager/src/features/Images/utils.ts
index cb7b2efed85..193eda19887 100644
--- a/packages/manager/src/features/Images/utils.ts
+++ b/packages/manager/src/features/Images/utils.ts
@@ -1,4 +1,4 @@
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import type { Image, Linode } from '@linode/api-v4';
diff --git a/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx b/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx
index 874229f9a5a..16d3f07758e 100644
--- a/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx
+++ b/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx
@@ -11,7 +11,7 @@ import { Notice } from 'src/components/Notice/Notice';
import { RenderGuard } from 'src/components/RenderGuard';
import { EUAgreementCheckbox } from 'src/features/Account/Agreements/EUAgreementCheckbox';
import { useAccountAgreements } from 'src/queries/account/agreements';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useSpecificTypes } from 'src/queries/types';
import { extendTypesQueryResult } from 'src/utilities/extendType';
import { getGDPRDetails } from 'src/utilities/formatRegion';
diff --git a/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx b/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx
index 8e19675c618..6569ab3ce14 100644
--- a/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx
+++ b/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx
@@ -14,7 +14,7 @@ import { useIsDiskEncryptionFeatureEnabled } from 'src/components/DiskEncryption
import { Link } from 'src/components/Link';
import { Typography, TypographyProps } from 'src/components/Typography';
import { AccessTable } from 'src/features/Linodes/AccessTable';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { pluralize } from 'src/utilities/pluralize';
import { encryptionStatusTestId } from '../Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable';
diff --git a/packages/manager/src/features/Linodes/LinodeEntityDetailFooter.tsx b/packages/manager/src/features/Linodes/LinodeEntityDetailFooter.tsx
index 02ca88438f7..30d8a7313f2 100644
--- a/packages/manager/src/features/Linodes/LinodeEntityDetailFooter.tsx
+++ b/packages/manager/src/features/Linodes/LinodeEntityDetailFooter.tsx
@@ -5,7 +5,7 @@ import * as React from 'react';
import { TagCell } from 'src/components/TagCell/TagCell';
import { useLinodeUpdateMutation } from 'src/queries/linodes/linodes';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { formatDate } from 'src/utilities/formatDate';
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/SelectBackupPanel.tsx b/packages/manager/src/features/Linodes/LinodesCreate/SelectBackupPanel.tsx
index fafb7e11394..e95328235d5 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/SelectBackupPanel.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/SelectBackupPanel.tsx
@@ -12,7 +12,7 @@ import { Notice } from 'src/components/Notice/Notice';
import { Paper } from 'src/components/Paper';
import { SelectionCard } from 'src/components/SelectionCard/SelectionCard';
import { Typography } from 'src/components/Typography';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { formatDate } from 'src/utilities/formatDate';
export const aggregateBackups = (
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.tsx
index 5e445f5efdc..0ed0f699554 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.tsx
@@ -18,7 +18,7 @@ import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
import { Typography } from 'src/components/Typography';
import { useLinodeBackupsQuery } from 'src/queries/linodes/backups';
import { useLinodeQuery } from 'src/queries/linodes/linodes';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { useTypeQuery } from 'src/queries/types';
import { getMonthlyBackupsPrice } from 'src/utilities/pricing/backups';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/ScheduleSettings.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/ScheduleSettings.tsx
index 46c447e94e1..ca78e553f1a 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/ScheduleSettings.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/ScheduleSettings.tsx
@@ -14,7 +14,7 @@ import {
useLinodeQuery,
useLinodeUpdateMutation,
} from 'src/queries/linodes/linodes';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getUserTimezone } from 'src/utilities/getUserTimezone';
import { initWindows } from 'src/utilities/initWindows';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigs.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigs.tsx
index 603b6bc411c..1b1f25cbe3a 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigs.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigs.tsx
@@ -16,7 +16,7 @@ import { TableHead } from 'src/components/TableHead';
import { TableRow } from 'src/components/TableRow';
import { TableSortCell } from 'src/components/TableSortCell';
import { useAllLinodeConfigsQuery } from 'src/queries/linodes/configs';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { sendLinodeConfigurationDocsEvent } from 'src/utilities/analytics/customEventAnalytics';
import { BootConfigDialog } from './BootConfigDialog';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsActionMenu.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsActionMenu.tsx
index 04e0c74e5cb..35b15fc5219 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsActionMenu.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewallsActionMenu.tsx
@@ -4,7 +4,7 @@ import { Action } from 'src/components/ActionMenu/ActionMenu';
import { InlineMenuAction } from 'src/components/InlineMenuAction/InlineMenuAction';
import { noPermissionTooltipText } from 'src/features/Firewalls/FirewallLanding/FirewallActionMenu';
import { checkIfUserCanModifyFirewall } from 'src/features/Firewalls/shared';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
interface LinodeFirewallsActionMenuProps {
firewallID: number;
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx
index 3fbbb76e73e..c79628fb224 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx
@@ -23,7 +23,7 @@ import {
useLinodeStatsByDate,
useLinodeTransferByDate,
} from 'src/queries/linodes/stats';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { readableBytes } from 'src/utilities/unitConversions';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/LinodeRebuildDialog.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/LinodeRebuildDialog.tsx
index 1a85ffba943..715c8a7b878 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/LinodeRebuildDialog.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/LinodeRebuildDialog.tsx
@@ -6,7 +6,7 @@ import EnhancedSelect, { Item } from 'src/components/EnhancedSelect/Select';
import { Notice } from 'src/components/Notice/Notice';
import { Typography } from 'src/components/Typography';
import { useLinodeQuery } from 'src/queries/linodes/linodes';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { HostMaintenanceError } from '../HostMaintenanceError';
import { LinodePermissionsError } from '../LinodePermissionsError';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx
index 9ac76f6f83d..e0155d4adc5 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx
@@ -21,7 +21,7 @@ import { regionSupportsMetadata } from 'src/features/Linodes/LinodesCreate/utili
import { useFlags } from 'src/hooks/useFlags';
import { useEventsPollingActions } from 'src/queries/events/events';
import { useAllImagesQuery } from 'src/queries/images';
-import { usePreferences } from 'src/queries/preferences';
+import { usePreferences } from 'src/queries/profile/preferences';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import {
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromStackScript.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromStackScript.tsx
index a557df4d25a..fe6641fa1ce 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromStackScript.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromStackScript.tsx
@@ -25,7 +25,7 @@ import { useStackScript } from 'src/hooks/useStackScript';
import { listToItemsByID } from 'src/queries/base';
import { useEventsPollingActions } from 'src/queries/events/events';
import { useAllImagesQuery } from 'src/queries/images';
-import { usePreferences } from 'src/queries/preferences';
+import { usePreferences } from 'src/queries/profile/preferences';
import { filterImagesByType } from 'src/store/image/image.helpers';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import {
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx
index cb09d9ca5f8..ec80ceab472 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx
@@ -17,7 +17,7 @@ import {
useLinodeQuery,
useLinodeRescueMutation,
} from 'src/queries/linodes/linodes';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { useAllVolumesQuery } from 'src/queries/volumes/volumes';
import {
DevicesAsStrings,
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeResize/LinodeResize.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeResize/LinodeResize.tsx
index 3fde980bb26..6d47d62e872 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeResize/LinodeResize.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeResize/LinodeResize.tsx
@@ -26,7 +26,7 @@ import {
useLinodeQuery,
useLinodeResizeMutation,
} from 'src/queries/linodes/linodes';
-import { usePreferences } from 'src/queries/preferences';
+import { usePreferences } from 'src/queries/profile/preferences';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { useAllTypes } from 'src/queries/types';
import { extendType } from 'src/utilities/extendType';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.tsx
index cbf0a15c7b5..ccd8d36357b 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.tsx
@@ -5,7 +5,7 @@ import { AccessPanel } from 'src/components/AccessPanel/AccessPanel';
import { Item } from 'src/components/EnhancedSelect/Select';
import { ImageSelect } from 'src/features/Images/ImageSelect';
import { useAllImagesQuery } from 'src/queries/images';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { LinodePermissionsError } from '../LinodePermissionsError';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettings.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettings.tsx
index 892dec45064..fa5ea84dd97 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettings.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettings.tsx
@@ -1,7 +1,7 @@
import * as React from 'react';
import { useParams } from 'react-router-dom';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { LinodeSettingsAlertsPanel } from './LinodeSettingsAlertsPanel';
import { LinodeSettingsDeletePanel } from './LinodeSettingsDeletePanel';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDisks.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDisks.tsx
index 9bec03d9b25..5fda62cd70f 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDisks.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDisks.tsx
@@ -20,7 +20,7 @@ import { TableSortCell } from 'src/components/TableSortCell';
import { TooltipIcon } from 'src/components/TooltipIcon';
import { useAllLinodeDisksQuery } from 'src/queries/linodes/disks';
import { useLinodeQuery } from 'src/queries/linodes/linodes';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { sendEvent } from 'src/utilities/analytics/utils';
import { CreateDiskDrawer } from './CreateDiskDrawer';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/LinodeSummary.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/LinodeSummary.tsx
index 10b9bdbd9bf..2a38f1b9474 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/LinodeSummary.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/LinodeSummary.tsx
@@ -24,7 +24,7 @@ import {
useLinodeStats,
useLinodeStatsByDate,
} from 'src/queries/linodes/stats';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { setUpCharts } from 'src/utilities/charts';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import {
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/MigrationNotification.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/MigrationNotification.tsx
index af52fbcd5e8..c6ecfe0e849 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/MigrationNotification.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/MigrationNotification.tsx
@@ -9,7 +9,7 @@ import { ConfirmationDialog } from 'src/components/ConfirmationDialog/Confirmati
import { Notice } from 'src/components/Notice/Notice';
import { Typography } from 'src/components/Typography';
import { useDialog } from 'src/hooks/useDialog';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { capitalize } from 'src/utilities/capitalize';
import { parseAPIDate } from 'src/utilities/date';
import { formatDate } from 'src/utilities/formatDate';
diff --git a/packages/manager/src/features/Linodes/LinodesLanding/CardView.tsx b/packages/manager/src/features/Linodes/LinodesLanding/CardView.tsx
index 10253f3994b..667158a0c04 100644
--- a/packages/manager/src/features/Linodes/LinodesLanding/CardView.tsx
+++ b/packages/manager/src/features/Linodes/LinodesLanding/CardView.tsx
@@ -7,7 +7,7 @@ import { Typography } from 'src/components/Typography';
import { LinodeEntityDetail } from 'src/features/Linodes/LinodeEntityDetail';
import { useIsResourceRestricted } from 'src/hooks/useIsResourceRestricted';
import { useLinodeUpdateMutation } from 'src/queries/linodes/linodes';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { RenderLinodesProps } from './DisplayLinodes';
diff --git a/packages/manager/src/features/Linodes/MigrateLinode/MigrateLinode.tsx b/packages/manager/src/features/Linodes/MigrateLinode/MigrateLinode.tsx
index 12d70ec0025..b9a2986f3ef 100644
--- a/packages/manager/src/features/Linodes/MigrateLinode/MigrateLinode.tsx
+++ b/packages/manager/src/features/Linodes/MigrateLinode/MigrateLinode.tsx
@@ -30,7 +30,7 @@ import {
useLinodeMigrateMutation,
useLinodeQuery,
} from 'src/queries/linodes/linodes';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { useTypeQuery } from 'src/queries/types';
import { sendMigrationInitiatedEvent } from 'src/utilities/analytics/customEventAnalytics';
diff --git a/packages/manager/src/features/Longview/LongviewDetail/LongviewDetail.tsx b/packages/manager/src/features/Longview/LongviewDetail/LongviewDetail.tsx
index 99799d154f5..165276620e6 100644
--- a/packages/manager/src/features/Longview/LongviewDetail/LongviewDetail.tsx
+++ b/packages/manager/src/features/Longview/LongviewDetail/LongviewDetail.tsx
@@ -27,7 +27,7 @@ import {
LongviewTopProcesses,
} from 'src/features/Longview/request.types';
import { useAPIRequest } from 'src/hooks/useAPIRequest';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useClientLastUpdated } from '../shared/useClientLastUpdated';
import { Apache } from './DetailTabs/Apache/Apache';
diff --git a/packages/manager/src/features/Longview/LongviewLanding/LongviewClientHeader.tsx b/packages/manager/src/features/Longview/LongviewLanding/LongviewClientHeader.tsx
index 5ca99a981e0..5c43ea21b7b 100644
--- a/packages/manager/src/features/Longview/LongviewLanding/LongviewClientHeader.tsx
+++ b/packages/manager/src/features/Longview/LongviewLanding/LongviewClientHeader.tsx
@@ -11,7 +11,7 @@ import { DispatchProps } from 'src/containers/longview.container';
import withClientStats, {
Props as LVDataProps,
} from 'src/containers/longview.stats.container';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { formatDate } from 'src/utilities/formatDate';
import { formatUptime } from 'src/utilities/formatUptime';
diff --git a/packages/manager/src/features/Longview/LongviewLanding/LongviewClientRow.tsx b/packages/manager/src/features/Longview/LongviewLanding/LongviewClientRow.tsx
index 6af219628b4..c55a084bc15 100644
--- a/packages/manager/src/features/Longview/LongviewLanding/LongviewClientRow.tsx
+++ b/packages/manager/src/features/Longview/LongviewLanding/LongviewClientRow.tsx
@@ -10,7 +10,7 @@ import withLongviewClients, {
import withClientStats, {
Props as LVDataProps,
} from 'src/containers/longview.stats.container';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { useClientLastUpdated } from '../shared/useClientLastUpdated';
import { CPUGauge } from './Gauges/CPU';
diff --git a/packages/manager/src/features/Longview/LongviewLanding/LongviewClients.tsx b/packages/manager/src/features/Longview/LongviewLanding/LongviewClients.tsx
index ca4639b0c66..113752848f3 100644
--- a/packages/manager/src/features/Longview/LongviewLanding/LongviewClients.tsx
+++ b/packages/manager/src/features/Longview/LongviewLanding/LongviewClients.tsx
@@ -17,7 +17,7 @@ import withLongviewClients, {
Props as LongviewProps,
} from 'src/containers/longview.container';
import { useAccountSettings } from 'src/queries/account/settings';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { State as StatsState } from 'src/store/longviewStats/longviewStats.reducer';
import { MapState } from 'src/store/types';
diff --git a/packages/manager/src/features/Longview/LongviewLanding/LongviewPlans.tsx b/packages/manager/src/features/Longview/LongviewLanding/LongviewPlans.tsx
index 6a1d777ae9b..2ae13c75b47 100644
--- a/packages/manager/src/features/Longview/LongviewLanding/LongviewPlans.tsx
+++ b/packages/manager/src/features/Longview/LongviewLanding/LongviewPlans.tsx
@@ -22,7 +22,7 @@ import { TableRowError } from 'src/components/TableRowError/TableRowError';
import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
import { UseAPIRequest } from 'src/hooks/useAPIRequest';
import { useAccountSettings } from 'src/queries/account/settings';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import {
diff --git a/packages/manager/src/features/Longview/shared/TimeRangeSelect.tsx b/packages/manager/src/features/Longview/shared/TimeRangeSelect.tsx
index 4a81055c25c..680b10a42a2 100644
--- a/packages/manager/src/features/Longview/shared/TimeRangeSelect.tsx
+++ b/packages/manager/src/features/Longview/shared/TimeRangeSelect.tsx
@@ -6,7 +6,10 @@ import Select, {
BaseSelectProps,
Item,
} from 'src/components/EnhancedSelect/Select';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
interface Props
extends Omit<
diff --git a/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedChartPanel.tsx b/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedChartPanel.tsx
index 62a8f7f1e86..83bb9e33cba 100644
--- a/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedChartPanel.tsx
+++ b/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedChartPanel.tsx
@@ -14,7 +14,7 @@ import {
generateNetworkUnits,
} from 'src/features/Longview/shared/utilities';
import { useManagedStatsQuery } from 'src/queries/managed/managed';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { getUserTimezone } from 'src/utilities/getUserTimezone';
diff --git a/packages/manager/src/features/Managed/Monitors/IssueCalendar.tsx b/packages/manager/src/features/Managed/Monitors/IssueCalendar.tsx
index 0ea39a8aed1..22cd98fd1a9 100644
--- a/packages/manager/src/features/Managed/Monitors/IssueCalendar.tsx
+++ b/packages/manager/src/features/Managed/Monitors/IssueCalendar.tsx
@@ -2,7 +2,7 @@ import { ManagedIssue } from '@linode/api-v4';
import { DateTime } from 'luxon';
import * as React from 'react';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { parseAPIDate } from 'src/utilities/date';
import { getUserTimezone } from 'src/utilities/getUserTimezone';
diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerCreate.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerCreate.tsx
index f4c44a9f990..502d9f7e933 100644
--- a/packages/manager/src/features/NodeBalancers/NodeBalancerCreate.tsx
+++ b/packages/manager/src/features/NodeBalancers/NodeBalancerCreate.tsx
@@ -41,7 +41,7 @@ import {
useNodeBalancerTypesQuery,
useNodebalancerCreateMutation,
} from 'src/queries/nodebalancers';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { sendCreateNodeBalancerEvent } from 'src/utilities/analytics/customEventAnalytics';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerDetail.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerDetail.tsx
index 506e98e0c68..886043c757e 100644
--- a/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerDetail.tsx
+++ b/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerDetail.tsx
@@ -20,7 +20,7 @@ import {
useNodeBalancerQuery,
useNodebalancerUpdateMutation,
} from 'src/queries/nodebalancers';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { getErrorMap } from 'src/utilities/errorUtils';
import NodeBalancerConfigurations from './NodeBalancerConfigurations';
diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerFirewallsActionMenu.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerFirewallsActionMenu.tsx
index 9ecf185236c..74507f315f6 100644
--- a/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerFirewallsActionMenu.tsx
+++ b/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerFirewallsActionMenu.tsx
@@ -4,7 +4,7 @@ import { Action } from 'src/components/ActionMenu/ActionMenu';
import { InlineMenuAction } from 'src/components/InlineMenuAction/InlineMenuAction';
import { noPermissionTooltipText } from 'src/features/Firewalls/FirewallLanding/FirewallActionMenu';
import { checkIfUserCanModifyFirewall } from 'src/features/Firewalls/shared';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
interface Props {
firewallID: number;
diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/TablesPanel.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/TablesPanel.tsx
index b77813c7574..125386a85a0 100644
--- a/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/TablesPanel.tsx
+++ b/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/TablesPanel.tsx
@@ -20,7 +20,7 @@ import {
useNodeBalancerQuery,
useNodeBalancerStats,
} from 'src/queries/nodebalancers';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { getUserTimezone } from 'src/utilities/getUserTimezone';
import { formatNumber, getMetrics } from 'src/utilities/statMetrics';
diff --git a/packages/manager/src/features/NotificationCenter/NotificationData/useFormattedNotifications.tsx b/packages/manager/src/features/NotificationCenter/NotificationData/useFormattedNotifications.tsx
index 4e5f433385b..d67fdbb5807 100644
--- a/packages/manager/src/features/NotificationCenter/NotificationData/useFormattedNotifications.tsx
+++ b/packages/manager/src/features/NotificationCenter/NotificationData/useFormattedNotifications.tsx
@@ -17,7 +17,7 @@ import { complianceUpdateContext } from 'src/context/complianceUpdateContext';
import { reportException } from 'src/exceptionReporting';
import { useDismissibleNotifications } from 'src/hooks/useDismissibleNotifications';
import { useNotificationsQuery } from 'src/queries/account/notifications';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { formatDate } from 'src/utilities/formatDate';
diff --git a/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx b/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx
index 3301589c9f5..cd9f2f31979 100644
--- a/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx
+++ b/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx
@@ -11,7 +11,7 @@ import { Divider } from 'src/components/Divider';
import { Drawer } from 'src/components/Drawer';
import { Link } from 'src/components/Link';
import { Typography } from 'src/components/Typography';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { formatDate } from 'src/utilities/formatDate';
import { truncateMiddle } from 'src/utilities/truncate';
import { readableBytes } from 'src/utilities/unitConversions';
diff --git a/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx b/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx
index 4bb73143f48..70fb01f55b8 100644
--- a/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx
+++ b/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx
@@ -15,7 +15,7 @@ import { Typography } from 'src/components/Typography';
import { useAccountManagement } from 'src/hooks/useAccountManagement';
import { useFlags } from 'src/hooks/useFlags';
import { useObjectStorageClusters } from 'src/queries/objectStorage';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { isFeatureEnabled } from 'src/utilities/accountCapabilities';
import { formatDate } from 'src/utilities/formatDate';
diff --git a/packages/manager/src/features/ObjectStorage/BucketLanding/BucketLanding.tsx b/packages/manager/src/features/ObjectStorage/BucketLanding/BucketLanding.tsx
index af8178d9819..f3e6c7b16f7 100644
--- a/packages/manager/src/features/ObjectStorage/BucketLanding/BucketLanding.tsx
+++ b/packages/manager/src/features/ObjectStorage/BucketLanding/BucketLanding.tsx
@@ -26,7 +26,7 @@ import {
useObjectStorageBuckets,
useObjectStorageClusters,
} from 'src/queries/objectStorage';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { isFeatureEnabled } from 'src/utilities/accountCapabilities';
import {
diff --git a/packages/manager/src/features/ObjectStorage/BucketLanding/CreateBucketDrawer.tsx b/packages/manager/src/features/ObjectStorage/BucketLanding/CreateBucketDrawer.tsx
index f470c3d3d0f..11c89b01580 100644
--- a/packages/manager/src/features/ObjectStorage/BucketLanding/CreateBucketDrawer.tsx
+++ b/packages/manager/src/features/ObjectStorage/BucketLanding/CreateBucketDrawer.tsx
@@ -21,7 +21,7 @@ import {
useObjectStorageClusters,
useObjectStorageTypesQuery,
} from 'src/queries/objectStorage';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { isFeatureEnabled } from 'src/utilities/accountCapabilities';
import { sendCreateBucketEvent } from 'src/utilities/analytics/customEventAnalytics';
diff --git a/packages/manager/src/features/ObjectStorage/BucketLanding/OMC_BucketLanding.tsx b/packages/manager/src/features/ObjectStorage/BucketLanding/OMC_BucketLanding.tsx
index 748f532c4ed..ab2f8f2a12e 100644
--- a/packages/manager/src/features/ObjectStorage/BucketLanding/OMC_BucketLanding.tsx
+++ b/packages/manager/src/features/ObjectStorage/BucketLanding/OMC_BucketLanding.tsx
@@ -23,7 +23,7 @@ import {
useDeleteBucketWithRegionMutation,
useObjectStorageBuckets,
} from 'src/queries/objectStorage';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { isFeatureEnabled } from 'src/utilities/accountCapabilities';
import {
diff --git a/packages/manager/src/features/ObjectStorage/BucketLanding/OMC_CreateBucketDrawer.tsx b/packages/manager/src/features/ObjectStorage/BucketLanding/OMC_CreateBucketDrawer.tsx
index 5143f9bff11..1438e669c81 100644
--- a/packages/manager/src/features/ObjectStorage/BucketLanding/OMC_CreateBucketDrawer.tsx
+++ b/packages/manager/src/features/ObjectStorage/BucketLanding/OMC_CreateBucketDrawer.tsx
@@ -17,7 +17,7 @@ import {
useCreateBucketMutation,
useObjectStorageBuckets,
} from 'src/queries/objectStorage';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { isFeatureEnabled } from 'src/utilities/accountCapabilities';
import { sendCreateBucketEvent } from 'src/utilities/analytics/customEventAnalytics';
diff --git a/packages/manager/src/features/Profile/APITokens/APITokenTable.tsx b/packages/manager/src/features/Profile/APITokens/APITokenTable.tsx
index 66cce009e4e..84cb4fc7f28 100644
--- a/packages/manager/src/features/Profile/APITokens/APITokenTable.tsx
+++ b/packages/manager/src/features/Profile/APITokens/APITokenTable.tsx
@@ -21,11 +21,11 @@ import { PROXY_USER_RESTRICTED_TOOLTIP_TEXT } from 'src/features/Account/constan
import { SecretTokenDialog } from 'src/features/Profile/SecretTokenDialog/SecretTokenDialog';
import { useOrder } from 'src/hooks/useOrder';
import { usePagination } from 'src/hooks/usePagination';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import {
useAppTokensQuery,
usePersonalAccessTokensQuery,
-} from 'src/queries/tokens';
+} from 'src/queries/profile/tokens';
import { APITokenMenu } from './APITokenMenu';
import {
diff --git a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
index 7b23c2f67f7..38f9fa7c00b 100644
--- a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
+++ b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
@@ -16,22 +16,14 @@ const queryMocks = vi.hoisted(() => ({
useProfile: vi.fn().mockReturnValue({}),
}));
-vi.mock('src/queries/profile', async () => {
- const actual = await vi.importActual('src/queries/profile');
+vi.mock('src/queries/profile/profile', async () => {
+ const actual = await vi.importActual('src/queries/profile/profile');
return {
...actual,
useProfile: queryMocks.useProfile,
};
});
-vi.mock('src/queries/grants', async () => {
- const actual = await vi.importActual('src/queries/grants');
- return {
- ...actual,
- useGrants: queryMocks.useGrants,
- };
-});
-
const props = {
onClose: vi.fn(),
open: true,
diff --git a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.tsx b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.tsx
index 71c93899c2c..8ce9ba24bd7 100644
--- a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.tsx
+++ b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.tsx
@@ -18,8 +18,8 @@ import { ISO_DATETIME_NO_TZ_FORMAT } from 'src/constants';
import { AccessCell } from 'src/features/ObjectStorage/AccessKeyLanding/AccessCell';
import { VPC_READ_ONLY_TOOLTIP } from 'src/features/VPCs/constants';
import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
-import { useProfile } from 'src/queries/profile';
-import { useCreatePersonalAccessTokenMutation } from 'src/queries/tokens';
+import { useProfile } from 'src/queries/profile/profile';
+import { useCreatePersonalAccessTokenMutation } from 'src/queries/profile/tokens';
import { getErrorMap } from 'src/utilities/errorUtils';
import {
diff --git a/packages/manager/src/features/Profile/APITokens/EditAPITokenDrawer.tsx b/packages/manager/src/features/Profile/APITokens/EditAPITokenDrawer.tsx
index 2d351114ce3..c64ae31140a 100644
--- a/packages/manager/src/features/Profile/APITokens/EditAPITokenDrawer.tsx
+++ b/packages/manager/src/features/Profile/APITokens/EditAPITokenDrawer.tsx
@@ -6,7 +6,7 @@ import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
import { Drawer } from 'src/components/Drawer';
import { Notice } from 'src/components/Notice/Notice';
import { TextField } from 'src/components/TextField';
-import { useUpdatePersonalAccessTokenMutation } from 'src/queries/tokens';
+import { useUpdatePersonalAccessTokenMutation } from 'src/queries/profile/tokens';
import { getErrorMap } from 'src/utilities/errorUtils';
interface Props {
diff --git a/packages/manager/src/features/Profile/APITokens/RevokeTokenDialog.tsx b/packages/manager/src/features/Profile/APITokens/RevokeTokenDialog.tsx
index 5f0371fcb8d..039f2781ec4 100644
--- a/packages/manager/src/features/Profile/APITokens/RevokeTokenDialog.tsx
+++ b/packages/manager/src/features/Profile/APITokens/RevokeTokenDialog.tsx
@@ -8,7 +8,7 @@ import { Typography } from 'src/components/Typography';
import {
useRevokeAppAccessTokenMutation,
useRevokePersonalAccessTokenMutation,
-} from 'src/queries/tokens';
+} from 'src/queries/profile/tokens';
import { APITokenType } from './APITokenTable';
diff --git a/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.test.tsx b/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.test.tsx
index 2a5a4e7f6c7..7b1b44387e7 100644
--- a/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.test.tsx
+++ b/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.test.tsx
@@ -14,8 +14,8 @@ const queryMocks = vi.hoisted(() => ({
useProfile: vi.fn().mockReturnValue({}),
}));
-vi.mock('src/queries/profile', async () => {
- const actual = await vi.importActual('src/queries/profile');
+vi.mock('src/queries/profile/profile', async () => {
+ const actual = await vi.importActual('src/queries/profile/profile');
return {
...actual,
useProfile: queryMocks.useProfile,
diff --git a/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.tsx b/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.tsx
index 94339546e54..1d1744d43f2 100644
--- a/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.tsx
+++ b/packages/manager/src/features/Profile/APITokens/ViewAPITokenDrawer.tsx
@@ -8,7 +8,7 @@ import { TableHead } from 'src/components/TableHead';
import { TableRow } from 'src/components/TableRow';
import { AccessCell } from 'src/features/ObjectStorage/AccessKeyLanding/AccessCell';
import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import {
StyledAccessCell,
diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx
index 36ffc36ddd4..c0c759fc0e4 100644
--- a/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx
+++ b/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx
@@ -9,7 +9,7 @@ import { ErrorState } from 'src/components/ErrorState/ErrorState';
import { Link } from 'src/components/Link';
import { Paper } from 'src/components/Paper';
import { Typography } from 'src/components/Typography';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { PhoneVerification } from './PhoneVerification/PhoneVerification';
import { ResetPassword } from './ResetPassword';
diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/PhoneVerification/PhoneVerification.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/PhoneVerification/PhoneVerification.tsx
index 351dc9ba7a8..4d94c22a06f 100644
--- a/packages/manager/src/features/Profile/AuthenticationSettings/PhoneVerification/PhoneVerification.tsx
+++ b/packages/manager/src/features/Profile/AuthenticationSettings/PhoneVerification/PhoneVerification.tsx
@@ -17,7 +17,7 @@ import {
useProfile,
useSendPhoneVerificationCodeMutation,
useVerifyPhoneVerificationCodeMutation,
-} from 'src/queries/profile';
+} from 'src/queries/profile/profile';
import {
StyledButtonContainer,
diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/RevokeTrustedDevicesDialog.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/RevokeTrustedDevicesDialog.tsx
index 0c11363f65c..7558603e818 100644
--- a/packages/manager/src/features/Profile/AuthenticationSettings/RevokeTrustedDevicesDialog.tsx
+++ b/packages/manager/src/features/Profile/AuthenticationSettings/RevokeTrustedDevicesDialog.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
import { Typography } from 'src/components/Typography';
-import { useRevokeTrustedDeviceMutation } from 'src/queries/profile';
+import { useRevokeTrustedDeviceMutation } from 'src/queries/profile/profile';
interface Props {
deviceId: number;
diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/SMSMessaging.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/SMSMessaging.tsx
index 77e4b7a5e4b..44c6969dcb7 100644
--- a/packages/manager/src/features/Profile/AuthenticationSettings/SMSMessaging.tsx
+++ b/packages/manager/src/features/Profile/AuthenticationSettings/SMSMessaging.tsx
@@ -9,8 +9,8 @@ import { ConfirmationDialog } from 'src/components/ConfirmationDialog/Confirmati
import { Link } from 'src/components/Link';
import { Notice } from 'src/components/Notice/Notice';
import { Typography } from 'src/components/Typography';
-import { useSMSOptOutMutation } from 'src/queries/profile';
-import { useProfile } from 'src/queries/profile';
+import { useSMSOptOutMutation } from 'src/queries/profile/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getFormattedNumber } from './PhoneVerification/helpers';
diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/SecurityQuestions/SecurityQuestions.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/SecurityQuestions/SecurityQuestions.tsx
index ad753e4c84e..d84d9002e53 100644
--- a/packages/manager/src/features/Profile/AuthenticationSettings/SecurityQuestions/SecurityQuestions.tsx
+++ b/packages/manager/src/features/Profile/AuthenticationSettings/SecurityQuestions/SecurityQuestions.tsx
@@ -12,7 +12,7 @@ import { Typography } from 'src/components/Typography';
import {
useMutateSecurityQuestions,
useSecurityQuestions,
-} from 'src/queries/securityQuestions';
+} from 'src/queries/profile/securityQuestions';
import { QuestionAndAnswerPair } from './QuestionAndAnswerPair';
import { getAnsweredQuestions, securityQuestionsToItems } from './utilities';
diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/TrustedDevices.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/TrustedDevices.tsx
index 1018568b59f..3279aa424e5 100644
--- a/packages/manager/src/features/Profile/AuthenticationSettings/TrustedDevices.tsx
+++ b/packages/manager/src/features/Profile/AuthenticationSettings/TrustedDevices.tsx
@@ -17,7 +17,7 @@ import { TableSortCell } from 'src/components/TableSortCell';
import { Typography } from 'src/components/Typography';
import { useOrder } from 'src/hooks/useOrder';
import { usePagination } from 'src/hooks/usePagination';
-import { useTrustedDevicesQuery } from 'src/queries/profile';
+import { useTrustedDevicesQuery } from 'src/queries/profile/profile';
import { RevokeTrustedDeviceDialog } from './RevokeTrustedDevicesDialog';
diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/DisableTwoFactorDialog.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/DisableTwoFactorDialog.tsx
index 95f722c9564..f60e346f1ec 100644
--- a/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/DisableTwoFactorDialog.tsx
+++ b/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/DisableTwoFactorDialog.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
import { Typography } from 'src/components/Typography';
-import { useDisableTwoFactorMutation } from 'src/queries/profile';
+import { useDisableTwoFactorMutation } from 'src/queries/profile/profile';
interface Props {
onClose: () => void;
diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/TwoFactor.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/TwoFactor.tsx
index e36913a0852..d21fb6961bf 100644
--- a/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/TwoFactor.tsx
+++ b/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/TwoFactor.tsx
@@ -6,7 +6,7 @@ import { useQueryClient } from '@tanstack/react-query';
import { StyledLinkButton } from 'src/components/Button/StyledLinkButton';
import { Notice } from 'src/components/Notice/Notice';
import { Typography } from 'src/components/Typography';
-import { useSecurityQuestions } from 'src/queries/securityQuestions';
+import { useSecurityQuestions } from 'src/queries/profile/securityQuestions';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { getAPIErrorFor } from 'src/utilities/getAPIErrorFor';
@@ -19,7 +19,7 @@ import {
StyledRootContainer,
} from './TwoFactor.styles';
import { TwoFactorToggle } from './TwoFactorToggle';
-import { profileQueries } from 'src/queries/profile';
+import { profileQueries } from 'src/queries/profile/profile';
export interface TwoFactorProps {
disabled?: boolean;
diff --git a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
index acd777fd456..2008bf9c339 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
@@ -9,8 +9,8 @@ const queryMocks = vi.hoisted(() => ({
useProfile: vi.fn().mockReturnValue({}),
}));
-vi.mock('src/queries/profile', async () => {
- const actual = await vi.importActual('src/queries/profile');
+vi.mock('src/queries/profile/profile', async () => {
+ const actual = await vi.importActual('src/queries/profile/profile');
return {
...actual,
useProfile: queryMocks.useProfile,
diff --git a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx
index 87ad2378350..564aae521ff 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx
@@ -15,7 +15,7 @@ import { TooltipIcon } from 'src/components/TooltipIcon';
import { Typography } from 'src/components/Typography';
import { RESTRICTED_FIELD_TOOLTIP } from 'src/features/Account/constants';
import { useNotificationsQuery } from 'src/queries/account/notifications';
-import { useMutateProfile, useProfile } from 'src/queries/profile';
+import { useMutateProfile, useProfile } from 'src/queries/profile/profile';
import { ApplicationState } from 'src/store';
import { sendManageGravatarEvent } from 'src/utilities/analytics/customEventAnalytics';
diff --git a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
index 65c41cc514e..9a1cd6bb1d1 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
@@ -9,7 +9,7 @@ import { Box } from 'src/components/Box';
import { CircleProgress } from 'src/components/CircleProgress';
import Select, { Item } from 'src/components/EnhancedSelect/Select';
import { Typography } from 'src/components/Typography';
-import { useMutateProfile, useProfile } from 'src/queries/profile';
+import { useMutateProfile, useProfile } from 'src/queries/profile/profile';
interface Props {
loggedInAsCustomer: boolean;
diff --git a/packages/manager/src/features/Profile/LishSettings/LishSettings.tsx b/packages/manager/src/features/Profile/LishSettings/LishSettings.tsx
index 56cafc8d409..1aa5aaa06d5 100644
--- a/packages/manager/src/features/Profile/LishSettings/LishSettings.tsx
+++ b/packages/manager/src/features/Profile/LishSettings/LishSettings.tsx
@@ -14,7 +14,7 @@ import { Paper } from 'src/components/Paper';
import { TextField } from 'src/components/TextField';
import { Typography } from 'src/components/Typography';
import { FormControl } from 'src/components/FormControl';
-import { useMutateProfile, useProfile } from 'src/queries/profile';
+import { useMutateProfile, useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import { getAPIErrorFor } from 'src/utilities/getAPIErrorFor';
import { scrollErrorIntoView } from 'src/utilities/scrollErrorIntoView';
diff --git a/packages/manager/src/features/Profile/Referrals/Referrals.tsx b/packages/manager/src/features/Profile/Referrals/Referrals.tsx
index 763b35a0a06..f3bac05580f 100644
--- a/packages/manager/src/features/Profile/Referrals/Referrals.tsx
+++ b/packages/manager/src/features/Profile/Referrals/Referrals.tsx
@@ -11,7 +11,7 @@ import { Link } from 'src/components/Link';
import { Notice } from 'src/components/Notice/Notice';
import { Paper } from 'src/components/Paper';
import { Typography } from 'src/components/Typography';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import {
diff --git a/packages/manager/src/features/Profile/SSHKeys/CreateSSHKeyDrawer.tsx b/packages/manager/src/features/Profile/SSHKeys/CreateSSHKeyDrawer.tsx
index de17e09d68e..6073e28691a 100644
--- a/packages/manager/src/features/Profile/SSHKeys/CreateSSHKeyDrawer.tsx
+++ b/packages/manager/src/features/Profile/SSHKeys/CreateSSHKeyDrawer.tsx
@@ -9,7 +9,7 @@ import { Link } from 'src/components/Link';
import { Notice } from 'src/components/Notice/Notice';
import { TextField } from 'src/components/TextField';
import { Typography } from 'src/components/Typography';
-import { useCreateSSHKeyMutation } from 'src/queries/profile';
+import { useCreateSSHKeyMutation } from 'src/queries/profile/profile';
import { handleFormikBlur } from 'src/utilities/formikTrimUtil';
import { getAPIErrorFor } from 'src/utilities/getAPIErrorFor';
diff --git a/packages/manager/src/features/Profile/SSHKeys/DeleteSSHKeyDialog.tsx b/packages/manager/src/features/Profile/SSHKeys/DeleteSSHKeyDialog.tsx
index 7aa868f566d..7b72b3913d7 100644
--- a/packages/manager/src/features/Profile/SSHKeys/DeleteSSHKeyDialog.tsx
+++ b/packages/manager/src/features/Profile/SSHKeys/DeleteSSHKeyDialog.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
import { Typography } from 'src/components/Typography';
-import { useDeleteSSHKeyMutation } from 'src/queries/profile';
+import { useDeleteSSHKeyMutation } from 'src/queries/profile/profile';
interface Props {
id: number;
diff --git a/packages/manager/src/features/Profile/SSHKeys/EditSSHKeyDrawer.tsx b/packages/manager/src/features/Profile/SSHKeys/EditSSHKeyDrawer.tsx
index 0861f2e38da..a1c09874fae 100644
--- a/packages/manager/src/features/Profile/SSHKeys/EditSSHKeyDrawer.tsx
+++ b/packages/manager/src/features/Profile/SSHKeys/EditSSHKeyDrawer.tsx
@@ -8,7 +8,7 @@ import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
import { Drawer } from 'src/components/Drawer';
import { Notice } from 'src/components/Notice/Notice';
import { TextField } from 'src/components/TextField';
-import { useUpdateSSHKeyMutation } from 'src/queries/profile';
+import { useUpdateSSHKeyMutation } from 'src/queries/profile/profile';
import { getAPIErrorFor } from 'src/utilities/getAPIErrorFor';
interface Props {
diff --git a/packages/manager/src/features/Profile/SSHKeys/SSHKeys.tsx b/packages/manager/src/features/Profile/SSHKeys/SSHKeys.tsx
index 1bec2a5ca14..91afe803212 100644
--- a/packages/manager/src/features/Profile/SSHKeys/SSHKeys.tsx
+++ b/packages/manager/src/features/Profile/SSHKeys/SSHKeys.tsx
@@ -18,7 +18,7 @@ import { Typography } from 'src/components/Typography';
import DeleteSSHKeyDialog from 'src/features/Profile/SSHKeys/DeleteSSHKeyDialog';
import SSHKeyActionMenu from 'src/features/Profile/SSHKeys/SSHKeyActionMenu';
import { usePagination } from 'src/hooks/usePagination';
-import { useSSHKeysQuery } from 'src/queries/profile';
+import { useSSHKeysQuery } from 'src/queries/profile/profile';
import { parseAPIDate } from 'src/utilities/date';
import { getSSHKeyFingerprint } from 'src/utilities/ssh-fingerprint';
diff --git a/packages/manager/src/features/Profile/Settings/PreferenceEditor.tsx b/packages/manager/src/features/Profile/Settings/PreferenceEditor.tsx
index 6eb633a8465..dd2fc9ac06c 100644
--- a/packages/manager/src/features/Profile/Settings/PreferenceEditor.tsx
+++ b/packages/manager/src/features/Profile/Settings/PreferenceEditor.tsx
@@ -6,7 +6,10 @@ import { Dialog, DialogProps } from 'src/components/Dialog/Dialog';
import { Link } from 'src/components/Link';
import { Notice } from 'src/components/Notice/Notice';
import { Typography } from 'src/components/Typography';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
type Props = Pick;
diff --git a/packages/manager/src/features/Profile/Settings/Settings.tsx b/packages/manager/src/features/Profile/Settings/Settings.tsx
index 61aa3b0726b..f383fdb5279 100644
--- a/packages/manager/src/features/Profile/Settings/Settings.tsx
+++ b/packages/manager/src/features/Profile/Settings/Settings.tsx
@@ -10,8 +10,11 @@ import { RadioGroup } from 'src/components/RadioGroup';
import { Stack } from 'src/components/Stack';
import { Toggle } from 'src/components/Toggle/Toggle';
import { Typography } from 'src/components/Typography';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
-import { useMutateProfile, useProfile } from 'src/queries/profile';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
+import { useMutateProfile, useProfile } from 'src/queries/profile/profile';
import { getQueryParamFromQueryString } from 'src/utilities/queryParams';
import { ThemeChoice } from 'src/utilities/theme';
import { isOSMac } from 'src/utilities/userAgent';
diff --git a/packages/manager/src/features/StackScripts/SelectStackScriptPanel/SelectStackScriptsSection.tsx b/packages/manager/src/features/StackScripts/SelectStackScriptPanel/SelectStackScriptsSection.tsx
index 0d1830bd647..a207afdc66b 100644
--- a/packages/manager/src/features/StackScripts/SelectStackScriptPanel/SelectStackScriptsSection.tsx
+++ b/packages/manager/src/features/StackScripts/SelectStackScriptPanel/SelectStackScriptsSection.tsx
@@ -5,7 +5,7 @@ import * as React from 'react';
import { CircleProgress } from 'src/components/CircleProgress';
import { TableBody } from 'src/components/TableBody';
import { TableRow } from 'src/components/TableRow';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { formatDate } from 'src/utilities/formatDate';
import { truncate } from 'src/utilities/truncate';
diff --git a/packages/manager/src/features/StackScripts/StackScriptCreate/StackScriptCreate.tsx b/packages/manager/src/features/StackScripts/StackScriptCreate/StackScriptCreate.tsx
index bebbc1f6b8e..bc39cd3ba1c 100644
--- a/packages/manager/src/features/StackScripts/StackScriptCreate/StackScriptCreate.tsx
+++ b/packages/manager/src/features/StackScripts/StackScriptCreate/StackScriptCreate.tsx
@@ -37,7 +37,7 @@ import { filterImagesByType } from 'src/store/image/image.helpers';
import { getAPIErrorFor } from 'src/utilities/getAPIErrorFor';
import { scrollErrorIntoView } from 'src/utilities/scrollErrorIntoView';
import { storage } from 'src/utilities/storage';
-import { profileQueries } from 'src/queries/profile';
+import { profileQueries } from 'src/queries/profile/profile';
interface State {
apiResponse?: StackScript;
diff --git a/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptActionMenu.tsx b/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptActionMenu.tsx
index 9e6a96efd8c..6fd4ddfb56b 100644
--- a/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptActionMenu.tsx
+++ b/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptActionMenu.tsx
@@ -6,7 +6,7 @@ import { useHistory } from 'react-router-dom';
import { Action, ActionMenu } from 'src/components/ActionMenu/ActionMenu';
import { Hidden } from 'src/components/Hidden';
import { InlineMenuAction } from 'src/components/InlineMenuAction/InlineMenuAction';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { StackScriptCategory, getStackScriptUrl } from '../stackScriptUtils';
diff --git a/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptPanel.tsx b/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptPanel.tsx
index 65bea35b05b..d8874623669 100644
--- a/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptPanel.tsx
+++ b/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptPanel.tsx
@@ -6,7 +6,7 @@ import { compose } from 'recompose';
import { NavTab, NavTabs } from 'src/components/NavTabs/NavTabs';
import { RenderGuard } from 'src/components/RenderGuard';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import {
getCommunityStackscripts,
diff --git a/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptsSection.tsx b/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptsSection.tsx
index 53006820b7b..cb6c1bce806 100644
--- a/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptsSection.tsx
+++ b/packages/manager/src/features/StackScripts/StackScriptPanel/StackScriptsSection.tsx
@@ -9,7 +9,7 @@ import {
StackScriptCategory,
canUserModifyAccountStackScript,
} from 'src/features/StackScripts/stackScriptUtils';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { formatDate } from 'src/utilities/formatDate';
import { stripImageName } from 'src/utilities/stripImageName';
diff --git a/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx b/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx
index 37fc05b2f30..3ea0651917c 100644
--- a/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx
+++ b/packages/manager/src/features/StackScripts/StackScriptsDetail.tsx
@@ -12,7 +12,7 @@ import { LandingHeader } from 'src/components/LandingHeader';
import { NotFound } from 'src/components/NotFound';
import { StackScript as _StackScript } from 'src/components/StackScript/StackScript';
import { useAccountManagement } from 'src/hooks/useAccountManagement';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault, getErrorMap } from 'src/utilities/errorUtils';
import {
diff --git a/packages/manager/src/features/Support/SupportTicketDetail/SupportTicketDetail.tsx b/packages/manager/src/features/Support/SupportTicketDetail/SupportTicketDetail.tsx
index 28dcbb0ebfe..2b2f0be3a77 100644
--- a/packages/manager/src/features/Support/SupportTicketDetail/SupportTicketDetail.tsx
+++ b/packages/manager/src/features/Support/SupportTicketDetail/SupportTicketDetail.tsx
@@ -11,7 +11,7 @@ import { DocumentTitleSegment } from 'src/components/DocumentTitle';
import { ErrorState } from 'src/components/ErrorState/ErrorState';
import { LandingHeader } from 'src/components/LandingHeader';
import { Stack } from 'src/components/Stack';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import {
useInfiniteSupportTicketRepliesQuery,
useSupportTicketQuery,
diff --git a/packages/manager/src/features/Support/SupportTicketDetail/TicketStatus.tsx b/packages/manager/src/features/Support/SupportTicketDetail/TicketStatus.tsx
index 954f8b0d4cc..79f3d52f439 100644
--- a/packages/manager/src/features/Support/SupportTicketDetail/TicketStatus.tsx
+++ b/packages/manager/src/features/Support/SupportTicketDetail/TicketStatus.tsx
@@ -9,7 +9,7 @@ import { Paper } from 'src/components/Paper';
import { Stack } from 'src/components/Stack';
import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
import { Typography } from 'src/components/Typography';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { capitalize } from 'src/utilities/capitalize';
import { formatDate } from 'src/utilities/formatDate';
import { getLinkTargets } from 'src/utilities/getEventsActionLink';
diff --git a/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx b/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx
index 2cfd5d58f69..61218835c21 100644
--- a/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx
+++ b/packages/manager/src/features/TopMenu/UserMenu/UserMenu.tsx
@@ -23,7 +23,7 @@ import { SwitchAccountDrawer } from 'src/features/Account/SwitchAccountDrawer';
import { useIsParentTokenExpired } from 'src/features/Account/SwitchAccounts/useIsParentTokenExpired';
import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
import { useAccount } from 'src/queries/account/account';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { sendSwitchAccountEvent } from 'src/utilities/analytics/customEventAnalytics';
import { getStorage, setStorage } from 'src/utilities/storage';
diff --git a/packages/manager/src/features/Users/UserDetail.tsx b/packages/manager/src/features/Users/UserDetail.tsx
index f23e351399f..292eafa1756 100644
--- a/packages/manager/src/features/Users/UserDetail.tsx
+++ b/packages/manager/src/features/Users/UserDetail.tsx
@@ -20,7 +20,7 @@ import { TabPanels } from 'src/components/Tabs/TabPanels';
import { Tabs } from 'src/components/Tabs/Tabs';
import { accountQueries } from 'src/queries/account/queries';
import { useAccountUser } from 'src/queries/account/users';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
import UserPermissions from './UserPermissions';
diff --git a/packages/manager/src/features/Users/UserProfile.tsx b/packages/manager/src/features/Users/UserProfile.tsx
index 710c7b48b1e..6f7f7b1f2da 100644
--- a/packages/manager/src/features/Users/UserProfile.tsx
+++ b/packages/manager/src/features/Users/UserProfile.tsx
@@ -11,7 +11,7 @@ import { Notice } from 'src/components/Notice/Notice';
import { TextField } from 'src/components/TextField';
import { Typography } from 'src/components/Typography';
import { useAccountUser } from 'src/queries/account/users';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { getAPIErrorFor } from 'src/utilities/getAPIErrorFor';
import { PARENT_USER, RESTRICTED_FIELD_TOOLTIP } from '../Account/constants';
diff --git a/packages/manager/src/features/Users/UserRow.tsx b/packages/manager/src/features/Users/UserRow.tsx
index 2f959791f2c..51745389d36 100644
--- a/packages/manager/src/features/Users/UserRow.tsx
+++ b/packages/manager/src/features/Users/UserRow.tsx
@@ -11,7 +11,7 @@ import { TableCell } from 'src/components/TableCell';
import { TableRow } from 'src/components/TableRow';
import { Typography } from 'src/components/Typography';
import { useAccountUserGrants } from 'src/queries/account/users';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { capitalize } from 'src/utilities/capitalize';
import { UsersActionMenu } from './UsersActionMenu';
diff --git a/packages/manager/src/features/Users/UsersActionMenu.tsx b/packages/manager/src/features/Users/UsersActionMenu.tsx
index 4f0bdad2cec..d2d5ea859cc 100644
--- a/packages/manager/src/features/Users/UsersActionMenu.tsx
+++ b/packages/manager/src/features/Users/UsersActionMenu.tsx
@@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom';
import { Action, ActionMenu } from 'src/components/ActionMenu/ActionMenu';
import { InlineMenuAction } from 'src/components/InlineMenuAction/InlineMenuAction';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
interface Props {
isProxyUser: boolean;
diff --git a/packages/manager/src/features/Users/UsersLanding.tsx b/packages/manager/src/features/Users/UsersLanding.tsx
index f927a5dfe8c..08a74f61930 100644
--- a/packages/manager/src/features/Users/UsersLanding.tsx
+++ b/packages/manager/src/features/Users/UsersLanding.tsx
@@ -14,7 +14,7 @@ import { useOrder } from 'src/hooks/useOrder';
import { usePagination } from 'src/hooks/usePagination';
import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
import { useAccountUsers } from 'src/queries/account/users';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import CreateUserDrawer from './CreateUserDrawer';
import { UserDeleteConfirmationDialog } from './UserDeleteConfirmationDialog';
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx
index 2a8a854ca64..20827c61afa 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx
@@ -27,7 +27,7 @@ import { useFormattedDate } from 'src/hooks/useFormattedDate';
import { useUnassignLinode } from 'src/hooks/useUnassignLinode';
import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
import { getAllLinodeConfigs } from 'src/queries/linodes/requests';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { getErrorMap } from 'src/utilities/errorUtils';
import { ExtendedIP } from 'src/utilities/ipUtils';
import { SUBNET_LINODE_CSV_HEADERS } from 'src/utilities/subnets';
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.tsx
index 3bd1be7a28a..f4b3a9527cb 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.tsx
@@ -5,7 +5,7 @@ import * as React from 'react';
import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
import { Drawer } from 'src/components/Drawer';
import { Notice } from 'src/components/Notice/Notice';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { useCreateSubnetMutation, useVPCQuery } from 'src/queries/vpcs/vpcs';
import { getErrorMap } from 'src/utilities/errorUtils';
import {
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.tsx
index e90b6bc1a83..e5b5279fbf4 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.tsx
@@ -7,7 +7,7 @@ import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
import { Drawer } from 'src/components/Drawer';
import { Notice } from 'src/components/Notice/Notice';
import { TextField } from 'src/components/TextField';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { useUpdateSubnetMutation } from 'src/queries/vpcs/vpcs';
import { getErrorMap } from 'src/utilities/errorUtils';
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx
index ed4fa97d7d6..99de08eabab 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx
@@ -19,7 +19,7 @@ import {
useAllLinodesQuery,
} from 'src/queries/linodes/linodes';
import { getAllLinodeConfigs } from 'src/queries/linodes/requests';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { SUBNET_LINODE_CSV_HEADERS } from 'src/utilities/subnets';
import type {
diff --git a/packages/manager/src/features/VPCs/VPCLanding/VPCEditDrawer.tsx b/packages/manager/src/features/VPCs/VPCLanding/VPCEditDrawer.tsx
index 83de5473f36..edcd25709f5 100644
--- a/packages/manager/src/features/VPCs/VPCLanding/VPCEditDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCLanding/VPCEditDrawer.tsx
@@ -8,7 +8,7 @@ import { Drawer } from 'src/components/Drawer';
import { Notice } from 'src/components/Notice/Notice';
import { RegionSelect } from 'src/components/RegionSelect/RegionSelect';
import { TextField } from 'src/components/TextField';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { useUpdateVPCMutation } from 'src/queries/vpcs/vpcs';
import { getErrorMap } from 'src/utilities/errorUtils';
diff --git a/packages/manager/src/features/Volumes/AttachVolumeDrawer.tsx b/packages/manager/src/features/Volumes/AttachVolumeDrawer.tsx
index 00415bd3ef8..e19b118990a 100644
--- a/packages/manager/src/features/Volumes/AttachVolumeDrawer.tsx
+++ b/packages/manager/src/features/Volumes/AttachVolumeDrawer.tsx
@@ -11,7 +11,7 @@ import { FormHelperText } from 'src/components/FormHelperText';
import { Notice } from 'src/components/Notice/Notice';
import { LinodeSelect } from 'src/features/Linodes/LinodeSelect/LinodeSelect';
import { useEventsPollingActions } from 'src/queries/events/events';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { useAttachVolumeMutation } from 'src/queries/volumes/volumes';
import { getAPIErrorFor } from 'src/utilities/getAPIErrorFor';
diff --git a/packages/manager/src/features/Volumes/CloneVolumeDrawer.tsx b/packages/manager/src/features/Volumes/CloneVolumeDrawer.tsx
index 2f54ad91c68..9304ab01c1f 100644
--- a/packages/manager/src/features/Volumes/CloneVolumeDrawer.tsx
+++ b/packages/manager/src/features/Volumes/CloneVolumeDrawer.tsx
@@ -9,7 +9,7 @@ import { Notice } from 'src/components/Notice/Notice';
import { TextField } from 'src/components/TextField';
import { Typography } from 'src/components/Typography';
import { useEventsPollingActions } from 'src/queries/events/events';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import {
useCloneVolumeMutation,
useVolumeTypesQuery,
diff --git a/packages/manager/src/features/Volumes/EditVolumeDrawer.tsx b/packages/manager/src/features/Volumes/EditVolumeDrawer.tsx
index 365e2261029..b4cf478c120 100644
--- a/packages/manager/src/features/Volumes/EditVolumeDrawer.tsx
+++ b/packages/manager/src/features/Volumes/EditVolumeDrawer.tsx
@@ -8,7 +8,7 @@ import { Drawer } from 'src/components/Drawer';
import { Notice } from 'src/components/Notice/Notice';
import { TagsInput } from 'src/components/TagsInput/TagsInput';
import { TextField } from 'src/components/TextField';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { useUpdateVolumeMutation } from 'src/queries/volumes/volumes';
import {
handleFieldErrors,
diff --git a/packages/manager/src/features/Volumes/ResizeVolumeDrawer.tsx b/packages/manager/src/features/Volumes/ResizeVolumeDrawer.tsx
index 79a168ea377..8a9f030f1c0 100644
--- a/packages/manager/src/features/Volumes/ResizeVolumeDrawer.tsx
+++ b/packages/manager/src/features/Volumes/ResizeVolumeDrawer.tsx
@@ -8,7 +8,7 @@ import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
import { Drawer } from 'src/components/Drawer';
import { Notice } from 'src/components/Notice/Notice';
import { useEventsPollingActions } from 'src/queries/events/events';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import {
useResizeVolumeMutation,
useVolumeTypesQuery,
diff --git a/packages/manager/src/features/Volumes/VolumeCreate.tsx b/packages/manager/src/features/Volumes/VolumeCreate.tsx
index 8b611c74ea1..ed14048a42e 100644
--- a/packages/manager/src/features/Volumes/VolumeCreate.tsx
+++ b/packages/manager/src/features/Volumes/VolumeCreate.tsx
@@ -25,7 +25,7 @@ import {
useAccountAgreements,
useMutateAccountAgreements,
} from 'src/queries/account/agreements';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import {
useCreateVolumeMutation,
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeAttachForm.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeAttachForm.tsx
index 3d75171ea14..e7a45c3b3e8 100644
--- a/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeAttachForm.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeAttachForm.tsx
@@ -8,7 +8,7 @@ import { number, object } from 'yup';
import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
import { Notice } from 'src/components/Notice/Notice';
import { useEventsPollingActions } from 'src/queries/events/events';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { useAttachVolumeMutation } from 'src/queries/volumes/volumes';
import {
handleFieldErrors,
diff --git a/packages/manager/src/hooks/useAccountManagement.ts b/packages/manager/src/hooks/useAccountManagement.ts
index 3501b7f0951..1829a3ca9ee 100644
--- a/packages/manager/src/hooks/useAccountManagement.ts
+++ b/packages/manager/src/hooks/useAccountManagement.ts
@@ -2,7 +2,7 @@ import { GlobalGrantTypes } from '@linode/api-v4/lib/account';
import { useAccount } from 'src/queries/account/account';
import { useAccountSettings } from 'src/queries/account/settings';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
export const useAccountManagement = () => {
const { data: account, error: accountError } = useAccount();
diff --git a/packages/manager/src/hooks/useCreateVPC.ts b/packages/manager/src/hooks/useCreateVPC.ts
index 3343ba59e0b..2ba217f9d8a 100644
--- a/packages/manager/src/hooks/useCreateVPC.ts
+++ b/packages/manager/src/hooks/useCreateVPC.ts
@@ -8,7 +8,7 @@ import { useFormik } from 'formik';
import * as React from 'react';
import { useHistory } from 'react-router-dom';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { useRegionsQuery } from 'src/queries/regions/regions';
import { useCreateVPCMutation } from 'src/queries/vpcs/vpcs';
import {
diff --git a/packages/manager/src/hooks/useDismissibleNotifications.ts b/packages/manager/src/hooks/useDismissibleNotifications.ts
index d87f35b0ce3..56cfc021664 100644
--- a/packages/manager/src/hooks/useDismissibleNotifications.ts
+++ b/packages/manager/src/hooks/useDismissibleNotifications.ts
@@ -2,7 +2,10 @@ import { DateTime } from 'luxon';
import md5 from 'md5';
import { useState } from 'react';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
import { DismissedNotification } from 'src/types/ManagerPreferences';
/**
diff --git a/packages/manager/src/hooks/useEventHandlers.ts b/packages/manager/src/hooks/useEventHandlers.ts
index a9667b9102a..56c8b6bad9e 100644
--- a/packages/manager/src/hooks/useEventHandlers.ts
+++ b/packages/manager/src/hooks/useEventHandlers.ts
@@ -8,10 +8,10 @@ import { imageEventsHandler } from 'src/queries/images';
import { diskEventHandler } from 'src/queries/linodes/events';
import { linodeEventsHandler } from 'src/queries/linodes/events';
import { nodebalanacerEventHandler } from 'src/queries/nodebalancers';
-import { sshKeyEventHandler } from 'src/queries/profile';
+import { sshKeyEventHandler } from 'src/queries/profile/profile';
import { stackScriptEventHandler } from 'src/queries/stackscripts';
import { supportTicketEventHandler } from 'src/queries/support';
-import { tokenEventHandler } from 'src/queries/tokens';
+import { tokenEventHandler } from 'src/queries/profile/tokens';
import { volumeEventsHandler } from 'src/queries/volumes/events';
import type { Event } from '@linode/api-v4';
diff --git a/packages/manager/src/hooks/useGlobalKeyboardListener.ts b/packages/manager/src/hooks/useGlobalKeyboardListener.ts
index 0a632cf5f01..e95e600f1e4 100644
--- a/packages/manager/src/hooks/useGlobalKeyboardListener.ts
+++ b/packages/manager/src/hooks/useGlobalKeyboardListener.ts
@@ -1,6 +1,9 @@
import React from 'react';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
import { getNextThemeValue } from 'src/utilities/theme';
import { isOSMac } from 'src/utilities/userAgent';
diff --git a/packages/manager/src/hooks/useInitialRequests.ts b/packages/manager/src/hooks/useInitialRequests.ts
index 25202e587bf..ec1dca356d6 100644
--- a/packages/manager/src/hooks/useInitialRequests.ts
+++ b/packages/manager/src/hooks/useInitialRequests.ts
@@ -5,7 +5,7 @@ import * as React from 'react';
import { useAuthentication } from 'src/hooks/useAuthentication';
import { usePendingUpload } from 'src/hooks/usePendingUpload';
import { accountQueries } from 'src/queries/account/queries';
-import { profileQueries } from 'src/queries/profile';
+import { profileQueries } from 'src/queries/profile/profile';
import { redirectToLogin } from 'src/session';
/**
diff --git a/packages/manager/src/hooks/useIsResourceRestricted.ts b/packages/manager/src/hooks/useIsResourceRestricted.ts
index e9126cf36af..997fcf6afb2 100644
--- a/packages/manager/src/hooks/useIsResourceRestricted.ts
+++ b/packages/manager/src/hooks/useIsResourceRestricted.ts
@@ -1,4 +1,4 @@
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import type { GrantLevel, GrantType } from '@linode/api-v4';
diff --git a/packages/manager/src/hooks/useOrder.test.tsx b/packages/manager/src/hooks/useOrder.test.tsx
index e3776006646..5a31d40d4fe 100644
--- a/packages/manager/src/hooks/useOrder.test.tsx
+++ b/packages/manager/src/hooks/useOrder.test.tsx
@@ -3,7 +3,7 @@ import { act, renderHook, waitFor } from '@testing-library/react';
import { HttpResponse, http, server } from 'src/mocks/testServer';
import { queryClientFactory } from 'src/queries/base';
-import { usePreferences } from 'src/queries/preferences';
+import { usePreferences } from 'src/queries/profile/preferences';
import { OrderSet } from 'src/types/ManagerPreferences';
import { wrapWithTheme } from 'src/utilities/testHelpers';
diff --git a/packages/manager/src/hooks/useOrder.ts b/packages/manager/src/hooks/useOrder.ts
index ce31f94a334..0a9f195c57e 100644
--- a/packages/manager/src/hooks/useOrder.ts
+++ b/packages/manager/src/hooks/useOrder.ts
@@ -3,7 +3,10 @@ import { useHistory, useLocation } from 'react-router-dom';
import { debounce } from 'throttle-debounce';
import { getInitialValuesFromUserPreferences } from 'src/components/OrderBy';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
import { OrderSet } from 'src/types/ManagerPreferences';
import { getQueryParamsFromQueryString } from 'src/utilities/queryParams';
diff --git a/packages/manager/src/hooks/usePagination.ts b/packages/manager/src/hooks/usePagination.ts
index ce90c3c1272..6095ef68bcc 100644
--- a/packages/manager/src/hooks/usePagination.ts
+++ b/packages/manager/src/hooks/usePagination.ts
@@ -1,7 +1,10 @@
import { useHistory, useLocation } from 'react-router-dom';
import { MIN_PAGE_SIZE } from 'src/components/PaginationFooter/PaginationFooter';
-import { useMutatePreferences, usePreferences } from 'src/queries/preferences';
+import {
+ useMutatePreferences,
+ usePreferences,
+} from 'src/queries/profile/preferences';
export interface PaginationProps {
handlePageChange: (page: number) => void;
diff --git a/packages/manager/src/hooks/useRestrictedGlobalGrantCheck.test.ts b/packages/manager/src/hooks/useRestrictedGlobalGrantCheck.test.ts
index b3ffd123797..6c298817a24 100644
--- a/packages/manager/src/hooks/useRestrictedGlobalGrantCheck.test.ts
+++ b/packages/manager/src/hooks/useRestrictedGlobalGrantCheck.test.ts
@@ -7,8 +7,8 @@ const queryMocks = vi.hoisted(() => ({
useProfile: vi.fn().mockReturnValue({}),
}));
-vi.mock('src/queries/profile', async () => {
- const actual = await vi.importActual('src/queries/profile');
+vi.mock('src/queries/profile/profile', async () => {
+ const actual = await vi.importActual('src/queries/profile/profile');
return {
...actual,
useGrants: queryMocks.useGrants,
diff --git a/packages/manager/src/hooks/useRestrictedGlobalGrantCheck.ts b/packages/manager/src/hooks/useRestrictedGlobalGrantCheck.ts
index d8243ad9806..266a0ef879e 100644
--- a/packages/manager/src/hooks/useRestrictedGlobalGrantCheck.ts
+++ b/packages/manager/src/hooks/useRestrictedGlobalGrantCheck.ts
@@ -1,4 +1,4 @@
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import type { RestrictedGlobalGrantType } from 'src/features/Account/utils';
diff --git a/packages/manager/src/queries/account/account.ts b/packages/manager/src/queries/account/account.ts
index 4d520314936..bbfa0714791 100644
--- a/packages/manager/src/queries/account/account.ts
+++ b/packages/manager/src/queries/account/account.ts
@@ -9,7 +9,7 @@ import {
useQueryClient,
} from '@tanstack/react-query';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants, useProfile } from 'src/queries/profile/profile';
import { queryPresets } from '../base';
import { accountQueries } from './queries';
diff --git a/packages/manager/src/queries/account/agreements.ts b/packages/manager/src/queries/account/agreements.ts
index 09db7945afa..4b754a2d950 100644
--- a/packages/manager/src/queries/account/agreements.ts
+++ b/packages/manager/src/queries/account/agreements.ts
@@ -2,7 +2,7 @@ import { signAgreement } from '@linode/api-v4';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { reportException } from 'src/exceptionReporting';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { queryPresets } from '../base';
import { accountQueries } from './queries';
diff --git a/packages/manager/src/queries/account/payment.ts b/packages/manager/src/queries/account/payment.ts
index 70b4d13c455..5db52a3a581 100644
--- a/packages/manager/src/queries/account/payment.ts
+++ b/packages/manager/src/queries/account/payment.ts
@@ -6,7 +6,7 @@ import {
import { APIError } from '@linode/api-v4/lib/types';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useGrants } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile/profile';
import { queryPresets } from '../base';
import { accountQueries } from './queries';
diff --git a/packages/manager/src/queries/account/settings.ts b/packages/manager/src/queries/account/settings.ts
index 77e894c32ad..27c8b1adc72 100644
--- a/packages/manager/src/queries/account/settings.ts
+++ b/packages/manager/src/queries/account/settings.ts
@@ -10,7 +10,7 @@ import {
useQueryClient,
} from '@tanstack/react-query';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { queryPresets } from '../base';
import { accountQueries } from './queries';
diff --git a/packages/manager/src/queries/account/users.ts b/packages/manager/src/queries/account/users.ts
index dfe0e764df1..e498baa0b3b 100644
--- a/packages/manager/src/queries/account/users.ts
+++ b/packages/manager/src/queries/account/users.ts
@@ -1,7 +1,7 @@
import { deleteUser } from '@linode/api-v4/lib/account';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { accountQueries } from './queries';
diff --git a/packages/manager/src/queries/databases/databases.ts b/packages/manager/src/queries/databases/databases.ts
index 21d72b0ce1d..4d7413418f2 100644
--- a/packages/manager/src/queries/databases/databases.ts
+++ b/packages/manager/src/queries/databases/databases.ts
@@ -13,7 +13,7 @@ import { createQueryKeys } from '@lukemorales/query-key-factory';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { queryPresets } from '../base';
-import { profileQueries } from '../profile';
+import { profileQueries } from '../profile/profile';
import {
getAllDatabaseEngines,
getAllDatabaseTypes,
diff --git a/packages/manager/src/queries/domains.ts b/packages/manager/src/queries/domains.ts
index 0c061adf2f5..fb21b5289fe 100644
--- a/packages/manager/src/queries/domains.ts
+++ b/packages/manager/src/queries/domains.ts
@@ -25,7 +25,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { EventHandlerData } from 'src/hooks/useEventHandlers';
import { getAll } from 'src/utilities/getAll';
-import { profileQueries } from './profile';
+import { profileQueries } from './profile/profile';
export const queryKey = 'domains';
diff --git a/packages/manager/src/queries/entityTransfers.ts b/packages/manager/src/queries/entityTransfers.ts
index a0dfee17111..2480d06f81d 100644
--- a/packages/manager/src/queries/entityTransfers.ts
+++ b/packages/manager/src/queries/entityTransfers.ts
@@ -8,7 +8,7 @@ import {
import { APIError, Filter, Params } from '@linode/api-v4/lib/types';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useProfile } from 'src/queries/profile';
+import { useProfile } from 'src/queries/profile/profile';
import { creationHandlers, listToItemsByID, queryPresets } from './base';
diff --git a/packages/manager/src/queries/firewalls.ts b/packages/manager/src/queries/firewalls.ts
index 0ff8a8adbed..a328021b773 100644
--- a/packages/manager/src/queries/firewalls.ts
+++ b/packages/manager/src/queries/firewalls.ts
@@ -27,7 +27,7 @@ import { queryKey as linodesQueryKey } from 'src/queries/linodes/linodes';
import { getAll } from 'src/utilities/getAll';
import { updateInPaginatedStore } from './base';
-import { profileQueries } from './profile';
+import { profileQueries } from './profile/profile';
export const queryKey = 'firewall';
diff --git a/packages/manager/src/queries/images.ts b/packages/manager/src/queries/images.ts
index fc5a7c114cb..2318ef0deee 100644
--- a/packages/manager/src/queries/images.ts
+++ b/packages/manager/src/queries/images.ts
@@ -22,7 +22,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { EventHandlerData } from 'src/hooks/useEventHandlers';
import { getAll } from 'src/utilities/getAll';
-import { profileQueries } from './profile';
+import { profileQueries } from './profile/profile';
export const getAllImages = (
passedParams: Params = {},
diff --git a/packages/manager/src/queries/kubernetes.ts b/packages/manager/src/queries/kubernetes.ts
index dbae81e7de1..e9573ad5283 100644
--- a/packages/manager/src/queries/kubernetes.ts
+++ b/packages/manager/src/queries/kubernetes.ts
@@ -37,7 +37,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { getAll } from 'src/utilities/getAll';
import { queryPresets } from './base';
-import { profileQueries } from './profile';
+import { profileQueries } from './profile/profile';
export const kubernetesQueries = createQueryKeys('kubernetes', {
cluster: (id: number) => ({
diff --git a/packages/manager/src/queries/linodes/linodes.ts b/packages/manager/src/queries/linodes/linodes.ts
index 85266a7d098..34a5549729a 100644
--- a/packages/manager/src/queries/linodes/linodes.ts
+++ b/packages/manager/src/queries/linodes/linodes.ts
@@ -42,7 +42,7 @@ import { manuallySetVPCConfigInterfacesToActive } from 'src/utilities/configs';
import { accountQueries } from '../account/queries';
import { queryPresets } from '../base';
-import { profileQueries } from '../profile';
+import { profileQueries } from '../profile/profile';
import { vlanQueries } from '../vlans';
import { getAllLinodeKernelsRequest, getAllLinodesRequest } from './requests';
diff --git a/packages/manager/src/queries/nodebalancers.ts b/packages/manager/src/queries/nodebalancers.ts
index 6dfdb690d7d..0cfc7afdc16 100644
--- a/packages/manager/src/queries/nodebalancers.ts
+++ b/packages/manager/src/queries/nodebalancers.ts
@@ -34,7 +34,7 @@ import { getAll } from 'src/utilities/getAll';
import { queryPresets } from './base';
import { itemInListCreationHandler, itemInListMutationHandler } from './base';
-import { profileQueries } from './profile';
+import { profileQueries } from './profile/profile';
import type {
APIError,
diff --git a/packages/manager/src/queries/placementGroups.ts b/packages/manager/src/queries/placementGroups.ts
index 1a599080b3c..4f8a4fefd70 100644
--- a/packages/manager/src/queries/placementGroups.ts
+++ b/packages/manager/src/queries/placementGroups.ts
@@ -19,7 +19,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { queryKey as linodeQueryKey } from 'src/queries/linodes/linodes';
import { getAll } from 'src/utilities/getAll';
-import { profileQueries } from './profile';
+import { profileQueries } from './profile/profile';
import type {
AssignLinodesToPlacementGroupPayload,
diff --git a/packages/manager/src/queries/preferences.ts b/packages/manager/src/queries/profile/preferences.ts
similarity index 66%
rename from packages/manager/src/queries/preferences.ts
rename to packages/manager/src/queries/profile/preferences.ts
index f99f578931b..086b3e6fcfc 100644
--- a/packages/manager/src/queries/preferences.ts
+++ b/packages/manager/src/queries/profile/preferences.ts
@@ -1,8 +1,4 @@
-import {
- getUserPreferences,
- updateUserPreferences,
-} from '@linode/api-v4/lib/profile';
-import { APIError } from '@linode/api-v4/lib/types';
+import { updateUserPreferences } from '@linode/api-v4';
import {
QueryClient,
useMutation,
@@ -12,12 +8,14 @@ import {
import { ManagerPreferences } from 'src/types/ManagerPreferences';
-import { queryPresets } from './base';
+import { queryPresets } from '../base';
+import { profileQueries } from './profile';
-export const queryKey = 'preferences';
+import type { APIError } from '@linode/api-v4';
export const usePreferences = (enabled = true) =>
- useQuery([queryKey], getUserPreferences, {
+ useQuery({
+ ...profileQueries.preferences,
...queryPresets.oneTimeFetch,
enabled,
});
@@ -25,20 +23,19 @@ export const usePreferences = (enabled = true) =>
export const useMutatePreferences = (replace = false) => {
const { data: preferences } = usePreferences(!replace);
const queryClient = useQueryClient();
+
return useMutation<
ManagerPreferences,
APIError[],
Partial
- >(
- (data) =>
+ >({
+ mutationFn: (data) =>
updateUserPreferences({
...(!replace && preferences !== undefined ? preferences : {}),
...data,
}),
- {
- onMutate: (data) => updatePreferenceData(data, replace, queryClient),
- }
- );
+ onMutate: (data) => updatePreferenceData(data, replace, queryClient),
+ });
};
export const updatePreferenceData = (
@@ -47,8 +44,8 @@ export const updatePreferenceData = (
queryClient: QueryClient
): void => {
queryClient.setQueryData(
- [queryKey],
- (oldData: ManagerPreferences) => ({
+ profileQueries.preferences.queryKey,
+ (oldData) => ({
...(!replace ? oldData : {}),
...newData,
})
diff --git a/packages/manager/src/queries/profile.ts b/packages/manager/src/queries/profile/profile.ts
similarity index 94%
rename from packages/manager/src/queries/profile.ts
rename to packages/manager/src/queries/profile/profile.ts
index 2306c075962..cc57db89c4e 100644
--- a/packages/manager/src/queries/profile.ts
+++ b/packages/manager/src/queries/profile/profile.ts
@@ -1,31 +1,25 @@
import {
Profile,
SSHKey,
- SendPhoneVerificationCodePayload,
TrustedDevice,
- VerifyVerificationCodePayload,
createSSHKey,
deleteSSHKey,
deleteTrustedDevice,
disableTwoFactor,
+ getAppTokens,
+ getPersonalAccessTokens,
getProfile,
getSSHKeys,
+ getSecurityQuestions,
getTrustedDevices,
+ getUserPreferences,
listGrants,
sendCodeToPhoneNumber,
smsOptOut,
updateProfile,
updateSSHKey,
verifyPhoneNumberCode,
- getAppTokens,
- getPersonalAccessTokens,
-} from '@linode/api-v4/lib/profile';
-import {
- APIError,
- Filter,
- Params,
- ResourcePage,
-} from '@linode/api-v4/lib/types';
+} from '@linode/api-v4';
import { createQueryKeys } from '@lukemorales/query-key-factory';
import {
QueryClient,
@@ -36,11 +30,19 @@ import {
import { EventHandlerData } from 'src/hooks/useEventHandlers';
-import { Grants } from '../../../api-v4/lib';
-import { accountQueries } from './account/queries';
-import { queryPresets } from './base';
+import { accountQueries } from '../account/queries';
+import { queryPresets } from '../base';
-import type { RequestOptions } from '@linode/api-v4';
+import type {
+ APIError,
+ Filter,
+ Grants,
+ Params,
+ RequestOptions,
+ ResourcePage,
+ SendPhoneVerificationCodePayload,
+ VerifyVerificationCodePayload,
+} from '@linode/api-v4';
export const profileQueries = createQueryKeys('profile', {
appTokens: (params: Params = {}, filter: Filter = {}) => ({
@@ -55,10 +57,18 @@ export const profileQueries = createQueryKeys('profile', {
queryFn: () => getPersonalAccessTokens(params, filter),
queryKey: [params, filter],
}),
+ preferences: {
+ queryFn: getUserPreferences,
+ queryKey: null,
+ },
profile: (options: RequestOptions = {}) => ({
queryFn: () => getProfile(options),
queryKey: [options],
}),
+ securityQuestions: {
+ queryFn: getSecurityQuestions,
+ queryKey: null,
+ },
sshKeys: (params: Params = {}, filter: Filter = {}) => ({
queryFn: () => getSSHKeys(params, filter),
queryKey: [params, filter],
diff --git a/packages/manager/src/queries/profile/securityQuestions.ts b/packages/manager/src/queries/profile/securityQuestions.ts
new file mode 100644
index 00000000000..78109ac37f5
--- /dev/null
+++ b/packages/manager/src/queries/profile/securityQuestions.ts
@@ -0,0 +1,79 @@
+import { updateSecurityQuestions } from '@linode/api-v4';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+
+import { queryPresets } from '../base';
+import { profileQueries } from './profile';
+
+import type {
+ APIError,
+ SecurityQuestionsData,
+ SecurityQuestionsPayload,
+} from '@linode/api-v4';
+
+export const useSecurityQuestions = ({
+ enabled = true,
+}: {
+ enabled?: boolean;
+} = {}) => {
+ return useQuery({
+ ...profileQueries.securityQuestions,
+ ...queryPresets.oneTimeFetch,
+ enabled,
+ });
+};
+
+export const useMutateSecurityQuestions = () => {
+ const queryClient = useQueryClient();
+ return useMutation<
+ SecurityQuestionsPayload,
+ APIError[],
+ SecurityQuestionsPayload
+ >({
+ mutationFn: updateSecurityQuestions,
+ onSuccess: (response) => {
+ queryClient.setQueryData(
+ profileQueries.securityQuestions.queryKey,
+ (oldData) => {
+ if (oldData === undefined) {
+ return undefined;
+ }
+
+ const newQuestions: SecurityQuestionsData['security_questions'] = oldData.security_questions.map(
+ (item) => ({
+ ...item,
+ response: null,
+ })
+ );
+
+ for (let i = 0; i < response.security_questions.length; i++) {
+ const index = oldData.security_questions.findIndex(
+ (question) =>
+ question.id === response.security_questions[i].question_id
+ );
+
+ newQuestions[index].response =
+ response.security_questions[i].response;
+ }
+
+ for (let i = 0; i < response.security_questions.length; i++) {
+ const index = newQuestions.findIndex(
+ (question) =>
+ question.id === response.security_questions[i].question_id
+ );
+ moveInArray(newQuestions, index, i);
+ }
+
+ return {
+ security_questions: newQuestions,
+ };
+ }
+ );
+ },
+ });
+};
+
+function moveInArray(arr: any[], fromIndex: number, toIndex: number) {
+ const element = arr[fromIndex];
+ arr.splice(fromIndex, 1);
+ arr.splice(toIndex, 0, element);
+}
diff --git a/packages/manager/src/queries/tokens.ts b/packages/manager/src/queries/profile/tokens.ts
similarity index 100%
rename from packages/manager/src/queries/tokens.ts
rename to packages/manager/src/queries/profile/tokens.ts
diff --git a/packages/manager/src/queries/securityQuestions.ts b/packages/manager/src/queries/securityQuestions.ts
deleted file mode 100644
index 7af77613dcc..00000000000
--- a/packages/manager/src/queries/securityQuestions.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import {
- SecurityQuestionsData,
- SecurityQuestionsPayload,
- getSecurityQuestions,
- updateSecurityQuestions,
-} from '@linode/api-v4/lib/profile';
-import { APIError } from '@linode/api-v4/lib/types';
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-
-import { queryPresets } from './base';
-
-export const queryKey = 'securityQuestions';
-
-export const useSecurityQuestions = ({
- enabled = true,
-}: {
- enabled?: boolean;
-} = {}) => {
- return useQuery(
- [queryKey],
- getSecurityQuestions,
- {
- ...queryPresets.oneTimeFetch,
- enabled,
- }
- );
-};
-
-export const useMutateSecurityQuestions = () => {
- const queryClient = useQueryClient();
- return useMutation<
- SecurityQuestionsPayload,
- APIError[],
- SecurityQuestionsPayload
- >(
- (data) => {
- return updateSecurityQuestions(data);
- },
- {
- onSuccess: (response) => {
- queryClient.setQueryData(
- [queryKey],
- (oldData) => {
- if (oldData === undefined) {
- return undefined;
- }
-
- const newQuestions: SecurityQuestionsData['security_questions'] = oldData.security_questions.map(
- (item) => ({
- ...item,
- response: null,
- })
- );
-
- for (let i = 0; i < response.security_questions.length; i++) {
- const index = oldData.security_questions.findIndex(
- (question) =>
- question.id === response.security_questions[i].question_id
- );
-
- newQuestions[index].response =
- response.security_questions[i].response;
- }
-
- for (let i = 0; i < response.security_questions.length; i++) {
- const index = newQuestions.findIndex(
- (question) =>
- question.id === response.security_questions[i].question_id
- );
- moveInArray(newQuestions, index, i);
- }
-
- return {
- security_questions: newQuestions,
- };
- }
- );
- },
- }
- );
-};
-
-function moveInArray(arr: any[], fromIndex: number, toIndex: number) {
- const element = arr[fromIndex];
- arr.splice(fromIndex, 1);
- arr.splice(toIndex, 0, element);
-}
diff --git a/packages/manager/src/queries/volumes/volumes.ts b/packages/manager/src/queries/volumes/volumes.ts
index d2b549100dc..0476d622e1d 100644
--- a/packages/manager/src/queries/volumes/volumes.ts
+++ b/packages/manager/src/queries/volumes/volumes.ts
@@ -28,7 +28,7 @@ import {
import { accountQueries } from '../account/queries';
import { queryPresets } from '../base';
-import { profileQueries } from '../profile';
+import { profileQueries } from '../profile/profile';
import { getAllVolumeTypes, getAllVolumes } from './requests';
export const volumeQueries = createQueryKeys('volumes', {
diff --git a/packages/manager/src/useSetupFeatureFlags.ts b/packages/manager/src/useSetupFeatureFlags.ts
index bed7ff14e25..1898f3f340c 100644
--- a/packages/manager/src/useSetupFeatureFlags.ts
+++ b/packages/manager/src/useSetupFeatureFlags.ts
@@ -5,7 +5,7 @@ import { LAUNCH_DARKLY_API_KEY } from 'src/constants';
import { configureErrorReportingUser } from './exceptionReporting';
import { useAccount } from './queries/account/account';
-import { useProfile } from './queries/profile';
+import { useProfile } from './queries/profile/profile';
/**
* This hook uses Linode account data to set Sentry and Launch Darkly context.
diff --git a/packages/manager/src/utilities/theme.ts b/packages/manager/src/utilities/theme.ts
index 322cf68e677..67f66422337 100644
--- a/packages/manager/src/utilities/theme.ts
+++ b/packages/manager/src/utilities/theme.ts
@@ -5,7 +5,7 @@ import { dark, light } from 'src/foundations/themes';
import type { ThemeName } from 'src/foundations/themes';
import { useAuthentication } from 'src/hooks/useAuthentication';
-import { usePreferences } from 'src/queries/preferences';
+import { usePreferences } from 'src/queries/profile/preferences';
export type ThemeChoice = 'dark' | 'light' | 'system';
From d52ad401564862e2f975fd49cfebf2e900ed2ce9 Mon Sep 17 00:00:00 2001
From: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:19:46 -0400
Subject: [PATCH 056/163] change: [M3-6541] - eslint: consistent-type-imports
(#10540)
* eslint: consistent-type-imports
* Added changeset: New `consistent-type-imports` es-lint warning
* modify changeset
---
.../.changeset/pr-10540-tech-stories-1717433580405.md | 5 +++++
packages/manager/.eslintrc.cjs | 1 +
2 files changed, 6 insertions(+)
create mode 100644 packages/manager/.changeset/pr-10540-tech-stories-1717433580405.md
diff --git a/packages/manager/.changeset/pr-10540-tech-stories-1717433580405.md b/packages/manager/.changeset/pr-10540-tech-stories-1717433580405.md
new file mode 100644
index 00000000000..c30e5a2e3b6
--- /dev/null
+++ b/packages/manager/.changeset/pr-10540-tech-stories-1717433580405.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+New `consistent-type-imports` es-lint warning ([#10540](https://github.com/linode/manager/pull/10540))
diff --git a/packages/manager/.eslintrc.cjs b/packages/manager/.eslintrc.cjs
index 3c64f9b2c0e..d28ee97f89f 100644
--- a/packages/manager/.eslintrc.cjs
+++ b/packages/manager/.eslintrc.cjs
@@ -115,6 +115,7 @@ module.exports = {
rules: {
'@linode/cloud-manager/no-custom-fontWeight': 'error',
'@typescript-eslint/camelcase': 'off',
+ "@typescript-eslint/consistent-type-imports": "warn",
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/interface-name-prefix': 'off',
From a0c4520ab6f53126835e0cec47bd6a8a6142f491 Mon Sep 17 00:00:00 2001
From: Hana Xu <115299789+hana-linode@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:00:40 -0400
Subject: [PATCH 057/163] refactor: [M3-8183] - Clean up loading components
(#10524)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Description 📝
We have a lot of loading components that are all basically just variations of CircleProgress. This PR cleans up those components.
I also moved the overage pricing tooltip text position in the Object Storage Create Bucket drawer to the top so that the tooltip doesn't block the CTA buttons
## How to test 🧪
### Verification steps
(How to verify changes)
- Check the affected loading spinners throughout the app
---
.../pr-10524-tech-stories-1716999765184.md | 5 ++
.../components/Autocomplete/Autocomplete.tsx | 2 +-
.../CircleProgress/CircleProgress.test.tsx | 29 ++----
.../CircleProgress/CircleProgress.tsx | 90 +++++++------------
.../components/CircularProgress.stories.tsx | 17 ----
.../src/components/CircularProgress.tsx | 14 ---
.../DebouncedSearchTextField.tsx | 2 +-
.../components/LoadingIndicator.tsx | 6 +-
.../LandingLoading/LandingLoading.stories.tsx | 25 ------
.../LandingLoading/LandingLoading.test.tsx | 57 ------------
.../LandingLoading/LandingLoading.tsx | 55 ------------
.../manager/src/components/LinkButton.tsx | 12 +--
.../src/components/MenuItem/MenuItem.tsx | 4 -
.../TableSortCell/TableSortCell.tsx | 2 +-
.../src/components/TagCell/TagCell.tsx | 2 +-
packages/manager/src/components/TextField.tsx | 2 +-
.../TransferDisplay/TransferDisplay.tsx | 2 +-
.../SwitchAccounts/ChildAccountList.tsx | 4 +-
.../PaymentDrawer/GooglePayButton.tsx | 2 +-
.../PaymentDrawer/PayPalButton.tsx | 2 +-
.../PaymentInfoPanel/GooglePayChip.tsx | 2 +-
.../PaymentInfoPanel/PayPalChip.tsx | 2 +-
.../PaymentInfoPanel/PaymentMethods.tsx | 2 +-
.../DatabaseSummaryConnectionDetails.tsx | 2 +-
.../Tabs/Backups/BackupSelect.tsx | 8 +-
.../Tabs/Marketplace/AppsList.tsx | 4 +-
.../Linodes/LinodesCreate/SelectAppPanel.tsx | 4 +-
.../LinodeNetworking/IPTransfer.tsx | 2 +-
.../LinodeNetworking/LinodeIPAddressRow.tsx | 2 +-
.../TransferContent.tsx | 2 +-
.../TransferHistory.tsx | 2 +-
.../LinodeSettings/LinodeWatchdogPanel.tsx | 5 +-
.../LinodeSummary/StatsPanel.tsx | 4 +-
.../LoadBalancerConfigurations.tsx | 2 +-
.../LongviewDetail/DetailTabs/Disks/Disks.tsx | 4 +-
.../LongviewLanding/LongviewPlans.test.tsx | 2 +-
.../LongviewLanding/LongviewPlans.tsx | 4 +-
.../Managed/SSHAccess/LinodePubKey.tsx | 2 +-
.../NodeBalancerSummary/TablesPanel.tsx | 2 +-
.../NotificationSection.tsx | 2 +-
.../BucketLanding/OveragePricing.tsx | 9 +-
.../PlacementGroupsLanding.tsx | 2 +-
.../features/Profile/Referrals/Referrals.tsx | 4 +-
.../StackScriptBase/StackScriptBase.tsx | 2 +-
.../SupportTicketDetail.tsx | 2 +-
.../VPCs/VPCDetail/SubnetLinodeRow.tsx | 2 +-
.../Volumes/VolumeDrawer/PricePanel.tsx | 17 ++--
.../Volumes/VolumeDrawer/SizeField.tsx | 4 +-
.../src/features/Volumes/VolumesLanding.tsx | 4 +-
.../manager/src/foundations/themes/light.ts | 3 +
50 files changed, 122 insertions(+), 320 deletions(-)
create mode 100644 packages/manager/.changeset/pr-10524-tech-stories-1716999765184.md
delete mode 100644 packages/manager/src/components/CircularProgress.stories.tsx
delete mode 100644 packages/manager/src/components/CircularProgress.tsx
delete mode 100644 packages/manager/src/components/LandingLoading/LandingLoading.stories.tsx
delete mode 100644 packages/manager/src/components/LandingLoading/LandingLoading.test.tsx
delete mode 100644 packages/manager/src/components/LandingLoading/LandingLoading.tsx
diff --git a/packages/manager/.changeset/pr-10524-tech-stories-1716999765184.md b/packages/manager/.changeset/pr-10524-tech-stories-1716999765184.md
new file mode 100644
index 00000000000..2e6b8ba7975
--- /dev/null
+++ b/packages/manager/.changeset/pr-10524-tech-stories-1716999765184.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+Clean up loading components ([#10524](https://github.com/linode/manager/pull/10524))
diff --git a/packages/manager/src/components/Autocomplete/Autocomplete.tsx b/packages/manager/src/components/Autocomplete/Autocomplete.tsx
index cc9a4100c73..90a7202f4d5 100644
--- a/packages/manager/src/components/Autocomplete/Autocomplete.tsx
+++ b/packages/manager/src/components/Autocomplete/Autocomplete.tsx
@@ -120,7 +120,7 @@ export const Autocomplete = <
<>
{loading && (
-
+
)}
{textFieldProps?.InputProps?.endAdornment}
diff --git a/packages/manager/src/components/CircleProgress/CircleProgress.test.tsx b/packages/manager/src/components/CircleProgress/CircleProgress.test.tsx
index b9416f0f1e6..989113ef285 100644
--- a/packages/manager/src/components/CircleProgress/CircleProgress.test.tsx
+++ b/packages/manager/src/components/CircleProgress/CircleProgress.test.tsx
@@ -15,40 +15,21 @@ describe('CircleProgress', () => {
const circle = screen.getByTestId('circle-progress');
expect(circle).toBeInTheDocument();
expect(circle).toHaveStyle('width: 124px; height: 124px;');
- const innerCircle = screen.getByTestId('inner-circle-progress');
- expect(innerCircle).toBeInTheDocument();
});
- it('renders a mini CircleProgress', () => {
- const screen = renderWithTheme();
+ it('renders a small CircleProgress', () => {
+ const screen = renderWithTheme();
const circleProgress = screen.getByLabelText(CONTENT_LOADING);
expect(circleProgress).toBeVisible();
expect(circleProgress).toHaveStyle('width: 40px; height: 40px;');
});
- it('sets a mini CircleProgress with no padding', () => {
- const screen = renderWithTheme();
+ it('sets a small CircleProgress with no padding', () => {
+ const screen = renderWithTheme();
const circleProgress = screen.getByLabelText(CONTENT_LOADING);
expect(circleProgress).toBeVisible();
- expect(circleProgress).toHaveStyle('width: 22px; height: 22px;');
- });
-
- it('sets a mini CircleProgress with a custom size', () => {
- const screen = renderWithTheme();
-
- const circleProgress = screen.getByLabelText(CONTENT_LOADING);
- expect(circleProgress).toBeVisible();
- expect(circleProgress).toHaveStyle('width: 25px; height: 25px;');
- });
-
- it('renders a CircleProgress without the inner circle', () => {
- const screen = renderWithTheme();
-
- const circleProgress = screen.getByLabelText(CONTENT_LOADING);
- expect(circleProgress).toBeVisible();
- const innerCircle = screen.queryByTestId('inner-circle-progress');
- expect(innerCircle).not.toBeInTheDocument();
+ expect(circleProgress).toHaveStyle('width: 20px; height: 20px;');
});
});
diff --git a/packages/manager/src/components/CircleProgress/CircleProgress.tsx b/packages/manager/src/components/CircleProgress/CircleProgress.tsx
index 24fe6e240fb..115f41c5422 100644
--- a/packages/manager/src/components/CircleProgress/CircleProgress.tsx
+++ b/packages/manager/src/components/CircleProgress/CircleProgress.tsx
@@ -1,58 +1,63 @@
+import _CircularProgress from '@mui/material/CircularProgress';
import { SxProps, styled } from '@mui/material/styles';
import * as React from 'react';
import { Box } from 'src/components/Box';
-import {
- CircularProgress,
- CircularProgressProps,
-} from 'src/components/CircularProgress';
import { omittedProps } from 'src/utilities/omittedProps';
-interface CircleProgressProps extends CircularProgressProps {
+import type { CircularProgressProps } from '@mui/material/CircularProgress';
+
+interface CircleProgressProps extends Omit {
/**
* Additional child elements to pass in
*/
children?: JSX.Element;
/**
- * Displays a smaller version of the circle progress.
- */
- mini?: boolean;
- /**
- * If true, will not show an inner circle beneath the spinning circle
- */
- noInner?: boolean;
- /**
- * Removes the padding for `mini` circle progresses only.
+ * Removes the padding
*/
noPadding?: boolean;
/**
- * To be primarily used with mini and noPadding. Set spinner to a custom size.
+ * Sets the size of the spinner
+ * @default "lg"
*/
- size?: number;
+ size?: 'lg' | 'md' | 'sm' | 'xs';
/**
* Additional styles to apply to the root element.
*/
sx?: SxProps;
}
+const SIZE_MAP = {
+ lg: 124,
+ md: 40,
+ sm: 20,
+ xs: 14,
+};
+
/**
- * Use for short, indeterminate activities requiring user attention.
+ * Use for short, indeterminate activities requiring user attention. Defaults to large.
+ *
+ * sizes:
+ * xs = 14
+ * md = 20
+ * md = 40
+ * lg = 124
*/
const CircleProgress = (props: CircleProgressProps) => {
- const { children, mini, noInner, noPadding, size, sx, ...rest } = props;
+ const { children, noPadding, size, sx, ...rest } = props;
const variant =
typeof props.value === 'number' ? 'determinate' : 'indeterminate';
const value = typeof props.value === 'number' ? props.value : 0;
- if (mini) {
+ if (size) {
return (
-
);
@@ -63,16 +68,11 @@ const CircleProgress = (props: CircleProgressProps) => {
{children !== undefined && (
{children}
)}
- {noInner !== true && (
-
-
-
- )}
({
width: '100%',
}));
-const StyledTopWrapperDiv = styled('div')(({}) => ({
- alignItems: 'center',
- display: 'flex',
- height: '100%',
- justifyContent: 'center',
- position: 'absolute',
- width: '100%',
-}));
-
-const StyledTopDiv = styled('div')(({ theme }) => ({
- border: '1px solid #999',
- borderRadius: '50%',
- height: 70,
- [theme.breakpoints.up('sm')]: {
- height: 120,
- width: 120,
+const StyledCircularProgress = styled(_CircularProgress)(({ theme }) => ({
+ position: 'relative',
+ [theme.breakpoints.down('sm')]: {
+ height: '72px !important',
+ width: '72px !important',
},
- width: 70,
}));
-const StyledCircularProgress = styled(CircularProgress)(
- ({ theme }) => ({
- position: 'relative',
- [theme.breakpoints.down('sm')]: {
- height: '72px !important',
- width: '72px !important',
- },
- })
-);
-
-const StyledMiniCircularProgress = styled(CircularProgress, {
+const StyledCustomCircularProgress = styled(_CircularProgress, {
shouldForwardProp: omittedProps(['noPadding']),
-})(({ theme, ...props }) => ({
+})<{ noPadding: boolean | undefined }>(({ theme, ...props }) => ({
padding: `calc(${theme.spacing()} * 1.3)`,
...(props.noPadding && {
padding: 0,
diff --git a/packages/manager/src/components/CircularProgress.stories.tsx b/packages/manager/src/components/CircularProgress.stories.tsx
deleted file mode 100644
index db6c4271610..00000000000
--- a/packages/manager/src/components/CircularProgress.stories.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Meta, StoryObj } from '@storybook/react';
-import React from 'react';
-
-import { CircularProgress } from './CircularProgress';
-
-const meta: Meta = {
- component: CircularProgress,
- title: 'Components/Loading States/Circular Progress',
-};
-
-type Story = StoryObj;
-
-export const Default: Story = {
- render: (args) => ,
-};
-
-export default meta;
diff --git a/packages/manager/src/components/CircularProgress.tsx b/packages/manager/src/components/CircularProgress.tsx
deleted file mode 100644
index 95ab3dd9391..00000000000
--- a/packages/manager/src/components/CircularProgress.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import _CircularProgress from '@mui/material/CircularProgress';
-import React from 'react';
-
-import type { CircularProgressProps } from '@mui/material/CircularProgress';
-
-/**
- * Not to be confused with ``.
- * @todo Consolidate these two components
- */
-export const CircularProgress = (props: CircularProgressProps) => {
- return <_CircularProgress {...props} />;
-};
-
-export type { CircularProgressProps };
diff --git a/packages/manager/src/components/DebouncedSearchTextField/DebouncedSearchTextField.tsx b/packages/manager/src/components/DebouncedSearchTextField/DebouncedSearchTextField.tsx
index 0c215e5cf97..cb5c23eafc7 100644
--- a/packages/manager/src/components/DebouncedSearchTextField/DebouncedSearchTextField.tsx
+++ b/packages/manager/src/components/DebouncedSearchTextField/DebouncedSearchTextField.tsx
@@ -82,7 +82,7 @@ export const DebouncedSearchTextField = React.memo(
InputProps={{
endAdornment: isSearching ? (
-
+
) : (
clearable &&
diff --git a/packages/manager/src/components/EnhancedSelect/components/LoadingIndicator.tsx b/packages/manager/src/components/EnhancedSelect/components/LoadingIndicator.tsx
index 14a1283fdf7..88cbadaeeb3 100644
--- a/packages/manager/src/components/EnhancedSelect/components/LoadingIndicator.tsx
+++ b/packages/manager/src/components/EnhancedSelect/components/LoadingIndicator.tsx
@@ -1,13 +1,13 @@
import { styled } from '@mui/material/styles';
import * as React from 'react';
-import { CircularProgress } from 'src/components/CircularProgress';
+import { CircleProgress } from 'src/components/CircleProgress';
export const LoadingIndicator = () => {
- return ;
+ return ;
};
-const StyledCircularProgress = styled(CircularProgress)(() => ({
+const StyledCircleProgress = styled(CircleProgress)(() => ({
position: 'relative',
right: 20,
}));
diff --git a/packages/manager/src/components/LandingLoading/LandingLoading.stories.tsx b/packages/manager/src/components/LandingLoading/LandingLoading.stories.tsx
deleted file mode 100644
index a57b9a11097..00000000000
--- a/packages/manager/src/components/LandingLoading/LandingLoading.stories.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-import { DEFAULT_DELAY, LandingLoading } from './LandingLoading';
-
-import type { Meta, StoryObj } from '@storybook/react';
-
-const meta: Meta = {
- argTypes: {},
- args: {
- children: undefined,
- delayInMS: DEFAULT_DELAY,
- shouldDelay: false,
- },
- component: LandingLoading,
- title: 'Components/Loading States/LandingLoading',
-};
-
-export default meta;
-
-type Story = StoryObj;
-
-export const Default: Story = {
- args: {},
- render: (args) => ,
-};
diff --git a/packages/manager/src/components/LandingLoading/LandingLoading.test.tsx b/packages/manager/src/components/LandingLoading/LandingLoading.test.tsx
deleted file mode 100644
index ac5944a63a3..00000000000
--- a/packages/manager/src/components/LandingLoading/LandingLoading.test.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { act, render, screen } from '@testing-library/react';
-import * as React from 'react';
-
-import { DEFAULT_DELAY, LandingLoading } from './LandingLoading';
-
-vi.useFakeTimers();
-
-const LOADING_ICON = 'circle-progress';
-
-describe('LandingLoading', () => {
- afterEach(() => {
- vi.clearAllTimers();
- });
-
- it('renders the loading indicator by default', () => {
- render();
- expect(screen.getByTestId(LOADING_ICON)).toBeInTheDocument();
- });
-
- it('renders custom loading indicator when children are provided', () => {
- render(
-
- Loading...
-
- );
- expect(screen.getByTestId('custom-loading-indicator')).toBeInTheDocument();
- expect(screen.queryByTestId(LOADING_ICON)).toBeNull();
- });
-
- it('does not render the loading indicator when shouldDelay is true', () => {
- render();
- expect(screen.queryByTestId(LOADING_ICON)).toBeNull();
- });
-
- it('renders the loading indicator after the delay', () => {
- render();
- expect(screen.queryByTestId(LOADING_ICON)).toBeNull();
- act(() => {
- vi.advanceTimersByTime(DEFAULT_DELAY);
- });
- expect(screen.getByTestId(LOADING_ICON)).toBeInTheDocument();
- });
-
- it('renders the loading indicator after the specified delayInMS', () => {
- render();
- expect(screen.queryByTestId(LOADING_ICON)).toBeNull();
- act(() => {
- vi.advanceTimersByTime(2000);
- });
- expect(screen.getByTestId(LOADING_ICON)).toBeInTheDocument();
- });
-
- it('does not render the loading indicator when shouldDelay is false and no delayInMS is provided', () => {
- render();
- expect(screen.getByTestId(LOADING_ICON)).toBeInTheDocument();
- });
-});
diff --git a/packages/manager/src/components/LandingLoading/LandingLoading.tsx b/packages/manager/src/components/LandingLoading/LandingLoading.tsx
deleted file mode 100644
index 520b04fd21f..00000000000
--- a/packages/manager/src/components/LandingLoading/LandingLoading.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import * as React from 'react';
-
-import { CircleProgress } from 'src/components/CircleProgress';
-
-export const DEFAULT_DELAY = 1000;
-
-interface LandingLoadingProps {
- /** Allow children to be passed in to override the default loading indicator */
- children?: JSX.Element;
- /** If given, the loading indicator will not be rendered for the given duration in milliseconds */
- delayInMS?: number;
- /** If true, the loading indicator will not be rendered for 1 second which may give user's with fast connections a more fluid experience. */
- shouldDelay?: boolean;
-}
-
-export const LandingLoading = ({
- children,
- delayInMS,
- shouldDelay,
-}: LandingLoadingProps): JSX.Element | null => {
- const [showLoading, setShowLoading] = React.useState(false);
-
- React.useEffect(() => {
- /* This `didCancel` business is to prevent a warning from React.
- * See: https://github.com/facebook/react/issues/14369#issuecomment-468267798
- */
- let didCancel = false;
- // Reference to the timeoutId so we can cancel it
- let timeoutId: NodeJS.Timeout | null = null;
-
- if (shouldDelay || typeof delayInMS === 'number') {
- // Used specified duration or default
- const delayDuration =
- typeof delayInMS === 'number' ? delayInMS : DEFAULT_DELAY;
-
- timeoutId = setTimeout(() => {
- if (!didCancel) {
- setShowLoading(true);
- }
- }, delayDuration);
- } else {
- setShowLoading(true);
- }
- return () => {
- didCancel = true;
- if (timeoutId) {
- clearTimeout(timeoutId);
- }
- };
- }, [shouldDelay, delayInMS]);
-
- return showLoading
- ? children ||
- : null;
-};
diff --git a/packages/manager/src/components/LinkButton.tsx b/packages/manager/src/components/LinkButton.tsx
index 55d118bbc42..4d4c21c25f9 100644
--- a/packages/manager/src/components/LinkButton.tsx
+++ b/packages/manager/src/components/LinkButton.tsx
@@ -1,10 +1,11 @@
import { Theme } from '@mui/material/styles';
-import { makeStyles } from 'tss-react/mui';
import * as React from 'react';
+import { makeStyles } from 'tss-react/mui';
+
+import { CircleProgress } from 'src/components/CircleProgress';
import { Box } from './Box';
import { StyledLinkButton } from './Button/StyledLinkButton';
-import { CircularProgress } from './CircularProgress';
const useStyles = makeStyles()((theme: Theme) => ({
disabled: {
@@ -12,9 +13,6 @@ const useStyles = makeStyles()((theme: Theme) => ({
cursor: 'default',
pointerEvents: 'none',
},
- spinner: {
- marginLeft: theme.spacing(),
- },
}));
interface Props {
@@ -58,7 +56,9 @@ export const LinkButton = (props: Props) => {
return (
{Button}
-
+
+
+
);
}
diff --git a/packages/manager/src/components/MenuItem/MenuItem.tsx b/packages/manager/src/components/MenuItem/MenuItem.tsx
index 2473835f403..3d153a1fda0 100644
--- a/packages/manager/src/components/MenuItem/MenuItem.tsx
+++ b/packages/manager/src/components/MenuItem/MenuItem.tsx
@@ -3,7 +3,6 @@ import { Theme } from '@mui/material/styles';
import * as React from 'react';
import { makeStyles } from 'tss-react/mui';
-import { CircularProgress } from 'src/components/CircularProgress';
import { IconButton } from 'src/components/IconButton';
import { MenuItem, MenuItemProps } from 'src/components/MenuItem';
@@ -88,9 +87,6 @@ export const WrapperMenuItem = (props: WrapperMenuItemCombinedProps) => {
{...rest}
className={`${classes.root} ${className} ${tooltip && 'hasTooltip'}`}
>
- {isLoading && (
-
- )}
{props.children}
diff --git a/packages/manager/src/components/TableSortCell/TableSortCell.tsx b/packages/manager/src/components/TableSortCell/TableSortCell.tsx
index fd7d860288b..8cd56dd0452 100644
--- a/packages/manager/src/components/TableSortCell/TableSortCell.tsx
+++ b/packages/manager/src/components/TableSortCell/TableSortCell.tsx
@@ -98,7 +98,7 @@ export const TableSortCell = (props: TableSortCellProps) => {
{children}
{!active && }
- {isLoading && }
+ {isLoading && }
);
};
diff --git a/packages/manager/src/components/TagCell/TagCell.tsx b/packages/manager/src/components/TagCell/TagCell.tsx
index a79ea11bd84..7340707d0a9 100644
--- a/packages/manager/src/components/TagCell/TagCell.tsx
+++ b/packages/manager/src/components/TagCell/TagCell.tsx
@@ -132,7 +132,7 @@ export const TagCell = (props: TagCellProps) => {
>
{loading ? (
-
+
) : null}
{tags.map((thisTag) => (
diff --git a/packages/manager/src/components/TextField.tsx b/packages/manager/src/components/TextField.tsx
index 15a71b066d7..cdf0a429d6a 100644
--- a/packages/manager/src/components/TextField.tsx
+++ b/packages/manager/src/components/TextField.tsx
@@ -427,7 +427,7 @@ export const TextField = (props: TextFieldProps) => {
disableUnderline: true,
endAdornment: loading && (
-
+
),
...InputProps,
diff --git a/packages/manager/src/components/TransferDisplay/TransferDisplay.tsx b/packages/manager/src/components/TransferDisplay/TransferDisplay.tsx
index e05c8ce2448..971ec80d6b7 100644
--- a/packages/manager/src/components/TransferDisplay/TransferDisplay.tsx
+++ b/packages/manager/src/components/TransferDisplay/TransferDisplay.tsx
@@ -43,7 +43,7 @@ export const TransferDisplay = React.memo(({ spacingTop }: Props) => {
{isLoading ? (
<>
Loading transfer data...
-
+
) : (
<>
diff --git a/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx b/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx
index 7803c0c7573..0e2242a2c18 100644
--- a/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx
+++ b/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx
@@ -77,7 +77,7 @@ export const ChildAccountList = React.memo(
) {
return (
-
+
);
}
@@ -144,7 +144,7 @@ export const ChildAccountList = React.memo(
{!isSwitchingChildAccounts && !isLoading && renderChildAccounts}
{hasNextPage && fetchNextPage()} />}
- {isFetchingNextPage && }
+ {isFetchingNextPage && }
);
}
diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/GooglePayButton.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/GooglePayButton.tsx
index 99835eefb88..f9fdb454989 100644
--- a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/GooglePayButton.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/GooglePayButton.tsx
@@ -145,7 +145,7 @@ export const GooglePayButton = (props: Props) => {
container
justifyContent="center"
>
-
+
);
}
diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PayPalButton.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PayPalButton.tsx
index 6da3a6056d7..94b614ffe95 100644
--- a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PayPalButton.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PayPalButton.tsx
@@ -222,7 +222,7 @@ export const PayPalButton = (props: Props) => {
container
justifyContent="center"
>
-
+
);
}
diff --git a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/GooglePayChip.tsx b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/GooglePayChip.tsx
index 2cc8901c1db..b79ac9dadf7 100644
--- a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/GooglePayChip.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/GooglePayChip.tsx
@@ -102,7 +102,7 @@ export const GooglePayChip = (props: Props) => {
if (isLoading) {
return (
-
+
);
}
diff --git a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PayPalChip.tsx b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PayPalChip.tsx
index 7c76f26d092..b96626489e5 100644
--- a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PayPalChip.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PayPalChip.tsx
@@ -161,7 +161,7 @@ export const PayPalChip = (props: Props) => {
if (isLoading || isPending || !options['data-client-token']) {
return (
-
+
);
}
diff --git a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PaymentMethods.tsx b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PaymentMethods.tsx
index fb16f7e602e..056fc1c7e61 100644
--- a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PaymentMethods.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/PaymentMethods.tsx
@@ -33,7 +33,7 @@ const PaymentMethods = ({
justifyContent: 'center',
}}
>
-
+
);
}
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummaryConnectionDetails.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummaryConnectionDetails.tsx
index 17d32930f5e..a313fe32b60 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummaryConnectionDetails.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummaryConnectionDetails.tsx
@@ -244,7 +244,7 @@ export const DatabaseSummaryConnectionDetails = (props: Props) => {
{showCredentials && credentialsLoading ? (
-
+
) : credentialsError ? (
<>
diff --git a/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Backups/BackupSelect.tsx b/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Backups/BackupSelect.tsx
index e00f06e22df..11e1ee972cf 100644
--- a/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Backups/BackupSelect.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Backups/BackupSelect.tsx
@@ -3,8 +3,8 @@ import React from 'react';
import { useController, useWatch } from 'react-hook-form';
import { Box } from 'src/components/Box';
-import { CircularProgress } from 'src/components/CircularProgress';
import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
+import { LinearProgress } from 'src/components/LinearProgress';
import { Notice } from 'src/components/Notice/Notice';
import { Paper } from 'src/components/Paper';
import { SelectionCard } from 'src/components/SelectionCard/SelectionCard';
@@ -38,11 +38,7 @@ export const BackupSelect = () => {
}
if (isFetching) {
- return (
-
-
-
- );
+ return ;
}
if (hasNoBackups) {
diff --git a/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Marketplace/AppsList.tsx b/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Marketplace/AppsList.tsx
index 59dfc3b7a07..839e13bc267 100644
--- a/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Marketplace/AppsList.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreatev2/Tabs/Marketplace/AppsList.tsx
@@ -3,7 +3,7 @@ import React from 'react';
import { useController, useFormContext } from 'react-hook-form';
import { Box } from 'src/components/Box';
-import { CircularProgress } from 'src/components/CircularProgress';
+import { CircleProgress } from 'src/components/CircleProgress';
import { ErrorState } from 'src/components/ErrorState/ErrorState';
import { Stack } from 'src/components/Stack';
import { oneClickApps } from 'src/features/OneClickApps/oneClickAppsv2';
@@ -53,7 +53,7 @@ export const AppsList = ({ onOpenDetailsDrawer }: Props) => {
justifyContent="center"
width="100%"
>
-
+
);
}
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/SelectAppPanel.tsx b/packages/manager/src/features/Linodes/LinodesCreate/SelectAppPanel.tsx
index ada6d0d36b7..4c9241c1ed9 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/SelectAppPanel.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/SelectAppPanel.tsx
@@ -1,8 +1,8 @@
import { Theme, styled } from '@mui/material/styles';
import * as React from 'react';
+import { CircleProgress } from 'src/components/CircleProgress';
import { ErrorState } from 'src/components/ErrorState/ErrorState';
-import { LandingLoading } from 'src/components/LandingLoading/LandingLoading';
import { Notice } from 'src/components/Notice/Notice';
import { Paper } from 'src/components/Paper';
import { AppPanelSection } from 'src/features/Linodes/LinodesCreate/AppPanelSection';
@@ -74,7 +74,7 @@ class SelectAppPanel extends React.PureComponent {
return (
-
+
);
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx
index cea0386e54e..872c66cb5be 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx
@@ -503,7 +503,7 @@ export const IPTransfer = (props: Props) => {
) : null}
{(isLoading || ipv6RangesLoading) && searchText === '' ? (
-
+
) : (
<>
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeIPAddressRow.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeIPAddressRow.tsx
index 9f517a993b5..903580bcbb9 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeIPAddressRow.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeIPAddressRow.tsx
@@ -151,7 +151,7 @@ const RangeRDNSCell = (props: {
const ipsWithRDNS = listIPv6InRange(range.range, range.prefix, ipsInRegion);
if (ipv6Loading) {
- return ;
+ return ;
}
// We don't show anything if there are no addresses.
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferContent.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferContent.tsx
index 9a6cc88ef49..c0b65afd2e6 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferContent.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferContent.tsx
@@ -75,7 +75,7 @@ export const TransferContent = (props: ContentProps) => {
return (
-
+
);
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx
index c79628fb224..8f2a972affa 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/NetworkingSummaryPanel/TransferHistory.tsx
@@ -119,7 +119,7 @@ export const TransferHistory = React.memo((props: Props) => {
if (statsLoading) {
return (
-
+
);
}
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeWatchdogPanel.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeWatchdogPanel.tsx
index e1a22966b17..e7eafa6cad4 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeWatchdogPanel.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeWatchdogPanel.tsx
@@ -1,8 +1,9 @@
-import { Box, CircularProgress, Stack } from '@mui/material';
+import { Box, Stack } from '@mui/material';
import Grid from '@mui/material/Unstable_Grid2';
import * as React from 'react';
import { Accordion } from 'src/components/Accordion';
+import { CircleProgress } from 'src/components/CircleProgress';
import { FormControlLabel } from 'src/components/FormControlLabel';
import { Notice } from 'src/components/Notice/Notice';
import { Toggle } from 'src/components/Toggle/Toggle';
@@ -58,7 +59,7 @@ export const LinodeWatchdogPanel = (props: Props) => {
label={
{linode?.watchdog_enabled ? 'Enabled' : 'Disabled'}
- {isLoading && }
+ {isLoading && }
}
disabled={isReadOnly}
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/StatsPanel.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/StatsPanel.tsx
index 0c3b9b3b82b..d6a3576cb9b 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/StatsPanel.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSummary/StatsPanel.tsx
@@ -21,14 +21,14 @@ export const StatsPanel = (props: Props) => {
{loading ? (
-
+
) : (
renderBody()
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerConfigurations.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerConfigurations.tsx
index 06db352e302..5c8923bb7bf 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerConfigurations.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/LoadBalancerConfigurations.tsx
@@ -52,7 +52,7 @@ export const LoadBalancerConfigurations = () => {
))}
{hasNextPage && fetchNextPage()} />}
- {isFetchingNextPage && }
+ {isFetchingNextPage && }
diff --git a/packages/manager/src/features/Support/SupportTicketDetail/SupportTicketDetail.tsx b/packages/manager/src/features/Support/SupportTicketDetail/SupportTicketDetail.tsx
index 2b2f0be3a77..2a7ffe83198 100644
--- a/packages/manager/src/features/Support/SupportTicketDetail/SupportTicketDetail.tsx
+++ b/packages/manager/src/features/Support/SupportTicketDetail/SupportTicketDetail.tsx
@@ -125,7 +125,7 @@ export const SupportTicketDetail = () => {
ticketUpdated={ticket ? ticket.updated : ''}
/>
))}
- {repliesLoading && }
+ {repliesLoading && }
{repliesError ? (
) : null}
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.tsx
index 99d256362d6..4879592020f 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.tsx
@@ -102,7 +102,7 @@ export const SubnetLinodeRow = (props: Props) => {
return (
-
+
);
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/PricePanel.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/PricePanel.tsx
index ad1ee389651..ffa3a5119d8 100644
--- a/packages/manager/src/features/Volumes/VolumeDrawer/PricePanel.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDrawer/PricePanel.tsx
@@ -1,11 +1,12 @@
-import { CircularProgress } from '@mui/material';
import * as React from 'react';
import { Box } from 'src/components/Box';
+import { CircleProgress } from 'src/components/CircleProgress';
import { DisplayPrice } from 'src/components/DisplayPrice';
import { MAX_VOLUME_SIZE } from 'src/constants';
import { useVolumeTypesQuery } from 'src/queries/volumes/volumes';
import { getDCSpecificPriceByType } from 'src/utilities/pricing/dynamicPricing';
+
interface Props {
currentSize: number;
regionId: string;
@@ -34,13 +35,17 @@ export const PricePanel = ({ currentSize, regionId, value }: Props) => {
: getPrice(currentSize);
const price = getClampedPrice(value, currentSize);
+ if (isLoading) {
+ return (
+
+
+
+ );
+ }
+
return (
- {isLoading ? (
-
- ) : (
-
- )}
+
);
};
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx
index bad1abae3ab..71b8b6f3b29 100644
--- a/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx
@@ -1,9 +1,9 @@
-import { CircularProgress } from '@mui/material';
import { Theme } from '@mui/material/styles';
import * as React from 'react';
import { makeStyles } from 'tss-react/mui';
import { Box } from 'src/components/Box';
+import { CircleProgress } from 'src/components/CircleProgress';
import { FormHelperText } from 'src/components/FormHelperText';
import { InputAdornment } from 'src/components/InputAdornment';
import { TextField } from 'src/components/TextField';
@@ -117,7 +117,7 @@ export const SizeField = (props: Props) => {
/>
{shouldShowPriceLoadingSpinner ? (
-
+
) : hasSelectedRegion ? (
priceDisplayText
) : (
diff --git a/packages/manager/src/features/Volumes/VolumesLanding.tsx b/packages/manager/src/features/Volumes/VolumesLanding.tsx
index d0c4cd8e3ee..662cb870e29 100644
--- a/packages/manager/src/features/Volumes/VolumesLanding.tsx
+++ b/packages/manager/src/features/Volumes/VolumesLanding.tsx
@@ -1,10 +1,10 @@
import * as React from 'react';
import { useHistory, useLocation } from 'react-router-dom';
+import { CircleProgress } from 'src/components/CircleProgress';
import { DocumentTitleSegment } from 'src/components/DocumentTitle';
import { ErrorState } from 'src/components/ErrorState/ErrorState';
import { LandingHeader } from 'src/components/LandingHeader';
-import { LandingLoading } from 'src/components/LandingLoading/LandingLoading';
import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
import { Table } from 'src/components/Table';
import { TableBody } from 'src/components/TableBody';
@@ -115,7 +115,7 @@ export const VolumesLanding = () => {
};
if (isLoading) {
- return
;
+ return
;
}
if (error) {
diff --git a/packages/manager/src/foundations/themes/light.ts b/packages/manager/src/foundations/themes/light.ts
index 1c2c63b87e1..75c064890b4 100644
--- a/packages/manager/src/foundations/themes/light.ts
+++ b/packages/manager/src/foundations/themes/light.ts
@@ -552,6 +552,9 @@ export const lightTheme: ThemeOptions = {
},
},
MuiCircularProgress: {
+ defaultProps: {
+ disableShrink: true,
+ },
styleOverrides: {
circle: {
strokeLinecap: 'inherit',
From c2544d11a02c7d0608e477ad49b22cd4bcc59687 Mon Sep 17 00:00:00 2001
From: jdamore-linode <97627410+jdamore-linode@users.noreply.github.com>
Date: Wed, 5 Jun 2024 18:33:37 -0400
Subject: [PATCH 058/163] test: Improve unit test stability when running
locally (#10278)
* Remove calls to "act" to resolve "The current testing environment is not configured to support act" errors
* Increase wait timeout to give time for Password input module to load
* Clean up test warnings
* Resolve RegEx global flag warnings
* Remove act
* Upgrade to Vitest 1.3.x
---
packages/api-v4/package.json | 2 +-
.../pr-10278-tests-1710347078555.md | 5 +
packages/manager/package.json | 2 +-
.../BillingSummary/BillingSummary.test.tsx | 6 +-
.../LinodeSettings/ImageAndPassword.test.tsx | 10 +-
.../CreateCertificateDrawer.test.tsx | 52 +++++----
.../EditCertificateDrawer.test.tsx | 19 ++-
.../DetailTabs/Disks/Graphs.test.tsx | 8 +-
.../LongviewLanding/LongviewLanding.test.tsx | 7 +-
.../PlacementGroupsDeleteModal.test.tsx | 100 +++++++---------
.../APITokens/CreateAPITokenDrawer.test.tsx | 62 +++++-----
.../APITokens/EditAPITokenDrawer.test.tsx | 48 ++++----
.../manager/src/utilities/storage.test.ts | 8 +-
yarn.lock | 108 ++++++++++--------
14 files changed, 222 insertions(+), 215 deletions(-)
create mode 100644 packages/manager/.changeset/pr-10278-tests-1710347078555.md
diff --git a/packages/api-v4/package.json b/packages/api-v4/package.json
index e6bcbdc9552..24f469068cc 100644
--- a/packages/api-v4/package.json
+++ b/packages/api-v4/package.json
@@ -67,7 +67,7 @@
"lint-staged": "^13.2.2",
"prettier": "~2.2.1",
"tsup": "^7.2.0",
- "vitest": "^1.0.1"
+ "vitest": "^1.3.1"
},
"lint-staged": {
"*.{ts,tsx,js}": [
diff --git a/packages/manager/.changeset/pr-10278-tests-1710347078555.md b/packages/manager/.changeset/pr-10278-tests-1710347078555.md
new file mode 100644
index 00000000000..6bb98190d06
--- /dev/null
+++ b/packages/manager/.changeset/pr-10278-tests-1710347078555.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tests
+---
+
+Improve unit test suite stability ([#10278](https://github.com/linode/manager/pull/10278))
diff --git a/packages/manager/package.json b/packages/manager/package.json
index 1b6e5bf0ea2..f1f0f3fcf49 100644
--- a/packages/manager/package.json
+++ b/packages/manager/package.json
@@ -212,7 +212,7 @@
"ts-node": "^10.9.2",
"vite": "^5.1.7",
"vite-plugin-svgr": "^3.2.0",
- "vitest": "^1.2.0"
+ "vitest": "^1.3.1"
},
"browserslist": [
">1%",
diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.test.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.test.tsx
index b9605c9cbde..35688591d00 100644
--- a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.test.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.test.tsx
@@ -31,7 +31,7 @@ describe('BillingSummary', () => {
);
- within(screen.getByTestId(accountBalanceText)).getByText(/no balance/gi);
+ within(screen.getByTestId(accountBalanceText)).getByText(/no balance/i);
within(screen.getByTestId(accountBalanceValue)).getByText('$0.00');
});
@@ -45,7 +45,7 @@ describe('BillingSummary', () => {
/>
);
- within(screen.getByTestId(accountBalanceText)).getByText(/credit/gi);
+ within(screen.getByTestId(accountBalanceText)).getByText(/credit/i);
within(screen.getByTestId(accountBalanceValue)).getByText('$10.00');
});
@@ -59,7 +59,7 @@ describe('BillingSummary', () => {
/>
);
- within(screen.getByTestId(accountBalanceText)).getByText(/Balance/gi);
+ within(screen.getByTestId(accountBalanceText)).getByText(/Balance/i);
within(screen.getByTestId(accountBalanceValue)).getByText('$10.00');
});
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.test.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.test.tsx
index bffcc435beb..29004901f82 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.test.tsx
@@ -1,5 +1,4 @@
import * as React from 'react';
-
import { profileFactory } from 'src/factories';
import { accountUserFactory } from 'src/factories/accountUsers';
import { grantsFactory } from 'src/factories/grants';
@@ -26,12 +25,15 @@ describe('ImageAndPassword', () => {
expect(getByLabelText('Image')).toBeEnabled();
});
it('should render a password error if defined', async () => {
- const passwordError = 'Unable to set password.';
+ const errorMessage = 'Unable to set password.';
const { findByText } = renderWithTheme(
-
+
);
- expect(await findByText(passwordError)).toBeVisible();
+ const passwordError = await findByText(errorMessage, undefined, {
+ timeout: 2500,
+ });
+ expect(passwordError).toBeVisible();
});
it('should render an SSH Keys section', async () => {
const { getByText } = renderWithTheme(
);
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CreateCertificateDrawer.test.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CreateCertificateDrawer.test.tsx
index eb99d893cab..7d28ba7a98a 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CreateCertificateDrawer.test.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/CreateCertificateDrawer.test.tsx
@@ -7,28 +7,32 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
import { CreateCertificateDrawer } from './CreateCertificateDrawer';
describe('CreateCertificateDrawer', () => {
- it('should be submittable when form is filled out correctly', async () => {
- const onClose = vi.fn();
-
- const { getByLabelText, getByTestId } = renderWithTheme(
-
- );
-
- const labelInput = getByLabelText('Label');
- const certInput = getByLabelText('TLS Certificate');
- const keyInput = getByLabelText('Private Key');
-
- await userEvent.type(labelInput, 'my-cert-0');
- await userEvent.type(certInput, 'massive cert');
- await userEvent.type(keyInput, 'massive key');
-
- await userEvent.click(getByTestId('submit'));
-
- await waitFor(() => expect(onClose).toBeCalled());
- });
+ it(
+ 'should be submittable when form is filled out correctly',
+ async () => {
+ const onClose = vi.fn();
+
+ const { getByLabelText, getByTestId } = renderWithTheme(
+
+ );
+
+ const labelInput = getByLabelText('Label');
+ const certInput = getByLabelText('TLS Certificate');
+ const keyInput = getByLabelText('Private Key');
+
+ await userEvent.type(labelInput, 'my-cert-0');
+ await userEvent.type(certInput, 'massive cert');
+ await userEvent.type(keyInput, 'massive key');
+
+ await userEvent.click(getByTestId('submit'));
+
+ await waitFor(() => expect(onClose).toBeCalled());
+ },
+ { timeout: 10000 }
+ );
});
diff --git a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/EditCertificateDrawer.test.tsx b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/EditCertificateDrawer.test.tsx
index d727d4ad7cc..9f77e663998 100644
--- a/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/EditCertificateDrawer.test.tsx
+++ b/packages/manager/src/features/LoadBalancers/LoadBalancerDetail/Certificates/EditCertificateDrawer.test.tsx
@@ -1,4 +1,4 @@
-import { act, waitFor } from '@testing-library/react';
+import { waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import React from 'react';
@@ -82,10 +82,8 @@ describe('EditCertificateDrawer', () => {
expect(labelInput).toHaveDisplayValue(mockCACertificate.label);
expect(certInput).toHaveDisplayValue(mockCACertificate.certificate.trim());
- await act(async () => {
- await userEvent.type(labelInput, 'my-updated-cert-0');
- await userEvent.click(getByTestId('submit'));
- });
+ await userEvent.type(labelInput, 'my-updated-cert-0');
+ await userEvent.click(getByTestId('submit'));
await waitFor(() => expect(onClose).toBeCalled());
});
@@ -105,13 +103,10 @@ describe('EditCertificateDrawer', () => {
const certInput = getByLabelText('TLS Certificate');
const keyInput = getByLabelText('Private Key');
- await act(async () => {
- await userEvent.type(labelInput, 'my-cert-0');
- await userEvent.type(certInput, 'massive cert');
- await userEvent.type(keyInput, 'massive key');
-
- await userEvent.click(getByTestId('submit'));
- });
+ await userEvent.type(labelInput, 'my-cert-0');
+ await userEvent.type(certInput, 'massive cert');
+ await userEvent.type(keyInput, 'massive key');
+ await userEvent.click(getByTestId('submit'));
await waitFor(() => expect(onClose).toBeCalled());
});
diff --git a/packages/manager/src/features/Longview/LongviewDetail/DetailTabs/Disks/Graphs.test.tsx b/packages/manager/src/features/Longview/LongviewDetail/DetailTabs/Disks/Graphs.test.tsx
index 6b4c3b31cb6..821e0339fe8 100644
--- a/packages/manager/src/features/Longview/LongviewDetail/DetailTabs/Disks/Graphs.test.tsx
+++ b/packages/manager/src/features/Longview/LongviewDetail/DetailTabs/Disks/Graphs.test.tsx
@@ -42,7 +42,7 @@ describe('UI', () => {
expect(queryByTestId('space-graph')).toBeNull();
expect(queryByTestId('diskio-graph')).toBeInTheDocument();
- expect(getByText(/gather space and inode data/gim));
+ expect(getByText(/gather space and inode data/im));
});
it('should not render Disk I/O graph for OpenVZ Configs', () => {
@@ -55,7 +55,7 @@ describe('UI', () => {
expect(queryByTestId('inodes-graph')).toBeInTheDocument();
expect(queryByTestId('diskio-graph')).toBeNull();
- expect(getByText(/gather Disk I\/O on OpenVZ Linodes/gim));
+ expect(getByText(/gather Disk I\/O on OpenVZ Linodes/im));
});
it('should render warning text for ChildOf Disks', () => {
@@ -68,7 +68,7 @@ describe('UI', () => {
expect(queryByTestId('space-graph')).toBeNull();
expect(queryByTestId('diskio-graph')).toBeNull();
- expect(getByText(/doesn't gather data on this type of device/gim));
+ expect(getByText(/doesn't gather data on this type of device/im));
});
it('should render warning text for unmounted disks', () => {
@@ -81,6 +81,6 @@ describe('UI', () => {
expect(queryByTestId('space-graph')).toBeNull();
expect(queryByTestId('diskio-graph')).toBeInTheDocument();
- expect(getByText(/gather Space and Inode data on unmounted disks/gim));
+ expect(getByText(/gather Space and Inode data on unmounted disks/im));
});
});
diff --git a/packages/manager/src/features/Longview/LongviewLanding/LongviewLanding.test.tsx b/packages/manager/src/features/Longview/LongviewLanding/LongviewLanding.test.tsx
index 47bd119b2da..1ff3d36970f 100644
--- a/packages/manager/src/features/Longview/LongviewLanding/LongviewLanding.test.tsx
+++ b/packages/manager/src/features/Longview/LongviewLanding/LongviewLanding.test.tsx
@@ -107,9 +107,10 @@ describe('Longview clients list view', () => {
expect(props.getLongviewClients).toHaveBeenCalledTimes(1);
});
- it('should have an Add Client button', () => {
- const { queryByText } = renderWithTheme(
);
- expect(queryByText('Add Client')).toBeInTheDocument();
+ it('should have an Add Client button', async () => {
+ const { findByText } = renderWithTheme(
);
+ const addButton = await findByText('Add Client');
+ expect(addButton).toBeInTheDocument();
});
it('should attempt to add a new client when the Add Client button is clicked', async () => {
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsDeleteModal.test.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsDeleteModal.test.tsx
index 3377afe1b35..77796f06e19 100644
--- a/packages/manager/src/features/PlacementGroups/PlacementGroupsDeleteModal.test.tsx
+++ b/packages/manager/src/features/PlacementGroups/PlacementGroupsDeleteModal.test.tsx
@@ -1,13 +1,11 @@
-import { act, fireEvent } from '@testing-library/react';
import * as React from 'react';
+import { userEvent } from '@testing-library/user-event';
import { linodeFactory, placementGroupFactory } from 'src/factories';
import { renderWithTheme } from 'src/utilities/testHelpers';
import { PlacementGroupsDeleteModal } from './PlacementGroupsDeleteModal';
-import type { RenderResult } from '@testing-library/react';
-
const queryMocks = vi.hoisted(() => ({
useDeletePlacementGroup: vi.fn().mockReturnValue({
mutateAsync: vi.fn().mockResolvedValue({}),
@@ -31,36 +29,31 @@ const props = {
describe('PlacementGroupsDeleteModal', () => {
it('should render the right form elements', async () => {
- let renderResult: RenderResult;
- await act(async () => {
- renderResult = renderWithTheme(
-
- );
- });
-
- const { getByRole, getByTestId, getByText } = renderResult!;
+ }),
+ ]}
+ selectedPlacementGroup={placementGroupFactory.build({
+ affinity_type: 'anti_affinity:local',
+ id: 1,
+ label: 'PG-to-delete',
+ members: [
+ {
+ is_compliant: true,
+ linode_id: 1,
+ },
+ ],
+ region: 'us-east',
+ })}
+ disableUnassignButton={false}
+ />
+ );
expect(
getByRole('heading', {
@@ -80,30 +73,25 @@ describe('PlacementGroupsDeleteModal', () => {
});
it("should be enabled when there's no assigned linodes", async () => {
- let renderResult: RenderResult;
- await act(async () => {
- renderResult = renderWithTheme(
-
- );
- });
-
- const { getByRole, getByTestId } = renderResult!;
+ label: 'test-linode',
+ region: 'us-east',
+ }),
+ ]}
+ selectedPlacementGroup={placementGroupFactory.build({
+ affinity_type: 'anti_affinity:local',
+ id: 1,
+ label: 'PG-to-delete',
+ members: [],
+ })}
+ disableUnassignButton={false}
+ />
+ );
const textField = getByTestId('textfield-input');
const deleteButton = getByRole('button', { name: 'Delete' });
@@ -111,10 +99,10 @@ describe('PlacementGroupsDeleteModal', () => {
expect(textField).toBeEnabled();
expect(deleteButton).toBeDisabled();
- fireEvent.change(textField, { target: { value: 'PG-to-delete' } });
+ await userEvent.type(textField, 'PG-to-delete');
expect(deleteButton).toBeEnabled();
- fireEvent.click(deleteButton);
+ await userEvent.click(deleteButton);
expect(queryMocks.useDeletePlacementGroup).toHaveBeenCalled();
});
diff --git a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
index 38f9fa7c00b..124ffd92732 100644
--- a/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
+++ b/packages/manager/src/features/Profile/APITokens/CreateAPITokenDrawer.test.tsx
@@ -56,35 +56,39 @@ describe('Create API Token Drawer', () => {
expect(cancelBtn).toBeVisible();
});
- it('Should see secret modal with secret when you type a label and submit the form successfully', async () => {
- server.use(
- http.post('*/profile/tokens', () => {
- return HttpResponse.json(
- appTokenFactory.build({ token: 'secret-value' })
- );
- })
- );
-
- const { getByLabelText, getByTestId, getByText } = renderWithTheme(
-
- );
-
- const labelField = getByTestId('textfield-input');
- await userEvent.type(labelField, 'my-test-token');
-
- const selectAllNoAccessPermRadioButton = getByLabelText(
- 'Select no access for all'
- );
- const submitBtn = getByText('Create Token');
-
- expect(submitBtn).not.toHaveAttribute('aria-disabled', 'true');
- await userEvent.click(selectAllNoAccessPermRadioButton);
- await userEvent.click(submitBtn);
-
- await waitFor(() =>
- expect(props.showSecret).toBeCalledWith('secret-value')
- );
- });
+ it(
+ 'Should see secret modal with secret when you type a label and submit the form successfully',
+ async () => {
+ server.use(
+ http.post('*/profile/tokens', () => {
+ return HttpResponse.json(
+ appTokenFactory.build({ token: 'secret-value' })
+ );
+ })
+ );
+
+ const { getByLabelText, getByTestId, getByText } = renderWithTheme(
+
+ );
+
+ const labelField = getByTestId('textfield-input');
+ await userEvent.type(labelField, 'my-test-token');
+
+ const selectAllNoAccessPermRadioButton = getByLabelText(
+ 'Select no access for all'
+ );
+ const submitBtn = getByText('Create Token');
+
+ expect(submitBtn).not.toHaveAttribute('aria-disabled', 'true');
+ await userEvent.click(selectAllNoAccessPermRadioButton);
+ await userEvent.click(submitBtn);
+
+ await waitFor(() =>
+ expect(props.showSecret).toBeCalledWith('secret-value')
+ );
+ },
+ { timeout: 15000 }
+ );
it('Should default to no selection for all scopes', () => {
const { getByLabelText } = renderWithTheme(
diff --git a/packages/manager/src/features/Profile/APITokens/EditAPITokenDrawer.test.tsx b/packages/manager/src/features/Profile/APITokens/EditAPITokenDrawer.test.tsx
index 05c526a8bf6..e102124db4c 100644
--- a/packages/manager/src/features/Profile/APITokens/EditAPITokenDrawer.test.tsx
+++ b/packages/manager/src/features/Profile/APITokens/EditAPITokenDrawer.test.tsx
@@ -1,4 +1,4 @@
-import { act, waitFor } from '@testing-library/react';
+import { waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import * as React from 'react';
@@ -33,44 +33,38 @@ describe('Edit API Token Drawer', () => {
expect(cancelBtn).not.toHaveAttribute('aria-disabled', 'true');
expect(cancelBtn).toBeVisible();
});
+
it('Save button should become enabled when label is changed', async () => {
const { getByTestId } = renderWithTheme(
);
- const saveButton = getByTestId('save-button');
- expect(saveButton).toHaveAttribute('aria-disabled', 'true');
-
- await act(async () => {
- const labelField = getByTestId('textfield-input');
-
- await userEvent.type(labelField, 'updated-token-label');
+ expect(getByTestId('save-button')).toHaveAttribute('aria-disabled', 'true');
- const saveButton = getByTestId('save-button');
+ const labelField = getByTestId('textfield-input');
- await waitFor(() =>
- expect(saveButton).toHaveAttribute('aria-disabled', 'false')
- );
- });
+ await userEvent.type(labelField, 'updated-token-label');
+ await waitFor(() =>
+ expect(getByTestId('save-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'false'
+ )
+ );
});
+
it('Should close when updating a label and saving', async () => {
// @note: this test uses handlers for PUT */profile/tokens/:id in serverHandlers.ts
const { getByTestId } = renderWithTheme(
);
- await act(async () => {
- const labelField = getByTestId('textfield-input');
-
- await userEvent.type(labelField, 'my-token-updated');
-
- const saveButton = getByTestId('save-button');
-
- await waitFor(() =>
- expect(saveButton).toHaveAttribute('aria-disabled', 'false')
- );
-
- await userEvent.click(saveButton);
+ const labelField = getByTestId('textfield-input');
+ await userEvent.type(labelField, 'my-token-updated');
- await waitFor(() => expect(props.onClose).toBeCalled());
- });
+ const saveButton = getByTestId('save-button');
+ await waitFor(() =>
+ expect(saveButton).toHaveAttribute('aria-disabled', 'false')
+ );
+ await userEvent.click(saveButton);
+ await waitFor(() => expect(props.onClose).toBeCalled());
});
+
it('Should close when Cancel is pressed', async () => {
const { getByText } = renderWithTheme(
);
const cancelButton = getByText(/Cancel/);
diff --git a/packages/manager/src/utilities/storage.test.ts b/packages/manager/src/utilities/storage.test.ts
index 46204e9b750..004c88dfb5f 100644
--- a/packages/manager/src/utilities/storage.test.ts
+++ b/packages/manager/src/utilities/storage.test.ts
@@ -15,9 +15,9 @@ describe('getLocalStorageOverrides', () => {
};
describe('built for development mode', () => {
- // Stub `DEV` environment variable to be truthy.
+ // Stub `DEV` environment variable to be true.
beforeEach(() => {
- vi.stubEnv('DEV', '1');
+ vi.stubEnv('DEV', true);
});
it('returns overrides if overrides are defined', () => {
@@ -42,9 +42,9 @@ describe('getLocalStorageOverrides', () => {
});
describe('not built for development mode', () => {
- // Stub `DEV` environment variable to be falsy.
+ // Stub `DEV` environment variable to be false.
beforeEach(() => {
- vi.stubEnv('DEV', '');
+ vi.stubEnv('DEV', false);
});
it('returns `undefined` when overrides are defined', () => {
diff --git a/yarn.lock b/yarn.lock
index c07bd45ecc9..c69bbcc7e3e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4506,37 +4506,37 @@
test-exclude "^6.0.0"
v8-to-istanbul "^9.2.0"
-"@vitest/expect@1.2.2":
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-1.2.2.tgz#39ea22e849bbf404b7e5272786551aa99e2663d0"
- integrity sha512-3jpcdPAD7LwHUUiT2pZTj2U82I2Tcgg2oVPvKxhn6mDI2On6tfvPQTjAI4628GUGDZrCm4Zna9iQHm5cEexOAg==
+"@vitest/expect@1.6.0":
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-1.6.0.tgz#0b3ba0914f738508464983f4d811bc122b51fb30"
+ integrity sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==
dependencies:
- "@vitest/spy" "1.2.2"
- "@vitest/utils" "1.2.2"
+ "@vitest/spy" "1.6.0"
+ "@vitest/utils" "1.6.0"
chai "^4.3.10"
-"@vitest/runner@1.2.2":
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-1.2.2.tgz#8b060a56ecf8b3d607b044d79f5f50d3cd9fee2f"
- integrity sha512-JctG7QZ4LSDXr5CsUweFgcpEvrcxOV1Gft7uHrvkQ+fsAVylmWQvnaAr/HDp3LAH1fztGMQZugIheTWjaGzYIg==
+"@vitest/runner@1.6.0":
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-1.6.0.tgz#a6de49a96cb33b0e3ba0d9064a3e8d6ce2f08825"
+ integrity sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==
dependencies:
- "@vitest/utils" "1.2.2"
+ "@vitest/utils" "1.6.0"
p-limit "^5.0.0"
pathe "^1.1.1"
-"@vitest/snapshot@1.2.2":
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-1.2.2.tgz#f56fd575569774968f3eeba9382a166c26201042"
- integrity sha512-SmGY4saEw1+bwE1th6S/cZmPxz/Q4JWsl7LvbQIky2tKE35US4gd0Mjzqfr84/4OD0tikGWaWdMja/nWL5NIPA==
+"@vitest/snapshot@1.6.0":
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-1.6.0.tgz#deb7e4498a5299c1198136f56e6e0f692e6af470"
+ integrity sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==
dependencies:
magic-string "^0.30.5"
pathe "^1.1.1"
pretty-format "^29.7.0"
-"@vitest/spy@1.2.2":
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-1.2.2.tgz#8fc2aeccb96cecbbdd192c643729bd5f97a01c86"
- integrity sha512-k9Gcahssw8d7X3pSLq3e3XEu/0L78mUkCjivUqCQeXJm9clfXR/Td8+AP+VC1O6fKPIDLcHDTAmBOINVuv6+7g==
+"@vitest/spy@1.6.0":
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-1.6.0.tgz#362cbd42ccdb03f1613798fde99799649516906d"
+ integrity sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==
dependencies:
tinyspy "^2.2.0"
@@ -4563,6 +4563,16 @@
loupe "^2.3.7"
pretty-format "^29.7.0"
+"@vitest/utils@1.6.0":
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-1.6.0.tgz#5c5675ca7d6f546a7b4337de9ae882e6c57896a1"
+ integrity sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==
+ dependencies:
+ diff-sequences "^29.6.3"
+ estree-walker "^3.0.3"
+ loupe "^2.3.7"
+ pretty-format "^29.7.0"
+
"@yarnpkg/esbuild-plugin-pnp@^3.0.0-rc.10":
version "3.0.0-rc.15"
resolved "https://registry.yarnpkg.com/@yarnpkg/esbuild-plugin-pnp/-/esbuild-plugin-pnp-3.0.0-rc.15.tgz#4e40e7d2eb28825c9a35ab9d04c363931d7c0e67"
@@ -4629,7 +4639,7 @@ acorn@^7.1.1, acorn@^7.4.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-acorn@^8.10.0, acorn@^8.11.3, acorn@^8.4.1, acorn@^8.9.0:
+acorn@^8.11.3, acorn@^8.4.1, acorn@^8.9.0:
version "8.11.3"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
@@ -8849,6 +8859,11 @@ joycon@^3.0.1:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+js-tokens@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-9.0.0.tgz#0f893996d6f3ed46df7f0a3b12a03f5fd84223c1"
+ integrity sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==
+
js-yaml@^3.13.1:
version "3.14.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
@@ -12594,12 +12609,12 @@ strip-json-comments@~2.0.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
-strip-literal@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-1.3.0.tgz#db3942c2ec1699e6836ad230090b84bb458e3a07"
- integrity sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==
+strip-literal@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-2.1.0.tgz#6d82ade5e2e74f5c7e8739b6c84692bd65f0bd2a"
+ integrity sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==
dependencies:
- acorn "^8.10.0"
+ js-tokens "^9.0.0"
stylis@4.2.0:
version "4.2.0"
@@ -12830,10 +12845,10 @@ tinybench@^2.5.1:
resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.6.0.tgz#1423284ee22de07c91b3752c048d2764714b341b"
integrity sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==
-tinypool@^0.8.2:
- version "0.8.2"
- resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.8.2.tgz#84013b03dc69dacb322563a475d4c0a9be00f82a"
- integrity sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==
+tinypool@^0.8.3:
+ version "0.8.4"
+ resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.8.4.tgz#e217fe1270d941b39e98c625dcecebb1408c9aa8"
+ integrity sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==
tinyspy@^2.2.0:
version "2.2.1"
@@ -13468,10 +13483,10 @@ victory-vendor@^36.6.8:
d3-time "^3.0.0"
d3-timer "^3.0.1"
-vite-node@1.2.2:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-1.2.2.tgz#f6d329b06f9032130ae6eac1dc773f3663903c25"
- integrity sha512-1as4rDTgVWJO3n1uHmUYqq7nsFgINQ9u+mRcXpjeOMJUmviqNKjcZB7UfRZrlM7MjYXMKpuWp5oGkjaFLnjawg==
+vite-node@1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-1.6.0.tgz#2c7e61129bfecc759478fa592754fd9704aaba7f"
+ integrity sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==
dependencies:
cac "^6.7.14"
debug "^4.3.4"
@@ -13499,18 +13514,17 @@ vite@^5.0.0, vite@^5.1.7:
optionalDependencies:
fsevents "~2.3.3"
-vitest@^1.0.1, vitest@^1.2.0:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/vitest/-/vitest-1.2.2.tgz#9e29ad2a74a5df553c30c5798c57a062d58ce299"
- integrity sha512-d5Ouvrnms3GD9USIK36KG8OZ5bEvKEkITFtnGv56HFaSlbItJuYr7hv2Lkn903+AvRAgSixiamozUVfORUekjw==
- dependencies:
- "@vitest/expect" "1.2.2"
- "@vitest/runner" "1.2.2"
- "@vitest/snapshot" "1.2.2"
- "@vitest/spy" "1.2.2"
- "@vitest/utils" "1.2.2"
+vitest@^1.3.1:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/vitest/-/vitest-1.6.0.tgz#9d5ad4752a3c451be919e412c597126cffb9892f"
+ integrity sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==
+ dependencies:
+ "@vitest/expect" "1.6.0"
+ "@vitest/runner" "1.6.0"
+ "@vitest/snapshot" "1.6.0"
+ "@vitest/spy" "1.6.0"
+ "@vitest/utils" "1.6.0"
acorn-walk "^8.3.2"
- cac "^6.7.14"
chai "^4.3.10"
debug "^4.3.4"
execa "^8.0.1"
@@ -13519,11 +13533,11 @@ vitest@^1.0.1, vitest@^1.2.0:
pathe "^1.1.1"
picocolors "^1.0.0"
std-env "^3.5.0"
- strip-literal "^1.3.0"
+ strip-literal "^2.0.0"
tinybench "^2.5.1"
- tinypool "^0.8.2"
+ tinypool "^0.8.3"
vite "^5.0.0"
- vite-node "1.2.2"
+ vite-node "1.6.0"
why-is-node-running "^2.2.2"
w3c-xmlserializer@^4.0.0:
From 7124a92e1e9b2c415f05982114fa478b09348d33 Mon Sep 17 00:00:00 2001
From: jdamore-linode <97627410+jdamore-linode@users.noreply.github.com>
Date: Thu, 6 Jun 2024 11:30:08 -0400
Subject: [PATCH 059/163] test: [M3-8013] - Upgrade to Cypress v13.11.0
(#10548)
* Upgrade to Cypress 13.11
---
.../pr-10548-tech-stories-1717618206213.md | 5 ++
packages/manager/Dockerfile | 2 +-
packages/manager/package.json | 10 ++--
yarn.lock | 57 ++++++++++++-------
4 files changed, 46 insertions(+), 28 deletions(-)
create mode 100644 packages/manager/.changeset/pr-10548-tech-stories-1717618206213.md
diff --git a/packages/manager/.changeset/pr-10548-tech-stories-1717618206213.md b/packages/manager/.changeset/pr-10548-tech-stories-1717618206213.md
new file mode 100644
index 00000000000..a4d4b90ec2e
--- /dev/null
+++ b/packages/manager/.changeset/pr-10548-tech-stories-1717618206213.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+Upgrade Cypress from v13.5.0 to v13.11.0 ([#10548](https://github.com/linode/manager/pull/10548))
diff --git a/packages/manager/Dockerfile b/packages/manager/Dockerfile
index cd3e70e8bc1..da157f3e810 100644
--- a/packages/manager/Dockerfile
+++ b/packages/manager/Dockerfile
@@ -19,7 +19,7 @@ CMD yarn start:manager:ci
#
# Builds an image containing Cypress and miscellaneous system utilities required
# by the tests.
-FROM cypress/included:13.5.0 as e2e-build
+FROM cypress/included:13.11.0 as e2e-build
RUN apt-get update \
&& apt-get install -y expect openssh-client \
&& rm -rf /var/cache/apt/* \
diff --git a/packages/manager/package.json b/packages/manager/package.json
index f1f0f3fcf49..9df56b357e9 100644
--- a/packages/manager/package.json
+++ b/packages/manager/package.json
@@ -127,7 +127,7 @@
"@storybook/react-vite": "^8.1.0",
"@storybook/theming": "^8.1.0",
"@swc/core": "^1.3.1",
- "@testing-library/cypress": "^10.0.0",
+ "@testing-library/cypress": "^10.0.2",
"@testing-library/jest-dom": "~6.4.2",
"@testing-library/react": "~14.2.1",
"@testing-library/user-event": "^14.5.2",
@@ -173,10 +173,10 @@
"chalk": "^5.2.0",
"commander": "^6.2.1",
"css-mediaquery": "^0.1.2",
- "cypress": "13.5.0",
- "cypress-axe": "^1.0.0",
- "cypress-file-upload": "^5.0.7",
- "cypress-real-events": "^1.11.0",
+ "cypress": "13.11.0",
+ "cypress-axe": "^1.5.0",
+ "cypress-file-upload": "^5.0.8",
+ "cypress-real-events": "^1.12.0",
"cypress-vite": "^1.5.0",
"dotenv": "^16.0.3",
"eslint": "^6.8.0",
diff --git a/yarn.lock b/yarn.lock
index c69bbcc7e3e..dcc8ddb93b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3537,13 +3537,27 @@
"@tanstack/query-core" "4.36.1"
use-sync-external-store "^1.2.0"
-"@testing-library/cypress@^10.0.0":
- version "10.0.1"
- resolved "https://registry.yarnpkg.com/@testing-library/cypress/-/cypress-10.0.1.tgz#15abae0edb83237316ec6d07e152b71a50b38387"
- integrity sha512-e8uswjTZIBhaIXjzEcrQQ8nHRWHgZH7XBxKuIWxZ/T7FxfWhCR48nFhUX5nfPizjVOKSThEfOSv67jquc1ASkw==
+"@testing-library/cypress@^10.0.2":
+ version "10.0.2"
+ resolved "https://registry.yarnpkg.com/@testing-library/cypress/-/cypress-10.0.2.tgz#5d360f2aa43708c6c92e24765f892b09f3a58912"
+ integrity sha512-dKv95Bre5fDmNb9tOIuWedhGUryxGu1GWYWtXDqUsDPcr9Ekld0fiTb+pcBvSsFpYXAZSpmyEjhoXzLbhh06yQ==
dependencies:
"@babel/runtime" "^7.14.6"
- "@testing-library/dom" "^9.0.0"
+ "@testing-library/dom" "^10.1.0"
+
+"@testing-library/dom@^10.1.0":
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.1.0.tgz#2d073e49771ad614da999ca48f199919e5176fb6"
+ integrity sha512-wdsYKy5zupPyLCW2Je5DLHSxSfbIp6h80WoHOQc+RPtmPGA52O9x5MJEkv92Sjonpq+poOAtUKhh1kBGAXBrNA==
+ dependencies:
+ "@babel/code-frame" "^7.10.4"
+ "@babel/runtime" "^7.12.5"
+ "@types/aria-query" "^5.0.1"
+ aria-query "5.3.0"
+ chalk "^4.1.0"
+ dom-accessibility-api "^0.5.9"
+ lz-string "^1.5.0"
+ pretty-format "^27.0.2"
"@testing-library/dom@^9.0.0":
version "9.3.4"
@@ -4040,7 +4054,7 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240"
integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==
-"@types/node@^18.0.0", "@types/node@^18.17.5":
+"@types/node@^18.0.0":
version "18.19.15"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.15.tgz#313a9d75435669a57fc28dc8694e7f4c4319f419"
integrity sha512-AMZ2UWx+woHNfM11PyAEQmfSxi05jm9OlkxczuHeEqmvwPkYj6MWv44gbzDPefYOLysTOFyI3ziiy2ONmUZfpA==
@@ -4838,7 +4852,7 @@ aria-query@5.1.3:
dependencies:
deep-equal "^2.0.5"
-aria-query@^5.0.0, aria-query@^5.3.0:
+aria-query@5.3.0, aria-query@^5.0.0, aria-query@^5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
@@ -5321,7 +5335,7 @@ buffer-from@^1.0.0:
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.5.0, buffer@^5.7.1:
version "5.7.1"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -6054,20 +6068,20 @@ csstype@^3.0.2, csstype@^3.1.3:
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
-cypress-axe@^1.0.0:
+cypress-axe@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==
-cypress-file-upload@^5.0.7:
+cypress-file-upload@^5.0.8:
version "5.0.8"
resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1"
integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==
-cypress-real-events@^1.11.0:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/cypress-real-events/-/cypress-real-events-1.11.0.tgz#292fe5281c5b6e955524e766ab7fec46930c7763"
- integrity sha512-4LXVRsyq+xBh5TmlEyO1ojtBXtN7xw720Pwb9rEE9rkJuXmeH3VyoR1GGayMGr+Itqf11eEjfDewtDmcx6PWPQ==
+cypress-real-events@^1.12.0:
+ version "1.12.0"
+ resolved "https://registry.yarnpkg.com/cypress-real-events/-/cypress-real-events-1.12.0.tgz#ffeb2b23686ba5b16ac91dd9bc3b6785d36d38d3"
+ integrity sha512-oiy+4kGKkzc2PT36k3GGQqkGxNiVypheWjMtfyi89iIk6bYmTzeqxapaLHS3pnhZOX1IEbTDUVxh8T4Nhs1tyQ==
cypress-vite@^1.5.0:
version "1.5.0"
@@ -6077,20 +6091,19 @@ cypress-vite@^1.5.0:
chokidar "^3.5.3"
debug "^4.3.4"
-cypress@13.5.0:
- version "13.5.0"
- resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.5.0.tgz#8c149074186130972f08b2cdce6ded41f014bacd"
- integrity sha512-oh6U7h9w8wwHfzNDJQ6wVcAeXu31DlIYlNOBvfd6U4CcB8oe4akawQmH+QJVOMZlM42eBoCne015+svVqdwdRQ==
+cypress@13.11.0:
+ version "13.11.0"
+ resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.11.0.tgz#17097366390424cba5db6bf0ee5e97503f036e07"
+ integrity sha512-NXXogbAxVlVje4XHX+Cx5eMFZv4Dho/2rIcdBHg9CNPFUGZdM4cRdgIgM7USmNYsC12XY0bZENEQ+KBk72fl+A==
dependencies:
"@cypress/request" "^3.0.0"
"@cypress/xvfb" "^1.2.4"
- "@types/node" "^18.17.5"
"@types/sinonjs__fake-timers" "8.1.1"
"@types/sizzle" "^2.3.2"
arch "^2.2.0"
blob-util "^2.0.2"
bluebird "^3.7.2"
- buffer "^5.6.0"
+ buffer "^5.7.1"
cachedir "^2.3.0"
chalk "^4.1.0"
check-more-types "^2.24.0"
@@ -6108,7 +6121,7 @@ cypress@13.5.0:
figures "^3.2.0"
fs-extra "^9.1.0"
getos "^3.2.1"
- is-ci "^3.0.0"
+ is-ci "^3.0.1"
is-installed-globally "~0.4.0"
lazy-ass "^1.6.0"
listr2 "^3.8.3"
@@ -8478,7 +8491,7 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-is-ci@^3.0.0:
+is-ci@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
From d4139ad6dc263f7effbaa36430f2a9818a0d1fc7 Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <125309814+jaalah-akamai@users.noreply.github.com>
Date: Thu, 6 Jun 2024 12:25:05 -0400
Subject: [PATCH 060/163] feat: [M3-7919] Add Fonoa tax id event notification
on invalidation (#10512)
Co-authored-by: Jaalah Ramos
Co-authored-by: Alban Bailly <130582365+abailly-akamai@users.noreply.github.com>
---
.../pr-10512-added-1717103206247.md | 5 ++
packages/api-v4/src/account/types.ts | 21 +++----
.../pr-10512-added-1716563502479.md | 5 ++
.../e2e/core/billing/billing-contact.spec.ts | 18 ++++++
packages/manager/src/featureFlags.ts | 15 +++--
.../manager/src/features/Account/utils.ts | 22 +++++++
.../UpdateContactInformationForm.tsx | 19 ++++++-
.../manager/src/features/Billing/constants.ts | 2 +
.../manager/src/features/Events/constants.ts | 9 +--
.../features/Events/eventMessageGenerator.ts | 57 ++++++++++---------
.../src/features/Events/factories/index.ts | 1 +
.../src/features/Events/factories/tax.tsx | 9 +++
.../useEventNotifications.tsx | 15 ++++-
.../src/features/PlacementGroups/utils.ts | 2 +-
.../manager/src/queries/account/account.ts | 35 +++++++++++-
15 files changed, 182 insertions(+), 53 deletions(-)
create mode 100644 packages/api-v4/.changeset/pr-10512-added-1717103206247.md
create mode 100644 packages/manager/.changeset/pr-10512-added-1716563502479.md
create mode 100644 packages/manager/src/features/Events/factories/tax.tsx
diff --git a/packages/api-v4/.changeset/pr-10512-added-1717103206247.md b/packages/api-v4/.changeset/pr-10512-added-1717103206247.md
new file mode 100644
index 00000000000..6b7d1d2b814
--- /dev/null
+++ b/packages/api-v4/.changeset/pr-10512-added-1717103206247.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Added
+---
+
+New event `tax_id_invalid` for account tax id ([#10512](https://github.com/linode/manager/pull/10512))
diff --git a/packages/api-v4/src/account/types.ts b/packages/api-v4/src/account/types.ts
index b5965e25d5a..e5d3c615fb3 100644
--- a/packages/api-v4/src/account/types.ts
+++ b/packages/api-v4/src/account/types.ts
@@ -300,11 +300,11 @@ export const EventActionKeys = [
'database_delete',
'database_failed',
'database_low_disk_space',
- 'database_resize',
'database_resize_create',
+ 'database_resize',
'database_scale',
- 'database_update',
'database_update_failed',
+ 'database_update',
'database_upgrade',
'disk_create',
'disk_delete',
@@ -324,8 +324,8 @@ export const EventActionKeys = [
'domain_record_update',
'domain_record_updated',
'domain_update',
- 'entity_transfer_accept',
'entity_transfer_accept_recipient',
+ 'entity_transfer_accept',
'entity_transfer_cancel',
'entity_transfer_create',
'entity_transfer_fail',
@@ -356,16 +356,16 @@ export const EventActionKeys = [
'linode_create',
'linode_delete',
'linode_deleteip',
+ 'linode_migrate_datacenter_create',
+ 'linode_migrate_datacenter',
'linode_migrate',
'linode_mutate_create',
'linode_mutate',
- 'linode_migrate_datacenter',
- 'linode_migrate_datacenter_create',
'linode_reboot',
'linode_rebuild',
- 'linode_resize',
'linode_resize_create',
'linode_resize_warm_create',
+ 'linode_resize',
'linode_shutdown',
'linode_snapshot',
'linode_update',
@@ -373,12 +373,12 @@ export const EventActionKeys = [
'lke_cluster_create',
'lke_cluster_delete',
'lke_cluster_recycle',
- 'lke_cluster_update',
- 'lke_kubeconfig_regenerate',
'lke_cluster_regenerate',
+ 'lke_cluster_update',
'lke_control_plane_acl_create',
'lke_control_plane_acl_delete',
'lke_control_plane_acl_update',
+ 'lke_kubeconfig_regenerate',
'lke_node_create',
'lke_node_recycle',
'lke_pool_create',
@@ -402,8 +402,8 @@ export const EventActionKeys = [
'nodebalancer_update',
'oauth_client_create',
'oauth_client_delete',
- 'oauth_client_update',
'oauth_client_secret_reset',
+ 'oauth_client_update',
'obj_access_key_create',
'obj_access_key_delete',
'obj_access_key_update',
@@ -432,6 +432,7 @@ export const EventActionKeys = [
'subnet_update',
'tag_create',
'tag_delete',
+ 'tax_id_invalid',
'tfa_disabled',
'tfa_enabled',
'ticket_attachment_upload',
@@ -451,8 +452,8 @@ export const EventActionKeys = [
'volume_create',
'volume_delete',
'volume_detach',
- 'volume_migrate',
'volume_migrate_scheduled',
+ 'volume_migrate',
'volume_resize',
'volume_update',
'vpc_create',
diff --git a/packages/manager/.changeset/pr-10512-added-1716563502479.md b/packages/manager/.changeset/pr-10512-added-1716563502479.md
new file mode 100644
index 00000000000..b322bd75fc8
--- /dev/null
+++ b/packages/manager/.changeset/pr-10512-added-1716563502479.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Added
+---
+
+New tax id validation for non-US countries ([#10512](https://github.com/linode/manager/pull/10512))
diff --git a/packages/manager/cypress/e2e/core/billing/billing-contact.spec.ts b/packages/manager/cypress/e2e/core/billing/billing-contact.spec.ts
index 0db765463af..c73550b7a13 100644
--- a/packages/manager/cypress/e2e/core/billing/billing-contact.spec.ts
+++ b/packages/manager/cypress/e2e/core/billing/billing-contact.spec.ts
@@ -2,6 +2,13 @@ import { mockGetAccount, mockUpdateAccount } from 'support/intercepts/account';
import { accountFactory } from 'src/factories/account';
import type { Account } from '@linode/api-v4';
import { ui } from 'support/ui';
+import { makeFeatureFlagData } from 'support/util/feature-flags';
+import { TAX_ID_HELPER_TEXT } from 'src/features/Billing/constants';
+import {
+ mockAppendFeatureFlags,
+ mockGetFeatureFlagClientstream,
+} from 'support/intercepts/feature-flags';
+import type { Flags } from 'src/featureFlags';
/* eslint-disable sonarjs/no-duplicate-string */
const accountData = accountFactory.build({
@@ -63,6 +70,14 @@ const checkAccountContactDisplay = (accountInfo: Account) => {
};
describe('Billing Contact', () => {
+ beforeEach(() => {
+ mockAppendFeatureFlags({
+ taxId: makeFeatureFlagData({
+ enabled: true,
+ }),
+ });
+ mockGetFeatureFlagClientstream();
+ });
it('Edit Contact Info', () => {
// mock the user's account data and confirm that it is displayed correctly upon page load
mockGetAccount(accountData).as('getAccount');
@@ -124,6 +139,8 @@ describe('Billing Contact', () => {
.click()
.clear()
.type(newAccountData['phone']);
+ cy.get('[data-qa-contact-country]').click().type('Afghanistan{enter}');
+ cy.findByText(TAX_ID_HELPER_TEXT).should('be.visible');
cy.get('[data-qa-contact-country]')
.click()
.type('United States{enter}');
@@ -136,6 +153,7 @@ describe('Billing Contact', () => {
.click()
.clear()
.type(newAccountData['tax_id']);
+ cy.findByText(TAX_ID_HELPER_TEXT).should('not.exist');
cy.get('[data-qa-save-contact-info="true"]')
.click()
.then(() => {
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
index 76e40d150bb..811f3b66097 100644
--- a/packages/manager/src/featureFlags.ts
+++ b/packages/manager/src/featureFlags.ts
@@ -38,13 +38,15 @@ interface TaxCollectionBanner {
regions?: TaxCollectionRegion[];
}
-interface PlacementGroupsFlag {
- beta: boolean;
+interface BaseFeatureFlag {
enabled: boolean;
}
-interface GeckoFlag {
- enabled: boolean;
+interface BetaFeatureFlag extends BaseFeatureFlag {
+ beta: boolean;
+}
+
+interface GaFeatureFlag extends BaseFeatureFlag {
ga: boolean;
}
@@ -69,7 +71,7 @@ export interface Flags {
disableLargestGbPlans: boolean;
eventMessagesV2: boolean;
gecko: boolean; // @TODO gecko: delete this after next release
- gecko2: GeckoFlag;
+ gecko2: GaFeatureFlag;
gpuv2: gpuV2;
ipv6Sharing: boolean;
linodeCreateRefactor: boolean;
@@ -80,7 +82,7 @@ export interface Flags {
objMultiCluster: boolean;
oneClickApps: OneClickApp;
oneClickAppsDocsOverride: Record;
- placementGroups: PlacementGroupsFlag;
+ placementGroups: BetaFeatureFlag;
productInformationBanners: ProductInformationBannerFlag[];
promos: boolean;
promotionalOffers: PromotionalOffer[];
@@ -90,6 +92,7 @@ export interface Flags {
supportTicketSeverity: boolean;
taxBanner: TaxBanner;
taxCollectionBanner: TaxCollectionBanner;
+ taxId: BaseFeatureFlag;
taxes: Taxes;
tpaProviders: Provider[];
}
diff --git a/packages/manager/src/features/Account/utils.ts b/packages/manager/src/features/Account/utils.ts
index b181a1f88c0..846cb66a7cc 100644
--- a/packages/manager/src/features/Account/utils.ts
+++ b/packages/manager/src/features/Account/utils.ts
@@ -1,3 +1,5 @@
+import { useFlags } from 'src/hooks/useFlags';
+
import { ADMINISTRATOR, PARENT_USER } from './constants';
import type { GlobalGrantTypes, GrantLevel } from '@linode/api-v4';
@@ -63,3 +65,23 @@ export const getRestrictedResourceText = ({
return message;
};
+
+/**
+ * Hook to determine if the Tax Id feature should be visible to the user.
+ * Based on the user's account capability and the feature flag.
+ *
+ * @returns {boolean} - Whether the TaxId feature is enabled for the current user.
+ */
+export const useIsTaxIdEnabled = (): {
+ isTaxIdEnabled: boolean;
+} => {
+ const flags = useFlags();
+
+ if (!flags) {
+ return { isTaxIdEnabled: false };
+ }
+
+ const isTaxIdEnabled = Boolean(flags.taxId?.enabled);
+
+ return { isTaxIdEnabled };
+};
diff --git a/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx b/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx
index 3c2fe20117d..a9402f6a85e 100644
--- a/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx
+++ b/packages/manager/src/features/Billing/BillingPanels/ContactInfoPanel/UpdateContactInformationForm/UpdateContactInformationForm.tsx
@@ -8,7 +8,11 @@ import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
import EnhancedSelect, { Item } from 'src/components/EnhancedSelect/Select';
import { Notice } from 'src/components/Notice/Notice';
import { TextField } from 'src/components/TextField';
-import { getRestrictedResourceText } from 'src/features/Account/utils';
+import {
+ getRestrictedResourceText,
+ useIsTaxIdEnabled,
+} from 'src/features/Account/utils';
+import { TAX_ID_HELPER_TEXT } from 'src/features/Billing/constants';
import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
import { useAccount, useMutateAccount } from 'src/queries/account/account';
import { useNotificationsQuery } from 'src/queries/account/notifications';
@@ -29,6 +33,7 @@ const UpdateContactInformationForm = ({ focusEmail, onClose }: Props) => {
const { classes } = useStyles();
const emailRef = React.useRef();
const { data: profile } = useProfile();
+ const { isTaxIdEnabled } = useIsTaxIdEnabled();
const isChildUser = profile?.user_type === 'child';
const isParentUser = profile?.user_type === 'parent';
const isReadOnly =
@@ -166,6 +171,11 @@ const UpdateContactInformationForm = ({ focusEmail, onClose }: Props) => {
formik.setFieldValue('company', '');
}
+ const handleCountryChange = (item: Item) => {
+ formik.setFieldValue('country', item.value);
+ formik.setFieldValue('tax_id', '');
+ };
+
return (