Merge branch 'main' into feature/CDD-3295-dual-category-chart-interface

Author: tushortz

auth_content/models/__init__.py

@@ -0,0 +1,31 @@
+import os
+from collections.abc import Callable
+
+from django import forms
+
+from cms.dynamic_content import help_texts
+
+
+def _create_form_field(
+    field: dict[str, str | Callable | None], wildcard_id_value=None
+) -> forms.CharField:
+    choices = [
+        ("", field["field_choice_default"]),
+    ]
+
+    if field["field_choice_wildcard"]:
+        choices += [(wildcard_id_value, field["field_choice_wildcard"])]
+
+    if field["field_choice_callable"]:
+        choices += field["field_choice_callable"]()
+
+    return forms.CharField(
+        required=False,
+        label=field["field_label"],
+        widget=forms.Select(choices=choices),
+        help_text=help_texts.NON_PUBLIC_PAGE_REQUIRED,
+    )
+
+
+def is_auth_enabled() -> bool:
+    return str(os.environ.get("AUTH_ENABLED", "")).lower() in {"true", "1"}

auth_content/__init__.py cms/auth_content/__init__.pyauth_content/__init__.py renamed to cms/auth_content/__init__.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.2.13 on 2026-05-22 08:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("auth_content", "0002_alter_permissionset_geography_type_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="permissionset",
+            name="display_name",
+            field=models.CharField(
+                blank=True,
+                help_text="\nThis is an (optional) user readable name for the permission set. If not set, a default autogenerated name will be used.\n",
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="permissionset",
+            constraint=models.UniqueConstraint(
+                condition=models.Q(("display_name__isnull", False)),
+                fields=("display_name",),
+                name="unique_non_null_display_name",
+            ),
+        ),
+    ]

cms/auth_content/auth_utils.py

@@ -0,0 +1,2 @@
+from cms.auth_content.models import users
+from cms.auth_content.models import permission_sets

auth_content/constants.py cms/auth_content/constants.pyauth_content/constants.py renamed to cms/auth_content/constants.py

@@ -1,13 +1,13 @@
-from collections.abc import Callable
 from itertools import starmap
 
-from django import forms
 from django.core.exceptions import ValidationError
 from django.db import models
-from wagtail.admin.forms import WagtailAdminModelForm
+from wagtail.admin.forms import WagtailAdminPageForm
 from wagtail.admin.panels import FieldPanel, mark_safe
 
-from auth_content.constants import PERMISSION_SET_FIELDS, WILDCARD_ID_VALUE
+from cms.auth_content.auth_utils import _create_form_field
+from cms.auth_content.constants import PERMISSION_SET_FIELDS, WILDCARD_ID_VALUE
+from cms.dynamic_content import help_texts
 from cms.metrics_interface.field_choices_callables import (
     get_all_geography_names_and_codes,
     get_all_geography_type_names_and_ids,
@@ -18,41 +18,14 @@
 )
 
 
-def get_theme_child_map():
-    """Returns an object of all parent to child mappings
-    e.g.
-    {
-        infectious_disease: [vaccine_preventable, respiratory ....],
-        extreme_event: [weather_alert, mortality_report...]
-        ...
-    }
-
-    """
-    return {}
-
-
-def _create_form_field(field: dict[str, str | Callable | None]) -> forms.CharField:
-    choices = [
-        ("", field["field_choice_default"]),
-    ]
-
-    if field["field_choice_wildcard"]:
-        choices += [(WILDCARD_ID_VALUE, field["field_choice_wildcard"])]
-
-    if field["field_choice_callable"]:
-        choices += field["field_choice_callable"]()
-
-    return forms.CharField(
-        required=True, label=field["field_label"], widget=forms.Select(choices=choices)
-    )
-
-
-class PermissionSetForm(WagtailAdminModelForm):
+class PermissionSetForm(WagtailAdminPageForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         for field in PERMISSION_SET_FIELDS:
-            self.fields[field["field_name"]] = _create_form_field(field)
+            self.fields[field["field_name"]] = _create_form_field(
+                field, WILDCARD_ID_VALUE
+            )
 
         if self.instance and self.instance.pk:
             self._initialize_dependent_fields()
@@ -110,6 +83,9 @@ def clean(self):
 
         return cleaned_data
 
+    class Media:
+        js = ["js/permission_set.js"]
+
 
 class PermissionSet(models.Model):
     name = models.CharField(
@@ -118,6 +94,12 @@ class PermissionSet(models.Model):
         editable=False,
         help_text="Auto-generated display name",
     )
+    display_name = models.CharField(
+        max_length=255,
+        blank=True,
+        null=True,
+        help_text=help_texts.PERMISSION_SET_DISPLAY_NAME,
+    )
     theme = models.CharField(max_length=255, blank=False, default="")
     sub_theme = models.CharField(max_length=255, blank=False, default="")
     topic = models.CharField(max_length=255, blank=False, default="")
@@ -133,6 +115,7 @@ def permission_set_details(self):
         return mark_safe("<br>".join(parts))
 
     panels = [
+        FieldPanel("display_name"),
         FieldPanel("theme"),
         FieldPanel("sub_theme"),
         FieldPanel("topic"),
@@ -153,7 +136,12 @@ class Meta:
                     "geography",
                 ],
                 name="unique_permission_set",
-            )
+            ),
+            models.UniqueConstraint(
+                fields=["display_name"],
+                condition=models.Q(display_name__isnull=False),
+                name="unique_non_null_display_name",
+            ),
         ]
 
     def save(self, *args, **kwargs):
@@ -241,4 +229,4 @@ def _find_label_in_choices(choices: list[tuple], value: str) -> str:
         )
 
     def __str__(self):
-        return self.name or f"Permission Set {self.id}"
+        return self.display_name or self.name or f"Permission Set {self.id}"