From e10cc4e4d9925ddd2eb1fce722f0884bd415f084 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 26 Nov 2022 10:51:50 -0500
Subject: [PATCH] dev/core#3965 Add Mailng Events to APIv4

---
 CRM/Mailing/DAO/Mailing.php                   |  9 +++++++-
 CRM/Mailing/DAO/MailingJob.php                | 14 +++++++++--
 CRM/Mailing/Event/DAO/MailingEventBounce.php  | 19 +++++++++++----
 .../Event/DAO/MailingEventClickThrough.php    |  5 ++--
 CRM/Mailing/Event/DAO/MailingEventConfirm.php |  5 ++--
 .../Event/DAO/MailingEventDelivered.php       |  7 +++---
 CRM/Mailing/Event/DAO/MailingEventForward.php |  7 +++---
 CRM/Mailing/Event/DAO/MailingEventOpened.php  |  7 +++---
 CRM/Mailing/Event/DAO/MailingEventQueue.php   | 20 ++++++++++++----
 CRM/Mailing/Event/DAO/MailingEventReply.php   |  7 +++---
 .../Event/DAO/MailingEventSubscribe.php       |  5 ++--
 .../Event/DAO/MailingEventUnsubscribe.php     |  7 +++---
 Civi/Api4/MailingEventBounce.php              | 23 +++++++++++++++++++
 Civi/Api4/MailingEventConfirm.php             | 23 +++++++++++++++++++
 Civi/Api4/MailingEventOpened.php              | 23 +++++++++++++++++++
 Civi/Api4/MailingEventQueue.php               | 23 +++++++++++++++++++
 Civi/Api4/MailingEventSubscribe.php           | 23 +++++++++++++++++++
 Civi/Api4/MailingEventUnsubscribe.php         | 23 +++++++++++++++++++
 Civi/Api4/MailingJob.php                      |  6 +----
 .../Mailing/Event/MailingEventBounce.xml      | 10 ++++----
 .../Event/MailingEventClickThrough.xml        |  3 ++-
 .../Mailing/Event/MailingEventConfirm.xml     |  4 ++--
 .../Mailing/Event/MailingEventDelivered.xml   |  7 +++---
 .../Mailing/Event/MailingEventForward.xml     |  7 +++---
 .../Mailing/Event/MailingEventOpened.xml      |  7 +++---
 .../Mailing/Event/MailingEventQueue.xml       |  9 ++++----
 .../Mailing/Event/MailingEventReply.xml       |  4 +++-
 .../Mailing/Event/MailingEventSubscribe.xml   |  2 ++
 .../Mailing/Event/MailingEventUnsubscribe.xml |  4 +++-
 xml/schema/Mailing/Mailing.xml                |  1 +
 xml/schema/Mailing/MailingJob.xml             |  3 +++
 31 files changed, 257 insertions(+), 60 deletions(-)
 create mode 100644 Civi/Api4/MailingEventBounce.php
 create mode 100644 Civi/Api4/MailingEventConfirm.php
 create mode 100644 Civi/Api4/MailingEventOpened.php
 create mode 100644 Civi/Api4/MailingEventQueue.php
 create mode 100644 Civi/Api4/MailingEventSubscribe.php
 create mode 100644 Civi/Api4/MailingEventUnsubscribe.php

diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php
index bd1efb12c5..2545211b60 100644
--- a/CRM/Mailing/DAO/Mailing.php
+++ b/CRM/Mailing/DAO/Mailing.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Mailing.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4e9b6cb841d8377bdf34fa039aa93ef6)
+ * (GenCodeChecksum:13cad136a69b399a6df4d54a5239bafd)
  */
 
 /**
@@ -31,6 +31,13 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
    */
   public static $_icon = 'fa-envelope-o';
 
+  /**
+   * Field to show when displaying a record.
+   *
+   * @var string
+   */
+  public static $_labelField = 'name';
+
   /**
    * Should CiviCRM log any modifications to this table in the civicrm_log table.
    *
diff --git a/CRM/Mailing/DAO/MailingJob.php b/CRM/Mailing/DAO/MailingJob.php
index d4e4418bd7..ffedad169c 100644
--- a/CRM/Mailing/DAO/MailingJob.php
+++ b/CRM/Mailing/DAO/MailingJob.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingJob.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fe545f125a882f22fb95372d5638a0f6)
+ * (GenCodeChecksum:d26651120224f019936fd62a44626441)
  */
 
 /**
@@ -143,7 +143,16 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Mailing Jobs') : ts('Mailing Job');
+    return $plural ? ts('Outbound Mailings') : ts('Outbound Mailing');
+  }
+
+  /**
+   * Returns user-friendly description of this entity.
+   *
+   * @return string
+   */
+  public static function getEntityDescription() {
+    return ts('Attempted delivery of a mailing.');
   }
 
   /**
@@ -182,6 +191,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
diff --git a/CRM/Mailing/Event/DAO/MailingEventBounce.php b/CRM/Mailing/Event/DAO/MailingEventBounce.php
index 6c047e00ac..46b40553ed 100644
--- a/CRM/Mailing/Event/DAO/MailingEventBounce.php
+++ b/CRM/Mailing/Event/DAO/MailingEventBounce.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventBounce.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e892eb5ad25bcc8b3892c384e2c2d1bd)
+ * (GenCodeChecksum:87faf01b97e5e2330d938880f59f5cf9)
  */
 
 /**
@@ -89,7 +89,16 @@ class CRM_Mailing_Event_DAO_MailingEventBounce extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Mailing Bounce Events') : ts('Mailing Bounce Event');
+    return $plural ? ts('Mailing Bounces') : ts('Mailing Bounce');
+  }
+
+  /**
+   * Returns user-friendly description of this entity.
+   *
+   * @return string
+   */
+  public static function getEntityDescription() {
+    return ts('Mailings that failed to reach the inbox of the recipient.');
   }
 
   /**
@@ -127,6 +136,7 @@ class CRM_Mailing_Event_DAO_MailingEventBounce extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
@@ -144,14 +154,14 @@ class CRM_Mailing_Event_DAO_MailingEventBounce extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Mailing_Event_DAO_MailingEventQueue',
           'html' => [
-            'label' => ts("Event Queue"),
+            'label' => ts("Recipient"),
           ],
           'add' => NULL,
         ],
         'bounce_type_id' => [
           'name' => 'bounce_type_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Bounce Type'),
+          'title' => ts('Bounce Type ID'),
           'description' => ts('What type of bounce was it?'),
           'where' => 'civicrm_mailing_event_bounce.bounce_type_id',
           'table_name' => 'civicrm_mailing_event_bounce',
@@ -160,6 +170,7 @@ class CRM_Mailing_Event_DAO_MailingEventBounce extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Select',
+            'label' => ts("Bounce Type"),
           ],
           'pseudoconstant' => [
             'table' => 'civicrm_mailing_bounce_type',
diff --git a/CRM/Mailing/Event/DAO/MailingEventClickThrough.php b/CRM/Mailing/Event/DAO/MailingEventClickThrough.php
index 85924ab9b4..3e7c1a73cc 100644
--- a/CRM/Mailing/Event/DAO/MailingEventClickThrough.php
+++ b/CRM/Mailing/Event/DAO/MailingEventClickThrough.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventClickThrough.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6aa7c66f684766bc1433c773998e4922)
+ * (GenCodeChecksum:ae4ae010b4a8e988ee7ba1deaaa20497)
  */
 
 /**
@@ -119,6 +119,7 @@ class CRM_Mailing_Event_DAO_MailingEventClickThrough extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
@@ -136,7 +137,7 @@ class CRM_Mailing_Event_DAO_MailingEventClickThrough extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Mailing_Event_DAO_MailingEventQueue',
           'html' => [
-            'label' => ts("Event Queue"),
+            'label' => ts("Recipient"),
           ],
           'add' => NULL,
         ],
diff --git a/CRM/Mailing/Event/DAO/MailingEventConfirm.php b/CRM/Mailing/Event/DAO/MailingEventConfirm.php
index 2b38a3aec4..26ee2df59a 100644
--- a/CRM/Mailing/Event/DAO/MailingEventConfirm.php
+++ b/CRM/Mailing/Event/DAO/MailingEventConfirm.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventConfirm.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:eece915d123df884f271fa46d49e6bc3)
+ * (GenCodeChecksum:1010da753b182ef9d13074309a165d5b)
  */
 
 /**
@@ -71,7 +71,7 @@ class CRM_Mailing_Event_DAO_MailingEventConfirm extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Mailing Contribution Events') : ts('Mailing Confirmation Event');
+    return $plural ? ts('Mailing Opt-In Confirmations') : ts('Mailing Opt-In Confirmation');
   }
 
   /**
@@ -109,6 +109,7 @@ class CRM_Mailing_Event_DAO_MailingEventConfirm extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
diff --git a/CRM/Mailing/Event/DAO/MailingEventDelivered.php b/CRM/Mailing/Event/DAO/MailingEventDelivered.php
index 2db98cbe73..990e06bde1 100644
--- a/CRM/Mailing/Event/DAO/MailingEventDelivered.php
+++ b/CRM/Mailing/Event/DAO/MailingEventDelivered.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventDelivered.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c05c0c158fb8ac1d9c93455498177e4f)
+ * (GenCodeChecksum:f0ba3fb4021c36006b5d70108daf975d)
  */
 
 /**
@@ -71,7 +71,7 @@ class CRM_Mailing_Event_DAO_MailingEventDelivered extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Mailing Delivery Events') : ts('Mailing Delivery Event');
+    return $plural ? ts('Mailing Deliveries') : ts('Mailing Delivery');
   }
 
   /**
@@ -109,6 +109,7 @@ class CRM_Mailing_Event_DAO_MailingEventDelivered extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
@@ -126,7 +127,7 @@ class CRM_Mailing_Event_DAO_MailingEventDelivered extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Mailing_Event_DAO_MailingEventQueue',
           'html' => [
-            'label' => ts("Event Queue"),
+            'label' => ts("Recipient"),
           ],
           'add' => NULL,
         ],
diff --git a/CRM/Mailing/Event/DAO/MailingEventForward.php b/CRM/Mailing/Event/DAO/MailingEventForward.php
index d90dfce179..ef24c6a6d4 100644
--- a/CRM/Mailing/Event/DAO/MailingEventForward.php
+++ b/CRM/Mailing/Event/DAO/MailingEventForward.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventForward.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:29af21b57af0d81d61fdb0af7e954b1b)
+ * (GenCodeChecksum:5b597c882095d9552d1fa79c3a178ab9)
  */
 
 /**
@@ -80,7 +80,7 @@ class CRM_Mailing_Event_DAO_MailingEventForward extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Mailing Forwarded Events') : ts('Mailing Forwarded Event');
+    return $plural ? ts('Mailing Forwards') : ts('Mailing Forward');
   }
 
   /**
@@ -119,6 +119,7 @@ class CRM_Mailing_Event_DAO_MailingEventForward extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
@@ -136,7 +137,7 @@ class CRM_Mailing_Event_DAO_MailingEventForward extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Mailing_Event_DAO_MailingEventQueue',
           'html' => [
-            'label' => ts("Event Queue"),
+            'label' => ts("Recipient"),
           ],
           'add' => NULL,
         ],
diff --git a/CRM/Mailing/Event/DAO/MailingEventOpened.php b/CRM/Mailing/Event/DAO/MailingEventOpened.php
index a89bc2e7cf..4414a43b9a 100644
--- a/CRM/Mailing/Event/DAO/MailingEventOpened.php
+++ b/CRM/Mailing/Event/DAO/MailingEventOpened.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventOpened.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c3830c170628fb5501b0bba9d53137e7)
+ * (GenCodeChecksum:0a8097cec7e3dbd5c0ca4e2fd7748fe4)
  */
 
 /**
@@ -71,7 +71,7 @@ class CRM_Mailing_Event_DAO_MailingEventOpened extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Mailing Opened Events') : ts('Mailing Opened Event');
+    return $plural ? ts('Mailings Opened') : ts('Mailing Opened');
   }
 
   /**
@@ -109,6 +109,7 @@ class CRM_Mailing_Event_DAO_MailingEventOpened extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
@@ -126,7 +127,7 @@ class CRM_Mailing_Event_DAO_MailingEventOpened extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Mailing_Event_DAO_MailingEventQueue',
           'html' => [
-            'label' => ts("Event Queue"),
+            'label' => ts("Recipient"),
           ],
           'add' => NULL,
         ],
diff --git a/CRM/Mailing/Event/DAO/MailingEventQueue.php b/CRM/Mailing/Event/DAO/MailingEventQueue.php
index b27a9a03e5..3079ff620b 100644
--- a/CRM/Mailing/Event/DAO/MailingEventQueue.php
+++ b/CRM/Mailing/Event/DAO/MailingEventQueue.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventQueue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fccd9d89912c517ab2384872399b82d4)
+ * (GenCodeChecksum:7d90419e2a81c33d1c420b935fa72621)
  */
 
 /**
@@ -39,7 +39,7 @@ class CRM_Mailing_Event_DAO_MailingEventQueue extends CRM_Core_DAO {
   public $id;
 
   /**
-   * FK to Job
+   * Mailing Job
    *
    * @var int|string
    *   (SQL type: int unsigned)
@@ -98,7 +98,16 @@ class CRM_Mailing_Event_DAO_MailingEventQueue extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Mailing Queue Events') : ts('Mailing Queue Event');
+    return $plural ? ts('Mailing Recipients') : ts('Mailing Recipient');
+  }
+
+  /**
+   * Returns user-friendly description of this entity.
+   *
+   * @return string
+   */
+  public static function getEntityDescription() {
+    return ts('Intended recipients of a mailing.');
   }
 
   /**
@@ -139,6 +148,7 @@ class CRM_Mailing_Event_DAO_MailingEventQueue extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
@@ -147,7 +157,7 @@ class CRM_Mailing_Event_DAO_MailingEventQueue extends CRM_Core_DAO {
           'name' => 'job_id',
           'type' => CRM_Utils_Type::T_INT,
           'title' => ts('Job ID'),
-          'description' => ts('FK to Job'),
+          'description' => ts('Mailing Job'),
           'required' => TRUE,
           'where' => 'civicrm_mailing_event_queue.job_id',
           'table_name' => 'civicrm_mailing_event_queue',
@@ -156,7 +166,7 @@ class CRM_Mailing_Event_DAO_MailingEventQueue extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Mailing_DAO_MailingJob',
           'html' => [
-            'label' => ts("Job"),
+            'label' => ts("Outbound Mailing"),
           ],
           'add' => NULL,
         ],
diff --git a/CRM/Mailing/Event/DAO/MailingEventReply.php b/CRM/Mailing/Event/DAO/MailingEventReply.php
index 9499249a52..a4e9de852d 100644
--- a/CRM/Mailing/Event/DAO/MailingEventReply.php
+++ b/CRM/Mailing/Event/DAO/MailingEventReply.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventReply.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a52320591b0ee787cfa5b39fb6249f12)
+ * (GenCodeChecksum:0b96aff101cae7ec818922a30da1671d)
  */
 
 /**
@@ -71,7 +71,7 @@ class CRM_Mailing_Event_DAO_MailingEventReply extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Mailing Event Replies') : ts('Mailing Event Reply');
+    return $plural ? ts('Mailing Replies') : ts('Mailing Reply');
   }
 
   /**
@@ -109,6 +109,7 @@ class CRM_Mailing_Event_DAO_MailingEventReply extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
@@ -126,7 +127,7 @@ class CRM_Mailing_Event_DAO_MailingEventReply extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Mailing_Event_DAO_MailingEventQueue',
           'html' => [
-            'label' => ts("Event Queue"),
+            'label' => ts("Recipient"),
           ],
           'add' => NULL,
         ],
diff --git a/CRM/Mailing/Event/DAO/MailingEventSubscribe.php b/CRM/Mailing/Event/DAO/MailingEventSubscribe.php
index f2b36a317a..8db99dc8cb 100644
--- a/CRM/Mailing/Event/DAO/MailingEventSubscribe.php
+++ b/CRM/Mailing/Event/DAO/MailingEventSubscribe.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventSubscribe.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2ccee5579635e00491dba9ffce8c5b74)
+ * (GenCodeChecksum:b3e466587c1eef86822a99252e693773)
  */
 
 /**
@@ -89,7 +89,7 @@ class CRM_Mailing_Event_DAO_MailingEventSubscribe extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Mailing Event Subscribes') : ts('Mailing Event Subscribe');
+    return $plural ? ts('Mailing Opt-Ins') : ts('Mailing Opt-In');
   }
 
   /**
@@ -128,6 +128,7 @@ class CRM_Mailing_Event_DAO_MailingEventSubscribe extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
diff --git a/CRM/Mailing/Event/DAO/MailingEventUnsubscribe.php b/CRM/Mailing/Event/DAO/MailingEventUnsubscribe.php
index d1d9c48652..87176a200c 100644
--- a/CRM/Mailing/Event/DAO/MailingEventUnsubscribe.php
+++ b/CRM/Mailing/Event/DAO/MailingEventUnsubscribe.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventUnsubscribe.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c71207752b44edd0d2e855384a956138)
+ * (GenCodeChecksum:d77759d3365fa86ab182b4b096ce15e0)
  */
 
 /**
@@ -80,7 +80,7 @@ class CRM_Mailing_Event_DAO_MailingEventUnsubscribe extends CRM_Core_DAO {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('Mailing Event Unsubscribes') : ts('Mailing Event Unsubscribe');
+    return $plural ? ts('Mailing Unsubscribes') : ts('Mailing Unsubscribe');
   }
 
   /**
@@ -118,6 +118,7 @@ class CRM_Mailing_Event_DAO_MailingEventUnsubscribe extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Number',
+            'label' => ts("ID"),
           ],
           'readonly' => TRUE,
           'add' => NULL,
@@ -135,7 +136,7 @@ class CRM_Mailing_Event_DAO_MailingEventUnsubscribe extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Mailing_Event_DAO_MailingEventQueue',
           'html' => [
-            'label' => ts("Event Queue"),
+            'label' => ts("Recipient"),
           ],
           'add' => NULL,
         ],
diff --git a/Civi/Api4/MailingEventBounce.php b/Civi/Api4/MailingEventBounce.php
new file mode 100644
index 0000000000..960d5d56dd
--- /dev/null
+++ b/Civi/Api4/MailingEventBounce.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\Api4;
+
+/**
+ * Mailings that failed to reach the inbox of the recipient
+ *
+ * @see \Civi\Api4\Mailing
+ * @since 5.57
+ * @package Civi\Api4
+ */
+class MailingEventBounce extends Generic\DAOEntity {
+  use Generic\Traits\ReadOnlyEntity;
+
+}
diff --git a/Civi/Api4/MailingEventConfirm.php b/Civi/Api4/MailingEventConfirm.php
new file mode 100644
index 0000000000..5b28bcc527
--- /dev/null
+++ b/Civi/Api4/MailingEventConfirm.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\Api4;
+
+/**
+ * Handles double-opt-in confirmations to mailing group subscriptions.
+ *
+ * @see \Civi\Api4\Mailing
+ * @since 5.57
+ * @package Civi\Api4
+ */
+class MailingEventConfirm extends Generic\DAOEntity {
+  use \Civi\Api4\Generic\Traits\ReadOnlyEntity;
+
+}
diff --git a/Civi/Api4/MailingEventOpened.php b/Civi/Api4/MailingEventOpened.php
new file mode 100644
index 0000000000..b05dcfd444
--- /dev/null
+++ b/Civi/Api4/MailingEventOpened.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\Api4;
+
+/**
+ * Tracks users who have opened sent mailings.
+ *
+ * @see \Civi\Api4\Mailing
+ * @since 5.57
+ * @package Civi\Api4
+ */
+class MailingEventOpened extends Generic\DAOEntity {
+  use \Civi\Api4\Generic\Traits\ReadOnlyEntity;
+
+}
diff --git a/Civi/Api4/MailingEventQueue.php b/Civi/Api4/MailingEventQueue.php
new file mode 100644
index 0000000000..a9b846bb36
--- /dev/null
+++ b/Civi/Api4/MailingEventQueue.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\Api4;
+
+/**
+ * Joins mailing jobs to mailing events
+ *
+ * @see \Civi\Api4\Mailing
+ * @since 5.57
+ * @package Civi\Api4
+ */
+class MailingEventQueue extends Generic\DAOEntity {
+  use Generic\Traits\ReadOnlyEntity;
+
+}
diff --git a/Civi/Api4/MailingEventSubscribe.php b/Civi/Api4/MailingEventSubscribe.php
new file mode 100644
index 0000000000..da1b2992eb
--- /dev/null
+++ b/Civi/Api4/MailingEventSubscribe.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\Api4;
+
+/**
+ * Subscriptions to mailing groups.
+ *
+ * @see \Civi\Api4\Mailing
+ * @since 5.57
+ * @package Civi\Api4
+ */
+class MailingEventSubscribe extends Generic\DAOEntity {
+  use \Civi\Api4\Generic\Traits\ReadOnlyEntity;
+
+}
diff --git a/Civi/Api4/MailingEventUnsubscribe.php b/Civi/Api4/MailingEventUnsubscribe.php
new file mode 100644
index 0000000000..3b3f08dada
--- /dev/null
+++ b/Civi/Api4/MailingEventUnsubscribe.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+namespace Civi\Api4;
+
+/**
+ * Opt-outs from mailing group subscriptions.
+ *
+ * @see \Civi\Api4\Mailing
+ * @since 5.57
+ * @package Civi\Api4
+ */
+class MailingEventUnsubscribe extends Generic\DAOEntity {
+  use \Civi\Api4\Generic\Traits\ReadOnlyEntity;
+
+}
diff --git a/Civi/Api4/MailingJob.php b/Civi/Api4/MailingJob.php
index cf187a8ed2..53c7b03a38 100644
--- a/Civi/Api4/MailingJob.php
+++ b/Civi/Api4/MailingJob.php
@@ -10,20 +10,16 @@
  */
 namespace Civi\Api4;
 
-use Civi\Api4\Generic\Traits\ReadOnlyEntity;
-
 /**
  * Mailing job.
  *
  * Mailing job tracks the batching of CiviMails.
  *
- * @searchable none
- *
  * @see https://docs.civicrm.org/user/en/latest/email/what-is-civimail/
  * @since 5.48
  * @package Civi\Api4
  */
 class MailingJob extends Generic\DAOEntity {
-  use ReadOnlyEntity;
+  use Generic\Traits\ReadOnlyEntity;
 
 }
diff --git a/xml/schema/Mailing/Event/MailingEventBounce.xml b/xml/schema/Mailing/Event/MailingEventBounce.xml
index f71cd47953..16855c9275 100644
--- a/xml/schema/Mailing/Event/MailingEventBounce.xml
+++ b/xml/schema/Mailing/Event/MailingEventBounce.xml
@@ -7,14 +7,15 @@
   <comment>Tracks when and why an email bounced.</comment>
   <archive>true</archive>
   <component>CiviMail</component>
-  <title>Mailing Bounce Event</title>
-  <titlePlural>Mailing Bounce Events</titlePlural>
+  <title>Mailing Bounce</title>
+  <description>Mailings that failed to reach the inbox of the recipient.</description>
   <field>
     <name>id</name>
     <title>Bounce ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
@@ -29,7 +30,7 @@
     <required>true</required>
     <comment>FK to EventQueue</comment>
     <html>
-      <label>Event Queue</label>
+      <label>Recipient</label>
     </html>
   </field>
   <foreignKey>
@@ -40,7 +41,7 @@
   </foreignKey>
   <field>
     <name>bounce_type_id</name>
-    <title>Bounce Type</title>
+    <title>Bounce Type ID</title>
     <type>int unsigned</type>
     <comment>What type of bounce was it?</comment>
     <pseudoconstant>
@@ -49,6 +50,7 @@
       <labelColumn>name</labelColumn>
     </pseudoconstant>
     <html>
+      <label>Bounce Type</label>
       <type>Select</type>
     </html>
   </field>
diff --git a/xml/schema/Mailing/Event/MailingEventClickThrough.xml b/xml/schema/Mailing/Event/MailingEventClickThrough.xml
index 54721f4f96..448c4da1b0 100644
--- a/xml/schema/Mailing/Event/MailingEventClickThrough.xml
+++ b/xml/schema/Mailing/Event/MailingEventClickThrough.xml
@@ -13,6 +13,7 @@
     <type>int unsigned</type>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
@@ -27,7 +28,7 @@
     <required>true</required>
     <comment>FK to EventQueue</comment>
     <html>
-      <label>Event Queue</label>
+      <label>Recipient</label>
     </html>
   </field>
   <foreignKey>
diff --git a/xml/schema/Mailing/Event/MailingEventConfirm.xml b/xml/schema/Mailing/Event/MailingEventConfirm.xml
index 7e12d7eee3..5df2807d5e 100644
--- a/xml/schema/Mailing/Event/MailingEventConfirm.xml
+++ b/xml/schema/Mailing/Event/MailingEventConfirm.xml
@@ -7,14 +7,14 @@
   <comment>Tracks when a subscription event is confirmed by email</comment>
   <archive>true</archive>
   <component>CiviMail</component>
-  <title>Mailing Confirmation Event</title>
-  <titlePlural>Mailing Contribution Events</titlePlural>
+  <title>Mailing Opt-In Confirmation</title>
   <field>
     <name>id</name>
     <title>Mailing Confirmation ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
diff --git a/xml/schema/Mailing/Event/MailingEventDelivered.xml b/xml/schema/Mailing/Event/MailingEventDelivered.xml
index 9993110d8d..09000d4199 100644
--- a/xml/schema/Mailing/Event/MailingEventDelivered.xml
+++ b/xml/schema/Mailing/Event/MailingEventDelivered.xml
@@ -7,14 +7,15 @@
   <comment>Tracks when a queued email is actually delivered to the MTA</comment>
   <archive>true</archive>
   <component>CiviMail</component>
-  <title>Mailing Delivery Event</title>
-  <titlePlural>Mailing Delivery Events</titlePlural>
+  <title>Mailing Delivery</title>
+  <titlePlural>Mailing Deliveries</titlePlural>
   <field>
     <name>id</name>
     <title>Delivered ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
@@ -29,7 +30,7 @@
     <required>true</required>
     <comment>FK to EventQueue</comment>
     <html>
-      <label>Event Queue</label>
+      <label>Recipient</label>
     </html>
   </field>
   <foreignKey>
diff --git a/xml/schema/Mailing/Event/MailingEventForward.xml b/xml/schema/Mailing/Event/MailingEventForward.xml
index 6afbd4b956..b4e17a45ee 100644
--- a/xml/schema/Mailing/Event/MailingEventForward.xml
+++ b/xml/schema/Mailing/Event/MailingEventForward.xml
@@ -7,14 +7,15 @@
   <comment>Tracks when a contact forwards a mailing to a (new) contact</comment>
   <archive>true</archive>
   <component>CiviMail</component>
-  <title>Mailing Forwarded Event</title>
-  <titlePlural>Mailing Forwarded Events</titlePlural>
+  <title>Mailing Forward</title>
+  <titlePlural>Mailing Forwards</titlePlural>
   <field>
     <name>id</name>
     <title>Forward ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
@@ -29,7 +30,7 @@
     <required>true</required>
     <comment>FK to EventQueue</comment>
     <html>
-      <label>Event Queue</label>
+      <label>Recipient</label>
     </html>
   </field>
   <foreignKey>
diff --git a/xml/schema/Mailing/Event/MailingEventOpened.xml b/xml/schema/Mailing/Event/MailingEventOpened.xml
index 96b722c84b..40819837ae 100644
--- a/xml/schema/Mailing/Event/MailingEventOpened.xml
+++ b/xml/schema/Mailing/Event/MailingEventOpened.xml
@@ -7,14 +7,15 @@
   <comment>Tracks when a delivered email is opened by the recipient</comment>
   <archive>true</archive>
   <component>CiviMail</component>
-  <title>Mailing Opened Event</title>
-  <titlePlural>Mailing Opened Events</titlePlural>
+  <title>Mailing Opened</title>
+  <titlePlural>Mailings Opened</titlePlural>
   <field>
     <name>id</name>
     <title>Mailing Opened ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
@@ -29,7 +30,7 @@
     <required>true</required>
     <comment>FK to EventQueue</comment>
     <html>
-      <label>Event Queue</label>
+      <label>Recipient</label>
     </html>
   </field>
   <foreignKey>
diff --git a/xml/schema/Mailing/Event/MailingEventQueue.xml b/xml/schema/Mailing/Event/MailingEventQueue.xml
index 762cca8cca..c11349fece 100644
--- a/xml/schema/Mailing/Event/MailingEventQueue.xml
+++ b/xml/schema/Mailing/Event/MailingEventQueue.xml
@@ -8,14 +8,15 @@
   <comment>A collection of all intended recipients of a job</comment>
   <archive>true</archive>
   <component>CiviMail</component>
-  <title>Mailing Queue Event</title>
-  <titlePlural>Mailing Queue Events</titlePlural>
+  <title>Mailing Recipient</title>
+  <description>Intended recipients of a mailing.</description>
   <field>
     <name>id</name>
     <type>int unsigned</type>
     <title>Mailing Event Queue ID</title>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
@@ -28,9 +29,9 @@
     <type>int unsigned</type>
     <required>true</required>
     <title>Job ID</title>
-    <comment>FK to Job</comment>
+    <comment>Mailing Job</comment>
     <html>
-      <label>Job</label>
+      <label>Outbound Mailing</label>
     </html>
   </field>
   <foreignKey>
diff --git a/xml/schema/Mailing/Event/MailingEventReply.xml b/xml/schema/Mailing/Event/MailingEventReply.xml
index fac5cce5c4..77a00969ee 100644
--- a/xml/schema/Mailing/Event/MailingEventReply.xml
+++ b/xml/schema/Mailing/Event/MailingEventReply.xml
@@ -7,12 +7,14 @@
   <comment>Tracks when a contact replies to a mailing</comment>
   <archive>true</archive>
   <component>CiviMail</component>
+  <title>Mailing Reply</title>
   <field>
     <name>id</name>
     <title>Reply ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
@@ -27,7 +29,7 @@
     <required>true</required>
     <comment>FK to EventQueue</comment>
     <html>
-      <label>Event Queue</label>
+      <label>Recipient</label>
     </html>
   </field>
   <foreignKey>
diff --git a/xml/schema/Mailing/Event/MailingEventSubscribe.xml b/xml/schema/Mailing/Event/MailingEventSubscribe.xml
index 80422205be..62f87f843e 100644
--- a/xml/schema/Mailing/Event/MailingEventSubscribe.xml
+++ b/xml/schema/Mailing/Event/MailingEventSubscribe.xml
@@ -7,12 +7,14 @@
   <comment>Tracks when a (new) contact subscribes to a group by email</comment>
   <archive>true</archive>
   <component>CiviMail</component>
+  <title>Mailing Opt-In</title>
   <field>
     <name>id</name>
     <title>Mailing Subscribe ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
diff --git a/xml/schema/Mailing/Event/MailingEventUnsubscribe.xml b/xml/schema/Mailing/Event/MailingEventUnsubscribe.xml
index 3b0d3215af..6a37161380 100644
--- a/xml/schema/Mailing/Event/MailingEventUnsubscribe.xml
+++ b/xml/schema/Mailing/Event/MailingEventUnsubscribe.xml
@@ -7,12 +7,14 @@
   <comment>Tracks when a recipient unsubscribes from a group/domain</comment>
   <archive>true</archive>
   <component>CiviMail</component>
+  <title>Mailing Unsubscribe</title>
   <field>
     <name>id</name>
     <title>Unsubscribe ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
@@ -27,7 +29,7 @@
     <required>true</required>
     <comment>FK to EventQueue</comment>
     <html>
-      <label>Event Queue</label>
+      <label>Recipient</label>
     </html>
   </field>
   <foreignKey>
diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml
index 666cf4e29a..ab5cd6aac4 100644
--- a/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@ -9,6 +9,7 @@
   <archive>true</archive>
   <icon>fa-envelope-o</icon>
   <component>CiviMail</component>
+  <labelField>name</labelField>
   <paths>
     <add>civicrm/a/#/mailing/new</add>
     <update>civicrm/a/#/mailing/[id]</update>
diff --git a/xml/schema/Mailing/MailingJob.xml b/xml/schema/Mailing/MailingJob.xml
index eb728a6aa0..8579589698 100644
--- a/xml/schema/Mailing/MailingJob.xml
+++ b/xml/schema/Mailing/MailingJob.xml
@@ -7,12 +7,15 @@
   <comment>Stores information about the job that executes this mailing</comment>
   <archive>true</archive>
   <component>CiviMail</component>
+  <title>Outbound Mailing</title>
+  <description>Attempted delivery of a mailing.</description>
   <field>
     <name>id</name>
     <title>Mailing Job ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <html>
+      <label>ID</label>
       <type>Number</type>
     </html>
   </field>
-- 
2.25.1