BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f1574e45
Commit
f1574e45
authored
Nov 09, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ESLint errors
parent
fe4d33cf
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
49 additions
and
63 deletions
+49
-63
filtered_search_manager.js.es6
...avascripts/filtered_search/filtered_search_manager.js.es6
+49
-63
No files found.
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
View file @
f1574e45
/* eslint-disable no-param-reassign */
((global) => {
const TOKEN_TYPE_STRING = 'string';
const TOKEN_TYPE_ARRAY = 'array';
const validTokenKeys = [{
key: 'author',
type: 'string',
param: 'username',
},{
},
{
key: 'assignee',
type: 'string',
param: 'username',
},{
},
{
key: 'milestone',
type: 'string',
param: 'title',
},{
},
{
key: 'label',
type: 'array',
param: 'name[]',
}
,
];
}];
class FilteredSearchManager {
constructor() {
this.bindEvents();
this.loadSearchParamsFromURL();
this.clearTokens();
}
bindEvents() {
const input = document.querySelector('.filtered-search');
function toggleClearSearchButton(event) {
const clearSearch = document.querySelector('.clear-search');
input.addEventListener('input', this.tokenize.bind(this));
input.addEventListener('input', this.toggleClearSearchButton);
input.addEventListener('keydown', this.checkForEnter.bind(this));
clearSearch.addEventListener('click', this.clearSearch.bind(this));
}
clearSearch(event) {
event.stopPropagation();
event.preventDefault();
this.clearTokens();
document.querySelector('.filtered-search').value = '';
document.querySelector('.clear-search').classList.add('hidden');
if (event.target.value) {
clearSearch.classList.remove('hidden');
} else {
clearSearch.classList.add('hidden');
}
clearTokens() {
this.tokens = [];
this.searchToken = '';
}
loadSearchParamsFromURL() {
function
loadSearchParamsFromURL() {
// We can trust that each param has one & since values containing & will be encoded
// Remove the first character of search as it is always ?
const params = window.location.search.slice(1).split('&');
...
...
@@ -66,10 +42,7 @@
// Sanitize value since URL converts spaces into +
// Replace before decode so that we know what was originally + versus the encoded +
const sanitizedValue = value ? decodeURIComponent(value.replace(/[+]/g, ' ')) : value;
const match = validTokenKeys.find((t) => {
return key === `${t.key}_${t.param}`;
});
const match = validTokenKeys.find(t => key === `${t.key}_${t.param}`);
if (match) {
const sanitizedKey = key.slice(0, key.indexOf('_'));
...
...
@@ -85,7 +58,6 @@
inputValue += valueHasSpace ? `${sanitizedKey}:${quotationsToUse}${sanitizedValue}${quotationsToUse}` : `${sanitizedKey}:${sanitizedValue}`;
inputValue += ' ';
} else if (!match && key === 'search') {
inputValue += sanitizedValue;
inputValue += ' ';
...
...
@@ -100,14 +72,36 @@
}
}
toggleClearSearchButton(event) {
class FilteredSearchManager {
constructor() {
this.bindEvents();
loadSearchParamsFromURL();
this.clearTokens();
}
bindEvents() {
const input = document.querySelector('.filtered-search');
const clearSearch = document.querySelector('.clear-search');
if (event.target.value) {
clearSearch.classList.remove('hidden');
} else {
clearSearch.classList.add('hidden');
input.addEventListener('input', this.tokenize.bind(this));
input.addEventListener('input', toggleClearSearchButton);
input.addEventListener('keydown', this.checkForEnter.bind(this));
clearSearch.addEventListener('click', this.clearSearch.bind(this));
}
clearSearch(event) {
event.stopPropagation();
event.preventDefault();
this.clearTokens();
document.querySelector('.filtered-search').value = '';
document.querySelector('.clear-search').classList.add('hidden');
}
clearTokens() {
this.tokens = [];
this.searchToken = '';
}
tokenize(event) {
...
...
@@ -121,8 +115,9 @@
let incompleteToken = false;
const addSearchTerm = function addSearchTerm(term) {
searchTerms += term + ' ';
}
// Add space for next term
searchTerms += `${term} `;
};
inputs.forEach((i) => {
if (incompleteToken) {
...
...
@@ -147,10 +142,7 @@
if (colonIndex !== -1) {
const tokenKey = i.slice(0, colonIndex).toLowerCase();
const tokenValue = i.slice(colonIndex + 1);
const match = validTokenKeys.find((v) => {
return v.key === tokenKey;
});
const match = validTokenKeys.find(v => v.key === tokenKey);
if (tokenValue.indexOf('"') !== -1) {
lastQuotation = '"';
...
...
@@ -178,11 +170,9 @@
}
printTokens() {
console.log('tokens:')
this.tokens.forEach((token) => {
console.log(token);
})
console.log('search: ' + this.searchToken);
console.log('tokens:');
this.tokens.forEach(token => console.log(token));
console.log(`search: ${this.searchToken}`);
}
checkForEnter(event) {
...
...
@@ -210,18 +200,14 @@
currentState = separatorIndex === -1 ? remaining : remaining.slice(0, separatorIndex);
}
path += `&state=${currentState}`
path += `&state=${currentState}`;
this.tokens.forEach((token) => {
const param = validTokenKeys.find((t) => {
return t.key === token.key;
}).param;
const param = validTokenKeys.find(t => t.key === token.key).param;
path += `&${token.key}_${param}=${encodeURIComponent(token.value)}`;
});
if (this.searchToken) {
path +=
'&search=' + encodeURIComponent(this.searchToken)
;
path +=
`&search=${encodeURIComponent(this.searchToken)}`
;
}
window.location = path;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment