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

Improved validation of number fields #511

Merged
merged 1 commit into from
Dec 5, 2022
Merged

Improved validation of number fields #511

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
10 changes: 5 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"@hapi/joi-date": "^2.0.1",
"@hookform/resolvers": "^2.8.8",
"@monaco-editor/react": "^4.4.5",
"@scality/core-ui": "github:scality/core-ui#v0.65.0",
"@scality/core-ui": "github:scality/core-ui#v0.66.0",
"@types/react-table": "^7.7.10",
"@types/react-virtualized": "^9.21.20",
"@types/react-window": "^1.8.5",
Expand Down
2 changes: 0 additions & 2 deletions src/react/databrowser/buckets/ObjectLockRetentionSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,6 @@ export default function ObjectLockRetentionSettings({
onChange(e.target.value)
}
type="number"
min={1}

size="2/3"
/>
);
Expand Down
21 changes: 9 additions & 12 deletions src/react/workflow/ExpirationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ const commonSchema = {
//At least one of currentVersion, previousVersion, expireDeleteMarkers and incompleteMutlipart are required
export const expirationSchema = Joi.object({
...commonSchema,
currentVersionTriggerDelayDays: Joi.number().label(
'Expire Current version Days',
),
previousVersionTriggerDelayDays: Joi.number().label(
'Expire Previous version Days',
),
currentVersionTriggerDelayDays: Joi.number()
.min(1)
.label('Expire Current version Days'),
previousVersionTriggerDelayDays: Joi.number()
.min(1)
.label('Expire Previous version Days'),
expireDeleteMarkersTrigger: Joi.boolean().invalid(false),
incompleteMultipartUploadTriggerDelayDays: Joi.number().label(
'Expire Previous version Days',
),
incompleteMultipartUploadTriggerDelayDays: Joi.number()
.min(1)
.label('Expire Previous version Days'),
}).or(
'currentVersionTriggerDelayDays',
'previousVersionTriggerDelayDays',
Expand Down Expand Up @@ -365,7 +365,6 @@ export function ExpirationForm({ bucketList, locations, prefix = '' }: Props) {
onChange={(e) => onChange(e.target.value)}
type="number"
style={{ width: '3rem', textAlign: 'right' }}
min={1}
aria-invalid={
!!errors[`${prefix}currentVersionTriggerDelayDays`]
}
Expand Down Expand Up @@ -475,7 +474,6 @@ export function ExpirationForm({ bucketList, locations, prefix = '' }: Props) {
onChange={(e) => onChange(e.target.value)}
type="number"
style={{ width: '3rem', textAlign: 'right' }}
min={1}
aria-invalid={
!!errors[`${prefix}previousVersionTriggerDelayDays`]
}
Expand Down Expand Up @@ -667,7 +665,6 @@ export function ExpirationForm({ bucketList, locations, prefix = '' }: Props) {
onChange={(e) => onChange(e.target.value)}
type="number"
style={{ width: '3rem', textAlign: 'right' }}
min={1}
aria-invalid={
!!errors[
`${prefix}incompleteMultipartUploadTriggerDelayDays`
Expand Down
10 changes: 3 additions & 7 deletions src/react/workflow/TransitionForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
import {
FormGroup,
FormSection,
IconHelp,
spacing,
Stack,
Toggle,
Expand All @@ -39,7 +38,7 @@ export const transitionSchema = {
applyToVersion: Joi.string().valid('current', 'previous').required(),
locationName: Joi.string().label('Location Name').required(),
triggerDelayDate: Joi.string().optional().allow(null, ''),
triggerDelayDays: Joi.string().label('Trigger delay days').required(),
triggerDelayDays: Joi.number().min(1).label('Trigger delay days').required(),
filter: Joi.object({
objectKeyPrefix: Joi.string().label('Prefix').optional().allow(null, ''),
objectTags: Joi.array()
Expand Down Expand Up @@ -113,12 +112,8 @@ export const TransitionForm = ({
const { errors: formErrors } = formState;
const errors = flattenFormErrors(formErrors);
const isEditing = !!getValues(`${prefix}workflowId`);
const locationName = watch(`${prefix}locationName`);
const triggerDelayDays = watch(`${prefix}triggerDelayDays`);
const bucketName = watch(`${prefix}bucketName`);
const applyToVersion = watch(`${prefix}applyToVersion`);
const objectKeyPrefix = watch(`${prefix}filter.objectKeyPrefix`);
const objectTags = watch(`${prefix}filter.objectTags`);

const sourceBucket = bucketList.find((bucket) => bucket.Name === bucketName);
const isSourceBucketVersionned = sourceBucket
Expand Down Expand Up @@ -342,13 +337,14 @@ export const TransitionForm = ({
id="triggerDelayDays"
required
direction="horizontal"
error={errors[`${prefix}triggerDelayDays`]?.message}
helpErrorPosition="bottom"
content={
<Input
id="triggerDelayDays"
aria-labelledby="triggerDelayDays-prefix"
type="number"
autoComplete="off"
min={0}
{...register(`${prefix}triggerDelayDays`)}
/>
}
Expand Down