From 513d565057fe28cae6e143803513300f4b88df0f Mon Sep 17 00:00:00 2001
From: John T Maxwell III <maxwellparc@gmail.com>
Date: Fri, 6 Dec 2024 11:54:06 -0800
Subject: [PATCH] Fix LT-21999: Improve saving of parser test reports (#224)

* Fix LT-21999: Improve saving of parser test reports

* Fix button position

* Move button to bottom of window

---------

Co-authored-by: Jake Oliver <jeoliver97@gmail.com>
---
 Src/LexText/ParserUI/ParserListener.cs        |  21 +-
 Src/LexText/ParserUI/ParserReportDialog.xaml  | 250 +++++++++---------
 .../ParserUI/ParserReportDialog.xaml.cs       |  46 +++-
 Src/LexText/ParserUI/ParserReportViewModel.cs |  17 ++
 Src/LexText/ParserUI/ParserReportsDialog.xaml |   4 +-
 .../ParserUI/ParserReportsDialog.xaml.cs      |  11 +-
 .../ParserUI/ParserReportsViewModel.cs        |  13 +-
 .../ParserUI/ParserUIStrings.Designer.cs      |   9 +
 Src/LexText/ParserUI/ParserUIStrings.resx     |   3 +
 9 files changed, 230 insertions(+), 144 deletions(-)

diff --git a/Src/LexText/ParserUI/ParserListener.cs b/Src/LexText/ParserUI/ParserListener.cs
index 4ec98804bf..f95c9f6fd3 100644
--- a/Src/LexText/ParserUI/ParserListener.cs
+++ b/Src/LexText/ParserUI/ParserListener.cs
@@ -619,8 +619,8 @@ private void UpdateWordforms(IEnumerable<IWfiWordform> wordforms, ParserPriority
 					ReadParserReports();
 					// Write an empty parser report.
 					var parserReport = CreateParserReport();
-					AddParserReport(parserReport);
-					ShowParserReport(parserReport, m_mediator, m_cache);
+					ParserReportViewModel viewModel = AddParserReport(parserReport);
+					ShowParserReport(viewModel, m_mediator, m_cache);
 				}
 			}
 			m_parserConnection.UpdateWordforms(wordforms, priority, checkParser);
@@ -670,8 +670,8 @@ private void WordformUpdatedEventHandler(object sender, WordformUpdatedEventArgs
 				ReadParserReports();
 				// Convert parse results into ParserReport.
 				var parserReport = CreateParserReport();
-				AddParserReport(parserReport);
-				ShowParserReport(parserReport, m_mediator, m_cache);
+				ParserReportViewModel viewModel = AddParserReport(parserReport);
+				ShowParserReport(viewModel, m_mediator, m_cache);
 			}
 		}
 
@@ -701,15 +701,18 @@ ParserReport CreateParserReport()
 			return parserReport;
 		}
 
-		public static void SaveParserReport(ParserReport report, LcmCache cache, string defaultComment)
+		public static void SaveParserReport(ParserReportViewModel reportViewModel, LcmCache cache, string defaultComment)
 		{
 			Form inputBox = CreateInputBox(ParserUIStrings.ksEnterComment, ref defaultComment);
 			DialogResult result = inputBox.ShowDialog();
 			if (result == DialogResult.OK)
 			{
+				ParserReport report = reportViewModel.ParserReport;
 				Control textBox = inputBox.Controls["input"];
 				report.Comment = textBox.Text;
+				report.DeleteJsonFile();
 				report.WriteJsonFile(cache);
+				reportViewModel.UpdateDisplayComment();
 			}
 		}
 
@@ -850,12 +853,14 @@ private void ReadParserReports()
 		/// <summary>
 		/// Add parserReport to the list of parser reports.
 		/// </summary>
-		private void AddParserReport(ParserReport parserReport)
+		private ParserReportViewModel AddParserReport(ParserReport parserReport)
 		{
-			m_parserReports.Insert(0, new ParserReportViewModel { ParserReport = parserReport });
+			ParserReportViewModel viewModel = new ParserReportViewModel { ParserReport = parserReport };
+			m_parserReports.Insert(0, viewModel);
 			if (m_parserReportsDialog != null)
 				// Reset ParserReports so that the window gets notified when the new report is selected.
 				((ParserReportsViewModel)m_parserReportsDialog.DataContext).ParserReports = m_parserReports;
+			return viewModel;
 		}
 
 		/// <summary>
@@ -863,7 +868,7 @@ private void AddParserReport(ParserReport parserReport)
 		/// </summary>
 		/// <param name="parserReport"></param>
 		/// <param name="mediator">the mediator is used to call TryAWord</param>
-		public static void ShowParserReport(ParserReport parserReport, Mediator mediator, LcmCache cache)
+		public static void ShowParserReport(ParserReportViewModel parserReport, Mediator mediator, LcmCache cache)
 		{
 			ParserReportDialog dialog = new ParserReportDialog(parserReport, mediator, cache);
 			dialog.Show();
diff --git a/Src/LexText/ParserUI/ParserReportDialog.xaml b/Src/LexText/ParserUI/ParserReportDialog.xaml
index 8197811047..23fa40cb3f 100644
--- a/Src/LexText/ParserUI/ParserReportDialog.xaml
+++ b/Src/LexText/ParserUI/ParserReportDialog.xaml
@@ -14,169 +14,183 @@
 		<local:PositiveIntToRedBrushConverter x:Key="PositiveIntToRedBrushConverter" />
 	</Window.Resources>
 	<Grid>
-		<DataGrid AutoGenerateColumns="False" CanUserAddRows="False" ItemsSource="{Binding ParseReports}">
-			<DataGrid.Columns>
-				<DataGridTemplateColumn>
-					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate>
-							<Button Content="{x:Static local:ParserUIStrings.ksShowAnalyses}"
+		<Grid.RowDefinitions>
+			<RowDefinition Height="*" />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+		<ScrollViewer VerticalScrollBarVisibility="Auto" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
+			<DataGrid Name="DataGrid" AutoGenerateColumns="False" CanUserAddRows="False" IsReadOnly="True" SelectionChanged="DataGrid_SelectionChanged"
+					  MouseDoubleClick="DataGrid_MouseDoubleClick" ItemsSource="{Binding ParseReports}">
+				<DataGrid.Columns>
+					<DataGridTemplateColumn>
+						<DataGridTemplateColumn.CellTemplate>
+							<DataTemplate>
+								<Button Content="{x:Static local:ParserUIStrings.ksShowAnalyses}"
 									ToolTip="{x:Static local:ParserUIStrings.ksShowAnalysesToolTip}"
 							Click="ShowWordAnalyses"
 							CommandParameter="{Binding}"/>
-						</DataTemplate>
-					</DataGridTemplateColumn.CellTemplate>
-				</DataGridTemplateColumn>
-				<DataGridTemplateColumn>
-					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate>
-							<Button Content="{x:Static local:ParserUIStrings.ksReparse}"
+							</DataTemplate>
+						</DataGridTemplateColumn.CellTemplate>
+					</DataGridTemplateColumn>
+					<DataGridTemplateColumn>
+						<DataGridTemplateColumn.CellTemplate>
+							<DataTemplate>
+								<Button Content="{x:Static local:ParserUIStrings.ksReparse}"
 									ToolTip="{x:Static local:ParserUIStrings.ksReparseToolTip}"
 							Click="ReparseWord"
 							CommandParameter="{Binding}"/>
-						</DataTemplate>
-					</DataGridTemplateColumn.CellTemplate>
-				</DataGridTemplateColumn>
-				<DataGridTextColumn Binding="{Binding Word}">
-					<DataGridTextColumn.Header>
-						<StackPanel>
-							<Label Content="{x:Static local:ParserUIStrings.ksWord}"
+							</DataTemplate>
+						</DataGridTemplateColumn.CellTemplate>
+					</DataGridTemplateColumn>
+					<DataGridTextColumn Binding="{Binding Word}">
+						<DataGridTextColumn.Header>
+							<StackPanel>
+								<Label Content="{x:Static local:ParserUIStrings.ksWord}"
 								   ToolTip="{x:Static local:ParserUIStrings.ksWordToolTip}"/>
-							<Separator/>
-							<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksNumWordsParsedToolTip}"
+								<Separator/>
+								<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksNumWordsParsedToolTip}"
 								   Text="{Binding DataContext.ParserReport.NumWords, RelativeSource={RelativeSource AncestorType=DataGrid}}"></TextBlock>
-						</StackPanel>
-					</DataGridTextColumn.Header>
-				</DataGridTextColumn>
-				<DataGridTemplateColumn SortMemberPath="NoParse" CanUserSort="True">
-					<DataGridTemplateColumn.Header>
-						<StackPanel>
-							<Label Content="{x:Static local:ParserUIStrings.ksNumZeroParses}"
+							</StackPanel>
+						</DataGridTextColumn.Header>
+					</DataGridTextColumn>
+					<DataGridTemplateColumn SortMemberPath="NoParse" CanUserSort="True">
+						<DataGridTemplateColumn.Header>
+							<StackPanel>
+								<Label Content="{x:Static local:ParserUIStrings.ksNumZeroParses}"
 								   ToolTip="{x:Static local:ParserUIStrings.ksNumZeroParsesToolTip}"/>
-							<Separator/>
-							<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksNumZeroParsesToolTip}"
+								<Separator/>
+								<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksNumZeroParsesToolTip}"
 									   Text="{Binding DataContext.ParserReport.NumZeroParses, RelativeSource={RelativeSource AncestorType=DataGrid}}"
 									   Foreground="{Binding DataContext.ParserReport.NumZeroParses,
 												RelativeSource={RelativeSource AncestorType=DataGrid},
 												Converter={StaticResource PositiveIntToRedBrushConverter}}"/>
-						</StackPanel>
-					</DataGridTemplateColumn.Header>
-					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate>
-							<TextBlock Text="{Binding NoParse}"
+							</StackPanel>
+						</DataGridTemplateColumn.Header>
+						<DataGridTemplateColumn.CellTemplate>
+							<DataTemplate>
+								<TextBlock Text="{Binding NoParse}"
 									   Foreground="{Binding NoParse, Converter={StaticResource PositiveIntToRedBrushConverter}}"/>
-						</DataTemplate>
-					</DataGridTemplateColumn.CellTemplate>
-				</DataGridTemplateColumn>
-				<DataGridTemplateColumn SortMemberPath="NumUserApprovedAnalysesMissing" CanUserSort="True">
-					<DataGridTemplateColumn.Header>
-						<StackPanel>
-							<Label Content="{x:Static local:ParserUIStrings.ksNumMissingAnalyses}"
+							</DataTemplate>
+						</DataGridTemplateColumn.CellTemplate>
+					</DataGridTemplateColumn>
+					<DataGridTemplateColumn SortMemberPath="NumUserApprovedAnalysesMissing" CanUserSort="True">
+						<DataGridTemplateColumn.Header>
+							<StackPanel>
+								<Label Content="{x:Static local:ParserUIStrings.ksNumMissingAnalyses}"
 								   ToolTip="{x:Static local:ParserUIStrings.ksNumMissingAnalysesToolTip}"/>
-							<Separator/>
-							<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksTotalMissingAnalysesToolTip}"
+								<Separator/>
+								<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksTotalMissingAnalysesToolTip}"
 									   Text="{Binding DataContext.ParserReport.TotalUserApprovedAnalysesMissing, RelativeSource={RelativeSource AncestorType=DataGrid}}"
 									   Foreground="{Binding DataContext.ParserReport.TotalUserApprovedAnalysesMissing,
 												RelativeSource={RelativeSource AncestorType=DataGrid},
 												Converter={StaticResource PositiveIntToRedBrushConverter}}"/>
-						</StackPanel>
-					</DataGridTemplateColumn.Header>
-					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate>
-							<TextBlock Text="{Binding NumUserApprovedAnalysesMissing}"
+							</StackPanel>
+						</DataGridTemplateColumn.Header>
+						<DataGridTemplateColumn.CellTemplate>
+							<DataTemplate>
+								<TextBlock Text="{Binding NumUserApprovedAnalysesMissing}"
 									   Foreground="{Binding NumUserApprovedAnalysesMissing, Converter={StaticResource PositiveIntToRedBrushConverter}}"/>
-						</DataTemplate>
-					</DataGridTemplateColumn.CellTemplate>
-				</DataGridTemplateColumn>
-				<DataGridTemplateColumn SortMemberPath="NumUserDisapprovedAnalyses" CanUserSort="True">
-					<DataGridTemplateColumn.Header>
-						<StackPanel>
-							<Label Content="{x:Static local:ParserUIStrings.ksNumDisapprovedAnalyses}"
+							</DataTemplate>
+						</DataGridTemplateColumn.CellTemplate>
+					</DataGridTemplateColumn>
+					<DataGridTemplateColumn SortMemberPath="NumUserDisapprovedAnalyses" CanUserSort="True">
+						<DataGridTemplateColumn.Header>
+							<StackPanel>
+								<Label Content="{x:Static local:ParserUIStrings.ksNumDisapprovedAnalyses}"
 								   ToolTip="{x:Static local:ParserUIStrings.ksNumDisapprovedAnalysesToolTip}"/>
-							<Separator/>
-							<TextBlock ToolTip="{x:Static local:ParserUIStrings.ksTotalDisapprovedAnalysesToolTip}"
+								<Separator/>
+								<TextBlock ToolTip="{x:Static local:ParserUIStrings.ksTotalDisapprovedAnalysesToolTip}"
 									   Text="{Binding DataContext.ParserReport.TotalUserDisapprovedAnalyses, RelativeSource={RelativeSource AncestorType=DataGrid}}"
 									   Foreground="{Binding DataContext.ParserReport.TotalUserDisapprovedAnalyses,
 												RelativeSource={RelativeSource AncestorType=DataGrid},
 												Converter={StaticResource PositiveIntToRedBrushConverter}}"/>
-						</StackPanel>
-					</DataGridTemplateColumn.Header>
-					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate>
-							<TextBlock Text="{Binding NumUserDisapprovedAnalyses}"
+							</StackPanel>
+						</DataGridTemplateColumn.Header>
+						<DataGridTemplateColumn.CellTemplate>
+							<DataTemplate>
+								<TextBlock Text="{Binding NumUserDisapprovedAnalyses}"
 									   Foreground="{Binding NumUserDisapprovedAnalyses, Converter={StaticResource PositiveIntToRedBrushConverter}}"/>
-						</DataTemplate>
-					</DataGridTemplateColumn.CellTemplate>
-				</DataGridTemplateColumn>
-				<DataGridTemplateColumn SortMemberPath="NumUserNoOpinionAnalyses" CanUserSort="True">
-					<DataGridTemplateColumn.Header>
-						<StackPanel>
-							<Label Content="{x:Static local:ParserUIStrings.ksNumNoOpinionAnalyses}"
+							</DataTemplate>
+						</DataGridTemplateColumn.CellTemplate>
+					</DataGridTemplateColumn>
+					<DataGridTemplateColumn SortMemberPath="NumUserNoOpinionAnalyses" CanUserSort="True">
+						<DataGridTemplateColumn.Header>
+							<StackPanel>
+								<Label Content="{x:Static local:ParserUIStrings.ksNumNoOpinionAnalyses}"
 								   ToolTip="{x:Static local:ParserUIStrings.ksNumNoOpinionAnalysesToolTip}"/>
-							<Separator/>
-							<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksTotalNoOpinionAnalysesToolTip}"
+								<Separator/>
+								<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksTotalNoOpinionAnalysesToolTip}"
 									   Text="{Binding DataContext.ParserReport.TotalUserNoOpinionAnalyses, RelativeSource={RelativeSource AncestorType=DataGrid}}"
 									   Foreground="{Binding DataContext.ParserReport.TotalUserNoOpinionAnalyses,
 												RelativeSource={RelativeSource AncestorType=DataGrid},
 												Converter={StaticResource PositiveIntToRedBrushConverter}}"/>
-						</StackPanel>
-					</DataGridTemplateColumn.Header>
-					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate>
-							<TextBlock Text="{Binding NumUserNoOpinionAnalyses}"
+							</StackPanel>
+						</DataGridTemplateColumn.Header>
+						<DataGridTemplateColumn.CellTemplate>
+							<DataTemplate>
+								<TextBlock Text="{Binding NumUserNoOpinionAnalyses}"
 									   Foreground="{Binding NumUserNoOpinionAnalyses, Converter={StaticResource PositiveIntToRedBrushConverter}}"/>
-						</DataTemplate>
-					</DataGridTemplateColumn.CellTemplate>
-				</DataGridTemplateColumn>
-				<DataGridTextColumn Binding="{Binding ErrorMessage}" Width="100">
-					<DataGridTextColumn.ElementStyle>
-						<Style TargetType="{x:Type TextBlock}"
+							</DataTemplate>
+						</DataGridTemplateColumn.CellTemplate>
+					</DataGridTemplateColumn>
+					<DataGridTextColumn Binding="{Binding ErrorMessage}" Width="100">
+						<DataGridTextColumn.ElementStyle>
+							<Style TargetType="{x:Type TextBlock}"
 							   BasedOn="{StaticResource {x:Type TextBlock}}">
-							<Setter Property="TextWrapping"
+								<Setter Property="TextWrapping"
 									   Value="NoWrap" />
-							<Setter Property="TextTrimming"
+								<Setter Property="TextTrimming"
 									Value="CharacterEllipsis" />
-							<Setter Property="ToolTip"
+								<Setter Property="ToolTip"
 									Value="{Binding ErrorMessage}" />
-						</Style>
-					</DataGridTextColumn.ElementStyle>
-					<DataGridTextColumn.Header>
-						<StackPanel>
-							<Label Content="{x:Static local:ParserUIStrings.ksErrorMessage}"
+							</Style>
+						</DataGridTextColumn.ElementStyle>
+						<DataGridTextColumn.Header>
+							<StackPanel>
+								<Label Content="{x:Static local:ParserUIStrings.ksErrorMessage}"
 								   ToolTip="{x:Static local:ParserUIStrings.ksErrorMessageToolTip}"/>
-							<Separator/>
-							<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksNumParseErrorsToolTip}"
+								<Separator/>
+								<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksNumParseErrorsToolTip}"
 									   Text="{Binding DataContext.ParserReport.NumParseErrors, RelativeSource={RelativeSource AncestorType=DataGrid}}"
 									   Foreground="{Binding DataContext.ParserReport.NumParseErrors,
 															RelativeSource={RelativeSource AncestorType=DataGrid},
 															Converter={StaticResource PositiveIntToRedBrushConverter}}"/>
-						</StackPanel>
-					</DataGridTextColumn.Header>
-				</DataGridTextColumn>
-				<DataGridTextColumn Binding="{Binding NumAnalyses}">
-					<DataGridTextColumn.Header>
-						<StackPanel>
-							<Label Content="{x:Static local:ParserUIStrings.ksNumAnalyses}"
+							</StackPanel>
+						</DataGridTextColumn.Header>
+					</DataGridTextColumn>
+					<DataGridTextColumn Binding="{Binding NumAnalyses}">
+						<DataGridTextColumn.Header>
+							<StackPanel>
+								<Label Content="{x:Static local:ParserUIStrings.ksNumAnalyses}"
 								   ToolTip="{x:Static local:ParserUIStrings.ksNumAnalysesToolTip}"/>
-							<Separator/>
-							<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksTotalAnalysesToolTip}"
+								<Separator/>
+								<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksTotalAnalysesToolTip}"
 								   Text="{Binding DataContext.ParserReport.TotalAnalyses, RelativeSource={RelativeSource AncestorType=DataGrid}}"></TextBlock>
-						</StackPanel>
-					</DataGridTextColumn.Header>
-				</DataGridTextColumn>
-				<DataGridTextColumn Binding="{Binding ParseTime, Converter={StaticResource MillisecondsToTimeSpanConverter}, StringFormat=\{0:g\}}">
-					<DataGridTextColumn.Header>
-						<StackPanel>
-							<Label Content="{x:Static local:ParserUIStrings.ksParseTime}"
+							</StackPanel>
+						</DataGridTextColumn.Header>
+					</DataGridTextColumn>
+					<DataGridTextColumn Binding="{Binding ParseTime, Converter={StaticResource MillisecondsToTimeSpanConverter}, StringFormat=\{0:g\}}">
+						<DataGridTextColumn.Header>
+							<StackPanel>
+								<Label Content="{x:Static local:ParserUIStrings.ksParseTime}"
 								   ToolTip="{x:Static local:ParserUIStrings.ksParseTimeToolTip}"/>
-							<Separator/>
-							<!-- The following must be a TextBlock for StringFormat to work. -->
-							<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksTotalParseTimeToolTip}"
+								<Separator/>
+								<!-- The following must be a TextBlock for StringFormat to work. -->
+								<TextBlock ToolTip ="{x:Static local:ParserUIStrings.ksTotalParseTimeToolTip}"
 								Text="{Binding DataContext.ParserReport.TotalParseTime, RelativeSource={RelativeSource AncestorType=DataGrid},
 								Converter={StaticResource MillisecondsToTimeSpanConverter}, StringFormat=\{0:g\}}"></TextBlock>
-						</StackPanel>
-					</DataGridTextColumn.Header>
-				</DataGridTextColumn>
-			</DataGrid.Columns>
-		</DataGrid>
+							</StackPanel>
+						</DataGridTextColumn.Header>
+					</DataGridTextColumn>
+				</DataGrid.Columns>
+			</DataGrid>
+		</ScrollViewer>
+		<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left" Height="40">
+			<Button Content="{x:Static local:ParserUIStrings.ksSaveReport}"
+                    ToolTip="{x:Static local:ParserUIStrings.ksSaveReportToolTip}"
+                    Click="SaveParserReport" Width="100" Margin="5"/>
+			<Label x:Name="commentLabel" Height="27"/>
+			<Label Content="{Binding DisplayComment, Mode=OneWay}" Height="27"/>
+		</StackPanel>
 	</Grid>
 </Window>
\ No newline at end of file
diff --git a/Src/LexText/ParserUI/ParserReportDialog.xaml.cs b/Src/LexText/ParserUI/ParserReportDialog.xaml.cs
index 1334d2d326..7f97244d9b 100644
--- a/Src/LexText/ParserUI/ParserReportDialog.xaml.cs
+++ b/Src/LexText/ParserUI/ParserReportDialog.xaml.cs
@@ -2,8 +2,12 @@
 using SIL.FieldWorks.WordWorks.Parser;
 using SIL.LCModel;
 using SIL.LCModel.Core.Text;
+using System.Diagnostics;
+using System;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Threading;
 using XCore;
 
 namespace SIL.FieldWorks.LexText.Controls
@@ -18,14 +22,22 @@ public ParserReportDialog()
 			InitializeComponent();
 		}
 
-		public ParserReportDialog(ParserReport parserReport, Mediator mediator, LcmCache cache)
+		public ParserReportDialog(ParserReportViewModel parserReport, Mediator mediator, LcmCache cache)
 		{
 			InitializeComponent();
 			Mediator = mediator;
 			Cache = cache;
-			DataContext = new ParserReportViewModel { ParserReport = parserReport };
+			DataContext = parserReport;
+			commentLabel.Content = ParserUIStrings.ksComment + ":";
 		}
 
+		public void SaveParserReport(object sender, RoutedEventArgs e)
+		{
+			ParserReportViewModel parserReportViewModel = (ParserReportViewModel)DataContext;
+			ParserListener.SaveParserReport(parserReportViewModel, Cache, null);
+		}
+
+
 		public void ReparseWord(object sender, RoutedEventArgs e)
 		{
 			var button = sender as Button;
@@ -54,5 +66,35 @@ private string RemoveArrow(string word)
 		{
 			return word.Replace(" => ", string.Empty);
 		}
+
+		private void ScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
+		{
+			ScrollViewer scrollViewer = sender as ScrollViewer;
+			if (scrollViewer != null)
+				if (e.Delta > 0)
+					scrollViewer.LineUp();
+				else
+					scrollViewer.LineDown();
+			e.Handled = true;
+		}
+
+		private void DataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+		{
+			if (sender is DataGrid dataGrid)
+			{
+				if (dataGrid.SelectedItem is ParserReportViewModel selectedItem)
+					ParserListener.ShowParserReport(selectedItem, Mediator, Cache);
+			}
+			else
+				Debug.Fail("Type of Contents of DataGrid changed, adjust double click code.");
+		}
+		private void DataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+		{
+			if (sender is DataGrid dataGrid)
+			{
+				// Turn off selection in favor of the check box.
+				Dispatcher.BeginInvoke(DispatcherPriority.Render, new Action(() => dataGrid.UnselectAll()));
+			}
+		}
 	}
 }
diff --git a/Src/LexText/ParserUI/ParserReportViewModel.cs b/Src/LexText/ParserUI/ParserReportViewModel.cs
index d9aaf09b5a..53e8562240 100644
--- a/Src/LexText/ParserUI/ParserReportViewModel.cs
+++ b/Src/LexText/ParserUI/ParserReportViewModel.cs
@@ -24,6 +24,18 @@ public string Title
 			}
 		}
 
+		public string DisplayComment
+		{
+			get
+			{
+				if (ParserReport.Filename == null)
+				{
+					return ParserUIStrings.ksUnsavedParserReport;
+				}
+				return ParserReport.Comment;
+			}
+		}
+
 		public IEnumerable<ParseReport> ParseReports
 		{
 			get
@@ -65,5 +77,10 @@ protected virtual void OnPropertyChanged(string propertyName)
 		{
 			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 		}
+
+		public void UpdateDisplayComment()
+		{
+			OnPropertyChanged("DisplayComment");
+		}
 	}
 }
diff --git a/Src/LexText/ParserUI/ParserReportsDialog.xaml b/Src/LexText/ParserUI/ParserReportsDialog.xaml
index 630b7c6d6d..cb5f72d9ac 100644
--- a/Src/LexText/ParserUI/ParserReportsDialog.xaml
+++ b/Src/LexText/ParserUI/ParserReportsDialog.xaml
@@ -39,7 +39,7 @@
 							<Label Content="{x:Static local:ParserUIStrings.ksText}" ToolTip="{x:Static local:ParserUIStrings.ksTextToolTip}"/>
 						</DataGridTextColumn.Header>
 					</DataGridTextColumn>
-					<DataGridTextColumn Binding="{Binding ParserReport.Comment, Mode=TwoWay}" Width="100">
+					<DataGridTextColumn Binding="{Binding DisplayComment, Mode=OneWay}" Width="100">
 						<DataGridTextColumn.Header>
 							<Label Content="{x:Static local:ParserUIStrings.ksComment}" ToolTip="{x:Static local:ParserUIStrings.ksCommentToolTip}"/>
 						</DataGridTextColumn.Header>
@@ -122,7 +122,7 @@
                     ToolTip="{x:Static local:ParserUIStrings.ksDiffButtonToolTip}"
                     IsEnabled="{Binding CanDiffReports}"
                     Click="DiffParserReports" Width="100" Margin="5" />
-			<Button Content="{Binding DiffButtonContent}"
+			<Button Content="{Binding DeleteButtonContent}"
                     ToolTip="{x:Static local:ParserUIStrings.ksDeleteToolTip}"
                     IsEnabled="{Binding CanDeleteReports}"
                     Click="DeleteParserReport" Width="100" Margin="5" />
diff --git a/Src/LexText/ParserUI/ParserReportsDialog.xaml.cs b/Src/LexText/ParserUI/ParserReportsDialog.xaml.cs
index 99e692666b..77498dcb96 100644
--- a/Src/LexText/ParserUI/ParserReportsDialog.xaml.cs
+++ b/Src/LexText/ParserUI/ParserReportsDialog.xaml.cs
@@ -60,7 +60,7 @@ public void ShowParserReport(object sender, RoutedEventArgs e)
 			{
 				if (report.IsSelected)
 				{
-					ParserListener.ShowParserReport(report.ParserReport, Mediator, Cache);
+					ParserListener.ShowParserReport(report, Mediator, Cache);
 					break;
 				}
 			}
@@ -72,11 +72,9 @@ public void SaveParserReport(object sender, RoutedEventArgs e)
 			{
 				if (report.IsSelected)
 				{
-					ParserListener.SaveParserReport(report.ParserReport, Cache, DefaultComment);
+					ParserListener.SaveParserReport(report, Cache, DefaultComment);
 				}
 			}
-			// The comment may have been updated.
-			DataGrid.Items.Refresh();
 			((ParserReportsViewModel)DataContext).UpdateButtonStates();
 
 		}
@@ -130,14 +128,15 @@ public void DiffParserReports(object sender, RoutedEventArgs e)
 				parserReport2 = temp;
 			}
 			var diff = parserReport.ParserReport.DiffParserReports(parserReport2.ParserReport);
-			ParserListener.ShowParserReport(diff, Mediator, Cache);
+			ParserReportViewModel viewModel = new ParserReportViewModel() { ParserReport = diff };
+			ParserListener.ShowParserReport(viewModel, Mediator, Cache);
 		}
 		private void DataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
 		{
 			if (sender is DataGrid dataGrid)
 			{
 				if(dataGrid.SelectedItem is ParserReportViewModel selectedItem)
-					ParserListener.ShowParserReport(selectedItem.ParserReport, Mediator, Cache);
+					ParserListener.ShowParserReport(selectedItem, Mediator, Cache);
 			}
 			else
 				Debug.Fail("Type of Contents of DataGrid changed, adjust double click code.");
diff --git a/Src/LexText/ParserUI/ParserReportsViewModel.cs b/Src/LexText/ParserUI/ParserReportsViewModel.cs
index cf5ba0cd72..34dcae2cb0 100644
--- a/Src/LexText/ParserUI/ParserReportsViewModel.cs
+++ b/Src/LexText/ParserUI/ParserReportsViewModel.cs
@@ -44,10 +44,9 @@ public ObservableCollection<ParserReportViewModel> ParserReports
 		public bool CanShowReport => ParserReports.Count(report => report.IsSelected) == 1;
 		public bool CanDiffReports => ParserReports.Count(report => report.IsSelected) == 2;
 		public bool CanDeleteReports => ParserReports.Any(report => report.IsSelected);
-		public bool CanSaveReport => ParserReports.Count(report => report.IsSelected) == 1 &&
-									ParserReports.Count(report => report.IsSelected && report.ParserReport.Filename == null) == 1;
+		public bool CanSaveReport => ParserReports.Count(report => report.IsSelected) == 1;
 
-		public string DiffButtonContent => string.Format(ParserUIStrings.ksDelete,
+		public string DeleteButtonContent => string.Format(ParserUIStrings.ksDelete,
 			ParserReports.Count(report => report.IsSelected));
 		public ParserReportsViewModel()
 		{
@@ -88,11 +87,7 @@ private void OnReportPropertyChanged(object sender, PropertyChangedEventArgs e)
 			if (e.PropertyName == nameof(ParserReportViewModel.IsSelected))
 			{
 				// Notify changes to button state properties
-				OnPropertyChanged(nameof(CanShowReport));
-				OnPropertyChanged(nameof(CanSaveReport));
-				OnPropertyChanged(nameof(CanDiffReports));
-				OnPropertyChanged(nameof(CanDeleteReports));
-				OnPropertyChanged(nameof(DiffButtonContent));
+				UpdateButtonStates();
 			}
 		}
 		protected virtual void OnPropertyChanged(string propertyName)
@@ -104,9 +99,11 @@ protected virtual void OnPropertyChanged(string propertyName)
 		public void UpdateButtonStates()
 		{
 			OnPropertyChanged(nameof(CanShowReport));
+			OnPropertyChanged(nameof(CanSaveReport));
 			OnPropertyChanged(nameof(CanDiffReports));
 			OnPropertyChanged(nameof(CanSaveReport));
 			OnPropertyChanged(nameof(CanDeleteReports));
+			OnPropertyChanged(nameof(DeleteButtonContent));
 		}
 	}
 }
diff --git a/Src/LexText/ParserUI/ParserUIStrings.Designer.cs b/Src/LexText/ParserUI/ParserUIStrings.Designer.cs
index d34153e430..4a4e5b67d7 100644
--- a/Src/LexText/ParserUI/ParserUIStrings.Designer.cs
+++ b/Src/LexText/ParserUI/ParserUIStrings.Designer.cs
@@ -699,6 +699,15 @@ public static string ksUndoEditingParserParameters {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to (unsaved).
+        /// </summary>
+        public static string ksUnsavedParserReport {
+            get {
+                return ResourceManager.GetString("ksUnsavedParserReport", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Word.
         /// </summary>
diff --git a/Src/LexText/ParserUI/ParserUIStrings.resx b/Src/LexText/ParserUI/ParserUIStrings.resx
index 16c9ecb1dc..467bf3f801 100644
--- a/Src/LexText/ParserUI/ParserUIStrings.resx
+++ b/Src/LexText/ParserUI/ParserUIStrings.resx
@@ -344,4 +344,7 @@
   <data name="ksEnterComment" xml:space="preserve">
     <value>Please enter a comment for the parser report</value>
   </data>
+  <data name="ksUnsavedParserReport" xml:space="preserve">
+    <value>(unsaved)</value>
+  </data>
 </root>
\ No newline at end of file