Merge pull request 'upd: diskusi umum' (#7) from amalia/15-jan-26 into join

Reviewed-on: http://wibugit.wibudev.com/wibu/mobile-darmasaba/pulls/7

app/(application)/discussion/[id].tsx

@@ -47,6 +47,13 @@ type PropsKomentar = {
    updatedAt: string
 }
 
+type PropsFile = {
+   id: string;
+   idStorage: string;
+   name: string;
+   extension: string
+}
+
 export default function DetailDiscussionGeneral() {
    const { token, decryptToken } = useAuthSession()
    const entityUser = useSelector((state: any) => state.user)
@@ -55,6 +62,7 @@ export default function DetailDiscussionGeneral() {
    const [data, setData] = useState<Props>()
    const [dataKomentar, setDataKomentar] = useState<PropsKomentar[]>([])
    const [memberDiscussion, setMemberDiscussion] = useState(false)
+   const [fileDiscussion, setFileDiscussion] = useState<PropsFile[]>([])
    const [komentar, setKomentar] = useState('')
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [loading, setLoading] = useState(true)
@@ -93,7 +101,7 @@ export default function DetailDiscussionGeneral() {
    }
 
 
-   async function handleLoad(cat: 'detail' | 'komentar' | 'cek-anggota', loading: boolean) {
+   async function handleLoad(cat: 'detail' | 'komentar' | 'cek-anggota' | 'file', loading: boolean) {
       try {
          if (cat == "detail") {
             setLoading(loading)
@@ -110,6 +118,8 @@ export default function DetailDiscussionGeneral() {
             setDataKomentar(response.data)
          } else if (cat == 'cek-anggota') {
             setMemberDiscussion(response.data)
+         } else if (cat == 'file') {
+            setFileDiscussion(response.data)
          }
 
       } catch (error) {
@@ -130,6 +140,7 @@ export default function DetailDiscussionGeneral() {
       handleLoad('detail', true)
       handleLoad('komentar', true)
       handleLoad('cek-anggota', true)
+      handleLoad('file', true)
    }, []);
 
    async function handleKomentar() {
@@ -216,6 +227,7 @@ export default function DetailDiscussionGeneral() {
                         <SkeletonContent />
                         :
                         <BorderBottomItem2
+                           dataFile={fileDiscussion}
                            descEllipsize={false}
                            borderType="bottom"
                            icon={

app/(application)/discussion/create.tsx

@@ -125,9 +125,26 @@ export default function CreateDiscussionGeneral() {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiCreateDiscussionGeneral({
+         const fd = new FormData()
-            data: { ...dataForm, user: hasil, member: entitiesMember },
+
-         })
+         for (let i = 0; i < fileForm.length; i++) {
+            fd.append(`file${i}`, {
+               uri: fileForm[i].uri,
+               type: 'application/octet-stream',
+               name: fileForm[i].name,
+            } as any);
+         }
+
+         fd.append("data", JSON.stringify(
+            { ...dataForm, user: hasil, member: entitiesMember }
+         ))
+
+         const response = await apiCreateDiscussionGeneral(fd)
+
+         // const response = await apiCreateDiscussionGeneral({
+         //    data: { ...dataForm, user: hasil, member: entitiesMember },
+         // })
+
          if (response.success) {
             dispatch(setMemberChoose([]))
             dispatch(setUpdateDiscussionGeneralDetail(!update))

components/borderBottomItem2.tsx

@@ -1,6 +1,6 @@
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
-import { Ionicons } from "@expo/vector-icons";
+import { Ionicons, Entypo, EvilIcons } from "@expo/vector-icons";
 import React, { useState } from "react";
 import { Dimensions, Pressable, View } from "react-native";
 import { ScrollView } from "react-native-gesture-handler";
@@ -24,9 +24,10 @@ type Props = {
    textColor?: string,
    colorPress?: boolean
    titleShowAll?: boolean
+   dataFile: { id: string; idStorage: string; name: string; extension: string }[]
 }
 
-export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress, onLongPress, rightTopInfo, borderType, leftBottomInfo, rightBottomInfo, titleWeight, bgColor, width, descEllipsize, textColor, colorPress, titleShowAll }: Props) {
+export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress, onLongPress, rightTopInfo, borderType, leftBottomInfo, rightBottomInfo, titleWeight, bgColor, width, descEllipsize, textColor, colorPress, titleShowAll, dataFile }: Props) {
    const lebarDim = Dimensions.get("window").width;
    const lebar = width ? lebarDim * width / 100 : 'auto';
    const textColorFix = textColor ? textColor : 'black';
@@ -69,24 +70,18 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
 
          </View>
          {desc && <Text style={[Styles.textDefault, Styles.mt05, { textAlign: 'left', color: textColorFix }]} numberOfLines={descEllipsize == false ? 0 : 2} ellipsizeMode='tail'>{desc}</Text>}
-         <ScrollView horizontal style={[Styles.mv05]} showsHorizontalScrollIndicator={false}>
+         {
-            <View style={[Styles.rowItemsCenter, Styles.borderAll, Styles.round10, Styles.ph05, Styles.pv03, Styles.mr05]}>
+            dataFile.length > 0 && (
-               <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
+               <ScrollView horizontal style={[Styles.mv05]} showsHorizontalScrollIndicator={false}>
-               <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Text petama.pdf</Text>
+                  {dataFile.map((item, index) => (
-            </View>
+                     <View key={index} style={[Styles.rowItemsCenter, Styles.borderAll, Styles.round10, Styles.ph05, Styles.pv03, Styles.mr05]}>
-            <View style={[Styles.rowItemsCenter, Styles.borderAll, Styles.round10, Styles.ph05, Styles.pv03, Styles.mr05]}>
+                        <Ionicons name="document-text" size={18} color="grey" style={Styles.mr05} />
-               <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
+                        <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{item.name}.{item.extension}</Text>
-               <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Text petama.pdf</Text>
+                     </View>
-            </View>
+                  ))}
-            <View style={[Styles.rowItemsCenter, Styles.borderAll, Styles.round10, Styles.ph05, Styles.pv03, Styles.mr05]}>
+               </ScrollView>
-               <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
+            )
-               <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Text petama.pdf</Text>
+         }
-            </View>
-            <View style={[Styles.rowItemsCenter, Styles.borderAll, Styles.round10, Styles.ph05, Styles.pv03, Styles.mr05]}>
-               <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
-               <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Text petama.pdf</Text>
-            </View>
-         </ScrollView>
          {
             (leftBottomInfo || rightBottomInfo) &&
             (

lib/api.ts

@@ -235,8 +235,18 @@ export const apiEditDiscussionGeneral = async (data: { user: string, title: stri
    return response.data;
 };
 
-export const apiCreateDiscussionGeneral = async ({ data }: { data: { idGroup: string, title: string, desc: string, user: string, member: [] } }) => {
+// export const apiCreateDiscussionGeneral = async ({ data }: { data: { idGroup: string, title: string, desc: string, user: string, member: [] } }) => {
-   const response = await api.post(`/mobile/discussion-general`, data)
+//    const response = await api.post(`/mobile/discussion-general`, data)
+//    return response.data;
+// };
+
+export const apiCreateDiscussionGeneral = async (data: FormData) => {
+   // const response = await api.post(`/mobile/discussion-general`, data)
+   const response = await api.post(`/mobile/discussion-general`, data, {
+      headers: {
+         'Content-Type': 'multipart/form-data',
+      },
+   })
    return response.data;
 };