Replace less with scss, add homepage widgets, add registrars selector and registrars page (#2114)

* Replace less compiler with scss

* Replace less with scss, add homepage widgets, add registrars selector and registrars page

console-webapp/angular.json

@@ -7,7 +7,7 @@
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
-          "style": "less"
+          "style": "scss"
         }
       },
       "root": "",
@@ -22,15 +22,18 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "inlineStyleLanguage": "less",
+            "inlineStyleLanguage": "scss",
             "assets": [
               "src/favicon.ico",
               "src/assets"
             ],
             "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
-              "src/styles.less"
+              "src/theme.scss",
+              "src/styles.scss"
             ],
+            "stylePreprocessorOptions": {
+              "includePaths": ["node_modules/"]
+            },
             "scripts": []
           },
           "configurations": {
@@ -91,15 +94,18 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
-            "inlineStyleLanguage": "less",
+            "inlineStyleLanguage": "scss",
             "assets": [
               "src/favicon.ico",
               "src/assets"
             ],
             "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
-              "src/styles.less"
+              "src/theme.scss",
+              "src/styles.scss"
             ],
+            "stylePreprocessorOptions": {
+              "includePaths": ["node_modules/"]
+            },
             "scripts": []
           }
         },

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

@@ -18,51 +18,56 @@ import { TldsComponent } from './tlds/tlds.component';
 import { HomeComponent } from './home/home.component';
 import { SettingsComponent } from './settings/settings.component';
 import SettingsContactComponent from './settings/contact/contact.component';
-import SettingsRegistrarsComponent from './settings/registrars/registrars.component';
 import SettingsWhoisComponent from './settings/whois/whois.component';
 import SettingsUsersComponent from './settings/users/users.component';
 import SettingsSecurityComponent from './settings/security/security.component';
 import { RegistrarGuard } from './registrar/registrar.guard';
-import { RegistrarComponent } from './registrar/registrar.component';
+import { RegistrarComponent } from './registrar/registrarsTable.component';
+import { EmptyRegistrar } from './registrar/emptyRegistrar.component';
 
 const routes: Routes = [
   { path: '', redirectTo: '/home', pathMatch: 'full' },
   { path: 'registrars', component: RegistrarComponent },
+  { path: 'empty-registrar', component: EmptyRegistrar },
   { path: 'home', component: HomeComponent, canActivate: [RegistrarGuard] },
   { path: 'tlds', component: TldsComponent, canActivate: [RegistrarGuard] },
   {
     path: 'settings',
     component: SettingsComponent,
-    canActivate: [RegistrarGuard],
     children: [
       {
         path: '',
-        redirectTo: 'contact',
+        redirectTo: 'registrars',
         pathMatch: 'full',
       },
       {
         path: 'contact',
         component: SettingsContactComponent,
+        canActivate: [RegistrarGuard],
       },
       {
         path: 'whois',
         component: SettingsWhoisComponent,
+        canActivate: [RegistrarGuard],
       },
       {
         path: 'security',
         component: SettingsSecurityComponent,
+        canActivate: [RegistrarGuard],
       },
       {
         path: 'epp-password',
         component: SettingsSecurityComponent,
+        canActivate: [RegistrarGuard],
       },
       {
         path: 'users',
         component: SettingsUsersComponent,
+        canActivate: [RegistrarGuard],
       },
       {
         path: 'registrars',
-        component: SettingsRegistrarsComponent,
+        component: RegistrarComponent,
       },
     ],
   },

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

@@ -12,13 +12,13 @@
         <a mat-list-item [routerLink]="'/settings'" routerLinkActive="active">
           Settings
         </a>
-        <a mat-list-item [routerLink]="'/registrars'" routerLinkActive="active">
-          Select Registrar
-        </a>
       </mat-nav-list>
     </mat-sidenav>
     <mat-sidenav-content class="console-app__content-wrapper">
-      <div class="console-app__content">
+      <div *ngIf="globalLoader.isLoading" class="console-app__global-spinner">
+        <mat-progress-bar mode="indeterminate"></mat-progress-bar>
+      </div>
+      <div class="console-app__content" *ngIf="renderRouter">
         <router-outlet></router-outlet>
       </div>
     </mat-sidenav-content>

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

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 :host {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica,
-    Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-family: Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji",
+    "Segoe UI Emoji", "Segoe UI Symbol" !important;
   font-size: 14px;
   color: #333;
   box-sizing: border-box;
@@ -47,4 +47,7 @@
     max-width: 1340px;
     margin: 0 auto;
   }
+  &__global-spinner {
+    margin-bottom: 2rem;
+  }
 }

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

@@ -13,10 +13,25 @@
 // limitations under the License.
 
 import { Component } from '@angular/core';
+import { RegistrarService } from './registrar/registrar.service';
+import { GlobalLoaderService } from './shared/services/globalLoader.service';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.less'],
+  styleUrls: ['./app.component.scss'],
 })
-export class AppComponent {}
+export class AppComponent {
+  renderRouter: boolean = true;
+  constructor(
+    protected registrarService: RegistrarService,
+    protected globalLoader: GlobalLoaderService
+  ) {
+    registrarService.activeRegistrarIdChange.subscribe(() => {
+      this.renderRouter = false;
+      setTimeout(() => {
+        this.renderRouter = true;
+      }, 400);
+    });
+  }
+}

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

@@ -31,9 +31,20 @@ import SettingsContactComponent, {
   ContactDetailsDialogComponent,
 } from './settings/contact/contact.component';
 import { HttpClientModule } from '@angular/common/http';
-import { RegistrarComponent } from './registrar/registrar.component';
+import { RegistrarComponent } from './registrar/registrarsTable.component';
 import { RegistrarGuard } from './registrar/registrar.guard';
 import SecurityComponent from './settings/security/security.component';
+import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
+import { EmptyRegistrar } from './registrar/emptyRegistrar.component';
+import { RegistrarSelectorComponent } from './registrar/registrar-selector.component';
+import { GlobalLoaderService } from './shared/services/globalLoader.service';
+import { ContactWidgetComponent } from './home/widgets/contact-widget.component';
+import { PromotionsWidgetComponent } from './home/widgets/promotions-widget.component';
+import { TldsWidgetComponent } from './home/widgets/tlds-widget.component';
+import { ResourcesWidgetComponent } from './home/widgets/resources-widget.component';
+import { EppWidgetComponent } from './home/widgets/epp-widget.component';
+import { BillingWidgetComponent } from './home/widgets/billing-widget.component';
+import { DomainsWidgetComponent } from './home/widgets/domains-widget.component';
 
 @NgModule({
   declarations: [
@@ -46,6 +57,15 @@ import SecurityComponent from './settings/security/security.component';
     ContactDetailsDialogComponent,
     RegistrarComponent,
     SecurityComponent,
+    EmptyRegistrar,
+    RegistrarSelectorComponent,
+    ContactWidgetComponent,
+    DomainsWidgetComponent,
+    PromotionsWidgetComponent,
+    TldsWidgetComponent,
+    ResourcesWidgetComponent,
+    EppWidgetComponent,
+    BillingWidgetComponent,
   ],
   imports: [
     HttpClientModule,
@@ -55,7 +75,17 @@ import SecurityComponent from './settings/security/security.component';
     AppRoutingModule,
     BrowserAnimationsModule,
   ],
-  providers: [BackendService, RegistrarGuard],
+  providers: [
+    GlobalLoaderService,
+    BackendService,
+    RegistrarGuard,
+    {
+      provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
+      useValue: {
+        subscriptSizing: 'dynamic',
+      },
+    },
+  ],
   bootstrap: [AppComponent],
 })
 export class AppModule {}

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

@@ -5,6 +5,7 @@
     </button>
     <span>Google Registry</span>
     <span class="spacer"></span>
+    <app-registrar-selector />
     <button mat-icon-button aria-label="Open FAQ">
       <mat-icon>question_mark</mat-icon>
     </button>

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

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+.console-app__header {
+  margin-top: 0;
+}
 .spacer {
   flex: 1;
 }

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

@@ -17,7 +17,7 @@ import { Component, EventEmitter, Output } from '@angular/core';
 @Component({
   selector: 'app-header',
   templateUrl: './header.component.html',
-  styleUrls: ['./header.component.less'],
+  styleUrls: ['./header.component.scss'],
 })
 export class HeaderComponent {
   private isNavOpen = false;

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

@@ -1,21 +1,13 @@
-<h3>Recent Activity</h3>
-<table
-  mat-table
-  [dataSource]="dataSource"
-  class="mat-elevation-z8 console-home__activity"
->
-  <ng-container
-    *ngFor="let column of columns"
-    [matColumnDef]="column.columnDef"
-  >
-    <th mat-header-cell *matHeaderCellDef>
-      {{ column.header }}
-    </th>
-    <td mat-cell *matCellDef="let row">
-      {{ column.cell(row) }}
-    </td>
-  </ng-container>
-
-  <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-  <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
-</table>
+<div class="console-app__home">
+  <h1>Welcome to the Google Registry Console</h1>
+  <div class="console-app__home-widgets">
+    <div app-domains-widget class="console-app__widget-wrapper__wide"></div>
+    <div app-contact-widget class="console-app__widget-wrapper__wide"></div>
+    <div app-tlds-widget></div>
+    <div app-promotions-widget class="console-app__widget-wrapper__wide"></div>
+    <div app-promotions-widget class="console-app__widget-wrapper__wide"></div>
+    <div app-resources-widget></div>
+    <div app-billing-widget></div>
+    <div app-epp-widget></div>
+  </div>
+</div>

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

@@ -1,13 +0,0 @@
-// Copyright 2022 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.

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

@@ -12,11 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-html,
-body {
-  height: 100%;
-}
-body {
-  margin: 0;
-  font-family: Roboto, "Helvetica Neue", sans-serif;
+.console-app {
+  &__home {
+    margin-top: 1rem;
+  }
+  &__home-widgets {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+    grid-gap: 20px;
+
+    mat-card {
+      height: 100%;
+      h1 {
+        margin-top: 1rem;
+      }
+    }
+  }
 }

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

@@ -12,220 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component } from '@angular/core';
-
-export interface ActivityRecord {
-  eventType: string;
-  userName: string;
-  registrarName: string;
-  timestamp: string;
-  details: string;
-}
-
-const MOCK_DATA: ActivityRecord[] = [
-  {
-    eventType: 'Export DUMS',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Update Contact',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Delete Domain',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Export DUMS',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Update Contact',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Delete Domain',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Export DUMS',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Update Contact',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Delete Domain',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Export DUMS',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Update Contact',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Delete Domain',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Export DUMS',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Update Contact',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Delete Domain',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Export DUMS',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Update Contact',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Delete Domain',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Export DUMS',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Update Contact',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Delete Domain',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Export DUMS',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Update Contact',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-  {
-    eventType: 'Delete Domain',
-    userName: 'user3',
-    registrarName: 'registrar1',
-    timestamp: '2022-03-15T19:46:39.007',
-    details: 'All Domains under management exported as .csv file',
-  },
-];
+import { Component, ViewEncapsulation } from '@angular/core';
 
 @Component({
   selector: 'app-home',
   templateUrl: './home.component.html',
-  styleUrls: ['./home.component.less'],
+  styleUrls: ['./home.component.scss'],
+  encapsulation: ViewEncapsulation.None,
 })
-export class HomeComponent {
-  columns = [
-    {
-      columnDef: 'eventType',
-      header: 'Event Type',
-      cell: (record: ActivityRecord) => `${record.eventType}`,
-    },
-    {
-      columnDef: 'userName',
-      header: 'User',
-      cell: (record: ActivityRecord) => `${record.userName}`,
-    },
-    {
-      columnDef: 'registrarName',
-      header: 'Registrar',
-      cell: (record: ActivityRecord) => `${record.registrarName}`,
-    },
-    {
-      columnDef: 'timestamp',
-      header: 'Timestamp',
-      cell: (record: ActivityRecord) => `${record.timestamp}`,
-    },
-    {
-      columnDef: 'details',
-      header: 'Details',
-      cell: (record: ActivityRecord) => `${record.details}`,
-    },
-  ];
-  dataSource = MOCK_DATA;
-  displayedColumns = this.columns.map((c) => c.columnDef);
-}
+export class HomeComponent {}

console-webapp/src/app/home/widgets/billing-widget.component.html

@@ -0,0 +1,13 @@
+<mat-card>
+  <mat-card-content>
+    <div class="console-app__widget">
+      <div class="console-app__widget_left">
+        <mat-icon class="console-app__widget-icon">account_balance</mat-icon>
+        <h1 class="console-app__widget-title">Billing Info</h1>
+        <h4 class="secondary-text text-center">
+          View important billing and payments information.
+        </h4>
+      </div>
+    </div>
+  </mat-card-content>
+</mat-card>

console-webapp/src/app/home/widgets/billing-widget.component.ts

@@ -15,8 +15,9 @@
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'app-registrars',
-  templateUrl: './registrars.component.html',
-  styleUrls: ['./registrars.component.less'],
+  selector: '[app-billing-widget]',
+  templateUrl: './billing-widget.component.html',
 })
-export default class RegistrarsComponent {}
+export class BillingWidgetComponent {
+  constructor() {}
+}

console-webapp/src/app/home/widgets/contact-widget.component.html

@@ -0,0 +1,27 @@
+<mat-card>
+  <mat-card-content>
+    <div class="console-app__widget">
+      <div class="console-app__widget_left">
+        <mat-icon class="console-app__widget-icon">call</mat-icon>
+        <h1 class="console-app__widget-title">Contact Support</h1>
+        <h4 class="secondary-text text-center">
+          View Google Registry support email and phone information
+        </h4>
+      </div>
+      <div class="console-app__widget_right">
+        <button mat-button color="primary" class="console-app__widget-link">
+          Give us a Call
+        </button>
+        <p class="secondary-text">
+          Call Google Registry support at +1 (404) 978 8419
+        </p>
+        <button mat-button color="primary" class="console-app__widget-link">
+          Send us an Email
+        </button>
+        <p class="secondary-text">
+          Email Google Registry at support@google.com
+        </p>
+      </div>
+    </div>
+  </mat-card-content>
+</mat-card>

console-webapp/src/app/home/widgets/contact-widget.component.ts

@@ -0,0 +1,23 @@
+// Copyright 2023 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 } from '@angular/core';
+
+@Component({
+  selector: '[app-contact-widget]',
+  templateUrl: './contact-widget.component.html',
+})
+export class ContactWidgetComponent {
+  constructor() {}
+}

console-webapp/src/app/home/widgets/domains-widget.component.html

@@ -0,0 +1,25 @@
+<mat-card>
+  <mat-card-content>
+    <div class="console-app__widget">
+      <div class="console-app__widget_left">
+        <mat-icon class="console-app__widget-icon">view_list</mat-icon>
+        <h1 class="console-app__widget-title">Domains</h1>
+        <h4 class="secondary-text text-center">
+          Manage domain names and registry lock settings.
+        </h4>
+      </div>
+      <div class="console-app__widget_right">
+        <button mat-button color="primary" class="console-app__widget-link">
+          Create a Domain
+        </button>
+        <p class="secondary-text">Register a new domain name</p>
+        <button mat-button color="primary" class="console-app__widget-link">
+          View DUMs
+        </button>
+        <p class="secondary-text">
+          Download a csv of all domains under management
+        </p>
+      </div>
+    </div>
+  </mat-card-content>
+</mat-card>

console-webapp/src/app/home/widgets/domains-widget.component.ts

@@ -0,0 +1,23 @@
+// Copyright 2023 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 } from '@angular/core';
+
+@Component({
+  selector: '[app-domains-widget]',
+  templateUrl: './domains-widget.component.html',
+})
+export class DomainsWidgetComponent {
+  constructor() {}
+}

console-webapp/src/app/home/widgets/epp-widget.component.html

@@ -0,0 +1,13 @@
+<mat-card>
+  <mat-card-content>
+    <div class="console-app__widget">
+      <div class="console-app__widget_left">
+        <mat-icon class="console-app__widget-icon">computer</mat-icon>
+        <h1 class="console-app__widget-title">EPP Console</h1>
+        <h4 class="secondary-text text-center">
+          Test run and execute EPP commands using XML files.
+        </h4>
+      </div>
+    </div>
+  </mat-card-content>
+</mat-card>

console-webapp/src/app/home/widgets/epp-widget.component.ts

@@ -11,3 +11,13 @@
 // 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 } from '@angular/core';
+
+@Component({
+  selector: '[app-epp-widget]',
+  templateUrl: './epp-widget.component.html',
+})
+export class EppWidgetComponent {
+  constructor() {}
+}

console-webapp/src/app/home/widgets/promotions-widget.component.html

@@ -0,0 +1,27 @@
+<mat-card class="console-app__widget-wrapper__wide">
+  <mat-card-content>
+    <div class="console-app__widget">
+      <div class="console-app__widget_left">
+        <mat-icon class="console-app__widget-icon">subject</mat-icon>
+        <h1 class="console-app__widget-title">Promotions</h1>
+        <h4 class="secondary-text text-center">
+          Manage Google Registry promotions and view onboarding process.
+        </h4>
+      </div>
+      <div class="console-app__widget_right">
+        <button mat-button color="primary" class="console-app__widget-link">
+          Manage Preferred Partner Program
+        </button>
+        <p class="secondary-text">
+          Onboard or view current preferred partner status
+        </p>
+        <button mat-button color="primary" class="console-app__widget-link">
+          Manage Registry Lock Program
+        </button>
+        <p class="secondary-text">
+          Onboard or view current registry lock status
+        </p>
+      </div>
+    </div>
+  </mat-card-content>
+</mat-card>

console-webapp/src/app/home/widgets/promotions-widget.component.ts

@@ -0,0 +1,23 @@
+// Copyright 2023 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 } from '@angular/core';
+
+@Component({
+  selector: '[app-promotions-widget]',
+  templateUrl: './promotions-widget.component.html',
+})
+export class PromotionsWidgetComponent {
+  constructor() {}
+}

console-webapp/src/app/home/widgets/resources-widget.component.html

@@ -0,0 +1,13 @@
+<mat-card>
+  <mat-card-content>
+    <div class="console-app__widget">
+      <div class="console-app__widget_left">
+        <mat-icon class="console-app__widget-icon">menu_book</mat-icon>
+        <h1 class="console-app__widget-title">Resources</h1>
+        <h4 class="secondary-text text-center">
+          Use Google Drive to view onboarding FAQs, and technical documentation.
+        </h4>
+      </div>
+    </div>
+  </mat-card-content>
+</mat-card>

console-webapp/src/app/home/widgets/resources-widget.component.ts

@@ -0,0 +1,23 @@
+// Copyright 2023 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 } from '@angular/core';
+
+@Component({
+  selector: '[app-resources-widget]',
+  templateUrl: './resources-widget.component.html',
+})
+export class ResourcesWidgetComponent {
+  constructor() {}
+}

console-webapp/src/app/home/widgets/tlds-widget.component.html

@@ -0,0 +1,13 @@
+<mat-card>
+  <mat-card-content>
+    <div class="console-app__widget">
+      <div class="console-app__widget_left">
+        <mat-icon class="console-app__widget-icon">list_alt</mat-icon>
+        <h1 class="console-app__widget-title">TLDs</h1>
+        <h4 class="secondary-text text-center">
+          View launch phase information for all onboarded and available TLDs.
+        </h4>
+      </div>
+    </div>
+  </mat-card-content>
+</mat-card>

console-webapp/src/app/home/widgets/tlds-widget.component.ts

@@ -0,0 +1,23 @@
+// Copyright 2023 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 } from '@angular/core';
+
+@Component({
+  selector: '[app-tlds-widget]',
+  templateUrl: './tlds-widget.component.html',
+})
+export class TldsWidgetComponent {
+  constructor() {}
+}

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

@@ -44,6 +44,7 @@ import { CdkMenuModule } from '@angular/cdk/menu';
 import { DialogModule } from '@angular/cdk/dialog';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatPaginatorModule } from '@angular/material/paginator';
 
 @NgModule({
   exports: [
@@ -79,6 +80,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
     OverlayModule,
     DialogModule,
     MatSnackBarModule,
+    MatPaginatorModule,
   ],
 })
 export class MaterialModule {}

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

@@ -0,0 +1,7 @@
+<div class="console-app__emty-registrar">
+  <h1>
+    <mat-icon class="console-app__emty-registrar-icon">block</mat-icon>
+  </h1>
+  <h1>No registrar selected</h1>
+  <h4 class="mat-body-2">Please select a registrar</h4>
+</div>

console-webapp/src/app/registrar/emptyRegistrar.component.scss

@@ -0,0 +1,17 @@
+.console-app {
+  &__emty-registrar {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+
+    &-icon {
+      transform: scale(3);
+      margin-bottom: 0.5rem;
+    }
+  }
+}

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

@@ -13,33 +13,32 @@
 // limitations under the License.
 
 import { Component } from '@angular/core';
-import { RegistrarService } from './registrar.service';
 import { ActivatedRoute, Router } from '@angular/router';
+import { RegistrarService } from './registrar.service';
+import { Subscription } from 'rxjs';
 
 @Component({
-  selector: 'app-registrar',
-  templateUrl: './registrar.component.html',
-  styleUrls: ['./registrar.component.less'],
+  selector: 'app-empty-registrar',
+  templateUrl: './emptyRegistrar.component.html',
+  styleUrls: ['./emptyRegistrar.component.scss'],
 })
-export class RegistrarComponent {
-  private lastActiveRegistrarId: string;
+export class EmptyRegistrar {
+  private registrarIdChangeSubscription?: Subscription;
 
   constructor(
     private route: ActivatedRoute,
     protected registrarService: RegistrarService,
     private router: Router
   ) {
-    this.lastActiveRegistrarId = registrarService.activeRegistrarId;
+    this.registrarIdChangeSubscription =
+      registrarService.activeRegistrarIdChange.subscribe((newRegistrarId) => {
+        if (newRegistrarId) {
+          this.router.navigate([this.route.snapshot.paramMap.get('nextUrl')]);
+        }
+      });
   }
 
-  ngDoCheck() {
-    if (
-      this.registrarService.activeRegistrarId &&
-      this.registrarService.activeRegistrarId !== this.lastActiveRegistrarId &&
-      this.route.snapshot.paramMap.get('nextUrl')
-    ) {
-      this.lastActiveRegistrarId = this.registrarService.activeRegistrarId;
-      this.router.navigate([this.route.snapshot.paramMap.get('nextUrl')]);
-    }
+  ngOnDestroy() {
+    this.registrarIdChangeSubscription?.unsubscribe();
   }
 }

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

@@ -0,0 +1,18 @@
+<div class="console-app__registrar">
+  <div>
+    <mat-form-field class="mat-form-field-density-5" appearance="fill">
+      <mat-label>Registrar</mat-label>
+      <mat-select
+        [ngModel]="registrarService.activeRegistrarId"
+        (selectionChange)="registrarService.updateRegistrar($event.value)"
+      >
+        <mat-option
+          *ngFor="let registrar of registrarService.registrars"
+          [value]="registrar.registrarName"
+        >
+          {{ registrar.registrarName }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+  </div>
+</div>

console-webapp/src/app/registrar/registrar-selector.component.scss

@@ -0,0 +1,18 @@
+.console-app {
+  &__registrar {
+    display: flex;
+    justify-content: center;
+    align-items: baseline;
+    // Fix for angular v15 label issue
+    // https://github.com/angular/components/issues/26579
+    .mat-mdc-floating-label {
+      display: inline !important;
+    }
+    .mat-mdc-select-arrow-wrapper {
+      transform: translateY(0) !important;
+    }
+  }
+  &__title {
+    margin-right: 1rem;
+  }
+}

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

@@ -14,18 +14,18 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import RegistrarsComponent from './registrars.component';
+import { RegistrarSelectorComponent } from './registrar-selector.component';
 
-describe('RegistrarsComponent', () => {
-  let component: RegistrarsComponent;
-  let fixture: ComponentFixture<RegistrarsComponent>;
+describe('RegistrarSelectorComponent', () => {
+  let component: RegistrarSelectorComponent;
+  let fixture: ComponentFixture<RegistrarSelectorComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [RegistrarsComponent],
+      declarations: [RegistrarSelectorComponent],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(RegistrarsComponent);
+    fixture = TestBed.createComponent(RegistrarSelectorComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

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

@@ -0,0 +1,25 @@
+// Copyright 2023 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 } from '@angular/core';
+import { RegistrarService } from './registrar.service';
+
+@Component({
+  selector: 'app-registrar-selector',
+  templateUrl: './registrar-selector.component.html',
+  styleUrls: ['./registrar-selector.component.scss'],
+})
+export class RegistrarSelectorComponent {
+  constructor(protected registrarService: RegistrarService) {}
+}

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

@@ -1,17 +0,0 @@
-<div class="console-app__registrar">
-  <h4 class="console-app__title">
-    {{ registrarService.activeRegistrarId === "" ? "Select" : "Switch" }}
-    registrar:
-  </h4>
-  <mat-form-field>
-    <mat-label>Registrar</mat-label>
-    <mat-select [(ngModel)]="registrarService.activeRegistrarId">
-      <mat-option
-        *ngFor="let registrar of registrarService.registrars"
-        [value]="registrar"
-      >
-        {{ registrar }}
-      </mat-option>
-    </mat-select>
-  </mat-form-field>
-</div>

console-webapp/src/app/registrar/registrar.component.less

@@ -1,11 +0,0 @@
-.console-app {
-  &__registrar {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-top: 1rem;
-  }
-  &__title {
-    margin-right: 1rem;
-  }
-}

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

@@ -29,6 +29,6 @@ export class RegistrarGuard {
     if (this.registrarService.activeRegistrarId) {
       return true;
     }
-    return this.router.navigate([`/registrars`, { nextUrl: state.url }]);
+    return this.router.navigate([`/empty-registrar`, { nextUrl: state.url }]);
   }
 }

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

@@ -14,16 +14,59 @@
 
 import { Injectable } from '@angular/core';
 import { BackendService } from '../shared/services/backend.service';
+import { Subject } from 'rxjs';
+import {
+  GlobalLoader,
+  GlobalLoaderService,
+} from '../shared/services/globalLoader.service';
+
+interface Address {
+  street?: string[];
+  city?: string;
+  countryCode?: string;
+  zip?: string;
+  state?: string;
+}
+
+export interface Registrar {
+  allowedTlds?: string[];
+  ipAddressAllowList?: string[];
+  emailAddress?: string;
+  billingAccountMap?: object;
+  driveFolderId?: string;
+  ianaIdentifier?: number;
+  icannReferralEmail?: string;
+  localizedAddress?: Address;
+  registrarId: string;
+  registrarName: string;
+  registryLockAllowed?: boolean;
+}
 
 @Injectable({
   providedIn: 'root',
 })
-export class RegistrarService {
+export class RegistrarService implements GlobalLoader {
   activeRegistrarId: string = '';
-  registrars: string[] = [];
-  constructor(private backend: BackendService) {
+  registrars: Registrar[] = [];
+  activeRegistrarIdChange: Subject<string> = new Subject<string>();
+
+  constructor(
+    private backend: BackendService,
+    private globalLoader: GlobalLoaderService
+  ) {
     this.backend.getRegistrars().subscribe((r) => {
+      this.globalLoader.stopGlobalLoader(this);
       this.registrars = r;
     });
+    this.globalLoader.startGlobalLoader(this);
+  }
+
+  public updateRegistrar(registrarId: string) {
+    this.activeRegistrarId = registrarId;
+    this.activeRegistrarIdChange.next(registrarId);
+  }
+
+  loadingTimeout() {
+    // TODO: Decide what to do when timeout happens
   }
 }

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

@@ -0,0 +1,25 @@
+<div class="console-app__registrars">
+  <table
+    mat-table
+    [dataSource]="registrarService.registrars"
+    class="mat-elevation-z8"
+  >
+    <ng-container
+      *ngFor="let column of columns"
+      [matColumnDef]="column.columnDef"
+    >
+      <th mat-header-cell *matHeaderCellDef>
+        {{ column.header }}
+      </th>
+      <td mat-cell *matCellDef="let row" [innerHTML]="column.cell(row)"></td>
+    </ng-container>
+
+    <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+    <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+  </table>
+  <mat-paginator
+    class="mat-elevation-z8"
+    [pageSizeOptions]="[5, 10, 20]"
+    showFirstLastButtons
+  ></mat-paginator>
+</div>

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

@@ -0,0 +1,5 @@
+.console-app {
+  &__registrars {
+    margin-top: 1.5rem;
+  }
+}

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

@@ -14,7 +14,7 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { RegistrarComponent } from './registrar.component';
+import { RegistrarComponent } from './registrarsTable.component';
 import { BackendService } from '../shared/services/backend.service';
 import { ActivatedRoute } from '@angular/router';
 import { HttpClientTestingModule } from '@angular/common/http/testing';

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

@@ -0,0 +1,75 @@
+// Copyright 2023 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 } from '@angular/core';
+import { Registrar, RegistrarService } from './registrar.service';
+
+@Component({
+  selector: 'app-registrar',
+  templateUrl: './registrarsTable.component.html',
+  styleUrls: ['./registrarsTable.component.scss'],
+})
+export class RegistrarComponent {
+  columns = [
+    {
+      columnDef: 'registrarId',
+      header: 'Registrar Id',
+      cell: (record: Registrar) => `${record.registrarId || ''}`,
+    },
+    {
+      columnDef: 'registrarName',
+      header: 'Name',
+      cell: (record: Registrar) => `${record.registrarName || ''}`,
+    },
+    {
+      columnDef: 'allowedTlds',
+      header: 'TLDs',
+      cell: (record: Registrar) => `${(record.allowedTlds || []).join(', ')}`,
+    },
+    {
+      columnDef: 'emailAddress',
+      header: 'Username',
+      cell: (record: Registrar) => `${record.emailAddress || ''}`,
+    },
+    {
+      columnDef: 'ianaIdentifier',
+      header: 'IANA ID',
+      cell: (record: Registrar) => `${record.ianaIdentifier || ''}`,
+    },
+    {
+      columnDef: 'billingAccountMap',
+      header: 'Billing Accounts',
+      cell: (record: Registrar) =>
+        // @ts-ignore - completely legit line, but TS keeps complaining
+        `${Object.entries(record.billingAccountMap).reduce(
+          (acc, [key, val]) => {
+            return `${acc}${key}=${val}<br/>`;
+          },
+          ''
+        )}`,
+    },
+    {
+      columnDef: 'registryLockAllowed',
+      header: 'Registry Lock',
+      cell: (record: Registrar) => `${record.registryLockAllowed}`,
+    },
+    {
+      columnDef: 'driveId',
+      header: 'Drive ID',
+      cell: (record: Registrar) => `${record.driveFolderId || ''}`,
+    },
+  ];
+  displayedColumns = this.columns.map((c) => c.columnDef);
+  constructor(protected registrarService: RegistrarService) {}
+}

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

@@ -2,6 +2,15 @@
   <mat-progress-bar mode="indeterminate"></mat-progress-bar>
 </div>
 <div *ngIf="!loading">
+  <div
+    class="contact__empty-contacts"
+    *ngIf="contactService.contacts.length === 0"
+  >
+    <mat-icon class="contact__empty-contacts-icon secondary-text"
+      >apps_outage</mat-icon
+    >
+    <h1>No contacts found</h1>
+  </div>
   <div *ngFor="let group of groupedData">
     <div class="contact__cards-wrapper" *ngIf="group.contacts.length">
       <h3>{{ group.label }}s</h3>

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

@@ -37,6 +37,18 @@
     justify-content: flex-start;
     margin: 2rem 0;
   }
+  &__empty-contacts {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+  }
+  &__empty-contacts-icon {
+    width: 4rem;
+    height: 4rem;
+    font-size: 4rem;
+    margin-top: 1.5rem;
+  }
 }
 .contact-details {
   &__input {

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

@@ -77,7 +77,7 @@ class ContactDetailsEventsResponder {
 @Component({
   selector: 'app-contact-details-dialog',
   templateUrl: 'contact-details.component.html',
-  styleUrls: ['./contact.component.less'],
+  styleUrls: ['./contact.component.scss'],
 })
 export class ContactDetailsDialogComponent {
   contact: Contact;
@@ -140,7 +140,7 @@ export class ContactDetailsDialogComponent {
 @Component({
   selector: 'app-contact',
   templateUrl: './contact.component.html',
-  styleUrls: ['./contact.component.less'],
+  styleUrls: ['./contact.component.scss'],
 })
 export default class ContactComponent {
   loading: boolean = false;
@@ -158,7 +158,7 @@ export default class ContactComponent {
   }
 
   public get groupedData() {
-    return this.contactService.contacts.reduce((acc, contact) => {
+    return this.contactService.contacts?.reduce((acc, contact) => {
       contact.types.forEach((type) => {
         acc
           .find((group: GroupedContacts) => group.value === type)

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

@@ -1 +0,0 @@
-<p>registrars component works!</p>

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

@@ -20,7 +20,7 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 @Component({
   selector: 'app-security',
   templateUrl: './security.component.html',
-  styleUrls: ['./security.component.less'],
+  styleUrls: ['./security.component.scss'],
   providers: [SecurityService],
 })
 export default class SecurityComponent {

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

@@ -17,7 +17,7 @@ import { Component, ViewEncapsulation } from '@angular/core';
 @Component({
   selector: 'app-settings',
   templateUrl: './settings.component.html',
-  styleUrls: ['./settings.component.less'],
+  styleUrls: ['./settings.component.scss'],
   encapsulation: ViewEncapsulation.None,
 })
 export class SettingsComponent {}

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

@@ -17,6 +17,6 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'app-users',
   templateUrl: './users.component.html',
-  styleUrls: ['./users.component.less'],
+  styleUrls: ['./users.component.scss'],
 })
 export default class UsersComponent {}

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

@@ -17,6 +17,6 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'app-whois',
   templateUrl: './whois.component.html',
-  styleUrls: ['./whois.component.less'],
+  styleUrls: ['./whois.component.scss'],
 })
 export default class WhoisComponent {}

console-webapp/src/app/shared/services/backend.service.ts

@@ -18,6 +18,7 @@ import { catchError, Observable, of } from 'rxjs';
 import { SecuritySettingsBackendModel } from 'src/app/settings/security/security.service';
 
 import { Contact } from '../../settings/contact/contact.service';
+import { Registrar } from '../../registrar/registrar.service';
 
 @Injectable()
 export class BackendService {
@@ -60,10 +61,10 @@ export class BackendService {
     );
   }
 
-  getRegistrars(): Observable<string[]> {
+  getRegistrars(): Observable<Registrar[]> {
     return this.http
-      .get<string[]>('/console-api/registrars')
-      .pipe(catchError((err) => this.errorCatcher<string[]>(err)));
+      .get<Registrar[]>('/console-api/registrars')
+      .pipe(catchError((err) => this.errorCatcher<Registrar[]>(err)));
   }
 
   getSecuritySettings(

console-webapp/src/app/shared/services/globalLoader.service.ts

@@ -0,0 +1,60 @@
+// Copyright 2023 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 } from '@angular/core';
+import { Observable, Subscription, timeout } from 'rxjs';
+
+export interface GlobalLoader {
+  loadingTimeout: () => void;
+}
+
+/**
+ * This class responsible for global application loading indicator
+ *
+ * <p>Only to be used for when the activity should indicate that the entire application is busy
+ * For instance - when initial user information is loading, which is crucial for any subsequent
+ * interaction with the application
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class GlobalLoaderService {
+  private static readonly TIMEOUT_MS = 3000;
+  private loaders = new Map<GlobalLoader, Subscription>();
+  public isLoading: boolean = false;
+
+  private syncLoading() {
+    this.isLoading = this.loaders.size > 0;
+  }
+
+  startGlobalLoader(c: GlobalLoader) {
+    const subscription = new Observable(() => {})
+      .pipe(timeout(GlobalLoaderService.TIMEOUT_MS))
+      .subscribe({
+        error: () => {
+          this.loaders.delete(c);
+          c.loadingTimeout();
+          this.syncLoading();
+        },
+      });
+    this.loaders.set(c, subscription);
+    this.syncLoading();
+  }
+
+  stopGlobalLoader(c: GlobalLoader) {
+    this.loaders.get(c)?.unsubscribe();
+    this.loaders.delete(c);
+    this.syncLoading();
+  }
+}

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

@@ -17,6 +17,6 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'app-tlds',
   templateUrl: './tlds.component.html',
-  styleUrls: ['./tlds.component.less'],
+  styleUrls: ['./tlds.component.scss'],
 })
 export class TldsComponent {}

console-webapp/src/styles.scss

@@ -0,0 +1,63 @@
+// Copyright 2022 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.
+@use "@angular/material" as mat;
+@import "app/registrar/registrar-selector.component.scss";
+
+html,
+body {
+  height: 100%;
+}
+body {
+  margin: 0;
+  font-family: Roboto, "Helvetica Neue", sans-serif;
+}
+
+.text-center {
+  text-align: center;
+}
+
+.console-app {
+  &__widget {
+    display: flex;
+    gap: 10px;
+    &-wrapper__wide {
+      grid-column: span 2;
+    }
+    &-link {
+      padding: 0 !important;
+      text-align: left;
+      margin-bottom: 0.5rem;
+    }
+    &-title {
+      color: var(--primary) !important;
+    }
+    &-icon {
+      font-size: 4rem;
+      line-height: 4rem;
+      height: 4rem !important;
+      width: 4rem !important;
+    }
+    &_left {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+    &_right {
+      flex: 1;
+      border-left: 1px solid var(--secondary);
+      padding-left: 20px;
+    }
+  }
+}

console-webapp/src/theme.scss

@@ -0,0 +1,69 @@
+@use "sass:map";
+@use "@angular/material" as mat;
+
+/** Copied from docs section **/
+
+// Include the common styles for Angular Material. We include this here so that you only
+// have to load a single css file for Angular Material in your app.
+// Be sure that you only ever include this mixin once!
+@include mat.core();
+
+// Define the palettes for your theme using the Material Design palettes available in palette.scss
+// (imported above). For each palette, you can optionally specify a default, lighter, and darker
+// hue. Available color palettes: https://material.io/design/color/
+$theme-primary: mat.define-palette(mat.$indigo-palette);
+$theme-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
+
+// The warn palette is optional (defaults to red).
+$theme-warn: mat.define-palette(mat.$red-palette);
+
+// Create the theme object. A theme consists of configurations for individual
+// theming systems such as "color" or "typography".
+$theme: mat.define-light-theme(
+  (
+    color: (
+      primary: $theme-primary,
+      accent: $theme-accent,
+      warn: $theme-warn,
+    ),
+    density: 0,
+  )
+);
+
+/** Application specific section **/
+
+@mixin form-field-density($density) {
+  $field-typography: mat.define-typography-config(
+    $body-1: mat.define-typography-level(12px, 24px, 400),
+  );
+  @include mat.typography-level($field-typography, "body-1");
+  @include mat.form-field-density($density);
+}
+
+// Define lowest possible density class to be used in application
+// In the same manner -1...-5 classes can be defined
+.mat-form-field-density-5 {
+  @include form-field-density(-5);
+}
+
+$foreground: map.merge($theme, mat.$light-theme-foreground-palette);
+
+// Access and define a class with secondary color exposed
+.secondary-text {
+  color: map.get($foreground, "secondary-text");
+}
+
+:root {
+  --primary: #{mat.get-color-from-palette($theme-primary, 500)};
+  --secondary: #{map.get($foreground, "secondary-text")};
+}
+
+@include mat.all-component-themes($theme);
+@import "@angular/material/theming";
+
+// Define application specific typography settings, font-family, etc
+$typography-configuration: mat-typography-config(
+  $font-family: 'Roboto, "Helvetica Neue", sans-serif',
+);
+
+@include angular-material-typography($typography-configuration);

core/src/main/java/google/registry/batch/CheckBulkComplianceAction.java

@@ -0,0 +1,246 @@
+// Copyright 2022 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.
+package google.registry.batch;
+
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.util.DateTimeUtils.END_OF_TIME;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.common.flogger.FluentLogger;
+import com.google.common.primitives.Ints;
+import google.registry.config.RegistryConfig.Config;
+import google.registry.model.domain.token.AllocationToken;
+import google.registry.model.domain.token.BulkPricingPackage;
+import google.registry.model.registrar.Registrar;
+import google.registry.request.Action;
+import google.registry.request.Action.Service;
+import google.registry.request.auth.Auth;
+import google.registry.ui.server.SendEmailUtils;
+import google.registry.util.Clock;
+import java.util.Optional;
+import javax.inject.Inject;
+import org.joda.time.Days;
+
+/**
+ * An action that checks all {@link BulkPricingPackage} objects for compliance with their max create
+ * limit.
+ */
+@Action(
+    service = Service.BACKEND,
+    path = CheckBulkComplianceAction.PATH,
+    auth = Auth.AUTH_API_ADMIN)
+public class CheckBulkComplianceAction implements Runnable {
+
+  public static final String PATH = "/_dr/task/checkBulkCompliance";
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+  private final SendEmailUtils sendEmailUtils;
+  private final Clock clock;
+  private final String bulkPricingPackageCreateLimitEmailSubject;
+  private final String bulkPricingPackageDomainLimitWarningEmailSubject;
+  private final String bulkPricingPackageDomainLimitUpgradeEmailSubject;
+  private final String bulkPricingPackageCreateLimitEmailBody;
+  private final String bulkPricingPackageDomainLimitWarningEmailBody;
+  private final String bulkPricingPackageDomainLimitUpgradeEmailBody;
+  private final String registrySupportEmail;
+  private static final int THIRTY_DAYS = 30;
+  private static final int FORTY_DAYS = 40;
+
+  @Inject
+  public CheckBulkComplianceAction(
+      SendEmailUtils sendEmailUtils,
+      Clock clock,
+      @Config("bulkPricingPackageCreateLimitEmailSubject")
+          String bulkPricingPackageCreateLimitEmailSubject,
+      @Config("bulkPricingPackageDomainLimitWarningEmailSubject")
+          String bulkPricingPackageDomainLimitWarningEmailSubject,
+      @Config("bulkPricingPackageDomainLimitUpgradeEmailSubject")
+          String bulkPricingPackageDomainLimitUpgradeEmailSubject,
+      @Config("bulkPricingPackageCreateLimitEmailBody")
+          String bulkPricingPackageCreateLimitEmailBody,
+      @Config("bulkPricingPackageDomainLimitWarningEmailBody")
+          String bulkPricingPackageDomainLimitWarningEmailBody,
+      @Config("bulkPricingPackageDomainLimitUpgradeEmailBody")
+          String bulkPricingPackageDomainLimitUpgradeEmailBody,
+      @Config("registrySupportEmail") String registrySupportEmail) {
+    this.sendEmailUtils = sendEmailUtils;
+    this.clock = clock;
+    this.bulkPricingPackageCreateLimitEmailSubject = bulkPricingPackageCreateLimitEmailSubject;
+    this.bulkPricingPackageDomainLimitWarningEmailSubject =
+        bulkPricingPackageDomainLimitWarningEmailSubject;
+    this.bulkPricingPackageDomainLimitUpgradeEmailSubject =
+        bulkPricingPackageDomainLimitUpgradeEmailSubject;
+    this.bulkPricingPackageCreateLimitEmailBody = bulkPricingPackageCreateLimitEmailBody;
+    this.bulkPricingPackageDomainLimitWarningEmailBody =
+        bulkPricingPackageDomainLimitWarningEmailBody;
+    this.bulkPricingPackageDomainLimitUpgradeEmailBody =
+        bulkPricingPackageDomainLimitUpgradeEmailBody;
+    this.registrySupportEmail = registrySupportEmail;
+  }
+
+  @Override
+  public void run() {
+    tm().transact(this::checkBulkPackages);
+  }
+
+  private void checkBulkPackages() {
+    ImmutableList<BulkPricingPackage> bulkPricingPackages =
+        tm().loadAllOf(BulkPricingPackage.class);
+    ImmutableMap.Builder<BulkPricingPackage, Long> bulkPricingPackagesOverCreateLimitBuilder =
+        new ImmutableMap.Builder<>();
+    ImmutableMap.Builder<BulkPricingPackage, Long>
+        bulkPricingPackagesOverActiveDomainsLimitBuilder = new ImmutableMap.Builder<>();
+    for (BulkPricingPackage bulkPricingPackage : bulkPricingPackages) {
+      Long creates =
+          (Long)
+              tm().query(
+                      "SELECT COUNT(*) FROM DomainHistory WHERE current_package_token ="
+                          + " :token AND modificationTime >= :lastBilling AND type ="
+                          + " 'DOMAIN_CREATE'")
+                  .setParameter("token", bulkPricingPackage.getToken().getKey().toString())
+                  .setParameter(
+                      "lastBilling", bulkPricingPackage.getNextBillingDate().minusYears(1))
+                  .getSingleResult();
+      if (creates > bulkPricingPackage.getMaxCreates()) {
+        long overage = creates - bulkPricingPackage.getMaxCreates();
+        logger.atInfo().log(
+            "Bulk pricing package with bulk token %s has exceeded their max domain creation limit"
+                + " by %d name(s).",
+            bulkPricingPackage.getToken().getKey(), overage);
+        bulkPricingPackagesOverCreateLimitBuilder.put(bulkPricingPackage, creates);
+      }
+
+      Long activeDomains =
+          tm().query(
+                  "SELECT COUNT(*) FROM Domain WHERE currentBulkToken = :token"
+                      + " AND deletionTime = :endOfTime",
+                  Long.class)
+              .setParameter("token", bulkPricingPackage.getToken())
+              .setParameter("endOfTime", END_OF_TIME)
+              .getSingleResult();
+      if (activeDomains > bulkPricingPackage.getMaxDomains()) {
+        int overage = Ints.saturatedCast(activeDomains) - bulkPricingPackage.getMaxDomains();
+        logger.atInfo().log(
+            "Bulk pricing package with bulk token %s has exceed their max active domains limit by"
+                + " %d name(s).",
+            bulkPricingPackage.getToken().getKey(), overage);
+        bulkPricingPackagesOverActiveDomainsLimitBuilder.put(bulkPricingPackage, activeDomains);
+      }
+    }
+    handleBulkPricingPackageCreationOverage(bulkPricingPackagesOverCreateLimitBuilder.build());
+    handleActiveDomainOverage(bulkPricingPackagesOverActiveDomainsLimitBuilder.build());
+  }
+
+  private void handleBulkPricingPackageCreationOverage(
+      ImmutableMap<BulkPricingPackage, Long> overageList) {
+    if (overageList.isEmpty()) {
+      logger.atInfo().log("Found no bulk pricing packages over their create limit.");
+      return;
+    }
+    logger.atInfo().log(
+        "Found %d bulk pricing packages over their create limit.", overageList.size());
+    for (BulkPricingPackage bulkPricingPackage : overageList.keySet()) {
+      AllocationToken bulkToken = tm().loadByKey(bulkPricingPackage.getToken());
+      Optional<Registrar> registrar =
+          Registrar.loadByRegistrarIdCached(
+              Iterables.getOnlyElement(bulkToken.getAllowedRegistrarIds()));
+      if (registrar.isPresent()) {
+        String body =
+            String.format(
+                bulkPricingPackageCreateLimitEmailBody,
+                bulkPricingPackage.getId(),
+                bulkToken.getToken(),
+                registrar.get().getRegistrarName(),
+                bulkPricingPackage.getMaxCreates(),
+                overageList.get(bulkPricingPackage));
+        sendNotification(
+            bulkToken, bulkPricingPackageCreateLimitEmailSubject, body, registrar.get());
+      } else {
+        throw new IllegalStateException(
+            String.format("Could not find registrar for bulk token %s", bulkToken));
+      }
+    }
+  }
+
+  private void handleActiveDomainOverage(ImmutableMap<BulkPricingPackage, Long> overageList) {
+    if (overageList.isEmpty()) {
+      logger.atInfo().log("Found no bulk pricing packages over their active domains limit.");
+      return;
+    }
+    logger.atInfo().log(
+        "Found %d bulk pricing packages over their active domains limit.", overageList.size());
+    for (BulkPricingPackage bulkPricingPackage : overageList.keySet()) {
+      int daysSinceLastNotification =
+          bulkPricingPackage
+              .getLastNotificationSent()
+              .map(sentDate -> Days.daysBetween(sentDate, clock.nowUtc()).getDays())
+              .orElse(Integer.MAX_VALUE);
+      if (daysSinceLastNotification < THIRTY_DAYS) {
+        // Don't send an email if notification was already sent within the last 30
+        // days
+        continue;
+      } else if (daysSinceLastNotification < FORTY_DAYS) {
+        // Send an upgrade email if last email was between 30 and 40 days ago
+        sendActiveDomainOverageEmail(
+            /* warning= */ false, bulkPricingPackage, overageList.get(bulkPricingPackage));
+      } else {
+        // Send a warning email
+        sendActiveDomainOverageEmail(
+            /* warning= */ true, bulkPricingPackage, overageList.get(bulkPricingPackage));
+      }
+    }
+  }
+
+  private void sendActiveDomainOverageEmail(
+      boolean warning, BulkPricingPackage bulkPricingPackage, long activeDomains) {
+    String emailSubject =
+        warning
+            ? bulkPricingPackageDomainLimitWarningEmailSubject
+            : bulkPricingPackageDomainLimitUpgradeEmailSubject;
+    String emailTemplate =
+        warning
+            ? bulkPricingPackageDomainLimitWarningEmailBody
+            : bulkPricingPackageDomainLimitUpgradeEmailBody;
+    AllocationToken bulkToken = tm().loadByKey(bulkPricingPackage.getToken());
+    Optional<Registrar> registrar =
+        Registrar.loadByRegistrarIdCached(
+            Iterables.getOnlyElement(bulkToken.getAllowedRegistrarIds()));
+    if (registrar.isPresent()) {
+      String body =
+          String.format(
+              emailTemplate,
+              bulkPricingPackage.getId(),
+              bulkToken.getToken(),
+              registrar.get().getRegistrarName(),
+              bulkPricingPackage.getMaxDomains(),
+              activeDomains);
+      sendNotification(bulkToken, emailSubject, body, registrar.get());
+      tm().put(bulkPricingPackage.asBuilder().setLastNotificationSent(clock.nowUtc()).build());
+    } else {
+      throw new IllegalStateException(
+          String.format("Could not find registrar for bulk token %s", bulkToken));
+    }
+  }
+
+  private void sendNotification(
+      AllocationToken bulkToken, String subject, String body, Registrar registrar) {
+    logger.atInfo().log(
+        String.format(
+            "Compliance email sent to support regarding the %s registrar and the bulk pricing"
+                + " package with token %s.",
+            registrar.getRegistrarName(), bulkToken.getToken()));
+    sendEmailUtils.sendEmail(subject, body, ImmutableList.of(registrySupportEmail));
+  }
+}

core/src/main/java/google/registry/batch/CheckPackagesComplianceAction.java

@@ -1,226 +0,0 @@
-// Copyright 2022 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.
-package google.registry.batch;
-
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
-import static google.registry.util.DateTimeUtils.END_OF_TIME;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.flogger.FluentLogger;
-import com.google.common.primitives.Ints;
-import google.registry.config.RegistryConfig.Config;
-import google.registry.model.domain.token.AllocationToken;
-import google.registry.model.domain.token.PackagePromotion;
-import google.registry.model.registrar.Registrar;
-import google.registry.request.Action;
-import google.registry.request.Action.Service;
-import google.registry.request.auth.Auth;
-import google.registry.ui.server.SendEmailUtils;
-import google.registry.util.Clock;
-import java.util.Optional;
-import javax.inject.Inject;
-import org.joda.time.Days;
-
-/**
- * An action that checks all {@link PackagePromotion} objects for compliance with their max create
- * limit.
- */
-@Action(
-    service = Service.BACKEND,
-    path = CheckPackagesComplianceAction.PATH,
-    auth = Auth.AUTH_API_ADMIN)
-public class CheckPackagesComplianceAction implements Runnable {
-
-  public static final String PATH = "/_dr/task/checkPackagesCompliance";
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-  private final SendEmailUtils sendEmailUtils;
-  private final Clock clock;
-  private final String packageCreateLimitEmailSubject;
-  private final String packageDomainLimitWarningEmailSubject;
-  private final String packageDomainLimitUpgradeEmailSubject;
-  private final String packageCreateLimitEmailBody;
-  private final String packageDomainLimitWarningEmailBody;
-  private final String packageDomainLimitUpgradeEmailBody;
-  private final String registrySupportEmail;
-  private static final int THIRTY_DAYS = 30;
-  private static final int FORTY_DAYS = 40;
-
-  @Inject
-  public CheckPackagesComplianceAction(
-      SendEmailUtils sendEmailUtils,
-      Clock clock,
-      @Config("packageCreateLimitEmailSubject") String packageCreateLimitEmailSubject,
-      @Config("packageDomainLimitWarningEmailSubject") String packageDomainLimitWarningEmailSubject,
-      @Config("packageDomainLimitUpgradeEmailSubject") String packageDomainLimitUpgradeEmailSubject,
-      @Config("packageCreateLimitEmailBody") String packageCreateLimitEmailBody,
-      @Config("packageDomainLimitWarningEmailBody") String packageDomainLimitWarningEmailBody,
-      @Config("packageDomainLimitUpgradeEmailBody") String packageDomainLimitUpgradeEmailBody,
-      @Config("registrySupportEmail") String registrySupportEmail) {
-    this.sendEmailUtils = sendEmailUtils;
-    this.clock = clock;
-    this.packageCreateLimitEmailSubject = packageCreateLimitEmailSubject;
-    this.packageDomainLimitWarningEmailSubject = packageDomainLimitWarningEmailSubject;
-    this.packageDomainLimitUpgradeEmailSubject = packageDomainLimitUpgradeEmailSubject;
-    this.packageCreateLimitEmailBody = packageCreateLimitEmailBody;
-    this.packageDomainLimitWarningEmailBody = packageDomainLimitWarningEmailBody;
-    this.packageDomainLimitUpgradeEmailBody = packageDomainLimitUpgradeEmailBody;
-    this.registrySupportEmail = registrySupportEmail;
-  }
-
-  @Override
-  public void run() {
-    tm().transact(this::checkPackages);
-  }
-
-  private void checkPackages() {
-    ImmutableList<PackagePromotion> packages = tm().loadAllOf(PackagePromotion.class);
-    ImmutableMap.Builder<PackagePromotion, Long> packagesOverCreateLimitBuilder =
-        new ImmutableMap.Builder<>();
-    ImmutableMap.Builder<PackagePromotion, Long> packagesOverActiveDomainsLimitBuilder =
-        new ImmutableMap.Builder<>();
-    for (PackagePromotion packagePromo : packages) {
-      Long creates =
-          (Long)
-              tm().query(
-                      "SELECT COUNT(*) FROM DomainHistory WHERE current_package_token ="
-                          + " :token AND modificationTime >= :lastBilling AND type ="
-                          + " 'DOMAIN_CREATE'")
-                  .setParameter("token", packagePromo.getToken().getKey().toString())
-                  .setParameter("lastBilling", packagePromo.getNextBillingDate().minusYears(1))
-                  .getSingleResult();
-      if (creates > packagePromo.getMaxCreates()) {
-        long overage = creates - packagePromo.getMaxCreates();
-        logger.atInfo().log(
-            "Package with package token %s has exceeded their max domain creation limit"
-                + " by %d name(s).",
-            packagePromo.getToken().getKey(), overage);
-        packagesOverCreateLimitBuilder.put(packagePromo, creates);
-      }
-
-      Long activeDomains =
-          tm().query(
-                  "SELECT COUNT(*) FROM Domain WHERE currentPackageToken = :token"
-                      + " AND deletionTime = :endOfTime",
-                  Long.class)
-              .setParameter("token", packagePromo.getToken())
-              .setParameter("endOfTime", END_OF_TIME)
-              .getSingleResult();
-      if (activeDomains > packagePromo.getMaxDomains()) {
-        int overage = Ints.saturatedCast(activeDomains) - packagePromo.getMaxDomains();
-        logger.atInfo().log(
-            "Package with package token %s has exceed their max active domains limit by"
-                + " %d name(s).",
-            packagePromo.getToken().getKey(), overage);
-        packagesOverActiveDomainsLimitBuilder.put(packagePromo, activeDomains);
-      }
-    }
-    handlePackageCreationOverage(packagesOverCreateLimitBuilder.build());
-    handleActiveDomainOverage(packagesOverActiveDomainsLimitBuilder.build());
-  }
-
-  private void handlePackageCreationOverage(ImmutableMap<PackagePromotion, Long> overageList) {
-    if (overageList.isEmpty()) {
-      logger.atInfo().log("Found no packages over their create limit.");
-      return;
-    }
-    logger.atInfo().log("Found %d packages over their create limit.", overageList.size());
-    for (PackagePromotion packagePromotion : overageList.keySet()) {
-      AllocationToken packageToken = tm().loadByKey(packagePromotion.getToken());
-      Optional<Registrar> registrar =
-          Registrar.loadByRegistrarIdCached(
-              Iterables.getOnlyElement(packageToken.getAllowedRegistrarIds()));
-      if (registrar.isPresent()) {
-        String body =
-            String.format(
-                packageCreateLimitEmailBody,
-                packagePromotion.getId(),
-                packageToken.getToken(),
-                registrar.get().getRegistrarName(),
-                packagePromotion.getMaxCreates(),
-                overageList.get(packagePromotion));
-        sendNotification(packageToken, packageCreateLimitEmailSubject, body, registrar.get());
-      } else {
-        throw new IllegalStateException(
-            String.format("Could not find registrar for package token %s", packageToken));
-      }
-    }
-  }
-
-  private void handleActiveDomainOverage(ImmutableMap<PackagePromotion, Long> overageList) {
-    if (overageList.isEmpty()) {
-      logger.atInfo().log("Found no packages over their active domains limit.");
-      return;
-    }
-    logger.atInfo().log("Found %d packages over their active domains limit.", overageList.size());
-    for (PackagePromotion packagePromotion : overageList.keySet()) {
-      int daysSinceLastNotification =
-          packagePromotion
-              .getLastNotificationSent()
-              .map(sentDate -> Days.daysBetween(sentDate, clock.nowUtc()).getDays())
-              .orElse(Integer.MAX_VALUE);
-      if (daysSinceLastNotification < THIRTY_DAYS) {
-        // Don't send an email if notification was already sent within the last 30
-        // days
-        continue;
-      } else if (daysSinceLastNotification < FORTY_DAYS) {
-        // Send an upgrade email if last email was between 30 and 40 days ago
-        sendActiveDomainOverageEmail(
-            /* warning= */ false, packagePromotion, overageList.get(packagePromotion));
-      } else {
-        // Send a warning email
-        sendActiveDomainOverageEmail(
-            /* warning= */ true, packagePromotion, overageList.get(packagePromotion));
-      }
-    }
-  }
-
-  private void sendActiveDomainOverageEmail(
-      boolean warning, PackagePromotion packagePromotion, long activeDomains) {
-    String emailSubject =
-        warning ? packageDomainLimitWarningEmailSubject : packageDomainLimitUpgradeEmailSubject;
-    String emailTemplate =
-        warning ? packageDomainLimitWarningEmailBody : packageDomainLimitUpgradeEmailBody;
-    AllocationToken packageToken = tm().loadByKey(packagePromotion.getToken());
-    Optional<Registrar> registrar =
-        Registrar.loadByRegistrarIdCached(
-            Iterables.getOnlyElement(packageToken.getAllowedRegistrarIds()));
-    if (registrar.isPresent()) {
-      String body =
-          String.format(
-              emailTemplate,
-              packagePromotion.getId(),
-              packageToken.getToken(),
-              registrar.get().getRegistrarName(),
-              packagePromotion.getMaxDomains(),
-              activeDomains);
-      sendNotification(packageToken, emailSubject, body, registrar.get());
-      tm().put(packagePromotion.asBuilder().setLastNotificationSent(clock.nowUtc()).build());
-    } else {
-      throw new IllegalStateException(
-          String.format("Could not find registrar for package token %s", packageToken));
-    }
-  }
-
-  private void sendNotification(
-      AllocationToken packageToken, String subject, String body, Registrar registrar) {
-    logger.atInfo().log(
-        String.format(
-            "Compliance email sent to support regarding the %s registrar and the package with token"
-                + " %s.",
-            registrar.getRegistrarName(), packageToken.getToken()));
-    sendEmailUtils.sendEmail(subject, body, ImmutableList.of(registrySupportEmail));
-  }
-}

core/src/main/java/google/registry/batch/RelockDomainAction.java

@@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.flogger.FluentLogger;
 import com.google.common.net.MediaType;
 import google.registry.config.RegistryConfig.Config;
+import google.registry.groups.GmailClient;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.RegistryLock;
 import google.registry.model.eppcommon.StatusValue;
@@ -40,7 +41,6 @@ import google.registry.request.auth.Auth;
 import google.registry.tools.DomainLockUtils;
 import google.registry.util.DateTimeUtils;
 import google.registry.util.EmailMessage;
-import google.registry.util.SendEmailService;
 import java.util.Optional;
 import javax.inject.Inject;
 import javax.mail.internet.AddressException;
@@ -84,7 +84,7 @@ public class RelockDomainAction implements Runnable {
   private final InternetAddress alertRecipientAddress;
   private final InternetAddress gSuiteOutgoingEmailAddress;
   private final String supportEmail;
-  private final SendEmailService sendEmailService;
+  private final GmailClient gmailClient;
   private final DomainLockUtils domainLockUtils;
   private final Response response;
 
@@ -92,10 +92,10 @@ public class RelockDomainAction implements Runnable {
   public RelockDomainAction(
       @Parameter(OLD_UNLOCK_REVISION_ID_PARAM) long oldUnlockRevisionId,
       @Parameter(PREVIOUS_ATTEMPTS_PARAM) int previousAttempts,
-      @Config("alertRecipientEmailAddress") InternetAddress alertRecipientAddress,
+      @Config("newAlertRecipientEmailAddress") InternetAddress alertRecipientAddress,
       @Config("gSuiteOutgoingEmailAddress") InternetAddress gSuiteOutgoingEmailAddress,
       @Config("supportEmail") String supportEmail,
-      SendEmailService sendEmailService,
+      GmailClient gmailClient,
       DomainLockUtils domainLockUtils,
       Response response) {
     this.oldUnlockRevisionId = oldUnlockRevisionId;
@@ -103,7 +103,7 @@ public class RelockDomainAction implements Runnable {
     this.alertRecipientAddress = alertRecipientAddress;
     this.gSuiteOutgoingEmailAddress = gSuiteOutgoingEmailAddress;
     this.supportEmail = supportEmail;
-    this.sendEmailService = sendEmailService;
+    this.gmailClient = gmailClient;
     this.domainLockUtils = domainLockUtils;
     this.response = response;
   }
@@ -215,7 +215,7 @@ public class RelockDomainAction implements Runnable {
             oldLock.getDomainName(),
             t.getMessage(),
             supportEmail);
-    sendEmailService.sendEmail(
+    gmailClient.sendEmail(
         EmailMessage.newBuilder()
             .setFrom(gSuiteOutgoingEmailAddress)
             .setBody(body)
@@ -245,7 +245,7 @@ public class RelockDomainAction implements Runnable {
     String body =
         String.format(RELOCK_SUCCESS_EMAIL_TEMPLATE, oldLock.getDomainName(), supportEmail);
 
-    sendEmailService.sendEmail(
+    gmailClient.sendEmail(
         EmailMessage.newBuilder()
             .setFrom(gSuiteOutgoingEmailAddress)
             .setBody(body)
@@ -264,7 +264,7 @@ public class RelockDomainAction implements Runnable {
             .addAll(getEmailRecipients(oldLock.getRegistrarId()))
             .add(alertRecipientAddress)
             .build();
-    sendEmailService.sendEmail(
+    gmailClient.sendEmail(
         EmailMessage.newBuilder()
             .setFrom(gSuiteOutgoingEmailAddress)
             .setBody(body)
@@ -274,7 +274,7 @@ public class RelockDomainAction implements Runnable {
   }
 
   private void sendUnknownRevisionIdAlertEmail() {
-    sendEmailService.sendEmail(
+    gmailClient.sendEmail(
         EmailMessage.newBuilder()
             .setFrom(gSuiteOutgoingEmailAddress)
             .setBody(String.format(RELOCK_UNKNOWN_ID_FAILURE_EMAIL_TEMPLATE, oldUnlockRevisionId))

core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java

@@ -31,6 +31,7 @@ import com.google.common.flogger.FluentLogger;
 import com.google.common.net.MediaType;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.flows.certs.CertificateChecker;
+import google.registry.groups.GmailClient;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarPoc;
 import google.registry.model.registrar.RegistrarPoc.Type;
@@ -38,7 +39,6 @@ import google.registry.request.Action;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
 import google.registry.util.EmailMessage;
-import google.registry.util.SendEmailService;
 import java.util.Date;
 import java.util.Optional;
 import javax.inject.Inject;
@@ -72,7 +72,7 @@ public class SendExpiringCertificateNotificationEmailAction implements Runnable
 
   private final CertificateChecker certificateChecker;
   private final String expirationWarningEmailBodyText;
-  private final SendEmailService sendEmailService;
+  private final GmailClient gmailClient;
   private final String expirationWarningEmailSubjectText;
   private final InternetAddress gSuiteOutgoingEmailAddress;
   private final Response response;
@@ -82,12 +82,12 @@ public class SendExpiringCertificateNotificationEmailAction implements Runnable
       @Config("expirationWarningEmailBodyText") String expirationWarningEmailBodyText,
       @Config("expirationWarningEmailSubjectText") String expirationWarningEmailSubjectText,
       @Config("gSuiteOutgoingEmailAddress") InternetAddress gSuiteOutgoingEmailAddress,
-      SendEmailService sendEmailService,
+      GmailClient gmailClient,
       CertificateChecker certificateChecker,
       Response response) {
     this.certificateChecker = certificateChecker;
     this.expirationWarningEmailSubjectText = expirationWarningEmailSubjectText;
-    this.sendEmailService = sendEmailService;
+    this.gmailClient = gmailClient;
     this.gSuiteOutgoingEmailAddress = gSuiteOutgoingEmailAddress;
     this.expirationWarningEmailBodyText = expirationWarningEmailBodyText;
     this.response = response;
@@ -173,7 +173,7 @@ public class SendExpiringCertificateNotificationEmailAction implements Runnable
             registrar.getRegistrarName());
         return false;
       }
-      sendEmailService.sendEmail(
+      gmailClient.sendEmail(
           EmailMessage.newBuilder()
               .setFrom(gSuiteOutgoingEmailAddress)
               .setSubject(expirationWarningEmailSubjectText)

core/src/main/java/google/registry/beam/rde/RdeIO.java

@@ -274,10 +274,7 @@ public class RdeIO {
                 PendingDeposit key = input.getKey();
                 Tld tld = Tld.get(key.tld());
                 Optional<Cursor> cursor =
-                    tm().transact(
-                            () ->
-                                tm().loadByKeyIfPresent(
-                                        Cursor.createScopedVKey(key.cursor(), tld)));
+                    tm().loadByKeyIfPresent(Cursor.createScopedVKey(key.cursor(), tld));
                 DateTime position = getCursorTimeOrStartOfTime(cursor);
                 checkState(key.interval() != null, "Interval must be present");
                 DateTime newPosition = key.watermark().plus(key.interval());

core/src/main/java/google/registry/config/RegistryConfig.java

@@ -723,6 +723,18 @@ public final class RegistryConfig {
           .collect(toImmutableList());
     }
 
+    /**
+     * Returns an optional return email address that overrides the default {@code reply-to} address
+     * in outgoing invoicing email messages.
+     */
+    @Provides
+    @Config("invoiceReplyToEmailAddress")
+    public static Optional<InternetAddress> provideInvoiceReplyToEmailAddress(
+        RegistryConfigSettings config) {
+      return Optional.ofNullable(config.billing.invoiceReplyToEmailAddress)
+          .map(RegistryConfig::parseEmailAddress);
+    }
+
     /**
      * Returns the file prefix for the invoice CSV file.
      *
@@ -1371,41 +1383,45 @@ public final class RegistryConfig {
     }
 
     @Provides
-    @Config("packageCreateLimitEmailSubject")
-    public static String providePackageCreateLimitEmailSubject(RegistryConfigSettings config) {
-      return config.packageMonitoring.packageCreateLimitEmailSubject;
-    }
-
-    @Provides
-    @Config("packageCreateLimitEmailBody")
-    public static String providePackageCreateLimitEmailBody(RegistryConfigSettings config) {
-      return config.packageMonitoring.packageCreateLimitEmailBody;
-    }
-
-    @Provides
-    @Config("packageDomainLimitWarningEmailSubject")
-    public static String providePackageDomainLimitWarningEmailSubject(
+    @Config("bulkPricingPackageCreateLimitEmailSubject")
+    public static String provideBulkPricingPackageCreateLimitEmailSubject(
         RegistryConfigSettings config) {
-      return config.packageMonitoring.packageDomainLimitWarningEmailSubject;
+      return config.bulkPricingPackageMonitoring.bulkPricingPackageCreateLimitEmailSubject;
     }
 
     @Provides
-    @Config("packageDomainLimitWarningEmailBody")
-    public static String providePackageDomainLimitWarningEmailBody(RegistryConfigSettings config) {
-      return config.packageMonitoring.packageDomainLimitWarningEmailBody;
-    }
-
-    @Provides
-    @Config("packageDomainLimitUpgradeEmailSubject")
-    public static String providePackageDomainLimitUpgradeEmailSubject(
+    @Config("bulkPricingPackageCreateLimitEmailBody")
+    public static String provideBulkPricingPackageCreateLimitEmailBody(
         RegistryConfigSettings config) {
-      return config.packageMonitoring.packageDomainLimitUpgradeEmailSubject;
+      return config.bulkPricingPackageMonitoring.bulkPricingPackageCreateLimitEmailBody;
     }
 
     @Provides
-    @Config("packageDomainLimitUpgradeEmailBody")
-    public static String providePackageDomainLimitUpgradeEmailBody(RegistryConfigSettings config) {
-      return config.packageMonitoring.packageDomainLimitUpgradeEmailBody;
+    @Config("bulkPricingPackageDomainLimitWarningEmailSubject")
+    public static String provideBulkPricingPackageDomainLimitWarningEmailSubject(
+        RegistryConfigSettings config) {
+      return config.bulkPricingPackageMonitoring.bulkPricingPackageDomainLimitWarningEmailSubject;
+    }
+
+    @Provides
+    @Config("bulkPricingPackageDomainLimitWarningEmailBody")
+    public static String provideBulkPricingPackageDomainLimitWarningEmailBody(
+        RegistryConfigSettings config) {
+      return config.bulkPricingPackageMonitoring.bulkPricingPackageDomainLimitWarningEmailBody;
+    }
+
+    @Provides
+    @Config("bulkPricingPackageDomainLimitUpgradeEmailSubject")
+    public static String provideBulkPricingPackageDomainLimitUpgradeEmailSubject(
+        RegistryConfigSettings config) {
+      return config.bulkPricingPackageMonitoring.bulkPricingPackageDomainLimitUpgradeEmailSubject;
+    }
+
+    @Provides
+    @Config("bulkPricingPackageDomainLimitUpgradeEmailBody")
+    public static String provideBulkPricingPackageDomainLimitUpgradeEmailBody(
+        RegistryConfigSettings config) {
+      return config.bulkPricingPackageMonitoring.bulkPricingPackageDomainLimitUpgradeEmailBody;
     }
 
     private static String formatComments(String text) {
@@ -1547,6 +1563,11 @@ public final class RegistryConfig {
     return CONFIG_SETTINGS.get().hibernate.connectionIsolation;
   }
 
+  /** Returns true if per-transaction isolation level is enabled. */
+  public static boolean getHibernatePerTransactionIsolationEnabled() {
+    return CONFIG_SETTINGS.get().hibernate.perTransactionIsolation;
+  }
+
   /** Returns true if hibernate.show_sql is enabled. */
   public static String getHibernateLogSqlQueries() {
     return CONFIG_SETTINGS.get().hibernate.logSqlQueries;

core/src/main/java/google/registry/config/RegistryConfigSettings.java

@@ -42,7 +42,7 @@ public class RegistryConfigSettings {
   public SslCertificateValidation sslCertificateValidation;
   public ContactHistory contactHistory;
   public DnsUpdate dnsUpdate;
-  public PackageMonitoring packageMonitoring;
+  public BulkPricingPackageMonitoring bulkPricingPackageMonitoring;
 
   /** Configuration options that apply to the entire GCP project. */
   public static class GcpProject {
@@ -115,6 +115,7 @@ public class RegistryConfigSettings {
 
   /** Configuration for Hibernate. */
   public static class Hibernate {
+    public boolean perTransactionIsolation;
     public String connectionIsolation;
     public String logSqlQueries;
     public String hikariConnectionTimeout;
@@ -169,6 +170,7 @@ public class RegistryConfigSettings {
   /** Configuration for monthly invoices. */
   public static class Billing {
     public List<String> invoiceEmailRecipients;
+    public String invoiceReplyToEmailAddress;
     public String invoiceFilePrefix;
   }
 
@@ -252,13 +254,13 @@ public class RegistryConfigSettings {
     public String registryCcEmail;
   }
 
-  /** Configuration for package compliance monitoring. */
-  public static class PackageMonitoring {
-    public String packageCreateLimitEmailSubject;
-    public String packageCreateLimitEmailBody;
-    public String packageDomainLimitWarningEmailSubject;
-    public String packageDomainLimitWarningEmailBody;
-    public String packageDomainLimitUpgradeEmailSubject;
-    public String packageDomainLimitUpgradeEmailBody;
+  /** Configuration for bulk pricing package compliance monitoring. */
+  public static class BulkPricingPackageMonitoring {
+    public String bulkPricingPackageCreateLimitEmailSubject;
+    public String bulkPricingPackageCreateLimitEmailBody;
+    public String bulkPricingPackageDomainLimitWarningEmailSubject;
+    public String bulkPricingPackageDomainLimitWarningEmailBody;
+    public String bulkPricingPackageDomainLimitUpgradeEmailSubject;
+    public String bulkPricingPackageDomainLimitUpgradeEmailBody;
   }
 }

core/src/main/java/google/registry/config/files/default-config.yaml

@@ -189,6 +189,12 @@ registryPolicy:
   sunriseDomainCreateDiscount: 0.15
 
 hibernate:
+  # Make it possible to specify the isolation level for each transaction. If set
+  # to true, nested transactions will throw an exception. If set to false, a
+  # transaction with the isolation override specified will still execute at the
+  # default level (specified below).
+  perTransactionIsolation: false
+
   # Make 'SERIALIZABLE' the default isolation level to ensure correctness.
   #
   # Entities that are never involved in multi-table transactions may use optimistic
@@ -376,6 +382,8 @@ icannReporting:
 
 billing:
   invoiceEmailRecipients: []
+  # Optional return address that overrides the default.
+  invoiceReplyToEmailAddress: null
   invoiceFilePrefix: REG-INV
 
 rde:
@@ -479,7 +487,7 @@ keyring:
 
 # Configuration options relevant to the "nomulus" registry tool.
 registryTool:
-  # OAuth client Id used by the tool.
+  # OAuth client ID used by the tool.
   clientId: YOUR_CLIENT_ID
   # OAuth client secret used by the tool.
   clientSecret: YOUR_CLIENT_SECRET
@@ -553,55 +561,55 @@ sslCertificateValidation:
     - secp256r1
     - secp384r1
 
-# Configuration options for the package compliance monitoring
-packageMonitoring:
-  # Email subject text to notify tech support that a package has exceeded the limit for domain creates
-  packageCreateLimitEmailSubject: "ACTION REQUIRED: Package needs to be upgraded"
-  # Email body text template notify support that a package has exceeded the limit for domain creates
-  packageCreateLimitEmailBody: >
+# Configuration options for the bulk pricing package compliance monitoring
+bulkPricingPackageMonitoring:
+  # Email subject text to notify tech support that a bulk pricing package has exceeded the limit for domain creates
+  bulkPricingPackageCreateLimitEmailSubject: "ACTION REQUIRED: Bulk pricing package needs to be upgraded"
+  # Email body text template notify support that a bulk pricing package has exceeded the limit for domain creates
+  bulkPricingPackageCreateLimitEmailBody: >
     Dear Support,
     
-    A package has exceeded its max create limit and needs to be upgraded to the 
+    A bulk pricing package has exceeded its max create limit and needs to be upgraded to the 
     next tier.
     
-    Package ID: %1$s
-    Package Token: %2$s
+    Bulk Pricing ID: %1$s
+    Bulk Token: %2$s
     Registrar: %3$s
     Current Max Create Limit: %4$s
     Creates Completed: %5$s
 
-  # Email subject text to notify support that a package has exceeded the limit
+  # Email subject text to notify support that a bulk pricing package has exceeded the limit
   # for current active domains and a warning needs to be sent
-  packageDomainLimitWarningEmailSubject: "ACTION REQUIRED: Package has exceeded the domain limit - send warning"
-  # Email body text template to inform support that a package has exceeded the
-  # limit for active domains and a warning needs to be sent that the package
+  bulkPricingPackageDomainLimitWarningEmailSubject: "ACTION REQUIRED: Bulk pricing package has exceeded the domain limit - send warning"
+  # Email body text template to inform support that a bulk pricing package has exceeded the
+  # limit for active domains and a warning needs to be sent that the bulk pricing package
   # will be upgraded in 30 days
-  packageDomainLimitWarningEmailBody: >
+  bulkPricingPackageDomainLimitWarningEmailBody: >
     Dear Support,
     
-    A package has exceeded its max domain limit. Please send a warning to the 
-    registrar that their package will be upgraded to the next tier in 30 days if 
+    A bulk pricing package has exceeded its max domain limit. Please send a warning to the 
+    registrar that their bulk pricing package will be upgraded to the next tier in 30 days if 
     the number of active domains does not return below the limit.
     
-    Package ID: %1$s
-    Package Token: %2$s
+    Bulk Pricing ID: %1$s
+    Bulk Token: %2$s
     Registrar: %3$s
     Active Domain Limit: %4$s
     Current Active Domains: %5$s
 
-  # Email subject text to notify support that a package has exceeded the limit
+  # Email subject text to notify support that a bulk pricing package has exceeded the limit
   # for current active domains for more than 30 days and needs to be upgraded
-  packageDomainLimitUpgradeEmailSubject: "ACTION REQUIRED: Package has exceeded the domain limit - upgrade package"
-  # Email body text template to inform support that a package has exceeded the
+  bulkPricingPackageDomainLimitUpgradeEmailSubject: "ACTION REQUIRED: Bulk pricing package has exceeded the domain limit - upgrade package"
+  # Email body text template to inform support that a bulk pricing package has exceeded the
   # limit for active domains for more than 30 days and needs to be upgraded
-  packageDomainLimitUpgradeEmailBody: >
+  bulkPricingPackageDomainLimitUpgradeEmailBody: >
     Dear Support,
     
-    A package has exceeded its max domain limit for over 30 days and needs to be 
+    A bulk pricing package has exceeded its max domain limit for over 30 days and needs to be 
     upgraded to the next tier.
     
-    Package ID: %1$s
-    Package Token: %2$s
+    Bulk Pricing ID: %1$s
+    Bulk Token: %2$s
     Registrar: %3$s
     Active Domain Limit: %4$s
     Current Active Domains: %5$s

core/src/main/java/google/registry/config/files/nomulus-config-unittest.yaml

@@ -26,3 +26,6 @@ gSuite:
 misc:
   # We would rather have failures than timeouts, so reduce the number of retries
   transientFailureRetries: 3
+
+hibernate:
+  perTransactionIsolation: true

core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java

@@ -45,6 +45,7 @@ import google.registry.dns.DnsMetrics.ActionStatus;
 import google.registry.dns.DnsMetrics.CommitStatus;
 import google.registry.dns.DnsMetrics.PublishStatus;
 import google.registry.dns.writer.DnsWriter;
+import google.registry.groups.GmailClient;
 import google.registry.model.domain.Domain;
 import google.registry.model.host.Host;
 import google.registry.model.registrar.Registrar;
@@ -61,7 +62,6 @@ import google.registry.request.lock.LockHandler;
 import google.registry.util.Clock;
 import google.registry.util.DomainNameUtils;
 import google.registry.util.EmailMessage;
-import google.registry.util.SendEmailService;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Callable;
@@ -112,7 +112,7 @@ public final class PublishDnsUpdatesAction implements Runnable, Callable<Void> {
   private final Clock clock;
   private final CloudTasksUtils cloudTasksUtils;
   private final Response response;
-  private final SendEmailService sendEmailService;
+  private final GmailClient gmailClient;
   private final String dnsUpdateFailEmailSubjectText;
   private final String dnsUpdateFailEmailBodyText;
   private final String dnsUpdateFailRegistryName;
@@ -143,12 +143,12 @@ public final class PublishDnsUpdatesAction implements Runnable, Callable<Void> {
       LockHandler lockHandler,
       Clock clock,
       CloudTasksUtils cloudTasksUtils,
-      SendEmailService sendEmailService,
+      GmailClient gmailClient,
       Response response) {
     this.dnsWriterProxy = dnsWriterProxy;
     this.dnsMetrics = dnsMetrics;
     this.timeout = timeout;
-    this.sendEmailService = sendEmailService;
+    this.gmailClient = gmailClient;
     this.retryCount = retryCount;
     this.dnsWriter = dnsWriter;
     this.enqueuedTime = enqueuedTime;
@@ -303,7 +303,7 @@ public final class PublishDnsUpdatesAction implements Runnable, Callable<Void> {
               .map(PublishDnsUpdatesAction::emailToInternetAddress)
               .collect(toImmutableList());
 
-      sendEmailService.sendEmail(
+      gmailClient.sendEmail(
           EmailMessage.newBuilder()
               .setBody(body)
               .setSubject(dnsUpdateFailEmailSubjectText)

core/src/main/java/google/registry/dns/RefreshDnsAction.java

@@ -60,18 +60,21 @@ public final class RefreshDnsAction implements Runnable {
     if (!domainOrHostName.contains(".")) {
       throw new BadRequestException("URL parameter 'name' must be fully qualified");
     }
-    switch (type) {
-      case DOMAIN:
-        loadAndVerifyExistence(Domain.class, domainOrHostName);
-        tm().transact(() -> requestDomainDnsRefresh(domainOrHostName));
-        break;
-      case HOST:
-        verifyHostIsSubordinate(loadAndVerifyExistence(Host.class, domainOrHostName));
-        tm().transact(() -> requestHostDnsRefresh(domainOrHostName));
-        break;
-      default:
-        throw new BadRequestException("Unsupported type: " + type);
-    }
+    tm().transact(
+            () -> {
+              switch (type) {
+                case DOMAIN:
+                  loadAndVerifyExistence(Domain.class, domainOrHostName);
+                  requestDomainDnsRefresh(domainOrHostName);
+                  break;
+                case HOST:
+                  verifyHostIsSubordinate(loadAndVerifyExistence(Host.class, domainOrHostName));
+                  requestHostDnsRefresh(domainOrHostName);
+                  break;
+                default:
+                  throw new BadRequestException("Unsupported type: " + type);
+              }
+            });
   }
 
   private <T extends EppResource & ForeignKeyedEppResource>

core/src/main/java/google/registry/flows/EppXmlSanitizer.java

@@ -165,6 +165,9 @@ public class EppXmlSanitizer {
     xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
     // Preserve Name Space information.
     xmlInputFactory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
+    // Prevent XXE attacks.
+    xmlInputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
+    xmlInputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
     return xmlInputFactory;
   }
 }

core/src/main/java/google/registry/flows/FlowModule.java

@@ -35,6 +35,8 @@ import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.eppoutput.Result;
 import google.registry.model.host.HostHistory;
 import google.registry.model.reporting.HistoryEntry;
+import google.registry.persistence.IsolationLevel;
+import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
 import java.lang.annotation.Documented;
 import java.util.Optional;
 import javax.inject.Qualifier;
@@ -135,6 +137,14 @@ public class FlowModule {
     return TransactionalFlow.class.isAssignableFrom(flowClass);
   }
 
+  @Provides
+  @FlowScope
+  Optional<TransactionIsolationLevel> provideIsolationLevelOverride(
+      Class<? extends Flow> flowClass) {
+    return Optional.ofNullable(flowClass.getAnnotation(IsolationLevel.class))
+        .map(IsolationLevel::value);
+  }
+
   @Provides
   @FlowScope
   @Superuser
@@ -166,7 +176,7 @@ public class FlowModule {
   @FlowScope
   @RegistrarId
   static String provideRegistrarId(SessionMetadata sessionMetadata) {
-    // Treat a missing registrarId as null so we can always inject a non-null value. All we do with
+    // Treat a missing registrarId as null, so we can always inject a non-null value. All we do with
     // the registrarId is log it (as "") or detect its absence, both of which work fine with empty.
     return Strings.nullToEmpty(sessionMetadata.getRegistrarId());
   }

core/src/main/java/google/registry/flows/FlowRunner.java

@@ -28,6 +28,8 @@ import google.registry.flows.session.LoginFlow;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppoutput.EppOutput;
 import google.registry.monitoring.whitebox.EppMetric;
+import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
+import java.util.Optional;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -42,6 +44,7 @@ public class FlowRunner {
   @Inject TransportCredentials credentials;
   @Inject EppRequestSource eppRequestSource;
   @Inject Provider<Flow> flowProvider;
+  @Inject Optional<TransactionIsolationLevel> isolationLevelOverride;
   @Inject Class<? extends Flow> flowClass;
   @Inject @InputXml byte[] inputXmlBytes;
   @Inject @DryRun boolean isDryRun;
@@ -75,6 +78,8 @@ public class FlowRunner {
       return EppOutput.create(flowProvider.get().run());
     }
     try {
+      // TODO(mcilwain/weiminyu): Use transactReadOnly() here for TransactionalFlow and transact()
+      //                          for MutatingFlow.
       return tm().transact(
               () -> {
                 try {
@@ -91,7 +96,8 @@ public class FlowRunner {
                 } catch (EppException e) {
                   throw new EppRuntimeException(e);
                 }
-              });
+              },
+              isolationLevelOverride.orElse(null));
     } catch (DryRunException e) {
       return e.output;
     } catch (EppRuntimeException e) {

core/src/main/java/google/registry/flows/MutatingFlow.java

@@ -0,0 +1,23 @@
+// Copyright 2023 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.
+
+package google.registry.flows;
+
+/**
+ * Interface for a {@link TransactionalFlow} that mutates the database (i.e. is not read-only).
+ *
+ * <p>Any flow that mutates the DB should implement this so that {@link FlowRunner} will know how to
+ * run it.
+ */
+public interface MutatingFlow extends TransactionalFlow {}

core/src/main/java/google/registry/flows/ResourceFlowUtils.java

@@ -72,17 +72,12 @@ public final class ResourceFlowUtils {
    */
   public static <R extends EppResource> void checkLinkedDomains(
       final String targetId, final DateTime now, final Class<R> resourceClass) throws EppException {
-    EppException failfastException =
-        tm().transact(
-                () -> {
-                  VKey<R> key = ForeignKeyUtils.load(resourceClass, targetId, now);
-                  if (key == null) {
-                    return new ResourceDoesNotExistException(resourceClass, targetId);
-                  }
-                  return isLinked(key, now) ? new ResourceToDeleteIsReferencedException() : null;
-                });
-    if (failfastException != null) {
-      throw failfastException;
+    VKey<R> key = ForeignKeyUtils.load(resourceClass, targetId, now);
+    if (key == null) {
+      throw new ResourceDoesNotExistException(resourceClass, targetId);
+    }
+    if (isLinked(key, now)) {
+      throw new ResourceToDeleteIsReferencedException();
     }
   }
 
@@ -169,7 +164,7 @@ public final class ResourceFlowUtils {
       throw new BadAuthInfoForResourceException();
     }
     // Check the authInfo against the contact.
-    verifyAuthInfo(authInfo, tm().transact(() -> tm().loadByKey(foundContact.get())));
+    verifyAuthInfo(authInfo, tm().loadByKey(foundContact.get()));
   }
 
   /** Check that the given {@link AuthInfo} is valid for the given contact. */

core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java

@@ -23,8 +23,8 @@ import com.google.common.collect.ImmutableSet;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
-import google.registry.flows.Flow;
 import google.registry.flows.FlowModule.RegistrarId;
+import google.registry.flows.TransactionalFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.contact.Contact;
 import google.registry.model.contact.ContactCommand.Check;
@@ -45,7 +45,7 @@ import javax.inject.Inject;
  * @error {@link google.registry.flows.FlowUtils.NotLoggedInException}
  */
 @ReportingSpec(ActivityReportField.CONTACT_CHECK)
-public final class ContactCheckFlow implements Flow {
+public final class ContactCheckFlow implements TransactionalFlow {
 
   @Inject ResourceCommand resourceCommand;
   @Inject @RegistrarId String registrarId;

core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java

@@ -28,7 +28,7 @@ import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.exceptions.ResourceAlreadyExistsForThisClientException;
 import google.registry.flows.exceptions.ResourceCreateContentionException;
@@ -54,7 +54,7 @@ import org.joda.time.DateTime;
  * @error {@link ContactFlowUtils.DeclineContactDisclosureFieldDisallowedPolicyException}
  */
 @ReportingSpec(ActivityReportField.CONTACT_CREATE)
-public final class ContactCreateFlow implements TransactionalFlow {
+public final class ContactCreateFlow implements MutatingFlow {
 
   @Inject ResourceCommand resourceCommand;
   @Inject ExtensionManager extensionManager;

core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java

@@ -32,7 +32,7 @@ import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.contact.Contact;
 import google.registry.model.contact.ContactHistory;
@@ -63,7 +63,7 @@ import org.joda.time.DateTime;
  * @error {@link google.registry.flows.exceptions.ResourceToDeleteIsReferencedException}
  */
 @ReportingSpec(ActivityReportField.CONTACT_DELETE)
-public final class ContactDeleteFlow implements TransactionalFlow {
+public final class ContactDeleteFlow implements MutatingFlow {
 
   private static final ImmutableSet<StatusValue> DISALLOWED_STATUSES =
       ImmutableSet.of(

core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java

@@ -22,10 +22,10 @@ import static google.registry.model.EppResourceUtils.isLinked;
 import com.google.common.collect.ImmutableSet;
 import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
-import google.registry.flows.Flow;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
+import google.registry.flows.TransactionalFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.contact.Contact;
 import google.registry.model.contact.ContactInfoData;
@@ -51,7 +51,7 @@ import org.joda.time.DateTime;
  * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException}
  */
 @ReportingSpec(ActivityReportField.CONTACT_INFO)
-public final class ContactInfoFlow implements Flow {
+public final class ContactInfoFlow implements TransactionalFlow {
 
   @Inject ExtensionManager extensionManager;
   @Inject Clock clock;

core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java

@@ -30,7 +30,7 @@ import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.contact.Contact;
 import google.registry.model.contact.ContactHistory;
@@ -60,7 +60,7 @@ import org.joda.time.DateTime;
  * @error {@link google.registry.flows.exceptions.NotPendingTransferException}
  */
 @ReportingSpec(ActivityReportField.CONTACT_TRANSFER_APPROVE)
-public final class ContactTransferApproveFlow implements TransactionalFlow {
+public final class ContactTransferApproveFlow implements MutatingFlow {
 
   @Inject ResourceCommand resourceCommand;
   @Inject ExtensionManager extensionManager;

core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java

@@ -30,7 +30,7 @@ import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.contact.Contact;
 import google.registry.model.contact.ContactHistory;
@@ -60,7 +60,7 @@ import org.joda.time.DateTime;
  * @error {@link google.registry.flows.exceptions.NotTransferInitiatorException}
  */
 @ReportingSpec(ActivityReportField.CONTACT_TRANSFER_CANCEL)
-public final class ContactTransferCancelFlow implements TransactionalFlow {
+public final class ContactTransferCancelFlow implements MutatingFlow {
 
   @Inject ResourceCommand resourceCommand;
   @Inject ExtensionManager extensionManager;

core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java

@@ -21,9 +21,9 @@ import static google.registry.flows.contact.ContactFlowUtils.createTransferRespo
 
 import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
-import google.registry.flows.Flow;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.TargetId;
+import google.registry.flows.TransactionalFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.exceptions.NoTransferHistoryToQueryException;
 import google.registry.flows.exceptions.NotAuthorizedToViewTransferException;
@@ -52,7 +52,7 @@ import javax.inject.Inject;
  * @error {@link google.registry.flows.exceptions.NotAuthorizedToViewTransferException}
  */
 @ReportingSpec(ActivityReportField.CONTACT_TRANSFER_QUERY)
-public final class ContactTransferQueryFlow implements Flow {
+public final class ContactTransferQueryFlow implements TransactionalFlow {
 
   @Inject ExtensionManager extensionManager;
   @Inject Optional<AuthInfo> authInfo;

core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java

@@ -30,7 +30,7 @@ import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.contact.Contact;
 import google.registry.model.contact.ContactHistory;
@@ -59,7 +59,7 @@ import org.joda.time.DateTime;
  * @error {@link google.registry.flows.exceptions.NotPendingTransferException}
  */
 @ReportingSpec(ActivityReportField.CONTACT_TRANSFER_REJECT)
-public final class ContactTransferRejectFlow implements TransactionalFlow {
+public final class ContactTransferRejectFlow implements MutatingFlow {
 
   @Inject ExtensionManager extensionManager;
   @Inject Optional<AuthInfo> authInfo;

core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java

@@ -33,7 +33,7 @@ import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.exceptions.AlreadyPendingTransferException;
 import google.registry.flows.exceptions.ObjectAlreadySponsoredException;
@@ -72,7 +72,7 @@ import org.joda.time.Duration;
  * @error {@link google.registry.flows.exceptions.ResourceStatusProhibitsOperationException}
  */
 @ReportingSpec(ActivityReportField.CONTACT_TRANSFER_REQUEST)
-public final class ContactTransferRequestFlow implements TransactionalFlow {
+public final class ContactTransferRequestFlow implements MutatingFlow {
 
   private static final ImmutableSet<StatusValue> DISALLOWED_STATUSES =
       ImmutableSet.of(

core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java

@@ -33,7 +33,7 @@ import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.exceptions.ResourceHasClientUpdateProhibitedException;
 import google.registry.model.contact.Contact;
@@ -66,7 +66,7 @@ import org.joda.time.DateTime;
  * @error {@link ContactFlowUtils.DeclineContactDisclosureFieldDisallowedPolicyException}
  */
 @ReportingSpec(ActivityReportField.CONTACT_UPDATE)
-public final class ContactUpdateFlow implements TransactionalFlow {
+public final class ContactUpdateFlow implements MutatingFlow {
 
   /**
    * Note that CLIENT_UPDATE_PROHIBITED is intentionally not in this list. This is because it

core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java

@@ -43,9 +43,9 @@ import google.registry.config.RegistryConfig.Config;
 import google.registry.flows.EppException;
 import google.registry.flows.EppException.ParameterValuePolicyErrorException;
 import google.registry.flows.ExtensionManager;
-import google.registry.flows.Flow;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
+import google.registry.flows.TransactionalFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.custom.DomainCheckFlowCustomLogic;
 import google.registry.flows.custom.DomainCheckFlowCustomLogic.BeforeResponseParameters;
@@ -121,7 +121,7 @@ import org.joda.time.DateTime;
  * @error {@link OnlyCheckedNamesCanBeFeeCheckedException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_CHECK)
-public final class DomainCheckFlow implements Flow {
+public final class DomainCheckFlow implements TransactionalFlow {
 
   @Inject ResourceCommand resourceCommand;
   @Inject ExtensionManager extensionManager;
@@ -382,17 +382,13 @@ public final class DomainCheckFlow implements Flow {
 
   private ImmutableMap<String, BillingRecurrence> loadRecurrencesForDomains(
       ImmutableMap<String, Domain> domainObjs) {
-    return tm().transact(
-            () -> {
-              ImmutableMap<VKey<? extends BillingRecurrence>, BillingRecurrence> recurrences =
-                  tm().loadByKeys(
-                          domainObjs.values().stream()
-                              .map(Domain::getAutorenewBillingEvent)
-                              .collect(toImmutableSet()));
-              return ImmutableMap.copyOf(
-                  Maps.transformValues(
-                      domainObjs, d -> recurrences.get(d.getAutorenewBillingEvent())));
-            });
+    ImmutableMap<VKey<? extends BillingRecurrence>, BillingRecurrence> recurrences =
+        tm().loadByKeys(
+                domainObjs.values().stream()
+                    .map(Domain::getAutorenewBillingEvent)
+                    .collect(toImmutableSet()));
+    return ImmutableMap.copyOf(
+        Maps.transformValues(domainObjs, d -> recurrences.get(d.getAutorenewBillingEvent())));
   }
 
   /**

core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java

@@ -31,9 +31,9 @@ import google.registry.config.RegistryConfig.Config;
 import google.registry.flows.EppException;
 import google.registry.flows.EppException.CommandUseErrorException;
 import google.registry.flows.ExtensionManager;
-import google.registry.flows.Flow;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
+import google.registry.flows.TransactionalFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.domain.DomainCommand.Check;
 import google.registry.model.domain.launch.LaunchCheckExtension;
@@ -67,7 +67,7 @@ import org.joda.time.DateTime;
  * @error {@link DomainClaimsCheckNotAllowedWithAllocationTokens}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_CHECK) // Claims check is a special domain check.
-public final class DomainClaimsCheckFlow implements Flow {
+public final class DomainClaimsCheckFlow implements TransactionalFlow {
 
   @Inject ExtensionManager extensionManager;
   @Inject EppInput eppInput;

core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java

@@ -67,7 +67,7 @@ import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.custom.DomainCreateFlowCustomLogic;
 import google.registry.flows.custom.DomainCreateFlowCustomLogic.BeforeResponseParameters;
@@ -152,7 +152,7 @@ import org.joda.time.Duration;
  * @error {@link DomainCreateFlow.MustHaveSignedMarksInCurrentPhaseException}
  * @error {@link DomainCreateFlow.NoGeneralRegistrationsInCurrentPhaseException}
  * @error {@link DomainCreateFlow.NoTrademarkedRegistrationsBeforeSunriseException}
- * @error {@link DomainCreateFlow.PackageDomainRegisteredForTooManyYearsException}
+ * @error {@link BulkDomainRegisteredForTooManyYearsException}
  * @error {@link DomainCreateFlow.SignedMarksOnlyDuringSunriseException}
  * @error {@link DomainFlowTmchUtils.NoMarksFoundMatchingDomainException}
  * @error {@link DomainFlowTmchUtils.FoundMarkNotYetValidException}
@@ -210,7 +210,7 @@ import org.joda.time.Duration;
  * @error {@link DomainPricingLogic.AllocationTokenInvalidForPremiumNameException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_CREATE)
-public final class DomainCreateFlow implements TransactionalFlow {
+public final class DomainCreateFlow implements MutatingFlow {
 
   /** Anchor tenant creates should always be for 2 years, since they get 2 years free. */
   private static final int ANCHOR_TENANT_CREATE_VALID_YEARS = 2;
@@ -405,12 +405,11 @@ public final class DomainCreateFlow implements TransactionalFlow {
                     : hasClaimsNotice ? LordnPhase.CLAIMS : LordnPhase.NONE);
     Domain domain = domainBuilder.build();
     if (allocationToken.isPresent()
-        && allocationToken.get().getTokenType().equals(TokenType.PACKAGE)) {
+        && allocationToken.get().getTokenType().equals(TokenType.BULK_PRICING)) {
       if (years > 1) {
-        throw new PackageDomainRegisteredForTooManyYearsException(allocationToken.get().getToken());
+        throw new BulkDomainRegisteredForTooManyYearsException(allocationToken.get().getToken());
       }
-      domain =
-          domain.asBuilder().setCurrentPackageToken(allocationToken.get().createVKey()).build();
+      domain = domain.asBuilder().setCurrentBulkToken(allocationToken.get().createVKey()).build();
     }
     DomainHistory domainHistory =
         buildDomainHistory(domain, tld, now, period, tld.getAddGracePeriodLength());
@@ -763,13 +762,12 @@ public final class DomainCreateFlow implements TransactionalFlow {
     }
   }
 
-  /** Package domain registered for too many years. */
-  static class PackageDomainRegisteredForTooManyYearsException extends CommandUseErrorException {
-    public PackageDomainRegisteredForTooManyYearsException(String token) {
+  /** Bulk pricing domain registered for too many years. */
+  static class BulkDomainRegisteredForTooManyYearsException extends CommandUseErrorException {
+    public BulkDomainRegisteredForTooManyYearsException(String token) {
       super(
           String.format(
-              "The package token %s cannot be used to register names for longer than 1 year.",
-              token));
+              "The bulk token %s cannot be used to register names for longer than 1 year.", token));
     }
   }
 }

core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java

@@ -51,8 +51,8 @@ import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.SessionMetadata;
-import google.registry.flows.TransactionalFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.custom.DomainDeleteFlowCustomLogic;
 import google.registry.flows.custom.DomainDeleteFlowCustomLogic.AfterValidationParameters;
@@ -115,7 +115,7 @@ import org.joda.time.Duration;
  * @error {@link DomainFlowUtils.NotAuthorizedForTldException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_DELETE)
-public final class DomainDeleteFlow implements TransactionalFlow {
+public final class DomainDeleteFlow implements MutatingFlow {
 
   private static final ImmutableSet<StatusValue> DISALLOWED_STATUSES = ImmutableSet.of(
       StatusValue.CLIENT_DELETE_PROHIBITED,

core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java

@@ -28,10 +28,10 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.net.InternetDomainName;
 import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
-import google.registry.flows.Flow;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
+import google.registry.flows.TransactionalFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.custom.DomainInfoFlowCustomLogic;
 import google.registry.flows.custom.DomainInfoFlowCustomLogic.AfterValidationParameters;
@@ -76,7 +76,7 @@ import org.joda.time.DateTime;
  * @error {@link DomainFlowUtils.TransfersAreAlwaysForOneYearException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_INFO)
-public final class DomainInfoFlow implements Flow {
+public final class DomainInfoFlow implements TransactionalFlow {
 
   @Inject ExtensionManager extensionManager;
   @Inject ResourceCommand resourceCommand;
@@ -120,14 +120,12 @@ public final class DomainInfoFlow implements Flow {
             .setLastEppUpdateTime(domain.getLastEppUpdateTime())
             .setRegistrationExpirationTime(domain.getRegistrationExpirationTime())
             .setLastTransferTime(domain.getLastTransferTime())
-            .setRegistrant(
-                tm().transact(() -> tm().loadByKey(domain.getRegistrant())).getContactId());
+            .setRegistrant(tm().loadByKey(domain.getRegistrant()).getContactId());
     // If authInfo is non-null, then the caller is authorized to see the full information since we
     // will have already verified the authInfo is valid.
     if (registrarId.equals(domain.getCurrentSponsorRegistrarId()) || authInfo.isPresent()) {
       infoBuilder
-          .setContacts(
-              tm().transact(() -> loadForeignKeyedDesignatedContacts(domain.getContacts())))
+          .setContacts(loadForeignKeyedDesignatedContacts(domain.getContacts()))
           .setSubordinateHosts(
               hostsRequest.requestSubordinate() ? domain.getSubordinateHosts() : null)
           .setCreationRegistrarId(domain.getCreationRegistrarId())
@@ -155,13 +153,13 @@ public final class DomainInfoFlow implements Flow {
     if (!gracePeriodStatuses.isEmpty()) {
       extensions.add(RgpInfoExtension.create(gracePeriodStatuses));
     }
-    Optional<BulkTokenExtension> packageInfo =
+    Optional<BulkTokenExtension> bulkPricingInfo =
         eppInput.getSingleExtension(BulkTokenExtension.class);
-    if (packageInfo.isPresent()) {
-      // Package info was requested.
+    if (bulkPricingInfo.isPresent()) {
+      // Bulk pricing info was requested.
       if (isSuperuser || registrarId.equals(domain.getCurrentSponsorRegistrarId())) {
-        // Only show package info to owning registrar or superusers
-        extensions.add(BulkTokenResponseExtension.create(domain.getCurrentPackageToken()));
+        // Only show bulk pricing info to owning registrar or superusers
+        extensions.add(BulkTokenResponseExtension.create(domain.getCurrentBulkToken()));
       }
     }
     Optional<FeeInfoCommandExtensionV06> feeInfo =
@@ -178,7 +176,7 @@ public final class DomainInfoFlow implements Flow {
           pricingLogic,
           Optional.empty(),
           false,
-          tm().transact(() -> tm().loadByKey(domain.getAutorenewBillingEvent())));
+          tm().loadByKey(domain.getAutorenewBillingEvent()));
       extensions.add(builder.build());
     }
     return extensions.build();

core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java

@@ -30,7 +30,7 @@ import static google.registry.flows.domain.DomainFlowUtils.validateFeeChallenge;
 import static google.registry.flows.domain.DomainFlowUtils.validateRegistrationPeriod;
 import static google.registry.flows.domain.DomainFlowUtils.verifyRegistrarIsActive;
 import static google.registry.flows.domain.DomainFlowUtils.verifyUnitIsYears;
-import static google.registry.flows.domain.token.AllocationTokenFlowUtils.maybeApplyPackageRemovalToken;
+import static google.registry.flows.domain.token.AllocationTokenFlowUtils.maybeApplyBulkPricingRemovalToken;
 import static google.registry.flows.domain.token.AllocationTokenFlowUtils.verifyTokenAllowedOnDomain;
 import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_RENEW;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
@@ -44,7 +44,7 @@ import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.custom.DomainRenewFlowCustomLogic;
 import google.registry.flows.custom.DomainRenewFlowCustomLogic.AfterValidationParameters;
@@ -53,8 +53,8 @@ import google.registry.flows.custom.DomainRenewFlowCustomLogic.BeforeResponseRet
 import google.registry.flows.custom.DomainRenewFlowCustomLogic.BeforeSaveParameters;
 import google.registry.flows.custom.EntityChanges;
 import google.registry.flows.domain.token.AllocationTokenFlowUtils;
-import google.registry.flows.domain.token.AllocationTokenFlowUtils.MissingRemoveDomainTokenOnPackageDomainException;
-import google.registry.flows.domain.token.AllocationTokenFlowUtils.RemoveDomainTokenOnNonPackageDomainException;
+import google.registry.flows.domain.token.AllocationTokenFlowUtils.MissingRemoveDomainTokenOnBulkPricingDomainException;
+import google.registry.flows.domain.token.AllocationTokenFlowUtils.RemoveDomainTokenOnNonBulkPricingDomainException;
 import google.registry.model.ImmutableObject;
 import google.registry.model.billing.BillingBase.Reason;
 import google.registry.model.billing.BillingEvent;
@@ -121,8 +121,8 @@ import org.joda.time.Duration;
  * @error {@link DomainFlowUtils.RegistrarMustBeActiveForThisOperationException}
  * @error {@link DomainFlowUtils.UnsupportedFeeAttributeException}
  * @error {@link DomainRenewFlow.IncorrectCurrentExpirationDateException}
- * @error {@link MissingRemoveDomainTokenOnPackageDomainException}
- * @error {@link RemoveDomainTokenOnNonPackageDomainException}
+ * @error {@link MissingRemoveDomainTokenOnBulkPricingDomainException}
+ * @error {@link RemoveDomainTokenOnNonBulkPricingDomainException}
  * @error {@link
  *     google.registry.flows.domain.token.AllocationTokenFlowUtils.AllocationTokenNotValidForDomainException}
  * @error {@link
@@ -137,7 +137,7 @@ import org.joda.time.Duration;
  *     google.registry.flows.domain.token.AllocationTokenFlowUtils.AlreadyRedeemedAllocationTokenException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_RENEW)
-public final class DomainRenewFlow implements TransactionalFlow {
+public final class DomainRenewFlow implements MutatingFlow {
 
   private static final ImmutableSet<StatusValue> RENEW_DISALLOWED_STATUSES = ImmutableSet.of(
       StatusValue.CLIENT_RENEW_PROHIBITED,
@@ -194,7 +194,7 @@ public final class DomainRenewFlow implements TransactionalFlow {
     verifyRenewAllowed(authInfo, existingDomain, command, allocationToken);
 
     // If client passed an applicable static token this updates the domain
-    existingDomain = maybeApplyPackageRemovalToken(existingDomain, allocationToken);
+    existingDomain = maybeApplyBulkPricingRemovalToken(existingDomain, allocationToken);
 
     int years = command.getPeriod().getValue();
     DateTime newExpirationTime =
@@ -328,7 +328,7 @@ public final class DomainRenewFlow implements TransactionalFlow {
       checkHasBillingAccount(registrarId, existingDomain.getTld());
     }
     verifyUnitIsYears(command.getPeriod());
-    // We only allow __REMOVE_PACKAGE__ token on promo package domains for now
+    // We only allow __REMOVEDOMAIN__ token on bulk pricing domains for now
     verifyTokenAllowedOnDomain(existingDomain, allocationToken);
     // If the date they specify doesn't match the expiration, fail. (This is an idempotence check).
     if (!command.getCurrentExpirationDate().equals(

core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java

@@ -42,7 +42,7 @@ import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.ImmutableObject;
 import google.registry.model.billing.BillingBase.Reason;
@@ -112,7 +112,7 @@ import org.joda.time.DateTime;
  * @error {@link DomainRestoreRequestFlow.RestoreCommandIncludesChangesException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_RGP_RESTORE_REQUEST)
-public final class DomainRestoreRequestFlow implements TransactionalFlow {
+public final class DomainRestoreRequestFlow implements MutatingFlow {
 
   @Inject ResourceCommand resourceCommand;
   @Inject ExtensionManager extensionManager;

core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java

@@ -41,7 +41,7 @@ import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.domain.token.AllocationTokenFlowUtils;
 import google.registry.model.ImmutableObject;
@@ -106,7 +106,7 @@ import org.joda.time.DateTime;
  *     google.registry.flows.domain.token.AllocationTokenFlowUtils.AlreadyRedeemedAllocationTokenException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_TRANSFER_APPROVE)
-public final class DomainTransferApproveFlow implements TransactionalFlow {
+public final class DomainTransferApproveFlow implements MutatingFlow {
 
   @Inject ExtensionManager extensionManager;
   @Inject Optional<AuthInfo> authInfo;
@@ -154,9 +154,9 @@ public final class DomainTransferApproveFlow implements TransactionalFlow {
         tm().loadByKey(existingDomain.getAutorenewBillingEvent());
     HistoryEntryId domainHistoryId = createHistoryEntryId(existingDomain);
     historyBuilder.setRevisionId(domainHistoryId.getRevisionId());
-    boolean hasPackageToken = existingDomain.getCurrentPackageToken().isPresent();
+    boolean hasBulkToken = existingDomain.getCurrentBulkToken().isPresent();
     Money renewalPrice =
-        hasPackageToken ? null : existingBillingRecurrence.getRenewalPrice().orElse(null);
+        hasBulkToken ? null : existingBillingRecurrence.getRenewalPrice().orElse(null);
     Optional<BillingEvent> billingEvent =
         transferData.getTransferPeriod().getValue() == 0
             ? Optional.empty()
@@ -172,10 +172,10 @@ public final class DomainTransferApproveFlow implements TransactionalFlow {
                                 Tld.get(tldStr),
                                 targetId,
                                 transferData.getTransferRequestTime(),
-                                // When removing a domain from a package it should return to the
+                                // When removing a domain from bulk pricing it should return to the
                                 // default recurrence billing behavior so the existing recurrence
                                 // billing event should not be passed in.
-                                hasPackageToken ? null : existingBillingRecurrence)
+                                hasBulkToken ? null : existingBillingRecurrence)
                             .getRenewCost())
                     .setEventTime(now)
                     .setBillingTime(now.plus(Tld.get(tldStr).getTransferGracePeriodLength()))
@@ -213,7 +213,7 @@ public final class DomainTransferApproveFlow implements TransactionalFlow {
             .setRegistrarId(gainingRegistrarId)
             .setEventTime(newExpirationTime)
             .setRenewalPriceBehavior(
-                hasPackageToken
+                hasBulkToken
                     ? RenewalPriceBehavior.DEFAULT
                     : existingBillingRecurrence.getRenewalPriceBehavior())
             .setRenewalPrice(renewalPrice)
@@ -258,9 +258,9 @@ public final class DomainTransferApproveFlow implements TransactionalFlow {
                     .orElseGet(ImmutableSet::of))
             .setLastEppUpdateTime(now)
             .setLastEppUpdateRegistrarId(registrarId)
-            // Even if the existing domain had a package token, that package token should be removed
+            // Even if the existing domain had a bulk token, that bulk token should be removed
             // on transfer
-            .setCurrentPackageToken(null)
+            .setCurrentBulkToken(null)
             .build();
 
     Tld tld = Tld.get(existingDomain.getTld());

core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java

@@ -37,7 +37,7 @@ import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.billing.BillingRecurrence;
 import google.registry.model.domain.Domain;
@@ -74,7 +74,7 @@ import org.joda.time.DateTime;
  * @error {@link DomainFlowUtils.NotAuthorizedForTldException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_TRANSFER_CANCEL)
-public final class DomainTransferCancelFlow implements TransactionalFlow {
+public final class DomainTransferCancelFlow implements MutatingFlow {
 
   @Inject ExtensionManager extensionManager;
   @Inject Optional<AuthInfo> authInfo;

core/src/main/java/google/registry/flows/domain/DomainTransferQueryFlow.java

@@ -21,10 +21,10 @@ import static google.registry.flows.domain.DomainTransferUtils.createTransferRes
 
 import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
-import google.registry.flows.Flow;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.TargetId;
 import google.registry.flows.ResourceFlowUtils;
+import google.registry.flows.TransactionalFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.exceptions.NoTransferHistoryToQueryException;
 import google.registry.flows.exceptions.NotAuthorizedToViewTransferException;
@@ -56,7 +56,7 @@ import org.joda.time.DateTime;
  * @error {@link google.registry.flows.exceptions.NotAuthorizedToViewTransferException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_TRANSFER_QUERY)
-public final class DomainTransferQueryFlow implements Flow {
+public final class DomainTransferQueryFlow implements TransactionalFlow {
 
   @Inject ExtensionManager extensionManager;
   @Inject Optional<AuthInfo> authInfo;

core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java

@@ -39,7 +39,7 @@ import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.model.billing.BillingRecurrence;
 import google.registry.model.domain.Domain;
@@ -76,7 +76,7 @@ import org.joda.time.DateTime;
  * @error {@link DomainFlowUtils.NotAuthorizedForTldException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_TRANSFER_REJECT)
-public final class DomainTransferRejectFlow implements TransactionalFlow {
+public final class DomainTransferRejectFlow implements MutatingFlow {
 
   @Inject ExtensionManager extensionManager;
   @Inject Optional<AuthInfo> authInfo;

core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java

@@ -45,7 +45,7 @@ import google.registry.flows.ExtensionManager;
 import google.registry.flows.FlowModule.RegistrarId;
 import google.registry.flows.FlowModule.Superuser;
 import google.registry.flows.FlowModule.TargetId;
-import google.registry.flows.TransactionalFlow;
+import google.registry.flows.MutatingFlow;
 import google.registry.flows.annotations.ReportingSpec;
 import google.registry.flows.domain.token.AllocationTokenFlowUtils;
 import google.registry.flows.exceptions.AlreadyPendingTransferException;
@@ -135,7 +135,7 @@ import org.joda.time.DateTime;
  *     google.registry.flows.domain.token.AllocationTokenFlowUtils.AlreadyRedeemedAllocationTokenException}
  */
 @ReportingSpec(ActivityReportField.DOMAIN_TRANSFER_REQUEST)
-public final class DomainTransferRequestFlow implements TransactionalFlow {
+public final class DomainTransferRequestFlow implements MutatingFlow {
 
   private static final ImmutableSet<StatusValue> DISALLOWED_STATUSES = ImmutableSet.of(
       StatusValue.CLIENT_TRANSFER_PROHIBITED,
@@ -201,11 +201,12 @@ public final class DomainTransferRequestFlow implements TransactionalFlow {
     Optional<FeesAndCredits> feesAndCredits;
     if (period.getValue() == 0) {
       feesAndCredits = Optional.empty();
-    } else if (!existingDomain.getCurrentPackageToken().isPresent()) {
+    } else if (!existingDomain.getCurrentBulkToken().isPresent()) {
       feesAndCredits =
           Optional.of(pricingLogic.getTransferPrice(tld, targetId, now, existingBillingRecurrence));
     } else {
-      // If existing domain is in a package, calculate the transfer price with default renewal price
+      // If existing domain is in a bulk pricing package, calculate the transfer price with default
+      // renewal price
       // behavior
       feesAndCredits =
           period.getValue() == 0