Skip to content

Commit 9c54a9b

Browse files
committed
Update dependency list view #447
* Use updated table header include * Update dependency presentation in package detail view Signed-off-by: Jono Yang <jyang@nexb.com>
1 parent ccd046a commit 9c54a9b

3 files changed

Lines changed: 28 additions & 26 deletions

File tree

scanpipe/templates/scanpipe/dependency_list.html

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,22 @@
11
{% extends "scanpipe/base.html" %}
22

33
{% block content %}
4-
<div id="content-header" class="container is-max-desktop mb-3">
5-
{% include 'scanpipe/includes/navbar_header.html' %}
6-
<section class="mx-5">
7-
<div class="is-flex is-justify-content-space-between">
8-
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True %}
9-
{% include 'scanpipe/includes/search_field.html' with extra_class="is-small" %}
10-
</div>
11-
{% include 'scanpipe/includes/pagination_header.html' with verbose_name="Packages" %}
12-
{% include 'scanpipe/includes/filters_breadcrumb.html' with filterset=filter only %}
13-
</section>
14-
</div>
4+
<div id="content-header" class="container is-max-desktop mb-3">
5+
{% include 'scanpipe/includes/navbar_header.html' %}
6+
<section class="mx-5">
7+
<div class="is-flex is-justify-content-space-between">
8+
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Dependencies" %}
9+
{% include 'scanpipe/includes/search_field.html' with extra_class="is-small" %}
10+
</div>
11+
{% include 'scanpipe/includes/pagination_header.html' %}
12+
{% include 'scanpipe/includes/filters_breadcrumb.html' with filterset=filter only %}
13+
</section>
14+
</div>
1515

1616
<div class="container is-fluid mb-3">
1717
<div class="table-container">
1818
<table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
19-
<thead>
20-
<tr>
21-
<th>Package URL</th>
22-
<th>Dependency type</th>
23-
<th>Extracted requirement</th>
24-
<th>Dependency scope</th>
25-
<th>Is runtime</th>
26-
<th>Is optional</th>
27-
<th>Is resolved</th>
28-
<th>For package</th>
29-
<th>Datafile resource</th>
30-
<th>Datasource ID</th>
31-
</tr>
32-
</thead>
19+
{% include 'scanpipe/includes/list_view_thead.html' %}
3320
<tbody>
3421
{% for dependency in object_list %}
3522
<tr class="break-word">

scanpipe/templates/scanpipe/tabset/tab_dependencies.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ul>
44
{% for dependency in tab_data.fields.dependencies.value.all %}
55
<li>
6-
<a href="{{ dependency.get_absolute_url }}">{{ dependency }}</a>
6+
<a href="{{ dependency.get_absolute_url }}" title="{{ dependency.dependency_uid }}">{{ dependency.package_url }}</a>
77
</li>
88
{% endfor %}
99
</ul>

scanpipe/views.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -891,14 +891,29 @@ class DiscoveredPackageListView(
891891

892892
class DiscoveredDependencyListView(
893893
ConditionalLoginRequired,
894+
PrefetchRelatedViewMixin,
894895
ProjectRelatedViewMixin,
896+
TableColumnsMixin,
897+
ExportXLSXMixin,
895898
PaginatedFilterView,
896899
):
897900
model = DiscoveredDependency
898901
filterset_class = DependencyFilterSet
899902
template_name = "scanpipe/dependency_list.html"
900903
paginate_by = 100
901904
prefetch_related = ["for_package", "datafile_resource"]
905+
table_columns = [
906+
"package_url",
907+
"package_type",
908+
"extracted_requirement",
909+
"scope",
910+
"is_runtime",
911+
"is_optional",
912+
"is_resolved",
913+
"for_package",
914+
"datafile_resource",
915+
"datasource_id",
916+
]
902917

903918

904919
class ProjectErrorListView(

0 commit comments

Comments
 (0)