From 331bbea45fa2187fbc8a907b1fed89d7c6080ef5 Mon Sep 17 00:00:00 2001
From: "web@ppanel" <web@ppanel.dev>
Date: Tue, 28 Jan 2025 13:43:18 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(sort):=20Refactor=20sorting?=
 =?UTF-8?q?=20logic=20in=20NodeTable=20and=20SubscribeTable=20components?=
 =?UTF-8?q?=20for=20improved=20clarity=20and=20performance?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/admin/app/dashboard/server/node-table.tsx         | 10 +++++-----
 apps/admin/app/dashboard/subscribe/subscribe-table.tsx | 10 +++++-----
 apps/admin/components/user-nav.tsx                     |  6 ++++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/apps/admin/app/dashboard/server/node-table.tsx b/apps/admin/app/dashboard/server/node-table.tsx
index d8a2817..d22bfd0 100644
--- a/apps/admin/app/dashboard/server/node-table.tsx
+++ b/apps/admin/app/dashboard/server/node-table.tsx
@@ -291,20 +291,20 @@ export default function NodeTable() {
         const sourceIndex = items.findIndex((item) => String(item.id) === source);
         const targetIndex = items.findIndex((item) => String(item.id) === target);
 
-        const originalSortMap = new Map(items.map((item) => [item.id, item.sort || item.id]));
+        const originalSorts = items.map((item) => item.sort);
 
         const [movedItem] = items.splice(sourceIndex, 1);
         items.splice(targetIndex, 0, movedItem!);
 
         const updatedItems = items.map((item, index) => {
-          const originalSort = originalSortMap.get(item.id);
+          const originalSort = originalSorts[index];
           const newSort = originalSort !== undefined ? originalSort : item.sort;
           return { ...item, sort: newSort };
         });
 
-        const changedItems = updatedItems.filter(
-          (item) => originalSortMap.get(item.id) !== item.sort,
-        );
+        const changedItems = updatedItems.filter((item, index) => {
+          return item.sort !== items[index]?.sort;
+        });
 
         if (changedItems.length > 0) {
           nodeSort({
diff --git a/apps/admin/app/dashboard/subscribe/subscribe-table.tsx b/apps/admin/app/dashboard/subscribe/subscribe-table.tsx
index 5d57317..151435a 100644
--- a/apps/admin/app/dashboard/subscribe/subscribe-table.tsx
+++ b/apps/admin/app/dashboard/subscribe/subscribe-table.tsx
@@ -278,20 +278,20 @@ export default function SubscribeTable() {
         const sourceIndex = items.findIndex((item) => String(item.id) === source);
         const targetIndex = items.findIndex((item) => String(item.id) === target);
 
-        const originalSortMap = new Map(items.map((item) => [item.id, item.sort || item.id]));
+        const originalSorts = items.map((item) => item.sort);
 
         const [movedItem] = items.splice(sourceIndex, 1);
         items.splice(targetIndex, 0, movedItem!);
 
         const updatedItems = items.map((item, index) => {
-          const originalSort = originalSortMap.get(item.id);
+          const originalSort = originalSorts[index];
           const newSort = originalSort !== undefined ? originalSort : item.sort;
           return { ...item, sort: newSort };
         });
 
-        const changedItems = updatedItems.filter(
-          (item) => originalSortMap.get(item.id) !== item.sort,
-        );
+        const changedItems = updatedItems.filter((item, index) => {
+          return item.sort !== items[index]?.sort;
+        });
 
         if (changedItems.length > 0) {
           subscribeSort({
diff --git a/apps/admin/components/user-nav.tsx b/apps/admin/components/user-nav.tsx
index 99b61de..5068041 100644
--- a/apps/admin/components/user-nav.tsx
+++ b/apps/admin/components/user-nav.tsx
@@ -27,7 +27,7 @@ export function UserNav() {
             <Avatar className='size-8'>
               <AvatarImage alt={user?.avatar ?? ''} src={user?.avatar ?? ''} />
               <AvatarFallback className='rounded-none bg-transparent'>
-                {user?.email?.[0]?.toUpperCase()}
+                {user?.auth_methods?.[0]?.auth_identifier.toUpperCase().charAt(0)}
               </AvatarFallback>
             </Avatar>
           </Button>
@@ -35,7 +35,9 @@ export function UserNav() {
         <DropdownMenuContent forceMount align='end' className='w-56'>
           <DropdownMenuLabel className='font-normal'>
             <div className='flex flex-col space-y-1'>
-              <p className='text-sm font-medium leading-none'>{user?.email}</p>
+              <p className='text-sm font-medium leading-none'>
+                {user?.auth_methods?.[0]?.auth_identifier}
+              </p>
               {/* <p className='text-xs leading-none text-muted-foreground'>ID: {user?.id}</p> */}
             </div>
           </DropdownMenuLabel>