Improve dashboard metrics list

backend/apps/owasp/api/internal/filters/project_health_metrics.py

@@ -20,3 +20,8 @@ class ProjectHealthMetricsFilter:
     def level(self, value: str, prefix: str):
         """Filter by project level."""
         return Q(project__level=ProjectLevel(value)) if value else Q()
+
+    @strawberry_django.filter_field
+    def is_active(self, *, value: bool, prefix: str):
+        """Filter by active projects."""
+        return Q(project__is_active=value) if value else Q()

backend/apps/owasp/api/internal/ordering/project_health_metrics.py

@@ -1,6 +1,6 @@
 """OWASP Project Health Metrics Ordering."""
 
-from strawberry import auto
+import strawberry
 from strawberry_django import order_type
 
 from apps.owasp.models.project_health_metrics import ProjectHealthMetrics
@@ -10,4 +10,9 @@
 class ProjectHealthMetricsOrder:
     """Ordering for Project Health Metrics."""
 
-    score: auto
+    score: strawberry.auto
+    # We need to order by another field in case of equal scores
+    # to ensure unique metrics in pagination.
+    # because SQL returns random order if no order is specified.
+    # We didn't do this ordering in the model since we order already in the query.
+    project__name: strawberry.auto

backend/tests/apps/owasp/api/internal/filters/project_health_metrics_test.py

@@ -16,11 +16,12 @@ def test_filter_fields(self):
         filter_fields = {
             field.name for field in ProjectHealthMetricsFilter.__strawberry_definition__.fields
         }
-        expected_fields = {"score", "level"}
+        expected_fields = {"score", "level", "is_active"}
         assert expected_fields.issubset(filter_fields)
 
     def test_filtering(self):
         """Test filtering by project level and score."""
-        filter_instance = ProjectHealthMetricsFilter(level="flagship", score=50)
+        filter_instance = ProjectHealthMetricsFilter(level="flagship", score=50, is_active=True)
         assert filter_instance.level == ProjectLevel.FLAGSHIP
         assert filter_instance.score == 50
+        assert filter_instance.is_active is True

backend/tests/apps/owasp/api/internal/ordering/project_health_metrics_test.py

@@ -15,12 +15,11 @@ def test_order_fields(self):
         order_fields = {
             field.name for field in ProjectHealthMetricsOrder.__strawberry_definition__.fields
         }
-        expected_fields = {"score"}
+        expected_fields = {"score", "project__name"}
         assert expected_fields == order_fields
 
     def test_order_by(self):
         """Test ordering by score."""
-        order_instance = ProjectHealthMetricsOrder(
-            score="DESC",
-        )
+        order_instance = ProjectHealthMetricsOrder(score="DESC", project__name="ASC")
         assert order_instance.score == "DESC"
+        assert order_instance.project__name == "ASC"

frontend/src/app/projects/dashboard/metrics/page.tsx

@@ -52,7 +52,9 @@ const MetricsPage: FC = () => {
     },
   }
 
-  let currentFilters = {}
+  let currentFilters = {
+    isActive: true,
+  }
   let currentOrdering = {
     score: 'DESC',
   }
@@ -62,6 +64,7 @@ const MetricsPage: FC = () => {
   const currentFilterKeys = []
   if (healthFilter) {
     currentFilters = {
+      ...currentFilters,
       ...healthFiltersMapping[healthFilter],
     }
     currentFilterKeys.push(healthFilter)
@@ -99,7 +102,12 @@ const MetricsPage: FC = () => {
     variables: {
       filters,
       pagination: { offset: 0, limit: PAGINATION_LIMIT },
-      ordering,
+      ordering: [
+        ordering,
+        {
+          ['project_Name']: 'ASC',
+        },
+      ],
     },
   })
 
@@ -176,7 +184,7 @@ const MetricsPage: FC = () => {
               } else {
                 newParams.delete('health')
                 newParams.delete('level')
-                newFilters = {}
+                newFilters = { isActive: true }
               }
               setFilters(newFilters)
               setActiveFilters(
@@ -246,7 +254,12 @@ const MetricsPage: FC = () => {
                   variables: {
                     filters,
                     pagination: newPagination,
-                    ordering,
+                    ordering: [
+                      ordering,
+                      {
+                        ['project_Name']: 'ASC',
+                      },
+                    ],
                   },
                   updateQuery: (prev, { fetchMoreResult }) => {
                     if (!fetchMoreResult) return prev