Refactor to use show_epss_chart flag

Signed-off-by: Sampurna Pyne <sampurnapyne1710@gmail.com>

Author: Samk1710

vulnerabilities/templates/advisory_detail.html

@@ -101,7 +101,7 @@
             </ul>
         </div>
         <div id="tab-content">
-            <div class="tab-div {% if not 'epss_page' in request.GET %}is-active{% endif %}" data-content="essentials">
+            <div class="tab-div is-active" data-content="essentials">
                 <div class="tab-nested-div">
                     <table class="table vcio-table width-100-pct mt-2">
                         <tbody>
@@ -797,9 +797,9 @@
 </section>
 {% endif %}
 
-<script src="{% static 'js/main.js' %}"></script>
+<script src="{% static 'js/main.js' %}" crossorigin="anonymous"></script>
 
-{% if 'epss_page' in request.GET or severities %}
+{% if show_epss_chart %}
     <link rel="stylesheet" href="{% static 'css/billboard.css' %}">
     <script src="{% static 'js/d3.js' %}"></script>
     <script src="{% static 'js/billboard.js' %}"></script>

vulnerabilities/tests/test_epss_history.py

@@ -9,9 +9,9 @@
 
 import json
 import time
-import pytest
 from pathlib import Path
 
+import pytest
 from django.test import TestCase
 from django.urls import reverse
 

vulnerabilities/views.py

@@ -28,7 +28,6 @@
 from django.db.models import Max
 from django.db.models import OuterRef
 from django.db.models import Prefetch
-from django.core.paginator import Paginator
 from django.db.models import Q
 from django.db.models.functions import Cast
 from django.db.models.functions import TruncDate
@@ -806,6 +805,8 @@ def add_ssvc(ssvc):
             advisory, self.request.GET.get("epss_page")
         )
 
+        show_epss_chart = "epss_page" in self.request.GET or advisory.severities.exists()
+
         context.update(
             {
                 "advisory": advisory,
@@ -819,6 +820,7 @@ def add_ssvc(ssvc):
                 "epss_data": epss_data,
                 "epss_history_data": epss_history_data,
                 "epss_pagination_obj": epss_pagination_obj,
+                "show_epss_chart": show_epss_chart,
             }
         )
         return context

vulnerablecode/static/css/custom.css

@@ -655,4 +655,3 @@ ul.fixed_by_bullet li li li {
         box-shadow: none;
     }
 }
-

vulnerablecode/static/js/billboard.js.ABOUT

@@ -12,6 +12,3 @@ licenses:
   - key: mit
     name: MIT License
     file: billboard.js.LICENSE
-
-
-

vulnerablecode/static/js/d3.js.ABOUT

@@ -12,8 +12,3 @@ licenses:
   - key: isc
     name: ISC License
     file: d3.js.LICENSE
-
-
-
-
-