FAT Write UX: typed inline value editor and fixed Write action

BrowserBatchWriteWindow.xaml

@@ -1,8 +1,8 @@
 <Window x:Class="ArIED61850Tester.BrowserBatchWriteWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Write selected Data Attributes · ARSAS"
-        Width="760" Height="580" MinWidth="650" MinHeight="420" MaxHeight="690"
+        Title="Write Data to IED"
+        Width="660" Height="490" MinWidth="570" MinHeight="360" MaxHeight="700"
         WindowStartupLocation="CenterOwner" ResizeMode="CanResize"
         Background="#F5F7FA" FontFamily="{StaticResource AppFontFamily}" FontSize="11.5"
         Loaded="Window_Loaded" Closed="Window_Closed">
@@ -14,15 +14,15 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Margin="2,0,2,10">
-            <TextBlock Text="Write selected Data Attributes" Foreground="#293E56"
+            <TextBlock Text="Write Data to IED" Foreground="#293E56"
                        FontWeight="SemiBold" FontSize="15"/>
             <TextBlock x:Name="IdentityLabel" Foreground="#5F7389" FontSize="11"
                        TextTrimming="CharacterEllipsis" Margin="0,3,0,0"/>
             <TextBlock Text="One verified DO · exact FC/type · no IEC Control Operate"
                        Foreground="#637990" FontSize="10.5" Margin="0,3,0,0"/>
         </StackPanel>
-        <TextBlock Grid.Row="1" Text="Select individual rows, enter new values and inspect the live MMS type before confirming. Writes are sequential, never atomic."
-                   TextWrapping="Wrap" Foreground="#596D84" FontSize="10.5" Margin="2,0,2,9"/>
+        <TextBlock Grid.Row="1" Text="Check attributes and choose values. Inspect verifies the current IED types before Write."
+                   TextTrimming="CharacterEllipsis" Foreground="#596D84" FontSize="10.5" Margin="2,0,2,7"/>
         <DataGrid x:Name="RowsGrid" Grid.Row="2" ItemsSource="{Binding Rows}"
                   Style="{StaticResource ModernDataGrid}" IsReadOnly="False"
                   AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False"
@@ -32,30 +32,36 @@
                   VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling"
                   EnableRowVirtualization="True">
             <DataGrid.Columns>
-                <DataGridTemplateColumn Header="Write" Width="53">
+                <DataGridTemplateColumn Header=" " Width="36">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <CheckBox HorizontalAlignment="Center" VerticalAlignment="Center"
-                                      IsChecked="{Binding Selected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                      IsEnabled="{Binding Eligible}" ToolTip="{Binding Status}"/>
+                            <CheckBox IsChecked="{Binding Selected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      IsEnabled="{Binding Eligible}" VerticalAlignment="Center"
+                                      HorizontalAlignment="Center" ToolTip="{Binding Status}"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="DA (exact MMS)" Binding="{Binding ReferenceText}"
-                                    IsReadOnly="True" Width="2.4*" MinWidth="220"/>
-                <DataGridTextColumn Header="FC" Binding="{Binding Fc}" IsReadOnly="True" Width="45"/>
-                <DataGridTextColumn Header="MMS type" Binding="{Binding Type}" IsReadOnly="True" Width="89"/>
-                <DataGridTextColumn Header="Before" Binding="{Binding Old}" IsReadOnly="True" Width="90"/>
-                <DataGridTemplateColumn Header="New value" Width="1.1*" MinWidth="108">
+                <DataGridTextColumn Header="Data Attribute" Binding="{Binding DisplayName}"
+                                    Width="2*" MinWidth="145" IsReadOnly="True"/>
+                <DataGridTextColumn Header="FC" Binding="{Binding Fc}" Width="43" IsReadOnly="True"/>
+                <DataGridTextColumn Header="Current" Binding="{Binding Old}" Width="1*" IsReadOnly="True"/>
+                <DataGridTemplateColumn Header="Value" Width="1.3*" MinWidth="120">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <TextBox Text="{Binding NewValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                     IsEnabled="{Binding Eligible}" Padding="5,3" FontSize="11"/>
+                            <Grid>
+                                <TextBox Text="{Binding NewValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         IsEnabled="{Binding CanEdit}" Visibility="{Binding TextEditorVisibility}"
+                                         Padding="6,3" ToolTip="{Binding Status}"/>
+                                <ComboBox ItemsSource="{Binding BooleanChoices}"
+                                          SelectedItem="{Binding NewValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                          Visibility="{Binding BooleanEditorVisibility}"
+                                          IsEnabled="{Binding CanEdit}" Padding="5,1"/>
+                            </Grid>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="Result / reason" Binding="{Binding Status}"
-                                    IsReadOnly="True" Width="1.7*" MinWidth="145"/>
+                <DataGridTextColumn Header="Status" Binding="{Binding Status}"
+                                    Width="1.4*" MinWidth="120" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
         <Grid Grid.Row="3" Margin="1,10,1,0">
@@ -72,14 +78,14 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Grid.Column="0" Text="A confirmed Write is not physical feedback."
+                <TextBlock Grid.Column="0" Text="Writes are sequential."
                            Foreground="#70849B" FontSize="10" TextWrapping="Wrap"
                            VerticalAlignment="Center" Margin="0,0,8,0"/>
-                <Button x:Name="InspectButton" Grid.Column="1" Content="Inspect selected"
-                        Style="{StaticResource SoftButton}" Width="117" Height="31"
+                <Button x:Name="InspectButton" Grid.Column="1" Content="Inspect"
+                        Style="{StaticResource SoftButton}" Width="89" Height="31"
                         Margin="0,0,7,0" Click="Inspect_Click"/>
-                <Button x:Name="WriteButton" Grid.Column="2" Content="Write selected…"
-                        Width="118" Height="31" IsEnabled="False" Background="#255F99"
+                <Button x:Name="WriteButton" Grid.Column="2" Content="Write"
+                        Width="94" Height="31" IsEnabled="False" Background="#255F99"
                         Foreground="White" BorderBrush="#255F99"
                         Margin="0,0,7,0" Click="Write_Click"/>
                 <Button Grid.Column="3" Content="Close" Width="72" Height="31"

BrowserBatchWriteWindow.xaml.cs

@@ -106,8 +106,8 @@ private void SetBusy(bool busy)
     private void Window_Loaded(object sender, RoutedEventArgs e)
     {
         var work = SystemParameters.WorkArea;
-        Height = Math.Max(MinHeight, Math.Min(580, work.Height - 26));
-        Width = Math.Max(MinWidth, Math.Min(760, work.Width - 26));
+        Height = Math.Max(MinHeight, Math.Min(490, work.Height - 26));
+        Width = Math.Max(MinWidth, Math.Min(660, work.Width - 26));
     }
 
     private BrowserBatchWriteRow[] CheckedRows()
@@ -142,13 +142,15 @@ private async void Inspect_Click(object sender, RoutedEventArgs e)
                     throw new InvalidOperationException("IED association changed during inspection.");
                 StatusLabel.Text = $"Read-only inspect {i + 1}/{selected.Length}: {row.ReferenceText}";
                 row.Preview = null;
+                row.NotifyEditorChanged();
                 var preview = await _runtime.PreviewBrowserDataAttributeWriteAsync(
                     _device, row.Reference!.Value, _lifetime.Token);
                 if (!CurrentAssociation)
                     throw new InvalidOperationException("IED association changed during inspection.");
                 row.Preview = preview.IsAvailable ? preview : null;
                 row.Type = preview.Type?.MmsType ?? "unverified";
                 row.Old = preview.CurrentText;
+                row.ApplyLiveEditor(preview.Type?.MmsType == "boolean", preview.CurrentText);
                 row.Status = preview.Message;
                 if (row.Preview is null)
                 {
@@ -270,6 +272,7 @@ private async void Write_Click(object sender, RoutedEventArgs e)
                 selected[i].Status = result.Rows[i].State?.ToString() ?? "Unattempted";
                 selected[i].Status += ": " + result.Rows[i].Message;
                 selected[i].Preview = null;
+                selected[i].NotifyEditorChanged();
             }
             StatusLabel.Text =
                 $"Readback verified: {result.Verified}; rejected: {result.Rejected}; " +
@@ -302,15 +305,17 @@ private async void Write_Click(object sender, RoutedEventArgs e)
 public sealed class BrowserBatchWriteRow : INotifyPropertyChanged
 {
     private bool _selected;
-    private string _newValue = "";
+    private string _newValue = "Inspect first";
     private string _status;
     private string _type = "Inspect first";
     private string _old = "—";
 
     public MmsObjectReference? Reference { get; }
     public string ReferenceText { get; }
+    public string DisplayName { get; }
     public string Fc { get; }
     public bool Eligible { get; }
+    public bool CanEdit => Eligible && Preview is { IsAvailable: true, Type: not null };
     public bool HasEdited { get; private set; }
     public IedBrowserNativeWritePreview? Preview { get; set; }
     public event PropertyChangedEventHandler? PropertyChanged;
@@ -321,11 +326,34 @@ public BrowserBatchWriteRow(
     {
         Reference = reference;
         ReferenceText = referenceText;
+        DisplayName = referenceText.Split((char)36).LastOrDefault() ?? referenceText;
         Fc = fc;
         Eligible = eligible;
         _status = reason;
     }
 
+    public void NotifyEditorChanged() => Changed(nameof(CanEdit));
+    public IReadOnlyList<string> BooleanChoices { get; } = new[] { "true", "false" };
+    public Visibility BooleanEditorVisibility => _booleanEditor ? Visibility.Visible : Visibility.Collapsed;
+    public Visibility TextEditorVisibility => _booleanEditor ? Visibility.Collapsed : Visibility.Visible;
+    private bool _booleanEditor;
+
+    public void ApplyLiveEditor(bool boolean, string actualValue)
+    {
+        if (_booleanEditor != boolean)
+        {
+            _booleanEditor = boolean;
+            Changed(nameof(BooleanEditorVisibility));
+            Changed(nameof(TextEditorVisibility));
+        }
+        if (!HasEdited && !string.IsNullOrWhiteSpace(actualValue))
+        {
+            _newValue = actualValue;
+            Changed(nameof(NewValue));
+        }
+        Changed(nameof(CanEdit));
+    }
+
     public bool Selected
     {
         get => _selected;