From f4186d491906774fe52c43a3cad785dc1785dadf Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Tue, 26 May 2026 16:08:41 +0400
Subject: [PATCH 01/14] add drill down links to the main compliance dashboard

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 dje/templates/object_details_base.html         |  2 +-
 license_library/filters.py                     |  1 +
 .../compliance_dashboard.html                  | 18 +++++++++---------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dje/templates/object_details_base.html b/dje/templates/object_details_base.html
index bf1fd9d7..ffaacff2 100644
--- a/dje/templates/object_details_base.html
+++ b/dje/templates/object_details_base.html
@@ -75,7 +75,7 @@ <h1 class="header-title text-break">
   {% endblock %}
 
   <nav role="navigation">
-    <ul class="nav nav-tabs container px-3" id="details_tab" role="tablist">
+    <ul class="nav nav-tabs container px-1" id="details_tab" role="tablist">
       {% for tab_name, tab_context in tabsets.items %}
         <li class="nav-item" role="presentation"{% if tab_context.tooltip %} data-bs-toggle="tooltip" title="{{ tab_context.tooltip }}"{% endif %}>
           <button class="nav-link{% if forloop.first %} active{% endif %}" id="tab_{{ tab_name|slugify }}-tab" data-bs-toggle="tab" data-bs-target="#tab_{{ tab_name|slugify }}" type="button" role="tab" aria-controls="tab_{{ tab_name|slugify }}" aria-selected="{% if forloop.first %}true{% else %}false{% endif %}"{% if tab_context.disabled %} disabled="disabled"{% endif %}>
diff --git a/license_library/filters.py b/license_library/filters.py
index 18f50a21..431cabe4 100644
--- a/license_library/filters.py
+++ b/license_library/filters.py
@@ -98,6 +98,7 @@ class Meta:
             "license_profile",
             "usage_policy",
             "in_spdx_list",
+            "usage_policy__compliance_alert",
         ]
 
     def __init__(self, *args, **kwargs):
diff --git a/product_portfolio/templates/product_portfolio/compliance_dashboard.html b/product_portfolio/templates/product_portfolio/compliance_dashboard.html
index 4f393b08..57db7203 100644
--- a/product_portfolio/templates/product_portfolio/compliance_dashboard.html
+++ b/product_portfolio/templates/product_portfolio/compliance_dashboard.html
@@ -137,17 +137,17 @@ <h1 class="h3 mb-0">
             </td>
             <td class="text-end">
               {% if product.license_error_count %}
-                <span class="badge bg-danger-subtle text-danger-emphasis">
+                <a href="{{ product_url }}license_summary/?usage_policy__compliance_alert=warning" class="badge bg-danger-subtle text-danger-emphasis">
                   {{ product.license_error_count }} {% trans "error" %}{{ product.license_error_count|pluralize }}
-                </span>
+                </a>
               {% endif %}
               {% if product.license_warning_count %}
-                <span class="badge bg-warning-subtle text-warning-emphasis ms-1">
+                <a href="{{ product_url }}license_summary/?usage_policy__compliance_alert=error" class="badge bg-warning-subtle text-warning-emphasis ms-1">
                   {{ product.license_warning_count }} {% trans "warning" %}{{ product.license_warning_count|pluralize }}
-                </span>
+                </a>
               {% endif %}
               {% if not product.license_error_count and not product.license_warning_count %}
-                <span class="badge bg-success-subtle text-success-emphasis">{% trans "OK" %}</span>
+                <a href="{{ product_url }}license_summary/" class="badge bg-success-subtle text-success-emphasis">{% trans "OK" %}</a>
               {% endif %}
             </td>
             <td class="text-end">
@@ -170,16 +170,16 @@ <h1 class="h3 mb-0">
                 </span>
               {% endif %}
               {% if product.critical_count %}
-                <span class="badge bg-danger-subtle text-danger-emphasis">{{ product.critical_count }} {% trans "critical" %}</span>
+                <a href="{{ product_url }}?vulnerabilities-weighted_risk_score=critical#vulnerabilities" class="badge bg-danger-subtle text-danger-emphasis">{{ product.critical_count }} {% trans "critical" %}</a>
               {% endif %}
               {% if product.high_count %}
-                <span class="badge bg-warning-orange-subtle text-warning-orange ms-1">{{ product.high_count }} {% trans "high" %}</span>
+                <a href="{{ product_url }}?vulnerabilities-weighted_risk_score=high#vulnerabilities" class="badge bg-warning-orange-subtle text-warning-orange ms-1">{{ product.high_count }} {% trans "high" %}</a>
               {% endif %}
               {% if product.medium_count %}
-                <span class="badge bg-warning-subtle text-warning-emphasis ms-1">{{ product.medium_count }} {% trans "medium" %}</span>
+                <a href="{{ product_url }}?vulnerabilities-weighted_risk_score=medium#vulnerabilities" class="badge bg-warning-subtle text-warning-emphasis ms-1">{{ product.medium_count }} {% trans "medium" %}</a>
               {% endif %}
               {% if product.low_count %}
-                <span class="badge bg-info-subtle text-info-emphasis ms-1">{{ product.low_count }} {% trans "low" %}</span>
+                <a href="{{ product_url }}?vulnerabilities-weighted_risk_score=low#vulnerabilities" class="badge bg-info-subtle text-info-emphasis ms-1">{{ product.low_count }} {% trans "low" %}</a>
               {% endif %}
               {% if not product.vulnerability_count %}
                 <span class="text-body-tertiary small">{% trans "None" %}</span>

From b4c841c1ff830ee960d484de36e502505775b1b6 Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 10:48:36 +0400
Subject: [PATCH 02/14] add bottom margin

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 dje/templates/dataspace_home.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dje/templates/dataspace_home.html b/dje/templates/dataspace_home.html
index 465195d6..94025027 100644
--- a/dje/templates/dataspace_home.html
+++ b/dje/templates/dataspace_home.html
@@ -78,7 +78,7 @@ <h2 class="card-header fw-bold px-2 h6">{{ card.title }}</h2>
                 {% if forloop.first %}
                   <ul class="mb-1 ps-3">
                 {% endif %}
-                <li>{{ obj }}</li>
+                <li class="mb-1">{{ obj }}</li>
                 {% if forloop.last %}
                   </ul>
                 {% endif %}

From 14ba3852c279d763e514b3d3245047be5a3b51a9 Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 10:48:49 +0400
Subject: [PATCH 03/14] fix missing quote

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 .../templates/product_portfolio/tabs/tab_inventory.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_inventory.html b/product_portfolio/templates/product_portfolio/tabs/tab_inventory.html
index 91bf791f..6c4683d9 100644
--- a/product_portfolio/templates/product_portfolio/tabs/tab_inventory.html
+++ b/product_portfolio/templates/product_portfolio/tabs/tab_inventory.html
@@ -99,7 +99,7 @@
       {% for relation in relationships %}
         {% cycle 'table-odd' '' as rowcolors silent %}
         <tr class="{{ rowcolors }}{% if show_licenses_policy and relation.inventory_item_compliance_alert %} {{ relation.compliance_table_class }}{% endif %}">
-          <td{% if relation.package %} data-purl="{{ relation.package.package_url }} data-package-uuid="{{ relation.package.uuid }}"{% endif %}>
+          <td{% if relation.package %} data-purl="{{ relation.package.package_url }}" data-package-uuid="{{ relation.package.uuid }}"{% endif %}>
             <ul class="list-inline float-end mb-0">
               {% if request.user.is_authenticated and is_user_dataspace and relation.related_component_or_package.request_count %}
                 <li class="list-inline-item me-1">

From d6268f168d651bbc78a8b611456671546697bf02 Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 11:10:45 +0400
Subject: [PATCH 04/14] add new licenses tab to product details

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 .../compliance_dashboard.html                 |   6 +-
 .../product_portfolio/tabs/tab_licenses.html  |  58 +++++++++
 product_portfolio/urls.py                     |   2 +
 product_portfolio/views.py                    | 117 ++++++++++++++++--
 4 files changed, 169 insertions(+), 14 deletions(-)
 create mode 100644 product_portfolio/templates/product_portfolio/tabs/tab_licenses.html

diff --git a/product_portfolio/templates/product_portfolio/compliance_dashboard.html b/product_portfolio/templates/product_portfolio/compliance_dashboard.html
index 57db7203..a6904dc7 100644
--- a/product_portfolio/templates/product_portfolio/compliance_dashboard.html
+++ b/product_portfolio/templates/product_portfolio/compliance_dashboard.html
@@ -137,17 +137,17 @@ <h1 class="h3 mb-0">
             </td>
             <td class="text-end">
               {% if product.license_error_count %}
-                <a href="{{ product_url }}license_summary/?usage_policy__compliance_alert=warning" class="badge bg-danger-subtle text-danger-emphasis">
+                <a href="{{ product_url }}?licenses-usage_policy__compliance_alert=warning#licenses" class="badge bg-danger-subtle text-danger-emphasis">
                   {{ product.license_error_count }} {% trans "error" %}{{ product.license_error_count|pluralize }}
                 </a>
               {% endif %}
               {% if product.license_warning_count %}
-                <a href="{{ product_url }}license_summary/?usage_policy__compliance_alert=error" class="badge bg-warning-subtle text-warning-emphasis ms-1">
+                <a href="{{ product_url }}?licenses-usage_policy__compliance_alert=error#licenses" class="badge bg-warning-subtle text-warning-emphasis ms-1">
                   {{ product.license_warning_count }} {% trans "warning" %}{{ product.license_warning_count|pluralize }}
                 </a>
               {% endif %}
               {% if not product.license_error_count and not product.license_warning_count %}
-                <a href="{{ product_url }}license_summary/" class="badge bg-success-subtle text-success-emphasis">{% trans "OK" %}</a>
+                <a href="{{ product_url }}#licenses" class="badge bg-success-subtle text-success-emphasis">{% trans "OK" %}</a>
               {% endif %}
             </td>
             <td class="text-end">
diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_licenses.html b/product_portfolio/templates/product_portfolio/tabs/tab_licenses.html
new file mode 100644
index 00000000..8d6dbf56
--- /dev/null
+++ b/product_portfolio/templates/product_portfolio/tabs/tab_licenses.html
@@ -0,0 +1,58 @@
+{% spaceless %}
+<div class="row align-items-end mb-1">
+  <div class="col mb-3">
+  </div>
+  <div class="col-auto">
+    <a class="btn btn-sm btn-outline-dark" href="?export=csv"><i class="fas fa-file-csv"></i> Export as CSV</a>
+  </div>
+</div>
+
+<table class="table table-bordered table-md text-break">
+  <thead>
+    <tr>
+      <th scope="col">Licenses</th>
+      {% if product.dataspace.show_usage_policy_in_user_views %}
+        <th scope="col" style="min-width: 145px;">Usage policy {{ filterset.form.usage_policy }}</th>
+      {% endif %}
+      <th scope="col">Items</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for license, items in license_index.items %}
+      <tr class="{% if 'error' in license.usage_policy.compliance_alert %}table-danger{% elif 'warning' in license.usage_policy.compliance_alert %}table-warning{% endif %}">
+        <td>
+          <strong>
+            <a href="{{ license.details_url }}" target="_blank">{{ license.name }}</a>
+          </strong>
+          {% include 'license_library/includes/license_short_name_and_key.html' with license=license only %}
+          {{ license.category }}
+          {{ license.guidance }}
+        </td>
+        {% if product.dataspace.show_usage_policy_in_user_views %}
+          <td>
+            {% if license.usage_policy %}
+              {{ license.get_usage_policy_display_with_icon }}
+            {% endif %}
+          </td>
+        {% endif %}
+        <td>
+          {% for item in items %}
+            <div class="mb-2">
+              <span data-bs-toggle="tooltip" title="Parent: {% if item.direct_parent %}{{ item.direct_parent }}{% else %}{{ product }}{% endif %}">
+                <i class="fas fa-sitemap cursor-help me-2"></i>
+              </span>
+              <span>
+                {% include 'includes/object_icon.html' with object=item only %}
+              </span>
+              <a href="{{ item.get_absolute_url }}" class="ms-1" target="_blank">{{ item }}</a>
+              <div>
+                <code class="ms-4 key ms-1 white-space-normal">{{ item.license_expression }}</code>
+              </div>
+            </div>
+          {% endfor %}
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
+{% endspaceless %}
\ No newline at end of file
diff --git a/product_portfolio/urls.py b/product_portfolio/urls.py
index e1b398f3..41aa58fa 100644
--- a/product_portfolio/urls.py
+++ b/product_portfolio/urls.py
@@ -31,6 +31,7 @@
 from product_portfolio.views import ProductTabDependenciesView
 from product_portfolio.views import ProductTabImportsView
 from product_portfolio.views import ProductTabInventoryView
+from product_portfolio.views import ProductTabLicensesView
 from product_portfolio.views import ProductTabVulnerabilitiesView
 from product_portfolio.views import ProductTreeComparisonView
 from product_portfolio.views import ProductUpdateView
@@ -137,6 +138,7 @@ def product_path(path_segment, view):
     *product_path("import_manifests", ImportManifestsView.as_view()),
     *product_path("tab_codebase", ProductTabCodebaseView.as_view()),
     *product_path("tab_dependencies", ProductTabDependenciesView.as_view()),
+    *product_path("tab_licenses", ProductTabLicensesView.as_view()),
     *product_path("tab_vulnerabilities", ProductTabVulnerabilitiesView.as_view()),
     *product_path("tab_imports", ProductTabImportsView.as_view()),
     *product_path("tab_inventory", ProductTabInventoryView.as_view()),
diff --git a/product_portfolio/views.py b/product_portfolio/views.py
index 0ccfc1d2..b352d3ef 100644
--- a/product_portfolio/views.py
+++ b/product_portfolio/views.py
@@ -290,6 +290,13 @@ class ProductDetailsView(
                 "packages",
             ],
         },
+        "licenses": {
+            "fields": [
+                "license_expression",
+                "licenses",
+            ],
+        },
+        "vulnerabilities": {},
         "codebase": {
             "fields": [
                 "path",
@@ -303,11 +310,7 @@ class ProductDetailsView(
         "hierarchy": {
             "fields": [
                 "components",
-            ],
-        },
-        "notice": {
-            "fields": [
-                "notice_text",
+                "packages",
             ],
         },
         "license": {
@@ -316,12 +319,16 @@ class ProductDetailsView(
                 "licenses",
             ],
         },
+        "notice": {
+            "fields": [
+                "notice_text",
+            ],
+        },
         "owner": {
             "fields": [
                 "owner",
             ],
         },
-        "vulnerabilities": {},
         "dependencies": {
             "fields": [
                 "dependencies",
@@ -397,6 +404,10 @@ def get_tabsets(self):
             anchor="#inventory",
         )
 
+        productcomponents_count = self.object.productcomponents.count()
+        productpackages_count = self.object.productpackages.count()
+        self.inventory_count = productcomponents_count + productpackages_count
+
         return super().get_tabsets()
 
     def tab_essentials(self):
@@ -525,14 +536,36 @@ def tab_compliance(self):
             "fields": [(None, tab_context, None, template)],
         }
 
+    def tab_licenses(self):
+        if not self.inventory_count:
+            return
+
+        template = "tabs/tab_async_loader.html"
+
+        # Pass the current request query context to the async request
+        tab_view_url = self.object.get_url("tab_licenses")
+        if full_query_string := self.request.META["QUERY_STRING"]:
+            tab_view_url += f"?{full_query_string}"
+
+        tab_context = {
+            "tab_view_url": tab_view_url,
+            "tab_object_name": "licenses",
+        }
+
+        return {
+            "label": "Licenses",
+            "fields": [(None, tab_context, None, template)],
+        }
+
     def tab_inventory(self):
-        productcomponents_count = self.object.productcomponents.count()
-        productpackages_count = self.object.productpackages.count()
-        inventory_count = productcomponents_count + productpackages_count
-        if not inventory_count:
+        if not self.inventory_count:
             return
 
-        label = f'Inventory <span class="badge text-bg-primary">{inventory_count}</span>'
+        label = (
+            f'Inventory <span class="badge bg-primary-subtle text-primary-emphasis">'
+            f"{self.inventory_count}"
+            f"</span>"
+        )
         template = "tabs/tab_async_loader.html"
 
         # Pass the current request query context to the async request
@@ -2274,6 +2307,68 @@ def get_relationship_queryset(self):
         )
 
 
+class ProductTabLicensesView(
+    LoginRequiredMixin,
+    BaseProductViewMixin,
+    TabContentView,
+):
+    template_name = "product_portfolio/tabs/tab_licenses.html"
+    tab_id = "licenses"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        product = self.object
+        filterset = LicenseFilterSet(
+            self.request.GET,
+            request=self.request,
+            dataspace=product.dataspace,
+            prefix="licenses",
+            anchor="#licenses",
+        )
+        license_index = self.get_license_index(product=product, queryset=filterset.qs)
+
+        context.update(
+            {
+                "product": product,
+                "filterset": filterset,
+                "license_index": license_index,
+            }
+        )
+
+        return context
+
+    @staticmethod
+    def get_license_index(product, queryset):
+        product_components = product.components.all()
+        product_packages = product.packages.all()
+
+        components_hierarchy = set(product_components)
+        for component in product_components:
+            components_hierarchy.update(component.get_descendants(set_direct_parent=True))
+
+        packages_hierarchy = set(product_packages)
+        for component in components_hierarchy:
+            component_packages = []
+            for package in component.packages.all():
+                package.direct_parent = component
+                component_packages.append(package)
+            packages_hierarchy.update(component_packages)
+
+        all_licenses = set()
+        license_index = defaultdict(list)
+
+        for item in list(components_hierarchy) + list(packages_hierarchy):
+            licenses = item.licenses.all()
+            all_licenses.update(licenses)
+            for license in licenses:
+                if license in queryset:
+                    license_index[license].append(item)
+
+        sorted_index = sorted(license_index.items(), key=lambda item: item[0].name)
+        return dict(sorted_index)
+
+
 @login_required
 def license_summary_view(request, dataspace, name, version=""):
     user = request.user

From 463c806f5913be6ec9c7fecb4abaa9e4707d3bdb Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 11:23:46 +0400
Subject: [PATCH 05/14] adjust CSS

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 .../includes/hierarchy_instance_box.html      |  2 +-
 product_portfolio/models.py                   |  3 -
 .../includes/productrelation_element.html     |  2 +-
 .../product_portfolio/license_summary.html    | 75 -------------------
 .../product_portfolio/product_details.html    |  1 -
 .../tabs/tab_dependencies.html                |  2 +-
 product_portfolio/tests/test_views.py         |  1 +
 product_portfolio/urls.py                     |  2 -
 product_portfolio/views.py                    | 22 ++++--
 9 files changed, 21 insertions(+), 89 deletions(-)
 delete mode 100644 product_portfolio/templates/product_portfolio/license_summary.html

diff --git a/component_catalog/templates/component_catalog/includes/hierarchy_instance_box.html b/component_catalog/templates/component_catalog/includes/hierarchy_instance_box.html
index 984c5198..c5fce9dd 100644
--- a/component_catalog/templates/component_catalog/includes/hierarchy_instance_box.html
+++ b/component_catalog/templates/component_catalog/includes/hierarchy_instance_box.html
@@ -32,7 +32,7 @@
           {% include 'component_catalog/includes/vulnerability_icon_link.html' with url=instance.get_absolute_url count=relation.vulnerability_count %}
         {% endif %}
         {% if relation.package_id and relation.package.declared_dependencies.all %}
-          <a class="btn badge text-bg-primary rounded-pill ms-1"
+          <a class="btn badge bg-primary-subtle text-primary-emphasis rounded-pill ms-1"
              href="{{ product.get_absolute_url }}?dependencies-for_package__uuid={{ relation.package.uuid }}#dependencies" data-bs-toggle="tooltip" title="Dependencies" aria-label="Dependencies">
             {{ relation.package.declared_dependencies.all|length }}<i class="fa-solid fa-share-nodes ms-1"></i>
           </a>
diff --git a/product_portfolio/models.py b/product_portfolio/models.py
index 2b476974..fb3d60e9 100644
--- a/product_portfolio/models.py
+++ b/product_portfolio/models.py
@@ -431,9 +431,6 @@ def get_manage_components_url(self):
     def get_manage_packages_url(self):
         return self.get_url("manage_packages")
 
-    def get_license_summary_url(self):
-        return self.get_url("license_summary")
-
     def get_check_package_version_url(self):
         return self.get_url("check_package_version")
 
diff --git a/product_portfolio/templates/product_portfolio/includes/productrelation_element.html b/product_portfolio/templates/product_portfolio/includes/productrelation_element.html
index a2c3b0be..d39e9433 100644
--- a/product_portfolio/templates/product_portfolio/includes/productrelation_element.html
+++ b/product_portfolio/templates/product_portfolio/includes/productrelation_element.html
@@ -59,7 +59,7 @@
   </span>
 {% endif %}
 {% if relation.package_id and relation.package.declared_dependencies.all %}
-  <a class="btn badge text-bg-primary rounded-pill ms-1"
+  <a class="btn badge bg-primary-subtle text-primary-emphasis rounded-pill ms-1"
      href="{{ product.get_absolute_url }}?dependencies-for_package__uuid={{ relation.package.uuid }}#dependencies" class="ms-1" data-bs-toggle="tooltip" title="Dependencies" aria-label="Dependencies">
     {{ relation.package.declared_dependencies.all|length }}<i class="fa-solid fa-share-nodes ms-1"></i>
   </a>
diff --git a/product_portfolio/templates/product_portfolio/license_summary.html b/product_portfolio/templates/product_portfolio/license_summary.html
deleted file mode 100644
index e89d339f..00000000
--- a/product_portfolio/templates/product_portfolio/license_summary.html
+++ /dev/null
@@ -1,75 +0,0 @@
-{% extends "bootstrap_base.html" %}
-{% load i18n dje_tags static %}
-
-{% block page_title %}
-  License summary
-{% endblock %}
-
-{% block content %}
-  <div class="header">
-    <div class="header-body">
-      <div class="row align-items-end">
-        <div class="col">
-          <div class="header-pretitle">
-            <a href="{% url 'product_portfolio:product_list' %}" title="Return to product list" data-bs-toggle="tooltip" data-bs-placement="bottom">Products</a>
-            >
-            <a href="{{ product.get_absolute_url }}">{{ product }}</a>
-          </div>
-          <h1 class="header-title">
-            License summary
-          </h1>
-        </div>
-        <div class="col-auto">
-          <a class="btn btn-outline-dark" href="?export=csv"><i class="fas fa-file-csv"></i> Export as CSV</a>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  {% include 'includes/messages_alert.html' %}
-
-  <table class="table table-bordered text-break">
-    <thead>
-      <tr>
-        <th scope="col">Licenses</th>
-        {% if product.dataspace.show_usage_policy_in_user_views %}
-          <th scope="col" style="min-width: 145px;">Usage policy {{ filterset.form.usage_policy }}</th>
-        {% endif %}
-        <th scope="col">Items</th>
-      </tr>
-    </thead>
-    <tbody>
-      {% for license, items in license_index.items %}
-        <tr class="{% if 'error' in license.usage_policy.compliance_alert %}table-danger{% elif 'warning' in license.usage_policy.compliance_alert %}table-warning{% endif %}">
-          <td>
-            <strong>
-              <a href="{{ license.details_url }}" target="_blank">{{ license.name }}</a>
-            </strong>
-            {% include 'license_library/includes/license_short_name_and_key.html' with license=license only %}
-          </td>
-          {% if product.dataspace.show_usage_policy_in_user_views %}
-            <td>
-              {% if license.usage_policy %}
-                {{ license.get_usage_policy_display_with_icon }}
-              {% endif %}
-            </td>
-          {% endif %}
-          <td>
-            {% for item in items %}
-              <div class="mb-2">
-                <span data-bs-toggle="tooltip" title="Parent: {% if item.direct_parent %}{{ item.direct_parent }}{% else %}{{ product }}{% endif %}">
-                  <i class="fas fa-sitemap cursor-help me-2"></i>
-                </span>
-                <span>
-                  {% include 'includes/object_icon.html' with object=item only %}
-                </span>
-                <strong><a href="{{ item.get_absolute_url }}" target="_blank">{{ item }}</a></strong>
-                <code class="key ms-1 white-space-normal">{{ item.license_expression }}</code>
-              </div>
-            {% endfor %}
-          </td>
-        </tr>
-     {% endfor %}
-    </tbody>
-  </table>
-{% endblock %}
\ No newline at end of file
diff --git a/product_portfolio/templates/product_portfolio/product_details.html b/product_portfolio/templates/product_portfolio/product_details.html
index bdc5be5f..d8b345ba 100644
--- a/product_portfolio/templates/product_portfolio/product_details.html
+++ b/product_portfolio/templates/product_portfolio/product_details.html
@@ -29,7 +29,6 @@
               <i class="fas fa-plus-circle"></i> {% trans 'Add custom Component' %}
             </button>
           {% endif %}
-          <a class="dropdown-item" href="{{ object.get_license_summary_url }}"><i class="fa fa-book"></i> {% trans 'License summary' %}</a>
           {% if purldb_enabled %}
             <a class="dropdown-item" href="#" id="check-package-versions"><i class="fas fa-arrow-alt-circle-up"></i> {% trans 'Check for new Package versions' %}</a>
           {% endif %}
diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_dependencies.html b/product_portfolio/templates/product_portfolio/tabs/tab_dependencies.html
index e7ac6b96..4b837d9d 100644
--- a/product_portfolio/templates/product_portfolio/tabs/tab_dependencies.html
+++ b/product_portfolio/templates/product_portfolio/tabs/tab_dependencies.html
@@ -34,7 +34,7 @@
                 </span>
               {% endif %}
               {% if dependency.resolved_to_package.declared_dependencies_count %}
-                <a class="btn badge text-bg-primary rounded-pill ms-1"
+                <a class="btn badge bg-primary-subtle text-primary-emphasis rounded-pill ms-1"
                    href="{{ product.get_absolute_url }}?dependencies-for_package__uuid={{ dependency.resolved_to_package.uuid }}#dependencies" class="ms-1" data-bs-toggle="tooltip" title="Dependencies" aria-label="Dependencies">
                   {{ dependency.resolved_to_package.declared_dependencies_count }}<i class="fa-solid fa-share-nodes ms-1"></i>
                 </a>
diff --git a/product_portfolio/tests/test_views.py b/product_portfolio/tests/test_views.py
index 7a81e266..a59e43dd 100644
--- a/product_portfolio/tests/test_views.py
+++ b/product_portfolio/tests/test_views.py
@@ -2865,6 +2865,7 @@ def test_product_portfolio_product_manage_packages_grid_filterset(self):
         filterset_qs = response.context["filterset"].qs
         self.assertEqual(0, len(filterset_qs))
 
+    # HERE test tab now
     def test_product_portfolio_product_license_summary_view(self):
         owner1 = Owner.objects.create(name="Owner1", dataspace=self.dataspace)
         license1 = License.objects.create(
diff --git a/product_portfolio/urls.py b/product_portfolio/urls.py
index 41aa58fa..115403b8 100644
--- a/product_portfolio/urls.py
+++ b/product_portfolio/urls.py
@@ -43,7 +43,6 @@
 from product_portfolio.views import import_from_scan_view
 from product_portfolio.views import import_packages_from_scancodeio_view
 from product_portfolio.views import improve_packages_from_purldb_view
-from product_portfolio.views import license_summary_view
 from product_portfolio.views import scan_all_packages_view
 from product_portfolio.views import scancodeio_project_download_input_view
 from product_portfolio.views import scancodeio_project_status_view
@@ -132,7 +131,6 @@ def product_path(path_segment, view):
     *product_path("import_from_scan", import_from_scan_view),
     *product_path("manage_components", ManageComponentGridView.as_view()),
     *product_path("manage_packages", ManagePackageGridView.as_view()),
-    *product_path("license_summary", license_summary_view),
     *product_path("check_package_version", check_package_version_ajax_view),
     *product_path("load_sboms", LoadSBOMsView.as_view()),
     *product_path("import_manifests", ImportManifestsView.as_view()),
diff --git a/product_portfolio/views.py b/product_portfolio/views.py
index b352d3ef..fc6248f4 100644
--- a/product_portfolio/views.py
+++ b/product_portfolio/views.py
@@ -588,7 +588,11 @@ def tab_dependencies(self):
         if not dependencies_count:
             return
 
-        label = f'Dependencies <span class="badge text-bg-primary">{dependencies_count}</span>'
+        label = (
+            f'Dependencies <span class="badge bg-primary-subtle text-primary-emphasis">'
+            f"{dependencies_count}"
+            f"</span>"
+        )
         template = "tabs/tab_async_loader.html"
 
         # Pass the current request query context to the async request
@@ -639,9 +643,9 @@ def tab_vulnerabilities(self):
                 "tooltip": "No vulnerabilities found in this Product",
             }
 
-        badge_class = "text-bg-secondary"
+        badge_class = "bg-secondary-subtle text-secondary-emphasisy"
         if vulnerability_count > 0:
-            badge_class = "badge-vulnerability"
+            badge_class = "bg-danger-subtle text-danger-emphasis"
 
         label = (
             f"Vulnerabilities"
@@ -672,7 +676,11 @@ def tab_codebase(self):
         if not codebaseresources_count:
             return
 
-        label = f'Codebase <span class="badge text-bg-primary">{codebaseresources_count}</span>'
+        label = (
+            f'Codebase <span class="badge bg-primary-subtle text-primary-emphasis">'
+            f"{codebaseresources_count}"
+            f"</span>"
+        )
         template = "tabs/tab_async_loader.html"
 
         # Pass the current request query context to the async request
@@ -698,7 +706,11 @@ def tab_imports(self):
         if not scancodeprojects_count:
             return
 
-        label = f'Imports <span class="badge text-bg-primary">{scancodeprojects_count}</span>'
+        label = (
+            f'Imports <span class="badge bg-primary-subtle text-primary-emphasis">'
+            f"{scancodeprojects_count}"
+            f"</span>"
+        )
         template = "tabs/tab_async_loader.html"
 
         # Pass the current request query context to the async request

From 3edb389cd73dabeee08923f9a3866aa491c1397e Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 11:36:21 +0400
Subject: [PATCH 06/14] add link to the badge to the licenses tab

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 .../product_portfolio/compliance/compliance_panels.html  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/product_portfolio/templates/product_portfolio/compliance/compliance_panels.html b/product_portfolio/templates/product_portfolio/compliance/compliance_panels.html
index ed90010e..49b3dd5d 100644
--- a/product_portfolio/templates/product_portfolio/compliance/compliance_panels.html
+++ b/product_portfolio/templates/product_portfolio/compliance/compliance_panels.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% url product.get_absolute_url as product_url %}
 <div class="row g-4 mb-4">
   {# License panel #}
   <div class="col-lg-6">
@@ -43,9 +44,9 @@ <h3 class="fs-6 fw-medium mb-0">{% trans "License compliance" %}</h3>
           {% if license_issues_count == 0 %}
             <span class="badge bg-success-subtle text-success-emphasis">{% trans "OK" %}</span>
           {% elif license_error_count > 0 %}
-            <span class="badge bg-danger-subtle text-danger-emphasis">{% trans "Error" %}</span>
+            <a href="{{ product_url }}?licenses-usage_policy__compliance_alert=error#licenses" class="badge bg-danger-subtle text-danger-emphasis">{% trans "Error" %}</a>
           {% else %}
-            <span class="badge bg-warning-subtle text-warning-emphasis">{% trans "Warning" %}</span>
+            <a href="{{ product_url }}?licenses-usage_policy__compliance_alert=warning#licenses" class="badge bg-warning-subtle text-warning-emphasis">{% trans "Warning" %}</a>
           {% endif %}
         </div>
       </div>
@@ -76,9 +77,9 @@ <h3 class="fs-6 fw-medium mb-0">{% trans "License compliance" %}</h3>
               </td>
               <td class="text-end">
                 {% if license.compliance_alert == "error" %}
-                  <span class="badge bg-danger-subtle text-danger-emphasis">{% trans "Error" %}</span>
+                  <a href="{{ product_url }}?licenses-usage_policy__compliance_alert=error#licenses" class="badge bg-danger-subtle text-danger-emphasis">{% trans "Error" %}</a>
                 {% elif license.compliance_alert == "warning" %}
-                  <span class="badge bg-warning-subtle text-warning-emphasis">{% trans "Warning" %}</span>
+                  <a href="{{ product_url }}?licenses-usage_policy__compliance_alert=warning#licenses" class="badge bg-warning-subtle text-warning-emphasis">{% trans "Warning" %}</a>
                 {% else %}
                   <span class="badge bg-success-subtle text-success-emphasis">{% trans "OK" %}</span>
                 {% endif %}

From 1d46597022cf8aa6fb9532597a0da809df8bce28 Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 16:14:43 +0400
Subject: [PATCH 07/14] improve and refine the ProductTabLicensesView

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 license_library/filters.py                    |   1 +
 .../product_portfolio/tabs/tab_licenses.html  |  36 ++----
 product_portfolio/views.py                    | 114 ++++++------------
 3 files changed, 47 insertions(+), 104 deletions(-)

diff --git a/license_library/filters.py b/license_library/filters.py
index 431cabe4..b3219640 100644
--- a/license_library/filters.py
+++ b/license_library/filters.py
@@ -59,6 +59,7 @@ class LicenseFilterSet(DataspacedFilterSet):
             "category",
             "license_profile",
             "owner",
+            "usage_policy",
         ],
         empty_label="Relevance",
     )
diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_licenses.html b/product_portfolio/templates/product_portfolio/tabs/tab_licenses.html
index 8d6dbf56..b2c08db6 100644
--- a/product_portfolio/templates/product_portfolio/tabs/tab_licenses.html
+++ b/product_portfolio/templates/product_portfolio/tabs/tab_licenses.html
@@ -1,22 +1,7 @@
 {% spaceless %}
-<div class="row align-items-end mb-1">
-  <div class="col mb-3">
-  </div>
-  <div class="col-auto">
-    <a class="btn btn-sm btn-outline-dark" href="?export=csv"><i class="fas fa-file-csv"></i> Export as CSV</a>
-  </div>
-</div>
-
+{% include 'tabs/pagination.html' with search_verbose_name="licenses" %}
 <table class="table table-bordered table-md text-break">
-  <thead>
-    <tr>
-      <th scope="col">Licenses</th>
-      {% if product.dataspace.show_usage_policy_in_user_views %}
-        <th scope="col" style="min-width: 145px;">Usage policy {{ filterset.form.usage_policy }}</th>
-      {% endif %}
-      <th scope="col">Items</th>
-    </tr>
-  </thead>
+  {% include 'includes/object_list_table_header.html' with filter=filterset %}
   <tbody>
     {% for license, items in license_index.items %}
       <tr class="{% if 'error' in license.usage_policy.compliance_alert %}table-danger{% elif 'warning' in license.usage_policy.compliance_alert %}table-warning{% endif %}">
@@ -25,16 +10,15 @@
             <a href="{{ license.details_url }}" target="_blank">{{ license.name }}</a>
           </strong>
           {% include 'license_library/includes/license_short_name_and_key.html' with license=license only %}
-          {{ license.category }}
-          {{ license.guidance }}
+          <div>
+            {{ license.category }}
+          </div>
+        </td>
+        <td>
+          {% if license.usage_policy %}
+            {{ license.get_usage_policy_display_with_icon }}
+          {% endif %}
         </td>
-        {% if product.dataspace.show_usage_policy_in_user_views %}
-          <td>
-            {% if license.usage_policy %}
-              {{ license.get_usage_policy_display_with_icon }}
-            {% endif %}
-          </td>
-        {% endif %}
         <td>
           {% for item in items %}
             <div class="mb-2">
diff --git a/product_portfolio/views.py b/product_portfolio/views.py
index fc6248f4..7f110940 100644
--- a/product_portfolio/views.py
+++ b/product_portfolio/views.py
@@ -2322,32 +2322,60 @@ def get_relationship_queryset(self):
 class ProductTabLicensesView(
     LoginRequiredMixin,
     BaseProductViewMixin,
+    PaginationMixin,
+    TableHeaderMixin,
     TabContentView,
 ):
     template_name = "product_portfolio/tabs/tab_licenses.html"
+    paginate_by = 50
+    table_model = License
+    filterset_class = LicenseFilterSet
+    query_dict_page_param = "licenses-page"
     tab_id = "licenses"
+    table_headers = (
+        Header("name", _("License"), help_text="License details"),
+        Header("usage_policy", _("Usage policy"), filter="usage_policy"),
+        Header("package", _("Items"), help_text="Items under this license."),
+    )
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
         product = self.object
-        filterset = LicenseFilterSet(
+        self.filterset = self.filterset_class(
             self.request.GET,
-            request=self.request,
             dataspace=product.dataspace,
-            prefix="licenses",
-            anchor="#licenses",
+            prefix=self.tab_id,
+            anchor=f"#{self.tab_id}",
         )
-        license_index = self.get_license_index(product=product, queryset=filterset.qs)
+
+        context = super().get_context_data(**kwargs)
+
+        filtered_queryset = self.filterset.qs
+        license_index = self.get_license_index(product=product, queryset=filtered_queryset)
+
+        paginator = Paginator(filtered_queryset, self.paginate_by)
+        page_number = self.request.GET.get(self.query_dict_page_param)
+        page_obj = paginator.get_page(page_number)
 
         context.update(
             {
                 "product": product,
-                "filterset": filterset,
                 "license_index": license_index,
+                "filterset": self.filterset,
+                "page_obj": page_obj,
+                "total_count": filtered_queryset.count(),
+                "search_query": self.request.GET.get("licenses-q", ""),
             }
         )
 
+        if page_obj:
+            previous_url, next_url = self.get_previous_next(page_obj)
+            context.update(
+                {
+                    "previous_url": (previous_url or "") + f"#{self.tab_id}",
+                    "next_url": (next_url or "") + f"#{self.tab_id}",
+                }
+            )
+
         return context
 
     @staticmethod
@@ -2381,76 +2409,6 @@ def get_license_index(product, queryset):
         return dict(sorted_index)
 
 
-@login_required
-def license_summary_view(request, dataspace, name, version=""):
-    user = request.user
-
-    guarded_qs = Product.objects.get_queryset(user)
-    product = get_object_or_404(guarded_qs, name=unquote_plus(name), version=unquote_plus(version))
-
-    filterset = LicenseFilterSet(
-        data=request.GET or None,
-        request=request,
-        dataspace=product.dataspace,
-    )
-
-    product_components = product.components.all()
-    product_packages = product.packages.all()
-
-    components_hierarchy = set(product_components)
-    for component in product_components:
-        components_hierarchy.update(component.get_descendants(set_direct_parent=True))
-
-    packages_hierarchy = set(product_packages)
-    for component in components_hierarchy:
-        component_packages = []
-        for package in component.packages.all():
-            package.direct_parent = component
-            component_packages.append(package)
-        packages_hierarchy.update(component_packages)
-
-    all_licenses = set()
-    license_index = defaultdict(list)
-
-    for item in list(components_hierarchy) + list(packages_hierarchy):
-        licenses = item.licenses.all()
-        all_licenses.update(licenses)
-        for license in licenses:
-            if license in filterset.qs:
-                license_index[license].append(item)
-
-    sorted_index = sorted(license_index.items(), key=lambda item: item[0].name)
-
-    if request.GET.get("export"):
-        response = HttpResponse(content_type="text/csv")
-        prefix = str(product).replace(" ", "_")
-        response["Content-Disposition"] = f'attachment; filename="{prefix}_license_summary.csv"'
-
-        fieldnames = ["License", "Usage policy", "Items"]
-        writer = csv.writer(response)
-        writer.writerow(fieldnames)
-
-        for license, items in sorted_index:
-            row = [
-                f"{license.name} ({license.key})",
-                license.usage_policy,
-                ", ".join([repr(item) for item in items]),
-            ]
-            writer.writerow(row)
-
-        return response
-
-    return render(
-        request,
-        "product_portfolio/license_summary.html",
-        {
-            "product": product,
-            "license_index": dict(sorted_index),
-            "filterset": filterset,
-        },
-    )
-
-
 @login_required
 def check_package_version_ajax_view(request, dataspace, name, version=""):
     user = request.user

From cd4cf38cea2d00cadce7e82c4cb315b0d2574b59 Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 16:32:22 +0400
Subject: [PATCH 08/14] merge license and notice to a single Terms tab

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 dejacode/static/css/dejacode_bootstrap.css |  3 +++
 product_portfolio/views.py                 | 20 ++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dejacode/static/css/dejacode_bootstrap.css b/dejacode/static/css/dejacode_bootstrap.css
index f67badbb..765d7e12 100644
--- a/dejacode/static/css/dejacode_bootstrap.css
+++ b/dejacode/static/css/dejacode_bootstrap.css
@@ -141,6 +141,9 @@ table.text-break thead {
   background-color: var(--bs-djc-blue-bg);
   height: 54px;
 }
+.nav {
+  --bs-nav-link-padding-x: 0.75rem;
+}
 .navbar-nav .active>.nav-link,
 .navbar-nav .show>.nav-link
 .navbar-nav .nav-link.active,
diff --git a/product_portfolio/views.py b/product_portfolio/views.py
index 7f110940..95363aba 100644
--- a/product_portfolio/views.py
+++ b/product_portfolio/views.py
@@ -313,22 +313,13 @@ class ProductDetailsView(
                 "packages",
             ],
         },
-        "license": {
+        "terms": {
             "fields": [
                 "license_expression",
                 "licenses",
-            ],
-        },
-        "notice": {
-            "fields": [
                 "notice_text",
             ],
         },
-        "owner": {
-            "fields": [
-                "owner",
-            ],
-        },
         "dependencies": {
             "fields": [
                 "dependencies",
@@ -432,9 +423,14 @@ def tab_essentials(self):
 
         return {"fields": self.get_tab_fields(tab_fields)}
 
-    def tab_notice(self):
+    def tab_terms(self):
+        tab_data = self.tab_license()
+
         if self.object.notice_text:
-            return {"fields": self.get_tab_fields([TabField("notice_text")])}
+            notice_field = self.get_tab_fields([TabField("notice_text")])[0]
+            tab_data["fields"].append(notice_field)
+
+        return tab_data
 
     def tab_hierarchy(self):
         template = "product_portfolio/tabs/tab_hierarchy.html"

From badd2afee771546c0e68e5222807f6e89d822fbc Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 16:48:06 +0400
Subject: [PATCH 09/14] regroup history and changes in the imports tab

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 .../product_portfolio/tabs/tab_imports.html   | 43 ++++++++++++++++++-
 product_portfolio/views.py                    |  8 ++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_imports.html b/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
index 497f5f04..6de10a1a 100644
--- a/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
+++ b/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load humanize i18n %}
 {% load naturaltime_short from dje_tags %}
 {% load as_icon from dje_tags %}
 
@@ -69,4 +69,45 @@
     </tbody>
   </table>
 </div>
+
+{# History section #}
+<div class="border rounded-3 p-3 mb-4">
+  <div class="d-flex justify-content-between align-items-center mb-3">
+    <h3 class="fs-6 fw-medium mb-0">History</h3>
+  </div>
+
+  <dl class="row mb-3 small">
+    <dt class="col-sm-3 col-md-2 text-body-secondary fw-normal">Created</dt>
+    <dd class="col-sm-9 col-md-10 mb-2">
+      <span title="{{ object.created_date }}">{{ object.created_date|naturaltime }}</span>
+      {% if object.created_by %} by <strong>{{ object.created_by }}</strong>{% endif %}
+    </dd>
+
+    <dt class="col-sm-3 col-md-2 text-body-secondary fw-normal">Last modified</dt>
+    <dd class="col-sm-9 col-md-10 mb-0">
+      <span title="{{ object.last_modified_date }}">{{ object.last_modified_date|naturaltime }}</span>
+      {% if object.last_modified_by %} by <strong>{{ object.last_modified_by }}</strong>{% endif %}
+    </dd>
+  </dl>
+
+  {% if history_entries %}
+    <div class="small text-body-secondary fw-medium mb-2">Changes</div>
+    <ul class="timeline pt-1 mb-0">
+      {% for history_entry in history_entries %}
+        {% with change_message=history_entry.get_change_message %}
+          <li class="timeline-item {% if 'Added' in change_message %}timeline-item-addition{% elif 'Deleted' in change_message %}timeline-item-deletion{% endif %} mb-3">
+            {{ change_message }}
+            <small class="text-body-tertiary d-block" title="{{ history_entry.action_time }}">
+              {{ history_entry.action_time|naturaltime }} by <strong>{{ history_entry.user }}</strong>
+            </small>
+          </li>
+        {% endwith %}
+      {% endfor %}
+    </ul>
+  {% else %}
+    <div class="text-body-tertiary small">
+      No changes yet
+    </div>
+  {% endif %}
+</div>
 {% endspaceless %}
\ No newline at end of file
diff --git a/product_portfolio/views.py b/product_portfolio/views.py
index 95363aba..c2172444 100644
--- a/product_portfolio/views.py
+++ b/product_portfolio/views.py
@@ -1368,6 +1368,14 @@ def get_context_data(self, **kwargs):
             }
         )
 
+        # History
+        history_entries = (
+            History.objects.get_for_object(self.object)
+            .select_related("user")
+            .order_by("-action_time")
+        )
+        context_data["history_entries"] = history_entries
+
         return context_data
 
     @staticmethod

From 8e93e780dc0dd8de598247916e401382e77d7d4e Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 17:51:39 +0400
Subject: [PATCH 10/14] modernize the import table in tab

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 .../product_portfolio/tabs/tab_imports.html   | 139 ++++++++++--------
 1 file changed, 78 insertions(+), 61 deletions(-)

diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_imports.html b/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
index 6de10a1a..91a6e07a 100644
--- a/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
+++ b/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
@@ -2,10 +2,8 @@
 {% load naturaltime_short from dje_tags %}
 {% load as_icon from dje_tags %}
 
-{% spaceless %}
-<div
-  {% if has_projects_in_progress %} hx-get="{{ tab_view_url }}" hx-trigger="load delay:10s" hx-swap="outerHTML"{% endif %}
->
+{% block imports %}
+<div {% if has_projects_in_progress %} hx-get="{{ tab_view_url }}" hx-trigger="load delay:10s" hx-swap="outerHTML"{% endif %}>
   {% if has_projects_in_progress %}
     <div class="alert alert-primary" role="alert">
       <i class="fas fa-spinner fa-spin"></i>
@@ -13,67 +11,86 @@
       completion of the import process.
     </div>
   {% endif %}
+  
+  <div class="border rounded-3 p-3 mb-4">
+    <div class="d-flex justify-content-between align-items-center mb-3">
+      <h3 class="fs-5 fw-medium mb-0">
+        Imports
+        {% if scancode_projects %}<span class="text-body-tertiary fw-normal ms-1">{{ scancode_projects|length }}</span>{% endif %}
+      </h3>
+      {% if has_projects_in_progress %}
+        <span class="badge bg-primary-subtle text-primary-emphasis">
+          <i class="fas fa-spinner fa-spin me-1"></i>In progress
+        </span>
+      {% endif %}
+    </div>
 
-  <table class="table table-bordered table-md text-break table-fixed-layout">
-    <thead>
-      <tr>
-        <th>{% trans 'Import type' %}</th>
-        <th style="width:140px;">{% trans 'Status' %}</th>
-        <th>{% trans 'Input' %}</th>
-        <th colspan="2">{% trans 'Log' %}</th>
-      </tr>
-    </thead>
-    <tbody>
-      {% for scancode_project in scancode_projects %}
-        <tr class="{% cycle 'odd' '' %}" data-uuid="{{ scancode_project.uuid }}">
-          <td>
-            {{ scancode_project.get_type_display }}
-            {% if scancode_project.update_existing_packages %}
-              <div class="smaller text-muted-darker">
-                + Update exising packages
-              </div>
-            {% endif %}
-            <div class="smaller text-muted-darker">
-              <span title="{{ scancode_project.created_date }}">
-                {{ scancode_project.created_date|naturaltime_short }}
-              </span>
-              by {{ scancode_project.created_by }}
-            </div>
-          </td>
-          <td>
-            {% if scancode_project.project_uuid %}
-              <a href="#" role="button" class="ms-1 float-end" data-bs-toggle="modal" data-bs-target="#scancode-project-status-modal" data-fetch-status-url="{% url 'product_portfolio:scancodeio_project_status' scancode_project.uuid %}">
-                <i class="fas fa-info-circle"></i>
-              </a>
-            {% endif %}
-            <strong>
-              {{ scancode_project.get_status_display|title }}
-              {% if scancode_project.has_errors %}
-                <span class="float-start"> with errors</span>
-              {% endif %}
-            </strong>
-            {% include 'component_catalog/includes/scan_status.html' with status=scancode_project.status has_errors=scancode_project.has_errors only %}
-          </td>
-          <td>
-            {% if scancode_project.input_file %}
-              File: <a href="{% url 'product_portfolio:scancodeio_project_download_input' scancode_project.uuid %}" target="_blank">{{ scancode_project.input_file_filename }}</a>
-            {% elif scancode_project.project_uuid %}
-              Project: {{ scancode_project.project_uuid }}
-            {% endif %}
-          </td>
-          <td colspan="2">
-            {{ scancode_project.import_log|join:"<br>" }}
-          </td>
-        </tr>
-      {% endfor %}
-    </tbody>
-  </table>
+    {% if scancode_projects %}
+      <div class="table-responsive">
+        <table class="table table-sm mb-0 align-middle">
+          <thead>
+            <tr>
+              <th class="fw-medium">Type</th>
+              <th class="fw-medium" style="width: 200px;">Status</th>
+              <th class="fw-medium">Input</th>
+              <th class="fw-medium">Log</th>
+            </tr>
+          </thead>
+          <tbody>
+            {% for scancode_project in scancode_projects %}
+              <tr data-uuid="{{ scancode_project.uuid }}">
+                <td>
+                  <div>{{ scancode_project.get_type_display }}</div>
+                  {% if scancode_project.update_existing_packages %}
+                    <div class="text-body-tertiary fs-xs">+ Update existing packages</div>
+                  {% endif %}
+                  <div class="text-body-tertiary fs-xs">
+                    <span title="{{ scancode_project.created_date }}">{{ scancode_project.created_date|naturaltime_short }}</span>
+                    by {{ scancode_project.created_by }}
+                  </div>
+                </td>
+                <td class="pe-4">
+                  {% if scancode_project.project_uuid %}
+                    <a href="#" role="button" class="ms-1 float-end" data-bs-toggle="modal" data-bs-target="#scancode-project-status-modal" data-fetch-status-url="{% url 'product_portfolio:scancodeio_project_status' scancode_project.uuid %}">
+                      <i class="fas fa-info-circle"></i>
+                    </a>
+                  {% endif %}
+                  <div>
+                    {{ scancode_project.get_status_display|title }}
+                    {% if scancode_project.has_errors %}
+                      <span class="float-start"> with errors</span>
+                    {% endif %}
+                  </div>
+                  {% include 'component_catalog/includes/scan_status.html' with status=scancode_project.status has_errors=scancode_project.has_errors only %}
+                </td>
+                <td class="small">
+                  {% if scancode_project.input_file %}
+                    File: <a href="{% url 'product_portfolio:scancodeio_project_download_input' scancode_project.uuid %}" target="_blank">{{ scancode_project.input_file_filename }}</a>
+                  {% elif scancode_project.project_uuid %}
+                    Project: {{ scancode_project.project_uuid }}
+                  {% endif %}
+                </td>
+                <td class="small text-body-secondary">
+                  {{ scancode_project.import_log|join:"<br>" }}
+                </td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+    {% else %}
+      <div class="text-body-tertiary small">
+        No imports yet
+      </div>
+    {% endif %}
+  </div>
 </div>
+{% endblock imports %}
 
-{# History section #}
+{% block history %}
 <div class="border rounded-3 p-3 mb-4">
   <div class="d-flex justify-content-between align-items-center mb-3">
-    <h3 class="fs-6 fw-medium mb-0">History</h3>
+    <h3 class="fs-5 fw-medium mb-0">History</h3>
   </div>
 
   <dl class="row mb-3 small">
@@ -110,4 +127,4 @@ <h3 class="fs-6 fw-medium mb-0">History</h3>
     </div>
   {% endif %}
 </div>
-{% endspaceless %}
\ No newline at end of file
+{% endblock history %}
\ No newline at end of file

From 8949dd57ab9ab9275e41f0090440190105ad80f8 Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 18:24:06 +0400
Subject: [PATCH 11/14] merge the requests in the import and history tab

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 .../product_portfolio/tabs/tab_imports.html   | 88 +++++++++++++++++--
 product_portfolio/views.py                    | 25 +++---
 2 files changed, 97 insertions(+), 16 deletions(-)

diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_imports.html b/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
index 91a6e07a..e2f5f8a8 100644
--- a/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
+++ b/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
@@ -11,7 +11,7 @@
       completion of the import process.
     </div>
   {% endif %}
-  
+
   <div class="border rounded-3 p-3 mb-4">
     <div class="d-flex justify-content-between align-items-center mb-3">
       <h3 class="fs-5 fw-medium mb-0">
@@ -56,10 +56,12 @@ <h3 class="fs-5 fw-medium mb-0">
                     </a>
                   {% endif %}
                   <div>
-                    {{ scancode_project.get_status_display|title }}
-                    {% if scancode_project.has_errors %}
-                      <span class="float-start"> with errors</span>
-                    {% endif %}
+                    <span class="smaller">
+                      {{ scancode_project.get_status_display|title }}
+                      {% if scancode_project.has_errors %}
+                        <span> with errors</span>
+                      {% endif %}
+                    </span>
                   </div>
                   {% include 'component_catalog/includes/scan_status.html' with status=scancode_project.status has_errors=scancode_project.has_errors only %}
                 </td>
@@ -87,6 +89,82 @@ <h3 class="fs-5 fw-medium mb-0">
 </div>
 {% endblock imports %}
 
+{% block requests %}
+<div class="border rounded-3 p-3 mb-4">
+  <div class="d-flex justify-content-between align-items-center mb-3">
+    <h3 class="fs-5 fw-medium mb-0">
+      Requests
+      {% if requests %}<span class="text-body-tertiary fw-normal ms-1">{{ requests|length }}</span>{% endif %}
+    </h3>
+  </div>
+
+  {% if requests %}
+    <div class="list-group list-group-flush">
+      {% for req in requests %}
+        <div class="list-group-item px-0 py-2">
+          {% if not req.is_private or req.requester == user or user.is_staff %}
+            <div class="d-flex justify-content-between align-items-start gap-3">
+              <div class="flex-grow-1">
+                <div>
+                  <a href="{{ req.get_absolute_url }}" class="fs-6 fw-semibold text-decoration-none">
+                    #{{ req.id }} {{ req.title }}
+                  </a>
+                </div>
+                <div class="text-body-secondary">{{ req.request_template.name }}</div>
+                <div class="text-body-tertiary fs-xs mt-1">
+                  {% if req.is_private %}<i class="fas fa-lock me-1"></i>{% endif %}
+                  Created <span title="{{ req.created_date }}">{{ req.created_date|naturaltime }}</span> by {{ req.requester.username }}
+                  {% if req.last_modified_by %}
+                    &middot; Edited <span title="{{ req.last_modified_date }}">{{ req.last_modified_date|naturaltime }}</span> by {{ req.last_modified_by.username }}
+                  {% endif %}
+                </div>
+              </div>
+              <div class="text-end small flex-shrink-0">
+                <a href="{{ req.get_absolute_url }}#attachments" class="text-decoration-none" title="{% if req.attachments_count %}View{% else %}Add{% endif %} attachments">
+                  {% if req.attachments_count %}
+                    <i class="fas fa-file"></i> {{ req.attachments_count }}
+                  {% else %}
+                    + <i class="far fa-file"></i>
+                  {% endif %}
+                </a>
+                <a href="{{ req.get_absolute_url }}#comments" class="ms-2 text-decoration-none" title="{% if req.comments_count %}View{% else %}Add{% endif %} comments">
+                  {% if req.comments_count %}
+                    <i class="fas fa-comments"></i> {{ req.comments_count }}
+                  {% else %}
+                    + <i class="far fa-comments"></i>
+                  {% endif %}
+                </a>
+                {% if req.priority %}
+                  <div class="mb-1">
+                    <span class="badge" {% if req.priority.color_code %}style="background-color: {{ req.priority.color_code }}; color: white;"{% endif %}>{{ req.priority }}</span>
+                  </div>
+                {% endif %}
+                <div class="fw-medium">
+                  {% include 'workflow/includes/request_status_icon.html' %}
+                  {{ req.get_status_display }}
+                </div>
+                {% if req.assignee %}
+                  <div class="text-body-tertiary fs-xs">Assigned to {{ req.assignee.username }}</div>
+                {% endif %}
+              </div>
+            </div>
+          {% else %}
+            <div class="text-body-secondary">
+              <strong>#{{ req.id }}</strong> <i class="fas fa-lock"></i>
+              <span class="ms-2 small">{{ req.request_template.name }}</span>
+            </div>
+          {% endif %}
+        </div>
+      {% endfor %}
+    </div>
+  {% else %}
+    <div class="text-body-tertiary small">
+      No requests yet
+    </div>
+  {% endif %}
+</div>
+{% endblock requests %}
+
 {% block history %}
 <div class="border rounded-3 p-3 mb-4">
   <div class="d-flex justify-content-between align-items-center mb-3">
diff --git a/product_portfolio/views.py b/product_portfolio/views.py
index c2172444..7cef0cc5 100644
--- a/product_portfolio/views.py
+++ b/product_portfolio/views.py
@@ -699,8 +699,8 @@ def tab_activity(self, exclude_product_context=False):
 
     def tab_imports(self):
         scancodeprojects_count = self.object.scancodeprojects.count()
-        if not scancodeprojects_count:
-            return
+        # if not scancodeprojects_count:
+        #     return
 
         label = (
             f'Imports <span class="badge bg-primary-subtle text-primary-emphasis">'
@@ -1360,22 +1360,25 @@ def get_context_data(self, **kwargs):
         for submitted_project in submitted_projects:
             self.synchronize(scancodeio=scancodeio, project=submitted_project)
 
+        history_entries = (
+            History.objects.get_for_object(self.object)
+            .select_related("user")
+            .order_by("-action_time")
+        )
+
         context_data.update(
             {
+                "tab_view_url": self.object.get_url("tab_imports"),
+                # Imports
                 "scancode_projects": scancode_projects,
                 "has_projects_in_progress": bool(submitted_projects),
-                "tab_view_url": self.object.get_url("tab_imports"),
+                # Requests
+                "requests": self.object.get_requests(self.request.user),
+                # History
+                "history_entries": history_entries,
             }
         )
 
-        # History
-        history_entries = (
-            History.objects.get_for_object(self.object)
-            .select_related("user")
-            .order_by("-action_time")
-        )
-        context_data["history_entries"] = history_entries
-
         return context_data
 
     @staticmethod

From e50182d1907a71e62c23a258c139cc8816a16c77 Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 18:31:46 +0400
Subject: [PATCH 12/14] complete the merge into a single grouped Activity tab

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 product_portfolio/tests/test_views.py |  2 +-
 product_portfolio/urls.py             |  4 ++--
 product_portfolio/views.py            | 33 ++++++++-------------------
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/product_portfolio/tests/test_views.py b/product_portfolio/tests/test_views.py
index a59e43dd..f5d3d021 100644
--- a/product_portfolio/tests/test_views.py
+++ b/product_portfolio/tests/test_views.py
@@ -3313,7 +3313,7 @@ def test_product_portfolio_pull_project_data_from_scancodeio_view(self, mock_fin
             "uuid": project_uuid,
         }
         response = self.client.post(url, data=form_data, follow=True)
-        self.assertRedirects(response, f"{self.product1.get_absolute_url()}#imports")
+        self.assertRedirects(response, f"{self.product1.get_absolute_url()}#activity")
         project = ScanCodeProject.objects.get(project_uuid=project_uuid)
         self.assertEqual(self.product1, project.product)
         self.assertEqual(ScanCodeProject.ProjectType.PULL_FROM_SCANCODEIO, project.type)
diff --git a/product_portfolio/urls.py b/product_portfolio/urls.py
index 115403b8..5f19cd4c 100644
--- a/product_portfolio/urls.py
+++ b/product_portfolio/urls.py
@@ -26,10 +26,10 @@
 from product_portfolio.views import ProductListView
 from product_portfolio.views import ProductSecurityComplianceExportView
 from product_portfolio.views import ProductSendAboutFilesView
+from product_portfolio.views import ProductTabActivityView
 from product_portfolio.views import ProductTabCodebaseView
 from product_portfolio.views import ProductTabComplianceView
 from product_portfolio.views import ProductTabDependenciesView
-from product_portfolio.views import ProductTabImportsView
 from product_portfolio.views import ProductTabInventoryView
 from product_portfolio.views import ProductTabLicensesView
 from product_portfolio.views import ProductTabVulnerabilitiesView
@@ -138,7 +138,7 @@ def product_path(path_segment, view):
     *product_path("tab_dependencies", ProductTabDependenciesView.as_view()),
     *product_path("tab_licenses", ProductTabLicensesView.as_view()),
     *product_path("tab_vulnerabilities", ProductTabVulnerabilitiesView.as_view()),
-    *product_path("tab_imports", ProductTabImportsView.as_view()),
+    *product_path("tab_activity", ProductTabActivityView.as_view()),
     *product_path("tab_inventory", ProductTabInventoryView.as_view()),
     *product_path("tab_compliance", ProductTabComplianceView.as_view()),
     *product_path("pull_project_data", PullProjectDataFromScanCodeIOView.as_view()),
diff --git a/product_portfolio/views.py b/product_portfolio/views.py
index 7cef0cc5..751661b1 100644
--- a/product_portfolio/views.py
+++ b/product_portfolio/views.py
@@ -325,9 +325,7 @@ class ProductDetailsView(
                 "dependencies",
             ],
         },
-        "activity": {},
-        "imports": {},
-        "history": {
+        "activity": {
             "fields": [
                 "created_date",
                 "created_by",
@@ -694,33 +692,20 @@ def tab_codebase(self):
             "fields": [(None, tab_context, None, template)],
         }
 
-    def tab_activity(self, exclude_product_context=False):
-        return super().tab_activity(exclude_product_context=True)
-
-    def tab_imports(self):
-        scancodeprojects_count = self.object.scancodeprojects.count()
-        # if not scancodeprojects_count:
-        #     return
-
-        label = (
-            f'Imports <span class="badge bg-primary-subtle text-primary-emphasis">'
-            f"{scancodeprojects_count}"
-            f"</span>"
-        )
+    def tab_activity(self):
         template = "tabs/tab_async_loader.html"
 
         # Pass the current request query context to the async request
-        tab_view_url = self.object.get_url("tab_imports")
+        tab_view_url = self.object.get_url("tab_activity")
         if full_query_string := self.request.META["QUERY_STRING"]:
             tab_view_url += f"?{full_query_string}"
 
         tab_context = {
             "tab_view_url": tab_view_url,
-            "tab_object_name": "imports",
         }
 
         return {
-            "label": mark_safe(label),
+            "label": "Activity",
             "fields": [(None, tab_context, None, template)],
         }
 
@@ -1342,7 +1327,7 @@ def get_context_data(self, **kwargs):
         return context_data
 
 
-class ProductTabImportsView(
+class ProductTabActivityView(
     LoginRequiredMixin,
     BaseProductViewMixin,
     TabContentView,
@@ -1368,7 +1353,7 @@ def get_context_data(self, **kwargs):
 
         context_data.update(
             {
-                "tab_view_url": self.object.get_url("tab_imports"),
+                "tab_view_url": self.object.get_url("tab_activity"),
                 # Imports
                 "scancode_projects": scancode_projects,
                 "has_projects_in_progress": bool(submitted_projects),
@@ -2118,7 +2103,7 @@ def import_from_scan_view(request, dataspace, name, version=""):
                 messages.success(request, mark_safe(msg))
             if warnings:
                 messages.warning(request, mark_safe("<br>".join(warnings)))
-            return redirect(f"{product.get_absolute_url()}#imports")
+            return redirect(f"{product.get_absolute_url()}#activity")
     else:
         form = form_class(request.user)
 
@@ -2506,7 +2491,7 @@ def get_context_data(self, **kwargs):
         return context
 
     def get_success_url(self):
-        return f"{self.object.get_absolute_url()}#imports"
+        return f"{self.object.get_absolute_url()}#activity"
 
     def form_valid(self, form):
         self.object = self.get_object()
@@ -2653,7 +2638,7 @@ def improve_packages_from_purldb_view(request, dataspace, name, version=""):
             )
         )
         messages.success(request, "Improve Packages from PurlDB in progress...")
-    return redirect(f"{product.get_absolute_url()}#imports")
+    return redirect(f"{product.get_absolute_url()}#activity")
 
 
 @login_required

From 64eefa2ec73bd0d8785974340f154b48c75e141e Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 18:43:30 +0400
Subject: [PATCH 13/14] fix htmx wrapping and js issues

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 dje/templates/hierarchy_base.js.html          |  11 +-
 .../product_portfolio/tabs/tab_activity.html  | 210 ++++++++++++++++++
 .../product_portfolio/tabs/tab_imports.html   | 208 -----------------
 product_portfolio/views.py                    |   2 +-
 4 files changed, 218 insertions(+), 213 deletions(-)
 create mode 100644 product_portfolio/templates/product_portfolio/tabs/tab_activity.html
 delete mode 100644 product_portfolio/templates/product_portfolio/tabs/tab_imports.html

diff --git a/dje/templates/hierarchy_base.js.html b/dje/templates/hierarchy_base.js.html
index c74e979f..8f80be9b 100644
--- a/dje/templates/hierarchy_base.js.html
+++ b/dje/templates/hierarchy_base.js.html
@@ -43,10 +43,13 @@
     // Draw if the hierarchy tab is active
     if (isTabActive(tabId)) jsPlumbHierarchy.setSuspendDrawing(false, true);
 
-    document.querySelector('button[data-bs-target="#tab_hierarchy"]').addEventListener('shown.bs.tab', function (e) {
-      // Second argument instructs jsPlumb to perform a full repaint.
-      jsPlumbHierarchy.setSuspendDrawing(false, true);
-    });
+    const hierarchyTab = document.querySelector('button[data-bs-target="#tab_hierarchy"]');
+    if (hierarchyTab) {
+      hierarchyTab.addEventListener('shown.bs.tab', function (e) {
+        // Second argument instructs jsPlumb to perform a full repaint.
+        jsPlumbHierarchy.setSuspendDrawing(false, true);
+      });
+    }
 
     // Repaint on resizing the browser window if the related tab is active
     window.addEventListener('resize', function(){
diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_activity.html b/product_portfolio/templates/product_portfolio/tabs/tab_activity.html
new file mode 100644
index 00000000..495524bb
--- /dev/null
+++ b/product_portfolio/templates/product_portfolio/tabs/tab_activity.html
@@ -0,0 +1,210 @@
+{% load humanize i18n %}
+{% load naturaltime_short from dje_tags %}
+{% load as_icon from dje_tags %}
+
+<div{% if has_projects_in_progress %} hx-get="{{ tab_view_url }}" hx-trigger="load delay:10s" hx-swap="outerHTML"{% endif %}>
+
+  {% block imports %}
+  {% if has_projects_in_progress %}
+    <div class="alert alert-primary" role="alert">
+      <i class="fas fa-spinner fa-spin"></i>
+      Imports are currently in progress. This view will automatically refresh upon
+      completion of the import process.
+    </div>
+  {% endif %}
+
+  <div class="border rounded-3 p-3 mb-4">
+    <div class="d-flex justify-content-between align-items-center mb-3">
+      <h3 class="fs-5 fw-medium mb-0">
+        Imports
+        {% if scancode_projects %}<span class="text-body-tertiary fw-normal ms-1">{{ scancode_projects|length }}</span>{% endif %}
+      </h3>
+      {% if has_projects_in_progress %}
+        <span class="badge bg-primary-subtle text-primary-emphasis">
+          <i class="fas fa-spinner fa-spin me-1"></i>In progress
+        </span>
+      {% endif %}
+    </div>
+
+    {% if scancode_projects %}
+      <div class="table-responsive">
+        <table class="table table-sm mb-0 align-middle">
+          <thead>
+            <tr>
+              <th class="fw-medium">Type</th>
+              <th class="fw-medium" style="width: 200px;">Status</th>
+              <th class="fw-medium">Input</th>
+              <th class="fw-medium">Log</th>
+            </tr>
+          </thead>
+          <tbody>
+            {% for scancode_project in scancode_projects %}
+              <tr data-uuid="{{ scancode_project.uuid }}">
+                <td>
+                  <div>{{ scancode_project.get_type_display }}</div>
+                  {% if scancode_project.update_existing_packages %}
+                    <div class="text-body-tertiary fs-xs">+ Update existing packages</div>
+                  {% endif %}
+                  <div class="text-body-tertiary fs-xs">
+                    <span title="{{ scancode_project.created_date }}">{{ scancode_project.created_date|naturaltime_short }}</span>
+                    by {{ scancode_project.created_by }}
+                  </div>
+                </td>
+                <td class="pe-4">
+                  {% if scancode_project.project_uuid %}
+                    <a href="#" role="button" class="ms-1 float-end" data-bs-toggle="modal" data-bs-target="#scancode-project-status-modal" data-fetch-status-url="{% url 'product_portfolio:scancodeio_project_status' scancode_project.uuid %}">
+                      <i class="fas fa-info-circle"></i>
+                    </a>
+                  {% endif %}
+                  <div>
+                    <span class="smaller">
+                      {{ scancode_project.get_status_display|title }}
+                      {% if scancode_project.has_errors %}
+                        <span> with errors</span>
+                      {% endif %}
+                    </span>
+                  </div>
+                  {% include 'component_catalog/includes/scan_status.html' with status=scancode_project.status has_errors=scancode_project.has_errors only %}
+                </td>
+                <td class="small">
+                  {% if scancode_project.input_file %}
+                    File: <a href="{% url 'product_portfolio:scancodeio_project_download_input' scancode_project.uuid %}" target="_blank">{{ scancode_project.input_file_filename }}</a>
+                  {% elif scancode_project.project_uuid %}
+                    Project: {{ scancode_project.project_uuid }}
+                  {% endif %}
+                </td>
+                <td class="small text-body-secondary">
+                  {{ scancode_project.import_log|join:"<br>" }}
+                </td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+    {% else %}
+      <div class="text-body-tertiary small">
+        No imports yet
+      </div>
+    {% endif %}
+  </div>
+  {% endblock imports %}
+
+  {% block requests %}
+  <div class="border rounded-3 p-3 mb-4">
+    <div class="d-flex justify-content-between align-items-center mb-3">
+      <h3 class="fs-5 fw-medium mb-0">
+        Requests
+        {% if requests %}<span class="text-body-tertiary fw-normal ms-1">{{ requests|length }}</span>{% endif %}
+      </h3>
+    </div>
+
+    {% if requests %}
+      <div class="list-group list-group-flush">
+        {% for req in requests %}
+          <div class="list-group-item px-0 py-2">
+            {% if not req.is_private or req.requester == user or user.is_staff %}
+              <div class="d-flex justify-content-between align-items-start gap-3">
+                <div class="flex-grow-1">
+                  <div>
+                    <a href="{{ req.get_absolute_url }}" class="fs-6 fw-semibold text-decoration-none">
+                      #{{ req.id }} {{ req.title }}
+                    </a>
+                  </div>
+                  <div class="text-body-secondary">{{ req.request_template.name }}</div>
+                  <div class="text-body-tertiary fs-xs mt-1">
+                    {% if req.is_private %}<i class="fas fa-lock me-1"></i>{% endif %}
+                    Created <span title="{{ req.created_date }}">{{ req.created_date|naturaltime }}</span> by {{ req.requester.username }}
+                    {% if req.last_modified_by %}
+                      &middot; Edited <span title="{{ req.last_modified_date }}">{{ req.last_modified_date|naturaltime }}</span> by {{ req.last_modified_by.username }}
+                    {% endif %}
+                  </div>
+                </div>
+                <div class="text-end small flex-shrink-0">
+                  <a href="{{ req.get_absolute_url }}#attachments" class="text-decoration-none" title="{% if req.attachments_count %}View{% else %}Add{% endif %} attachments">
+                    {% if req.attachments_count %}
+                      <i class="fas fa-file"></i> {{ req.attachments_count }}
+                    {% else %}
+                      + <i class="far fa-file"></i>
+                    {% endif %}
+                  </a>
+                  <a href="{{ req.get_absolute_url }}#comments" class="ms-2 text-decoration-none" title="{% if req.comments_count %}View{% else %}Add{% endif %} comments">
+                    {% if req.comments_count %}
+                      <i class="fas fa-comments"></i> {{ req.comments_count }}
+                    {% else %}
+                      + <i class="far fa-comments"></i>
+                    {% endif %}
+                  </a>
+                  {% if req.priority %}
+                    <div class="mb-1">
+                      <span class="badge" {% if req.priority.color_code %}style="background-color: {{ req.priority.color_code }}; color: white;"{% endif %}>{{ req.priority }}</span>
+                    </div>
+                  {% endif %}
+                  <div class="fw-medium">
+                    {% include 'workflow/includes/request_status_icon.html' %}
+                    {{ req.get_status_display }}
+                  </div>
+                  {% if req.assignee %}
+                    <div class="text-body-tertiary fs-xs">Assigned to {{ req.assignee.username }}</div>
+                  {% endif %}
+                </div>
+              </div>
+            {% else %}
+              <div class="text-body-secondary">
+                <strong>#{{ req.id }}</strong> <i class="fas fa-lock"></i>
+                <span class="ms-2 small">{{ req.request_template.name }}</span>
+              </div>
+            {% endif %}
+          </div>
+        {% endfor %}
+      </div>
+    {% else %}
+      <div class="text-body-tertiary small">
+        No requests yet
+      </div>
+    {% endif %}
+  </div>
+  {% endblock requests %}
+
+  {% block history %}
+  <div class="border rounded-3 p-3 mb-4">
+    <div class="d-flex justify-content-between align-items-center mb-3">
+      <h3 class="fs-5 fw-medium mb-0">History</h3>
+    </div>
+
+    <dl class="row mb-3 small">
+      <dt class="col-sm-3 col-md-2 text-body-secondary fw-normal">Created</dt>
+      <dd class="col-sm-9 col-md-10 mb-2">
+        <span title="{{ object.created_date }}">{{ object.created_date|naturaltime }}</span>
+        {% if object.created_by %} by <strong>{{ object.created_by }}</strong>{% endif %}
+      </dd>
+
+      <dt class="col-sm-3 col-md-2 text-body-secondary fw-normal">Last modified</dt>
+      <dd class="col-sm-9 col-md-10 mb-0">
+        <span title="{{ object.last_modified_date }}">{{ object.last_modified_date|naturaltime }}</span>
+        {% if object.last_modified_by %} by <strong>{{ object.last_modified_by }}</strong>{% endif %}
+      </dd>
+    </dl>
+
+    {% if history_entries %}
+      <div class="small text-body-secondary fw-medium mb-2">Changes</div>
+      <ul class="timeline pt-1 mb-0">
+        {% for history_entry in history_entries %}
+          {% with change_message=history_entry.get_change_message %}
+            <li class="timeline-item {% if 'Added' in change_message %}timeline-item-addition{% elif 'Deleted' in change_message %}timeline-item-deletion{% endif %} mb-3">
+              {{ change_message }}
+              <small class="text-body-tertiary d-block" title="{{ history_entry.action_time }}">
+                {{ history_entry.action_time|naturaltime }} by <strong>{{ history_entry.user }}</strong>
+              </small>
+            </li>
+          {% endwith %}
+        {% endfor %}
+      </ul>
+    {% else %}
+      <div class="text-body-tertiary small">
+        No changes yet
+      </div>
+    {% endif %}
+  </div>
+  {% endblock history %}
+
+</div>
\ No newline at end of file
diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_imports.html b/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
deleted file mode 100644
index e2f5f8a8..00000000
--- a/product_portfolio/templates/product_portfolio/tabs/tab_imports.html
+++ /dev/null
@@ -1,208 +0,0 @@
-{% load humanize i18n %}
-{% load naturaltime_short from dje_tags %}
-{% load as_icon from dje_tags %}
-
-{% block imports %}
-<div {% if has_projects_in_progress %} hx-get="{{ tab_view_url }}" hx-trigger="load delay:10s" hx-swap="outerHTML"{% endif %}>
-  {% if has_projects_in_progress %}
-    <div class="alert alert-primary" role="alert">
-      <i class="fas fa-spinner fa-spin"></i>
-      Imports are currently in progress. This view will automatically refresh upon
-      completion of the import process.
-    </div>
-  {% endif %}
-
-  <div class="border rounded-3 p-3 mb-4">
-    <div class="d-flex justify-content-between align-items-center mb-3">
-      <h3 class="fs-5 fw-medium mb-0">
-        Imports
-        {% if scancode_projects %}<span class="text-body-tertiary fw-normal ms-1">{{ scancode_projects|length }}</span>{% endif %}
-      </h3>
-      {% if has_projects_in_progress %}
-        <span class="badge bg-primary-subtle text-primary-emphasis">
-          <i class="fas fa-spinner fa-spin me-1"></i>In progress
-        </span>
-      {% endif %}
-    </div>
-
-    {% if scancode_projects %}
-      <div class="table-responsive">
-        <table class="table table-sm mb-0 align-middle">
-          <thead>
-            <tr>
-              <th class="fw-medium">Type</th>
-              <th class="fw-medium" style="width: 200px;">Status</th>
-              <th class="fw-medium">Input</th>
-              <th class="fw-medium">Log</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% for scancode_project in scancode_projects %}
-              <tr data-uuid="{{ scancode_project.uuid }}">
-                <td>
-                  <div>{{ scancode_project.get_type_display }}</div>
-                  {% if scancode_project.update_existing_packages %}
-                    <div class="text-body-tertiary fs-xs">+ Update existing packages</div>
-                  {% endif %}
-                  <div class="text-body-tertiary fs-xs">
-                    <span title="{{ scancode_project.created_date }}">{{ scancode_project.created_date|naturaltime_short }}</span>
-                    by {{ scancode_project.created_by }}
-                  </div>
-                </td>
-                <td class="pe-4">
-                  {% if scancode_project.project_uuid %}
-                    <a href="#" role="button" class="ms-1 float-end" data-bs-toggle="modal" data-bs-target="#scancode-project-status-modal" data-fetch-status-url="{% url 'product_portfolio:scancodeio_project_status' scancode_project.uuid %}">
-                      <i class="fas fa-info-circle"></i>
-                    </a>
-                  {% endif %}
-                  <div>
-                    <span class="smaller">
-                      {{ scancode_project.get_status_display|title }}
-                      {% if scancode_project.has_errors %}
-                        <span> with errors</span>
-                      {% endif %}
-                    </span>
-                  </div>
-                  {% include 'component_catalog/includes/scan_status.html' with status=scancode_project.status has_errors=scancode_project.has_errors only %}
-                </td>
-                <td class="small">
-                  {% if scancode_project.input_file %}
-                    File: <a href="{% url 'product_portfolio:scancodeio_project_download_input' scancode_project.uuid %}" target="_blank">{{ scancode_project.input_file_filename }}</a>
-                  {% elif scancode_project.project_uuid %}
-                    Project: {{ scancode_project.project_uuid }}
-                  {% endif %}
-                </td>
-                <td class="small text-body-secondary">
-                  {{ scancode_project.import_log|join:"<br>" }}
-                </td>
-              </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-      </div>
-    {% else %}
-      <div class="text-body-tertiary small">
-        No imports yet
-      </div>
-    {% endif %}
-  </div>
-</div>
-{% endblock imports %}
-
-{% block requests %}
-<div class="border rounded-3 p-3 mb-4">
-  <div class="d-flex justify-content-between align-items-center mb-3">
-    <h3 class="fs-5 fw-medium mb-0">
-      Requests
-      {% if requests %}<span class="text-body-tertiary fw-normal ms-1">{{ requests|length }}</span>{% endif %}
-    </h3>
-  </div>
-
-  {% if requests %}
-    <div class="list-group list-group-flush">
-      {% for req in requests %}
-        <div class="list-group-item px-0 py-2">
-          {% if not req.is_private or req.requester == user or user.is_staff %}
-            <div class="d-flex justify-content-between align-items-start gap-3">
-              <div class="flex-grow-1">
-                <div>
-                  <a href="{{ req.get_absolute_url }}" class="fs-6 fw-semibold text-decoration-none">
-                    #{{ req.id }} {{ req.title }}
-                  </a>
-                </div>
-                <div class="text-body-secondary">{{ req.request_template.name }}</div>
-                <div class="text-body-tertiary fs-xs mt-1">
-                  {% if req.is_private %}<i class="fas fa-lock me-1"></i>{% endif %}
-                  Created <span title="{{ req.created_date }}">{{ req.created_date|naturaltime }}</span> by {{ req.requester.username }}
-                  {% if req.last_modified_by %}
-                    &middot; Edited <span title="{{ req.last_modified_date }}">{{ req.last_modified_date|naturaltime }}</span> by {{ req.last_modified_by.username }}
-                  {% endif %}
-                </div>
-              </div>
-              <div class="text-end small flex-shrink-0">
-                <a href="{{ req.get_absolute_url }}#attachments" class="text-decoration-none" title="{% if req.attachments_count %}View{% else %}Add{% endif %} attachments">
-                  {% if req.attachments_count %}
-                    <i class="fas fa-file"></i> {{ req.attachments_count }}
-                  {% else %}
-                    + <i class="far fa-file"></i>
-                  {% endif %}
-                </a>
-                <a href="{{ req.get_absolute_url }}#comments" class="ms-2 text-decoration-none" title="{% if req.comments_count %}View{% else %}Add{% endif %} comments">
-                  {% if req.comments_count %}
-                    <i class="fas fa-comments"></i> {{ req.comments_count }}
-                  {% else %}
-                    + <i class="far fa-comments"></i>
-                  {% endif %}
-                </a>
-                {% if req.priority %}
-                  <div class="mb-1">
-                    <span class="badge" {% if req.priority.color_code %}style="background-color: {{ req.priority.color_code }}; color: white;"{% endif %}>{{ req.priority }}</span>
-                  </div>
-                {% endif %}
-                <div class="fw-medium">
-                  {% include 'workflow/includes/request_status_icon.html' %}
-                  {{ req.get_status_display }}
-                </div>
-                {% if req.assignee %}
-                  <div class="text-body-tertiary fs-xs">Assigned to {{ req.assignee.username }}</div>
-                {% endif %}
-              </div>
-            </div>
-          {% else %}
-            <div class="text-body-secondary">
-              <strong>#{{ req.id }}</strong> <i class="fas fa-lock"></i>
-              <span class="ms-2 small">{{ req.request_template.name }}</span>
-            </div>
-          {% endif %}
-        </div>
-      {% endfor %}
-    </div>
-  {% else %}
-    <div class="text-body-tertiary small">
-      No requests yet
-    </div>
-  {% endif %}
-</div>
-{% endblock requests %}
-
-{% block history %}
-<div class="border rounded-3 p-3 mb-4">
-  <div class="d-flex justify-content-between align-items-center mb-3">
-    <h3 class="fs-5 fw-medium mb-0">History</h3>
-  </div>
-
-  <dl class="row mb-3 small">
-    <dt class="col-sm-3 col-md-2 text-body-secondary fw-normal">Created</dt>
-    <dd class="col-sm-9 col-md-10 mb-2">
-      <span title="{{ object.created_date }}">{{ object.created_date|naturaltime }}</span>
-      {% if object.created_by %} by <strong>{{ object.created_by }}</strong>{% endif %}
-    </dd>
-
-    <dt class="col-sm-3 col-md-2 text-body-secondary fw-normal">Last modified</dt>
-    <dd class="col-sm-9 col-md-10 mb-0">
-      <span title="{{ object.last_modified_date }}">{{ object.last_modified_date|naturaltime }}</span>
-      {% if object.last_modified_by %} by <strong>{{ object.last_modified_by }}</strong>{% endif %}
-    </dd>
-  </dl>
-
-  {% if history_entries %}
-    <div class="small text-body-secondary fw-medium mb-2">Changes</div>
-    <ul class="timeline pt-1 mb-0">
-      {% for history_entry in history_entries %}
-        {% with change_message=history_entry.get_change_message %}
-          <li class="timeline-item {% if 'Added' in change_message %}timeline-item-addition{% elif 'Deleted' in change_message %}timeline-item-deletion{% endif %} mb-3">
-            {{ change_message }}
-            <small class="text-body-tertiary d-block" title="{{ history_entry.action_time }}">
-              {{ history_entry.action_time|naturaltime }} by <strong>{{ history_entry.user }}</strong>
-            </small>
-          </li>
-        {% endwith %}
-      {% endfor %}
-    </ul>
-  {% else %}
-    <div class="text-body-tertiary small">
-      No changes yet
-    </div>
-  {% endif %}
-</div>
-{% endblock history %}
\ No newline at end of file
diff --git a/product_portfolio/views.py b/product_portfolio/views.py
index 751661b1..242a2631 100644
--- a/product_portfolio/views.py
+++ b/product_portfolio/views.py
@@ -1332,7 +1332,7 @@ class ProductTabActivityView(
     BaseProductViewMixin,
     TabContentView,
 ):
-    template_name = "product_portfolio/tabs/tab_imports.html"
+    template_name = "product_portfolio/tabs/tab_activity.html"
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)

From 5f5f67b2fa106be4127feff383762903cd1792d3 Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@aboutcode.org>
Date: Wed, 27 May 2026 18:49:25 +0400
Subject: [PATCH 14/14] fix the modal js error

Signed-off-by: tdruez <tdruez@aboutcode.org>
---
 .../templates/product_portfolio/product_details.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/product_portfolio/templates/product_portfolio/product_details.html b/product_portfolio/templates/product_portfolio/product_details.html
index d8b345ba..7af09625 100644
--- a/product_portfolio/templates/product_portfolio/product_details.html
+++ b/product_portfolio/templates/product_portfolio/product_details.html
@@ -142,7 +142,7 @@
   {% if has_edit_productpackage or has_edit_productcomponent %}
     {% include 'product_portfolio/modals/edit_productpackage_modal.html' %}
   {% endif %}
-  {% if tabsets.Imports %}
+  {% if tabsets.Activity %}
     {% include 'product_portfolio/modals/scancode_project_status_modal.html' %}
   {% endif %}
   {% if request.user.dataspace.enable_vulnerablecodedb_access and product.vulnerability_count %}