Skip to content
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

Jump to bottom

MGMT-17377: Change the way to validate field values in networking page #2534

Merged
merged 1 commit into from
Apr 3, 2024
Merged

MGMT-17377: Change the way to validate field values in networking page #2534

Show file tree
Hide file tree
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
77 changes: 31 additions & 46 deletions libs/ui-lib/lib/common/components/ui/formik/validationSchemas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
import { NO_SUBNET_SET } from '../../../config/constants';
import { ProxyFieldsType } from '../../../types';
import { HostSubnets, NetworkConfigurationValues } from '../../../types/clusters';
import { getErrorMessage } from '../../../utils';
import { getSubnet } from '../../clusterConfiguration/utils';
import {
bmcAddressValidationMessages,
Expand Down Expand Up @@ -194,44 +193,40 @@ export const vipRangeValidationSchema = (
{ machineNetworks, hostSubnet }: NetworkConfigurationValues,
allowSuffix: boolean,
) =>
Yup.string().test(
'vip-validation',
'IP Address is outside of selected subnet',
(value, testContext: Yup.TestContext) => {
if (!value) {
return true;
}
Yup.string().test('vip-validation', 'IP Address is outside of selected subnet', (value) => {
if (!value) {
return true;
}

try {
const validator = allowSuffix ? ipValidationSchema : ipNoSuffixValidationSchema;
validator.validateSync(value);
} catch (err) {
return testContext.createError({ message: getErrorMessage(err) });
}
try {
const validator = allowSuffix ? ipValidationSchema : ipNoSuffixValidationSchema;
validator.validateSync(value);
} catch (err) {
return true;
}

const foundHostSubnets = [];
if (machineNetworks) {
const cidrs = machineNetworks?.map((network) => network.cidr);
foundHostSubnets.push(...hostSubnets.filter((hn) => cidrs?.includes(hn.subnet)));
} else {
const subnet = hostSubnets.find((hn) => hn.subnet === hostSubnet);
if (subnet) {
foundHostSubnets.push(subnet);
}
const foundHostSubnets = [];
if (machineNetworks) {
const cidrs = machineNetworks?.map((network) => network.cidr);
foundHostSubnets.push(...hostSubnets.filter((hn) => cidrs?.includes(hn.subnet)));
} else {
const subnet = hostSubnets.find((hn) => hn.subnet === hostSubnet);
if (subnet) {
foundHostSubnets.push(subnet);
}
for (const hostSubnet of foundHostSubnets) {
if (hostSubnet?.subnet) {
// Workaround for bug in CIM backend. hostIDs are empty
if (!hostSubnet.hostIDs.length) {
return true;
} else if (isInSubnet(value, hostSubnet.subnet)) {
return true;
}
}
for (const hostSubnet of foundHostSubnets) {
if (hostSubnet?.subnet) {
// Workaround for bug in CIM backend. hostIDs are empty
if (!hostSubnet.hostIDs.length) {
return true;
} else if (isInSubnet(value, hostSubnet.subnet)) {
return true;
}
}
return false;
},
);
}
return false;
});

const vipUniqueValidationSchema = (
{ ingressVips, apiVips, apiVip, ingressVip }: NetworkConfigurationValues,
Expand Down Expand Up @@ -297,12 +292,7 @@ export const vipValidationSchema = (
then: () =>
requiredOnceSet(initialValue, 'Required. Please provide an IP address')
.concat(vipRangeValidationSchema(hostSubnets, values, true))
.concat(vipUniqueValidationSchema(values, false))
.when('hostSubnet', {
is: (hostSubnet: NetworkConfigurationValues['hostSubnet']) =>
hostSubnet !== NO_SUBNET_SET,
then: () => Yup.string().required('Required. Please provide an IP address'),
}),
.concat(vipUniqueValidationSchema(values, false)),
});

export const vipNoSuffixValidationSchema = (
Expand All @@ -320,12 +310,7 @@ export const vipNoSuffixValidationSchema = (
.concat(ipNoSuffixValidationSchema)
.concat(vipRangeValidationSchema(hostSubnets, values, false))
.concat(vipBroadcastValidationSchema(values))
.concat(vipUniqueValidationSchema(values, true))
.when('hostSubnet', {
is: (hostSubnet: NetworkConfigurationValues['hostSubnet']) =>
hostSubnet !== NO_SUBNET_SET,
then: () => Yup.string().required('Required. Please provide an IP address'),
}),
.concat(vipUniqueValidationSchema(values, true)),
});

export const vipArrayValidationSchema = <T extends Yup.Maybe<Yup.AnyObject>>(
Expand Down
9 changes: 5 additions & 4 deletions ...ib/lib/ocm/components/clusterConfiguration/networkConfiguration/VirtualIPControlGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,15 @@ export const VirtualIPControlGroup = ({
const onChangeDhcp = React.useCallback(
(hasDhcp: boolean) => {
// We need to sync the values back to the form
setFieldValue('apiVips', hasDhcp ? [] : cluster.apiVips);
setFieldValue('ingressVips', hasDhcp ? [] : cluster.ingressVips);
setFieldValue('apiVips', hasDhcp ? [] : cluster.apiVips, true);
setFieldValue('ingressVips', hasDhcp ? [] : cluster.ingressVips, true);
},
[cluster.apiVips, cluster.ingressVips, setFieldValue],
);

const setVipValue = (field: string, e: React.ChangeEvent<HTMLInputElement>) =>
setFieldValue(field, [{ ip: e.target.value, clusterId: cluster.id }]);
const setVipValue = (field: string, e: React.ChangeEvent<HTMLInputElement>) => {
setFieldValue(field, [{ ip: e.target.value, clusterId: cluster.id }], true);
};

const ipFieldsSuffix = values.stackType === DUAL_STACK ? ' (IPv4)' : '';
return (
Expand Down
Loading