Skip to content

Different bugs related with dual-stack with ipv4/ipv6 #3231

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
openshift-merge-bot merged 1 commit into from
Oct 31, 2025
Merged

Different bugs related with dual-stack with ipv4/ipv6 #3231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions libs/ui-lib/lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@ import {
MenuToggle,
MenuToggleElement,
MenuToggleProps,
Divider,
} from '@patternfly/react-core';
import { useField } from 'formik';
import { getFieldId, HostSubnet, NO_SUBNET_SET } from '../../../../common';
import {
getFieldId,
HostSubnet,
NO_SUBNET_SET,
TechnologyPreview,
PreviewBadgePosition,
} from '../../../../common';
import { Address4, Address6 } from 'ip-address';

type SubnetsDropdownProps = {
Expand Down Expand Up @@ -62,7 +69,8 @@ export const SubnetsDropdown = ({
const ipv4Subnets = machineSubnets.filter((subnet) => Address4.isValid(subnet.subnet));
const ipv6Subnets = machineSubnets.filter((subnet) => Address6.isValid(subnet.subnet));

let currentDisplayValue = itemsSubnets[0].label; // The placeholder is the fallback
let currentDisplayValue =
itemsSubnets.length > 1 ? itemsSubnets[1].label : itemsSubnets[0].label; // The placeholder is the fallback in some cases
if (field.value) {
const subnetItem = itemsSubnets.find((item) => item.value === field.value);
if (subnetItem) {
Expand Down Expand Up @@ -100,7 +108,7 @@ export const SubnetsDropdown = ({
{label}
</DropdownItem>
));

ipv4Items.push(<Divider key="ipv4-divider" />);
const ipv6Items = toFormSelectOptions(ipv6Subnets).map(({ value, label, isDisabled }) => (
<DropdownItem key={value} id={value} isDisabled={isDisabled} value={value}>
{label}
Expand All @@ -119,7 +127,7 @@ export const SubnetsDropdown = ({
<DropdownGroup label="IPv4" key="ipv4-group">
{ipv4Items}
</DropdownGroup>,
<DropdownGroup label="IPv6" key="ipv6-group">
<DropdownGroup label="IPv6 (Technology Preview)" key="ipv6-group">
{ipv6Items}
</DropdownGroup>,
];
Expand All @@ -138,6 +146,9 @@ export const SubnetsDropdown = ({
setOpen(false);
};

const currentItem = itemsSubnets.find((i) => i.label === currentDisplayValue);
const showBadge = Boolean(currentItem && Address6.isValid(currentItem.value));

const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
<MenuToggle
ref={toggleRef}
Expand All @@ -150,6 +161,11 @@ export const SubnetsDropdown = ({
{...props}
>
{currentDisplayValue}
{showBadge && (
<span onClick={(e) => e.stopPropagation()}>
<TechnologyPreview position={PreviewBadgePosition.inlineRight} />
</span>
)}
</MenuToggle>
);

Expand Down
Loading