Decode wiki route

Tavenem · Feb 21, 2024 · e8c52b9 · e8c52b9
1 parent 440ee5a
commit e8c52b9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,6 +1,6 @@
 name: publish
 env:
-  VERSION: '0.7.7-preview'
+  VERSION: '0.7.8-preview'
   PRERELEASE: true
 on:
   push:

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.7.8-preview
+### Fixed
+- Decode wiki route
+
 ## 0.7.5-7-preview
 ### Updated
 - Update dependencies

diff --git a/src/Client/Tavenem.Wiki.Blazor.Client.csproj b/src/Client/Tavenem.Wiki.Blazor.Client.csproj
@@ -53,7 +53,7 @@
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="Tavenem.Blazor.Framework" Version="2.20.6" />
-    <PackageReference Include="Tavenem.Wiki" Version="0.24.3-preview" />
+    <PackageReference Include="Tavenem.Wiki" Version="0.24.4-preview" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/Client/Wiki.razor.cs b/src/Client/Wiki.razor.cs
@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.JSInterop;
 using System.Text;
+using System.Web;
 using Tavenem.Blazor.Framework;
 using Tavenem.Wiki.Blazor.Client.Shared;
 
@@ -420,7 +421,7 @@ protected override async Task RefreshAsync()
     {
         if (string.IsNullOrEmpty(input))
         {
-            return Enumerable.Empty<KeyValuePair<string, object>>();
+            return [];
         }
 
         var suggestions = await FetchDataAsync(
@@ -431,7 +432,7 @@ protected override async Task RefreshAsync()
                 user,
                 input));
         return suggestions?.Select(x => new KeyValuePair<string, object>(x, x))
-            ?? Enumerable.Empty<KeyValuePair<string, object>>();
+            ?? [];
     }
 
     private async Task GetWikiItemAsync()
@@ -682,9 +683,11 @@ private void SetRoute()
             index = Route.IndexOf('#');
             if (index != -1)
             {
-                Fragment = Route[(index + 1)..];
+                Fragment = HttpUtility.UrlDecode(Route[(index + 1)..]);
                 Route = Route[..index];
             }
+
+            Route = HttpUtility.UrlDecode(Route);
         }
     }