Add support for generic keywords in PackageAddView.get_initial #45

Signed-off-by: tdruez <tdruez@nexb.com>
aboutcode-org · May 28, 2024 · f8d5d48 · f8d5d48
1 parent c255f58
commit f8d5d48
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/component_catalog/tests/test_views.py b/component_catalog/tests/test_views.py
@@ -3698,6 +3698,10 @@ 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,
@@ -3718,6 +3722,10 @@ def test_component_catalog_package_add_view_initial_data(
             "primary_language": "Java",
             "description": "Abbot Java GUI Test Library",
             "license_expression": "bsd-new OR eps-1.0 OR apache-2.0 OR mit",
+            "keywords": [
+                "keyword1",
+                "keyword2",
+            ],
         }
         self.assertEqual(expected, response.context["form"].initial)
 

diff --git a/component_catalog/views.py b/component_catalog/views.py
@@ -1929,12 +1929,7 @@ def get_initial(self):
 
         if purldb_entry := self.get_entry_from_purldb():
             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()