Simplify UsePresets

decompme · Jul 12, 2024 · 424f09e · 424f09e
1 parent e303202
commit 424f09e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/frontend/src/components/compiler/PresetSelect.tsx b/frontend/src/components/compiler/PresetSelect.tsx
@@ -24,9 +24,7 @@ export default function PresetSelect({ className, platform, presetId, setPreset,
     if (typeof serverPresets === "undefined")
         serverPresets = api.usePresets(platform)
 
-    const sortedPresets = typeof serverPresets === "undefined" ? null : serverPresets.slice().sort((a, b) => a.name.localeCompare(b.name))
-
-    if (sortedPresets === null) {
+    if (typeof serverPresets === "undefined") {
         return <Select
             className={className}
             options={{ "Loading": "Loading..." }}
@@ -35,17 +33,17 @@ export default function PresetSelect({ className, platform, presetId, setPreset,
         />
     }
 
-    const selectedPreset = sortedPresets.find((p: api.Preset) => p.id === presetId)
+    const selectedPreset = serverPresets.find((p: api.Preset) => p.id === presetId)
 
-    if (sortedPresets.length > 0 && typeof presetId === "number" && !selectedPreset)
+    if (serverPresets.length > 0 && typeof presetId === "number" && !selectedPreset)
         console.warn(`Scratch.preset == '${presetId}' but no preset with that id was found.`)
 
     return <Select
         className={className}
-        options={presetsToOptions(sortedPresets)}
+        options={presetsToOptions(serverPresets)}
         value={selectedPreset?.name || "Custom"}
         onChange={name => {
-            setPreset(name === "Custom" ? null : sortedPresets.find((p: api.Preset) => p.name === name))
+            setPreset(name === "Custom" ? null : serverPresets.find((p: api.Preset) => p.name === name))
         }}
     />
 }
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
@@ -280,7 +280,7 @@ export function useLibraries(platform: string): LibraryVersions[] {
 
 export function usePresets(platform: string): Preset[] {
     const getByPlatform = ([url, platform]: [string | null, string]) => {
-        return get(url && platform && `${url}?platform=${platform}&page_size=100`)
+        return get(url && platform && `${url}?platform=${platform}&ordering=name&page_size=100`)
     }
 
     const url = typeof platform === "string" ? "/preset" : null