Merge branch 'main' into ky/required-optional-form-fields

.github/workflows/deploy-sandbox.yaml

@@ -21,6 +21,7 @@ jobs:
         || startsWith(github.head_ref, 'dk/')
         || startsWith(github.head_ref, 'es/')
         || startsWith(github.head_ref, 'ky/')
+        || startsWith(github.head_ref, 'backup/')
     outputs:
       environment: ${{ steps.var.outputs.environment}}
     runs-on: "ubuntu-latest"

.github/workflows/migrate.yaml

@@ -16,6 +16,7 @@ on:
           - stable
           - staging
           - development
+          - backup
           - ky
           - es
           - nl

.github/workflows/reset-db.yaml

@@ -16,6 +16,7 @@ on:
         options:
           - staging
           - development
+          - backup
           - ky
           - es
           - nl

ops/manifests/manifest-backup.yaml

@@ -0,0 +1,32 @@
+---
+applications:
+- name: getgov-backup
+  buildpacks:
+    - python_buildpack
+  path: ../../src
+  instances: 1
+  memory: 512M
+  stack: cflinuxfs4
+  timeout: 180
+  command: ./run.sh
+  health-check-type: http
+  health-check-http-endpoint: /health
+  health-check-invocation-timeout: 40
+  env:
+    # Send stdout and stderr straight to the terminal without buffering
+    PYTHONUNBUFFERED: yup
+    # Tell Django where to find its configuration
+    DJANGO_SETTINGS_MODULE: registrar.config.settings
+    # Tell Django where it is being hosted
+    DJANGO_BASE_URL: https://getgov-backup.app.cloud.gov
+    # Tell Django how much stuff to log
+    DJANGO_LOG_LEVEL: INFO
+    # default public site location
+    GETGOV_PUBLIC_SITE_URL: https://beta.get.gov
+    # Flag to disable/enable features in prod environments
+    IS_PRODUCTION: False
+  routes:
+    - route: getgov-backup.app.cloud.gov
+  services:
+  - getgov-credentials
+  - getgov-backup-database

src/registrar/admin.py

@@ -322,7 +322,7 @@ class WebsiteAdmin(ListHeaderAdmin):
 
 
 class UserDomainRoleAdmin(ListHeaderAdmin):
-    """Custom domain role admin class."""
+    """Custom user domain role admin class."""
 
     # Columns
     list_display = [
@@ -340,6 +340,8 @@ class UserDomainRoleAdmin(ListHeaderAdmin):
     ]
     search_help_text = "Search by user, domain, or role."
 
+    autocomplete_fields = ["user", "domain"]
+
 
 class DomainInvitationAdmin(ListHeaderAdmin):
     """Custom domain invitation admin class."""

src/registrar/assets/sass/_theme/_admin.scss

@@ -245,3 +245,9 @@ h1, h2, h3 {
         padding-left: 90px;
     }
 }
+
+// Combo box
+#select2-id_domain-results,
+#select2-id_user-results {
+    width: 100%;
+}

src/registrar/config/settings.py

@@ -627,6 +627,7 @@ ALLOWED_HOSTS = [
     "getgov-stable.app.cloud.gov",
     "getgov-staging.app.cloud.gov",
     "getgov-development.app.cloud.gov",
+    "getgov-backup.app.cloud.gov",
     "getgov-ky.app.cloud.gov",
     "getgov-es.app.cloud.gov",
     "getgov-nl.app.cloud.gov",