kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add Refresh option for Job Logs

Browse Source
This commit is contained in:
sbwalker 2024-07-17 17:12:24 -04:00
parent d7a290c595
commit 0c80e28754
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Oqtane.Client/Modules/Admin/Jobs/Index.razor
View File

@ -10,9 +10,7 @@
} }
else else
{ {
<ActionLink Action="Log" Class="btn btn-secondary" Text="View Logs" ResourceKey="ViewJobs" /> <button type="button" class="btn btn-secondary" @onclick="Refresh">@Localizer["Refresh.Text"]</button>
<button type="button" class="btn btn-secondary" @onclick="(async () => await Refresh())">@Localizer["Refresh.Text"]</button>
<br />
<br /> <br />
<Pager Items="@_jobs" SearchProperties="Name"> <Pager Items="@_jobs" SearchProperties="Name">
@ -44,21 +42,29 @@ else
</td> </td>
</Row> </Row>
</Pager> </Pager>
<br />
<ActionLink Action="Log" Class="btn btn-secondary" Text="View All Logs" ResourceKey="ViewLogs" />
} }
@code { @code {
private List<Job> _jobs; 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() protected override async Task OnInitializedAsync()
{ {
_jobs = await JobService.GetJobsAsync(); await GetJobs();
if (_jobs.Count == 0) if (_jobs.Count == 0)
{ {
AddModuleMessage(string.Format(Localizer["Message.NoJobs"], NavigateUrl("admin/system")), MessageType.Warning); 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) private string DisplayStatus(bool isEnabled, bool isExecuting)
{ {
@ -146,7 +152,7 @@ else
private async Task Refresh() private async Task Refresh()
{ {
_jobs = await JobService.GetJobsAsync(); await GetJobs();
StateHasChanged(); StateHasChanged();
} }
} }

14
Oqtane.Client/Modules/Admin/Jobs/Log.razor
View File

@ -10,6 +10,9 @@
} }
else else
{ {
<button type="button" class="btn btn-secondary" @onclick="Refresh">@Localizer["Refresh"]</button>
<br /><br />
<Pager Items="@_jobLogs"> <Pager Items="@_jobLogs">
<Header> <Header>
<th>@SharedLocalizer["Name"]</th> <th>@SharedLocalizer["Name"]</th>
@ -35,6 +38,11 @@ else
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{
await GetJobLogs();
}
private async Task GetJobLogs()
{ {
_jobLogs = await JobLogService.GetJobLogsAsync(); _jobLogs = await JobLogService.GetJobLogsAsync();
@ -67,4 +75,10 @@ else
return status; return status;
} }
private async Task Refresh()
{
await GetJobLogs();
StateHasChanged();
}
} }

4
Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx
View File

@ -144,8 +144,8 @@
<data name="Month" xml:space="preserve"> <data name="Month" xml:space="preserve">
<value>Month(s)</value> <value>Month(s)</value>
</data> </data>
<data name="ViewJobs.Text" xml:space="preserve"> <data name="ViewLogs.Text" xml:space="preserve">
<value>View Logs</value> <value>View All Logs</value>
</data> </data>
<data name="Frequency" xml:space="preserve"> <data name="Frequency" xml:space="preserve">
<value>Frequency</value> <value>Frequency</value>

3
Oqtane.Client/Resources/Modules/Admin/Jobs/Log.resx
View File

@ -132,4 +132,7 @@
<data name="Failed" xml:space="preserve"> <data name="Failed" xml:space="preserve">
<value>Failed</value> <value>Failed</value>
</data> </data>
<data name="Refresh" xml:space="preserve">
<value>Refresh</value>
</data>
</root> </root>