Skip to content

C
CAP
Commit a16041cd authored by Savorboard's avatar Savorboard
Browse files
Options

processing pages will contains Scheduled and Enqueued messages.

parent 1d408d09
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 893 additions and 753 deletions
src/DotNetCore.CAP/Dashboard/Pages/PublishedPage.cs
View file @ a16041cd
......@@ -14,11 +14,11 @@ namespace DotNetCore.CAP.Dashboard.Pages
public int GetTotal(IMonitoringApi api)
{
if (string.Compare(StatusName, SucceededState.StateName, StringComparison.OrdinalIgnoreCase) == 0)
if (string.Equals(StatusName, SucceededState.StateName, StringComparison.CurrentCultureIgnoreCase))
{
return api.PublishedSucceededCount();
}
if (string.Compare(StatusName, ProcessingState.StateName, StringComparison.OrdinalIgnoreCase) == 0)
if (string.Equals(StatusName, ProcessingState.StateName, StringComparison.CurrentCultureIgnoreCase))
{
return api.PublishedProcessingCount();
}
......
src/DotNetCore.CAP/Dashboard/Pages/PublishedPage.cshtml
View file @ a16041cd
......@@ -32,7 +32,7 @@
<div class="row">
<div class="col-md-3">
@Html.JobsSidebar(MessageType.Publish)
@Html.MessagesSidebar(MessageType.Publish)
</div>
<div class="col-md-9">
<h1 class="page-header">@Strings.PublishedPage_Title</h1>
......@@ -67,7 +67,7 @@
data-loading-text="@Strings.Common_Enqueueing"
disabled="disabled">
<span class="glyphicon glyphicon-repeat"></span>
@Strings.Common_RequeueJobs
@Strings.Common_RequeueMessages
</button>
@Html.PerPageSelector(pager)
......@@ -83,6 +83,10 @@
<th>@Strings.MessagesPage_Table_Code</th>
<th>@Strings.MessagesPage_Table_Name</th>
<th class="min-width">@Strings.MessagesPage_Table_Retries</th>
@if (string.Equals(StatusName, "Processing", StringComparison.CurrentCultureIgnoreCase))
{
<th>@Strings.MessagesPage_Table_State</th>
}
<th class="align-right">@Strings.MessagesPage_Table_ExpiresAt</th>
</tr>
</thead>
......@@ -102,6 +106,12 @@
<td>
@message.Retries
</td>
@if (string.Equals(StatusName, "Processing", StringComparison.CurrentCultureIgnoreCase))
{
<td>
@message.StatusName
</td>
}
<td class="align-right">
@if (message.ExpiresAt.HasValue)
{
......
src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.cs
View file @ a16041cd
......@@ -14,11 +14,11 @@ namespace DotNetCore.CAP.Dashboard.Pages
public int GetTotal(IMonitoringApi api)
{
if (string.Compare(StatusName, SucceededState.StateName, StringComparison.OrdinalIgnoreCase) == 0)
if (string.Equals(StatusName, SucceededState.StateName, StringComparison.CurrentCultureIgnoreCase))
{
return api.ReceivedSucceededCount();
}
if (string.Compare(StatusName, ProcessingState.StateName, StringComparison.OrdinalIgnoreCase) == 0)
if (string.Equals(StatusName, ProcessingState.StateName, StringComparison.CurrentCultureIgnoreCase))
{
return api.ReceivedProcessingCount();
}
......
src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.cshtml
View file @ a16041cd
......@@ -22,7 +22,7 @@
var queryDto = new MessageQueryDto
{
MessageType = MessageType.Subscribe,
Group =group,
Group = group,
Name = name,
Content = content,
StatusName = StatusName,
......@@ -34,7 +34,7 @@
<div class="row">
<div class="col-md-3">
@Html.JobsSidebar(MessageType.Subscribe)
@Html.MessagesSidebar(MessageType.Subscribe)
</div>
<div class="col-md-9">
<h1 class="page-header">@Strings.ReceivedPage_Title</h1>
......@@ -72,7 +72,7 @@
data-loading-text="@Strings.Common_Enqueueing"
disabled="disabled">
<span class="glyphicon glyphicon-repeat"></span>
@Strings.Common_RequeueJobs
@Strings.Common_ReConsume
</button>
@Html.PerPageSelector(pager)
......@@ -89,6 +89,10 @@
<th>@Strings.MessagesPage_Table_Group</th>
<th>@Strings.MessagesPage_Table_Name</th>
<th class="min-width">@Strings.MessagesPage_Table_Retries</th>
@if (string.Equals(StatusName, "Processing", StringComparison.CurrentCultureIgnoreCase))
{
<th>@Strings.MessagesPage_Table_State</th>
}
<th class="align-right">@Strings.MessagesPage_Table_ExpiresAt</th>
</tr>
</thead>
......@@ -111,6 +115,12 @@
<td>
@message.Retries
</td>
@if (string.Equals(StatusName, "Processing", StringComparison.CurrentCultureIgnoreCase))
{
<td>
@message.StatusName
</td>
}
<td class="align-right">
@if (message.ExpiresAt.HasValue)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment