Merge branch 'main' into 1001_recipient_name_not_show_in_receipt_note

src/resources/users/UserForm.tsx

@@ -12,7 +12,7 @@ import EditToolBar from '../../components/EditToolBar'
 import { Typography } from '@mui/material'
 import { rolesOptions } from '../../utils/options'
 import FlexBox from '../../components/FlexBox'
-
+import { DateTime } from 'luxon'
 const schema = yup.object({
   name: yup.string().required(),
   role: yup
@@ -27,19 +27,23 @@ const schema = yup.object({
 })
 
 export default function UserForm({ isEdit }: FormProps): React.ReactElement {
+  const valueWithTenYears = DateTime.now()
+    .plus({ years: 10 })
+    .toJSDate()
+    .toISOString()
   const defaultValues: Omit<
     User,
     | 'id'
     | 'createdAt'
     | 'createdBy'
     | 'staffNumber'
-    | 'departedDate'
     | 'lastUpdatedAt'
     | 'lockoutAttempts'
   > = {
     name: '',
     password: '',
-    role: 'rco-user'
+    role: 'rco-user',
+    departedDate: valueWithTenYears
   }
   const { record } = useEditContext()
   const pageTitle = isEdit !== undefined ? 'Edit User' : 'Add new User'

src/resources/users/index.tsx

@@ -63,10 +63,10 @@ const EditVal = ({ setPrev }: EditValType): React.ReactElement => {
 }
 
 const users = {
+  create: UserCreate,
   edit: UserEdit,
   list: UserList,
   show: UserShow
 }
 
 export default users
-export { UserCreate }