Browse Source

cleanup.

master
yangxiaodong 7 years ago
parent
commit
f6ca2cc426
44 changed files with 90 additions and 104 deletions
  1. +1
    -1
      src/DotNetCore.CAP/Dashboard/BatchCommandDispatcher.cs
  2. +4
    -4
      src/DotNetCore.CAP/Dashboard/CombinedResourceDispatcher.cs
  3. +2
    -2
      src/DotNetCore.CAP/Dashboard/CommandDispatcher.cs
  4. +1
    -3
      src/DotNetCore.CAP/Dashboard/DashboardContext.cs
  5. +1
    -1
      src/DotNetCore.CAP/Dashboard/DashboardMetric.cs
  6. +2
    -2
      src/DotNetCore.CAP/Dashboard/DashboardMetrics.cs
  7. +4
    -1
      src/DotNetCore.CAP/Dashboard/DashboardRequest.cs
  8. +2
    -1
      src/DotNetCore.CAP/Dashboard/DashboardResponse.cs
  9. +7
    -8
      src/DotNetCore.CAP/Dashboard/DashboardRoutes.cs
  10. +3
    -3
      src/DotNetCore.CAP/Dashboard/EmbeddedResourceDispatcher.cs
  11. +3
    -4
      src/DotNetCore.CAP/Dashboard/HtmlHelper.cs
  12. +1
    -1
      src/DotNetCore.CAP/Dashboard/IDashboardAuthorizationFilter.cs
  13. +2
    -5
      src/DotNetCore.CAP/Dashboard/IDashboardDispatcher.cs
  14. +10
    -3
      src/DotNetCore.CAP/Dashboard/IMonitoringApi.cs
  15. +2
    -2
      src/DotNetCore.CAP/Dashboard/JobHistoryRenderer.cs
  16. +1
    -2
      src/DotNetCore.CAP/Dashboard/JsonDispatcher.cs
  17. +2
    -2
      src/DotNetCore.CAP/Dashboard/JsonStats.cs
  18. +1
    -3
      src/DotNetCore.CAP/Dashboard/LocalRequestsOnlyAuthorizationFilter.cs
  19. +1
    -1
      src/DotNetCore.CAP/Dashboard/MenuItem.cs
  20. +1
    -2
      src/DotNetCore.CAP/Dashboard/MessagesSidebarMenu.cs
  21. +5
    -6
      src/DotNetCore.CAP/Dashboard/Metric.cs
  22. +1
    -0
      src/DotNetCore.CAP/Dashboard/Monitoring/MessageDto.cs
  23. +3
    -6
      src/DotNetCore.CAP/Dashboard/Monitoring/MessageQueryDto.cs
  24. +1
    -4
      src/DotNetCore.CAP/Dashboard/Monitoring/ServerDto.cs
  25. +1
    -1
      src/DotNetCore.CAP/Dashboard/Monitoring/StateHistoryDto.cs
  26. +1
    -1
      src/DotNetCore.CAP/Dashboard/Monitoring/StatisticsDto.cs
  27. +1
    -1
      src/DotNetCore.CAP/Dashboard/NavigationMenu.cs
  28. +1
    -1
      src/DotNetCore.CAP/Dashboard/NonEscapedString.cs
  29. +2
    -2
      src/DotNetCore.CAP/Dashboard/Pager.cs
  30. +1
    -1
      src/DotNetCore.CAP/Dashboard/Pages/BlockMetric.cs
  31. +1
    -1
      src/DotNetCore.CAP/Dashboard/Pages/Breadcrumbs.cs
  32. +1
    -1
      src/DotNetCore.CAP/Dashboard/Pages/HomePage.cs
  33. +1
    -1
      src/DotNetCore.CAP/Dashboard/Pages/InlineMetric.cs
  34. +1
    -1
      src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.cs
  35. +1
    -3
      src/DotNetCore.CAP/Dashboard/Pages/PublishedPage.cs
  36. +1
    -3
      src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.cs
  37. +2
    -2
      src/DotNetCore.CAP/Dashboard/Pages/SidebarMenu.cs
  38. +1
    -1
      src/DotNetCore.CAP/Dashboard/Pages/_Paginator.cs
  39. +1
    -1
      src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.cs
  40. +5
    -6
      src/DotNetCore.CAP/Dashboard/RazorPage.cs
  41. +1
    -1
      src/DotNetCore.CAP/Dashboard/RazorPageDispatcher.cs
  42. +1
    -2
      src/DotNetCore.CAP/Dashboard/RouteCollection.cs
  43. +3
    -3
      src/DotNetCore.CAP/Dashboard/RouteCollectionExtensions.cs
  44. +2
    -4
      src/DotNetCore.CAP/Dashboard/UrlHelper.cs

+ 1
- 1
src/DotNetCore.CAP/Dashboard/BatchCommandDispatcher.cs View File

@@ -31,4 +31,4 @@ namespace DotNetCore.CAP.Dashboard
context.Response.StatusCode = (int)HttpStatusCode.NoContent;
}
}
}
}

+ 4
- 4
src/DotNetCore.CAP/Dashboard/CombinedResourceDispatcher.cs View File

@@ -9,9 +9,9 @@ namespace DotNetCore.CAP.Dashboard
private readonly string[] _resourceNames;

public CombinedResourceDispatcher(
string contentType,
Assembly assembly,
string baseNamespace,
string contentType,
Assembly assembly,
string baseNamespace,
params string[] resourceNames) : base(contentType, assembly, null)
{
_assembly = assembly;
@@ -30,4 +30,4 @@ namespace DotNetCore.CAP.Dashboard
}
}
}
}
}

+ 2
- 2
src/DotNetCore.CAP/Dashboard/CommandDispatcher.cs View File

@@ -15,7 +15,7 @@ namespace DotNetCore.CAP.Dashboard

public Task Dispatch(DashboardContext context)
{
var request = context.Request;
var request = context.Request;
var response = context.Response;

if (!"POST".Equals(request.Method, StringComparison.OrdinalIgnoreCase))
@@ -36,4 +36,4 @@ namespace DotNetCore.CAP.Dashboard
return Task.FromResult(true);
}
}
}
}

+ 1
- 3
src/DotNetCore.CAP/Dashboard/DashboardContext.cs View File

@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
using Microsoft.AspNetCore.Http;

@@ -48,4 +46,4 @@ namespace DotNetCore.CAP.Dashboard

public HttpContext HttpContext { get; }
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/DashboardMetric.cs View File

@@ -4,7 +4,7 @@ namespace DotNetCore.CAP.Dashboard
{
public class DashboardMetric
{
public DashboardMetric(string name, Func<RazorPage, Metric> func)
public DashboardMetric(string name, Func<RazorPage, Metric> func)
: this(name, name, func)
{
}


+ 2
- 2
src/DotNetCore.CAP/Dashboard/DashboardMetrics.cs View File

@@ -135,7 +135,6 @@ namespace DotNetCore.CAP.Dashboard
IntValue = page.Statistics.ReceivedSucceeded
});


//----------------------------------------------------

public static readonly DashboardMetric PublishedFailedCount = new DashboardMetric(
@@ -147,6 +146,7 @@ namespace DotNetCore.CAP.Dashboard
Style = page.Statistics.PublishedFailed > 0 ? MetricStyle.Danger : MetricStyle.Default,
Highlighted = page.Statistics.PublishedFailed > 0
});

public static readonly DashboardMetric ReceivedFailedCount = new DashboardMetric(
"received_failed:count",
"Metrics_FailedJobs",
@@ -157,4 +157,4 @@ namespace DotNetCore.CAP.Dashboard
Highlighted = page.Statistics.ReceivedFailed > 0
});
}
}
}

+ 4
- 1
src/DotNetCore.CAP/Dashboard/DashboardRequest.cs View File

@@ -15,6 +15,7 @@ namespace DotNetCore.CAP.Dashboard
public abstract string RemoteIpAddress { get; }

public abstract string GetQuery(string key);

public abstract Task<IList<string>> GetFormValuesAsync(string key);
}

@@ -25,7 +26,7 @@ namespace DotNetCore.CAP.Dashboard
public CapDashboardRequest(HttpContext context)
{
if (context == null) throw new ArgumentNullException(nameof(context));
_context = context;
_context = context;
}

public override string Method => _context.Request.Method;
@@ -33,7 +34,9 @@ namespace DotNetCore.CAP.Dashboard
public override string PathBase => _context.Request.PathBase.Value;
public override string LocalIpAddress => _context.Connection.LocalIpAddress.ToString();
public override string RemoteIpAddress => _context.Connection.RemoteIpAddress.ToString();

public override string GetQuery(string key) => _context.Request.Query[key];

public override async Task<IList<string>> GetFormValuesAsync(string key)
{
var form = await _context.Request.ReadFormAsync();


+ 2
- 1
src/DotNetCore.CAP/Dashboard/DashboardResponse.cs View File

@@ -14,6 +14,7 @@ namespace DotNetCore.CAP.Dashboard
public abstract Stream Body { get; }

public abstract void SetExpire(DateTimeOffset? value);

public abstract Task WriteAsync(string text);
}

@@ -21,7 +22,7 @@ namespace DotNetCore.CAP.Dashboard
{
private readonly HttpContext _context;

public CapDashboardResponse( HttpContext context)
public CapDashboardResponse(HttpContext context)
{
if (context == null) throw new ArgumentNullException(nameof(context));
_context = context;


+ 7
- 8
src/DotNetCore.CAP/Dashboard/DashboardRoutes.cs View File

@@ -72,11 +72,10 @@ namespace DotNetCore.CAP.Dashboard
GetExecutingAssembly(),
GetContentResourceName("fonts", "glyphicons-halflings-regular.woff2")));

#endregion
#endregion Embedded static content

#region Razor pages and commands


Routes.AddJsonResult("/published/message/(?<Id>.+)", x =>
{
var id = int.Parse(x.UriMatch.Groups["Id"].Value);
@@ -103,7 +102,7 @@ namespace DotNetCore.CAP.Dashboard

//Routes.AddRazorPage("/jobs/processing", x => new ProcessingJobsPage());
//Routes.AddClientBatchCommand(
// "/jobs/processing/delete",
// "/jobs/processing/delete",
// (client, jobId) => client.ChangeState(jobId, CreateDeletedState(), ProcessingState.StateName));

//Routes.AddClientBatchCommand(
@@ -113,7 +112,7 @@ namespace DotNetCore.CAP.Dashboard
//Routes.AddRazorPage("/jobs/scheduled", x => new ScheduledJobsPage());

//Routes.AddClientBatchCommand(
// "/jobs/scheduled/enqueue",
// "/jobs/scheduled/enqueue",
// (client, jobId) => client.ChangeState(jobId, CreateEnqueuedState(), ScheduledState.StateName));

//Routes.AddClientBatchCommand(
@@ -176,17 +175,17 @@ namespace DotNetCore.CAP.Dashboard

//Routes.AddRazorPage("/recurring", x => new RecurringJobsPage());
//Routes.AddRecurringBatchCommand(
// "/recurring/remove",
// "/recurring/remove",
// (manager, jobId) => manager.RemoveIfExists(jobId));

//Routes.AddRecurringBatchCommand(
// "/recurring/trigger",
// "/recurring/trigger",
// (manager, jobId) => manager.Trigger(jobId));

//Routes.AddRazorPage("/servers", x => new ServersPage());
//Routes.AddRazorPage("/retries", x => new RetriesPage());

#endregion
#endregion Razor pages and commands
}

public static RouteCollection Routes { get; }
@@ -216,4 +215,4 @@ namespace DotNetCore.CAP.Dashboard
return typeof(DashboardRoutes).GetTypeInfo().Assembly;
}
}
}
}

+ 3
- 3
src/DotNetCore.CAP/Dashboard/EmbeddedResourceDispatcher.cs View File

@@ -12,12 +12,12 @@ namespace DotNetCore.CAP.Dashboard

public EmbeddedResourceDispatcher(
string contentType,
Assembly assembly,
Assembly assembly,
string resourceName)
{
if (contentType == null) throw new ArgumentNullException(nameof(contentType));
if (assembly == null) throw new ArgumentNullException(nameof(assembly));
_assembly = assembly;
_resourceName = resourceName;
_contentType = contentType;
@@ -51,4 +51,4 @@ namespace DotNetCore.CAP.Dashboard
}
}
}
}
}

+ 3
- 4
src/DotNetCore.CAP/Dashboard/HtmlHelper.cs View File

@@ -2,12 +2,11 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.ComponentModel;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using DotNetCore.CAP.Dashboard.Resources;
using DotNetCore.CAP.Dashboard.Pages;
using DotNetCore.CAP.Dashboard.Resources;
using DotNetCore.CAP.Infrastructure;
using DotNetCore.CAP.Models;
using Microsoft.Extensions.Internal;
@@ -349,4 +348,4 @@ namespace DotNetCore.CAP.Dashboard
return WebUtility.HtmlEncode(text);
}
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/IDashboardAuthorizationFilter.cs View File

@@ -2,6 +2,6 @@
{
public interface IDashboardAuthorizationFilter
{
bool Authorize( DashboardContext context);
bool Authorize(DashboardContext context);
}
}

+ 2
- 5
src/DotNetCore.CAP/Dashboard/IDashboardDispatcher.cs View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using System.Threading.Tasks;

namespace DotNetCore.CAP.Dashboard
{
@@ -9,4 +6,4 @@ namespace DotNetCore.CAP.Dashboard
{
Task Dispatch(DashboardContext context);
}
}
}

+ 10
- 3
src/DotNetCore.CAP/Dashboard/IMonitoringApi.cs View File

@@ -6,21 +6,28 @@ namespace DotNetCore.CAP.Dashboard
{
public interface IMonitoringApi
{
StatisticsDto GetStatistics();
StatisticsDto GetStatistics();
IList<MessageDto> Messages(MessageQueryDto queryDto);
int PublishedFailedCount();

int PublishedProcessingCount();

int PublishedSucceededCount();

int ReceivedFailedCount();

int ReceivedProcessingCount();

int ReceivedSucceededCount();

IDictionary<DateTime, int> SucceededByDatesCount();

IDictionary<DateTime, int> FailedByDatesCount();

IDictionary<DateTime, int> HourlySucceededJobs();

IDictionary<DateTime, int> HourlyFailedJobs();
}
}

+ 2
- 2
src/DotNetCore.CAP/Dashboard/JobHistoryRenderer.cs View File

@@ -14,6 +14,7 @@ namespace DotNetCore.CAP.Dashboard

private static readonly IDictionary<string, string> BackgroundStateColors
= new Dictionary<string, string>();

private static readonly IDictionary<string, string> ForegroundStateColors
= new Dictionary<string, string>();

@@ -144,7 +145,6 @@ namespace DotNetCore.CAP.Dashboard
itemsAdded = true;
}


if (stateData.ContainsKey("Result") && !String.IsNullOrWhiteSpace(stateData["Result"]))
{
var result = stateData["Result"];
@@ -249,4 +249,4 @@ namespace DotNetCore.CAP.Dashboard
return new NonEscapedString(builder.ToString());
}
}
}
}

+ 1
- 2
src/DotNetCore.CAP/Dashboard/JsonDispatcher.cs View File

@@ -1,5 +1,4 @@
using System;
using System.Net;
using System.Threading.Tasks;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
@@ -49,4 +48,4 @@ namespace DotNetCore.CAP.Dashboard
await context.Response.WriteAsync(serialized);
}
}
}
}

+ 2
- 2
src/DotNetCore.CAP/Dashboard/JsonStats.cs View File

@@ -27,7 +27,7 @@ namespace DotNetCore.CAP.Dashboard
var settings = new JsonSerializerSettings
{
ContractResolver = new CamelCasePropertyNamesContractResolver(),
Converters = new JsonConverter[]{ new StringEnumConverter { CamelCaseText = true } }
Converters = new JsonConverter[] { new StringEnumConverter { CamelCaseText = true } }
};
var serialized = JsonConvert.SerializeObject(result, settings);

@@ -42,4 +42,4 @@ namespace DotNetCore.CAP.Dashboard
}
}
}
}
}

+ 1
- 3
src/DotNetCore.CAP/Dashboard/LocalRequestsOnlyAuthorizationFilter.cs View File

@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace DotNetCore.CAP.Dashboard
{
@@ -23,4 +21,4 @@ namespace DotNetCore.CAP.Dashboard
return false;
}
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/MenuItem.cs View File

@@ -21,7 +21,7 @@ namespace DotNetCore.CAP.Dashboard
public IEnumerable<DashboardMetric> GetAllMetrics()
{
var metrics = new List<DashboardMetric> { Metric };
if (Metrics != null)
{
metrics.AddRange(Metrics);


+ 1
- 2
src/DotNetCore.CAP/Dashboard/MessagesSidebarMenu.cs View File

@@ -31,7 +31,7 @@ namespace DotNetCore.CAP.Dashboard
Active = page.RequestPath.StartsWith("/published/failed"),
Metric = DashboardMetrics.PublishedFailedCount
});
//=======================================ReceivedItems=============================

ReceivedItems.Add(page => new MenuItem(Strings.SidebarMenu_Succeeded, page.Url.To("/received/succeeded"))
@@ -51,7 +51,6 @@ namespace DotNetCore.CAP.Dashboard
Active = page.RequestPath.StartsWith("/received/failed"),
Metric = DashboardMetrics.ReceivedFailedCount
});

}
}
}

+ 5
- 6
src/DotNetCore.CAP/Dashboard/Metric.cs View File

@@ -1,5 +1,4 @@

namespace DotNetCore.CAP.Dashboard
namespace DotNetCore.CAP.Dashboard
{
public class Metric
{
@@ -31,12 +30,12 @@ namespace DotNetCore.CAP.Dashboard
switch (style)
{
case MetricStyle.Default: return "metric-default";
case MetricStyle.Info: return "metric-info";
case MetricStyle.Info: return "metric-info";
case MetricStyle.Success: return "metric-success";
case MetricStyle.Warning: return "metric-warning";
case MetricStyle.Danger: return "metric-danger";
default: return "metric-null";
case MetricStyle.Danger: return "metric-danger";
default: return "metric-null";
}
}
}
}
}

+ 1
- 0
src/DotNetCore.CAP/Dashboard/Monitoring/MessageDto.cs View File

@@ -1,4 +1,5 @@
using System;

namespace DotNetCore.CAP.Dashboard.Monitoring
{
public class MessageDto


+ 3
- 6
src/DotNetCore.CAP/Dashboard/Monitoring/MessageQueryDto.cs View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using DotNetCore.CAP.Models;
using DotNetCore.CAP.Models;

namespace DotNetCore.CAP.Dashboard.Monitoring
{
@@ -15,9 +12,9 @@ namespace DotNetCore.CAP.Dashboard.Monitoring
public string Content { get; set; }

public string StatusName { get; set; }
public int CurrentPage { get; set; }

public int PageSize { get; set; }
}
}
}

+ 1
- 4
src/DotNetCore.CAP/Dashboard/Monitoring/ServerDto.cs View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;

namespace DotNetCore.CAP.Dashboard.Monitoring
namespace DotNetCore.CAP.Dashboard.Monitoring
{
public class SubscriberDto
{


+ 1
- 1
src/DotNetCore.CAP/Dashboard/Monitoring/StateHistoryDto.cs View File

@@ -8,6 +8,6 @@ namespace DotNetCore.CAP.Dashboard.Monitoring
public string StateName { get; set; }
public string Reason { get; set; }
public DateTime CreatedAt { get; set; }
public IDictionary<string, string> Data { get; set; }
public IDictionary<string, string> Data { get; set; }
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/Monitoring/StatisticsDto.cs View File

@@ -13,4 +13,4 @@
public int PublishedProcessing { get; set; }
public int ReceivedProcessing { get; set; }
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/NavigationMenu.cs View File

@@ -13,7 +13,7 @@ namespace DotNetCore.CAP.Dashboard
Items.Add(page => new MenuItem(Strings.NavigationMenu_Published, page.Url.LinkToPublished())
{
Active = page.RequestPath.StartsWith("/published"),
Metrics = new []
Metrics = new[]
{
DashboardMetrics.PublishedSucceededCount,
DashboardMetrics.PublishedFailedCountOrNull


+ 1
- 1
src/DotNetCore.CAP/Dashboard/NonEscapedString.cs View File

@@ -14,4 +14,4 @@
return _value;
}
}
}
}

+ 2
- 2
src/DotNetCore.CAP/Dashboard/Pager.cs View File

@@ -66,7 +66,7 @@ namespace DotNetCore.CAP.Dashboard
AddPrevious(pagerItems);

// first page
if (_startPageIndex > 1)
if (_startPageIndex > 1)
pagerItems.Add(new Item(1, false, ItemType.Page));

// more page before numeric page buttons
@@ -153,4 +153,4 @@ namespace DotNetCore.CAP.Dashboard
MorePage
}
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/Pages/BlockMetric.cs View File

@@ -9,4 +9,4 @@

public DashboardMetric DashboardMetric { get; }
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/Pages/Breadcrumbs.cs View File

@@ -13,4 +13,4 @@ namespace DotNetCore.CAP.Dashboard.Pages
public string Title { get; }
public IDictionary<string, string> Items { get; }
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/Pages/HomePage.cs View File

@@ -6,4 +6,4 @@ namespace DotNetCore.CAP.Dashboard.Pages
{
public static readonly List<DashboardMetric> Metrics = new List<DashboardMetric>();
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/Pages/InlineMetric.cs View File

@@ -9,4 +9,4 @@

public DashboardMetric DashboardMetric { get; }
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.cs View File

@@ -9,4 +9,4 @@

public string Title { get; }
}
}
}

+ 1
- 3
src/DotNetCore.CAP/Dashboard/Pages/PublishedPage.cs View File

@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using DotNetCore.CAP.Processor.States;

namespace DotNetCore.CAP.Dashboard.Pages
@@ -30,4 +28,4 @@ namespace DotNetCore.CAP.Dashboard.Pages
}
}
}
}
}

+ 1
- 3
src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.cs View File

@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using DotNetCore.CAP.Processor.States;

namespace DotNetCore.CAP.Dashboard.Pages
@@ -30,4 +28,4 @@ namespace DotNetCore.CAP.Dashboard.Pages
}
}
}
}
}

+ 2
- 2
src/DotNetCore.CAP/Dashboard/Pages/SidebarMenu.cs View File

@@ -5,7 +5,7 @@ namespace DotNetCore.CAP.Dashboard.Pages
{
partial class SidebarMenu
{
public SidebarMenu( IEnumerable<Func<RazorPage, MenuItem>> items)
public SidebarMenu(IEnumerable<Func<RazorPage, MenuItem>> items)
{
if (items == null) throw new ArgumentNullException(nameof(items));
Items = items;
@@ -13,4 +13,4 @@ namespace DotNetCore.CAP.Dashboard.Pages

public IEnumerable<Func<RazorPage, MenuItem>> Items { get; }
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/Pages/_Paginator.cs View File

@@ -9,4 +9,4 @@
_pager = pager;
}
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.cs View File

@@ -9,4 +9,4 @@
_pager = pager;
}
}
}
}

+ 5
- 6
src/DotNetCore.CAP/Dashboard/RazorPage.cs View File

@@ -2,12 +2,11 @@
using System.Diagnostics;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using DotNetCore.CAP.Dashboard.Monitoring;

namespace DotNetCore.CAP.Dashboard
{
public abstract class RazorPage
public abstract class RazorPage
{
private Lazy<StatisticsDto> _statisticsLazy;

@@ -116,15 +115,15 @@ namespace DotNetCore.CAP.Dashboard
private string TransformText(string body)
{
_body = body;
Execute();
if (Layout != null)
{
Layout.Assign(this);
return Layout.TransformText(_content.ToString());
}
return _content.ToString();
}

@@ -135,4 +134,4 @@ namespace DotNetCore.CAP.Dashboard
: WebUtility.HtmlEncode(text);
}
}
}
}

+ 1
- 1
src/DotNetCore.CAP/Dashboard/RazorPageDispatcher.cs View File

@@ -23,4 +23,4 @@ namespace DotNetCore.CAP.Dashboard
return context.Response.WriteAsync(page.ToString());
}
}
}
}

+ 1
- 2
src/DotNetCore.CAP/Dashboard/RouteCollection.cs View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;

namespace DotNetCore.CAP.Dashboard
@@ -45,4 +44,4 @@ namespace DotNetCore.CAP.Dashboard
return null;
}
}
}
}

+ 3
- 3
src/DotNetCore.CAP/Dashboard/RouteCollectionExtensions.cs View File

@@ -19,7 +19,7 @@ namespace DotNetCore.CAP.Dashboard

public static void AddCommand(
this RouteCollection routes,
string pathTemplate,
string pathTemplate,
Func<DashboardContext, bool> command)
{
if (routes == null) throw new ArgumentNullException(nameof(routes));
@@ -63,6 +63,6 @@ namespace DotNetCore.CAP.Dashboard
if (command == null) throw new ArgumentNullException(nameof(command));

routes.Add(pathTemplate, new BatchCommandDispatcher(command));
}
}
}
}
}

+ 2
- 4
src/DotNetCore.CAP/Dashboard/UrlHelper.cs View File

@@ -1,14 +1,12 @@
using System;
using System.Collections.Generic;

namespace DotNetCore.CAP.Dashboard
{
public class UrlHelper
{

private readonly DashboardContext _context;

public UrlHelper( DashboardContext context)
public UrlHelper(DashboardContext context)
{
if (context == null) throw new ArgumentNullException(nameof(context));
_context = context;
@@ -46,4 +44,4 @@ namespace DotNetCore.CAP.Dashboard
return To("/jobs/enqueued/" + queue);
}
}
}
}

Loading…
Cancel
Save