diff --git a/apps/cm/.env.local b/apps/cm/.env.local index 4aba6b3b2..59eac2cc7 100644 --- a/apps/cm/.env.local +++ b/apps/cm/.env.local @@ -8,6 +8,6 @@ NEXT_PUBLIC_LINK_BACKEND_API_HOST=http://rsone.iptime.org:10014 NEXT_PUBLIC_TINY_API_KEY=t9nc4z6inquvvd5pq1vea8wcp7lb01qmqseh6egms9vpaju2 NEXT_PUBLIC_SERVER_API_URL2=http://con.mind-one.co.kr:11083 -NEXT_PUBLIC_SERVER_API_URL_RSONE=https://apigateway.apps.rsonesoft.com/ +NEXT_PUBLIC_SERVER_API_URL3=https://apigateway.apps.rsonesoft.com NEXT_PUBLIC_SN=https://devlion.hasuon.co.kr NEXT_PUBLIC_WR=https://devtiger.hasuon.co.kr diff --git a/apps/cm/middleware.ts b/apps/cm/middleware.ts index 683defe8c..241df1e74 100644 --- a/apps/cm/middleware.ts +++ b/apps/cm/middleware.ts @@ -114,7 +114,7 @@ export function middleware(req: NextRequest) { const token = req.cookies.get(CLAIM_NAME)?.value; const userId = req.cookies.get(AUTH_USER_ID)?.value; - const newUrl = `${serverApiUrl3}${pathname.replace("/server/", "/")}${searchParams ? `?${searchParams}` : ""}`; + const newUrl = `${serverApiUrl3}${pathname.replace("/server/", "/")}`; if (token) requestHeaders.set(CLAIM_NAME, token); if (userId) requestHeaders.set(AUTH_USER_ID, userId); diff --git a/apps/cm/src/pages/dashboard/model/support-columns.tsx b/apps/cm/src/pages/dashboard/model/support-columns.tsx index 813b09051..97be211ab 100644 --- a/apps/cm/src/pages/dashboard/model/support-columns.tsx +++ b/apps/cm/src/pages/dashboard/model/support-columns.tsx @@ -42,7 +42,7 @@ const supportTableColumns: ColumnDef[] = [ }, { accessorKey: "completed", - header: "환료", + header: "완료", }, ]; diff --git a/apps/cm/src/pages/dashboard/ui/support-list.tsx b/apps/cm/src/pages/dashboard/ui/support-list.tsx index 7ae9e79f0..348f334ec 100644 --- a/apps/cm/src/pages/dashboard/ui/support-list.tsx +++ b/apps/cm/src/pages/dashboard/ui/support-list.tsx @@ -4,13 +4,36 @@ import { useQuery } from "@tanstack/react-query"; import { getCoreRowModel } from "@tanstack/react-table"; import { ENDPOINT } from "@/shared/config"; import { useDataTable } from "@/shared/lib"; +import type { PageableList } from "@/shared/model"; import { supportTableColumns } from "../model/support-columns"; -import { getSupportList } from "../api/support"; +import { getSupportList, type Support } from "../api/support"; const SupportList: React.FC = () => { - const supportQuery = useQuery({ + const supportQuery = useQuery>({ queryKey: [ENDPOINT.IC_SERVICE.GROUPING_STATISTICS], - queryFn: () => getSupportList(), + queryFn: async () => { + const data = await getSupportList(); + return { + content: data, + pageable: { + sort: { empty: true, sorted: false, unsorted: true }, + offset: 0, + pageNumber: 0, + pageSize: data.length, + paged: false, + unpaged: true, + }, + sort: { empty: true, sorted: false, unsorted: true }, + totalPages: 1, + totalElements: data.length, + number: 0, + numberOfElements: data.length, + size: data.length, + first: true, + last: true, + empty: data.length === 0, + }; + }, }); const { tableComponent: supportTableComponent } = useDataTable({