From ea7181c99d9fec8b9c53aefc25614d1f839a4e37 Mon Sep 17 00:00:00 2001
From: Jeroen Roefs <71811893+SoftAdviceJR@users.noreply.github.com>
Date: Tue, 6 Jun 2023 17:15:36 +0200
Subject: [PATCH] Added order property and ordered by it (#104)

---
 .../DashboardQueueAndTaskDetails.cs                 |  5 +++++
 ...ManagerExAsynchronousDashboardContentProvider.cs | 13 ++++++++++---
 .../TaskQueues/ShowOnDashboardAttribute.cs          |  5 +++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/MFiles.VAF.Extensions/Dashboards/AsynchronousDashboardContent/DashboardQueueAndTaskDetails.cs b/MFiles.VAF.Extensions/Dashboards/AsynchronousDashboardContent/DashboardQueueAndTaskDetails.cs
index 9799f629..f5970855 100644
--- a/MFiles.VAF.Extensions/Dashboards/AsynchronousDashboardContent/DashboardQueueAndTaskDetails.cs
+++ b/MFiles.VAF.Extensions/Dashboards/AsynchronousDashboardContent/DashboardQueueAndTaskDetails.cs
@@ -44,5 +44,10 @@ public class DashboardQueueAndTaskDetails
 		/// If this is a recurring process then details on the recurring frequency.
 		/// </summary>
 		public IRecurrenceConfiguration RecurrenceConfiguration { get; set; }
+
+		/// <summary>
+		/// Determines the order the operations are shown on the dashboard.
+		/// </summary>
+		public int Order { get; set; }
 	}
 }
diff --git a/MFiles.VAF.Extensions/Dashboards/AsynchronousDashboardContent/TaskManagerExAsynchronousDashboardContentProvider.cs b/MFiles.VAF.Extensions/Dashboards/AsynchronousDashboardContent/TaskManagerExAsynchronousDashboardContentProvider.cs
index c40961fb..18da79d9 100644
--- a/MFiles.VAF.Extensions/Dashboards/AsynchronousDashboardContent/TaskManagerExAsynchronousDashboardContentProvider.cs
+++ b/MFiles.VAF.Extensions/Dashboards/AsynchronousDashboardContent/TaskManagerExAsynchronousDashboardContentProvider.cs
@@ -63,8 +63,12 @@ RecurringOperationConfigurationManager<TConfiguration> recurringOperationConfigu
 		/// <inheritdoc />
 		public IEnumerable<KeyValuePair<DashboardQueueAndTaskDetails, IEnumerable<TaskInfo<TaskDirective>>>> GetAsynchronousDashboardContent()
 		{
+
+			var items = new List<KeyValuePair<DashboardQueueAndTaskDetails, IEnumerable<TaskInfo<TaskDirective>>>>();
+
 			if (null == TaskQueueResolver)
-				yield break;
+				return items;
+
 
 			foreach (var queue in TaskQueueResolver.GetQueues())
 			{
@@ -184,7 +188,7 @@ public IEnumerable<KeyValuePair<DashboardQueueAndTaskDetails, IEnumerable<TaskIn
 						.TryGetValue(queue, processor.Type, out recurrenceConfiguration);
 
 					// Return the data.
-					yield return new KeyValuePair<DashboardQueueAndTaskDetails, IEnumerable<TaskInfo<TaskDirective>>>
+					items.Add(new KeyValuePair<DashboardQueueAndTaskDetails, IEnumerable<TaskInfo<TaskDirective>>>
 					(
 						new DashboardQueueAndTaskDetails()
 						{
@@ -194,16 +198,19 @@ public IEnumerable<KeyValuePair<DashboardQueueAndTaskDetails, IEnumerable<TaskIn
 							Description = showOnDashboardAttribute?.Description,
 							Commands = commands,
 							TasksInQueue = waitingTasks,
+							Order = showOnDashboardAttribute?.Order ?? 100,
 							RecurrenceConfiguration = recurrenceConfiguration
 						},
 						// Get known executions (prior, running and future).
 						showDegraded
 							? TaskManager.GetExecutions<TaskDirective>(queue, processor.Type, MFTaskState.MFTaskStateInProgress)
 							: TaskManager.GetAllExecutions<TaskDirective>(queue, processor.Type)
-					);
+					));
 
 				}
 			}
+
+			return items.OrderBy(i => i.Key.Order);
 		}
 	}
 }
diff --git a/MFiles.VAF.Extensions/Dashboards/TaskQueues/ShowOnDashboardAttribute.cs b/MFiles.VAF.Extensions/Dashboards/TaskQueues/ShowOnDashboardAttribute.cs
index 5492fe01..76cc3424 100644
--- a/MFiles.VAF.Extensions/Dashboards/TaskQueues/ShowOnDashboardAttribute.cs
+++ b/MFiles.VAF.Extensions/Dashboards/TaskQueues/ShowOnDashboardAttribute.cs
@@ -97,6 +97,11 @@ public class ShowOnDashboardAttribute
 		/// </summary>
 		public string RunCommandDisplayText { get; set; } = ShowOnDashboardAttribute.DefaultRunCommandDisplayText;
 
+		/// <summary>
+		/// Used to determine the order in which the task processors are shown on the dashboard
+		/// </summary>
+		public int Order { get; set; } = 100;
+
 		public ShowOnDashboardAttribute(string name)
 		{
 			this.Name = name;