Fix notifikasi forum

FixL
 modified:   app/(application)/(user)/_layout.tsx
        modified:   app/(application)/(user)/forum/[id]/index.tsx
        modified:   app/(application)/(user)/forum/create.tsx
        modified:   app/(application)/admin/forum/[id]/list-report-posting.tsx
        modified:   screens/Home/tabsList.ts
        modified:   service/api-admin/api-admin-forum.ts
        modified:   service/api-client/api-forum.ts

Add:
 app/(application)/(user)/forum/[id]/preview-report-posting.tsx
        types/type-forum.ts

### No Issue

app/(application)/(user)/_layout.tsx

@@ -616,6 +616,15 @@ export default function UserLayout() {
             headerLeft: () => <BackButton />,
           }}
         />
+         <Stack.Screen
+          name="forum/[id]/preview-report-posting"
+          options={{
+            title: "Preview Laporan Diskusi",
+            headerLeft: () => <BackButton />,
+          }}
+        />
+
+
 
         {/* ========== Maps Section ========= */}
         <Stack.Screen

app/(application)/(user)/event/[id]/history.tsx

@@ -56,7 +56,7 @@ export default function EventDetailHistory() {
       <DrawerCustom
         isVisible={openDrawer}
         closeDrawer={() => setOpenDrawer(false)}
-        height={250}
+        height={"auto"}
       >
         <MenuDrawerDynamicGrid
           data={menuDrawerPublishEvent({ id: id as string })}

app/(application)/(user)/event/[id]/publish.tsx

@@ -1,14 +1,15 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
   AlertDefaultSystem,
+  BackButton,
   ButtonCustom,
   DotButton,
   DrawerCustom,
-  LoaderCustom,
   MenuDrawerDynamicGrid,
   ViewWrapper,
 } from "@/components";
 import { IMenuDrawerItem } from "@/components/_Interface/types";
+import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
 import LeftButtonCustom from "@/components/Button/BackButton";
 import { useAuth } from "@/hooks/use-auth";
 import Event_BoxDetailPublishSection from "@/screens/Event/BoxDetailPublishSection";
@@ -18,23 +19,26 @@ import {
   apiEventGetOne,
   apiEventJoin,
 } from "@/service/api-client/api-event";
+import dayjs from "dayjs";
 import {
+  Redirect,
   router,
   Stack,
   useFocusEffect,
   useLocalSearchParams,
 } from "expo-router";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import Toast from "react-native-toast-message";
 
 export default function EventDetailPublish() {
-  const { id } = useLocalSearchParams();
+  const now = new Date().toISOString();
   const { user } = useAuth();
+  const { id } = useLocalSearchParams();
   const [openDrawer, setOpenDrawer] = useState(false);
   const [isLoadingData, setIsLoadingData] = useState(false);
   const [isLoadingJoin, setIsLoadingJoin] = useState(false);
 
-  const [data, setData] = useState();
+  const [data, setData] = useState<any>();
   const [isParticipant, setIsParticipant] = useState<boolean | null>(null);
 
   useFocusEffect(
@@ -55,8 +59,6 @@ export default function EventDetailPublish() {
           userId: user?.id as string,
         });
 
-        console.log("[RES CHECK PARTICIPANTS]", responseCheckParticipants);
-
         if (
           responseCheckParticipants.success &&
           responseCheckParticipants.data
@@ -108,7 +110,24 @@ export default function EventDetailPublish() {
     }
   };
 
-  const footerButton = () => {
+  const isEventFinished =
+    id && data?.tanggalSelesai && dayjs(data.tanggalSelesai).isBefore(now);
+
+  useEffect(() => {
+    if (isEventFinished) {
+      router.replace(`/(application)/(user)/event/${id}/history`);
+    }
+  }, [isEventFinished, id]);
+
+  if (isEventFinished) {
+    return (
+      <ViewWrapper>
+        <CustomSkeleton />
+      </ViewWrapper>
+    );
+  }
+
+  const FooterButton = () => {
     return (
       <>
         <ButtonCustom
@@ -138,17 +157,17 @@ export default function EventDetailPublish() {
       <Stack.Screen
         options={{
           title: `Event Publish`,
-          headerLeft: () => <LeftButtonCustom />,
+          headerLeft: () => <BackButton onPress={() => router.back()} />,
           headerRight: () => <DotButton onPress={() => setOpenDrawer(true)} />,
         }}
       />
       <ViewWrapper>
         {isLoadingData ? (
-          <LoaderCustom />
+          <CustomSkeleton height={400} />
         ) : (
           <Event_BoxDetailPublishSection
             data={data}
-            footerButton={footerButton()}
+            footerButton={FooterButton()}
           />
         )}
       </ViewWrapper>

app/(application)/(user)/event/create.tsx

@@ -78,23 +78,6 @@ export default function EventCreate() {
       return;
     }
 
-    // if (selectedDate) {
-    //   console.log("Tanggal yang dipilih:", selectedDate);
-    //   console.log(`ISO Format ${Platform.OS}:`, selectedDate.toString());
-
-    //   // Kirim ke API atau proses lanjutan
-    // } else {
-    //   console.log("Tanggal belum dipilih");
-    // }
-
-    // if (selectedEndDate) {
-    //   console.log("Tanggal yang dipilih:", selectedEndDate);
-    //   console.log(`ISO Format ${Platform.OS}:`, selectedEndDate.toString());
-    //   // Kirim ke API atau proses lanjutan
-    // } else {
-    //   console.log("Tanggal berakhir belum dipilih");
-    // }
-
     try {
       setIsLoading(true);
 
@@ -110,7 +93,7 @@ export default function EventCreate() {
       const response = await apiEventCreate(newData);
       console.log("Response", JSON.stringify(response, null, 2));
 
-      router.replace("/event/status");
+      router.replace("/event/status?status=review");
     } catch (error) {
       console.log(error);
     } finally {

app/(application)/(user)/forum/[id]/index.tsx

@@ -19,34 +19,20 @@ import {
   apiForumGetOne,
   apiForumUpdateStatus,
 } from "@/service/api-client/api-forum";
+import { TypeForum_CommentProps } from "@/types/type-forum";
 import { isBadContent } from "@/utils/badWordsIndonesia";
 import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useEffect, useState } from "react";
-import { Alert } from "react-native";
 
-interface CommentProps {
+
-  id: string;
-  isActive: boolean;
-  komentar: string;
-  createdAt: Date;
-  authorId: string;
-  Author: {
-    id: string;
-    username: string;
-    Profile: {
-      id: string;
-      imageId: string;
-    };
-  };
-}
 
 export default function ForumDetail() {
   const { id } = useLocalSearchParams();
   const { user } = useAuth();
   const [openDrawer, setOpenDrawer] = useState(false);
   const [data, setData] = useState<any | null>(null);
-  const [listComment, setListComment] = useState<CommentProps[] | null>(null);
+  const [listComment, setListComment] = useState<TypeForum_CommentProps[] | null>(null);
   const [isLoadingComment, setLoadingComment] = useState(false);
 
   // Status
@@ -122,6 +108,7 @@ export default function ForumDetail() {
       comment: text,
       authorId: user?.id,
     };
+    
     try {
       setLoadingComment(true);
       const response = await apiForumCreateComment({

app/(application)/(user)/forum/[id]/preview-report-posting.tsx

@@ -0,0 +1,43 @@
+import { NewWrapper, TextCustom } from "@/components";
+import { useAuth } from "@/hooks/use-auth";
+import {
+  apiForumGetOne,
+  apiForumGetReportPosting,
+} from "@/service/api-client/api-forum";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
+import { useCallback, useState } from "react";
+
+export default function ForumPreviewReportPosting() {
+  const { id } = useLocalSearchParams();
+  const { user } = useAuth();
+  const [data, setData] = useState<any | null>(null);
+  // Status
+
+  useFocusEffect(
+    useCallback(() => {
+      onLoadData(id as string);
+    }, [id])
+  );
+
+  const onLoadData = async (id: string) => {
+    try {
+      const response = await apiForumGetReportPosting({ id });
+      setData(response.data);
+    } catch (error) {
+      console.log("[ERROR]", error);
+    }
+  };
+
+  return (
+   <>
+
+    <NewWrapper>
+      <TextCustom>Halaman preview repost posting</TextCustom>
+      <TextCustom>{JSON.stringify(data, null, 2)}</TextCustom>
+
+      <TextCustom>untuk report jomentar beda halaman</TextCustom>
+
+    </NewWrapper>
+   </>
+  );
+}

app/(application)/(user)/forum/create.tsx

@@ -2,15 +2,14 @@ import {
   BoxButtonOnFooter,
   ButtonCustom,
   TextAreaCustom,
-  ViewWrapper
+  ViewWrapper,
 } from "@/components";
 import AlertWarning from "@/components/Alert/AlertWarning";
 import { useAuth } from "@/hooks/use-auth";
 import { apiForumCreate } from "@/service/api-client/api-forum";
-import { isBadContent } from "@/utils/badWordsIndonesia";
+import { censorText, isBadContent } from "@/utils/badWordsIndonesia";
 import { router } from "expo-router";
 import { useState } from "react";
-import { Alert } from "react-native";
 import Toast from "react-native-toast-message";
 
 export default function ForumCreate() {
@@ -19,16 +18,22 @@ export default function ForumCreate() {
   const [isLoading, setIsLoading] = useState(false);
 
   const handlerSubmit = async () => {
-    
+    if (text.trim() === "") {
-    if (isBadContent(text)) {
+      AlertWarning({
-      AlertWarning({})
+        title: "Lengkapi Data",
+        description: "Postingan tidak boleh kosong",
+      });
       return;
     }
-    
+
+    // Bisa di sensor atau return dan tidak bisa di post
+    const cencorContent = censorText(text)
+
     const newData = {
-      diskusi: text,
+      diskusi: cencorContent,
       authorId: user?.id,
     };
+
     try {
       setIsLoading(true);
       const response = await apiForumCreate({ data: newData });
@@ -50,6 +55,7 @@ export default function ForumCreate() {
   const buttonFooter = (
     <BoxButtonOnFooter>
       <ButtonCustom
+        disabled={!text.trim() || isLoading}
         isLoading={isLoading}
         onPress={() => {
           handlerSubmit();

app/(application)/(user)/notifications/index.tsx

@@ -78,7 +78,7 @@ const BoxNotification = ({
             categoryApp: data.kategoriApp,
           });
 
-          router.replace(newPath as any);
+          router.navigate(newPath as any);
           selectedCategory(activeCategory as string);
 
           if (!data.isRead) {

app/(application)/(user)/voting/(tabs)/_layout.tsx

@@ -1,13 +1,37 @@
 import {
-    IconContribution,
+  IconContribution,
-    IconHistory,
+  IconHistory,
-    IconHome,
+  IconHome,
-    IconStatus,
+  IconStatus,
 } from "@/components/_Icon";
+import BackButtonFromNotification from "@/components/Button/BackButtonFromNotification";
 import { TabsStyles } from "@/styles/tabs-styles";
-import { Tabs } from "expo-router";
+import { Tabs, useLocalSearchParams, useNavigation, router } from "expo-router";
+import { useLayoutEffect } from "react";
 
 export default function VotingTabsLayout() {
+  const navigation = useNavigation();
+
+  const { from, category } = useLocalSearchParams<{
+    from?: string;
+    category?: string;
+  }>();
+
+  console.log("from", from);
+  console.log("category", category);
+
+  // Atur header secara dinamis
+  useLayoutEffect(() => {
+    navigation.setOptions({
+      headerLeft: () => (
+        <BackButtonFromNotification
+          from={from as string}
+          category={category as string}
+        />
+      ),
+    });
+  }, [from, router, navigation]);
+
   return (
     <Tabs screenOptions={TabsStyles}>
       <Tabs.Screen

app/(application)/(user)/voting/(tabs)/status.tsx

@@ -12,15 +12,17 @@ import { useAuth } from "@/hooks/use-auth";
 import { dummyMasterStatus } from "@/lib/dummy-data/_master/status";
 import { apiVotingGetByStatus } from "@/service/api-client/api-voting";
 import { dateTimeView } from "@/utils/dateTimeView";
-import { useFocusEffect } from "expo-router";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";
 
 export default function VotingStatus() {
   const { user } = useAuth();
+  const { status } = useLocalSearchParams<{ status?: string }>();
+
   const id = user?.id || "";
   const [activeCategory, setActiveCategory] = useState<string | null>(
-    "publish"
+    status || "publish"
   );
 
   const [listData, setListData] = useState([]);
@@ -86,8 +88,14 @@ export default function VotingStatus() {
                 style={{ width: "70%", alignSelf: "center" }}
                 variant="light"
               >
-                {item?.awalVote && dateTimeView({date: item?.awalVote, withoutTime: true})} -{" "}
+                {item?.awalVote &&
-                {item?.akhirVote && dateTimeView({date: item?.akhirVote, withoutTime: true})}
+                  dateTimeView({
+                    date: item?.awalVote,
+                    withoutTime: true,
+                  })}{" "}
+                -{" "}
+                {item?.akhirVote &&
+                  dateTimeView({ date: item?.akhirVote, withoutTime: true })}
               </BadgeCustom>
             </StackCustom>
           </BaseBox>

app/(application)/(user)/voting/[id]/index.tsx

@@ -13,6 +13,7 @@ import {
 } from "@/components";
 import { IconArchive, IconContribution } from "@/components/_Icon";
 import { IMenuDrawerItem } from "@/components/_Interface/types";
+import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
 import { useAuth } from "@/hooks/use-auth";
 import Voting_BoxDetailHasilVotingSection from "@/screens/Voting/BoxDetailHasilVotingSection";
 import { Voting_BoxDetailPublishSection } from "@/screens/Voting/BoxDetailPublishSection";
@@ -22,13 +23,14 @@ import {
   apiVotingUpdateData,
 } from "@/service/api-client/api-voting";
 import { today } from "@/utils/dateTimeView";
+import dayjs from "dayjs";
 import {
   router,
   Stack,
   useFocusEffect,
   useLocalSearchParams,
 } from "expo-router";
-import React, { useCallback, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import Toast from "react-native-toast-message";
 
 export default function VotingDetail() {
@@ -119,6 +121,23 @@ export default function VotingDetail() {
     setOpenDrawerPublish(false);
   };
 
+  const now = new Date().toISOString();
+  const isEventFinished = id && data?.akhirVote && dayjs(data.akhirVote).isBefore(now);
+
+  useEffect(() => {
+    if (isEventFinished) {
+      router.replace(`/(application)/(user)/voting/${id}/history`);
+    }
+  }, [isEventFinished, id]);
+
+  if (isEventFinished) {
+    return (
+      <ViewWrapper>
+        <CustomSkeleton />
+      </ViewWrapper>
+    );
+  }
+
   return (
     <>
       <Stack.Screen

app/(application)/(user)/voting/create.tsx

@@ -79,7 +79,7 @@ export default function VotingCreate() {
           type: "success",
           text1: "Data berhasil disimpan",
         });
-        router.replace("/(application)/(user)/voting/(tabs)/status");
+        router.replace("/(application)/(user)/voting/(tabs)/status?status=review");
       } else {
         Toast.show({
           type: "error",

app/(application)/admin/forum/[id]/list-report-posting.tsx

@@ -16,12 +16,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 {
   apiAdminForumDeactivatePosting,
   apiAdminForumListReportPostingById,
@@ -35,6 +34,7 @@ import { Divider } from "react-native-paper";
 import Toast from "react-native-toast-message";
 
 export default function AdminForumReportPosting() {
+  const { user } = useAuth();
   const { id } = useLocalSearchParams();
   const [openDrawerPage, setOpenDrawerPage] = useState(false);
   const [openDrawerAction, setOpenDrawerAction] = useState(false);
@@ -215,6 +215,9 @@ export default function AdminForumReportPosting() {
               onPressRight: async () => {
                 const response = await apiAdminForumDeactivatePosting({
                   id: id as string,
+                  data: {
+                    senderId: user?.id as string,
+                  },
                 });
 
                 if (!response.success) {

app/(application)/admin/voting/[id]/[status]/index.tsx

@@ -16,6 +16,7 @@ import AdminButtonReview from "@/components/_ShareComponent/Admin/ButtonReview";
 import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import ReportBox from "@/components/Box/ReportBox";
 import { MainColor } from "@/constants/color-palet";
+import { useAuth } from "@/hooks/use-auth";
 import funUpdateStatusVoting from "@/screens/Admin/Voting/funUpdateStatus";
 import { apiAdminVotingById } from "@/service/api-admin/api-admin-voting";
 import { colorBadgeStatus } from "@/utils/colorBadge";
@@ -29,6 +30,7 @@ import { List } from "react-native-paper";
 import Toast from "react-native-toast-message";
 
 export default function AdminVotingDetail() {
+  const { user } = useAuth();
   const { id, status } = useLocalSearchParams();
   const [data, setData] = useState<any | null>(null);
   const [isLoading, setIsLoading] = useState(false);
@@ -139,6 +141,10 @@ export default function AdminVotingDetail() {
       const response = await funUpdateStatusVoting({
         id: id as string,
         changeStatus,
+        data: {
+          senderId: user?.id as string,
+          catatan: "",
+        },
       });
 
       if (!response.success) {

app/(application)/admin/voting/[id]/[status]/reject-input.tsx

@@ -7,6 +7,7 @@ import {
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminButtonReject from "@/components/_ShareComponent/Admin/ButtonReject";
+import { useAuth } from "@/hooks/use-auth";
 import funUpdateStatusVoting from "@/screens/Admin/Voting/funUpdateStatus";
 import { apiAdminVotingById } from "@/service/api-admin/api-admin-voting";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
@@ -14,6 +15,7 @@ import { useCallback, useState } from "react";
 import Toast from "react-native-toast-message";
 
 export default function AdminVotingRejectInput() {
+  const { user } = useAuth()
   const { id, status } = useLocalSearchParams();
   const [data, setData] = useState("");
   const [isLoading, setIsLoading] = useState(false);
@@ -48,7 +50,10 @@ export default function AdminVotingRejectInput() {
       const response = await funUpdateStatusVoting({
         id: id as string,
         changeStatus,
-        data: data,
+        data: {
+          catatan: data,
+          senderId: user?.id as string,
+        },
       });
 
       if (!response.success) {

screens/Admin/Event/funUpdateStatus.ts

@@ -1,5 +1,5 @@
 import { apiAdminEventUpdateStatus } from "@/service/api-admin/api-admin-event";
-import { RejectedData } from "@/types/type-collect-other";
+import { typeRejectedData } from "@/types/type-collect-other";
 
 export const funUpdateStatusEvent = async ({
   id,
@@ -8,7 +8,7 @@ export const funUpdateStatusEvent = async ({
 }: {
   id: string;
   changeStatus: "publish" | "review" | "reject";
-  data?: RejectedData;
+  data?: typeRejectedData;
 }) => {
   try {
     console.log("[DATA]", data);

screens/Admin/Voting/funUpdateStatus.ts

@@ -1,4 +1,5 @@
 import { apiAdminVotingUpdateStatus } from "@/service/api-admin/api-admin-voting";
+import { typeRejectedData } from "@/types/type-collect-other";
 
 const funUpdateStatusVoting = async ({
   id,
@@ -7,7 +8,7 @@ const funUpdateStatusVoting = async ({
 }: {
   id: string;
   changeStatus: "publish" | "review" | "reject";
-  data?: string;
+  data?: typeRejectedData;
 }) => {
   try {
     const response = await apiAdminVotingUpdateStatus({

screens/Home/tabsList.ts

@@ -13,7 +13,8 @@ export const tabsHome: any = ({
     icon: "chatbubble-ellipses-outline",
     activeIcon: "chatbubble-ellipses",
     label: "Forum",
-    path: acceptedForumTermsAt ? "/forum" : "/forum/terms",
+    // path: acceptedForumTermsAt ? "/forum" : "/forum/terms",
+    path: "/forum",
     isActive: true,
     disabled: false,
   },

service/api-admin/api-admin-forum.ts

@@ -81,9 +81,17 @@ export async function apiAdminForumListReportPostingById({
   }
 }
 
-export async function apiAdminForumDeactivatePosting({ id }: { id: string }) {
+export async function apiAdminForumDeactivatePosting({
+  id,
+  data,
+}: {
+  id: string;
+  data: { senderId: string };
+}) {
   try {
-    const response = await apiConfig.put(`/mobile/admin/forum/${id}`);
+    const response = await apiConfig.put(`/mobile/admin/forum/${id}`, {
+      data: data,
+    });
     return response.data;
   } catch (error) {
     throw error;

service/api-admin/api-admin-voting.ts

@@ -1,3 +1,4 @@
+import { typeRejectedData } from "@/types/type-collect-other";
 import { apiConfig } from "../api-config";
 
 export async function apiAdminVoting({
@@ -32,7 +33,7 @@ export async function apiAdminVotingUpdateStatus({
   status,
 }: {
   id: string;
-  data?: string;
+  data?: typeRejectedData;
   status: "publish" | "review" | "reject";
 }) {
   try {

service/api-client/api-forum.ts

@@ -119,3 +119,12 @@ export async function apiForumDeleteComment({ id }: { id: string }) {
     throw error;
   }
 }
+
+export async function  apiForumGetReportPosting({id}: {id:string}) {
+   try {
+    const response = await apiConfig.get(`/mobile/forum/${id}/preview-report-posting`);
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}

types/type-collect-other.ts

@@ -1,4 +1,4 @@
-export type RejectedData = {
+export type typeRejectedData = {
   catatan?: string;
   senderId: string;
 };

types/type-forum.ts

@@ -0,0 +1,15 @@
+export interface TypeForum_CommentProps {
+  id: string;
+  isActive: boolean;
+  komentar: string;
+  createdAt: Date;
+  authorId: string;
+  Author: {
+    id: string;
+    username: string;
+    Profile: {
+      id: string;
+      imageId: string;
+    };
+  };
+}