handle DJA ui and handle permission test for UserDomainRole

src/registrar/admin.py

@@ -35,6 +35,8 @@ from django_admin_multiple_choice_list_filter.list_filters import MultipleChoice
 from import_export import resources
 from import_export.admin import ImportExportModelAdmin
 from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.postgres.forms import SimpleArrayField
+from django.contrib.admin.widgets import FilteredSelectMultiple
 
 from django.utils.translation import gettext_lazy as _
 
@@ -89,12 +91,33 @@ class UserResource(resources.ModelResource):
     class Meta:
         model = models.User
 
+class FilteredSelectMultipleArrayWidget(FilteredSelectMultiple):
+    def __init__(self, verbose_name, is_stacked=False, choices=(), **kwargs):
+        super().__init__(verbose_name, is_stacked, **kwargs)
+        self.choices = choices
 
+    def value_from_datadict(self, data, files, name):
+        values = super().value_from_datadict(data, files, name)
+        # print(f'value_from_datadict - values: {values}')
+        return values or []
+
+    def get_context(self, name, value, attrs):
+        # print(f'get_context - initial value: {value}')
+        if value is None:
+            value = []
+        elif isinstance(value, str):
+            value = value.split(',')
+        # print(f'get_context - processed value: {value}')
+        self.choices = [(choice, label) for choice, label in self.choices if choice in value] + [(choice, label) for choice, label in self.choices if choice not in value]
+        # print(f'get_context - choices: {self.choices}')
+        context = super().get_context(name, value, attrs)
+        return context
+    
 class MyUserAdminForm(UserChangeForm):
     """This form utilizes the custom widget for its class's ManyToMany UIs.
 
     It inherits from UserChangeForm which has special handling for the password and username fields."""
-
+    
     class Meta:
         model = models.User
         fields = "__all__"
@@ -102,6 +125,8 @@ class MyUserAdminForm(UserChangeForm):
         widgets = {
             "groups": NoAutocompleteFilteredSelectMultiple("groups", False),
             "user_permissions": NoAutocompleteFilteredSelectMultiple("user_permissions", False),
+            "portfolio_roles": FilteredSelectMultipleArrayWidget("portfolio_roles", is_stacked=False, choices=User.UserPortfolioRoleChoices.choices),
+            "portfolio_additional_permissions": FilteredSelectMultipleArrayWidget("portfolio_additional_permissions", is_stacked=False, choices=User.UserPortfolioPermissionChoices.choices),
         }
 
     def __init__(self, *args, **kwargs):
@@ -625,6 +650,10 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
         "status",
     )
 
+    # For each filter_horizontal, init in admin js extendFilterHorizontalWidgets
+    # to activate the edit/delete/view buttons
+    # filter_horizontal = ("portfolio_roles",)
+
     # Renames inherited AbstractUser label 'email_address to 'email'
     def formfield_for_dbfield(self, dbfield, **kwargs):
         field = super().formfield_for_dbfield(dbfield, **kwargs)
@@ -654,6 +683,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
                     "user_permissions",
                     "portfolio",
                     "portfolio_roles",
+                    "portfolio_additional_permissions",
                 )
             },
         ),
@@ -684,6 +714,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
                     "groups",
                     "portfolio",
                     "portfolio_roles",
+                    "portfolio_additional_permissions",
                 )
             },
         ),
@@ -715,6 +746,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
         "date_joined",
         "portfolio",
         "portfolio_roles",
+        "portfolio_additional_permissions",
     ]
 
     list_filter = (