summaryrefslogtreecommitdiff
path: root/lib/form-list
diff options
context:
space:
mode:
Diffstat (limited to 'lib/form-list')
-rw-r--r--lib/form-list/repository.ts58
-rw-r--r--lib/form-list/service.ts28
-rw-r--r--lib/form-list/table/formLists-table-columns.tsx14
-rw-r--r--lib/form-list/table/formLists-table-toolbar-actions.tsx47
-rw-r--r--lib/form-list/table/formLists-table.tsx22
-rw-r--r--lib/form-list/table/meta-sheet.tsx2
-rw-r--r--lib/form-list/validation.ts11
7 files changed, 130 insertions, 52 deletions
diff --git a/lib/form-list/repository.ts b/lib/form-list/repository.ts
index ced320db..d3c555bf 100644
--- a/lib/form-list/repository.ts
+++ b/lib/form-list/repository.ts
@@ -1,4 +1,5 @@
import db from "@/db/db";
+import { projects } from "@/db/schema";
import { Item, items } from "@/db/schema/items";
import { tagTypeClassFormMappings } from "@/db/schema/vendorData";
import {
@@ -17,30 +18,47 @@ import {
import { PgTransaction } from "drizzle-orm/pg-core";
export async function selectFormLists(
- tx: PgTransaction<any, any, any>,
- params: {
- where?: any; // drizzle-orm의 조건식 (and, eq...) 등
- orderBy?: (ReturnType<typeof asc> | ReturnType<typeof desc>)[];
- offset?: number;
- limit?: number;
- }
- ) {
- const { where, orderBy, offset = 0, limit = 10 } = params;
-
- return tx
- .select()
- .from(tagTypeClassFormMappings)
- .where(where)
- .orderBy(...(orderBy ?? []))
- .offset(offset)
- .limit(limit);
+ tx: PgTransaction<any, any, any>,
+ params: {
+ where?: any;
+ orderBy?: (ReturnType<typeof asc> | ReturnType<typeof desc>)[];
+ offset?: number;
+ limit?: number;
}
+) {
+ const { where, orderBy, offset = 0, limit = 10 } = params;
+
+ return tx
+ .select({
+ id: tagTypeClassFormMappings.id,
+ projectId: tagTypeClassFormMappings.projectId,
+ tagTypeLabel: tagTypeClassFormMappings.tagTypeLabel,
+ classLabel: tagTypeClassFormMappings.classLabel,
+ formCode: tagTypeClassFormMappings.formCode,
+ formName: tagTypeClassFormMappings.formName,
+ createdAt: tagTypeClassFormMappings.createdAt,
+ updatedAt: tagTypeClassFormMappings.updatedAt,
+ // 프로젝트 정보 추가
+ projectCode: projects.code,
+ projectName: projects.name
+ })
+ .from(tagTypeClassFormMappings)
+ .innerJoin(projects, eq(tagTypeClassFormMappings.projectId, projects.id))
+ .where(where)
+ .orderBy(...(orderBy ?? []))
+ .offset(offset)
+ .limit(limit);
+}
+
/** 총 개수 count */
export async function countFormLists(
tx: PgTransaction<any, any, any>,
where?: any
) {
- const res = await tx.select({ count: count() }).from(tagTypeClassFormMappings).where(where);
+ const res = await tx
+ .select({ count: count() })
+ .from(tagTypeClassFormMappings)
+ .leftJoin(projects, eq(tagTypeClassFormMappings.projectId, projects.id))
+ .where(where);
return res[0]?.count ?? 0;
- }
- \ No newline at end of file
+ } \ No newline at end of file
diff --git a/lib/form-list/service.ts b/lib/form-list/service.ts
index 64156cf4..310930be 100644
--- a/lib/form-list/service.ts
+++ b/lib/form-list/service.ts
@@ -8,6 +8,7 @@ import { filterColumns } from "@/lib/filter-columns";
import { tagTypeClassFormMappings } from "@/db/schema/vendorData";
import { asc, desc, ilike, inArray, and, gte, lte, not, or } from "drizzle-orm";
import { countFormLists, selectFormLists } from "./repository";
+import { projects } from "@/db/schema";
export async function getFormLists(input: GetFormListsSchema) {
@@ -31,7 +32,9 @@ export async function getFormLists(input: GetFormListsSchema) {
if (input.search) {
const s = `%${input.search}%`
globalWhere = or(ilike(tagTypeClassFormMappings.formCode, s), ilike(tagTypeClassFormMappings.formName, s)
- , ilike(tagTypeClassFormMappings.tagTypeLabel, s) , ilike(tagTypeClassFormMappings.classLabel, s)
+ , ilike(tagTypeClassFormMappings.tagTypeLabel, s) , ilike(tagTypeClassFormMappings.classLabel, s),
+ ilike(projects.name, s),
+ ilike(projects.code, s),
)
// 필요시 여러 칼럼 OR조건 (status, priority, etc)
}
@@ -48,12 +51,21 @@ export async function getFormLists(input: GetFormListsSchema) {
const orderBy =
- input.sort.length > 0
- ? input.sort.map((item) =>
- item.desc ? desc(tagTypeClassFormMappings[item.id]) : asc(tagTypeClassFormMappings[item.id])
- )
- : [asc(tagTypeClassFormMappings.createdAt)];
-
+ input.sort.length > 0
+ ? input.sort.map((item) => {
+ // 프로젝트 관련 필드 정렬 처리
+ if (item.id === 'projectCode') {
+ return item.desc ? desc(projects.code) : asc(projects.code);
+ } else if (item.id === 'projectName') {
+ return item.desc ? desc(projects.name) : asc(projects.name);
+ } else {
+ // 기존 필드 정렬
+ return item.desc
+ ? desc(tagTypeClassFormMappings[item.id])
+ : asc(tagTypeClassFormMappings[item.id]);
+ }
+ })
+ : [asc(tagTypeClassFormMappings.createdAt)];
// 트랜잭션 내부에서 Repository 호출
const { data, total } = await db.transaction(async (tx) => {
const data = await selectFormLists(tx, {
@@ -78,7 +90,7 @@ export async function getFormLists(input: GetFormListsSchema) {
[JSON.stringify(input)], // 캐싱 키
{
revalidate: 3600,
- tags: ["form-lists"], // revalidateTag("items") 호출 시 무효화
+ tags: ["form-lists"],
}
)();
} \ No newline at end of file
diff --git a/lib/form-list/table/formLists-table-columns.tsx b/lib/form-list/table/formLists-table-columns.tsx
index f638c4df..647a8af1 100644
--- a/lib/form-list/table/formLists-table-columns.tsx
+++ b/lib/form-list/table/formLists-table-columns.tsx
@@ -17,16 +17,16 @@ import {
import { DataTableColumnHeaderSimple } from "@/components/data-table/data-table-column-simple-header"
import { formListsColumnsConfig } from "@/config/formListsColumnsConfig"
-import { TagTypeClassFormMappings } from "@/db/schema/vendorData"
+import { ExtendedFormMappings } from "../validation"
interface GetColumnsProps {
- setRowAction: React.Dispatch<React.SetStateAction<DataTableRowAction<TagTypeClassFormMappings> | null>>
+ setRowAction: React.Dispatch<React.SetStateAction<DataTableRowAction<ExtendedFormMappings> | null>>
}
/**
* tanstack table 컬럼 정의 (중첩 헤더 버전)
*/
-export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<TagTypeClassFormMappings>[] {
+export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<ExtendedFormMappings>[] {
// ----------------------------------------------------------------
// 1) select 컬럼 (체크박스)
// ----------------------------------------------------------------
@@ -35,7 +35,7 @@ export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<TagType
// ----------------------------------------------------------------
// 2) actions 컬럼 (단일 버튼 - Meta Info 바로 보기)
// ----------------------------------------------------------------
- const actionsColumn: ColumnDef<TagTypeClassFormMappings> = {
+ const actionsColumn: ColumnDef<ExtendedFormMappings> = {
id: "actions",
enableHiding: false,
cell: function Cell({ row }) {
@@ -65,7 +65,7 @@ export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<TagType
// 3) 일반 컬럼들을 "그룹"별로 묶어 중첩 columns 생성
// ----------------------------------------------------------------
// 3-1) groupMap: { [groupName]: ColumnDef<TagTypeClassFormMappings>[] }
- const groupMap: Record<string, ColumnDef<TagTypeClassFormMappings>[]> = {}
+ const groupMap: Record<string, ColumnDef<ExtendedFormMappings>[]> = {}
formListsColumnsConfig.forEach((cfg) => {
// 만약 group가 없으면 "_noGroup" 처리
@@ -76,7 +76,7 @@ export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<TagType
}
// child column 정의
- const childCol: ColumnDef<TagTypeClassFormMappings> = {
+ const childCol: ColumnDef<ExtendedFormMappings> = {
accessorKey: cfg.id,
enableResizing: true,
header: ({ column }) => (
@@ -104,7 +104,7 @@ export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<TagType
// ----------------------------------------------------------------
// 3-2) groupMap에서 실제 상위 컬럼(그룹)을 만들기
// ----------------------------------------------------------------
- const nestedColumns: ColumnDef<TagTypeClassFormMappings>[] = []
+ const nestedColumns: ColumnDef<ExtendedFormMappings>[] = []
// 순서를 고정하고 싶다면 group 순서를 미리 정의하거나 sort해야 함
// 여기서는 그냥 Object.entries 순서
diff --git a/lib/form-list/table/formLists-table-toolbar-actions.tsx b/lib/form-list/table/formLists-table-toolbar-actions.tsx
index 346a3980..96494607 100644
--- a/lib/form-list/table/formLists-table-toolbar-actions.tsx
+++ b/lib/form-list/table/formLists-table-toolbar-actions.tsx
@@ -7,18 +7,49 @@ import { toast } from "sonner"
import { exportTableToExcel } from "@/lib/export"
import { Button } from "@/components/ui/button"
-import { TagTypeClassFormMappings } from "@/db/schema/vendorData"
+import { ExtendedFormMappings } from "../validation"
interface ItemsTableToolbarActionsProps {
- table: Table<TagTypeClassFormMappings>
+ table: Table<ExtendedFormMappings>
}
export function FormListsTableToolbarActions({ table }: ItemsTableToolbarActionsProps) {
- // 파일 input을 숨기고, 버튼 클릭 시 참조해 클릭하는 방식
- const fileInputRef = React.useRef<HTMLInputElement>(null)
+ const [isLoading, setIsLoading] = React.useState(false)
+ const syncForms = async () => {
+ try {
+ setIsLoading(true)
+
+ // API 엔드포인트 호출
+ const response = await fetch('/api/cron/forms')
+
+ if (!response.ok) {
+ const errorData = await response.json()
+ throw new Error(errorData.error || 'Failed to sync forms')
+ }
+
+ const data = await response.json()
+
+ // 성공 메시지 표시
+ toast.success(
+ `Forms synced successfully! ${data.result.items} items processed.`
+ )
+
+ // 페이지 새로고침으로 테이블 데이터 업데이트
+ window.location.reload()
+ } catch (error) {
+ console.error('Error syncing forms:', error)
+ toast.error(
+ error instanceof Error
+ ? error.message
+ : 'An error occurred while syncing forms'
+ )
+ } finally {
+ setIsLoading(false)
+ }
+ }
return (
@@ -29,8 +60,10 @@ export function FormListsTableToolbarActions({ table }: ItemsTableToolbarActions
size="sm"
className="gap-2"
>
- <RefreshCcw className="size-4" aria-hidden="true" />
- <span className="hidden sm:inline">Get Forms</span>
+ <RefreshCcw className={`size-4 ${isLoading ? 'animate-spin' : ''}`} aria-hidden="true" />
+ <span className="hidden sm:inline">
+ {isLoading ? 'Syncing...' : 'Get Forms'}
+ </span>
</Button>
{/** 4) Export 버튼 */}
@@ -39,7 +72,7 @@ export function FormListsTableToolbarActions({ table }: ItemsTableToolbarActions
size="sm"
onClick={() =>
exportTableToExcel(table, {
- filename: "tasks",
+ filename: "Forms",
excludeColumns: ["select", "actions"],
})
}
diff --git a/lib/form-list/table/formLists-table.tsx b/lib/form-list/table/formLists-table.tsx
index be252655..58ac4671 100644
--- a/lib/form-list/table/formLists-table.tsx
+++ b/lib/form-list/table/formLists-table.tsx
@@ -12,17 +12,17 @@ import { DataTable } from "@/components/data-table/data-table"
import { DataTableAdvancedToolbar } from "@/components/data-table/data-table-advanced-toolbar"
import { useFeatureFlags } from "./feature-flags-provider"
-import { TagTypeClassFormMappings } from "@/db/schema/vendorData"
import { getFormLists } from "../service"
import { getColumns } from "./formLists-table-columns"
import { FormListsTableToolbarActions } from "./formLists-table-toolbar-actions"
import { ViewMetas } from "./meta-sheet"
+import { ExtendedFormMappings } from "../validation"
interface ItemsTableProps {
promises: Promise<
[
Awaited<ReturnType<typeof getFormLists>>,
- ]
+ ]
>
}
@@ -34,7 +34,7 @@ export function FormListsTable({ promises }: ItemsTableProps) {
const [rowAction, setRowAction] =
- React.useState<DataTableRowAction<TagTypeClassFormMappings> | null>(null)
+ React.useState<DataTableRowAction<ExtendedFormMappings> | null>(null)
const columns = React.useMemo(
() => getColumns({ setRowAction }),
@@ -52,7 +52,7 @@ export function FormListsTable({ promises }: ItemsTableProps) {
* @prop {React.ReactNode} [icon] - An optional icon to display next to the label.
* @prop {boolean} [withCount] - An optional boolean to display the count of the filter option.
*/
- const filterFields: DataTableFilterField<TagTypeClassFormMappings>[] = [
+ const filterFields: DataTableFilterField<ExtendedFormMappings>[] = [
]
@@ -67,18 +67,26 @@ export function FormListsTable({ promises }: ItemsTableProps) {
* 3. Used with DataTableAdvancedToolbar: Enables a more sophisticated filtering UI.
* 4. Date and boolean types: Adds support for filtering by date ranges and boolean values.
*/
- const advancedFilterFields: DataTableAdvancedFilterField<TagTypeClassFormMappings>[] = [
+ const advancedFilterFields: DataTableAdvancedFilterField<ExtendedFormMappings>[] = [
+ {
+ id: "projectCode",
+ label: "Project Code",
+ type: "text",
+ },
+ {
+ id: "projectName",
+ label: "Project Name",
+ type: "text",
+ },
{
id: "formCode",
label: "Form Code",
type: "text",
-
},
{
id: "formName",
label: "Form Name",
type: "text",
-
},
{
id: "tagTypeLabel",
diff --git a/lib/form-list/table/meta-sheet.tsx b/lib/form-list/table/meta-sheet.tsx
index 155e4f5a..694ee845 100644
--- a/lib/form-list/table/meta-sheet.tsx
+++ b/lib/form-list/table/meta-sheet.tsx
@@ -77,7 +77,7 @@ export function ViewMetas({ open, onOpenChange, form }: ViewMetasProps) {
setLoading(true)
try {
// 서버 액션 호출
- const metaData = await fetchFormMetadata(form.formCode)
+ const metaData = await fetchFormMetadata(form.formCode, form.projectId)
if (metaData) {
setMetadata(metaData)
} else {
diff --git a/lib/form-list/validation.ts b/lib/form-list/validation.ts
index c8baf960..497ec871 100644
--- a/lib/form-list/validation.ts
+++ b/lib/form-list/validation.ts
@@ -10,15 +10,22 @@ import * as z from "zod"
import { getFiltersStateParser, getSortingStateParser } from "@/lib/parsers"
import { TagTypeClassFormMappings } from "@/db/schema/vendorData";
+export type ExtendedFormMappings = TagTypeClassFormMappings & {
+ projectCode: string;
+ projectName: string;
+ };
+
+
export const searchParamsCache = createSearchParamsCache({
flags: parseAsArrayOf(z.enum(["advancedTable", "floatingBar"])).withDefault(
[]
),
page: parseAsInteger.withDefault(1),
perPage: parseAsInteger.withDefault(10),
- sort: getSortingStateParser<TagTypeClassFormMappings>().withDefault([
+ sort: getSortingStateParser<ExtendedFormMappings>().withDefault([
{ id: "createdAt", desc: true },
- ]),
+ ]),
+
tagTypeLabel: parseAsString.withDefault(""),
classLabel: parseAsString.withDefault(""),
formCode: parseAsString.withDefault(""),
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-07 19:39:51 +0000