From a9a350fdb2a07e6e3f8bb412022967e05f34312e Mon Sep 17 00:00:00 2001
From: "fredy.siswanto" <fredy.siswanto@komunal.co.id>
Date: Sun, 9 Mar 2025 20:23:26 +0700
Subject: [PATCH] refactor: update subscription data loading and clean up
 unused imports in dashboard components

---
 app/pages/dashboard-plan-subscribe/index.tsx        | 13 +++++--------
 app/pages/dashboard-subscriptions/index.tsx         | 10 ----------
 ...in.lg-admin._dashboard.subscribe-plan._index.tsx |  7 +++++++
 app/routes/_admin.lg-admin._dashboard.tsx           |  3 ---
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/app/pages/dashboard-plan-subscribe/index.tsx b/app/pages/dashboard-plan-subscribe/index.tsx
index 8a9d5a0..61a6fb6 100644
--- a/app/pages/dashboard-plan-subscribe/index.tsx
+++ b/app/pages/dashboard-plan-subscribe/index.tsx
@@ -5,24 +5,22 @@ import { Link, useRouteLoaderData } from 'react-router'
 import { Button } from '~/components/ui/button'
 import { UiTable } from '~/components/ui/table'
 import { TitleDashboard } from '~/components/ui/title-dashboard'
-import type { loader } from '~/routes/_admin.lg-admin._dashboard'
+import type { loader } from '~/routes/_admin.lg-admin._dashboard.subscribe-plan._index'
 
 export const SubscribePlanPage = () => {
   const loaderData = useRouteLoaderData<typeof loader>(
-    'routes/_admin.lg-admin._dashboard',
+    'routes/_admin.lg-admin._dashboard.subscribe-plan._index',
   )
 
   DataTable.use(DT)
-
   const { subscriptionsData: dataTable } = loaderData || {}
-
   const dataColumns = [
     {
       title: 'No',
       render: (
-        data: unknown,
-        type: unknown,
-        row: unknown,
+        _data: unknown,
+        _type: unknown,
+        _row: unknown,
         meta: { row: number },
       ) => {
         return meta.row + 1
@@ -41,7 +39,6 @@ export const SubscribePlanPage = () => {
       data: 'id',
     },
   ]
-
   const dataSlot = {
     3: (value: string) => (
       <Button
diff --git a/app/pages/dashboard-subscriptions/index.tsx b/app/pages/dashboard-subscriptions/index.tsx
index 7afdbfc..9cb54d5 100644
--- a/app/pages/dashboard-subscriptions/index.tsx
+++ b/app/pages/dashboard-subscriptions/index.tsx
@@ -3,7 +3,6 @@ import DT from 'datatables.net-dt'
 import DataTable from 'datatables.net-react'
 
 import { SearchIcon } from '~/components/icons/search'
-import { Button } from '~/components/ui/button'
 import { UiTable } from '~/components/ui/table'
 import { TitleDashboard } from '~/components/ui/title-dashboard'
 
@@ -61,15 +60,6 @@ export const SubscriptionsPage = () => {
             </Field>
           </div>
         </div>
-
-        <Button
-          as="a"
-          className="rounded-md"
-          size="lg"
-          href="#"
-        >
-          Subscription Settings
-        </Button>
       </div>
 
       <UiTable
diff --git a/app/routes/_admin.lg-admin._dashboard.subscribe-plan._index.tsx b/app/routes/_admin.lg-admin._dashboard.subscribe-plan._index.tsx
index eb574ba..b94fc90 100644
--- a/app/routes/_admin.lg-admin._dashboard.subscribe-plan._index.tsx
+++ b/app/routes/_admin.lg-admin._dashboard.subscribe-plan._index.tsx
@@ -1,4 +1,11 @@
+import { getSubscriptions } from '~/apis/common/get-subscriptions'
 import { SubscribePlanPage } from '~/pages/dashboard-plan-subscribe'
 
+import type { Route } from './+types/_admin.lg-admin._dashboard.contents._index'
+
+export const loader = async ({}: Route.LoaderArgs) => {
+  const { data: subscriptionsData } = await getSubscriptions()
+  return { subscriptionsData }
+}
 const DashboardSubscriptionsSettingsLayout = () => <SubscribePlanPage />
 export default DashboardSubscriptionsSettingsLayout
diff --git a/app/routes/_admin.lg-admin._dashboard.tsx b/app/routes/_admin.lg-admin._dashboard.tsx
index 72ed1cc..11b5ffc 100644
--- a/app/routes/_admin.lg-admin._dashboard.tsx
+++ b/app/routes/_admin.lg-admin._dashboard.tsx
@@ -1,7 +1,6 @@
 import { Outlet } from 'react-router'
 
 import { getCategories } from '~/apis/common/get-categories'
-import { getSubscriptions } from '~/apis/common/get-subscriptions'
 import { getTags } from '~/apis/common/get-tags'
 import { AdminDashboardLayout } from '~/layouts/admin/dashboard'
 
@@ -10,12 +9,10 @@ import type { Route } from './+types/_admin.lg-admin._dashboard'
 export const loader = async ({}: Route.LoaderArgs) => {
   const { data: categoriesData } = await getCategories()
   const { data: tagsData } = await getTags()
-  const { data: subscriptionsData } = await getSubscriptions()
 
   return {
     categoriesData,
     tagsData,
-    subscriptionsData,
   }
 }