Add ViewModel metthods.

allisterb · allisterb · commit 46f15aa0ce48 · 2025-04-12T09:53:47.000-04:00
diff --git a/tests/Stratis.DevEx.Wpf.Test/BlockchainExplorer/BlockchainExplorerToolWindowControl.xaml b/tests/Stratis.DevEx.Wpf.Test/BlockchainExplorer/BlockchainExplorerToolWindowControl.xaml
@@ -44,6 +44,7 @@
         <!-- bindings for context menu commands -->
         <CommandBinding Command="{x:Static stratisui:BlockchainExplorerTree.NewNetworkCmd}" Executed="NewNetworkCmdExecuted" />
         <CommandBinding Command="{x:Static stratisui:BlockchainExplorerTree.NewEndpointCmd}" Executed="NewEndpointCmd_Executed" />
+        <CommandBinding Command="{x:Static stratisui:BlockchainExplorerTree.DeleteEndpointCmd}" Executed="DeleteEndpointCmd_Executed" CanExecute="DeleteEndpointCmd_CanExecute" />
     </UserControl.CommandBindings>
 
 </UserControl>
diff --git a/tests/Stratis.DevEx.Wpf.Test/BlockchainExplorer/BlockchainExplorerToolWindowControl.xaml.cs b/tests/Stratis.DevEx.Wpf.Test/BlockchainExplorer/BlockchainExplorerToolWindowControl.xaml.cs
@@ -118,7 +118,7 @@ private async void NewNetworkCmdExecuted(object sender, ExecutedRoutedEventArgs
                         else
                         {
                             validForClose = false;
-                            ShowValidationErrors(errors, "Enter a network name and a valid JSON-RPC URL.");
+                            ShowValidationErrors(errors, "Enter a network name and a valid JSON-RPC endpoint URL.");
                         }
                     }
                     else
@@ -203,6 +203,12 @@ private async void NewEndpointCmd_Executed(object sender, ExecutedRoutedEventArg
             }
         }
 
+        private BlockchainInfo GetSelectedItem(object sender)
+        {
+            var window = (BlockchainExplorerToolWindowControl)sender;
+            var tree = window.BlockchainExplorerTree;
+            return tree.SelectedItem;
+        }
         private void ShowValidationErrors(Wpc.TextBlock textBlock, string message)
         {
             textBlock.Visibility = Visibility.Visible;
@@ -226,8 +232,24 @@ private void HideProgressRing(ProgressRing progressRing)
 
         #region Fields
         internal BlockchainExplorerToolWindow window;
+
         #endregion
 
+        private void DeleteEndpointCmd_Executed(object sender, ExecutedRoutedEventArgs e)
+        {
+            var item = GetSelectedItem(sender);
+            item.Parent.DeleteChild(item);
+        }
 
+        private void DeleteEndpointCmd_CanExecute(object sender, CanExecuteRoutedEventArgs e)
+        {
+            var item = GetSelectedItem(sender);
+            var endpoints = item.GetEndPoints();    
+            if (endpoints.Count() == 1)
+            {
+                e.CanExecute = false;
+            }
+            e.CanExecute =  (item.Parent.Name == "Stratis MainNet");
+        }
     }
 }
diff --git a/tests/Stratis.DevEx.Wpf.Test/BlockchainExplorer/BlockchainExplorerTree.cs b/tests/Stratis.DevEx.Wpf.Test/BlockchainExplorer/BlockchainExplorerTree.cs
@@ -17,6 +17,8 @@ public class BlockchainExplorerTree : TreeViewBase<BlockchainInfo>
         public static RoutedCommand NewNetworkCmd { get; } = new RoutedCommand();
 
         public static RoutedCommand NewEndpointCmd { get; } = new RoutedCommand();
+
+        public static RoutedCommand DeleteEndpointCmd { get; } = new RoutedCommand();
         #endregion
 
         #region Methods
@@ -37,6 +39,10 @@ protected override TreeViewItem CreateTreeViewItem(BlockchainInfo data)
             {
                 item.ContextMenu = (ContextMenu)TryFindResource("NetworkContextMenu");
             }
+            else if (data.Kind == BlockchainInfoKind.Endpoint)
+            {
+                item.ContextMenu = (ContextMenu)TryFindResource("EndpointContextMenu");
+            }
             return item;
         }
         #endregion
diff --git a/tests/Stratis.DevEx.Wpf.Test/BlockchainExplorer/BlockchainExplorerTreeResources.xaml b/tests/Stratis.DevEx.Wpf.Test/BlockchainExplorer/BlockchainExplorerTreeResources.xaml
@@ -92,6 +92,34 @@
         </DrawingImage.Drawing>
     </DrawingImage>
 
+    <DrawingImage x:Key="DeleteFileDrawingImage">
+        <DrawingImage.Drawing>
+            <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                <GeometryDrawing>
+                    <GeometryDrawing.Pen>
+                        <Pen Brush="{DynamicResource TextFillColorPrimaryBrush}" Thickness="2" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
+                    </GeometryDrawing.Pen>
+                    <GeometryDrawing.Geometry>
+                        <LineGeometry StartPoint="10.5,10.5" EndPoint="13.5,13.5" />
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+                <GeometryDrawing>
+                    <GeometryDrawing.Pen>
+                        <Pen Brush="{DynamicResource TextFillColorPrimaryBrush}" Thickness="2" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
+                    </GeometryDrawing.Pen>
+                    <GeometryDrawing.Geometry>
+                        <LineGeometry StartPoint="13.5,10.5" EndPoint="10.5,13.5" />
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+                <GeometryDrawing Geometry="F1 M24,24z M0,0z M6,21A1,1,0,0,1,5,20L5,4A1,1,0,0,1,6,3L15,3 19,7 19,20A1,1,0,0,1,18,21z">
+                    <GeometryDrawing.Pen>
+                        <Pen Brush="{DynamicResource TextFillColorPrimaryBrush}" Thickness="2" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
+                    </GeometryDrawing.Pen>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
     <!-- TreeView items data template-->
     <DataTemplate x:Key="BlockchainInfoTemplate" DataType="{x:Type vm:BlockchainInfo}">
         <StackPanel x:Name="GroupPanel" Orientation="Horizontal" Margin="0,2,0,2">
@@ -173,6 +201,14 @@
         </MenuItem>
     </ContextMenu>
 
+    <ContextMenu x:Key="EndpointContextMenu" Style="{DynamicResource ContextMenuStyle}">
+        <MenuItem Header="Delete" Command="{x:Static stratisui:BlockchainExplorerTree.DeleteEndpointCmd}">
+            <MenuItem.Icon>
+                <Image Source="{StaticResource DeleteFileDrawingImage}" />
+            </MenuItem.Icon>
+        </MenuItem>
+    </ContextMenu>
+
     <ContextMenu x:Key="StratisNetworkContextMenu" Style="{DynamicResource ContextMenuStyle}">
         <MenuItem Header="Statistics" Command="{x:Static stratisui:BlockchainExplorerTree.NewEndpointCmd}">
             <MenuItem.Icon>
diff --git a/tests/Stratis.DevEx.Wpf.Test/BlockchainExplorer/BlockchainViewModel.cs b/tests/Stratis.DevEx.Wpf.Test/BlockchainExplorer/BlockchainViewModel.cs
@@ -54,7 +54,15 @@ public BlockchainInfo AddChild(BlockchainInfoKind kind, string name, object data
             return info;
         }
 
-        public BlockchainInfo GetChild(string name, BlockchainInfoKind kind) => Children.Single(c =>  c.Name == name && c.Kind == kind); 
+        public void DeleteChild(BlockchainInfo child) => Children.Remove(child);
+
+        public void DeleteChild(string name, BlockchainInfoKind kind) => Children.Remove(GetChild(name, kind)); 
+
+        public BlockchainInfo GetChild(string name, BlockchainInfoKind kind) => Children.Single(c =>  c.Name == name && c.Kind == kind);
+
+        public IEnumerable<BlockchainInfo> GetChildren(BlockchainInfoKind kind) => Children.Where(c => c.Kind == kind);
+
+        public IEnumerable<BlockchainInfo> GetEndPoints() => GetChildren(BlockchainInfoKind.Endpoint);  
         #endregion
     }
 

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ private async void NewNetworkCmdExecuted(object sender, ExecutedRoutedEventArgs`
`118`	`118`	`else`
`119`	`119`	`{`
`120`	`120`	`validForClose = false;`
`121`		`- ShowValidationErrors(errors, "Enter a network name and a valid JSON-RPC URL.");`
	`121`	`+ ShowValidationErrors(errors, "Enter a network name and a valid JSON-RPC endpoint URL.");`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`else`
`@@ -203,6 +203,12 @@ private async void NewEndpointCmd_Executed(object sender, ExecutedRoutedEventArg`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
	`206`	`+ private BlockchainInfo GetSelectedItem(object sender)`
	`207`	`+ {`
	`208`	`+ var window = (BlockchainExplorerToolWindowControl)sender;`
	`209`	`+ var tree = window.BlockchainExplorerTree;`
	`210`	`+ return tree.SelectedItem;`
	`211`	`+ }`
`206`	`212`	`private void ShowValidationErrors(Wpc.TextBlock textBlock, string message)`
`207`	`213`	`{`
`208`	`214`	`textBlock.Visibility = Visibility.Visible;`
`@@ -226,8 +232,24 @@ private void HideProgressRing(ProgressRing progressRing)`
`226`	`232`
`227`	`233`	`#region Fields`
`228`	`234`	`internal BlockchainExplorerToolWindow window;`
	`235`	`+`
`229`	`236`	`#endregion`
`230`	`237`
	`238`	`+ private void DeleteEndpointCmd_Executed(object sender, ExecutedRoutedEventArgs e)`
	`239`	`+ {`
	`240`	`+ var item = GetSelectedItem(sender);`
	`241`	`+ item.Parent.DeleteChild(item);`
	`242`	`+ }`
`231`	`243`
	`244`	`+ private void DeleteEndpointCmd_CanExecute(object sender, CanExecuteRoutedEventArgs e)`
	`245`	`+ {`
	`246`	`+ var item = GetSelectedItem(sender);`
	`247`	`+ var endpoints = item.GetEndPoints();`
	`248`	`+ if (endpoints.Count() == 1)`
	`249`	`+ {`
	`250`	`+ e.CanExecute = false;`
	`251`	`+ }`
	`252`	`+ e.CanExecute = (item.Parent.Name == "Stratis MainNet");`
	`253`	`+ }`
`232`	`254`	`}`
`233`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ public class BlockchainExplorerTree : TreeViewBase<BlockchainInfo>`
`17`	`17`	`public static RoutedCommand NewNetworkCmd { get; } = new RoutedCommand();`
`18`	`18`
`19`	`19`	`public static RoutedCommand NewEndpointCmd { get; } = new RoutedCommand();`
	`20`	`+`
	`21`	`+ public static RoutedCommand DeleteEndpointCmd { get; } = new RoutedCommand();`
`20`	`22`	`#endregion`
`21`	`23`
`22`	`24`	`#region Methods`
`@@ -37,6 +39,10 @@ protected override TreeViewItem CreateTreeViewItem(BlockchainInfo data)`
`37`	`39`	`{`
`38`	`40`	`item.ContextMenu = (ContextMenu)TryFindResource("NetworkContextMenu");`
`39`	`41`	`}`
	`42`	`+ else if (data.Kind == BlockchainInfoKind.Endpoint)`
	`43`	`+ {`
	`44`	`+ item.ContextMenu = (ContextMenu)TryFindResource("EndpointContextMenu");`
	`45`	`+ }`
`40`	`46`	`return item;`
`41`	`47`	`}`
`42`	`48`	`#endregion`