Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
CAP
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
CAP
Commits
0ffdca79
Commit
0ffdca79
authored
Mar 17, 2019
by
Savorboard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed dashboard query messages bug.
parent
8773ec6e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
IMonitoringApi.InMemory.cs
...DotNetCore.CAP.InMemoryStorage/IMonitoringApi.InMemory.cs
+5
-3
ReceivedPage.cshtml
src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.cshtml
+3
-3
ReceivedPage.generated.cs
src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.generated.cs
+3
-3
No files found.
src/DotNetCore.CAP.InMemoryStorage/IMonitoringApi.InMemory.cs
View file @
0ffdca79
...
@@ -52,7 +52,7 @@ namespace DotNetCore.CAP.InMemoryStorage
...
@@ -52,7 +52,7 @@ namespace DotNetCore.CAP.InMemoryStorage
if
(!
string
.
IsNullOrEmpty
(
queryDto
.
StatusName
))
if
(!
string
.
IsNullOrEmpty
(
queryDto
.
StatusName
))
{
{
expression
=
expression
.
Where
(
x
=>
x
.
StatusName
==
queryDto
.
StatusName
);
expression
=
expression
.
Where
(
x
=>
x
.
StatusName
.
ToLower
()
==
queryDto
.
StatusName
);
}
}
if
(!
string
.
IsNullOrEmpty
(
queryDto
.
Name
))
if
(!
string
.
IsNullOrEmpty
(
queryDto
.
Name
))
...
@@ -85,7 +85,7 @@ namespace DotNetCore.CAP.InMemoryStorage
...
@@ -85,7 +85,7 @@ namespace DotNetCore.CAP.InMemoryStorage
if
(!
string
.
IsNullOrEmpty
(
queryDto
.
StatusName
))
if
(!
string
.
IsNullOrEmpty
(
queryDto
.
StatusName
))
{
{
expression
=
expression
.
Where
(
x
=>
x
.
StatusName
==
queryDto
.
StatusName
);
expression
=
expression
.
Where
(
x
=>
x
.
StatusName
.
ToLower
()
==
queryDto
.
StatusName
);
}
}
if
(!
string
.
IsNullOrEmpty
(
queryDto
.
Name
))
if
(!
string
.
IsNullOrEmpty
(
queryDto
.
Name
))
...
@@ -109,6 +109,8 @@ namespace DotNetCore.CAP.InMemoryStorage
...
@@ -109,6 +109,8 @@ namespace DotNetCore.CAP.InMemoryStorage
return
expression
.
Skip
(
offset
).
Take
(
size
).
Select
(
x
=>
new
MessageDto
()
return
expression
.
Skip
(
offset
).
Take
(
size
).
Select
(
x
=>
new
MessageDto
()
{
{
Added
=
x
.
Added
,
Added
=
x
.
Added
,
Group
=
x
.
Group
,
Version
=
"N/A"
,
Content
=
x
.
Content
,
Content
=
x
.
Content
,
ExpiresAt
=
x
.
ExpiresAt
,
ExpiresAt
=
x
.
ExpiresAt
,
Id
=
x
.
Id
,
Id
=
x
.
Id
,
...
@@ -137,7 +139,7 @@ namespace DotNetCore.CAP.InMemoryStorage
...
@@ -137,7 +139,7 @@ namespace DotNetCore.CAP.InMemoryStorage
public
int
ReceivedSucceededCount
()
public
int
ReceivedSucceededCount
()
{
{
return
GetConnection
().
ReceivedMessages
.
Count
(
x
=>
x
.
StatusName
==
StatusName
.
Succeeded
);
return
GetConnection
().
ReceivedMessages
.
Count
(
x
=>
x
.
StatusName
==
StatusName
.
Succeeded
);
}
}
private
InMemoryStorageConnection
GetConnection
()
private
InMemoryStorageConnection
GetConnection
()
{
{
...
...
src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.cshtml
View file @
0ffdca79
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
<input type="checkbox" class="js-jobs-list-select-all"/>
<input type="checkbox" class="js-jobs-list-select-all"/>
</th>
</th>
<th>@Strings.Common_Id</th>
<th>@Strings.Common_Id</th>
<th>@Strings.Common_Version</th>
<th
style="width: 30px;"
>@Strings.Common_Version</th>
<th>@Strings.MessagesPage_Table_Group</th>
<th>@Strings.MessagesPage_Table_Group</th>
<th>@Strings.MessagesPage_Table_Name</th>
<th>@Strings.MessagesPage_Table_Name</th>
<th class="min-width">@Strings.MessagesPage_Table_Retries</th>
<th class="min-width">@Strings.MessagesPage_Table_Retries</th>
...
@@ -94,7 +94,7 @@
...
@@ -94,7 +94,7 @@
{
{
<th>@Strings.MessagesPage_Table_State</th>
<th>@Strings.MessagesPage_Table_State</th>
}
}
<th class="align-right">@Strings.MessagesPage_Table_ExpiresAt</th>
<th
style="width: 75px;"
class="align-right">@Strings.MessagesPage_Table_ExpiresAt</th>
</tr>
</tr>
</thead>
</thead>
<tbody>
<tbody>
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
<td>
<td>
@message.Version
@message.Version
</td>
</td>
<td>
<td
class="word-break"
>
@message.Group
@message.Group
</td>
</td>
<td>
<td>
...
...
src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.generated.cs
View file @
0ffdca79
...
@@ -302,7 +302,7 @@ namespace DotNetCore.CAP.Dashboard.Pages
...
@@ -302,7 +302,7 @@ namespace DotNetCore.CAP.Dashboard.Pages
#line default
#line default
#line hidden
#line hidden
WriteLiteral
(
"</th>\r\n <th>"
);
WriteLiteral
(
"</th>\r\n <th
style=\"width:50px;\"
>"
);
#line 88 "..\..\ReceivedPage.cshtml"
#line 88 "..\..\ReceivedPage.cshtml"
Write
(
Strings
.
Common_Version
);
Write
(
Strings
.
Common_Version
);
...
@@ -371,7 +371,7 @@ namespace DotNetCore.CAP.Dashboard.Pages
...
@@ -371,7 +371,7 @@ namespace DotNetCore.CAP.Dashboard.Pages
#line default
#line default
#line hidden
#line hidden
WriteLiteral
(
" <th class=\"align-right\">"
);
WriteLiteral
(
" <th
style=\"width:75px;\"
class=\"align-right\">"
);
...
@@ -438,7 +438,7 @@ namespace DotNetCore.CAP.Dashboard.Pages
...
@@ -438,7 +438,7 @@ namespace DotNetCore.CAP.Dashboard.Pages
#line default
#line default
#line hidden
#line hidden
WriteLiteral
(
"\r\n </td>\r\n "
+
WriteLiteral
(
"\r\n </td>\r\n "
+
"<td>\r\n "
);
"<td
class=\"word-break\"
>\r\n "
);
#line 110 "..\..\ReceivedPage.cshtml"
#line 110 "..\..\ReceivedPage.cshtml"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment