Re-enabled keywords in PurlDB to Package #63

Signed-off-by: tdruez <tdruez@nexb.com>
aboutcode-org · Jun 28, 2024 · f4248af · f4248af
1 parent 7cf635f
commit f4248af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/component_catalog/tests/test_views.py b/component_catalog/tests/test_views.py
@@ -3457,6 +3457,7 @@ def test_component_catalog_package_add_view_initial_data(
             "primary_language": "Java",
             "description": "Abbot Java GUI Test Library",
             "declared_license_expression": "bsd-new OR eps-1.0 OR apache-2.0 OR mit",
+            "keywords": ["keyword1", "keyword2"],
         }
         mock_request_get.return_value = {
             "count": 1,
@@ -3469,6 +3470,7 @@ def test_component_catalog_package_add_view_initial_data(
         response = self.client.get(add_url + "?package_url=pkg:maven/abbot/abbot@1.4.0")
         expected = {
             "filename": "abbot-1.4.0.jar",
+            "keywords": ["keyword1", "keyword2"],
             "release_date": "2015-09-22",
             "type": "maven",
             "namespace": "abbot",

diff --git a/component_catalog/views.py b/component_catalog/views.py
@@ -1920,13 +1920,9 @@ def get_initial(self):
         initial = super().get_initial()
 
         if purldb_entry := self.get_entry_from_purldb():
+            # Duplicate the declared_license_expression as the "concluded" license_expression
             purldb_entry["license_expression"] = purldb_entry.get("declared_license_expression")
-            model_fields = [
-                field.name
-                for field in Package._meta.get_fields()
-                # Generic keywords are not supported because of validation
-                if field.name != "keywords"
-            ]
+            model_fields = [field.name for field in Package._meta.get_fields()]
             initial_from_purldb_entry = {
                 field_name: value
                 for field_name, value in purldb_entry.items()