Merge pull request 'amalia/26-sept-25' (#43) from amalia/26-sept-25 into join

Reviewed-on: bip/mobile-darmasaba#43

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

@@ -160,7 +160,6 @@ export default function DetailDiscussionGeneral() {
                                  :
                                  <LabelStatus category={data.status == 1 ? 'success' : 'error'} text={data.status == 1 ? 'BUKA' : 'TUTUP'} size="small" />
                            }
-                           // rightTopInfo={data?.createdAt}
                            desc={data?.desc}
                            leftBottomInfo={
                               <View style={[Styles.rowItemsCenter]}>
@@ -224,7 +223,11 @@ export default function DetailDiscussionGeneral() {
                         <Pressable onPress={() => {
                            (komentar != '' && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
                               && handleKomentar()
-                        }}>
+                        }}
+                           style={[
+                              Platform.OS == 'android' && Styles.mb15,
+                           ]}
+                        >
                            <MaterialIcons name="send" size={25} style={(komentar == '' || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
                         </Pressable>
                      }

app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx

@@ -324,12 +324,15 @@ export default function DiscussionDetail() {
                                     entityUser.role == "cosupadmin") &&
                                  handleKomentar();
                            }}
+                           style={[
+                              Platform.OS == 'android' && Styles.mb15,
+                           ]}
                         >
                            <MaterialIcons
                               name="send"
                               size={25}
                               style={
-                                 komentar == "" ||
+                                 [komentar == "" ||
                                     loadingSend ||
                                     data?.status == 2 ||
                                     data?.isActive == false ||
@@ -337,7 +340,8 @@ export default function DiscussionDetail() {
                                        entityUser.role == "coadmin") &&
                                        !isMemberDivision)
                                     ? Styles.cGray
-                                    : Styles.cDefault
+                                    : Styles.cDefault,
+                                 ]
                               }
                            />
                         </Pressable>

app/(application)/division/[id]/(fitur-division)/document/index.tsx

@@ -18,6 +18,7 @@ import Styles from "@/constants/Styles";
 import {
    apiDocumentDelete,
    apiDocumentRename,
+   apiGetDivisionOneFeature,
    apiGetDocument,
    apiShareDocument,
 } from "@/lib/api";
@@ -85,6 +86,8 @@ export default function DocumentDivision() {
    const update = useSelector((state: any) => state.dokumenUpdate)
    const [refreshing, setRefreshing] = useState(false)
    const [loadingOpen, setLoadingOpen] = useState(false)
+   const [isMemberDivision, setIsMemberDivision] = useState(false)
+   const entityUser = useSelector((state: any) => state.user)
    const [bodyRename, setBodyRename] = useState({
       id: "",
       name: "",
@@ -93,6 +96,24 @@ export default function DocumentDivision() {
       extension: "",
    });
 
+   async function handleCheckMember() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+         setIsMemberDivision(response.data);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleCheckMember()
+   }, [id])
+
    async function handleLoad(loading: boolean) {
       try {
          setLoading(loading)
@@ -347,7 +368,7 @@ export default function DocumentDivision() {
                         }}
                      />
                   ) : (
-                     <HeaderRightDocument path={path} />
+                     <HeaderRightDocument path={path} isMember={isMemberDivision} />
                   ),
             }}
          />
@@ -407,6 +428,7 @@ export default function DocumentDivision() {
                                           : `${item.name}.${item.extension}`
                                     }
                                     dateTime={item.createdAt}
+                                    canChecked={(entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision}
                                     onChecked={() => {
                                        handleCheckboxChange(index);
                                     }}

app/(application)/division/[id]/(fitur-division)/task/[detail]/index.tsx

@@ -125,7 +125,7 @@ export default function DetailTaskDivision() {
                <SectionTanggalTugasTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
                <SectionFileTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
                <SectionLinkTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
-               <SectionMemberTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionMemberTask refreshing={refreshing} isAdminDivision={isAdminDivision} />
             </View>
          </ScrollView>
       </SafeAreaView>

components/document/headerDocument.tsx

@@ -15,7 +15,7 @@ import { InputForm } from "../inputForm";
 import MenuItemRow from "../menuItemRow";
 import ModalFloat from "../modalFloat";
 
-export default function HeaderRightDocument({ path }: { path: string }) {
+export default function HeaderRightDocument({ path, isMember }: { path: string, isMember: boolean }) {
    const [isVisible, setVisible] = useState(false);
    const [newFolder, setNewFolder] = useState(false);
    const { id } = useLocalSearchParams<{ id: string }>();
@@ -25,6 +25,7 @@ export default function HeaderRightDocument({ path }: { path: string }) {
    const update = useSelector((state: any) => state.dokumenUpdate)
    const [loading, setLoading] = useState(false)
    const [loadingFolder, setLoadingFolder] = useState(false)
+   const entityUser = useSelector((state: any) => state.user)
 
    async function handleCreateFolder() {
       try {
@@ -102,11 +103,14 @@ export default function HeaderRightDocument({ path }: { path: string }) {
 
    return (
       <>
+         {
+            ((entityUser.role != "user" && entityUser.role != "coadmin") || isMember) &&
             <ButtonMenuHeader
                onPress={() => {
                   setVisible(true);
                }}
             />
+         }
          <DrawerBottom
             animation="slide"
             isVisible={isVisible}

components/document/itemFile.tsx

@@ -11,9 +11,10 @@ type Props = {
    checked?: boolean
    onChecked?: () => void
    onPress?: () => void
+   canChecked?: boolean
 }
 
-export default function ItemFile({ category, checked, dateTime, title, onChecked, onPress }: Props) {
+export default function ItemFile({ category, checked, dateTime, title, onChecked, onPress, canChecked }: Props) {
    return (
       <View style={[Styles.wrapItemBorderBottom]}>
          <View style={[Styles.rowItemsCenter]}>
@@ -43,10 +44,13 @@ export default function ItemFile({ category, checked, dateTime, title, onChecked
 
             </Pressable>
             <View style={[Styles.rowSpaceBetween, { flex: 1, alignItems: 'center' }]}>
-               <Pressable style={[Styles.ml10, {flex:1},]} onPress={onPress}>
+               <Pressable style={[Styles.ml10, { flex: 1 },]} onPress={onPress}>
                   <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{title}</Text>
                   <Text style={[Styles.textInformation]}>{dateTime}</Text>
                </Pressable>
+               {
+                  !canChecked ? <></>
+                     :
                      <Pressable onPress={onChecked}>
                         {
                            checked
@@ -55,6 +59,7 @@ export default function ItemFile({ category, checked, dateTime, title, onChecked
                         }
 
                      </Pressable>
+               }
             </View>
          </View>
       </View>

components/inputForm.tsx

@@ -44,7 +44,11 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
                round && Styles.round30,
                { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' },
                error && { borderColor: "red" },
-               Platform.OS == 'ios' ? { paddingVertical: 10 } : { paddingVertical: 0 },
+               Platform.OS == 'ios' ? { paddingVertical: 10 } : { paddingVertical: 0, minHeight: 40 },
+               { alignItems: 'center' },
+               multiline
+                  ? { alignItems: "flex-end" } // multiline: tombol send di bawah
+                  : { alignItems: "center" }, // default: tetap di tengah
             ]}>
                {itemRight != undefined ? itemRight : itemLeft}
                <TextInput
@@ -58,12 +62,9 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
                   numberOfLines={3}
                   style={[
                      Styles.mh05,
-                     multiline && { height: '100%', paddingTop: 3 },
+                     multiline && { height: '100%', maxHeight: 100 },
                      { width: width ? lebar * width / 100 : lebar * 0.78, color: 'black' },
-                     Platform.OS == 'ios' ? { paddingVertical: 1 } : { paddingVertical: 5 },
+                     Platform.OS == 'ios' ? { paddingVertical: 1, paddingTop: 3 } : { paddingVertical: 0 },
-                     multiline && {
-                        maxHeight: 100,     // batas maksimal
-                     }
                   ]}
                />
             </View>

components/task/sectionMemberTask.tsx

@@ -26,7 +26,7 @@ type Props = {
    position: string;
 };
 
-export default function SectionMemberTask({ refreshing, isMemberDivision }: { refreshing: boolean, isMemberDivision: boolean }) {
+export default function SectionMemberTask({ refreshing, isAdminDivision }: { refreshing: boolean, isAdminDivision: boolean }) {
    const [isModal, setModal] = useState(false);
    const entityUser = useSelector((state: any) => state.user);
    const { token, decryptToken } = useAuthSession();
@@ -168,7 +168,7 @@ export default function SectionMemberTask({ refreshing, isMemberDivision }: { re
 
 
                {
-                  (entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision
+                  (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision
                      ?
                      <MenuItemRow
                         icon={