Merge branch 'bugfix/CurrentWebPath' into develop

Fixed bug with `NavigationViewModel<T>.CurrentWebPath` still being assigned to `Topic.GetUniqueKey()` instead of the `Topic.GetWebPath()`, as expected. This was permitted by faulty unit tests, which have also been fixed. This results in current navigation items not being properly selected, since they were comparing the `GetWebPath()` to `GetUniqueKey()`.

Author: JeremyCaney

OnTopic.AspNetCore.Mvc.Tests/TopicViewComponentTest.cs

@@ -114,7 +114,7 @@ public async Task Menu_Invoke_ReturnsNavigationViewModel() {
       var model                 = concreteResult?.ViewData.Model as NavigationViewModel<NavigationTopicViewModel>;
 
       Assert.IsNotNull(model);
-      Assert.AreEqual<string?>(_topic.GetUniqueKey(), model?.CurrentWebPath);
+      Assert.AreEqual<string?>(_topic.GetWebPath(), model?.CurrentWebPath);
       Assert.AreEqual<string?>("/Web/", model?.NavigationRoot?.WebPath);
       Assert.AreEqual<int?>(3, model?.NavigationRoot?.Children.Count);
       Assert.IsTrue(model?.NavigationRoot?.IsSelected(_topic.GetWebPath())?? false);
@@ -139,7 +139,7 @@ public async Task PageLevelNavigation_Invoke_ReturnsNavigationViewModel() {
       var model                 = concreteResult?.ViewData.Model as NavigationViewModel<NavigationTopicViewModel>;
 
       Assert.IsNotNull(model);
-      Assert.AreEqual<string?>(_topic.GetUniqueKey(), model?.CurrentWebPath);
+      Assert.AreEqual<string?>(_topic.GetWebPath(), model?.CurrentWebPath);
       Assert.AreEqual<string?>("/Web/Web_3/", model?.NavigationRoot?.WebPath);
       Assert.AreEqual<int?>(2, model?.NavigationRoot?.Children.Count);
       Assert.IsTrue(model?.NavigationRoot?.IsSelected(_topic.GetWebPath())?? false);

OnTopic.AspNetCore.Mvc/Components/MenuViewComponentBase{T}.cs

@@ -131,7 +131,7 @@ public async Task<IViewComponentResult> InvokeAsync() {
       \-----------------------------------------------------------------------------------------------------------------------*/
       var navigationViewModel = new NavigationViewModel<T>() {
         NavigationRoot = await MapNavigationTopicViewModels(navigationRootTopic).ConfigureAwait(true),
-        CurrentWebPath = CurrentTopic?.GetUniqueKey()?? HttpContext.Request.Path
+        CurrentWebPath = CurrentTopic?.GetWebPath()?? HttpContext.Request.Path
       };
 
       /*------------------------------------------------------------------------------------------------------------------------

OnTopic.AspNetCore.Mvc/Components/PageLevelNavigationViewComponentBase{T}.cs

@@ -128,7 +128,7 @@ public async Task<IViewComponentResult> InvokeAsync() {
       \-----------------------------------------------------------------------------------------------------------------------*/
       var navigationViewModel = new NavigationViewModel<T>() {
         NavigationRoot = await MapNavigationTopicViewModels(navigationRootTopic).ConfigureAwait(true),
-        CurrentWebPath = CurrentTopic?.GetUniqueKey()?? HttpContext.Request.Path
+        CurrentWebPath = CurrentTopic?.GetWebPath()?? HttpContext.Request.Path
       };
 
       /*------------------------------------------------------------------------------------------------------------------------