Compare commits

...

4 Commits

Author SHA1 Message Date
3854db9330 Event
Fix:
- Create event
- api master tipe event

## NO Issue
2025-09-10 17:43:01 +08:00
fc181bda7c API
User search:
Fix:
-  api get all user
- searching by username

Portofolio:
Fix:
- dot button hanya muncul jika user yang memiliki portofolio tersebut yang melihat

Profile:
Fix:
- dot button muncul hanya untuk user yang memiliki akunnya

### No Issue
2025-09-10 16:33:39 +08:00
fb822d20b6 Portofolio
Fix: API edit detail data

### No Issue
2025-09-10 12:12:11 +08:00
0e708dde0f API Portofolio
Fix:
- edit select sub bidang

### NO Issue
2025-09-03 17:42:17 +08:00
12 changed files with 872 additions and 185 deletions

View File

@@ -3,17 +3,32 @@ import {
SelectCustom, SelectCustom,
StackCustom, StackCustom,
TextAreaCustom, TextAreaCustom,
TextCustom,
TextInputCustom, TextInputCustom,
ViewWrapper, ViewWrapper,
} from "@/components"; } from "@/components";
import DateTimePickerCustom from "@/components/DateInput/DateTimePickerCustom"; import DateTimePickerCustom from "@/components/DateInput/DateTimePickerCustom";
import { useAuth } from "@/hooks/use-auth";
import { masterTypeEvent } from "@/lib/dummy-data/event/master-type-event"; import { masterTypeEvent } from "@/lib/dummy-data/event/master-type-event";
import { DateTimePickerEvent } from "@react-native-community/datetimepicker"; import { DateTimePickerEvent } from "@react-native-community/datetimepicker";
import { router } from "expo-router"; import { router } from "expo-router";
import React, { useState } from "react"; import React, { useState } from "react";
import { Platform } from "react-native"; import { Platform } from "react-native";
interface EventCreateProps {
title?: string;
lokasi?: string;
deskripsi?: string;
eventMaster_TipeAcaraId?: string;
tanggal?: string;
tanggalSelesai?: string;
authorId?: string;
}
export default function EventCreate() { export default function EventCreate() {
const [data, setData] = useState<EventCreateProps>();
const { user } = useAuth();
const [selectedDate, setSelectedDate] = useState< const [selectedDate, setSelectedDate] = useState<
Date | DateTimePickerEvent | null Date | DateTimePickerEvent | null
>(null); >(null);
@@ -24,24 +39,24 @@ export default function EventCreate() {
const handlerSubmit = () => { const handlerSubmit = () => {
try { try {
if (selectedDate) { // if (selectedDate) {
console.log("Tanggal yang dipilih:", selectedDate); // console.log("Tanggal yang dipilih:", selectedDate);
console.log(`ISO Format ${Platform.OS}:`, selectedDate.toString()); // console.log(`ISO Format ${Platform.OS}:`, selectedDate.toString());
// Kirim ke API atau proses lanjutan // // Kirim ke API atau proses lanjutan
} else { // } else {
console.log("Tanggal belum dipilih"); // console.log("Tanggal belum dipilih");
} // }
if (selectedEndDate) { // if (selectedEndDate) {
console.log("Tanggal yang dipilih:", selectedEndDate); // console.log("Tanggal yang dipilih:", selectedEndDate);
console.log(`ISO Format ${Platform.OS}:`, selectedEndDate.toString()); // console.log(`ISO Format ${Platform.OS}:`, selectedEndDate.toString());
// Kirim ke API atau proses lanjutan // // Kirim ke API atau proses lanjutan
} else { // } else {
console.log("Tanggal berakhir belum dipilih"); // console.log("Tanggal berakhir belum dipilih");
} // }
console.log("Data berhasil disimpan"); console.log("Data berhasil disimpan", JSON.stringify(data, null, 2));
router.navigate("/event/status"); // router.navigate("/event/status");
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
@@ -61,17 +76,21 @@ export default function EventCreate() {
placeholder="Masukkan nama event" placeholder="Masukkan nama event"
label="Nama Event" label="Nama Event"
required required
onChangeText={(value: any) => setData({ ...data, title: value })}
/> />
<SelectCustom <SelectCustom
label="Tipe Event" label="Tipe Event"
placeholder="Pilih tipe event" placeholder="Pilih tipe event"
data={masterTypeEvent} data={masterTypeEvent}
onChange={(value) => console.log(value)} onChange={(value: any) =>
setData({ ...data, eventMaster_TipeAcaraId: value })
}
/> />
<TextInputCustom <TextInputCustom
label="Lokasi" label="Lokasi"
placeholder="Masukkan lokasi event" placeholder="Masukkan lokasi event"
required required
onChangeText={(value: any) => setData({ ...data, lokasi: value })}
/> />
<DateTimePickerCustom <DateTimePickerCustom

View File

@@ -0,0 +1,357 @@
import {
ActionIcon,
BoxButtonOnFooter,
ButtonCustom,
CenterCustom,
SelectCustom,
Spacing,
StackCustom,
TextAreaCustom,
TextCustom,
TextInputCustom,
ViewWrapper,
} from "@/components";
import { MainColor } from "@/constants/color-palet";
import { ICON_SIZE_XLARGE } from "@/constants/constans-value";
import {
apiMasterBidangBisnis,
apiMasterSubBidangBisnis,
} from "@/service/api-client/api-master";
import {
apiGetOnePortofolio,
apiUpdatePortofolio,
} from "@/service/api-client/api-portofolio";
import {
IMasterBidangBisnis,
IMasterSubBidangBisnis,
} from "@/types/Type-Master";
import { Ionicons } from "@expo/vector-icons";
import { router, useLocalSearchParams } from "expo-router";
import _ from "lodash";
import { useEffect, useState } from "react";
import { Text, View } from "react-native";
import PhoneInput, { ICountry } from "react-native-international-phone-number";
import Toast from "react-native-toast-message";
interface IFormData {
id_Portofolio: string;
namaBisnis: string;
alamatKantor: string;
tlpn: string;
deskripsi: string;
masterBidangBisnisId: string;
subBidang: any[];
}
interface IListSubBidangSelected {
id: string;
MasterSubBidangBisnis: {
id: string;
name: string;
masterBidangBisnisId: string;
};
}
export default function PortofolioEdit() {
const { id } = useLocalSearchParams();
const [isLoading, setIsLoading] = useState(false);
const [data, setData] = useState<any>({});
const [selectedCountry, setSelectedCountry] = useState<null | ICountry>(null);
const [bidangBisnis, setBidangBisnis] = useState<IMasterBidangBisnis[]>([]);
const [subBidangBisnis, setSubBidangBisnis] = useState<
IMasterSubBidangBisnis[]
>([]);
const [selectedSubBidang, setSelectedSubBidang] = useState<string[]>([]);
const [listSubBidangSelected, setListSubBidangSelected] = useState<
IListSubBidangSelected[]
>([
{
id: "",
MasterSubBidangBisnis: {
id: "",
name: "",
masterBidangBisnisId: "",
},
},
]);
function handleInputValue(phoneNumber: string) {
setData({ ...data, tlpn: phoneNumber });
}
function handleSelectedCountry(country: ICountry) {
setSelectedCountry(country);
}
useEffect(() => {
onLoadData(id as string);
onLoadMasterBidang();
onLoadMasterSubBidangBisnis();
}, [id]);
const onLoadData = async (id: string) => {
const response = await apiGetOnePortofolio({ id: id });
if (response.data.tlpn && response.data.tlpn.includes("62")) {
const fixNumber = response.data.tlpn.replace("62", "");
setData({ ...response.data, tlpn: fixNumber });
}
};
const onLoadMasterBidang = async () => {
try {
const response = await apiMasterBidangBisnis();
setBidangBisnis(response.data);
} catch (error) {
setBidangBisnis([]);
console.log("Error onLoadMasterBidangBisnis", error);
}
};
async function onLoadMasterSubBidangBisnis() {
try {
const response = await apiMasterSubBidangBisnis({});
if (response.success) {
setSubBidangBisnis(response.data);
}
} catch (error) {
console.error("Error on load master sub bidang bisnis", error);
}
}
const handleSubmitUpdate = async () => {
try {
setIsLoading(true);
const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
const fixNumber = data.tlpn.replace(/\s+/g, "");
const realNumber = callingCode + fixNumber;
const newData: IFormData = {
id_Portofolio: data.id_Portofolio,
namaBisnis: data.namaBisnis,
alamatKantor: data.alamatKantor,
tlpn: realNumber,
deskripsi: data.deskripsi,
masterBidangBisnisId: data.masterBidangBisnisId,
subBidang: listSubBidangSelected,
};
const response = await apiUpdatePortofolio({
id: id as string,
data: newData,
category: "detail",
});
if (!response.success) {
Toast.show({
type: "info",
text1: "Info",
text2: response.message,
});
return;
}
Toast.show({
type: "success",
text1: "Sukses",
text2: "Data terupdate",
});
router.back();
} catch (error) {
console.log("Error handleSubmitUpdate", error);
} finally {
setIsLoading(false);
}
};
const buttonUpdate = (
<BoxButtonOnFooter>
<ButtonCustom
isLoading={isLoading}
disabled={isLoading}
onPress={handleSubmitUpdate}
>
Update
</ButtonCustom>
</BoxButtonOnFooter>
);
return (
<>
<ViewWrapper footerComponent={buttonUpdate}>
<StackCustom gap={"xs"}>
<TextInputCustom
required
label="Nama Bisnis"
placeholder="Masukkan nama bisnis"
value={data.namaBisnis}
onChangeText={(value: any) =>
setData({ ...data, namaBisnis: value })
}
/>
<SelectCustom
label="Bidang Usaha"
required
data={bidangBisnis?.map((item) => ({
label: item.name,
value: item.id,
}))}
value={data.masterBidangBisnisId}
onChange={(value) => {
setData({ ...(data as any), masterBidangBisnisId: value });
}}
/>
{listSubBidangSelected.map((item, index) => (
<SelectCustom
key={index}
label="Sub Bidang Usaha"
required
data={subBidangBisnis?.map((item) => ({
label: item.name,
value: item.id,
}))}
value={item.id || null}
onChange={(value) => {
console.log("Value >>", value);
}}
/>
))}
<CenterCustom>
<View
style={{ flexDirection: "row", alignItems: "center", gap: 10 }}
>
<ActionIcon
// disabled={
// selectedSubBidang.length === listSubBidangSelected.length
// }
onPress={() => {
setListSubBidangSelected([
...listSubBidangSelected,
{
id: "",
MasterSubBidangBisnis: {
id: "",
name: "",
masterBidangBisnisId: "",
},
},
]);
}}
icon={
<Ionicons
name="add-circle-outline"
size={ICON_SIZE_XLARGE}
color={MainColor.black}
/>
}
size="xl"
/>
<ActionIcon
// disabled={listSubBidangSelected.length <= 1}
onPress={() => {
const list = _.clone(listSubBidangSelected);
list.pop();
setListSubBidangSelected(list);
}}
icon={
<Ionicons
name="remove-circle-outline"
size={ICON_SIZE_XLARGE}
color={MainColor.black}
/>
}
size="xl"
/>
</View>
</CenterCustom>
<Spacing />
{/* <Grid>
<Grid.Col span={10}>
<SelectCustom
// disabled
label="Sub Bidang Usaha"
required
data={dummyMasterSubBidangBisnis.map((item) => ({
label: item.name,
value: item.id,
}))}
value={data.masterSubBidangBisnisId}
onChange={(value) => {
setData({ ...(data as any), masterSubBidangBisnisId: value });
}}
/>
</Grid.Col>
<Grid.Col
span={2}
style={{ alignItems: "center", justifyContent: "center" }}
>
<TouchableOpacity onPress={() => console.log("delete")}>
<Ionicons name="trash" size={24} color={MainColor.red} />
</TouchableOpacity>
</Grid.Col>
</Grid> */}
{/* <ButtonCenteredOnly onPress={() => console.log("add")}>
Tambah Pilihan
</ButtonCenteredOnly>
<Spacing /> */}
<View>
<View style={{ flexDirection: "row", alignItems: "center" }}>
<TextCustom semiBold style={{ color: MainColor.white_gray }}>
Nomor Telepon
</TextCustom>
<Text style={{ color: "red" }}> *</Text>
</View>
<Spacing height={5} />
<PhoneInput
value={data.tlpn}
onChangePhoneNumber={handleInputValue}
selectedCountry={selectedCountry}
onChangeSelectedCountry={handleSelectedCountry}
defaultCountry="ID"
placeholder="xxx-xxx-xxx"
/>
</View>
<Spacing />
<TextInputCustom
required
label="Alamat Bisnis"
placeholder="Masukkan alamat bisnis"
value={data.alamatKantor}
onChangeText={(value: any) =>
setData({ ...data, alamatKantor: value })
}
/>
<TextAreaCustom
label="Deskripsi Bisnis"
placeholder="Masukkan deskripsi bisnis"
value={data.deskripsi}
onChangeText={(value: any) =>
setData({ ...data, deskripsi: value })
}
autosize
minRows={2}
maxRows={5}
required
showCount
maxLength={1000}
/>
<Spacing />
<TextCustom>{JSON.stringify(subBidangBisnis, null, 2)}</TextCustom>
</StackCustom>
</ViewWrapper>
</>
);
}

View File

@@ -1,6 +1,9 @@
/* eslint-disable react-hooks/exhaustive-deps */
import { import {
ActionIcon,
BoxButtonOnFooter, BoxButtonOnFooter,
ButtonCustom, ButtonCustom,
CenterCustom,
SelectCustom, SelectCustom,
Spacing, Spacing,
StackCustom, StackCustom,
@@ -10,16 +13,26 @@ import {
ViewWrapper, ViewWrapper,
} from "@/components"; } from "@/components";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
import { apiMasterBidangBisnis } from "@/service/api-client/api-master"; import { ICON_SIZE_XLARGE } from "@/constants/constans-value";
import {
apiMasterBidangBisnis,
apiMasterSubBidangBisnis,
} from "@/service/api-client/api-master";
import { import {
apiGetOnePortofolio, apiGetOnePortofolio,
apiUpdatePortofolio, apiUpdatePortofolio,
} from "@/service/api-client/api-portofolio"; } from "@/service/api-client/api-portofolio";
import { IMasterBidangBisnis } from "@/types/Type-Master"; import {
IMasterBidangBisnis,
IMasterSubBidangBisnis,
} from "@/types/Type-Master";
import { Ionicons } from "@expo/vector-icons";
import { router, useLocalSearchParams } from "expo-router"; import { router, useLocalSearchParams } from "expo-router";
import _ from "lodash";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Text, View } from "react-native"; import { Text, View } from "react-native";
import PhoneInput, { ICountry } from "react-native-international-phone-number"; import PhoneInput, { ICountry } from "react-native-international-phone-number";
import { ActivityIndicator } from "react-native-paper";
import Toast from "react-native-toast-message"; import Toast from "react-native-toast-message";
interface IFormData { interface IFormData {
@@ -29,15 +42,35 @@ interface IFormData {
tlpn: string; tlpn: string;
deskripsi: string; deskripsi: string;
masterBidangBisnisId: string; masterBidangBisnisId: string;
subBidang: any[];
}
interface IListSubBidangSelected {
id: string;
MasterSubBidangBisnis?: {
id?: string;
name?: string;
masterBidangBisnisId?: string;
};
} }
export default function PortofolioEdit() { export default function PortofolioEdit() {
const { id } = useLocalSearchParams(); const { id } = useLocalSearchParams();
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [selectedCountry, setSelectedCountry] = useState<null | ICountry>(null);
const [bidangBisnis, setBidangBisnis] = useState<IMasterBidangBisnis[]>([]);
const [data, setData] = useState<any>({}); const [data, setData] = useState<any>({});
const [selectedCountry, setSelectedCountry] = useState<null | ICountry>(null);
const [bidangBisnis, setBidangBisnis] = useState<
IMasterBidangBisnis[] | null
>(null);
const [subBidangBisnis, setSubBidangBisnis] = useState<
IMasterSubBidangBisnis[] | null
>(null);
const [selectedSubBidang, setSelectedSubBidang] = useState<string[]>([]);
const [listSubBidangSelected, setListSubBidangSelected] = useState<
IListSubBidangSelected[]
>([]);
function handleInputValue(phoneNumber: string) { function handleInputValue(phoneNumber: string) {
setData({ ...data, tlpn: phoneNumber }); setData({ ...data, tlpn: phoneNumber });
} }
@@ -46,46 +79,200 @@ export default function PortofolioEdit() {
setSelectedCountry(country); setSelectedCountry(country);
} }
useEffect(() => { const onLoadMasterBidang = async () => {
onLoadData(id as string);
onLoadMaster();
}, [id]);
const onLoadData = async (id: string) => {
const response = await apiGetOnePortofolio({ id: id });
if (response.data.tlpn && response.data.tlpn.includes("62")) {
const fixNumber = response.data.tlpn.replace("62", "");
console.log("Fix Number >>", fixNumber);
setData({ ...response.data, tlpn: fixNumber });
}
};
const onLoadMaster = async () => {
try { try {
const response = await apiMasterBidangBisnis(); const response = await apiMasterBidangBisnis();
setBidangBisnis(response.data); setBidangBisnis(response.data);
return response.success;
} catch (error) { } catch (error) {
setBidangBisnis([]); setBidangBisnis([]);
console.log("Error onLoadMasterBidangBisnis", error); console.log("Error onLoadMasterBidangBisnis", error);
} }
}; };
async function onLoadMasterSubBidangBisnis() {
try {
const response = await apiMasterSubBidangBisnis({});
setSubBidangBisnis(response.data);
return response.success;
} catch (error) {
console.error("Error on load master sub bidang bisnis", error);
}
}
const handleLoadMaster = async (id: string) => {
const loadBidang = await onLoadMasterBidang();
const loadSubBidang = await onLoadMasterSubBidangBisnis();
if (!loadBidang || !loadSubBidang) {
return;
}
onLoadData(id);
};
useEffect(() => {
handleLoadMaster(id as any);
}, [id]);
const onLoadData = async (id: string) => {
const response = await apiGetOnePortofolio({ id: id });
if (response.success) {
const fixNumber = response.data.tlpn.replace("62", "");
setData({ ...response.data, tlpn: fixNumber });
// Cek apakah ada sub bidang bisnis yang terpilih
const prevSubBidang = response.data.Portofolio_BidangDanSubBidangBisnis;
if (prevSubBidang && prevSubBidang.length > 0) {
setListSubBidangSelected(prevSubBidang);
} else {
// Jika tidak ada sub bidang yang terpilih sebelumnya, tetap inisialisasi dengan array kosong
setListSubBidangSelected([
{
id: "",
MasterSubBidangBisnis: {
id: "",
name: "",
},
},
]);
}
const bisnisId = response.data.masterBidangBisnisId;
handleLoadSelectedSubBidang({
id: bisnisId,
});
}
};
// Handler untuk saat komponen pertama kali load
const handleLoadSelectedSubBidang = ({ id }: { id: string }) => {
if (!subBidangBisnis) return;
const filteredSubBidang: any = subBidangBisnis.filter((item) => {
return item.masterBidangBisnisId === id;
});
setSelectedSubBidang(filteredSubBidang);
};
// Handler untuk menambah sub bidang bisnis
const handleAddSubBidang = () => {
setListSubBidangSelected([
...listSubBidangSelected,
{
id: "",
MasterSubBidangBisnis: { id: "", name: "" },
},
]);
};
// Handler untuk menghapus sub bidang bisnis
const handleRemoveSubBidang = (index: number) => {
if (listSubBidangSelected.length <= 1) return;
const updatedList = [...listSubBidangSelected];
updatedList.splice(index, 1);
setListSubBidangSelected(updatedList);
};
// Handler untuk perubahan bidang bisnis
const handleBidangBisnisChange = (val: string) => {
const isSameBidang = data?.MasterBidangBisnis?.id === val;
setData({ ...(data as any), masterBidangBisnisId: val });
// Reset sub bidang jika ganti bidang
if (!isSameBidang) {
setListSubBidangSelected([
{
id: "",
MasterSubBidangBisnis: { id: "", name: "" },
},
]);
}
handleLoadSelectedSubBidang({ id: val });
};
// Handler untuk update sub bidang
const handleSubBidangChange = (value: string, index: number) => {
const select = selectedSubBidang.find((sub: any) => sub.id === value);
const list: any = _.cloneDeep(listSubBidangSelected);
list[index] = {
id: "",
MasterSubBidangBisnis: select || {
id: value,
name: "",
masterBidangBisnisId: "",
},
};
setListSubBidangSelected(list);
};
useEffect(() => {
if (subBidangBisnis?.length !== undefined && data.masterBidangBisnisId) {
handleLoadSelectedSubBidang({
id: data.masterBidangBisnisId,
});
}
}, [subBidangBisnis, data.masterBidangBisnisId]);
function validateData(data: any) {
if (
!data.namaBisnis ||
!data.alamatKantor ||
!data.tlpn ||
!data.deskripsi ||
!data.masterBidangBisnisId
) {
return false;
}
return true;
}
function validateDataSubBidang(dataArray: any[]) {
return !dataArray.some(
(item: any) =>
!item.MasterSubBidangBisnis.id ||
item.MasterSubBidangBisnis.id.trim() === ""
);
}
const handleSubmitUpdate = async () => { const handleSubmitUpdate = async () => {
const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
const fixNumber = data.tlpn.replace(/\s+/g, "");
const realNumber = callingCode + fixNumber;
const newData: IFormData = {
id_Portofolio: data.id_Portofolio,
namaBisnis: data.namaBisnis,
alamatKantor: data.alamatKantor,
tlpn: realNumber,
deskripsi: data.deskripsi,
masterBidangBisnisId: data.masterBidangBisnisId,
subBidang: listSubBidangSelected,
};
if (!validateData(newData)) {
return Toast.show({
type: "error",
text1: "Harap lengkapi data",
});
}
if (!validateDataSubBidang(listSubBidangSelected as any)) {
return Toast.show({
type: "error",
text1: "Harap lengkapi sub bidang",
});
}
try { try {
setIsLoading(true); setIsLoading(true);
const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
const fixNumber = data.tlpn.replace(/\s+/g, "");
const realNumber = callingCode + fixNumber;
const newData: IFormData = {
id_Portofolio: data.id_Portofolio,
namaBisnis: data.namaBisnis,
alamatKantor: data.alamatKantor,
tlpn: realNumber,
deskripsi: data.deskripsi,
masterBidangBisnisId: data.masterBidangBisnisId,
};
const response = await apiUpdatePortofolio({ const response = await apiUpdatePortofolio({
id: id as string, id: id as string,
@@ -100,14 +287,14 @@ export default function PortofolioEdit() {
text2: response.message, text2: response.message,
}); });
return return;
} }
Toast.show({ Toast.show({
type: "success", type: "success",
text1: "Sukses", text1: "Sukses",
text2: "Data terupdate", text2: "Data terupdate",
}); });
router.back(); router.back();
} catch (error) { } catch (error) {
@@ -129,6 +316,16 @@ export default function PortofolioEdit() {
</BoxButtonOnFooter> </BoxButtonOnFooter>
); );
if (!bidangBisnis || !subBidangBisnis) {
return (
<>
<ViewWrapper>
<ActivityIndicator size="large" color={MainColor.yellow} />
</ViewWrapper>
</>
);
}
return ( return (
<> <>
<ViewWrapper footerComponent={buttonUpdate}> <ViewWrapper footerComponent={buttonUpdate}>
@@ -151,40 +348,83 @@ export default function PortofolioEdit() {
value: item.id, value: item.id,
}))} }))}
value={data.masterBidangBisnisId} value={data.masterBidangBisnisId}
onChange={(value) => { onChange={(value: any) => {
setData({ ...(data as any), masterBidangBisnisId: value }); handleBidangBisnisChange(value);
}} }}
/> />
{/* <Grid> {listSubBidangSelected.map((item, index) => {
<Grid.Col span={10}> // Filter data untuk select sub bidang, menghilangkan yang sudah dipilih kecuali untuk item ini sendiri
const selectedIds = listSubBidangSelected
.filter((_, i) => i !== index)
.map((s) => s.MasterSubBidangBisnis?.id)
.filter((id) => id); // Filter hanya yang memiliki id (tidak kosong)
const availableSubBidangOptions = (selectedSubBidang || [])
.filter((sub: any) => {
// Tampilkan jika ini adalah opsi yang dipilih saat ini atau belum dipilih di sub bidang lainnya
return (
sub.id === item.MasterSubBidangBisnis?.id ||
!selectedIds.includes(sub.id)
);
})
.map((sub: any) => ({
value: sub.id,
label: sub.name,
}));
return (
<SelectCustom <SelectCustom
// disabled key={index}
label="Sub Bidang Usaha" label="Sub Bidang Usaha"
required required
data={dummyMasterSubBidangBisnis.map((item) => ({ data={availableSubBidangOptions}
label: item.name, value={item.MasterSubBidangBisnis?.id || null}
value: item.id, onChange={(value: any) => {
}))} handleSubBidangChange(value, index);
value={data.masterSubBidangBisnisId}
onChange={(value) => {
setData({ ...(data as any), masterSubBidangBisnisId: value });
}} }}
/> />
</Grid.Col> );
<Grid.Col })}
span={2}
style={{ alignItems: "center", justifyContent: "center" }} <CenterCustom>
<View
style={{ flexDirection: "row", alignItems: "center", gap: 10 }}
> >
<TouchableOpacity onPress={() => console.log("delete")}> <ActionIcon
<Ionicons name="trash" size={24} color={MainColor.red} /> disabled={
</TouchableOpacity> selectedSubBidang.length === listSubBidangSelected.length
</Grid.Col> }
</Grid> */} onPress={() => {
{/* <ButtonCenteredOnly onPress={() => console.log("add")}> handleAddSubBidang();
Tambah Pilihan }}
</ButtonCenteredOnly> icon={
<Spacing /> */} <Ionicons
name="add-circle-outline"
size={ICON_SIZE_XLARGE}
color={MainColor.black}
/>
}
size="xl"
/>
<ActionIcon
disabled={listSubBidangSelected.length <= 1}
onPress={() => {
handleRemoveSubBidang(listSubBidangSelected.length - 1);
}}
icon={
<Ionicons
name="remove-circle-outline"
size={ICON_SIZE_XLARGE}
color={MainColor.black}
/>
}
size="xl"
/>
</View>
</CenterCustom>
<Spacing />
<View> <View>
<View style={{ flexDirection: "row", alignItems: "center" }}> <View style={{ flexDirection: "row", alignItems: "center" }}>

View File

@@ -1,4 +1,5 @@
import { DrawerCustom, Spacing, StackCustom } from "@/components"; /* eslint-disable react-hooks/exhaustive-deps */
import { DrawerCustom, LoaderCustom, Spacing, StackCustom } from "@/components";
import LeftButtonCustom from "@/components/Button/BackButton"; import LeftButtonCustom from "@/components/Button/BackButton";
import ViewWrapper from "@/components/_ShareComponent/ViewWrapper"; import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
@@ -10,6 +11,7 @@ import { drawerItemsPortofolio } from "@/screens/Portofolio/ListPage";
import Portofolio_MenuDrawerSection from "@/screens/Portofolio/MenuDrawer"; import Portofolio_MenuDrawerSection from "@/screens/Portofolio/MenuDrawer";
import Portofolio_SocialMediaSection from "@/screens/Portofolio/SocialMediaSection"; import Portofolio_SocialMediaSection from "@/screens/Portofolio/SocialMediaSection";
import { apiGetOnePortofolio } from "@/service/api-client/api-portofolio"; import { apiGetOnePortofolio } from "@/service/api-client/api-portofolio";
import { apiUser } from "@/service/api-client/api-user";
import { GStyles } from "@/styles/global-styles"; import { GStyles } from "@/styles/global-styles";
import { Ionicons } from "@expo/vector-icons"; import { Ionicons } from "@expo/vector-icons";
import { Stack, useFocusEffect, useLocalSearchParams } from "expo-router"; import { Stack, useFocusEffect, useLocalSearchParams } from "expo-router";
@@ -18,10 +20,12 @@ import { TouchableOpacity } from "react-native";
export default function Portofolio() { export default function Portofolio() {
const { id } = useLocalSearchParams(); const { id } = useLocalSearchParams();
const { user } = useAuth();
const [isDrawerOpen, setIsDrawerOpen] = useState(false); const [isDrawerOpen, setIsDrawerOpen] = useState(false);
const [isLoadingDelete, setIsLoadingDelete] = useState(false); const [isLoadingDelete, setIsLoadingDelete] = useState(false);
const [data, setData] = useState<any>(); const [data, setData] = useState<any>();
const [profileId, setProfileId] = useState<any>();
const { user } = useAuth();
const openDrawer = () => { const openDrawer = () => {
setIsDrawerOpen(true); setIsDrawerOpen(true);
@@ -33,24 +37,27 @@ export default function Portofolio() {
useFocusEffect( useFocusEffect(
useCallback(() => { useCallback(() => {
onLoadData(id as string); onLoadData(id as string);
onLoadUserByToken();
}, [id]) }, [id])
); );
async function onLoadData(id: string) { async function onLoadData(id: string) {
const response = await apiGetOnePortofolio({ id: id }); const response = await apiGetOnePortofolio({ id: id });
console.log( console.log(
"Response portofolio >>", "[PROFILE ID]>>",
JSON.stringify(response.data, null, 2) JSON.stringify(response.data.Profile.id, null, 2)
); );
setData(response.data); setData(response.data);
} }
const userId = user?.id; const onLoadUserByToken = async () => {
const userLoginId = data?.Profile?.userId const response = await apiUser(user?.id as string);
console.log(
console.log("User ID >>", userId); "[PROFILE LOGIN]>>",
console.log("User Login ID >>", userLoginId); JSON.stringify(response.data?.Profile.id, null, 2)
);
setProfileId(response?.data?.Profile?.id);
};
return ( return (
<> <>
@@ -59,32 +66,41 @@ export default function Portofolio() {
options={{ options={{
title: "Portofolio", title: "Portofolio",
headerLeft: () => <LeftButtonCustom />, headerLeft: () => <LeftButtonCustom />,
headerRight: () => ( headerRight: () =>
<TouchableOpacity onPress={openDrawer}> data?.Profile?.id !== profileId ? null : (
<Ionicons <TouchableOpacity onPress={openDrawer}>
name="ellipsis-vertical" <Ionicons
size={20} name="ellipsis-vertical"
color={MainColor.yellow} size={20}
/> color={MainColor.yellow}
</TouchableOpacity> />
), </TouchableOpacity>
),
headerStyle: GStyles.headerStyle, headerStyle: GStyles.headerStyle,
headerTitleStyle: GStyles.headerTitleStyle, headerTitleStyle: GStyles.headerTitleStyle,
}} }}
/> />
<ViewWrapper> <ViewWrapper>
{/* <PorfofolioSection setShowDeleteAlert={setDeleteAlert} data={data} /> */} {!data || !profileId ? (
<StackCustom> <LoaderCustom />
<Portofolio_Data data={data} listSubBidang={data?.Portofolio_BidangDanSubBidangBisnis as any []} /> ) : (
<Portofolio_BusinessLocation /> <StackCustom>
<Portofolio_SocialMediaSection data={data?.Portofolio_MediaSosial} /> <Portofolio_Data
<Portofolio_ButtonDelete data={data}
id={id as string} listSubBidang={data?.Portofolio_BidangDanSubBidangBisnis as any[]}
isLoadingDelete={isLoadingDelete} />
setIsLoadingDelete={setIsLoadingDelete} <Portofolio_BusinessLocation />
/> <Portofolio_SocialMediaSection
<Spacing /> data={data?.Portofolio_MediaSosial}
</StackCustom> />
<Portofolio_ButtonDelete
id={id as string}
isLoadingDelete={isLoadingDelete}
setIsLoadingDelete={setIsLoadingDelete}
/>
<Spacing />
</StackCustom>
)}
</ViewWrapper> </ViewWrapper>
{/* Drawer Komponen Eksternal */} {/* Drawer Komponen Eksternal */}

View File

@@ -1,3 +1,5 @@
/* eslint-disable react-hooks/exhaustive-deps */
import { LoaderCustom } from "@/components";
import ViewWrapper from "@/components/_ShareComponent/ViewWrapper"; import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
import LeftButtonCustom from "@/components/Button/BackButton"; import LeftButtonCustom from "@/components/Button/BackButton";
import DrawerCustom from "@/components/Drawer/DrawerCustom"; import DrawerCustom from "@/components/Drawer/DrawerCustom";
@@ -9,6 +11,7 @@ import Profile_PortofolioSection from "@/screens/Profile/PortofolioSection";
import ProfileSection from "@/screens/Profile/ProfileSection"; import ProfileSection from "@/screens/Profile/ProfileSection";
import { apiGetPortofolio } from "@/service/api-client/api-portofolio"; import { apiGetPortofolio } from "@/service/api-client/api-portofolio";
import { apiProfile } from "@/service/api-client/api-profile"; import { apiProfile } from "@/service/api-client/api-profile";
import { apiUser } from "@/service/api-client/api-user";
import { GStyles } from "@/styles/global-styles"; import { GStyles } from "@/styles/global-styles";
import { IProfile } from "@/types/Type-Profile"; import { IProfile } from "@/types/Type-Profile";
import { Ionicons } from "@expo/vector-icons"; import { Ionicons } from "@expo/vector-icons";
@@ -20,9 +23,10 @@ export default function Profile() {
const { id } = useLocalSearchParams(); const { id } = useLocalSearchParams();
const [isDrawerOpen, setIsDrawerOpen] = useState(false); const [isDrawerOpen, setIsDrawerOpen] = useState(false);
const [data, setData] = useState<IProfile>(); const [data, setData] = useState<IProfile>();
const [dataPortofolio, setDataPortofolio] = useState<any[]>(); const [dataToken, setDataToken] = useState<IProfile>();
const [listPortofolio, setListPortofolio] = useState<any[]>();
const { logout, isAdmin } = useAuth(); const { logout, isAdmin, user } = useAuth();
const openDrawer = () => { const openDrawer = () => {
setIsDrawerOpen(true); setIsDrawerOpen(true);
@@ -36,14 +40,28 @@ export default function Profile() {
useCallback(() => { useCallback(() => {
onLoadData(id as string); onLoadData(id as string);
onLoadPortofolio(id as string); onLoadPortofolio(id as string);
onLoadUserByToken();
isUserCheck();
}, [id]) }, [id])
); );
const isUserCheck = () => {
const userId = id;
const userLoginId = dataToken?.id;
return userId === userLoginId;
};
const onLoadData = async (id: string) => { const onLoadData = async (id: string) => {
const response = await apiProfile({ id: id }); const response = await apiProfile({ id: id });
setData(response.data); setData(response.data);
}; };
const onLoadUserByToken = async () => {
const response = await apiUser(user?.id as string);
setDataToken(response?.data?.Profile);
};
const onLoadPortofolio = async (id: string) => { const onLoadPortofolio = async (id: string) => {
const response = await apiGetPortofolio({ id: id }); const response = await apiGetPortofolio({ id: id });
const lastTwoByDate = response.data const lastTwoByDate = response.data
@@ -52,7 +70,7 @@ export default function Profile() {
new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime() new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
) // urut desc ) // urut desc
.slice(0, 2); .slice(0, 2);
setDataPortofolio(lastTwoByDate); setListPortofolio(lastTwoByDate);
}; };
return ( return (
@@ -61,27 +79,34 @@ export default function Profile() {
options={{ options={{
title: "Profile", title: "Profile",
headerLeft: () => <LeftButtonCustom />, headerLeft: () => <LeftButtonCustom />,
headerRight: () => ( headerRight: () =>
<TouchableOpacity onPress={openDrawer}> isUserCheck() && (
<Ionicons <TouchableOpacity onPress={openDrawer}>
name="ellipsis-vertical" <Ionicons
size={20} name="ellipsis-vertical"
color={MainColor.yellow} size={20}
/> color={MainColor.yellow}
</TouchableOpacity> />
), </TouchableOpacity>
),
headerStyle: GStyles.headerStyle, headerStyle: GStyles.headerStyle,
headerTitleStyle: GStyles.headerTitleStyle, headerTitleStyle: GStyles.headerTitleStyle,
}} }}
/> />
{/* Main View */} {/* Main View */}
<ViewWrapper> <ViewWrapper>
<ProfileSection data={data as any} /> {!data || !dataToken ? (
<LoaderCustom />
) : (
<>
<ProfileSection data={data as any} />
<Profile_PortofolioSection <Profile_PortofolioSection
data={dataPortofolio as any} data={listPortofolio as any}
profileId={id as string} profileId={id as string}
/> />
</>
)}
</ViewWrapper> </ViewWrapper>
{/* Drawer Komponen Eksternal */} {/* Drawer Komponen Eksternal */}

View File

@@ -1,5 +1,5 @@
import { import {
AvatarCustom, AvatarComp,
ClickableCustom, ClickableCustom,
Grid, Grid,
Spacing, Spacing,
@@ -10,39 +10,42 @@ import {
} from "@/components"; } from "@/components";
import { MainColor } from "@/constants/color-palet"; import { MainColor } from "@/constants/color-palet";
import { ICON_SIZE_SMALL } from "@/constants/constans-value"; import { ICON_SIZE_SMALL } from "@/constants/constans-value";
import { apiAllUser } from "@/service/api-client/api-user";
import { Ionicons } from "@expo/vector-icons"; import { Ionicons } from "@expo/vector-icons";
import { router } from "expo-router"; import { router } from "expo-router";
import _ from "lodash";
import { useEffect, useState } from "react";
export default function UserSearch() { export default function UserSearch() {
function generateRandomPhoneNumber(index: number) { const [data, setData] = useState<any[]>([]);
let prefix; const [search, setSearch] = useState<string>("");
// Menentukan prefix berdasarkan index genap atau ganjil useEffect(() => {
if (index % 2 === 0) { onLoadData(search);
const evenPrefixes = ["6288", "6289", "6281"]; }, [search]);
prefix = evenPrefixes[Math.floor(Math.random() * evenPrefixes.length)];
} else { const onLoadData = async (search: string) => {
const oddPrefixes = ["6285", "6283"]; try {
prefix = oddPrefixes[Math.floor(Math.random() * oddPrefixes.length)]; const response = await apiAllUser({ search: search });
console.log("[DATA USER] >", JSON.stringify(response.data, null, 2));
setData(response.data);
} catch (error) {
console.log("Error fetching data", error);
} }
};
// Menghitung panjang sisa nomor acak (antara 10 - 12 digit) const handleSearch = (search: string) => {
const remainingLength = Math.floor(Math.random() * 3) + 10; // 10, 11, atau 12 setSearch(search);
onLoadData(search);
};
// Membuat sisa nomor acak
let randomNumber = "";
for (let i = 0; i < remainingLength; i++) {
randomNumber += Math.floor(Math.random() * 10); // Digit acak antara 0-9
}
// Menggabungkan prefix dan sisa nomor
return prefix + randomNumber;
}
return ( return (
<> <>
<ViewWrapper <ViewWrapper
headerComponent={ headerComponent={
<TextInputCustom <TextInputCustom
value={search}
onChangeText={handleSearch}
iconLeft={ iconLeft={
<Ionicons <Ionicons
name="search" name="search"
@@ -57,41 +60,46 @@ export default function UserSearch() {
} }
> >
<StackCustom> <StackCustom>
{Array.from({ length: 20 }).map((e, index) => { {!_.isEmpty(data) ? (
return ( data?.map((e, index) => {
<Grid key={index}> return (
<Grid.Col span={2}> <ClickableCustom
<AvatarCustom href={`/profile/${index}`}/> key={index}
</Grid.Col> onPress={() => {
<Grid.Col span={9}> console.log("Ke Profile");
<TextCustom size="large">Nama user {index}</TextCustom> router.push(`/profile/${e?.Profile?.id}`);
<TextCustom size="small">
+{generateRandomPhoneNumber(index)}
</TextCustom>
</Grid.Col>
<Grid.Col
span={1}
style={{
justifyContent: "center",
alignItems: "flex-end",
}} }}
> >
<ClickableCustom <Grid>
onPress={() => { <Grid.Col span={2}>
console.log("Ke Profile"); <AvatarComp fileId={e?.Profile?.imageId} size="base" />
router.push(`/profile/${index}`); </Grid.Col>
}} <Grid.Col span={9}>
> <StackCustom gap={"sm"}>
<Ionicons <TextCustom size="large">{e?.username}</TextCustom>
name="chevron-forward" <TextCustom size="small">+{e?.nomor}</TextCustom>
size={ICON_SIZE_SMALL} </StackCustom>
color={MainColor.white} </Grid.Col>
/> <Grid.Col
</ClickableCustom> span={1}
</Grid.Col> style={{
</Grid> justifyContent: "center",
); alignItems: "flex-end",
})} }}
>
<Ionicons
name="chevron-forward"
size={ICON_SIZE_SMALL}
color={MainColor.white}
/>
</Grid.Col>
</Grid>
</ClickableCustom>
);
})
) : (
<TextCustom align="center">Tidak ditemukan</TextCustom>
)}
</StackCustom> </StackCustom>
<Spacing height={50} /> <Spacing height={50} />
</ViewWrapper> </ViewWrapper>

View File

@@ -0,0 +1,8 @@
import { MainColor } from "@/constants/color-palet";
import { ActivityIndicator } from "react-native";
export default function LoaderCustom({ size }: { size?: "small" | "large" }) {
return (
<ActivityIndicator size={size ? size : "small"} color={MainColor.yellow} />
);
}

View File

@@ -61,6 +61,8 @@ import DummyLandscapeImage from "./_ShareComponent/DummyLandscapeImage";
import GridComponentView from "./_ShareComponent/GridSectionView"; import GridComponentView from "./_ShareComponent/GridSectionView";
// Progress // Progress
import ProgressCustom from "./Progress/ProgressCustom"; import ProgressCustom from "./Progress/ProgressCustom";
// Loader
import LoaderCustom from "./Loader/LoaderCustom";
export { export {
// ActionIcon // ActionIcon
@@ -128,4 +130,6 @@ export {
TextInputCustom, TextInputCustom,
// ViewWrapper // ViewWrapper
ViewWrapper, ViewWrapper,
// Loader
LoaderCustom,
}; };

View File

@@ -92,7 +92,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
await AsyncStorage.setItem("authToken", token); await AsyncStorage.setItem("authToken", token);
const responseUser = await apiConfig.get( const responseUser = await apiConfig.get(
`/mobile/user?token=${token}`, `/mobile?token=${token}`,
{ {
headers: { headers: {
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,

View File

@@ -89,7 +89,7 @@ export default function Portofolio_Data({
// }, // },
// ]; // ];
console.log("List Sub Bidang >>", JSON.stringify(listSubBidang, null, 2)); // console.log("List Sub Bidang >>", JSON.stringify(listSubBidang, null, 2));
return ( return (
<> <>

View File

@@ -20,3 +20,7 @@ export async function apiMasterSubBidangBisnis({ id }: { id?: string }) {
throw error; throw error;
} }
} }
// export async function apiMasterEventType(params:type) {
// }

View File

@@ -1,6 +1,12 @@
import { apiConfig } from "../api-config"; import { apiConfig } from "../api-config";
export async function apiUser(id: string) { export async function apiUser(id: string) {
const response = await apiConfig.get(`/user/${id}`); const response = await apiConfig.get(`/mobile/user/${id}`);
return response.data; return response.data;
} }
export async function apiAllUser({ search }: { search: string }) {
const response = await apiConfig.get(`/mobile/user?search=${search}`);
return response.data;
}