diff --git a/app/client/src/utils/Validators.ts b/app/client/src/utils/Validators.ts index ee6248a0d0..44dc1d8235 100644 --- a/app/client/src/utils/Validators.ts +++ b/app/client/src/utils/Validators.ts @@ -387,7 +387,7 @@ export const VALIDATORS: Record = { return { isValid, parsed }; }, [VALIDATION_TYPES.DATE]: ( - value: any, + value: string, props: WidgetProps, dataTree?: DataTree, ): ValidationResponse => { @@ -401,15 +401,14 @@ export const VALIDATORS: Record = { return { isValid: false, parsed: "", - message: `${WIDGET_TYPE_VALIDATION_ERROR}: Date`, + message: + `${WIDGET_TYPE_VALIDATION_ERROR}: Date ` + props.dateFormat + ? props.dateFormat + : "", }; } - const isValid = moment(value).isValid(); - const parsed = isValid - ? props.dateFormat - ? moment(value).format(props.dateFormat) - : moment(value).toISOString(true) - : today; + const isValid = moment(value, props.dateFormat).isValid(); + const parsed = isValid ? value : today; return { isValid, parsed,