DYN-2240 (DynamoDS#10155)

* DYN-2240 * Addressing some comments (cherry picked from commit b3ba589)
reddyashish · Nov 27, 2019 · 372fd2d · 372fd2d
1 parent d1b84bc
commit 372fd2d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/src/DynamoCore/Graph/Workspaces/PackageDependencyInfo.cs b/src/DynamoCore/Graph/Workspaces/PackageDependencyInfo.cs
@@ -12,7 +12,7 @@ public enum PackageDependencyState
         IncorrectVersion,  // Correct package but incorrect version. 
         Missing,           // package is completely missing.
         Warning,           // Actual package is missing but the nodes are resolved by some other package. 
-        RequiresRestart    // Restart needed in order to complete the uninstall of some package. Notice this would be only set when workspace dependency viewer is loaded.
+        RequiresRestart    // Restart needed in order to complete the uninstall of some package. Notice this would be only set when workspace references extension is loaded.
     }
 
     /// <summary>

diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -211,7 +211,7 @@ internal TabItem AddTabItem(IViewExtension viewExtension, ContentControl content
 
                 // creates a new tab item
                 TabItem tab = new TabItem();
-                tab.Header = viewExtension.GetType().Name;
+                tab.Header = viewExtension.Name;
                 tab.Tag = viewExtension.GetType();
                 tab.HeaderTemplate = tabDynamic.FindResource("TabHeader") as DataTemplate;
 

diff --git a/src/WorkspaceDependencyViewExtension/Properties/Resources.Designer.cs b/src/WorkspaceDependencyViewExtension/Properties/Resources.Designer.cs
diff --git a/src/WorkspaceDependencyViewExtension/Properties/Resources.en-US.resx b/src/WorkspaceDependencyViewExtension/Properties/Resources.en-US.resx
@@ -142,7 +142,7 @@
     <value>Keep Installed Version</value>
   </data>
   <data name="MenuItemString" xml:space="preserve">
-    <value>Show Graph Package Dependency</value>
+    <value>Workspace References</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="NodeLibraryDependency_Loaded" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -369,7 +369,7 @@
     <value>Could not redirect to the Dynamo forum page for feedback:</value>
   </data>
   <data name="RefreshButtonTooltipText" xml:space="preserve">
-    <value>Click to recalculate workspace dependencies.</value>
+    <value>Click to recalculate workspace references.</value>
   </data>
   <data name="RestartBannerMessage" xml:space="preserve">
     <value>An installed package is marked for uninstall. To complete the uninstall, please restart Dynamo.</value>

diff --git a/src/WorkspaceDependencyViewExtension/Properties/Resources.resx b/src/WorkspaceDependencyViewExtension/Properties/Resources.resx
@@ -142,7 +142,7 @@
     <value>Keep Installed Version</value>
   </data>
   <data name="MenuItemString" xml:space="preserve">
-    <value>Show Graph Package Dependency</value>
+    <value>Workspace References</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="NodeLibraryDependency_Loaded" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -369,7 +369,7 @@
     <value>Could not redirect to the Dynamo forum page for feedback:</value>
   </data>
   <data name="RefreshButtonTooltipText" xml:space="preserve">
-    <value>Click to recalculate workspace dependencies.</value>
+    <value>Click to recalculate workspace references.</value>
   </data>
   <data name="RestartBannerMessage" xml:space="preserve">
     <value>An installed package is marked for uninstall. To complete the uninstall, please restart Dynamo.</value>

diff --git a/src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.cs b/src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.cs
@@ -34,7 +34,7 @@ public string Name
         {
             get
             {
-                return "Workspace Dependency ViewExtension";
+                return "Workspace References";
             }
         }
 

diff --git a/test/DynamoCoreWpfTests/PackageManagerExtensionLoadingTests.cs b/test/DynamoCoreWpfTests/PackageManagerExtensionLoadingTests.cs
@@ -57,7 +57,7 @@ public void PackageManagerLoadsExtensionAndItWorks()
         public void PackageManagerLoadsAndAddsViewExtension()
         {
             Assert.That(this.View.viewExtensionManager.ViewExtensions.Select(x => x.Name),
-                Is.EquivalentTo((new List<string> { "DynamoManipulationExtension","LibraryUI","NotificationsExtension", "Workspace Dependency ViewExtension", "Sample View Extension","PackageManagerViewExtension" })));
+                Is.EquivalentTo((new List<string> { "DynamoManipulationExtension","LibraryUI","NotificationsExtension", "Workspace References", "Sample View Extension","PackageManagerViewExtension" })));
         }
 
         [Test]

diff --git a/test/DynamoCoreWpfTests/ViewExtensions/WorkspaceDependencyViewExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/WorkspaceDependencyViewExtensionTests.cs
@@ -167,7 +167,7 @@ public void WillNotAddDupWorkspaceDependencyViewExtensionLoadTest()
 
             var initialNum = View.TabItems.Count;
 
-            // Adding the workspace dependency view extension will 
+            // Adding the workspace references extension will 
             // not add a dup tab in the extensions side bar
             extensionManager.Add(viewExtension);
             Assert.AreEqual(initialNum, View.TabItems.Count);
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ public string Name @@
             {
                 get
                 {
-                    return "Workspace Dependency ViewExtension";
+                    return "Workspace References";
                 }
             }
@@ Expand Down @@