diff --git a/app/pages/dashboard-categories/index.tsx b/app/pages/dashboard-categories/index.tsx
index 66056d2..5a67ed1 100644
--- a/app/pages/dashboard-categories/index.tsx
+++ b/app/pages/dashboard-categories/index.tsx
@@ -1,5 +1,5 @@
-import DT from 'datatables.net-dt'
-import DataTable from 'datatables.net-react'
+import DT, { type Config, type ConfigColumns } from 'datatables.net-dt'
+import DataTable, { type DataTableSlots } from 'datatables.net-react'
import { Link, useRouteLoaderData } from 'react-router'
import type { TCategoryResponse } from '~/apis/common/get-categories'
@@ -13,12 +13,13 @@ export const CategoriesPage = () => {
)
DataTable.use(DT)
- const dataTable = loaderData?.categoriesData?.sort((a, b) => {
- if (a.sequence === null) return 1
- if (b.sequence === null) return -1
- return a.sequence - b.sequence
- })
- const dataColumns = [
+ const dataTable =
+ loaderData?.categoriesData?.sort((a, b) => {
+ if (a.sequence === null) return 1
+ if (b.sequence === null) return -1
+ return a.sequence - b.sequence
+ }) || []
+ const dataColumns: ConfigColumns[] = [
{
title: 'No',
render: (
@@ -46,7 +47,7 @@ export const CategoriesPage = () => {
data: 'id',
},
]
- const dataSlot = {
+ const dataSlot: DataTableSlots = {
1: (_value: unknown, _type: unknown, data: TCategoryResponse) => (
{data.name}
@@ -64,7 +65,7 @@ export const CategoriesPage = () => {
),
}
- const dataOptions = {
+ const dataOptions: Config = {
paging: true,
searching: true,
ordering: true,
diff --git a/app/pages/dashboard-contents/index.tsx b/app/pages/dashboard-contents/index.tsx
index 450b7d1..fb13630 100644
--- a/app/pages/dashboard-contents/index.tsx
+++ b/app/pages/dashboard-contents/index.tsx
@@ -1,5 +1,5 @@
-import DT from 'datatables.net-dt'
-import DataTable from 'datatables.net-react'
+import DT, { type Config, type ConfigColumns } from 'datatables.net-dt'
+import DataTable, { type DataTableSlots } from 'datatables.net-react'
import { Link, useRouteLoaderData } from 'react-router'
import type { TCategoryResponse } from '~/apis/common/get-categories'
@@ -17,16 +17,17 @@ export const ContentsPage = () => {
)
DataTable.use(DT)
- const dataTable = loaderData?.newsData?.sort(
- (a, b) => new Date(b.live_at).getTime() - new Date(a.live_at).getTime(),
- )
- const dataColumns = [
+ const dataTable =
+ loaderData?.newsData?.sort(
+ (a, b) => new Date(b.live_at).getTime() - new Date(a.live_at).getTime(),
+ ) || []
+ const dataColumns: ConfigColumns[] = [
{
title: 'No',
render: (
- data: unknown,
- type: unknown,
- row: unknown,
+ _data: unknown,
+ _type: unknown,
+ _row: unknown,
meta: { row: number },
) => {
return meta.row + 1
@@ -54,7 +55,7 @@ export const ContentsPage = () => {
data: 'slug',
},
]
- const dataSlot = {
+ const dataSlot: DataTableSlots = {
1: (value: string) => formatDate(value),
2: (_value: unknown, _type: unknown, data: TNewsResponse) => (
@@ -62,6 +63,7 @@ export const ContentsPage = () => {
ID: {data.id.slice(0, 8)}
),
+ 3: (value: string) =>
{value},
4: (value: TCategoryResponse[]) => (
{value.map((item) => item.name).join(', ')}
),
@@ -89,7 +91,7 @@ export const ContentsPage = () => {
),
}
- const dataOptions = {
+ const dataOptions: Config = {
paging: true,
searching: true,
ordering: true,
diff --git a/app/pages/dashboard-tags/index.tsx b/app/pages/dashboard-tags/index.tsx
index 8d6bddc..06225ed 100644
--- a/app/pages/dashboard-tags/index.tsx
+++ b/app/pages/dashboard-tags/index.tsx
@@ -1,5 +1,5 @@
-import DT from 'datatables.net-dt'
-import DataTable from 'datatables.net-react'
+import DT, { type Config, type ConfigColumns } from 'datatables.net-dt'
+import DataTable, { type DataTableSlots } from 'datatables.net-react'
import { Link, useRouteLoaderData } from 'react-router'
import { Button } from '~/components/ui/button'
@@ -14,13 +14,13 @@ export const TagsPage = () => {
const { tagsData: dataTable } = loaderData || {}
DataTable.use(DT)
- const dataColumns = [
+ const dataColumns: ConfigColumns[] = [
{
title: 'No',
render: (
- data: unknown,
- type: unknown,
- row: unknown,
+ _data: unknown,
+ _type: unknown,
+ _row: unknown,
meta: { row: number },
) => {
return meta.row + 1
@@ -39,15 +39,7 @@ export const TagsPage = () => {
data: 'id',
},
]
-
- const dataOptions = {
- paging: true,
- searching: true,
- ordering: true,
- info: true,
- }
-
- const dataSlot = {
+ const dataSlot: DataTableSlots = {
3: (value: string) => (
),
}
+ const dataOptions: Config = {
+ paging: true,
+ searching: true,
+ ordering: true,
+ info: true,
+ }
+
return (
@@ -75,7 +74,7 @@ export const TagsPage = () => {