From 6ec0bff678649a9b7baae75ce58838bb16fb0b66 Mon Sep 17 00:00:00 2001 From: tahaKhanAbdalli Date: Wed, 24 Jan 2024 19:06:41 +0500 Subject: [PATCH 1/2] cannot create new user issue resolved --- src/resources/users/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/users/index.tsx b/src/resources/users/index.tsx index c37f2b037..f316fd5ab 100644 --- a/src/resources/users/index.tsx +++ b/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 } From dc74307d3444e54a999391ee4b2751d24691ddf6 Mon Sep 17 00:00:00 2001 From: tahaKhanAbdalli Date: Thu, 25 Jan 2024 14:41:08 +0500 Subject: [PATCH 2/2] set date default value of 10 years in the future --- src/resources/users/UserForm.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/resources/users/UserForm.tsx b/src/resources/users/UserForm.tsx index 52cf27cfc..8d3820324 100644 --- a/src/resources/users/UserForm.tsx +++ b/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'