Merge pull request #182 from bipproduction/amalia/11-des-24

fix: pencegahan error
This commit is contained in:
Bagasbanuna02
2024-12-11 16:15:29 +08:00
committed by GitHub
3 changed files with 115 additions and 68 deletions

View File

@@ -77,21 +77,28 @@ export default function UIGlobal_Drawer({
</Group> </Group>
<SimpleGrid cols={component.length < 4 ? component.length : 4}> <SimpleGrid cols={component.length < 4 ? component.length : 4}>
{component.map((e, i) => ( {component.map((e, i) => (
<Stack key={i} align="center" spacing={"xs"}> <Stack key={i} align="center" spacing={"xs"}
<ActionIcon
variant="transparent"
c="white"
onClick={() => { onClick={() => {
setPageId(e?.id); setPageId(e?.id);
setIsLoading(true); setIsLoading(true);
router.push(e?.path, { scroll: false }); router.push(e?.path, { scroll: false });
}} }}
> >
{isLoading && e?.id === pageId ? ( <ActionIcon
variant="transparent"
c="white"
>
{/* PAKE LOADING */}
{/* {isLoading && e?.id === pageId ? (
<ComponentGlobal_Loader /> <ComponentGlobal_Loader />
) : ( ) : (
e?.icon e?.icon
)} )} */}
{/* GA PAKE LOADING */}
{e?.icon}
</ActionIcon> </ActionIcon>
<Text fz={"sm"} align="center" color="white"> <Text fz={"sm"} align="center" color="white">
{e?.name} {e?.name}

View File

@@ -13,6 +13,7 @@ export default function ComponentPortofolio_ButtonMoreNew() {
const param = useParams<{ id: string }>() const param = useParams<{ id: string }>()
const [userLoginId, setUserLoginId] = useState("") const [userLoginId, setUserLoginId] = useState("")
const [authorId, setAuthorId] = useState("") const [authorId, setAuthorId] = useState("")
const [mapId, setMapId] = useState(true)
const [openDrawer, setOpenDrawer] = useState(false) const [openDrawer, setOpenDrawer] = useState(false)
const listPage = [ const listPage = [
@@ -48,13 +49,48 @@ export default function ComponentPortofolio_ButtonMoreNew() {
}, },
]; ];
const listPage2 = [
{
id: "1",
name: "Edit detail ",
icon: <IconEdit />,
path: RouterPortofolio.edit_data_bisnis + `${param.id}`,
},
{
id: "2",
name: "Edit logo ",
icon: <IconPhotoEdit />,
path: RouterPortofolio.edit_logo_bisnis + `${param.id}`,
},
{
id: "3",
name: "Edit sosial media",
icon: <IconId />,
path: RouterPortofolio.edit_medsos_bisnis + `${param.id}`,
},
{
id: "4",
name: "Edit data map",
icon: <IconMapPin2 />,
path: RouterMap.create + `${param.id}`,
},
{
id: "5",
name: "Custom pin map",
icon: <IconMapPin />,
path: RouterMap.custom_pin + `${param.id}`,
},
];
async function funGetPortofolio() { async function funGetPortofolio() {
try { try {
const response = await apiGetOnePortofolioById(param.id, "bisnis") const response = await apiGetOnePortofolioById(param.id, "bisnis")
const response3 = await apiGetOnePortofolioById(param.id, "lokasi")
const response2 = await funGetUserIdByToken() const response2 = await funGetUserIdByToken()
if (response.success) { if (response.success) {
setAuthorId(response.data.authorId) setAuthorId(response.data.authorId)
setMapId((response3.data?.mapId !== null && response3.data?.mapId !== undefined) ? true : false)
setUserLoginId(response2) setUserLoginId(response2)
} }
} catch (error) { } catch (error) {
@@ -80,7 +116,7 @@ export default function ComponentPortofolio_ButtonMoreNew() {
<UIGlobal_Drawer <UIGlobal_Drawer
opened={openDrawer} opened={openDrawer}
close={() => setOpenDrawer(false)} close={() => setOpenDrawer(false)}
component={listPage} component={mapId ? listPage : listPage2}
/> />
</> </>
) )

View File

@@ -1,7 +1,7 @@
import { APIs } from "@/app/lib"; import { APIs } from "@/app/lib";
import { AccentColor } from "@/app_modules/_global/color"; import { AccentColor } from "@/app_modules/_global/color";
import { defaultMapZoom } from "@/app_modules/map/lib/default_lat_long"; import { defaultMapZoom } from "@/app_modules/map/lib/default_lat_long";
import { Paper, Stack, Title, Avatar, Skeleton } from "@mantine/core"; import { Paper, Stack, Title, Avatar, Skeleton, Text } from "@mantine/core";
import "mapbox-gl/dist/mapbox-gl.css"; import "mapbox-gl/dist/mapbox-gl.css";
import { useParams } from "next/navigation"; import { useParams } from "next/navigation";
import { useState } from "react"; import { useState } from "react";
@@ -10,6 +10,7 @@ import { IDetailPortofolioLokasi } from "../lib/type_portofolio";
import { apiGetOnePortofolioById } from "../lib/api_portofolio"; import { apiGetOnePortofolioById } from "../lib/api_portofolio";
import { useShallowEffect } from "@mantine/hooks"; import { useShallowEffect } from "@mantine/hooks";
import { ComponentMap_DetailData, ComponentMap_DrawerDetailData } from "@/app_modules/map/_component"; import { ComponentMap_DetailData, ComponentMap_DrawerDetailData } from "@/app_modules/map/_component";
import ComponentGlobal_IsEmptyData from "@/app_modules/_global/component/is_empty_data";
export default function Portofolio_UiMapNew({ mapboxToken }: { mapboxToken: string }) { export default function Portofolio_UiMapNew({ mapboxToken }: { mapboxToken: string }) {
const [loading, setLoading] = useState(true) const [loading, setLoading] = useState(true)
@@ -56,6 +57,9 @@ export default function Portofolio_UiMapNew({ mapboxToken }: { mapboxToken: stri
loading ? loading ?
<Skeleton radius={"md"} w={"100%"} h={100} /> <Skeleton radius={"md"} w={"100%"} h={100} />
: :
dataPorto?.mapId === null || dataPorto?.mapId === undefined ?
<ComponentGlobal_IsEmptyData text="Tidak ada data" height={10} />
:
<Map <Map
mapboxAccessToken={mapboxToken} mapboxAccessToken={mapboxToken}
mapStyle={"mapbox://styles/mapbox/streets-v11"} mapStyle={"mapbox://styles/mapbox/streets-v11"}