Skip to content

Commit

Permalink
update validation
Browse files Browse the repository at this point in the history
  • Loading branch information
@henryoforeh-dev
henryoforeh-dev committed Oct 8, 2024
1 parent f19582e commit bc940e4
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 26 deletions.
25 changes: 18 additions & 7 deletions services/common/src/components/projectSummary/Agent.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ export const Agent: FC = () => {
name="agent.party_orgbook_entity.registration_id"
label="Incorporation Number"
required
validate={[required]}
validate={[required, maxLength(25)]}
component={RenderField}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
Expand All @@ -250,7 +250,7 @@ export const Agent: FC = () => {
label="First Name"
component={RenderField}
required
validate={[required, maxLength(100)]}
validate={[required, maxLength(60)]}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
</Col>
Expand All @@ -260,7 +260,7 @@ export const Agent: FC = () => {
label="Last Name"
component={RenderField}
required
validate={[required, maxLength(100)]}
validate={[required, maxLength(60)]}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
</Col>
Expand All @@ -273,6 +273,7 @@ export const Agent: FC = () => {
name="agent.job_title"
label="Agent's Title"
component={RenderField}
validate={[maxLength(100)]}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
</Col>
Expand All @@ -284,21 +285,30 @@ export const Agent: FC = () => {
name="agent.phone_no"
label="Contact Number"
required
validate={isInternational ? [required] : [required, phoneNumber]}
validate={
isInternational
? [required, maxLength(12)]
: [required, phoneNumber, maxLength(12)]
}
component={RenderField}
normalize={normalizePhone}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
</Col>
<Col md={4} sm={5}>
<Field name="agent.phone_ext" label="Ext." component={RenderField} />
<Field
name="agent.phone_ext"
validate={[maxLength(4)]}
label="Ext."
component={RenderField}
/>
</Col>
<Col md={12} sm={24}>
<Field
name="agent.email"
label="Email Address"
required
validate={[required, email]}
validate={[required, email, maxLength(60)]}
component={RenderField}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
Expand All @@ -312,7 +322,7 @@ export const Agent: FC = () => {
name="agent.address.address_line_1"
label="Street"
required
validate={[required]}
validate={[required, maxLength(100)]}
component={RenderField}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
Expand All @@ -322,6 +332,7 @@ export const Agent: FC = () => {
name="agent.address.suite_no"
label="Unit #"
component={RenderField}
validate={[required, maxLength(5)]}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
</Col>
Expand Down
19 changes: 13 additions & 6 deletions services/common/src/components/projectSummary/Applicant.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ const Applicant = () => {
name="applicant.party_orgbook_entity.registration_id"
label="Incorporation Number"
required
validate={[required]}
validate={[required, maxLength(25)]}
component={RenderField}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
Expand All @@ -349,20 +349,25 @@ const Applicant = () => {
name="applicant.first_name"
label="First Name"
required
validate={[required]}
validate={[required, maxLength(60)]}
component={RenderField}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
</Col>
<Col md={8} sm={24}>
<Field name="applicant.middle_name" label="Middle Name" component={RenderField} />
<Field
name="applicant.middle_name"
validate={[maxLength(60)]}
label="Middle Name"
component={RenderField}
/>
</Col>
<Col md={8} sm={24}>
<Field
name="applicant.party_name"
label="Last Name"
required
validate={[required]}
validate={[required, maxLength(60)]}
component={RenderField}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
Expand All @@ -386,6 +391,7 @@ const Applicant = () => {
name="applicant.phone_ext"
label="Ext."
component={RenderField}
validate={[phoneNumber, maxLength(4), required]}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
</Col>
Expand All @@ -394,7 +400,7 @@ const Applicant = () => {
name="applicant.email"
label="Email Address"
required
validate={[required, email]}
validate={[required, email, maxLength(60)]}
component={RenderField}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
Expand All @@ -407,13 +413,14 @@ const Applicant = () => {
name="applicant.address[0].address_line_1"
label="Street"
required
validate={[required]}
validate={[required, maxLength(100)]}
component={RenderField}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
</Col>
<Col md={5} sm={24}>
<Field
validate={[maxLength(5)]}
name="applicant.address[0].suite_no"
label="Unit #"
component={RenderField}
Expand Down
21 changes: 14 additions & 7 deletions services/common/src/components/projectSummary/FacilityOperator.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,15 @@ export const FacilityOperator: FC = () => {
name="facility_operator.address.address_line_1"
label="Street"
required
validate={[required, maxLength(400)]}
validate={[required, maxLength(60)]}
component={RenderField}
help="If no civic address, describe location (e.g. 3km north of Sechelt, BC, on Highway 101)"
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
</Col>
<Col md={5} sm={24}>
<Field
validate={[maxLength(20)]}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
name="facility_operator.address.suite_no"
label="Unit #"
Expand All @@ -97,7 +98,7 @@ export const FacilityOperator: FC = () => {
name="facility_operator.address.city"
label="City"
required
validate={[required]}
validate={[required, maxLength(100)]}
component={RenderField}
/>
<Field
Expand All @@ -114,7 +115,7 @@ export const FacilityOperator: FC = () => {
name="facility_operator.address.post_code"
label="Postal Code"
component={RenderField}
validate={[postalCodeWithCountry(address_type_code)]}
validate={[postalCodeWithCountry(address_type_code), maxLength(10)]}
/>

<Field
Expand Down Expand Up @@ -142,7 +143,7 @@ export const FacilityOperator: FC = () => {
name="facility_operator.first_name"
label="Facility Operator First Name"
required
validate={[required]}
validate={[required, maxLength(100)]}
component={RenderField}
/>
</Col>
Expand All @@ -152,7 +153,7 @@ export const FacilityOperator: FC = () => {
name="facility_operator.party_name"
label="Last Name"
required
validate={[required]}
validate={[required, maxLength(100)]}
component={RenderField}
/>
</Col>
Expand All @@ -161,6 +162,7 @@ export const FacilityOperator: FC = () => {
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
name="facility_operator.job_title"
label="Facility Operator Title"
validate={[maxLength(100)]}
component={RenderField}
/>
</Col>
Expand All @@ -179,14 +181,19 @@ export const FacilityOperator: FC = () => {
/>
</Col>
<Col md={4} sm={5}>
<Field name="facility_operator.phone_ext" label="Ext." component={RenderField} />
<Field
name="facility_operator.phone_ext"
validate={[maxLength(4)]}
label="Ext."
component={RenderField}
/>
</Col>
<Col md={12} sm={24}>
<Field
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
name="facility_operator.email"
label="Facility Operator Email Address"
validate={[email]}
validate={[email, maxLength(100)]}
component={RenderField}
/>
</Col>
Expand Down
10 changes: 7 additions & 3 deletions services/common/src/components/projectSummary/LegalLandOwnerInformation.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export const LegalLandOwnerInformation: FC = () => {
label="Legal Land Owner Name"
component={RenderField}
required={!is_legal_land_owner}
validate={!is_legal_land_owner ? [required, maxLength(100)] : []}
validate={!is_legal_land_owner ? [required, maxLength(100)] : [maxLength(100)]}
help="If it is provincial or federal, write in that"
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
Expand All @@ -130,7 +130,9 @@ export const LegalLandOwnerInformation: FC = () => {
label="Legal Land Owner Contact Number"
component={RenderField}
required={!is_legal_land_owner}
validate={!is_legal_land_owner ? [phoneNumber, maxLength(12), required] : []}
validate={
!is_legal_land_owner ? [phoneNumber, maxLength(12), required] : [maxLength(12)]
}
normalize={normalizePhone}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
Expand All @@ -142,7 +144,9 @@ export const LegalLandOwnerInformation: FC = () => {
label="Legal Land Owner Email Address"
component={RenderField}
required={!is_legal_land_owner}
validate={!is_legal_land_owner ? [required, email, maxLength(4000)] : []}
validate={
!is_legal_land_owner ? [required, email, maxLength(100)] : [maxLength(100)]
}
disabled={isFieldDisabled(systemFlag, formValues?.status_code)}
/>
</Col>
Expand Down
7 changes: 4 additions & 3 deletions services/common/src/components/projectSummary/ProjectContacts.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const RenderContacts = ({ fields, isDisabled }) => {
label="First Name"
component={RenderField}
required
validate={[required, maxLength(100)]}
validate={[required, maxLength(60)]}
/>
</Col>
<Col md={12} sm={24}>
Expand All @@ -106,7 +106,7 @@ const RenderContacts = ({ fields, isDisabled }) => {
label="Last Name"
component={RenderField}
required
validate={[required, maxLength(100)]}
validate={[required, maxLength(60)]}
/>
</Col>
</Row>
Expand All @@ -119,6 +119,7 @@ const RenderContacts = ({ fields, isDisabled }) => {
id={`${field}.job_title`}
label="Job Title"
component={RenderField}
validate={[maxLength(100)]}
/>
</Col>
<Col md={12} sm={24}>
Expand Down Expand Up @@ -163,7 +164,7 @@ const RenderContacts = ({ fields, isDisabled }) => {
label="Email"
required
component={RenderField}
validate={[required, email]}
validate={[required, email, maxLength(60)]}
/>
</Col>
</Row>
Expand Down

0 comments on commit bc940e4

Please sign in to comment.