[FIX] supervisor null check (#467)

* supervisor null check * fix: gov.bc.ca, lowercase
bcgov · Jan 21, 2025 · fc30ad2 · fc30ad2
1 parent 10514f5
commit fc30ad2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/backend/src/personnel/personnel.service.ts b/backend/src/personnel/personnel.service.ts
@@ -145,6 +145,10 @@ export class PersonnelService {
   ): Promise<PersonnelEntity> {
     const person = await this.findOneById(id);
 
+    if (!!personnel.supervisorEmail) {
+      personnel.supervisorEmail = personnel.supervisorEmail.toLowerCase();
+    }
+
     if (personnel.tools?.[0]?.hasOwnProperty('tool')) {
       const allTools = await this.toolsRepository.find();
       const personnelTools = personnel.tools.map((t) => ({

diff --git a/frontend/src/components/recommitment/RecommitmentFormBase.tsx b/frontend/src/components/recommitment/RecommitmentFormBase.tsx
@@ -445,10 +445,10 @@ export const RecommitmentFormBase = ({
     // For SupervisorForm, require first name, last name, and email
     if (currentComponentType === SupervisorForm) {
       const { firstName, lastName, email } = supervisorInformation;
-      const isValidEmail = /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
+      const isValidEmail = /^[^\s@]+@gov.bc.ca+$/.test(email);
 
       return Boolean(
-        firstName.trim() && lastName.trim() && email.trim() && isValidEmail,
+        firstName?.trim() && lastName?.trim() && email?.trim() && isValidEmail,
       );
     }
 

diff --git a/frontend/src/components/recommitment/SupervisorForm.tsx b/frontend/src/components/recommitment/SupervisorForm.tsx
@@ -84,6 +84,7 @@ export const SupervisorForm = ({ initialData, onUpdate }: SupervisorFormProps) =
             onChange={handleChange}
             className="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           />
+          <p className="text-xs text-gray-600">Must be a valid @gov.bc.ca email</p>
         </div>
 
         {/* Phone */}