Skip to content
Snippets Groups Projects
Commit df78d4bf authored by Miłosz Grocholewski's avatar Miłosz Grocholewski
Browse files

Merge branch 'bugfix/MIN-147-write-project-admin' into 'development'

bugfix(privileges): add privilege to edit layer for user with IS_ADMIN role

Closes MIN-147

See merge request !412
parents 759c7ce2 148021e2
No related branches found
No related tags found
1 merge request!412bugfix(privileges): add privilege to edit layer for user with IS_ADMIN role
Pipeline #102323 passed
......@@ -3,6 +3,7 @@ import { createSelector } from '@reduxjs/toolkit';
import { projectIdSelector } from '@/redux/project/project.selectors';
import { hasPrivilegeToObject } from '@/redux/user/user.utils';
import { UserPrivilege } from '@/types/models';
import { USER_ROLE } from '@/constants/user';
export const userSelector = createSelector(rootSelector, state => state.user);
......@@ -17,11 +18,18 @@ export const userPrivilegesSelector = createSelector(
export const hasPrivilegeToWriteProjectSelector = createSelector(
userPrivilegesSelector,
projectIdSelector,
(userPrivileges: UserPrivilege[], projectId: string | undefined): boolean => {
if (!projectId) {
userRoleSelector,
(
userPrivileges: UserPrivilege[],
projectId: string | undefined,
role: string | null,
): boolean => {
if (!projectId || !role) {
return false;
}
return hasPrivilegeToObject(userPrivileges, 'WRITE_PROJECT', projectId);
return (
role === USER_ROLE.ADMIN || hasPrivilegeToObject(userPrivileges, 'WRITE_PROJECT', projectId)
);
},
);
export const userTokenSelector = createSelector(userSelector, state => state.token);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment