diff --git a/src/app/api/discussion-general/[id]/route.ts b/src/app/api/discussion-general/[id]/route.ts
index fc58302..7e27184 100644
--- a/src/app/api/discussion-general/[id]/route.ts
+++ b/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 })
- return NextResponse.json({ success: true, message: "Berhasil menghapus diskusi umum", user: user.id }, { status: 200 });
+ if (active) {
+ 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 });
}
}
diff --git a/src/app/api/version-app/route.ts b/src/app/api/version-app/route.ts
index 1741163..d349d09 100644
--- a/src/app/api/version-app/route.ts
+++ b/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 });
diff --git a/src/module/_global/layout/layout_modal_new.tsx b/src/module/_global/layout/layout_modal_new.tsx
index 3ade286..bf80f3c 100644
--- a/src/module/_global/layout/layout_modal_new.tsx
+++ b/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}>
-
- {description}
+
+ {description}
{isMobile ?
<>
-
+
>
:
<>
+
-
>
}
diff --git a/src/module/discussion/ui/detail_discussion.tsx b/src/module/discussion/ui/detail_discussion.tsx
index b1c71f5..1b5df7e 100644
--- a/src/module/discussion/ui/detail_discussion.tsx
+++ b/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")
- setTimeout(() => {
- router.push(`/division/${param.id}/discussion`)
- }, 1000)
+ if ((roleLogin.get() == "user" || roleLogin.get() == "coadmin") && !adminLogin.get()) {
+ toast.error("Data telah diarsipkan, anda akan beralih ke halaman list diskusi")
+ setTimeout(() => {
+ 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 (
- {/* */}
{isData?.username}
- {isData?.status === 1 ? "BUKA" : "TUTUP"}
+ {!isData?.isActive ?
+ ARSIP
+ :
+ {isData?.status === 1 ? "BUKA" : "TUTUP"}
+ }
@@ -196,7 +203,11 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv
{isData?.username}
- {isData?.status === 1 ? "BUKA" : "TUTUP"}
+ {!isData?.isActive ?
+ ARSIP
+ :
+ {isData?.status === 1 ? "BUKA" : "TUTUP"}
+ }
diff --git a/src/module/discussion/ui/drawer_detail_discussion.tsx b/src/module/discussion/ui/drawer_detail_discussion.tsx
index 43be17d..ba0de90 100644
--- a/src/module/discussion/ui/drawer_detail_discussion.tsx
+++ b/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([{
- category: "discussion-detail",
- id: id,
- }])
+ setDataRealtime([
+ {
+ 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 mengarsipkan diskusi, coba lagi nanti");
- } else {
- toast.error("Gagal mengaktifkan diskusi, coba lagi nanti");
- }
+ toast.error("Gagal mengupdate diskusi, coba lagi nanti");
} finally {
setLoadingDelete(false)
setValModal(false)
diff --git a/src/module/discussion_general/lib/api_discussion_general.ts b/src/module/discussion_general/lib/api_discussion_general.ts
index 1d7a9bd..769bce9 100644
--- a/src/module/discussion_general/lib/api_discussion_general.ts
+++ b/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);
}
diff --git a/src/module/discussion_general/lib/type_discussion_general.ts b/src/module/discussion_general/lib/type_discussion_general.ts
index 62be53f..df2275f 100644
--- a/src/module/discussion_general/lib/type_discussion_general.ts
+++ b/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
diff --git a/src/module/discussion_general/ui/add_member.tsx b/src/module/discussion_general/ui/add_member.tsx
index ab2a6b9..1903eb9 100644
--- a/src/module/discussion_general/ui/add_member.tsx
+++ b/src/module/discussion_general/ui/add_member.tsx
@@ -184,7 +184,7 @@ export default function AddMemberDiscussionGeneral() {
}>
+ }} src={`https://wibu-storage.wibudev.com/api/files/${v.img}`} alt="it's me" size="lg" />
{v.name}
@@ -233,7 +233,7 @@ export default function AddMemberDiscussionGeneral() {
xl: 1,
}}
>
-
+
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")
- setTimeout(() => {
- router.push(`/discussion`)
- }, 1000)
+ if (roleLogin.get() == "user" || roleLogin.get() == "coadmin") {
+ toast.error("Data telah diarsipkan, anda akan beralih ke halaman list diskusi umum")
+ setTimeout(() => {
+ router.push(`/discussion`)
+ }, 1000)
+ } else {
+ getData(false)
+ }
+
}
}, [dataRealTime])
@@ -139,7 +144,7 @@ export default function DetailDiscussionGeneral() {
}
/>
setOpenDrawer(false)}>
- setOpenDrawer(false)} id={param.id} status={Number(isData?.status)} />
+ setOpenDrawer(false)} id={param.id} status={Number(isData?.status)} active={isData?.isActive == false ? false : true} />
@@ -188,7 +193,12 @@ export default function DetailDiscussionGeneral() {
{isData?.title}
- {isData?.status === 1 ? "BUKA" : "TUTUP"}
+ {!isData?.isActive ?
+ ARSIP
+ :
+ {isData?.status === 1 ? "BUKA" : "TUTUP"}
+ }
+
@@ -234,7 +244,12 @@ export default function DetailDiscussionGeneral() {
{isData?.title}
- {isData?.status === 1 ? "BUKA" : "TUTUP"}
+ {
+ !isData?.isActive ?
+ ARSIP
+ :
+ {isData?.status === 1 ? "BUKA" : "TUTUP"}
+ }
@@ -303,7 +318,7 @@ export default function DetailDiscussionGeneral() {
-
+
@@ -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() {
+ variant="subtle" aria-label="submit" disabled={(isData?.status === 2 || !isData?.isActive || (!memberDiscussion && (roleLogin.get() == "user" || roleLogin.get() == "coadmin")))}>
diff --git a/src/module/discussion_general/ui/drawer_detail_discussion_general.tsx b/src/module/discussion_general/ui/drawer_detail_discussion_general.tsx
index 58278d7..becce84 100644
--- a/src/module/discussion_general/ui/drawer_detail_discussion_general.tsx
+++ b/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") ? (
<>
- window.location.href = `/discussion/${param.id}/edit/`} justify={'center'} align={'center'} direction={'column'} >
-
-
-
-
- Edit
-
-
-
- setValModalStatus(true)} >
- {status === 1 ? (
+ {
+ active && (
<>
-
+ window.location.href = `/discussion/${param.id}/edit/`} justify={'center'} align={'center'} direction={'column'} >
-
+
- Tutup Diskusi
+
+ Edit
+
+
+
+ setValModalStatus(true)} >
+ {status === 1 ? (
+ <>
+
+
+
+
+ Tutup Diskusi
+
+ >
+ ) : (
+ <>
+
+
+
+
+
+ Buka Diskusi
+
+ >
+ )}
>
- ) : (
- <>
-
-
-
-
-
- Buka Diskusi
-
- >
- )}
-
+ )
+ }
setValModal(true)} justify={'center'} align={'center'} direction={'column'} >
-
+
- Arsipkan
+ {active ? "Arsipkan" : "Aktifkan Diskusi"}
>
@@ -157,7 +177,7 @@ export default function DrawerDetailDiscussionGeneral({ onSuccess, id, status }:
setValModal(false)}
- description="Apakah Anda yakin ingin mengarsipkan diskusi ini?"
+ description={`Apakah Anda yakin ingin ${active ? "mengarsipkan" : "mengaktifkan"} diskusi ini?`}
onYes={(val) => {
fetchDeleteDiscussion(val)
}} />
diff --git a/src/module/discussion_general/ui/member_discussion_general.tsx b/src/module/discussion_general/ui/member_discussion_general.tsx
index 1613acb..a612951 100644
--- a/src/module/discussion_general/ui/member_discussion_general.tsx
+++ b/src/module/discussion_general/ui/member_discussion_general.tsx
@@ -122,7 +122,7 @@ export default function MemberDiscussionGeneral() {
onClick={() => { onClickMember(v.idUser, v.name) }}
>
-
+