Merge branch 'release-1.0.0' into fix/alex-cr-history-etl-1907

Author: prv-proton

frontend/src/views/Users/AddEditUser/AddEditUser.jsx

@@ -61,7 +61,7 @@ export const AddEditUser = ({ userType }) => {
 
   // User form hook and form validation
   const form = useForm({
-    resolver: yupResolver(userInfoSchema),
+    resolver: yupResolver(userInfoSchema(userType)),
     mode: 'onChange',
     defaultValues
   })

frontend/src/views/Users/AddEditUser/__tests__/AddEditUser.test.jsx

@@ -37,7 +37,7 @@ vi.mock('@/stores/useUserStore', () => ({
 async function typeAndValidateTextBox(name, value) {
   const textBox = screen.getByRole('textbox', { name })
   expect(textBox).toBeInTheDocument()
-  await userEvent.type(textBox, value)
+  await userEvent.type(textBox, value, { delay: 10 })
   expect(textBox).toHaveValue(value)
 }
 
@@ -81,7 +81,7 @@ describe('AddEditUser component', () => {
     // Check for form fields
     await typeAndValidateTextBox('First name', 'John')
     await typeAndValidateTextBox('Last name', 'Doe')
-    await typeAndValidateTextBox('Job title', 'Compliance manager')
+    await typeAndValidateTextBox('Job title (optional)', 'Compliance manager')
     await typeAndValidateTextBox('BCeID Userid', 'johndoe')
     await typeAndValidateTextBox(
       'Email address associated with the BCeID user account',

frontend/src/views/Users/AddEditUser/_schema.js

@@ -3,29 +3,33 @@ import { govRoles, nonGovRoles, roles } from '@/constants/roles'
 import { PHONE_REGEX } from '@/constants/common.js'
 
 // Schema for form validation
-export const userInfoSchema = Yup.object({
-  firstName: Yup.string().required('First name is required.'),
-  lastName: Yup.string().required('Last name is required.'),
-  jobTitle: Yup.string().required('Job title is required.'),
-  userName: Yup.string().required('User name is required'),
-  keycloakEmail: Yup.string()
-    .required('Email address is required.')
-    .email('Please enter a valid email address.'),
-  altEmail: Yup.string()
-    .email('Please enter a valid email address.')
-    .optional(),
-  phone: Yup.string()
-    .matches(PHONE_REGEX, 'Phone number is not valid')
-    .nullable(true),
-  mobilePhone: Yup.string()
-    .matches(PHONE_REGEX, 'Phone number is not valid')
-    .nullable(true),
-  status: Yup.string(),
-  adminRole: Yup.array(),
-  idirRole: Yup.string(),
-  bceidRoles: Yup.array(),
-  readOnly: Yup.string()
-})
+export const userInfoSchema = (userType) =>
+  Yup.object({
+    firstName: Yup.string().required('First name is required.'),
+    lastName: Yup.string().required('Last name is required.'),
+    jobTitle:
+      userType === 'bceid'
+        ? Yup.string().optional()
+        : Yup.string().required('Job title is required.'),
+    userName: Yup.string().required('User name is required'),
+    keycloakEmail: Yup.string()
+      .required('Email address is required.')
+      .email('Please enter a valid email address.'),
+    altEmail: Yup.string()
+      .email('Please enter a valid email address.')
+      .optional(),
+    phone: Yup.string()
+      .matches(PHONE_REGEX, 'Phone number is not valid')
+      .nullable(true),
+    mobilePhone: Yup.string()
+      .matches(PHONE_REGEX, 'Phone number is not valid')
+      .nullable(true),
+    status: Yup.string(),
+    adminRole: Yup.array(),
+    idirRole: Yup.string(),
+    bceidRoles: Yup.array(),
+    readOnly: Yup.string()
+  })
 
 export const idirTextFields = (t) => [
   {
@@ -70,7 +74,8 @@ export const bceidTextFields = (t) => [
   },
   {
     name: 'jobTitle',
-    label: t('admin:userForm.jobTitle')
+    label: t('admin:userForm.jobTitle'),
+    optional: true
   },
   {
     name: 'userName',