set all app roles to admin when admin dashboard role is selected
This commit is contained in:
parent
c8e416b30c
commit
e1d326e7b1
3 changed files with 27 additions and 6 deletions
|
@ -173,7 +173,9 @@ const Header: React.FC<HeaderProps> = () => {
|
||||||
)}
|
)}
|
||||||
</Disclosure>
|
</Disclosure>
|
||||||
|
|
||||||
<UserModal open={currentUserModal} onClose={currentUserModalClose} userId={currentUserId} setUserId={_.noop} />
|
{currentUserModal && (
|
||||||
|
<UserModal open={currentUserModal} onClose={currentUserModalClose} userId={currentUserId} setUserId={_.noop} />
|
||||||
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect, useState } from 'react';
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
import { TrashIcon } from '@heroicons/react/outline';
|
import { TrashIcon } from '@heroicons/react/outline';
|
||||||
import { useFieldArray, useForm } from 'react-hook-form';
|
import { useController, useFieldArray, useForm, useFormState, useWatch } from 'react-hook-form';
|
||||||
import { Modal, ConfirmationModal } from 'src/components';
|
import { Modal, ConfirmationModal } from 'src/components';
|
||||||
import { Input, Select } from 'src/components/Form';
|
import { Input, Select } from 'src/components/Form';
|
||||||
import { User, UserRole, useUsers } from 'src/services/users';
|
import { User, UserRole, useUsers } from 'src/services/users';
|
||||||
|
@ -11,6 +11,7 @@ import { UserModalProps } from './types';
|
||||||
|
|
||||||
export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps) => {
|
export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps) => {
|
||||||
const [deleteModal, setDeleteModal] = useState(false);
|
const [deleteModal, setDeleteModal] = useState(false);
|
||||||
|
const [dashboardRoleEdited, setDashboardRoleEdited] = useState(false);
|
||||||
const { user, loadUser, editUserById, createNewUser, userModalLoading, deleteUserById, clearSelectedUser } =
|
const { user, loadUser, editUserById, createNewUser, userModalLoading, deleteUserById, clearSelectedUser } =
|
||||||
useUsers();
|
useUsers();
|
||||||
const { currentUser, isAdmin } = useAuth();
|
const { currentUser, isAdmin } = useAuth();
|
||||||
|
@ -19,7 +20,11 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
|
||||||
defaultValues: initialUserForm,
|
defaultValues: initialUserForm,
|
||||||
});
|
});
|
||||||
|
|
||||||
const { fields } = useFieldArray({
|
const { isDirty } = useFormState({
|
||||||
|
control,
|
||||||
|
});
|
||||||
|
|
||||||
|
const { fields, update } = useFieldArray({
|
||||||
control,
|
control,
|
||||||
name: 'app_roles',
|
name: 'app_roles',
|
||||||
});
|
});
|
||||||
|
@ -28,8 +33,6 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
|
||||||
if (userId) {
|
if (userId) {
|
||||||
loadUser(userId);
|
loadUser(userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
reset(initialUserForm);
|
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [userId, open]);
|
}, [userId, open]);
|
||||||
|
|
||||||
|
@ -43,6 +46,20 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
|
||||||
};
|
};
|
||||||
}, [user, reset, open]);
|
}, [user, reset, open]);
|
||||||
|
|
||||||
|
const dashboardRole = useWatch({
|
||||||
|
control,
|
||||||
|
name: 'app_roles.0.role',
|
||||||
|
});
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (dashboardRole === UserRole.Admin && (isDirty || dashboardRoleEdited)) {
|
||||||
|
fields.forEach((field, index) => update(index, { name: field.name, role: UserRole.Admin }));
|
||||||
|
}
|
||||||
|
if (isDirty) {
|
||||||
|
setDashboardRoleEdited(true);
|
||||||
|
}
|
||||||
|
}, [dashboardRole]);
|
||||||
|
|
||||||
const handleSave = async () => {
|
const handleSave = async () => {
|
||||||
try {
|
try {
|
||||||
if (userId) {
|
if (userId) {
|
||||||
|
|
|
@ -163,7 +163,9 @@ export const Users: React.FC = () => {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<UserModal open={configureModal} onClose={configureModalClose} userId={userId} setUserId={setUserId} />
|
{configureModal && (
|
||||||
|
<UserModal open={configureModal} onClose={configureModalClose} userId={userId} setUserId={setUserId} />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue