Add filter by package relationships availability #138

Signed-off-by: tdruez <[email protected]>
aboutcode-org · Jul 18, 2024 · 67cb308 · 67cb308
1 parent ce7faf7
commit 67cb308
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/product_portfolio/filters.py b/product_portfolio/filters.py
@@ -321,6 +321,7 @@ class DependencyFilterSet(DataspacedFilterSet):
     q = SearchFilter(
         label=_("Search"),
         search_fields=[
+            "dependency_uid",
             "for_package__filename",
             "for_package__type",
             "for_package__namespace",
@@ -333,6 +334,14 @@ class DependencyFilterSet(DataspacedFilterSet):
             "resolved_to_package__version",
         ],
     )
+    sort = DefaultOrderingFilter(
+        label=_("Sort"),
+        fields=[
+            "dependency_uid",
+            "for_package",
+            "resolved_to_package",
+        ],
+    )
     for_package = HasRelationFilter(
         widget=DropDownWidget(anchor="#dependencies"),
     )

diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_dependencies.html b/product_portfolio/templates/product_portfolio/tabs/tab_dependencies.html
@@ -40,13 +40,17 @@
         <span class="help_text" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ help_texts.for_package }}">
           {% trans 'For package' %}
         </span>
-        {{ filter_dependency.form.for_package }}
+        <div class="float-end">
+          {{ filter_dependency.form.for_package }}
+        </div>
       </th>
       <th>
         <span class="help_text" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ help_texts.resolved_to_package }}">
           {% trans 'Resolved to package' %}
         </span>
-        {{ filter_dependency.form.resolved_to_package }}
+        <div class="float-end">
+          {{ filter_dependency.form.resolved_to_package }}
+        </div>
       </th>
       <th>
         <span class="help_text" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ help_texts.scope }}">
@@ -62,25 +66,33 @@
         <span class="help_text" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ help_texts.is_runtime }}">
           {% trans 'Runtime' %}
         </span>
-        {{ filter_dependency.form.is_runtime }}
+        <div class="float-end">
+          {{ filter_dependency.form.is_runtime }}
+        </div>
       </th>
       <th style="min-width: 100px">
         <span class="help_text" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ help_texts.is_optional }}">
           {% trans 'Optional' %}
         </span>
-        {{ filter_dependency.form.is_optional }}
+        <div class="float-end">
+          {{ filter_dependency.form.is_optional }}
+        </div>
       </th>
       <th style="min-width: 105px">
         <span class="help_text" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ help_texts.is_resolved }}">
           {% trans 'Resolved' %}
         </span>
-        {{ filter_dependency.form.is_resolved }}
+        <div class="float-end">
+          {{ filter_dependency.form.is_resolved }}
+        </div>
       </th>
       <th style="min-width: 82px">
         <span class="help_text" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ help_texts.is_direct }}">
           {% trans 'Direct' %}
         </span>
-        {{ filter_dependency.form.is_direct }}
+        <div class="float-end">
+          {{ filter_dependency.form.is_direct }}
+        </div>
       </th>
     </tr>
   </thead>