diff --git a/web/src/containers/Settings/deletePermissionModal.tsx b/web/src/components/deleteConfirmationModal.tsx similarity index 62% rename from web/src/containers/Settings/deletePermissionModal.tsx rename to web/src/components/deleteConfirmationModal.tsx index 23736f8..ec0eb0b 100644 --- a/web/src/containers/Settings/deletePermissionModal.tsx +++ b/web/src/components/deleteConfirmationModal.tsx @@ -18,22 +18,27 @@ const BootstrapDialog = styled(Dialog)(({ theme }) => ({ } })) -type DeleteModalProps = { +type DeleteConfirmationModalProps = { open: boolean setOpen: React.Dispatch> - deletePermission: () => void + message: string + _delete: () => void } -const DeleteModal = ({ open, setOpen, deletePermission }: DeleteModalProps) => { +const DeleteConfirmationModal = ({ + open, + setOpen, + message, + _delete +}: DeleteConfirmationModalProps) => { return ( setOpen(false)} open={open}> - - Are you sure you want to delete this permission? - + {message} - + @@ -41,4 +46,4 @@ const DeleteModal = ({ open, setOpen, deletePermission }: DeleteModalProps) => { ) } -export default DeleteModal +export default DeleteConfirmationModal diff --git a/web/src/containers/Settings/permission.tsx b/web/src/containers/Settings/permission.tsx index 81b2180..772d592 100644 --- a/web/src/containers/Settings/permission.tsx +++ b/web/src/containers/Settings/permission.tsx @@ -28,7 +28,7 @@ import Modal from '../../components/modal' import PermissionFilterModal from './permissionFilterModal' import AddPermissionModal from './addPermissionModal' import UpdatePermissionModal from './updatePermissionModal' -import DeleteModal from './deletePermissionModal' +import DeleteConfirmationModal from '../../components/deleteConfirmationModal' import BootstrapSnackbar, { AlertSeverityType } from '../../components/snackbar' import { @@ -61,7 +61,10 @@ const Permission = () => { const [addPermissionModalOpen, setAddPermissionModalOpen] = useState(false) const [updatePermissionModalOpen, setUpdatePermissionModalOpen] = useState(false) - const [deleteModalOpen, setDeleteModalOpen] = useState(false) + const [deleteConfirmationModalOpen, setDeleteConfirmationModalOpen] = + useState(false) + const [deleteConfirmationModalMessage, setDeleteConfirmationModalMessage] = + useState('') const [selectedPermission, setSelectedPermission] = useState() const [filterModalOpen, setFilterModalOpen] = useState(false) @@ -236,11 +239,14 @@ const Permission = () => { const handleDeletePermissionClick = (permission: PermissionResponse) => { setSelectedPermission(permission) - setDeleteModalOpen(true) + setDeleteConfirmationModalOpen(true) + setDeleteConfirmationModalMessage( + 'Are you sure you want to delete this permission?' + ) } const deletePermission = () => { - setDeleteModalOpen(false) + setDeleteConfirmationModalOpen(false) setIsLoading(true) axios .delete(`/SASjsApi/permission/${selectedPermission?.permissionId}`) @@ -338,10 +344,11 @@ const Permission = () => { permission={selectedPermission} updatePermission={updatePermission} /> - )