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.

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

add form validation for zoom google meet #1812

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions client/src/components/manageProjects/createNewEvent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ const CreateNewEvent = ({
handleInputChange={handleInputChange}
formValues={formValues}
formErrors={formErrors}
setFormErrors={setFormErrors}
title="Create New Recurring Event"
>
<div className="button-box">
Expand Down
18 changes: 13 additions & 5 deletions client/src/components/manageProjects/eventForm.jsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
import React from 'react';
import { createClockHours } from '../../utils/createClockHours';
import validateEventForm from './utilities/validateEventForm';
import '../../sass/ManageProjects.scss';

const EventForm = ({
title,
formValues,
formErrors,
setFormErrors,
handleInputChange,
children,
}) => {
// This creates the clock hours for the form
const clockHours = createClockHours();
const handleInputChangeWithValidation = (e) => {
const { name, value } = e.target;
handleInputChange(e);
const errors = validateEventForm({ ...formValues, [name]: value });
setFormErrors(errors || {});
};
return (
<div className="event-form-box">
{title && <h3 className="event-form-title">{title}</h3>}
Expand All @@ -24,9 +32,9 @@ const EventForm = ({
onChange={handleInputChange}
maxLength={30}
/>
{formErrors?.name &&
{formErrors?.name && (
<div className="event-form-error">{formErrors.name}</div>
}
)}
</label>
<div className="event-form-row">
<label className="event-form-label" htmlFor="eventType">
Expand Down Expand Up @@ -114,13 +122,13 @@ const EventForm = ({
placeholder="Enter meeting url..."
name="videoConferenceLink"
value={formValues.videoConferenceLink}
onChange={handleInputChange}
onChange={handleInputChangeWithValidation}
/>
{formErrors?.videoConferenceLink &&
{formErrors?.videoConferenceLink && (
<div className="event-form-error">
{formErrors.videoConferenceLink}
</div>
}
)}
</label>

{children}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import validator from 'validator';
import { isWordInArrayInString } from './../../../utils/stringUtils.js';

const validateEventForm = (vals, projectToEdit) => {
Expand All @@ -10,10 +9,7 @@ const validateEventForm = (vals, projectToEdit) => {
if (!vals[key]) {
newErrors = { ...newErrors, name: 'Event name is required' };
} else if (
isWordInArrayInString(
['meeting', 'mtg'],
vals[key].toLowerCase()
)
isWordInArrayInString(['meeting', 'mtg'], vals[key].toLowerCase())
) {
newErrors = {
...newErrors,
Expand Down Expand Up @@ -61,6 +57,9 @@ const validateEventForm = (vals, projectToEdit) => {

export default validateEventForm;

function validateLink(str) {
return validator.isURL(str);
function validateLink(url) {
const ZoomMeetRegex =
/^https:\/\/(www\.)?zoom\.us\/j\/[0-9]+(\?pwd=[a-zA-Z0-9]+)?$/;
const GoogleMeetRegex = /^https:\/\/meet\.google\.com\/[a-zA-Z0-9-]+$/;
return ZoomMeetRegex.test(url) || GoogleMeetRegex.test(url);
}
Loading