From 51d249f4c6f466ee42ef95ade704c597deabb849 Mon Sep 17 00:00:00 2001 From: falendikategar Date: Fri, 16 Aug 2024 14:10:02 +0700 Subject: [PATCH] Revert "create: fetch data in assessmentsQueries to FE still error" This reverts commit 26b5b9228a84d4f01b5437a161d80d9742c084ce. --- .../queries/assessmentsQueries.ts | 72 ---------- .../assessments/index.lazy.tsx | 131 ------------------ .../_dashboardLayout/assessments/index.tsx | 5 - 3 files changed, 208 deletions(-) delete mode 100644 apps/frontend/src/modules/assessmentsManagement/queries/assessmentsQueries.ts delete mode 100644 apps/frontend/src/routes/_dashboardLayout/assessments/index.lazy.tsx delete mode 100644 apps/frontend/src/routes/_dashboardLayout/assessments/index.tsx diff --git a/apps/frontend/src/modules/assessmentsManagement/queries/assessmentsQueries.ts b/apps/frontend/src/modules/assessmentsManagement/queries/assessmentsQueries.ts deleted file mode 100644 index c15dd34..0000000 --- a/apps/frontend/src/modules/assessmentsManagement/queries/assessmentsQueries.ts +++ /dev/null @@ -1,72 +0,0 @@ -import client from "@/honoClient"; -import fetchRPC from "@/utils/fetchRPC"; -import { queryOptions } from "@tanstack/react-query"; -import { InferRequestType } from "hono"; - -export const questionsQueryOptions = (page: number, limit: number, q?: string) => - queryOptions({ - queryKey: ["questions", { page, limit, q }], - queryFn: async () => { - const result = await fetchRPC( - client.assessments.getAllQuestions.$get({ - query: { - limit: String(limit), - page: String(page), - q, - }, - }) - ); - console.log('Result from fetchRPC:', result); - return result; - }, - }); - - -export const getUserByIdQueryOptions = (userId: string | undefined) => - queryOptions({ - queryKey: ["user", userId], - queryFn: () => - fetchRPC( - client.users[":id"].$get({ - param: { - id: userId!, - }, - query: {}, - }) - ), - enabled: Boolean(userId), - }); - -export const createUser = async ( - form: InferRequestType["form"] -) => { - return await fetchRPC( - client.users.$post({ - form, - }) - ); -}; - -export const updateUser = async ( - form: InferRequestType<(typeof client.users)[":id"]["$patch"]>["form"] & { - id: string; - } -) => { - return await fetchRPC( - client.users[":id"].$patch({ - param: { - id: form.id, - }, - form, - }) - ); -}; - -export const deleteUser = async (id: string) => { - return await fetchRPC( - client.users[":id"].$delete({ - param: { id }, - form: {}, - }) - ); -}; diff --git a/apps/frontend/src/routes/_dashboardLayout/assessments/index.lazy.tsx b/apps/frontend/src/routes/_dashboardLayout/assessments/index.lazy.tsx deleted file mode 100644 index 15175be..0000000 --- a/apps/frontend/src/routes/_dashboardLayout/assessments/index.lazy.tsx +++ /dev/null @@ -1,131 +0,0 @@ -import { createLazyFileRoute } from '@tanstack/react-router' - -import { Button } from "@/shadcn/components/ui/button" -import { - Card, - CardContent, - CardDescription, - CardFooter, - CardHeader, - CardTitle, -} from "@/shadcn/components/ui/card" -import { Label } from "@/shadcn/components/ui/label" -import { RadioGroup, RadioGroupItem } from "@/shadcn/components/ui/radio-group" -// import ExtractQueryDataType from '@/types/ExtractQueryDataType' -// import { createColumnHelper } from '@tanstack/react-table' -import { questionsQueryOptions } from "@/modules/assessmentsManagement/queries/assessmentsQueries"; -// import { useForm } from '@mantine/form' -import { useQuery } from '@tanstack/react-query' - -// type DataType = ExtractQueryDataType; -// const columnHelper = useForm(); - -export function CardWithAssessment() { - // const { handleSubmit, form } = useForm(); - - const { page = 1, limit = 10, q = '' } = {} - - const { data, isLoading, isError } = useQuery(questionsQueryOptions(page, limit, q)); - - console.log(data) - - if (isLoading) return
Loading...
; - if (isError) return
Error fetching data
; - - // const groupedQuestions = data?.reduce((acc, item) => { - // const { subAspectId, subAspectName } = item; - // if (!acc[subAspectId]) { - // acc[subAspectId] = { - // subAspectName, - // questions: [], - // }; - // } - // acc[subAspectId].questions.push(item); - // return acc; - // }, {} as Record); - - - const renderQuestions = () => { - return data?.data.map((subAspect) => ( -
-

{subAspect.subAspectName}

- {data?.data.map((question) => ( -
- - - {data?.data.map((option) => ( -
- - -
- ))} -
-
- ))} -
- )); - }; - - const renderQuestionNumbers = () => { - const questionNumbers: number[] = []; - data?.data.forEach((subAspect) => { - data?.data.forEach((question, index) => { - questionNumbers.push(index + 1); - }); - }); - - return questionNumbers.map((num) => ( - - )); - }; - - return ( - -
- - Pertanyaan - - Bacalah pertanyaan dengan hati-hati dan jawablah dengan teliti! - - - -
-
- {renderQuestions()} -
-
-
- - - - -
-
- - Daftar Nomor - - -
-
- {renderQuestionNumbers()} -
-
-
-
-
- ); -} - -export const Route = createLazyFileRoute('/_dashboardLayout/assessments/')({ - component: () => -
-

- Halaman Assessments -

- -
-}) \ No newline at end of file diff --git a/apps/frontend/src/routes/_dashboardLayout/assessments/index.tsx b/apps/frontend/src/routes/_dashboardLayout/assessments/index.tsx deleted file mode 100644 index 57a1b20..0000000 --- a/apps/frontend/src/routes/_dashboardLayout/assessments/index.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/_dashboardLayout/assessments/')({ - component: () =>
Hello /_dashboardLayout/assessments/!
-}) \ No newline at end of file