Skip to content

refactor: [M3-10638] - VPC IPv4 and IPv6 address code clean up #12940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hana-akamai merged 8 commits into from
Oct 6, 2025
Merged

refactor: [M3-10638] - VPC IPv4 and IPv6 address code clean up #12940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
523af69
consolidate auto-assign vpc ipv6 address logic into one component
hana-akamai Oct 1, 2025
8032430
consolidate auto-assign vpc ipv4 address logic into one component
hana-akamai Oct 1, 2025
60e4ab4
Added changeset: VPC IPv4 and IPv6 address code clean up
hana-akamai Oct 1, 2025
4b1fe60
Merge branch 'develop' into M3-10638-vpc-ipv6-code-clean-up
hana-akamai Oct 2, 2025
dc51cf2
update LinodeCreate VPC config
hana-akamai Oct 2, 2025
e575175
refactor public access
hana-akamai Oct 2, 2025
b7314ab
fix unit test
hana-akamai Oct 2, 2025
1bb542a
remove placeholder
hana-akamai Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/manager/.changeset/pr-12940-tech-stories-1759341754178.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Tech Stories
---

VPC IPv4 and IPv6 address code clean up ([#12940](https://github.com/linode/manager/pull/12940))
161 changes: 40 additions & 121 deletions packages/manager/src/features/Linodes/LinodeCreate/Networking/VPC.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,14 @@
import { useAllVPCsQuery, useRegionQuery } from '@linode/queries';
import {
Autocomplete,
Box,
Checkbox,
Divider,
FormControlLabel,
Notice,
Stack,
TextField,
TooltipIcon,
Typography,
} from '@linode/ui';
import { Autocomplete, Box, Divider, Stack, Typography } from '@linode/ui';
import { LinkButton } from '@linode/ui';
import React, { useState } from 'react';
import { Controller, useFormContext, useWatch } from 'react-hook-form';

import {
VPCIPv6PublicIPLabel,
VPCPublicIPLabel,
} from 'src/features/VPCs/components/VPCPublicIPLabel';
import {
REGION_CAVEAT_HELPER_TEXT,
VPC_AUTO_ASSIGN_IPV4_TOOLTIP,
VPC_AUTO_ASSIGN_IPV6_TOOLTIP,
VPC_IPV4_INPUT_HELPER_TEXT,
VPC_IPV6_INPUT_HELPER_TEXT,
} from 'src/features/VPCs/constants';
import { PublicIPv4Access } from 'src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/PublicIPv4Access';
import { PublicIPv6Access } from 'src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/PublicIPv6Access';
import { VPCIPv4Address } from 'src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/VPCIPv4Address';
import { VPCIPv6Address } from 'src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/VPCIPv6Address';
import { REGION_CAVEAT_HELPER_TEXT } from 'src/features/VPCs/constants';
import { VPCCreateDrawer } from 'src/features/VPCs/VPCCreateDrawer/VPCCreateDrawer';
import { useVPCDualStack } from 'src/hooks/useVPCDualStack';

Expand Down Expand Up @@ -161,85 +144,35 @@ export const VPC = ({ index }: Props) => {
control={control}
name={`linodeInterfaces.${index}.vpc.ipv4.addresses.0.address`}
render={({ field, fieldState }) => (
<Box>
<FormControlLabel
checked={field.value === 'auto'}
control={<Checkbox sx={{ ml: 0.4 }} />}
disabled={!regionSupportsVPCs}
label={
<Stack alignItems="center" direction="row">
<Typography>Auto-assign VPC IPv4</Typography>
<TooltipIcon
status="info"
text={VPC_AUTO_ASSIGN_IPV4_TOOLTIP}
/>
</Stack>
}
onChange={(e, checked) =>
field.onChange(checked ? 'auto' : '')
}
/>
{field.value !== 'auto' && (
<TextField
containerProps={{ sx: { mb: 1.5, mt: 1 } }}
errorText={
fieldState.error?.message ??
errors.linodeInterfaces?.[index]?.vpc?.ipv4
?.addresses?.[0]?.message
}
helperText={VPC_IPV4_INPUT_HELPER_TEXT}
label="VPC IPv4"
noMarginTop
onBlur={field.onBlur}
onChange={field.onChange}
required
value={field.value}
/>
)}
</Box>
<VPCIPv4Address
disabled={!regionSupportsVPCs}
errorMessage={
fieldState.error?.message ??
errors.linodeInterfaces?.[index]?.vpc?.ipv4?.addresses?.[0]
?.message
}
fieldValue={field.value}
onBlur={field.onBlur}
onChange={field.onChange}
/>
)}
/>
{showIPv6Fields && (
<Controller
control={control}
name={`linodeInterfaces.${index}.vpc.ipv6.slaac.0.range`}
render={({ field, fieldState }) => (
<Box>
<FormControlLabel
checked={field.value === 'auto'}
control={<Checkbox sx={{ ml: 0.4 }} />}
disabled={!regionSupportsVPCs}
label={
<Stack alignItems="center" direction="row">
<Typography>Auto-assign VPC IPv6</Typography>
<TooltipIcon
status="info"
text={VPC_AUTO_ASSIGN_IPV6_TOOLTIP}
/>
</Stack>
}
onChange={(e, checked) =>
field.onChange(checked ? 'auto' : '')
}
/>
{field.value !== 'auto' && (
<TextField
containerProps={{ sx: { mb: 1.5, mt: 1 } }}
errorText={
fieldState.error?.message ??
errors.linodeInterfaces?.[index]?.vpc?.ipv6?.slaac?.[0]
?.range?.message
}
helperText={VPC_IPV6_INPUT_HELPER_TEXT}
label="VPC IPv6"
noMarginTop
onBlur={field.onBlur}
onChange={field.onChange}
required
value={field.value}
/>
)}
</Box>
<VPCIPv6Address
disabled={!regionSupportsVPCs}
errorMessage={
fieldState.error?.message ??
errors.linodeInterfaces?.[index]?.vpc?.ipv6?.slaac?.[0]
?.range?.message
}
fieldValue={field.value}
onBlur={field.onBlur}
onChange={field.onChange}
/>
)}
/>
)}
Expand All @@ -254,39 +187,25 @@ export const VPC = ({ index }: Props) => {
control={control}
name={`linodeInterfaces.${index}.vpc.ipv4.addresses.0.nat_1_1_address`}
render={({ field, fieldState }) => (
<Box>
{fieldState.error?.message && (
<Notice text={fieldState.error.message} variant="error" />
)}
<FormControlLabel
checked={field.value === 'auto'}
control={<Checkbox sx={{ ml: 0.4 }} />}
disabled={!regionSupportsVPCs}
label={<VPCPublicIPLabel />}
onChange={(e, checked) =>
field.onChange(checked ? 'auto' : null)
}
/>
</Box>
<PublicIPv4Access
checked={Boolean(field.value)}
disabled={!regionSupportsVPCs}
errorMessage={fieldState.error?.message}
onChange={field.onChange}
/>
)}
/>
{showIPv6Fields && (
<Controller
control={control}
name={`linodeInterfaces.${index}.vpc.ipv6.is_public`}
render={({ field, fieldState }) => (
<Box>
{fieldState.error?.message && (
<Notice text={fieldState.error.message} variant="error" />
)}
<FormControlLabel
checked={field.value === true}
control={<Checkbox sx={{ ml: 0.4 }} />}
disabled={!regionSupportsVPCs}
label={<VPCIPv6PublicIPLabel />}
onChange={() => field.onChange(!field.value)}
/>
</Box>
<PublicIPv6Access
checked={field.value === true}
disabled={!regionSupportsVPCs}
errorMessage={fieldState.error?.message}
onChange={field.onChange}
/>
)}
/>
)}
Expand Down
Loading