Add license detection improvements

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

scanpipe/templates/scanpipe/license_detection_list.html

@@ -50,7 +50,7 @@
         {% empty %}
           <tr>
             <td colspan="42" class="has-text-centered p-3">
-              No Licenses detected. <a href="?">Clear search and filters</a>
+              No licenses detected. <a href="?">Clear search and filters</a>
             </td>
           </tr>
         {% endfor %}

scanpipe/templates/scanpipe/panels/license_detections_summary.html

@@ -3,7 +3,7 @@
   <div class="column is-half">
     <nav class="panel is-info">
       <p class="panel-heading py-2 is-size-6">
-        Unique License detections
+        Unique license detections
       </p>
       {% for license_expression, count in license_detection_summary.items %}
         <a class="panel-block is-align-items-flex-start break-word  is-flex is-align-items-center" href="{{ project_licenses_url }}?license_expression={{ license_expression|default:'_EMPTY_' }}" target="_blank">
@@ -16,7 +16,7 @@
       {% endfor %}
       {% if total_counts.all %}
       <a class="panel-block is-align-items-flex-start break-word is-flex is-align-items-center" href="{{ project_licenses_url }}" target="_blank">
-        See all License Detections
+        See all license detections
         <span class="tag is-rounded ml-1">{{ total_counts.all|intcomma }}</span>
         {% if total_counts.with_compliance_error %}
         <span class="has-text-danger is-size-6 ml-2">

scanpipe/templates/scanpipe/tabset/tab_license_detections.html

@@ -2,14 +2,15 @@
     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
         <thead>
           <tr>
-            <th>License Expression</th>
-            <th>Origin Resource Path</th>
+            <th>License expression</th>
+            <th>Origin resource path</th>
+            <th>Matched text</th>
             <th>Rule URL</th>
             <th>Score</th>
             <th>Matcher</th>
-            <th>Match Length</th>
-            <th>Match Coverage</th>
-            <th>Rule Relevance</th>
+            <th>Match length</th>
+            <th>Match coverage</th>
+            <th>Rule relevance</th>
           </tr>
         </thead>
         <tbody>
@@ -22,7 +23,17 @@
                 <a href="{% url 'resource_detail' project.slug match.from_file %}#detection">{{ match.from_file }}</a>
             </td>
             <td class="break-all">
-                {{ match.rule_url }}
+              {{ match.matched_text }}
+            </td>
+            <td class="break-all">
+              {% if match.rule_url %}
+              <a href="{{match.rule_url}}">
+                {{ match.rule_identifier }}
+                <i class="fa-solid fa-up-right-from-square is-small"></i>
+              </a>
+              {% else %}
+                {{ match.rule_identifier }}
+              {% endif %}
             </td>
             <td class="break-all">
                 {{ match.score }}
@@ -47,7 +58,7 @@
     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
         <thead>
           <tr>
-            <th>Detection Log</th>
+            <th>Detection log</th>
           </tr>
         </thead>
         <tbody>
@@ -64,9 +75,9 @@
     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
         <thead>
           <tr>
-            <th>Resource Path</th>
-            <th>Start Line</th>
-            <th>End Line</th>
+            <th>Resource path</th>
+            <th>Start line</th>
+            <th>End line</th>
           </tr>
         </thead>
         <tbody>

scanpipe/templates/scanpipe/tabset/tab_package_detections.html

@@ -2,7 +2,7 @@
     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
       <thead>
         <tr>
-          <th>Datafile Paths</th>
+          <th>Datafile paths</th>
         </tr>
       </thead>
       <tbody>
@@ -35,9 +35,9 @@
     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
         <thead>
           <tr>
-            <th>License Detections</th>
-            <th>License Expression</th>
-            <th>License Expression SPDX</th>
+            <th>License detections</th>
+            <th>License expression</th>
+            <th>License expression SPDX</th>
           </tr>
         </thead>
         <tbody>
@@ -61,9 +61,9 @@
     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
         <thead>
           <tr>
-            <th>License Detections</th>
-            <th>License Expression</th>
-            <th>License Expression SPDX</th>
+            <th>License detections</th>
+            <th>License expression</th>
+            <th>License expression SPDX</th>
           </tr>
         </thead>
         <tbody>

scanpipe/templates/scanpipe/tabset/tab_resource_detections.html

@@ -3,9 +3,9 @@
     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
         <thead>
           <tr>
-            <th>License Detections</th>
-            <th>License Expression</th>
-            <th>License Expression SPDX</th>
+            <th>License detections</th>
+            <th>License expression</th>
+            <th>License expression SPDX</th>
           </tr>
         </thead>
         <tbody>
@@ -29,8 +29,8 @@
     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
         <thead>
           <tr>
-            <th>License Expression</th>
-            <th>License Clue Detials</th>
+            <th>License expression</th>
+            <th>License clue detials</th>
           </tr>
         </thead>
         <tbody>
@@ -52,8 +52,8 @@
         <thead>
           <tr>
             <th>Email</th>
-            <th>Start Line</th>
-            <th>End Line</th>
+            <th>Start line</th>
+            <th>End line</th>
           </tr>
         </thead>
         <tbody>
@@ -78,8 +78,8 @@
         <thead>
           <tr>
             <th>URL</th>
-            <th>Start Line</th>
-            <th>End Line</th>
+            <th>Start line</th>
+            <th>End line</th>
           </tr>
         </thead>
         <tbody>