Skip to content

Commit

Permalink
Update dependency list view #447
Browse files Browse the repository at this point in the history
    * Use updated table header include
    * Update dependency presentation in package detail view
    * Show package uid on hover on for package tab

Signed-off-by: Jono Yang <jyang@nexb.com>
  • Loading branch information
JonoYang committed Aug 26, 2022
1 parent ccd046a commit b63981c
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 27 deletions.
37 changes: 12 additions & 25 deletions scanpipe/templates/scanpipe/dependency_list.html
Original file line number Diff line number Diff line change
@@ -1,35 +1,22 @@
{% extends "scanpipe/base.html" %}

{% block content %}
<div id="content-header" class="container is-max-desktop mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<div class="is-flex is-justify-content-space-between">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True %}
{% include 'scanpipe/includes/search_field.html' with extra_class="is-small" %}
</div>
{% include 'scanpipe/includes/pagination_header.html' with verbose_name="Packages" %}
{% include 'scanpipe/includes/filters_breadcrumb.html' with filterset=filter only %}
</section>
</div>
<div id="content-header" class="container is-max-desktop mb-3">
{% include 'scanpipe/includes/navbar_header.html' %}
<section class="mx-5">
<div class="is-flex is-justify-content-space-between">
{% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Dependencies" %}
{% include 'scanpipe/includes/search_field.html' with extra_class="is-small" %}
</div>
{% include 'scanpipe/includes/pagination_header.html' %}
{% include 'scanpipe/includes/filters_breadcrumb.html' with filterset=filter only %}
</section>
</div>

<div class="container is-fluid mb-3">
<div class="table-container">
<table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
<thead>
<tr>
<th>Package URL</th>
<th>Dependency type</th>
<th>Extracted requirement</th>
<th>Dependency scope</th>
<th>Is runtime</th>
<th>Is optional</th>
<th>Is resolved</th>
<th>For package</th>
<th>Datafile resource</th>
<th>Datasource ID</th>
</tr>
</thead>
{% include 'scanpipe/includes/list_view_thead.html' %}
<tbody>
{% for dependency in object_list %}
<tr class="break-word">
Expand Down
2 changes: 1 addition & 1 deletion scanpipe/templates/scanpipe/tabset/tab_dependencies.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ul>
{% for dependency in tab_data.fields.dependencies.value.all %}
<li>
<a href="{{ dependency.get_absolute_url }}">{{ dependency }}</a>
<a href="{{ dependency.get_absolute_url }}" title="{{ dependency.dependency_uid }}">{{ dependency.package_url }}</a>
</li>
{% endfor %}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion scanpipe/templates/scanpipe/tabset/tab_for_package.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<strong>{{ tab_data.fields.for_package.label }}</strong>
<ul>
<li>
<a href="{{ tab_data.fields.for_package.value.get_absolute_url }}">{{ tab_data.fields.for_package.value }}</a>
<a href="{{ tab_data.fields.for_package.value.get_absolute_url }}" title="{{ tab_data.fields.for_package.value.package_uid }}">{{ tab_data.fields.for_package.value }}</a>
</li>
</ul>
</div>
15 changes: 15 additions & 0 deletions scanpipe/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -891,14 +891,29 @@ class DiscoveredPackageListView(

class DiscoveredDependencyListView(
ConditionalLoginRequired,
PrefetchRelatedViewMixin,
ProjectRelatedViewMixin,
TableColumnsMixin,
ExportXLSXMixin,
PaginatedFilterView,
):
model = DiscoveredDependency
filterset_class = DependencyFilterSet
template_name = "scanpipe/dependency_list.html"
paginate_by = 100
prefetch_related = ["for_package", "datafile_resource"]
table_columns = [
"package_url",
"package_type",
"extracted_requirement",
"scope",
"is_runtime",
"is_optional",
"is_resolved",
"for_package",
"datafile_resource",
"datasource_id",
]


class ProjectErrorListView(
Expand Down

0 comments on commit b63981c

Please sign in to comment.