From 9db7348e9e4b106acc33a40dcd7b96bc65018fa7 Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@nexb.com>
Date: Wed, 27 Nov 2024 16:14:12 +0400
Subject: [PATCH] Multiple adjustments #98

Signed-off-by: tdruez <tdruez@nexb.com>
---
 .../modals/vulnerability_analysis_modal.html  |  2 +-
 .../product_portfolio/product_details.html    |  4 ++--
 .../tabs/tab_vulnerabilities.html             |  4 ++--
 ...r_vulnerabilityanalysis_product_package.py | 20 +++++++++++++++++++
 vulnerabilities/models.py                     |  2 --
 5 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 vulnerabilities/migrations/0004_alter_vulnerabilityanalysis_product_package.py

diff --git a/product_portfolio/templates/product_portfolio/modals/vulnerability_analysis_modal.html b/product_portfolio/templates/product_portfolio/modals/vulnerability_analysis_modal.html
index 0001d58d..fae63967 100644
--- a/product_portfolio/templates/product_portfolio/modals/vulnerability_analysis_modal.html
+++ b/product_portfolio/templates/product_portfolio/modals/vulnerability_analysis_modal.html
@@ -9,7 +9,7 @@ <h5>
             <strong id="analysis-vulnerability-id"></strong>
           </h5>
           <div>
-            Package: <strong id="analysis-package-purl"></strong>
+            Package: <strong id="analysis-package-identifier"></strong>
           </div>
         </div>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
diff --git a/product_portfolio/templates/product_portfolio/product_details.html b/product_portfolio/templates/product_portfolio/product_details.html
index 8721d3cf..9302a18e 100644
--- a/product_portfolio/templates/product_portfolio/product_details.html
+++ b/product_portfolio/templates/product_portfolio/product_details.html
@@ -245,11 +245,11 @@
         // Extract info from data-* attributes
         let edit_url = button.data('edit-url');
         let vulnerability_id = button.data('vulnerability-id');
-        let package_purl = button.data('package-purl');
+        let package_identifier = button.data('package-identifier');
 
         $('#submit-vulnerability-analysis-form').data('edit-url', edit_url);
         $('#vulnerability-analysis-modal #analysis-vulnerability-id').text(vulnerability_id);
-        $('#vulnerability-analysis-modal #analysis-package-purl').text(package_purl);
+        $('#vulnerability-analysis-modal #analysis-package-identifier').text(package_identifier);
 
         $.ajax({
           url: edit_url,
diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_vulnerabilities.html b/product_portfolio/templates/product_portfolio/tabs/tab_vulnerabilities.html
index cb7f67f4..cd494a78 100644
--- a/product_portfolio/templates/product_portfolio/tabs/tab_vulnerabilities.html
+++ b/product_portfolio/templates/product_portfolio/tabs/tab_vulnerabilities.html
@@ -33,7 +33,7 @@
         <td rowspan="{{ affected_packages_count }}">
           {{ vulnerability.weighted_severity|default_if_none:"" }}
         </td>
-        <td  rowspan="{{ affected_packages_count }}" class="fs-110pct">
+        <td rowspan="{{ affected_packages_count }}" class="fs-110pct">
           {% include 'vulnerabilities/includes/risk_score_badge.html' with risk_score=vulnerability.risk_score only %}
         </td>
         {% for package in vulnerability.affected_packages.all %}
@@ -72,7 +72,7 @@
             <span data-bs-toggle="modal"
                   data-bs-target="#vulnerability-analysis-modal"
                   data-vulnerability-id="{{ vulnerability.vulnerability_id }}"
-                  data-package-purl="{{ package.package_url }}"
+                  data-package-identifier="{{ package.identifier }}"
                   data-edit-url="{{ product.get_absolute_url }}vulnerability_analysis_ajax_view/?vulnerability_id={{ vulnerability.vulnerability_id }}&package_uuid={{ package.uuid }}"
             >
               <button type="button" data-bs-toggle="tooltip" title="Edit" class="btn btn-link p-0" aria-label="Edit">
diff --git a/vulnerabilities/migrations/0004_alter_vulnerabilityanalysis_product_package.py b/vulnerabilities/migrations/0004_alter_vulnerabilityanalysis_product_package.py
new file mode 100644
index 00000000..709e40d0
--- /dev/null
+++ b/vulnerabilities/migrations/0004_alter_vulnerabilityanalysis_product_package.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.0.9 on 2024-11-25 16:26
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('product_portfolio', '0008_productdependency_is_resolved_to_is_pinned'),
+        ('vulnerabilities', '0003_vulnerabilityanalysis'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='vulnerabilityanalysis',
+            name='product_package',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='vulnerability_analyses', to='product_portfolio.productpackage'),
+        ),
+    ]
diff --git a/vulnerabilities/models.py b/vulnerabilities/models.py
index 999e4568..33e6053e 100644
--- a/vulnerabilities/models.py
+++ b/vulnerabilities/models.py
@@ -490,8 +490,6 @@ class VulnerabilityAnalysis(
         to="product_portfolio.ProductPackage",
         related_name="vulnerability_analyses",
         on_delete=models.CASCADE,
-        null=True,
-        blank=True,
     )
 
     class Meta: