Order API keys by name

dust-tt · Oct 31, 2024 · 4cb931b · 4cb931b
1 parent 443f2f9
commit 4cb931b
Showing 1 changed file with 22 additions and 7 deletions.
diff --git a/front/pages/w/[wId]/developers/api-keys.tsx b/front/pages/w/[wId]/developers/api-keys.tsx
@@ -196,13 +196,28 @@ export function APIKeys({
               />
             </NewDropdownMenuTrigger>
             <NewDropdownMenuContent>
-              {groups.map((group: GroupType) => (
-                <NewDropdownMenuItem
-                  key={group.id}
-                  label={prettifyGroupName(group)}
-                  onClick={() => setNewApiKeyGroup(group)}
-                />
-              ))}
+              {groups
+                .sort((a, b) => {
+                  // Put global groups first
+                  if (a.kind === "global" && b.kind !== "global") {
+                    return -1;
+                  }
+                  if (a.kind !== "global" && b.kind === "global") {
+                    return 1;
+                  }
+
+                  // Then sort alphabetically case insensitive
+                  return prettifyGroupName(a)
+                    .toLowerCase()
+                    .localeCompare(prettifyGroupName(b).toLowerCase());
+                })
+                .map((group: GroupType) => (
+                  <NewDropdownMenuItem
+                    key={group.id}
+                    label={prettifyGroupName(group)}
+                    onClick={() => setNewApiKeyGroup(group)}
+                  />
+                ))}
             </NewDropdownMenuContent>
           </NewDropdownMenu>
         </div>