Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
71 additions
and
85 deletions
+71
-85
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
...avascripts/filtered_search/filtered_search_manager.js.es6
+71
-85
No files found.
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
View file @
f1574e45
/* eslint-disable no-param-reassign */
((global) => {
((global) => {
const TOKEN_TYPE_STRING = 'string';
const TOKEN_TYPE_ARRAY = 'array';
const validTokenKeys = [{
const validTokenKeys = [{
key: 'author',
key: 'author',
type: 'string',
type: 'string',
param: 'username',
param: 'username',
},{
},
{
key: 'assignee',
key: 'assignee',
type: 'string',
type: 'string',
param: 'username',
param: 'username',
},{
},
{
key: 'milestone',
key: 'milestone',
type: 'string',
type: 'string',
param: 'title',
param: 'title',
},{
},
{
key: 'label',
key: 'label',
type: 'array',
type: 'array',
param: 'name[]',
param: 'name[]',
},];
}];
function toggleClearSearchButton(event) {
const clearSearch = document.querySelector('.clear-search');
if (event.target.value) {
clearSearch.classList.remove('hidden');
} else {
clearSearch.classList.add('hidden');
}
}
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('&');
let inputValue = '';
params.forEach((p) => {
const split = p.split('=');
const key = decodeURIComponent(split[0]);
const value = split[1];
// 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 => key === `${t.key}_${t.param}`);
if (match) {
const sanitizedKey = key.slice(0, key.indexOf('_'));
const valueHasSpace = sanitizedValue.indexOf(' ') !== -1;
const preferredQuotations = '"';
let quotationsToUse = preferredQuotations;
if (valueHasSpace) {
// Prefer ", but use ' if required
quotationsToUse = sanitizedValue.indexOf(preferredQuotations) === -1 ? preferredQuotations : '\'';
}
inputValue += valueHasSpace ? `${sanitizedKey}:${quotationsToUse}${sanitizedValue}${quotationsToUse}` : `${sanitizedKey}:${sanitizedValue}`;
inputValue += ' ';
} else if (!match && key === 'search') {
inputValue += sanitizedValue;
inputValue += ' ';
}
});
// Trim the last space value
document.querySelector('.filtered-search').value = inputValue.trim();
if (inputValue.trim()) {
document.querySelector('.clear-search').classList.remove('hidden');
}
}
class FilteredSearchManager {
class FilteredSearchManager {
constructor() {
constructor() {
this.bindEvents();
this.bindEvents();
this.
loadSearchParamsFromURL();
loadSearchParamsFromURL();
this.clearTokens();
this.clearTokens();
}
}
...
@@ -32,7 +84,7 @@
...
@@ -32,7 +84,7 @@
const clearSearch = document.querySelector('.clear-search');
const clearSearch = document.querySelector('.clear-search');
input.addEventListener('input', this.tokenize.bind(this));
input.addEventListener('input', this.tokenize.bind(this));
input.addEventListener('input', t
his.t
oggleClearSearchButton);
input.addEventListener('input', toggleClearSearchButton);
input.addEventListener('keydown', this.checkForEnter.bind(this));
input.addEventListener('keydown', this.checkForEnter.bind(this));
clearSearch.addEventListener('click', this.clearSearch.bind(this));
clearSearch.addEventListener('click', this.clearSearch.bind(this));
...
@@ -52,64 +104,6 @@
...
@@ -52,64 +104,6 @@
this.searchToken = '';
this.searchToken = '';
}
}
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('&');
let inputValue = '';
params.forEach((p) => {
const split = p.split('=');
const key = decodeURIComponent(split[0]);
const value = split[1];
// 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}`;
});
if (match) {
const sanitizedKey = key.slice(0, key.indexOf('_'));
const valueHasSpace = sanitizedValue.indexOf(' ') !== -1;
const preferredQuotations = '"';
let quotationsToUse = preferredQuotations;
if (valueHasSpace) {
// Prefer ", but use ' if required
quotationsToUse = sanitizedValue.indexOf(preferredQuotations) === -1 ? preferredQuotations : '\'';
}
inputValue += valueHasSpace ? `${sanitizedKey}:${quotationsToUse}${sanitizedValue}${quotationsToUse}` : `${sanitizedKey}:${sanitizedValue}`;
inputValue += ' ';
} else if (!match && key === 'search') {
inputValue += sanitizedValue;
inputValue += ' ';
}
});
// Trim the last space value
document.querySelector('.filtered-search').value = inputValue.trim();
if (inputValue.trim()) {
document.querySelector('.clear-search').classList.remove('hidden');
}
}
toggleClearSearchButton(event) {
const clearSearch = document.querySelector('.clear-search');
if (event.target.value) {
clearSearch.classList.remove('hidden');
} else {
clearSearch.classList.add('hidden');
}
}
tokenize(event) {
tokenize(event) {
// Re-calculate tokens
// Re-calculate tokens
this.clearTokens();
this.clearTokens();
...
@@ -121,8 +115,9 @@
...
@@ -121,8 +115,9 @@
let incompleteToken = false;
let incompleteToken = false;
const addSearchTerm = function addSearchTerm(term) {
const addSearchTerm = function addSearchTerm(term) {
searchTerms += term + ' ';
// Add space for next term
}
searchTerms += `${term} `;
};
inputs.forEach((i) => {
inputs.forEach((i) => {
if (incompleteToken) {
if (incompleteToken) {
...
@@ -147,10 +142,7 @@
...
@@ -147,10 +142,7 @@
if (colonIndex !== -1) {
if (colonIndex !== -1) {
const tokenKey = i.slice(0, colonIndex).toLowerCase();
const tokenKey = i.slice(0, colonIndex).toLowerCase();
const tokenValue = i.slice(colonIndex + 1);
const tokenValue = i.slice(colonIndex + 1);
const match = validTokenKeys.find(v => v.key === tokenKey);
const match = validTokenKeys.find((v) => {
return v.key === tokenKey;
});
if (tokenValue.indexOf('"') !== -1) {
if (tokenValue.indexOf('"') !== -1) {
lastQuotation = '"';
lastQuotation = '"';
...
@@ -178,11 +170,9 @@
...
@@ -178,11 +170,9 @@
}
}
printTokens() {
printTokens() {
console.log('tokens:')
console.log('tokens:');
this.tokens.forEach((token) => {
this.tokens.forEach(token => console.log(token));
console.log(token);
console.log(`search: ${this.searchToken}`);
})
console.log('search: ' + this.searchToken);
}
}
checkForEnter(event) {
checkForEnter(event) {
...
@@ -210,18 +200,14 @@
...
@@ -210,18 +200,14 @@
currentState = separatorIndex === -1 ? remaining : remaining.slice(0, separatorIndex);
currentState = separatorIndex === -1 ? remaining : remaining.slice(0, separatorIndex);
}
}
path += `&state=${currentState}`
path += `&state=${currentState}`;
this.tokens.forEach((token) => {
this.tokens.forEach((token) => {
const param = validTokenKeys.find((t) => {
const param = validTokenKeys.find(t => t.key === token.key).param;
return t.key === token.key;
}).param;
path += `&${token.key}_${param}=${encodeURIComponent(token.value)}`;
path += `&${token.key}_${param}=${encodeURIComponent(token.value)}`;
});
});
if (this.searchToken) {
if (this.searchToken) {
path +=
'&search=' + encodeURIComponent(this.searchToken)
;
path +=
`&search=${encodeURIComponent(this.searchToken)}`
;
}
}
window.location = path;
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