From 2e4dfddb105805b560fadf0e2d1f9d3253cadd63 Mon Sep 17 00:00:00 2001 From: jgyselov Date: Thu, 9 Oct 2025 10:14:29 +0200 Subject: [PATCH] Add unique data-testid to dualstack subnet dropdowns --- .../AvailableSubnetsControl.tsx | 2 ++ .../networkConfiguration/SubnetsDropdown.tsx | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/libs/ui-lib/lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx b/libs/ui-lib/lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx index 741def1cef..02ba2e0548 100644 --- a/libs/ui-lib/lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx +++ b/libs/ui-lib/lib/ocm/components/clusterConfiguration/networkConfiguration/AvailableSubnetsControl.tsx @@ -79,6 +79,7 @@ export const AvailableSubnetsControl = ({ name={`machineNetworks.${index}.cidr`} machineSubnets={machineSubnets} isDisabled={isDisabled} + data-testid={`subnets-dropdown-toggle-${index ? 'ipv6' : 'ipv4'}`} /> ); @@ -89,6 +90,7 @@ export const AvailableSubnetsControl = ({ name={`machineNetworks.0.cidr`} machineSubnets={IPv4Subnets} isDisabled={isDisabled} + data-testid={'subnets-dropdown-toggle-ipv4'} /> )} diff --git a/libs/ui-lib/lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx b/libs/ui-lib/lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx index 08f70842d4..668121e125 100644 --- a/libs/ui-lib/lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx +++ b/libs/ui-lib/lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx @@ -1,5 +1,11 @@ import React from 'react'; -import { Dropdown, DropdownItem, MenuToggle, MenuToggleElement } from '@patternfly/react-core'; +import { + Dropdown, + DropdownItem, + MenuToggle, + MenuToggleElement, + MenuToggleProps, +} from '@patternfly/react-core'; import { useField } from 'formik'; import { getFieldId, HostSubnet, NO_SUBNET_SET } from '../../../../common'; @@ -32,7 +38,12 @@ const noSubnetAvailableOption = { id: 'form-input-hostSubnet-field-option-no-subnet-available', }; -export const SubnetsDropdown = ({ name, machineSubnets, isDisabled }: SubnetsDropdownProps) => { +export const SubnetsDropdown = ({ + name, + machineSubnets, + isDisabled, + ...props +}: SubnetsDropdownProps & MenuToggleProps) => { const [field, , { setValue }] = useField(name); const [isOpen, setOpen] = React.useState(false); const fieldId = getFieldId(name, 'input'); @@ -79,7 +90,7 @@ export const SubnetsDropdown = ({ name, machineSubnets, isDisabled }: SubnetsDro id={fieldId} className="pf-v6-u-w-100" style={{ minWidth: '100%' }} - data-testid="subnets-dropdown-toggle" + {...props} > {currentDisplayValue}