diff --git a/src/app/api/admin/forum/[id]/komentar/route.ts b/src/app/api/admin/forum/[id]/komentar/route.ts
index dd43e628..1569bf8a 100644
--- a/src/app/api/admin/forum/[id]/komentar/route.ts
+++ b/src/app/api/admin/forum/[id]/komentar/route.ts
@@ -1,5 +1,6 @@
import _ from "lodash";
import { NextResponse } from "next/server";
+import prisma from "@/lib/prisma";
export async function GET(
request: Request,
diff --git a/src/app/api/admin/forum/komentar/route.ts b/src/app/api/admin/forum/komentar/route.ts
index 7353924c..e76249b0 100644
--- a/src/app/api/admin/forum/komentar/route.ts
+++ b/src/app/api/admin/forum/komentar/route.ts
@@ -27,11 +27,7 @@ export async function GET(request: Request) {
},
},
},
- select: {
- id: true,
- isActive: true,
- createdAt: true,
- deskripsi: true,
+ include: {
ForumMaster_KategoriReport: true,
User: {
select: {
@@ -46,6 +42,7 @@ export async function GET(request: Request) {
},
Forum_Komentar: {
select: {
+ id: true,
komentar: true,
},
},
@@ -67,11 +64,7 @@ export async function GET(request: Request) {
},
},
},
- select: {
- id: true,
- isActive: true,
- createdAt: true,
- deskripsi: true,
+ include: {
ForumMaster_KategoriReport: true,
User: {
select: {
@@ -86,6 +79,7 @@ export async function GET(request: Request) {
},
Forum_Komentar: {
select: {
+ id: true,
komentar: true,
},
},
diff --git a/src/app_modules/_global/component/new/comp_set_inner_html.tsx b/src/app_modules/_global/component/new/comp_set_inner_html.tsx
new file mode 100644
index 00000000..a2c24945
--- /dev/null
+++ b/src/app_modules/_global/component/new/comp_set_inner_html.tsx
@@ -0,0 +1,23 @@
+import React from "react";
+import { MainColor } from "../../color";
+
+export function Component_SetInnerHtml({
+ props,
+ color,
+}: {
+ props: string
+ color?: string;
+}) {
+ return (
+ <>
+
+ >
+ );
+}
diff --git a/src/app_modules/admin/forum/component/detail_one_komentar.tsx b/src/app_modules/admin/forum/component/detail_one_komentar.tsx
index 8ff84ece..f0fc4828 100644
--- a/src/app_modules/admin/forum/component/detail_one_komentar.tsx
+++ b/src/app_modules/admin/forum/component/detail_one_komentar.tsx
@@ -1,7 +1,11 @@
"use client";
import { AdminColor } from "@/app_modules/_global/color/color_pallet";
-import { MODEL_FORUM_KOMENTAR, MODEL_FORUM_POSTING } from "@/app_modules/forum/model/interface";
+import { Component_SetInnerHtml } from "@/app_modules/_global/component/new/comp_set_inner_html";
+import {
+ MODEL_FORUM_KOMENTAR,
+ MODEL_FORUM_POSTING,
+} from "@/app_modules/forum/model/interface";
import {
Badge,
Box,
@@ -21,14 +25,8 @@ export default function ComponentAdminForum_ViewOneDetailKomentar({
}) {
return (
<>
-
-
-
- Detail Komentar
-
-
-
-
+
+
@@ -38,23 +36,17 @@ export default function ComponentAdminForum_ViewOneDetailKomentar({
{dataKomentar?.Author?.username}
-
{/* */}
-
+
diff --git a/src/app_modules/admin/forum/component/detail_one_posting.tsx b/src/app_modules/admin/forum/component/detail_one_posting.tsx
index a8acede1..e545f140 100644
--- a/src/app_modules/admin/forum/component/detail_one_posting.tsx
+++ b/src/app_modules/admin/forum/component/detail_one_posting.tsx
@@ -22,7 +22,6 @@ export default function ComponentAdminForum_ViewOneDetailPosting({
}) {
return (
<>
-
@@ -65,7 +64,8 @@ export default function ComponentAdminForum_ViewOneDetailPosting({
-
+ {/*
+ */}
>
);
}
diff --git a/src/app_modules/admin/forum/detail/detail_posting.tsx b/src/app_modules/admin/forum/detail/detail_posting.tsx
index 1e6482ab..69eaaefe 100644
--- a/src/app_modules/admin/forum/detail/detail_posting.tsx
+++ b/src/app_modules/admin/forum/detail/detail_posting.tsx
@@ -45,6 +45,7 @@ import { apiAdminGetKomentarForumById } from "../lib/api_fetch_admin_forum";
import CustomSkeleton from "@/app_modules/components/CustomSkeleton";
import moment from "moment";
import "moment/locale/id";
+import { Admin_ComponentModal } from "../../_admin_global/_component/comp_admin_modal";
export default function AdminForum_DetailPosting({
dataPosting,
@@ -72,10 +73,11 @@ function TableKomentar({ postingId }: { postingId: string }) {
const [isSearch, setSearch] = useState("");
const [isLoadingReport, setLoadingReport] = useState(false);
const [idData, setIdData] = useState("");
+ const [isDelete, setDelete] = useState(false);
useShallowEffect(() => {
handleLoadData();
- }, []);
+ }, [isSearch, activePage, isDelete]);
async function handleLoadData() {
try {
@@ -87,6 +89,7 @@ function TableKomentar({ postingId }: { postingId: string }) {
if (response && response.success) {
setData(response.data.data);
+ setDelete(false);
}
} catch (error) {
console.error("Invalid data format received:", error);
@@ -97,24 +100,10 @@ function TableKomentar({ postingId }: { postingId: string }) {
async function onSearch(s: string) {
setSearch(s);
setActivePage(1);
- const loadData = await adminForum_getListKomentarById({
- postingId: postingId,
- page: 1,
- search: s,
- });
- setData(loadData.data as any);
- setNPage(loadData.nPage);
}
async function onPageClick(p: any) {
setActivePage(p);
- const loadData = await adminForum_getListKomentarById({
- postingId: postingId,
- search: isSearch,
- page: p,
- });
- setData(loadData.data as any);
- setNPage(loadData.nPage);
}
const rowTable = () => {
@@ -131,7 +120,7 @@ function TableKomentar({ postingId }: { postingId: string }) {
}
return data?.map((e, i) => (
-
+
|
{e?.Author?.username}
@@ -158,7 +147,7 @@ function TableKomentar({ postingId }: { postingId: string }) {
|
-
+
= 3 ? "red" : AdminColor.white
@@ -171,7 +160,7 @@ function TableKomentar({ postingId }: { postingId: string }) {
|
-
+
-
+ {
+ setDelete(val);
+ }}
+ />
|
@@ -269,7 +263,13 @@ function TableKomentar({ postingId }: { postingId: string }) {
);
}
-function ButtonDeleteKomentar({ komentarId }: { komentarId: string }) {
+function ButtonDeleteKomentar({
+ komentarId,
+ onSuccessDelete,
+}: {
+ komentarId: string;
+ onSuccessDelete: (val: any) => void;
+}) {
const router = useRouter();
const [opened, { open, close }] = useDisclosure(false);
const [loadindDel, setLoadingDel] = useState(false);
@@ -280,7 +280,9 @@ function ButtonDeleteKomentar({ komentarId }: { komentarId: string }) {
if (res.status === 200) {
setLoadingDel(false);
setLoadingDel2(false);
+ onSuccessDelete(true);
ComponentGlobal_NotifikasiBerhasil(res.message);
+
close();
} else {
ComponentGlobal_NotifikasiGagal(res.message);
@@ -289,9 +291,15 @@ function ButtonDeleteKomentar({ komentarId }: { komentarId: string }) {
}
return (
<>
-
+
- Anda yakin menghapus komentar ini ?
+
+ Anda yakin menghapus komentar ini ?
+
-
+
-
-
-
- {
- setData(val);
- }}
- />
-
-
+
+
+
+
+
+
+ {
+ setData(val);
+ }}
+ />
+
+
+
{/* {JSON.stringify(listReport, null, 2)} */}
@@ -90,11 +94,12 @@ function ButtonDeleteKomentar({
if (res.status === 200) {
setLoadingDel2(false);
close();
+ router.back();
- const dataKomentar = await adminForum_funGetOneKomentarById({
- komentarId: komentarId,
- });
- onSuccess(dataKomentar);
+ // const dataKomentar = await adminForum_funGetOneKomentarById({
+ // komentarId: komentarId,
+ // });
+ // onSuccess(dataKomentar);
const dataNotif = {
appId: data.id,
@@ -125,9 +130,15 @@ function ButtonDeleteKomentar({
return (
<>
-
+
- Anda yakin menghapus komentar ini ?
+
+ Anda yakin menghapus komentar ini ?
+
-
+
{data?.isActive ? (
(
-
+
|
-
- {e?.User?.Profile?.name}
-
+
+ {e?.User?.username}
+
|
-
+
{e?.ForumMaster_KategoriReport?.title
? e?.ForumMaster_KategoriReport?.title
: "-"}
-
+
|
-
+
{e?.ForumMaster_KategoriReport?.deskripsi ? (
{e?.ForumMaster_KategoriReport?.deskripsi}
@@ -223,19 +233,18 @@ function HasilReportPosting({
-
)}
-
+
|
-
+
{e?.deskripsi ? {e?.deskripsi} : -}
-
+
|
));
- console.log("Ini data", data);
return (
<>
@@ -247,16 +256,8 @@ function HasilReportPosting({
style={{ borderRadius: "6px" }}
>
- Report Komentar
+ Hasil Report Komentar
- {/* }
- radius={"xl"}
- placeholder="Cari postingan"
- onChange={(val) => {
- onSearch(val.currentTarget.value);
- }}
- /> */}
{_.isEmpty(data) ? (
@@ -270,21 +271,20 @@ function HasilReportPosting({
p={"md"}
w={"100%"}
h={"100%"}
-
>
|
- Username
+ Username
|
- Kategori
+ Kategori
|
- Deskripsi
+ Deskripsi
|
- Deskripsi Lainnya
+ Deskripsi Lainnya
|
@@ -292,15 +292,11 @@ function HasilReportPosting({
{TableRows}
-
- {
- onPageClick(val);
- }}
- />
-
+
)}
diff --git a/src/app_modules/admin/forum/sub_detail/hasil_report_posting.tsx b/src/app_modules/admin/forum/sub_detail/hasil_report_posting.tsx
index 584867bd..9caaa81f 100644
--- a/src/app_modules/admin/forum/sub_detail/hasil_report_posting.tsx
+++ b/src/app_modules/admin/forum/sub_detail/hasil_report_posting.tsx
@@ -1,25 +1,26 @@
"use client";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/_admin_global/header_tamplate";
+import { AdminColor } from "@/app_modules/_global/color/color_pallet";
import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/_admin_global/header_tamplate";
import {
MODEL_FORUM_POSTING,
MODEL_FORUM_REPORT_POSTING,
} from "@/app_modules/forum/model/interface";
+import mqtt_client from "@/util/mqtt_client";
import {
Button,
Center,
Group,
Modal,
- Pagination,
Paper,
ScrollArea,
Spoiler,
Stack,
Table,
Text,
- Title,
+ Title
} from "@mantine/core";
import { useDisclosure } from "@mantine/hooks";
import { IconTrash } from "@tabler/icons-react";
@@ -28,12 +29,12 @@ import { useRouter } from "next/navigation";
import { useState } from "react";
import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
import ComponentAdminGlobal_IsEmptyData from "../../_admin_global/is_empty_data";
+import { Admin_V3_ComponentPaginationBreakpoint } from "../../_components_v3/comp_pagination_breakpoint";
+import { Admin_V3_ComponentBreakpoint } from "../../_components_v3/comp_simple_grid_breakpoint";
+import adminNotifikasi_funCreateToUser from "../../notifikasi/fun/create/fun_create_notif_user";
+import ComponentAdminForum_ViewOneDetailPosting from "../component/detail_one_posting";
import { adminForum_funDeletePostingById } from "../fun/delete/fun_delete_posting_by_id";
import { adminForum_getListReportPostingById } from "../fun/get/get_list_report_posting_by_id";
-import ComponentAdminForum_ViewOneDetailPosting from "../component/detail_one_posting";
-import mqtt_client from "@/util/mqtt_client";
-import adminNotifikasi_funCreateToUser from "../../notifikasi/fun/create/fun_create_notif_user";
-import { AdminColor } from "@/app_modules/_global/color/color_pallet";
export default function AdminForum_HasilReportPosting({
dataPosting,
@@ -45,12 +46,16 @@ export default function AdminForum_HasilReportPosting({
return (
<>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
{e?.ForumMaster_KategoriReport?.deskripsi ? (
- {e?.ForumMaster_KategoriReport?.deskripsi}
+
+ {e?.ForumMaster_KategoriReport?.deskripsi}
+
) : (
-
)}
@@ -207,7 +214,13 @@ function HasilReportPosting({
- {e?.deskripsi ? {e?.deskripsi} : -}
+ {e?.deskripsi ? (
+
+ {e?.deskripsi}
+
+ ) : (
+ -
+ )}
|
@@ -239,7 +252,7 @@ function HasilReportPosting({
{_.isEmpty(data) ? (
) : (
-
+
|
- Username
+
+ Username
+
|
- Kategori
+
+ Kategori
+
|
- Deskripsi
+
+ Deskripsi
+
|
- Deskripsi Lainnya
+
+ Deskripsi Lainnya
+
|
@@ -269,15 +289,14 @@ function HasilReportPosting({
{TableRows}
-
- {
- onPageClick(val);
- }}
- />
-
+
+ {
+ onPageClick(val);
+ }}
+ />
)}
diff --git a/src/app_modules/admin/forum/sub_menu/table_posting.tsx b/src/app_modules/admin/forum/sub_menu/table_posting.tsx
index 0eeec292..e8712bbf 100644
--- a/src/app_modules/admin/forum/sub_menu/table_posting.tsx
+++ b/src/app_modules/admin/forum/sub_menu/table_posting.tsx
@@ -27,6 +27,7 @@ import { ComponentAdminGlobal_TitlePage } from "../../_admin_global/_component";
import { Admin_V3_ComponentPaginationBreakpoint } from "../../_components_v3/comp_pagination_breakpoint";
import ComponentAdminForum_ButtonDeletePosting from "../component/button_delete";
import { apiGetAdminForumPublish } from "../lib/api_fetch_admin_forum";
+import { Component_SetInnerHtml } from "@/app_modules/_global/component/new/comp_set_inner_html";
export default function AdminForum_TablePosting() {
return (
@@ -126,25 +127,21 @@ function TablePublish() {
{/* Deskripsi */}
-
+
-
+
|
{/* Jumlah komentar */}
-
+
{e?.Forum_Komentar.length}
@@ -153,7 +150,7 @@ function TablePublish() {
{/* Jumlah report */}
-
+
= 3 ? "red" : AdminColor.white}
fw={"bold"}
diff --git a/src/app_modules/admin/forum/sub_menu/table_report_komentar.tsx b/src/app_modules/admin/forum/sub_menu/table_report_komentar.tsx
index 621e8d95..0ea668f0 100644
--- a/src/app_modules/admin/forum/sub_menu/table_report_komentar.tsx
+++ b/src/app_modules/admin/forum/sub_menu/table_report_komentar.tsx
@@ -141,7 +141,7 @@ function TableView() {
|
-
+
|
diff --git a/src/app_modules/admin/forum/sub_menu/table_report_posting.tsx b/src/app_modules/admin/forum/sub_menu/table_report_posting.tsx
index 47fd57ff..caf8eec7 100644
--- a/src/app_modules/admin/forum/sub_menu/table_report_posting.tsx
+++ b/src/app_modules/admin/forum/sub_menu/table_report_posting.tsx
@@ -187,7 +187,7 @@ function TableView() {
Postingan
-
+
Status Posting
|
| |