devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some issues related to build

Browse Source
This commit is contained in:
José Lima
2025-02-09 04:29:32 +00:00
parent b175d8797e
commit e5e60fcce9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/(admin)/Lists/ExamList.tsx
View File

@@ -61,7 +61,7 @@ export default function ExamList({
// Pass this permission filter to the backend later // Pass this permission filter to the backend later
const filteredExams = useMemo( const filteredExams = useMemo(
() => () =>
["admin", "developer"].includes(user.type) ["admin", "developer"].includes(user?.type)
? exams ? exams
: exams.filter((item) => { : exams.filter((item) => {
if ( if (
@@ -73,7 +73,7 @@ export default function ExamList({
return false; return false;
return true; return true;
}), }),
[canViewConfidentialEntities, exams, user.type] [canViewConfidentialEntities, exams, user?.type]
); );
const parsedExams = useMemo(() => { const parsedExams = useMemo(() => {

12
src/utils/permissions.ts
View File

@@ -54,11 +54,11 @@ export function groupAllowedEntitiesByPermissions(
const userEntity = userEntityMap.get(entity.id); const userEntity = userEntityMap.get(entity.id);
const role = userEntity const role = userEntity
? roleCache.get(userEntity.role) ?? ? roleCache.get(userEntity.role) ??
(() => { (() => {
const foundRole = entity.roles.find(r => r.id === userEntity.role) || null; const foundRole = entity.roles.find(r => r.id === userEntity.role) || null;
roleCache.set(userEntity.role, foundRole); roleCache.set(userEntity.role, foundRole);
return foundRole; return foundRole;
})() })()
: null; : null;
permissions.forEach(permission => { permissions.forEach(permission => {
@@ -75,7 +75,7 @@ export function groupAllowedEntitiesByPermissions(
export function findAllowedEntities(user: User, entities: EntityWithRoles[], permission: RolePermission) { export function findAllowedEntities(user: User, entities: EntityWithRoles[], permission: RolePermission) {
if (["admin", "developer"].includes(user?.type)) return entities if (["admin", "developer"].includes(user?.type)) return entities
const allowedEntities = entities.filter((e) => doesEntityAllow(user, e, permission)) const allowedEntities = (entities ?? []).filter((e) => doesEntityAllow(user, e, permission))
return allowedEntities return allowedEntities
} }