Do not include the Dataspace related FKs on addition

as the Dataspace does not exist yet

Signed-off-by: tdruez <[email protected]>

Author: tdruez

dje/admin.py

@@ -1081,11 +1081,7 @@ class DataspaceConfigurationInline(DataspacedFKMixin, admin.StackedInline):
     form = DataspaceConfigurationForm
     verbose_name_plural = _("Configuration")
     verbose_name = _("Dataspace configuration")
-    fieldsets = [
-        (
-            "",
-            {"fields": ("homepage_layout",)},
-        ),
+    add_fieldsets = [
         (
             "AboutCode Integrations",
             {
@@ -1142,8 +1138,15 @@ class DataspaceConfigurationInline(DataspacedFKMixin, admin.StackedInline):
             },
         ),
     ]
+    # Do not include the Dataspace related FKs on addition as the Dataspace does not exist yet
+    fieldsets = [("", {"fields": ("homepage_layout",)})] + add_fieldsets
     can_delete = False
 
+    def get_fieldsets(self, request, obj=None):
+        if not obj:
+            return self.add_fieldsets
+        return super().get_fieldsets(request, obj)
+
 
 @admin.register(Dataspace, site=dejacode_site)
 class DataspaceAdmin(
@@ -1433,7 +1436,6 @@ class DejacodeUserAdmin(
     add_fieldsets = (
         (None, {"fields": ("username", "dataspace")}),
         (_("Personal information"), {"fields": ("email", "first_name", "last_name", "company")}),
-        (_("Profile"), {"fields": ("homepage_layout",)}),
         (
             _("Notifications"),
             {
@@ -1448,6 +1450,7 @@ class DejacodeUserAdmin(
         (_("Permissions"), {"fields": ("is_staff", "is_superuser", "groups")}),
     )
     fieldsets = add_fieldsets[:-1] + (
+        (_("Profile"), {"fields": ("homepage_layout",)}),
         (_("Permissions"), {"fields": ("is_active", "is_staff", "is_superuser", "groups")}),
         (_("Important dates"), {"fields": ("last_login", "last_api_access", "date_joined")}),
     )

dje/tests/test_admin.py

@@ -188,6 +188,22 @@ def test_dataspace_admin_changeform_update_packages_from_scan_field_validation(s
         response = self.client.post(url, data, follow=True)
         self.assertContains(response, "was changed successfully.")
 
+    def test_dataspace_admin_changeform_hide_dataspace_fk_on_addition(self):
+        self.client.login(username=self.super_user.username, password="secret")
+
+        expected1 = "homepage_layout"
+        expected2 = "Homepage layout"
+
+        url = reverse("admin:dje_dataspace_add")
+        response = self.client.get(url)
+        self.assertNotContains(response, expected1)
+        self.assertNotContains(response, expected2)
+
+        url = reverse("admin:dje_dataspace_change", args=[self.other_dataspace.pk])
+        response = self.client.get(url)
+        self.assertContains(response, expected1)
+        self.assertContains(response, expected2)
+
     def test_dataspace_admin_changelist_missing_in_filter_availability(self):
         # MissingInFilter is only available to superusers
         url = reverse("admin:organization_owner_changelist")

dje/tests/test_user.py

@@ -413,6 +413,21 @@ def test_user_admin_changeform_submit_row_delete_button_label(self):
         )
         self.assertContains(response, expected, html=True)
 
+    def test_user_admin_hide_dataspace_fk_on_addition(self):
+        self.client.login(username="nexb_user", password="secret")
+        url = reverse("admin:dje_dejacodeuser_add")
+        response = self.client.get(url)
+
+        expected1 = "homepage_layout"
+        expected2 = "Homepage layout"
+        self.assertNotContains(response, expected1)
+        self.assertNotContains(response, expected2)
+
+        url = reverse("admin:dje_dejacodeuser_change", args=[self.other_user.pk])
+        response = self.client.get(url)
+        self.assertContains(response, expected1)
+        self.assertContains(response, expected2)
+
     def test_user_admin_form_scope_homepage_layout_choices(self):
         self.client.login(username=self.nexb_user.username, password="secret")
         url = reverse("admin:dje_dejacodeuser_change", args=[self.nexb_user.pk])