From 993587dc3cd04108a5b88dcf7abf60d9f751588f Mon Sep 17 00:00:00 2001
From: reddyashish <43763136+reddyashish@users.noreply.github.com>
Date: Wed, 17 May 2023 15:04:16 -0400
Subject: [PATCH] DYN-5862 Python editor docking improvements (#13984)

* Python docking improvements

* Update resources

* update

* Update ScriptEditorWindow.xaml.cs

* update CachedEngine when editor engine is changed in docked state

* Improvement python editor behavior inside a custom node.

* Update DynamoViewModel.cs

* Addressing comments

* Update PythonNode.cs
---
 .../Properties/Resources.Designer.cs          |  4 +-
 .../Properties/Resources.en-US.resx           |  2 +-
 src/DynamoCoreWpf/Properties/Resources.resx   |  2 +-
 .../UI/GuidedTour/GuidesValidationMethods.cs  |  4 +-
 .../ViewModels/Core/DynamoViewModel.cs        | 78 ++++++++++++++-
 .../ViewModels/Core/WorkspaceViewModel.cs     | 10 +-
 src/DynamoCoreWpf/Views/Core/DynamoView.xaml  |  8 +-
 .../Views/Core/DynamoView.xaml.cs             | 98 ++++++++-----------
 src/Libraries/PythonNodeModels/PythonNode.cs  | 11 +++
 .../PythonNodeModelsWpf/PythonNode.cs         | 54 +++++++++-
 .../ScriptEditorWindow.xaml                   |  4 +-
 .../ScriptEditorWindow.xaml.cs                | 19 +++-
 .../PythonNodeCustomizationTests.cs           | 18 ++--
 .../DocumentationBrowserViewExtensionTests.cs | 42 ++++----
 .../GraphNodeManagerViewExtensionTests.cs     | 24 ++---
 .../ViewExtensions/ViewExtensionTests.cs      | 54 +++++-----
 .../WorkspaceDependencyViewExtensionTests.cs  | 24 ++---
 .../PythonMigrationViewExtensionTests.cs      |  6 +-
 18 files changed, 298 insertions(+), 164 deletions(-)

diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index 2fa3cbce17d..ff5b86ab8ff 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -8407,7 +8407,7 @@ public static string ShowWiresPopupMenuItem {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to SideBar Panel.
+        ///   Looks up a localized string similar to Sidebar.
         /// </summary>
         public static string SideBarPanelViewTitle {
             get {
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index bdc3e99e651..31c422bfb9f 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2143,7 +2143,7 @@ Do you want to install the latest Dynamo update?</value>
     <value>Write note here</value>
   </data>
   <data name="SideBarPanelViewTitle" xml:space="preserve">
-    <value>SideBar Panel</value>
+    <value>Sidebar</value>
   </data>
   <data name="ExtensionAdded" xml:space="preserve">
     <value>Extension tab added to the extensions side bar.</value>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index df931defe28..ad311a2c573 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2367,7 +2367,7 @@ Want to publish a different package?</value>
     <value>Write note here</value>
   </data>
   <data name="SideBarPanelViewTitle" xml:space="preserve">
-    <value>SideBar Panel</value>
+    <value>Sidebar</value>
   </data>
   <data name="ExtensionAdded" xml:space="preserve">
     <value>Extension tab added to the extensions side bar.</value>
diff --git a/src/DynamoCoreWpf/UI/GuidedTour/GuidesValidationMethods.cs b/src/DynamoCoreWpf/UI/GuidedTour/GuidesValidationMethods.cs
index 88475f157f0..a444a69e499 100644
--- a/src/DynamoCoreWpf/UI/GuidedTour/GuidesValidationMethods.cs
+++ b/src/DynamoCoreWpf/UI/GuidedTour/GuidesValidationMethods.cs
@@ -577,14 +577,14 @@ internal static void ExecuteViewDetailsSideBar(Step stepInfo, StepUIAutomation u
                 if (packageDetailsWindow == null)
                     return;
                 //In order to close the Package Details tab we need first to get the Tab, then get the Close button and finally call the event to close it
-                TabItem tabitem = dynamoView.SideBarPanelTabItems.OfType<TabItem>().SingleOrDefault(n => n.Header.ToString() == packageDetailsName);
+                TabItem tabitem = stepInfo.DynamoViewModelStep.SideBarTabItems.OfType<TabItem>().SingleOrDefault(n => n.Header.ToString() == packageDetailsName);
                 if (tabitem == null)
                     return;
                 //Get the Close button from the PackageDetailsView
                 Button closeButton = GuideUtilities.FindChild(tabitem, closeButtonName) as Button;
                 if (closeButton == null)
                     return;
-                dynamoView.OnCloseRightSidePanelTab(closeButton, null);
+                dynamoView.OnCloseRightSideBarTab(closeButton, null);
             }
         }
 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
index 373843a3c29..30d9416d63d 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Forms;
 using System.Windows.Media;
 using System.Windows.Threading;
@@ -42,6 +43,8 @@
 using Dynamo.Wpf.ViewModels.FileTrust;
 using Dynamo.Wpf.ViewModels.Watch3D;
 using DynamoUtilities;
+using ICSharpCode.AvalonEdit;
+using PythonNodeModels;
 using ISelectable = Dynamo.Selection.ISelectable;
 using WpfResources = Dynamo.Wpf.Properties.Resources;
 
@@ -63,24 +66,40 @@ public partial class DynamoViewModel : ViewModelBase, IDynamoViewModel
 
         // Can the user run the graph
         private bool CanRunGraph => HomeSpace.RunSettings.RunEnabled && !HomeSpace.GraphRunInProgress;
-
         private ObservableCollection<DefaultWatch3DViewModel> watch3DViewModels = new ObservableCollection<DefaultWatch3DViewModel>();
+        private ObservableCollection<TabItem> sideBarTabItems = new ObservableCollection<TabItem>();
 
         /// <summary>
-        /// An observable collection of workspace view models which tracks the model
+        /// An observable collection of workspace view models which tracks the model.
         /// </summary>
         private ObservableCollection<WorkspaceViewModel> workspaces = new ObservableCollection<WorkspaceViewModel>();
 
         /// <summary>
-        /// Set of node window id's that are currently docked in right side sidebar
+        /// Set of node window id's that are currently docked in right side sidebar.
         /// </summary>
-        internal HashSet<string> CurrentDockedWindows { get; set; } = new HashSet<string>();
+        internal HashSet<string> DockedNodeWindows { get; set; } = new HashSet<string>();
 
         /// <summary>
         ///  Node window's state, either DockRight or FloatingWindow.
         /// </summary>
         internal Dictionary<string, ViewExtensionDisplayMode> NodeWindowsState { get; set; } = new Dictionary<string, ViewExtensionDisplayMode>();
 
+        /// <summary>
+        /// Collection of Right SideBar tab items: view extensions and docked windows.
+        /// </summary>
+        public ObservableCollection<TabItem> SideBarTabItems
+        {
+            get
+            {
+                return sideBarTabItems;
+            }
+            set
+            {
+                sideBarTabItems = value;
+                RaisePropertyChanged(nameof(SideBarTabItems));
+            }
+        }
+
         public ObservableCollection<WorkspaceViewModel> Workspaces
         {
             get { return workspaces; }
@@ -1470,6 +1489,57 @@ internal void AddToRecentFiles(string path)
             }
         }
 
+        // Get the nodemodel if a node is present in any open workspace.
+        internal NodeModel GetDockedWindowNodeModel(string tabId)
+        {
+            var workspaces = Model.Workspaces;
+            NodeModel nodeModel = null;
+
+            foreach (WorkspaceModel workspace in workspaces)
+            {
+                nodeModel = workspace.Nodes.FirstOrDefault(x => x.GUID.ToString() == tabId);
+                if (nodeModel != null)
+                {
+                    return nodeModel;
+                }
+            }
+            return nodeModel;
+        }
+
+        /// <summary>
+        /// Closes any docked python script windows if there are no unsaved changes.
+        /// Show warning message on the script editor if it has unsaved changes.
+        /// </summary>
+        /// <param name="nodes">Nodes in the workspace</param>
+        internal bool CanCloseDockedNodeWindows(ObservableCollection<NodeViewModel> nodes)
+        {
+            foreach (var node in nodes)
+            {
+                var id = node.NodeModel.GUID.ToString();
+                if (DockedNodeWindows.Contains(id))
+                {
+                    var tabItem = SideBarTabItems.OfType<TabItem>().SingleOrDefault(n => n.Uid.ToString() == id);
+                    NodeModel nodeModel = GetDockedWindowNodeModel(tabItem.Uid);
+
+                    if (nodeModel is PythonNode pythonNode)
+                    {
+                        var editor = (tabItem.Content as Grid).ChildOfType<TextEditor>();
+                        if (editor != null && editor.IsModified)
+                        {
+                            pythonNode.OnWarnUserScript();
+                            tabItem.Focus();
+                            return false;
+                        }
+                        pythonNode.Dispose();
+                    }
+
+                    SideBarTabItems.Remove(tabItem);
+                    DockedNodeWindows.Remove(id);
+                }
+            }
+            return true;
+        }
+
         /// <summary>
         /// Returns the file-save dialog with customized file types of Dynamo.
         /// </summary>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
index e3e9b459f41..4c63be9050b 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
@@ -1329,8 +1329,14 @@ private void Hide(object parameters)
             }
             else
             {
-                if (!Model.HasUnsavedChanges || DynamoViewModel.AskUserToSaveWorkspaceOrCancel(Model))
-                    DynamoViewModel.Model.RemoveWorkspace(Model);
+                // Close the custom workspace only if all docked node windows are saved and can be closed.
+                if (DynamoViewModel.CanCloseDockedNodeWindows(Nodes))
+                {
+                    if (!Model.HasUnsavedChanges || DynamoViewModel.AskUserToSaveWorkspaceOrCancel(Model))
+                    {
+                        DynamoViewModel.Model.RemoveWorkspace(Model);
+                    }
+                }
             }
         }
 
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
index 50bb96fe329..b80be8af064 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
@@ -1556,7 +1556,7 @@
               Grid.Row="2"
               Grid.Column="4"
               Grid.RowSpan="2">
-            <TabControl Name="tabDynamic" Background="#353535" BorderThickness="0" ItemsSource="{Binding}">
+            <TabControl Name="tabDynamic" Background="#353535" BorderThickness="0" ItemsSource="{Binding SideBarTabItems, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}">
                 <TabControl.Resources>
                     <!--Styling for the close button in the tab-->
                     <Style TargetType="{x:Type Button}"
@@ -1594,11 +1594,11 @@
                             <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Path=Header}"
                                        FontFamily="{StaticResource ArtifaktElementBold}"
                                        FontSize="12"
-                                       Margin="5,5,0,0"
+                                       Margin="5,7,0,0"
                                        HorizontalAlignment="Stretch"/>
                             
                             <!--Button to close a particular tab-->
-                            <Button Name="CloseButton" Style="{StaticResource CloseButtonStyle}" DockPanel.Dock="Right" Click="OnCloseRightSidePanelTab"
+                            <Button Name="CloseButton" Style="{StaticResource CloseButtonStyle}" DockPanel.Dock="Right" Click="OnCloseRightSideBarTab"
                                     Margin="5,5,5,0" Uid="{Binding RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Path=Uid}">
                                 <Image Width="18" Height="18" HorizontalAlignment="Right" VerticalAlignment="Center">
                                     <Image.Style>
@@ -1618,7 +1618,7 @@
                                 </Image>
                             </Button>
                             <!-- Undock -->
-                            <Button Name="UndockButton" Style="{StaticResource CloseButtonStyle}" DockPanel.Dock="Right" Click="OnUndockRightSidePanelTab"
+                            <Button Name="UndockButton" Style="{StaticResource CloseButtonStyle}" DockPanel.Dock="Right" Click="OnUndockRightSideBarTab"
                                     Margin="8,5,0,0" Uid="{Binding RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Path=Uid}">
                                 <Image Width="18" Height="18" HorizontalAlignment="Right" VerticalAlignment="Center">
                                     <Image.Style>
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
index 8c755a8f932..e803c568e48 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -85,11 +84,6 @@ public partial class DynamoView : Window, IDisposable
         private readonly DispatcherTimer _workspaceResizeTimer = new DispatcherTimer { Interval = new TimeSpan(0, 0, 0, 0, 500), IsEnabled = false };
         private ViewLoadedParams sharedViewExtensionLoadedParams;
 
-        /// <summary>
-        /// Collection of right side-bar panel tab items, view extensions and docked windows.
-        /// </summary>
-        internal ObservableCollection<TabItem> SideBarPanelTabItems { set; get; } = new ObservableCollection<TabItem>();
-
         /// <summary>
         /// Extensions currently displayed as windows.
         /// Made internal for testing purposes only.
@@ -228,7 +222,7 @@ public DynamoView(DynamoViewModel dynamoViewModel)
              };
 
             // Add an event handler to check if the collection is modified.   
-            SideBarPanelTabItems.CollectionChanged += this.OnCollectionChanged;
+            dynamoViewModel.SideBarTabItems.CollectionChanged += this.OnCollectionChanged;
 
             this.HideOrShowRightSideBar();
 
@@ -447,8 +441,6 @@ private void SaveExtensionWindowSettings(ExtensionWindow window)
 
         private TabItem AddExtensionTab(IViewExtension viewExtension, UIElement content)
         {
-            tabDynamic.DataContext = null;
-
             // creates a new tab item
             var tab = new TabItem();
             tab.Header = viewExtension.Name;
@@ -467,9 +459,8 @@ private TabItem AddExtensionTab(IViewExtension viewExtension, UIElement content)
             tab.Content = content;
 
             //Insert the tab at the end
-            SideBarPanelTabItems.Insert(SideBarPanelTabItems.Count, tab);
+            dynamoViewModel.SideBarTabItems.Insert(dynamoViewModel.SideBarTabItems.Count, tab);
 
-            tabDynamic.DataContext = SideBarPanelTabItems;
             tabDynamic.SelectedItem = tab;
 
             return tab;
@@ -478,21 +469,19 @@ private TabItem AddExtensionTab(IViewExtension viewExtension, UIElement content)
         /// <summary>
         /// Dock the window to right side bar panel.
         /// </summary>
-        /// <param name="window">the window which needs to be docked</param>
-        /// <param name="nodeModel">nodemodel if it is a node window</param>
-        /// <param name="hideUIElement">Any UI element to hide after docking it in the right side panel(like the toolbar).</param>
+        /// <param name="window">The window that needs to be docked</param>
+        /// <param name="nodeModel">NodeModel, if it is a node window</param>
+        /// <param name="hideUIElement">Any UI element to hide after docking it in the right sidebar(like the toolbar).</param>
         /// <returns></returns>
         internal TabItem DockWindowInSideBar(Window window, NodeModel nodeModel = null, UIElement hideUIElement = null)
         {
-            var tabItem = SideBarPanelTabItems.OfType<TabItem>().SingleOrDefault(tabtem => tabtem.Uid.ToString() == window.Uid);
+            var tabItem = dynamoViewModel.SideBarTabItems.OfType<TabItem>().SingleOrDefault(tabtem => tabtem.Uid.ToString() == window.Uid);
             if (tabItem != null)
             {
                 tabDynamic.SelectedItem = tabItem;
                 return tabItem;
             }
 
-            tabDynamic.DataContext = null;
-
             if (hideUIElement != null)
             {
                 hideUIElement.Visibility = Visibility.Collapsed;
@@ -518,14 +507,13 @@ internal TabItem DockWindowInSideBar(Window window, NodeModel nodeModel = null,
             tab.Content = content;
 
             //Insert the tab at the end
-            SideBarPanelTabItems.Insert(SideBarPanelTabItems.Count, tab);
+            dynamoViewModel.SideBarTabItems.Insert(dynamoViewModel.SideBarTabItems.Count, tab);
 
-            tabDynamic.DataContext = SideBarPanelTabItems;
             tabDynamic.SelectedItem = tab;
 
             if (nodeModel != null)
             {
-                dynamoViewModel.CurrentDockedWindows.Add(window.Uid);
+                dynamoViewModel.DockedNodeWindows.Add(window.Uid);
                 dynamoViewModel.NodeWindowsState[window.Uid] = ViewExtensionDisplayMode.DockRight;
             }
 
@@ -540,14 +528,14 @@ internal TabItem DockWindowInSideBar(Window window, NodeModel nodeModel = null,
         internal void CloseExtensionControl(IViewExtension viewExtension)
         {
             string tabName = viewExtension.Name;
-            TabItem tabitem = SideBarPanelTabItems.OfType<TabItem>().SingleOrDefault(n => n.Header.ToString() == tabName);
+            TabItem tabitem = dynamoViewModel.SideBarTabItems.OfType<TabItem>().SingleOrDefault(n => n.Header.ToString() == tabName);
 
             if (viewExtension is ViewExtensionBase viewExtensionBase)
             {
                 viewExtensionBase.Closed();
             }
 
-            CloseRightSidePanelTab(tabitem);
+            CloseRightSideBarTab(tabitem);
             CloseExtensionWindow(tabName);
         }
  
@@ -557,19 +545,19 @@ internal void CloseExtensionControl(IViewExtension viewExtension)
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        internal void OnCloseRightSidePanelTab(object sender, RoutedEventArgs e)
+        internal void OnCloseRightSideBarTab(object sender, RoutedEventArgs e)
         {
             try
             {
                 string tabId = (sender as Button).Uid.ToString();
-                TabItem tabitem = SideBarPanelTabItems.OfType<TabItem>().SingleOrDefault(n => n.Uid.ToString() == tabId);
+                TabItem tabitem = dynamoViewModel.SideBarTabItems.OfType<TabItem>().SingleOrDefault(n => n.Uid.ToString() == tabId);
 
                 if (tabitem.Tag is ViewExtensionBase viewExtensionBase)
                 {
                     viewExtensionBase.Closed();
                 }
 
-                NodeModel nodeModel = dynamoViewModel.Model.CurrentWorkspace.Nodes.FirstOrDefault(x => x.GUID.ToString() == tabitem.Uid.ToString());
+                NodeModel nodeModel = dynamoViewModel.GetDockedWindowNodeModel(tabitem.Uid);
 
                 if (nodeModel is PythonNode pythonNode)
                 {
@@ -582,11 +570,11 @@ internal void OnCloseRightSidePanelTab(object sender, RoutedEventArgs e)
                     }
                 }
 
-                CloseRightSidePanelTab(tabitem);
+                CloseRightSideBarTab(tabitem);
 
-                if (dynamoViewModel.CurrentDockedWindows.Contains(tabitem.Uid))
+                if (dynamoViewModel.DockedNodeWindows.Contains(tabitem.Uid))
                 {
-                    dynamoViewModel.CurrentDockedWindows.Remove(tabitem.Uid);
+                    dynamoViewModel.DockedNodeWindows.Remove(tabitem.Uid);
                 }
             }
             catch (Exception ex)
@@ -601,28 +589,26 @@ internal void OnCloseRightSidePanelTab(object sender, RoutedEventArgs e)
         /// Close right side-bar panel tab by extension tab item
         /// </summary>
         /// <param name="tabitem">target tab item</param>
-        internal void CloseRightSidePanelTab(TabItem tabitem)
+        internal void CloseRightSideBarTab(TabItem tabitem)
         {
             TabItem tabToBeRemoved = tabitem;
 
             // get the selected tab
             TabItem selectedTab = tabDynamic.SelectedItem as TabItem;
 
-            if (tabToBeRemoved != null && SideBarPanelTabItems.Count > 0)
+            if (tabToBeRemoved != null && dynamoViewModel.SideBarTabItems.Count > 0)
             {
-                // clear tab control binding and bind to the new tab-list. 
-                tabDynamic.DataContext = null;
-                SideBarPanelTabItems.Remove(tabToBeRemoved);
+                // Remove the tab from the binding collection SideBarTabItems 
+                dynamoViewModel.SideBarTabItems.Remove(tabToBeRemoved);
                 // Disconnect content from tab to allow it to be moved.
                 tabToBeRemoved.Content = null;
-                tabDynamic.DataContext = SideBarPanelTabItems;
 
                 // Highlight previously selected tab. if that is removed then Highlight the first tab
                 if (selectedTab.Equals(tabToBeRemoved))
                 {
-                    if (SideBarPanelTabItems.Count > 0)
+                    if (dynamoViewModel.SideBarTabItems.Count > 0)
                     {
-                        selectedTab = SideBarPanelTabItems[0];
+                        selectedTab = dynamoViewModel.SideBarTabItems[0];
                     }
                 }
                 tabDynamic.SelectedItem = selectedTab;
@@ -641,26 +627,23 @@ private void CloseExtensionWindow(string name)
             }
         }
 
-        internal void OnUndockRightSidePanelTab(object sender, RoutedEventArgs e)
+        internal void OnUndockRightSideBarTab(object sender, RoutedEventArgs e)
         {
             try
             {
                 var tabId = (sender as Button).Uid.ToString();
-                var tabItem = SideBarPanelTabItems.OfType<TabItem>().SingleOrDefault(tab => tab.Uid.ToString() == tabId);
+                var tabItem = dynamoViewModel.SideBarTabItems.OfType<TabItem>().SingleOrDefault(tab => tab.Uid.ToString() == tabId);
                 var tabName = tabItem.Header.ToString();
 
                 // If docked window is a node window, undock the window and call the action on the node. 
-                if (dynamoViewModel.CurrentDockedWindows.Contains(tabItem.Uid))
+                if (dynamoViewModel.DockedNodeWindows.Contains(tabItem.Uid))
                 {
                     UndockWindow(tabItem);
-                    Logging.Analytics.TrackEvent(
-                                   Actions.Undock,
-                                   Categories.PythonOperations, tabName);
                 }
                 else// if it an extension, undock the extension and update settings.
                 {
                     UndockExtension(tabItem);
-                    Logging.Analytics.TrackEvent(
+                    Analytics.TrackEvent(
                                    Actions.Undock,
                                    Categories.ViewExtensionOperations, tabName);
                 }
@@ -680,9 +663,9 @@ internal void OnUndockRightSidePanelTab(object sender, RoutedEventArgs e)
         /// <param name="name">Name of the extension</param>
         internal void UndockExtension(string name)
         {
-            var tabItem = SideBarPanelTabItems.OfType<TabItem>().SingleOrDefault(tab => tab.Header.ToString() == name);
+            var tabItem = dynamoViewModel.SideBarTabItems.OfType<TabItem>().SingleOrDefault(tab => tab.Header.ToString() == name);
             var content = tabItem.Content as UIElement;
-            CloseRightSidePanelTab(tabItem);
+            CloseRightSideBarTab(tabItem);
             var extension = tabItem.Tag as IViewExtension;
             var settings = this.dynamoViewModel.PreferenceSettings.ViewExtensionSettings.Find(s => s.UniqueId == extension.UniqueId);
             AddExtensionWindow(extension, content, settings?.WindowSettings);
@@ -699,7 +682,7 @@ internal void UndockExtension(string name)
         internal void UndockExtension(TabItem tabItem)
         {
             var content = tabItem.Content as UIElement;
-            CloseRightSidePanelTab(tabItem);
+            CloseRightSideBarTab(tabItem);
             var extension = tabItem.Tag as IViewExtension;
             var settings = this.dynamoViewModel.PreferenceSettings.ViewExtensionSettings.Find(s => s.UniqueId == extension.UniqueId);
             AddExtensionWindow(extension, content, settings?.WindowSettings);
@@ -715,7 +698,7 @@ internal void UndockExtension(TabItem tabItem)
         /// <param name="tabItem">Tab item to be undocked</param>
         internal void UndockWindow(TabItem tabItem)
         {
-            NodeModel nodeModel = dynamoViewModel.Model.CurrentWorkspace.Nodes.FirstOrDefault(x => x.GUID.ToString() == tabItem.Uid.ToString());
+            NodeModel nodeModel = dynamoViewModel.GetDockedWindowNodeModel(tabItem.Uid);
 
             dynamoViewModel.NodeWindowsState[tabItem.Uid] = ViewExtensionDisplayMode.FloatingWindow;
 
@@ -724,20 +707,23 @@ internal void UndockWindow(TabItem tabItem)
             {
                 var pythonNode = nodeModel as PythonNode;
                 Window window = tabItem.Tag as Window;
-                var textEditor = window.FindName("editText") as ICSharpCode.AvalonEdit.TextEditor;
+                var textEditor = window.FindName("editText") as TextEditor;
 
                 if (textEditor.IsModified)
                 {
                     pythonNode.OnNodeEdited(textEditor.Text);
                 }
                 else {
-
                     pythonNode.OnNodeEdited(null);
                 }
+
+                Analytics.TrackEvent(
+                               Actions.Undock,
+                               Categories.PythonOperations, tabItem.Header.ToString());
             }
 
-            CloseRightSidePanelTab(tabItem);
-            dynamoViewModel.CurrentDockedWindows.Remove(tabItem.Uid);
+            CloseRightSideBarTab(tabItem);
+            dynamoViewModel.DockedNodeWindows.Remove(tabItem.Uid);
         }
 
         /// <summary>
@@ -803,7 +789,7 @@ private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs
 
         private TabItem FindExtensionTab(IViewExtension viewExtension)
         {
-            foreach (var tabItem in SideBarPanelTabItems)
+            foreach (var tabItem in dynamoViewModel.SideBarTabItems)
             {
                 if (tabItem.Tag is IViewExtension extension && extension.GetType().Equals(viewExtension.GetType()))
                 {
@@ -1813,7 +1799,7 @@ private void SaveExtensionsState()
                 SaveExtensionOpenState(window);
             }
             //for any new extensions that are opened for the first time
-            foreach (var tab in SideBarPanelTabItems)
+            foreach (var tab in dynamoViewModel.SideBarTabItems)
             {
                 SaveExtensionOpenState(tab);
             }
@@ -1821,7 +1807,7 @@ private void SaveExtensionsState()
             var settings = dynamoViewModel.PreferenceSettings.ViewExtensionSettings;
             foreach (var setting in settings)
             {
-                if (!SideBarPanelTabItems.Any(e => e.Uid == setting.UniqueId) && !ExtensionWindows.Values.Any(e => e.Uid == setting.UniqueId))
+                if (!dynamoViewModel.SideBarTabItems.Any(e => e.Uid == setting.UniqueId) && !ExtensionWindows.Values.Any(e => e.Uid == setting.UniqueId))
                 {
                     setting.IsOpen = false;
                 }
@@ -2466,7 +2452,7 @@ private void UpdateLibraryCollapseIcon()
         // Show the extensions right side bar when there is atleast one extension
         private void HideOrShowRightSideBar()
         {
-            if (SideBarPanelTabItems.Count == 0)
+            if (dynamoViewModel.SideBarTabItems.Count == 0)
             {
                 if (RightExtensionsViewColumn.Width.Value != 0)
                 {
@@ -2813,7 +2799,7 @@ public void Dispose()
             }
 
             // Removing the tab items list handler
-            SideBarPanelTabItems.CollectionChanged -= this.OnCollectionChanged;
+            dynamoViewModel.SideBarTabItems.CollectionChanged -= this.OnCollectionChanged;
 
             if (fileTrustWarningPopup != null)
                 fileTrustWarningPopup.CleanPopup();
diff --git a/src/Libraries/PythonNodeModels/PythonNode.cs b/src/Libraries/PythonNodeModels/PythonNode.cs
index c33fbfe8716..c16d5769c29 100644
--- a/src/Libraries/PythonNodeModels/PythonNode.cs
+++ b/src/Libraries/PythonNodeModels/PythonNode.cs
@@ -355,6 +355,17 @@ public void OnWarnUserScript()
             UserScriptWarned?.Invoke();
         }
 
+        internal List<Delegate> GetInvocationListForEditAction()
+        {
+            var delegates = new List<Delegate>();
+            if (EditNode != null)
+            {
+                delegates = EditNode.GetInvocationList().ToList();
+            }
+
+            return delegates;
+        }
+
         /// <summary>
         /// Fires when the Script content is migrated to Python 3.
         /// NOTE: This is a temporary event used during the Python 2 to Python 3 transistion period,
diff --git a/src/Libraries/PythonNodeModelsWpf/PythonNode.cs b/src/Libraries/PythonNodeModelsWpf/PythonNode.cs
index d32cbb1b39e..1130a7f6974 100644
--- a/src/Libraries/PythonNodeModelsWpf/PythonNode.cs
+++ b/src/Libraries/PythonNodeModelsWpf/PythonNode.cs
@@ -27,6 +27,7 @@ public class PythonNodeViewCustomization : VariableInputNodeViewCustomization, I
         private NodeView pythonNodeView;
         private WorkspaceModel workspaceModel;
         private ScriptEditorWindow editWindow;
+        private DynamoView dynamoView;
         private ModelessChildWindow.WindowRect editorWindowRect;
         private readonly MenuItem editWindowItem = new MenuItem { Header = PythonNodeModels.Properties.Resources.EditHeader, IsCheckable = false };
         private MenuItem pythonEngineVersionMenu;
@@ -43,7 +44,17 @@ public void CustomizeView(PythonNode nodeModel, NodeView nodeView)
 
             nodeView.MainContextMenu.Items.Add(editWindowItem);
             editWindowItem.Click += EditScriptContent;
+
+            var previousdelegates = pythonNodeModel.GetInvocationListForEditAction();
+
+            // Unsubscibe any previous listeners to the EditNode action when switching views.
+            foreach (Delegate d in previousdelegates)
+            {
+                pythonNodeModel.EditNode -= (Action<string>)d;
+            }
+
             pythonNodeModel.EditNode += EditScriptContent;
+            pythonNodeModel.PropertyChanged += NodeModel_PropertyChanged;
 
             pythonEngineVersionMenu = new MenuItem { Header = PythonNodeModels.Properties.Resources.PythonNodeContextMenuEngineSwitcher, IsCheckable = false };
             nodeView.MainContextMenu.Items.Add(pythonEngineVersionMenu);
@@ -109,8 +120,16 @@ private void NodeModel_Disposed(Dynamo.Graph.ModelBase obj)
                 editWindow.Close();
             }
 
+            // When the node is disposed, close the script editor if it is docked in the right SideBar
+            if (dynamoView != null && IsEditorCurrentlyDocked())
+            {
+                var tabItem = dynamoViewModel.SideBarTabItems.FirstOrDefault(t => t.Uid == pythonNodeModel.GUID.ToString());
+                dynamoView.CloseRightSideBarTab(tabItem);
+            }
+
             editWindowItem.Click -= EditScriptContent;
             pythonNodeModel.EditNode -= EditScriptContent;
+            pythonNodeModel.PropertyChanged -= NodeModel_PropertyChanged;
 
             if (pythonEngineVersionMenu != null)
             {
@@ -129,7 +148,7 @@ private void NodeModel_Disposed(Dynamo.Graph.ModelBase obj)
 
         private void NodeModel_DeletionStarted(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            if (editWindow != null)
+            if (editWindow != null || IsEditorCurrentlyDocked())
             {
                 var res = MessageBoxService.Show(
                     String.Format(
@@ -169,11 +188,13 @@ private void EditScriptContent(object sender, EventArgs e)
                     if (editWindow != null)
                     {
                         editWindow.Activate();
+                        dynamoView = editWindow.Owner as DynamoView;
                     }
                     else
                     {
                         editWindow = new ScriptEditorWindow(dynamoViewModel, pythonNodeModel, pythonNodeView, ref editorWindowRect);
-                        if (pythonNodeModel.ScriptContentSaved)
+
+                        if (pythonNodeModel.ScriptContentSaved || sender == null)
                         {
                             editWindow.Initialize(workspaceModel.Guid, pythonNodeModel.GUID, "ScriptContent", pythonNodeModel.Script);
                         }
@@ -182,7 +203,9 @@ private void EditScriptContent(object sender, EventArgs e)
                             editWindow.Initialize(workspaceModel.Guid, pythonNodeModel.GUID, "ScriptContent", sender.ToString());
                             editWindow.IsSaved = false;
                         }
+
                         editWindow.Closed += editWindow_Closed;
+                        dynamoView = editWindow.Owner as DynamoView;
 
                         if (IsEditorInDockedState())
                         {
@@ -203,6 +226,7 @@ private void EditScriptContent(object sender, EventArgs e)
             }
         }
 
+        // Checks the state of this node script editor, either DockRight or FloatingWindow
         private bool IsEditorInDockedState()
         {
             var nodemodel = pythonNodeModel as NodeModel;
@@ -211,11 +235,37 @@ private bool IsEditorInDockedState()
             return viewExtensionDisplayMode.Equals(ViewExtensionDisplayMode.DockRight);
         }
 
+        // Checks if this node editor is currrently docked(and opened) in the right side-bar
+        private bool IsEditorCurrentlyDocked()
+        {
+            var nodemodel = pythonNodeModel as NodeModel;
+            return dynamoViewModel.DockedNodeWindows.Contains(nodemodel.GUID.ToString());
+        }
+
         private void EditScriptContent(string text)
         {
             EditScriptContent(text, null);
         }
 
+        private void NodeModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                // If this node is renamed, update the tab header in the right SideBar
+                case nameof(NodeModel.Name):
+                    if (dynamoView != null && IsEditorCurrentlyDocked())
+                    {
+                        TabItem tabItem = dynamoViewModel.SideBarTabItems.OfType<TabItem>().SingleOrDefault(n => n.Uid.ToString() == pythonNodeModel.GUID.ToString());
+                        if (tabItem != null)
+                        {
+                            tabItem.Header = pythonNodeModel.Name;
+                        }
+                    }
+                    break;
+            }
+        }
+
+
         /// <summary>
         /// MenuItem click handler
         /// </summary>
diff --git a/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml b/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml
index ebe75d458ac..db416d2d463 100644
--- a/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml
+++ b/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml
@@ -350,8 +350,8 @@
                                    Source="/PythonNodeModelsWpf;component/Resources/zoom-out_hover.png" />
                         </Button.Resources>
                     </Button>
-                    <ComboBox ItemsSource="{Binding AvailableEngines, RelativeSource={RelativeSource AncestorType=dww:ModelessChildWindow}}"
-                              SelectedItem="{Binding CachedEngine, Mode=TwoWay}"
+                    <ComboBox SelectedItem="{Binding CachedEngine, RelativeSource={RelativeSource AncestorType=dww:ModelessChildWindow}, Mode=TwoWay}"
+                              ItemsSource="{Binding AvailableEngines, RelativeSource={RelativeSource AncestorType=dww:ModelessChildWindow}}"
                               SelectionChanged="OnEngineChanged"
                               Style="{StaticResource DropDown}"
                               Name="EngineSelectorComboBox"
diff --git a/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml.cs b/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml.cs
index 5632f862f62..b32b64bba68 100644
--- a/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml.cs
+++ b/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml.cs
@@ -173,6 +173,7 @@ internal void Initialize(Guid workspaceGuid, Guid nodeGuid, string propName, str
             editText.Text = propValue;
             originalScript = propValue;
             CachedEngine = NodeModel.EngineName;
+            EngineSelectorComboBox.ItemsSource = AvailableEngines;
             EngineSelectorComboBox.SelectedItem = CachedEngine;
 
             InstallFoldingManager();
@@ -196,7 +197,10 @@ internal void DockWindow()
                 editor.IsModified = !IsSaved;
 
                 dynamoView.DockWindowInSideBar(this, NodeModel, titleBar);
-                EngineSelectorComboBox.SelectedItem = NodeModel.EngineName;
+
+                Analytics.TrackEvent(
+                               Actions.Dock,
+                               Categories.PythonOperations, NodeModel.Name);
 
                 Close();
             }
@@ -456,6 +460,7 @@ private void UpdateScript(string scriptText)
 
         private void OnRunClicked(object sender, RoutedEventArgs e)
         {
+            NodeModel.EngineName = CachedEngine;
             UpdateScript(editText.Text);
             if (dynamoViewModel.HomeSpace.RunSettings.RunType != RunType.Automatic)
             {
@@ -487,6 +492,12 @@ private void OnMoreInfoClicked(object sender, RoutedEventArgs e)
 
         private void OnEngineChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
         {
+            var enginecomboBox = sender as ComboBox;
+            if (enginecomboBox != null && enginecomboBox.Name.Equals("EngineSelectorComboBox"))
+            {
+                CachedEngine = enginecomboBox.SelectedItem.ToString();
+            }
+
             if (CachedEngine != NodeModel.EngineName)
             {
                 nodeWasModified = true;
@@ -504,7 +515,7 @@ private void OnScriptEditorWindowClosed(object sender, EventArgs e)
         {
             // When the script editor is docked, we don't want to dispose the editor functionality.
             // Dispose it only when the window is closed.
-            if (!dynamoViewModel.CurrentDockedWindows.Contains(Uid))
+            if (!dynamoViewModel.DockedNodeWindows.Contains(Uid))
             {
                 completionProvider?.Dispose();
                 NodeModel.CodeMigrated -= OnNodeModelCodeMigrated;
@@ -625,8 +636,8 @@ private void CloseWarningBarButton_OnClick(object sender, RoutedEventArgs e)
                 else // Close the right side extension tab if the close button is clicked on the docked editor. 
                 {
                     var dynamoView = Owner as DynamoView;
-                    TabItem tabItem = dynamoView.SideBarPanelTabItems.OfType<TabItem>().SingleOrDefault(n => n.Uid.ToString() == NodeModel.GUID.ToString());
-                    dynamoView.CloseRightSidePanelTab(tabItem);
+                    TabItem tabItem = dynamoViewModel.SideBarTabItems.OfType<TabItem>().SingleOrDefault(n => n.Uid.ToString() == NodeModel.GUID.ToString());
+                    dynamoView.CloseRightSideBarTab(tabItem);
                 }
             }
             catch (Exception ex)
diff --git a/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs b/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs
index 345a457519e..2569f4217fc 100644
--- a/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs
+++ b/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs
@@ -269,7 +269,7 @@ public void OnMoreInfoEventTest()
             codeEditor.Focus();
 
             //Check that we don't have any extension tabs shown right now
-            Assert.That(this.View.SideBarPanelTabItems.Count, Is.EqualTo(0));
+            Assert.That(this.ViewModel.SideBarTabItems.Count, Is.EqualTo(0));
 
             var moreInfoButton = scriptWindow.FindName("MoreInfoButton") as Button;
 
@@ -278,9 +278,9 @@ public void OnMoreInfoEventTest()
             DispatcherUtil.DoEvents();
 
             //Check that now we are showing a extension tab (DocumentationBrowser)
-            Assert.That(this.View.SideBarPanelTabItems.Count, Is.EqualTo(1));
+            Assert.That(this.ViewModel.SideBarTabItems.Count, Is.EqualTo(1));
 
-            var docBrowser = this.View.SideBarPanelTabItems
+            var docBrowser = this.ViewModel.SideBarTabItems
                             .Where(x => x.Content.GetType().Equals(typeof(DocumentationBrowserView)))
                             .FirstOrDefault();
 
@@ -317,7 +317,7 @@ public void OpenPythonLearningMaterialValidationTest()
 
             DispatcherUtil.DoEvents();
 
-            var learnMoreTab = this.View.SideBarPanelTabItems
+            var learnMoreTab = this.ViewModel.SideBarTabItems
                                 .Where(x => x.Content.GetType().Equals(typeof(DocumentationBrowserView)))
                                 .FirstOrDefault();
 
@@ -351,7 +351,7 @@ public void OpenPythonLearningMaterial_PythonNodeFromStringValidationTest()
 
             DispatcherUtil.DoEvents();
 
-            var learnMoreTab = this.View.SideBarPanelTabItems
+            var learnMoreTab = this.ViewModel.SideBarTabItems
                                 .Where(x => x.Content.GetType().Equals(typeof(DocumentationBrowserView)))
                                 .FirstOrDefault();
 
@@ -719,17 +719,17 @@ public void PythonEditorDockingTest()
             // Dock python editor
             var scriptWindow = EditPythonCode(nodeView, View);
             scriptWindow.DockWindow();
-            Assert.IsTrue(ViewModel.CurrentDockedWindows.Contains(nodeModel.GUID.ToString()));
+            Assert.IsTrue(ViewModel.DockedNodeWindows.Contains(nodeModel.GUID.ToString()));
 
-            var editorTab = View.SideBarPanelTabItems.FirstOrDefault(x => x.Uid == nodeModel.GUID.ToString());
+            var editorTab = ViewModel.SideBarTabItems.FirstOrDefault(x => x.Uid == nodeModel.GUID.ToString());
             Assert.IsNotNull(editorTab);
             Assert.AreEqual(editorTab.Header.ToString(), "Python Script");
 
             // Undock editor tab from right side panel.
             View.UndockWindow(editorTab);
 
-            Assert.IsFalse(ViewModel.CurrentDockedWindows.Contains(nodeModel.GUID.ToString()));
-            Assert.IsNull(View.SideBarPanelTabItems.FirstOrDefault(x => x.Uid == nodeModel.GUID.ToString()));
+            Assert.IsFalse(ViewModel.DockedNodeWindows.Contains(nodeModel.GUID.ToString()));
+            Assert.IsNull(ViewModel.SideBarTabItems.FirstOrDefault(x => x.Uid == nodeModel.GUID.ToString()));
         }
 
         /// <summary>
diff --git a/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs
index dfd569b11e4..65cb91642ac 100644
--- a/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs
+++ b/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs
@@ -154,9 +154,9 @@ public void ViewExtensionIgnoresExternalEvents()
             using (var viewExtension = SetupNewViewExtension())
             {
                 // Act
-                var tabsBeforeExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 viewExtension.HandleRequestOpenDocumentationLink(externalEvent);
-                var tabsAfterExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
 
                 // Assert
                 Assert.IsTrue(externalEvent.IsRemoteResource);
@@ -173,9 +173,9 @@ public void CanHandleDocsEventWithValidLink()
             using (var viewExtension = SetupNewViewExtension(true))
             {
                 // Act
-                var tabsBeforeExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
-                var tabsAfterExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 var htmlContent = GetSidebarDocsBrowserContents();
 
                 // Assert
@@ -193,9 +193,9 @@ public void CanHandleDocsEventTriggeredFromDynamoViewModel()
             var docsEvent = new OpenDocumentationLinkEventArgs(new Uri(localDocsFileLink, UriKind.Relative));
 
             // Act
-            var tabsBeforeExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+            var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
             this.ViewModel.OpenDocumentationLinkCommand.Execute(docsEvent);
-            var tabsAfterExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+            var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
             var htmlContent = GetSidebarDocsBrowserContents();
 
             // Assert
@@ -213,9 +213,9 @@ public void Displays404PageOnMissingDocFile()
             using (var viewExtension = SetupNewViewExtension(true))
             {
                 // Act
-                var tabsBeforeExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
-                var tabsAfterExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 var htmlContent = GetSidebarDocsBrowserContents();
 
                 // Assert
@@ -239,9 +239,9 @@ public void DisplaysHtmlEmbeddedInLoadedAssemblies()
                 var docsEvent = new OpenDocumentationLinkEventArgs(new Uri(uri, UriKind.Relative));
 
                 // Act
-                var tabsBeforeExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
-                var tabsAfterExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 var htmlContent = GetSidebarDocsBrowserContents();
 
                 // Assert
@@ -266,9 +266,9 @@ public void Displays404PageWhenLinkPointsToAssemblyThatCannotBeFound()
                 var docsEvent = new OpenDocumentationLinkEventArgs(new Uri(uri, UriKind.Relative));
 
                 // Act
-                var tabsBeforeExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
-                var tabsAfterExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 var htmlContent = GetSidebarDocsBrowserContents();
 
                 // Assert
@@ -430,9 +430,9 @@ public void RemovesScriptTagsFromLoadedHtml()
                 var docsEvent = new OpenDocumentationLinkEventArgs(new Uri(uri, UriKind.Relative));
 
                 // Act
-                var tabsBeforeExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
-                var tabsAfterExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 var htmlContent = GetSidebarDocsBrowserContents();
 
                 // Assert
@@ -457,9 +457,9 @@ public void DPIScriptExists()
                 var docsEvent = new OpenDocumentationLinkEventArgs(new Uri(uri, UriKind.Relative));
 
                 // Act
-                var tabsBeforeExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
-                var tabsAfterExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+                var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 var htmlContent = GetSidebarDocsBrowserContents();
 
                 // Assert
@@ -516,9 +516,9 @@ public void CanCreateNodeDocumenationHtmlFromNodeAnnotationEventArgsWithOOTBNode
             node.Name = nodeRename; // Forces original name header to appear 
             var nodeAnnotationEventArgs = new OpenNodeAnnotationEventArgs(node, this.ViewModel);
 
-            var tabsBeforeExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+            var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
             docBrowserviewExtension.HandleRequestOpenDocumentationLink(nodeAnnotationEventArgs);
-            var tabsAfterExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+            var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
             var htmlContent = GetSidebarDocsBrowserContents();
 
             // Assert
@@ -563,9 +563,9 @@ public void CanCreateNodeDocumenationHtmlFromNodeAnnotationEventArgsWithPackageN
             node.Name = nodeRename; // Forces original name header to appear 
             var nodeAnnotationEventArgs = new OpenNodeAnnotationEventArgs(node, this.ViewModel);
 
-            var tabsBeforeExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+            var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
             docBrowserviewExtension.HandleRequestOpenDocumentationLink(nodeAnnotationEventArgs);
-            var tabsAfterExternalEventTrigger = this.View.SideBarPanelTabItems.Count;
+            var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
             var htmlContent = GetSidebarDocsBrowserContents();
             htmlContent = htmlContent.Replace(@"%5C", "/");
 
@@ -798,7 +798,7 @@ private string GetSidebarDocsBrowserContents()
 
         private TabItem GetDocsTabItem()
         {
-            return this.View.SideBarPanelTabItems
+            return this.ViewModel.SideBarTabItems
                 .Where(x => x.Content.GetType().Equals(typeof(DocumentationBrowserView)))
                 .FirstOrDefault();
         }
diff --git a/test/DynamoCoreWpfTests/ViewExtensions/GraphNodeManagerViewExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/GraphNodeManagerViewExtensionTests.cs
index 23120a75a31..a964df9eee3 100644
--- a/test/DynamoCoreWpfTests/ViewExtensions/GraphNodeManagerViewExtensionTests.cs
+++ b/test/DynamoCoreWpfTests/ViewExtensions/GraphNodeManagerViewExtensionTests.cs
@@ -68,12 +68,12 @@ public void ViewExtensionOpenTest()
             // Open
             LoadExtension(viewExtension);
 
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
 
             // Close
             Utility.DispatcherUtil.DoEvents();
-            View.OnCloseRightSidePanelTab(WpfUtilities.ChildrenOfType<Button>(View.SideBarPanelTabItems.FirstOrDefault()).FirstOrDefault(), null);
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            View.OnCloseRightSideBarTab(WpfUtilities.ChildrenOfType<Button>(ViewModel.SideBarTabItems.FirstOrDefault()).FirstOrDefault(), null);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
         }
 
         /// <summary>
@@ -228,7 +228,7 @@ public void ViewExtensionOpensWithDynamoWhenRememberedTest()
             LoadExtension(viewExtension);
 
             //confirm that extension was opened
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
 
             //Restart Dynamo
             Exit();
@@ -237,8 +237,8 @@ public void ViewExtensionOpensWithDynamoWhenRememberedTest()
             Utility.DispatcherUtil.DoEvents();
 
             //confirm that extension is reopened after restart
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
-            Assert.IsNotNull(View.SideBarPanelTabItems.FirstOrDefault(x => x.Tag as GraphNodeManagerViewExtension != null));
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
+            Assert.IsNotNull(ViewModel.SideBarTabItems.FirstOrDefault(x => x.Tag as GraphNodeManagerViewExtension != null));
         }
 
         /// <summary>
@@ -265,7 +265,7 @@ public void ViewExtensionDoesNotOpensWithDynamoWhenClosedTest()
             loadedParams.CloseExtensioninInSideBar(viewExtension);
 
             //confirm that extension was closed
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
 
             //Restart Dynamo
             Exit();
@@ -274,8 +274,8 @@ public void ViewExtensionDoesNotOpensWithDynamoWhenClosedTest()
             Utility.DispatcherUtil.DoEvents();
 
             //confirm that extension is still closed after restart
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
-            Assert.IsNull(View.SideBarPanelTabItems.FirstOrDefault(x => x.Tag as GraphNodeManagerViewExtension != null));
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
+            Assert.IsNull(ViewModel.SideBarTabItems.FirstOrDefault(x => x.Tag as GraphNodeManagerViewExtension != null));
         }
 
         /// <summary>
@@ -298,7 +298,7 @@ public void ViewExtensionDoesNotOpenWhenNotRememberedTest()
             LoadExtension(viewExtension);
 
             //confirm that extension was opened
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
 
             //Restart Dynamo
             Exit();
@@ -307,8 +307,8 @@ public void ViewExtensionDoesNotOpenWhenNotRememberedTest()
             Utility.DispatcherUtil.DoEvents();
 
             //confirm that extension is still closed after restart
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
-            Assert.IsNull(View.SideBarPanelTabItems.FirstOrDefault(x => x.Tag as GraphNodeManagerViewExtension != null));
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
+            Assert.IsNull(ViewModel.SideBarTabItems.FirstOrDefault(x => x.Tag as GraphNodeManagerViewExtension != null));
         }
         #endregion
 
diff --git a/test/DynamoCoreWpfTests/ViewExtensions/ViewExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/ViewExtensionTests.cs
index 6c20b8a5669..5e8a72d5741 100644
--- a/test/DynamoCoreWpfTests/ViewExtensions/ViewExtensionTests.cs
+++ b/test/DynamoCoreWpfTests/ViewExtensions/ViewExtensionTests.cs
@@ -56,21 +56,21 @@ public void ExtensionsSideBarExtensionsTest()
 
             var extensionManager = View.viewExtensionManager;
 
-            var initialNum = View.SideBarPanelTabItems.Count;
+            var initialNum = ViewModel.SideBarTabItems.Count;
 
             // Adding the first extension will add a tab in the extensions side bar
             extensionManager.Add(viewExtension);
-            Assert.AreEqual(initialNum + 1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(initialNum + 1, ViewModel.SideBarTabItems.Count);
 
             // Adding the second extension will add another tab in the extensions side bar
             extensionManager.Add(extensionsSideBarViewExtension);
-            Assert.AreEqual(initialNum + 2, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(initialNum + 2, ViewModel.SideBarTabItems.Count);
 
             // Setting a different unique ID so as to add the extension to the extension manager. 
             // But since that extension is already added to the side bar, it won't be added again. 
             extensionsSideBarViewExtensionNew.UniqueId = "ExtensionsSideBarDummyIDNew";
             extensionManager.Add(extensionsSideBarViewExtensionNew);
-            Assert.AreEqual(initialNum + 2, View.SideBarPanelTabItems.Count); 
+            Assert.AreEqual(initialNum + 2, ViewModel.SideBarTabItems.Count); 
         }
 
         [Test]
@@ -80,17 +80,17 @@ public void CloseViewExtensionTest()
 
             var extensionManager = View.viewExtensionManager;
 
-            var initialNum = View.SideBarPanelTabItems.Count;
+            var initialNum = ViewModel.SideBarTabItems.Count;
 
             // Adding a dummy extension will add a new tab in the extensions side bar
             extensionManager.Add(viewExtension);
-            Assert.AreEqual(initialNum + 1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(initialNum + 1, ViewModel.SideBarTabItems.Count);
 
             var loadedParams = new ViewLoadedParams(View, ViewModel);
 
             // Closing the view extension using the CloseExtensioninInSideBar API should close the view extension.
             loadedParams.CloseExtensioninInSideBar(this.viewExtension);
-            Assert.AreEqual(initialNum, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(initialNum, ViewModel.SideBarTabItems.Count);
         }
 
         [Test]
@@ -151,11 +151,11 @@ public void ExtensionUndockRedock()
             View.viewExtensionManager.Add(viewExtension);
 
             // Extension bar is shown
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
             Assert.IsFalse(View.ExtensionsCollapsed);
 
             // The content is in the extension tab
-            var content = View.SideBarPanelTabItems[0].Content as TextBlock;
+            var content = ViewModel.SideBarTabItems[0].Content as TextBlock;
             Assert.IsNotNull(content);
             Assert.AreEqual("Dummy", content.Text);
 
@@ -163,7 +163,7 @@ public void ExtensionUndockRedock()
             View.UndockExtension(viewExtension.Name);
 
             // Extension is no longer in the side bar (now collapsed)
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
             Assert.IsTrue(View.ExtensionsCollapsed);
             // Extension is in a window now
             Assert.AreEqual(1, View.ExtensionWindows.Count);
@@ -179,12 +179,12 @@ public void ExtensionUndockRedock()
             window.Close();
 
             // Extension is in the sidebar again and the window is gone
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
             Assert.IsFalse(View.ExtensionsCollapsed);
             Assert.AreEqual(0, View.ExtensionWindows.Count);
 
             // The content is in the extension tab
-            content = View.SideBarPanelTabItems[0].Content as TextBlock;
+            content = ViewModel.SideBarTabItems[0].Content as TextBlock;
             Assert.IsNotNull(content);
             Assert.AreEqual("Dummy", content.Text);
         }
@@ -198,11 +198,11 @@ public void ExtensionUndockClose()
             View.viewExtensionManager.Add(viewExtension);
 
             // Extension bar is shown
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
             Assert.IsFalse(View.ExtensionsCollapsed);
 
             // The content is in the extension tab
-            var content = View.SideBarPanelTabItems[0].Content as TextBlock;
+            var content = ViewModel.SideBarTabItems[0].Content as TextBlock;
             Assert.IsNotNull(content);
             Assert.AreEqual("Dummy", content.Text);
 
@@ -210,7 +210,7 @@ public void ExtensionUndockClose()
             View.UndockExtension(viewExtension.Name);
 
             // Extension is no longer in the side bar (now collapsed)
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
             Assert.IsTrue(View.ExtensionsCollapsed);
             // Extension is in a window now
             Assert.AreEqual(1, View.ExtensionWindows.Count);
@@ -225,7 +225,7 @@ public void ExtensionUndockClose()
             window.Close();
 
             // Extension is not in the sidebar nor as a window
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
             Assert.IsTrue(View.ExtensionsCollapsed);
             Assert.AreEqual(0, View.ExtensionWindows.Count);
         }
@@ -239,7 +239,7 @@ public void ExtensionDockAndUndockWithRandomGUID()
             View.viewExtensionManager.Add(extensionsSideBarViewExtension);
 
             // Extension bar is shown
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
             Assert.IsFalse(View.ExtensionsCollapsed);
 
             // Undock extension which return a new UniqueId, this should not crash Dynamo
@@ -256,14 +256,14 @@ public void ExtensionCannotBeAddedAsBothWindowAndTab()
             View.viewExtensionManager.Add(viewExtension);
 
             // Extension bar is shown
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
             Assert.IsFalse(View.ExtensionsCollapsed);
 
             // Undock extension 
             View.UndockExtension(viewExtension.Name);
 
             // Extension is no longer in the side bar (now collapsed)
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
             Assert.IsTrue(View.ExtensionsCollapsed);
             // Extension is in a window now
             Assert.AreEqual(1, View.ExtensionWindows.Count);
@@ -272,7 +272,7 @@ public void ExtensionCannotBeAddedAsBothWindowAndTab()
             View.AddOrFocusExtensionControl(viewExtension, viewExtension.Content);
 
             // Extension is not added to the sidebar
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
             Assert.IsTrue(View.ExtensionsCollapsed);
         }
 
@@ -285,14 +285,14 @@ public void ExtensionLocationIsRemembered()
             View.viewExtensionManager.Add(viewExtension);
 
             // Extension bar is shown
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
             Assert.IsFalse(View.ExtensionsCollapsed);
 
             // Undock extension 
             View.UndockExtension(viewExtension.Name);
 
             // Extension is no longer in the side bar (now collapsed)
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
             Assert.IsTrue(View.ExtensionsCollapsed);
             // Extension is in a window now
             Assert.AreEqual(1, View.ExtensionWindows.Count);
@@ -302,7 +302,7 @@ public void ExtensionLocationIsRemembered()
             window.Close();
 
             // Extension is not in the sidebar nor as a window
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
             Assert.IsTrue(View.ExtensionsCollapsed);
             Assert.AreEqual(0, View.ExtensionWindows.Count);
 
@@ -310,7 +310,7 @@ public void ExtensionLocationIsRemembered()
             View.AddOrFocusExtensionControl(viewExtension, viewExtension.Content);
 
             // Extension is remembered to be opened as a window
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
             Assert.IsTrue(View.ExtensionsCollapsed);
             Assert.AreEqual(1, View.ExtensionWindows.Count);
 
@@ -320,7 +320,7 @@ public void ExtensionLocationIsRemembered()
             window.Close();
 
             // Extension is in the sidebar now
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
             Assert.IsFalse(View.ExtensionsCollapsed);
             Assert.AreEqual(0, View.ExtensionWindows.Count);
 
@@ -328,7 +328,7 @@ public void ExtensionLocationIsRemembered()
             View.CloseExtensionControl(viewExtension);
 
             // Extension is closed
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
             Assert.IsTrue(View.ExtensionsCollapsed);
             Assert.AreEqual(0, View.ExtensionWindows.Count);
 
@@ -336,7 +336,7 @@ public void ExtensionLocationIsRemembered()
             View.AddOrFocusExtensionControl(viewExtension, viewExtension.Content);
 
             // Extension is remembered to be opened in the sidebar
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
             Assert.IsFalse(View.ExtensionsCollapsed);
             Assert.AreEqual(0, View.ExtensionWindows.Count);
         }
diff --git a/test/DynamoCoreWpfTests/ViewExtensions/WorkspaceDependencyViewExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/WorkspaceDependencyViewExtensionTests.cs
index fcf229946fe..ef766d15a59 100644
--- a/test/DynamoCoreWpfTests/ViewExtensions/WorkspaceDependencyViewExtensionTests.cs
+++ b/test/DynamoCoreWpfTests/ViewExtensions/WorkspaceDependencyViewExtensionTests.cs
@@ -117,11 +117,11 @@ public void ClickingToCloseViewExtensionTabTest()
             extensionManager.Add(viewExtension);
             // Open a graph which should bring up the Workspace References view extension window with one tab
             Open(@"pkgs\Dynamo Samples\extra\CustomRenderExample.dyn");
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
 
             Utility.DispatcherUtil.DoEvents();
-            View.OnCloseRightSidePanelTab(WpfUtilities.ChildrenOfType<Button>(View.SideBarPanelTabItems.FirstOrDefault()).FirstOrDefault(), null);
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            View.OnCloseRightSideBarTab(WpfUtilities.ChildrenOfType<Button>(ViewModel.SideBarTabItems.FirstOrDefault()).FirstOrDefault(), null);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
         }
 
         /// <summary>
@@ -136,11 +136,11 @@ public void APItoCloseViewExtensionTabTest()
             extensionManager.Add(viewExtension);
             // Open a graph which should bring up the Workspace References view extension window with one tab
             Open(@"pkgs\Dynamo Samples\extra\CustomRenderExample.dyn");
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
 
             var loadedParams = new ViewLoadedParams(View, ViewModel);
             loadedParams.CloseExtensioninInSideBar(this.viewExtension);
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public void OnViewExtensionClosedTest()
 
             // Open a graph which should bring up the Workspace References view extension window with one tab
             Open(@"pkgs\Dynamo Samples\extra\CustomRenderExample.dyn");
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
 
             var loadedParams = new ViewLoadedParams(View, ViewModel);
 
@@ -165,7 +165,7 @@ public void OnViewExtensionClosedTest()
             // This will un-check the workspace references menu item.
             loadedParams.CloseExtensioninInSideBar(WorkspaceReferencesExtension);
 
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
 
             // Assert that the workspace references menu item is un-checked.
             Assert.IsFalse(WorkspaceReferencesExtension.workspaceReferencesMenuItem.IsChecked);
@@ -182,10 +182,10 @@ public void CloseViewExtensionTabOnClosingWorkspace()
             extensionManager.Add(viewExtension);
             // Open a graph which should bring up the Workspace References view extension window with one tab
             Open(@"pkgs\Dynamo Samples\extra\CustomRenderExample.dyn");
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
             var homeSpace = Model.Workspaces.First(ws => ws is HomeWorkspaceModel) as HomeWorkspaceModel;
             homeSpace.Clear();
-            Assert.AreEqual(0, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(0, ViewModel.SideBarTabItems.Count);
         }
 
         /// <summary>
@@ -265,12 +265,12 @@ public void WillNotAddDupWorkspaceDependencyViewExtensionLoadTest()
 
             var extensionManager = View.viewExtensionManager;
 
-            var initialNum = View.SideBarPanelTabItems.Count;
+            var initialNum = ViewModel.SideBarTabItems.Count;
 
             // Adding the workspace references extension will 
             // not add a dup tab in the extensions side bar
             extensionManager.Add(viewExtension);
-            Assert.AreEqual(initialNum, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(initialNum, ViewModel.SideBarTabItems.Count);
         }
 
         [Test]
@@ -289,7 +289,7 @@ public void VerifyDynamoLoadingOnOpeningWorkspaceWithMissingCustomNodes()
 
             var examplePath = Path.Combine(@"core\packageDependencyTests\PackageDependencyStates.dyn");
             Open(examplePath);
-            Assert.AreEqual(1, View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(1, ViewModel.SideBarTabItems.Count);
 
             foreach (PackageDependencyRow packageDependencyRow in WorkspaceReferencesExtension.DependencyView.dataRows)
             {
diff --git a/test/Libraries/IronPythonTests/PythonMigrationViewExtensionTests.cs b/test/Libraries/IronPythonTests/PythonMigrationViewExtensionTests.cs
index b9505953801..a59f6c243b2 100644
--- a/test/Libraries/IronPythonTests/PythonMigrationViewExtensionTests.cs
+++ b/test/Libraries/IronPythonTests/PythonMigrationViewExtensionTests.cs
@@ -242,16 +242,16 @@ public void CanOpenDocumentationBrowserWhenMoreInformationIsClicked()
             DispatcherUtil.DoEvents();
 
             var ironPythonDialog = this.View.GetChildrenWindowsOfType<IronPythonInfoDialog>().First();
-            var viewExtensionTabsBeforeBtnClick = this.View.SideBarPanelTabItems.Count;
+            var viewExtensionTabsBeforeBtnClick = this.ViewModel.SideBarTabItems.Count;
             DispatcherUtil.DoEvents();
 
             ironPythonDialog.MoreInformationBtn.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
-            var hasDocumentationBrowserTab = this.View.SideBarPanelTabItems
+            var hasDocumentationBrowserTab = this.ViewModel.SideBarTabItems
                 .Any(x => x.Header.ToString() == "Documentation Browser");
             DispatcherUtil.DoEvents();
 
             // Assert
-            Assert.AreEqual(viewExtensionTabsBeforeBtnClick + 1, this.View.SideBarPanelTabItems.Count);
+            Assert.AreEqual(viewExtensionTabsBeforeBtnClick + 1, this.ViewModel.SideBarTabItems.Count);
             Assert.IsTrue(hasDocumentationBrowserTab);
             DynamoModel.IsTestMode = true;
             DispatcherUtil.DoEvents();