Skip to content

Commit 2d76575

Browse files
authored
Show the individual PURL fields in the Package details view #83 (#85)
Signed-off-by: tdruez <tdruez@nexb.com>
1 parent 4111b21 commit 2d76575

5 files changed

Lines changed: 66 additions & 1 deletion

File tree

CHANGELOG.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ Release notes
4848
- Add a DEJACODE_SUPPORT_EMAIL setting for support email address customization.
4949
https://github.com/nexB/dejacode/issues/76
5050

51+
- Show the individual PURL fields in the Package details view.
52+
https://github.com/nexB/dejacode/issues/83
53+
5154
### Version 5.0.1
5255

5356
- Improve the stability of the "Check for new Package versions" feature.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<dt class="col-sm-2 text-end pt-2 pe-0">
2+
&nbsp;
3+
</dt>
4+
<dd class="col-sm-10">
5+
<div class="container px-0">
6+
<div class="row align-items-start">
7+
<div class="col">
8+
<span class="help_text" data-bs-placement="right" data-bs-toggle="tooltip" data-bs-title="{{ values.help_texts.type }}">
9+
Type
10+
</span>
11+
<pre class="pre-bg-body-tertiary mt-1 mb-2">{{ values.package.type|default:"&nbsp;" }}</pre>
12+
</div>
13+
<div class="col">
14+
<span class="help_text" data-bs-placement="right" data-bs-toggle="tooltip" data-bs-title="{{ values.help_texts.namespace }}">
15+
Namespace
16+
</span>
17+
<pre class="pre-bg-body-tertiary mt-1 mb-2">{{ values.package.namespace|default:"&nbsp;" }}</pre>
18+
</div>
19+
<div class="col">
20+
<span class="help_text" data-bs-placement="right" data-bs-toggle="tooltip" data-bs-title="{{ values.help_texts.name }}">
21+
Name
22+
</span>
23+
<pre class="pre-bg-body-tertiary mt-1 mb-2">{{ values.package.name|default:"&nbsp;" }}</pre>
24+
</div>
25+
<div class="col">
26+
<span class="help_text" data-bs-placement="right" data-bs-toggle="tooltip" data-bs-title="{{ values.help_texts.version }}">
27+
Version
28+
</span>
29+
<pre class="pre-bg-body-tertiary mt-1 mb-2">{{ values.package.version|default:"&nbsp;" }}</pre>
30+
</div>
31+
</div>
32+
{% if package.qualifiers or package.subpath %}
33+
<div class="row align-items-start">
34+
<div class="col">
35+
<span class="help_text" data-bs-placement="right" data-bs-toggle="tooltip" data-bs-title="{{ values.help_texts.qualifiers }}">
36+
Qualifiers
37+
</span>
38+
<pre class="pre-bg-body-tertiary mt-1 mb-2">{{ values.package.qualifiers|default:"&nbsp;" }}</pre>
39+
</div>
40+
<div class="col">
41+
<span class="help_text" data-bs-placement="right" data-bs-toggle="tooltip" data-bs-title="{{ values.help_texts.subpath }}">
42+
Subpath
43+
</span>
44+
<pre class="pre-bg-body-tertiary mt-1 mb-2">{{ values.package.subpath|default:"&nbsp;" }}</pre>
45+
</div>
46+
</div>
47+
{% endif %}
48+
</div>
49+
</dd>

dje/templates/tabs/tab_content.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% if template_name %}
33
{% include template_name %}
44
{% else %}
5-
{% include 'tabs/tab_default.html' %}
5+
{% include 'tabs/field_default.html' %}
66
{% endif %}
77
{% endfor %}
88
{% if tab_context.extra %}

dje/views.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,8 @@ def tab_history(self):
10041004
}
10051005

10061006
def get_package_fields(self, package, essential_tab=False):
1007+
from component_catalog.models import PACKAGE_URL_FIELDS
1008+
10071009
# Always displayed in the Package "Essentials" tab context but only
10081010
# displayed if a value is available in the Component "Packages" tab.
10091011
essential_else_bool = None if essential_tab else bool
@@ -1024,9 +1026,20 @@ def show_usage_policy(value):
10241026
(_("Identifier"), package.get_absolute_link(), package.identifier_help(), None)
10251027
)
10261028

1029+
package_url_fields_context = {
1030+
"package": package,
1031+
"help_texts": {field: ght(package._meta, field) for field in PACKAGE_URL_FIELDS},
1032+
}
1033+
10271034
tab_fields.extend(
10281035
[
10291036
(_("Package URL"), package.package_url, package.package_url_help(), None),
1037+
(
1038+
"",
1039+
package_url_fields_context,
1040+
None,
1041+
"component_catalog/tabs/field_package_url_fields.html",
1042+
),
10301043
TabField("filename", package, condition=essential_else_bool),
10311044
TabField(
10321045
"usage_policy",

0 commit comments

Comments
 (0)