fix: issues with routes prefixed with /admin/store to break (#103)

* fix issue with paths being replaced, causing issues with route /admin/store * chore: cleanup
adrien2p · Jul 27, 2022 · f913ae5 · f913ae5
1 parent fca67d1
commit f913ae5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 28 deletions.
diff --git a/src/loaders/admin-api.loader.ts b/src/loaders/admin-api.loader.ts
@@ -18,26 +18,18 @@ export async function adminApiLoader(
 	const adminMiddlewares = middlewares
 		.map((middleware) => ({
 			...middleware,
-			routes: middleware.routes.filter((route) => {
-				if (route.path.startsWith('/admin')) {
-					route.path = route.path.replace('/admin', '');
-					return true;
-				}
-				return false;
-			}),
+			routes: middleware.routes
+				.filter((route) => route.path.startsWith('/admin'))
+				.map((route) => ({ ...route, path: route.path.replace('/admin', '') })),
 		}))
 		.filter((middleware) => middleware.routes.length);
 
 	const adminRouters = routers
 		.map((router) => ({
 			...router,
-			routes: router.routes.filter((route) => {
-				if (route.path.startsWith('/admin')) {
-					route.path = route.path.replace('/admin', '');
-					return true;
-				}
-				return false;
-			}),
+			routes: router.routes
+				.filter((route) => route.path.startsWith('/admin'))
+				.map((route) => ({ ...route, path: route.path.replace('/admin', '') })),
 		}))
 		.filter((route) => route.routes.length);
 

diff --git a/src/loaders/store-api.loader.ts b/src/loaders/store-api.loader.ts
@@ -18,26 +18,18 @@ export async function storeApiLoader(
 	const storeMiddlewares = middlewares
 		.map((middleware) => ({
 			...middleware,
-			routes: middleware.routes.filter((route) => {
-				if (route.path.startsWith('/store')) {
-					route.path = route.path.replace('/store', '');
-					return true;
-				}
-				return false;
-			}),
+			routes: middleware.routes
+				.filter((route) => route.path.startsWith('/store'))
+				.map((route) => ({ ...route, path: route.path.replace('/store', '') })),
 		}))
 		.filter((middleware) => middleware.routes.length);
 
 	const storeRouters = routers
 		.map((router) => ({
 			...router,
-			routes: router.routes.filter((route) => {
-				if (route.path.startsWith('/store')) {
-					route.path = route.path.replace('/store', '');
-					return true;
-				}
-				return false;
-			}),
+			routes: router.routes
+				.filter((route) => route.path.startsWith('/store'))
+				.map((route) => ({ ...route, path: route.path.replace('/store', '') })),
 		}))
 		.filter((route) => route.routes.length);