Add option to preview or hide preview of all geometry in a group and Fix top menu pixel difference (#13702)

zeusongit · web-flow · commit 7262a784d8cc · 2023-01-26T17:39:52.000-05:00
* Adjust border to fix 1 pixel anomaly

* remove unused login grid

* add logic to toggle preview for group

* add analytics

* Preview &gt; Preview Geometry

* ensure that signout option no seen when user sign out
diff --git a/src/DynamoCore/Graph/Annotations/AnnotationModel.cs b/src/DynamoCore/Graph/Annotations/AnnotationModel.cs
@@ -395,6 +395,26 @@ internal set
         /// </summary>
         public bool HasNestedGroups => nodes.OfType<AnnotationModel>().Any();
 
+        private bool isVisible = true;
+        /// <summary>
+        /// Preview visibility of the nodes in a group
+        /// </summary>
+        [JsonIgnore]
+        public bool IsVisible
+        {
+            get
+            {
+                return isVisible;
+            }
+            internal set
+            {
+                if (value != isVisible)
+                {
+                    isVisible = value;
+                    RaisePropertyChanged(nameof(IsVisible));
+                }
+            }
+        }
         #endregion
 
         /// <summary>
diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
@@ -52,9 +52,13 @@ public ShortcutToolbar(DynamoViewModel dynamoViewModel)
             var shortcutToolbar = new ShortcutToolbarViewModel(dynamoViewModel);
             DataContext = shortcutToolbar;
             authManager = dynamoViewModel.Model.AuthenticationManager;
-            if (authManager.IsLoggedIn()) {
+            if (authManager.IsLoggedIn())
+            {
                 authManager.LoginStateChanged += SignOutHandler;
             }
+            else {
+                logoutOption.Visibility = Visibility.Collapsed;
+            }
         }
 
         private void SignOutHandler(LoginState status)
diff --git a/src/DynamoCoreWpf/Controls/StartPage.xaml b/src/DynamoCoreWpf/Controls/StartPage.xaml
@@ -31,7 +31,7 @@
         </Grid.RowDefinitions>
 
         <!-- Begin top part (i.e. the "Start" tab) -->
-        <Border HorizontalAlignment="Stretch" Background="#3C3C3C" Margin="220,-40,0,49"></Border>
+        <Border HorizontalAlignment="Stretch" Background="#3C3C3C" Margin="220,-40,0,50"></Border>
   
         <!-- Begin Dynamo logo -->
         <Image Name="StartPageLogo"
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -1419,7 +1419,7 @@ To avoid unintended behavior, uninstall the conflicting loaded package(s), resta
     <value>Is Output</value>
   </data>
   <data name="NodeContextMenuPreview" xml:space="preserve">
-    <value>Preview</value>
+    <value>Preview Geometry</value>
     <comment>Context menu item - preview geometry</comment>
   </data>
   <data name="NodeContextMenuRenameNode" xml:space="preserve">
@@ -3482,4 +3482,7 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="SplashScreenSigningIn" xml:space="preserve">
     <value>Signing In</value>
   </data>
+  <data name="GroupContextMenuPreview" xml:space="preserve">
+    <value>Preview Geometry</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -745,7 +745,7 @@
     <comment>Lacing strategy: use the shortest list</comment>
   </data>
   <data name="NodeContextMenuPreview" xml:space="preserve">
-    <value>Preview</value>
+    <value>Preview Geometry</value>
     <comment>Context menu item - preview geometry</comment>
   </data>
   <data name="NodeContextMenuRenameNode" xml:space="preserve">
@@ -3469,4 +3469,7 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="SplashScreenSigningIn" xml:space="preserve">
     <value>Signing In</value>
   </data>
+  <data name="GroupContextMenuPreview" xml:space="preserve">
+    <value>Preview Geometry</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs
@@ -614,6 +614,26 @@ private bool CanChangeFontSize(object obj)
         {
             return true;
         }
+
+        private DelegateCommand toggleIsVisibleGroupCommand;
+
+        /// <summary>
+        /// Command to toggle this group's node preview visibility.
+        /// belongs to.
+        /// </summary>
+        [JsonIgnore]
+        public DelegateCommand ToggleIsVisibleGroupCommand
+        {
+            get
+            {
+                if (toggleIsVisibleGroupCommand == null)
+                    toggleIsVisibleGroupCommand =
+                        new DelegateCommand(ToggleIsVisibleGroup, CanToggleIsVisibleGroup);
+                new DelegateCommand(RemoveGroupFromGroup, CanUngroupGroup);
+
+                return toggleIsVisibleGroupCommand;
+            }
+        }
         #endregion
 
         public AnnotationViewModel(WorkspaceViewModel workspaceViewModel, AnnotationModel model)
@@ -795,13 +815,6 @@ internal IEnumerable<PortModel> GetGroupOutPorts(IEnumerable<NodeModel> ownerNod
                 );
         }
 
-        private double GetPortVerticalOffset(PortModel portModel, int proxyPortIndex)
-        {
-            // calculate the vertical offset based on the port index.
-            double portHeight = portModel.Height;
-            return verticalOffset + (proxyPortIndex * portHeight) + portVerticalMidPoint;
-        }
-
         private Point2D CalculatePortPosition(PortModel portModel, double verticalPosition)
         {
             double groupHeaderHeight = Height - ModelAreaRect.Height;
@@ -1348,6 +1361,27 @@ private bool BelongsToGroup()
             return WorkspaceViewModel.Model.Annotations.ContainsModel(this.annotationModel);
         }
 
+        internal void ToggleIsVisibleGroup(object parameters)
+        {
+            DynamoSelection.Instance.ClearSelection();
+            var nodesInGroup = this.AnnotationModel.Nodes.Select(n => n.GUID).ToList();
+
+            var command = new DynamoModel.UpdateModelValueCommand(Guid.Empty,
+            nodesInGroup, "IsVisible", (!this.AnnotationModel.IsVisible).ToString());
+
+            this.AnnotationModel.IsVisible = !this.AnnotationModel.IsVisible;
+            WorkspaceViewModel.DynamoViewModel.Model.ExecuteCommand(command);
+            WorkspaceViewModel.DynamoViewModel.RaiseCanExecuteUndoRedo();
+            WorkspaceViewModel.HasUnsavedChanges = true;
+
+            Analytics.TrackEvent(Actions.Preview, Categories.GroupOperations, this.AnnotationModel.IsVisible.ToString());
+        }
+
+        internal bool CanToggleIsVisibleGroup(object parameters)
+        {
+            return true;
+        }
+
         public override void Dispose()
         {
             annotationModel.PropertyChanged -= model_PropertyChanged;
diff --git a/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs
@@ -1,8 +1,6 @@
 using Dynamo.Core;
 using Dynamo.UI.Commands;
-using Dynamo.UI.Controls;
 using Dynamo.ViewModels;
-using System.Windows;
 
 namespace Dynamo.Wpf.ViewModels.Core
 {
diff --git a/src/DynamoCoreWpf/Views/Core/AnnotationView.xaml b/src/DynamoCoreWpf/Views/Core/AnnotationView.xaml
@@ -341,6 +341,11 @@
                 <MenuItem Name="UngroupAnnotation"
                           Click="OnUngroupAnnotation"
                           Header="{x:Static p:Resources.GroupContextMenuUngroup}" />
+                <MenuItem Name="PreviewAnnotation"
+                          Command="{Binding Path=ToggleIsVisibleGroupCommand}"
+                          Header="{x:Static p:Resources.GroupContextMenuPreview}"
+                          IsCheckable="true"
+                          IsChecked="{Binding Path=AnnotationModel.IsVisible, Mode=OneWay}"/>
                 <MenuItem Name="unGroup_cm"
                           Command="{Binding Path=RemoveGroupFromGroupCommand}"
                           Header="{x:Static p:Resources.ContextUnGroupFromSelection}" />
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
@@ -740,11 +740,6 @@
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
             </Grid.ColumnDefinitions>
 
-            <Grid Name="loginGrid" 
-                  Grid.Row="0" 
-                  Grid.Column="1">
-            </Grid>
-
             <Border Name="shortcutBarBorder"
                     BorderThickness="0"
                     HorizontalAlignment="Stretch"
diff --git a/test/DynamoCoreWpfTests/AnnotationViewModelTests.cs b/test/DynamoCoreWpfTests/AnnotationViewModelTests.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -154,13 +154,13 @@ public void CanUngroupNodeFromAGroup()
             var secondNode = new DSFunction(ViewModel.Model.LibraryServices.GetFunctionDescriptor("+"));
             ViewModel.Model.CurrentWorkspace.AddAndRegisterNode(secondNode, false);
 
-            //verify the node was created
+            //verify if the second node was created
             Assert.AreEqual(2, ViewModel.Model.CurrentWorkspace.Nodes.Count());
 
             //Select the node 
             DynamoSelection.Instance.Selection.Add(addNode);
           
-            //Check whether group can be created
+            //Check whether group can be ungrouped
             Assert.AreEqual(true, ViewModel.CanUngroupModel(null));
         }
 
@@ -1377,6 +1377,47 @@ public void ShowGroupContentsTest()
             Assert.IsTrue(connectorViewModel.IsCollapsed);
         }
 
+        [Test]
+        public void CanToggleVisibilityOfAllNodesInAGroup()
+        {
+            // Arrange
+            var parentGroupName = "GroupWithGroupedGroup";
+            var nestedGroupName = "GroupInsideOtherGroup";
+
+            OpenModel(@"core\annotationViewModelTests\groupsTestFile.dyn");
+
+            var parentGroupNameViewModel = ViewModel.CurrentSpaceViewModel.Annotations.FirstOrDefault(x => x.AnnotationText == parentGroupName);
+            var nestedGroupNameViewModel = ViewModel.CurrentSpaceViewModel.Annotations.FirstOrDefault(x => x.AnnotationText == nestedGroupName);
+
+            //No. of nodes in parent group with preview enabled before the toggle.
+            var parentGroupContentBefore = parentGroupNameViewModel.Nodes.OfType<NodeModel>().Where(x => x.IsVisible == true).ToList();
+            var nestedGroupContentBefore = nestedGroupNameViewModel.Nodes.OfType<NodeModel>().Where(x => x.IsVisible == true).ToList();
+
+            Assert.AreEqual(2, parentGroupContentBefore.Count);
+            Assert.AreEqual(2, nestedGroupContentBefore.Count);
+
+            //Assert HasUnsavedChanges is false
+            Assert.AreEqual(false, ViewModel.CurrentSpaceViewModel.HasUnsavedChanges);
+
+            // Act
+            parentGroupNameViewModel.ToggleIsVisibleGroupCommand.Execute(null);
+
+            // Assert
+            // Only the nodes in parent group are affected
+            var parentGroupContentAfter = parentGroupNameViewModel.Nodes.OfType<NodeModel>().Where(x => x.IsVisible == true).ToList();
+            var nestedGroupContentAfter = nestedGroupNameViewModel.Nodes.OfType<NodeModel>().Where(x => x.IsVisible == true).ToList();
+            Assert.AreEqual(0, parentGroupContentAfter.Count);
+            Assert.AreEqual(2, nestedGroupContentAfter.Count);
+
+            // Now both the groups are affected
+            nestedGroupNameViewModel.ToggleIsVisibleGroupCommand.Execute(null);
+            nestedGroupContentAfter = nestedGroupNameViewModel.Nodes.OfType<NodeModel>().Where(x => x.IsVisible == true).ToList();
+            Assert.AreEqual(0, nestedGroupContentAfter.Count);
+
+            //Assert HasUnsavedChanges is false
+            Assert.AreEqual(true, ViewModel.CurrentSpaceViewModel.HasUnsavedChanges);
+        }
+
         #endregion
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,13 @@ public ShortcutToolbar(DynamoViewModel dynamoViewModel)`
`52`	`52`	`var shortcutToolbar = new ShortcutToolbarViewModel(dynamoViewModel);`
`53`	`53`	`DataContext = shortcutToolbar;`
`54`	`54`	`authManager = dynamoViewModel.Model.AuthenticationManager;`
`55`		`- if (authManager.IsLoggedIn()) {`
	`55`	`+ if (authManager.IsLoggedIn())`
	`56`	`+ {`
`56`	`57`	`authManager.LoginStateChanged += SignOutHandler;`
`57`	`58`	`}`
	`59`	`+ else {`
	`60`	`+ logoutOption.Visibility = Visibility.Collapsed;`
	`61`	`+ }`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`private void SignOutHandler(LoginState status)`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`using Dynamo.Core;`
`2`	`2`	`using Dynamo.UI.Commands;`
`3`		`-using Dynamo.UI.Controls;`
`4`	`3`	`using Dynamo.ViewModels;`
`5`		`-using System.Windows;`
`6`	`4`
`7`	`5`	`namespace Dynamo.Wpf.ViewModels.Core`
`8`	`6`	`{`