From f55d4c601fcd653f5c2e34a57ac1dc150e019d84 Mon Sep 17 00:00:00 2001 From: Bagasbanuna02 Date: Thu, 20 Feb 2025 12:02:11 +0800 Subject: [PATCH 1/2] fix job deskripsi: - fix api job : detail > publish, review, reject, draft, arsip --- src/app/api/job/[id]/route.ts | 51 ++++++- src/app/dev/job/detail/arsip/[id]/page.tsx | 9 +- src/app/dev/job/detail/draft/[id]/page.tsx | 9 +- src/app/dev/job/detail/main/[id]/page.tsx | 7 +- src/app/dev/job/detail/publish/[id]/page.tsx | 8 +- src/app/dev/job/detail/reject/[id]/page.tsx | 7 +- src/app/dev/job/detail/review/[id]/page.tsx | 13 +- src/app/dev/job/edit/[id]/page.tsx | 6 +- src/app/zCoba/skeleton/page.tsx | 13 +- .../job/component/api_fetch_job.ts | 39 +++++- .../job/component/detail/detail_data.tsx | 28 +--- src/app_modules/job/component/index.ts | 2 +- .../skeleton/comp_skeleton_beranda.tsx | 50 ++++++- src/app_modules/job/detail/arsip/view.tsx | 73 +++++++--- src/app_modules/job/detail/draft/view.tsx | 61 ++++++--- src/app_modules/job/detail/main/view.tsx | 42 +++++- src/app_modules/job/detail/publish/view.tsx | 125 +++++++++--------- src/app_modules/job/detail/reject/view.tsx | 61 +++++++-- src/app_modules/job/detail/review/view.tsx | 68 +++++++--- src/app_modules/job/edit/view.tsx | 36 ++++- .../job/fun/create/fun_create_no_file.ts | 57 ++++---- .../job/fun/edit/fun_edit_by_id.ts | 74 ++++++----- src/app_modules/job/main/arsip/view_arsip.tsx | 17 +-- 23 files changed, 568 insertions(+), 288 deletions(-) diff --git a/src/app/api/job/[id]/route.ts b/src/app/api/job/[id]/route.ts index 9a4abc30..da6515ab 100644 --- a/src/app/api/job/[id]/route.ts +++ b/src/app/api/job/[id]/route.ts @@ -1,9 +1,52 @@ +import backendLogger from "@/util/backendLogger"; import { NextResponse } from "next/server"; export { GET }; -async function GET(request: Request) { - return NextResponse.json({ - success: true, - }); +async function GET(request: Request, { params }: { params: { id: string } }) { + try { + const { id } = params; + const data = await prisma.job.findUnique({ + where: { + id: id, + }, + include: { + Author: { + select: { + username: true, + nomor: true, + Profile: { + select: { + name: true, + alamat: true, + }, + }, + }, + }, + MasterStatus: { + select: { + name: true, + }, + }, + }, + }); + return NextResponse.json( + { + success: true, + message: "Success get data job-vacancy", + data: data, + }, + { status: 200 } + ); + } catch (error) { + backendLogger.error("Error get data job-vacancy", error); + return NextResponse.json( + { + success: false, + message: "Error get data job-vacancy", + reason: (error as Error).message, + }, + { status: 500 } + ); + } } diff --git a/src/app/dev/job/detail/arsip/[id]/page.tsx b/src/app/dev/job/detail/arsip/[id]/page.tsx index b37f2fd6..455d6a9e 100644 --- a/src/app/dev/job/detail/arsip/[id]/page.tsx +++ b/src/app/dev/job/detail/arsip/[id]/page.tsx @@ -1,12 +1,9 @@ -import { Job_DetailArsip } from "@/app_modules/job"; -import { job_getOneById } from "@/app_modules/job/fun/get/get_one_by_id"; +import { Job_DetailArsip } from "@/app_modules/job"; -export default async function Page({params}:{params: {id: string}}) { - let jobId = params.id - const dataJob = await job_getOneById(jobId) +export default async function Page() { return ( <> - + ); } diff --git a/src/app/dev/job/detail/draft/[id]/page.tsx b/src/app/dev/job/detail/draft/[id]/page.tsx index 646e6ab3..c5445f62 100644 --- a/src/app/dev/job/detail/draft/[id]/page.tsx +++ b/src/app/dev/job/detail/draft/[id]/page.tsx @@ -1,14 +1,11 @@ import Job_DetailDraft from "@/app_modules/job/detail/draft/view"; -import { job_getOneById } from "@/app_modules/job/fun/get/get_one_by_id"; -export default async function Page({params}: {params: {id: string}}) { - let jobId = params.id - const dataJob = await job_getOneById(jobId) - +export default async function Page() { + return ( <> - + ); } diff --git a/src/app/dev/job/detail/main/[id]/page.tsx b/src/app/dev/job/detail/main/[id]/page.tsx index 2928fe5d..f8234a83 100644 --- a/src/app/dev/job/detail/main/[id]/page.tsx +++ b/src/app/dev/job/detail/main/[id]/page.tsx @@ -1,13 +1,10 @@ import { Job_MainDetail } from "@/app_modules/job"; -import { job_getOneById } from "@/app_modules/job/fun/get/get_one_by_id"; -export default async function Page({ params }: { params: { id: string } }) { - const idJob = params.id; - const dataJob = await job_getOneById(idJob); +export default async function Page() { return ( <> - + ); } diff --git a/src/app/dev/job/detail/publish/[id]/page.tsx b/src/app/dev/job/detail/publish/[id]/page.tsx index 6dd30830..54179745 100644 --- a/src/app/dev/job/detail/publish/[id]/page.tsx +++ b/src/app/dev/job/detail/publish/[id]/page.tsx @@ -1,13 +1,9 @@ import { Job_DetailPublish } from "@/app_modules/job"; -import { job_getOneById } from "@/app_modules/job/fun/get/get_one_by_id"; - -export default async function Page({params}: {params: {id: string}}) { - let jobId = params.id - const dataJob = await job_getOneById(jobId) +export default async function Page() { return ( <> - + ); } diff --git a/src/app/dev/job/detail/reject/[id]/page.tsx b/src/app/dev/job/detail/reject/[id]/page.tsx index cd6f0206..1152ebe9 100644 --- a/src/app/dev/job/detail/reject/[id]/page.tsx +++ b/src/app/dev/job/detail/reject/[id]/page.tsx @@ -1,14 +1,11 @@ import Job_DetailReject from "@/app_modules/job/detail/reject/view"; -import { job_getOneById } from "@/app_modules/job/fun/get/get_one_by_id"; -export default async function Page({params}: {params: {id: string}}) { - let jobId = params.id - const dataJob = await job_getOneById(jobId) +export default async function Page() { return ( <> - + ); } diff --git a/src/app/dev/job/detail/review/[id]/page.tsx b/src/app/dev/job/detail/review/[id]/page.tsx index 6dda171e..7578351a 100644 --- a/src/app/dev/job/detail/review/[id]/page.tsx +++ b/src/app/dev/job/detail/review/[id]/page.tsx @@ -1,18 +1,9 @@ import Job_DetailReview from "@/app_modules/job/detail/review/view"; -import { job_getOneById } from "@/app_modules/job/fun/get/get_one_by_id"; -import React from "react"; - -export default async function Page({ - params, -}: { - params: { id: React.ReactNode }; -}) { - let jobId = params.id; - const dataJob = await job_getOneById(jobId) +export default async function Page() { return ( <> - + ); } diff --git a/src/app/dev/job/edit/[id]/page.tsx b/src/app/dev/job/edit/[id]/page.tsx index baba6e04..994e52d5 100644 --- a/src/app/dev/job/edit/[id]/page.tsx +++ b/src/app/dev/job/edit/[id]/page.tsx @@ -1,13 +1,11 @@ import { Job_Edit } from "@/app_modules/job"; import { job_getOneById } from "@/app_modules/job/fun/get/get_one_by_id"; -export default async function Page({ params }: { params: { id: string } }) { - let jobId = params.id; - const dataJob = await job_getOneById(jobId); +export default async function Page() { return ( <> - + ); } diff --git a/src/app/zCoba/skeleton/page.tsx b/src/app/zCoba/skeleton/page.tsx index 2e5b8aa9..df2e7133 100644 --- a/src/app/zCoba/skeleton/page.tsx +++ b/src/app/zCoba/skeleton/page.tsx @@ -16,7 +16,15 @@ export default function Voting_ComponentSkeletonViewPuh() { header={} > - + +
+ +
+ + + + + {/* @@ -33,8 +41,7 @@ export default function Voting_ComponentSkeletonViewPuh() { - - + */} {/* {Array.from({ length: 4 }).map((_, i) => ( diff --git a/src/app_modules/job/component/api_fetch_job.ts b/src/app_modules/job/component/api_fetch_job.ts index f12a79ce..5c558741 100644 --- a/src/app_modules/job/component/api_fetch_job.ts +++ b/src/app_modules/job/component/api_fetch_job.ts @@ -1,4 +1,4 @@ -export { apiGetJobByStatus, apiGetJob, apiGetJobArsip }; +export { apiGetJobByStatus, apiGetJob, apiGetJobArsip, apiGetJobById }; const apiGetJobByStatus = async ({ status, @@ -124,3 +124,40 @@ const apiGetJobArsip = async ({ throw error; // Re-throw the error to handle it in the calling function } }; + +const apiGetJobById = async ({ id }: { id: string }) => { + try { + // Fetch token from cookie + const { token } = await fetch("/api/get-cookie").then((res) => res.json()); + if (!token) { + console.error("No token found"); + return null; + } + + // Send PUT request to update portfolio logo + const response = await fetch(`/api/job/${id}`, { + method: "GET", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + Authorization: `Bearer ${token}`, + }, + }); + + // Check if the response is OK + if (!response.ok) { + const errorData = await response.json().catch(() => null); + console.error( + "Error updating portfolio logo:", + errorData?.message || "Unknown error" + ); + + return null; + } + + return await response.json(); + } catch (error) { + console.error("Error updating portfolio logo:", error); + throw error; // Re-throw the error to handle it in the calling function + } +}; \ No newline at end of file diff --git a/src/app_modules/job/component/detail/detail_data.tsx b/src/app_modules/job/component/detail/detail_data.tsx index 5d831286..fced4484 100644 --- a/src/app_modules/job/component/detail/detail_data.tsx +++ b/src/app_modules/job/component/detail/detail_data.tsx @@ -4,14 +4,11 @@ import { ComponentGlobal_CardStyles, ComponentGlobal_LoadImage, } from "@/app_modules/_global/component"; -import { Box, Center, Skeleton, Stack, Text } from "@mantine/core"; +import { Center, Stack, Text } from "@mantine/core"; import { MODEL_JOB } from "../../model/interface"; +import { Job_SkeletonDetailJob } from "../skeleton/comp_skeleton_beranda"; -export default function ComponentJob_DetailData({ - data, -}: { - data?: MODEL_JOB; -}) { +export default function ComponentJob_DetailData({ data }: { data: MODEL_JOB }) { return ( <> {data ? ( @@ -39,24 +36,7 @@ export default function ComponentJob_DetailData({ ) : ( - - - - - - - - {Array.from(new Array(2)).map((e, i) => ( - - - - {Array.from({ length: 3 }).map((_, ii) => ( - - ))} - - ))} - - + )} ); diff --git a/src/app_modules/job/component/index.ts b/src/app_modules/job/component/index.ts index 156a94cd..5794e982 100644 --- a/src/app_modules/job/component/index.ts +++ b/src/app_modules/job/component/index.ts @@ -2,7 +2,7 @@ import Job_ComponentButtonSaveCreate from "./button/comp_button_save_create"; import { Job_ComponentButtonUpdateBeranda } from "./button/comp_button_update_beranda"; import { Job_ComponentButtonUpdateData } from "./button/comp_button_update_data"; import { Job_ComponentBoxUploadImage } from "./detail/comp_box_upload_image"; -import Job_ComponentSkeletonBeranda from "./skeleton/comp_skeleton_beranda"; +import { Job_ComponentSkeletonBeranda } from "./skeleton/comp_skeleton_beranda"; export { Job_ComponentButtonSaveCreate }; export { Job_ComponentBoxUploadImage }; diff --git a/src/app_modules/job/component/skeleton/comp_skeleton_beranda.tsx b/src/app_modules/job/component/skeleton/comp_skeleton_beranda.tsx index fb0561f2..2f40f2df 100644 --- a/src/app_modules/job/component/skeleton/comp_skeleton_beranda.tsx +++ b/src/app_modules/job/component/skeleton/comp_skeleton_beranda.tsx @@ -1,8 +1,14 @@ import { ComponentGlobal_CardStyles } from "@/app_modules/_global/component"; import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; -import { Box, Center, Group, Skeleton, Stack } from "@mantine/core"; +import { Box, Center, Group, Stack } from "@mantine/core"; -export default function Job_ComponentSkeletonBeranda() { +export { + Job_ComponentSkeletonBeranda, + Job_SkeletonDetailJob, + Job_SkeletonEdit +}; + +function Job_ComponentSkeletonBeranda() { return ( <> @@ -24,3 +30,43 @@ export default function Job_ComponentSkeletonBeranda() { ); } + +function Job_SkeletonDetailJob() { + return ( + <> + + + + + + + + {Array.from(new Array(2)).map((e, i) => ( + + + + {Array.from({ length: 3 }).map((_, ii) => ( + + ))} + + ))} + + + + ); +} + +function Job_SkeletonEdit() { + return ( + <> + + +
+ +
+ + + + + ); +} diff --git a/src/app_modules/job/detail/arsip/view.tsx b/src/app_modules/job/detail/arsip/view.tsx index 796438b6..d53c9aec 100644 --- a/src/app_modules/job/detail/arsip/view.tsx +++ b/src/app_modules/job/detail/arsip/view.tsx @@ -1,9 +1,9 @@ "use client"; -import { Button, Stack } from "@mantine/core"; +import { Button, Center, Stack } from "@mantine/core"; import ComponentJob_DetailData from "../../component/detail/detail_data"; import { MODEL_JOB } from "../../model/interface"; -import { useRouter } from "next/navigation"; +import { useParams, useRouter } from "next/navigation"; import { RouterJob } from "@/lib/router_hipmi/router_job"; import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil"; import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal"; @@ -11,15 +11,49 @@ import { useAtom } from "jotai"; import { Job_funEditArsipById } from "../../fun/edit/fun_edit_arsip_by_id"; import { gs_job_hot_menu } from "../../global_state"; import { useState } from "react"; -import { useDisclosure } from "@mantine/hooks"; +import { useDisclosure, useShallowEffect } from "@mantine/hooks"; import UIGlobal_Modal from "@/app_modules/_global/ui/ui_modal"; +import { clientLogger } from "@/util/clientLogger"; +import { apiGetJobById } from "../../component/api_fetch_job"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; + +export default function Job_DetailArsip() { + const param = useParams<{ id: string }>(); + const [data, setData] = useState(null); + + useShallowEffect(() => { + handleLoadData(); + }, []); + + const handleLoadData = async () => { + try { + const response = await apiGetJobById({ + id: param.id, + }); + + if (response.success) { + setData(response.data); + } else { + setData(null); + } + } catch (error) { + clientLogger.error("Error get data job", error); + setData(null); + } + }; -export default function Job_DetailArsip({ dataJob }: { dataJob: MODEL_JOB }) { return ( <> - - + + + {!data ? ( +
+ +
+ ) : ( + + )} ); @@ -74,18 +108,21 @@ function ButtonAction({ jobId }: { jobId: string }) { } /> - +
+ +
); } diff --git a/src/app_modules/job/detail/draft/view.tsx b/src/app_modules/job/detail/draft/view.tsx index 87022c4b..31d567c9 100644 --- a/src/app_modules/job/detail/draft/view.tsx +++ b/src/app_modules/job/detail/draft/view.tsx @@ -9,7 +9,7 @@ import UIGlobal_Modal from "@/app_modules/_global/ui/ui_modal"; import notifikasiToAdmin_funCreate from "@/app_modules/notifikasi/fun/create/create_notif_to_admin"; import mqtt_client from "@/util/mqtt_client"; import { useDisclosure, useShallowEffect } from "@mantine/hooks"; -import { useRouter } from "next/navigation"; +import { useParams, useRouter } from "next/navigation"; import { useState } from "react"; import ComponentJob_DetailData from "../../component/detail/detail_data"; import { Job_funDeleteById } from "../../fun/delete/fun_delete_by_id"; @@ -20,33 +20,41 @@ import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/noti import { job_getOneById } from "../../fun/get/get_one_by_id"; import { IRealtimeData } from "@/lib/global_state"; import { WibuRealtime } from "wibu-pkg"; +import { clientLogger } from "@/util/clientLogger"; +import { apiGetJobById } from "../../component/api_fetch_job"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; -export default function Job_DetailDraft({ - dataJob, - jobId, -}: { - dataJob: MODEL_JOB; - jobId: string; -}) { - const [data, setData] = useState(dataJob); +export default function Job_DetailDraft() { + const param = useParams<{ id: string }>(); + const [data, setData] = useState(null); useShallowEffect(() => { - onLoadData({ - loadData(val) { - setData(val); - }, - }); - }, [setData]); + handleLoadData(); + }, []); - async function onLoadData({ loadData }: { loadData: (val: any) => void }) { - const dataJob = await job_getOneById(jobId); - loadData(dataJob as any); - } + const handleLoadData = async () => { + try { + const response = await apiGetJobById({ + id: param.id, + }); + + if (response.success) { + setData(response.data); + } else { + setData(null); + } + } catch (error) { + clientLogger.error("Error get data job", error); + setData(null); + } + }; return ( <> - {data?.catatan ? ( + {!data ? ( + + ) : data?.catatan ? ( - + + {!data ? ( + + + + + ) : ( + + )} ); diff --git a/src/app_modules/job/detail/main/view.tsx b/src/app_modules/job/detail/main/view.tsx index 8ead5b07..a2bd8b0b 100644 --- a/src/app_modules/job/detail/main/view.tsx +++ b/src/app_modules/job/detail/main/view.tsx @@ -1,20 +1,56 @@ "use client"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; import { RouterJob } from "@/lib/router_hipmi/router_job"; +import { clientLogger } from "@/util/clientLogger"; import { Button, Center, Stack } from "@mantine/core"; import { useShallowEffect } from "@mantine/hooks"; import { IconBrandWhatsapp } from "@tabler/icons-react"; import Link from "next/link"; +import { useParams } from "next/navigation"; import { useState } from "react"; +import { apiGetJobById } from "../../component/api_fetch_job"; import ComponentJob_DetailData from "../../component/detail/detail_data"; import { MODEL_JOB } from "../../model/interface"; -export default function Job_MainDetail({ dataJob }: { dataJob: MODEL_JOB }) { +export default function Job_MainDetail() { + const param = useParams<{ id: string }>(); + const [data, setData] = useState(null); + + useShallowEffect(() => { + handleLoadData(); + }, []); + + const handleLoadData = async () => { + try { + const response = await apiGetJobById({ + id: param.id, + }); + + if (response.success) { + + setData(response.data); + } else { + setData(null); + } + } catch (error) { + clientLogger.error("Error get data job", error); + setData(null); + } + }; + return ( <> - - + + + {!data ? ( +
+ +
+ ) : ( + + )} ); diff --git a/src/app_modules/job/detail/publish/view.tsx b/src/app_modules/job/detail/publish/view.tsx index cddbb1a3..022c7eb6 100644 --- a/src/app_modules/job/detail/publish/view.tsx +++ b/src/app_modules/job/detail/publish/view.tsx @@ -1,29 +1,62 @@ "use client"; -import { RouterJob } from "@/lib/router_hipmi/router_job"; -import { - AccentColor, - MainColor, -} from "@/app_modules/_global/color/color_pallet"; import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil"; import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal"; -import { Button, Group, Modal, Paper, Stack, Title } from "@mantine/core"; -import { useDisclosure } from "@mantine/hooks"; +import UIGlobal_Modal from "@/app_modules/_global/ui/ui_modal"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; +import { RouterJob } from "@/lib/router_hipmi/router_job"; +import { clientLogger } from "@/util/clientLogger"; +import { + Button, + Center, + Stack +} from "@mantine/core"; +import { useDisclosure, useShallowEffect } from "@mantine/hooks"; import { useAtom } from "jotai"; -import { useRouter } from "next/navigation"; +import { useParams, useRouter } from "next/navigation"; import { useState } from "react"; +import { apiGetJobById } from "../../component/api_fetch_job"; import ComponentJob_DetailData from "../../component/detail/detail_data"; import { Job_funEditArsipById } from "../../fun/edit/fun_edit_arsip_by_id"; -import { gs_job_hot_menu, } from "../../global_state"; +import { gs_job_hot_menu } from "../../global_state"; import { MODEL_JOB } from "../../model/interface"; -import UIGlobal_Modal from "@/app_modules/_global/ui/ui_modal"; -export default function Job_DetailPublish({ dataJob }: { dataJob: MODEL_JOB }) { +export default function Job_DetailPublish() { + const param = useParams<{ id: string }>(); + const [data, setData] = useState(null); + + useShallowEffect(() => { + handleLoadData(); + }, []); + + const handleLoadData = async () => { + try { + const response = await apiGetJobById({ + id: param.id, + }); + + if (response.success) { + setData(response.data); + } else { + setData(null); + } + } catch (error) { + clientLogger.error("Error get data job", error); + setData(null); + } + }; + return ( <> - - + + {!data ? ( +
+ +
+ ) : ( + + )} ); @@ -34,13 +67,11 @@ function ButtonAction({ jobId }: { jobId: string }) { const [isLoading, setLoading] = useState(false); const [opened, { open, close }] = useDisclosure(); - const [hotMenu, setHotMenu] = useAtom(gs_job_hot_menu); async function onArsipkan() { await Job_funEditArsipById(jobId, true).then((res) => { if (res.status === 200) { - setHotMenu(3); ComponentGlobal_NotifikasiBerhasil("Berhasil Diarsipkan"); setLoading(true); @@ -52,47 +83,6 @@ function ButtonAction({ jobId }: { jobId: string }) { } return ( <> - {/* - - - Mengarsipkan akan menghilangkan info lowongan kerja dari beranda, - anda yakin ? - - - - - - - */} - close()} @@ -122,16 +112,19 @@ function ButtonAction({ jobId }: { jobId: string }) { } /> - +
+ +
); } diff --git a/src/app_modules/job/detail/reject/view.tsx b/src/app_modules/job/detail/reject/view.tsx index a7a75af8..24ec238e 100644 --- a/src/app_modules/job/detail/reject/view.tsx +++ b/src/app_modules/job/detail/reject/view.tsx @@ -3,32 +3,71 @@ import { RouterJob } from "@/lib/router_hipmi/router_job"; import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil"; import { Button, Group, Stack } from "@mantine/core"; - import ComponentGlobal_BoxInformation from "@/app_modules/_global/component/box_information"; import { funGlobal_DeleteFileById } from "@/app_modules/_global/fun"; import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global"; import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal"; import UIGlobal_Modal from "@/app_modules/_global/ui/ui_modal"; -import { useDisclosure } from "@mantine/hooks"; -import { useRouter } from "next/navigation"; +import { useDisclosure, useShallowEffect } from "@mantine/hooks"; +import { useParams, useRouter } from "next/navigation"; import { useState } from "react"; import ComponentJob_DetailData from "../../component/detail/detail_data"; import { Job_funDeleteById } from "../../fun/delete/fun_delete_by_id"; import { Job_funEditStatusByStatusId } from "../../fun/edit/fun_edit_status_by_status_id"; import { MODEL_JOB } from "../../model/interface"; +import { clientLogger } from "@/util/clientLogger"; +import { apiGetJobById } from "../../component/api_fetch_job"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; -export default function Job_DetailReject({ dataJob }: { dataJob: MODEL_JOB }) { - const [data, setData] = useState(dataJob); +export default function Job_DetailReject() { + const param = useParams<{ id: string }>(); + const [data, setData] = useState(null); + + useShallowEffect(() => { + handleLoadData(); + }, []); + + const handleLoadData = async () => { + try { + const response = await apiGetJobById({ + id: param.id, + }); + + if (response.success) { + setData(response.data); + } else { + setData(null); + } + } catch (error) { + clientLogger.error("Error get data job", error); + setData(null); + } + }; return ( <> - - - + {!data ? ( + + ) : ( + + )} + + + {!data ? ( + + + + + ) : ( + + )} ); diff --git a/src/app_modules/job/detail/review/view.tsx b/src/app_modules/job/detail/review/view.tsx index 811833e8..a2536984 100644 --- a/src/app_modules/job/detail/review/view.tsx +++ b/src/app_modules/job/detail/review/view.tsx @@ -6,20 +6,53 @@ import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_glo import UIGlobal_Modal from "@/app_modules/_global/ui/ui_modal"; import notifikasiToAdmin_funCreate from "@/app_modules/notifikasi/fun/create/create_notif_to_admin"; import mqtt_client from "@/util/mqtt_client"; -import { Button, Stack } from "@mantine/core"; -import { useDisclosure } from "@mantine/hooks"; -import { useRouter } from "next/navigation"; +import { Button, Center, Stack } from "@mantine/core"; +import { useDisclosure, useShallowEffect } from "@mantine/hooks"; +import { useParams, useRouter } from "next/navigation"; import { useState } from "react"; import ComponentJob_DetailData from "../../component/detail/detail_data"; import { Job_funEditStatusByStatusId } from "../../fun/edit/fun_edit_status_by_status_id"; import { MODEL_JOB } from "../../model/interface"; +import { clientLogger } from "@/util/clientLogger"; +import { apiGetJobById } from "../../component/api_fetch_job"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; + +export default function Job_DetailReview() { + const param = useParams<{ id: string }>(); + const [data, setData] = useState(null); + + useShallowEffect(() => { + handleLoadData(); + }, []); + + const handleLoadData = async () => { + try { + const response = await apiGetJobById({ + id: param.id, + }); + + if (response.success) { + setData(response.data); + } else { + setData(null); + } + } catch (error) { + clientLogger.error("Error get data job", error); + setData(null); + } + }; -export default function Job_DetailReview({ dataJob }: { dataJob: MODEL_JOB }) { return ( <> - - + + {!data ? ( +
+ +
+ ) : ( + + )} ); @@ -92,16 +125,19 @@ function ButtonAction({ jobId }: { jobId: string }) { } /> - +
+ +
); } diff --git a/src/app_modules/job/edit/view.tsx b/src/app_modules/job/edit/view.tsx index b41fb92d..2b76dad9 100644 --- a/src/app_modules/job/edit/view.tsx +++ b/src/app_modules/job/edit/view.tsx @@ -22,6 +22,11 @@ import { IconPhoto } from "@tabler/icons-react"; import dynamic from "next/dynamic"; import "react-quill/dist/quill.snow.css"; import { Job_ComponentButtonUpdate } from "../component"; +import { clientLogger } from "@/util/clientLogger"; +import { useShallowEffect } from "@mantine/hooks"; +import { useParams } from "next/navigation"; +import { apiGetJobById } from "../component/api_fetch_job"; +import { Job_SkeletonEdit } from "../component/skeleton/comp_skeleton_beranda"; const ReactQuill = dynamic( () => { return import("react-quill"); @@ -29,14 +34,35 @@ const ReactQuill = dynamic( { ssr: false } ); -export default function Job_Edit({ dataJob }: { dataJob: MODEL_JOB }) { - const [data, setData] = useState(dataJob); +export default function Job_Edit() { const [file, setFile] = useState(null); const [img, setImg] = useState(); - // useShallowEffect(() => { - // if (window && window.document) setReload(true); - // }, []); + const param = useParams<{ id: string }>(); + const [data, setData] = useState(null); + + useShallowEffect(() => { + handleLoadData(); + }, []); + + const handleLoadData = async () => { + try { + const response = await apiGetJobById({ + id: param.id, + }); + + if (response.success) { + setData(response.data); + } else { + setData(null); + } + } catch (error) { + clientLogger.error("Error get data job", error); + setData(null); + } + }; + + if (!data) return ; return ( <> diff --git a/src/app_modules/job/fun/create/fun_create_no_file.ts b/src/app_modules/job/fun/create/fun_create_no_file.ts index 85fea58e..6017a440 100644 --- a/src/app_modules/job/fun/create/fun_create_no_file.ts +++ b/src/app_modules/job/fun/create/fun_create_no_file.ts @@ -6,32 +6,39 @@ import { revalidatePath } from "next/cache"; import { MODEL_JOB } from "../../model/interface"; export async function job_funCreateNoFile({ data }: { data: MODEL_JOB }) { - const authorId = await funGetUserIdByToken(); + try { + const authorId = await funGetUserIdByToken(); - const createNoImage = await prisma.job.create({ - data: { - title: data.title, - content: data.content, - deskripsi: data.deskripsi, - authorId: authorId, - }, - select: { - id: true, - authorId: true, - MasterStatus: { - select: { - name: true, - }, + const createNoImage = await prisma.job.create({ + data: { + title: data.title, + content: data.content, + deskripsi: data.deskripsi, + authorId: authorId, }, - title: true, - }, - }); + select: { + id: true, + authorId: true, + MasterStatus: { + select: { + name: true, + }, + }, + title: true, + }, + }); - if (!createNoImage) return { status: 400, message: "Gagal Disimpan" }; - revalidatePath("/dev/job/main/status/2"); - return { - status: 201, - message: "Berhasil Disimpan", - data: createNoImage, - }; + if (!createNoImage) return { status: 400, message: "Gagal Disimpan" }; + revalidatePath("/dev/job/main/status/2"); + return { + status: 201, + message: "Berhasil Disimpan", + data: createNoImage, + }; + } catch (error) { + return { + status: 500, + message: "Error create job", + }; + } } diff --git a/src/app_modules/job/fun/edit/fun_edit_by_id.ts b/src/app_modules/job/fun/edit/fun_edit_by_id.ts index b72b0cba..7adec77b 100644 --- a/src/app_modules/job/fun/edit/fun_edit_by_id.ts +++ b/src/app_modules/job/fun/edit/fun_edit_by_id.ts @@ -11,42 +11,46 @@ export async function job_EditById({ data: MODEL_JOB; fileId?: string; }) { - if (fileId == undefined) { - const updt = await prisma.job.update({ - where: { - id: data.id, - }, - data: { - title: data.title, - content: data.content, - deskripsi: data.deskripsi, - }, - }); - if (!updt) return { status: 400, message: "Gagal Update" }; - revalidatePath("/dev/job/detail/draft"); + try { + if (fileId == undefined) { + const updt = await prisma.job.update({ + where: { + id: data.id, + }, + data: { + title: data.title, + content: data.content, + deskripsi: data.deskripsi, + }, + }); + if (!updt) return { status: 400, message: "Gagal Update" }; + revalidatePath("/dev/job/detail/draft"); - return { - status: 200, - message: "Berhasil Update", - }; - } else { - const updtWithFile = await prisma.job.update({ - where: { - id: data.id, - }, - data: { - title: data.title, - content: data.content, - deskripsi: data.deskripsi, - imageId: fileId, - }, - }); - if (!updtWithFile) return { status: 400, message: "Gagal Update" }; - revalidatePath("/dev/job/detail/draft"); + return { + status: 200, + message: "Berhasil Update", + }; + } else { + const updtWithFile = await prisma.job.update({ + where: { + id: data.id, + }, + data: { + title: data.title, + content: data.content, + deskripsi: data.deskripsi, + imageId: fileId, + }, + }); + if (!updtWithFile) return { status: 400, message: "Gagal Update" }; + revalidatePath("/dev/job/detail/draft"); - return { - status: 200, - message: "Berhasil Update", - }; + return { + status: 200, + message: "Berhasil Update", + }; + } + } catch (error) { + return { status: 500, message: "Error Update" }; } } diff --git a/src/app_modules/job/main/arsip/view_arsip.tsx b/src/app_modules/job/main/arsip/view_arsip.tsx index 39c48bf9..cede63f8 100644 --- a/src/app_modules/job/main/arsip/view_arsip.tsx +++ b/src/app_modules/job/main/arsip/view_arsip.tsx @@ -1,21 +1,18 @@ "use client"; -import { Box, Center, Stack } from "@mantine/core"; -import { MODEL_JOB } from "../../model/interface"; -import { Job_UI_Arsip } from "./ui_arsip"; import ComponentGlobal_IsEmptyData from "@/app_modules/_global/component/is_empty_data"; +import ComponentGlobal_Loader from "@/app_modules/_global/component/loader"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; import { RouterJob } from "@/lib/router_hipmi/router_job"; +import { clientLogger } from "@/util/clientLogger"; +import { Box, Stack } from "@mantine/core"; +import { useShallowEffect } from "@mantine/hooks"; import _ from "lodash"; import { ScrollOnly } from "next-scroll-loader"; import { useState } from "react"; -import ComponentJob_CardStatus from "../../component/card/card_view"; -import { job_getAllArsipById } from "../../fun/get/get_all_arsip"; -import ComponentGlobal_Loader from "@/app_modules/_global/component/loader"; -import { clientLogger } from "@/util/clientLogger"; -import { useShallowEffect } from "@mantine/hooks"; import { apiGetJob, apiGetJobArsip } from "../../component/api_fetch_job"; -import { Job_ComponentSkeletonBeranda } from "../../component"; -import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; +import ComponentJob_CardStatus from "../../component/card/card_view"; +import { MODEL_JOB } from "../../model/interface"; export default function Job_ViewArsip() { const [data, setData] = useState([]); From 4e42dd7a94ad76efb4e977fd4bd2082b61e36191 Mon Sep 17 00:00:00 2001 From: Bagasbanuna02 Date: Thu, 20 Feb 2025 12:03:28 +0800 Subject: [PATCH 2/2] chore(release): 1.2.57 --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e58bfcb..8c5279ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. +## [1.2.57](https://github.com/bipproduction/hipmi/compare/v1.2.56...v1.2.57) (2025-02-20) + ## [1.2.56](https://github.com/bipproduction/hipmi/compare/v1.2.55...v1.2.56) (2025-02-19) ## [1.2.55](https://github.com/bipproduction/hipmi/compare/v1.2.54...v1.2.55) (2025-02-12) diff --git a/package.json b/package.json index bae30c55..ae122692 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hipmi", - "version": "1.2.56", + "version": "1.2.57", "private": true, "type": "module", "prisma": {