Fix for issue #101.

M-Files · Apr 27, 2023 · f32f321 · f32f321
1 parent 44d62c6
commit f32f321
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/MFiles.VAF.Extensions/ConfigurableVaultApplicationBase.GetDashboardContent.cs b/MFiles.VAF.Extensions/ConfigurableVaultApplicationBase.GetDashboardContent.cs
@@ -41,17 +41,40 @@ public abstract partial class ConfigurableVaultApplicationBase<TSecureConfigurat
 		public override string GetDashboardContent(IConfigurationRequestContext context)
 		{
 			// Create a new dashboard.
-			var dashboard = this.CreateStatusDashboard();
-			if (null == dashboard)
-				return "";
+			StatusDashboard dashboard;
+			try
+			{
+				dashboard = this.CreateStatusDashboard();
+				if (null == dashboard)
+					return "";
+			}
+			catch(Exception e)
+			{
+				// Log the exception and render an exception panel.
+				var exception = new Exception("Could not create status dashboard", e);
+				FormattableString message = $"Could not create status dashboard.";
+				this.Logger?.Error(e, message);
+				return new ExceptionDashboardPanel(exception, $"Could not create status dashboard")?.ToString();
+			}
 
 			// Add all content in turn.
 			foreach (var content in this.GetStatusDashboardRootItems(context) ?? Enumerable.Empty<IDashboardContent>())
 				if (null != content)
 					dashboard.AddContent(content);
 
 			// Return the dashboard.
-			return dashboard.ToString();
+			try
+			{
+				return dashboard.ToString();
+			}
+			catch (Exception e)
+			{
+				// Log the exception and render an exception panel.
+				var exception = new Exception("Could not render dashboard to a string", e);
+				FormattableString message = $"Could not render dashboard to a string.";
+				this.Logger?.Error(e, message);
+				return new ExceptionDashboardPanel(exception, $"Could not render dashboard")?.ToString();
+			}
 		}
 
 		/// <summary>

diff --git a/...ApplicationOverviewDashboardContent/DefaultApplicationOverviewDashboardContentRenderer.cs b/...ApplicationOverviewDashboardContent/DefaultApplicationOverviewDashboardContentRenderer.cs
@@ -363,15 +363,15 @@ public virtual DashboardPanelEx GetApplicationDetailsDashboardContent()
 				row.AddCell(Resources.Licensing.ApplicationDetailsPanel_RowHeaders_Publisher, DashboardTableCellType.Header)
 					.HeaderStyles
 					.Remove("border-bottom");
-				row.AddCell(ApplicationDefinition.Publisher.ToString());
+				row.AddCell(ApplicationDefinition.Publisher.EscapeXmlForDashboard());
 			}
 			if (this.ShowCopyright && false == string.IsNullOrWhiteSpace(ApplicationDefinition.Copyright))
 			{
 				var row = table.AddRow();
 				row.AddCell(Resources.Licensing.ApplicationDetailsPanel_RowHeaders_Copyright, DashboardTableCellType.Header)
 					.HeaderStyles
 					.Remove("border-bottom");
-				row.AddCell($"&copy; {ApplicationDefinition.Copyright}");
+				row.AddCell($"&copy; {ApplicationDefinition.Copyright.EscapeXmlForDashboard()}");
 			}
 
 			innerContent.Add(table);