wibu/hipmi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #287 from bipproduction/Nico/07-feb-25

Browse Source 
Perbaikan Dashboard API Collaboration dan proses table API forum
This commit is contained in:
Bagasbanuna02
2025-02-07 17:32:29 +08:00
committed by GitHub
parent 6fe5daa5e2 f2d5a45868
commit 7cafd9ff79
24 changed files with 386 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/app/api/admin/collaboration/dashboard/[name]/route.ts Normal file
View File

@@ -0,0 +1,65 @@
import { prisma } from "@/app/lib";
import backendLogger from "@/util/backendLogger";
import _ from "lodash";
import { NextResponse } from "next/server";
export async function GET(request: Request, { params }: {
params: { name: string }
}) {
const method = request.method;
if (method !== "GET") {
return NextResponse.json({
success: false,
message: "Method not allowed",
},
{ status: 405 }
);
}
const { name } = params;
try {
let fixData;
const fixStatus = _.startCase(name);
if (fixStatus === "Publish") {
fixData = await prisma.projectCollaboration.count({
where: {
isActive: true,
},
});
} else if (fixStatus === "Reject") {
fixData = await prisma.projectCollaboration.count({
where: {
isReject: true,
},
});
} else if (fixStatus === "Room") {
fixData = await prisma.projectCollaboration_RoomChat.count({
where: {
isActive: true,
},
});
}
return NextResponse.json({
success: true,
message: `Success Get Data ${fixStatus}`,
data: fixData,
},
{ status: 200 }
)
} catch (error) {
backendLogger.error("Error get count group chat", error);
return NextResponse.json({
success: false,
message: "Error get data count group chat ",
reason: (error as Error).message
},
{ status: 500 }
)
} finally {
await prisma.$disconnect
}
}

110
src/app/api/admin/donasi/[status]/route.ts
View File

@@ -27,90 +27,64 @@ export async function GET(request: Request,
try {
let fixData;
const fixStatus = _.startCase(status);
if (!page && !search) {
fixData = await prisma.donasi.findMany({
if (!page) {
const data = await prisma.donasi.findMany({
orderBy: {
updatedAt: "desc",
createdAt: "desc",
},
where: {
active: true,
DonasiMaster_Status: {
name: fixStatus
}
},
include: {
Author: {
select: {
id: true,
username: true,
Profile: {
select: {
name: true
}
}
}
name: fixStatus,
},
DonasiMaster_Status: true,
DonasiMaster_Ketegori: true,
DonasiMaster_Durasi: true
}
})
} else if (!page && search) {
fixData = await prisma.donasi.findMany({
orderBy: {
updatedAt: "desc"
},
where: {
active: true,
DonasiMaster_Status: {
name: fixStatus
},
title: {
contains: search,
mode: "insensitive"
}
},
include: {
Author: {
select: {
id: true,
username: true,
Profile: {
select: {
name: true
}
}
}
contains: search ? search : "",
mode: "insensitive",
},
DonasiMaster_Status: true,
},
select: {
id: true,
title: true,
target: true,
authorId: true,
terkumpul: true,
imageDonasi: true,
DonasiMaster_Ketegori: true,
DonasiMaster_Durasi: true
}
DonasiMaster_Durasi: true,
imageId: true,
},
})
} else if (page && !search) {
} else {
const data = await prisma.donasi.findMany({
take: takeData,
skip: skipData,
orderBy: [
{
publishTime: "desc"
}
],
where: {
active: true,
DonasiMaster_Status: {
name: fixStatus
}
orderBy: {
createdAt: "desc",
},
include: {
Author: true,
where: {
DonasiMaster_Status: {
name: fixStatus,
},
active: true,
title: {
contains: search ? search : "",
mode: "insensitive",
},
},
select: {
id: true,
title: true,
target: true,
authorId: true,
terkumpul: true,
imageDonasi: true,
DonasiMaster_Status: true,
DonasiMaster_Ketegori: true,
DonasiMaster_Durasi: true
}
DonasiMaster_Durasi: true,
imageId: true,
},
})
const nCount = await prisma.donasi.count({
@@ -122,7 +96,7 @@ export async function GET(request: Request,
}
})
console.log("data >", data)
fixData = {
data: data,
nCount: _.ceil(nCount / takeData)

95
src/app/api/admin/forum/publish/route.ts Normal file
View File

@@ -0,0 +1,95 @@
import { prisma } from "@/app/lib";
import backendLogger from "@/util/backendLogger";
import _ from "lodash";
import { NextResponse } from "next/server";
export async function GET(request: Request) {
const method = request.method;
if (method !== "GET") {
return NextResponse.json({
success: false,
message: "Method not allowed",
},
{ status: 405 }
)
}
const { searchParams } = new URL(request.url);
const search = searchParams.get("search");
const page = searchParams.get("page");
const takeData = 10;
const skipData = Number(page) * takeData - takeData;
try {
let fixData;
if (!page) {
const data = await prisma.forum_Posting.findMany({
take: takeData,
skip: skipData,
orderBy: {
createdAt: "desc",
},
where: {
isActive: true,
diskusi: {
contains: search ? search : "",
mode: "insensitive",
},
},
select: {
id: true,
diskusi: true,
isActive: true,
createdAt: true,
Author: {
select: {
id: true,
username: true,
Profile: true,
},
},
Forum_ReportPosting: true,
Forum_Komentar: {
where: {
isActive: true,
},
},
ForumMaster_StatusPosting: true,
},
});
const nCount = await prisma.forum_Posting.count({
where: {
isActive: true,
diskusi: {
contains: search ? search : "",
mode: "insensitive",
},
},
});
fixData = {
data: data,
nCount: _.ceil(nCount / takeData)
}
}
return NextResponse.json({
success: true,
message: "Success get data table forum",
data: fixData
},
{ status: 200 }
)
} catch (error) {
backendLogger.error("Error get data table forum", error)
return NextResponse.json({
success: false,
message: "Error get data table forum",
reason: (error as Error)
},
{ status: 500 }
)
}
}

81
src/app/api/admin/investasi/[status]/route.ts
View File

@@ -24,41 +24,13 @@ export async function GET(request: Request, { params }: {
const takeData = 10
const skipData = Number(page) * takeData - takeData;
console.log("Ini Status", status);
console.log("Ini Page", page)
try {
let fixData;
const fixStatus = _.startCase(status);
if (!page && !search) {
fixData = await prisma.investasi.findMany({
orderBy: {
updatedAt: "desc",
},
where: {
active: true,
MasterStatusInvestasi: {
name: fixStatus
},
},
include: {
author: {
select: {
id: true,
username: true,
Profile: {
select: {
name: true,
},
},
},
},
MasterStatusInvestasi: true,
},
});
} else if (!page && search) {
fixData = await prisma.investasi.findMany({
if (!page) {
const data = await prisma.investasi.findMany({
orderBy: {
updatedAt: "desc",
},
@@ -68,41 +40,40 @@ export async function GET(request: Request, { params }: {
name: fixStatus
},
title: {
contains: search,
mode: "insensitive",
},
contains: search ? search : "",
mode: "insensitive"
}
},
include: {
author: {
select: {
id: true,
username: true,
Profile: {
select: {
name: true,
},
},
MasterStatusInvestasi: true,
BeritaInvestasi: true,
DokumenInvestasi: true,
ProspektusInvestasi: true,
MasterPembagianDeviden: true,
MasterPencarianInvestor: true,
MasterPeriodeDeviden: true,
author: true,
Investasi_Invoice: {
where: {
statusInvoiceId: "2",
},
},
MasterStatusInvestasi: true,
},
});
} else if (page && !search) {
} else {
const data = await prisma.investasi.findMany({
take: takeData,
skip: skipData,
orderBy: [
{
countDown: "desc",
},
],
orderBy: {
updatedAt: "desc",
},
where: {
active: true,
MasterStatusInvestasi: {
name: fixStatus
},
title: {
contains: search ? search : "",
mode: "insensitive"
}
},
include: {
MasterStatusInvestasi: true,
@@ -131,8 +102,6 @@ export async function GET(request: Request, { params }: {
},
});
console.log("data >", data)
fixData = {
data: data,
nPage: _.ceil(nCount / takeData),

6
src/app/api/admin/job/[status]/route.ts
View File

@@ -31,7 +31,7 @@ export async function GET(request: Request, { params }: {
const fixStatus = _.startCase(status);
if (!page) {
fixData = await prisma.job.findMany({
const data = await prisma.job.findMany({
orderBy: {
updatedAt: "desc"
},
@@ -53,7 +53,7 @@ export async function GET(request: Request, { params }: {
})
} else {
fixData = await prisma.job.findMany({
const data = await prisma.job.findMany({
take: takeData,
skip: skipData,
orderBy: {
@@ -87,7 +87,7 @@ export async function GET(request: Request, { params }: {
})
fixData = {
data: fixData,
data: data,
nPage: _.ceil(nCount / takeData)
}
}

9
src/app/dev/admin/colab/dashboard/page.tsx
View File

@@ -4,16 +4,13 @@ import adminColab_countIsPublish from "@/app_modules/admin/colab/fun/count/count
import adminColab_countIsReject from "@/app_modules/admin/colab/fun/count/count_reject";
export default async function Page() {
const countPublish = await adminColab_countIsPublish();
const countRoom = await adminColab_countGroupChat();
const countReject = await adminColab_countIsReject()
// const countPublish = await adminColab_countIsPublish();
// const countRoom = await adminColab_countGroupChat();
// const countReject = await adminColab_countIsReject()
return (
<>
<AdminColab_Dashboard
countPublish={countPublish}
countRoom={countRoom}
countReject={countReject}
/>
</>
);

1
src/app/dev/admin/donasi/sub-menu/kategori/page.tsx
View File

@@ -2,7 +2,6 @@ import { AdminDonasi_TableKategori } from "@/app_modules/admin/donasi";
import adminDonasi_getMasterKategori from "@/app_modules/admin/donasi/fun/master/get_list_kategori";
export default async function Page() {
// const listKategori = await adminDonasi_getMasterKategori();
return (
<>

5
src/app/dev/admin/donasi/sub-menu/publish/page.tsx
View File

@@ -2,10 +2,7 @@ import { AdminDonasi_TablePublish } from "@/app_modules/admin/donasi";
import adminDonasi_getListPublish from "@/app_modules/admin/donasi/fun/get/get_list_publish";
export default async function Page() {
// const listPublish = await adminDonasi_getListPublish({
// page: 1,
// });
// console.log(listPublish)
return<>
<AdminDonasi_TablePublish />
</>

3
src/app/dev/admin/donasi/sub-menu/reject/page.tsx
View File

@@ -2,8 +2,7 @@ import { AdminDonasi_TableReject } from "@/app_modules/admin/donasi";
import adminDonasi_getListReject from "@/app_modules/admin/donasi/fun/get/get_list_reject";
export default async function Page() {
// const dataReject = await adminDonasi_getListReject({ page: 1 });
// console.log(dataReject)
return (
<>
<AdminDonasi_TableReject />

4
src/app/dev/admin/donasi/sub-menu/review/page.tsx
View File

@@ -1,8 +1,6 @@
import { AdminDonasi_TableReview } from "@/app_modules/admin/donasi";
import adminDonasi_getListReview from "@/app_modules/admin/donasi/fun/get/get_list_review";
export default async function Page() {
// const listReview = await adminDonasi_getListReview({page: 1});
// console.log(listReview);
return <AdminDonasi_TableReview />;
}

4
src/app/dev/admin/investasi/sub-menu/publish/page.tsx
View File

@@ -1,9 +1,7 @@
import { Admin_TablePublishInvestasi } from "@/app_modules/admin/investasi";
import { adminInvestasi_funGetAllPublish } from "@/app_modules/admin/investasi/fun/get/get_all_publish";
export default async function Page() {
// const listInvestasi = await adminInvestasi_funGetAllPublish({page: 1});
return (
<>
<Admin_TablePublishInvestasi />

2
src/app/dev/admin/investasi/sub-menu/reject/page.tsx
View File

@@ -2,7 +2,7 @@ import { Admin_TableRejectInvestasi } from "@/app_modules/admin/investasi";
import { adminInvestasi_funGetAllReject } from "@/app_modules/admin/investasi/fun/get/get_all_reject";
export default async function Page() {
// const dataInvestsi = await adminInvestasi_funGetAllReject({page: 1});
return (
<>
<Admin_TableRejectInvestasi />

1
src/app/dev/admin/investasi/sub-menu/review/page.tsx
View File

@@ -2,7 +2,6 @@ import { Admin_TableReviewInvestasi } from "@/app_modules/admin/investasi";
import { adminInvestasi_funGetAllReview } from "@/app_modules/admin/investasi/fun/get/get_all_review";
export default async function Page() {
// const dataInvestsi = await adminInvestasi_funGetAllReview({ page: 1 });
return (
<>
<Admin_TableReviewInvestasi />

4
src/app/dev/admin/job/child/reject/page.tsx
View File

@@ -3,11 +3,11 @@ import adminJob_getListReject from "@/app_modules/admin/job/fun/get/get_list_rej
import { AdminJob_getListTableByStatusId } from "@/app_modules/admin/job/fun/get/get_list_table_by_status_id";
export default async function Page() {
const listReject = await adminJob_getListReject({ page: 1 });
return (
<>
<AdminJob_TableReject dataReject={listReject} />
<AdminJob_TableReject />
</>
);
}

113
src/app_modules/admin/colab/dashboard/index.tsx
View File

@@ -5,37 +5,122 @@ import { useRouter } from "next/navigation";
import ComponentAdminGlobal_HeaderTamplate from "../../_admin_global/header_tamplate";
import { IconAlertTriangle, IconMessage2, IconUpload } from "@tabler/icons-react";
import { AccentColor, AdminColor } from "@/app_modules/_global/color/color_pallet";
import { useState } from "react";
import { clientLogger } from "@/util/clientLogger";
import { apiGetAdminCollaborationStatusCountDashboard } from "../lib/api_fetch_admin_collaboration";
import global_limit from "@/app/lib/limit";
import { useShallowEffect } from "@mantine/hooks";
import CustomSkeleton from "@/app_modules/components/CustomSkeleton";
export default function AdminColab_Dashboard({
countPublish,
countRoom,
countReject,
}: {
countPublish: number;
countRoom: number;
countReject: number;
}) {
export default function AdminColab_Dashboard() {
const [countPublish, setCountPublish] = useState<number | null>(null);
const [countRoom, setCountRoom] = useState<number | null>(null);
const [countReject, setCountReject] = useState<number | null>(null);
const router = useRouter();
useShallowEffect(() => {
handlerLoadData()
}, []);
async function handlerLoadData() {
try {
const listLoadData = [
global_limit(() => onLoadCountPublish()),
global_limit(() => onLoadCountRoom()),
global_limit(() => onLoadCountReject()),
]
const result = await Promise.all(listLoadData);
} catch (error) {
clientLogger.error("Error handler load data", error)
}
}
async function onLoadCountPublish() {
try {
const response = await apiGetAdminCollaborationStatusCountDashboard({
name: "Publish",
})
if (response) {
setCountPublish(response.data);
}
} catch (error) {
clientLogger.error("Error get count publish", error);
}
}
async function onLoadCountRoom() {
try {
const response = await apiGetAdminCollaborationStatusCountDashboard(
{
name: "Room",
}
)
if (response) {
setCountRoom(response.data);
}
} catch (error) {
clientLogger.error("Error get count room", error);
}
}
async function onLoadCountReject() {
try {
const response = await apiGetAdminCollaborationStatusCountDashboard({
name: "Reject",
})
if (response) {
setCountReject(response.data);
}
} catch (error) {
clientLogger.error("Error get count reject", error);
}
}
const listStatus = [
{
id: 1,
name: "Publish",
jumlah: countPublish,
jumlah: countPublish
== null ? (
<CustomSkeleton height={40} width={40} />
) : countPublish ? (
countPublish
) : (
"-"
)
,
color: "green",
icon: <IconUpload size={18} color="#4CAF4F" />
},
{
id: 2,
name: "Group Chat",
jumlah: countRoom,
jumlah: countRoom
== null ? (
<CustomSkeleton height={40} width={40} />
) : countRoom ? (
countRoom
) : (
"-"
)
,
color: "orange",
icon: <IconMessage2 size={18} color="#FF9800" />
},
{
id: 3,
name: "Reject",
jumlah: countReject,
jumlah: countReject
== null ? (
<CustomSkeleton height={40} width={40} />
) : countReject ? (
countReject
) : (
"-"
)
,
color: "red",
icon: <IconAlertTriangle size={18} color="#FF4B4C" />
},
@@ -84,3 +169,7 @@ export default function AdminColab_Dashboard({
</>
);
}
function apiGetAdminCollaborationStatuCountDashboard(arg0: { name: string; }) {
throw new Error("Function not implemented.");
}

25
src/app_modules/admin/colab/lib/api_fetch_admin_collaboration.ts Normal file
View File

@@ -0,0 +1,25 @@
export {
apiGetAdminCollaborationStatusCountDashboard,
}
const apiGetAdminCollaborationStatusCountDashboard = async ({
name
}: {
name: "Publish" | "Reject" | "Room";
}) => {
const { token } = await fetch("/api/get-cookie").then((res) => res.json());
if (!token) return await token.json().catch(() => null);
// console.log("Ini Token", token);
const response = await fetch(`/api/admin/collaboration/dashboard/${name}`, {
method: "GET",
headers: {
"Content-Type": "application/json",
Accept: "application/json",
"Access-Control-Allow-Origin": "*",
Authorization: `Bearer ${token}`,
}
})
// console.log("Ini Response", await response.json());
return await response.json().catch(() => null);
}

8
src/app_modules/admin/donasi/lib/api_fetch_admin_donasi.ts
View File

@@ -48,9 +48,7 @@ const apiGetAdminDonasiByStatus = async ({
const { token } = await fetch("/api/get-cookie").then((res) => res.json());
if (!token) return await token.json().catch(() => null);
console.log("Ini token", token)
console.log("Ini Page", page)
console.log("Ini search", search)
const isPage = page ? `?page=${page}` : "";
const isSearch = search ? `&search=${search}` : "";
const response = await fetch(
@@ -64,14 +62,14 @@ const apiGetAdminDonasiByStatus = async ({
}
}
)
console.log("Ini response", response)
return await response.json().catch(() => null);
}
const apiGetAdminDonasiKategori = async () => {
const { token } = await fetch("/api/get-cookie").then((res) => res.json());
if (!token) return await token.json().catch(() => null);
console.log("ini token", token)
const response = await fetch(`/api/admin/donasi/kategori`, {
method: "GET",
headers: {

4
src/app_modules/admin/donasi/sub_menu/table_kategori.tsx
View File

@@ -73,7 +73,7 @@ function TableView() {
try {
const response = await apiGetAdminDonasiKategori();
if (response) {
console.log("ini response", response)
setData(response.data)
}
} catch (error) {
@@ -96,7 +96,7 @@ function TableView() {
}
async function onChangeStatus() {
// console.log(updateStatus.kategoriId, updateStatus.isActive);
const del = await adminDonasi_funDeleteKategori({
kategoriId: updateStatus.kategoriId,
isActive: updateStatus.isActive as any,

2
src/app_modules/admin/donasi/sub_menu/table_review.tsx
View File

@@ -72,7 +72,7 @@ function TableStatus() {
page: `${isActivePage}`,
search: isSearch
})
console.log("IniData", response)
if (response?.success && response?.data?.data) {
setData(response.data.data);

6
src/app_modules/admin/event/_view/view_table_review.tsx
View File

@@ -162,11 +162,11 @@ export default function AdminEvent_ComponentTableReview() {
});
if (response?.success && response?.data?.data) {
console.log("review >>", response.data.data);
setData(response.data.data);
setNPage(response.data.nPage || 1);
} else {
console.error("Invalid data format received:", response);
setData([]);
}
} catch (error) {
@@ -227,7 +227,7 @@ export default function AdminEvent_ComponentTableReview() {
});
if (response?.success && response?.data?.data) {
console.log("review >>", response.data.data);
setData(response.data.data);
setNPage(response.data.nPage || 1);
} else {

8
src/app_modules/admin/investasi/_lib/api_fetch_admin_investasi.ts
View File

@@ -28,12 +28,10 @@ const apiGetAdminInvestasiByStatus = async ({ status, page, search }: {
page: string,
search: string
}) => {
console.log("dgsdg")
const { token } = await fetch("/api/get-cookie").then((res) => res.json());
if (!token) return await token.json().catch(() => null);
console.log("Ini token", token)
console.log("Ini Page", page)
console.log("Ini Search", search)
const isPage = page ? `?page=${page}` : "";
@@ -46,6 +44,6 @@ const apiGetAdminInvestasiByStatus = async ({ status, page, search }: {
Authorization: `Bearer ${token}`,
},
})
console.log("Ini response", response)
return await response.json().catch(() => null);
}

7
src/app_modules/admin/investasi/detail/detail_reject.tsx
View File

@@ -13,6 +13,7 @@ import { ComponentAdminInvestasi_DetailDataAuthor } from "../_component/detail_d
import { ComponentAdminInvestasi_DetailData } from "../_component/detail_data_investasi";
import { ComponentAdminInvestasi_DetailGambar } from "../_component/detail_gambar_investasi";
import { ComponentAdminInvestasi_UIDetailFile } from "../_component/ui_detail_file";
import { AdminColor } from "@/app_modules/_global/color/color_pallet";
export function AdminInvestasi_DetailReject({ data }: { data: MODEL_INVESTASI }) {
return (
@@ -28,15 +29,15 @@ export function AdminInvestasi_DetailReject({ data }: { data: MODEL_INVESTASI })
{ maxWidth: "36rem", cols: 1, spacing: "sm" },
]}
>
<Paper withBorder p={"lg"}>
<Paper bg={AdminColor.softBlue} p={"lg"}>
<Stack>
<Title order={3} c={"red"}>
#{" "}
<Text span inherit c={"black"}>
<Text span inherit c={AdminColor.white}>
Alasan penolakan
</Text>
</Title>
<Text>{data.catatan}</Text>
<Text c={AdminColor.white}>{data.catatan}</Text>
</Stack>
</Paper>
</SimpleGrid>

6
src/app_modules/admin/job/child/reject/index.tsx
View File

@@ -35,11 +35,7 @@ import { apiGetAdminJobByStatus } from "../../lib/api_fetch_admin_job";
import { clientLogger } from "@/util/clientLogger";
import { useShallowEffect } from "@mantine/hooks";
export default function AdminJob_TableReject({
dataReject,
}: {
dataReject: any;
}) {
export default function AdminJob_TableReject() {
return (
<>
<Stack>

6
src/middleware.ts
View File

@@ -38,12 +38,12 @@ const middlewareConfig: MiddlewareConfig = {
// "/api/new/*",
// ADMIN API
// "/api/admin/event/*",
// "/api/admin/investasi/*",
"/api/admin/investasi/*",
// "/api/admin/donasi/*",
// "/api/admin/voting/dashboard/*",
// "/api/admin/job/dashboard/*",
// "/api/admin/forum/dashboard/*",
// "/api/admin/job/*",
// "/api/admin/forum/*",
// "/api/admin/collaboration/*",
// Akses awal
"/api/get-cookie",