From 6a1b54410acce1cdeaecc32f40443830ac711b21 Mon Sep 17 00:00:00 2001 From: yangxiaodong Date: Fri, 25 Aug 2017 18:29:58 +0800 Subject: [PATCH] add dashboard --- .../Dashboard/CombinedResourceDispatcher.cs | 33 + .../Dashboard/CommandDispatcher.cs | 39 + .../Content/resx/Strings.Designer.cs | 5 +- .../Dashboard/DashboardContext.cs | 19 +- .../Dashboard/DashboardMetric.cs | 24 + .../Dashboard/DashboardMetrics.cs | 179 ++++ .../Dashboard/DashboardRequest.cs | 18 + .../Dashboard/DashboardResponse.cs | 17 + .../Dashboard/EmbeddedResourceDispatcher.cs | 54 + src/DotNetCore.CAP/Dashboard/HtmlHelper.cs | 244 +++++ .../IDashboardAuthorizationFilter.cs | 7 + .../Dashboard/IDashboardDispatcher.cs | 12 + .../Dashboard/IMonitoringApi.cs | 20 +- .../Dashboard/JobHistoryRenderer.cs | 258 +++++ .../Dashboard/JobsSidebarMenu.cs | 57 ++ src/DotNetCore.CAP/Dashboard/JsonStats.cs | 45 + .../LocalRequestsOnlyAuthorizationFilter.cs | 26 + src/DotNetCore.CAP/Dashboard/MenuItem.cs | 33 + src/DotNetCore.CAP/Dashboard/Metric.cs | 42 + .../Dashboard/Monitoring/DeletedJobDto.cs | 6 +- .../Dashboard/Monitoring/EnqueuedJobDto.cs | 24 +- .../Dashboard/Monitoring/FailedJobDto.cs | 24 +- .../Dashboard/Monitoring/FetchedJobDto.cs | 24 +- .../Dashboard/Monitoring/JobDetailsDto.cs | 24 +- .../Dashboard/Monitoring/JobList.cs | 18 +- .../Dashboard/Monitoring/ProcessingJobDto.cs | 24 +- .../Monitoring/QueueWithTopEnqueuedJobsDto.cs | 18 +- .../Dashboard/Monitoring/ScheduledJobDto.cs | 24 +- .../Dashboard/Monitoring/ServerDto.cs | 20 +- .../Dashboard/Monitoring/StateHistoryDto.cs | 20 +- .../Dashboard/Monitoring/StatisticsDto.cs | 18 +- .../Dashboard/Monitoring/SucceededJobDto.cs | 6 +- .../Dashboard/NavigationMenu.cs | 42 + .../Dashboard/NonEscapedString.cs | 17 + src/DotNetCore.CAP/Dashboard/Pager.cs | 156 +++ .../{Views => Pages}/AwaitingJobsPage.cshtml | 23 +- .../Dashboard/{Views => Pages}/BlockMetric.cs | 2 +- .../Dashboard/{Views => Pages}/Breadcrumbs.cs | 2 +- .../Dashboard/{Views => Pages}/HomePage.cs | 6 +- .../{Views => Pages}/HomePage.cshtml | 6 +- .../{Views => Pages}/HomePage.generated.cs | 8 +- .../{Views => Pages}/InlineMetric.cs | 4 +- .../Dashboard/{Views => Pages}/LayoutPage.cs | 2 +- .../{Views => Pages}/LayoutPage.cshtml | 6 +- .../{Views => Pages}/LayoutPage.generated.cs | 8 +- .../ProcessingJobsPage.cshtml | 6 +- .../Dashboard/Pages/SidebarMenu.cs | 16 + .../{Views => Pages}/SucceededJobs.cshtml | 6 +- .../{Views => Pages}/_BlockMetric.cshtml | 6 +- .../_BlockMetric.generated.cs | 6 +- .../{Views => Pages}/_Breadcrumbs.cshtml | 2 +- .../{Views => Pages}/_InlineMetric.cshtml | 2 +- .../_InlineMetric.generated.cs | 4 +- .../{Views => Pages}/_Navigation.cshtml | 2 +- .../{Views => Pages}/_Navigation.generated.cs | 4 +- .../Dashboard/{Views => Pages}/_Paginator.cs | 2 +- .../{Views => Pages}/_Paginator.cshtml | 4 +- .../{Views => Pages}/_PerPageSelector.cs | 2 +- .../{Views => Pages}/_PerPageSelector.cshtml | 4 +- .../{Views => Pages}/_SidebarMenu.cshtml | 2 +- src/DotNetCore.CAP/Dashboard/RazorPage.cs | 25 +- .../Dashboard/RazorPageDispatcher.cs | 26 + src/DotNetCore.CAP/Dashboard/UrlHelper.cs | 44 + .../Views/AwaitingJobsPage.generated.cs | 638 ------------ .../Dashboard/Views/DeletedJobsPage.cshtml | 102 -- .../Views/DeletedJobsPage.generated.cs | 433 -------- .../Dashboard/Views/EnqueuedJobsPage.cs | 12 - .../Dashboard/Views/EnqueuedJobsPage.cshtml | 118 --- .../Views/EnqueuedJobsPage.generated.cs | 517 ---------- .../Dashboard/Views/FailedJobsPage.cshtml | 135 --- .../Views/FailedJobsPage.generated.cs | 606 ------------ .../Dashboard/Views/FetchedJobsPage.cs | 12 - .../Dashboard/Views/FetchedJobsPage.cshtml | 121 --- .../Views/FetchedJobsPage.generated.cs | 497 ---------- .../Dashboard/Views/JobDetailsPage.cs | 15 - .../Dashboard/Views/JobDetailsPage.cshtml | 211 ---- .../Views/JobDetailsPage1.generated.cs | 932 ------------------ .../Views/ProcessingJobsPage.generated.cs | 544 ---------- .../Dashboard/Views/QueuesPage.cshtml | 122 --- .../Dashboard/Views/QueuesPage.generated.cs | 574 ----------- .../Dashboard/Views/RecurringJobsPage.cshtml | 196 ---- .../Views/RecurringJobsPage.generated.cs | 831 ---------------- .../Dashboard/Views/RetriesPage.cshtml | 143 --- .../Dashboard/Views/RetriesPage.generated.cs | 555 ----------- .../Dashboard/Views/ScheduledJobsPage.cshtml | 106 -- .../Views/ScheduledJobsPage.generated.cs | 449 --------- .../Dashboard/Views/ServersPage.cshtml | 60 -- .../Dashboard/Views/ServersPage.generated.cs | 294 ------ .../Dashboard/Views/SidebarMenu.cs | 33 - .../Views/SucceededJobs1.generated.cs | 481 --------- .../Dashboard/Views/_Breadcrumbs.generated.cs | 105 -- .../Dashboard/Views/_Paginator.generated.cs | 248 ----- .../Views/_PerPageSelector.generated.cs | 106 -- .../Dashboard/Views/_SidebarMenu.generated.cs | 139 --- 94 files changed, 1513 insertions(+), 9649 deletions(-) create mode 100644 src/DotNetCore.CAP/Dashboard/CombinedResourceDispatcher.cs create mode 100644 src/DotNetCore.CAP/Dashboard/CommandDispatcher.cs create mode 100644 src/DotNetCore.CAP/Dashboard/DashboardMetric.cs create mode 100644 src/DotNetCore.CAP/Dashboard/DashboardMetrics.cs create mode 100644 src/DotNetCore.CAP/Dashboard/DashboardRequest.cs create mode 100644 src/DotNetCore.CAP/Dashboard/DashboardResponse.cs create mode 100644 src/DotNetCore.CAP/Dashboard/EmbeddedResourceDispatcher.cs create mode 100644 src/DotNetCore.CAP/Dashboard/HtmlHelper.cs create mode 100644 src/DotNetCore.CAP/Dashboard/IDashboardAuthorizationFilter.cs create mode 100644 src/DotNetCore.CAP/Dashboard/IDashboardDispatcher.cs create mode 100644 src/DotNetCore.CAP/Dashboard/JobHistoryRenderer.cs create mode 100644 src/DotNetCore.CAP/Dashboard/JobsSidebarMenu.cs create mode 100644 src/DotNetCore.CAP/Dashboard/JsonStats.cs create mode 100644 src/DotNetCore.CAP/Dashboard/LocalRequestsOnlyAuthorizationFilter.cs create mode 100644 src/DotNetCore.CAP/Dashboard/MenuItem.cs create mode 100644 src/DotNetCore.CAP/Dashboard/Metric.cs create mode 100644 src/DotNetCore.CAP/Dashboard/NavigationMenu.cs create mode 100644 src/DotNetCore.CAP/Dashboard/NonEscapedString.cs create mode 100644 src/DotNetCore.CAP/Dashboard/Pager.cs rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/AwaitingJobsPage.cshtml (92%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/BlockMetric.cs (83%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/Breadcrumbs.cs (88%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/HomePage.cs (52%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/HomePage.cshtml (95%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/HomePage.generated.cs (98%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/InlineMetric.cs (70%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/LayoutPage.cs (79%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/LayoutPage.cshtml (96%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/LayoutPage.generated.cs (98%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/ProcessingJobsPage.cshtml (97%) create mode 100644 src/DotNetCore.CAP/Dashboard/Pages/SidebarMenu.cs rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/SucceededJobs.cshtml (97%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_BlockMetric.cshtml (82%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_BlockMetric.generated.cs (95%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_Breadcrumbs.cshtml (90%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_InlineMetric.cshtml (85%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_InlineMetric.generated.cs (96%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_Navigation.cshtml (95%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_Navigation.generated.cs (97%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_Paginator.cs (79%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_Paginator.cshtml (95%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_PerPageSelector.cs (80%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_PerPageSelector.cshtml (87%) rename src/DotNetCore.CAP/Dashboard/{Views => Pages}/_SidebarMenu.cshtml (95%) create mode 100644 src/DotNetCore.CAP/Dashboard/RazorPageDispatcher.cs create mode 100644 src/DotNetCore.CAP/Dashboard/UrlHelper.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/AwaitingJobsPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/DeletedJobsPage.cshtml delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/DeletedJobsPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.cshtml delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/FailedJobsPage.cshtml delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/FailedJobsPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.cshtml delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage.cshtml delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage1.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/ProcessingJobsPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/QueuesPage.cshtml delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/QueuesPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/RecurringJobsPage.cshtml delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/RecurringJobsPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/RetriesPage.cshtml delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/RetriesPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/ScheduledJobsPage.cshtml delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/ScheduledJobsPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/ServersPage.cshtml delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/ServersPage.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/SidebarMenu.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/SucceededJobs1.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/_Breadcrumbs.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/_Paginator.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/_PerPageSelector.generated.cs delete mode 100644 src/DotNetCore.CAP/Dashboard/Views/_SidebarMenu.generated.cs diff --git a/src/DotNetCore.CAP/Dashboard/CombinedResourceDispatcher.cs b/src/DotNetCore.CAP/Dashboard/CombinedResourceDispatcher.cs new file mode 100644 index 0000000..6c6d3af --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/CombinedResourceDispatcher.cs @@ -0,0 +1,33 @@ +using System.Reflection; + +namespace DotNetCore.CAP.Dashboard +{ + internal class CombinedResourceDispatcher : EmbeddedResourceDispatcher + { + private readonly Assembly _assembly; + private readonly string _baseNamespace; + private readonly string[] _resourceNames; + + public CombinedResourceDispatcher( + string contentType, + Assembly assembly, + string baseNamespace, + params string[] resourceNames) : base(contentType, assembly, null) + { + _assembly = assembly; + _baseNamespace = baseNamespace; + _resourceNames = resourceNames; + } + + protected override void WriteResponse(DashboardResponse response) + { + foreach (var resourceName in _resourceNames) + { + WriteResource( + response, + _assembly, + $"{_baseNamespace}.{resourceName}"); + } + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/CommandDispatcher.cs b/src/DotNetCore.CAP/Dashboard/CommandDispatcher.cs new file mode 100644 index 0000000..3abde72 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/CommandDispatcher.cs @@ -0,0 +1,39 @@ +using System; +using System.Net; +using System.Threading.Tasks; + +namespace DotNetCore.CAP.Dashboard +{ + internal class CommandDispatcher : IDashboardDispatcher + { + private readonly Func _command; + + public CommandDispatcher(Func command) + { + _command = command; + } + + public Task Dispatch(DashboardContext context) + { + var request = context.Request; + var response = context.Response; + + if (!"POST".Equals(request.Method, StringComparison.OrdinalIgnoreCase)) + { + response.StatusCode = (int)HttpStatusCode.MethodNotAllowed; + return Task.FromResult(false); + } + + if (_command(context)) + { + response.StatusCode = (int)HttpStatusCode.NoContent; + } + else + { + response.StatusCode = 422; + } + + return Task.FromResult(true); + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/Content/resx/Strings.Designer.cs b/src/DotNetCore.CAP/Dashboard/Content/resx/Strings.Designer.cs index 8b1d990..a7ea40e 100644 --- a/src/DotNetCore.CAP/Dashboard/Content/resx/Strings.Designer.cs +++ b/src/DotNetCore.CAP/Dashboard/Content/resx/Strings.Designer.cs @@ -10,7 +10,8 @@ using System.Reflection; -namespace Hangfire.Dashboard.Resources { +namespace DotNetCore.CAP.Dashboard.Resources +{ using System; @@ -41,7 +42,7 @@ namespace Hangfire.Dashboard.Resources { public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Hangfire.Dashboard.Content.resx.Strings", typeof(Strings).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DotNetCore.CAP.Dashboard.Content.resx.Strings", typeof(Strings).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/DotNetCore.CAP/Dashboard/DashboardContext.cs b/src/DotNetCore.CAP/Dashboard/DashboardContext.cs index a45ee11..21a7811 100644 --- a/src/DotNetCore.CAP/Dashboard/DashboardContext.cs +++ b/src/DotNetCore.CAP/Dashboard/DashboardContext.cs @@ -1,10 +1,27 @@ using System; using System.Collections.Generic; using System.Text; +using System.Text.RegularExpressions; namespace DotNetCore.CAP.Dashboard { - class DashboardContext + public abstract class DashboardContext { + protected DashboardContext(IStorage storage, DashboardOptions options) + { + if (storage == null) throw new ArgumentNullException(nameof(storage)); + if (options == null) throw new ArgumentNullException(nameof(options)); + + Storage = storage; + Options = options; + } + + public IStorage Storage { get; } + public DashboardOptions Options { get; } + + public Match UriMatch { get; set; } + + public DashboardRequest Request { get; protected set; } + public DashboardResponse Response { get; protected set; } } } diff --git a/src/DotNetCore.CAP/Dashboard/DashboardMetric.cs b/src/DotNetCore.CAP/Dashboard/DashboardMetric.cs new file mode 100644 index 0000000..cef8593 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/DashboardMetric.cs @@ -0,0 +1,24 @@ +using System; + +namespace DotNetCore.CAP.Dashboard +{ + public class DashboardMetric + { + public DashboardMetric(string name, Func func) + : this(name, name, func) + { + } + + public DashboardMetric(string name, string title, Func func) + { + Name = name; + Title = title; + Func = func; + } + + public string Name { get; } + public Func Func { get; } + + public string Title { get; set; } + } +} \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/DashboardMetrics.cs b/src/DotNetCore.CAP/Dashboard/DashboardMetrics.cs new file mode 100644 index 0000000..9b6c07c --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/DashboardMetrics.cs @@ -0,0 +1,179 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using DotNetCore.CAP.Dashboard.Resources; + +namespace DotNetCore.CAP.Dashboard +{ + public static class DashboardMetrics + { + private static readonly Dictionary Metrics = new Dictionary(); + + static DashboardMetrics() + { + AddMetric(ServerCount); + AddMetric(RecurringJobCount); + AddMetric(RetriesCount); + AddMetric(EnqueuedCountOrNull); + AddMetric(FailedCountOrNull); + AddMetric(EnqueuedAndQueueCount); + AddMetric(ScheduledCount); + AddMetric(ProcessingCount); + AddMetric(SucceededCount); + AddMetric(FailedCount); + AddMetric(DeletedCount); + AddMetric(AwaitingCount); + } + + public static void AddMetric(DashboardMetric metric) + { + if (metric == null) throw new ArgumentNullException(nameof(metric)); + + lock (Metrics) + { + Metrics[metric.Name] = metric; + } + } + + public static IEnumerable GetMetrics() + { + lock (Metrics) + { + return Metrics.Values.ToList(); + } + } + + public static readonly DashboardMetric ServerCount = new DashboardMetric( + "servers:count", + "Metrics_Servers", + page => new Metric(page.Statistics.Servers.ToString("N0")) + { + Style = page.Statistics.Servers == 0 ? MetricStyle.Warning : MetricStyle.Default, + Highlighted = page.Statistics.Servers == 0, + Title = page.Statistics.Servers == 0 + ? "No active servers found. Jobs will not be processed." + : null + }); + + public static readonly DashboardMetric RecurringJobCount = new DashboardMetric( + "recurring:count", + "Metrics_RecurringJobs", + page => new Metric(page.Statistics.Recurring.ToString("N0"))); + + public static readonly DashboardMetric RetriesCount = new DashboardMetric( + "retries:count", + "Metrics_Retries", + page => + { + long retryCount; + using (var connection = page.Storage.GetConnection()) + { + var storageConnection = connection as IStorageConnection; + if (storageConnection == null) + { + return null; + } + + retryCount = storageConnection.GetSetCount("retries"); + } + + return new Metric(retryCount.ToString("N0")) + { + Style = retryCount > 0 ? MetricStyle.Warning : MetricStyle.Default + }; + }); + + public static readonly DashboardMetric EnqueuedCountOrNull = new DashboardMetric( + "enqueued:count-or-null", + "Metrics_EnqueuedCountOrNull", + page => page.Statistics.Enqueued > 0 || page.Statistics.Failed == 0 + ? new Metric(page.Statistics.Enqueued.ToString("N0")) + { + Style = page.Statistics.Enqueued > 0 ? MetricStyle.Info : MetricStyle.Default, + Highlighted = page.Statistics.Enqueued > 0 && page.Statistics.Failed == 0 + } + : null); + + public static readonly DashboardMetric FailedCountOrNull = new DashboardMetric( + "failed:count-or-null", + "Metrics_FailedJobs", + page => page.Statistics.Failed > 0 + ? new Metric(page.Statistics.Failed.ToString("N0")) + { + Style = MetricStyle.Danger, + Highlighted = true, + Title = string.Format(Strings.Metrics_FailedCountOrNull, page.Statistics.Failed) + } + : null); + + public static readonly DashboardMetric EnqueuedAndQueueCount = new DashboardMetric( + "enqueued-queues:count", + "Metrics_EnqueuedQueuesCount", + page => new Metric($"{page.Statistics.Enqueued:N0} / {page.Statistics.Queues:N0}") + { + Style = page.Statistics.Enqueued > 0 ? MetricStyle.Info : MetricStyle.Default, + Highlighted = page.Statistics.Enqueued > 0 + }); + + public static readonly DashboardMetric ScheduledCount = new DashboardMetric( + "scheduled:count", + "Metrics_ScheduledJobs", + page => new Metric(page.Statistics.Scheduled.ToString("N0")) + { + Style = page.Statistics.Scheduled > 0 ? MetricStyle.Info : MetricStyle.Default + }); + + public static readonly DashboardMetric ProcessingCount = new DashboardMetric( + "processing:count", + "Metrics_ProcessingJobs", + page => new Metric(page.Statistics.Processing.ToString("N0")) + { + Style = page.Statistics.Processing > 0 ? MetricStyle.Warning : MetricStyle.Default + }); + + public static readonly DashboardMetric SucceededCount = new DashboardMetric( + "succeeded:count", + "Metrics_SucceededJobs", + page => new Metric(page.Statistics.Succeeded.ToString("N0")) + { + IntValue = page.Statistics.Succeeded + }); + + public static readonly DashboardMetric FailedCount = new DashboardMetric( + "failed:count", + "Metrics_FailedJobs", + page => new Metric(page.Statistics.Failed.ToString("N0")) + { + IntValue = page.Statistics.Failed, + Style = page.Statistics.Failed > 0 ? MetricStyle.Danger : MetricStyle.Default, + Highlighted = page.Statistics.Failed > 0 + }); + + public static readonly DashboardMetric DeletedCount = new DashboardMetric( + "deleted:count", + "Metrics_DeletedJobs", + page => new Metric(page.Statistics.Deleted.ToString("N0"))); + + public static readonly DashboardMetric AwaitingCount = new DashboardMetric( + "awaiting:count", + "Metrics_AwaitingCount", + page => + { + long awaitingCount = -1; + + using (var connection = page.Storage.GetConnection()) + { + var storageConnection = connection as IStorageConnection; + if (storageConnection != null) + { + awaitingCount = storageConnection.GetSetCount("awaiting"); + } + } + + return new Metric(awaitingCount.ToString("N0")) + { + Style = awaitingCount > 0 ? MetricStyle.Info : MetricStyle.Default + }; + }); + } +} diff --git a/src/DotNetCore.CAP/Dashboard/DashboardRequest.cs b/src/DotNetCore.CAP/Dashboard/DashboardRequest.cs new file mode 100644 index 0000000..ee04d5a --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/DashboardRequest.cs @@ -0,0 +1,18 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace DotNetCore.CAP.Dashboard +{ + public abstract class DashboardRequest + { + public abstract string Method { get; } + public abstract string Path { get; } + public abstract string PathBase { get; } + + public abstract string LocalIpAddress { get; } + public abstract string RemoteIpAddress { get; } + + public abstract string GetQuery(string key); + public abstract Task> GetFormValuesAsync(string key); + } +} \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/DashboardResponse.cs b/src/DotNetCore.CAP/Dashboard/DashboardResponse.cs new file mode 100644 index 0000000..7fb9024 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/DashboardResponse.cs @@ -0,0 +1,17 @@ +using System; +using System.IO; +using System.Threading.Tasks; + +namespace DotNetCore.CAP.Dashboard +{ + public abstract class DashboardResponse + { + public abstract string ContentType { get; set; } + public abstract int StatusCode { get; set; } + + public abstract Stream Body { get; } + + public abstract void SetExpire(DateTimeOffset? value); + public abstract Task WriteAsync(string text); + } +} \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/EmbeddedResourceDispatcher.cs b/src/DotNetCore.CAP/Dashboard/EmbeddedResourceDispatcher.cs new file mode 100644 index 0000000..f04ee60 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/EmbeddedResourceDispatcher.cs @@ -0,0 +1,54 @@ +using System; +using System.Reflection; +using System.Threading.Tasks; + +namespace DotNetCore.CAP.Dashboard +{ + internal class EmbeddedResourceDispatcher : IDashboardDispatcher + { + private readonly Assembly _assembly; + private readonly string _resourceName; + private readonly string _contentType; + + public EmbeddedResourceDispatcher( + string contentType, + 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; + } + + public Task Dispatch(DashboardContext context) + { + context.Response.ContentType = _contentType; + context.Response.SetExpire(DateTimeOffset.Now.AddYears(1)); + + WriteResponse(context.Response); + + return Task.FromResult(true); + } + + protected virtual void WriteResponse(DashboardResponse response) + { + WriteResource(response, _assembly, _resourceName); + } + + protected void WriteResource(DashboardResponse response, Assembly assembly, string resourceName) + { + using (var inputStream = assembly.GetManifestResourceStream(resourceName)) + { + if (inputStream == null) + { + throw new ArgumentException($@"Resource with name {resourceName} not found in assembly {assembly}."); + } + + inputStream.CopyTo(response.Body); + } + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/HtmlHelper.cs b/src/DotNetCore.CAP/Dashboard/HtmlHelper.cs new file mode 100644 index 0000000..fa4e52f --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/HtmlHelper.cs @@ -0,0 +1,244 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Text; +using System.ComponentModel; +using System.Reflection; +using System.Text.RegularExpressions; +using DotNetCore.CAP.Dashboard.Resources; +using DotNetCore.CAP.Dashboard.Pages; +using DotNetCore.CAP.Infrastructure; +using DotNetCore.CAP.Models; + +namespace DotNetCore.CAP.Dashboard +{ + public class HtmlHelper + { + private readonly RazorPage _page; + + public HtmlHelper(RazorPage page) + { + if (page == null) throw new ArgumentNullException(nameof(page)); + _page = page; + } + + //public NonEscapedString Breadcrumbs(string title, IDictionary items) + //{ + // if (items == null) throw new ArgumentNullException(nameof(items)); + // return RenderPartial(new Breadcrumbs(title, items)); + //} + + //public NonEscapedString JobsSidebar() + //{ + // return RenderPartial(new SidebarMenu(JobsSidebarMenu.Items)); + //} + + //public NonEscapedString SidebarMenu(IEnumerable> items) + //{ + // if (items == null) throw new ArgumentNullException(nameof(items)); + // return RenderPartial(new SidebarMenu(items)); + //} + + public NonEscapedString BlockMetric(DashboardMetric metric) + { + if (metric == null) throw new ArgumentNullException(nameof(metric)); + return RenderPartial(new BlockMetric(metric)); + } + + public NonEscapedString InlineMetric(DashboardMetric metric) + { + if (metric == null) throw new ArgumentNullException(nameof(metric)); + return RenderPartial(new InlineMetric(metric)); + } + + //public NonEscapedString Paginator(Pager pager) + //{ + // if (pager == null) throw new ArgumentNullException(nameof(pager)); + // return RenderPartial(new Paginator(pager)); + //} + + //public NonEscapedString PerPageSelector(Pager pager) + //{ + // if (pager == null) throw new ArgumentNullException(nameof(pager)); + // return RenderPartial(new PerPageSelector(pager)); + //} + + public NonEscapedString RenderPartial(RazorPage partialPage) + { + partialPage.Assign(_page); + return new NonEscapedString(partialPage.ToString()); + } + + public NonEscapedString Raw(string value) + { + return new NonEscapedString(value); + } + + public NonEscapedString JobId(string jobId, bool shorten = true) + { + Guid guid; + return new NonEscapedString(Guid.TryParse(jobId, out guid) + ? (shorten ? jobId.Substring(0, 8) + "…" : jobId) + : $"#{jobId}"); + } + + public string JobName(Message job) + { + if (job == null) + { + return Strings.Common_CannotFindTargetMethod; + } + + return job.ToString(); + } + + public NonEscapedString StateLabel(string stateName) + { + if (String.IsNullOrWhiteSpace(stateName)) + { + return Raw($"{Strings.Common_NoState}"); + } + + return Raw($"{stateName}"); + } + + public NonEscapedString JobIdLink(string jobId) + { + return Raw($"{JobId(jobId)}"); + } + + public NonEscapedString JobNameLink(string jobId, Message job) + { + return Raw($"{HtmlEncode(JobName(job))}"); + } + + public NonEscapedString RelativeTime(DateTime value) + { + return Raw($"{value}"); + } + + public NonEscapedString MomentTitle(DateTime time, string value) + { + return Raw($"{value}"); + } + + public NonEscapedString LocalTime(DateTime value) + { + return Raw($"{value}"); + } + + public string ToHumanDuration(TimeSpan? duration, bool displaySign = true) + { + if (duration == null) return null; + + var builder = new StringBuilder(); + if (displaySign) + { + builder.Append(duration.Value.TotalMilliseconds < 0 ? "-" : "+"); + } + + duration = duration.Value.Duration(); + + if (duration.Value.Days > 0) + { + builder.Append($"{duration.Value.Days}d "); + } + + if (duration.Value.Hours > 0) + { + builder.Append($"{duration.Value.Hours}h "); + } + + if (duration.Value.Minutes > 0) + { + builder.Append($"{duration.Value.Minutes}m "); + } + + if (duration.Value.TotalHours < 1) + { + if (duration.Value.Seconds > 0) + { + builder.Append(duration.Value.Seconds); + if (duration.Value.Milliseconds > 0) + { + builder.Append($".{duration.Value.Milliseconds.ToString().PadLeft(3, '0')}"); + } + + builder.Append("s "); + } + else + { + if (duration.Value.Milliseconds > 0) + { + builder.Append($"{duration.Value.Milliseconds}ms "); + } + } + } + + if (builder.Length <= 1) + { + builder.Append(" <1ms "); + } + + builder.Remove(builder.Length - 1, 1); + + return builder.ToString(); + } + + public string FormatProperties(IDictionary properties) + { + return String.Join(", ", properties.Select(x => $"{x.Key}: \"{x.Value}\"")); + } + + public NonEscapedString QueueLabel(string queue) + { + var label = queue != null + ? $"{queue}" + : $"{Strings.Common_Unknown}"; + + return new NonEscapedString(label); + } + + public NonEscapedString ServerId(string serverId) + { + var parts = serverId.Split(':'); + var shortenedId = parts.Length > 1 + ? String.Join(":", parts.Take(parts.Length - 1)) + : serverId; + + return new NonEscapedString( + $"{shortenedId}"); + } + + //private static readonly StackTraceHtmlFragments StackTraceHtmlFragments = new StackTraceHtmlFragments + //{ + // BeforeFrame = "" , AfterFrame = "", + // BeforeType = "" , AfterType = "", + // BeforeMethod = "" , AfterMethod = "", + // BeforeParameters = "" , AfterParameters = "", + // BeforeParameterType = "", AfterParameterType = "", + // BeforeParameterName = "" , AfterParameterName = "", + // BeforeFile = "" , AfterFile = "", + // BeforeLine = "" , AfterLine = "", + //}; + + public NonEscapedString StackTrace(string stackTrace) + { + try + { + //return new NonEscapedString(StackTraceFormatter.FormatHtml(stackTrace, StackTraceHtmlFragments)); + return new NonEscapedString(stackTrace); + } + catch (RegexMatchTimeoutException) + { + return new NonEscapedString(HtmlEncode(stackTrace)); + } + } + + public string HtmlEncode(string text) + { + return WebUtility.HtmlEncode(text); + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/IDashboardAuthorizationFilter.cs b/src/DotNetCore.CAP/Dashboard/IDashboardAuthorizationFilter.cs new file mode 100644 index 0000000..741dd1a --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/IDashboardAuthorizationFilter.cs @@ -0,0 +1,7 @@ +namespace DotNetCore.CAP.Dashboard +{ + public interface IDashboardAuthorizationFilter + { + bool Authorize( DashboardContext context); + } +} \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/IDashboardDispatcher.cs b/src/DotNetCore.CAP/Dashboard/IDashboardDispatcher.cs new file mode 100644 index 0000000..fec2faa --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/IDashboardDispatcher.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace DotNetCore.CAP.Dashboard +{ + public interface IDashboardDispatcher + { + Task Dispatch( DashboardContext context); + } +} diff --git a/src/DotNetCore.CAP/Dashboard/IMonitoringApi.cs b/src/DotNetCore.CAP/Dashboard/IMonitoringApi.cs index fad0eae..b7bb626 100644 --- a/src/DotNetCore.CAP/Dashboard/IMonitoringApi.cs +++ b/src/DotNetCore.CAP/Dashboard/IMonitoringApi.cs @@ -1,24 +1,8 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . - using System; using System.Collections.Generic; -using Hangfire.Storage.Monitoring; +using DotNetCore.CAP.Dashboard.Monitoring; -namespace Hangfire.Storage +namespace DotNetCore.CAP.Dashboard { public interface IMonitoringApi { diff --git a/src/DotNetCore.CAP/Dashboard/JobHistoryRenderer.cs b/src/DotNetCore.CAP/Dashboard/JobHistoryRenderer.cs new file mode 100644 index 0000000..04d0d0e --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/JobHistoryRenderer.cs @@ -0,0 +1,258 @@ +using System; +using System.Collections.Generic; +using System.Text; +using DotNetCore.CAP.Infrastructure; +using DotNetCore.CAP.Processor.States; +using Newtonsoft.Json; + +namespace DotNetCore.CAP.Dashboard +{ + public static class JobHistoryRenderer + { + private static readonly IDictionary, NonEscapedString>> + Renderers = new Dictionary, NonEscapedString>>(); + + private static readonly IDictionary BackgroundStateColors + = new Dictionary(); + private static readonly IDictionary ForegroundStateColors + = new Dictionary(); + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline")] + static JobHistoryRenderer() + { + Register(SucceededState.StateName, SucceededRenderer); + Register(FailedState.StateName, FailedRenderer); + Register(ProcessingState.StateName, ProcessingRenderer); + Register(EnqueuedState.StateName, EnqueuedRenderer); + Register(ScheduledState.StateName, ScheduledRenderer); + //Register(DeletedState.StateName, NullRenderer); + //Register(AwaitingState.StateName, AwaitingRenderer); + + BackgroundStateColors.Add(EnqueuedState.StateName, "#F5F5F5"); + BackgroundStateColors.Add(SucceededState.StateName, "#EDF7ED"); + BackgroundStateColors.Add(FailedState.StateName, "#FAEBEA"); + BackgroundStateColors.Add(ProcessingState.StateName, "#FCEFDC"); + BackgroundStateColors.Add(ScheduledState.StateName, "#E0F3F8"); + //BackgroundStateColors.Add(DeletedState.StateName, "#ddd"); + //BackgroundStateColors.Add(AwaitingState.StateName, "#F5F5F5"); + + ForegroundStateColors.Add(EnqueuedState.StateName, "#999"); + ForegroundStateColors.Add(SucceededState.StateName, "#5cb85c"); + ForegroundStateColors.Add(FailedState.StateName, "#d9534f"); + ForegroundStateColors.Add(ProcessingState.StateName, "#f0ad4e"); + ForegroundStateColors.Add(ScheduledState.StateName, "#5bc0de"); + //ForegroundStateColors.Add(DeletedState.StateName, "#777"); + //ForegroundStateColors.Add(AwaitingState.StateName, "#999"); + } + + public static void AddBackgroundStateColor(string stateName, string color) + { + BackgroundStateColors.Add(stateName, color); + } + + public static string GetBackgroundStateColor(string stateName) + { + if (stateName == null || !BackgroundStateColors.ContainsKey(stateName)) + { + return "inherit"; + } + + return BackgroundStateColors[stateName]; + } + + public static void AddForegroundStateColor(string stateName, string color) + { + ForegroundStateColors.Add(stateName, color); + } + + public static string GetForegroundStateColor(string stateName) + { + if (stateName == null || !ForegroundStateColors.ContainsKey(stateName)) + { + return "inherit"; + } + + return ForegroundStateColors[stateName]; + } + + public static void Register(string state, Func, NonEscapedString> renderer) + { + if (!Renderers.ContainsKey(state)) + { + Renderers.Add(state, renderer); + } + else + { + Renderers[state] = renderer; + } + } + + public static bool Exists(string state) + { + return Renderers.ContainsKey(state); + } + + public static NonEscapedString RenderHistory( + this HtmlHelper helper, + string state, IDictionary properties) + { + var renderer = Renderers.ContainsKey(state) + ? Renderers[state] + : DefaultRenderer; + + return renderer?.Invoke(helper, properties); + } + + public static NonEscapedString NullRenderer(HtmlHelper helper, IDictionary properties) + { + return null; + } + + public static NonEscapedString DefaultRenderer(HtmlHelper helper, IDictionary stateData) + { + if (stateData == null || stateData.Count == 0) return null; + + var builder = new StringBuilder(); + builder.Append("
"); + + foreach (var item in stateData) + { + builder.Append($"
{item.Key}
"); + builder.Append($"
{item.Value}
"); + } + + builder.Append("
"); + + return new NonEscapedString(builder.ToString()); + } + + public static NonEscapedString SucceededRenderer(HtmlHelper html, IDictionary stateData) + { + var builder = new StringBuilder(); + builder.Append("
"); + + var itemsAdded = false; + + if (stateData.ContainsKey("Latency")) + { + var latency = TimeSpan.FromMilliseconds(long.Parse(stateData["Latency"])); + + builder.Append($"
Latency:
{html.ToHumanDuration(latency, false)}
"); + + itemsAdded = true; + } + + if (stateData.ContainsKey("PerformanceDuration")) + { + var duration = TimeSpan.FromMilliseconds(long.Parse(stateData["PerformanceDuration"])); + builder.Append($"
Duration:
{html.ToHumanDuration(duration, false)}
"); + + itemsAdded = true; + } + + + if (stateData.ContainsKey("Result") && !String.IsNullOrWhiteSpace(stateData["Result"])) + { + var result = stateData["Result"]; + builder.Append($"
Result:
{System.Net.WebUtility.HtmlEncode(result)}
"); + + itemsAdded = true; + } + + builder.Append("
"); + + if (!itemsAdded) return null; + + return new NonEscapedString(builder.ToString()); + } + + private static NonEscapedString FailedRenderer(HtmlHelper html, IDictionary stateData) + { + var stackTrace = html.StackTrace(stateData["ExceptionDetails"]).ToString(); + return new NonEscapedString( + $"

{stateData["ExceptionType"]}

{stateData["ExceptionMessage"]}

{"
" + stackTrace + "
"}"); + } + + private static NonEscapedString ProcessingRenderer(HtmlHelper helper, IDictionary stateData) + { + var builder = new StringBuilder(); + builder.Append("
"); + + string serverId = null; + + if (stateData.ContainsKey("ServerId")) + { + serverId = stateData["ServerId"]; + } + else if (stateData.ContainsKey("ServerName")) + { + serverId = stateData["ServerName"]; + } + + if (serverId != null) + { + builder.Append("
Server:
"); + builder.Append($"
{helper.ServerId(serverId)}
"); + } + + if (stateData.ContainsKey("WorkerId")) + { + builder.Append("
Worker:
"); + builder.Append($"
{stateData["WorkerId"].Substring(0, 8)}
"); + } + else if (stateData.ContainsKey("WorkerNumber")) + { + builder.Append("
Worker:
"); + builder.Append($"
#{stateData["WorkerNumber"]}
"); + } + + builder.Append("
"); + + return new NonEscapedString(builder.ToString()); + } + + private static NonEscapedString EnqueuedRenderer(HtmlHelper helper, IDictionary stateData) + { + return new NonEscapedString( + $"
Queue:
{helper.QueueLabel(stateData["Queue"])}
"); + } + + private static NonEscapedString ScheduledRenderer(HtmlHelper helper, IDictionary stateData) + { + var enqueueAt = Helper.DeserializeDateTime(stateData["EnqueueAt"]); + + return new NonEscapedString( + $"
Enqueue at:
{enqueueAt}
"); + } + + private static NonEscapedString AwaitingRenderer(HtmlHelper helper, IDictionary stateData) + { + var builder = new StringBuilder(); + + builder.Append("
"); + + if (stateData.ContainsKey("ParentId")) + { + builder.Append($"
Parent
{helper.JobIdLink(stateData["ParentId"])}
"); + } + + if (stateData.ContainsKey("NextState")) + { + var nextState = JsonConvert.DeserializeObject( + stateData["NextState"], + new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All }); + + builder.Append($"
Next State
{helper.StateLabel(nextState.Name)}
"); + } + + if (stateData.ContainsKey("Options")) + { + builder.Append($"
Options
{helper.HtmlEncode(stateData["Options"])}
"); + } + + builder.Append("
"); + + return new NonEscapedString(builder.ToString()); + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/JobsSidebarMenu.cs b/src/DotNetCore.CAP/Dashboard/JobsSidebarMenu.cs new file mode 100644 index 0000000..350af27 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/JobsSidebarMenu.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using DotNetCore.CAP.Dashboard.Resources; + +namespace DotNetCore.CAP.Dashboard +{ + public static class JobsSidebarMenu + { + public static readonly List> Items + = new List>(); + + static JobsSidebarMenu() + { + Items.Add(page => new MenuItem(Strings.JobsSidebarMenu_Enqueued, page.Url.LinkToQueues()) + { + Active = page.RequestPath.StartsWith("/jobs/enqueued"), + Metric = DashboardMetrics.EnqueuedAndQueueCount + }); + + Items.Add(page => new MenuItem(Strings.JobsSidebarMenu_Scheduled, page.Url.To("/jobs/scheduled")) + { + Active = page.RequestPath.StartsWith("/jobs/scheduled"), + Metric = DashboardMetrics.ScheduledCount + }); + + Items.Add(page => new MenuItem(Strings.JobsSidebarMenu_Processing, page.Url.To("/jobs/processing")) + { + Active = page.RequestPath.StartsWith("/jobs/processing"), + Metric = DashboardMetrics.ProcessingCount + }); + + Items.Add(page => new MenuItem(Strings.JobsSidebarMenu_Succeeded, page.Url.To("/jobs/succeeded")) + { + Active = page.RequestPath.StartsWith("/jobs/succeeded"), + Metric = DashboardMetrics.SucceededCount + }); + + Items.Add(page => new MenuItem(Strings.JobsSidebarMenu_Failed, page.Url.To("/jobs/failed")) + { + Active = page.RequestPath.StartsWith("/jobs/failed"), + Metric = DashboardMetrics.FailedCount + }); + + Items.Add(page => new MenuItem(Strings.JobsSidebarMenu_Deleted, page.Url.To("/jobs/deleted")) + { + Active = page.RequestPath.StartsWith("/jobs/deleted"), + Metric = DashboardMetrics.DeletedCount + }); + + Items.Add(page => new MenuItem(Strings.JobsSidebarMenu_Awaiting, page.Url.To("/jobs/awaiting")) + { + Active = page.RequestPath.StartsWith("/jobs/awaiting"), + Metric = DashboardMetrics.AwaitingCount + }); + } + } +} \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/JsonStats.cs b/src/DotNetCore.CAP/Dashboard/JsonStats.cs new file mode 100644 index 0000000..5500bd8 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/JsonStats.cs @@ -0,0 +1,45 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Serialization; + +namespace DotNetCore.CAP.Dashboard +{ + internal class JsonStats : IDashboardDispatcher + { + public async Task Dispatch(DashboardContext context) + { + var requestedMetrics = await context.Request.GetFormValuesAsync("metrics[]"); + var page = new StubPage(); + page.Assign(context); + + var metrics = DashboardMetrics.GetMetrics().Where(x => requestedMetrics.Contains(x.Name)); + var result = new Dictionary(); + + foreach (var metric in metrics) + { + var value = metric.Func(page); + result.Add(metric.Name, value); + } + + var settings = new JsonSerializerSettings + { + ContractResolver = new CamelCasePropertyNamesContractResolver(), + Converters = new JsonConverter[]{ new StringEnumConverter { CamelCaseText = true } } + }; + var serialized = JsonConvert.SerializeObject(result, settings); + + context.Response.ContentType = "application/json"; + await context.Response.WriteAsync(serialized); + } + + private class StubPage : RazorPage + { + public override void Execute() + { + } + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/LocalRequestsOnlyAuthorizationFilter.cs b/src/DotNetCore.CAP/Dashboard/LocalRequestsOnlyAuthorizationFilter.cs new file mode 100644 index 0000000..f8788c3 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/LocalRequestsOnlyAuthorizationFilter.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace DotNetCore.CAP.Dashboard +{ + public class LocalRequestsOnlyAuthorizationFilter : IDashboardAuthorizationFilter + { + public bool Authorize(DashboardContext context) + { + // if unknown, assume not local + if (String.IsNullOrEmpty(context.Request.RemoteIpAddress)) + return false; + + // check if localhost + if (context.Request.RemoteIpAddress == "127.0.0.1" || context.Request.RemoteIpAddress == "::1") + return true; + + // compare with local address + if (context.Request.RemoteIpAddress == context.Request.LocalIpAddress) + return true; + + return false; + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/MenuItem.cs b/src/DotNetCore.CAP/Dashboard/MenuItem.cs new file mode 100644 index 0000000..d6735f8 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/MenuItem.cs @@ -0,0 +1,33 @@ +using System.Collections.Generic; +using System.Linq; + +namespace DotNetCore.CAP.Dashboard +{ + public class MenuItem + { + public MenuItem(string text, string url) + { + Text = text; + Url = url; + } + + public string Text { get; } + public string Url { get; } + + public bool Active { get; set; } + public DashboardMetric Metric { get; set; } + public DashboardMetric[] Metrics { get; set; } + + public IEnumerable GetAllMetrics() + { + var metrics = new List { Metric }; + + if (Metrics != null) + { + metrics.AddRange(Metrics); + } + + return metrics.Where(x => x != null).ToList(); + } + } +} \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/Metric.cs b/src/DotNetCore.CAP/Dashboard/Metric.cs new file mode 100644 index 0000000..50a48f9 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/Metric.cs @@ -0,0 +1,42 @@ + +namespace DotNetCore.CAP.Dashboard +{ + public class Metric + { + public Metric(string value) + { + Value = value; + } + + public string Value { get; } + public long IntValue { get; set; } + public MetricStyle Style { get; set; } + public bool Highlighted { get; set; } + public string Title { get; set; } + } + + public enum MetricStyle + { + Default, + Info, + Success, + Warning, + Danger, + } + + internal static class MetricStyleExtensions + { + public static string ToClassName(this MetricStyle style) + { + switch (style) + { + case MetricStyle.Default: return "metric-default"; + 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"; + } + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/DeletedJobDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/DeletedJobDto.cs index 7e35d9d..bdc2bd6 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/DeletedJobDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/DeletedJobDto.cs @@ -1,7 +1,7 @@ using System; -using Hangfire.Common; +using DotNetCore.CAP.Models; -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class DeletedJobDto { @@ -10,7 +10,7 @@ namespace Hangfire.Storage.Monitoring InDeletedState = true; } - public Job Job { get; set; } + public Message Message { get; set; } public DateTime? DeletedAt { get; set; } public bool InDeletedState { get; set; } } diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/EnqueuedJobDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/EnqueuedJobDto.cs index df215b6..4ec62dd 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/EnqueuedJobDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/EnqueuedJobDto.cs @@ -1,23 +1,7 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . +using System; +using DotNetCore.CAP.Models; -using System; -using Hangfire.Common; - -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class EnqueuedJobDto { @@ -26,7 +10,7 @@ namespace Hangfire.Storage.Monitoring InEnqueuedState = true; } - public Job Job { get; set; } + public Message Message { get; set; } public string State { get; set; } public DateTime? EnqueuedAt { get; set; } public bool InEnqueuedState { get; set; } diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/FailedJobDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/FailedJobDto.cs index 51e7016..75fff5a 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/FailedJobDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/FailedJobDto.cs @@ -1,23 +1,7 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . +using System; +using DotNetCore.CAP.Models; -using System; -using Hangfire.Common; - -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class FailedJobDto { @@ -26,7 +10,7 @@ namespace Hangfire.Storage.Monitoring InFailedState = true; } - public Job Job { get; set; } + public Message Message { get; set; } public string Reason { get; set; } public DateTime? FailedAt { get; set; } public string ExceptionType { get; set; } diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/FetchedJobDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/FetchedJobDto.cs index 2f57176..7794982 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/FetchedJobDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/FetchedJobDto.cs @@ -1,27 +1,11 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . +using System; +using DotNetCore.CAP.Models; -using System; -using Hangfire.Common; - -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class FetchedJobDto { - public Job Job { get; set; } + public Message Message { get; set; } public string State { get; set; } public DateTime? FetchedAt { get; set; } } diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/JobDetailsDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/JobDetailsDto.cs index fd96e06..f63a8ba 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/JobDetailsDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/JobDetailsDto.cs @@ -1,28 +1,12 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . - -using System; +using System; using System.Collections.Generic; -using Hangfire.Common; +using DotNetCore.CAP.Models; -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class JobDetailsDto { - public Job Job { get; set; } + public Message Message { get; set; } public DateTime? CreatedAt { get; set; } public IDictionary Properties { get; set; } public IList History { get; set; } diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/JobList.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/JobList.cs index 69a38e9..5099afb 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/JobList.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/JobList.cs @@ -1,22 +1,6 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . - using System.Collections.Generic; -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class JobList : List> { diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/ProcessingJobDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/ProcessingJobDto.cs index ef6b9c5..7e5f81e 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/ProcessingJobDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/ProcessingJobDto.cs @@ -1,23 +1,7 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . +using System; +using DotNetCore.CAP.Models; -using System; -using Hangfire.Common; - -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class ProcessingJobDto { @@ -26,7 +10,7 @@ namespace Hangfire.Storage.Monitoring InProcessingState = true; } - public Job Job { get; set; } + public Message Message { get; set; } public bool InProcessingState { get; set; } public string ServerId { get; set; } public DateTime? StartedAt { get; set; } diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/QueueWithTopEnqueuedJobsDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/QueueWithTopEnqueuedJobsDto.cs index 14fb5dc..ec40525 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/QueueWithTopEnqueuedJobsDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/QueueWithTopEnqueuedJobsDto.cs @@ -1,20 +1,4 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . - -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class QueueWithTopEnqueuedJobsDto { diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/ScheduledJobDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/ScheduledJobDto.cs index 13d3644..fa6840e 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/ScheduledJobDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/ScheduledJobDto.cs @@ -1,23 +1,7 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . +using System; +using DotNetCore.CAP.Models; -using System; -using Hangfire.Common; - -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class ScheduledJobDto { @@ -26,7 +10,7 @@ namespace Hangfire.Storage.Monitoring InScheduledState = true; } - public Job Job { get; set; } + public Message Message { get; set; } public DateTime EnqueueAt { get; set; } public DateTime? ScheduledAt { get; set; } public bool InScheduledState { get; set; } diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/ServerDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/ServerDto.cs index 7ae2894..f1932cb 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/ServerDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/ServerDto.cs @@ -1,23 +1,7 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . - -using System; +using System; using System.Collections.Generic; -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class ServerDto { diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/StateHistoryDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/StateHistoryDto.cs index 0506c2c..0f391e8 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/StateHistoryDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/StateHistoryDto.cs @@ -1,23 +1,7 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . - -using System; +using System; using System.Collections.Generic; -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class StateHistoryDto { diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/StatisticsDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/StatisticsDto.cs index 3ec9229..56048ac 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/StatisticsDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/StatisticsDto.cs @@ -1,20 +1,4 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . - -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class StatisticsDto { diff --git a/src/DotNetCore.CAP/Dashboard/Monitoring/SucceededJobDto.cs b/src/DotNetCore.CAP/Dashboard/Monitoring/SucceededJobDto.cs index b222b99..6487d0a 100644 --- a/src/DotNetCore.CAP/Dashboard/Monitoring/SucceededJobDto.cs +++ b/src/DotNetCore.CAP/Dashboard/Monitoring/SucceededJobDto.cs @@ -1,7 +1,7 @@ using System; -using Hangfire.Common; +using DotNetCore.CAP.Models; -namespace Hangfire.Storage.Monitoring +namespace DotNetCore.CAP.Dashboard.Monitoring { public class SucceededJobDto { @@ -10,7 +10,7 @@ namespace Hangfire.Storage.Monitoring InSucceededState = true; } - public Job Job { get; set; } + public Message Message { get; set; } public object Result { get; set; } public long? TotalDuration { get; set; } public DateTime? SucceededAt { get; set; } diff --git a/src/DotNetCore.CAP/Dashboard/NavigationMenu.cs b/src/DotNetCore.CAP/Dashboard/NavigationMenu.cs new file mode 100644 index 0000000..0ed59c0 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/NavigationMenu.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using DotNetCore.CAP.Dashboard.Resources; + +namespace DotNetCore.CAP.Dashboard +{ + public static class NavigationMenu + { + public static readonly List> Items = new List>(); + + static NavigationMenu() + { + Items.Add(page => new MenuItem(Strings.NavigationMenu_Jobs, page.Url.LinkToQueues()) + { + Active = page.RequestPath.StartsWith("/jobs"), + Metrics = new [] + { + DashboardMetrics.EnqueuedCountOrNull, + DashboardMetrics.FailedCountOrNull + } + }); + + Items.Add(page => new MenuItem(Strings.NavigationMenu_Retries, page.Url.To("/retries")) + { + Active = page.RequestPath.StartsWith("/retries"), + Metric = DashboardMetrics.RetriesCount + }); + + Items.Add(page => new MenuItem(Strings.NavigationMenu_RecurringJobs, page.Url.To("/recurring")) + { + Active = page.RequestPath.StartsWith("/recurring"), + Metric = DashboardMetrics.RecurringJobCount + }); + + Items.Add(page => new MenuItem(Strings.NavigationMenu_Servers, page.Url.To("/servers")) + { + Active = page.RequestPath.Equals("/servers"), + Metric = DashboardMetrics.ServerCount + }); + } + } +} \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/NonEscapedString.cs b/src/DotNetCore.CAP/Dashboard/NonEscapedString.cs new file mode 100644 index 0000000..f95cf4f --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/NonEscapedString.cs @@ -0,0 +1,17 @@ +namespace DotNetCore.CAP.Dashboard +{ + public class NonEscapedString + { + private readonly string _value; + + public NonEscapedString(string value) + { + _value = value; + } + + public override string ToString() + { + return _value; + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/Pager.cs b/src/DotNetCore.CAP/Dashboard/Pager.cs new file mode 100644 index 0000000..b964569 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/Pager.cs @@ -0,0 +1,156 @@ +using System; +using System.Collections.Generic; + +namespace DotNetCore.CAP.Dashboard +{ + public class Pager + { + private const int PageItemsCount = 7; + private const int DefaultRecordsPerPage = 10; + + private int _startPageIndex = 1; + private int _endPageIndex = 1; + + public Pager(int from, int perPage, long total) + { + FromRecord = from >= 0 ? from : 0; + RecordsPerPage = perPage > 0 ? perPage : DefaultRecordsPerPage; + TotalRecordCount = total; + CurrentPage = FromRecord / RecordsPerPage + 1; + TotalPageCount = (int)Math.Ceiling((double)TotalRecordCount / RecordsPerPage); + + PagerItems = GenerateItems(); + } + + public string BasePageUrl { get; set; } + + public int FromRecord { get; } + public int RecordsPerPage { get; } + public int CurrentPage { get; } + + public int TotalPageCount { get; } + public long TotalRecordCount { get; } + + internal ICollection PagerItems { get; } + + public string PageUrl(int page) + { + if (page < 1 || page > TotalPageCount) return "#"; + + return BasePageUrl + "?from=" + (page - 1) * RecordsPerPage + "&count=" + RecordsPerPage; + } + + public string RecordsPerPageUrl(int perPage) + { + if (perPage <= 0) return "#"; + return BasePageUrl + "?from=0&count=" + perPage; + } + + private ICollection GenerateItems() + { + // start page index + _startPageIndex = CurrentPage - PageItemsCount / 2; + if (_startPageIndex + PageItemsCount > TotalPageCount) + _startPageIndex = TotalPageCount + 1 - PageItemsCount; + if (_startPageIndex < 1) + _startPageIndex = 1; + + // end page index + _endPageIndex = _startPageIndex + PageItemsCount - 1; + if (_endPageIndex > TotalPageCount) + _endPageIndex = TotalPageCount; + + var pagerItems = new List(); + if (TotalPageCount == 0) return pagerItems; + + AddPrevious(pagerItems); + + // first page + if (_startPageIndex > 1) + pagerItems.Add(new Item(1, false, ItemType.Page)); + + // more page before numeric page buttons + AddMoreBefore(pagerItems); + + // numeric page + AddPageNumbers(pagerItems); + + // more page after numeric page buttons + AddMoreAfter(pagerItems); + + // last page + if (_endPageIndex < TotalPageCount) + pagerItems.Add(new Item(TotalPageCount, false, ItemType.Page)); + + // Next page + AddNext(pagerItems); + + return pagerItems; + } + + private void AddPrevious(ICollection results) + { + var item = new Item(CurrentPage - 1, CurrentPage == 1, ItemType.PrevPage); + results.Add(item); + } + + private void AddMoreBefore(ICollection results) + { + if (_startPageIndex > 2) + { + var index = _startPageIndex - 1; + if (index < 1) index = 1; + var item = new Item(index, false, ItemType.MorePage); + results.Add(item); + } + } + + private void AddMoreAfter(ICollection results) + { + if (_endPageIndex < TotalPageCount - 1) + { + var index = _startPageIndex + PageItemsCount; + if (index > TotalPageCount) { index = TotalPageCount; } + var item = new Item(index, false, ItemType.MorePage); + results.Add(item); + } + } + + private void AddPageNumbers(ICollection results) + { + for (var pageIndex = _startPageIndex; pageIndex <= _endPageIndex; pageIndex++) + { + var item = new Item(pageIndex, false, ItemType.Page); + results.Add(item); + } + } + + private void AddNext(ICollection results) + { + var item = new Item(CurrentPage + 1, CurrentPage >= TotalPageCount, ItemType.NextPage); + results.Add(item); + } + + internal class Item + { + public Item(int pageIndex, bool disabled, ItemType type) + { + PageIndex = pageIndex; + Disabled = disabled; + Type = type; + } + + public int PageIndex { get; } + public bool Disabled { get; } + public ItemType Type { get; } + } + + internal enum ItemType + { + Page, + PrevPage, + NextPage, + MorePage + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/Views/AwaitingJobsPage.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/AwaitingJobsPage.cshtml similarity index 92% rename from src/DotNetCore.CAP/Dashboard/Views/AwaitingJobsPage.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/AwaitingJobsPage.cshtml index d3f5e56..582e068 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/AwaitingJobsPage.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/AwaitingJobsPage.cshtml @@ -1,11 +1,10 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: true *@ @using System @using System.Collections.Generic -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@using Hangfire.States -@using Hangfire.Storage +@using DotNetCore.CAP +@using DotNetCore.CAP.Dashboard +@using DotNetCore.CAP.Dashboard.Pages +@using DotNetCore.CAP.Dashboard.Resources @inherits RazorPage @{ Layout = new LayoutPage(Strings.AwaitingJobsPage_Title); @@ -20,7 +19,7 @@ using (var connection = Storage.GetConnection()) { - var storageConnection = connection as JobStorageConnection; + var storageConnection = connection as IStorageConnection; if (storageConnection != null) { @@ -83,7 +82,7 @@ @foreach (var jobId in jobIds) { - JobData jobData; + MessageData jobData; StateData stateData; StateData parentStateData = null; @@ -92,10 +91,10 @@ jobData = connection.GetJobData(jobId); stateData = connection.GetStateData(jobId); - if (stateData != null && stateData.Name == AwaitingState.StateName) - { - parentStateData = connection.GetStateData(stateData.Data["ParentId"]); - } + //if (stateData != null && stateData.Name == AwaitingState.StateName) + //{ + // parentStateData = connection.GetStateData(stateData.Data["ParentId"]); + //} } @@ -112,7 +111,7 @@ else { - @Html.JobNameLink(jobId, jobData.Job) + @Html.JobNameLink(jobId, jobData.Message) @if (stateData != null && stateData.Data.ContainsKey("Options") && !String.IsNullOrWhiteSpace(stateData.Data["Options"])) diff --git a/src/DotNetCore.CAP/Dashboard/Views/BlockMetric.cs b/src/DotNetCore.CAP/Dashboard/Pages/BlockMetric.cs similarity index 83% rename from src/DotNetCore.CAP/Dashboard/Views/BlockMetric.cs rename to src/DotNetCore.CAP/Dashboard/Pages/BlockMetric.cs index 16a5fad..f102675 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/BlockMetric.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/BlockMetric.cs @@ -1,4 +1,4 @@ -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { partial class BlockMetric { diff --git a/src/DotNetCore.CAP/Dashboard/Views/Breadcrumbs.cs b/src/DotNetCore.CAP/Dashboard/Pages/Breadcrumbs.cs similarity index 88% rename from src/DotNetCore.CAP/Dashboard/Views/Breadcrumbs.cs rename to src/DotNetCore.CAP/Dashboard/Pages/Breadcrumbs.cs index 9ef7642..ad66efa 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/Breadcrumbs.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/Breadcrumbs.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { partial class Breadcrumbs { diff --git a/src/DotNetCore.CAP/Dashboard/Views/HomePage.cs b/src/DotNetCore.CAP/Dashboard/Pages/HomePage.cs similarity index 52% rename from src/DotNetCore.CAP/Dashboard/Views/HomePage.cs rename to src/DotNetCore.CAP/Dashboard/Pages/HomePage.cs index 395f40b..d2ed24e 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/HomePage.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/HomePage.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { - partial class HomePage + internal partial class HomePage { - public static readonly List Metrics = new List(); + public static readonly List Metrics = new List(); } } diff --git a/src/DotNetCore.CAP/Dashboard/Views/HomePage.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/HomePage.cshtml similarity index 95% rename from src/DotNetCore.CAP/Dashboard/Views/HomePage.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/HomePage.cshtml index 5ae1bf9..099064a 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/HomePage.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/HomePage.cshtml @@ -1,9 +1,9 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ @using System @using System.Collections.Generic -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources +@using DotNetCore.CAP.Dashboard +@using DotNetCore.CAP.Dashboard.Pages +@using DotNetCore.CAP.Dashboard.Resources @using Newtonsoft.Json @inherits RazorPage @{ diff --git a/src/DotNetCore.CAP/Dashboard/Views/HomePage.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/HomePage.generated.cs similarity index 98% rename from src/DotNetCore.CAP/Dashboard/Views/HomePage.generated.cs rename to src/DotNetCore.CAP/Dashboard/Pages/HomePage.generated.cs index ca7681f..8d67de0 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/HomePage.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/HomePage.generated.cs @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { #line 2 "..\..\Dashboard\Pages\HomePage.cshtml" @@ -27,19 +27,19 @@ namespace Hangfire.Dashboard.Pages using System.Text; #line 4 "..\..\Dashboard\Pages\HomePage.cshtml" - using Hangfire.Dashboard; + using DotNetCore.CAP.Dashboard; #line default #line hidden #line 5 "..\..\Dashboard\Pages\HomePage.cshtml" - using Hangfire.Dashboard.Pages; + using DotNetCore.CAP.Dashboard.Pages; #line default #line hidden #line 6 "..\..\Dashboard\Pages\HomePage.cshtml" - using Hangfire.Dashboard.Resources; + using DotNetCore.CAP.Dashboard.Resources; #line default #line hidden diff --git a/src/DotNetCore.CAP/Dashboard/Views/InlineMetric.cs b/src/DotNetCore.CAP/Dashboard/Pages/InlineMetric.cs similarity index 70% rename from src/DotNetCore.CAP/Dashboard/Views/InlineMetric.cs rename to src/DotNetCore.CAP/Dashboard/Pages/InlineMetric.cs index b754d7d..d02f228 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/InlineMetric.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/InlineMetric.cs @@ -1,6 +1,6 @@ -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { - partial class InlineMetric + internal partial class InlineMetric { public InlineMetric(DashboardMetric dashboardMetric) { diff --git a/src/DotNetCore.CAP/Dashboard/Views/LayoutPage.cs b/src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.cs similarity index 79% rename from src/DotNetCore.CAP/Dashboard/Views/LayoutPage.cs rename to src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.cs index 9ade99b..9cbd688 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/LayoutPage.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.cs @@ -1,4 +1,4 @@ -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { partial class LayoutPage { diff --git a/src/DotNetCore.CAP/Dashboard/Views/LayoutPage.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.cshtml similarity index 96% rename from src/DotNetCore.CAP/Dashboard/Views/LayoutPage.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.cshtml index 4338c87..3d927df 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/LayoutPage.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.cshtml @@ -2,9 +2,9 @@ @using System @using System.Globalization @using System.Reflection -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources +@using DotNetCore.CAP.Dashboard +@using DotNetCore.CAP.Dashboard.Pages +@using DotNetCore.CAP.Dashboard.Resources @inherits RazorPage diff --git a/src/DotNetCore.CAP/Dashboard/Views/LayoutPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.generated.cs similarity index 98% rename from src/DotNetCore.CAP/Dashboard/Views/LayoutPage.generated.cs rename to src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.generated.cs index 91ab133..1bc5b6a 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/LayoutPage.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.generated.cs @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { #line 2 "..\..\Dashboard\Pages\LayoutPage.cshtml" @@ -34,19 +34,19 @@ namespace Hangfire.Dashboard.Pages using System.Text; #line 5 "..\..\Dashboard\Pages\LayoutPage.cshtml" - using Hangfire.Dashboard; + using DotNetCore.CAP.Dashboard; #line default #line hidden #line 6 "..\..\Dashboard\Pages\LayoutPage.cshtml" - using Hangfire.Dashboard.Pages; + using DotNetCore.CAP.Dashboard.Pages; #line default #line hidden #line 7 "..\..\Dashboard\Pages\LayoutPage.cshtml" - using Hangfire.Dashboard.Resources; + using DotNetCore.CAP.Dashboard.Resources; #line default #line hidden diff --git a/src/DotNetCore.CAP/Dashboard/Views/ProcessingJobsPage.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/ProcessingJobsPage.cshtml similarity index 97% rename from src/DotNetCore.CAP/Dashboard/Views/ProcessingJobsPage.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/ProcessingJobsPage.cshtml index 6850ed7..af50fb9 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/ProcessingJobsPage.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/ProcessingJobsPage.cshtml @@ -1,9 +1,9 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ @using System @using System.Linq -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources +@using DotNetCore.CAP.Dashboard +@using DotNetCore.CAP.Dashboard.Pages +@using DotNetCore.CAP.Dashboard.Resources @inherits RazorPage @{ Layout = new LayoutPage(Strings.ProcessingJobsPage_Title); diff --git a/src/DotNetCore.CAP/Dashboard/Pages/SidebarMenu.cs b/src/DotNetCore.CAP/Dashboard/Pages/SidebarMenu.cs new file mode 100644 index 0000000..285fcde --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/Pages/SidebarMenu.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; + +namespace DotNetCore.CAP.Dashboard.Pages +{ + partial class SidebarMenu + { + public SidebarMenu( IEnumerable> items) + { + if (items == null) throw new ArgumentNullException(nameof(items)); + Items = items; + } + + public IEnumerable> Items { get; } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/Views/SucceededJobs.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/SucceededJobs.cshtml similarity index 97% rename from src/DotNetCore.CAP/Dashboard/Views/SucceededJobs.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/SucceededJobs.cshtml index 05d68a3..581185a 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/SucceededJobs.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/SucceededJobs.cshtml @@ -1,8 +1,8 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ @using System -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources +@using DotNetCore.CAP.Dashboard +@using DotNetCore.CAP.Dashboard.Pages +@using DotNetCore.CAP.Dashboard.Resources @inherits RazorPage @{ Layout = new LayoutPage(Strings.SucceededJobsPage_Title); diff --git a/src/DotNetCore.CAP/Dashboard/Views/_BlockMetric.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/_BlockMetric.cshtml similarity index 82% rename from src/DotNetCore.CAP/Dashboard/Views/_BlockMetric.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/_BlockMetric.cshtml index 279f48a..47abdb4 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_BlockMetric.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/_BlockMetric.cshtml @@ -1,13 +1,13 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True TrimLeadingUnderscores : true *@ -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Resources +@using DotNetCore.CAP.Dashboard +@using DotNetCore.CAP.Dashboard.Resources @inherits RazorPage @{ var metric = DashboardMetric.Func(this); var className = metric == null ? "metric-null" : metric.Style.ToClassName(); var highlighted = metric != null && metric.Highlighted ? "highlighted" : null; } -
+
@(metric?.Value)
diff --git a/src/DotNetCore.CAP/Dashboard/Views/_BlockMetric.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/_BlockMetric.generated.cs similarity index 95% rename from src/DotNetCore.CAP/Dashboard/Views/_BlockMetric.generated.cs rename to src/DotNetCore.CAP/Dashboard/Pages/_BlockMetric.generated.cs index 9eaa616..e8ad9cc 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_BlockMetric.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_BlockMetric.generated.cs @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { using System; using System.Collections.Generic; @@ -17,13 +17,13 @@ namespace Hangfire.Dashboard.Pages using System.Text; #line 2 "..\..\Dashboard\Pages\_BlockMetric.cshtml" - using Hangfire.Dashboard; + using DotNetCore.CAP.Dashboard; #line default #line hidden #line 3 "..\..\Dashboard\Pages\_BlockMetric.cshtml" - using Hangfire.Dashboard.Resources; + using DotNetCore.CAP.Dashboard.Resources; #line default #line hidden diff --git a/src/DotNetCore.CAP/Dashboard/Views/_Breadcrumbs.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/_Breadcrumbs.cshtml similarity index 90% rename from src/DotNetCore.CAP/Dashboard/Views/_Breadcrumbs.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/_Breadcrumbs.cshtml index 542c380..590b8d6 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_Breadcrumbs.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/_Breadcrumbs.cshtml @@ -1,5 +1,5 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True TrimLeadingUnderscores : true *@ -@using Hangfire.Dashboard +@using DotNetCore.CAP.Dashboard @inherits RazorPage
    diff --git a/src/DotNetCore.CAP/Dashboard/Views/_InlineMetric.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/_InlineMetric.cshtml similarity index 85% rename from src/DotNetCore.CAP/Dashboard/Views/_InlineMetric.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/_InlineMetric.cshtml index 1e2ce76..988d74f 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_InlineMetric.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/_InlineMetric.cshtml @@ -1,5 +1,5 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True TrimLeadingUnderscores : true *@ -@using Hangfire.Dashboard +@using DotNetCore.CAP.Dashboard @inherits RazorPage @{ var metric = DashboardMetric.Func(this); diff --git a/src/DotNetCore.CAP/Dashboard/Views/_InlineMetric.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/_InlineMetric.generated.cs similarity index 96% rename from src/DotNetCore.CAP/Dashboard/Views/_InlineMetric.generated.cs rename to src/DotNetCore.CAP/Dashboard/Pages/_InlineMetric.generated.cs index da953bc..e6f9833 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_InlineMetric.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_InlineMetric.generated.cs @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { using System; using System.Collections.Generic; @@ -17,7 +17,7 @@ namespace Hangfire.Dashboard.Pages using System.Text; #line 2 "..\..\Dashboard\Pages\_InlineMetric.cshtml" - using Hangfire.Dashboard; + using DotNetCore.CAP.Dashboard; #line default #line hidden diff --git a/src/DotNetCore.CAP/Dashboard/Views/_Navigation.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/_Navigation.cshtml similarity index 95% rename from src/DotNetCore.CAP/Dashboard/Views/_Navigation.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/_Navigation.cshtml index 3fb3900..f9575b3 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_Navigation.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/_Navigation.cshtml @@ -1,5 +1,5 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True TrimLeadingUnderscores : true *@ -@using Hangfire.Dashboard +@using DotNetCore.CAP.Dashboard @inherits RazorPage @if (NavigationMenu.Items.Count > 0) { diff --git a/src/DotNetCore.CAP/Dashboard/Views/_Navigation.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/_Navigation.generated.cs similarity index 97% rename from src/DotNetCore.CAP/Dashboard/Views/_Navigation.generated.cs rename to src/DotNetCore.CAP/Dashboard/Pages/_Navigation.generated.cs index c25d339..4f08933 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_Navigation.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_Navigation.generated.cs @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { using System; using System.Collections.Generic; @@ -17,7 +17,7 @@ namespace Hangfire.Dashboard.Pages using System.Text; #line 2 "..\..\Dashboard\Pages\_Navigation.cshtml" - using Hangfire.Dashboard; + using DotNetCore.CAP.Dashboard; #line default #line hidden diff --git a/src/DotNetCore.CAP/Dashboard/Views/_Paginator.cs b/src/DotNetCore.CAP/Dashboard/Pages/_Paginator.cs similarity index 79% rename from src/DotNetCore.CAP/Dashboard/Views/_Paginator.cs rename to src/DotNetCore.CAP/Dashboard/Pages/_Paginator.cs index 41b6d91..babfc06 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_Paginator.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_Paginator.cs @@ -1,4 +1,4 @@ -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { partial class Paginator { diff --git a/src/DotNetCore.CAP/Dashboard/Views/_Paginator.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/_Paginator.cshtml similarity index 95% rename from src/DotNetCore.CAP/Dashboard/Views/_Paginator.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/_Paginator.cshtml index 19d055c..ab70d2b 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_Paginator.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/_Paginator.cshtml @@ -1,6 +1,6 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True TrimLeadingUnderscores : true *@ -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Resources; +@using DotNetCore.CAP.Dashboard +@using DotNetCore.CAP.Dashboard.Resources; @inherits RazorPage
    diff --git a/src/DotNetCore.CAP/Dashboard/Views/_PerPageSelector.cs b/src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.cs similarity index 80% rename from src/DotNetCore.CAP/Dashboard/Views/_PerPageSelector.cs rename to src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.cs index c12b5f0..d1ffb7d 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_PerPageSelector.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.cs @@ -1,4 +1,4 @@ -namespace Hangfire.Dashboard.Pages +namespace DotNetCore.CAP.Dashboard.Pages { partial class PerPageSelector { diff --git a/src/DotNetCore.CAP/Dashboard/Views/_PerPageSelector.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.cshtml similarity index 87% rename from src/DotNetCore.CAP/Dashboard/Views/_PerPageSelector.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.cshtml index 6242fa7..2c2fb46 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_PerPageSelector.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.cshtml @@ -1,6 +1,6 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True TrimLeadingUnderscores : true *@ -@using Hangfire.Dashboard.Resources; -@inherits Hangfire.Dashboard.RazorPage +@using DotNetCore.CAP.Dashboard.Resources; +@inherits DotNetCore.CAP.Dashboard.RazorPage
    @foreach (var count in new[] { 10, 20, 50, 100, 500 }) diff --git a/src/DotNetCore.CAP/Dashboard/Views/_SidebarMenu.cshtml b/src/DotNetCore.CAP/Dashboard/Pages/_SidebarMenu.cshtml similarity index 95% rename from src/DotNetCore.CAP/Dashboard/Views/_SidebarMenu.cshtml rename to src/DotNetCore.CAP/Dashboard/Pages/_SidebarMenu.cshtml index caf6b8e..8944a65 100644 --- a/src/DotNetCore.CAP/Dashboard/Views/_SidebarMenu.cshtml +++ b/src/DotNetCore.CAP/Dashboard/Pages/_SidebarMenu.cshtml @@ -1,5 +1,5 @@ @* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True TrimLeadingUnderscores : true *@ -@using Hangfire.Dashboard +@using DotNetCore.CAP.Dashboard @inherits RazorPage @if (Items.Any()) { diff --git a/src/DotNetCore.CAP/Dashboard/RazorPage.cs b/src/DotNetCore.CAP/Dashboard/RazorPage.cs index e9bc145..b69b730 100644 --- a/src/DotNetCore.CAP/Dashboard/RazorPage.cs +++ b/src/DotNetCore.CAP/Dashboard/RazorPage.cs @@ -1,26 +1,11 @@ -// This file is part of Hangfire. -// Copyright © 2013-2014 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . - -using System; +using System; using System.Diagnostics; using System.Net; using System.Text; -using Hangfire.Storage.Monitoring; +using System.Threading.Tasks; +using DotNetCore.CAP.Dashboard.Monitoring; -namespace Hangfire.Dashboard +namespace DotNetCore.CAP.Dashboard { public abstract class RazorPage { @@ -39,7 +24,7 @@ namespace Hangfire.Dashboard public HtmlHelper Html { get; private set; } public UrlHelper Url { get; private set; } - public JobStorage Storage { get; internal set; } + public IStorage Storage { get; internal set; } public string AppPath { get; internal set; } public int StatsPollingInterval { get; internal set; } public Stopwatch GenerationTime { get; private set; } diff --git a/src/DotNetCore.CAP/Dashboard/RazorPageDispatcher.cs b/src/DotNetCore.CAP/Dashboard/RazorPageDispatcher.cs new file mode 100644 index 0000000..79359c5 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/RazorPageDispatcher.cs @@ -0,0 +1,26 @@ +using System; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +namespace DotNetCore.CAP.Dashboard +{ + internal class RazorPageDispatcher : IDashboardDispatcher + { + private readonly Func _pageFunc; + + public RazorPageDispatcher(Func pageFunc) + { + _pageFunc = pageFunc; + } + + public Task Dispatch(DashboardContext context) + { + context.Response.ContentType = "text/html"; + + var page = _pageFunc(context.UriMatch); + page.Assign(context); + + return context.Response.WriteAsync(page.ToString()); + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/UrlHelper.cs b/src/DotNetCore.CAP/Dashboard/UrlHelper.cs new file mode 100644 index 0000000..cbfb2e8 --- /dev/null +++ b/src/DotNetCore.CAP/Dashboard/UrlHelper.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; + +namespace DotNetCore.CAP.Dashboard +{ + public class UrlHelper + { + + private readonly DashboardContext _context; + + public UrlHelper( DashboardContext context) + { + if (context == null) throw new ArgumentNullException(nameof(context)); + _context = context; + } + + public string To(string relativePath) + { + return + _context.Request.PathBase + + relativePath; + } + + public string Home() + { + return To("/"); + } + + public string JobDetails(string jobId) + { + return To("/jobs/details/" + jobId); + } + + public string LinkToQueues() + { + return To("/jobs/enqueued"); + } + + public string Queue(string queue) + { + return To("/jobs/enqueued/" + queue); + } + } +} diff --git a/src/DotNetCore.CAP/Dashboard/Views/AwaitingJobsPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/AwaitingJobsPage.generated.cs deleted file mode 100644 index 3fb6163..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/AwaitingJobsPage.generated.cs +++ /dev/null @@ -1,638 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - - #line 2 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - using System; - - #line default - #line hidden - - #line 3 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - using System.Collections.Generic; - - #line default - #line hidden - using System.Linq; - using System.Text; - - #line 4 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 5 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 6 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - #line 7 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - using Hangfire.States; - - #line default - #line hidden - - #line 8 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - using Hangfire.Storage; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class AwaitingJobsPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - - - - #line 10 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - - Layout = new LayoutPage(Strings.AwaitingJobsPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - List jobIds = null; - Pager pager = null; - - using (var connection = Storage.GetConnection()) - { - var storageConnection = connection as JobStorageConnection; - - if (storageConnection != null) - { - pager = new Pager(from, perPage, storageConnection.GetSetCount("awaiting")); - jobIds = storageConnection.GetRangeFromSet("awaiting", pager.FromRecord, pager.FromRecord + pager.RecordsPerPage - 1); - } - } - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 35 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Html.JobsSidebar()); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n

    "); - - - - #line 38 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Strings.AwaitingJobsPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 40 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - if (jobIds == null) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n

    "); - - - - #line 43 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Strings.AwaitingJobsPage_ContinuationsWarning_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n

    "); - - - - #line 44 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Strings.AwaitingJobsPage_ContinuationsWarning_Text); - - - #line default - #line hidden -WriteLiteral("

    \r\n
    \r\n"); - - - - #line 46 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - } - else if (jobIds.Count > 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n \r\n\r\n \r\n\r\n "); - - - - #line 66 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Html.PerPageSelector(pager)); - - - #line default - #line hidden -WriteLiteral(@" -
    - -
    - - - - - \r\n \r\n \r\n \r\n \r\n \r\n \r\n " + -" \r\n"); - - - - #line 84 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - foreach (var jobId in jobIds) - { - JobData jobData; - StateData stateData; - StateData parentStateData = null; - - using (var connection = Storage.GetConnection()) - { - jobData = connection.GetJobData(jobId); - stateData = connection.GetStateData(jobId); - - if (stateData != null && stateData.Name == AwaitingState.StateName) - { - parentStateData = connection.GetStateData(stateData.Data["ParentId"]); - } - } - - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n " + -" \r\n"); - - - - #line 108 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - if (jobData == null) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 111 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - - #line 144 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 146 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    - - "); - - - - #line 76 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 77 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 78 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Strings.AwaitingJobsPage_Table_Options); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 79 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Strings.AwaitingJobsPage_Table_Parent); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 80 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Strings.Common_Created); - - - #line default - #line hidden -WriteLiteral("
    \r\n <" + -"/div>\r\n "); - - - - #line 150 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Html.Paginator(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 152 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 156 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - Write(Strings.AwaitingJobsPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 158 "..\..\Dashboard\Pages\AwaitingJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n"); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/DeletedJobsPage.cshtml b/src/DotNetCore.CAP/Dashboard/Views/DeletedJobsPage.cshtml deleted file mode 100644 index 9d84703..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/DeletedJobsPage.cshtml +++ /dev/null @@ -1,102 +0,0 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@inherits RazorPage -@{ - Layout = new LayoutPage(Strings.DeletedJobsPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.DeletedListCount()); - var jobs = monitor.DeletedJobs(pager.FromRecord, pager.RecordsPerPage); -} - -
    -
    - @Html.JobsSidebar() -
    -
    -

    @Strings.DeletedJobsPage_Title

    - - @if (pager.TotalPageCount == 0) - { -
    - @Strings.DeletedJobsPage_NoJobs -
    - } - else - { -
    -
    - - @Html.PerPageSelector(pager) -
    -
    - - - - - - - - - - - @foreach (var job in jobs) - { - - - - - @if (job.Value == null) - { - - } - else - { - - - } - - } - -
    - - @Strings.Common_Id@Strings.Common_Job@Strings.DeletedJobsPage_Table_Deleted
    - @if (job.Value == null || job.Value.InDeletedState) - { - - } - - @Html.JobIdLink(job.Key) - @if (job.Value != null && !job.Value.InDeletedState) - { - - } - @Strings.Common_JobExpired - @Html.JobNameLink(job.Key, job.Value.Job) - - @if (job.Value.DeletedAt.HasValue) - { - @Html.RelativeTime(job.Value.DeletedAt.Value) - } -
    -
    - - @Html.Paginator(pager) -
    - } -
    -
    - diff --git a/src/DotNetCore.CAP/Dashboard/Views/DeletedJobsPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/DeletedJobsPage.generated.cs deleted file mode 100644 index ead5476..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/DeletedJobsPage.generated.cs +++ /dev/null @@ -1,433 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - - #line 2 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 3 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 4 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class DeletedJobsPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - #line 6 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - - Layout = new LayoutPage(Strings.DeletedJobsPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.DeletedListCount()); - var jobs = monitor.DeletedJobs(pager.FromRecord, pager.RecordsPerPage); - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 21 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - Write(Html.JobsSidebar()); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n

    "); - - - - #line 24 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - Write(Strings.DeletedJobsPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 26 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - if (pager.TotalPageCount == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 29 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - Write(Strings.DeletedJobsPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 31 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n \r\n "); - - - - #line 43 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - Write(Html.PerPageSelector(pager)); - - - #line default - #line hidden -WriteLiteral(@" -
    -
    - - - - - \r\n \r\n \r\n \r\n \r\n " + -" \r\n"); - - - - #line 58 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - foreach (var job in jobs) - { - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n \r\n "); - - - - #line 68 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - Write(Html.JobIdLink(job.Key)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 69 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - if (job.Value != null && !job.Value.InDeletedState) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 72 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n\r\n"); - - - - #line 75 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - if (job.Value == null) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 78 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - - #line 90 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 92 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    - - "); - - - - #line 52 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 53 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 54 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - Write(Strings.DeletedJobsPage_Table_Deleted); - - - #line default - #line hidden -WriteLiteral("
    \r\n <" + -"/div>\r\n\r\n "); - - - - #line 97 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - Write(Html.Paginator(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 99 "..\..\Dashboard\Pages\DeletedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n\r\n"); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.cs b/src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.cs deleted file mode 100644 index 92cb45c..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Hangfire.Dashboard.Pages -{ - partial class EnqueuedJobsPage - { - public EnqueuedJobsPage(string queue) - { - Queue = queue; - } - - public string Queue { get; } - } -} diff --git a/src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.cshtml b/src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.cshtml deleted file mode 100644 index b426e9c..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.cshtml +++ /dev/null @@ -1,118 +0,0 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ -@using System.Collections -@using System.Collections.Generic -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@inherits RazorPage -@{ - Layout = new LayoutPage(Queue.ToUpperInvariant()); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.EnqueuedCount(Queue)); - var enqueuedJobs = monitor.EnqueuedJobs(Queue, pager.FromRecord, pager.RecordsPerPage); -} - -
    -
    - @Html.JobsSidebar() -
    -
    - @Html.Breadcrumbs(Queue.ToUpperInvariant(), new Dictionary - { - { "Queues", Url.LinkToQueues() } - }) - -

    @Queue.ToUpperInvariant() @Strings.EnqueuedJobsPage_Title

    - - @if (pager.TotalPageCount == 0) - { -
    - @Strings.EnqueuedJobsPage_NoJobs -
    - } - else - { -
    -
    - - - @Html.PerPageSelector(pager) -
    - -
    - - - - - - - - - - - - @foreach (var job in enqueuedJobs) - { - - - - @if (job.Value == null) - { - - } - else - { - - - - } - - } - -
    - - @Strings.Common_Id@Strings.Common_State@Strings.Common_Job@Strings.Common_Enqueued
    - @if (job.Value != null) - { - - } - - @Html.JobIdLink(job.Key) - @if (job.Value != null && !job.Value.InEnqueuedState) - { - - } - @Strings.Common_JobExpired - @Html.StateLabel(job.Value.State) - - @Html.JobNameLink(job.Key, job.Value.Job) - - @if (job.Value.EnqueuedAt.HasValue) - { - @Html.RelativeTime(job.Value.EnqueuedAt.Value) - } - else - { - @Strings.Common_NotAvailable - } -
    -
    - - @Html.Paginator(pager) -
    - } -
    -
    \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.generated.cs deleted file mode 100644 index fcb10da..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/EnqueuedJobsPage.generated.cs +++ /dev/null @@ -1,517 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - using System; - - #line 2 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - using System.Collections; - - #line default - #line hidden - - #line 3 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - using System.Collections.Generic; - - #line default - #line hidden - using System.Linq; - using System.Text; - - #line 4 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 5 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 6 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class EnqueuedJobsPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - - #line 8 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - - Layout = new LayoutPage(Queue.ToUpperInvariant()); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.EnqueuedCount(Queue)); - var enqueuedJobs = monitor.EnqueuedJobs(Queue, pager.FromRecord, pager.RecordsPerPage); - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 23 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Html.JobsSidebar()); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 26 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Html.Breadcrumbs(Queue.ToUpperInvariant(), new Dictionary - { - { "Queues", Url.LinkToQueues() } - })); - - - #line default - #line hidden -WriteLiteral("\r\n\r\n

    "); - - - - #line 31 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Queue.ToUpperInvariant()); - - - #line default - #line hidden -WriteLiteral(" "); - - - - #line 31 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Strings.EnqueuedJobsPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 33 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - if (pager.TotalPageCount == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 36 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Strings.EnqueuedJobsPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 38 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n \r\n\r\n "); - - - - #line 52 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Html.PerPageSelector(pager)); - - - #line default - #line hidden -WriteLiteral(@" -
    - -
    - - - - - \r\n \r\n \r\n \r\n \r\n \r\n " + -" \r\n"); - - - - #line 69 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - foreach (var job in enqueuedJobs) - { - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n \r\n"); - - - - #line 85 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - if (job.Value == null) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 88 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - - #line 107 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 109 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    - - "); - - - - #line 62 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 63 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Strings.Common_State); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 64 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 65 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Strings.Common_Enqueued); - - - #line default - #line hidden -WriteLiteral("
    \r\n <" + -"/div>\r\n\r\n "); - - - - #line 114 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - Write(Html.Paginator(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 116 "..\..\Dashboard\Pages\EnqueuedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/FailedJobsPage.cshtml b/src/DotNetCore.CAP/Dashboard/Views/FailedJobsPage.cshtml deleted file mode 100644 index 67cc7cf..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/FailedJobsPage.cshtml +++ /dev/null @@ -1,135 +0,0 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ -@using System -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@inherits RazorPage -@{ - Layout = new LayoutPage(Strings.FailedJobsPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.FailedCount()); - var failedJobs = monitor.FailedJobs(pager.FromRecord, pager.RecordsPerPage); -} - -
    -
    - @Html.JobsSidebar() -
    -
    -

    @Strings.FailedJobsPage_Title

    - - @if (pager.TotalPageCount == 0) - { -
    - @Strings.FailedJobsPage_NoJobs -
    - } - else - { -
    - @Html.Raw(Strings.FailedJobsPage_FailedJobsNotExpire_Warning_Html) -
    - -
    -
    - - - - - @Html.PerPageSelector(pager) -
    - -
    - - - - - - - - - - - @{ var index = 0; } - @foreach (var job in failedJobs) - { - - - - - - - if (job.Value.InFailedState) - { - - - - } - } - -
    - - @Strings.Common_Id@Strings.FailedJobsPage_Table_Failed@Strings.Common_Job
    - @if (job.Value.InFailedState) - { - - } - - @Html.JobIdLink(job.Key) - @if (!job.Value.InFailedState) - { - - } - - @if (job.Value.FailedAt.HasValue) - { - @Html.RelativeTime(job.Value.FailedAt.Value) - } - -
    - @Html.JobNameLink(job.Key, job.Value.Job) -
    - @if (!String.IsNullOrEmpty(job.Value.ExceptionMessage)) - { - - } -
    - -
    -
    - - @Html.Paginator(pager) -
    - } -
    -
    \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/Views/FailedJobsPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/FailedJobsPage.generated.cs deleted file mode 100644 index e5e2fea..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/FailedJobsPage.generated.cs +++ /dev/null @@ -1,606 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - - #line 2 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - using System; - - #line default - #line hidden - using System.Collections.Generic; - using System.Linq; - using System.Text; - - #line 3 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 4 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 5 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class FailedJobsPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - #line 7 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - - Layout = new LayoutPage(Strings.FailedJobsPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.FailedCount()); - var failedJobs = monitor.FailedJobs(pager.FromRecord, pager.RecordsPerPage); - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 22 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - Write(Html.JobsSidebar()); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n

    "); - - - - #line 25 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - Write(Strings.FailedJobsPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 27 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - if (pager.TotalPageCount == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 30 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - Write(Strings.FailedJobsPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 32 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 36 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - Write(Html.Raw(Strings.FailedJobsPage_FailedJobsNotExpire_Warning_Html)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 38 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n \r\n\r\n \r\n\r\n "); - - - - #line 57 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - Write(Html.PerPageSelector(pager)); - - - #line default - #line hidden -WriteLiteral(@" -
    - -
    - - - - - \r\n \r\n \r\n \r\n \r\n " + -" \r\n"); - - - - #line 73 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - var index = 0; - - - #line default - #line hidden - - - #line 74 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - foreach (var job in failedJobs) - { - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n \r" + -"\n"); - - - - #line 108 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - if (job.Value.InFailedState) - { - - - #line default - #line hidden -WriteLiteral(" \r\n " + -" \r\n \r\n"); - - - - #line 125 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - } - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    - - "); - - - - #line 67 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 68 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - Write(Strings.FailedJobsPage_Table_Failed); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 69 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral("
    \r\n " + -" \r\n " + -"
    \r\n <" + -"/div>\r\n\r\n "); - - - - #line 131 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - Write(Html.Paginator(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 133 "..\..\Dashboard\Pages\FailedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.cs b/src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.cs deleted file mode 100644 index ada3339..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Hangfire.Dashboard.Pages -{ - partial class FetchedJobsPage - { - public FetchedJobsPage(string queue) - { - Queue = queue; - } - - public string Queue { get; } - } -} diff --git a/src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.cshtml b/src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.cshtml deleted file mode 100644 index f29a551..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.cshtml +++ /dev/null @@ -1,121 +0,0 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ -@using System.Collections -@using System.Collections.Generic -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@inherits RazorPage -@{ - Layout = new LayoutPage(Queue.ToUpperInvariant()); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.FetchedCount(Queue)); - var fetchedJobs = monitor.FetchedJobs(Queue, pager.FromRecord, pager.RecordsPerPage); -} - -
    -
    - @Html.JobsSidebar() -
    -
    - @Html.Breadcrumbs(Strings.FetchedJobsPage_Title, new Dictionary - { - { "Queues", Url.LinkToQueues() }, - { Queue.ToUpperInvariant(), Url.Queue(Queue) } - }) - -

    - @Queue.ToUpperInvariant() @Strings.FetchedJobsPage_Title -

    - - @if (pager.TotalPageCount == 0) - { -
    - @Strings.FetchedJobsPage_NoJobs -
    - } - else - { -
    -
    - - - - - @Html.PerPageSelector(pager) -
    - -
    - - - - - - - - - - - - @foreach (var job in fetchedJobs) - { - - - - @if (job.Value == null) - { - - } - else - { - - - - } - - } - -
    - - @Strings.Common_Id@Strings.Common_State@Strings.Common_Job@Strings.Common_Fetched
    - @if (job.Value != null) - { - - } - - @Html.JobIdLink(job.Key) - @Strings.Common_JobExpired - @Html.StateLabel(job.Value.State) - - @Html.JobNameLink(job.Key, job.Value.Job) - - @if (job.Value.FetchedAt.HasValue) - { - @Html.RelativeTime(job.Value.FetchedAt.Value) - } -
    -
    - - @Html.Paginator(pager) -
    - } -
    -
    \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.generated.cs deleted file mode 100644 index 06b71f0..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/FetchedJobsPage.generated.cs +++ /dev/null @@ -1,497 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - using System; - - #line 2 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - using System.Collections; - - #line default - #line hidden - - #line 3 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - using System.Collections.Generic; - - #line default - #line hidden - using System.Linq; - using System.Text; - - #line 4 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 5 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 6 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class FetchedJobsPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - - #line 8 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - - Layout = new LayoutPage(Queue.ToUpperInvariant()); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.FetchedCount(Queue)); - var fetchedJobs = monitor.FetchedJobs(Queue, pager.FromRecord, pager.RecordsPerPage); - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 23 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Html.JobsSidebar()); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 26 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Html.Breadcrumbs(Strings.FetchedJobsPage_Title, new Dictionary - { - { "Queues", Url.LinkToQueues() }, - { Queue.ToUpperInvariant(), Url.Queue(Queue) } - })); - - - #line default - #line hidden -WriteLiteral("\r\n\r\n

    \r\n "); - - - - #line 33 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Queue.ToUpperInvariant()); - - - #line default - #line hidden -WriteLiteral(" "); - - - - #line 33 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Strings.FetchedJobsPage_Title); - - - #line default - #line hidden -WriteLiteral("\r\n

    \r\n\r\n"); - - - - #line 36 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - if (pager.TotalPageCount == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 39 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Strings.FetchedJobsPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 41 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n \r\n\r\n \r\n\r\n "); - - - - #line 63 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Html.PerPageSelector(pager)); - - - #line default - #line hidden -WriteLiteral(@" -
    - -
    - - - - - \r\n \r\n \r\n \r\n \r\n \r\n " + -" \r\n"); - - - - #line 80 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - foreach (var job in fetchedJobs) - { - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n \r\n"); - - - - #line 92 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - if (job.Value == null) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 95 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - - #line 110 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 112 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    - - "); - - - - #line 73 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 74 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Strings.Common_State); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 75 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 76 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Strings.Common_Fetched); - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n\r\n " + -" "); - - - - #line 117 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - Write(Html.Paginator(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 119 "..\..\Dashboard\Pages\FetchedJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage.cs b/src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage.cs deleted file mode 100644 index 9ac2386..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Hangfire.Annotations; - -namespace Hangfire.Dashboard.Pages -{ - partial class JobDetailsPage - { - public JobDetailsPage(string jobId) - { - JobId = jobId; - } - - public string JobId { get; } - - } -} diff --git a/src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage.cshtml b/src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage.cshtml deleted file mode 100644 index 83fafb6..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage.cshtml +++ /dev/null @@ -1,211 +0,0 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ -@using System -@using System.Collections.Generic -@using System.Linq -@using Hangfire -@using Hangfire.Common -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@using Hangfire.States -@using Hangfire.Storage -@using Hangfire.Storage.Monitoring -@inherits RazorPage -@{ - var monitor = Storage.GetMonitoringApi(); - var job = monitor.JobDetails(JobId); - - string title = null; - - if (job != null) - { - title = job.Job != null ? Html.JobName(job.Job) : null; - job.History.Add(new StateHistoryDto { StateName = "Created", CreatedAt = job.CreatedAt ?? default(DateTime) }); - } - - title = title ?? Strings.Common_Job; - Layout = new LayoutPage(title); -} - -
    -
    - @Html.JobsSidebar() -
    -
    -

    @title

    - - @if (job == null) - { -
    - @String.Format(Strings.JobDetailsPage_JobExpired, JobId) -
    - } - else - { - var currentState = job.History[0]; - if (currentState.StateName == ProcessingState.StateName) - { - var server = monitor.Servers().FirstOrDefault(x => x.Name == currentState.Data["ServerId"]); - if (server == null) - { -
    - @Html.Raw(String.Format(Strings.JobDetailsPage_JobAbortedNotActive_Warning_Html, currentState.Data["ServerId"], Url.To("/servers"))) -
    - } - else if (server.Heartbeat.HasValue && server.Heartbeat < DateTime.UtcNow.AddMinutes(-1)) - { -
    - @Html.Raw(String.Format(Strings.JobDetailsPage_JobAbortedWithHeartbeat_Warning_Html, server.Name)) -
    - } - } - - if (job.ExpireAt.HasValue) - { -
    - @Html.Raw(String.Format(Strings.JobDetailsPage_JobFinished_Warning_Html, JobHelper.ToTimestamp(job.ExpireAt.Value), job.ExpireAt)) -
    - } - -
    -
    - 
    // @Strings.JobDetailsPage_JobId: @Html.JobId(JobId.ToString(), false)
-@JobMethodCallRenderer.Render(job.Job)
-
    -
    - - @if (job.Properties.Count > 0) - { -
    -
    - @foreach (var property in job.Properties.Where(x => x.Key != "Continuations")) - { -
    @property.Key
    - 
    @property.Value
    - } -
    -
    - } -
    - - if (job.Properties.ContainsKey("Continuations")) - { - List continuations; - - using (var connection = Storage.GetConnection()) - { - continuations = JobHelper.FromJson>(connection.GetJobParameter( - JobId, "Continuations")) ?? new List(); - } - - if (continuations.Count > 0) - { -

    @Strings.Common_Continuations

    -
    - - - - - - - - - - - - @foreach (var continuation in continuations) - { - JobData jobData; - - using (var connection = Storage.GetConnection()) - { - jobData = connection.GetJobData(continuation.JobId); - } - - - @if (jobData == null) - { - - } - else - { - - - - - - } - - } - -
    @Strings.Common_Id@Strings.Common_Condition@Strings.Common_State@Strings.Common_Job@Strings.Common_Created
    @String.Format(Strings.JobDetailsPage_JobExpired, continuation.JobId)@Html.JobIdLink(continuation.JobId)@continuation.Options.ToString("G")@Html.StateLabel(jobData.State)@Html.JobNameLink(continuation.JobId, jobData.Job)@Html.RelativeTime(jobData.CreatedAt)
    -
    - } - } - -

    - @if (job.History.Count > 1) - { - - - - - } - - @Strings.JobDetailsPage_State -

    - - var index = 0; - - foreach (var entry in job.History) - { - var accentColor = JobHistoryRenderer.GetForegroundStateColor(entry.StateName); - var backgroundColor = JobHistoryRenderer.GetBackgroundStateColor(entry.StateName); - -
    -

    - - @if (index == job.History.Count - 1) - { - @Html.RelativeTime(entry.CreatedAt) - } - else - { - var duration = Html.ToHumanDuration(entry.CreatedAt - job.History[index + 1].CreatedAt); - - if (index == 0) - { - @: @Html.RelativeTime(entry.CreatedAt) (@duration) - } - else - { - @: @Html.MomentTitle(entry.CreatedAt, duration) - } - } - - - @entry.StateName -

    - - @if (!String.IsNullOrWhiteSpace(entry.Reason)) - { -

    @entry.Reason

    - } - - @{ - var rendered = Html.RenderHistory(entry.StateName, entry.Data); - } - - @if (rendered != null) - { -
    - @rendered -
    - } -
    - - index++; - } - } -
    -
    \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage1.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage1.generated.cs deleted file mode 100644 index 19e9c21..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/JobDetailsPage1.generated.cs +++ /dev/null @@ -1,932 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - - #line 2 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using System; - - #line default - #line hidden - - #line 3 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using System.Collections.Generic; - - #line default - #line hidden - - #line 4 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using System.Linq; - - #line default - #line hidden - using System.Text; - - #line 5 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using Hangfire; - - #line default - #line hidden - - #line 6 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using Hangfire.Common; - - #line default - #line hidden - - #line 7 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 8 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 9 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - #line 10 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using Hangfire.States; - - #line default - #line hidden - - #line 11 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using Hangfire.Storage; - - #line default - #line hidden - - #line 12 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - using Hangfire.Storage.Monitoring; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class JobDetailsPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - - - - - - - - #line 14 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - - var monitor = Storage.GetMonitoringApi(); - var job = monitor.JobDetails(JobId); - - string title = null; - - if (job != null) - { - title = job.Job != null ? Html.JobName(job.Job) : null; - job.History.Add(new StateHistoryDto { StateName = "Created", CreatedAt = job.CreatedAt ?? default(DateTime) }); - } - - title = title ?? Strings.Common_Job; - Layout = new LayoutPage(title); - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 32 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Html.JobsSidebar()); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n

    "); - - - - #line 35 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 37 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - if (job == null) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 40 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(String.Format(Strings.JobDetailsPage_JobExpired, JobId)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 42 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - else - { - var currentState = job.History[0]; - if (currentState.StateName == ProcessingState.StateName) - { - var server = monitor.Servers().FirstOrDefault(x => x.Name == currentState.Data["ServerId"]); - if (server == null) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 52 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Html.Raw(String.Format(Strings.JobDetailsPage_JobAbortedNotActive_Warning_Html, currentState.Data["ServerId"], Url.To("/servers")))); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 54 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - else if (server.Heartbeat.HasValue && server.Heartbeat < DateTime.UtcNow.AddMinutes(-1)) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 58 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Html.Raw(String.Format(Strings.JobDetailsPage_JobAbortedWithHeartbeat_Warning_Html, server.Name))); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 60 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - } - - if (job.ExpireAt.HasValue) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 66 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Html.Raw(String.Format(Strings.JobDetailsPage_JobFinished_Warning_Html, JobHelper.ToTimestamp(job.ExpireAt.Value), job.ExpireAt))); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 68 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n 
    // ");
-
-
-            
-            #line 72 "..\..\Dashboard\Pages\JobDetailsPage.cshtml"
-                                                   Write(Strings.JobDetailsPage_JobId);
-
-            
-            #line default
-            #line hidden
-WriteLiteral(": ");
-
-
-            
-            #line 72 "..\..\Dashboard\Pages\JobDetailsPage.cshtml"
-                                                                                  Write(Html.JobId(JobId.ToString(), false));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n");
-
-
-            
-            #line 73 "..\..\Dashboard\Pages\JobDetailsPage.cshtml"
-Write(JobMethodCallRenderer.Render(job.Job));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("\r\n
    \r\n
    \r\n\r\n"); - - - - #line 77 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - if (job.Properties.Count > 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n " + -"
    \r\n"); - - - - #line 81 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - foreach (var property in job.Properties.Where(x => x.Key != "Continuations")) - { - - - #line default - #line hidden -WriteLiteral("
    "); - - - - #line 83 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(property.Key); - - - #line default - #line hidden -WriteLiteral("
    \r\n"); - - - -WriteLiteral(" 
    ");
-
-
-            
-            #line 84 "..\..\Dashboard\Pages\JobDetailsPage.cshtml"
-                                          Write(property.Value);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("
    \r\n"); - - - - #line 85 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n"); - - - - #line 88 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n"); - - - - #line 90 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - - if (job.Properties.ContainsKey("Continuations")) - { - List continuations; - - using (var connection = Storage.GetConnection()) - { - continuations = JobHelper.FromJson>(connection.GetJobParameter( - JobId, "Continuations")) ?? new List(); - } - - if (continuations.Count > 0) - { - - - #line default - #line hidden -WriteLiteral("

    "); - - - - #line 103 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Strings.Common_Continuations); - - - #line default - #line hidden -WriteLiteral("

    \r\n"); - - - -WriteLiteral("
    \r\n \r\n \r\n " + -" \r\n "); - - - - #line 108 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral("\r\n "); - - - - #line 109 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Strings.Common_Condition); - - - #line default - #line hidden -WriteLiteral("\r\n "); - - - - #line 110 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Strings.Common_State); - - - #line default - #line hidden -WriteLiteral("\r\n "); - - - - #line 111 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral("\r\n "); - - - - #line 112 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Strings.Common_Created); - - - #line default - #line hidden -WriteLiteral("\r\n \r\n \r\n " + -" \r\n"); - - - - #line 116 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - foreach (var continuation in continuations) - { - JobData jobData; - - using (var connection = Storage.GetConnection()) - { - jobData = connection.GetJobData(continuation.JobId); - } - - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 126 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - if (jobData == null) - { - - - #line default - #line hidden -WriteLiteral(" "); - - - - #line 128 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(String.Format(Strings.JobDetailsPage_JobExpired, continuation.JobId)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 129 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" "); - - - - #line 132 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Html.JobIdLink(continuation.JobId)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - -WriteLiteral(" "); - - - - #line 133 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(continuation.Options.ToString("G")); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - -WriteLiteral(" "); - - - - #line 134 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Html.StateLabel(jobData.State)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - -WriteLiteral(" "); - - - - #line 135 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Html.JobNameLink(continuation.JobId, jobData.Job)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - -WriteLiteral(" "); - - - - #line 136 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Html.RelativeTime(jobData.CreatedAt)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 137 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 139 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n " + -"
    \r\n"); - - - - #line 143 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - } - - - - #line default - #line hidden -WriteLiteral("

    \r\n"); - - - - #line 147 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - if (job.History.Count > 1) - { - - - #line default - #line hidden -WriteLiteral(" \r\n " + -" \r\n \r\n \r\n"); - - - - #line 153 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("\r\n "); - - - - #line 155 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - Write(Strings.JobDetailsPage_State); - - - #line default - #line hidden -WriteLiteral("\r\n

    \r\n"); - - - - #line 157 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - - var index = 0; - - foreach (var entry in job.History) - { - var accentColor = JobHistoryRenderer.GetForegroundStateColor(entry.StateName); - var backgroundColor = JobHistoryRenderer.GetBackgroundStateColor(entry.StateName); - - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 206 "..\..\Dashboard\Pages\JobDetailsPage.cshtml" - - index++; - } - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/ProcessingJobsPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/ProcessingJobsPage.generated.cs deleted file mode 100644 index 5e34f90..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/ProcessingJobsPage.generated.cs +++ /dev/null @@ -1,544 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - - #line 2 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - using System; - - #line default - #line hidden - using System.Collections.Generic; - - #line 3 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - using System.Linq; - - #line default - #line hidden - using System.Text; - - #line 4 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 5 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 6 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class ProcessingJobsPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - - #line 8 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - - Layout = new LayoutPage(Strings.ProcessingJobsPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.ProcessingCount()); - var processingJobs = monitor.ProcessingJobs(pager.FromRecord, pager.RecordsPerPage); - var servers = monitor.Servers(); - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 24 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - Write(Html.JobsSidebar()); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n

    "); - - - - #line 27 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - Write(Strings.ProcessingJobsPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 29 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - if (pager.TotalPageCount == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 32 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - Write(Strings.ProcessingJobsPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 34 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n \r\n\r\n \r\n\r\n "); - - - - #line 56 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - Write(Html.PerPageSelector(pager)); - - - #line default - #line hidden -WriteLiteral(@" -
    - -
    - - - - - \r\n \r\n \r\n \r\n \r\n \r\n " + -" \r\n"); - - - - #line 73 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - foreach (var job in processingJobs) - { - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n \r\n "); - - - - #line 83 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - Write(Html.JobIdLink(job.Key)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 84 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - if (!job.Value.InProcessingState) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 87 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 89 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - if (!job.Value.InProcessingState) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 92 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - - #line 112 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 114 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    - - "); - - - - #line 66 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 67 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - Write(Strings.Common_Server); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 68 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 69 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - Write(Strings.ProcessingJobsPage_Table_Started); - - - #line default - #line hidden -WriteLiteral("
    \r\n <" + -"/div>\r\n\r\n "); - - - - #line 119 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - Write(Html.Paginator(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 121 "..\..\Dashboard\Pages\ProcessingJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/QueuesPage.cshtml b/src/DotNetCore.CAP/Dashboard/Views/QueuesPage.cshtml deleted file mode 100644 index fc3c289..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/QueuesPage.cshtml +++ /dev/null @@ -1,122 +0,0 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ -@using System.Linq -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@inherits RazorPage -@{ - Layout = new LayoutPage(Strings.QueuesPage_Title); - - var monitor = Storage.GetMonitoringApi(); - var queues = monitor.Queues(); -} - -
    -
    - @Html.JobsSidebar() -
    -
    -

    @Strings.QueuesPage_Title

    - - @if (queues.Count == 0) - { -
    - @Strings.QueuesPage_NoQueues -
    - } - else - { -
    - - - - - - - - - - - @foreach (var queue in queues) - { - - - - - - - } - -
    @Strings.QueuesPage_Table_Queue@Strings.QueuesPage_Table_Length@Strings.Common_Fetched@Strings.QueuesPage_Table_NextsJobs
    @Html.QueueLabel(queue.Name)@queue.Length - @if (queue.Fetched.HasValue) - { - - @queue.Fetched - - } - else - { - @Strings.Common_NotAvailable - } - - @if (queue.FirstJobs.Count == 0) - { - - @Strings.QueuesPage_NoJobs - - } - else - { - - - - - - - - - - - @foreach (var job in queue.FirstJobs) - { - - - @if (job.Value == null) - { - - } - else - { - - - - } - - } - -
    @Strings.Common_Id@Strings.Common_State@Strings.Common_Job@Strings.Common_Enqueued
    - @Html.JobIdLink(job.Key) - @if (job.Value != null && !job.Value.InEnqueuedState) - { - - } - @Strings.Common_JobExpired - @Html.StateLabel(job.Value.State) - - @Html.JobNameLink(job.Key, job.Value.Job) - - @if (job.Value.EnqueuedAt.HasValue) - { - @Html.RelativeTime(job.Value.EnqueuedAt.Value) - } - else - { - @Strings.Common_NotAvailable - } -
    - } -
    -
    - } -
    -
    \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/Views/QueuesPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/QueuesPage.generated.cs deleted file mode 100644 index a7ce16d..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/QueuesPage.generated.cs +++ /dev/null @@ -1,574 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - using System; - using System.Collections.Generic; - - #line 2 "..\..\Dashboard\Pages\QueuesPage.cshtml" - using System.Linq; - - #line default - #line hidden - using System.Text; - - #line 3 "..\..\Dashboard\Pages\QueuesPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 4 "..\..\Dashboard\Pages\QueuesPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 5 "..\..\Dashboard\Pages\QueuesPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class QueuesPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - #line 7 "..\..\Dashboard\Pages\QueuesPage.cshtml" - - Layout = new LayoutPage(Strings.QueuesPage_Title); - - var monitor = Storage.GetMonitoringApi(); - var queues = monitor.Queues(); - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 16 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Html.JobsSidebar()); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n

    "); - - - - #line 19 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.QueuesPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 21 "..\..\Dashboard\Pages\QueuesPage.cshtml" - if (queues.Count == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 24 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.QueuesPage_NoQueues); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 26 "..\..\Dashboard\Pages\QueuesPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n \r\n \r\n \r\n " + -" \r\n \r\n \r\n \r\n \r\n \r\n " + -" \r\n"); - - - - #line 40 "..\..\Dashboard\Pages\QueuesPage.cshtml" - foreach (var queue in queues) - { - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n \r\n \r\n \r\n \r\n"); - - - - #line 116 "..\..\Dashboard\Pages\QueuesPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    "); - - - - #line 33 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.QueuesPage_Table_Queue); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 34 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.QueuesPage_Table_Length); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 35 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.Common_Fetched); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 36 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.QueuesPage_Table_NextsJobs); - - - #line default - #line hidden -WriteLiteral("
    "); - - - - #line 43 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Html.QueueLabel(queue.Name)); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 44 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(queue.Length); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 46 "..\..\Dashboard\Pages\QueuesPage.cshtml" - if (queue.Fetched.HasValue) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 51 "..\..\Dashboard\Pages\QueuesPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" "); - - - - #line 54 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.Common_NotAvailable); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 55 "..\..\Dashboard\Pages\QueuesPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 58 "..\..\Dashboard\Pages\QueuesPage.cshtml" - if (queue.FirstJobs.Count == 0) - { - - - #line default - #line hidden -WriteLiteral(" \r\n " + -" "); - - - - #line 61 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.QueuesPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n \r\n"); - - - - #line 63 "..\..\Dashboard\Pages\QueuesPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(@" - - - \r\n \r\n \r\n \r\n \r\n " + -" \r\n <" + -"tbody>\r\n"); - - - - #line 76 "..\..\Dashboard\Pages\QueuesPage.cshtml" - foreach (var job in queue.FirstJobs) - { - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n"); - - - - #line 86 "..\..\Dashboard\Pages\QueuesPage.cshtml" - if (job.Value == null) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 89 "..\..\Dashboard\Pages\QueuesPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - - #line 108 "..\..\Dashboard\Pages\QueuesPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 110 "..\..\Dashboard\Pages\QueuesPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n " + -"
    "); - - - - #line 69 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral("" + -""); - - - - #line 70 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.Common_State); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 71 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 72 "..\..\Dashboard\Pages\QueuesPage.cshtml" - Write(Strings.Common_Enqueued); - - - #line default - #line hidden -WriteLiteral("
    \r\n"); - - - - #line 113 "..\..\Dashboard\Pages\QueuesPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n"); - - - - #line 120 "..\..\Dashboard\Pages\QueuesPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/RecurringJobsPage.cshtml b/src/DotNetCore.CAP/Dashboard/Views/RecurringJobsPage.cshtml deleted file mode 100644 index 05511be..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/RecurringJobsPage.cshtml +++ /dev/null @@ -1,196 +0,0 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: true *@ -@using System -@using System.Collections.Generic -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@using Hangfire.Storage -@inherits RazorPage -@{ - Layout = new LayoutPage(Strings.RecurringJobsPage_Title); - List recurringJobs; - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - Pager pager = null; - - using (var connection = Storage.GetConnection()) - { - var storageConnection = connection as JobStorageConnection; - if (storageConnection != null) - { - pager = new Pager(from, perPage, storageConnection.GetRecurringJobCount()); - recurringJobs = storageConnection.GetRecurringJobs(pager.FromRecord, pager.FromRecord + pager.RecordsPerPage); - } - else - { - recurringJobs = connection.GetRecurringJobs(); - } - } -} - -
    -
    -

    @Strings.RecurringJobsPage_Title

    - - @if (recurringJobs.Count == 0) - { -
    - @Strings.RecurringJobsPage_NoJobs -
    - } - else - { -
    -
    - - - - - @if (pager != null) - { - @: @Html.PerPageSelector(pager) - } -
    - -
    - - - - - - - - - - - - - - - @foreach (var job in recurringJobs) - { - - - - - - - - - - - } - -
    - - @Strings.Common_Id@Strings.RecurringJobsPage_Table_Cron@Strings.RecurringJobsPage_Table_TimeZone@Strings.Common_Job@Strings.RecurringJobsPage_Table_NextExecution@Strings.RecurringJobsPage_Table_LastExecution@Strings.Common_Created
    - - @job.Id - @* ReSharper disable once EmptyGeneralCatchClause *@ - @{ - string cronDescription = null; -#if NETFULL - try - { - cronDescription = string.IsNullOrEmpty(job.Cron) ? null : CronExpressionDescriptor.ExpressionDescriptor.GetDescription(job.Cron); - } - catch (FormatException) - { - } -#endif - } - - @if (cronDescription != null) - { - @job.Cron - } - else - { - @job.Cron - } - - @if (!String.IsNullOrWhiteSpace(job.TimeZoneId)) - { - @job.TimeZoneId - } - else - { - @: UTC - } - - @if (job.Job != null) - { - @: @Html.JobName(job.Job) - } - else - { - @job.LoadException.InnerException.Message - } - - @if (job.NextExecution != null) - { - @Html.RelativeTime(job.NextExecution.Value) - } - else - { - @Strings.Common_NotAvailable - } - - @if (job.LastExecution != null) - { - if (!String.IsNullOrEmpty(job.LastJobId)) - { - - - @Html.RelativeTime(job.LastExecution.Value) - - - } - else - { - - @Strings.RecurringJobsPage_Canceled @Html.RelativeTime(job.LastExecution.Value) - - } - } - else - { - @Strings.Common_NotAvailable - } - - @if (job.CreatedAt != null) - { - @Html.RelativeTime(job.CreatedAt.Value) - } - else - { - N/A - } -
    -
    - - @if (pager != null) - { - @: @Html.Paginator(pager) - } -
    - } -
    -
    \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/Views/RecurringJobsPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/RecurringJobsPage.generated.cs deleted file mode 100644 index eb7f1b2..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/RecurringJobsPage.generated.cs +++ /dev/null @@ -1,831 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - - #line 2 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - using System; - - #line default - #line hidden - - #line 3 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - using System.Collections.Generic; - - #line default - #line hidden - using System.Linq; - using System.Text; - - #line 4 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 5 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 6 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - #line 7 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - using Hangfire.Storage; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class RecurringJobsPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - - - #line 9 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - - Layout = new LayoutPage(Strings.RecurringJobsPage_Title); - List recurringJobs; - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - Pager pager = null; - - using (var connection = Storage.GetConnection()) - { - var storageConnection = connection as JobStorageConnection; - if (storageConnection != null) - { - pager = new Pager(from, perPage, storageConnection.GetRecurringJobCount()); - recurringJobs = storageConnection.GetRecurringJobs(pager.FromRecord, pager.FromRecord + pager.RecordsPerPage - 1); - } - else - { - recurringJobs = connection.GetRecurringJobs(); - } - } - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n

    "); - - - - #line 37 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.RecurringJobsPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 39 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - if (recurringJobs.Count == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 42 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.RecurringJobsPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 44 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n \r\n\r\n \r\n\r\n"); - - - - #line 66 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - if (pager != null) - { - - - #line default - #line hidden -WriteLiteral(" "); - -WriteLiteral(" "); - - - - #line 68 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Html.PerPageSelector(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 69 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(@"
    - -
    - - - - - \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n " + -" \r\n"); - - - - #line 89 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - foreach (var job in recurringJobs) - { - - - #line default - #line hidden -WriteLiteral(" \r\n " + -" \r\n " + -" \r\n \r\n \r\n"); - - - - #line 121 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - if (!String.IsNullOrWhiteSpace(job.TimeZoneId)) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 124 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" "); - -WriteLiteral(" UTC\r\n"); - - - - #line 128 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n"); - - - - #line 131 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - if (job.Job != null) - { - - - #line default - #line hidden -WriteLiteral(" "); - -WriteLiteral(" "); - - - - #line 133 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Html.JobName(job.Job)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 134 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" "); - - - - #line 137 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(job.LoadException.InnerException.Message); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 138 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n"); - - - - #line 141 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - if (job.NextExecution != null) - { - - - #line default - #line hidden - - #line 143 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Html.RelativeTime(job.NextExecution.Value)); - - - #line default - #line hidden - - #line 143 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - - } - else - { - - - #line default - #line hidden -WriteLiteral(" "); - - - - #line 147 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.Common_NotAvailable); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 148 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n"); - - - - #line 151 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - if (job.LastExecution != null) - { - if (!String.IsNullOrEmpty(job.LastJobId)) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 160 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" \r\n " + -" "); - - - - #line 164 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.RecurringJobsPage_Canceled); - - - #line default - #line hidden -WriteLiteral(" "); - - - - #line 164 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Html.RelativeTime(job.LastExecution.Value)); - - - #line default - #line hidden -WriteLiteral("\r\n \r\n"); - - - - #line 166 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - } - else - { - - - #line default - #line hidden -WriteLiteral(" "); - - - - #line 170 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.Common_NotAvailable); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 171 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n"); - - - - #line 174 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - if (job.CreatedAt != null) - { - - - #line default - #line hidden - - #line 176 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Html.RelativeTime(job.CreatedAt.Value)); - - - #line default - #line hidden - - #line 176 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - - } - else - { - - - #line default - #line hidden -WriteLiteral(" N/A\r\n"); - - - - #line 181 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n \r" + -"\n"); - - - - #line 184 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    - - "); - - - - #line 79 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 80 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.RecurringJobsPage_Table_Cron); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 81 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.RecurringJobsPage_Table_TimeZone); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 82 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 83 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.RecurringJobsPage_Table_NextExecution); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 84 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.RecurringJobsPage_Table_LastExecution); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 85 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Strings.Common_Created); - - - #line default - #line hidden -WriteLiteral("
    \r\n \r\n "); - - - - #line 95 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(job.Id); - - - #line default - #line hidden -WriteLiteral("\r\n " + -" "); - - - -WriteLiteral("\r\n"); - - - - #line 98 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - - string cronDescription = null; -#if NETFULL - try - { - cronDescription = string.IsNullOrEmpty(job.Cron) ? null : CronExpressionDescriptor.ExpressionDescriptor.GetDescription(job.Cron); - } - catch (FormatException) - { - } -#endif - - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 111 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - if (cronDescription != null) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 114 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" "); - - - - #line 117 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(job.Cron); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 118 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n <" + -"/div>\r\n\r\n"); - - - - #line 189 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - if (pager != null) - { - - - #line default - #line hidden -WriteLiteral(" "); - -WriteLiteral(" "); - - - - #line 191 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - Write(Html.Paginator(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 192 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n"); - - - - #line 194 "..\..\Dashboard\Pages\RecurringJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/RetriesPage.cshtml b/src/DotNetCore.CAP/Dashboard/Views/RetriesPage.cshtml deleted file mode 100644 index 6a60c39..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/RetriesPage.cshtml +++ /dev/null @@ -1,143 +0,0 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ -@using System.Collections.Generic -@using Hangfire.Common -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@using Hangfire.Storage -@inherits RazorPage -@{ - Layout = new LayoutPage(Strings.RetriesPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - Pager pager = null; - List jobIds = null; - - using (var connection = Storage.GetConnection()) - { - var storageConnection = connection as JobStorageConnection; - - if (storageConnection != null) - { - pager = new Pager(@from, perPage, storageConnection.GetSetCount("retries")); - jobIds = storageConnection.GetRangeFromSet("retries", pager.FromRecord, pager.FromRecord + pager.RecordsPerPage - 1); - } - } -} - -@if (pager == null) -{ -
    - @Html.Raw(String.Format(Strings.RetriesPage_Warning_Html, Url.To("/jobs/scheduled"))) -
    -} -else -{ -
    -
    -

    @Strings.RetriesPage_Title

    - @if (jobIds.Count == 0) - { -
    - @Strings.RetriesPage_NoJobs -
    - } - else - { -
    -
    - - - - - @Html.PerPageSelector(pager) -
    - -
    - - - - - - - - - - - - - - @foreach (var jobId in jobIds) - { - JobData jobData; - StateData stateData; - - using (var connection = Storage.GetConnection()) - { - jobData = connection.GetJobData(jobId); - stateData = connection.GetStateData(jobId); - } - - - - - @if (jobData == null) - { - - } - else - { - - - - - - } - - } - -
    - - @Strings.Common_Id@Strings.Common_State@Strings.Common_Job@Strings.Common_Reason@Strings.Common_Retry@Strings.Common_Created
    - - - @Html.JobIdLink(jobId) - Job expired. - @Html.StateLabel(jobData.State) - - @Html.JobNameLink(jobId, jobData.Job) - - @(stateData?.Reason) - - @if (stateData != null && stateData.Data.ContainsKey("EnqueueAt")) - { - @Html.RelativeTime(JobHelper.DeserializeDateTime(stateData.Data["EnqueueAt"])) - } - - @Html.RelativeTime(jobData.CreatedAt) -
    -
    - - @Html.Paginator(pager) -
    - } -
    -
    -} \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/Views/RetriesPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/RetriesPage.generated.cs deleted file mode 100644 index 781ae89..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/RetriesPage.generated.cs +++ /dev/null @@ -1,555 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - using System; - - #line 2 "..\..\Dashboard\Pages\RetriesPage.cshtml" - using System.Collections.Generic; - - #line default - #line hidden - using System.Linq; - using System.Text; - - #line 3 "..\..\Dashboard\Pages\RetriesPage.cshtml" - using Hangfire.Common; - - #line default - #line hidden - - #line 4 "..\..\Dashboard\Pages\RetriesPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 5 "..\..\Dashboard\Pages\RetriesPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 6 "..\..\Dashboard\Pages\RetriesPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - #line 7 "..\..\Dashboard\Pages\RetriesPage.cshtml" - using Hangfire.Storage; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class RetriesPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - - - #line 9 "..\..\Dashboard\Pages\RetriesPage.cshtml" - - Layout = new LayoutPage(Strings.RetriesPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - Pager pager = null; - List jobIds = null; - - using (var connection = Storage.GetConnection()) - { - var storageConnection = connection as JobStorageConnection; - - if (storageConnection != null) - { - pager = new Pager(@from, perPage, storageConnection.GetSetCount("retries")); - jobIds = storageConnection.GetRangeFromSet("retries", pager.FromRecord, pager.FromRecord + pager.RecordsPerPage - 1); - } - } - - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 32 "..\..\Dashboard\Pages\RetriesPage.cshtml" - if (pager == null) -{ - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 35 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Html.Raw(String.Format(Strings.RetriesPage_Warning_Html, Url.To("/jobs/scheduled")))); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 37 "..\..\Dashboard\Pages\RetriesPage.cshtml" -} -else -{ - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n

    "); - - - - #line 42 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Strings.RetriesPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n"); - - - - #line 43 "..\..\Dashboard\Pages\RetriesPage.cshtml" - if (jobIds.Count == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 46 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Strings.RetriesPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 48 "..\..\Dashboard\Pages\RetriesPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n \r\n\r\n \r\n\r\n "); - - - - #line 70 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Html.PerPageSelector(pager)); - - - #line default - #line hidden -WriteLiteral(@" -
    - -
    - - - - - \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n"); - - - - #line 89 "..\..\Dashboard\Pages\RetriesPage.cshtml" - foreach (var jobId in jobIds) - { - JobData jobData; - StateData stateData; - - using (var connection = Storage.GetConnection()) - { - jobData = connection.GetJobData(jobId); - stateData = connection.GetStateData(jobId); - } - - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n " + -" \r\n"); - - - - #line 107 "..\..\Dashboard\Pages\RetriesPage.cshtml" - if (jobData == null) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 110 "..\..\Dashboard\Pages\RetriesPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - - #line 131 "..\..\Dashboard\Pages\RetriesPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 133 "..\..\Dashboard\Pages\RetriesPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    - - "); - - - - #line 80 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 81 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Strings.Common_State); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 82 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 83 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Strings.Common_Reason); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 84 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Strings.Common_Retry); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 85 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Strings.Common_Created); - - - #line default - #line hidden -WriteLiteral("
    \r\n " + -"
    \r\n\r\n "); - - - - #line 138 "..\..\Dashboard\Pages\RetriesPage.cshtml" - Write(Html.Paginator(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 140 "..\..\Dashboard\Pages\RetriesPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n"); - - - - #line 143 "..\..\Dashboard\Pages\RetriesPage.cshtml" -} - - #line default - #line hidden - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/ScheduledJobsPage.cshtml b/src/DotNetCore.CAP/Dashboard/Views/ScheduledJobsPage.cshtml deleted file mode 100644 index 720c902..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/ScheduledJobsPage.cshtml +++ /dev/null @@ -1,106 +0,0 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@inherits RazorPage -@{ - Layout = new LayoutPage(Strings.ScheduledJobsPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.ScheduledCount()); - var scheduledJobs = monitor.ScheduledJobs(pager.FromRecord, pager.RecordsPerPage); -} - -
    -
    - @Html.JobsSidebar() -
    -
    -

    @Strings.ScheduledJobsPage_Title

    - - @if (pager.TotalPageCount == 0) - { -
    - @Strings.ScheduledJobsPage_NoJobs -
    - } - else - { -
    -
    - - - - - @Html.PerPageSelector(pager) -
    - -
    - - - - - - - - - - - @foreach (var job in scheduledJobs) - { - - - - - - - - } -
    - - @Strings.Common_Id@Strings.ScheduledJobsPage_Table_Enqueue@Strings.Common_Job@Strings.ScheduledJobsPage_Table_Scheduled
    - @if (job.Value.InScheduledState) - { - - } - - @Html.JobIdLink(job.Key) - @if (!job.Value.InScheduledState) - { - - } - - @Html.RelativeTime(job.Value.EnqueueAt) - - @Html.JobNameLink(job.Key, job.Value.Job) - - @if (job.Value.ScheduledAt.HasValue) - { - @Html.RelativeTime(job.Value.ScheduledAt.Value) - } -
    -
    - - @Html.Paginator(pager) -
    - } -
    -
    \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/Views/ScheduledJobsPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/ScheduledJobsPage.generated.cs deleted file mode 100644 index 2cb8f14..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/ScheduledJobsPage.generated.cs +++ /dev/null @@ -1,449 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - - #line 2 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 3 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 4 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class ScheduledJobsPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - #line 6 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - - Layout = new LayoutPage(Strings.ScheduledJobsPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.ScheduledCount()); - var scheduledJobs = monitor.ScheduledJobs(pager.FromRecord, pager.RecordsPerPage); - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 21 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - Write(Html.JobsSidebar()); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n

    "); - - - - #line 24 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - Write(Strings.ScheduledJobsPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 26 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - if (pager.TotalPageCount == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 29 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - Write(Strings.ScheduledJobsPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 31 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n \r\n\r\n \r\n\r\n "); - - - - #line 53 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - Write(Html.PerPageSelector(pager)); - - - #line default - #line hidden -WriteLiteral(@" -
    - -
    - - - - - \r\n \r\n \r\n \r\n \r\n \r\n"); - - - - #line 69 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - foreach (var job in scheduledJobs) - { - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n \r\n \r\n \r\n \r\n \r\n"); - - - - #line 98 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    - - "); - - - - #line 63 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 64 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - Write(Strings.ScheduledJobsPage_Table_Enqueue); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 65 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 66 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - Write(Strings.ScheduledJobsPage_Table_Scheduled); - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n\r\n "); - - - - #line 102 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - Write(Html.Paginator(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 104 "..\..\Dashboard\Pages\ScheduledJobsPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/ServersPage.cshtml b/src/DotNetCore.CAP/Dashboard/Views/ServersPage.cshtml deleted file mode 100644 index f0d31a6..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/ServersPage.cshtml +++ /dev/null @@ -1,60 +0,0 @@ -@* Generator: Template TypeVisibility: Internal GeneratePrettyNames: True *@ -@using System -@using System.Linq -@using Hangfire.Common -@using Hangfire.Dashboard -@using Hangfire.Dashboard.Pages -@using Hangfire.Dashboard.Resources -@inherits RazorPage -@{ - Layout = new LayoutPage(Strings.ServersPage_Title); - - var monitor = Storage.GetMonitoringApi(); - var servers = monitor.Servers(); -} - -
    -
    -

    @Strings.ServersPage_Title

    - - @if (servers.Count == 0) - { -
    - @Strings.ServersPage_NoServers -
    - } - else - { -
    - - - - - - - - - - - - @foreach (var server in servers) - { - - - - - - - - } - -
    @Strings.ServersPage_Table_Name@Strings.ServersPage_Table_Workers@Strings.ServersPage_Table_Queues@Strings.ServersPage_Table_Started@Strings.ServersPage_Table_Heartbeat
    @Html.ServerId(server.Name)@server.WorkersCount@Html.Raw(String.Join(", ", server.Queues.Select(Html.QueueLabel)))@server.StartedAt - @if (server.Heartbeat.HasValue) - { - @Html.RelativeTime(server.Heartbeat.Value) - } -
    -
    - } -
    -
    \ No newline at end of file diff --git a/src/DotNetCore.CAP/Dashboard/Views/ServersPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/ServersPage.generated.cs deleted file mode 100644 index d6a6b66..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/ServersPage.generated.cs +++ /dev/null @@ -1,294 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - - #line 2 "..\..\Dashboard\Pages\ServersPage.cshtml" - using System; - - #line default - #line hidden - using System.Collections.Generic; - - #line 3 "..\..\Dashboard\Pages\ServersPage.cshtml" - using System.Linq; - - #line default - #line hidden - using System.Text; - - #line 4 "..\..\Dashboard\Pages\ServersPage.cshtml" - using Hangfire.Common; - - #line default - #line hidden - - #line 5 "..\..\Dashboard\Pages\ServersPage.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 6 "..\..\Dashboard\Pages\ServersPage.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 7 "..\..\Dashboard\Pages\ServersPage.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class ServersPage : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - - - #line 9 "..\..\Dashboard\Pages\ServersPage.cshtml" - - Layout = new LayoutPage(Strings.ServersPage_Title); - - var monitor = Storage.GetMonitoringApi(); - var servers = monitor.Servers(); - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n

    "); - - - - #line 18 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(Strings.ServersPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 20 "..\..\Dashboard\Pages\ServersPage.cshtml" - if (servers.Count == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 23 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(Strings.ServersPage_NoServers); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 25 "..\..\Dashboard\Pages\ServersPage.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n " + -"\r\n \r\n \r\n " + -" \r\n \r\n \r\n \r\n \r\n \r\n \r\n " + -" \r\n"); - - - - #line 40 "..\..\Dashboard\Pages\ServersPage.cshtml" - foreach (var server in servers) - { - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n \r\n \r\n \r\n \r\n \r\n"); - - - - #line 54 "..\..\Dashboard\Pages\ServersPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    "); - - - - #line 32 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(Strings.ServersPage_Table_Name); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 33 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(Strings.ServersPage_Table_Workers); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 34 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(Strings.ServersPage_Table_Queues); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 35 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(Strings.ServersPage_Table_Started); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 36 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(Strings.ServersPage_Table_Heartbeat); - - - #line default - #line hidden -WriteLiteral("
    "); - - - - #line 43 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(Html.ServerId(server.Name)); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 44 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(server.WorkersCount); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 45 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(Html.Raw(String.Join(", ", server.Queues.Select(Html.QueueLabel)))); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 48 "..\..\Dashboard\Pages\ServersPage.cshtml" - if (server.Heartbeat.HasValue) - { - - - #line default - #line hidden - - #line 50 "..\..\Dashboard\Pages\ServersPage.cshtml" - Write(Html.RelativeTime(server.Heartbeat.Value)); - - - #line default - #line hidden - - #line 50 "..\..\Dashboard\Pages\ServersPage.cshtml" - - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n"); - - - - #line 58 "..\..\Dashboard\Pages\ServersPage.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/SidebarMenu.cs b/src/DotNetCore.CAP/Dashboard/Views/SidebarMenu.cs deleted file mode 100644 index b35e2de..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/SidebarMenu.cs +++ /dev/null @@ -1,33 +0,0 @@ -// This file is part of Hangfire. -// Copyright © 2015 Sergey Odinokov. -// -// Hangfire is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 -// of the License, or any later version. -// -// Hangfire is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with Hangfire. If not, see . - -using System; -using System.Collections.Generic; -using Hangfire.Annotations; - -namespace Hangfire.Dashboard.Pages -{ - partial class SidebarMenu - { - public SidebarMenu([NotNull] IEnumerable> items) - { - if (items == null) throw new ArgumentNullException(nameof(items)); - Items = items; - } - - public IEnumerable> Items { get; } - } -} diff --git a/src/DotNetCore.CAP/Dashboard/Views/SucceededJobs1.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/SucceededJobs1.generated.cs deleted file mode 100644 index cee9c28..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/SucceededJobs1.generated.cs +++ /dev/null @@ -1,481 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - - #line 2 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - using System; - - #line default - #line hidden - using System.Collections.Generic; - using System.Linq; - using System.Text; - - #line 3 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 4 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - using Hangfire.Dashboard.Pages; - - #line default - #line hidden - - #line 5 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class SucceededJobs : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - - - - #line 7 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - - Layout = new LayoutPage(Strings.SucceededJobsPage_Title); - - int from, perPage; - - int.TryParse(Query("from"), out from); - int.TryParse(Query("count"), out perPage); - - var monitor = Storage.GetMonitoringApi(); - var pager = new Pager(from, perPage, monitor.SucceededListCount()); - var succeededJobs = monitor.SucceededJobs(pager.FromRecord, pager.RecordsPerPage); - - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n "); - - - - #line 22 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - Write(Html.JobsSidebar()); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n

    "); - - - - #line 25 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - Write(Strings.SucceededJobsPage_Title); - - - #line default - #line hidden -WriteLiteral("

    \r\n\r\n"); - - - - #line 27 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - if (pager.TotalPageCount == 0) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n "); - - - - #line 30 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - Write(Strings.SucceededJobsPage_NoJobs); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 32 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n \r\n\r\n "); - - - - #line 45 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - Write(Html.PerPageSelector(pager)); - - - #line default - #line hidden -WriteLiteral(@" -
    - -
    - - - - - \r\n \r\n \r\n \r\n \r\n \r\n " + -" \r\n"); - - - - #line 62 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - foreach (var job in succeededJobs) - { - - - #line default - #line hidden -WriteLiteral(" \r\n \r\n \r\n "); - - - - #line 72 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - Write(Html.JobIdLink(job.Key)); - - - #line default - #line hidden -WriteLiteral("\r\n"); - - - - #line 73 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - if (job.Value != null && !job.Value.InSucceededState) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 76 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n\r\n"); - - - - #line 79 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - if (job.Value == null) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 84 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - } - else - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - -WriteLiteral(" \r\n"); - - - - #line 102 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 104 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - } - - - #line default - #line hidden -WriteLiteral(" \r\n
    - - "); - - - - #line 55 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - Write(Strings.Common_Id); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 56 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - Write(Strings.Common_Job); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 57 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - Write(Strings.SucceededJobsPage_Table_TotalDuration); - - - #line default - #line hidden -WriteLiteral(""); - - - - #line 58 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - Write(Strings.SucceededJobsPage_Table_Succeeded); - - - #line default - #line hidden -WriteLiteral("
    \r\n <" + -"/div>\r\n\r\n "); - - - - #line 109 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - Write(Html.Paginator(pager)); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n"); - - - - #line 111 "..\..\Dashboard\Pages\SucceededJobs.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/_Breadcrumbs.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/_Breadcrumbs.generated.cs deleted file mode 100644 index 0920249..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/_Breadcrumbs.generated.cs +++ /dev/null @@ -1,105 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - - #line 2 "..\..\Dashboard\Pages\_Breadcrumbs.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class Breadcrumbs : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - -WriteLiteral("\r\n
      \r\n
      2. \r\n"); - - - - #line 7 "..\..\Dashboard\Pages\_Breadcrumbs.cshtml" - foreach (var item in Items) - { - - - #line default - #line hidden -WriteLiteral("
      3. \r\n"); - - - - #line 10 "..\..\Dashboard\Pages\_Breadcrumbs.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    3. "); - - - - #line 11 "..\..\Dashboard\Pages\_Breadcrumbs.cshtml" - Write(Title); - - - #line default - #line hidden -WriteLiteral("
      4. \r\n
    "); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/_Paginator.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/_Paginator.generated.cs deleted file mode 100644 index 78a9e1a..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/_Paginator.generated.cs +++ /dev/null @@ -1,248 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - - #line 2 "..\..\Dashboard\Pages\_Paginator.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - #line 3 "..\..\Dashboard\Pages\_Paginator.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class Paginator : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - -WriteLiteral("\r\n"); - - -WriteLiteral("
    \r\n"); - - - - #line 7 "..\..\Dashboard\Pages\_Paginator.cshtml" - if (_pager.TotalPageCount > 1) - { - - - #line default - #line hidden -WriteLiteral("
    \r\n"); - - - - #line 10 "..\..\Dashboard\Pages\_Paginator.cshtml" - foreach (var page in _pager.PagerItems) - { - switch (page.Type) - { - case Pager.ItemType.Page: - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 18 "..\..\Dashboard\Pages\_Paginator.cshtml" - break; - case Pager.ItemType.NextPage: - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 23 "..\..\Dashboard\Pages\_Paginator.cshtml" - break; - case Pager.ItemType.PrevPage: - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 28 "..\..\Dashboard\Pages\_Paginator.cshtml" - break; - case Pager.ItemType.MorePage: - - - #line default - #line hidden -WriteLiteral(" \r\n " + -" …\r\n \r\n"); - - - - #line 33 "..\..\Dashboard\Pages\_Paginator.cshtml" - break; - } - } - - - #line default - #line hidden -WriteLiteral("
    \r\n"); - - - -WriteLiteral("
    \r\n"); - - - - #line 38 "..\..\Dashboard\Pages\_Paginator.cshtml" - } - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n "); - - - - #line 41 "..\..\Dashboard\Pages\_Paginator.cshtml" - Write(Strings.Paginator_TotalItems); - - - #line default - #line hidden -WriteLiteral(": "); - - - - #line 41 "..\..\Dashboard\Pages\_Paginator.cshtml" - Write(_pager.TotalRecordCount); - - - #line default - #line hidden -WriteLiteral("\r\n
    \r\n
    \r\n"); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/_PerPageSelector.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/_PerPageSelector.generated.cs deleted file mode 100644 index 6601862..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/_PerPageSelector.generated.cs +++ /dev/null @@ -1,106 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - - #line 2 "..\..\Dashboard\Pages\_PerPageSelector.cshtml" - using Hangfire.Dashboard.Resources; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class PerPageSelector : Hangfire.Dashboard.RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - -WriteLiteral("\r\n
    \r\n"); - - - - #line 6 "..\..\Dashboard\Pages\_PerPageSelector.cshtml" - foreach (var count in new[] { 10, 20, 50, 100, 500 }) - { - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 10 "..\..\Dashboard\Pages\_PerPageSelector.cshtml" - } - - - #line default - #line hidden -WriteLiteral("
    \r\n
    \r\n
    \r\n "); - - - - #line 14 "..\..\Dashboard\Pages\_PerPageSelector.cshtml" - Write(Strings.PerPageSelector_ItemsPerPage); - - - #line default - #line hidden -WriteLiteral(":\r\n
    \r\n"); - - - } - } -} -#pragma warning restore 1591 diff --git a/src/DotNetCore.CAP/Dashboard/Views/_SidebarMenu.generated.cs b/src/DotNetCore.CAP/Dashboard/Views/_SidebarMenu.generated.cs deleted file mode 100644 index f47b6ad..0000000 --- a/src/DotNetCore.CAP/Dashboard/Views/_SidebarMenu.generated.cs +++ /dev/null @@ -1,139 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Hangfire.Dashboard.Pages -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - - #line 2 "..\..\Dashboard\Pages\_SidebarMenu.cshtml" - using Hangfire.Dashboard; - - #line default - #line hidden - - [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")] - internal partial class SidebarMenu : RazorPage - { -#line hidden - - public override void Execute() - { - - -WriteLiteral("\r\n"); - - - - - - #line 4 "..\..\Dashboard\Pages\_SidebarMenu.cshtml" - if (Items.Any()) -{ - - - #line default - #line hidden -WriteLiteral(" \r\n"); - - - - #line 21 "..\..\Dashboard\Pages\_SidebarMenu.cshtml" -} - - - #line default - #line hidden - - } - } -} -#pragma warning restore 1591