Remove 'include_presets' from /api/platform endpoint

backend/coreapp/platforms.py

@@ -11,11 +11,9 @@
     COMMON_MSDOS_DIFF_FLAGS,
     Flags,
 )
-from coreapp.models.preset import Preset
 from coreapp.models.scratch import Scratch
 from rest_framework.exceptions import APIException
 
-from coreapp.serializers import TersePresetSerializer
 
 logger = logging.getLogger(__name__)
 
@@ -47,7 +45,6 @@ def get_num_scratches(self) -> int:
     def to_json(
         self,
         include_compilers: bool = False,
-        include_presets: bool = False,
         include_num_scratches: bool = False,
     ) -> Dict[str, Any]:
         ret: Dict[str, Any] = {
@@ -63,11 +60,6 @@ def to_json(
                 for x in compilers.available_compilers()
                 if x.platform.id == self.id
             ]
-        if include_presets:
-            ret["presets"] = [
-                TersePresetSerializer(p).data
-                for p in Preset.objects.filter(platform=self.id).order_by("name")
-            ]
         if include_num_scratches:
             ret["num_scratches"] = self.get_num_scratches()
         return ret

backend/coreapp/tests/test_preset.py

@@ -77,22 +77,6 @@ def test_user_create_preset(self) -> None:
         assert preset.owner is not None
         assert preset.owner.pk == self.user.pk
 
-    def test_list_compiler_with_custom_presets(self) -> None:
-        user = self.create_user()
-        self.create_preset(DUMMY_PRESET_DICT)
-        response = self.client.get(reverse("compiler"))
-        body = response.json()
-
-        assert "platforms" in body
-        assert "dummy" in body["platforms"]
-        assert "presets" in body["platforms"]["dummy"]
-        assert len(body["platforms"]["dummy"]["presets"]) == 1
-        assert (
-            body["platforms"]["dummy"]["presets"][0]["name"]
-            == DUMMY_PRESET_DICT["name"]
-        )
-        assert body["platforms"]["dummy"]["presets"][0]["owner"]["id"] == user.pk
-
     def test_owner_can_delete_preset(self) -> None:
         self.create_user()
         preset = self.create_preset(DUMMY_PRESET_DICT)

backend/coreapp/views/compiler.py

@@ -74,14 +74,12 @@ def compilers_json() -> Dict[str, Dict[str, object]]:
 
     @staticmethod
     def platforms_json(
-        include_presets: bool = True,
         include_num_scratches: bool = False,
     ) -> Dict[str, Dict[str, object]]:
         ret: Dict[str, Dict[str, object]] = {}
 
         for platform in compilers.available_platforms():
             ret[platform.id] = platform.to_json(
-                include_presets=include_presets,
                 include_num_scratches=include_num_scratches,
             )
 

backend/coreapp/views/platform.py

@@ -32,11 +32,7 @@ def head(self, request: Request) -> Response:
 
     @condition(last_modified_func=endpoint_updated)
     def get(self, request: Request) -> Response:
-        return Response(
-            CompilerDetail.platforms_json(
-                include_presets=False, include_num_scratches=False
-            )
-        )
+        return Response(CompilerDetail.platforms_json(include_num_scratches=False))
 
 
 @api_view(["GET"])
@@ -52,7 +48,6 @@ def single_platform(request: Request, id: str) -> Response:
             return Response(
                 platform.to_json(
                     include_compilers=True,
-                    include_presets=True,
                     include_num_scratches=True,
                 )
             )

frontend/src/app/(navfooter)/new/NewScratchForm.tsx

@@ -19,7 +19,7 @@ import { get } from "@/lib/api/request";
 import type { TerseScratch } from "@/lib/api/types";
 import { SingleLineScratchItem } from "@/components/ScratchItem";
 import { useDebounce } from "use-debounce";
-import { usePlatform } from "@/lib/api";
+import { useCompilers, usePresets } from "@/lib/api";
 
 interface FormLabelProps {
     children: React.ReactNode;
@@ -171,16 +171,17 @@ export default function NewScratchForm({
     }, []);
 
     // 2. Fetch compilers and presets for selected platform
-    const platformDetails = usePlatform(platform);
+    const compilers = useCompilers(platform);
+    const presets = usePresets(platform);
     useEffect(() => {
-        if (platformDetails) {
-            setAvailableCompilers(platformDetails.compilers);
-            setAvailablePresets(platformDetails.presets);
+        if (compilers && typeof presets !== "undefined") {
+            setAvailableCompilers(Object.keys(compilers));
+            setAvailablePresets(presets);
         } else {
             setAvailableCompilers([]);
             setAvailablePresets(undefined);
         }
-    }, [platformDetails]);
+    }, [compilers, presets]);
 
     // 3. Select compiler based on local storage
     useEffect(() => {

frontend/src/lib/api/types.ts

@@ -169,7 +169,6 @@ export interface PlatformMetadata extends PlatformBase {
 
 export interface Platform extends PlatformBase {
     compilers: string[];
-    presets: Preset[];
 }
 
 export interface ScratchResult {