fix(score-breakdown): prevent infinite looping and make defaulting logic consistent

Author: aarthy-dk

testgen/ui/views/score_details.py

@@ -66,25 +66,26 @@ def render(
             ],
         )
 
-        if category not in typing.get_args(Categories):
-            category = None
-
-        if not category and score_definition.category:
-            category = score_definition.category.value
+        if not category or category not in typing.get_args(Categories):
+            category = (
+                score_definition.category.value
+                if score_definition.category 
+                else ScoreCategory.dq_dimension.value
+            )
 
-        if not category:
-            category = ScoreCategory.dq_dimension.value
+        if not score_type or score_type not in typing.get_args(ScoreTypes):
+            score_type = (
+                "cde_score"
+                if score_definition.cde_score and not score_definition.total_score
+                else "score"
+            )
 
         score_card = None
         score_breakdown = None
         issues = None
         with st.spinner(text="Loading data :gray[:small[(This might take a few minutes)]] ..."):
             user_can_edit = session.auth.user_has_permission("edit")
             score_card = format_score_card(score_definition.as_cached_score_card(include_definition=True))
-            if score_type not in typing.get_args(ScoreTypes):
-                score_type = None
-            if not score_type:
-                score_type = "cde_score" if score_card["cde_score"] and not score_card["score"] else "score"
             if not drilldown:
                 score_breakdown = ScoreDefinitionBreakdownItem.filter(
                     definition_id=definition_id,

testgen/ui/views/score_explorer.py

@@ -1,4 +1,5 @@
 import json
+import typing
 from datetime import datetime
 from functools import partial
 from io import BytesIO
@@ -13,7 +14,14 @@
 )
 from testgen.common.mixpanel_service import MixpanelService
 from testgen.common.models.profiling_run import ProfilingRun
-from testgen.common.models.scores import ScoreCategory, ScoreDefinition, ScoreDefinitionCriteria, SelectedIssue
+from testgen.common.models.scores import (
+    Categories,
+    ScoreCategory,
+    ScoreDefinition,
+    ScoreDefinitionCriteria,
+    ScoreTypes,
+    SelectedIssue,
+)
 from testgen.common.models.test_run import TestRun
 from testgen.ui.components import widgets as testgen
 from testgen.ui.components.widgets.download_dialog import FILE_DATA_TYPE, download_dialog, zip_multi_file_data
@@ -46,7 +54,7 @@ def render(
         category: str | None = None,
         filters: str | None = None,
         breakdown_category: str | None = None,
-        breakdown_score_type: str | None = "score",
+        breakdown_score_type: str | None = None,
         drilldown: str | None = None,
         definition_id: str | None = None,
         project_code: str | None = None,
@@ -65,20 +73,15 @@ def render(
                 )
                 return
 
-            if not breakdown_category and original_score_definition.category:
-                breakdown_category = original_score_definition.category.value
-
             project_code = original_score_definition.project_code
             page_title = "Edit Scorecard"
             last_breadcrumb = original_score_definition.name
+
         testgen.page_header(page_title, breadcrumbs=[
             {"path": "quality-dashboard", "label": "Quality Dashboard", "params": {"project_code": project_code}},
             {"label": last_breadcrumb},
         ])
 
-        if not breakdown_category:
-            breakdown_category = ScoreCategory.dq_dimension.value
-
         score_breakdown = None
         issues = None
         filter_values = {}
@@ -117,9 +120,21 @@ def render(
                         group_by_field=filter_by_columns != "true",
                     )
 
-            score_card = None
-            if score_definition:
-                score_card = score_definition.as_score_card()
+            score_card = score_definition.as_score_card()
+
+            if not breakdown_category or breakdown_category not in typing.get_args(Categories):
+                breakdown_category = (
+                    score_definition.category.value
+                    if score_definition.category 
+                    else ScoreCategory.dq_dimension.value
+                )
+
+            if not breakdown_score_type or breakdown_score_type not in typing.get_args(ScoreTypes):
+                breakdown_score_type = (
+                    "cde_score"
+                    if score_definition.cde_score and not score_definition.total_score
+                    else "score"
+                )
 
             if score_definition.criteria.has_filters() and not drilldown:
                 score_breakdown = format_score_card_breakdown(
@@ -129,7 +144,7 @@ def render(
                     ),
                     breakdown_category,
                 )
-            if score_card and drilldown:
+            if drilldown:
                 issues = format_score_card_issues(
                     score_definition.get_score_card_issues(breakdown_score_type, breakdown_category, drilldown),
                     breakdown_category,