AB#46862: Refactor route filtering logic (#425)

HSLdevcom · Nov 18, 2024 · 07d2fa5 · 07d2fa5
1 parent 83f0e6b
commit 07d2fa5
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/util/domain.js b/src/util/domain.js
@@ -296,16 +296,19 @@ function routeGeneralizer(routes) {
 function filterRoute(props) {
   const { filter } = props;
   const { routeId } = props;
+  const routeIdParsed = trimRouteId(routeId);
   if (!filter) {
     return true;
   }
-  for (let i = 0; i < filter.length; i++) {
-    const char = filter[i];
-    if (char !== '*' && char === routeId[i]) {
-      return false;
+
+  const filteredRoutes = filter.split(',').map(routeIdToFilter => routeIdToFilter.trim());
+  let routeMatchesFilter = false;
+  filteredRoutes.forEach(filterRouteId => {
+    if (routeId.includes(filterRouteId) && filterRouteId === routeIdParsed) {
+      routeMatchesFilter = true;
     }
-  }
-  return true;
+  });
+  return !routeMatchesFilter;
 }
 
 export {