Skip to content

adapt ValidatedTextField to accept custom validation functions #1789

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

Merged
trillium merged 2 commits into from
Feb 3, 2026
Merged

adapt ValidatedTextField to accept custom validation functions #1789

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
6d6735a
adapt ValidatedTextField to accept custom validation functions
angela-lee1 Oct 10, 2024
b4ebe92
add paper to form for styling
angela-lee1 Feb 16, 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
188 changes: 96 additions & 92 deletions client/src/components/ProjectForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
FormControl,
FormControlLabel,
RadioGroup,
Paper,
} from '@mui/material';
import { styled } from '@mui/material/styles';

Expand Down Expand Up @@ -235,102 +236,105 @@ export default function ProjectForm({
<Box sx={{ textAlign: 'center' }}>
<Typography variant="h1">{projectName}</Typography>
</Box>
{auth.user.accessLevel === 'admin' ||
auth.user.accessLevel == 'superadmin' ? (
<TitledBox
title={editMode ? 'Editing Project' : 'Project Information'}
badge={isEdit ? editIcon() : addIcon()}
expandable={true}
>
<form
id="project-form"
onSubmit={handleSubmit((data) => {
isEdit ? submitEditProject(data) : submitNewProject(data);
})}
<Paper
elevation={3}
sx={{ padding: 3, borderRadius: 1, backgroundColor: '#f5f5f5' }}
>
{auth.user.accessLevel === 'admin' ||
auth.user.accessLevel === 'superadmin' ? (
<TitledBox
title={editMode ? 'Editing Project' : 'Project Information'}
badge={isEdit ? editIcon() : addIcon()}
expandable={true}
>
{arr.map((input) => (
<ValidatedTextField
key={input.name}
register={register}
isEdit={isEdit}
editMode={editMode}
locationType={locationType}
locationRadios={locationRadios}
errors={errors}
input={input}
<form
id="project-form"
onSubmit={handleSubmit((data) => {
isEdit ? submitEditProject(data) : submitNewProject(data);
})}
>
{arr.map((input) => (
<ValidatedTextField
key={input.name}
register={register}
isEdit={isEdit}
editMode={editMode}
locationType={locationType}
locationRadios={locationRadios}
errors={errors}
input={input}
/>
))}
<ChangesModal
open={isModalOpen}
onClose={handleClose}
destination={'/projects'}
aria-labelledby="modal-modal-title"
aria-describedby="modal-modal-description"
handleClose={handleClose}
/>
))}
<ChangesModal
open={isModalOpen}
onClose={handleClose}
destination={'/projects'}
aria-labelledby="modal-modal-title"
aria-describedby="modal-modal-description"
handleClose={handleClose}
/>
</form>{' '}
<Grid container justifyContent="space-evenly" sx={{ my: 3 }}>
<Grid item xs="auto">
<StyledButton
type="submit"
form="project-form"
variant={
!isEdit ? 'secondary' : !editMode ? 'contained' : 'secondary'
}
cursor="pointer"
disabled={isEdit && isLoading ? !editMode : false}
>
{isLoading ? <CircularProgress /> : 'Save'}
</StyledButton>
</form>
<Grid container justifyContent="space-evenly" sx={{ my: 3 }}>
<Grid item xs="auto">
<StyledButton
type="submit"
form="project-form"
variant={
!isEdit ? 'secondary' : !editMode ? 'contained' : 'secondary'
}
cursor="pointer"
disabled={isEdit && isLoading ? !editMode : false}
>
{isLoading ? <CircularProgress /> : 'Save'}
</StyledButton>
</Grid>
<Grid item xs="auto">
<StyledButton
variant="contained"
cursor="pointer"
onClick={
!editMode || Object.keys(dirtyFields).length === 0
? checkFields
: handleOpen
}
>
Close
</StyledButton>
</Grid>
</Grid>
<Grid item xs="auto">
<StyledButton
variant="contained"
cursor="pointer"
onClick={
!editMode || Object.keys(dirtyFields).length === 0
? checkFields
: handleOpen
}
>
Close
</StyledButton>
</Grid>
</Grid>
</TitledBox>
) : (
<TitledBox title={'Project Information'} expandable={true}>
{' '}
<form
id="project-form"
onSubmit={handleSubmit((data) => {
isEdit ? submitEditProject(data) : submitNewProject(data);
})}
>
{arr.map((input) => (
<ValidatedTextField
key={input.name}
register={register}
isEdit={isEdit}
editMode={editMode}
locationType={locationType}
locationRadios={locationRadios}
errors={errors}
input={input}
</TitledBox>
) : (
<TitledBox title={'Project Information'} expandable={true}>
<form
id="project-form"
onSubmit={handleSubmit((data) => {
isEdit ? submitEditProject(data) : submitNewProject(data);
})}
>
{arr.map((input) => (
<ValidatedTextField
key={input.name}
register={register}
isEdit={isEdit}
editMode={editMode}
locationType={locationType}
locationRadios={locationRadios}
errors={errors}
input={input}
/>
))}
<ChangesModal
open={isModalOpen}
onClose={handleClose}
destination={'/projects'}
aria-labelledby="modal-modal-title"
aria-describedby="modal-modal-description"
handleClose={handleClose}
/>
))}
<ChangesModal
open={isModalOpen}
onClose={handleClose}
destination={'/projects'}
aria-labelledby="modal-modal-title"
aria-describedby="modal-modal-description"
handleClose={handleClose}
/>
</form>
{''}
</TitledBox>
)}
</form>
</TitledBox>
)}
</Paper>
</Box>
);
}
80 changes: 47 additions & 33 deletions client/src/components/parts/form/ValidatedTextField.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Box, Grid, InputLabel, TextField } from "@mui/material";
import { Box, Grid, InputLabel, TextField } from '@mui/material';

/**
* A validated text field component for forms.
Expand All @@ -24,61 +24,75 @@ function ValidatedTextField({
locationRadios,
input,
}) {

const validationRules = {};

// Validation rules for Google Drive URL
if (input.required) {
validationRules.required = `${input.label || input.name} is required`
// Handle required validation
if (input.required !== false) {
validationRules.required = `${input.label || input.name} is required`;
}

// Handle custom validation function if provided
if (input.validate) {
validationRules.validate = input.validate;
}
if(input.name === 'googleDriveUrl'){

// Validation rules for Google Drive URL
if (input.name === 'googleDriveUrl') {
validationRules.pattern = {
value: /^https:\/\/drive\.google\.com\/.+$/,
message: "Invalid Google Drive URL", // Pattern validation for Google Drive URL
message: 'Invalid Google Drive URL',
};
}

// Handle location field validation based on type
if (input.name === 'location') {
if (locationType === 'remote') {
validationRules.pattern = {
value: input.value,
message: input.errorMessage || "Invalid remote location URL",
message: input.errorMessage || 'Invalid remote location URL',
};
} else {
validationRules.pattern = {
value: input.addressValue,
message: input.addressError || "Invalid physical address",
message: input.addressError || 'Invalid physical address',
};
}
} else if (input.value && input.name !== 'googleDriveUrl') {
// Handle other pattern validations
validationRules.pattern = {
value: input.value,
message:
input.errorMessage || `${input.label} is not in the correct format`,
};
}

const registerObj = {
...register(input.name, validationRules),
}
};

return (
<Box sx={{ mb: 1 }} key={input.name}>
<Grid container alignItems="center">
<Grid item xs="auto" sx={{ pr: 3 }}>
<InputLabel
sx={{ width: 'max-content', ml: 0.5, mb: 0.5 }}
id={input.name}
>
{input.label}
</InputLabel>
<Box sx={{ mb: 1 }} key={input.name}>
<Grid container alignItems="center">
<Grid item xs="auto" sx={{ pr: 3 }}>
<InputLabel
sx={{ width: 'max-content', ml: 0.5, mb: 0.5 }}
id={input.name}
>
{input.label}
</InputLabel>
</Grid>
{input.name === 'location' && locationRadios}
</Grid>
{input.name === 'location' && locationRadios}
</Grid>
<TextField
{...registerObj}
error={!!errors[input.name]}
type={input.type}
placeholder={input.placeholder}
helperText={`${errors[input.name]?.message || ' '}`}
disabled={isEdit ? !editMode || input.disabled : undefined} // handles edit mode for EditProjcet form
/>
</Box>
<TextField
{...registerObj}
error={!!errors[input.name]}
type={input.type}
placeholder={input.placeholder}
helperText={`${errors[input.name]?.message || ' '}`}
disabled={isEdit ? !editMode || input.disabled : undefined} // handles edit mode for EditProjcet form
/>
</Box>
);
};
}

export default ValidatedTextField;
export default ValidatedTextField;
Loading