Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Dashboard] Display job arguments #1659

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+1,425 −438
Open

[Dashboard] Display job arguments #1659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab22fa4
stash changs on display job arguments
PaulARoy Apr 30, 2020
129b4be
[Dashboard] Adding support for DisplayArgumentsInLists
PaulARoy May 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/css/hangfire.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,24 @@ div.metric-null {
display: none;
}

.ellipsis {
width: 220px;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
cursor: pointer;
}

.ellipsis-wrap {
white-space: nowrap;
}

@media (min-width: 1200px) {
.ellipsis {
width: 420px;
}
}

@media (min-width: 992px) {
#stats {
position: fixed;
Expand Down
9 changes: 9 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/resx/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/resx/Strings.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,4 +517,7 @@
<data name="HomePage_GraphHover_Succeeded" xml:space="preserve">
<value>Completados</value>
</data>
<data name="Arguments" xml:space="preserve">
<value>Argumentos</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/resx/Strings.fa.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,4 +517,7 @@
<data name="HomePage_GraphHover_Succeeded" xml:space="preserve">
<value>موفقیت آمیز</value>
</data>
<data name="Arguments" xml:space="preserve">
<value>استدلال</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/resx/Strings.nl.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,4 +539,7 @@
<data name="ServersPage_Possibly_Aborted" xml:space="preserve">
<value>Mogelijk afgebroken</value>
</data>
<data name="Arguments" xml:space="preserve">
<value>Argumenten</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/resx/Strings.pt-BR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,4 +517,7 @@
<data name="HomePage_GraphHover_Succeeded" xml:space="preserve">
<value>Concluídos</value>
</data>
<data name="Arguments" xml:space="preserve">
<value>Argumentos</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/resx/Strings.pt-PT.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,4 +542,7 @@
<data name="Common_Error" xml:space="preserve">
<value>Erro</value>
</data>
<data name="Arguments" xml:space="preserve">
<value>Argumentos</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/resx/Strings.pt.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,4 +542,7 @@
<data name="Common_Error" xml:space="preserve">
<value>Erro</value>
</data>
<data name="Arguments" xml:space="preserve">
<value>Argumentos</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/resx/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,4 +545,7 @@
<data name="Common_Error" xml:space="preserve">
<value>Error</value>
</data>
<data name="Arguments" xml:space="preserve">
<value>Arguments</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/resx/Strings.zh-TW.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,4 +516,7 @@
<data name="HomePage_GraphHover_Succeeded" xml:space="preserve">
<value>完成</value>
</data>
<data name="Arguments" xml:space="preserve">
<value>論點</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/Hangfire.Core/Dashboard/Content/resx/Strings.zh.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,4 +527,7 @@
<data name="HomePage_GraphHover_Succeeded" xml:space="preserve">
<value>完成</value>
</data>
<data name="Arguments" xml:space="preserve">
<value>论点</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/Hangfire.Core/Dashboard/HtmlHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
using Hangfire.Annotations;
using Hangfire.Dashboard.Pages;
using Hangfire.Dashboard.Resources;
using Newtonsoft.Json;

namespace Hangfire.Dashboard
{
Expand Down Expand Up @@ -107,6 +108,12 @@ public NonEscapedString PerPageSelector([NotNull] Pager pager)
return RenderPartial(new PerPageSelector(pager));
}

public NonEscapedString JobArguments(Job job)
{
var serialized = JsonConvert.SerializeObject(job?.Args, Formatting.Indented);
return Raw($"<a class=\"job-method toggle-ellipsis\">{HtmlEncode(serialized)}</a>");
}

public NonEscapedString RenderPartial(RazorPage partialPage)
{
partialPage.Assign(_page);
Expand Down
14 changes: 12 additions & 2 deletions src/Hangfire.Core/Dashboard/Pages/AwaitingJobsPage.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,15 @@
@if (!IsReadOnly)
{
<th class="min-width">
<input type="checkbox" class="js-jobs-list-select-all"/>
<input type="checkbox" class="js-jobs-list-select-all" />
</th>
}
<th class="min-width">@Strings.Common_Id</th>
<th>@Strings.Common_Job</th>
@if (DashboardOptions.DisplayArgumentsInLists)
{
<th>@Strings.Arguments</th>
}
<th class="min-width">@Strings.AwaitingJobsPage_Table_Options</th>
<th class="min-width">@Strings.AwaitingJobsPage_Table_Parent</th>
<th class="align-right">@Strings.Common_Created</th>
Expand Down Expand Up @@ -118,13 +122,19 @@
</td>
@if (jobData == null)
{
<td colspan="2"><em>@Strings.Common_JobExpired</em></td>
<td colspan="@(DashboardOptions.DisplayArgumentsInLists ? 3 : 2)"><em>@Strings.Common_JobExpired</em></td>
}
else
{
<td class="word-break">
@Html.JobNameLink(jobId, jobData.Job)
</td>
if (DashboardOptions.DisplayArgumentsInLists)
{
<td class="ellipsis ellipsis-wrap">
@Html.JobArguments(jobData.Job)
</td>
}
<td class="min-width">
@if (stateData != null && stateData.Data.ContainsKey("Options") && !String.IsNullOrWhiteSpace(stateData.Data["Options"]))
{
Expand Down