Improve default ordering of packages in tab_inventory #3

Signed-off-by: tdruez <[email protected]>
nexB · Dec 14, 2023 · b852e09 · b852e09
1 parent 05a3a25
commit b852e09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -126,6 +126,7 @@ postgresdb:
 	@dropdb ${DB_NAME} || true
 	@echo "-> Create ${DB_NAME} database"
 	@createdb --owner=${DB_USERNAME} ${POSTGRES_INITDB_ARGS} ${DB_NAME}
+	@gunzip < ${DB_INIT_FILE} | psql --username=${DB_USERNAME} ${DB_NAME}
 
 run:
 	${MANAGE} runserver 8000

diff --git a/product_portfolio/views.py b/product_portfolio/views.py
@@ -421,9 +421,10 @@ def tab_inventory(self):
         productcomponent_qs = self.filter_productcomponent.qs.order_by(
             "feature", "component", "name", "version"
         ).group_by("feature")
-        productpackage_qs = self.filter_productpackage.qs.order_by("feature", "package").group_by(
-            "feature"
-        )
+
+        productpackage_qs = self.filter_productpackage.qs.order_by(
+            "feature", "package__type", "package__namespace", "package__name"
+        ).group_by("feature")
 
         user = self.request.user
         dataspace = user.dataspace