From e0ccdbdcef0d7d905e7aea70bf31fa280d8aa701 Mon Sep 17 00:00:00 2001 From: Stephen Salinas Date: Wed, 11 May 2016 15:38:44 -0400 Subject: [PATCH] glob should behave as if ending in * for better results --- SingularityUI/app/views/requests.coffee | 4 ++-- SingularityUI/app/views/tasks.coffee | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SingularityUI/app/views/requests.coffee b/SingularityUI/app/views/requests.coffee index bc19aabeb3..b3ac149cf5 100644 --- 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 index 6e865b3dfe..5d9da3c456 100644 --- 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)