From 0bbeb481f4b398d3ec4c74e8902433e34e2272e1 Mon Sep 17 00:00:00 2001
From: scarqin <scarqin@gmail.com>
Date: Fri, 3 Jan 2025 16:29:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20The=20load=20diagram=20moves=20as=20?=
 =?UTF-8?q?a=20whole=20to=20the=20left=20so=20that=20the=20main=20content?=
 =?UTF-8?q?=20is=20in=20the=20middle=20and=20the=20AI=20=E2=80=8B=E2=80=8B?=
 =?UTF-8?q?Services=20icon=20is=20aligned=20to=20the=20left?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/packages/core/src/pages/aiSetting/styles.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/packages/core/src/pages/aiSetting/styles.css b/frontend/packages/core/src/pages/aiSetting/styles.css
index 13d5b62b..0311fdf3 100644
--- a/frontend/packages/core/src/pages/aiSetting/styles.css
+++ b/frontend/packages/core/src/pages/aiSetting/styles.css
@@ -8,6 +8,7 @@
 .react-flow__container {
   width: 100%;
   height: 100%;
+  transform: translate(0px, 0px) !important;
 }
 
 .react-flow__renderer {

From 17372cd0a4f1737ae6298f8fb9865b3d3e9fd6b1 Mon Sep 17 00:00:00 2001
From: scarqin <scarqin@gmail.com>
Date: Fri, 3 Jan 2025 16:37:36 +0800
Subject: [PATCH 2/3] fix: The bottom margin of the banner should be sufficient

---
 frontend/packages/core/src/pages/aiApis/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/packages/core/src/pages/aiApis/index.tsx b/frontend/packages/core/src/pages/aiApis/index.tsx
index 17b20768..f7450511 100644
--- a/frontend/packages/core/src/pages/aiApis/index.tsx
+++ b/frontend/packages/core/src/pages/aiApis/index.tsx
@@ -184,7 +184,7 @@ const ApiSettings: React.FC = () => {
         <Alert
           message={message}
           type={type}
-          className="my-4"
+          className="mt-[30px]"
           showIcon
           action={
             <Button
@@ -205,7 +205,7 @@ const ApiSettings: React.FC = () => {
 
   return (
     <InsidePage
-      className="overflow-y-auto gap-4 pb-PAGE_INSIDE_B"
+      className="overflow-y-auto pb-PAGE_INSIDE_B"
       pageTitle={$t('AI API 列表')}
       description={
         <>

From ac5cbd2d22ec9db5bad2396b742859ce28eb1ac8 Mon Sep 17 00:00:00 2001
From: scarqin <scarqin@gmail.com>
Date: Fri, 3 Jan 2025 17:13:40 +0800
Subject: [PATCH 3/3] fix: KEY pool adjustment order will fail

---
 .../core/src/pages/keySettings/index.tsx      | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/frontend/packages/core/src/pages/keySettings/index.tsx b/frontend/packages/core/src/pages/keySettings/index.tsx
index 6ea97505..61eb784a 100644
--- a/frontend/packages/core/src/pages/keySettings/index.tsx
+++ b/frontend/packages/core/src/pages/keySettings/index.tsx
@@ -27,6 +27,7 @@ const KeySettings: React.FC = () => {
   const [total, setTotal] = useState<number>(0)
   const modalRef = useRef<any>()
   const { accessData } = useGlobalContext()
+  const [apiKeys, setApiKeys] = useState<APIKey[]>([])
 
   useEffect(() => {
     pageListRef.current?.reload()
@@ -154,16 +155,30 @@ const KeySettings: React.FC = () => {
   }
 
   const handleDragSortEnd = async (beforeIndex: number, afterIndex: number, newDataSource: APIKey[]) => {
-    console.log(beforeIndex, afterIndex, newDataSource)
     try {
+      let targetId
+      let sortDirection
+
+      // Check if there's an item before afterIndex
+      if (afterIndex > 0) {
+        targetId = newDataSource[afterIndex - 1].id
+        sortDirection = 'after'
+      } else if (afterIndex < newDataSource.length - 1) {
+        // If no item before, use the item after
+        targetId = newDataSource[afterIndex + 1].id
+        sortDirection = 'before'
+      }
+
       const response = await fetchData<BasicResponse<any>>('ai/resource/key/sort', {
         method: 'PUT',
         eoParams: {
-          origin: newDataSource[beforeIndex].id,
-          target: newDataSource[afterIndex].id,
-          sort: afterIndex > beforeIndex ? 'before' : 'after'
+          provider: selectedProvider
+        },
+        eoBody: {
+          origin: apiKeys[beforeIndex].id,
+          target: targetId,
+          sort: sortDirection
         }
-        // eoApiPrefix: 'http://uat.apikit.com:11204/mockApi/aoplatform/api/v1/'
       })
 
       if (response.code === STATUS_CODE.SUCCESS) {
@@ -171,9 +186,13 @@ const KeySettings: React.FC = () => {
         pageListRef.current?.reload()
       } else {
         message.error(response.msg || RESPONSE_TIPS.error)
+        // Revert the UI if API call fails
+        pageListRef.current?.reload()
       }
     } catch (error) {
       message.error(RESPONSE_TIPS.error)
+      // Revert the UI if API call fails
+      pageListRef.current?.reload()
     }
   }
 
@@ -195,6 +214,7 @@ const KeySettings: React.FC = () => {
 
       if (response.code === STATUS_CODE.SUCCESS) {
         setTotal(response.data.total)
+        setApiKeys(response.data.keys)
         return {
           data: response.data.keys,
           success: true,