Merge pull request 'amalia/13-okt-25' (#50 ) from amalia/13-okt-25 into join

Reviewed-on: bip/mobile-darmasaba#50
upd : tampilan edit komentar
2025-10-13 17:20:53 +08:00 · 2025-10-13 17:17:57 +08:00 · 2025-10-13 16:08:12 +08:00 · 2025-10-09 17:55:18 +08:00 · 2025-10-09 14:21:14 +08:00 · 2025-10-09 10:12:18 +08:00
8 changed files with 188 additions and 90 deletions
--- a/app.config.js
+++ b/app.config.js
@@ -4,7 +4,7 @@ export default {
   expo: {
      name: "Desa+",
      slug: "mobile-darmasaba",
-      version: "2.0.1", // Versi aplikasi (App Store)
+      version: "2.0.2", // Versi aplikasi (App Store)
      jsEngine: "jsc",
      orientation: "portrait",
      icon: "./assets/images/logo-icon-small.png",
@@ -14,7 +14,7 @@ export default {
      ios: {
         supportsTablet: true,
         bundleIdentifier: "mobiledarmasaba.app",
-         buildNumber: "3",
+         buildNumber: "4",
         infoPlist: {
            ITSAppUsesNonExemptEncryption: false,
            CFBundleDisplayName: "Desa+"
@@ -23,7 +23,7 @@ export default {
      },
      android: {
         package: "mobiledarmasaba.app",
-         versionCode: 10,
+         versionCode: 11,
         adaptiveIcon: {
            foregroundImage: "./assets/images/logo-icon-small.png",
            backgroundColor: "#ffffff"
--- a/app/(application)/discussion/[id].tsx
+++ b/app/(application)/discussion/[id].tsx
@@ -1,9 +1,12 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import HeaderRightDiscussionGeneralDetail from "@/components/discussion_general/headerDiscussionDetail";
+import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
 import LabelStatus from "@/components/labelStatus";
+import MenuItemRow from "@/components/menuItemRow";
 import Skeleton from "@/components/skeleton";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from '@/components/Text';
@@ -14,12 +17,13 @@ import Styles from "@/constants/Styles";
 import { apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar } from "@/lib/api";
 import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Ionicons, MaterialIcons } from "@expo/vector-icons";
+import { Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
 import { ref } from '@react-native-firebase/database';
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";

 type Props = {
@@ -38,6 +42,8 @@ type PropsKomentar = {
   idUser: string
   img: string
   username: string
+   isEdited: boolean
+   updatedAt: string
 }

 export default function DetailDiscussionGeneral() {
@@ -54,6 +60,14 @@ export default function DetailDiscussionGeneral() {
   const arrSkeleton = Array.from({ length: 3 }, (_, index) => index)
   const reference = ref(getDB(), `/discussion-general/${id}`);
   const headerHeight = useHeaderHeight();
+   const [detailMore, setDetailMore] = useState<any>([])
+   const [loadingSendKomentar, setLoadingSendKomentar] = useState(false)
+   const [isVisible, setVisible] = useState(false)
+   const [selectKomentar, setSelectKomentar] = useState({
+      id: '',
+      comment: ''
+   })
+

   useEffect(() => {
      const onValueChange = reference.on('value', snapshot => {
@@ -116,19 +130,29 @@ export default function DetailDiscussionGeneral() {

   async function handleKomentar() {
      try {
+         setLoadingSendKomentar(true)
         if (komentar != '') {
            const hasil = await decryptToken(String(token?.current))
            const response = await apiSendDiscussionGeneralCommentar({ id: id, data: { desc: komentar, user: hasil } })
            if (response.success) {
               setKomentar('')
               updateTrigger()
+            } else {
+               Toast.show({ type: 'small', text1: 'Gagal menambahkan komentar' })
            }
         }
      } catch (error) {
         console.error(error)
+      } finally {
+         setLoadingSendKomentar(false)
      }
   }

+   function handleMenuKomentar(id: string, comment: string) {
+      setSelectKomentar({ id, comment })
+      setVisible(true)
+   }
+
   return (
      <>
         <Stack.Screen
@@ -195,6 +219,20 @@ export default function DetailDiscussionGeneral() {
                                    title={item.username}
                                    rightTopInfo={item.createdAt}
                                    desc={item.comment}
+                                    rightBottomInfo={item.isEdited ? "Edited" : ""}
+                                    descEllipsize={detailMore.includes(item.id) ? false : true}
+                                    onPress={() => {
+                                       setDetailMore((prev: any) => {
+                                          if (prev.includes(item.id)) {
+                                             return prev.filter((id: string) => id !== item.id)
+                                          } else {
+                                             return [...prev, item.id]
+                                          }
+                                       })
+                                    }}
+                                    onLongPress={() => {
+                                       handleMenuKomentar(item.id, item.comment)
+                                    }}
                                 />
                              )
                           })
@@ -211,31 +249,67 @@ export default function DetailDiscussionGeneral() {
                  Styles.w100,
                  { backgroundColor: "#f4f4f4" },
               ]}>
-                  <InputForm
-                     disable={(data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin")))}
-                     type="default"
-                     round
-                     placeholder="Kirim Komentar"
-                     bg="white"
-                     onChange={setKomentar}
-                     value={komentar}
-                     multiline
-                     itemRight={
-                        <Pressable onPress={() => {
-                           (komentar != '' && !regexOnlySpacesOrEnter.test(komentar) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
-                              && handleKomentar()
-                        }}
-                           style={[
-                              Platform.OS == 'android' && Styles.mb12,
-                           ]}
-                        >
-                           <MaterialIcons name="send" size={25} style={(komentar == '' || regexOnlySpacesOrEnter.test(komentar) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
-                        </Pressable>
-                     }
-                  />
+                  {
+                     data?.status != 2 && data?.isActive && ((entityUser.role != "user" && entityUser.role != "coadmin") || memberDiscussion)
+                        ?
+                        <InputForm
+                           disable={(data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin")))}
+                           type="default"
+                           round
+                           placeholder="Kirim Komentar"
+                           bg="white"
+                           onChange={setKomentar}
+                           value={komentar}
+                           multiline
+                           itemRight={
+                              <Pressable onPress={() => {
+                                 (!loadingSendKomentar && komentar != '' && !regexOnlySpacesOrEnter.test(komentar) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
+                                    && handleKomentar()
+                              }}
+                                 style={[
+                                    Platform.OS == 'android' && Styles.mb12,
+                                 ]}
+                              >
+                                 <MaterialIcons name="send" size={25} style={(loadingSendKomentar || komentar == '' || regexOnlySpacesOrEnter.test(komentar) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
+                              </Pressable>
+                           }
+                        />
+                        :
+                        <View style={[Styles.pv20, { alignItems: 'center' }]}>
+                           <Text style={[Styles.textInformation, Styles.cGray]}>
+                              {
+                                 data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota diskusi yang dapat memberikan komentar"
+                              }
+                           </Text>
+                        </View>
+                  }
+
               </View>
            </KeyboardAvoidingView>
         </View >
+
+         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Komentar">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
+                  title="Edit"
+                  onPress={() => {
+                     setVisible(false)
+                  }}
+               />
+               <MenuItemRow
+                  icon={<MaterialIcons name="delete" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => {
+                     AlertKonfirmasi({
+                        title: 'Konfirmasi',
+                        desc: 'Apakah anda yakin ingin menghapus komentar?',
+                        onPress: () => { setVisible(false) }
+                     })
+                  }}
+               />
+            </View>
+         </DrawerBottom>
      </>
   )
 }
--- a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
@@ -64,6 +64,7 @@ export default function DiscussionDetail() {
   const reference = ref(getDB(), `/discussion-division/${detail}`);
   const [refreshing, setRefreshing] = useState(false)
   const headerHeight = useHeaderHeight();
+   const [detailMore, setDetailMore] = useState<any>([])


   useEffect(() => {
@@ -276,7 +277,16 @@ export default function DiscussionDetail() {
                                 title={item.username}
                                 rightTopInfo={item.createdAt}
                                 desc={item.comment}
-                                 descEllipsize={false}
+                                 descEllipsize={detailMore.includes(item.id) ? false : true}
+                                 onPress={() => {
+                                    setDetailMore((prev: any) => {
+                                       if (prev.includes(item.id)) {
+                                          return prev.filter((id: string) => id !== item.id)
+                                       } else {
+                                          return [...prev, item.id]
+                                       }
+                                    })
+                                 }}
                              />
                           ))
                     }
@@ -295,61 +305,67 @@ export default function DiscussionDetail() {
                     { backgroundColor: "#f4f4f4" },
                  ]}
               >
-                  <InputForm
-                     disable={
-                        data?.status == 2 ||
-                        data?.isActive == false ||
-                        ((entityUser.role == "user" || entityUser.role == "coadmin") &&
-                           !isMemberDivision)
-                     }
-                     bg="white"
-                     type="default"
-                     round
-                     multiline
-                     placeholder="Kirim Komentar"
-                     onChange={setKomentar}
-                     value={komentar}
-                     itemRight={
-                        <Pressable
-                           onPress={() => {
-                              komentar != "" &&
-                                 !regexOnlySpacesOrEnter.test(komentar) &&
-                                 !loadingSend &&
-                                 data?.status != 2 &&
-                                 data?.isActive &&
-                                 (((entityUser.role == "user" ||
-                                    entityUser.role == "coadmin") &&
-                                    isMemberDivision) ||
-                                    entityUser.role == "admin" ||
-                                    entityUser.role == "supadmin" ||
-                                    entityUser.role == "developer" ||
-                                    entityUser.role == "cosupadmin") &&
-                                 handleKomentar();
-                           }}
-                           style={[
-                              Platform.OS == 'android' && Styles.mb12,
-                           ]}
-                        >
-                           <MaterialIcons
-                              name="send"
-                              size={25}
-                              style={
-                                 [komentar == "" ||
-                                    regexOnlySpacesOrEnter.test(komentar) ||
-                                    loadingSend ||
-                                    data?.status == 2 ||
-                                    data?.isActive == false ||
-                                    ((entityUser.role == "user" ||
-                                       entityUser.role == "coadmin") &&
-                                       !isMemberDivision)
-                                    ? Styles.cGray
-                                    : Styles.cDefault,
-                                 ]
+                  {
+                     data?.status != 2 && data?.isActive && ((entityUser.role != "user" && entityUser.role != "coadmin") ||
+                        isMemberDivision)
+                        ?
+                        <InputForm
+                           // disable={
+                           //    data?.status == 2 ||
+                           //    data?.isActive == false ||
+                           //    ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
+                           // }
+                           bg="white"
+                           type="default"
+                           round
+                           multiline
+                           placeholder="Kirim Komentar"
+                           onChange={setKomentar}
+                           value={komentar}
+                           itemRight={
+                              <Pressable
+                                 onPress={() => {
+                                    komentar != "" &&
+                                       !regexOnlySpacesOrEnter.test(komentar) &&
+                                       !loadingSend &&
+                                       data?.status != 2 &&
+                                       data?.isActive &&
+                                       (((entityUser.role == "user" ||
+                                          entityUser.role == "coadmin") &&
+                                          isMemberDivision) ||
+                                          entityUser.role == "admin" ||
+                                          entityUser.role == "supadmin" ||
+                                          entityUser.role == "developer" ||
+                                          entityUser.role == "cosupadmin") &&
+                                       handleKomentar();
+                                 }}
+                                 style={[
+                                    Platform.OS == 'android' && Styles.mb12,
+                                 ]}
+                              >
+                                 <MaterialIcons
+                                    name="send"
+                                    size={25}
+                                    style={
+                                       [komentar == "" || regexOnlySpacesOrEnter.test(komentar) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
+                                          ? Styles.cGray
+                                          : Styles.cDefault,
+                                       ]
+                                    }
+                                 />
+                              </Pressable>
+                           }
+                        />
+                        :
+                        <View style={[Styles.pv20, { alignItems: 'center' }]}>
+                           <Text style={[Styles.textInformation, Styles.cGray]}>
+                              {
+                                 data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota divisi yang dapat memberikan komentar"
                              }
-                           />
-                        </Pressable>
-                     }
-                  />
+                           </Text>
+                        </View>
+                  }
+
               </View>
            </KeyboardAvoidingView>

--- a/components/borderBottomItem.tsx
+++ b/components/borderBottomItem.tsx
@@ -11,6 +11,7 @@ type Props = {
   desc?: string
   rightTopInfo?: string
   onPress?: () => void
+   onLongPress?: () => void
   borderType: 'all' | 'bottom' | 'none'
   leftBottomInfo?: React.ReactNode | string
   rightBottomInfo?: React.ReactNode | string
@@ -21,13 +22,13 @@ type Props = {
   textColor?: string
 }

-export default function BorderBottomItem({ title, subtitle, icon, desc, onPress, rightTopInfo, borderType, leftBottomInfo, rightBottomInfo, titleWeight, bgColor, width, descEllipsize, textColor }: Props) {
+export default function BorderBottomItem({ title, subtitle, icon, desc, onPress, onLongPress, rightTopInfo, borderType, leftBottomInfo, rightBottomInfo, titleWeight, bgColor, width, descEllipsize, textColor }: Props) {
   const lebarDim = Dimensions.get("window").width;
   const lebar = width ? lebarDim * width / 100 : 'auto';
   const textColorFix = textColor ? textColor : 'black';

   return (
-      <Pressable style={[borderType == 'bottom' ? Styles.wrapItemBorderBottom : borderType == 'all' ? Styles.wrapItemBorderAll : Styles.wrapItemBorderNone, bgColor && bgColor == 'white' && ColorsStatus.white]} onPress={onPress}>
+      <Pressable onLongPress={onLongPress} style={[borderType == 'bottom' ? Styles.wrapItemBorderBottom : borderType == 'all' ? Styles.wrapItemBorderAll : Styles.wrapItemBorderNone, bgColor && bgColor == 'white' && ColorsStatus.white]} onPress={onPress}>
         <View style={[Styles.rowItemsCenter]}>
            {icon}
            <View style={[Styles.rowSpaceBetween, width ? { width: lebar } : { width: '88%' }]}>
@@ -52,16 +53,16 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
         {
            (leftBottomInfo || rightBottomInfo) &&
            (
-               <View style={[Styles.rowSpaceBetween, Styles.mt10]}>
+               <View style={[rightBottomInfo && !leftBottomInfo ? Styles.rowSpaceBetweenReverse : Styles.rowSpaceBetween, Styles.mt05]}>
                  {
                     typeof leftBottomInfo == 'string' ?
-                        <Text style={[Styles.textInformation, Styles.cGray, { textAlign: 'left' }]}>{leftBottomInfo}</Text>
+                        <Text style={[Styles.textInformation, Styles.cGray]}>{leftBottomInfo}</Text>
                        :
                        leftBottomInfo
                  }
                  {
                     typeof rightBottomInfo == 'string' ?
-                        <Text style={[Styles.textInformation, Styles.mt05, Styles.cGray, { textAlign: 'right' }]}>{rightBottomInfo}</Text>
+                        <Text style={[Styles.textInformation, Styles.cGray]}>{rightBottomInfo}</Text>
                        :
                        rightBottomInfo
                  }
--- a/components/project/headerProjectDetail.tsx
+++ b/components/project/headerProjectDetail.tsx
@@ -67,7 +67,7 @@ export default function HeaderRightProjectDetail({ id, status }: Props) {
   return (
      <>
         <ButtonMenuHeader onPress={() => { setVisible(true) }} />
-         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={30}>
+         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={35}>
            <View style={Styles.rowItemsCenter}>
               <MenuItemRow
                  icon={<AntDesign name="pluscircle" color="black" size={25} />}
--- a/components/task/headerTaskDetail.tsx
+++ b/components/task/headerTaskDetail.tsx
@@ -69,7 +69,7 @@ export default function HeaderRightTaskDetail({ id, division, status, isAdminDiv
   return (
      <>
         <ButtonMenuHeader onPress={() => { setVisible(true) }} />
-         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={30}>
+         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={35}>
            <View style={Styles.rowItemsCenter}>
               <MenuItemRow
                  icon={<AntDesign name="pluscircle" color="black" size={25} />}
--- a/constants/Styles.ts
+++ b/constants/Styles.ts
@@ -187,6 +187,9 @@ const Styles = StyleSheet.create({
   pv15: {
      paddingVertical: 15
   },
+   pv20: {
+      paddingVertical: 20
+   },
   p15: {
      padding: 15
   },
@@ -247,6 +250,10 @@ const Styles = StyleSheet.create({
      justifyContent: 'space-between',
      flexDirection: 'row'
   },
+   rowSpaceBetweenReverse: {
+      justifyContent: 'space-between',
+      flexDirection: 'row-reverse'
+   },
   rowItemsCenter: {
      flexDirection: 'row',
      alignItems: 'center'
--- a/ios/Desa/Info.plist
+++ b/ios/Desa/Info.plist
@@ -19,7 +19,7 @@
    <key>CFBundlePackageType</key>
    <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
    <key>CFBundleShortVersionString</key>
-    <string>2.0.1</string>
+    <string>2.0.2</string>
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>CFBundleURLTypes</key>
@@ -39,7 +39,7 @@
      </dict>
    </array>
    <key>CFBundleVersion</key>
-    <string>3</string>
+    <string>4</string>
    <key>ITSAppUsesNonExemptEncryption</key>
    <false/>
    <key>LSMinimumSystemVersion</key>
Author	SHA1	Message	Date
amaliadwiy	6ffda375a4	Merge pull request 'amalia/13-okt-25' (#50 ) from amalia/13-okt-25 into join Reviewed-on: bip/mobile-darmasaba#50	2025-10-13 17:20:53 +08:00
amaliadwiy	2347b322cf	upd : tampilan edit komentar Deskripsi: - menampilkan tulisan edited jika komentar telah di edit - menampilkan modal jika komentar di longpress No Issues	2025-10-13 17:17:57 +08:00
amaliadwiy	13a1d0e858	fix: tinggi drawer Deskripsi: - update tinggi drawer bottom pada detail project dan detail tugas divisi karena tombol batal tertutup navigasi pada device android No Issues	2025-10-13 16:08:12 +08:00
amaliadwiy	f6ea4f65bb	Merge pull request 'amalia/09-okt-25' (#49 ) from amalia/09-okt-25 into join Reviewed-on: bip/mobile-darmasaba#49	2025-10-09 17:55:18 +08:00
amaliadwiy	6069756d6f	fix :komentar diskusi Deskripsi: - list komentar bisa di lihat lebih banyak >> diskusi umum dan diskusi divisi - loading disable saat menambah komentar >> diskusi umum No Issues	2025-10-09 14:21:14 +08:00
amaliadwiy	5de8962a0a	upd: rollout new version	2025-10-09 10:12:18 +08:00
amaliadwiy	67ac6d920c	Merge pull request 'upd: komentar diskusi umum dan divisi' (#48 ) from amalia/08-okt-25 into join Reviewed-on: bip/mobile-darmasaba#48	2025-10-08 14:08:05 +08:00
amaliadwiy	f9c8c92d3b	upd: komentar diskusi umum dan divisi Deskripsi: - memberikan note sesuai dengan status diskusi agar lebih jelas - pada fitur diskusi umum dan diskusi divisi No Issues	2025-10-08 12:07:56 +08:00