mirror of
https://github.com/sasjs/server.git
synced 2026-01-11 16:20:06 +00:00
feat: replace ID with UID
BREAKING CHANGE: remove auto incremental ids from user, group and permissions and add a virtual uid property that returns string value of documents object id
This commit is contained in:
@@ -99,8 +99,8 @@ const AddPermissionModal = ({
|
||||
principalType: principalType.toLowerCase(),
|
||||
principalId:
|
||||
principalType.toLowerCase() === 'user'
|
||||
? userPrincipal?.id
|
||||
: groupPrincipal?.groupId
|
||||
? userPrincipal?.uid
|
||||
: groupPrincipal?.uid
|
||||
}
|
||||
|
||||
permissions.push(addPermissionPayload)
|
||||
|
||||
@@ -61,7 +61,7 @@ const PermissionTable = ({
|
||||
</TableHead>
|
||||
<TableBody>
|
||||
{permissions.map((permission) => (
|
||||
<TableRow key={permission.permissionId}>
|
||||
<TableRow key={permission.uid}>
|
||||
<BootstrapTableCell>{permission.path}</BootstrapTableCell>
|
||||
<BootstrapTableCell>{permission.type}</BootstrapTableCell>
|
||||
<BootstrapTableCell>
|
||||
|
||||
@@ -69,7 +69,7 @@ const useAddPermission = () => {
|
||||
|
||||
for (const permission of updatingPermissions) {
|
||||
await axios
|
||||
.patch(`/SASjsApi/permission/${permission.permissionId}`, {
|
||||
.patch(`/SASjsApi/permission/${permission.uid}`, {
|
||||
setting: permission.setting === 'Grant' ? 'Deny' : 'Grant'
|
||||
})
|
||||
.then((res) => {
|
||||
|
||||
@@ -24,7 +24,7 @@ const useDeletePermissionModal = () => {
|
||||
setDeleteConfirmationModalOpen(false)
|
||||
setIsLoading(true)
|
||||
axios
|
||||
.delete(`/SASjsApi/permission/${selectedPermission?.permissionId}`)
|
||||
.delete(`/SASjsApi/permission/${selectedPermission?.uid}`)
|
||||
.then((res: any) => {
|
||||
fetchPermissions()
|
||||
setSnackbarMessage('Permission deleted!')
|
||||
|
||||
@@ -62,21 +62,17 @@ const useFilterPermissions = () => {
|
||||
: permissions
|
||||
|
||||
let filteredArray = uriFilteredPermissions.filter((permission) =>
|
||||
principalFilteredPermissions.some(
|
||||
(item) => item.permissionId === permission.permissionId
|
||||
)
|
||||
principalFilteredPermissions.some((item) => item.uid === permission.uid)
|
||||
)
|
||||
|
||||
filteredArray = filteredArray.filter((permission) =>
|
||||
principalTypeFilteredPermissions.some(
|
||||
(item) => item.permissionId === permission.permissionId
|
||||
(item) => item.uid === permission.uid
|
||||
)
|
||||
)
|
||||
|
||||
filteredArray = filteredArray.filter((permission) =>
|
||||
settingFilteredPermissions.some(
|
||||
(item) => item.permissionId === permission.permissionId
|
||||
)
|
||||
settingFilteredPermissions.some((item) => item.uid === permission.uid)
|
||||
)
|
||||
|
||||
setFilteredPermissions(filteredArray)
|
||||
|
||||
@@ -24,7 +24,7 @@ const useUpdatePermissionModal = () => {
|
||||
setUpdatePermissionModalOpen(false)
|
||||
setIsLoading(true)
|
||||
axios
|
||||
.patch(`/SASjsApi/permission/${selectedPermission?.permissionId}`, {
|
||||
.patch(`/SASjsApi/permission/${selectedPermission?.uid}`, {
|
||||
setting
|
||||
})
|
||||
.then((res: any) => {
|
||||
|
||||
@@ -27,8 +27,8 @@ interface AppContextProps {
|
||||
setLoggedIn: Dispatch<SetStateAction<boolean>> | null
|
||||
needsToUpdatePassword: boolean
|
||||
setNeedsToUpdatePassword: Dispatch<SetStateAction<boolean>> | null
|
||||
userId: number
|
||||
setUserId: Dispatch<SetStateAction<number>> | null
|
||||
userId: string
|
||||
setUserId: Dispatch<SetStateAction<string>> | null
|
||||
username: string
|
||||
setUsername: Dispatch<SetStateAction<string>> | null
|
||||
displayName: string
|
||||
@@ -46,7 +46,7 @@ export const AppContext = createContext<AppContextProps>({
|
||||
setLoggedIn: null,
|
||||
needsToUpdatePassword: false,
|
||||
setNeedsToUpdatePassword: null,
|
||||
userId: 0,
|
||||
userId: '',
|
||||
setUserId: null,
|
||||
username: '',
|
||||
setUsername: null,
|
||||
@@ -64,7 +64,7 @@ const AppContextProvider = (props: { children: ReactNode }) => {
|
||||
const [checkingSession, setCheckingSession] = useState(false)
|
||||
const [loggedIn, setLoggedIn] = useState(false)
|
||||
const [needsToUpdatePassword, setNeedsToUpdatePassword] = useState(false)
|
||||
const [userId, setUserId] = useState(0)
|
||||
const [userId, setUserId] = useState('')
|
||||
const [username, setUsername] = useState('')
|
||||
const [displayName, setDisplayName] = useState('')
|
||||
const [isAdmin, setIsAdmin] = useState(false)
|
||||
|
||||
@@ -6,13 +6,13 @@ export const findExistingPermission = (
|
||||
) => {
|
||||
for (const permission of existingPermissions) {
|
||||
if (
|
||||
permission.user?.id === newPermission.principalId &&
|
||||
permission.user?.uid === newPermission.principalId &&
|
||||
hasSameCombination(permission, newPermission)
|
||||
)
|
||||
return permission
|
||||
|
||||
if (
|
||||
permission.group?.groupId === newPermission.principalId &&
|
||||
permission.group?.uid === newPermission.principalId &&
|
||||
hasSameCombination(permission, newPermission)
|
||||
)
|
||||
return permission
|
||||
@@ -27,13 +27,13 @@ export const findUpdatingPermission = (
|
||||
) => {
|
||||
for (const permission of existingPermissions) {
|
||||
if (
|
||||
permission.user?.id === newPermission.principalId &&
|
||||
permission.user?.uid === newPermission.principalId &&
|
||||
hasDifferentSetting(permission, newPermission)
|
||||
)
|
||||
return permission
|
||||
|
||||
if (
|
||||
permission.group?.groupId === newPermission.principalId &&
|
||||
permission.group?.uid === newPermission.principalId &&
|
||||
hasDifferentSetting(permission, newPermission)
|
||||
)
|
||||
return permission
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
export interface UserResponse {
|
||||
id: number
|
||||
uid: number
|
||||
username: string
|
||||
displayName: string
|
||||
isAdmin: boolean
|
||||
}
|
||||
|
||||
export interface GroupResponse {
|
||||
groupId: number
|
||||
uid: number
|
||||
name: string
|
||||
description: string
|
||||
}
|
||||
@@ -17,7 +17,7 @@ export interface GroupDetailsResponse extends GroupResponse {
|
||||
}
|
||||
|
||||
export interface PermissionResponse {
|
||||
permissionId: number
|
||||
uid: number
|
||||
path: string
|
||||
type: string
|
||||
setting: string
|
||||
|
||||
Reference in New Issue
Block a user