1
0
mirror of https://github.com/sasjs/server.git synced 2025-12-10 11:24:35 +00:00

feat: add multiple permission for same combination of type and principal at once

This commit is contained in:
2022-08-03 23:26:31 +05:00
parent 78bea7c154
commit 754704bca8
4 changed files with 171 additions and 53 deletions

View File

@@ -32,7 +32,7 @@ const BootstrapDialog = styled(Dialog)(({ theme }) => ({
type AddPermissionModalProps = {
open: boolean
handleOpen: Dispatch<SetStateAction<boolean>>
addPermission: (addPermissionPayload: RegisterPermissionPayload) => void
addPermission: (permissions: RegisterPermissionPayload[]) => void
}
const AddPermissionModal = ({
@@ -42,9 +42,9 @@ const AddPermissionModal = ({
}: AddPermissionModalProps) => {
const [paths, setPaths] = useState<string[]>([])
const [loadingPaths, setLoadingPaths] = useState(false)
const [path, setPath] = useState<string>()
const [selectedPaths, setSelectedPaths] = useState<string[]>([])
const [permissionType, setPermissionType] = useState('Route')
const [principalType, setPrincipalType] = useState('group')
const [principalType, setPrincipalType] = useState('Group')
const [userPrincipal, setUserPrincipal] = useState<UserResponse>()
const [groupPrincipal, setGroupPrincipal] = useState<GroupResponse>()
const [permissionSetting, setPermissionSetting] = useState('Grant')
@@ -72,10 +72,10 @@ const AddPermissionModal = ({
useEffect(() => {
setLoadingPrincipals(true)
axios
.get(`/SASjsApi/${principalType}`)
.get(`/SASjsApi/${principalType.toLowerCase()}`)
.then((res: any) => {
if (res.data) {
if (principalType === 'user') {
if (principalType.toLowerCase() === 'user') {
const users: UserResponse[] = res.data
const nonAdminUsers = users.filter((user) => !user.isAdmin)
setUserPrincipals(nonAdminUsers)
@@ -93,22 +93,29 @@ const AddPermissionModal = ({
}, [principalType])
const handleAddPermission = () => {
const addPermissionPayload: any = {
path,
type: permissionType,
setting: permissionSetting,
principalType
}
if (principalType === 'user' && userPrincipal) {
addPermissionPayload.principalId = userPrincipal.id
} else if (principalType === 'group' && groupPrincipal) {
addPermissionPayload.principalId = groupPrincipal.groupId
}
addPermission(addPermissionPayload)
const permissions: RegisterPermissionPayload[] = []
selectedPaths.forEach((path) => {
const addPermissionPayload: any = {
path,
type: permissionType,
setting: permissionSetting,
principalType: principalType.toLowerCase(),
principalId:
principalType.toLowerCase() === 'user'
? userPrincipal?.id
: groupPrincipal?.groupId
}
permissions.push(addPermissionPayload)
})
addPermission(permissions)
}
const addButtonDisabled =
!path || (principalType === 'user' ? !userPrincipal : !groupPrincipal)
!selectedPaths.length ||
(principalType.toLowerCase() === 'user' ? !userPrincipal : !groupPrincipal)
return (
<BootstrapDialog onClose={() => handleOpen(false)} open={open}>
@@ -122,17 +129,14 @@ const AddPermissionModal = ({
<Grid container spacing={2}>
<Grid item xs={12}>
<Autocomplete
multiple
options={paths}
disableClearable
value={path}
onChange={(event: any, newValue: string) => setPath(newValue)}
renderInput={(params) =>
loadingPaths ? (
<CircularProgress />
) : (
<TextField {...params} autoFocus label="Path" />
)
}
filterSelectedOptions
value={selectedPaths}
onChange={(event: any, newValue: string[]) => {
setSelectedPaths(newValue)
}}
renderInput={(params) => <TextField {...params} label="Paths" />}
/>
</Grid>
<Grid item xs={12}>
@@ -154,8 +158,7 @@ const AddPermissionModal = ({
</Grid>
<Grid item xs={12}>
<Autocomplete
options={['group', 'user']}
getOptionLabel={(option) => option.toUpperCase()}
options={['Group', 'User']}
disableClearable
value={principalType}
onChange={(event: any, newValue: string) =>
@@ -167,7 +170,7 @@ const AddPermissionModal = ({
/>
</Grid>
<Grid item xs={12}>
{principalType === 'user' ? (
{principalType.toLowerCase() === 'user' ? (
<Autocomplete
options={userPrincipals}
getOptionLabel={(option) => option.displayName}

View File

@@ -0,0 +1,99 @@
import React from 'react'
import {
Paper,
Typography,
DialogContent,
TableContainer,
Table,
TableHead,
TableBody,
TableRow,
TableCell
} from '@mui/material'
import { BootstrapDialog } from '../../components/modal'
import { BootstrapDialogTitle } from '../../components/dialogTitle'
import { PermissionResponse } from '../../utils/types'
type Props = {
open: boolean
setOpen: React.Dispatch<React.SetStateAction<boolean>>
permissionResponses: PermissionResponse[]
errorResponses: any[]
}
const PermissionResponseModal = ({
open,
setOpen,
permissionResponses,
errorResponses
}: Props) => {
return (
<div>
<BootstrapDialog onClose={() => setOpen(false)} open={open}>
<BootstrapDialogTitle
id="permission-response-modal"
handleOpen={setOpen}
>
Permission Response
</BootstrapDialogTitle>
<DialogContent dividers>
{permissionResponses.length > 0 && (
<>
<Typography gutterBottom>Added Permissions</Typography>
{permissionResponses.length > 0 && (
<TableContainer component={Paper}>
<Table size="small">
<TableHead>
<TableRow>
<TableCell>Path</TableCell>
<TableCell>Type</TableCell>
<TableCell>Setting</TableCell>
</TableRow>
</TableHead>
<TableBody>
{permissionResponses.map((permission, index) => {
return (
<TableRow key={index}>
<TableCell>{permission.path}</TableCell>
<TableCell>{permission.type}</TableCell>
<TableCell>{permission.setting}</TableCell>
</TableRow>
)
})}
</TableBody>
</Table>
</TableContainer>
)}
</>
)}
{errorResponses.length > 0 && (
<>
<Typography style={{ color: 'red', marginTop: '10px' }}>
Errors
</Typography>
<ul>
{errorResponses.map((err, index) => (
<li key={index}>
<Typography>
Error occurred for Path: {err.permission.path}
</Typography>
<Typography>
{typeof err.error.response.data === 'object'
? JSON.stringify(err.error.response.data)
: err.error.response.data}
</Typography>
</li>
))}
</ul>
</>
)}
</DialogContent>
</BootstrapDialog>
</div>
)
}
export default PermissionResponseModal

View File

@@ -27,6 +27,7 @@ import { styled } from '@mui/material/styles'
import Modal from '../../components/modal'
import PermissionFilterModal from './permissionFilterModal'
import AddPermissionModal from './addPermissionModal'
import PermissionResponseModal from './addPermissionResponseModal'
import UpdatePermissionModal from './updatePermissionModal'
import DeleteConfirmationModal from '../../components/deleteConfirmationModal'
import BootstrapSnackbar, { AlertSeverityType } from '../../components/snackbar'
@@ -59,6 +60,13 @@ const Permission = () => {
AlertSeverityType.Success
)
const [addPermissionModalOpen, setAddPermissionModalOpen] = useState(false)
const [openPermissionResponseModal, setOpenPermissionResponseModal] =
useState(false)
const [addedPermissions, setAddedPermission] = useState<PermissionResponse[]>(
[]
)
const [errorResponses, setErrorResponses] = useState<any[]>([])
const [updatePermissionModalOpen, setUpdatePermissionModalOpen] =
useState(false)
const [deleteConfirmationModalOpen, setDeleteConfirmationModalOpen] =
@@ -181,29 +189,31 @@ const Permission = () => {
setFilterApplied(false)
}
const addPermission = (addPermissionPayload: RegisterPermissionPayload) => {
const addPermission = (permissions: RegisterPermissionPayload[]) => {
setAddPermissionModalOpen(false)
setAddedPermission([])
setErrorResponses([])
setIsLoading(true)
axios
.post('/SASjsApi/permission', addPermissionPayload)
.then((res: any) => {
fetchPermissions()
setSnackbarMessage('Permission added!')
setSnackbarSeverity(AlertSeverityType.Success)
setOpenSnackbar(true)
})
.catch((err) => {
setModalTitle('Abort')
setModalPayload(
typeof err.response.data === 'object'
? JSON.stringify(err.response.data)
: err.response.data
)
setOpenModal(true)
})
.finally(() => {
setIsLoading(false)
})
const permissionResponses: PermissionResponse[] = []
const errors: any = []
permissions.forEach(async (permission) => {
await axios
.post('/SASjsApi/permission', permission)
.then((res) => {
permissionResponses.push(res.data)
})
.catch((error) => {
errors.push({ error, permission })
})
})
fetchPermissions()
setIsLoading(false)
setOpenPermissionResponseModal(true)
setAddedPermission(permissionResponses)
setErrorResponses(errors)
}
const handleUpdatePermissionClick = (permission: PermissionResponse) => {
@@ -340,6 +350,12 @@ const Permission = () => {
handleOpen={setAddPermissionModalOpen}
addPermission={addPermission}
/>
<PermissionResponseModal
open={openPermissionResponseModal}
setOpen={setOpenPermissionResponseModal}
permissionResponses={addedPermissions}
errorResponses={errorResponses}
/>
<UpdatePermissionModal
open={updatePermissionModalOpen}
handleOpen={setUpdatePermissionModalOpen}

View File

@@ -92,7 +92,7 @@ const PermissionFilterModal = ({
onChange={(event: any, newValue: string[]) => {
setPathFilter(newValue)
}}
renderInput={(params) => <TextField {...params} label="URIs" />}
renderInput={(params) => <TextField {...params} label="Paths" />}
/>
</Grid>
<Grid item xs={12}>