From 7d3d33ef7e45126e8726e4e857778d3dfb8f24d7 Mon Sep 17 00:00:00 2001
From: "Mr.Dat" <imdat2999@gmail.com>
Date: Fri, 23 Jan 2026 15:17:24 +0700
Subject: [PATCH] refactor: reorganize imports and replace fetchPlans with
 useSWRV for data fetching

---
 src/lib/swr/use-swrv.ts    | 36 ++++++++++-----------
 src/routes/plans/Plans.vue | 65 ++++++++++++++++++--------------------
 2 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/src/lib/swr/use-swrv.ts b/src/lib/swr/use-swrv.ts
index 8230ca4..5f6a490 100644
--- a/src/lib/swr/use-swrv.ts
+++ b/src/lib/swr/use-swrv.ts
@@ -19,26 +19,26 @@
  *               |||    /    //
  *               |||   /
  */
+import { tinyassert } from "@hiogawa/utils";
 import {
-	reactive,
-	watch,
-	ref,
-	toRefs,
+	getCurrentInstance,
+	inject,
+	isReadonly,
+	isRef,
 	// isRef,
 	onMounted,
-	onUnmounted,
-	getCurrentInstance,
-	isReadonly,
 	onServerPrefetch,
-	isRef,
+	onUnmounted,
+	reactive,
+	ref,
+	toRefs,
 	useSSRContext,
-	type FunctionPlugin,
-	inject
-} from 'vue'
-import webPreset from './lib/web-preset'
-import SWRVCache from './cache'
-import type { IConfig, IKey, IResponse, fetcherFn, revalidateOptions } from './types'
-import { tinyassert } from "@hiogawa/utils";
+	watch,
+	type FunctionPlugin
+} from 'vue';
+import SWRVCache from './cache';
+import webPreset from './lib/web-preset';
+import type { IConfig, IKey, IResponse, fetcherFn, revalidateOptions } from './types';
 
 type StateRef<Data, Error> = {
 	data: Data, error: Error, isValidating: boolean, isLoading: boolean, revalidate: Function, key: any
@@ -183,7 +183,7 @@ function useSWRV<Data = any, Error = any>(...args: any[]): IResponse<Data, Error
 	// #region ssr
 	const isSsrHydration = Boolean(
 		!IS_SERVER &&
-		window !== undefined && (window as any).__SSR_STATE__.swrv)
+		window !== undefined && (window as any).window.swrv)
 	// #endregion
 	if (args.length >= 1) {
 		key = args[0]
@@ -211,7 +211,7 @@ function useSWRV<Data = any, Error = any>(...args: any[]): IResponse<Data, Error
 	if (isSsrHydration) {
 		// component was ssrHydrated, so make the ssr reactive as the initial data
 
-		const swrvState = (window as any).__SSR_STATE__.swrv || []
+		const swrvState = (window as any).window.swrv || []
 		const swrvKey = nanoHex(vm.$.type.__name ?? vm.$.type.name)
 		if (swrvKey !== undefined && swrvKey !== null) {
 			const nodeState = swrvState[swrvKey] || []
@@ -466,5 +466,5 @@ export const vueSWR = (swrvConfig: Partial<IConfig> = defaultConfig): FunctionPl
 	// app.provide('swrv', useSWRV)
 	app.provide('swrv-config', swrvConfig)
 }
-export { mutate }
+export { mutate };
 export default useSWRV
diff --git a/src/routes/plans/Plans.vue b/src/routes/plans/Plans.vue
index 53ce321..a9ad210 100644
--- a/src/routes/plans/Plans.vue
+++ b/src/routes/plans/Plans.vue
@@ -1,20 +1,19 @@
 <script setup lang="ts">
-import { ref, onMounted, computed } from 'vue';
-import { useAuthStore } from '@/stores/auth';
 import { client, type ModelPlan } from '@/api/client';
 import PageHeader from '@/components/dashboard/PageHeader.vue';
-import Card from 'primevue/card';
+import useSWRV from '@/lib/swr';
+import { useAuthStore } from '@/stores/auth';
 import Button from 'primevue/button';
-import Skeleton from 'primevue/skeleton';
-import DataTable from 'primevue/datatable';
 import Column from 'primevue/column';
-import Tag from 'primevue/tag';
-import ProgressBar from 'primevue/progressbar';
+import DataTable from 'primevue/datatable';
 import Dialog from 'primevue/dialog';
+import ProgressBar from 'primevue/progressbar';
+import Skeleton from 'primevue/skeleton';
+import Tag from 'primevue/tag';
+import { computed, ref } from 'vue';
 
 const auth = useAuthStore();
 const plans = ref<ModelPlan[]>([]);
-const loading = ref(true);
 const error = ref<string | null>(null);
 const subscribing = ref<string | null>(null);
 const showManageDialog = ref(false);
@@ -48,27 +47,27 @@ const currentPlan = computed(() => {
     if (!Array.isArray(plans.value)) return undefined;
     return plans.value.find(p => p.id === currentPlanId.value);
 });
-
-const fetchPlans = async () => {
-  loading.value = true;
-  error.value = null;
-  try {
-    const response = await client.plans.plansList();
-    if (response.data && Array.isArray(response.data)) {
-        plans.value = response.data;
-    } else if (response.data && Array.isArray((response.data as any).data)) {
-        // Handle paginated or wrapped response
-        plans.value = (response.data as any).data;
-    } else {
-        plans.value = [];
-    }
-  } catch (err: any) {
-    console.error(err);
-    error.value = err.message || 'Failed to load plans';
-  } finally {
-    loading.value = false;
-  }
-};
+const { isLoading } = useSWRV("plans", client.plans.plansList)
+// const fetchPlans = async () => {
+//   loading.value = true;
+//   error.value = null;
+//   try {
+//     const response = await client.plans.plansList();
+//     if (response.data && Array.isArray(response.data)) {
+//         plans.value = response.data;
+//     } else if (response.data && Array.isArray((response.data as any).data)) {
+//         // Handle paginated or wrapped response
+//         plans.value = (response.data as any).data;
+//     } else {
+//         plans.value = [];
+//     }
+//   } catch (err: any) {
+//     console.error(err);
+//     error.value = err.message || 'Failed to load plans';
+//   } finally {
+//     loading.value = false;
+//   }
+// };
 
 const subscribe = async (plan: ModelPlan) => {
   if (!plan.id) return;
@@ -145,10 +144,6 @@ const getStatusSeverity = (status: string) => {
             return 'info';
     }
 };
-
-onMounted(() => {
-  fetchPlans();
-});
 </script>
 
 <template>
@@ -165,7 +160,7 @@ onMounted(() => {
     <div class="content max-w-7xl mx-auto space-y-12 pb-12">
         
         <!-- Hero Section: Current Plan & Usage -->
-        <div v-if="!loading" class="grid grid-cols-1 lg:grid-cols-3 gap-6">
+        <div v-if="!isLoading" class="grid grid-cols-1 lg:grid-cols-3 gap-6">
             <!-- Current Plan Card -->
             <div class="lg:col-span-2 relative overflow-hidden rounded-2xl bg-gradient-to-br from-gray-900 to-gray-800 text-white p-8 shadow-xl">
                  <!-- Background decorations -->
@@ -222,7 +217,7 @@ onMounted(() => {
             </div>
             
              <!-- Loading State -->
-             <div v-if="loading" class="grid grid-cols-1 md:grid-cols-3 gap-8">
+             <div v-if="isLoading" class="grid grid-cols-1 md:grid-cols-3 gap-8">
                 <div v-for="i in 3" :key="i" class="h-full">
                     <Skeleton height="300px" borderRadius="16px"></Skeleton>
                 </div>