local-it/dashboard
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Modify FE for No access role

Browse source 
- fix user settings modal - CurrentUserModal
- TODO: refactor UserModal and CurrentUserModal - it's same thing
This commit is contained in:
Davor 2022-05-27 21:28:34 +02:00
parent d0edc5b2bc
commit bc8db8d248
6 changed files with 48 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/components/Header/components/CurrentUserModal/CurrentUserModal.tsx
View file

@ -83,6 +83,7 @@ export const CurrentUserModal = ({ open, onClose, user }: UserModalProps) => {
name={`app_roles.${index}.role`}
label="Role"
options={[
{ value: UserRole.NoAccess, name: 'No access' },
{ value: UserRole.Admin, name: 'Admin' },
{ value: UserRole.User, name: 'User' },
]}
@ -121,9 +122,12 @@ export const CurrentUserModal = ({ open, onClose, user }: UserModalProps) => {
<div>
<div className="flow-root mt-6">
<ul className="-my-5 divide-y divide-gray-200 ">
{fields
.filter((field) => field.name !== 'dashboard')
.map((item, index) => (
{fields.map((item, index) => {
if (item.name === 'dashboard') {
return null;
}
return (
<li className="py-4" key={item.name}>
<div className="flex items-center space-x-4">
<div className="flex-shrink-0 flex-1 flex items-center">
@ -142,6 +146,7 @@ export const CurrentUserModal = ({ open, onClose, user }: UserModalProps) => {
control={control}
name={`app_roles.${index}.role`}
options={[
{ value: UserRole.NoAccess, name: 'No access' },
{ value: UserRole.Admin, name: 'Admin' },
{ value: UserRole.User, name: 'User' },
]}
@ -149,7 +154,8 @@ export const CurrentUserModal = ({ open, onClose, user }: UserModalProps) => {
</div>
</div>
</li>
))}
);
})}
</ul>
</div>
</div>

12
src/components/Header/components/CurrentUserModal/consts.ts
View file

@ -12,7 +12,7 @@ export const appAccessList = [
label: 'Wordpress',
},
{
name: 'next-cloud',
name: 'nextcloud',
image: '/assets/nextcloud.svg',
label: 'NextCloud',
},
@ -30,19 +30,19 @@ const initialAppRoles = [
},
{
name: 'wekan',
role: UserRole.User,
role: UserRole.NoAccess,
},
{
name: 'wordpress',
role: UserRole.User,
role: UserRole.NoAccess,
},
{
name: 'next-cloud',
role: UserRole.User,
name: 'nextcloud',
role: UserRole.NoAccess,
},
{
name: 'zulip',
role: UserRole.User,
role: UserRole.NoAccess,
},
];

2
src/modules/users/components/UserModal/UserModal.tsx
View file

@ -133,6 +133,7 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
name={`app_roles.${index}.role`}
label="Role"
options={[
{ value: UserRole.NoAccess, name: 'No access' },
{ value: UserRole.User, name: 'User' },
{ value: UserRole.Admin, name: 'Admin' },
]}
@ -194,6 +195,7 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
control={control}
name={`app_roles.${index}.role`}
options={[
{ value: UserRole.NoAccess, name: 'No Access' },
{ value: UserRole.User, name: 'User' },
{ value: UserRole.Admin, name: 'Admin' },
]}

8
src/modules/users/components/UserModal/consts.ts
View file

@ -30,19 +30,19 @@ const initialAppRoles = [
},
{
name: 'wekan',
role: UserRole.User,
role: UserRole.NoAccess,
},
{
name: 'wordpress',
role: UserRole.User,
role: UserRole.NoAccess,
},
{
name: 'nextcloud',
role: UserRole.User,
role: UserRole.NoAccess,
},
{
name: 'zulip',
role: UserRole.User,
role: UserRole.NoAccess,
},
];

28
src/services/users/transformations.ts
View file

@ -1,16 +1,38 @@
import { AppRoles, User, UserRole } from './types';
const transformRoleById = (roleId: any): UserRole => {
switch (roleId) {
case 1:
return UserRole.Admin;
case 2:
return UserRole.User;
default:
return UserRole.NoAccess;
}
};
const transformRoleIdByRole = (role: UserRole | null): number | null => {
switch (role) {
case UserRole.Admin:
return 1;
case UserRole.User:
return 2;
default:
return null;
}
};
export const transformAppRoles = (data: any): AppRoles => {
const resolvedAdminRole = data.role_id === 1 ? UserRole.Admin : UserRole.User;
const userRole = transformRoleById(data.role_id);
return {
name: data.name ?? '',
role: resolvedAdminRole ?? UserRole.User,
role: userRole,
};
};
export const transformRequestAppRoles = (data: AppRoles): any => {
const resolvedRequestRole = data.role === UserRole.Admin ? 1 : null;
const resolvedRequestRole = transformRoleIdByRole(data.role) ?? null;
return {
name: data.name ?? '',

1
src/services/users/types.ts
View file

@ -13,6 +13,7 @@ export interface FormUser extends User {
}
export enum UserRole {
NoAccess = 'no_access',
Admin = 'admin',
User = 'user',
}