From d99de89034480609b861007ea8388c0163bccc14 Mon Sep 17 00:00:00 2001
From: Bradley Taylor <hello@brad-taylor.co.uk>
Date: Sat, 24 Sep 2022 11:56:57 +0100
Subject: [PATCH] Migrate JobLog page to API4

---
 CRM/Admin/Page/JobLog.php           | 25 +++++++++----------------
 Civi/Api4/JobLog.php                | 23 +++++++++++++++++++++++
 templates/CRM/Admin/Page/JobLog.tpl |  6 +++---
 3 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 Civi/Api4/JobLog.php

diff --git a/CRM/Admin/Page/JobLog.php b/CRM/Admin/Page/JobLog.php
index e31a52558d..c9ba511f85 100644
--- a/CRM/Admin/Page/JobLog.php
+++ b/CRM/Admin/Page/JobLog.php
@@ -75,34 +75,27 @@ class CRM_Admin_Page_JobLog extends CRM_Core_Page_Basic {
   public function browse() {
     $jid = CRM_Utils_Request::retrieve('jid', 'Positive');
 
-    $sj = new CRM_Core_JobManager();
-
     if ($jid) {
       $jobName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Job', $jid);
       $this->assign('jobName', $jobName);
       $jobRunUrl = CRM_Utils_System::url('civicrm/admin/job', 'action=view&reset=1&context=joblog&id=' . $jid);
       $this->assign('jobRunUrl', $jobRunUrl);
     }
+    else {
+      $this->assign('jobName', FALSE);
+      $this->assign('jobRunUrl', FALSE);
+    }
 
-    $dao = new CRM_Core_DAO_JobLog();
-    $dao->orderBy('id desc');
-
-    // limit to last 1000 records
-    $dao->limit(1000);
+    $jobLogsQuery = \Civi\Api4\JobLog::get(FALSE)
+      ->addOrderBy('id', 'DESC')
+      ->setLimit(1000);
 
     if ($jid) {
-      $dao->job_id = $jid;
+      $jobLogsQuery->addWhere('job_id', '=', $jid);
     }
-    $dao->find();
 
-    $rows = [];
-    while ($dao->fetch()) {
-      unset($row);
-      CRM_Core_DAO::storeValues($dao, $row);
-      $rows[$dao->id] = $row;
-    }
+    $rows = $jobLogsQuery->execute()->getArrayCopy();
     $this->assign('rows', $rows);
-
     $this->assign('jobId', $jid);
   }
 
diff --git a/Civi/Api4/JobLog.php b/Civi/Api4/JobLog.php
new file mode 100644
index 0000000000..d495327814
--- /dev/null
+++ b/Civi/Api4/JobLog.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;
+
+/**
+ * JobLog entity.
+ *
+ * @searchable secondary
+ * @since 5.56
+ * @package Civi\Api4
+ */
+class JobLog extends Generic\DAOEntity {
+  use Generic\Traits\ReadOnlyEntity;
+
+}
diff --git a/templates/CRM/Admin/Page/JobLog.tpl b/templates/CRM/Admin/Page/JobLog.tpl
index 41bf07769d..442823f9ac 100644
--- a/templates/CRM/Admin/Page/JobLog.tpl
+++ b/templates/CRM/Admin/Page/JobLog.tpl
@@ -13,13 +13,13 @@
 
 <div class="crm-content-block crm-block">
 
-{if !empty($jobId)}
+{if $jobId}
     <h3>{ts}List of log entries for:{/ts} {$jobName}</h3>
 {/if}
 
   <div class="action-link">
     <a href="{crmURL p='civicrm/admin/job' q="reset=1"}" id="jobsList-top" class="button"><span><i class="crm-i fa-chevron-left" aria-hidden="true"></i> {ts}Back to Scheduled Jobs Listing{/ts}</span></a>
-    {if !empty($jobRunUrl)}
+    {if $jobRunUrl}
       <a href="{$jobRunUrl}" id="jobsList-run-top" class="button"><span><i class="crm-i fa-play" aria-hidden="true"></i> {ts}Execute Now{/ts}</span></a>
     {/if}
   </div>
@@ -63,7 +63,7 @@
 
   <div class="action-link">
     <a href="{crmURL p='civicrm/admin/job' q="reset=1"}" id="jobsList-bottom" class="button"><span><i class="crm-i fa-chevron-left" aria-hidden="true"></i> {ts}Back to Scheduled Jobs Listing{/ts}</span></a>
-    {if !empty($jobRunUrl)}
+    {if $jobRunUrl}
       <a href="{$jobRunUrl}" id="jobsList-run-bottom" class="button"><span><i class="crm-i fa-play" aria-hidden="true"></i> {ts}Execute Now{/ts}</span></a>
     {/if}
   </div>
-- 
2.25.1