glob should behave as if ending in * for better results

HubSpot · May 11, 2016 · e0ccdbd · e0ccdbd
1 parent c862700
commit e0ccdbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/SingularityUI/app/views/requests.coffee b/SingularityUI/app/views/requests.coffee
@@ -68,9 +68,9 @@ class RequestsView extends View
                 o.requestDeployState?.activeDeploy?.user or ''
         if Utils.isGlobFilter filter
             res1 = requests.filter (request) =>
-                micromatch.any id.extract(request), filter
+                micromatch.any id.extract(request), filter + '*'
             res2 = requests.filter (request) =>
-                micromatch.any user.extract(request), filter
+                micromatch.any user.extract(request), filter + '*'
             _.uniq(_.union(res2, res1)).reverse()
         else
             res1 = fuzzy.filter(filter, requests, id)

diff --git a/SingularityUI/app/views/tasks.coffee b/SingularityUI/app/views/tasks.coffee
@@ -71,11 +71,11 @@ class TasksView extends View
                 "#{o.rackId}"
         if Utils.isGlobFilter filter
             res1 = tasks.filter (task) =>
-                micromatch.any host.extract(task), filter
+                micromatch.any host.extract(task), filter + '*'
             res2 = tasks.filter (task) =>
-                micromatch.any id.extract(task), filter
+                micromatch.any id.extract(task), filter + '*'
             res3 = tasks.filter (task) =>
-                micromatch.any rack.extract(task), filter
+                micromatch.any rack.extract(task), filter + '*'
             _.uniq(_.union(res3, _.union(res1, res2))).reverse()
         else
             res1 = fuzzy.filter(filter, tasks, host)