Commit 15454eb5 authored by Clement Ho's avatar Clement Ho

Add ability to search for filter dropdowns without filter symbol

parent 158e90d1
...@@ -23,6 +23,21 @@ ...@@ -23,6 +23,21 @@
super.renderContent(); super.renderContent();
droplab.setData(this.hookId, '/autocomplete/users.json?search=&per_page=20&active=true&project_id=2&group_id=&skip_ldap=&todo_filter=&todo_state_filter=&current_user=true&push_code_to_protected_branches=&author_id=&skip_users='); droplab.setData(this.hookId, '/autocomplete/users.json?search=&per_page=20&active=true&project_id=2&group_id=&skip_ldap=&todo_filter=&todo_state_filter=&current_user=true&push_code_to_protected_branches=&author_id=&skip_users=');
} }
filterMethod(item, query) {
const { value } = gl.FilteredSearchTokenizer.getLastTokenObject(query);
const valueWithoutColon = value.slice(1).toLowerCase();
const valueWithoutPrefix = valueWithoutColon.slice(1);
const username = item.username.toLowerCase();
const name = item.name.toLowerCase();
const noUsernameMatch = username.indexOf(valueWithoutPrefix) === -1 && username.indexOf(valueWithoutColon) === -1;
const noNameMatch = name.indexOf(valueWithoutColon) === -1;
item.droplab_hidden = noUsernameMatch && noNameMatch;
return item;
}
} }
global.DropdownAssignee = DropdownAssignee; global.DropdownAssignee = DropdownAssignee;
......
...@@ -22,9 +22,16 @@ ...@@ -22,9 +22,16 @@
filterMethod(item, query) { filterMethod(item, query) {
const { value } = gl.FilteredSearchTokenizer.getLastTokenObject(query); const { value } = gl.FilteredSearchTokenizer.getLastTokenObject(query);
const valueWithoutPrefix = value.slice(1); const valueWithoutColon = value.slice(1).toLowerCase();
const valueWithoutPrefix = valueWithoutColon.slice(1);
item.droplab_hidden = item['username'].indexOf(valueWithoutPrefix) === -1; const username = item.username.toLowerCase();
const name = item.name.toLowerCase();
const noUsernameMatch = username.indexOf(valueWithoutPrefix) === -1 && username.indexOf(valueWithoutColon) === -1;
const noNameMatch = name.indexOf(valueWithoutColon) === -1;
item.droplab_hidden = noUsernameMatch && noNameMatch;
return item; return item;
} }
} }
......
...@@ -27,9 +27,13 @@ ...@@ -27,9 +27,13 @@
filterMethod(item, query) { filterMethod(item, query) {
const { value } = gl.FilteredSearchTokenizer.getLastTokenObject(query); const { value } = gl.FilteredSearchTokenizer.getLastTokenObject(query);
const valueWithoutPrefix = value.slice(1); const valueWithoutColon = value.slice(1).toLowerCase();
const valueWithoutPrefix = valueWithoutColon.slice(1);
item.droplab_hidden = item['title'].indexOf(valueWithoutPrefix) === -1; const title = item.title.toLowerCase();
const noTitleMatch = title.indexOf(valueWithoutPrefix) === -1 && title.indexOf(valueWithoutColon) === -1;
item.droplab_hidden = noTitleMatch;
return item; return item;
} }
} }
......
...@@ -27,9 +27,14 @@ ...@@ -27,9 +27,14 @@
filterMethod(item, query) { filterMethod(item, query) {
const { value } = gl.FilteredSearchTokenizer.getLastTokenObject(query); const { value } = gl.FilteredSearchTokenizer.getLastTokenObject(query);
const valueWithoutPrefix = value.slice(1); const valueWithoutColon = value.slice(1).toLowerCase();
const valueWithoutPrefix = valueWithoutColon.slice(1);
item.droplab_hidden = item['title'].indexOf(valueWithoutPrefix) === -1; const title = item.title.toLowerCase();
const noTitleMatch = title.indexOf(valueWithoutPrefix) === -1 && title.indexOf(valueWithoutColon) === -1;
item.droplab_hidden = noTitleMatch;
return item; return item;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment