Skip to content

Commit

Permalink
feat(validators): announcement validators
Browse files Browse the repository at this point in the history
  • Loading branch information
@kishore03109
kishore03109 committed Sep 14, 2023
1 parent 0a77e38 commit 84c9c1c
Show file tree
Hide file tree
Showing 2 changed files with 125 additions and 16 deletions.
7 changes: 5 additions & 2 deletions src/components/PageSettingsModal/PageSettingsSchema.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
permalinkRegexTest,
specialCharactersRegexTest,
jekyllFirstCharacterRegexTest,
dateRegexTest,
resourceDateRegexTest,
PAGE_SETTINGS_PERMALINK_MIN_LENGTH,
PAGE_SETTINGS_PERMALINK_MAX_LENGTH,
PAGE_SETTINGS_TITLE_MIN_LENGTH,
Expand Down Expand Up @@ -71,7 +71,10 @@ export const PageSettingsSchema = (existingTitlesArray = []) =>
layout
? schema
.required("Date is required")
.matches(dateRegexTest, "Date must be formatted as YYYY-MM-DD")
.matches(
resourceDateRegexTest,
"Date must be formatted as YYYY-MM-DD"
)
.test(
"Date cannot be in the future",
"Date cannot be in the future",
Expand Down
134 changes: 120 additions & 14 deletions src/utils/validators.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,17 @@ export const PASSWORD_REGEX =
"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{12,}$"
const EMAIL_REGEX =
'^(([^<>()\\[\\]\\.,;:\\s@\\"]+(\\.[^<>()\\[\\]\\.,;:\\s@\\"]+)*)|(".+"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\])|(([a-zA-Z-0-9]+\\.)+[a-zA-Z]{2,}))$'
const DATE_REGEX = "^([0-9]{4}-[0-9]{2}-[0-9]{2})$"
const DATE_REGEX_Y_M_D = "^([0-9]{4}-[0-9]{2}-[0-9]{2})$"
const DATE_REGEX_D_M_Y = "^([0-9]{2}/[0-9]{2}/[0-9]{4})$"
const ALPHABETS_ONLY_REGEX = '^[a-zA-Z" "\\._-]+$'
const ALPHANUMERICS_ONLY_REGEX = '^[a-zA-Z0-9" "\\._\\-:]+$'

export const permalinkRegexTest = RegExp(PERMALINK_REGEX)
export const phoneRegexTest = RegExp(PHONE_REGEX)
export const tollFreePhoneRegexText = RegExp(TOLL_FREE_PHONE_REGEX)
export const emailRegexTest = RegExp(EMAIL_REGEX)
export const dateRegexTest = RegExp(DATE_REGEX)
export const resourceDateRegexTest = RegExp(DATE_REGEX_Y_M_D)
export const announcementDateRegexTest = RegExp(DATE_REGEX_D_M_Y)
export const alphabetsRegexTest = RegExp(ALPHABETS_ONLY_REGEX)
export const alphanumericRegexTest = RegExp(ALPHANUMERICS_ONLY_REGEX)
export const fileNameRegexTest = /^[a-zA-Z0-9" "_-]+$/
Expand Down Expand Up @@ -112,10 +114,16 @@ const HERO_TITLE_MIN_LENGTH = 0
const HERO_TITLE_MAX_LENGTH = 60
const HERO_SUBTITLE_MIN_LENGTH = 0
const HERO_SUBTITLE_MAX_LENGTH = 160
// const HERO_BUTTON_TEXT_MIN_LENGTH = 2;
// const HERO_BUTTON_TEXT_MAX_LENGTH = 30;
const HERO_DROPDOWN_MIN_LENGTH = 0
const HERO_DROPDOWN_MAX_LENGTH = 30
// Announcement
const ANNOUNCEMENT_BLOCK_SUBTITLE_MAX_LENGTH = 30
const ANNOUNCEMENT_BLOCK_TITLE_MAX_LENGTH = 50
const ANNOUNCEMENT_TITLE_MIN_LENGTH = 0
const ANNOUNCEMENT_TITLE_MAX_LENGTH = 100
const ANNOUNCEMENT_DESCRIPTION_MIN_LENGTH = 0
const ANNOUNCEMENT_DESCRIPTION_MAX_LENGTH = 100
const ANNOUNCEMENT_LINK_TEXT_URL_MAX_LENGTH = 50

// Contact Us Editor
// ===============
Expand All @@ -127,7 +135,6 @@ const CONTACT_DESCRIPTION_MAX_LENGTH = 400
// Locations
const LOCATION_TITLE_MIN_LENGTH = 1
const LOCATION_TITLE_MAX_LENGTH = 30
// const LOCATION_ADDRESS_MIN_LENGTH = 2
const LOCATION_ADDRESS_MAX_LENGTH = 30
const LOCATION_OPERATING_DAYS_MIN_LENGTH = 2
const LOCATION_OPERATING_DAYS_MAX_LENGTH = 30
Expand Down Expand Up @@ -171,6 +178,20 @@ export const MEDIA_SETTINGS_TITLE_MIN_LENGTH = 6
export const MEDIA_SETTINGS_TITLE_MAX_LENGTH = 100
export const MEDIA_FILE_MAX_SIZE = 5242880 // 5MB -> 5242880B

const validateNonFutureResourceDate = (dateStr) => {
const today = new Date(moment().tz("Asia/Singapore").format("YYYY-MM-DD"))
const chosenDate = new Date(dateStr)
const daysDiff = today - chosenDate
return daysDiff >= 0
}

const validateNonFutureAnnouncementDate = (dateStr) => {
const today = new Date(moment().tz("Asia/Singapore").format("YYYY-MM-DD"))
const IsoDateStr = dateStr.split("/").reverse().join("-")
const chosenDate = new Date(IsoDateStr)
return today > chosenDate
}

// Homepage Editor
// ==========
// Returns new errors.highlights[index] object
Expand Down Expand Up @@ -218,6 +239,57 @@ const validateHighlights = (highlightError, field, value) => {
return newHighlightError
}

const validateAnnouncements = (announcementError, field, value) => {
const newAnnouncementError = announcementError
let errorMessage = ""
switch (field) {
case "title": {
// Title is too short
if (value.length < ANNOUNCEMENT_TITLE_MIN_LENGTH) {
errorMessage = `The title should not be empty.`
}
// Title is too long
if (value.length > ANNOUNCEMENT_TITLE_MAX_LENGTH) {
errorMessage = `The title should be shorter than ${ANNOUNCEMENT_TITLE_MAX_LENGTH} characters.`
}
break
}
case "date": {
if (!validateNonFutureAnnouncementDate(value)) {
errorMessage = `Date cannot be in the future`
}
if (!announcementDateRegexTest.test(value)) {
errorMessage = `Date is invalid`
}
break
}
case "announcementContent": {
// Announcement content is too short
if (value.length < ANNOUNCEMENT_DESCRIPTION_MIN_LENGTH) {
errorMessage = `The announcement content should not be empty.`
}
// Announcement content is too long
if (value.length > ANNOUNCEMENT_DESCRIPTION_MAX_LENGTH) {
errorMessage = `You have exceeded the number of characters allowed (${value.length}/${ANNOUNCEMENT_DESCRIPTION_MAX_LENGTH})`
}
break
}
case "linkText": {
// Link text is too long
if (value.length > ANNOUNCEMENT_LINK_TEXT_URL_MAX_LENGTH) {
errorMessage = `The link text should be shorter than ${ANNOUNCEMENT_LINK_TEXT_URL_MAX_LENGTH} characters.`
}
break
}

default:
break
}

newAnnouncementError[field] = errorMessage
return newAnnouncementError
}

// Returns errors.dropdownElems[dropdownsIndex] object
const validateDropdownElems = (dropdownElemError, field, value) => {
const newDropdownElemError = dropdownElemError
Expand Down Expand Up @@ -494,6 +566,37 @@ const validateInfopicSection = (sectionError, sectionType, field, value) => {
return newSectionError
}

const validateAnnouncementBlockSection = (
sectionError,
sectionType,
field,
value
) => {
const newSectionError = sectionError
let errorMessage = ""

switch (field) {
case "title": {
// Title is too long
if (value.length > ANNOUNCEMENT_BLOCK_TITLE_MAX_LENGTH) {
errorMessage = `Title should be shorter than ${ANNOUNCEMENT_BLOCK_TITLE_MAX_LENGTH} characters.`
}
break
}
case "subtitle": {
// Subtitle is too long
if (value.length > ANNOUNCEMENT_BLOCK_SUBTITLE_MAX_LENGTH) {
errorMessage = `Subtitle should be shorter than ${ANNOUNCEMENT_BLOCK_SUBTITLE_MAX_LENGTH} characters.`
}
break
}
default:
break
}
newSectionError[sectionType][field] = errorMessage
return newSectionError
}

const validateSections = (sectionError, sectionType, field, value) => {
let newSectionError = sectionError
switch (sectionType) {
Expand Down Expand Up @@ -533,6 +636,15 @@ const validateSections = (sectionError, sectionType, field, value) => {
)
break
}
case "announcementBlock": {
newSectionError = validateAnnouncementBlockSection(
sectionError,
sectionType,
field,
value
)
break
}
default:
break
}
Expand Down Expand Up @@ -803,13 +915,6 @@ const validateDayOfMonth = (month, day) => {
}
}

const validateNonFutureDate = (dateStr) => {
const today = new Date(moment().tz("Asia/Singapore").format("YYYY-MM-DD"))
const chosenDate = new Date(dateStr)
const daysDiff = today - chosenDate
return daysDiff >= 0
}

const validateResourceSettings = (id, value, folderOrderArray) => {
let errorMessage = ""
switch (id) {
Expand All @@ -836,11 +941,11 @@ const validateResourceSettings = (id, value, folderOrderArray) => {
}
case "date": {
// Date is in the future
if (!validateNonFutureDate(value)) {
if (!validateNonFutureResourceDate(value)) {
errorMessage = "Selected date is greater than today's date."
}
// Date is in wrong format
if (!dateRegexTest.test(value)) {
if (!resourceDateRegexTest.test(value)) {
errorMessage = "The date should be in the format YYYY-MM-DD."
} else {
const dateTokens = value.split("-")
Expand Down Expand Up @@ -964,6 +1069,7 @@ export {
validateLocationType,
validateLink,
validateHighlights,
validateAnnouncements,
validateDropdownElems,
validateSections,
validatePageSettings,
Expand Down

0 comments on commit 84c9c1c

Please sign in to comment.