Fix notification to report comment

Fix: User – Forum (Reporting & Preview) app/(application)/(user)/forum/[id]/other-report-commentar.tsx app/(application)/(user)/forum/[id]/other-report-posting.tsx app/(application)/(user)/forum/[id]/preview-report-posting.tsx app/(application)/(user)/forum/[id]/report-commentar.tsx app/(application)/(user)/forum/[id]/report-posting.tsx Admin – Forum Moderation app/(application)/admin/forum/[id]/list-report-comment.tsx app/(application)/admin/forum/report-posting.tsx Layout app/(application)/(user)/_layout.tsx API Client & Admin service/api-admin/api-admin-forum.ts service/api-client/api-forum.ts service/api-client/api-master.ts Utils utils/badWordsIndonesia.ts ### No Issue
2026-01-19 17:46:54 +08:00
parent c2682246d6
commit 0262423c50
13 changed files with 273 additions and 102 deletions
--- a/app/(application)/(user)/_layout.tsx
+++ b/app/(application)/(user)/_layout.tsx
@@ -616,15 +616,20 @@ export default function UserLayout() {
            headerLeft: () => <BackButton />,
          }}
        />
-         <Stack.Screen
+        <Stack.Screen
          name="forum/[id]/preview-report-posting"
          options={{
-            title: "Preview Laporan Diskusi",
+            title: "Laporan Postingan",
+            headerLeft: () => <BackButton />,
+          }}
+        />
+        <Stack.Screen
+          name="forum/[id]/preview-report-comment"
+          options={{
+            title: "Laporan Komentar",
            headerLeft: () => <BackButton />,
          }}
        />
-
-

        {/* ========== Maps Section ========= */}
        <Stack.Screen
--- a/app/(application)/(user)/forum/[id]/other-report-commentar.tsx
+++ b/app/(application)/(user)/forum/[id]/other-report-commentar.tsx
@@ -6,7 +6,7 @@ import {
 } from "@/components";
 import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
-import { apiForumCreateReportCommentar } from "@/service/api-client/api-master";
+import { apiForumCreateReportCommentar } from "@/service/api-client/api-forum";
 import { router, useLocalSearchParams } from "expo-router";
 import { useState } from "react";
 import Toast from "react-native-toast-message";
--- a/app/(application)/(user)/forum/[id]/other-report-posting.tsx
+++ b/app/(application)/(user)/forum/[id]/other-report-posting.tsx
@@ -6,7 +6,7 @@ import {
 } from "@/components";
 import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
-import { apiForumCreateReportPosting } from "@/service/api-client/api-master";
+import { apiForumCreateReportPosting } from "@/service/api-client/api-forum";
 import { router, useLocalSearchParams } from "expo-router";
 import { useState } from "react";
 import Toast from "react-native-toast-message";
--- a/app/(application)/(user)/forum/[id]/preview-report-comment.tsx
+++ b/app/(application)/(user)/forum/[id]/preview-report-comment.tsx
@@ -0,0 +1,91 @@
+import {
+  BaseBox,
+  NewWrapper,
+  Spacing,
+  StackCustom,
+  TextCustom,
+} from "@/components";
+import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
+import NoDataText from "@/components/_ShareComponent/NoDataText";
+import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
+import { apiForumGetReportComment } from "@/service/api-client/api-forum";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
+import _ from "lodash";
+import { useCallback, useState } from "react";
+
+export default function ForumPreviewReportComment() {
+  const { id } = useLocalSearchParams();
+  const [data, setData] = useState<any | null>(null);
+  const [listData, setListData] = useState<any | null>(null);
+  const [loading, setLoading] = useState<boolean>(false);
+  // Status
+
+  useFocusEffect(
+    useCallback(() => {
+      onLoadData(id as string);
+    }, [id])
+  );
+
+  const onLoadData = async (id: string) => {
+    try {
+      setLoading(true);
+      const response = await apiForumGetReportComment({ id });
+      setData(response.data);
+      setListData(response?.data?.Forum_ReportKomentar);
+    } catch (error) {
+      console.log("[ERROR]", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <>
+      <NewWrapper>
+        <StackCustom>
+          <TextCustom color="red" bold>
+            Komentar anda telah melanggar aturan forum ! Admin mengambil
+            tindakan untuk menghapus komentar anda!
+          </TextCustom>
+          {loading ? (
+            <CustomSkeleton height={100} />
+          ) : (
+            <BaseBox>
+              <TextCustom>"{data?.komentar ? data?.komentar : "-"}"</TextCustom>
+            </BaseBox>
+          )}
+        </StackCustom>
+
+        <Spacing height={10} />
+        <TextCustom bold>Beberapa laporan yang telah diterima</TextCustom>
+        <Spacing height={10} />
+
+        {loading ? (
+          <ListSkeletonComponent />
+        ) : _.isEmpty(listData) ? (
+          <NoDataText />
+        ) : (
+          listData?.map((e: any, index: number) => (
+             <BaseBox key={index}>
+                {e?.deskripsi ? (
+                  <StackCustom gap={"sm"}>
+                    <TextCustom bold>Laporan Lainnya</TextCustom>
+                    <TextCustom>{e?.deskripsi}</TextCustom>
+                  </StackCustom>
+                ) : (
+                  <StackCustom gap={"sm"}>
+                    <TextCustom bold>
+                      {e?.ForumMaster_KategoriReport?.title}
+                    </TextCustom>
+                    <TextCustom>
+                      {e?.ForumMaster_KategoriReport?.deskripsi}
+                    </TextCustom>
+                  </StackCustom>
+                )}
+              </BaseBox>
+          ))
+        )}
+      </NewWrapper>
+    </>
+  );
+}
--- a/app/(application)/(user)/forum/[id]/preview-report-posting.tsx
+++ b/app/(application)/(user)/forum/[id]/preview-report-posting.tsx
@@ -1,16 +1,23 @@
-import { NewWrapper, TextCustom } from "@/components";
-import { useAuth } from "@/hooks/use-auth";
 import {
-  apiForumGetOne,
-  apiForumGetReportPosting,
-} from "@/service/api-client/api-forum";
+  BaseBox,
+  NewWrapper,
+  Spacing,
+  StackCustom,
+  TextCustom,
+} from "@/components";
+import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
+import NoDataText from "@/components/_ShareComponent/NoDataText";
+import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
+import { apiForumGetReportPosting } from "@/service/api-client/api-forum";
 import { useFocusEffect, useLocalSearchParams } from "expo-router";
+import _ from "lodash";
 import { useCallback, useState } from "react";

 export default function ForumPreviewReportPosting() {
  const { id } = useLocalSearchParams();
-  const { user } = useAuth();
  const [data, setData] = useState<any | null>(null);
+  const [listData, setListData] = useState<any | null>(null);
+  const [loading, setLoading] = useState<boolean>(false);
  // Status

  useFocusEffect(
@@ -21,23 +28,64 @@ export default function ForumPreviewReportPosting() {

  const onLoadData = async (id: string) => {
    try {
+      setLoading(true);
      const response = await apiForumGetReportPosting({ id });
      setData(response.data);
+      setListData(response?.data?.Forum_ReportPosting);
    } catch (error) {
      console.log("[ERROR]", error);
+    } finally {
+      setLoading(false);
    }
  };

  return (
-   <>
+    <>
+      <NewWrapper>
+        <StackCustom>
+          <TextCustom color="red" bold>
+            Postingan anda telah melanggar aturan forum ! Admin mengambil
+            tindakan untuk menghapus komentar anda!
+          </TextCustom>
+          {loading ? (
+            <CustomSkeleton height={100} />
+          ) : (
+            <BaseBox>
+              <TextCustom>"{data?.diskusi ? data?.diskusi : "-"}"</TextCustom>
+            </BaseBox>
+          )}
+        </StackCustom>

-    <NewWrapper>
-      <TextCustom>Halaman preview repost posting</TextCustom>
-      <TextCustom>{JSON.stringify(data, null, 2)}</TextCustom>
+        <Spacing height={10} />
+        <TextCustom bold>Beberapa laporan yang telah diterima</TextCustom>
+        <Spacing height={10} />

-      <TextCustom>untuk report jomentar beda halaman</TextCustom>
-
-    </NewWrapper>
-   </>
+        {loading ? (
+          <ListSkeletonComponent />
+        ) : _.isEmpty(listData) ? (
+          <NoDataText />
+        ) : (
+          listData?.map((e: any) => (
+            <BaseBox key={e?.id}>
+              {e?.deskripsi ? (
+                <StackCustom gap={"sm"}>
+                  <TextCustom bold>Laporan Lainnya</TextCustom>
+                  <TextCustom>{e?.deskripsi}</TextCustom>
+                </StackCustom>
+              ) : (
+                <StackCustom gap={"sm"}>
+                  <TextCustom bold>
+                    {e?.ForumMaster_KategoriReport?.title}
+                  </TextCustom>
+                  <TextCustom>
+                    {e?.ForumMaster_KategoriReport?.deskripsi}
+                  </TextCustom>
+                </StackCustom>
+              )}
+            </BaseBox>
+          ))
+        )}
+      </NewWrapper>
+    </>
  );
 }
--- a/app/(application)/(user)/forum/[id]/report-commentar.tsx
+++ b/app/(application)/(user)/forum/[id]/report-commentar.tsx
@@ -8,7 +8,8 @@ import {
 import { AccentColor, MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 import Forum_ReportListSection from "@/screens/Forum/ReportListSection";
-import { apiForumCreateReportCommentar, apiMasterForumReportList } from "@/service/api-client/api-master";
+import { apiForumCreateReportCommentar } from "@/service/api-client/api-forum";
+import { apiMasterForumReportList } from "@/service/api-client/api-master";
 import { router, useLocalSearchParams } from "expo-router";
 import { useState, useEffect } from "react";
 import Toast from "react-native-toast-message";
--- a/app/(application)/(user)/forum/[id]/report-posting.tsx
+++ b/app/(application)/(user)/forum/[id]/report-posting.tsx
@@ -9,8 +9,8 @@ import {
 import { AccentColor, MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 import Forum_ReportListSection from "@/screens/Forum/ReportListSection";
+import { apiForumCreateReportPosting } from "@/service/api-client/api-forum";
 import {
-  apiForumCreateReportPosting,
  apiMasterForumReportList,
 } from "@/service/api-client/api-master";
 import { router, useLocalSearchParams } from "expo-router";
--- a/app/(application)/admin/forum/[id]/list-report-comment.tsx
+++ b/app/(application)/admin/forum/[id]/list-report-comment.tsx
@@ -15,12 +15,11 @@ import { IconDot, IconView } from "@/components/_Icon/IconComponent";
 import { IconTrash } from "@/components/_Icon/IconTrash";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
-import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
-import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
 import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
+import { useAuth } from "@/hooks/use-auth";
 import {
  apiAdminForumCommentById,
  apiAdminForumDeactivateComment,
@@ -35,6 +34,7 @@ import Toast from "react-native-toast-message";

 export default function AdminForumReportComment() {
  const { id } = useLocalSearchParams();
+  const { user } = useAuth();
  const [data, setData] = useState<any | null>(null);
  const [listReport, setListReport] = useState<any[] | null>(null);
  const [loadList, setLoadList] = useState(false);
@@ -111,9 +111,13 @@ export default function AdminForumReportComment() {

        <AdminComp_BoxTitle title="Daftar Report Komentar" />

-        <StackCustom  gap={"sm"}>
+        <StackCustom gap={"sm"}>
          <GridSpan_NewComponent
-            text1={<TextCustom bold align="center">Aksi</TextCustom>}
+            text1={
+              <TextCustom bold align="center">
+                Aksi
+              </TextCustom>
+            }
            text2={<TextCustom bold>Pelapor</TextCustom>}
            text3={<TextCustom bold>Kategori Report</TextCustom>}
          />
@@ -129,22 +133,24 @@ export default function AdminForumReportComment() {
              <View key={index}>
                <GridSpan_NewComponent
                  text1={
-                   <CenterCustom>
-                     <ActionIcon
-                      icon={<IconView size={ICON_SIZE_BUTTON} color="black" />}
-                      onPress={() => {
-                        setOpenDrawerAction(true);
-                        setSelectedReport({
-                          id: item.id,
-                          username: item.User?.username,
-                          kategori: item.ForumMaster_KategoriReport?.title,
-                          keterangan:
-                            item.ForumMaster_KategoriReport?.deskripsi,
-                          deskripsi: item.deskripsi,
-                        });
-                      }}
-                    />
-                   </CenterCustom>
+                    <CenterCustom>
+                      <ActionIcon
+                        icon={
+                          <IconView size={ICON_SIZE_BUTTON} color="black" />
+                        }
+                        onPress={() => {
+                          setOpenDrawerAction(true);
+                          setSelectedReport({
+                            id: item.id,
+                            username: item.User?.username,
+                            kategori: item.ForumMaster_KategoriReport?.title,
+                            keterangan:
+                              item.ForumMaster_KategoriReport?.deskripsi,
+                            deskripsi: item.deskripsi,
+                          });
+                        }}
+                      />
+                    </CenterCustom>
                  }
                  text2={
                    <TextCustom truncate={1}>
@@ -188,15 +194,18 @@ export default function AdminForumReportComment() {
              onPressRight: async () => {
                const deleteComment = await apiAdminForumDeactivateComment({
                  id: id as string,
+                  data: {
+                    senderId: user?.id as string,
+                  },
                });

-                if (!deleteComment.success) {
-                  Toast.show({
-                    type: "error",
-                    text1: "Komentar gagal dihapus",
-                  });
-                  return;
-                }
+                // if (!deleteComment.success) {
+                //   Toast.show({
+                //     type: "error",
+                //     text1: "Komentar gagal dihapus",
+                //   });
+                //   return;
+                // }

                setOpenDrawer(false);
                Toast.show({
--- a/app/(application)/admin/forum/report-posting.tsx
+++ b/app/(application)/admin/forum/report-posting.tsx
@@ -73,7 +73,7 @@ export default function AdminForumReportPosting() {
        <GridSpan_NewComponent
          text1={
            <TextCustom bold truncate>
-              Username
+              Pelapor
            </TextCustom>
          }
          text2={