Skip to content

Commit a9d0bb7

Browse files
committed
rename action as recommended_action
Signed-off-by: tdruez <tdruez@aboutcode.org>
1 parent f3a5e2f commit a9d0bb7

18 files changed

Lines changed: 90 additions & 124 deletions

product_portfolio/filters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ def filter_triage_action(queryset, name, value):
467467
vulnerability__affected_packages__productpackages=OuterRef("pk"),
468468
ruleset__enabled=True,
469469
ruleset_id=Subquery(winning_ruleset_id),
470-
action=value,
470+
recommended_action=value,
471471
)
472472
return queryset.filter(Exists(primary_triage)).distinct()
473473

product_portfolio/templates/product_portfolio/modals/manage_triage_rulesets_form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
{% endfor %}
3434
</span>
3535
{% endif %}
36-
{% if ruleset.action %}
36+
{% if ruleset.recommended_action %}
3737
<span class="d-flex align-items-center gap-2 mt-1">
3838
<span class="small text-body-secondary">{% trans "Recommended action:" %}</span>
3939
<span class="badge {{ ruleset.action_badge_class }} text-nowrap">

product_portfolio/templates/product_portfolio/tabs/tab_packages_vulnerabilities.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<td>
7979
{% if vulnerability.triage_record %}
8080
{% with record=vulnerability.triage_record %}
81-
{% if record.action %}
81+
{% if record.recommended_action %}
8282
<span class="badge {{ record.action_badge_class }} d-block text-start">
8383
<i class="fas {{ record.action_icon }} me-1"></i>{{ record.action_label }}
8484
</span>

product_portfolio/tests/test_filters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def setUp(self):
206206
)
207207
ruleset = TriageRuleset.objects.create(
208208
name="Upgrade Ruleset",
209-
action=TriageAction.UPGRADE,
209+
recommended_action=TriageAction.UPGRADE,
210210
precedence=100,
211211
dataspace=self.dataspace,
212212
rules_config={"risk_score": {"is_active": True, "min_risk_score": 8.0}},

product_portfolio/tests/test_views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ def test_product_portfolio_tab_vulnerability_view_filters(self):
306306
# product has at least one enabled TriageRuleset assigned to it.
307307
ruleset = TriageRuleset.objects.create(
308308
name="Upgrade Ruleset",
309-
action=TriageAction.UPGRADE,
309+
recommended_action=TriageAction.UPGRADE,
310310
precedence=100,
311311
dataspace=self.dataspace,
312312
)
@@ -4361,7 +4361,7 @@ def setUp(self):
43614361
)
43624362
self.ruleset = TriageRuleset.objects.create(
43634363
name="Upgrade Ruleset",
4364-
action=TriageAction.UPGRADE,
4364+
recommended_action=TriageAction.UPGRADE,
43654365
precedence=100,
43664366
dataspace=self.dataspace,
43674367
)

product_portfolio/views.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,8 +1349,12 @@ def attach_triage_data(self, product, page_obj):
13491349
.select_related("ruleset", "request")
13501350
)
13511351
for record in triage_records:
1352-
record.action_label = action_labels.get(record.action, record.action)
1353-
badge_class, icon = TRIAGE_ACTION_STYLES.get(record.action, TRIAGE_ACTION_DEFAULT_STYLE)
1352+
record.action_label = action_labels.get(
1353+
record.recommended_action, record.recommended_action
1354+
)
1355+
badge_class, icon = TRIAGE_ACTION_STYLES.get(
1356+
record.recommended_action, TRIAGE_ACTION_DEFAULT_STYLE
1357+
)
13541358
record.action_badge_class = badge_class
13551359
record.action_icon = icon
13561360

@@ -2251,9 +2255,11 @@ def manage_triage_rulesets_view(request, dataspace, name, version=""):
22512255
action_labels = dict(TriageAction.choices)
22522256

22532257
for ruleset in available_rulesets:
2254-
ruleset.action_label = action_labels.get(ruleset.action, ruleset.action)
2258+
ruleset.action_label = action_labels.get(
2259+
ruleset.recommended_action, ruleset.recommended_action
2260+
)
22552261
action_badge_class, action_icon = TRIAGE_ACTION_STYLES.get(
2256-
ruleset.action, TRIAGE_ACTION_DEFAULT_STYLE
2262+
ruleset.recommended_action, TRIAGE_ACTION_DEFAULT_STYLE
22572263
)
22582264
ruleset.action_badge_class = action_badge_class
22592265
ruleset.action_icon = action_icon

vulnerabilities/migrations/0011_vulnerabilityanalysis_applied_by_preset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 6.0.6 on 2026-08-12 06:37
1+
# Generated by Django 6.0.6 on 2026-08-14 15:02
22

33
import django.db.models.deletion
44
from django.db import migrations, models
@@ -8,7 +8,7 @@ class Migration(migrations.Migration):
88

99
dependencies = [
1010
('vulnerabilities', '0010_api_v3_remove_old_fields'),
11-
('vulnerabilities_triage', '0002_analysispreset_triageruleset_analysis_preset'),
11+
('vulnerabilities_triage', '0001_initial'),
1212
]
1313

1414
operations = [

vulnerabilities/triage/admin.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class TriageRulesetAdmin(DataspacedAdmin):
101101

102102
@admin.display(description="Action")
103103
def get_action_label(self, obj):
104-
return dict(TriageAction.choices).get(obj.action, obj.action)
104+
return dict(TriageAction.choices).get(obj.recommended_action, obj.recommended_action)
105105

106106
@admin.display(description="Enabled rules")
107107
def get_enabled_rules(self, obj):
@@ -134,7 +134,7 @@ def get_form(self, request, obj=None, change=False, **kwargs):
134134
kwargs["fields"] = [
135135
"name",
136136
"description",
137-
"action",
137+
"recommended_action",
138138
"precedence",
139139
"enabled",
140140
"analysis_preset",
@@ -150,7 +150,7 @@ def get_fieldsets(self, request, obj=None):
150150
"fields": [
151151
"name",
152152
"description",
153-
"action",
153+
"recommended_action",
154154
"precedence",
155155
"enabled",
156156
"analysis_preset",

vulnerabilities/triage/engine.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def sync_triage_records(ruleset, product, matched_rules_per_vulnerability_id, ap
147147
vulnerability_id=vulnerability_id,
148148
product=product,
149149
ruleset=ruleset,
150-
action=ruleset.action,
150+
recommended_action=ruleset.recommended_action,
151151
matched_rules=matched_rules,
152152
dataspace=ruleset.dataspace,
153153
detected_date=now,
@@ -159,7 +159,7 @@ def sync_triage_records(ruleset, product, matched_rules_per_vulnerability_id, ap
159159
records,
160160
update_conflicts=True,
161161
unique_fields=["vulnerability", "product", "ruleset"],
162-
update_fields=["action", "matched_rules", "last_checked", "dataspace"],
162+
update_fields=["recommended_action", "matched_rules", "last_checked", "dataspace"],
163163
)
164164

165165
stale_records_qs = TriageRecord.objects.filter(

vulnerabilities/triage/forms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Meta:
3737

3838

3939
class TriageRulesetForm(DataspacedAdminForm):
40-
action = forms.ChoiceField(
40+
recommended_action = forms.ChoiceField(
4141
choices=[("", "---------")] + list(TriageAction.choices),
4242
required=False,
4343
)
@@ -47,7 +47,7 @@ class Meta:
4747
fields = [
4848
"name",
4949
"description",
50-
"action",
50+
"recommended_action",
5151
"precedence",
5252
"enabled",
5353
"analysis_preset",

0 commit comments

Comments
 (0)