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

Form Validation: Added support for required fields #18

Merged
merged 2 commits into from
Feb 4, 2025
Merged

Form Validation: Added support for required fields #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2187115
Added validation func to form to support required fields and future v…
natalialuzuriaga Jan 31, 2025
b507bfa
Updated schema
natalialuzuriaga Jan 31, 2025
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
45 changes: 34 additions & 11 deletions js/generateFormComponents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ function transformArrayToOptions(arr) {
}));
}

// Function that handles validation object needed for each form component
function determineValidation(fieldName, fieldObject, requiredArray){
return {
"required": requiredArray.includes(fieldName)
}
}

// Function that determines type of form component based on field
function determineType(field) {
if (field.type === "object") {
return "container";
Expand Down Expand Up @@ -52,16 +60,18 @@ function determineType(field) {
}

// Creates Form.io component based on json field type
function createComponent(fieldName, fieldObject) {
function createComponent(fieldName, fieldObject, requiredArray) {
const componentType = determineType(fieldObject);
const validate = determineValidation(fieldName, fieldObject, requiredArray);
switch (componentType) {
case "textfield":
return {
type: "textfield",
key: fieldName,
label: fieldName,
input: true,
description: fieldObject["description"]
description: fieldObject["description"],
validate
};
case "tags":
return {
Expand All @@ -72,7 +82,8 @@ function createComponent(fieldName, fieldObject) {
key: fieldName,
type: "tags",
input: true,
description: fieldObject["description"]
description: fieldObject["description"],
validate
};
case "number":
return {
Expand All @@ -88,7 +99,8 @@ function createComponent(fieldName, fieldObject) {
key: fieldName,
type: "number",
input: true,
description: fieldObject["description"]
description: fieldObject["description"],
validate
};
case "radio":
var options = transformArrayToOptions(fieldObject.enum);
Expand All @@ -104,6 +116,7 @@ function createComponent(fieldName, fieldObject) {
type: "radio",
input: true,
description: fieldObject["description"],
validate
};
case "selectboxes":
var options = transformArrayToOptions(fieldObject.items.enum);
Expand All @@ -118,7 +131,8 @@ function createComponent(fieldName, fieldObject) {
type: "selectboxes",
input: true,
inputType: "checkbox",
description: fieldObject["description"]
description: fieldObject["description"],
validate
};
case "datetime":
return {
Expand Down Expand Up @@ -152,7 +166,8 @@ function createComponent(fieldName, fieldObject) {
disableWeekdays: false,
maxDate: null
},
description: fieldObject["description"]
description: fieldObject["description"],
validate
};
case "select-boolean":
return {
Expand All @@ -175,7 +190,8 @@ function createComponent(fieldName, fieldObject) {
key: fieldName,
type: "select",
input: true,
description: fieldObject["description"]
description: fieldObject["description"],
validate
};
case "container":
return {
Expand All @@ -185,7 +201,8 @@ function createComponent(fieldName, fieldObject) {
key: fieldName,
type: "container",
input: true,
components: []
components: [],
validate
};
case "datagrid":
return {
Expand All @@ -203,7 +220,8 @@ function createComponent(fieldName, fieldObject) {
key: fieldName,
type: "datagrid",
input: true,
components: []
components: [],
validate
};
default:
break;
Expand All @@ -222,14 +240,19 @@ function createAllComponents(schema, prefix = ""){

if (schema.type === "object" && schema.properties) {

const items = schema.properties.hasOwnProperty("items") ? schema.properties.items : schema.properties
const items = schema.properties.hasOwnProperty("items") ? schema.properties.items : schema.properties;

let requiredArray = [];
if (schema.hasOwnProperty("required")) {
requiredArray = schema.required;
}

for (const [key, value] of Object.entries(items)) {

console.log("key at play:", key);
const fullKey = prefix ? `${prefix}.${key}` : key;

let fieldComponent = createComponent(key, value);
let fieldComponent = createComponent(key, value, requiredArray);

if (fieldComponent.type === "container") {
fieldComponent.components = createAllComponents(value, fullKey);
Expand Down
2 changes: 1 addition & 1 deletion schemas/schema-0.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"type": "object",
"description": "An object containing description of the usage/restrictions regarding the release",
"properties": {
"license": {
"licenses": {
"type": "array",
"items": {
"type": "object",
Expand Down
Loading