From 51e2e2966f8e5f0b41410e23e46dedd67945317b Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sun, 4 Sep 2022 09:35:18 -0400
Subject: [PATCH] fix #2366 - populate new UrlParameters property

---
 Oqtane.Client/Modules/Admin/Logs/Detail.razor |  2 +-
 Oqtane.Client/Modules/Admin/Logs/Index.razor  |  4 ++--
 Oqtane.Client/Modules/ModuleBase.cs           | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
index 71f26397..e45b8511 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
@@ -130,7 +130,7 @@
     private string _properties = string.Empty;
     private string _server = string.Empty;
 
-	public override string RouteTemplate => "/{id}";
+	public override string UrlParameterTemplate => "/{id}";
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 49a8e0a9..4b5ac56a 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -99,10 +99,10 @@ else
 	private List<Log> _logs;
 	private string _retention = "";
 
-	public override string RouteTemplate => "/{level}/{function}/{rows}/{page}";
+	public override string UrlParameterTemplate => "/{level}/{function}/{rows}/{page}";
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-	protected override async Task OnInitializedAsync()
+	protected override async Task OnParametersSetAsync()
 	{
 		try
 		{
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 3005dbe9..d8e1bd43 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -15,6 +15,7 @@ namespace Oqtane.Modules
     public abstract class ModuleBase : ComponentBase, IModuleControl
     {
         private Logger _logger;
+        private string _urlparametersstate;
         private Dictionary<string, string> _urlparameters;
 
         protected Logger logger => _logger ?? (_logger = new Logger(this));
@@ -49,14 +50,15 @@ namespace Oqtane.Modules
         public virtual List<Resource> Resources { get; set; }
 
         // url parameters
-        public virtual string RouteTemplate { get; set; }
+        public virtual string UrlParameterTemplate { get; set; }
 
         public Dictionary<string, string> UrlParameters {
             get
             {
-                if (_urlparameters == null)
+                if (_urlparametersstate == null || _urlparametersstate != PageState.UrlParameters)
                 {
-                    _urlparameters = GetUrlParameters(RouteTemplate);
+                    _urlparametersstate = PageState.UrlParameters;
+                    _urlparameters = GetUrlParameters(UrlParameterTemplate);
                 }
                 return _urlparameters;
             }
@@ -183,7 +185,7 @@ namespace Oqtane.Modules
         public virtual Dictionary<string, string> GetUrlParameters(string template = "")
         {
             var urlParameters = new Dictionary<string, string>();
-            var parameters = PageState.UrlParameters.Split('/', StringSplitOptions.RemoveEmptyEntries);
+            var parameters = _urlparametersstate.Split('/', StringSplitOptions.RemoveEmptyEntries);
 
             if (string.IsNullOrEmpty(template))
             {