From e7ca5def8cbe24df5918964e5ddad12dac85461a Mon Sep 17 00:00:00 2001 From: Anang Yusman Date: Tue, 25 Feb 2025 00:37:17 +0800 Subject: [PATCH] feat:status contest,delete agenda setting admin --- .../shared/contest/components/columns.tsx | 6 +++- .../form/contest/contest-detail-form.tsx | 8 ++---- lib/menus.ts | 28 +++++++++---------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/app/[locale]/(protected)/shared/contest/components/columns.tsx b/app/[locale]/(protected)/shared/contest/components/columns.tsx index 5db22073..85ced8c3 100644 --- a/app/[locale]/(protected)/shared/contest/components/columns.tsx +++ b/app/[locale]/(protected)/shared/contest/components/columns.tsx @@ -109,15 +109,19 @@ const columns: ColumnDef[] = [ (userRoleId === 3 && userLevelNumber === 1 && !isPublishForAll) || // Role 3 dengan level 1 hanya publish jika isPublishForAll true ((userRoleId === 11 || userRoleId === 12) && !isPublishForMabes); // Role 11 dan 12 hanya publish jika isPublishForMabes true + const isTerkirim: boolean = isPublishForMabes && !isPublishForAll; + return ( - {isPending ? "Pending" : "Publish"} + {isPending ? "Pending" : isTerkirim ? "Terkirim" : "Publish"} ); }, diff --git a/components/form/contest/contest-detail-form.tsx b/components/form/contest/contest-detail-form.tsx index 13a1e13b..2dfef0bd 100644 --- a/components/form/contest/contest-detail-form.tsx +++ b/components/form/contest/contest-detail-form.tsx @@ -224,10 +224,8 @@ export default function FormContestDetail() { }, [detail?.targetOutput]); useEffect(() => { - if (detail?.targetParticipantTopLevel) { - const outputSet = new Set( - detail.targetParticipantTopLevel.split(",").map(Number) - ); + if (detail?.targetOutput) { + const outputSet = new Set(detail.targetOutput.split(",").map(Number)); setUnitSelection({ allUnit: outputSet.has(0), mabes: outputSet.has(1), @@ -235,7 +233,7 @@ export default function FormContestDetail() { polres: outputSet.has(3), }); } - }, [detail?.targetParticipantTopLevel]); + }, [detail?.targetOutput]); const handleCheckboxChange = (levelId: number) => { setCheckedLevels((prev) => { diff --git a/lib/menus.ts b/lib/menus.ts index e4cf05f3..c1ae7464 100644 --- a/lib/menus.ts +++ b/lib/menus.ts @@ -2723,20 +2723,20 @@ export function getMenuList(pathname: string, t: any): Group[] { }, ], }, - { - groupLabel: "", - id: "agenda-setting", - menus: [ - { - id: "agenda-setting", - href: "/contributor/agenda-setting", - label: t("agenda-setting"), - active: pathname.includes("/agenda-setting"), - icon: "iconoir:journal-page", - submenus: [], - }, - ], - }, + // { + // groupLabel: "", + // id: "agenda-setting", + // menus: [ + // { + // id: "agenda-setting", + // href: "/contributor/agenda-setting", + // label: t("agenda-setting"), + // active: pathname.includes("/agenda-setting"), + // icon: "iconoir:journal-page", + // submenus: [], + // }, + // ], + // }, { groupLabel: "", id: "management-user",