mirror of
https://github.com/makeplane/plane
synced 2024-06-14 14:31:34 +00:00
feat: search project & workspace members (#2590)
* feat: search project & workspace members * chore: formatting
This commit is contained in:
parent
4f09a89f5e
commit
1a46c6c399
@ -11,6 +11,8 @@ import useUser from "hooks/use-user";
|
|||||||
import { ProjectMemberListItem, SendProjectInvitationModal } from "components/project";
|
import { ProjectMemberListItem, SendProjectInvitationModal } from "components/project";
|
||||||
// ui
|
// ui
|
||||||
import { Button, Loader } from "@plane/ui";
|
import { Button, Loader } from "@plane/ui";
|
||||||
|
// icons
|
||||||
|
import { Search } from "lucide-react";
|
||||||
|
|
||||||
// services
|
// services
|
||||||
const projectInvitationService = new ProjectInvitationService();
|
const projectInvitationService = new ProjectInvitationService();
|
||||||
@ -25,6 +27,7 @@ export const ProjectMemberList: React.FC = observer(() => {
|
|||||||
|
|
||||||
// states
|
// states
|
||||||
const [inviteModal, setInviteModal] = useState(false);
|
const [inviteModal, setInviteModal] = useState(false);
|
||||||
|
const [searchQuery, setSearchQuery] = useState<string>("");
|
||||||
|
|
||||||
const { user } = useUser();
|
const { user } = useUser();
|
||||||
|
|
||||||
@ -72,6 +75,12 @@ export const ProjectMemberList: React.FC = observer(() => {
|
|||||||
})) || []),
|
})) || []),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const searchedMembers = members?.filter((member) => {
|
||||||
|
const fullName = `${member.first_name} ${member.last_name}`.toLowerCase();
|
||||||
|
const displayName = member.display_name.toLowerCase();
|
||||||
|
return displayName.includes(searchQuery.toLowerCase()) || fullName.includes(searchQuery.toLowerCase());
|
||||||
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<SendProjectInvitationModal
|
<SendProjectInvitationModal
|
||||||
@ -87,6 +96,16 @@ export const ProjectMemberList: React.FC = observer(() => {
|
|||||||
|
|
||||||
<div className="flex items-center justify-between gap-4 py-3.5 border-b border-custom-border-200">
|
<div className="flex items-center justify-between gap-4 py-3.5 border-b border-custom-border-200">
|
||||||
<h4 className="text-xl font-medium">Members</h4>
|
<h4 className="text-xl font-medium">Members</h4>
|
||||||
|
<div className="flex gap-1 items-center justify-start ml-auto text-custom-text-400 rounded-md px-2.5 py-1.5 border border-custom-border-200 bg-custom-background-100">
|
||||||
|
<Search className="h-3.5 w-3.5" />
|
||||||
|
<input
|
||||||
|
className="max-w-[234px] w-full border-none bg-transparent text-sm focus:outline-none"
|
||||||
|
placeholder="Search"
|
||||||
|
value={searchQuery}
|
||||||
|
autoFocus={true}
|
||||||
|
onChange={(e) => setSearchQuery(e.target.value)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<Button variant="primary" onClick={() => setInviteModal(true)}>
|
<Button variant="primary" onClick={() => setInviteModal(true)}>
|
||||||
Add Member
|
Add Member
|
||||||
</Button>
|
</Button>
|
||||||
@ -101,8 +120,11 @@ export const ProjectMemberList: React.FC = observer(() => {
|
|||||||
) : (
|
) : (
|
||||||
<div className="divide-y divide-custom-border-200">
|
<div className="divide-y divide-custom-border-200">
|
||||||
{members.length > 0
|
{members.length > 0
|
||||||
? members.map((member) => <ProjectMemberListItem key={member.id} member={member} />)
|
? searchedMembers.map((member) => <ProjectMemberListItem key={member.id} member={member} />)
|
||||||
: null}
|
: null}
|
||||||
|
{searchedMembers.length === 0 && (
|
||||||
|
<h4 className="text-md text-custom-text-400 text-center mt-20">No matching member</h4>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
|
@ -11,8 +11,7 @@ import { WorkspaceMembersListItem } from "components/workspace";
|
|||||||
import { Loader } from "@plane/ui";
|
import { Loader } from "@plane/ui";
|
||||||
|
|
||||||
const workspaceService = new WorkspaceService();
|
const workspaceService = new WorkspaceService();
|
||||||
|
export const WorkspaceMembersList: React.FC<{ searchQuery: string }> = observer(({ searchQuery }) => {
|
||||||
export const WorkspaceMembersList: React.FC = observer(() => {
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { workspaceSlug } = router.query;
|
const { workspaceSlug } = router.query;
|
||||||
// store
|
// store
|
||||||
@ -53,6 +52,11 @@ export const WorkspaceMembersList: React.FC = observer(() => {
|
|||||||
accountCreated: true,
|
accountCreated: true,
|
||||||
})) || []),
|
})) || []),
|
||||||
];
|
];
|
||||||
|
const searchedMembers = members?.filter((member) => {
|
||||||
|
const fullName = `${member.first_name} ${member.last_name}`.toLowerCase();
|
||||||
|
const displayName = member.display_name.toLowerCase();
|
||||||
|
return displayName.includes(searchQuery.toLowerCase()) || fullName.includes(searchQuery.toLowerCase());
|
||||||
|
});
|
||||||
|
|
||||||
if (!workspaceMembers || !workspaceInvitations || !user)
|
if (!workspaceMembers || !workspaceInvitations || !user)
|
||||||
return (
|
return (
|
||||||
@ -67,8 +71,11 @@ export const WorkspaceMembersList: React.FC = observer(() => {
|
|||||||
return (
|
return (
|
||||||
<div className="divide-y-[0.5px] divide-custom-border-200">
|
<div className="divide-y-[0.5px] divide-custom-border-200">
|
||||||
{members.length > 0
|
{members.length > 0
|
||||||
? members.map((member) => <WorkspaceMembersListItem key={member.id} member={member} />)
|
? searchedMembers.map((member) => <WorkspaceMembersListItem key={member.id} member={member} />)
|
||||||
: null}
|
: null}
|
||||||
|
{searchedMembers.length === 0 && (
|
||||||
|
<h4 className="text-md text-custom-text-400 text-center mt-20">No matching member</h4>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
@ -12,10 +12,12 @@ import { SendWorkspaceInvitationModal, WorkspaceMembersList } from "components/w
|
|||||||
import { Button } from "@plane/ui";
|
import { Button } from "@plane/ui";
|
||||||
// types
|
// types
|
||||||
import type { NextPage } from "next";
|
import type { NextPage } from "next";
|
||||||
|
// icons
|
||||||
|
import { Search } from "lucide-react";
|
||||||
|
|
||||||
const MembersSettings: NextPage = () => {
|
const MembersSettings: NextPage = () => {
|
||||||
const [inviteModal, setInviteModal] = useState(false);
|
const [inviteModal, setInviteModal] = useState(false);
|
||||||
|
const [searchQuery, setSearchQuery] = useState<string>("");
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { workspaceSlug } = router.query;
|
const { workspaceSlug } = router.query;
|
||||||
|
|
||||||
@ -35,11 +37,21 @@ const MembersSettings: NextPage = () => {
|
|||||||
<section className="pr-9 py-8 w-full overflow-y-auto">
|
<section className="pr-9 py-8 w-full overflow-y-auto">
|
||||||
<div className="flex items-center justify-between gap-4 py-3.5 border-b-[0.5px] border-custom-border-200">
|
<div className="flex items-center justify-between gap-4 py-3.5 border-b-[0.5px] border-custom-border-200">
|
||||||
<h4 className="text-xl font-medium">Members</h4>
|
<h4 className="text-xl font-medium">Members</h4>
|
||||||
|
<div className="flex gap-1 items-center justify-start ml-auto text-custom-text-400 rounded-md px-2.5 py-1.5 border border-custom-border-200 bg-custom-background-100">
|
||||||
|
<Search className="h-3.5 w-3.5" />
|
||||||
|
<input
|
||||||
|
className="max-w-[234px] w-full border-none bg-transparent text-sm focus:outline-none"
|
||||||
|
placeholder="Search"
|
||||||
|
value={searchQuery}
|
||||||
|
autoFocus={true}
|
||||||
|
onChange={(e) => setSearchQuery(e.target.value)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<Button variant="primary" size="sm" onClick={() => setInviteModal(true)}>
|
<Button variant="primary" size="sm" onClick={() => setInviteModal(true)}>
|
||||||
Add Member
|
Add Member
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<WorkspaceMembersList />
|
<WorkspaceMembersList searchQuery={searchQuery} />
|
||||||
</section>
|
</section>
|
||||||
</WorkspaceSettingLayout>
|
</WorkspaceSettingLayout>
|
||||||
</AppLayout>
|
</AppLayout>
|
||||||
|
Loading…
Reference in New Issue
Block a user