Add hidden propert to PackageCategory model

builder/src/api/models.ts

@@ -88,6 +88,7 @@ export interface CurrentUserInfo {
 export interface PackageCategory {
     name: string;
     slug: string;
+    hidden: boolean;
 }
 
 export interface PackageAvailableCommunity {

builder/src/components/CommunitySelector.tsx

@@ -24,7 +24,9 @@ const CategorySelector: React.FC<CategorySelectorProps> = ({
             : ExperimentalApi.listCategories({ communityIdentifier });
 
         promise.then((result) => {
-            const next = current.concat(result.results);
+            // Filter out hidden categories for UI dropdown
+            const visible = result.results.filter((c) => !c.hidden);
+            const next = current.concat(visible);
             setCategories(next);
             if (result.pagination.next_link) {
                 enumerateCategories(

django/thunderstore/api/cyberstorm/serializers/community.py

@@ -44,6 +44,7 @@ class CyberstormPackageCategorySerializer(serializers.Serializer):
     id = serializers.CharField()  # noqa: A003
     name = serializers.CharField()
     slug = serializers.SlugField()
+    hidden = serializers.BooleanField()
 
 
 class CyberstormPackageListingSectionSerializer(serializers.Serializer):

django/thunderstore/api/cyberstorm/tests/test_community_filters.py

@@ -10,20 +10,19 @@ def test_community_filters_api_view__returns_package_categories(
     api_client: APIClient,
     community: Community,
 ):
-    c1 = PackageCategoryFactory(community=community)
-    c2 = PackageCategoryFactory(community=community)
+    c1 = PackageCategoryFactory(community=community, hidden=False)
+    c2 = PackageCategoryFactory(community=community, hidden=True)
 
     response = api_client.get(
         f"/api/cyberstorm/community/{community.identifier}/filters/",
     )
     result = response.json()
 
     assert len(result["package_categories"]) == 2
-    category_ids = [c["id"] for c in result["package_categories"]]
-    assert isinstance(category_ids[0], str)
-    assert isinstance(category_ids[1], str)
-    assert str(c1.id) in category_ids
-    assert str(c2.id) in category_ids
+    # Hidden categories should be included in API response
+    by_id = {c["id"]: c for c in result["package_categories"]}
+    assert by_id[str(c1.id)]["hidden"] is False
+    assert by_id[str(c2.id)]["hidden"] is True
 
 
 @pytest.mark.django_db

django/thunderstore/community/admin/package_category.py

@@ -5,11 +5,12 @@
 
 @admin.register(PackageCategory)
 class PackageCategoryAdmin(admin.ModelAdmin):
-    list_filter = ("community",)
+    list_filter = ("community", "hidden")
     list_display = (
         "id",
         "name",
         "slug",
+        "hidden",
         "datetime_created",
         "datetime_updated",
         "community",

django/thunderstore/community/api/experimental/serializers.py

@@ -25,6 +25,7 @@ class PackageListingUpdateRequestSerializer(serializers.Serializer):
 class PackageCategoryExperimentalSerializer(serializers.Serializer):
     name = serializers.CharField()
     slug = serializers.SlugField()
+    hidden = serializers.BooleanField()
 
 
 class PackageListingUpdateResponseSerializer(serializers.Serializer):

django/thunderstore/community/migrations/0038_add_packagecategory_hidden.py

@@ -0,0 +1,16 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("community", "0037_create_default_visibility_for_existing_listings"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="packagecategory",
+            name="hidden",
+            field=models.BooleanField(default=False),
+        ),
+    ]

django/thunderstore/community/models/package_category.py

@@ -1,18 +1,27 @@
 from django.db import models
-from django.db.models import Manager
 
 from thunderstore.core.mixins import TimestampMixin
 
 
+class PackageCategoryQuerySet(models.QuerySet):
+    def visible(self):
+        return self.filter(hidden=False)
+
+
+class PackageCategoryManager(models.Manager.from_queryset(PackageCategoryQuerySet)):
+    pass
+
+
 class PackageCategory(TimestampMixin, models.Model):
-    objects: "Manager[PackageCategory]"
+    objects = PackageCategoryManager()
     community = models.ForeignKey(
         "community.Community",
         related_name="package_categories",
         on_delete=models.CASCADE,
     )
     name = models.CharField(max_length=512)
     slug = models.SlugField()
+    hidden = models.BooleanField(default=False)
 
     def __str__(self):
         return f"{self.community.name} -> {self.name}"

django/thunderstore/community/tests/test_package_category_queryset.py

@@ -0,0 +1,51 @@
+import pytest
+
+from thunderstore.community.factories import CommunityFactory, PackageListingFactory
+from thunderstore.community.models import PackageCategory
+
+
+@pytest.mark.django_db
+def test_packagecategory_objects_visible_filters_hidden_flag():
+    community = CommunityFactory()
+    visible = PackageCategory.objects.create(
+        community=community, name="Visible", slug="visible", hidden=False
+    )
+    hidden = PackageCategory.objects.create(
+        community=community, name="Hidden", slug="hidden", hidden=True
+    )
+
+    result = list(PackageCategory.objects.visible().order_by("slug"))
+
+    assert result == [visible]
+    assert hidden not in result
+
+
+@pytest.mark.django_db
+def test_related_manager_visible_on_community_package_categories():
+    community = CommunityFactory()
+    visible = PackageCategory.objects.create(
+        community=community, name="Visible", slug="visible", hidden=False
+    )
+    PackageCategory.objects.create(
+        community=community, name="Hidden", slug="hidden", hidden=True
+    )
+
+    result = list(community.package_categories.visible().order_by("slug"))
+
+    assert result == [visible]
+
+
+@pytest.mark.django_db
+def test_related_manager_visible_on_listing_categories():
+    listing = PackageListingFactory()
+    visible = PackageCategory.objects.create(
+        community=listing.community, name="Visible", slug="visible", hidden=False
+    )
+    hidden = PackageCategory.objects.create(
+        community=listing.community, name="Hidden", slug="hidden", hidden=True
+    )
+    listing.categories.set([visible, hidden])
+
+    result = list(listing.categories.visible().order_by("slug"))
+
+    assert result == [visible]