Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1211)

- Fix empty strings passing validation.
This commit is contained in:
Dave Richer
2024-01-25 18:09:51 +00:00

View File

@@ -125,7 +125,11 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
<Form.Item <Form.Item
label={t('eula.labels.first_name')} label={t('eula.labels.first_name')}
name="first_name" name="first_name"
rules={[{ required: true, message: t('eula.messages.first_name') }]} rules={[{
required: true,
validator: (_, value) =>
value.trim() !== '' ? Promise.resolve() : Promise.reject(new Error(t('eula.messages.first_name'))),
},]}
> >
<Input placeholder={t('eula.labels.first_name')} <Input placeholder={t('eula.labels.first_name')}
aria-label={t('eula.labels.first_name')}/> aria-label={t('eula.labels.first_name')}/>
@@ -135,7 +139,11 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
<Form.Item <Form.Item
label={t('eula.labels.last_name')} label={t('eula.labels.last_name')}
name="last_name" name="last_name"
rules={[{ required: true, message: t('eula.messages.last_name') }]} rules={[{
required: true,
validator: (_, value) =>
value.trim() !== '' ? Promise.resolve() : Promise.reject(new Error(t('eula.messages.last_name'))),
}]}
> >
<Input placeholder={t('eula.labels.last_name')} <Input placeholder={t('eula.labels.last_name')}
aria-label={t('eula.labels.last_name')}/> aria-label={t('eula.labels.last_name')}/>
@@ -147,10 +155,13 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
<Form.Item <Form.Item
label={t('eula.labels.business_name')} label={t('eula.labels.business_name')}
name="business_name" name="business_name"
rules={[{ required: true, message: t('eula.messages.business_name') }]} rules={[{
required: true,
validator: (_, value) =>
value.trim() !== '' ? Promise.resolve() : Promise.reject(new Error(t('eula.messages.business_name'))),
}]}
> >
<Input placeholder={t('eula.labels.business_name')} <Input placeholder={t('eula.labels.business_name')} aria-label={t('eula.labels.business_name')}/>
aria-label={t('eula.labels.business_name')} />
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={12}> <Col span={12}>
@@ -183,8 +194,8 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
label={t('eula.labels.date_accepted')} label={t('eula.labels.date_accepted')}
name="date_accepted" name="date_accepted"
rules={[ rules={[
{ required: true },
{ {
required: true,
validator: (_, value) => { validator: (_, value) => {
if (day(value).isSame(day(), 'day')) { if (day(value).isSame(day(), 'day')) {
return Promise.resolve(); return Promise.resolve();
@@ -194,8 +205,7 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
}, },
]} ]}
> >
<FormDatePicker onChange={handleChange} onlyToday <FormDatePicker onChange={handleChange} onlyToday aria-label={t('eula.labels.date_accepted')}/>
aria-label={t('eula.labels.date_accepted')} />
</Form.Item> </Form.Item>
</Col> </Col>
</Row> </Row>
@@ -206,13 +216,13 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
valuePropName="checked" valuePropName="checked"
rules={[ rules={[
{ {
required: true,
validator: (_, value) => validator: (_, value) =>
value ? Promise.resolve() : Promise.reject(new Error(t('eula.messages.accepted_terms'))), value ? Promise.resolve() : Promise.reject(new Error(t('eula.messages.accepted_terms'))),
}, },
]} ]}
> >
<Checkbox <Checkbox aria-label={t('eula.labels.accepted_terms')}>{t('eula.labels.accepted_terms')}</Checkbox>
aria-label={t('eula.labels.accepted_terms')}>{t('eula.labels.accepted_terms')}</Checkbox>
</Form.Item> </Form.Item>
</Col> </Col>
</Row> </Row>