From 166b4b18dba43dcc5cc85c4b29f472362b2b9a57 Mon Sep 17 00:00:00 2001
From: amel <amel@amel.local>
Date: Thu, 26 Dec 2024 17:40:00 +0800
Subject: [PATCH] fix: project

Deskripsi:
- menampilkan semua anggota kecuali supadmin pada tambah kegiatan dan tambah anggota di kegiatan

NO Issues
---
 src/app/api/project/[id]/member/route.ts      | 18 +++++++-------
 .../project/ui/add_member_detail_project.tsx  |  5 ++--
 .../project/ui/create_users_project.tsx       |  6 ++---
 src/module/project/ui/menu_drawer_project.tsx | 24 ++++++++++---------
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/app/api/project/[id]/member/route.ts b/src/app/api/project/[id]/member/route.ts
index ca9630c..0af5250 100644
--- a/src/app/api/project/[id]/member/route.ts
+++ b/src/app/api/project/[id]/member/route.ts
@@ -133,13 +133,13 @@ export async function GET(request: Request, context: { params: { id: string } })
         const member = await prisma.user.findMany({
             where: {
                 idGroup: String(groupId),
-                id: {
-                    not: String(userId)
-                },
-                OR: [
-                    { idUserRole: 'coadmin', },
-                    { idUserRole: 'user', }
-                ],
+                // id: {
+                //     not: String(userId)
+                // },
+                // OR: [
+                //     { idUserRole: 'coadmin', },
+                //     { idUserRole: 'user', }
+                // ],
                 isActive: true,
                 name: {
                     contains: (name == undefined || name == "null") ? "" : name,
@@ -149,6 +149,7 @@ export async function GET(request: Request, context: { params: { id: string } })
             },
             select: {
                 id: true,
+                idUserRole: true,
                 name: true,
                 email: true,
                 img: true,
@@ -172,7 +173,8 @@ export async function GET(request: Request, context: { params: { id: string } })
             idUser: v.id,
             name: v.name,
             email: v.email,
-            img: v.img
+            img: v.img,
+            idUserRole: v.idUserRole
         }))
 
         const dataFix = {
diff --git a/src/module/project/ui/add_member_detail_project.tsx b/src/module/project/ui/add_member_detail_project.tsx
index 927f94e..0f50504 100644
--- a/src/module/project/ui/add_member_detail_project.tsx
+++ b/src/module/project/ui/add_member_detail_project.tsx
@@ -40,7 +40,8 @@ export default function AddMemberDetailProject() {
       setLoading(true)
       const response = await funGetAllMemberById('?search=' + searchQuery, param.id)
       if (response.success) {
-        setData(response.data.member)
+        // setData(response.data.member)
+        setData(response.data.member.filter((i: any) => i.idUserRole != 'supadmin'))
       } else {
         toast.error(response.message)
       }
@@ -243,7 +244,7 @@ export default function AddMemberDetailProject() {
               <Text c="dimmed" ta={"center"} fs={"italic"}>Tidak ada anggota</Text>
             </Stack>
             :
-            <Box mt={15} mb={100}>
+            <Box mt={100} mb={100}>
               {isData.map((v, i) => {
                 const isSelected = selectedFiles.some((i: any) => i?.idUser == v.idUser);
                 const found = isDataMember.some((i: any) => i.idUser == v.idUser)
diff --git a/src/module/project/ui/create_users_project.tsx b/src/module/project/ui/create_users_project.tsx
index ee93619..ced2c48 100644
--- a/src/module/project/ui/create_users_project.tsx
+++ b/src/module/project/ui/create_users_project.tsx
@@ -1,6 +1,5 @@
 "use client"
 import { LayoutNavbarNew, SkeletonList, TEMA } from '@/module/_global';
-import { funGetUserByCookies } from '@/module/auth';
 import { funGetAllmember, TypeUser } from '@/module/user';
 import { useHookstate } from '@hookstate/core';
 import { Carousel } from '@mantine/carousel';
@@ -36,9 +35,10 @@ export default function CreateUsersProject({ grup, onClose }: { grup?: string, o
     try {
       setLoading(true)
       const res = await funGetAllmember('?active=true&group=' + grup + '&search=' + search);
-      const user = await funGetUserByCookies();
+      // const user = await funGetUserByCookies();
       if (res.success) {
-        setDataMember(res.data.filter((i: any) => i.id != user.id && i.idUserRole != 'supadmin' && i.idUserRole != 'cosupadmin'))
+        // setDataMember(res.data.filter((i: any) => i.id != user.id && i.idUserRole != 'supadmin' && i.idUserRole != 'cosupadmin'))
+        setDataMember(res.data.filter((i: any) => i.idUserRole != 'supadmin'))
         // cek data member sebelumnya
         if (member.length > 0) {
           setSelectedFiles(JSON.parse(JSON.stringify(member.get())))
diff --git a/src/module/project/ui/menu_drawer_project.tsx b/src/module/project/ui/menu_drawer_project.tsx
index f91436e..4408b27 100644
--- a/src/module/project/ui/menu_drawer_project.tsx
+++ b/src/module/project/ui/menu_drawer_project.tsx
@@ -15,17 +15,19 @@ export default function MenuDrawerProject() {
   return (
     <Box>
       <Stack pt={10}>
-        <SimpleGrid
-          cols={{ base: 2, sm: 2, lg: 3 }}
-        >
-          <Flex onClick={() => window.location.href = "/project/create"} justify={'center'} align={'center'} direction={'column'} >
-            <Box>
-              <IoAddCircle size={30} color={tema.get().utama} />
-            </Box>
-            <Box>
-              <Text c={tema.get().utama}>Tambah Kegiatan</Text>
-            </Box>
-          </Flex>
+        <SimpleGrid cols={{ base: 2, sm: 2, lg: 3 }} >
+          {
+            (roleLogin.get() != "user" && roleLogin.get() != "coadmin") &&
+            <Flex onClick={() => window.location.href = "/project/create"} justify={'center'} align={'center'} direction={'column'} >
+              <Box>
+                <IoAddCircle size={30} color={tema.get().utama} />
+              </Box>
+              <Box>
+                <Text c={tema.get().utama}>Tambah Kegiatan</Text>
+              </Box>
+            </Flex>
+          }
+
           {
             roleLogin.get() == "supadmin" &&
             <Flex onClick={() => window.location.href = "/project?page=filter&group=" + group} justify={'center'} align={'center'} direction={'column'} >