From 2c8086f07881c7bb7f9ba05ac27db22ce2d2df39 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Sun, 1 Jun 2025 20:04:20 +0800
Subject: [PATCH] refactor: sort mentioned models in QuickPanel (#6666)

---
 .../home/Inputbar/MentionModelsButton.tsx     | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/renderer/src/pages/home/Inputbar/MentionModelsButton.tsx b/src/renderer/src/pages/home/Inputbar/MentionModelsButton.tsx
index 4928d6f4ed..c41de8b8c5 100644
--- a/src/renderer/src/pages/home/Inputbar/MentionModelsButton.tsx
+++ b/src/renderer/src/pages/home/Inputbar/MentionModelsButton.tsx
@@ -74,29 +74,33 @@ const MentionModelsButton: FC<Props> = ({ ref, mentionModels, onMentionModel, To
     }
 
     providers.forEach((p) => {
-      const providerModels = p.models
-        .filter((m) => !isEmbeddingModel(m) && !isRerankModel(m))
-        .filter((m) => !pinnedModels.includes(getModelUniqId(m)))
-        .map((m) => ({
-          label: (
-            <>
-              <ProviderName>{p.isSystem ? t(`provider.${p.id}`) : p.name}</ProviderName>
-              <span style={{ opacity: 0.8 }}> | {m.name}</span>
-            </>
-          ),
-          description: <ModelTagsWithLabel model={m} showLabel={false} size={10} style={{ opacity: 0.8 }} />,
-          icon: (
-            <Avatar src={getModelLogo(m.id)} size={20}>
-              {first(m.name)}
-            </Avatar>
-          ),
-          filterText: (p.isSystem ? t(`provider.${p.id}`) : p.name) + m.name,
-          action: () => onMentionModel(m),
-          isSelected: mentionModels.some((selected) => getModelUniqId(selected) === getModelUniqId(m))
-        }))
+      const providerModels = sortBy(
+        p.models
+          .filter((m) => !isEmbeddingModel(m) && !isRerankModel(m))
+          .filter((m) => !pinnedModels.includes(getModelUniqId(m))),
+        ['group', 'name']
+      )
 
-      if (providerModels.length > 0) {
-        items.push(...sortBy(providerModels, ['label']))
+      const providerModelItems = providerModels.map((m) => ({
+        label: (
+          <>
+            <ProviderName>{p.isSystem ? t(`provider.${p.id}`) : p.name}</ProviderName>
+            <span style={{ opacity: 0.8 }}> | {m.name}</span>
+          </>
+        ),
+        description: <ModelTagsWithLabel model={m} showLabel={false} size={10} style={{ opacity: 0.8 }} />,
+        icon: (
+          <Avatar src={getModelLogo(m.id)} size={20}>
+            {first(m.name)}
+          </Avatar>
+        ),
+        filterText: (p.isSystem ? t(`provider.${p.id}`) : p.name) + m.name,
+        action: () => onMentionModel(m),
+        isSelected: mentionModels.some((selected) => getModelUniqId(selected) === getModelUniqId(m))
+      }))
+
+      if (providerModelItems.length > 0) {
+        items.push(...providerModelItems)
       }
     })