From e175333cd3f961eb66d76fc53e414088b1fd1897 Mon Sep 17 00:00:00 2001
From: eriklimakc <erik.lima@knowcode.app>
Date: Thu, 16 Jan 2025 16:52:34 +0000
Subject: [PATCH] fix: Include Data to navigation for addressbar

---
 .../Navigators/FrameNavigator.cs              |  2 +-
 .../Navigation/AddressBar/Given_AddressBar.cs | 15 ++++++++
 .../AddressBar/AddressBarHomeModel.cs         |  5 +++
 .../AddressBar/AddressBarHomePage.xaml        |  6 +++
 .../AddressBar/AddressBarHostInit.cs          | 23 +++++++++++-
 .../AddressBar/AddressBarSecondModel.cs       | 17 +++++++++
 .../AddressBar/AddressBarSecondPage.xaml      | 37 +++++++++++++++++++
 .../AddressBar/AddressBarSecondPage.xaml.cs   | 27 ++++++++++++++
 .../AddressBar/AddressBarUserService.cs       | 26 +++++++++++++
 9 files changed, 155 insertions(+), 3 deletions(-)
 create mode 100644 testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondModel.cs
 create mode 100644 testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondPage.xaml
 create mode 100644 testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondPage.xaml.cs
 create mode 100644 testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarUserService.cs

diff --git a/src/Uno.Extensions.Navigation.UI/Navigators/FrameNavigator.cs b/src/Uno.Extensions.Navigation.UI/Navigators/FrameNavigator.cs
index 6cf5ae66e4..3ea379720c 100644
--- a/src/Uno.Extensions.Navigation.UI/Navigators/FrameNavigator.cs
+++ b/src/Uno.Extensions.Navigation.UI/Navigators/FrameNavigator.cs
@@ -196,8 +196,8 @@ viewType is null ||
 
 		CurrentView?.SetNavigatorInstance(Region.Navigator()!);
 
+		var responseRequest = navSegment with { Qualifier = route.Qualifier, Data = route.Data };
 
-		var responseRequest = navSegment with { Qualifier = route.Qualifier };
 		return responseRequest;
 	}
 
diff --git a/testing/TestHarness/TestHarness.UITest/Ext/Navigation/AddressBar/Given_AddressBar.cs b/testing/TestHarness/TestHarness.UITest/Ext/Navigation/AddressBar/Given_AddressBar.cs
index 6149a39681..e4aec53374 100644
--- a/testing/TestHarness/TestHarness.UITest/Ext/Navigation/AddressBar/Given_AddressBar.cs
+++ b/testing/TestHarness/TestHarness.UITest/Ext/Navigation/AddressBar/Given_AddressBar.cs
@@ -13,4 +13,19 @@ public async Task When_AddressBar_HomePage_Wont_Navigate_Twice()
 
 		Assert.AreEqual("1", intanceCount);
 	}
+
+	[Test]
+	[ActivePlatforms(Platform.Browser)]
+	public void When_AddressBar_SecondPage_Query_Displayed()
+	{
+		InitTestSection(TestSections.Navigation_AddressBar);
+
+		App.WaitThenTap("AddressBarSecondButton");
+
+		App.WaitThenTap("GetUrlFromBrowser");
+
+		var url = App.GetText("TxtUrlFromBrowser");
+
+		StringAssert.Contains(url, "QueryUser.Id=8a5c5b2e-ff96-474b-9e4d-65bde598f6bc");
+	}
 }
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHomeModel.cs b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHomeModel.cs
index 19d0b8de08..4ff1da9ed5 100644
--- a/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHomeModel.cs
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHomeModel.cs
@@ -2,6 +2,11 @@
 
 public partial class AddressBarHomeModel
 {
+	public IDictionary<string, object> UserId => new Dictionary<string, object>
+	{
+		{ "QueryUser.Id", new Guid("8a5c5b2e-ff96-474b-9e4d-65bde598f6bc") }
+	};
+
 	public static int InstanceCount
 	{
 		get => ApplicationData.Current.LocalSettings.Values.TryGetValue(Constants.HomeInstanceCountKey, out var value)
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHomePage.xaml b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHomePage.xaml
index c8d8c04925..6d341b74b3 100644
--- a/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHomePage.xaml
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHomePage.xaml
@@ -20,6 +20,12 @@
 						   Text="{Binding InstanceCountProperty}" />
 				<TextBlock Text=" times" />
 			</StackPanel>
+			<StackPanel>
+				<Button Content="Go To Second"
+						AutomationProperties.AutomationId="AddressBarSecondButton"
+						uen:Navigation.Request="AddressBarSecond"
+						uen:Navigation.Data="{Binding UserId}" />
+			</StackPanel>
 
 		</StackPanel>
 
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHostInit.cs b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHostInit.cs
index 0c59bb83b1..b227af7df8 100644
--- a/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHostInit.cs
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarHostInit.cs
@@ -14,15 +14,34 @@ public AddressBarHostInit()
 	protected override void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
 	{
 		views.Register(
+			new ViewMap(ViewModel: typeof(ShellViewModel)),
 			new ViewMap<AddressBarHomePage, AddressBarHomeModel>(),
-			new ViewMap(ViewModel: typeof(ShellViewModel))
+			new DataViewMap<AddressBarSecondPage, AddressBarSecondModel, AddressBarUser>(
+				ToQuery: user => new Dictionary<string, string>
+				{
+					{ "QueryUser.Id", $"{user.UserId}" }
+				},
+				FromQuery: async (sp, query) =>
+				{
+					var userService = new AddressBarUserService();
+
+					if (Guid.TryParse($"{query["QueryUser.Id"]}", out var guid))
+					{
+						var user = userService.GetById(guid);
+						return user ?? new AddressBarUser(guid, "User not found");
+					}
+
+					return new AddressBarUser(guid, "User not found");
+				}
+			)
 		);
 
 		routes.Register(
 			new RouteMap("", View: views.FindByViewModel<ShellViewModel>(),
 				Nested:
 				[
-					new RouteMap("AddressBarHome", View: views.FindByViewModel<AddressBarHomeModel>(), IsDefault: true)
+					new RouteMap("AddressBarHome", View: views.FindByViewModel<AddressBarHomeModel>(), IsDefault: true),
+					new RouteMap("AddressBarSecond", View: views.FindByViewModel<AddressBarSecondModel>())
 				]
 			)
 		);
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondModel.cs b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondModel.cs
new file mode 100644
index 0000000000..8ac6f4cd96
--- /dev/null
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondModel.cs
@@ -0,0 +1,17 @@
+namespace TestHarness.Ext.Navigation.AddressBar;
+
+public class AddressBarSecondModel
+{
+	public AddressBarUser User { get; set; }
+
+	public AddressBarSecondModel(AddressBarUser user)
+	{
+		User = user;
+	}
+}
+
+public class AddressBarUser(Guid id, string name)
+{
+	public Guid UserId { get; set; } = id;
+	public string UserName { get; set; } = name;
+}
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondPage.xaml b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondPage.xaml
new file mode 100644
index 0000000000..0e27a71429
--- /dev/null
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondPage.xaml
@@ -0,0 +1,37 @@
+<Page x:Class="TestHarness.Ext.Navigation.AddressBar.AddressBarSecondPage"
+	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	  xmlns:local="using:TestHarness.Ext.Navigation.RoutesNavigation"
+	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  xmlns:uen="using:Uno.Extensions.Navigation.UI"
+	  mc:Ignorable="d"
+	  d:DesignHeight="300"
+	  d:DesignWidth="400">
+
+	<Grid>
+		<StackPanel Grid.Row="1"
+					HorizontalAlignment="Center"
+					Spacing="16">
+			<TextBlock Text="AddressBar SecondPage" />
+
+			<TextBlock HorizontalAlignment="Center"
+					   Style="{StaticResource TitleLarge}">
+				<Run Text="User Id: " /><Run Text="{Binding User.UserId}" />
+			</TextBlock>
+
+			<TextBlock HorizontalAlignment="Center"
+					   Style="{StaticResource TitleLarge}">
+				<Run Text="User name: " /><Run Text="{Binding User.UserName}" />
+			</TextBlock>
+
+			<TextBlock x:Name="TxtUrl"
+					   AutomationProperties.AutomationId="TxtUrlFromBrowser" />
+
+			<Button AutomationProperties.AutomationId="GetUrlFromBrowser"
+					Click="GetUrlFromBrowser"
+					Content="Get URL" />
+		</StackPanel>
+
+	</Grid>
+</Page>
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondPage.xaml.cs b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondPage.xaml.cs
new file mode 100644
index 0000000000..032284b561
--- /dev/null
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarSecondPage.xaml.cs
@@ -0,0 +1,27 @@
+namespace TestHarness.Ext.Navigation.AddressBar;
+
+public sealed partial class AddressBarSecondPage : Page
+{
+	public AddressBarSecondPage()
+	{
+		this.InitializeComponent();
+	}
+
+	public async void GetUrlFromBrowser(object sender, RoutedEventArgs e)
+	{
+#if __WASM__
+		var url = ImportsJS.GetUrl();
+
+		TxtUrl.Text = url;
+#else
+		TxtUrl.Text = "Not supported";
+#endif
+	}
+}
+#if __WASM__
+internal static partial class ImportsJS
+{
+	[System.Runtime.InteropServices.JavaScript.JSImport("globalThis.Uno.Extensions.Hosting.getLocation")]
+	public static partial string GetUrl();
+}
+#endif
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarUserService.cs b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarUserService.cs
new file mode 100644
index 0000000000..7a3e10593e
--- /dev/null
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/AddressBar/AddressBarUserService.cs
@@ -0,0 +1,26 @@
+namespace TestHarness.Ext.Navigation.AddressBar;
+
+public class AddressBarUserService
+{
+	private readonly List<AddressBarUser> _users;
+
+	public AddressBarUserService()
+	{
+		_users =
+		[
+			new(ConvertFromString("8a5c5b2e-ff96-474b-9e4d-65bde598f6bc"), "João Rodrigues"),
+			new(ConvertFromString("2b64071a-2c8a-45e4-9f48-3eb7d7aace41"), "Ross Polard")
+		];
+	}
+
+	public AddressBarUser? GetById(Guid id)
+	{
+		return _users.FirstOrDefault(user => user.UserId == id);
+	}
+
+	private static Guid ConvertFromString(string value)
+	{
+		var guid = Guid.Parse(value);
+		return guid;
+	}
+}