fix: react extract incorrect resource from encoded pathname (#3126)

* fix: react extract incorrect resource from encoded pathname * fix: update changeset * fix: lint
refinedev · Dec 5, 2022 · ccaf8bd · ccaf8bd
1 parent 365c3ed
commit ccaf8bd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.changeset/warm-peas-report.md b/.changeset/warm-peas-report.md
@@ -0,0 +1,6 @@
+---
+"@pankod/refine-react-location": patch
+"@pankod/refine-react-router-v6": patch
+---
+
+fix: react extract incorrect resource from encoded pathname
diff --git a/packages/react-location/src/index.ts b/packages/react-location/src/index.ts
@@ -68,9 +68,9 @@ const RouterProvider: IReactRouterProvider = {
             resource:
                 Object.keys(match.params).length === 0
                     ? pathname.current.pathname.substring(1)
-                    : pathname.current.pathname
-                          .substring(1)
-                          .replace(paramsString, ""),
+                    : decodeURIComponent(
+                          pathname.current.pathname.substring(1),
+                      ).replace(paramsString, ""),
         });
     },
     Prompt,

diff --git a/packages/react-router-v6/src/index.ts b/packages/react-router-v6/src/index.ts
@@ -54,7 +54,10 @@ const RouterProvider: IReactRouterProvider = {
             resource:
                 Object.keys(params).length === 0
                     ? pathname.substring(1)
-                    : pathname.substring(1).replace(paramsString, ""),
+                    : decodeURIComponent(pathname.substring(1)).replace(
+                          paramsString,
+                          "",
+                      ),
         });
     },
     Prompt: Prompt as any,