Merge pull request #376 from bipproduction/amalia/15-jan-25

Amalia/15 jan 25

src/app/api/discussion-general/[id]/route.ts

@@ -50,7 +50,8 @@ export async function GET(request: Request, context: { params: { id: string } })
 
          dataFix = {
             id: data?.id,
-            idGroup:data?.idGroup,
+            isActive: data?.isActive,
+            idGroup: data?.idGroup,
             title: data?.title,
             desc: data?.desc,
             status: data?.status,
@@ -190,6 +191,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
          return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
       }
       const { id } = context.params
+      const { active } = (await request.json());
 
       const cek = await prisma.discussion.count({
          where: {
@@ -207,19 +209,24 @@ export async function DELETE(request: Request, context: { params: { id: string }
             id
          },
          data: {
-            isActive: false
+            isActive: active
          }
       });
 
 
       // create log user
-      const log = await createLogUser({ act: 'DELETE', desc: 'User menghapus data diskusi umum', table: 'disscussion', data: id })
+      if (active) {
-      return NextResponse.json({ success: true, message: "Berhasil menghapus diskusi umum", user: user.id }, { status: 200 });
+         const log = await createLogUser({ act: 'DELETE', desc: 'User mengaktifkan data diskusi umum', table: 'disscussion', data: id })
+         return NextResponse.json({ success: true, message: "Berhasil mengaktifkan diskusi umum", user: user.id }, { status: 200 });
+      } else {
+         const log = await createLogUser({ act: 'DELETE', desc: 'User mengarsipkan data diskusi umum', table: 'disscussion', data: id })
+         return NextResponse.json({ success: true, message: "Berhasil mengarsipkan diskusi umum", user: user.id }, { status: 200 });
+      }
 
 
    } catch (error) {
       console.error(error);
-      return NextResponse.json({ success: false, message: "Gagal menghapus diskusi umum, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });
+      return NextResponse.json({ success: false, message: "Gagal mengubah diskusi umum, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });
    }
 }
 

src/app/api/version-app/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 
 export async function GET(request: Request) {
    try {
-      return NextResponse.json({ success: true, version: "1.0.0", tahap: "beta" }, { status: 200 });
+      return NextResponse.json({ success: true, version: "1.1.0", tahap: "beta" }, { status: 200 });
    } catch (error) {
       console.error(error);
       return NextResponse.json({ success: false, version: "Gagal mendapatkan version, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });

src/module/_global/layout/layout_modal_new.tsx

@@ -1,6 +1,6 @@
 import { Button, Flex, Modal, SimpleGrid, Text } from '@mantine/core';
 import { useMediaQuery } from '@mantine/hooks';
-import { BsQuestionCircleFill } from 'react-icons/bs';
+import { IoIosWarning } from 'react-icons/io';
 
 export default function LayoutModalNew({ opened, onClose, description, onYes, loading, onCheck }: { opened: boolean, onClose: () => void, loading?: boolean, description: string, onYes: (val: boolean) => void, onCheck: (val: boolean) => void }) {
    const isMobile = useMediaQuery('(max-width: 768px)');
@@ -15,24 +15,20 @@ export default function LayoutModalNew({ opened, onClose, description, onYes, lo
          }
       }} opened={opened} onClose={onClose} withCloseButton={false} centered closeOnClickOutside={false}>
          <Flex justify={"center"} align={"center"} direction={"column"}>
-            <BsQuestionCircleFill size={100} color="red" />
+            <IoIosWarning size={130} color="red" />
-            <Text mt={30} ta={"center"} fw={"bold"} fz={18}>{description}</Text>
+            <Text mt={20} ta={"center"} fw={"bold"} fz={18}>{description}</Text>
          </Flex>
          <Button mt={30} fullWidth size="lg" radius={'xl'} bg={'blue'} onClick={() => onCheck(true)}>Lihat Data</Button>
          <SimpleGrid mt={10} cols={{ base: 1, sm: 2, lg: 2 }}>
             {isMobile ?
                <>
-                  <Button loading={loading} fullWidth size="lg" radius={'xl'} bg={'green'} onClick={() => {
+                  <Button loading={loading} fullWidth size="lg" radius={'xl'} bg={'#dcdcdc'} c={'#858e96'} onClick={() => { onYes(true) }}>YA</Button>
-                     onYes(true)
-                  }}>YA</Button>
                   <Button fullWidth size="lg" radius={'xl'} bg={'#F1C1CF'} c={'#D30B30'} onClick={() => onYes(false)}>TIDAK</Button>
                </>
                :
                <>
+                  <Button loading={loading} fullWidth size="lg" radius={'xl'} bg={'#dcdcdc'} c={'#858e96'} onClick={() => { onYes(true) }}>YA</Button>
                   <Button fullWidth size="lg" radius={'xl'} bg={'#F1C1CF'} c={'#D30B30'} onClick={() => onYes(false)}>TIDAK</Button>
-                  <Button loading={loading} fullWidth size="lg" radius={'xl'} bg={'green'} onClick={() => {
-                     onYes(true)
-                  }}>YA</Button>
                </>
 
             }

src/module/discussion/ui/detail_discussion.tsx

@@ -63,10 +63,14 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv
       }
 
       if (dataRealTime && dataRealTime.some((i: any) => i.category == 'discussion-delete' && i.id == id && i.user != isUser)) {
-         toast.error("Data telah diarsipkan, anda akan beralih ke halaman list diskusi")
+         if ((roleLogin.get() == "user" || roleLogin.get() == "coadmin") && !adminLogin.get()) {
-         setTimeout(() => {
+            toast.error("Data telah diarsipkan, anda akan beralih ke halaman list diskusi")
-            router.push(`/division/${param.id}/discussion`)
+            setTimeout(() => {
-         }, 1000)
+               router.push(`/division/${param.id}/discussion`)
+            }, 1000)
+         } else {
+            getData(true)
+         }
       }
    }, [dataRealTime])
 
@@ -107,7 +111,6 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv
 
    return (
       <Box>
-         {/* <NavbarDetailDiscussion id={id} status={Number(isData?.status)} idDivision={idDivision} /> */}
          <LayoutNavbarNew back={`/division/${param.id}/discussion/`} title="Diskusi"
             menu={
                ((roleLogin.get() != 'user' && roleLogin.get() != 'coadmin') || adminLogin.get() || isCreator) ?
@@ -159,7 +162,11 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv
                            <Grid.Col span={8}>
                               <Box pl={isMobile2 ? 40 : 30}>
                                  <Text lineClamp={1} fz={isMobile ? 15 : 16}>{isData?.username}</Text>
-                                 <Badge color={isData?.status === 1 ? "green" : "red"} size="sm">{isData?.status === 1 ? "BUKA" : "TUTUP"}</Badge>
+                                 {!isData?.isActive ?
+                                    <Badge color="gray" size="sm">ARSIP</Badge>
+                                    :
+                                    <Badge color={isData?.status === 1 ? "green" : "red"} size="sm">{isData?.status === 1 ? "BUKA" : "TUTUP"}</Badge>
+                                 }
                               </Box>
                            </Grid.Col>
                            <Grid.Col span={3}>
@@ -196,7 +203,11 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv
                            <Grid.Col span={8}>
                               <Box pl={isMobile2 ? 40 : 30}>
                                  <Text lineClamp={1} fz={isMobile ? 15 : 16}>{isData?.username}</Text>
-                                 <Badge color={isData?.status === 1 ? "green" : "red"} size="sm">{isData?.status === 1 ? "BUKA" : "TUTUP"}</Badge>
+                                 {!isData?.isActive ?
+                                    <Badge color="gray" size="sm">ARSIP</Badge>
+                                    :
+                                    <Badge color={isData?.status === 1 ? "green" : "red"} size="sm">{isData?.status === 1 ? "BUKA" : "TUTUP"}</Badge>
+                                 }
                               </Box>
                            </Grid.Col>
                            <Grid.Col span={3}>

src/module/discussion/ui/drawer_detail_discussion.tsx

@@ -59,26 +59,31 @@ export default function DrawerDetailDiscussion({ onSuccess, id, status, idDivisi
             setLoadingDelete(true)
             const response = await funDeleteDiscussion(id, { active: !active })
             if (response.success) {
-               setDataRealtime([
-                  {
-                     category: "discussion-delete",
-                     id: id,
-                     user: response.user
-                  },
-                  {
-                     category: "division/" + param.id + "/discussion",
-                  }
-               ])
                toast.success(response.message)
                onSuccess(false)
                if (active) {
+                  setDataRealtime([
+                     {
+                        category: "discussion-delete",
+                        id: id,
+                        user: response.user
+                     },
+                     {
+                        category: "division/" + param.id + "/discussion",
+                     }
+                  ])
                   router.push(`/division/${param.id}/discussion`)
                } else {
                   refresh.set(!refresh.get())
-                  setDataRealtime([{
+                  setDataRealtime([
-                     category: "discussion-detail",
+                     {
-                     id: id,
+                        category: "discussion-detail",
-                  }])
+                        id: id,
+                     },
+                     {
+                        category: "division/" + param.id + "/discussion",
+                     }
+                  ])
                }
             } else {
                toast.error(response.message)
@@ -86,11 +91,7 @@ export default function DrawerDetailDiscussion({ onSuccess, id, status, idDivisi
          }
       } catch (error) {
          console.error(error);
-         if (!active) {
+         toast.error("Gagal mengupdate diskusi, coba lagi nanti");
-            toast.error("Gagal mengarsipkan diskusi, coba lagi nanti");
-         } else {
-            toast.error("Gagal mengaktifkan diskusi, coba lagi nanti");
-         }
       } finally {
          setLoadingDelete(false)
          setValModal(false)

src/module/discussion_general/lib/api_discussion_general.ts

@@ -58,9 +58,13 @@ export const funEditDiscussionGeneral = async (path: string, data: { title: stri
 }
 
 
-export const funDeleteDiscussionGeneral = async (path: string) => {
+export const funDeleteDiscussionGeneral = async (path: string, data: { active: boolean }) => {
    const response = await fetch(`/api/discussion-general/${path}`, {
       method: "DELETE",
+      headers: {
+         "Content-Type": "application/json",
+      },
+      body: JSON.stringify(data),
    });
    return await response.json().catch(() => null);
 }

src/module/discussion_general/lib/type_discussion_general.ts

@@ -6,6 +6,7 @@ export interface IFormMemberDisscussionGeneral {
 
  export interface IDetailDiscussionGeneral{
   id: string
+  isActive: boolean
   title: string
   desc: string
   status: number

src/module/discussion_general/ui/add_member.tsx

@@ -184,7 +184,7 @@ export default function AddMemberDiscussionGeneral() {
                       <Indicator inline size={25} offset={7} position="bottom-end" color="red" withBorder label={<IoClose />}>
                         <Avatar style={{
                           border: `2px solid ${tema.get().utama}`
-                        }} src={`https://wibu-storage.wibudev.com/api/files/${v.img}-size-100`} alt="it's me" size="lg" />
+                        }} src={`https://wibu-storage.wibudev.com/api/files/${v.img}`} alt="it's me" size="lg" />
                       </Indicator>
                     </Center>
                     <Text ta={"center"} lineClamp={1}>{v.name}</Text>
@@ -233,7 +233,7 @@ export default function AddMemberDiscussionGeneral() {
                           xl: 1,
                         }}
                       >
-                        <Avatar src={`https://wibu-storage.wibudev.com/api/files/${v.img}-size-100`} alt="it's me" size="lg" />
+                        <Avatar src={`https://wibu-storage.wibudev.com/api/files/${v.img}`} alt="it's me" size="lg" />
                       </Grid.Col>
                       <Grid.Col
                         span={{

src/module/discussion_general/ui/detail_discussion_general.tsx

@@ -81,10 +81,15 @@ export default function DetailDiscussionGeneral() {
       }
 
       if (dataRealTime && dataRealTime.some((i: any) => i.category == 'discussion-general-delete' && i.id == param.id && i.user != isUser)) {
-         toast.error("Data telah diarsipkan, anda akan beralih ke halaman list diskusi umum")
+         if (roleLogin.get() == "user" || roleLogin.get() == "coadmin") {
-         setTimeout(() => {
+            toast.error("Data telah diarsipkan, anda akan beralih ke halaman list diskusi umum")
-            router.push(`/discussion`)
+            setTimeout(() => {
-         }, 1000)
+               router.push(`/discussion`)
+            }, 1000)
+         } else {
+            getData(false)
+         }
+
       }
    }, [dataRealTime])
 
@@ -139,7 +144,7 @@ export default function DetailDiscussionGeneral() {
             }
          />
          <LayoutDrawer opened={openDrawer} title={'Menu'} onClose={() => setOpenDrawer(false)}>
-            <DrawerDetailDiscussionGeneral onSuccess={(val) => setOpenDrawer(false)} id={param.id} status={Number(isData?.status)} />
+            <DrawerDetailDiscussionGeneral onSuccess={(val) => setOpenDrawer(false)} id={param.id} status={Number(isData?.status)} active={isData?.isActive == false ? false : true} />
          </LayoutDrawer>
 
 
@@ -188,7 +193,12 @@ export default function DetailDiscussionGeneral() {
                            <Grid.Col span={8}>
                               <Box pl={isMobile2 ? 40 : 30}>
                                  <Text lineClamp={1} fz={isMobile ? 15 : 16}>{isData?.title}</Text>
-                                 <Badge color={isData?.status === 1 ? "green" : "red"} size="sm">{isData?.status === 1 ? "BUKA" : "TUTUP"}</Badge>
+                                 {!isData?.isActive ?
+                                    <Badge color="gray" size="sm">ARSIP</Badge>
+                                    :
+                                    <Badge color={isData?.status === 1 ? "green" : "red"} size="sm">{isData?.status === 1 ? "BUKA" : "TUTUP"}</Badge>
+                                 }
+
                               </Box>
                            </Grid.Col>
                            <Grid.Col span={3}>
@@ -234,7 +244,12 @@ export default function DetailDiscussionGeneral() {
                            <Grid.Col span={8}>
                               <Box pl={isMobile2 ? 40 : 30}>
                                  <Text lineClamp={1} fz={isMobile ? 15 : 16}>{isData?.title}</Text>
-                                 <Badge color={isData?.status === 1 ? "green" : "red"} size="sm">{isData?.status === 1 ? "BUKA" : "TUTUP"}</Badge>
+                                 {
+                                    !isData?.isActive ?
+                                       <Badge color="gray" size="sm">ARSIP</Badge>
+                                       :
+                                       <Badge color={isData?.status === 1 ? "green" : "red"} size="sm">{isData?.status === 1 ? "BUKA" : "TUTUP"}</Badge>
+                                 }
                               </Box>
                            </Grid.Col>
                            <Grid.Col span={3}>
@@ -303,7 +318,7 @@ export default function DetailDiscussionGeneral() {
                         <Box key={i} p={10} >
                            <Grid align="center">
                               <Grid.Col span={1}>
-                                 <Avatar alt="it's me" size="md" src={`https://wibu-storage.wibudev.com/api/files/${v.img}-size-100`} />
+                                 <Avatar alt="it's me" size="md" src={`https://wibu-storage.wibudev.com/api/files/${v.img}`} />
                               </Grid.Col>
                               <Grid.Col span={8}>
                                  <Box>
@@ -362,7 +377,7 @@ export default function DetailDiscussionGeneral() {
                               }}
                               size="md"
                               placeholder="Kirim Komentar"
-                              disabled={(isData?.status === 2 || (!memberDiscussion && (roleLogin.get() == "user" || roleLogin.get() == "coadmin")))}
+                              disabled={(isData?.status === 2 || !isData?.isActive || (!memberDiscussion && (roleLogin.get() == "user" || roleLogin.get() == "coadmin")))}
                               onChange={(e) => setIsComent(e.target.value)}
                               value={isComent}
                               maxLength={300}
@@ -373,7 +388,7 @@ export default function DetailDiscussionGeneral() {
                            <Center>
                               <ActionIcon
                                  onClick={sendComent}
-                                 variant="subtle" aria-label="submit" disabled={(isData?.status === 2 || (!memberDiscussion && (roleLogin.get() == "user" || roleLogin.get() == "coadmin")))}>
+                                 variant="subtle" aria-label="submit" disabled={(isData?.status === 2 || !isData?.isActive || (!memberDiscussion && (roleLogin.get() == "user" || roleLogin.get() == "coadmin")))}>
                                  <VscSend size={30} />
                               </ActionIcon>
                            </Center>

src/module/discussion_general/ui/drawer_detail_discussion_general.tsx

@@ -4,15 +4,15 @@ import { useHookstate } from "@hookstate/core";
 import { Box, Flex, SimpleGrid, Stack, Text } from "@mantine/core";
 import { useParams, useRouter } from "next/navigation";
 import { useState } from "react";
-import { BsTrash3 } from "react-icons/bs";
+import toast from "react-hot-toast";
+import { BiArchive } from "react-icons/bi";
 import { FaCheck, FaPencil, FaUsers } from "react-icons/fa6";
 import { MdClose } from "react-icons/md";
 import { useWibuRealtime } from "wibu-realtime";
 import { funDeleteDiscussionGeneral, funEditStatusDiscussionGeneral } from "../lib/api_discussion_general";
 import { globalRefreshDiscussionGeneral } from "../lib/val_discussion_general";
-import toast from "react-hot-toast";
 
-export default function DrawerDetailDiscussionGeneral({ onSuccess, id, status }: { onSuccess: (val: boolean) => void, id: string, status: number }) {
+export default function DrawerDetailDiscussionGeneral({ onSuccess, id, status, active }: { onSuccess: (val: boolean) => void, id: string, status: number, active: boolean }) {
    const [isValModal, setValModal] = useState(false)
    const [isValModalStatus, setValModalStatus] = useState(false)
    const router = useRouter()
@@ -58,28 +58,42 @@ export default function DrawerDetailDiscussionGeneral({ onSuccess, id, status }:
       try {
          if (val) {
             setLoadingDelete(true)
-            const response = await funDeleteDiscussionGeneral(id)
+            const response = await funDeleteDiscussionGeneral(id, { active: !active })
             if (response.success) {
-               setDataRealtime([
-                  {
-                     category: "discussion-general-delete",
-                     id: id,
-                     user: response.user
-                  },
-                  {
-                     category: "discussion",
-                  }
-               ])
                toast.success(response.message)
                onSuccess(false)
-               router.push(`/discussion`)
+               if (active) {
+                  setDataRealtime([
+                     {
+                        category: "discussion-general-delete",
+                        id: id,
+                        user: response.user
+                     },
+                     {
+                        category: "discussion-general",
+                     }
+                  ])
+                  router.push(`/discussion`)
+               } else {
+                  refresh.set(!refresh.get())
+                  setDataRealtime([
+                     {
+                        category: "discussion-general-detail",
+                        id: id,
+                     },
+                     {
+                        category: "discussion-general",
+                     }
+                  ])
+               }
+
             } else {
                toast.error(response.message)
             }
          }
       } catch (error) {
          console.error(error);
-         toast.error("Gagal mengarsipkan diskusi umum, coba lagi nanti");
+         toast.error("Gagal mengupdate diskusi umum, coba lagi nanti");
       } finally {
          setLoadingDelete(false)
          setValModal(false)
@@ -108,44 +122,50 @@ export default function DrawerDetailDiscussionGeneral({ onSuccess, id, status }:
                {
                   (roleLogin.get() != "user" && roleLogin.get() != "coadmin") ? (
                      <>
-                        <Flex onClick={() => window.location.href = `/discussion/${param.id}/edit/`} justify={'center'} align={'center'} direction={'column'} >
+                        {
-                           <Box>
+                           active && (
-                              <FaPencil size={30} color={tema.get().utama} />
-                           </Box>
-                           <Box>
-                              <Text c={tema.get().utama}>Edit</Text>
-                           </Box>
-                        </Flex>
-
-                        <Flex justify={'center'} align={'center'} direction={'column'} onClick={() => setValModalStatus(true)}  >
-                           {status === 1 ? (
                               <>
-                                 <Flex justify={'center'} align={'center'} direction={'column'}>
+                                 <Flex onClick={() => window.location.href = `/discussion/${param.id}/edit/`} justify={'center'} align={'center'} direction={'column'} >
                                     <Box>
-                                       <MdClose size={30} color={tema.get().utama} />
+                                       <FaPencil size={30} color={tema.get().utama} />
                                     </Box>
-                                    <Text style={{ color: tema.get().utama }}>Tutup Diskusi</Text>
+                                    <Box>
+                                       <Text c={tema.get().utama}>Edit</Text>
+                                    </Box>
+                                 </Flex>
+
+                                 <Flex justify={'center'} align={'center'} direction={'column'} onClick={() => setValModalStatus(true)}  >
+                                    {status === 1 ? (
+                                       <>
+                                          <Flex justify={'center'} align={'center'} direction={'column'}>
+                                             <Box>
+                                                <MdClose size={30} color={tema.get().utama} />
+                                             </Box>
+                                             <Text style={{ color: tema.get().utama }}>Tutup Diskusi</Text>
+                                          </Flex>
+                                       </>
+                                    ) : (
+                                       <>
+                                          <Flex justify={'center'} align={'center'} direction={'column'}>
+
+                                             <Box>
+                                                <FaCheck size={30} color={tema.get().utama} />
+                                             </Box>
+                                             <Text style={{ color: tema.get().utama }}>Buka Diskusi</Text>
+                                          </Flex>
+                                       </>
+                                    )}
                                  </Flex>
                               </>
-                           ) : (
+                           )
-                              <>
+                        }
-                                 <Flex justify={'center'} align={'center'} direction={'column'}>
-
-                                    <Box>
-                                       <FaCheck size={30} color={tema.get().utama} />
-                                    </Box>
-                                    <Text style={{ color: tema.get().utama }}>Buka Diskusi</Text>
-                                 </Flex>
-                              </>
-                           )}
-                        </Flex>
 
                         <Flex onClick={() => setValModal(true)} justify={'center'} align={'center'} direction={'column'} >
                            <Box>
-                              <BsTrash3 size={30} color={tema.get().utama} />
+                              <BiArchive size={30} color={tema.get().utama} />
                            </Box>
                            <Box>
-                              <Text c={tema.get().utama}>Arsipkan</Text>
+                              <Text c={tema.get().utama}>{active ? "Arsipkan" : "Aktifkan Diskusi"}</Text>
                            </Box>
                         </Flex>
                      </>
@@ -157,7 +177,7 @@ export default function DrawerDetailDiscussionGeneral({ onSuccess, id, status }:
          </Stack>
 
          <LayoutModal loading={loadingDelete} opened={isValModal} onClose={() => setValModal(false)}
-            description="Apakah Anda yakin ingin mengarsipkan diskusi ini?"
+            description={`Apakah Anda yakin ingin ${active ? "mengarsipkan" : "mengaktifkan"}  diskusi ini?`}
             onYes={(val) => {
                fetchDeleteDiscussion(val)
             }} />

src/module/discussion_general/ui/member_discussion_general.tsx

@@ -122,7 +122,7 @@ export default function MemberDiscussionGeneral() {
                                        onClick={() => { onClickMember(v.idUser, v.name) }}
                                     >
                                        <Grid.Col span={1}>
-                                          <Avatar src={`https://wibu-storage.wibudev.com/api/files/${v.img}-size-100`} alt="it's me" size={'lg'} />
+                                          <Avatar src={`https://wibu-storage.wibudev.com/api/files/${v.img}`} alt="it's me" size={'lg'} />
                                        </Grid.Col>
                                        <Grid.Col span={11}>
                                           <Text c={tema.get().utama} fw={"bold"} truncate="end" pl={isMobile2 ? 40 : 30} fz={isMobile ? 14 : 16}>