Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { StaticIpForm } from '../StaticIpForm';
import { StaticIpFormProps, StaticIpViewProps } from '../propTypes';
import { FormViewHost, FormViewNetworkWideValues } from '../../data/dataTypes';
import { networkWideValidationSchema } from './formViewNetworkWideValidationSchema';
import { getNetworkWideValidationSchema } from './formViewNetworkWideValidationSchema';
import { networkWideToInfraEnvField } from '../../data/formDataToInfraEnvField';
import { FormViewNetworkWideFields } from './FormViewNetworkWideFields';
import { getFormData, getFormViewNetworkWideValues } from '../../data/fromInfraEnv';
Expand All @@ -22,7 +22,7 @@ export const FormViewNetworkWide: React.FC<StaticIpViewProps> = ({ infraEnv, ...
setFormProps({
infraEnv,
...props,
validationSchema: networkWideValidationSchema,
validationSchema: getNetworkWideValidationSchema(infraEnv.rendezvousIp),
getInitialValues: (infraEnv: InfraEnv) => {
return getFormViewNetworkWideValues(infraEnv);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,32 +95,71 @@ const getAddressDataValidationSchema = (protocolVersion: ProtocolVersion, ipConf
});
};

export const networkWideValidationSchema = Yup.lazy((values: FormViewNetworkWideValues) => {
const ipConfigsValidationSchemas = Yup.object({
ipv4: getAddressDataValidationSchema(ProtocolVersion.ipv4, values.ipConfigs.ipv4),
ipv6: showProtocolVersion(values.protocolType, ProtocolVersion.ipv6)
? getAddressDataValidationSchema(ProtocolVersion.ipv6, values.ipConfigs.ipv6)
: Yup.object<IpConfig>(),
});
/**
* Validates that Rendezvous IP (when set) is within the IPv4 subnet.
* Default gateway is already validated by getAddressDataValidationSchema (getInMachineNetworkValidationSchema).
*/
const getRendezvousIpCoherenceTest = (rendezvousIp: string | undefined) => {
return Yup.object().test(
'rendezvous-ip-in-subnet',
'Rendezvous IP must be within the IPv4 subnet.',
(value: unknown, context: Yup.TestContext) => {
const values = value as FormViewNetworkWideValues | undefined;
const machineNetwork = values?.ipConfigs?.ipv4?.machineNetwork;
if (
!rendezvousIp?.trim() ||
!machineNetwork?.ip?.trim() ||
machineNetwork.prefixLength === '' ||
typeof machineNetwork.prefixLength !== 'number'
) {
return true;
}
const inSubnetSchema = getInMachineNetworkValidationSchema(
ProtocolVersion.ipv4,
machineNetwork,
);
if (!inSubnetSchema.isValidSync(rendezvousIp)) {
return context.createError({
path: 'ipConfigs.ipv4.machineNetwork.ip',
message: 'Rendezvous IP must be within the IPv4 subnet.',
});
}
return true;
},
);
};

return Yup.object({
useVlan: Yup.boolean(),
vlanId: Yup.mixed().when('useVlan', {
is: (useVlan: boolean) => useVlan,
then: () =>
Yup.number()
.required(MUST_BE_A_NUMBER)
.min(1, `Must be more than or equal to 1`)
.max(MAX_VLAN_ID, `Must be less than or equal to ${MAX_VLAN_ID}`)
.test('not-number', MUST_BE_A_NUMBER, () => validateNumber(values.vlanId))
.nullable()
.transform(transformNumber) as Yup.NumberSchema,
}),
protocolType: Yup.string(),
dns: getDNSValidationSchema(values.protocolType),
ipConfigs: ipConfigsValidationSchemas,
export const getNetworkWideValidationSchema = (rendezvousIp?: string) =>
Yup.lazy((values: FormViewNetworkWideValues) => {
const ipConfigsValidationSchemas = Yup.object({
ipv4: getAddressDataValidationSchema(ProtocolVersion.ipv4, values.ipConfigs.ipv4),
ipv6: showProtocolVersion(values.protocolType, ProtocolVersion.ipv6)
? getAddressDataValidationSchema(ProtocolVersion.ipv6, values.ipConfigs.ipv6)
: Yup.object<IpConfig>(),
});

const baseSchema = Yup.object({
useVlan: Yup.boolean(),
vlanId: Yup.mixed().when('useVlan', {
is: (useVlan: boolean) => useVlan,
then: () =>
Yup.number()
.required(MUST_BE_A_NUMBER)
.min(1, `Must be more than or equal to 1`)
.max(MAX_VLAN_ID, `Must be less than or equal to ${MAX_VLAN_ID}`)
.test('not-number', MUST_BE_A_NUMBER, () => validateNumber(values.vlanId))
.nullable()
.transform(transformNumber) as Yup.NumberSchema,
}),
Comment thread
ElayAharoni marked this conversation as resolved.
protocolType: Yup.string(),
dns: getDNSValidationSchema(values.protocolType),
ipConfigs: ipConfigsValidationSchemas,
});

return baseSchema.concat(getRendezvousIpCoherenceTest(rendezvousIp));
});
});

export const networkWideValidationSchema = getNetworkWideValidationSchema();

export const validateNumber = (vlanId: FormViewNetworkWideValues['vlanId']) => {
//We need to validate that value is a number(without letters) and is not an exponential number (ex: 1e2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const ReviewStep = () => {
</DescriptionListGroup>
<DescriptionListGroup>
<DescriptionListTerm>ISO size</DescriptionListTerm>
<DescriptionListDescription>approx. 43.5GB</DescriptionListDescription>
<DescriptionListDescription>approx. 50 GB</DescriptionListDescription>
</DescriptionListGroup>
</DescriptionList>
</Grid>
Expand Down
Loading