Skip poll messages on deletions for configured registrars (#2613)

See b/379331882 for more details

.github/workflows/codeql.yml

@@ -31,7 +31,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '25'
+        java-version: '21'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/dependency-submission.yml

@@ -20,6 +20,6 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '25'
+        java-version: '21'
     - name: Generate and submit dependency graph
       uses: gradle/actions/dependency-submission@v3

.gitignore

@@ -18,13 +18,6 @@ gjf.out
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
-# Environment-specific configuration files
-core/src/main/java/google/registry/config/files/nomulus-config-alpha.yaml
-core/src/main/java/google/registry/config/files/nomulus-config-crash.yaml
-core/src/main/java/google/registry/config/files/nomulus-config-production.yaml
-core/src/main/java/google/registry/config/files/nomulus-config-qa.yaml
-core/src/main/java/google/registry/config/files/nomulus-config-sandbox.yaml
-
 ######################################################################
 # Eclipse Ignores
 
@@ -121,5 +114,9 @@ core/**/registrar_dbg*.js
 core/**/registrar_bin*.css
 core/**/registrar_dbg*.css
 
+# Appengine generated files
+core/WEB-INF/appengine-generated/*.bin
+core/WEB-INF/appengine-generated/*.xml
+
 # jEnv
 .java-version

GEMINI.md

@@ -1,52 +0,0 @@
-# Engineering Standards for Gemini CLI
-
-This document outlines foundational mandates, architectural patterns, and project-specific conventions to ensure high-quality, idiomatic, and consistent code from the first iteration.
-
-## Core Mandates
-
-### 1. Rigorous Import Management
-- **Addition:** When adding new symbols, ensure the corresponding import is added.
-- **Removal:** When removing the last usage of a class or symbol from a file (e.g., removing a `@Inject Clock clock;` field), **immediately remove the associated import**. Do not wait for a build failure to identify unused imports.
-- **Checkstyle:** Proactively fix common checkstyle errors (line length > 100, formatting, unused imports) during the initial code write. Do not wait for CI/build failures to address these, as iterative fixes are inefficient.
-- **Verification:** Before finalizing any change, scan the imports section for redundancy.
-
-### 2. Time and Precision Handling (java.time Migration)
-- **Millisecond Precision:** Always truncate `Instant.now()` to milliseconds (using `.truncatedTo(ChronoUnit.MILLIS)`) to maintain consistency with Joda `DateTime` and the PostgreSQL schema (which enforces millisecond precision via JPA converters).
-- **Clock Injection:**
-    - Avoid direct calls to `Instant.now()`, `DateTime.now()`, `ZonedDateTime.now()`, or `System.currentTimeMillis()`.
-    - Inject `google.registry.util.Clock` (production) or `google.registry.testing.FakeClock` (tests).
-    - Use `clock.nowDate()` to get a `ZonedDateTime` in UTC.
-- **Beam Pipelines:**
-    - Ensure `Clock` is serializable (it is by default in this project) when used in Beam `DoFn`s.
-    - Pass the `Clock` through the constructor or via Dagger provider methods in the pipeline module.
-- **Command-Line Tools:**
-    - Use `@Inject Clock clock;` in `Command` implementations.
-    - The `clock` field should be **package-private** (no access modifier) to allow manual initialization in corresponding test classes.
-    - In test classes (e.g., `UpdateDomainCommandTest`), manually set `command.clock = fakeClock;` in the `@BeforeEach` method.
-    - Base test classes like `EppToolCommandTestCase` should handle this assignment for their generic command types where applicable.
-
-### 3. Dependency Injection (Dagger)
-- **Concrete Types:** Dagger `inject` methods must use explicit concrete types. Generic `inject(Command)` methods will not work.
-- **Test Components:** Use `TestRegistryToolComponent` for command-line tool tests to bridge the gap between `main` and `nonprod/test` source sets.
-
-### 4. Database Consistency
-- **JPA Converters:** Be aware that JPA converters (like `DateTimeConverter`) may perform truncation or transformation. Ensure application-level logic matches these transformations to avoid "dirty" state or unexpected diffs.
-- **Transaction Management:**
-    - **Top-Level:** Define database transactions (`tm().transact(...)`) at the highest possible level in the call chain (e.g., in an Action, a Command, or a Flow). This ensures all operations are atomic and handled by the retry logic.
-    - **DAO Methods:** Avoid declaring transactions inside low-level DAO methods. Use `tm().assertInTransaction()` to ensure that these methods are only called within a valid transactional context.
-    - **Utility/Cache Methods:** Use `tm().reTransact(...)` for utility methods or Caffeine cache loaders that might be invoked from both transactional and non-transactional paths.
-        - `reTransact` will join an existing transaction if one is present (acting as a no-op) or start a new one if not.
-        - This is particularly useful for in-memory caches where the loader must be able to fetch data regardless of whether the caller is currently in a transaction.
-    - **Transactional Time:** Ensure code that relies on `tm().getTransactionTime()` is executed within a transaction context.
-
-### 5. Testing Best Practices
-- **FakeClock and Sleeper:** Use `FakeClock` and `Sleeper` for any logic involving timeouts, delays, or expiration.
-- **Empirical Reproduction:** Before fixing a bug, always create a test case that reproduces the failure.
-- **Base Classes:** Leverage `CommandTestCase`, `EppToolCommandTestCase`, etc., to reduce boilerplate and ensure consistent setup (e.g., clock initialization).
-
-### 6. Project Dependencies
-- **Common Module:** When using `Clock` or other core utilities in a new or separate module (like `load-testing`), ensure `implementation project(':common')` is added to the module's `build.gradle`.
-
-## Performance and Efficiency
-- **Turn Minimization:** Aim for "perfect" code in the first iteration. Iterative fixes for checkstyle or compilation errors consume significant context and time.
-- **Context Management:** Use sub-agents for batch refactoring or high-volume output tasks to keep the main session history lean and efficient.

README.md

@@ -12,16 +12,16 @@ Nomulus is an open source, scalable, cloud-based service for operating
 [top-level domains](https://en.wikipedia.org/wiki/Top-level_domain) (TLDs). It
 is the authoritative source for the TLDs that it runs, meaning that it is
 responsible for tracking domain name ownership and handling registrations,
-renewals, availability checks, and WHOIS requests. End-user registrants (i.e.,
+renewals, availability checks, and WHOIS requests. End-user registrants (i.e.
 people or companies that want to register a domain name) use an intermediate
 domain name registrar acting on their behalf to interact with the registry.
 
-Nomulus runs on [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine)
-and is written primarily in Java. It is the software that
-[Google Registry](https://www.registry.google/) uses to operate TLDs such as .google,
-.app, .how, .soy, and .みんな. It can run any number of TLDs in a single shared registry
-system using horizontal scaling. Its source code is publicly available in this
-repository under the [Apache 2.0 free and open source license](https://www.apache.org/licenses/LICENSE-2.0).
+Nomulus runs on [Google App Engine][gae] and is written primarily in Java. It is
+the software that [Google Registry](https://www.registry.google/) uses to
+operate TLDs such as .google, .app, .how, .soy, and .みんな. It can run any
+number of TLDs in a single shared registry system using horizontal scaling. Its
+source code is publicly available in this repository under the [Apache 2.0 free
+and open source license](https://www.apache.org/licenses/LICENSE-2.0).
 
 ## Getting started
 
@@ -30,8 +30,8 @@ running system:
 
 *   [Install
     guide](https://github.com/google/nomulus/blob/master/docs/install.md)
-*   View the source code for the [Main HTTP server](https://github.com/google/nomulus/tree/master/core/src/main/java/google/registry)
-    and for the [EPP proxy](https://github.com/google/nomulus/tree/master/proxy/src/main/java/google/registry)
+*   View the source code for the [GAE app](https://github.com/google/nomulus/tree/master/core/src/main/java/google/registry)
+    and for the [GKE proxy](https://github.com/google/nomulus/tree/master/proxy/src/main/java/google/registry)
 *   [Other docs](https://github.com/google/nomulus/tree/master/docs)
 *   [Javadoc](https://javadoc.nomulus.foo/)
 *   [Nomulus discussion
@@ -54,11 +54,11 @@ Nomulus has the following capabilities:
     checking, updating, and transferring domain names.
 *   **[DNS](https://en.wikipedia.org/wiki/Domain_Name_System) interface**: The
     registry provides a pluggable interface that can be implemented to handle
-    different DNS providers. It includes a sample implementation using [Google
-    Cloud DNS](https://cloud.google.com/dns/), as well as an RFC 2136 compliant
-    implementation that works with BIND. If you are using Google Cloud DNS, you
-    may need to understand its capabilities and provide your own
-    multi-[AS](https://en.wikipedia.org/wiki/Autonomous_system_\(Internet\)) solution.
+    different DNS providers. It includes a sample implementation using Google
+    Cloud DNS as well as an RFC 2136 compliant implementation that works with
+    BIND.
+*   **[WHOIS](https://en.wikipedia.org/wiki/WHOIS)**: A text-based protocol that
+    returns ownership and contact information on registered domain names.
 *   **[Registration Data Access Protocol
     (RDAP)](https://en.wikipedia.org/wiki/Registration_Data_Access_Protocol)**:
     A JSON API that returns structured, machine-readable information about
@@ -68,7 +68,7 @@ Nomulus has the following capabilities:
     provider to allow take-over by another registry operator in the event of
     serious failure. This is required by ICANN for all [new
     gTLDs](https://newgtlds.icann.org/).
-*   **Premium pricing**: Communicates prices for premium domain names (i.e.,
+*   **Premium pricing**: Communicates prices for premium domain names (i.e.
     those that are highly desirable) and supports configurable premium
     registration and renewal prices. An extensible interface allows fully
     programmatic pricing.
@@ -91,50 +91,56 @@ Nomulus has the following capabilities:
 *   **Administrative tool**: Performs the full range of administrative tasks
     needed to manage a running registry system, including creating and
     configuring new TLDs.
-*   **Secure storage of cryptographic keys**: A keyring interface is
-      provided for plugging in your own implementation (see [configuration
-      doc](https://github.com/google/nomulus/blob/master/docs/configuration.md)
-      for details), and an implementation based on
-      [Google Cloud Secret Manager](https://cloud.google.com/security/products/secret-manager) is
-      available.
-*   **TPC Proxy**: Nomulus is built on top of the [Jetty](https://jetty.org/)
-    container that implements the [Jakarta Servlet](https://jakarta.ee/specifications/servlet/)
-    specification and only serves HTTP/S traffic. A proxy to translate raw TCP traffic (e.g., EPP)
-    to and from HTTP is provided.
-    Instructions on setting up the proxy
-    are [available](https://github.com/google/nomulus/blob/master/docs/proxy-setup.md).
-    The proxy can either run in a separate cluster and communicate to Nomulus public HTTP
-    endpoints via the Internet, or as a sidecar with the Nomulus image in the same pod and
-    communicate to it via loopback.
+*   **DNS interface**: An interface for DNS operations is provided so you can
+    write an implementation for your chosen provider, along with a sample
+    implementation that uses [Google Cloud DNS](https://cloud.google.com/dns/).
+    If you are using Google Cloud DNS you may need to understand its
+    capabilities and provide your own
+    multi-[AS](https://en.wikipedia.org/wiki/Autonomous_system_\(Internet\))
+    solution.
+*   **GAE Proxy**: App Engine Standard only serves HTTP/S traffic. A proxy to
+    forward traffic on EPP and WHOIS ports to App Engine via HTTPS is provided.
+    Instructions on setting up the proxy on
+    [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/)
+    is [available](https://github.com/google/nomulus/blob/master/docs/proxy-setup.md).
+    Running the proxy on GKE supports IPv4 and IPv6 access, per ICANN's
+    requirements for gTLDs. The proxy can also run as a single jar file, or on
+    other Kubernetes providers, with modifications.
 
 ## Additional components
 
 Registry operators interested in deploying Nomulus will likely require some
-additional components that need to be configured separately.
+additional components that are need to be configured separately.
 
 *   A way to invoice registrars for domain name registrations and accept
     payments. Nomulus records the information required to generate invoices in
     [billing
     events](https://github.com/google/nomulus/blob/master/docs/code-structure.md#billing-events).
 *   Fully automated reporting to meet ICANN's requirements for gTLDs. Nomulus
-    includes substantial reporting functionality, but some additional work will
+    includes substantial reporting functionality but some additional work will
     be required by the operator in this area.
-
+*   A secure method for storing cryptographic keys. A keyring interface is
+    provided for plugging in your own implementation (see [configuration
+    doc](https://github.com/google/nomulus/blob/master/docs/configuration.md)
+    for details).
 *   System status and uptime monitoring.
 
 ## Outside references
 
-*   [Identity Digital](http://identity.digital) has helped review the code and
-    provided valuable feedback.
+*   [Donuts](http://donuts.domains) Registry has helped review the code and
+    provided valuable feedback
 *   [CoCCa](http://cocca.org.nz) and [FRED](https://fred.nic.cz) are other
-    open-source registry platforms in use by many TLDs.
+    open-source registry platforms in use by many TLDs
 *   We are not aware of any fully open source domain registrar projects, but
     open source EPP Toolkits (not yet tested with Nomulus; may require
     integration work) include:
-    *   [Universal Registry/Registrar Toolkit](https://sourceforge.net/projects/epp-rtk/)
+    *   [EPP RTK Project](http://epp-rtk.sourceforge.net/)
+    *   [CentralNic](https://www.centralnic.com/registry/labs)
     *   [ari-toolkit](https://github.com/AusRegistry/ari-toolkit)
     *   [Net::DRI](https://metacpan.org/pod/Net::DRI)
 *   Some Open Source DNS Projects that may be useful, but which we have not
     tested:
-    *   [AtomiaDNS](https://github.com/atomia/atomiadns)
-    *   [PowerDNS](https://github.com/PowerDNS/pdns)
+    *   [AtomiaDNS](http://atomiadns.com/)
+    *   [PowerDNS](https://doc.powerdns.com/md/)
+
+[gae]:https://cloud.google.com/appengine/docs/about-the-standard-environment

appengine_war.gradle

@@ -0,0 +1,109 @@
+// Copyright 2019 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+apply plugin: 'war'
+
+def environment = rootProject.environment
+def gcpProject = rootProject.gcpProject
+
+// Set this directory before applying the appengine plugin so that the
+// plugin will recognize this as an app-engine standard app (and also
+// obtains the appengine-web.xml from the correct location)
+project.convention.plugins['war'].webAppDirName =
+        "../../core/src/main/java/google/registry/env/${environment}/${project.name}"
+
+apply plugin: 'com.google.cloud.tools.appengine'
+
+def coreResourcesDir = "${rootDir}/core/build/resources/main"
+def coreLibsDir = "${rootDir}/core/build/libs"
+
+// Get the web.xml file for the service.
+war {
+    webInf {
+        from "../../core/src/main/java/google/registry/env/common/${project.name}/WEB-INF"
+    }
+}
+
+war {
+    from("${coreResourcesDir}/google/registry/ui/html") {
+        include "*.html"
+    }
+    from("${coreLibsDir}") {
+        include "core.jar"
+        into("WEB-INF/lib")
+    }
+}
+
+if (project.path == ":services:default") {
+    war {
+        from("${coreResourcesDir}/google/registry/ui/html") {
+            include "*.html"
+            into("registrar")
+        }
+    }
+}
+
+appengine {
+    deploy {
+        // appengineDeployAll task requires the version to be set. So,
+        // this config lets gcloud select a version name when deploying
+        // to alpha or sandbox from our workstation.
+        if (!rootProject.prodOrSandboxEnv) {
+            version = 'GCLOUD_CONFIG'
+        }
+
+        // Don't set gcpProject directly, it gets overriden in ./build.gradle.
+        // Do -P environment={crash,alpha} instead.  For sandbox/production,
+        // use Spinnaker.
+        projectId = gcpProject
+    }
+}
+
+dependencies {
+    implementation project(path: ':core', configuration: 'deploy_jar')
+}
+
+// The tools.jar file gets pulled in from the java environment and for some
+// reason gets exploded "readonly", causing subsequent builds to fail when
+// they can't overwrite it.  The hack below makes the file writable after
+// we're done exploding it.
+//
+// Fun fact: We only use this jar for documentation generation and as such we
+// don't need it in our warfile, as it is not used by the application at
+// runtime.  But it's not clear how to exclude it, as we seem to be
+// constructing the jar from the entire WEB-INF directory and per-file
+// exclude rules don't seem to work on it.  Better solutions are welcome :-)
+explodeWar.doLast {
+    file("${it.explodedAppDirectory}/WEB-INF/lib/tools.jar").setWritable(true)
+}
+
+appengineDeployAll.mustRunAfter ':console-webapp:deploy'
+appengineDeployAll.finalizedBy ':deployCloudSchedulerAndQueue'
+rootProject.deploy.dependsOn appengineDeployAll
+
+rootProject.stage.dependsOn appengineStage
+tasks['war'].dependsOn ':core:processResources'
+tasks['war'].dependsOn ':core:jar'
+
+// Impose verification for all of the deployment tasks.  We haven't found a
+// better way to do this other than to apply to each of them independently.
+// If a new task gets added, it will still fail if "environment"  is not defined
+// because gcpProject is null.  We just won't get as friendly an error message.
+appengineDeployAll.configure rootProject.verifyDeploymentConfig
+appengineDeploy.configure rootProject.verifyDeploymentConfig
+appengineDeployCron.configure rootProject.verifyDeploymentConfig
+appengineDeployDispatch.configure rootProject.verifyDeploymentConfig
+appengineDeployDos.configure rootProject.verifyDeploymentConfig
+appengineDeployIndex.configure rootProject.verifyDeploymentConfig
+appengineDeployQueue.configure rootProject.verifyDeploymentConfig

build.gradle

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
@@ -27,9 +28,8 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.5.0'
-    classpath 'net.ltgt.gradle:gradle-errorprone-plugin:5.1.0'
-    classpath 'com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.4.0'
+    classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.4.1'
+    classpath 'net.ltgt.gradle:gradle-errorprone-plugin:3.1.0'
     classpath 'org.sonatype.aether:aether-api:1.13.1'
     classpath 'org.sonatype.aether:aether-impl:1.13.1'
   }
@@ -40,15 +40,15 @@ plugins {
 
   // Re-enable when compatible with Gradle 8
   // id 'nebula.lint' version '16.0.2'
-  id 'net.ltgt.errorprone' version '5.1.0'
+  id 'net.ltgt.errorprone' version '3.1.0'
   id 'checkstyle'
-  id 'com.gradleup.shadow' version '9.4.0' apply false
+  id 'com.github.johnrengelman.shadow' version '8.1.1'
 
   // NodeJs plugin
-  id "com.github.node-gradle.node" version "7.1.0"
+  id "com.github.node-gradle.node" version "3.0.1"
 
   id 'idea'
-  id 'com.diffplug.spotless' version '8.4.0'
+  id 'com.diffplug.spotless' version '6.20.0'
 
   id 'jacoco'
   id 'com.dorongold.task-tree' version '2.1.0'
@@ -73,15 +73,7 @@ apply from: 'dependency_lic.gradle'
 
 apply from: 'utils.gradle'
 
-// The license-report plugin must run with --no-parallel due to
-// complex cross-subject references. The `mutex` pattern does not
-// help because a mutex does not enforce task execution order.
-// For now we separate checkLicense from build so that the latter may
-// still take advantage of parallelism, which cuts down the build time
-// by about 20%. The presubmit and release procedures that want to check
-// licenses must invoke checkLicense explicitly with the `--no-parallel`
-// flag.
-// tasks.build.dependsOn(tasks.checkLicense)
+tasks.build.dependsOn(tasks.checkLicense)
 
 // Provide defaults for all of the project properties.
 
@@ -92,10 +84,10 @@ apply from: 'utils.gradle'
 // Paths to main and test sources.
 ext.projectRootDir = "${rootDir}"
 
-// Tasks to deploy/stage all services
+// Tasks to deploy/stage all App Engine services
 task deploy {
   group = 'deployment'
-  description = 'Deploys all services.'
+  description = 'Deploys all services to App Engine.'
 }
 
 task stage {
@@ -103,22 +95,26 @@ task stage {
   description = 'Generates application directories for all services.'
 }
 
+// App-engine environment configuration.  We set up all of the variables in
+// the root project.
+
+def environments = ['production', 'sandbox', 'alpha', 'crash', 'qa']
+
 def gcpProject = null
 
 apply from: "${rootDir.path}/projects.gradle"
 
 if (environment == '') {
-    // Keep the project null, this will prevent deployment. Set the
+    // Keep the project null, this will prevent deployment.  Set the
     // environment to "alpha" because other code needs this property to
     // explode the war file.
     environment = 'alpha'
-} else {
+} else if (environment != 'production' && environment != 'sandbox') {
     gcpProject = projects[environment]
     if (gcpProject == null) {
         throw new GradleException("-Penvironment must be one of " +
                                   "${projects.keySet()}.")
     }
-    project(':console-webapp').setProperty('configuration', environment)
 }
 
 rootProject.ext.environment = environment
@@ -161,7 +157,7 @@ allprojects {
     if (!mavenUrl.isEmpty()) {
       maven {
         println "Java dependencies: Using repo ${mavenUrl}..."
-        url = mavenUrl
+        url mavenUrl
         allowInsecureProtocol = allowInsecure == "true"
       }
     } else {
@@ -169,7 +165,7 @@ allprojects {
       mavenCentral()
       google()
       maven {
-        url = "https://packages.confluent.io/maven/"
+        url "https://packages.confluent.io/maven/"
         content {
           includeGroup "io.confluent"
         }
@@ -200,7 +196,6 @@ allprojects {
                                 "--add-exports",
                                 "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"]
         options.forkOptions.jvmArgs = ["-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
-                                       "-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
                                        "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
                                        "-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
                                        "-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
@@ -264,14 +259,6 @@ subprojects {
   // Skip no-op project
   if (project.name == 'services') return
 
-  apply plugin: 'com.gradleup.shadow'
-
-  tasks.configureEach {
-    if (it.class.name.contains('ShadowJar')) {
-      it.zip64 = true
-    }
-  }
-
   ext.createUberJar = {
       taskName,
       binaryName,
@@ -280,8 +267,7 @@ subprojects {
       List<SourceSetOutput> srcOutput = [project.sourceSets.main.output],
       List<String> excludes = [] ->
     project.tasks.create(
-        taskName, project.tasks.shadowJar.class) {
-      zip64 = true
+        taskName, com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
       mergeServiceFiles()
       archiveBaseName = binaryName
       if (mainClass != '') {
@@ -309,7 +295,7 @@ subprojects {
       // We do seem to get duplicates when constructing uber-jars, either
       // this is a product of something in gradle 7 or a product of gradle 7
       // now giving an error about them when it didn't previously.
-      duplicatesStrategy = DuplicatesStrategy.WARN
+      duplicatesStrategy DuplicatesStrategy.WARN
     }
   }
 
@@ -333,14 +319,14 @@ subprojects {
       // exception.
       //
       // For all other projects, due to problem with the gradle-license-report
-      // plugin, the `detached` configurations by this plugin must opt out of
+      // plugin, the dependencyLicenseReport configuration must opt out of
       // dependency-locking. See dependency_lic.gradle for the reason why.
       //
       // To selectively activate dependency locking without hardcoding them
       // in the 'configurations' block, the following code must run after
       // project evaluation, when all configurations have been created.
-      configurations.all {
-        if (!it.name.contains('detachedConfiguration')) {
+      configurations.each {
+        if (it.name != 'dependencyLicenseReport' && it.name != 'integration') {
           it.resolutionStrategy.activateDependencyLocking()
         }
       }
@@ -349,6 +335,9 @@ subprojects {
 
   // Set up all of the deployment projects.
   if (services.contains(project.path)) {
+
+    apply from: "${rootDir.path}/appengine_war.gradle"
+
     // Return early, do not apply the settings below.
     return
   }
@@ -359,14 +348,8 @@ subprojects {
   // search for `flex-template-base-image` and update the parameter value.
   // There are at least two instances, one in core/build.gradle, one in
   // release/stage_beam_pipeline.sh
-  // Also need to change:
-  // - base images in Dockerfiles under core, jetty, and proxy.
-  // - Java installation command in the builder image under release.
-  // - cloudbuild-release.yaml under release.
-  java {
-    sourceCompatibility = JavaVersion.VERSION_25
-    targetCompatibility = JavaVersion.VERSION_25
-  }
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
 
   project.tasks.test.dependsOn runPresubmits
 
@@ -393,19 +376,25 @@ subprojects {
 
   // No need to produce javadoc for the jetty subproject, which has no APIs to
   // expose to users.
-  if (project.name != 'jetty' && !services.contains(project.path)) {
+  if (project.name != 'jetty') {
     javadocSource << project.sourceSets.main.allJava
-    javadocClasspath << { project.sourceSets.main.runtimeClasspath.files }
+    javadocClasspath << project.sourceSets.main.runtimeClasspath
     javadocClasspath << "${buildDir}/generated/sources/annotationProcessor/java/main"
-    if (project.tasks.findByName('compileJava')) {
-      javadocDependentTasks << project.tasks.compileJava
-    }
-    if (project.tasks.findByName('processResources')) {
-      javadocDependentTasks << project.tasks.processResources
-    }
+    javadocDependentTasks << project.tasks.compileJava
   }
 }
 
+// Force SDK download and deployment to be sequential, otherwise parallel tasks
+// will fail. For SDK download, they will try to write to the same location to
+// upgrade gcloud. For deployment, they will try to deploy different services to
+// the same project at the same time.
+for (int i = 1; i < services.size(); i++) {
+  project("${services[i]}").downloadCloudSdk
+          .dependsOn(project("${services[i - 1]}").downloadCloudSdk)
+  project("${services[i]}").appengineDeployAll
+          .dependsOn(project("${services[i - 1]}").appengineDeployAll)
+}
+
 // If "-P verboseTestOutput=true" is passed in, configure all subprojects to dump all of their
 // output and final test status (pass/fail, errors) for each test class.
 //
@@ -538,10 +527,7 @@ task javadoc(type: Javadoc) {
   // In a lot of places we don't write @return so suppress warnings about that.
   // We don't report HTML lint errors because XJB-generated POJO files have
   // incorrect tags (like dangling </p> without the corresponding open tag.
-  // Starting in Java 25, references to primitives and arrays are forbidden.
-  // The JAXB-generated classes have array references, and we suppress the
-  // error with '-reference'.
-  options.addBooleanOption('Xdoclint:all,-missing,-html,-reference', true)
+  options.addBooleanOption('Xdoclint:all,-missing,-html', true)
   options.addBooleanOption("-allow-script-in-comments",true)
   options.tags = ["type:a:Generic Type",
                   "error:a:Expected Error",
@@ -561,14 +547,6 @@ task coreDev {
   dependsOn 'checkLicense'
   dependsOn ':core:check'
   dependsOn 'assemble'
-
-  if (gradle.startParameter.parallelProjectExecutionEnabled
-      && gradle.startParameter.taskNames.contains("coreDev")) {
-    throw new GradleException(
-        "ERROR: 'coreDev' cannot run with --parallel due to checkLicense constraints.\n"
-            + "Please run: ./gradlew coreDev --no-parallel"
-    )
-  }
 }
 
 javadocDependentTasks.each { tasks.javadoc.dependsOn(it) }
@@ -583,7 +561,7 @@ task deployCloudSchedulerAndQueue {
         commandLine 'go', 'run',
                 "./deployCloudSchedulerAndQueue.go",
                 "${rootDir}/core/src/main/java/google/registry/config/files/nomulus-config-${env}.yaml",
-                "${rootDir}/core/src/main/java/google/registry/config/files/tasks/cloud-scheduler-tasks-${env}.xml",
+                "${rootDir}/core/src/main/java/google/registry/env/${env}/default/WEB-INF/cloud-scheduler-tasks.xml",
                 "domain-registry-${env}"
       }
       exec {
@@ -591,7 +569,7 @@ task deployCloudSchedulerAndQueue {
         commandLine 'go', 'run',
                 "./deployCloudSchedulerAndQueue.go",
                 "${rootDir}/core/src/main/java/google/registry/config/files/nomulus-config-${env}.yaml",
-                "${rootDir}/core/src/main/java/google/registry/config/files/cloud-tasks-queue.xml",
+                "${rootDir}/core/src/main/java/google/registry/env/common/default/WEB-INF/cloud-tasks-queue.xml",
                 "domain-registry-${env}"
       }
     }

buildscript-gradle.lockfile

@@ -4,68 +4,59 @@
 com.diffplug.durian:durian-collect:1.2.0=classpath
 com.diffplug.durian:durian-core:1.2.0=classpath
 com.diffplug.durian:durian-io:1.2.0=classpath
-com.diffplug.durian:durian-swt.os:4.3.0=classpath
-com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:8.4.0=classpath
-com.diffplug.spotless:spotless-lib-extra:4.5.0=classpath
-com.diffplug.spotless:spotless-lib:4.5.0=classpath
-com.diffplug.spotless:spotless-plugin-gradle:8.4.0=classpath
+com.diffplug.durian:durian-swt.os:4.2.0=classpath
+com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:6.20.0=classpath
+com.diffplug.spotless:spotless-lib-extra:2.40.0=classpath
+com.diffplug.spotless:spotless-lib:2.40.0=classpath
+com.diffplug.spotless:spotless-plugin-gradle:6.20.0=classpath
 com.dorongold.plugins:task-tree:2.1.0=classpath
 com.dorongold.task-tree:com.dorongold.task-tree.gradle.plugin:2.1.0=classpath
-com.fasterxml.jackson.core:jackson-annotations:2.14.2=classpath
-com.fasterxml.jackson.core:jackson-core:2.14.2=classpath
-com.fasterxml.jackson.core:jackson-databind:2.14.2=classpath
-com.fasterxml.jackson:jackson-bom:2.14.2=classpath
-com.fasterxml.woodstox:woodstox-core:7.1.1=classpath
-com.github.node-gradle.node:com.github.node-gradle.node.gradle.plugin:7.1.0=classpath
-com.github.node-gradle:gradle-node-plugin:7.1.0=classpath
-com.google.cloud.tools:appengine-gradle-plugin:2.5.0=classpath
-com.google.cloud.tools:appengine-plugins-core:0.10.0=classpath
+com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:8.1.1=classpath
+com.github.johnrengelman:shadow:8.1.1=classpath
+com.github.node-gradle.node:com.github.node-gradle.node.gradle.plugin:3.0.1=classpath
+com.github.node-gradle:gradle-node-plugin:3.0.1=classpath
+com.google.cloud.tools:appengine-gradle-plugin:2.4.1=classpath
+com.google.cloud.tools:appengine-plugins-core:0.9.1=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
-com.google.code.gson:gson:2.10.1=classpath
-com.google.errorprone:error_prone_annotations:2.18.0=classpath
+com.google.code.gson:gson:2.8.6=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava-parent:32.1.2-jre=classpath
-com.google.guava:guava:32.1.2-jre=classpath
+com.google.guava:guava:28.2-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
+com.google.j2objc:j2objc-annotations:1.3=classpath
 com.googlecode.concurrent-trees:concurrent-trees:2.6.1=classpath
 com.googlecode.javaewah:JavaEWAH:1.2.3=classpath
-com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.4.0=classpath
-com.gradleup.shadow:shadow-gradle-plugin:9.4.0=classpath
-com.squareup.okhttp3:okhttp:4.12.0=classpath
-com.squareup.okio:okio-jvm:3.6.0=classpath
-com.squareup.okio:okio:3.6.0=classpath
-commons-codec:commons-codec:1.21.0=classpath
-commons-io:commons-io:2.21.0=classpath
-dev.equo.ide:solstice:1.8.1=classpath
-net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:5.1.0=classpath
-net.ltgt.gradle:gradle-errorprone-plugin:5.1.0=classpath
-org.apache.ant:ant-launcher:1.10.15=classpath
-org.apache.ant:ant:1.10.15=classpath
-org.apache.commons:commons-compress:1.21=classpath
+com.squareup.okhttp3:okhttp:4.10.0=classpath
+com.squareup.okio:okio-jvm:3.0.0=classpath
+com.squareup.okio:okio:3.0.0=classpath
+commons-io:commons-io:2.11.0=classpath
+dev.equo.ide:solstice:1.3.1=classpath
+net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0=classpath
+net.ltgt.gradle:gradle-errorprone-plugin:3.1.0=classpath
+org.apache.ant:ant-launcher:1.10.13=classpath
+org.apache.ant:ant:1.10.13=classpath
+org.apache.commons:commons-compress:1.20=classpath
 org.apache.commons:commons-lang3:3.5=classpath
-org.apache.maven:maven-api-annotations:4.0.0-rc-5=classpath
-org.apache.maven:maven-api-xml:4.0.0-rc-5=classpath
-org.apache.maven:maven-xml:4.0.0-rc-5=classpath
-org.checkerframework:checker-qual:3.33.0=classpath
-org.codehaus.plexus:plexus-utils:4.0.2=classpath
-org.codehaus.plexus:plexus-xml:4.1.1=classpath
-org.codehaus.woodstox:stax2-api:4.2.2=classpath
-org.eclipse.jgit:org.eclipse.jgit:7.5.0.202512021534-r=classpath
-org.eclipse.platform:org.eclipse.osgi:3.24.100=classpath
+org.checkerframework:checker-qual:2.10.0=classpath
+org.codehaus.plexus:plexus-utils:3.5.1=classpath
+org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r=classpath
+org.eclipse.platform:org.eclipse.osgi:3.18.300=classpath
 org.glassfish:javax.json:1.0.4=classpath
 org.jdom:jdom2:2.0.6.1=classpath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20-RC3=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20-RC3=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=classpath
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20-RC3=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.6.20=classpath
 org.jetbrains:annotations:13.0=classpath
-org.slf4j:slf4j-api:2.0.17=classpath
+org.ow2.asm:asm-commons:9.4=classpath
+org.ow2.asm:asm-tree:9.4=classpath
+org.ow2.asm:asm:9.4=classpath
+org.slf4j:slf4j-api:1.7.36=classpath
 org.sonatype.aether:aether-api:1.13.1=classpath
 org.sonatype.aether:aether-impl:1.13.1=classpath
 org.sonatype.aether:aether-spi:1.13.1=classpath
 org.sonatype.aether:aether-util:1.13.1=classpath
 org.tukaani:xz:1.9=classpath
-org.vafer:jdependency:2.15=classpath
-org.yaml:snakeyaml:2.0=classpath
+org.vafer:jdependency:2.8.0=classpath
+org.yaml:snakeyaml:1.21=classpath
 empty=

common/build.gradle

@@ -65,5 +65,4 @@ dependencies {
 
   testImplementation deps['org.junit.jupiter:junit-jupiter-api']
   testImplementation deps['org.junit.jupiter:junit-jupiter-engine']
-  testImplementation deps['org.junit.platform:junit-platform-launcher']
 }

common/gradle.lockfile

@@ -1,85 +1,69 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.github.ben-manes.caffeine:caffeine:3.2.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
+aopalliance:aopalliance:1.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
 com.google.auto.value:auto-value-annotations:1.11.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.errorprone:error_prone_annotation:2.48.0=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
-com.google.errorprone:error_prone_annotations:2.43.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.errorprone:error_prone_annotations:2.48.0=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.48.0=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.google.errorprone:error_prone_core:2.48.0=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.google.flogger:flogger:0.9=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.googlejavaformat:google-java-format:1.34.1=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testing,testingAnnotationProcessor,testingCompileClasspath
+com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.28.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+com.google.errorprone:error_prone_annotations:2.7.1=checkstyle
+com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.errorprone:error_prone_type_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.errorprone:javac:9+181-r4173-1=errorproneJavac
+com.google.flogger:flogger:0.8=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+com.google.guava:failureaccess:1.0.1=annotationProcessor,checkstyle,errorprone,testAnnotationProcessor,testingAnnotationProcessor
 com.google.guava:failureaccess:1.0.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.guava:failureaccess:1.0.3=annotationProcessor,checkstyle,testAnnotationProcessor,testingAnnotationProcessor
-com.google.guava:guava:33.4.3-android=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.guava:guava:33.4.8-jre=checkstyle
-com.google.guava:guava:33.5.0-jre=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testing,testingAnnotationProcessor,testingCompileClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.google.protobuf:protobuf-java:4.33.2=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-com.google.truth:truth:1.4.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.puppycrawl.tools:checkstyle:10.24.0=checkstyle
-commons-beanutils:commons-beanutils:1.10.1=checkstyle
-commons-codec:commons-codec:1.15=checkstyle
+com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.guava:guava:31.0.1-jre=checkstyle
+com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.guava:guava:33.2.1-android=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.j2objc:j2objc-annotations:1.3=checkstyle
+com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath,testingCompileClasspath
+com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+com.google.truth:truth:1.4.4=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+com.puppycrawl.tools:checkstyle:9.3=checkstyle
+commons-beanutils:commons-beanutils:1.9.4=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
-info.picocli:picocli:4.7.7=checkstyle
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.16=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-joda-time:joda-time:2.14.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+info.picocli:picocli:4.6.2=checkstyle
+io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testing,testingAnnotationProcessor,testingCompileClasspath
+jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+joda-time:joda-time:2.13.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-org.antlr:antlr4-runtime:4.13.2=checkstyle
-org.apache.commons:commons-lang3:3.8.1=checkstyle
-org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
-org.apache.httpcomponents:httpclient:4.5.13=checkstyle
-org.apache.httpcomponents:httpcore:4.4.14=checkstyle
-org.apache.maven.doxia:doxia-core:1.12.0=checkstyle
-org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle
-org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
-org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
-org.apache.xbean:xbean-reflect:3.7=checkstyle
+net.sf.saxon:Saxon-HE:10.6=checkstyle
+org.antlr:antlr4-runtime:4.9.3=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.19.0=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
-org.checkerframework:checker-qual:3.43.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
-org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
-org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
-org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
-org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
+org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+org.checkerframework:checker-qual:3.12.0=checkstyle
+org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
+org.checkerframework:checker-qual:3.42.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
 org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.12=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.12=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.12=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.12=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle
-org.jspecify:jspecify:1.0.0=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testing,testingAnnotationProcessor,testingCompileClasspath
-org.junit.jupiter:junit-jupiter-api:5.13.4=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.13.4=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.13.4=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.13.4=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.13.4=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.13.4=testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:0.3.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+org.junit.jupiter:junit-jupiter-api:5.11.2=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.11.2=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.11.2=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.11.2=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:5.11.2=testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-commons:9.9=jacocoAnt
-org.ow2.asm:asm-tree:9.9=jacocoAnt
-org.ow2.asm:asm:9.8=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-org.ow2.asm:asm:9.9=jacocoAnt
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor,testingAnnotationProcessor
+org.ow2.asm:asm-commons:9.7=jacocoAnt
+org.ow2.asm:asm-tree:9.7=jacocoAnt
+org.ow2.asm:asm:9.7=compileClasspath,deploy_jar,jacocoAnt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
 org.reflections:reflections:0.10.2=checkstyle
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-empty=shadow,testingCompile,testingRuntime,testingRuntimeClasspath
+empty=testingCompile,testingRuntime,testingRuntimeClasspath

common/src/main/java/google/registry/util/Clock.java

@@ -15,9 +15,6 @@
 package google.registry.util;
 
 import java.io.Serializable;
-import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import javax.annotation.concurrent.ThreadSafe;
 import org.joda.time.DateTime;
 
@@ -33,14 +30,5 @@ import org.joda.time.DateTime;
 public interface Clock extends Serializable {
 
   /** Returns current time in UTC timezone. */
-  @Deprecated
   DateTime nowUtc();
-
-  /** Returns current Instant (which is always in UTC). */
-  Instant now();
-
-  /** Returns the current time as a {@link ZonedDateTime} in UTC. */
-  default ZonedDateTime nowDate() {
-    return ZonedDateTime.ofInstant(now(), ZoneOffset.UTC);
-  }
 }

common/src/main/java/google/registry/util/DateTimeUtils.java

@@ -20,9 +20,6 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 import java.sql.Date;
-import java.time.Instant;
-import java.time.ZoneOffset;
-import javax.annotation.Nullable;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
@@ -31,52 +28,28 @@ import org.joda.time.LocalDate;
 public abstract class DateTimeUtils {
 
   /** The start of the epoch, in a convenient constant. */
-  @Deprecated public static final DateTime START_OF_TIME = new DateTime(0, DateTimeZone.UTC);
-
-  /** The start of the UNIX epoch (which is defined in UTC), in a convenient constant. */
-  public static final Instant START_INSTANT = Instant.ofEpochMilli(0);
+  public static final DateTime START_OF_TIME = new DateTime(0, DateTimeZone.UTC);
 
   /**
    * A date in the far future that we can treat as infinity.
    *
-   * <p>This value is (2^63-1)/1000 rounded down. Postgres can store dates as 64 bit microseconds,
-   * but Java uses milliseconds, so this is the largest representable date that will survive a
+   * <p>This value is (2^63-1)/1000 rounded down. AppEngine stores dates as 64 bit microseconds, but
+   * Java uses milliseconds, so this is the largest representable date that will survive a
    * round-trip through the database.
    */
-  @Deprecated
   public static final DateTime END_OF_TIME = new DateTime(Long.MAX_VALUE / 1000, DateTimeZone.UTC);
 
-  /**
-   * An instant in the far future that we can treat as infinity.
-   *
-   * <p>This value is (2^63-1)/1000 rounded down. Postgres can store dates as 64 bit microseconds,
-   * but Java uses milliseconds, so this is the largest representable date that will survive a
-   * round-trip through the database.
-   */
-  public static final Instant END_INSTANT = Instant.ofEpochMilli(Long.MAX_VALUE / 1000);
-
   /** Returns the earliest of a number of given {@link DateTime} instances. */
   public static DateTime earliestOf(DateTime first, DateTime... rest) {
-    return earliestDateTimeOf(Lists.asList(first, rest));
-  }
-
-  /** Returns the earliest of a number of given {@link Instant} instances. */
-  public static Instant earliestOf(Instant first, Instant... rest) {
     return earliestOf(Lists.asList(first, rest));
   }
 
   /** Returns the earliest element in a {@link DateTime} iterable. */
-  public static DateTime earliestDateTimeOf(Iterable<DateTime> dates) {
+  public static DateTime earliestOf(Iterable<DateTime> dates) {
     checkArgument(!Iterables.isEmpty(dates));
     return Ordering.<DateTime>natural().min(dates);
   }
 
-  /** Returns the earliest element in a {@link Instant} iterable. */
-  public static Instant earliestOf(Iterable<Instant> instants) {
-    checkArgument(!Iterables.isEmpty(instants));
-    return Ordering.<Instant>natural().min(instants);
-  }
-
   /** Returns the latest of a number of given {@link DateTime} instances. */
   public static DateTime latestOf(DateTime first, DateTime... rest) {
     return latestOf(Lists.asList(first, rest));
@@ -93,63 +66,29 @@ public abstract class DateTimeUtils {
     return !timeToCheck.isAfter(timeToCompareTo);
   }
 
-  /** Returns whether the first {@link Instant} is equal to or earlier than the second. */
-  public static boolean isBeforeOrAt(Instant timeToCheck, Instant timeToCompareTo) {
-    return !timeToCheck.isAfter(timeToCompareTo);
-  }
-
   /** Returns whether the first {@link DateTime} is equal to or later than the second. */
   public static boolean isAtOrAfter(DateTime timeToCheck, DateTime timeToCompareTo) {
     return !timeToCheck.isBefore(timeToCompareTo);
   }
 
-  /** Returns whether the first {@link Instant} is equal to or later than the second. */
-  public static boolean isAtOrAfter(Instant timeToCheck, Instant timeToCompareTo) {
-    return !timeToCheck.isBefore(timeToCompareTo);
-  }
-
   /**
    * Adds years to a date, in the {@code Duration} sense of semantic years. Use this instead of
    * {@link DateTime#plusYears} to ensure that we never end up on February 29.
    */
-  @Deprecated
   public static DateTime leapSafeAddYears(DateTime now, int years) {
     checkArgument(years >= 0);
     return years == 0 ? now : now.plusYears(1).plusYears(years - 1);
   }
 
-  /**
-   * Adds years to a date, in the {@code Duration} sense of semantic years. Use this instead of
-   * {@link java.time.ZonedDateTime#plusYears} to ensure that we never end up on February 29.
-   */
-  public static Instant leapSafeAddYears(Instant now, long years) {
-    checkArgument(years >= 0);
-    return (years == 0)
-        ? now
-        : now.atZone(ZoneOffset.UTC).plusYears(1).plusYears(years - 1).toInstant();
-  }
-
   /**
    * Subtracts years from a date, in the {@code Duration} sense of semantic years. Use this instead
    * of {@link DateTime#minusYears} to ensure that we never end up on February 29.
    */
-  @Deprecated
   public static DateTime leapSafeSubtractYears(DateTime now, int years) {
     checkArgument(years >= 0);
     return years == 0 ? now : now.minusYears(1).minusYears(years - 1);
   }
 
-  /**
-   * Subtracts years from a date, in the {@code Duration} sense of semantic years. Use this instead
-   * of {@link java.time.ZonedDateTime#minusYears} to ensure that we never end up on February 29.
-   */
-  public static Instant leapSafeSubtractYears(Instant now, int years) {
-    checkArgument(years >= 0);
-    return (years == 0)
-        ? now
-        : now.atZone(ZoneOffset.UTC).minusYears(1).minusYears(years - 1).toInstant();
-  }
-
   public static Date toSqlDate(LocalDate localDate) {
     return new Date(localDate.toDateTimeAtStartOfDay().getMillis());
   }
@@ -157,34 +96,4 @@ public abstract class DateTimeUtils {
   public static LocalDate toLocalDate(Date date) {
     return new LocalDate(date.getTime(), DateTimeZone.UTC);
   }
-
-  /** Convert a joda {@link DateTime} to a java.time {@link Instant}, null-safe. */
-  @Nullable
-  public static Instant toInstant(@Nullable DateTime dateTime) {
-    return (dateTime == null) ? null : Instant.ofEpochMilli(dateTime.getMillis());
-  }
-
-  /** Convert a java.time {@link Instant} to a joda {@link DateTime}, null-safe. */
-  @Nullable
-  public static DateTime toDateTime(@Nullable Instant instant) {
-    return (instant == null) ? null : new DateTime(instant.toEpochMilli(), DateTimeZone.UTC);
-  }
-
-  /** Convert a java.time {@link java.time.Instant} to a joda {@link org.joda.time.Instant}. */
-  @Nullable
-  public static org.joda.time.Instant toJodaInstant(@Nullable java.time.Instant instant) {
-    return (instant == null) ? null : org.joda.time.Instant.ofEpochMilli(instant.toEpochMilli());
-  }
-
-  public static Instant plusYears(Instant instant, int years) {
-    return instant.atZone(ZoneOffset.UTC).plusYears(years).toInstant();
-  }
-
-  public static Instant plusDays(Instant instant, int days) {
-    return instant.atZone(ZoneOffset.UTC).plusDays(days).toInstant();
-  }
-
-  public static Instant minusDays(Instant instant, int days) {
-    return instant.atZone(ZoneOffset.UTC).minusDays(days).toInstant();
-  }
 }

common/src/main/java/google/registry/util/SystemClock.java

@@ -16,9 +16,8 @@ package google.registry.util;
 
 import static org.joda.time.DateTimeZone.UTC;
 
-import jakarta.inject.Inject;
-import java.time.Instant;
 import javax.annotation.concurrent.ThreadSafe;
+import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /** Clock implementation that proxies to the real system clock. */
@@ -35,13 +34,4 @@ public class SystemClock implements Clock {
   public DateTime nowUtc() {
     return DateTime.now(UTC);
   }
-
-  @Override
-  public Instant now() {
-    // Truncate to milliseconds to match the precision of Joda DateTime and our database schema
-    // (which uses millisecond precision via DateTimeConverter). This prevents subtle comparison
-    // bugs where a high-precision Instant would be considered "after" a truncated database
-    // timestamp.
-    return Instant.now().truncatedTo(java.time.temporal.ChronoUnit.MILLIS);
-  }
 }

common/src/main/java/google/registry/util/SystemSleeper.java

@@ -17,9 +17,9 @@ package google.registry.util;
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.util.concurrent.Uninterruptibles;
-import jakarta.inject.Inject;
 import java.io.Serializable;
 import javax.annotation.concurrent.ThreadSafe;
+import javax.inject.Inject;
 import org.joda.time.ReadableDuration;
 
 /** Implementation of {@link Sleeper} for production use. */

common/src/testing/java/google/registry/testing/FakeClock.java

@@ -19,7 +19,6 @@ import static org.joda.time.DateTimeZone.UTC;
 import static org.joda.time.Duration.millis;
 
 import google.registry.util.Clock;
-import java.time.Instant;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.concurrent.ThreadSafe;
 import org.joda.time.DateTime;
@@ -55,11 +54,6 @@ public final class FakeClock implements Clock {
     return new DateTime(currentTimeMillis.addAndGet(autoIncrementStepMs), UTC);
   }
 
-  @Override
-  public Instant now() {
-    return Instant.ofEpochMilli(currentTimeMillis.addAndGet(autoIncrementStepMs));
-  }
-
   /**
    * Sets the increment applied to the clock whenever it is queried. The increment is zero by
    * default: the clock is left unchanged when queried.

common/src/testing/java/google/registry/testing/truth/TextDiffSubject.java

@@ -63,7 +63,6 @@ public class TextDiffSubject extends Subject {
 
   private final ImmutableList<String> actual;
   private DiffFormat diffFormat = DiffFormat.SIDE_BY_SIDE_MARKDOWN;
-  private ImmutableList<String> comments = ImmutableList.of();
 
   protected TextDiffSubject(FailureMetadata metadata, List<String> actual) {
     super(metadata, actual);
@@ -84,27 +83,13 @@ public class TextDiffSubject extends Subject {
     return this;
   }
 
-  /** If set, ignore lines that start with the given string. */
-  public TextDiffSubject ignoringLinesStartingWith(String... comments) {
-    this.comments = ImmutableList.copyOf(comments);
-    return this;
-  }
-
-  private ImmutableList<String> filterComments(List<String> lines) {
-    return lines.stream()
-        .filter(line -> !line.isBlank())
-        .filter(line -> comments.stream().noneMatch(line::startsWith))
-        .collect(ImmutableList.toImmutableList());
-  }
-
   public void hasSameContentAs(List<String> expectedContent) {
     checkNotNull(expectedContent, "expectedContent");
-    ImmutableList<String> filteredExpected = filterComments(expectedContent);
-    ImmutableList<String> filteredActual = filterComments(actual);
-    if (filteredExpected.equals(filteredActual)) {
+    ImmutableList<String> expected = ImmutableList.copyOf(expectedContent);
+    if (expected.equals(actual)) {
       return;
     }
-    String diffString = diffFormat.generateDiff(filteredExpected, filteredActual);
+    String diffString = diffFormat.generateDiff(expected, actual);
     failWithoutActual(
         Fact.simpleFact(
             Joiner.on('\n')

config/dependency-license/allowed_licenses.json

@@ -244,12 +244,6 @@
     {
       "moduleLicense": "The JSON License"
     },
-    {
-      "moduleLicense": "LGPL-2.1-or-later"
-    },
-    {
-      "moduleLicense": "Apache License version 2.0"
-    },
     {
       "moduleLicense": "LGPL-2.1+"
     },
@@ -311,11 +305,7 @@
     {
       // "Apache License, Version 2.0".
       "moduleLicense": null,
-      "moduleName": "tools.jackson:jackson-bom"
-    },
-    {
-      // "Apache License, Version 2.0".
-      "moduleLicense": null,
+      "moduleVersion": "26.26.0",
       "moduleName": "com.google.cloud:libraries-bom"
     },
     {
@@ -380,6 +370,7 @@
     // "Apache License, Version 2.0".
     {
       "moduleLicense": null,
+      "moduleVersion": "1.33.0",
       "moduleName": "io.opentelemetry:opentelemetry-bom"
     },
     {

config/nom_build.py

@@ -56,7 +56,7 @@ PROPERTIES_HEADER = """\
 # nom_build), run ./nom_build --help.
 #
 # DO NOT EDIT THIS FILE BY HAND
-org.gradle.jvmargs=-Xmx4096m
+org.gradle.jvmargs=-Xmx1024m
 org.gradle.caching=true
 org.gradle.parallel=true
 """
@@ -104,7 +104,7 @@ PROPERTIES = [
     Property('testFilter',
              'Comma separated list of test patterns, if specified run only '
              'these.'),
-    Property('environment', 'Environment for deployment and staging.'),
+    Property('environment', 'GAE Environment for deployment and staging.'),
 
     # Cloud SQL properties
     Property('dbServer',
@@ -117,19 +117,28 @@ PROPERTIES = [
     Property('dbUser', 'Database user name for use in connection'),
     Property('dbPassword', 'Database password for use in connection'),
 
+    Property('publish_repo',
+             'Maven repository that hosts the Cloud SQL schema jar and the '
+             'registry server test jars. Such jars are needed for '
+             'server/schema integration tests. Please refer to <a '
+             'href="./integration/README.md">integration project</a> for more '
+             'information.'),
+    Property('baseSchemaTag',
+             'The nomulus version tag of the schema for use in the schema'
+             'deployment integration test (:db:schemaIncrementalDeployTest)'),
+    Property('schema_version',
+             'The nomulus version tag of the schema for use in a database'
+             'integration test.'),
+    Property('nomulus_version',
+             'The version of nomulus to test against in a database '
+             'integration test.'),
     Property('dot_path',
              'The path to "dot", part of the graphviz package that converts '
              'a BEAM pipeline to image. Setting this property to empty string '
              'will disable image generation.',
              '/usr/bin/dot'),
     Property('pipeline',
-             'The name of the Beam pipeline being staged.'),
-    Property('nomulus_env',
-             'For use by scripts. Normally not set manually.'),
-    Property('schema_env',
-             'For use by scripts. Normally not set manually.'),
-    Property('schemaTestArtifactsDir',
-             'For use by scripts. Normally not set manually.')
+             'The name of the Beam pipeline being staged.')
 ]
 
 GRADLE_FLAGS = [

config/presubmits.py

@@ -25,11 +25,7 @@ import textwrap
 import re
 
 # We should never analyze any generated files
-UNIVERSALLY_SKIPPED_PATTERNS = {"/build/", "cloudbuild-caches", "/out/", ".git/",
-     ".gradle/", "/dist/", "/console-alpha/", "/console-crash/", "/console-qa",
-     "/console-sandbox", "/console-production", "karma.conf.js", "polyfills.ts",
-     "test.ts", "/docs/console-endpoints/", "/bin/generated-sources/",
-     "/bin/generated-test-sources/", "src/main/generated", "src/test/generated"}
+UNIVERSALLY_SKIPPED_PATTERNS = {"/build/", "cloudbuild-caches", "/out/", ".git/", ".gradle/", "/dist/", "karma.conf.js", "polyfills.ts", "test.ts", "/docs/console-endpoints/"}
 # We can't rely on CI to have the Enum package installed so we do this instead.
 FORBIDDEN = 1
 REQUIRED = 2
@@ -91,22 +87,25 @@ PRESUBMITS = {
     PresubmitCheck(
         r".*Copyright 20\d{2} The Nomulus Authors\. All Rights Reserved\.",
         ("java", "js", "soy", "sql", "py", "sh", "gradle", "ts"), {
-            ".git", "/build/", "node_modules/", "LoggerConfig.java", "registrar_bin.",
+            ".git", "/build/", "/bin/generated-sources/", "/bin/generated-test-sources/",
+            "node_modules/", "LoggerConfig.java", "registrar_bin.",
             "registrar_dbg.", "google-java-format-diff.py",
-            "nomulus.golden.sql", "soyutils_usegoog.js", "javascript/checks.js"
+            "nomulus.golden.sql", "soyutils_usegoog.js", "javascript/checks.js",
+            "/src/main/generated", "/src/test/generated"
         }, REQUIRED):
         "File did not include the license header.",
 
     # Files must end in a newline
-    PresubmitCheck(r".*\n$", ("java", "js", "soy", "sql", "py", "sh", "gradle", "ts", "xml"),
-                   {"node_modules/", ".idea"}, REQUIRED):
+    PresubmitCheck(r".*\n$", ("java", "js", "soy", "sql", "py", "sh", "gradle", "ts"),
+                   {"node_modules/"}, REQUIRED):
         "Source files must end in a newline.",
 
     # System.(out|err).println should only appear in tools/ or load-testing/
     PresubmitCheck(
         r".*\bSystem\.(out|err)\.print", "java", {
-            "/tools/", "/example/", "/load-testing/",
-            "RegistryTestServerMain.java", "TestServerExtension.java"
+            "StackdriverDashboardBuilder.java", "/tools/", "/example/",
+            "/load-testing/", "RegistryTestServerMain.java",
+            "TestServerExtension.java", "FlowDocumentationTool.java"
         }):
         "System.(out|err).println is only allowed in tools/ packages. Please "
         "use a logger instead.",
@@ -119,7 +118,7 @@ PRESUBMITS = {
     ):
         "In SOY please use the ({@param name: string} /** User name. */) style"
         " parameter passing instead of the ( * @param name User name.) style "
-        "parameter passing.",
+        "parameter pasing.",
     PresubmitCheck(
         r'.*\{[^}]+\w+:\s+"',
         "soy",
@@ -138,6 +137,41 @@ PRESUBMITS = {
         {},
     ):
         "All soy templates must use strict autoescaping",
+
+    # various JS linting checks
+    PresubmitCheck(
+        r".*goog\.base\(",
+        "js",
+        {"/node_modules/"},
+    ):
+        "Use of goog.base is not allowed.",
+    PresubmitCheck(
+        r".*goog\.dom\.classes",
+        "js",
+        {"/node_modules/"},
+    ):
+        "Instead of goog.dom.classes, use goog.dom.classlist which is smaller "
+        "and faster.",
+    PresubmitCheck(
+        r".*goog\.getMsg",
+        "js",
+        {"/node_modules/"},
+    ):
+        "Put messages in Soy, instead of using goog.getMsg().",
+    PresubmitCheck(
+        r".*(innerHTML|outerHTML)\s*(=|[+]=)([^=]|$)",
+        "js",
+        {"/node_modules/", "registrar_bin."},
+    ):
+        "Do not assign directly to the dom. Use goog.dom.setTextContent to set"
+        " to plain text, goog.dom.removeChildren to clear, or "
+        "soy.renderElement to render anything else",
+    PresubmitCheck(
+        r".*console\.(log|info|warn|error)",
+        "js",
+        {"/node_modules/", "google/registry/ui/js/util.js", "registrar_bin."},
+    ):
+        "JavaScript files should not include console logging.",
     PresubmitCheck(
         r".*\nimport (static )?.*\.shaded\..*",
         "java",
@@ -174,20 +208,6 @@ PRESUBMITS = {
         {"/node_modules/"},
     ):
         "Do not use javax.servlet.* Use jakarta.servlet.* instead.",
-    PresubmitCheck(
-        r".*javax\.inject\..*",
-        "java",
-        {"/node_modules/"},
-    ):
-        "Do not use javax.inject.* Use jakarta.inject.* instead.",
-    PresubmitCheck(
-        r".*import jakarta.persistence.(Pre|Post)(Persist|Load|Remove|Update);",
-        "java",
-        {"EntityCallbacksListener.java"},
-    ):
-        "Hibernate lifecycle events aren't called for embedded entities, so it's "
-        "usually best to avoid them. Instead, use the annotations defined in "
-        "EntityCallbacksListener.java"
 }
 
 # Note that this regex only works for one kind of Flyway file.  If we want to
@@ -275,6 +295,26 @@ def verify_flyway_index():
   return not success
 
 
+def verify_javascript_deps():
+  """Verifies that we haven't introduced any new javascript dependencies."""
+  with open('package.json') as f:
+    package = json.load(f)
+
+  deps = list(package['dependencies'].keys())
+  if deps != EXPECTED_JS_PACKAGES:
+    print('Unexpected javascript dependencies.  Was expecting '
+          '%s, got %s.' % (EXPECTED_JS_PACKAGES, deps))
+    print(textwrap.dedent("""
+        * If the new dependencies are intentional, please verify that the
+        * license is one of the allowed licenses (see
+        * config/dependency-license/allowed_licenses.json) and add an entry
+        * for the package (with the license in a comment) to the
+        * EXPECTED_JS_PACKAGES variable in config/presubmits.py.
+        """))
+    return True
+  return False
+
+
 def get_files():
   for root, dirnames, filenames in os.walk("."):
     for filename in filenames:
@@ -282,6 +322,7 @@ def get_files():
 
 
 if __name__ == "__main__":
+  print('python version is %s' % sys.version)
   failed = False
   for file in get_files():
     error_messages = []
@@ -298,5 +339,8 @@ if __name__ == "__main__":
   # when we put it here it fails fast before all of the tests are run.
   failed |= verify_flyway_index()
 
+  # Make sure we haven't introduced any javascript dependencies.
+  failed |= verify_javascript_deps()
+
   if failed:
     sys.exit(1)

console-webapp/.gitignore

@@ -44,4 +44,3 @@ Thumbs.db
 
 # Build artifact
 /staged/dist
-/staged/console-*

console-webapp/README.md

@@ -9,7 +9,7 @@ expected to change.
 
 ## Deployment
 
-The webapp is deployed with the nomulus default service war to GKE.
+Webapp is deployed with the nomulus default service war to Google App Engine.
 During nomulus default service war build task, gradle script triggers the
 following:
 

console-webapp/angular.json

@@ -15,7 +15,7 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular/build:application",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
             "outputPath": {
               "base": "staged/dist/",
@@ -96,23 +96,17 @@
               "sourceMap": true,
               "namedChunks": true
             },
-            "qa": {
-              "optimization": false,
-              "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
-            },
             "development": {
               "optimization": false,
               "extractLicenses": false,
               "sourceMap": true,
-              "namedChunks": true,
+              "namedChunks": true
             }
           },
           "defaultConfiguration": "production"
         },
         "serve": {
-          "builder": "@angular/build:dev-server",
+          "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
               "buildTarget": "console-webapp:build:production"
@@ -126,9 +120,6 @@
             "sandbox": {
               "buildTarget": "console-webapp:build:sandbox"
             },
-            "qa": {
-              "buildTarget": "console-webapp:build:qa"
-            },
             "development": {
               "buildTarget": "console-webapp:build:development"
             }
@@ -136,18 +127,16 @@
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
-          "builder": "@angular/build:extract-i18n",
+          "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
             "buildTarget": "console-webapp:build"
           }
         },
         "test": {
-          "builder": "@angular/build:karma",
+          "builder": "@angular-devkit/build-angular:karma",
           "options": {
             "main": "src/test.ts",
-            "polyfills": [
-              "src/polyfills.ts"
-            ],
+            "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
             "inlineStyleLanguage": "scss",
@@ -185,31 +174,5 @@
     "schematicCollections": [
       "@angular-eslint/schematics"
     ]
-  },
-  "schematics": {
-    "@schematics/angular:component": {
-      "type": "component"
-    },
-    "@schematics/angular:directive": {
-      "type": "directive"
-    },
-    "@schematics/angular:service": {
-      "type": "service"
-    },
-    "@schematics/angular:guard": {
-      "typeSeparator": "."
-    },
-    "@schematics/angular:interceptor": {
-      "typeSeparator": "."
-    },
-    "@schematics/angular:module": {
-      "typeSeparator": "."
-    },
-    "@schematics/angular:pipe": {
-      "typeSeparator": "."
-    },
-    "@schematics/angular:resolver": {
-      "typeSeparator": "."
-    }
   }
 }

console-webapp/build.gradle

@@ -40,55 +40,15 @@ task runConsoleWebappUnitTests(type: Exec) {
 task buildConsoleWebapp(type: Exec) {
   workingDir "${consoleDir}/"
   executable 'npm'
-  def configuration = project.getProperty('configuration')
+  def configuration = project.hasProperty('configuration') ?
+    project.getProperty('configuration') :
+    'production'
   args 'run', "build", "--configuration=${configuration}"
   doFirst {
     println "Building console for environment: ${configuration}"
   }
 }
 
-task buildConsoleForAll() {}
-
-def createConsoleTask = { env ->
-  project.tasks.register("buildConsoleFor${env.capitalize()}", Exec) {
-    workingDir "${consoleDir}/"
-    executable 'npm'
-    args 'run', 'build', "--configuration=${env}"
-    doFirst {
-      println "Building console for environment: ${env}"
-    }
-    doLast {
-      copy {
-        from "${consoleDir}/staged/dist/"
-        into "${consoleDir}/staged/console-${env}"
-      }
-      delete "${consoleDir}/staged/dist"
-    }
-    dependsOn(tasks.npmInstallDeps)
-  }
-  project.tasks.register("deleteConsoleFor${env.capitalize()}", Delete) {
-    delete "${consoleDir}/staged/console-${env}"
-  }
-  tasks.named('clean') {
-    dependsOn(tasks.named("deleteConsoleFor${env.capitalize()}"))
-  }
-  tasks.named('buildConsoleForAll') {
-    dependsOn(tasks.named("buildConsoleFor${env.capitalize()}"))
-  }
-}
-
-['alpha', 'crash', 'qa', 'sandbox', 'production'].forEach {env ->
-  createConsoleTask(env)
-}
-
-// Force an order so we don't run these tasks in parallel.
-tasks.buildConsoleForCrash.mustRunAfter(tasks.buildConsoleForAlpha)
-tasks.buildConsoleForQa.mustRunAfter(tasks.buildConsoleForCrash)
-tasks.buildConsoleForSandbox.mustRunAfter(tasks.buildConsoleForQa)
-tasks.buildConsoleForProduction.mustRunAfter(tasks.buildConsoleForSandbox)
-// This task must run last, otherwise the previous tasks will have deleted the "dist" folder.
-tasks.buildConsoleWebapp.mustRunAfter(tasks.buildConsoleForProduction)
-
 task applyFormatting(type: Exec) {
   workingDir "${consoleDir}/"
   executable 'npm'
@@ -101,9 +61,16 @@ task checkFormatting(type: Exec) {
   args 'run', 'prettify:check'
 }
 
+task deploy(type: Exec) {
+  workingDir "${consoleDir}/staged"
+  executable 'gcloud'
+  args 'app', 'deploy', "${projectParam}", '--quiet'
+}
+
 tasks.buildConsoleWebapp.dependsOn(tasks.npmInstallDeps)
 tasks.runConsoleWebappUnitTests.dependsOn(tasks.npmInstallDeps)
 tasks.applyFormatting.dependsOn(tasks.npmInstallDeps)
 tasks.checkFormatting.dependsOn(tasks.npmInstallDeps)
 tasks.build.dependsOn(tasks.checkFormatting)
 tasks.build.dependsOn(tasks.runConsoleWebappUnitTests)
+tasks.deploy.dependsOn(tasks.buildConsoleWebapp)

console-webapp/gradle.lockfile

@@ -1,63 +1,47 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,testAnnotationProcessor
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
-com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.2=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=checkstyle
-com.google.errorprone:error_prone_annotation:2.48.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
-com.google.errorprone:error_prone_annotations:2.48.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_check_api:2.48.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.48.0=annotationProcessor,testAnnotationProcessor
-com.google.googlejavaformat:google-java-format:1.34.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.3=annotationProcessor,checkstyle,testAnnotationProcessor
-com.google.guava:guava:33.4.8-jre=checkstyle
-com.google.guava:guava:33.5.0-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,testAnnotationProcessor
-com.google.protobuf:protobuf-java:4.33.2=annotationProcessor,testAnnotationProcessor
-com.puppycrawl.tools:checkstyle:10.24.0=checkstyle
-commons-beanutils:commons-beanutils:1.10.1=checkstyle
-commons-codec:commons-codec:1.15=checkstyle
+aopalliance:aopalliance:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor
+com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.7.1=checkstyle
+com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:error_prone_type_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.errorprone:javac:9+181-r4173-1=errorproneJavac
+com.google.guava:failureaccess:1.0.1=annotationProcessor,checkstyle,errorprone,testAnnotationProcessor
+com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:guava:31.0.1-jre=checkstyle
+com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle
+com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor
+com.google.j2objc:j2objc-annotations:1.3=checkstyle
+com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor
+com.puppycrawl.tools:checkstyle:9.3=checkstyle
+commons-beanutils:commons-beanutils:1.9.4=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
-info.picocli:picocli:4.7.7=checkstyle
-io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,testAnnotationProcessor
-io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,testAnnotationProcessor
-javax.inject:javax.inject:1=annotationProcessor,testAnnotationProcessor
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-org.antlr:antlr4-runtime:4.13.2=checkstyle
-org.apache.commons:commons-lang3:3.8.1=checkstyle
-org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
-org.apache.httpcomponents:httpclient:4.5.13=checkstyle
-org.apache.httpcomponents:httpcore:4.4.14=checkstyle
-org.apache.maven.doxia:doxia-core:1.12.0=checkstyle
-org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle
-org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
-org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
-org.apache.xbean:xbean-reflect:3.7=checkstyle
-org.checkerframework:checker-qual:3.19.0=annotationProcessor,testAnnotationProcessor
-org.checkerframework:checker-qual:3.49.3=checkstyle
-org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
-org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
-org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
-org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
-org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
+info.picocli:picocli:4.6.2=checkstyle
+io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
+io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
+javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
+net.sf.saxon:Saxon-HE:10.6=checkstyle
+org.antlr:antlr4-runtime:4.9.3=checkstyle
+org.checkerframework:checker-qual:3.12.0=checkstyle
+org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor
+org.jacoco:org.jacoco.agent:0.8.12=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.12=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.12=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.12=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle
-org.jspecify:jspecify:1.0.0=annotationProcessor,checkstyle,testAnnotationProcessor
-org.ow2.asm:asm-commons:9.9=jacocoAnt
-org.ow2.asm:asm-tree:9.9=jacocoAnt
-org.ow2.asm:asm:9.9=jacocoAnt
-org.pcollections:pcollections:4.0.1=annotationProcessor,testAnnotationProcessor
+org.ow2.asm:asm-commons:9.7=jacocoAnt
+org.ow2.asm:asm-tree:9.7=jacocoAnt
+org.ow2.asm:asm:9.7=jacocoAnt
+org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotationProcessor
 org.reflections:reflections:0.10.2=checkstyle
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-empty=compileClasspath,deploy_jar,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
+empty=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

console-webapp/gradle.properties

@@ -1 +0,0 @@
-configuration=production

console-webapp/karma.conf.js

@@ -21,7 +21,7 @@ module.exports = function (config) {
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage'),
-      
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
     client: {
       jasmine: {

console-webapp/package.json

@@ -16,31 +16,31 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^21.1.5",
-    "@angular/cdk": "^21.1.5",
-    "@angular/common": "^21.1.5",
-    "@angular/compiler": "^21.1.5",
-    "@angular/core": "^21.1.5",
-    "@angular/forms": "^21.1.5",
-    "@angular/material": "^21.1.5",
-    "@angular/platform-browser": "^21.1.5",
-    "@angular/platform-browser-dynamic": "^21.1.5",
-    "@angular/router": "^21.1.5",
+    "@angular/animations": "^18.0.2",
+    "@angular/cdk": "^18.0.2",
+    "@angular/common": "^18.0.2",
+    "@angular/compiler": "^18.0.2",
+    "@angular/core": "^18.0.2",
+    "@angular/forms": "^18.0.2",
+    "@angular/material": "^18.0.2",
+    "@angular/platform-browser": "^18.0.2",
+    "@angular/platform-browser-dynamic": "^18.0.2",
+    "@angular/router": "^18.0.2",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
-    "zone.js": "~0.15.0"
+    "zone.js": "~0.14.2"
   },
   "devDependencies": {
-    "@angular-eslint/builder": "19.0.2",
-    "@angular-eslint/eslint-plugin": "19.0.2",
-    "@angular-eslint/eslint-plugin-template": "19.0.2",
-    "@angular-eslint/schematics": "19.0.2",
-    "@angular-eslint/template-parser": "19.0.2",
-    "@angular/build": "^21.1.4",
-    "@angular/cli": "~21.1.4",
-    "@angular/compiler-cli": "^21.1.5",
+    "@angular-devkit/build-angular": "^18.0.3",
+    "@angular-eslint/builder": "18.0.1",
+    "@angular-eslint/eslint-plugin": "18.0.1",
+    "@angular-eslint/eslint-plugin-template": "18.0.1",
+    "@angular-eslint/schematics": "18.0.1",
+    "@angular-eslint/template-parser": "18.0.1",
+    "@angular/cli": "~18.0.3",
+    "@angular/compiler-cli": "^18.0.2",
     "@types/jasmine": "~4.0.0",
-    "@types/node": "^18.19.74",
+    "@types/node": "^18.11.18",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
     "concurrently": "^7.6.0",
@@ -52,6 +52,6 @@
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.0.0",
     "prettier": "2.8.7",
-    "typescript": "^5.9.3"
+    "typescript": "~5.4.5"
   }
-}
+}

console-webapp/src/app/app-routing.module.ts

@@ -24,10 +24,8 @@ import { ResourcesComponent } from './resources/resources.component';
 import ContactComponent from './settings/contact/contact.component';
 import SecurityComponent from './settings/security/security.component';
 import { SettingsComponent } from './settings/settings.component';
+import WhoisComponent from './settings/whois/whois.component';
 import { SupportComponent } from './support/support.component';
-import RdapComponent from './settings/rdap/rdap.component';
-import { HistoryComponent } from './history/history.component';
-import { PasswordResetVerifyComponent } from './shared/components/passwordReset/passwordResetVerify.component';
 
 export interface RouteWithIcon extends Route {
   iconName?: string;
@@ -40,10 +38,6 @@ export const PATHS = {
 };
 export const routes: RouteWithIcon[] = [
   { path: '', redirectTo: '/home', pathMatch: 'full' },
-  {
-    path: PasswordResetVerifyComponent.PATH,
-    component: PasswordResetVerifyComponent,
-  },
   {
     path: RegistryLockVerifyComponent.PATH,
     component: RegistryLockVerifyComponent,
@@ -65,18 +59,13 @@ export const routes: RouteWithIcon[] = [
     title: 'Dashboard',
     iconName: 'view_comfy_alt',
   },
+  // { path: 'tlds', component: TldsComponent, title: "TLDs", iconName: "event_list" },
   {
     path: DomainListComponent.PATH,
     component: DomainListComponent,
     title: 'Domains',
     iconName: 'view_list',
   },
-  {
-    path: HistoryComponent.PATH,
-    component: HistoryComponent,
-    // title: 'History',
-    // iconName: 'history',
-  },
   {
     path: SettingsComponent.PATH,
     component: SettingsComponent,
@@ -94,9 +83,9 @@ export const routes: RouteWithIcon[] = [
         title: 'Contacts',
       },
       {
-        path: RdapComponent.PATH,
-        component: RdapComponent,
-        title: 'RDAP Info',
+        path: WhoisComponent.PATH,
+        component: WhoisComponent,
+        title: 'WHOIS Info',
       },
       {
         path: SecurityComponent.PATH,

console-webapp/src/app/app.component.html

@@ -1,24 +1,24 @@
 <div class="console-app mat-typography">
   <app-header (toggleNavOpen)="toggleSidenav()"></app-header>
   <div class="console-app__global-spinner">
-    @if (globalLoader.isLoading) {
-    <mat-progress-bar mode="indeterminate"></mat-progress-bar>
-    }
+    <mat-progress-bar
+      mode="indeterminate"
+      *ngIf="globalLoader.isLoading"
+    ></mat-progress-bar>
   </div>
   <mat-sidenav-container class="console-app__container">
-    <mat-sidenav-content class="console-app__content-wrapper">
-      <div class="console-app__content" role="main">
-        <router-outlet></router-outlet>
-      </div>
-    </mat-sidenav-content>
     <mat-sidenav
       [mode]="breakpointObserver.isMobileView() ? 'over' : 'side'"
       [opened]="!breakpointObserver.isMobileView()"
-      [disableClose]="!breakpointObserver.isMobileView()"
       #sidenav
       class="console-app__sidebar"
     >
       <app-navigation />
     </mat-sidenav>
+    <mat-sidenav-content class="console-app__content-wrapper">
+      <div class="console-app__content">
+        <router-outlet></router-outlet>
+      </div>
+    </mat-sidenav-content>
   </mat-sidenav-container>
 </div>

console-webapp/src/app/app.component.spec.ts

@@ -14,124 +14,29 @@
 
 import { provideHttpClient } from '@angular/common/http';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
-import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { TestBed } from '@angular/core/testing';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { AppComponent } from './app.component';
-import { routes } from './app-routing.module';
-import { AppModule } from './app.module';
-import { PocReminderComponent } from './shared/components/pocReminder/pocReminder.component';
-import { RouterModule } from '@angular/router';
-import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
-import { UserData, UserDataService } from './shared/services/userData.service';
-import { Registrar, RegistrarService } from './registrar/registrar.service';
-import { MatSidenavModule } from '@angular/material/sidenav';
-import { signal, WritableSignal } from '@angular/core';
+import { MaterialModule } from './material.module';
+import { BackendService } from './shared/services/backend.service';
+import { AppRoutingModule } from './app-routing.module';
 
 describe('AppComponent', () => {
-  let component: AppComponent;
-  let fixture: ComponentFixture<AppComponent>;
-  let mockRegistrarService: {
-    registrar: WritableSignal<Partial<Registrar> | null | undefined>;
-    registrarId: WritableSignal<string>;
-    registrars: WritableSignal<Array<Partial<Registrar>>>;
-  };
-  let mockUserDataService: { userData: WritableSignal<Partial<UserData>> };
-  let mockSnackBar: jasmine.SpyObj<MatSnackBar>;
-
-  const dummyPocReminderComponent = class {}; // Dummy class for type checking
-
   beforeEach(async () => {
-    mockRegistrarService = {
-      registrar: signal<Registrar | null | undefined>(undefined),
-      registrarId: signal('123'),
-      registrars: signal([]),
-    };
-
-    mockUserDataService = {
-      userData: signal({
-        globalRole: 'NONE',
-      }),
-    };
-
-    mockSnackBar = jasmine.createSpyObj('MatSnackBar', ['openFromComponent']);
-
     await TestBed.configureTestingModule({
-      imports: [
-        MatSidenavModule,
-        NoopAnimationsModule,
-        MatSnackBarModule,
-        AppModule,
-        RouterModule.forRoot(routes),
-      ],
+      declarations: [AppComponent],
+      imports: [MaterialModule, BrowserAnimationsModule, AppRoutingModule],
       providers: [
-        { provide: RegistrarService, useValue: mockRegistrarService },
-        { provide: UserDataService, useValue: mockUserDataService },
-        { provide: MatSnackBar, useValue: mockSnackBar },
-        { provide: PocReminderComponent, useClass: dummyPocReminderComponent },
+        BackendService,
         provideHttpClient(),
         provideHttpClientTesting(),
       ],
     }).compileComponents();
-
-    fixture = TestBed.createComponent(AppComponent);
-    component = fixture.componentInstance;
-  });
-
-  afterEach(() => {
-    jasmine.clock().uninstall();
   });
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
     const app = fixture.componentInstance;
     expect(app).toBeTruthy();
   });
-
-  describe('PoC Verification Reminder', () => {
-    beforeEach(() => {
-      jasmine.clock().install();
-    });
-
-    it('should open snackbar if lastPocVerificationDate is older than one year', fakeAsync(() => {
-      const MOCK_TODAY = new Date('2024-07-15T10:00:00.000Z');
-      jasmine.clock().mockDate(MOCK_TODAY);
-
-      const twoYearsAgo = new Date(MOCK_TODAY);
-      twoYearsAgo.setFullYear(MOCK_TODAY.getFullYear() - 2);
-
-      mockRegistrarService.registrar.set({
-        lastPocVerificationDate: twoYearsAgo.toISOString(),
-      });
-
-      fixture.detectChanges();
-      TestBed.flushEffects();
-
-      expect(mockSnackBar.openFromComponent).toHaveBeenCalledWith(
-        PocReminderComponent,
-        {
-          horizontalPosition: 'center',
-          verticalPosition: 'top',
-          duration: 1000000000,
-        }
-      );
-    }));
-
-    it('should NOT open snackbar if lastPocVerificationDate is within last year', fakeAsync(() => {
-      const MOCK_TODAY = new Date('2024-07-15T10:00:00.000Z');
-      jasmine.clock().mockDate(MOCK_TODAY);
-
-      const sixMonthsAgo = new Date(MOCK_TODAY);
-      sixMonthsAgo.setMonth(MOCK_TODAY.getMonth() - 6);
-
-      mockRegistrarService.registrar.set({
-        lastPocVerificationDate: sixMonthsAgo.toISOString(),
-      });
-
-      fixture.detectChanges();
-      TestBed.flushEffects();
-
-      expect(mockSnackBar.openFromComponent).not.toHaveBeenCalled();
-    }));
-  });
 });

console-webapp/src/app/app.component.ts

@@ -12,21 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { AfterViewInit, Component, effect, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ViewChild } from '@angular/core';
 import { MatSidenav } from '@angular/material/sidenav';
 import { NavigationEnd, Router } from '@angular/router';
 import { RegistrarService } from './registrar/registrar.service';
 import { BreakPointObserverService } from './shared/services/breakPoint.service';
 import { GlobalLoaderService } from './shared/services/globalLoader.service';
 import { UserDataService } from './shared/services/userData.service';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { PocReminderComponent } from './shared/components/pocReminder/pocReminder.component';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss'],
-  standalone: false,
 })
 export class AppComponent implements AfterViewInit {
   @ViewChild(MatSidenav)
@@ -37,28 +34,8 @@ export class AppComponent implements AfterViewInit {
     protected userDataService: UserDataService,
     protected globalLoader: GlobalLoaderService,
     protected breakpointObserver: BreakPointObserverService,
-    private router: Router,
-    private _snackBar: MatSnackBar
-  ) {
-    effect(() => {
-      const registrar = this.registrarService.registrar();
-      const oneYearAgo = new Date();
-      oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1);
-      oneYearAgo.setHours(0, 0, 0, 0);
-      if (
-        registrar &&
-        registrar.lastPocVerificationDate &&
-        new Date(registrar.lastPocVerificationDate) < oneYearAgo &&
-        this.userDataService?.userData()?.globalRole === 'NONE'
-      ) {
-        this._snackBar.openFromComponent(PocReminderComponent, {
-          horizontalPosition: 'center',
-          verticalPosition: 'top',
-          duration: 1000000000,
-        });
-      }
-    });
-  }
+    private router: Router
+  ) {}
 
   ngAfterViewInit() {
     this.router.events.subscribe((event) => {

console-webapp/src/app/app.module.ts

@@ -26,11 +26,7 @@ import { BackendService } from './shared/services/backend.service';
 import { provideHttpClient } from '@angular/common/http';
 import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
 import { BillingInfoComponent } from './billingInfo/billingInfo.component';
-import {
-  DomainListComponent,
-  ReasonDialogComponent,
-  ResponseDialogComponent,
-} from './domains/domainList.component';
+import { DomainListComponent } from './domains/domainList.component';
 import { RegistryLockComponent } from './domains/registryLock.component';
 import { HeaderComponent } from './header/header.component';
 import { HomeComponent } from './home/home.component';
@@ -47,6 +43,8 @@ import EppPasswordEditComponent from './settings/security/eppPasswordEdit.compon
 import SecurityComponent from './settings/security/security.component';
 import SecurityEditComponent from './settings/security/securityEdit.component';
 import { SettingsComponent } from './settings/settings.component';
+import WhoisComponent from './settings/whois/whois.component';
+import WhoisEditComponent from './settings/whois/whoisEdit.component';
 import { NotificationsComponent } from './shared/components/notifications/notifications.component';
 import { SelectedRegistrarWrapper } from './shared/components/selectedRegistrarWrapper/selectedRegistrarWrapper.component';
 import { LocationBackDirective } from './shared/directives/locationBack.directive';
@@ -56,14 +54,7 @@ import { GlobalLoaderService } from './shared/services/globalLoader.service';
 import { UserDataService } from './shared/services/userData.service';
 import { SnackBarModule } from './snackbar.module';
 import { SupportComponent } from './support/support.component';
-import { ForceFocusDirective } from './shared/directives/forceFocus.directive';
-import RdapComponent from './settings/rdap/rdap.component';
-import RdapEditComponent from './settings/rdap/rdapEdit.component';
-import { PocReminderComponent } from './shared/components/pocReminder/pocReminder.component';
-import { PasswordResetVerifyComponent } from './shared/components/passwordReset/passwordResetVerify.component';
-import { PasswordInputForm } from './shared/components/passwordReset/passwordInputForm.component';
-import { HistoryComponent } from './history/history.component';
-import { HistoryListComponent } from './history/historyList.component';
+import { TldsComponent } from './tlds/tlds.component';
 
 @NgModule({
   declarations: [SelectedRegistrarWrapper],
@@ -80,34 +71,27 @@ export class SelectedRegistrarModule {}
     ContactDetailsComponent,
     DomainListComponent,
     EppPasswordEditComponent,
-    ForceFocusDirective,
     HeaderComponent,
-    HistoryComponent,
-    HistoryListComponent,
     HomeComponent,
     LocationBackDirective,
+    UserLevelVisibility,
     NavigationComponent,
     NewRegistrarComponent,
     NotificationsComponent,
-    PasswordInputForm,
-    PasswordResetVerifyComponent,
-    PocReminderComponent,
-    RdapComponent,
-    RdapEditComponent,
-    ReasonDialogComponent,
     RegistrarComponent,
     RegistrarDetailsComponent,
-    RegistrarSelectorComponent,
     RegistryLockComponent,
+    RegistrarSelectorComponent,
     RegistryLockVerifyComponent,
     ResourcesComponent,
-    ResponseDialogComponent,
     SecurityComponent,
     SecurityEditComponent,
     SettingsComponent,
     SettingsContactComponent,
     SupportComponent,
-    UserLevelVisibility,
+    TldsComponent,
+    WhoisComponent,
+    WhoisEditComponent,
   ],
   bootstrap: [AppComponent],
   imports: [
@@ -116,8 +100,8 @@ export class SelectedRegistrarModule {}
     BrowserModule,
     FormsModule,
     MaterialModule,
-    SelectedRegistrarModule,
     SnackBarModule,
+    SelectedRegistrarModule,
   ],
   providers: [
     BackendService,

console-webapp/src/app/billingInfo/billingInfo.component.html

@@ -1,20 +1,16 @@
 <app-selected-registrar-wrapper>
-  <h1 class="mat-headline-4" forceFocus>Billing Info</h1>
+  <h1 class="mat-headline-4">Billing Info</h1>
   <div class="console-app__billing">
     <div>
       <div class="console-app__billing-subhead">
         Billing records and information
       </div>
-      <a
-        class="text-l"
-        href="{{ driveFolderUrl() }}"
-        target="_blank"
-        aria-label="View billing records on Google Drive"
+      <a class="text-l" href="{{ driveFolderUrl() }}" target="_blank"
         >View on Google Drive</a
       >
     </div>
     <div>
-      <img src="./assets/billing.png" alt="Generic billing image" />
+      <img src="./assets/billing.png" />
     </div>
   </div>
 </app-selected-registrar-wrapper>

console-webapp/src/app/billingInfo/billingInfo.component.scss

@@ -16,7 +16,7 @@
     width: 100%;
   }
   &-subhead {
-    font-size: 1.25rem;
+    font-size: 20px;
     margin-bottom: 20px;
   }
 }

console-webapp/src/app/billingInfo/billingInfo.component.ts

@@ -20,7 +20,6 @@ import { MatSnackBar } from '@angular/material/snack-bar';
   selector: 'app-billingInfo',
   templateUrl: './billingInfo.component.html',
   styleUrls: ['./billingInfo.component.scss'],
-  standalone: false,
 })
 export class BillingInfoComponent {
   public static PATH = 'billingInfo';

console-webapp/src/app/domains/domainList.component.html

@@ -1,6 +1,6 @@
 <app-selected-registrar-wrapper>
   <div class="console-app-domains">
-    <h1 class="mat-headline-4" forceFocus>Domains</h1>
+    <h1 class="mat-headline-4">Domains</h1>
 
     <div
       class="console-app-domains__actions-wrapper"
@@ -24,37 +24,11 @@
     </div>
     } @else {
     <mat-menu #actions="matMenu">
-      <ng-template
-        matMenuContent
-        let-domainName="domainName"
-        let-domain="domain"
-      >
-        <button
-          mat-menu-item
-          (click)="openRegistryLock(domainName)"
-          aria-label="Access registry lock for domain"
-        >
+      <ng-template matMenuContent let-domainName="domainName">
+        <button mat-menu-item (click)="openRegistryLock(domainName)">
           <mat-icon>key</mat-icon>
           <span>Registry Lock</span>
         </button>
-        <button
-          mat-menu-item
-          (click)="onSuspendClick(domainName)"
-          [elementId]="getElementIdForSuspendUnsuspend()"
-          [disabled]="isDomainUnsuspendable(domain)"
-        >
-          <mat-icon>lock_clock</mat-icon>
-          <span>Suspend</span>
-        </button>
-        <button
-          mat-menu-item
-          (click)="onUnsuspendClick(domainName)"
-          [elementId]="getElementIdForSuspendUnsuspend()"
-          [disabled]="!isDomainUnsuspendable(domain)"
-        >
-          <mat-icon>lock_open</mat-icon>
-          <span>Unsuspend</span>
-        </button>
       </ng-template>
     </mat-menu>
     <div
@@ -91,68 +65,16 @@
             />
           </mat-form-field>
 
-          <div
-            class="console-app__domains-selection"
-            [elementId]="getElementIdForBulkDelete()"
-            [ngClass]="{ active: selection.hasValue() }"
-          >
-            <div class="console-app__domains-selection-text">
-              {{ selection.selected.length }} Selected
-            </div>
-            <div class="console-app__domains-selection-actions">
-              <button
-                mat-flat-button
-                aria-label="Delete Selected Domains"
-                [attr.aria-hidden]="!selection.hasValue()"
-                (click)="deleteSelectedDomains()"
-              >
-                Delete Selected Domains
-              </button>
-            </div>
-          </div>
-
           <mat-table
             [dataSource]="dataSource"
             class="mat-elevation-z0"
             class="console-app__domains-table"
           >
-            <!-- Checkbox Column -->
-            <ng-container matColumnDef="select">
-              <mat-header-cell *matHeaderCellDef>
-                <mat-checkbox
-                  (change)="$event ? toggleAllRows() : null"
-                  [checked]="selection.hasValue() && isAllSelected"
-                  [indeterminate]="selection.hasValue() && !isAllSelected"
-                  [aria-label]="checkboxLabel()"
-                  [elementId]="getElementIdForBulkDelete()"
-                >
-                </mat-checkbox>
-              </mat-header-cell>
-              <mat-cell *matCellDef="let row">
-                <mat-checkbox
-                  (click)="$event.stopPropagation()"
-                  (change)="$event ? selection.toggle(row) : null"
-                  [checked]="selection.isSelected(row)"
-                  [aria-label]="checkboxLabel(row)"
-                  [elementId]="getElementIdForBulkDelete()"
-                >
-                </mat-checkbox>
-              </mat-cell>
-            </ng-container>
-
             <ng-container matColumnDef="domainName">
               <mat-header-cell *matHeaderCellDef>Domain Name</mat-header-cell>
-              <mat-cell *matCellDef="let element">
-                @if (getOperationMessage(element.domainName)) {
-                <mat-icon
-                  [matTooltip]="getOperationMessage(element.domainName)"
-                  matTooltipPosition="above"
-                  class="primary-text"
-                  >info</mat-icon
-                >
-                }
-                <span>{{ element.domainName }}</span>
-              </mat-cell>
+              <mat-cell *matCellDef="let element">{{
+                element.domainName
+              }}</mat-cell>
             </ng-container>
 
             <ng-container matColumnDef="creationTime">
@@ -193,10 +115,7 @@
                 <button
                   mat-icon-button
                   [matMenuTriggerFor]="actions"
-                  [matMenuTriggerData]="{
-                    domainName: element.domainName,
-                    domain: element
-                  }"
+                  [matMenuTriggerData]="{ domainName: element.domainName }"
                   aria-label="Domain actions"
                 >
                   <mat-icon>more_horiz</mat-icon>
@@ -210,9 +129,9 @@
             <mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
 
             <!-- Row shown when there is no matching data. -->
-            <tr class="mat-row" *matNoDataRow>
-              <td class="mat-cell" colspan="6">No domains found</td>
-            </tr>
+            <mat-row *matNoDataRow>
+              <mat-cell colspan="6">No domains found</mat-cell>
+            </mat-row>
           </mat-table>
           <mat-paginator
             [length]="totalResults"

console-webapp/src/app/domains/domainList.component.scss

@@ -12,22 +12,6 @@
     }
   }
 
-  &__domains-selection {
-    height: 60px;
-    max-height: 0;
-    transition: max-height 0.2s linear;
-    display: flex;
-    align-items: center;
-    overflow: hidden;
-    gap: 20px;
-    &-text {
-      font-weight: bold;
-    }
-    &.active {
-      max-height: 60px;
-    }
-  }
-
   &-domains__download {
     position: absolute;
     top: -55px;
@@ -57,22 +41,6 @@
       overflow: hidden;
       word-break: break-word;
     }
-    .mat-column-select {
-      max-width: 60px;
-      padding-left: 15px;
-    }
-    .mat-column-domainName {
-      position: relative;
-      padding-left: 25px;
-      mat-icon {
-        position: absolute;
-        left: 0;
-      }
-    }
-    mat-cell:has([style*="display: none"]),
-    mat-header-cell:has([style*="display: none"]) {
-      display: none;
-    }
   }
 
   &__domains-spinner {

console-webapp/src/app/domains/domainList.component.spec.ts

@@ -21,7 +21,6 @@ import { MaterialModule } from '../material.module';
 import { BackendService } from '../shared/services/backend.service';
 import { DomainListComponent } from './domainList.component';
 import { FormsModule } from '@angular/forms';
-import { AppModule } from '../app.module';
 
 describe('DomainListComponent', () => {
   let component: DomainListComponent;
@@ -30,12 +29,7 @@ describe('DomainListComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [DomainListComponent],
-      imports: [
-        MaterialModule,
-        BrowserAnimationsModule,
-        FormsModule,
-        AppModule,
-      ],
+      imports: [MaterialModule, BrowserAnimationsModule, FormsModule],
       providers: [
         BackendService,
         provideHttpClient(),

console-webapp/src/app/domains/domainList.component.ts

@@ -12,125 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { SelectionModel } from '@angular/cdk/collections';
 import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
-import { Component, effect, Inject, ViewChild } from '@angular/core';
+import { Component, ViewChild, effect } from '@angular/core';
 import { MatPaginator, PageEvent } from '@angular/material/paginator';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { MatTableDataSource } from '@angular/material/table';
-import { debounceTime, filter, Subject, take } from 'rxjs';
+import { Subject, debounceTime } from 'rxjs';
 import { RegistrarService } from '../registrar/registrar.service';
-import {
-  BULK_ACTION_NAME,
-  Domain,
-  DomainListService,
-} from './domainList.service';
+import { Domain, DomainListService } from './domainList.service';
 import { RegistryLockComponent } from './registryLock.component';
 import { RegistryLockService } from './registryLock.service';
-import {
-  MAT_DIALOG_DATA,
-  MatDialog,
-  MatDialogRef,
-} from '@angular/material/dialog';
-import { RESTRICTED_ELEMENTS } from '../shared/directives/userLevelVisiblity.directive';
-import { CdkColumnDef } from '@angular/cdk/table';
-
-interface DomainResponse {
-  message: string;
-  responseCode: string;
-}
-
-interface DomainData {
-  [domain: string]: DomainResponse;
-}
-
-@Component({
-  selector: 'app-response-dialog',
-  template: `
-    <h2 mat-dialog-title>{{ data.title }}</h2>
-    <mat-dialog-content [innerHTML]="data.content" />
-    <mat-dialog-actions>
-      <button mat-button (click)="onClose()">Close</button>
-    </mat-dialog-actions>
-  `,
-  standalone: false,
-})
-export class ResponseDialogComponent {
-  constructor(
-    public dialogRef: MatDialogRef<ReasonDialogComponent>,
-    @Inject(MAT_DIALOG_DATA)
-    public data: { title: string; content: string }
-  ) {}
-
-  onClose(): void {
-    this.dialogRef.close();
-  }
-}
-
-enum Operation {
-  deleting = 'deleting',
-  suspending = 'suspending',
-  unsuspending = 'unsuspending',
-}
-
-@Component({
-  selector: 'app-reason-dialog',
-  template: `
-    <h2 mat-dialog-title>
-      Please provide the (EPP) reason for {{ data.operation }} the domain(s):
-    </h2>
-    <mat-dialog-content>
-      <mat-form-field appearance="outline" style="width:100%">
-        <textarea matInput [(ngModel)]="reason" rows="4"></textarea>
-      </mat-form-field>
-    </mat-dialog-content>
-    <mat-dialog-actions>
-      <button mat-button (click)="onCancel()">Cancel</button>
-      <button mat-button color="warn" (click)="onSave()" [disabled]="!reason">
-        Save
-      </button>
-    </mat-dialog-actions>
-  `,
-  standalone: false,
-})
-export class ReasonDialogComponent {
-  reason: string = '';
-  constructor(
-    public dialogRef: MatDialogRef<ReasonDialogComponent>,
-    @Inject(MAT_DIALOG_DATA)
-    public data: { operation: Operation }
-  ) {}
-
-  onSave(): void {
-    this.dialogRef.close(this.reason);
-  }
-
-  onCancel(): void {
-    this.dialogRef.close();
-  }
-}
 
 @Component({
   selector: 'app-domain-list',
   templateUrl: './domainList.component.html',
   styleUrls: ['./domainList.component.scss'],
-  standalone: false,
-  providers: [CdkColumnDef],
 })
 export class DomainListComponent {
   public static PATH = 'domain-list';
-  private static SUSPENDED_STATUSES = [
-    'SERVER_RENEW_PROHIBITED',
-    'SERVER_TRANSFER_PROHIBITED',
-    'SERVER_UPDATE_PROHIBITED',
-    'SERVER_DELETE_PROHIBITED',
-    'SERVER_HOLD',
-  ];
   private readonly DEBOUNCE_MS = 500;
-  isAllSelected = false;
 
   displayedColumns: string[] = [
-    'select',
     'domainName',
     'creationTime',
     'registrationExpirationTime',
@@ -140,7 +42,6 @@ export class DomainListComponent {
   ];
 
   dataSource: MatTableDataSource<Domain> = new MatTableDataSource();
-  selection = new SelectionModel<Domain>(true, [], undefined, this.isChecked());
   isLoading = true;
 
   searchTermSubject = new Subject<string>();
@@ -150,18 +51,13 @@ export class DomainListComponent {
   resultsPerPage = 50;
   totalResults?: number = 0;
 
-  reason: string = '';
-
-  operationResult: DomainData | undefined;
-
   @ViewChild(MatPaginator, { static: true }) paginator!: MatPaginator;
 
   constructor(
     protected domainListService: DomainListService,
     protected registrarService: RegistrarService,
     protected registryLockService: RegistryLockService,
-    private _snackBar: MatSnackBar,
-    private dialog: MatDialog
+    private _snackBar: MatSnackBar
   ) {
     effect(() => {
       this.pageNumber = 0;
@@ -238,184 +134,6 @@ export class DomainListComponent {
   onPageChange(event: PageEvent) {
     this.pageNumber = event.pageIndex;
     this.resultsPerPage = event.pageSize;
-    this.selection.clear();
     this.reloadData();
   }
-
-  toggleAllRows() {
-    if (this.isAllSelected) {
-      this.selection.clear();
-      this.isAllSelected = false;
-      return;
-    }
-
-    this.selection.select(...this.dataSource.data);
-    this.isAllSelected = true;
-  }
-
-  checkboxLabel(row?: Domain): string {
-    if (!row) {
-      return `${this.isAllSelected ? 'deselect' : 'select'} all`;
-    }
-    return `${this.selection.isSelected(row) ? 'deselect' : 'select'} row ${
-      row.domainName
-    }`;
-  }
-
-  private isChecked(): ((o1: Domain, o2: Domain) => boolean) | undefined {
-    return (o1: Domain, o2: Domain) => {
-      if (!o1.domainName || !o2.domainName) {
-        return false;
-      }
-
-      return this.isAllSelected || o1.domainName === o2.domainName;
-    };
-  }
-
-  getElementIdForBulkDelete() {
-    return RESTRICTED_ELEMENTS.BULK_DELETE;
-  }
-
-  getElementIdForSuspendUnsuspend() {
-    return RESTRICTED_ELEMENTS.SUSPEND;
-  }
-
-  getOperationMessage(domain: string) {
-    if (this.operationResult && this.operationResult[domain])
-      return this.operationResult[domain].message;
-    return '';
-  }
-
-  isDomainUnsuspendable(domain: Domain) {
-    return DomainListComponent.SUSPENDED_STATUSES.every((s) =>
-      domain.statuses.includes(s)
-    );
-  }
-
-  sendDeleteRequest(reason: string) {
-    this.isLoading = true;
-    this.domainListService
-      .bulkDomainAction(
-        this.selection.selected.map((d) => d.domainName),
-        reason,
-        this.registrarService.registrarId(),
-        BULK_ACTION_NAME.DELETE
-      )
-      .pipe(take(1))
-      .subscribe({
-        next: (result: DomainData) => {
-          this.isLoading = false;
-          const successCount = Object.keys(result).filter((domainName) =>
-            result[domainName].responseCode.toString().startsWith('1')
-          ).length;
-          const failureCount = Object.keys(result).length - successCount;
-          this.dialog.open(ResponseDialogComponent, {
-            data: {
-              title: 'Domain Deletion Results',
-              content: `Successfully deleted - ${successCount} domain(s)<br/>Failed to delete - ${failureCount} domain(s)<br/>${
-                failureCount
-                  ? 'Some domains could not be deleted due to ongoing processes or server errors. '
-                  : ''
-              }Please check the table for more information.`,
-            },
-          });
-          this.selection.clear();
-          this.operationResult = result;
-          this.reloadData();
-        },
-        error: (err: HttpErrorResponse) => {
-          this.isLoading = false;
-          this._snackBar.open(err.error || err.message);
-        },
-      });
-  }
-
-  deleteSelectedDomains() {
-    const dialogRef = this.dialog.open(ReasonDialogComponent, {
-      data: {
-        operation: Operation.deleting,
-      },
-    });
-
-    dialogRef
-      .afterClosed()
-      .pipe(
-        take(1),
-        filter((reason) => !!reason)
-      )
-      .subscribe(this.sendDeleteRequest.bind(this));
-  }
-
-  sendSuspendUnsuspendRequest(
-    domainName: string,
-    reason: string,
-    actionName: BULK_ACTION_NAME
-  ) {
-    this.isLoading = true;
-    this.domainListService
-      .bulkDomainAction(
-        [domainName],
-        reason,
-        this.registrarService.registrarId(),
-        actionName
-      )
-      .pipe(take(1))
-      .subscribe({
-        next: (result: DomainData) => {
-          this.isLoading = false;
-          if (result[domainName].responseCode.toString().startsWith('2')) {
-            this._snackBar.open(result[domainName].message);
-          } else {
-            this.reloadData();
-          }
-        },
-        error: (err: HttpErrorResponse) => {
-          this.isLoading = false;
-          this._snackBar.open(err.error || err.message);
-        },
-      });
-  }
-  onSuspendClick(domainName: string) {
-    const dialogRef = this.dialog.open(ReasonDialogComponent, {
-      data: {
-        operation: Operation.suspending,
-      },
-    });
-
-    dialogRef
-      .afterClosed()
-      .pipe(
-        take(1),
-        filter((reason) => !!reason)
-      )
-      .subscribe((reason) => {
-        this.sendSuspendUnsuspendRequest(
-          domainName,
-          reason,
-          BULK_ACTION_NAME.SUSPEND
-        );
-      });
-  }
-
-  onUnsuspendClick(domainName: string) {
-    const dialogRef = this.dialog.open(ReasonDialogComponent, {
-      data: {
-        operation: Operation.unsuspending,
-      },
-    });
-
-    dialogRef
-      .afterClosed()
-      .pipe(
-        take(1),
-        filter((reason) => !!reason)
-      )
-      .subscribe((reason) => {
-        this.sendSuspendUnsuspendRequest(
-          domainName,
-          reason,
-          BULK_ACTION_NAME.UNSUSPEND
-        );
-      });
-  }
 }

console-webapp/src/app/domains/domainList.service.ts

@@ -35,12 +35,6 @@ export interface DomainListResult {
   totalResults: number;
 }
 
-export enum BULK_ACTION_NAME {
-  DELETE = 'DELETE',
-  SUSPEND = 'SUSPEND',
-  UNSUSPEND = 'UNSUSPEND',
-}
-
 @Injectable({
   providedIn: 'root',
 })
@@ -54,6 +48,7 @@ export class DomainListService {
     private backendService: BackendService,
     private registrarService: RegistrarService
   ) {}
+
   retrieveDomains(
     pageNumber?: number,
     resultsPerPage?: number,
@@ -76,18 +71,4 @@ export class DomainListService {
         })
       );
   }
-
-  bulkDomainAction(
-    domains: string[],
-    reason: string,
-    registrarId: string,
-    actionName: BULK_ACTION_NAME
-  ) {
-    return this.backendService.bulkDomainAction(
-      domains,
-      reason,
-      actionName,
-      registrarId
-    );
-  }
 }

console-webapp/src/app/domains/registryLock.component.html

@@ -49,7 +49,6 @@
       color="primary"
       type="submit"
       [disabled]="!unlockDomain.valid"
-      aria-label="Submit domain unlock request"
     >
       Save
     </button>
@@ -74,7 +73,6 @@
       color="primary"
       type="submit"
       [disabled]="!lockDomain.valid"
-      aria-label="Submit domain lock request"
     >
       Save
     </button>

console-webapp/src/app/domains/registryLock.component.ts

@@ -25,7 +25,6 @@ import { RegistryLockService } from './registryLock.service';
   selector: 'app-registry-lock',
   templateUrl: './registryLock.component.html',
   styleUrls: ['./registryLock.component.scss'],
-  standalone: false,
 })
 export class RegistryLockComponent {
   readonly isLocked = computed(() =>

console-webapp/src/app/header/header.component.html

@@ -1,19 +1,17 @@
 <p class="console-app__header">
   <mat-toolbar>
-    @if (breakpointObserver.isMobileView()) {
     <button
       mat-icon-button
-      aria-label="Open navigation menu"
+      aria-label="Open menu"
       (click)="toggleNavPane()"
+      *ngIf="breakpointObserver.isMobileView()"
       class="console-app__menu-btn"
     >
       <mat-icon>menu</mat-icon>
     </button>
-    }
     <a
       [routerLink]="'/home'"
       routerLinkActive="active"
-      aria-label="Google Registry logo"
       class="console-app__logo"
     >
       <svg
@@ -66,9 +64,7 @@
       </svg>
     </a>
     <span class="spacer"></span>
-    @if (!breakpointObserver.isMobileView()) {
-    <app-registrar-selector />
-    }
+    <app-registrar-selector *ngIf="!breakpointObserver.isMobileView()" />
     <button
       class="console-app__header-user-icon"
       mat-mini-fab
@@ -82,7 +78,5 @@
       <button mat-menu-item (click)="logOut()">Log out</button>
     </mat-menu>
   </mat-toolbar>
-  @if (breakpointObserver.isMobileView()) {
-  <app-registrar-selector />
-  }
+  <app-registrar-selector *ngIf="breakpointObserver.isMobileView()" />
 </p>

console-webapp/src/app/header/header.component.spec.ts

@@ -17,12 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { HeaderComponent } from './header.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MaterialModule } from '../material.module';
-import { ActivatedRoute } from '@angular/router';
-import { AppModule, SelectedRegistrarModule } from '../app.module';
-import { AppRoutingModule } from '../app-routing.module';
-import { BackendService } from '../shared/services/backend.service';
-import { provideHttpClient } from '@angular/common/http';
-import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 describe('HeaderComponent', () => {
   let component: HeaderComponent;
@@ -30,19 +24,7 @@ describe('HeaderComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        SelectedRegistrarModule,
-        MaterialModule,
-        BrowserAnimationsModule,
-        AppRoutingModule,
-        AppModule,
-      ],
-      providers: [
-        BackendService,
-        { provide: ActivatedRoute, useValue: {} as ActivatedRoute },
-        provideHttpClient(),
-        provideHttpClientTesting(),
-      ],
+      imports: [MaterialModule, BrowserAnimationsModule],
       declarations: [HeaderComponent],
     }).compileComponents();
 

console-webapp/src/app/header/header.component.ts

@@ -19,7 +19,6 @@ import { BreakPointObserverService } from '../shared/services/breakPoint.service
   selector: 'app-header',
   templateUrl: './header.component.html',
   styleUrls: ['./header.component.scss'],
-  standalone: false,
 })
 export class HeaderComponent {
   private isNavOpen = false;

console-webapp/src/app/history/history.component.html

@@ -1,62 +0,0 @@
-<app-selected-registrar-wrapper>
-  <div class="history-log">
-    <h1 class="mat-headline-4" forceFocus>
-      Registrar Console Activity History
-    </h1>
-    <mat-tab-group
-      [elementId]="getElementIdForUserLog()"
-      class="history-log__tabs"
-    >
-      <mat-tab label="Registrar Activity">
-        <div class="spacer"></div>
-
-        <app-history-list
-          [historyRecords]="historyService.historyRecordsRegistrar()"
-          [isLoading]="isLoading"
-        />
-      </mat-tab>
-      <mat-tab label="User Activity">
-        <div class="spacer"></div>
-        <form (ngSubmit)="loadHistory()" #form="ngForm">
-          <section>
-            <mat-form-field appearance="outline">
-              <mat-label>Console User Email: </mat-label>
-              <input
-                matInput
-                id="email"
-                type="email"
-                name="consoleUserEmail"
-                required
-                email
-                [(ngModel)]="consoleUserEmail"
-                #emailControl="ngModel"
-              />
-            </mat-form-field>
-          </section>
-          <div class="spacer"></div>
-          <button
-            mat-flat-button
-            color="primary"
-            type="submit"
-            aria-label="Search user history"
-            [disabled]="!form.valid"
-          >
-            Search
-          </button>
-        </form>
-        <div class="spacer"></div>
-        <app-history-list
-          [historyRecords]="historyService.historyRecordsUser()"
-          [isLoading]="isLoading"
-        />
-      </mat-tab>
-    </mat-tab-group>
-  </div>
-
-  <app-history-list
-    [elementId]="getElementIdForUserLog()"
-    [isReverse]="true"
-    [historyRecords]="historyService.historyRecordsUser()"
-    [isLoading]="isLoading"
-  />
-</app-selected-registrar-wrapper>

console-webapp/src/app/history/history.component.ts

@@ -1,80 +0,0 @@
-// Copyright 2025 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { Component, effect } from '@angular/core';
-import { UserDataService } from '../shared/services/userData.service';
-import { BackendService } from '../shared/services/backend.service';
-import { RegistrarService } from '../registrar/registrar.service';
-import { HistoryService } from './history.service';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import {
-  GlobalLoader,
-  GlobalLoaderService,
-} from '../shared/services/globalLoader.service';
-import { HttpErrorResponse } from '@angular/common/http';
-import { RESTRICTED_ELEMENTS } from '../shared/directives/userLevelVisiblity.directive';
-
-@Component({
-  selector: 'app-history',
-  templateUrl: './history.component.html',
-  styleUrls: ['./history.component.scss'],
-  providers: [HistoryService],
-  standalone: false,
-})
-export class HistoryComponent implements GlobalLoader {
-  public static PATH = 'history';
-
-  consoleUserEmail: string = '';
-  isLoading: boolean = false;
-
-  constructor(
-    private backendService: BackendService,
-    private registrarService: RegistrarService,
-    protected historyService: HistoryService,
-    protected globalLoader: GlobalLoaderService,
-    protected userDataService: UserDataService,
-    private _snackBar: MatSnackBar
-  ) {
-    effect(() => {
-      if (registrarService.registrarId()) {
-        this.loadHistory();
-      }
-    });
-  }
-
-  getElementIdForUserLog() {
-    return RESTRICTED_ELEMENTS.ACTIVITY_PER_USER;
-  }
-
-  loadingTimeout() {
-    this._snackBar.open('Timeout loading records history');
-  }
-
-  loadHistory() {
-    this.globalLoader.startGlobalLoader(this);
-    this.isLoading = true;
-    this.historyService
-      .getHistoryLog(this.registrarService.registrarId(), this.consoleUserEmail)
-      .subscribe({
-        error: (err: HttpErrorResponse) => {
-          this._snackBar.open(err.error || err.message);
-          this.isLoading = false;
-        },
-        next: () => {
-          this.globalLoader.stopGlobalLoader(this);
-          this.isLoading = false;
-        },
-      });
-  }
-}

console-webapp/src/app/history/history.service.ts

@@ -1,46 +0,0 @@
-// Copyright 2025 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { Injectable, signal } from '@angular/core';
-import { BackendService } from '../shared/services/backend.service';
-import { tap } from 'rxjs';
-
-export interface HistoryRecord {
-  modificationTime: string;
-  type: string;
-  description: string;
-  actingUser: {
-    emailAddress: string;
-  };
-}
-
-@Injectable()
-export class HistoryService {
-  historyRecordsRegistrar = signal<HistoryRecord[]>([]);
-  historyRecordsUser = signal<HistoryRecord[]>([]);
-
-  constructor(private backendService: BackendService) {}
-
-  getHistoryLog(registrarId: string, userEmail?: string) {
-    return this.backendService.getHistoryLog(registrarId, userEmail).pipe(
-      tap((historyRecords: HistoryRecord[]) => {
-        if (userEmail) {
-          this.historyRecordsUser.set(historyRecords);
-        } else {
-          this.historyRecordsRegistrar.set(historyRecords);
-        }
-      })
-    );
-  }
-}

console-webapp/src/app/history/historyList.component.html

@@ -1,45 +0,0 @@
-@if (!isLoading && historyRecords.length == 0) {
-<div class="history-list__no-records">
-  <mat-icon class="history-list__no-records-icon secondary-text"
-    >apps_outage</mat-icon
-  >
-  <h1>No records found</h1>
-</div>
-} @else {
-<mat-card>
-  <mat-card-content>
-    <mat-list role="list">
-      @for (item of historyRecords; track item; let last = $last) {
-      <mat-list-item class="history-list__item">
-        <mat-icon
-          [ngClass]="getIconClass(item.type)"
-          class="history-list__icon"
-        >
-          {{ getIconForType(item.type) }}
-        </mat-icon>
-        <div class="history-list__content">
-          <div class="history-list__description">
-            <span class="history-list__description--main">{{ item.type }}</span>
-            <div>
-              @if (parseDescription(item.description).detail) {
-              <mat-chip class="history-list__chip">
-                {{ parseDescription(item.description).detail }}
-              </mat-chip>
-              }
-            </div>
-          </div>
-          <div class="history-list__user">
-            <b>User - {{ item.actingUser.emailAddress }}</b>
-          </div>
-        </div>
-        <span class="history-list__timestamp">
-          {{ item.modificationTime | date : "MMM d, y, h:mm a" }}
-        </span>
-      </mat-list-item>
-      @if (!last) {
-      <mat-divider></mat-divider>
-      } }
-    </mat-list>
-  </mat-card-content>
-</mat-card>
-}

console-webapp/src/app/history/historyList.component.scss

@@ -1,81 +0,0 @@
-// Copyright 2025 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-.history-list {
-  font-family: "Roboto", sans-serif;
-  &__item {
-    display: flex;
-    align-items: center;
-    // Override default mat-list-item height to fit content
-    height: auto !important;
-    padding: 16px 0;
-  }
-
-  &__no-records {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-direction: column;
-  }
-  &__no-records-icon {
-    width: 4rem;
-    height: 4rem;
-    font-size: 4rem;
-    margin-top: 1.5rem;
-  }
-
-  &__icon {
-    margin-right: 16px;
-
-    &--update {
-      color: #1976d2;
-    }
-
-    &--security {
-      color: #d32f2f;
-    }
-  }
-
-  &__description {
-    &--main {
-      font-size: 1rem;
-      font-weight: 500;
-      color: rgba(0, 0, 0, 0.87);
-      margin-bottom: 1em;
-    }
-  }
-
-  &__content {
-    flex-grow: 1;
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    margin-right: 16px;
-  }
-
-  &__chip {
-    margin: 0.5rem 0;
-  }
-
-  &__user {
-    font-size: 0.9rem;
-    color: rgba(0, 0, 0, 0.6);
-  }
-
-  &__timestamp {
-    color: rgba(0, 0, 0, 0.6);
-    white-space: nowrap;
-    text-align: right;
-  }
-}

console-webapp/src/app/history/historyList.component.ts

@@ -1,66 +0,0 @@
-// Copyright 2025 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { HistoryRecord } from './history.service';
-
-@Component({
-  selector: 'app-history-list',
-  templateUrl: './historyList.component.html',
-  styleUrls: ['./historyList.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: false,
-})
-export class HistoryListComponent {
-  @Input() historyRecords: HistoryRecord[] = [];
-  @Input() isLoading: boolean = false;
-
-  getIconForType(type: string): string {
-    switch (type) {
-      case 'REGISTRAR_UPDATE':
-        return 'edit';
-      case 'REGISTRAR_SECURITY_UPDATE':
-        return 'security';
-      default:
-        return 'history'; // A fallback icon
-    }
-  }
-
-  getIconClass(type: string): string {
-    switch (type) {
-      case 'REGISTRAR_UPDATE':
-        return 'history-log__icon--update';
-      case 'REGISTRAR_SECURITY_UPDATE':
-        return 'history-log__icon--security';
-      default:
-        return '';
-    }
-  }
-
-  parseDescription(description: string): {
-    main: string;
-    detail: string | null;
-  } {
-    if (!description) {
-      return { main: 'N/A', detail: null };
-    }
-    const parts = description.split('|');
-    const detail = parts.length > 1 ? parts[1].replace(/_/g, ' ') : parts[0];
-
-    return {
-      main: parts[0],
-      detail: detail,
-    };
-  }
-}

console-webapp/src/app/home/home.component.spec.ts

@@ -16,10 +16,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { HomeComponent } from './home.component';
 import { MaterialModule } from '../material.module';
-import { AppModule } from '../app.module';
-import { BackendService } from '../shared/services/backend.service';
-import { provideHttpClient } from '@angular/common/http';
-import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 describe('HomeComponent', () => {
   let component: HomeComponent;
@@ -27,13 +23,8 @@ describe('HomeComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [MaterialModule, AppModule],
+      imports: [MaterialModule],
       declarations: [HomeComponent],
-      providers: [
-        BackendService,
-        provideHttpClient(),
-        provideHttpClientTesting(),
-      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(HomeComponent);

console-webapp/src/app/home/home.component.ts

@@ -25,7 +25,6 @@ import { BreakPointObserverService } from '../shared/services/breakPoint.service
   selector: 'app-home',
   templateUrl: './home.component.html',
   styleUrls: ['./home.component.scss'],
-  standalone: false,
 })
 export class HomeComponent {
   constructor(

console-webapp/src/app/lock/registryLockVerify.component.scss

@@ -3,7 +3,7 @@
     margin-top: 30px;
   }
   &-subhead {
-    font-size: 1.25rem;
+    font-size: 20px;
     margin-bottom: 20px;
   }
 }

console-webapp/src/app/lock/registryLockVerify.component.ts

@@ -25,7 +25,6 @@ import { DomainListComponent } from '../domains/domainList.component';
   templateUrl: './registryLockVerify.component.html',
   styleUrls: ['./registryLockVerify.component.scss'],
   providers: [RegistryLockVerifyService],
-  standalone: false,
 })
 export class RegistryLockVerifyComponent {
   public static PATH = 'registry-lock-verify';

console-webapp/src/app/navigation/navigation.component.html

@@ -6,24 +6,18 @@
   <mat-tree-node
     *matTreeNodeDef="let node"
     matTreeNodeToggle
-    tabindex="0"
     (click)="onClick(node)"
-    (keyup.enter)="onClick(node)"
     [class.active]="router.url.includes(node.path)"
     [elementId]="getElementId(node)"
   >
-    @if (node.iconName) {
-    <mat-icon class="console-app__nav-icon">
+    <mat-icon class="console-app__nav-icon" *ngIf="node.iconName">
       {{ node.iconName }}
     </mat-icon>
-    }
     {{ node.title }}
   </mat-tree-node>
   <mat-nested-tree-node
     *matTreeNodeDef="let node; when: hasChild"
     (click)="onClick(node)"
-    tabindex="0"
-    (keyup.enter)="onClick(node)"
   >
     <div class="mat-tree-node" [class.active]="router.url.includes(node.path)">
       <button
@@ -36,11 +30,9 @@
           {{ treeControl.isExpanded(node) ? "expand_more" : "chevron_right" }}
         </mat-icon>
       </button>
-      @if (node.iconName) {
-      <mat-icon class="console-app__nav-icon">
+      <mat-icon class="console-app__nav-icon" *ngIf="node.iconName">
         {{ node.iconName }}
       </mat-icon>
-      }
       {{ node.title }}
     </div>
     <div

console-webapp/src/app/navigation/navigation.component.ts

@@ -33,7 +33,6 @@ interface NavMenuNode extends RouteWithIcon {
   selector: 'app-navigation',
   templateUrl: './navigation.component.html',
   styleUrls: ['./navigation.component.scss'],
-  standalone: false,
 })
 export class NavigationComponent {
   renderRouter: boolean = true;
@@ -57,7 +56,7 @@ export class NavigationComponent {
   }
 
   ngOnDestroy() {
-    this.subscription && this.subscription.unsubscribe();
+    this.subscription.unsubscribe();
   }
 
   getElementId(node: RouteWithIcon) {

console-webapp/src/app/ote/newOte.component.html

@@ -30,14 +30,7 @@
         >
       </mat-form-field>
     </p>
-    <button
-      mat-flat-button
-      color="primary"
-      type="submit"
-      aria-label="Submit new OT&E account"
-    >
-      Save
-    </button>
+    <button mat-flat-button color="primary" type="submit">Save</button>
   </form>
   }
 </div>

console-webapp/src/app/ote/newOte.component.ts

@@ -26,6 +26,7 @@ export interface OteCreateResponse extends Map<string, string> {
 
 @Component({
   selector: 'app-ote',
+  standalone: true,
   imports: [MaterialModule, SnackBarModule],
   templateUrl: './newOte.component.html',
   styleUrls: ['./newOte.component.scss'],

console-webapp/src/app/ote/oteStatus.component.html

@@ -1,28 +1,25 @@
 <h1 class="mat-headline-4">OT&E Status Check</h1>
 @if(registrarId() === null) {
 <h1>Missing registrarId param</h1>
-} @else if(isOte()) { @if (oteStatusResponse().length) {
-<h1>
+} @else if(isOte()) {
+<h1 *ngIf="oteStatusResponse().length">
   Status:
   <span>{{ oteStatusUnfinished().length ? "Unfinished" : "Completed" }}</span>
 </h1>
-}
 <div class="console-app__ote-status">
   @if(oteStatusCompleted().length) {
   <div class="console-app__ote-status_completed">
     <h1>Completed</h1>
-    @for (entry of oteStatusCompleted(); track entry) {
-    <div><mat-icon>check_box</mat-icon>{{ entry.description }}</div>
-    }
+    <div *ngFor="let entry of oteStatusCompleted()">
+      <mat-icon>check_box</mat-icon>{{ entry.description }}
+    </div>
   </div>
   } @if(oteStatusUnfinished().length) {
   <div class="console-app__ote-status_unfinished">
     <h1>Unfinished</h1>
-    @for (entry of oteStatusUnfinished(); track entry) {
-    <div>
+    <div *ngFor="let entry of oteStatusUnfinished()">
       <mat-icon>check_box_outline_blank</mat-icon>{{ entry.description }}
     </div>
-    }
   </div>
   }
 </div>

console-webapp/src/app/ote/oteStatus.component.ts

@@ -18,7 +18,7 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { RegistrarService } from '../registrar/registrar.service';
 import { MaterialModule } from '../material.module';
 import { SnackBarModule } from '../snackbar.module';
-
+import { CommonModule } from '@angular/common';
 import { ActivatedRoute, ParamMap } from '@angular/router';
 import { take } from 'rxjs';
 
@@ -31,7 +31,8 @@ export interface OteStatusResponse {
 
 @Component({
   selector: 'app-ote-status',
-  imports: [MaterialModule, SnackBarModule],
+  standalone: true,
+  imports: [MaterialModule, SnackBarModule, CommonModule],
   templateUrl: './oteStatus.component.html',
   styleUrls: ['./oteStatus.component.scss'],
 })

console-webapp/src/app/registrar/newRegistrar.component.html

@@ -175,7 +175,6 @@ JPY=billing-id-for-yen"
       mat-flat-button
       color="primary"
       type="submit"
-      aria-label="Submit new registrar request"
     >
       Save
     </button>

console-webapp/src/app/registrar/newRegistrar.component.ts

@@ -33,7 +33,6 @@ interface LocalizedAddressStreet {
   templateUrl: './newRegistrar.component.html',
   styleUrls: ['./newRegistrar.component.scss'],
   encapsulation: ViewEncapsulation.None,
-  standalone: false,
 })
 export default class NewRegistrarComponent {
   protected newRegistrar: Registrar;
@@ -48,6 +47,7 @@ export default class NewRegistrarComponent {
     this.newRegistrar = {
       registrarId: '',
       url: '',
+      whoisServer: '',
       registrarName: '',
       icannReferralEmail: '',
       localizedAddress: {

console-webapp/src/app/registrar/registrar.service.ts

@@ -50,16 +50,17 @@ export interface SecuritySettings
   ipAddressAllowList?: Array<IpAllowListItem>;
 }
 
-export interface RdapRegistrarFields {
+export interface WhoisRegistrarFields {
   ianaIdentifier?: number;
   icannReferralEmail: string;
   localizedAddress: Address;
   registrarId: string;
   url: string;
+  whoisServer: string;
 }
 
 export interface Registrar
-  extends RdapRegistrarFields,
+  extends WhoisRegistrarFields,
     SecuritySettingsBackendModel {
   allowedTlds?: string[];
   billingAccountMap?: object;
@@ -71,7 +72,6 @@ export interface Registrar
   registrarName: string;
   registryLockAllowed?: boolean;
   type?: string;
-  lastPocVerificationDate?: string;
 }
 
 @Injectable({

console-webapp/src/app/registrar/registrarDetails.component.html

@@ -1,8 +1,4 @@
-<div
-  class="console-app__registrar-view"
-  cdkTrapFocus
-  [cdkTrapFocusAutoCapture]="true"
->
+<div class="console-app__registrar-view">
   <h1 class="mat-headline-4">Registrars</h1>
   <mat-divider></mat-divider>
   <div class="console-app__registrar-view-content">
@@ -11,16 +7,16 @@
         <mat-icon>arrow_back</mat-icon>
       </button>
       <div class="spacer"></div>
-      @if(!inEdit && !registrarNotFound) { @if (oteButtonVisible) {
+      @if(!inEdit && !registrarNotFound) {
       <button
+        *ngIf="oteButtonVisible"
         mat-stroked-button
         (click)="checkOteStatus()"
-        aria-label="Check OT&E account status"
+        aria-label="Check OT&E account"
         [elementId]="getElementIdForOteBlock()"
       >
         Check OT&E Status
       </button>
-      }
       <button
         mat-flat-button
         color="primary"
@@ -39,11 +35,10 @@
     <h1>Registrar not found</h1>
     } @else {
     <h1>{{ registrarInEdit.registrarId }}</h1>
-    @if (registrarInEdit.registrarName !== registrarInEdit.registrarId) {
-    <h2>
+    <h2 *ngIf="registrarInEdit.registrarName !== registrarInEdit.registrarId">
       {{ registrarInEdit.registrarName }}
     </h2>
-    } @if(inEdit) {
+    @if(inEdit) {
     <form (ngSubmit)="saveAndClose()">
       <div>
         <mat-form-field appearance="outline">
@@ -61,14 +56,15 @@
         <mat-form-field appearance="outline">
           <mat-label>Onboarded TLDs: </mat-label>
           <mat-chip-grid #chipGrid aria-label="Enter TLD">
-            @for (tld of registrarInEdit.allowedTlds; track tld) {
-            <mat-chip-row (removed)="removeTLD(tld)">
+            <mat-chip-row
+              *ngFor="let tld of registrarInEdit.allowedTlds"
+              (removed)="removeTLD(tld)"
+            >
               {{ tld }}
               <button matChipRemove aria-label="'remove ' + tld">
                 <mat-icon>cancel</mat-icon>
               </button>
             </mat-chip-row>
-            }
           </mat-chip-grid>
           <input
             placeholder="New tld..."

console-webapp/src/app/registrar/registrarDetails.component.ts

@@ -27,7 +27,6 @@ import { environment } from '../../environments/environment';
   selector: 'app-registrar-details',
   templateUrl: './registrarDetails.component.html',
   styleUrls: ['./registrarDetails.component.scss'],
-  standalone: false,
 })
 export class RegistrarDetailsComponent implements OnInit {
   public static PATH = 'registrars/:id';

console-webapp/src/app/registrar/registrarSelector.component.html

@@ -11,7 +11,6 @@
       [ngModelOptions]="{ standalone: true }"
       (focus)="onFocus()"
       [matAutocomplete]="auto"
-      spellcheck="false"
     />
     <mat-autocomplete
       autoActiveFirstOption

console-webapp/src/app/registrar/registrarSelector.component.ts

@@ -19,16 +19,12 @@ import { RegistrarService } from './registrar.service';
   selector: 'app-registrar-selector',
   templateUrl: './registrarSelector.component.html',
   styleUrls: ['./registrarSelector.component.scss'],
-  standalone: false,
 })
 export class RegistrarSelectorComponent {
   registrarInput = signal<string>(this.registrarService.registrarId());
   filteredOptions?: string[];
   allRegistrarIds = computed(() =>
-    this.registrarService
-      .registrars()
-      .map((r) => r.registrarId)
-      .sort()
+    this.registrarService.registrars().map((r) => r.registrarId)
   );
 
   constructor(protected registrarService: RegistrarService) {

console-webapp/src/app/registrar/registrarsTable.component.html

@@ -3,18 +3,17 @@
 } @else {
 <div class="console-app__registrars">
   <div class="console-app__registrars-header">
-    <h1 class="mat-headline-4" forceFocus>Registrars</h1>
+    <h1 class="mat-headline-4">Registrars</h1>
     <div class="spacer"></div>
-    @if (oteButtonVisible) {
     <button
       mat-stroked-button
+      *ngIf="oteButtonVisible"
       (click)="createOteAccount()"
       aria-label="Generate OT&E accounts"
       [elementId]="getElementIdForOteBlock()"
     >
       Create OT&E accounts
     </button>
-    }
     <button
       class="console-app__registrars-new"
       mat-flat-button
@@ -44,8 +43,10 @@
         class="console-app__registrars-table"
         matSort
       >
-        @for (column of columns; track column) {
-        <ng-container [matColumnDef]="column.columnDef">
+        <ng-container
+          *ngFor="let column of columns"
+          [matColumnDef]="column.columnDef"
+        >
           <mat-header-cell *matHeaderCellDef>
             {{ column.header }}
           </mat-header-cell>
@@ -54,13 +55,10 @@
             [innerHTML]="column.cell(row)"
           ></mat-cell>
         </ng-container>
-        }
         <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
         <mat-row
           *matRowDef="let row; columns: displayedColumns"
           (click)="openDetails(row.registrarId)"
-          tabindex="0"
-          (keyup.enter)="openDetails(row.registrarId)"
         ></mat-row>
       </mat-table>
 

console-webapp/src/app/registrar/registrarsTable.component.ts

@@ -78,7 +78,6 @@ export const columns = [
   templateUrl: './registrarsTable.component.html',
   styleUrls: ['./registrarsTable.component.scss'],
   encapsulation: ViewEncapsulation.None,
-  standalone: false,
 })
 export class RegistrarComponent {
   public static PATH = 'registrars';

console-webapp/src/app/resources/resources.component.html

@@ -1,4 +1,4 @@
-<h1 class="mat-headline-4" forceFocus>Resources</h1>
+<h1 class="mat-headline-4">Resources</h1>
 <div class="console-app__resources">
   <div>
     <div class="console-app__resources-subhead">Technical resources</div>
@@ -11,6 +11,6 @@
     >
   </div>
   <div>
-    <img src="./assets/resources.png" alt="Generic resources image" />
+    <img src="./assets/resources.png" />
   </div>
 </div>

console-webapp/src/app/resources/resources.component.scss

@@ -16,7 +16,7 @@
     width: 100%;
   }
   &-subhead {
-    font-size: 1.25rem;
+    font-size: 20px;
     margin-bottom: 20px;
   }
 }

console-webapp/src/app/resources/resources.component.ts

@@ -19,7 +19,6 @@ import { UserDataService } from '../shared/services/userData.service';
   selector: 'app-resources',
   templateUrl: './resources.component.html',
   styleUrls: ['./resources.component.scss'],
-  standalone: false,
 })
 export class ResourcesComponent {
   public static PATH = 'resources';

console-webapp/src/app/settings/contact/contact.component.html

@@ -22,18 +22,17 @@
   </div>
   } @else {
   <mat-table [dataSource]="dataSource" class="mat-elevation-z0">
-    @for (column of columns; track column) {
-    <ng-container [matColumnDef]="column.columnDef">
+    <ng-container
+      *ngFor="let column of columns"
+      [matColumnDef]="column.columnDef"
+    >
       <mat-header-cell *matHeaderCellDef> {{ column.header }} </mat-header-cell>
       <mat-cell *matCellDef="let row" [innerHTML]="column.cell(row)"></mat-cell>
     </ng-container>
-    }
     <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
     <mat-row
       *matRowDef="let row; columns: displayedColumns"
-      tabindex="0"
       (click)="openDetails(row)"
-      (keyup.enter)="openDetails(row)"
     ></mat-row>
   </mat-table>
   }

console-webapp/src/app/settings/contact/contact.component.ts

@@ -16,14 +16,17 @@ import { Component, effect, ViewEncapsulation } from '@angular/core';
 import { MatTableDataSource } from '@angular/material/table';
 import { take } from 'rxjs';
 import { RegistrarService } from 'src/app/registrar/registrar.service';
-import { ContactService, ViewReadyContact } from './contact.service';
+import {
+  ContactService,
+  contactTypeToViewReadyContact,
+  ViewReadyContact,
+} from './contact.service';
 
 @Component({
   selector: 'app-contact',
   templateUrl: './contact.component.html',
   styleUrls: ['./contact.component.scss'],
   encapsulation: ViewEncapsulation.None,
-  standalone: false,
 })
 export default class ContactComponent {
   public static PATH = 'contact';

console-webapp/src/app/settings/contact/contact.service.ts

@@ -35,7 +35,7 @@ export const contactTypeToTextMap: contactTypesToUserFriendlyTypes = {
   LEGAL: 'Legal contact',
   MARKETING: 'Marketing contact',
   TECH: 'Technical contact',
-  WHOIS: 'RDAP-Inquiry contact',
+  WHOIS: 'WHOIS-Inquiry contact',
 };
 
 type UserFriendlyType = (typeof contactTypeToTextMap)[contactType];
@@ -47,9 +47,9 @@ export interface Contact {
   registrarId?: string;
   faxNumber?: string;
   types: Array<contactType>;
-  visibleInRdapAsAdmin?: boolean;
-  visibleInRdapAsTech?: boolean;
-  visibleInDomainRdapAsAbuse?: boolean;
+  visibleInWhoisAsAdmin?: boolean;
+  visibleInWhoisAsTech?: boolean;
+  visibleInDomainWhoisAsAbuse?: boolean;
 }
 
 export interface ViewReadyContact extends Contact {
@@ -59,10 +59,7 @@ export interface ViewReadyContact extends Contact {
 export function contactTypeToViewReadyContact(c: Contact): ViewReadyContact {
   return {
     ...c,
-    userFriendlyTypes: (c.types || []).map(
-      (cType) => contactTypeToTextMap[cType]
-    ),
-    types: c.types || [],
+    userFriendlyTypes: c.types?.map((cType) => contactTypeToTextMap[cType]),
   };
 }
 
@@ -86,7 +83,7 @@ export class ContactService {
       : contactTypeToViewReadyContact({
           emailAddress: '',
           name: '',
-          types: ['TECH'],
+          types: ['ADMIN'],
           faxNumber: '',
           phoneNumber: '',
           registrarId: '',
@@ -101,21 +98,19 @@ export class ContactService {
     );
   }
 
-  updateContact(contact: ViewReadyContact) {
+  saveContacts(contacts: ViewReadyContact[]): Observable<Contact[]> {
     return this.backend
-      .updateContact(this.registrarService.registrarId(), contact)
+      .postContacts(this.registrarService.registrarId(), contacts)
       .pipe(switchMap((_) => this.fetchContacts()));
   }
 
   addContact(contact: ViewReadyContact) {
-    return this.backend
-      .createContact(this.registrarService.registrarId(), contact)
-      .pipe(switchMap((_) => this.fetchContacts()));
+    const newContacts = this.contacts().concat([contact]);
+    return this.saveContacts(newContacts);
   }
 
   deleteContact(contact: ViewReadyContact) {
-    return this.backend
-      .deleteContact(this.registrarService.registrarId(), contact)
-      .pipe(switchMap((_) => this.fetchContacts()));
+    const newContacts = this.contacts().filter((c) => c !== contact);
+    return this.saveContacts(newContacts);
   }
 }

console-webapp/src/app/settings/contact/contactDetails.component.html

@@ -1,5 +1,4 @@
-@if (contactService.contactInEdit) {
-<div class="console-app__contact" cdkTrapFocus [cdkTrapFocusAutoCapture]="true">
+<div class="console-app__contact" *ngIf="contactService.contactInEdit">
   <div class="console-app__contact-controls">
     <button
       mat-icon-button
@@ -28,6 +27,7 @@
     </button>
     }
   </div>
+
   @if(isEditing || contactService.isContactNewView) {
   <h1>Contact Details</h1>
   <form (ngSubmit)="save($event)">
@@ -41,6 +41,7 @@
           [ngModelOptions]="{ standalone: true }"
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>Primary account email: </mat-label>
         <input
@@ -50,14 +51,9 @@
           [required]="true"
           [(ngModel)]="contactService.contactInEdit.emailAddress"
           [ngModelOptions]="{ standalone: true }"
-          [disabled]="emailAddressIsDisabled()"
-          [matTooltip]="
-            emailAddressIsDisabled()
-              ? 'Reach out to registry customer support to update email address'
-              : ''
-          "
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>Phone: </mat-label>
         <input
@@ -67,6 +63,7 @@
           placeholder="+0.0000000000"
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>Fax: </mat-label>
         <input
@@ -76,47 +73,48 @@
         />
       </mat-form-field>
     </section>
+
     <section>
       <h1>Contact Type</h1>
       <p class="console-app__contact-required">
         <mat-icon color="accent">error</mat-icon>Required to select at least one
-        (primary contact can't be updated)
       </p>
       <div class="">
-        @for (contactType of contactTypeToTextMap | keyvalue; track contactType)
-        { @if (shouldDisplayCheckbox(contactType.key)) {
         <mat-checkbox
+          *ngFor="let contactType of contactTypeToTextMap | keyvalue"
           [checked]="checkboxIsChecked(contactType.key)"
           (change)="checkboxOnChange($event, contactType.key)"
           [disabled]="checkboxIsDisabled(contactType.key)"
         >
           {{ contactType.value }}
         </mat-checkbox>
-        } }
       </div>
     </section>
+
     <section>
-      <h1>RDAP Preferences</h1>
+      <h1>WHOIS Preferences</h1>
       <div>
         <mat-checkbox
-          [(ngModel)]="contactService.contactInEdit.visibleInRdapAsAdmin"
+          [(ngModel)]="contactService.contactInEdit.visibleInWhoisAsAdmin"
           [ngModelOptions]="{ standalone: true }"
-          >Show in Registrar RDAP record as admin contact</mat-checkbox
+          >Show in Registrar WHOIS record as admin contact</mat-checkbox
         >
       </div>
+
       <div>
         <mat-checkbox
-          [(ngModel)]="contactService.contactInEdit.visibleInRdapAsTech"
+          [(ngModel)]="contactService.contactInEdit.visibleInWhoisAsTech"
           [ngModelOptions]="{ standalone: true }"
-          >Show in Registrar RDAP record as technical contact</mat-checkbox
+          >Show in Registrar WHOIS record as technical contact</mat-checkbox
         >
       </div>
+
       <div>
         <mat-checkbox
-          [(ngModel)]="contactService.contactInEdit.visibleInDomainRdapAsAbuse"
+          [(ngModel)]="contactService.contactInEdit.visibleInDomainWhoisAsAbuse"
           [ngModelOptions]="{ standalone: true }"
-          >Show Phone and Email in Domain RDAP Record as registrar abuse contact
-          (per CL&D requirements)</mat-checkbox
+          >Show Phone and Email in Domain WHOIS Record as registrar abuse
+          contact (per CL&D requirements)</mat-checkbox
         >
       </div>
     </section>
@@ -125,7 +123,6 @@
       mat-flat-button
       color="primary"
       type="submit"
-      aria-label="Save contact updates"
     >
       Save
     </button>
@@ -173,28 +170,30 @@
     <mat-card-content>
       <mat-list role="list">
         <mat-list-item role="listitem">
-          <h2>RDAP Preferences</h2>
+          <h2>WHOIS Preferences</h2>
         </mat-list-item>
-        @if(contactService.contactInEdit.visibleInRdapAsAdmin) {
+        @if(contactService.contactInEdit.visibleInWhoisAsAdmin) {
         <mat-divider></mat-divider>
         <mat-list-item role="listitem">
           <span class="console-app__list-value"
-            >Show in Registrar RDAP record as admin contact</span
+            >Show in Registrar WHOIS record as admin contact</span
           >
         </mat-list-item>
-        } @if(contactService.contactInEdit.visibleInRdapAsTech) {
+        } @if(contactService.contactInEdit.visibleInWhoisAsTech) {
         <mat-divider></mat-divider>
-        @if (contactService.contactInEdit.visibleInRdapAsTech) {
-        <mat-list-item role="listitem">
+        <mat-list-item
+          role="listitem"
+          *ngIf="contactService.contactInEdit.visibleInWhoisAsTech"
+        >
           <span class="console-app__list-value"
-            >Show in Registrar RDAP record as technical contact</span
+            >Show in Registrar WHOIS record as technical contact</span
           >
         </mat-list-item>
-        } } @if(contactService.contactInEdit.visibleInDomainRdapAsAbuse) {
+        } @if(contactService.contactInEdit.visibleInDomainWhoisAsAbuse) {
         <mat-divider></mat-divider>
         <mat-list-item role="listitem">
           <span class="console-app__list-value"
-            >Show Phone and Email in Domain RDAP Record as registrar abuse
+            >Show Phone and Email in Domain WHOIS Record as registrar abuse
             contact (per CL&D requirements)</span
           >
         </mat-list-item>
@@ -204,4 +203,3 @@
   </mat-card>
   }
 </div>
-}

console-webapp/src/app/settings/contact/contactDetails.component.ts

@@ -27,7 +27,6 @@ import {
   selector: 'app-contact-details',
   templateUrl: './contactDetails.component.html',
   styleUrls: ['./contactDetails.component.scss'],
-  standalone: false,
 })
 export class ContactDetailsComponent {
   protected contactTypeToTextMap = contactTypeToTextMap;
@@ -69,13 +68,9 @@ export class ContactDetailsComponent {
 
   save(e: SubmitEvent) {
     e.preventDefault();
-    if ((this.contactService.contactInEdit.types || []).length === 0) {
-      this._snackBar.open('Required to select contact type');
-      return;
-    }
     const request = this.contactService.isContactNewView
       ? this.contactService.addContact(this.contactService.contactInEdit)
-      : this.contactService.updateContact(this.contactService.contactInEdit);
+      : this.contactService.saveContacts(this.contactService.contacts());
     request.subscribe({
       complete: () => {
         this.goBack();
@@ -86,10 +81,6 @@ export class ContactDetailsComponent {
     });
   }
 
-  shouldDisplayCheckbox(type: string) {
-    return type !== 'ADMIN' || this.checkboxIsChecked(type);
-  }
-
   checkboxIsChecked(type: string) {
     return this.contactService.contactInEdit.types.includes(
       type as contactType
@@ -97,9 +88,6 @@ export class ContactDetailsComponent {
   }
 
   checkboxIsDisabled(type: string) {
-    if (type === 'ADMIN') {
-      return true;
-    }
     return (
       this.contactService.contactInEdit.types.length === 1 &&
       this.contactService.contactInEdit.types[0] === (type as contactType)
@@ -116,8 +104,4 @@ export class ContactDetailsComponent {
         );
     }
   }
-
-  emailAddressIsDisabled() {
-    return this.contactService.contactInEdit.types.includes('ADMIN');
-  }
 }

console-webapp/src/app/settings/security/eppPasswordEdit.component.html

@@ -1,8 +1,4 @@
-<div
-  class="settings-security__edit-password"
-  cdkTrapFocus
-  [cdkTrapFocusAutoCapture]="true"
->
+<div class="settings-security__edit-password">
   <p>
     <button
       mat-icon-button
@@ -16,20 +12,65 @@
   <p class="secondary-text">
     Passwords must be between 6 and 16 alphanumeric characters
   </p>
-  <password-input-form-component
-    [displayOldPasswordField]="true"
+  <form
+    (ngSubmit)="save()"
     [formGroup]="passwordUpdateForm"
-    (submitResults)="save($event)"
-  />
-  <div class="settings-security__reset-password-field">
-    <h2>Need to reset your EPP password?</h2>
+    class="settings-security__edit-password-form"
+  >
+    <div class="settings-security__edit-password-field">
+      <mat-form-field appearance="outline">
+        <mat-label>Old password: </mat-label>
+        <input
+          matInput
+          type="text"
+          formControlName="oldPassword"
+          required
+          autocomplete="current-password"
+        />
+        <mat-error *ngIf="hasError('oldPassword') as errorText">{{
+          errorText
+        }}</mat-error>
+      </mat-form-field>
+    </div>
+    <div class="settings-security__edit-password-field">
+      <mat-form-field appearance="outline">
+        <mat-label>New password: </mat-label>
+        <input
+          matInput
+          type="text"
+          formControlName="newPassword"
+          required
+          autocomplete="new-password"
+        />
+        <mat-error *ngIf="hasError('newPassword') as errorText">{{
+          errorText
+        }}</mat-error>
+      </mat-form-field>
+    </div>
+    <div class="settings-security__edit-password-field">
+      <mat-form-field appearance="outline">
+        <mat-label>Confirm new password: </mat-label>
+        <input
+          matInput
+          type="text"
+          formControlName="newPasswordRepeat"
+          required
+          autocomplete="new-password"
+        />
+        <mat-error *ngIf="hasError('newPasswordRepeat') as errorText">{{
+          errorText
+        }}</mat-error>
+      </mat-form-field>
+    </div>
     <button
       mat-flat-button
       color="primary"
-      aria-label="Reset EPP password via email"
-      (click)="requestEppPasswordReset()"
+      [disabled]="!passwordUpdateForm.valid"
+      aria-label="Save epp password update"
+      type="submit"
+      class="settings-security__edit-password-save"
     >
-      Reset EPP password via email
+      Save
     </button>
-  </div>
+  </form>
 </div>

console-webapp/src/app/settings/security/eppPasswordEdit.component.scss

@@ -1,19 +1,16 @@
-// Copyright 2025 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-.settings-security {
-  &__reset-password-field {
-    margin-top: 60px;
+.settings-security__edit-password {
+  max-width: 616px;
+  &-field {
+    width: 100%;
+    mat-form-field {
+      margin-bottom: 20px;
+      width: 100%;
+    }
+  }
+  &-form {
+    margin-top: 30px;
+  }
+  &-save {
+    margin-top: 30px;
   }
 }

console-webapp/src/app/settings/security/eppPasswordEdit.component.ts

@@ -14,86 +14,97 @@
 
 import { HttpErrorResponse } from '@angular/common/http';
 import { Component } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
+import {
+  AbstractControl,
+  FormControl,
+  FormGroup,
+  ValidatorFn,
+  Validators,
+} from '@angular/forms';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { RegistrarService } from 'src/app/registrar/registrar.service';
 import { SecurityService } from './security.service';
-import { UserDataService } from 'src/app/shared/services/userData.service';
-import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 
-import { MaterialModule } from 'src/app/material.module';
-import { filter, switchMap, take } from 'rxjs';
-import { BackendService } from 'src/app/shared/services/backend.service';
-import {
-  PasswordInputForm,
-  PasswordResults,
-} from 'src/app/shared/components/passwordReset/passwordInputForm.component';
+type errorCode = 'required' | 'maxlength' | 'minlength' | 'passwordsDontMatch';
 
-@Component({
-  selector: 'app-reset-epp-password-dialog',
-  template: `
-    <h2 mat-dialog-title>Please confirm the password reset:</h2>
-    <mat-dialog-content>
-      This will send an EPP password reset email to the admin POC.
-    </mat-dialog-content>
-    <mat-dialog-actions>
-      <button mat-button (click)="onCancel()">Cancel</button>
-      <button mat-button color="warn" (click)="onSave()">Confirm</button>
-    </mat-dialog-actions>
-  `,
-  imports: [MaterialModule],
-})
-export class ResetEppPasswordComponent {
-  constructor(public dialogRef: MatDialogRef<ResetEppPasswordComponent>) {}
-
-  onSave(): void {
-    this.dialogRef.close(true);
-  }
-
-  onCancel(): void {
-    this.dialogRef.close(false);
-  }
-}
+type errorFriendlyText = { [type in errorCode]: String };
 
 @Component({
   selector: 'app-epp-password-edit',
   templateUrl: './eppPasswordEdit.component.html',
   styleUrls: ['./eppPasswordEdit.component.scss'],
-  standalone: false,
 })
 export default class EppPasswordEditComponent {
-  static EPP_VALIDATORS = [
-    Validators.required,
-    Validators.minLength(6),
-    Validators.maxLength(16),
-    PasswordInputForm.newPasswordsMatch,
-  ];
+  MIN_MAX_LENGHT = new String(
+    'Passwords must be between 6 and 16 alphanumeric characters'
+  );
+
+  errorTextMap: errorFriendlyText = {
+    required: "This field can't be empty",
+    maxlength: this.MIN_MAX_LENGHT,
+    minlength: this.MIN_MAX_LENGHT,
+    passwordsDontMatch: "Passwords don't match",
+  };
+
+  constructor(
+    public securityService: SecurityService,
+    private _snackBar: MatSnackBar,
+    public registrarService: RegistrarService
+  ) {}
+
+  hasError(controlName: string) {
+    const maybeErrors = this.passwordUpdateForm.get(controlName)?.errors;
+    const maybeError =
+      maybeErrors && (Object.keys(maybeErrors)[0] as errorCode);
+    if (maybeError) {
+      return this.errorTextMap[maybeError];
+    }
+    return '';
+  }
+
+  newPasswordsMatch: ValidatorFn = (control: AbstractControl) => {
+    if (
+      this.passwordUpdateForm?.get('newPassword')?.value ===
+      this.passwordUpdateForm?.get('newPasswordRepeat')?.value
+    ) {
+      this.passwordUpdateForm?.get('newPasswordRepeat')?.setErrors(null);
+    } else {
+      // latest angular just won't detect the error without setTimeout
+      setTimeout(() => {
+        this.passwordUpdateForm
+          ?.get('newPasswordRepeat')
+          ?.setErrors({ passwordsDontMatch: control.value });
+      });
+    }
+    return null;
+  };
 
   passwordUpdateForm = new FormGroup({
     oldPassword: new FormControl('', [Validators.required]),
-    newPassword: new FormControl('', EppPasswordEditComponent.EPP_VALIDATORS),
-    newPasswordRepeat: new FormControl(
-      '',
-      EppPasswordEditComponent.EPP_VALIDATORS
-    ),
+    newPassword: new FormControl('', [
+      Validators.required,
+      Validators.minLength(6),
+      Validators.maxLength(16),
+      this.newPasswordsMatch,
+    ]),
+    newPasswordRepeat: new FormControl('', [
+      Validators.required,
+      Validators.minLength(6),
+      Validators.maxLength(16),
+      this.newPasswordsMatch,
+    ]),
   });
 
-  constructor(
-    public registrarService: RegistrarService,
-    public securityService: SecurityService,
-    protected userDataService: UserDataService,
-    private backendService: BackendService,
-    private resetPasswordDialog: MatDialog,
-    private _snackBar: MatSnackBar
-  ) {}
-
-  save(passwordResults: PasswordResults) {
+  save() {
+    const { oldPassword, newPassword, newPasswordRepeat } =
+      this.passwordUpdateForm.value;
+    if (!oldPassword || !newPassword || !newPasswordRepeat) return;
     this.securityService
       .saveEppPassword({
         registrarId: this.registrarService.registrarId(),
-        oldPassword: passwordResults.oldPassword!,
-        newPassword: passwordResults.newPassword,
-        newPasswordRepeat: passwordResults.newPasswordRepeat,
+        oldPassword,
+        newPassword,
+        newPasswordRepeat,
       })
       .subscribe({
         complete: () => {
@@ -108,26 +119,4 @@ export default class EppPasswordEditComponent {
   goBack() {
     this.securityService.isEditingPassword = false;
   }
-
-  sendEppPasswordResetRequest() {
-    return this.backendService.requestEppPasswordReset(
-      this.registrarService.registrarId()
-    );
-  }
-
-  requestEppPasswordReset() {
-    const dialogRef = this.resetPasswordDialog.open(ResetEppPasswordComponent);
-    dialogRef
-      .afterClosed()
-      .pipe(
-        take(1),
-        filter((result) => !!result)
-      )
-      .pipe(switchMap((_) => this.sendEppPasswordResetRequest()))
-      .subscribe({
-        next: (_) => this.goBack(),
-        error: (err: HttpErrorResponse) =>
-          this._snackBar.open(err.error || err.message),
-      });
-  }
 }

console-webapp/src/app/settings/security/security.component.html

@@ -68,7 +68,7 @@
           >
         </mat-list-item>
         <mat-divider></mat-divider>
-        @for (item of dataSource.ipAddressAllowList; track $index){
+        @for (item of dataSource.ipAddressAllowList; track item.value) {
         <mat-list-item role="listitem">
           <span class="console-app__list-value">{{ item.value }}</span>
         </mat-list-item>

console-webapp/src/app/settings/security/security.component.spec.ts

@@ -12,13 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {
-  ComponentFixture,
-  fakeAsync,
-  TestBed,
-  tick,
-  waitForAsync,
-} from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { provideHttpClient } from '@angular/common/http';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
@@ -36,32 +30,43 @@ import { MOCK_REGISTRAR_SERVICE } from 'src/testdata/registrar/registrar.service
 describe('SecurityComponent', () => {
   let component: SecurityComponent;
   let fixture: ComponentFixture<SecurityComponent>;
+  let fetchSecurityDetailsSpy: Function;
   let saveSpy: Function;
-  let securityServiceStub: Partial<SecurityService>;
 
   beforeEach(async () => {
-    securityServiceStub = {
-      isEditingSecurity: false,
-      isEditingPassword: false,
-      saveChanges: jasmine.createSpy('saveChanges').and.returnValue(of({})),
-    };
+    const securityServiceSpy = jasmine.createSpyObj(SecurityService, [
+      'fetchSecurityDetails',
+      'saveChanges',
+    ]);
+
+    fetchSecurityDetailsSpy =
+      securityServiceSpy.fetchSecurityDetails.and.returnValue(of());
+
+    saveSpy = securityServiceSpy.saveChanges;
 
     await TestBed.configureTestingModule({
       declarations: [SecurityEditComponent, SecurityComponent],
       imports: [MaterialModule, BrowserAnimationsModule, FormsModule],
       providers: [
         BackendService,
-        { provide: SecurityService, useValue: securityServiceStub },
+        SecurityService,
         { provide: RegistrarService, useValue: MOCK_REGISTRAR_SERVICE },
         provideHttpClient(),
         provideHttpClientTesting(),
       ],
-    }).compileComponents();
-
-    saveSpy = securityServiceStub.saveChanges as jasmine.Spy;
+    })
+      .overrideComponent(SecurityComponent, {
+        set: {
+          providers: [
+            { provide: SecurityService, useValue: securityServiceSpy },
+          ],
+        },
+      })
+      .compileComponents();
 
     fixture = TestBed.createComponent(SecurityComponent);
     component = fixture.componentInstance;
+    fixture.detectChanges();
   });
 
   it('should create', () => {
@@ -88,36 +93,17 @@ describe('SecurityComponent', () => {
     });
   }));
 
-  it('should remove ip', fakeAsync(() => {
-    fixture.detectChanges();
-    tick();
-
-    const editBtn = fixture.nativeElement.querySelector(
-      'button[aria-label="Edit security settings"]'
-    );
-    editBtn.click();
-
-    tick();
-    fixture.detectChanges();
-
-    const removeIpBtn = fixture.nativeElement.querySelector(
-      '.console-app__removeIp'
-    );
-    removeIpBtn.click();
-
-    tick();
-    fixture.detectChanges();
-
-    const saveBtn = fixture.nativeElement.querySelector(
-      '.settings-security__edit-save'
-    );
-    saveBtn.click();
-
-    tick();
-    fixture.detectChanges();
-
-    expect(saveSpy).toHaveBeenCalledWith({
-      ipAddressAllowList: [],
+  it('should remove ip', waitForAsync(() => {
+    component.dataSource.ipAddressAllowList =
+      component.dataSource.ipAddressAllowList?.splice(1);
+    fixture.whenStable().then(() => {
+      fixture.detectChanges();
+      let listElems: Array<HTMLElement> = Array.from(
+        fixture.nativeElement.querySelectorAll('span.console-app__list-value')
+      );
+      expect(listElems.map((e) => e.textContent)).toContain(
+        'No IP addresses on file.'
+      );
     });
   }));
 
@@ -133,34 +119,21 @@ describe('SecurityComponent', () => {
     expect(component.securityService.isEditingPassword).toBeTrue();
   });
 
-  it('should call save', fakeAsync(() => {
+  it('should call save', waitForAsync(async () => {
+    component.editSecurity();
+    await fixture.whenStable();
     fixture.detectChanges();
-    tick();
-
-    const editBtn = fixture.nativeElement.querySelector(
-      'button[aria-label="Edit security settings"]'
-    );
-    editBtn.click();
-
-    tick();
-    fixture.detectChanges();
-
     const el = fixture.nativeElement.querySelector(
       '.console-app__clientCertificateValue'
     );
     el.value = 'test';
     el.dispatchEvent(new Event('input'));
-
-    tick();
     fixture.detectChanges();
-
-    const saveBtn = fixture.nativeElement.querySelector(
-      '.settings-security__edit-save'
-    );
-    saveBtn.click();
-
-    tick();
-    expect(saveSpy).toHaveBeenCalledWith({
+    await fixture.whenStable();
+    fixture.nativeElement
+      .querySelector('.settings-security__edit-save')
+      .click();
+    expect(saveSpy).toHaveBeenCalledOnceWith({
       ipAddressAllowList: [{ value: '123.123.123.123' }],
       clientCertificate: 'test',
     });

console-webapp/src/app/settings/security/security.component.ts

@@ -23,7 +23,6 @@ import { SecurityService, apiToUiConverter } from './security.service';
   selector: 'app-security',
   templateUrl: './security.component.html',
   styleUrls: ['./security.component.scss'],
-  standalone: false,
 })
 export default class SecurityComponent {
   public static PATH = 'security';

console-webapp/src/app/settings/security/security.service.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { switchMap } from 'rxjs';
+import { switchMap, timeout } from 'rxjs';
 import {
   IpAllowListItem,
   RegistrarService,
@@ -69,6 +69,7 @@ export class SecurityService {
         uiToApiConverter(newSecuritySettings)
       )
       .pipe(
+        timeout(2000),
         switchMap(() => {
           return this.registrarService.loadRegistrars();
         })

console-webapp/src/app/settings/security/securityEdit.component.html

@@ -1,8 +1,4 @@
-<div
-  class="settings-security__edit"
-  cdkTrapFocus
-  [cdkTrapFocusAutoCapture]="true"
->
+<div class="settings-security__edit">
   <h1>IP Allowlist</h1>
   <p>
     Restrict access to EPP production servers to the following IP/IPv6
@@ -23,11 +19,9 @@
       <button
         matSuffix
         mat-icon-button
-        class="console-app__removeIp"
-        [attr.aria-label]="'Remove IP entry ' + ip.value"
+        aria-label="Remove"
         (click)="removeIpEntry(ip)"
         [disabled]="isUpdating"
-        type="button"
       >
         <mat-icon>close</mat-icon>
       </button>
@@ -38,7 +32,6 @@
       [disabled]="isUpdating"
       color="primary"
       (click)="createIpEntry()"
-      aria-label="Add new IP address"
       type="button"
     >
       + Add IP

console-webapp/src/app/settings/security/securityEdit.component.ts

@@ -26,7 +26,6 @@ import { SecurityService, apiToUiConverter } from './security.service';
   selector: 'app-security-edit',
   templateUrl: './securityEdit.component.html',
   styleUrls: ['./securityEdit.component.scss'],
-  standalone: false,
 })
 export default class SecurityEditComponent {
   dataSource: SecuritySettings = {};

console-webapp/src/app/settings/settings.component.html

@@ -1,6 +1,6 @@
 <app-selected-registrar-wrapper>
   <div class="console-settings">
-    <h1 class="mat-headline-4" forceFocus>Settings</h1>
+    <h1 class="mat-headline-4">Settings</h1>
     <nav
       mat-tab-nav-bar
       mat-stretch-tabs="false"
@@ -10,31 +10,22 @@
       <a
         mat-tab-link
         routerLink="contact"
-        routerLinkActive
+        routerLinkActive="active-link"
         queryParamsHandling="merge"
-        #rla="routerLinkActive"
-        [active]="rla.isActive"
-        aria-label="Access contacts settings"
         >Contacts</a
       >
       <a
         mat-tab-link
-        routerLink="rdap"
-        routerLinkActive
+        routerLink="whois"
+        routerLinkActive="active-link"
         queryParamsHandling="merge"
-        #rla2="routerLinkActive"
-        [active]="rla2.isActive"
-        aria-label="Access rdap settings"
-        >RDAP Info</a
+        >WHOIS Info</a
       >
       <a
         mat-tab-link
         routerLink="security"
-        routerLinkActive
+        routerLinkActive="active-link"
         queryParamsHandling="merge"
-        #rla3="routerLinkActive"
-        [active]="rla3.isActive"
-        aria-label="Access security settings"
         >Security</a
       >
     </nav>

console-webapp/src/app/settings/settings.component.scss

@@ -13,6 +13,14 @@
 // limitations under the License.
 
 .console-settings {
+  .mdc-tab {
+    &.active-link {
+      border-bottom: 2px solid var(--primary);
+      .mdc-tab__text-label {
+        color: var(--primary);
+      }
+    }
+  }
   nav {
     margin-bottom: 40px;
   }

console-webapp/src/app/settings/settings.component.spec.ts

@@ -17,12 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { SettingsComponent } from './settings.component';
 import { MaterialModule } from '../material.module';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { ActivatedRoute } from '@angular/router';
-import { AppModule, SelectedRegistrarModule } from '../app.module';
-import { BackendService } from '../shared/services/backend.service';
-import { provideHttpClient } from '@angular/common/http';
-import { provideHttpClientTesting } from '@angular/common/http/testing';
-import { AppRoutingModule } from '../app-routing.module';
 
 describe('SettingsComponent', () => {
   let component: SettingsComponent;
@@ -30,19 +24,7 @@ describe('SettingsComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        SelectedRegistrarModule,
-        MaterialModule,
-        BrowserAnimationsModule,
-        AppRoutingModule,
-        AppModule,
-      ],
-      providers: [
-        BackendService,
-        { provide: ActivatedRoute, useValue: {} as ActivatedRoute },
-        provideHttpClient(),
-        provideHttpClientTesting(),
-      ],
+      imports: [MaterialModule, BrowserAnimationsModule],
       declarations: [SettingsComponent],
     }).compileComponents();
 

console-webapp/src/app/settings/settings.component.ts

@@ -19,7 +19,6 @@ import { Component, ViewEncapsulation } from '@angular/core';
   templateUrl: './settings.component.html',
   styleUrls: ['./settings.component.scss'],
   encapsulation: ViewEncapsulation.None,
-  standalone: false,
 })
 export class SettingsComponent {
   public static PATH = 'settings';

console-webapp/src/app/settings/whois/whois.component.html

@@ -1,18 +1,18 @@
-@if(rdapService.editing) {
-<app-rdap-edit></app-rdap-edit>
+@if(whoisService.editing) {
+<app-whois-edit></app-whois-edit>
 } @else {
-<div class="console-app__rdap">
-  <div class="console-app__rdap-controls">
+<div class="console-app__whois">
+  <div class="console-app__whois-controls">
     <span>
-      General registrar information for your RDAP record. This information is
-      always visible in RDAP.
+      General registrar information for your WHOIS record. This information is
+      always visible in WHOIS.
     </span>
     <div class="spacer"></div>
     <button
       mat-flat-button
       color="primary"
-      aria-label="Edit RDAP record"
-      (click)="rdapService.editing = true"
+      aria-label="Edit WHOIS record"
+      (click)="whoisService.editing = true"
     >
       <mat-icon>edit</mat-icon>
       Edit
@@ -61,5 +61,45 @@
       </mat-list>
     </mat-card-content>
   </mat-card>
+
+  <mat-card appearance="outlined">
+    <mat-card-content>
+      <mat-list role="list">
+        <mat-list-item role="listitem">
+          <h2>Technical Info</h2>
+        </mat-list-item>
+        <mat-divider></mat-divider>
+        <mat-list-item role="listitem">
+          <span class="console-app__list-key">IANA Identifier</span>
+          <span class="console-app__list-value">{{
+            registrarService.registrar()?.ianaIdentifier
+          }}</span>
+        </mat-list-item>
+        <mat-divider></mat-divider>
+        <mat-list-item role="listitem">
+          <div>
+            <span class="console-app__list-key">ICANN Referral Email</span>
+            <span class="console-app__list-value">{{
+              registrarService.registrar()?.icannReferralEmail
+            }}</span>
+          </div>
+        </mat-list-item>
+        <mat-divider></mat-divider>
+        <mat-list-item role="listitem">
+          <span class="console-app__list-key">WHOIS server</span>
+          <span class="console-app__list-value">{{
+            registrarService.registrar()?.whoisServer
+          }}</span>
+        </mat-list-item>
+        <mat-divider></mat-divider>
+        <mat-list-item role="listitem">
+          <span class="console-app__list-key">Referral URL</span>
+          <span class="console-app__list-value">{{
+            registrarService.registrar()?.url
+          }}</span>
+        </mat-list-item>
+      </mat-list>
+    </mat-card-content>
+  </mat-card>
 </div>
 }

console-webapp/src/app/settings/whois/whois.component.scss

@@ -1,4 +1,4 @@
-.console-app__rdap {
+.console-app__whois {
   max-width: 616px;
 
   &-controls {

console-webapp/src/app/settings/whois/whois.component.spec.ts

@@ -20,15 +20,15 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MaterialModule } from 'src/app/material.module';
 import { RegistrarService } from 'src/app/registrar/registrar.service';
 import { BackendService } from 'src/app/shared/services/backend.service';
-import RdapComponent from './rdap.component';
+import WhoisComponent from './whois.component';
 
-describe('RdapComponent', () => {
-  let component: RdapComponent;
-  let fixture: ComponentFixture<RdapComponent>;
+describe('WhoisComponent', () => {
+  let component: WhoisComponent;
+  let fixture: ComponentFixture<WhoisComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [RdapComponent],
+      declarations: [WhoisComponent],
       imports: [MaterialModule, BrowserAnimationsModule],
       providers: [
         BackendService,
@@ -45,7 +45,7 @@ describe('RdapComponent', () => {
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(RdapComponent);
+    fixture = TestBed.createComponent(WhoisComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

console-webapp/src/app/settings/whois/whois.component.ts

@@ -14,16 +14,16 @@
 
 import { Component, computed } from '@angular/core';
 import { RegistrarService } from 'src/app/registrar/registrar.service';
-import { RdapService } from './rdap.service';
+
+import { WhoisService } from './whois.service';
 
 @Component({
-  selector: 'app-rdap',
-  templateUrl: './rdap.component.html',
-  styleUrls: ['./rdap.component.scss'],
-  standalone: false,
+  selector: 'app-whois',
+  templateUrl: './whois.component.html',
+  styleUrls: ['./whois.component.scss'],
 })
-export default class RdapComponent {
-  public static PATH = 'rdap';
+export default class WhoisComponent {
+  public static PATH = 'whois';
   formattedAddress = computed(() => {
     let result = '';
     const registrar = this.registrarService.registrar();
@@ -46,7 +46,7 @@ export default class RdapComponent {
   });
 
   constructor(
-    public rdapService: RdapService,
+    public whoisService: WhoisService,
     public registrarService: RegistrarService
   ) {}
 }

console-webapp/src/app/settings/whois/whois.service.ts

@@ -16,14 +16,14 @@ import { Injectable } from '@angular/core';
 import { switchMap } from 'rxjs';
 import {
   RegistrarService,
-  RdapRegistrarFields,
+  WhoisRegistrarFields,
 } from 'src/app/registrar/registrar.service';
 import { BackendService } from 'src/app/shared/services/backend.service';
 
 @Injectable({
   providedIn: 'root',
 })
-export class RdapService {
+export class WhoisService {
   editing: boolean = false;
 
   constructor(
@@ -31,8 +31,8 @@ export class RdapService {
     private registrarService: RegistrarService
   ) {}
 
-  saveChanges(newRdapRegistrarFields: RdapRegistrarFields) {
-    return this.backend.postRdapRegistrarFields(newRdapRegistrarFields).pipe(
+  saveChanges(newWhoisRegistrarFields: WhoisRegistrarFields) {
+    return this.backend.postWhoisRegistrarFields(newWhoisRegistrarFields).pipe(
       switchMap(() => {
         return this.registrarService.loadRegistrars();
       })

console-webapp/src/app/settings/whois/whoisEdit.component.html

@@ -1,26 +1,24 @@
-@if (registrarInEdit) {
-<div
-  class="console-app__rdap-edit"
-  cdkTrapFocus
-  [cdkTrapFocusAutoCapture]="true"
->
+<div class="console-app__whois-edit" *ngIf="registrarInEdit">
   <button
     mat-icon-button
-    class="console-app__rdap-edit-back"
-    aria-label="Back to rdap view"
-    (click)="rdapService.editing = false"
+    class="console-app__whois-edit-back"
+    aria-label="Back to whois view"
+    (click)="whoisService.editing = false"
   >
     <mat-icon>arrow_back</mat-icon>
   </button>
-  <div class="console-app__rdap-edit-controls">
+
+  <div class="console-app__whois-edit-controls">
     <span>
-      General registrar information for your RDAP record. This information is
-      always visible in RDAP.
+      General registrar information for your WHOIS record. This information is
+      always visible in WHOIS.
     </span>
     <div class="spacer"></div>
   </div>
-  <div class="console-app__rdap-edit">
+
+  <div class="console-app__whois-edit">
     <h1>Personal info</h1>
+
     <form (ngSubmit)="save($event)">
       <mat-form-field appearance="outline">
         <mat-label>Email: </mat-label>
@@ -31,6 +29,7 @@
           [ngModelOptions]="{ standalone: true }"
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>Phone: </mat-label>
         <input
@@ -40,6 +39,7 @@
           [ngModelOptions]="{ standalone: true }"
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>Fax: </mat-label>
         <input
@@ -49,6 +49,7 @@
           [ngModelOptions]="{ standalone: true }"
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>Street Address (line 1): </mat-label>
         <input
@@ -58,6 +59,7 @@
           [(ngModel)]="registrarInEdit.localizedAddress.street![0]"
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>Street Address (line 2): </mat-label>
         <input
@@ -67,6 +69,7 @@
           [(ngModel)]="registrarInEdit.localizedAddress.street![1]"
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>City: </mat-label>
         <input
@@ -76,6 +79,7 @@
           [(ngModel)]="(registrarInEdit.localizedAddress || {}).city"
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>State or Province: </mat-label>
         <input
@@ -85,6 +89,7 @@
           [(ngModel)]="(registrarInEdit.localizedAddress || {}).state"
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>Country: </mat-label>
         <input
@@ -94,6 +99,7 @@
           [(ngModel)]="(registrarInEdit.localizedAddress || {}).countryCode"
         />
       </mat-form-field>
+
       <mat-form-field appearance="outline">
         <mat-label>Postal code: </mat-label>
         <input
@@ -103,15 +109,42 @@
           [(ngModel)]="(registrarInEdit.localizedAddress || {}).zip"
         />
       </mat-form-field>
-      <button
-        mat-flat-button
-        color="primary"
-        type="submit"
-        aria-label="Save RDAO settings"
-      >
-        Save
-      </button>
+
+      <h1>Technical info</h1>
+
+      <mat-form-field appearance="outline">
+        <mat-label>WHOIS server: </mat-label>
+        <input
+          matInput
+          type="text"
+          [(ngModel)]="registrarInEdit.whoisServer"
+          [ngModelOptions]="{ standalone: true }"
+        />
+      </mat-form-field>
+
+      <mat-form-field appearance="outline">
+        <mat-label>Referral URL: </mat-label>
+        <input
+          matInput
+          type="text"
+          [(ngModel)]="registrarInEdit.url"
+          [ngModelOptions]="{ standalone: true }"
+        />
+      </mat-form-field>
+
+      @if((userDataService.userData()?.globalRole || 'NONE') !== "NONE") {
+      <mat-form-field appearance="outline">
+        <mat-label>ICANN Referral Email: </mat-label>
+        <input
+          matInput
+          type="text"
+          [(ngModel)]="registrarInEdit.icannReferralEmail"
+          [ngModelOptions]="{ standalone: true }"
+        />
+      </mat-form-field>
+      }
+
+      <button mat-flat-button color="primary" type="submit">Save</button>
     </form>
   </div>
 </div>
-}

console-webapp/src/app/settings/whois/whoisEdit.component.scss

@@ -1,4 +1,4 @@
-.console-app__rdap-edit {
+.console-app__whois-edit {
   max-width: 616px;
 
   &-controls {

console-webapp/src/app/settings/whois/whoisEdit.component.ts

@@ -20,20 +20,19 @@ import {
   RegistrarService,
 } from 'src/app/registrar/registrar.service';
 import { UserDataService } from 'src/app/shared/services/userData.service';
-import { RdapService } from './rdap.service';
+import { WhoisService } from './whois.service';
 
 @Component({
-  selector: 'app-rdap-edit',
-  templateUrl: './rdapEdit.component.html',
-  styleUrls: ['./rdapEdit.component.scss'],
-  standalone: false,
+  selector: 'app-whois-edit',
+  templateUrl: './whoisEdit.component.html',
+  styleUrls: ['./whoisEdit.component.scss'],
 })
-export default class RdapEditComponent {
+export default class WhoisEditComponent {
   registrarInEdit: Registrar | undefined;
 
   constructor(
     public userDataService: UserDataService,
-    public rdapService: RdapService,
+    public whoisService: WhoisService,
     public registrarService: RegistrarService,
     private _snackBar: MatSnackBar
   ) {
@@ -49,9 +48,9 @@ export default class RdapEditComponent {
     e.preventDefault();
     if (!this.registrarInEdit) return;
 
-    this.rdapService.saveChanges(this.registrarInEdit).subscribe({
+    this.whoisService.saveChanges(this.registrarInEdit).subscribe({
       complete: () => {
-        this.rdapService.editing = false;
+        this.whoisService.editing = false;
       },
       error: (err: HttpErrorResponse) => {
         this._snackBar.open(err.error);