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

moved minTime/maxTime validation to validate namespace #563

Merged
merged 1 commit into from
Oct 19, 2023
Merged

moved minTime/maxTime validation to validate namespace #563

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
5 changes: 5 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
SDK Changelog
=============

1.6.0 (2023-10-??)
==================

.. warning:: SDK 1.6.0 requires at least version 2.4.0 of the Open Formulieren API.

1.6.0-alpha.0 (2023-10-02)
==========================

Expand Down
10 changes: 6 additions & 4 deletions src/formio/validators/MinMaxTimeValidator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ const validateTimeBoundaries = (minBoundary, maxBoundary, timeValue) => {
const MinMaxTimeValidator = {
key: 'validate.timeMinMax',
message(component) {
const minTime = moment(component.component.minTime || '00:00:00', 'HH:mm:ss').format('HH:mm');
const maxTime = moment(component.component.maxTime || '23:59:59', 'HH:mm:ss').format('HH:mm');
const validate = component.component?.validate || {};
const minTime = moment(validate?.minTime || '00:00:00', 'HH:mm:ss').format('HH:mm');
const maxTime = moment(validate?.maxTime || '23:59:59', 'HH:mm:ss').format('HH:mm');

let errorMessage = component.component.errors?.invalid_time || 'invalid_time';
const errorKeys = component?.openForms?.validationErrorContext?.minMaxTimeValidatorErrorKeys;
Expand All @@ -65,9 +66,10 @@ const MinMaxTimeValidator = {
check(component, setting, value) {
if (!value) return true;

const validate = component.component?.validate || {};
const {isValid, errorKeys} = validateTimeBoundaries(
component.component.minTime,
component.component.maxTime,
validate?.minTime,
validate?.maxTime,
value
);

Expand Down
2 changes: 1 addition & 1 deletion src/jstests/formio/components/fixtures/time.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export const timeForm = {
type: 'form',
components: [{label: 'time', key: 'time', type: 'time'}],
components: [{label: 'time', key: 'time', type: 'time', validate: {}}],
title: 'Test Time form',
display: 'Test Time form',
name: 'testTimeForm',
Expand Down
26 changes: 13 additions & 13 deletions src/jstests/formio/components/time.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Formio.use(OpenFormsModule);
describe('Time Component', () => {
test('Time component with min/max time validation', done => {
let formJSON = _.cloneDeep(timeForm);
formJSON.components[0].minTime = '09:00:00';
formJSON.components[0].maxTime = '17:00:00';
formJSON.components[0].validate.minTime = '09:00:00';
formJSON.components[0].validate.maxTime = '17:00:00';

const validValues = ['09:00:00', '10:30:00', '11:11:11'];

Expand Down Expand Up @@ -84,7 +84,7 @@ describe('Time Component', () => {

test('Time component with only min time validation', done => {
let formJSON = _.cloneDeep(timeForm);
formJSON.components[0].minTime = '09:00:00';
formJSON.components[0].validate.minTime = '09:00:00';

const validValues = ['17:00:00'];

Expand Down Expand Up @@ -123,7 +123,7 @@ describe('Time Component', () => {

test('Time component with only max time validation', done => {
let formJSON = _.cloneDeep(timeForm);
formJSON.components[0].maxTime = '09:00:00';
formJSON.components[0].validate.maxTime = '09:00:00';

const validValues = ['08:00:00'];

Expand Down Expand Up @@ -162,8 +162,8 @@ describe('Time Component', () => {

test('Time component with min time boundary larger than max time boundary', done => {
let formJSON = _.cloneDeep(timeForm);
formJSON.components[0].maxTime = '01:00:00';
formJSON.components[0].minTime = '08:00:00';
formJSON.components[0].validate.maxTime = '01:00:00';
formJSON.components[0].validate.minTime = '08:00:00';

const validValues = ['09:00:00', '00:30:00'];

Expand Down Expand Up @@ -209,8 +209,8 @@ describe('Time Component', () => {
minTime: 'Custom error! Min time {{ minTime }}',
maxTime: 'Custom error! max time {{ maxTime }}',
};
formJSON.components[0].maxTime = '13:00:00';
formJSON.components[0].minTime = '12:00:00';
formJSON.components[0].validate.maxTime = '13:00:00';
formJSON.components[0].validate.minTime = '12:00:00';

const element = document.createElement('div');

Expand Down Expand Up @@ -240,8 +240,8 @@ describe('Time Component', () => {
minTime: 'Custom error! Min time {{ minTime }}',
maxTime: 'Custom error! max time {{ maxTime }}',
};
formJSON.components[0].maxTime = '01:00:00'; // One o'clock in the night of the next day
formJSON.components[0].minTime = '08:00:00';
formJSON.components[0].validate.maxTime = '01:00:00'; // One o'clock in the night of the next day
formJSON.components[0].validate.minTime = '08:00:00';

const element = document.createElement('div');

Expand Down Expand Up @@ -271,7 +271,7 @@ describe('Time Component', () => {
minTime: 'Custom error! Min time {{ minTime }}',
maxTime: 'Custom error! max time {{ maxTime }}',
};
formJSON.components[0].minTime = '13:00:00';
formJSON.components[0].validate.minTime = '13:00:00';

const element = document.createElement('div');

Expand Down Expand Up @@ -301,7 +301,7 @@ describe('Time Component', () => {
minTime: 'Custom error! Min time {{ minTime }}',
maxTime: 'Custom error! Max time {{ maxTime }}',
};
formJSON.components[0].maxTime = '13:00:00';
formJSON.components[0].validate.maxTime = '13:00:00';

const element = document.createElement('div');

Expand Down Expand Up @@ -329,7 +329,7 @@ describe('Time Component', () => {
formJSON.components[0].errors = {
invalid_time: '',
};
formJSON.components[0].maxTime = '13:00:00';
formJSON.components[0].validate.maxTime = '13:00:00';

const element = document.createElement('div');

Expand Down