add calls to new 'me' endpoint
This commit is contained in:
parent
281a0ed4e7
commit
a797027c7e
3 changed files with 83 additions and 4 deletions
|
|
@ -11,8 +11,18 @@ import { UserModalProps } from './types';
|
|||
|
||||
export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps) => {
|
||||
const [deleteModal, setDeleteModal] = useState(false);
|
||||
const { user, loadUser, editUserById, createNewUser, userModalLoading, deleteUserById, clearSelectedUser } =
|
||||
useUsers();
|
||||
const [isPersonalModal, setPersonalModal] = useState(false);
|
||||
const {
|
||||
user,
|
||||
loadUser,
|
||||
loadPersonalInfo,
|
||||
editUserById,
|
||||
editPersonalInfo,
|
||||
createNewUser,
|
||||
userModalLoading,
|
||||
deleteUserById,
|
||||
clearSelectedUser,
|
||||
} = useUsers();
|
||||
const { currentUser, isAdmin } = useAuth();
|
||||
|
||||
const { control, reset, handleSubmit } = useForm<User>({
|
||||
|
|
@ -26,7 +36,13 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
|
|||
|
||||
useEffect(() => {
|
||||
if (userId) {
|
||||
loadUser(userId);
|
||||
const currentUserId = currentUser?.id;
|
||||
if (currentUserId === userId) {
|
||||
setPersonalModal(true);
|
||||
loadPersonalInfo();
|
||||
} else {
|
||||
loadUser(userId);
|
||||
}
|
||||
}
|
||||
|
||||
reset(initialUserForm);
|
||||
|
|
@ -45,7 +61,9 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
|
|||
|
||||
const handleSave = async () => {
|
||||
try {
|
||||
if (userId) {
|
||||
if (isPersonalModal) {
|
||||
await handleSubmit((data) => editPersonalInfo(data))();
|
||||
} else if (userId) {
|
||||
await handleSubmit((data) => editUserById(data))();
|
||||
} else {
|
||||
await handleSubmit((data) => createNewUser(data))();
|
||||
|
|
@ -134,6 +152,7 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
|
|||
name={`app_roles.${index}.role`}
|
||||
label="Role"
|
||||
options={[
|
||||
{ value: UserRole.NoAccess, name: 'No Access' },
|
||||
{ value: UserRole.User, name: 'User' },
|
||||
{ value: UserRole.Admin, name: 'Admin' },
|
||||
]}
|
||||
|
|
|
|||
Reference in a new issue