feat: view customize on member's role

This commit is contained in:
Takeshi Kimata
2024-06-02 19:57:46 +09:00
parent d7b870ae0d
commit 016a8d07c5
10 changed files with 113 additions and 31 deletions

View File

@@ -56,23 +56,47 @@ function authMiddleware(sequelize) {
*/ */
async function verifyProjectVisible(req, res, next) { async function verifyProjectVisible(req, res, next) {
const Project = defineProject(sequelize, DataTypes); const Project = defineProject(sequelize, DataTypes);
const Member = defineMember(sequelize, DataTypes);
Project.hasMany(Member, { foreignKey: 'projectId' });
const projectId = req.params.projectId || req.query.projectId; const projectId = req.params.projectId || req.query.projectId;
if (!projectId) { if (!projectId) {
return res.status(400).json({ error: 'projectId is required' }); return res.status(400).json({ error: 'projectId is required' });
} }
const project = await Project.findByPk(projectId); const project = await Project.findOne({
where: { id: projectId },
include: [
{
model: Member,
where: { userId: req.userId },
required: false,
},
],
});
if (!project) { if (!project) {
return res.status(404).send('Project not found'); return res.status(404).send('Project not found');
} }
// if project is private, only project owner can access // if project is public, everyone can see
if (!project.isPublic && project.userId !== req.userId) { if (project.isPublic) {
return res.status(403).json({ error: 'Forbidden' }); next();
return;
} }
// if project is private, owner and project member can see
if (project.userId === req.userId) {
next(); next();
return;
}
const member = project.Members && project.Members[0];
if (member) {
next();
return;
}
return res.status(403).json({ error: 'Forbidden' });
} }
/** /**

View File

@@ -1,17 +1,16 @@
const express = require('express'); const express = require('express');
const router = express.Router(); const router = express.Router();
const defineMember = require('../../models/members');
const defineUser = require('../../models/users'); const defineUser = require('../../models/users');
const defineMember = require('../../models/members');
const { DataTypes } = require('sequelize'); const { DataTypes } = require('sequelize');
module.exports = function (sequelize) { module.exports = function (sequelize) {
const { verifySignedIn, verifyProjectManager } = require('../../middleware/auth')(sequelize); const { verifySignedIn, verifyProjectVisible } = require('../../middleware/auth')(sequelize);
const Member = defineMember(sequelize, DataTypes);
const User = defineUser(sequelize, DataTypes); const User = defineUser(sequelize, DataTypes);
const Member = defineMember(sequelize, DataTypes);
Member.belongsTo(User, { foreignKey: 'userId' }); Member.belongsTo(User, { foreignKey: 'userId' });
router.get('/', verifySignedIn, verifyProjectManager, async (req, res) => { router.get('/', verifySignedIn, verifyProjectVisible, async (req, res) => {
const { projectId } = req.query; const { projectId } = req.query;
if (!projectId) { if (!projectId) {

View File

@@ -1,4 +1,4 @@
import { useState, useMemo, useCallback } from 'react'; import { useState, useEffect, useMemo, useCallback } from 'react';
import { import {
Table, Table,
TableHeader, TableHeader,

View File

@@ -1,3 +1,4 @@
import { useState, useEffect } from 'react';
import { Button, Dropdown, DropdownTrigger, DropdownMenu, DropdownItem } from '@nextui-org/react'; import { Button, Dropdown, DropdownTrigger, DropdownMenu, DropdownItem } from '@nextui-org/react';
import { MoreVertical } from 'lucide-react'; import { MoreVertical } from 'lucide-react';
import { FolderType, FoldersMessages } from '@/types/folder'; import { FolderType, FoldersMessages } from '@/types/folder';
@@ -11,14 +12,24 @@ type Props = {
}; };
export default function FolderEditMenu({ folder, isDisabled, onEditClick, onDeleteClick, messages }: Props) { export default function FolderEditMenu({ folder, isDisabled, onEditClick, onDeleteClick, messages }: Props) {
const [disabledKeys, setDisabledKeys] = useState<string[]>([]);
useEffect(() => {
if (isDisabled) {
setDisabledKeys(['edit', 'delete']);
} else {
setDisabledKeys([]);
}
}, [isDisabled]);
return ( return (
<Dropdown> <Dropdown>
<DropdownTrigger> <DropdownTrigger>
<Button isIconOnly isDisabled={isDisabled} size="sm" className="bg-transparent rounded-full"> <Button isIconOnly size="sm" className="bg-transparent rounded-full">
<MoreVertical size={16} /> <MoreVertical size={16} />
</Button> </Button>
</DropdownTrigger> </DropdownTrigger>
<DropdownMenu aria-label="Static Actions"> <DropdownMenu aria-label="Static Actions" disabledKeys={disabledKeys}>
<DropdownItem key="edit" onClick={() => onEditClick(folder)}> <DropdownItem key="edit" onClick={() => onEditClick(folder)}>
{messages.editFolder} {messages.editFolder}
</DropdownItem> </DropdownItem>

View File

@@ -118,7 +118,7 @@ export default function FoldersPane({ projectId, messages, locale }: Props) {
size="sm" size="sm"
variant="bordered" variant="bordered"
className="m-2" className="m-2"
isDisabled={!context.isProjectEditable(Number(projectId))} isDisabled={!context.isProjectDeveloper(Number(projectId))}
onClick={openDialogForCreate} onClick={openDialogForCreate}
> >
{messages.newFolder} {messages.newFolder}
@@ -133,7 +133,7 @@ export default function FoldersPane({ projectId, messages, locale }: Props) {
endContent={ endContent={
<FolderEditMenu <FolderEditMenu
folder={folder} folder={folder}
isDisabled={!context.isProjectEditable(Number(projectId))} isDisabled={!context.isProjectDeveloper(Number(projectId))}
onEditClick={onEditClick} onEditClick={onEditClick}
onDeleteClick={onDeleteClick} onDeleteClick={onDeleteClick}
messages={messages} messages={messages}

View File

@@ -21,12 +21,13 @@ import Avatar from 'boring-avatars';
type Props = { type Props = {
members: MemberType[]; members: MemberType[];
isDisabled: boolean;
onChangeRole: (userEdit: UserType, role: number) => void; onChangeRole: (userEdit: UserType, role: number) => void;
onDeleteMember: (userDeleted: UserType) => void; onDeleteMember: (userDeleted: UserType) => void;
messages: SettingsMessages; messages: SettingsMessages;
}; };
export default function MembersTable({ members, onChangeRole, onDeleteMember, messages }: Props) { export default function MembersTable({ members, isDisabled, onChangeRole, onDeleteMember, messages }: Props) {
const headerColumns = [ const headerColumns = [
{ name: messages.avatar, uid: 'avatar' }, { name: messages.avatar, uid: 'avatar' },
{ name: messages.email, uid: 'email', sortable: true }, { name: messages.email, uid: 'email', sortable: true },
@@ -71,7 +72,7 @@ export default function MembersTable({ members, onChangeRole, onDeleteMember, me
return ( return (
<Dropdown> <Dropdown>
<DropdownTrigger> <DropdownTrigger>
<Button size="sm" variant="light" endContent={<ChevronDown size={16} />}> <Button size="sm" isDisabled={isDisabled} variant="light" endContent={<ChevronDown size={16} />}>
<span className="w-12">{messages[memberRoles[cellValue].uid]}</span> <span className="w-12">{messages[memberRoles[cellValue].uid]}</span>
</Button> </Button>
</DropdownTrigger> </DropdownTrigger>
@@ -86,7 +87,13 @@ export default function MembersTable({ members, onChangeRole, onDeleteMember, me
); );
case 'delete': case 'delete':
return ( return (
<Button size="sm" color="danger" variant="light" onClick={() => onDeleteMember(member.User)}> <Button
size="sm"
isDisabled={isDisabled}
color="danger"
variant="light"
onClick={() => onDeleteMember(member.User)}
>
{messages.deleteMember} {messages.deleteMember}
</Button> </Button>
); );

View File

@@ -69,13 +69,20 @@ export default function SettingsPage({ projectId, messages, locale }: Props) {
<div className="container mx-auto max-w-3xl pt-16 px-6 flex-grow"> <div className="container mx-auto max-w-3xl pt-16 px-6 flex-grow">
<div className="w-full p-3 flex items-center justify-between"> <div className="w-full p-3 flex items-center justify-between">
<h3 className="font-bold">{messages.memberManagement}</h3> <h3 className="font-bold">{messages.memberManagement}</h3>
<Button startContent={<Plus size={16} />} size="sm" color="primary" onClick={() => setIsDialogOpen(true)}> <Button
startContent={<Plus size={16} />}
size="sm"
color="primary"
isDisabled={!context.isProjectManager(Number(projectId))}
onClick={() => setIsDialogOpen(true)}
>
{messages.addMember} {messages.addMember}
</Button> </Button>
</div> </div>
<MembersTable <MembersTable
members={members} members={members}
isDisabled={!context.isProjectManager(Number(projectId))}
onChangeRole={handleChangeRole} onChangeRole={handleChangeRole}
onDeleteMember={handleDeleteMember} onDeleteMember={handleDeleteMember}
messages={messages} messages={messages}

View File

@@ -26,12 +26,13 @@ export type TokenContextType = {
access_token: string; access_token: string;
user: UserType; user: UserType;
}; };
isSignedIn: () => Boolean; isSignedIn: () => boolean;
isAdmin: () => Boolean; isAdmin: () => boolean;
isProjectEditable: (projectId: number) => Boolean; isProjectManager: (projectId: number) => boolean;
setToken: (token: TokenType) => {}; isProjectDeveloper: (projectId: number) => boolean;
storeTokenToLocalStorage: (token: TokenType) => {}; setToken: (token: TokenType) => void;
removeTokenFromLocalStorage: () => {}; storeTokenToLocalStorage: (token: TokenType) => void;
removeTokenFromLocalStorage: () => void;
}; };
export type ProjectRoleType = { export type ProjectRoleType = {

View File

@@ -6,7 +6,8 @@ import { useRouter, usePathname } from '@/src/navigation';
import { import {
isSignedIn as tokenIsSinedIn, isSignedIn as tokenIsSinedIn,
isAdmin as tokenIsAdmin, isAdmin as tokenIsAdmin,
isProjectEditable as tokenIsProjectEditable, isProjectManager as tokenIsProjectManager,
isProjectDeveloper as tokenIsProjectDeveloper,
checkSignInPage as tokenCheckSignInPage, checkSignInPage as tokenCheckSignInPage,
fetchMyRoles, fetchMyRoles,
} from './token'; } from './token';
@@ -28,6 +29,12 @@ const defaultContext = {
}, },
isSignedIn: () => false, isSignedIn: () => false,
isAdmin: () => false, isAdmin: () => false,
isProjectManager: (projectId: number) => {
return false;
},
isProjectDeveloper: (projectId: number) => {
return false;
},
setToken: (token: TokenType) => {}, setToken: (token: TokenType) => {},
storeTokenToLocalStorage, storeTokenToLocalStorage,
removeTokenFromLocalStorage, removeTokenFromLocalStorage,
@@ -55,8 +62,12 @@ const TokenProvider = ({ toastMessages, locale, children }: TokenProps) => {
return tokenIsAdmin(token); return tokenIsAdmin(token);
}; };
const isProjectEditable = (projectId: number) => { const isProjectManager = (projectId: number) => {
return tokenIsProjectEditable(projectRoles, projectId); return tokenIsProjectManager(projectRoles, projectId);
};
const isProjectDeveloper = (projectId: number) => {
return tokenIsProjectDeveloper(projectRoles, projectId);
}; };
const tokenContext = { const tokenContext = {
@@ -64,7 +75,8 @@ const TokenProvider = ({ toastMessages, locale, children }: TokenProps) => {
projectRoles, projectRoles,
isSignedIn, isSignedIn,
isAdmin, isAdmin,
isProjectEditable, isProjectManager,
isProjectDeveloper,
setToken, setToken,
storeTokenToLocalStorage, storeTokenToLocalStorage,
removeTokenFromLocalStorage, removeTokenFromLocalStorage,

View File

@@ -61,7 +61,28 @@ async function fetchMyRoles(jwt: string) {
} }
} }
function isProjectEditable(projectRoles: ProjectRoleType[], projectId: number) { function isProjectManager(projectRoles: ProjectRoleType[], projectId: number) {
const found = projectRoles.find((role) => {
return role.projectId === projectId;
});
if (!found) {
return false;
}
if (found.isOwner === true) {
return true;
}
const managerRoleIndex = memberRoles.findIndex((entry) => entry.uid === 'manager');
if (found.role === managerRoleIndex) {
return true;
}
return false;
}
function isProjectDeveloper(projectRoles: ProjectRoleType[], projectId: number) {
const found = projectRoles.find((role) => { const found = projectRoles.find((role) => {
return role.projectId === projectId; return role.projectId === projectId;
}); });
@@ -113,4 +134,4 @@ function checkSignInPage(token: TokenType, pathname: string) {
return ret; return ret;
} }
export { isSignedIn, isAdmin, isProjectEditable, isPrivatePath, checkSignInPage, fetchMyRoles }; export { isSignedIn, isAdmin, isProjectManager, isProjectDeveloper, isPrivatePath, checkSignInPage, fetchMyRoles };