kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make changes to make it more flexible for new filters

Browse source
This commit is contained in:
Clement Ho 2016-12-16 10:22:09 -06:00
parent fd90a99639
commit 9c48681412
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/filtered_search/dropdown_hint.js.es6
View file

@ -37,7 +37,7 @@
if (selected.tagName === 'LI') { if (selected.tagName === 'LI') {
if (selected.hasAttribute('data-value')) { if (selected.hasAttribute('data-value')) {
this.dismissDropdown(); this.dismissDropdown();
} else { } else {
const token = selected.querySelector('.js-filter-hint').innerText.trim(); const token = selected.querySelector('.js-filter-hint').innerText.trim();
const tag = selected.querySelector('.js-filter-tag').innerText.trim(); const tag = selected.querySelector('.js-filter-tag').innerText.trim();

12
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
View file

@ -101,7 +101,8 @@
const match = gl.FilteredSearchTokenKeys.searchByKeyParam(keyParam); const match = gl.FilteredSearchTokenKeys.searchByKeyParam(keyParam);
if (match) { if (match) {
const sanitizedKey = keyParam.slice(0, keyParam.indexOf('_')); const indexOf = keyParam.indexOf('_');
const sanitizedKey = indexOf !== -1 ? keyParam.slice(0, keyParam.indexOf('_')) : keyParam;
const symbol = match.symbol; const symbol = match.symbol;
let quotationsToUse = ''; let quotationsToUse = '';
@ -137,14 +138,19 @@
const { param } = gl.FilteredSearchTokenKeys.searchByKey(token.key); const { param } = gl.FilteredSearchTokenKeys.searchByKey(token.key);
let tokenPath = ''; let tokenPath = '';
let keyParam = token.key;
if (param) {
keyParam += `_${param}`;
}
if (token.wildcard && condition) { if (token.wildcard && condition) {
tokenPath = condition.url; tokenPath = condition.url;
} else if (token.wildcard) { } else if (token.wildcard) {
// wildcard means that the token does not have a symbol // wildcard means that the token does not have a symbol
tokenPath = `${token.key}_${param}=${encodeURIComponent(token.value)}`; tokenPath = `${keyParam}=${encodeURIComponent(token.value)}`;
} else { } else {
// Remove the token symbol // Remove the token symbol
tokenPath = `${token.key}_${param}=${encodeURIComponent(token.value.slice(1))}`; tokenPath = `${keyParam}=${encodeURIComponent(token.value.slice(1))}`;
} }
paths.push(tokenPath); paths.push(tokenPath);

10
app/assets/javascripts/filtered_search/filtered_search_token_keys.js.es6
View file

@ -57,7 +57,15 @@
} }
static searchByKeyParam(keyParam) { static searchByKeyParam(keyParam) {
return tokenKeys.find(tokenKey => keyParam === `${tokenKey.key}_${tokenKey.param}`) || null; return tokenKeys.find((tokenKey) => {
let tokenKeyParam = tokenKey.key;
if (tokenKey.param) {
tokenKeyParam += `_${tokenKey.param}`;
}
return keyParam === tokenKeyParam;
}) || null;
} }
static searchByConditionUrl(url) { static searchByConditionUrl(url) {

4
app/assets/stylesheets/framework/filters.scss
View file

@ -89,6 +89,10 @@
overflow-y: hidden; overflow-y: hidden;
border-radius: 0; border-radius: 0;
.fa {
width: 15px;
}
.dropdown-label-box { .dropdown-label-box {
border-color: $white-light; border-color: $white-light;
border-style: solid; border-style: solid;