Merge branch 'main' into dk/902-epp-dnssec

ops/manifests/manifest-ab.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-bl.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-dk.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-gd.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-ko.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-nl.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-rb.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-rh.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-rjm.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-stable.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-staging.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/manifests/manifest-za.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/scripts/manifest-sandbox-template-migrate.yaml

@@ -11,6 +11,7 @@ applications:
   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

ops/scripts/manifest-sandbox-template.yaml

@@ -11,6 +11,7 @@ applications:
   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

src/registrar/assets/sass/_theme/_uswds-theme-custom-styles.scss

@@ -399,6 +399,11 @@ a.usa-button--unstyled:visited {
   border-color: color('accent-cool-lighter');
 }
 
+.dotgov-status-box--action-need {
+  background-color: color('warning-lighter'); 
+  border-color: color('warning');
+}
+
 #wrapper {
   padding-top: units(3);
   padding-bottom: units(6) * 2 ; //Workaround because USWDS units jump from 10 to 15

src/registrar/migrations/0032_alter_transitiondomain_status.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.1 on 2023-09-27 00:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0031_transitiondomain_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="transitiondomain",
+            name="status",
+            field=models.CharField(
+                blank=True,
+                choices=[("ready", "Ready"), ("hold", "Hold")],
+                default="ready",
+                help_text="domain status during the transfer",
+                max_length=255,
+                verbose_name="Status",
+            ),
+        ),
+    ]

src/registrar/models/domain.py

@@ -1006,76 +1006,37 @@ class Domain(TimeStampedModel, DomainHelper):
             for extension in returned_extensions:
                 if isinstance(extension, extensions.DNSSECExtension):
                     cleaned["dnssecdata"] = extension
+            # Capture and store old hosts and contacts from cache if they exist
+            old_cache_hosts = self._cache.get("hosts")
+            old_cache_contacts = self._cache.get("contacts")
 
             # get contact info, if there are any
             if (
-                # fetch_contacts and
-                "_contacts" in cleaned
+                fetch_contacts
+                and "_contacts" in cleaned
                 and isinstance(cleaned["_contacts"], list)
                 and len(cleaned["_contacts"])
             ):
-                cleaned["contacts"] = []
-                for domainContact in cleaned["_contacts"]:
-                    # we do not use _get_or_create_* because we expect the object we
-                    # just asked the registry for still exists --
-                    # if not, that's a problem
-
-                    # TODO- discuss-should we check if contact is in public contacts
-                    # and add it if not- this is really to keep in mine the transisiton
-                    req = commands.InfoContact(id=domainContact.contact)
-                    data = registry.send(req, cleaned=True).res_data[0]
-
-                    # extract properties from response
-                    # (Ellipsis is used to mean "null")
-                    # convert this to use PublicContactInstead
-                    contact = {
-                        "id": domainContact.contact,
-                        "type": domainContact.type,
-                        "auth_info": getattr(data, "auth_info", ...),
-                        "cr_date": getattr(data, "cr_date", ...),
-                        "disclose": getattr(data, "disclose", ...),
-                        "email": getattr(data, "email", ...),
-                        "fax": getattr(data, "fax", ...),
-                        "postal_info": getattr(data, "postal_info", ...),
-                        "statuses": getattr(data, "statuses", ...),
-                        "tr_date": getattr(data, "tr_date", ...),
-                        "up_date": getattr(data, "up_date", ...),
-                        "voice": getattr(data, "voice", ...),
-                    }
-
-                    cleaned["contacts"].append(
-                        {k: v for k, v in contact.items() if v is not ...}
-                    )
+                cleaned["contacts"] = self._fetch_contacts(cleaned["_contacts"])
+                # We're only getting contacts, so retain the old
+                # hosts that existed in cache (if they existed)
+                # and pass them along.
+                if old_cache_hosts is not None:
+                    cleaned["hosts"] = old_cache_hosts
 
             # get nameserver info, if there are any
             if (
-                # fetch_hosts and
-                "_hosts" in cleaned
+                fetch_hosts
+                and "_hosts" in cleaned
                 and isinstance(cleaned["_hosts"], list)
                 and len(cleaned["_hosts"])
             ):
-                # TODO- add elif in cache set it to be the old cache value
-                # no point in removing
-                cleaned["hosts"] = []
-                for name in cleaned["_hosts"]:
-                    # we do not use _get_or_create_* because we expect the object we
-                    # just asked the registry for still exists --
-                    # if not, that's a problem
-                    req = commands.InfoHost(name=name)
-                    data = registry.send(req, cleaned=True).res_data[0]
-                    # extract properties from response
-                    # (Ellipsis is used to mean "null")
-                    host = {
-                        "name": name,
-                        "addrs": getattr(data, "addrs", ...),
-                        "cr_date": getattr(data, "cr_date", ...),
-                        "statuses": getattr(data, "statuses", ...),
-                        "tr_date": getattr(data, "tr_date", ...),
-                        "up_date": getattr(data, "up_date", ...),
-                    }
-                    cleaned["hosts"].append(
-                        {k: v for k, v in host.items() if v is not ...}
-                    )
+                cleaned["hosts"] = self._fetch_hosts(cleaned["_hosts"])
+                # We're only getting hosts, so retain the old
+                # contacts that existed in cache (if they existed)
+                # and pass them along.
+                if old_cache_contacts is not None:
+                    cleaned["contacts"] = old_cache_contacts
 
             # replace the prior cache with new data
             self._cache = cleaned
@@ -1083,6 +1044,46 @@ class Domain(TimeStampedModel, DomainHelper):
         except RegistryError as e:
             logger.error(e)
 
+    def _fetch_contacts(self, contact_data):
+        """Fetch contact info."""
+        contacts = []
+        for domainContact in contact_data:
+            req = commands.InfoContact(id=domainContact.contact)
+            data = registry.send(req, cleaned=True).res_data[0]
+            contact = {
+                "id": domainContact.contact,
+                "type": domainContact.type,
+                "auth_info": getattr(data, "auth_info", ...),
+                "cr_date": getattr(data, "cr_date", ...),
+                "disclose": getattr(data, "disclose", ...),
+                "email": getattr(data, "email", ...),
+                "fax": getattr(data, "fax", ...),
+                "postal_info": getattr(data, "postal_info", ...),
+                "statuses": getattr(data, "statuses", ...),
+                "tr_date": getattr(data, "tr_date", ...),
+                "up_date": getattr(data, "up_date", ...),
+                "voice": getattr(data, "voice", ...),
+            }
+            contacts.append({k: v for k, v in contact.items() if v is not ...})
+        return contacts
+
+    def _fetch_hosts(self, host_data):
+        """Fetch host info."""
+        hosts = []
+        for name in host_data:
+            req = commands.InfoHost(name=name)
+            data = registry.send(req, cleaned=True).res_data[0]
+            host = {
+                "name": name,
+                "addrs": getattr(data, "addrs", ...),
+                "cr_date": getattr(data, "cr_date", ...),
+                "statuses": getattr(data, "statuses", ...),
+                "tr_date": getattr(data, "tr_date", ...),
+                "up_date": getattr(data, "up_date", ...),
+            }
+            hosts.append({k: v for k, v in host.items() if v is not ...})
+        return hosts
+
     def _invalidate_cache(self):
         """Remove cache data when updates are made."""
         self._cache = {}

src/registrar/models/transition_domain.py

@@ -3,15 +3,16 @@ from django.db import models
 from .utility.time_stamped_model import TimeStampedModel
 
 
+class StatusChoices(models.TextChoices):
+    READY = "ready", "Ready"
+    HOLD = "hold", "Hold"
+
+
 class TransitionDomain(TimeStampedModel):
     """Transition Domain model stores information about the
     state of a domain upon transition between registry
     providers"""
 
-    class StatusChoices(models.TextChoices):
-        CREATED = "created", "Created"
-        HOLD = "hold", "Hold"
-
     username = models.TextField(
         null=False,
         blank=False,
@@ -27,6 +28,7 @@ class TransitionDomain(TimeStampedModel):
         max_length=255,
         null=False,
         blank=True,
+        default=StatusChoices.READY,
         choices=StatusChoices.choices,
         verbose_name="Status",
         help_text="domain status during the transfer",
@@ -39,4 +41,9 @@ class TransitionDomain(TimeStampedModel):
     )
 
     def __str__(self):
-        return self.username
+        return (
+            f"username: {self.username} "
+            f"domainName: {self.domain_name} "
+            f"status: {self.status} "
+            f"email sent: {self.email_sent} "
+        )

src/registrar/templates/domain_detail.html

@@ -5,6 +5,28 @@
   {{ block.super }}
   <div class="margin-top-4 tablet:grid-col-10">
 
+    <div
+        class="usa-summary-box dotgov-status-box margin-top-3 padding-left-2{% if domain.state == domain.State.UNKNOWN or domain.state == domain.State.DNS_NEEDED%} dotgov-status-box--action-need{% endif %}"
+        role="region"
+        aria-labelledby="summary-box-key-information"
+    >
+      <div class="usa-summary-box__body">
+        <p class="usa-summary-box__heading font-sans-md margin-bottom-0" 
+          id="summary-box-key-information"
+        > 
+          <span class="text-bold text-primary-darker">
+            Status:
+          </span>
+            {% if domain.state == domain.State.UNKNOWN or domain.state == domain.State.DNS_NEEDED%}
+              DNS Needed
+            {% else %}
+                {{ domain.state|title }}
+            {% endif %}
+        </p>
+      </div>
+    </div>
+    <br>
+
     {% url 'domain-nameservers' pk=domain.id as url %}
     {% if domain.nameservers|length > 0 %}
       {% include "includes/summary_item.html" with title='DNS name servers' value=domain.nameservers list='true' edit_link=url %}

src/registrar/templates/domain_nameservers.html

@@ -40,11 +40,11 @@
       </svg><span class="margin-left-05">Add another name server</span>
     </button>
 
-
     <button
           type="submit"
           class="usa-button"
-      >Save</button>
-    </form>
+      >Save
+    </button>
+  </form>
 
 {% endblock %}  {# domain_content #}

src/registrar/templates/home.html

@@ -33,14 +33,18 @@
       </thead>
       <tbody>
         {% for domain in domains %}
-        {% comment %} ticket 796
-        {% if domain.application_status == "approved" or (domain.application does not exist)  %} {% endcomment %}
         <tr>
           <th th scope="row" role="rowheader" data-label="Domain name">
             {{ domain.name }}
           </th>
           <td data-sort-value="{{ domain.created_time|date:"U" }}" data-label="Date created">{{ domain.created_time|date }}</td>
-          <td data-label="Status">{{ domain.application_status|title }}</td>
+          <td data-label="Status">
+            {% if domain.state == "unknown" or domain.state == "dns needed"%}
+                DNS Needed
+            {% else %}
+                {{ domain.state|title }}
+            {% endif %}
+          </td>
           <td>
             <a href="{% url "domain" pk=domain.pk %}">
               <svg
@@ -50,9 +54,15 @@
                 role="img"
                 width="24"
               >
+              {% if domain.state == "deleted" or domain.state == "on hold" %}
+                <use xlink:href="{%static 'img/sprite.svg'%}#visibility"></use>
+              </svg>
+                View <span class="usa-sr-only">{{ domain.name }}</span>
+              {% else %}
                 <use xlink:href="{%static 'img/sprite.svg'%}#settings"></use>
               </svg>
                 Manage <span class="usa-sr-only">{{ domain.name }}</span>
+              {% endif %}
             </a>
           </td>
         </tr>

src/registrar/tests/test_models_domain.py

@@ -53,8 +53,6 @@ class TestDomainCache(MockEppLib):
                     commands.InfoDomain(name="igorville.gov", auth_info=None),
                     cleaned=True,
                 ),
-                call(commands.InfoContact(id="123", auth_info=None), cleaned=True),
-                call(commands.InfoHost(name="fake.host.com"), cleaned=True),
             ],
             any_order=False,  # Ensure calls are in the specified order
         )
@@ -76,8 +74,6 @@ class TestDomainCache(MockEppLib):
             call(
                 commands.InfoDomain(name="igorville.gov", auth_info=None), cleaned=True
             ),
-            call(commands.InfoContact(id="123", auth_info=None), cleaned=True),
-            call(commands.InfoHost(name="fake.host.com"), cleaned=True),
         ]
 
         self.mockedSendFunction.assert_has_calls(expectedCalls)
@@ -112,6 +108,19 @@ class TestDomainCache(MockEppLib):
         # get and check hosts is set correctly
         domain._get_property("hosts")
         self.assertEqual(domain._cache["hosts"], [expectedHostsDict])
+        self.assertEqual(domain._cache["contacts"], [expectedContactsDict])
+
+        # invalidate cache
+        domain._cache = {}
+
+        # get host
+        domain._get_property("hosts")
+        self.assertEqual(domain._cache["hosts"], [expectedHostsDict])
+
+        # get contacts
+        domain._get_property("contacts")
+        self.assertEqual(domain._cache["hosts"], [expectedHostsDict])
+        self.assertEqual(domain._cache["contacts"], [expectedContactsDict])
 
     def tearDown(self) -> None:
         Domain.objects.all().delete()
@@ -172,8 +181,6 @@ class TestDomainCreation(MockEppLib):
                     commands.InfoDomain(name="beef-tongue.gov", auth_info=None),
                     cleaned=True,
                 ),
-                call(commands.InfoContact(id="123", auth_info=None), cleaned=True),
-                call(commands.InfoHost(name="fake.host.com"), cleaned=True),
             ],
             any_order=False,  # Ensure calls are in the specified order
         )
@@ -223,8 +230,6 @@ class TestDomainStatuses(MockEppLib):
                     commands.InfoDomain(name="chicken-liver.gov", auth_info=None),
                     cleaned=True,
                 ),
-                call(commands.InfoContact(id="123", auth_info=None), cleaned=True),
-                call(commands.InfoHost(name="fake.host.com"), cleaned=True),
             ],
             any_order=False,  # Ensure calls are in the specified order
         )

src/registrar/tests/test_views.py

@@ -25,6 +25,7 @@ from registrar.models import (
 from registrar.views.application import ApplicationWizard, Step
 
 from .common import less_console_noise
+from .common import MockEppLib
 
 
 class TestViews(TestCase):
@@ -47,8 +48,9 @@ class TestViews(TestCase):
         self.assertIn("/login?next=/register/", response.headers["Location"])
 
 
-class TestWithUser(TestCase):
+class TestWithUser(MockEppLib):
     def setUp(self):
+        super().setUp()
         username = "test_user"
         first_name = "First"
         last_name = "Last"
@@ -59,6 +61,7 @@ class TestWithUser(TestCase):
 
     def tearDown(self):
         # delete any applications too
+        super().tearDown()
         DomainApplication.objects.all().delete()
         self.user.delete()
 
@@ -91,6 +94,7 @@ class LoggedInTests(TestWithUser):
         response = self.client.get("/")
         # count = 2 because it is also in screenreader content
         self.assertContains(response, "igorville.gov", count=2)
+        self.assertContains(response, "DNS Needed")
         # clean up
         role.delete()
 
@@ -1141,6 +1145,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest):
         # click the "Edit" link
         detail_page = home_page.click("Manage")
         self.assertContains(detail_page, "igorville.gov")
+        self.assertContains(detail_page, "Status")
 
     def test_domain_user_management(self):
         response = self.client.get(
@@ -1307,6 +1312,7 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest):
         )
         self.assertContains(page, "Domain name servers")
 
+    @skip("Broken by adding registry connection fix in ticket 848")
     def test_domain_nameservers_form(self):
         """Can change domain's nameservers.
 

src/registrar/views/domain.py

@@ -139,10 +139,17 @@ class DomainNameserversView(DomainPermissionView, FormMixin):
         """The initial value for the form (which is a formset here)."""
         domain = self.get_object()
         nameservers = domain.nameservers
-        if nameservers is None:
-            return []
+        initial_data = []
 
-        return [{"server": name} for name, *ip in domain.nameservers]
+        if nameservers is not None:
+            # Add existing nameservers as initial data
+            initial_data.extend({"server": name} for name, *ip in nameservers)
+
+        # Ensure at least 3 fields, filled or empty
+        while len(initial_data) < 2:
+            initial_data.append({})
+
+        return initial_data
 
     def get_success_url(self):
         """Redirect to the nameservers page for the domain."""
@@ -158,6 +165,7 @@ class DomainNameserversView(DomainPermissionView, FormMixin):
     def get_form(self, **kwargs):
         """Override the labels and required fields every time we get a formset."""
         formset = super().get_form(**kwargs)
+
         for i, form in enumerate(formset):
             form.fields["server"].label += f" {i+1}"
             if i < 2:

src/registrar/views/index.py

@@ -19,7 +19,7 @@ def index(request):
             pk=F("domain__id"),
             name=F("domain__name"),
             created_time=F("domain__created_at"),
-            application_status=F("domain__domain_application__status"),
+            state=F("domain__state"),
         )
         context["domains"] = domains
     return render(request, "home.html", context)