From 0c80e28754dd2757f3d3009dda44c139127d96b9 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Wed, 17 Jul 2024 17:12:24 -0400
Subject: [PATCH] add Refresh option for Job Logs

---
 Oqtane.Client/Modules/Admin/Jobs/Index.razor  | 22 ++++++++++++-------
 Oqtane.Client/Modules/Admin/Jobs/Log.razor    | 14 ++++++++++++
 .../Resources/Modules/Admin/Jobs/Index.resx   |  4 ++--
 .../Resources/Modules/Admin/Jobs/Log.resx     |  3 +++
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index ce5f2b55..81c36430 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -10,9 +10,7 @@
 }
 else
 {
-    <ActionLink Action="Log" Class="btn btn-secondary" Text="View Logs" ResourceKey="ViewJobs" />
-    <button type="button" class="btn btn-secondary" @onclick="(async () => await Refresh())">@Localizer["Refresh.Text"]</button>
-    <br />
+    <button type="button" class="btn btn-secondary" @onclick="Refresh">@Localizer["Refresh.Text"]</button>
     <br />
 
     <Pager Items="@_jobs" SearchProperties="Name">
@@ -44,21 +42,29 @@ else
             </td>
         </Row>
     </Pager>
+
+    <br />
+    <ActionLink Action="Log" Class="btn btn-secondary" Text="View All Logs" ResourceKey="ViewLogs" />
 }
 
 @code {
     private List<Job> _jobs;
 
-	public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
-    
+    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+
     protected override async Task OnInitializedAsync()
     {
-        _jobs = await JobService.GetJobsAsync();
+        await GetJobs();
         if (_jobs.Count == 0)
         {
             AddModuleMessage(string.Format(Localizer["Message.NoJobs"], NavigateUrl("admin/system")), MessageType.Warning);
         }
-	}
+    }
+
+    private async Task GetJobs()
+    {
+        _jobs = await JobService.GetJobsAsync();
+    }
 
 	private string DisplayStatus(bool isEnabled, bool isExecuting)
 	{
@@ -146,7 +152,7 @@ else
 
     private async Task Refresh()
     {
-        _jobs = await JobService.GetJobsAsync();
+        await GetJobs();
         StateHasChanged();
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor
index 23b605c2..e82ea9ae 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor
@@ -10,6 +10,9 @@
 }
 else
 {
+    <button type="button" class="btn btn-secondary" @onclick="Refresh">@Localizer["Refresh"]</button>
+    <br /><br />
+
     <Pager Items="@_jobLogs">
         <Header>
             <th>@SharedLocalizer["Name"]</th>
@@ -35,6 +38,11 @@ else
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
+    {
+        await GetJobLogs();
+    }
+
+    private async Task GetJobLogs()
     {
         _jobLogs = await JobLogService.GetJobLogsAsync();
 
@@ -67,4 +75,10 @@ else
 
         return status;
     }
+
+    private async Task Refresh()
+    {
+        await GetJobLogs();
+        StateHasChanged();
+    }
 }
diff --git a/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx
index d4c6b52a..60e347c5 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx
@@ -144,8 +144,8 @@
   <data name="Month" xml:space="preserve">
     <value>Month(s)</value>
   </data>
-  <data name="ViewJobs.Text" xml:space="preserve">
-    <value>View Logs</value>
+  <data name="ViewLogs.Text" xml:space="preserve">
+    <value>View All Logs</value>
   </data>
   <data name="Frequency" xml:space="preserve">
     <value>Frequency</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Jobs/Log.resx b/Oqtane.Client/Resources/Modules/Admin/Jobs/Log.resx
index d86eb2c2..91571889 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Jobs/Log.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Jobs/Log.resx
@@ -132,4 +132,7 @@
   <data name="Failed" xml:space="preserve">
     <value>Failed</value>
   </data>
+  <data name="Refresh" xml:space="preserve">
+    <value>Refresh</value>
+  </data>
 </root>
\ No newline at end of file