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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
64d46a3e
Commit
64d46a3e
authored
Nov 30, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add logic for dynamically selecting which dropdown to load [skip ci]
parent
44187782
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
20 deletions
+72
-20
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
...avascripts/filtered_search/filtered_search_manager.js.es6
+45
-10
app/assets/javascripts/filtered_search/filtered_search_tokenizer.es6
...javascripts/filtered_search/filtered_search_tokenizer.es6
+26
-9
app/views/shared/issuable/_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+1
-1
No files found.
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
View file @
64d46a3e
...
@@ -77,42 +77,77 @@
...
@@ -77,42 +77,77 @@
}
}
}
}
let dropdownHint;
class FilteredSearchManager {
class FilteredSearchManager {
constructor() {
constructor() {
this.tokenizer = gl.FilteredSearchTokenizer;
this.tokenizer = gl.FilteredSearchTokenizer;
this.bindEvents();
this.bindEvents();
loadSearchParamsFromURL();
loadSearchParamsFromURL();
this.setDropdown();
}
}
static
fillInWord(word
) {
static
addWordToInput(word, addSpace
) {
const
originalValue = document.querySelector('.filtered-search').value
;
const
hasExistingValue = document.querySelector('.filtered-search').value.length !== 0
;
document.querySelector('.filtered-search').value
= `${originalValue} ${word.trim()}`
;
document.querySelector('.filtered-search').value
+= hasExistingValue && addSpace ? ` ${word}` : word
;
}
}
static loadDropdown(dropdownName
) {
loadDropdown(dropdownName = ''
) {
dropdownName = dropdownName.toLowerCase();
dropdownName = dropdownName.toLowerCase();
const match = gl.FilteredSearchTokenKeys.get().filter(value => value.key === dropdownName)[0];
const match = gl.FilteredSearchTokenKeys.get().filter(value => value.key === dropdownName)[0];
if (match) {
if (match
&& this.currentDropdown !== match.key
) {
console.log(`🦄 load ${match.key} dropdown`);
console.log(`🦄 load ${match.key} dropdown`);
this.currentDropdown = match.key;
} else if (!match && this.currentDropdown !== 'hint') {
console.log('🦄 load hint dropdown');
this.currentDropdown = 'hint';
if (!dropdownHint) {
dropdownHint = new gl.DropdownHint(document.querySelector('#js-dropdown-hint'), document.querySelector('.filtered-search'))
}
dropdownHint.render();
}
}
setDropdown() {
const { lastToken } = this.tokenizer.processTokens(document.querySelector('.filtered-search').value);
if (typeof lastToken === 'string') {
// Token is not fully initialized yet
// because it has no value
// Eg. token = 'label:'
const { tokenKey } = this.tokenizer.parseToken(lastToken);
this.loadDropdown(tokenKey);
} else if (lastToken.hasOwnProperty('key')) {
// Token has been initialized into an object
// because it has a value
this.loadDropdown(lastToken.key);
} else {
this.loadDropdown('hint');
}
}
}
}
bindEvents() {
bindEvents() {
const filteredSearchInput = document.querySelector('.filtered-search');
const filteredSearchInput = document.querySelector('.filtered-search');
filteredSearchInput.addEventListener('input', this.
processInput
.bind(this));
filteredSearchInput.addEventListener('input', this.
setDropdown
.bind(this));
filteredSearchInput.addEventListener('input', toggleClearSearchButton);
filteredSearchInput.addEventListener('input', toggleClearSearchButton);
filteredSearchInput.addEventListener('keydown', this.checkForEnter.bind(this));
filteredSearchInput.addEventListener('keydown', this.checkForEnter.bind(this));
document.querySelector('.clear-search').addEventListener('click', clearSearch);
document.querySelector('.clear-search').addEventListener('click', clearSearch);
}
}
// TODO: This is only used for testing, remove when going to PRO
checkDropdownToken(e) {
processInput(e) {
const input = e.target.value;
const input = e.target.value;
this.tokenizer.processTokens(input);
const { lastToken } = this.tokenizer.processTokens(input);
// Check for dropdown token
if (lastToken[lastToken.length - 1] === ':') {
const token = lastToken.slice(0, -1);
}
}
}
checkForEnter(e) {
checkForEnter(e) {
...
...
app/assets/javascripts/filtered_search/filtered_search_tokenizer.es6
View file @
64d46a3e
...
@@ -3,11 +3,30 @@
...
@@ -3,11 +3,30 @@
class FilteredSearchTokenizer {
class FilteredSearchTokenizer {
// TODO: Remove when going to pro
// TODO: Remove when going to pro
static printTokens(tokens, searchToken, lastToken) {
static printTokens(tokens, searchToken, lastToken) {
console.log('tokens:');
// console.log('tokens:');
tokens.forEach(token => console.log(token));
// tokens.forEach(token => console.log(token));
console.log(`search: ${searchToken}`);
// console.log(`search: ${searchToken}`);
console.log('last token:');
// console.log('last token:');
console.log(lastToken);
// console.log(lastToken);
}
static parseToken(input) {
const colonIndex = input.indexOf(':');
let tokenKey;
let tokenValue;
let tokenSymbol;
if (colonIndex !== -1) {
tokenKey = input.slice(0, colonIndex).toLowerCase();
tokenValue = input.slice(colonIndex + 1);
tokenSymbol = tokenValue[0];
}
return {
tokenKey,
tokenValue,
tokenSymbol,
}
}
}
static processTokens(input) {
static processTokens(input) {
...
@@ -43,10 +62,8 @@
...
@@ -43,10 +62,8 @@
const colonIndex = i.indexOf(':');
const colonIndex = i.indexOf(':');
if (colonIndex !== -1) {
if (colonIndex !== -1) {
const tokenKey = i.slice(0, colonIndex).toLowerCase();
const { tokenKey, tokenValue, tokenSymbol } = gl.FilteredSearchTokenizer.parseToken(i);
const tokenValue = i.slice(colonIndex + 1);
const tokenSymbol = tokenValue[0];
console.log(tokenSymbol)
const keyMatch = validTokenKeys.filter(v => v.key === tokenKey)[0];
const keyMatch = validTokenKeys.filter(v => v.key === tokenKey)[0];
const symbolMatch = validTokenKeys.filter(v => v.symbol === tokenSymbol)[0];
const symbolMatch = validTokenKeys.filter(v => v.symbol === tokenSymbol)[0];
...
...
app/views/shared/issuable/_search_bar.html.haml
View file @
64d46a3e
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
class:
"check_all_issues left"
class:
"check_all_issues left"
.issues-other-filters.filtered-search-container
.issues-other-filters.filtered-search-container
.filtered-search-input-container
.filtered-search-input-container
%input
.form-control.filtered-search
{
placeholder:
'Search or filter results...'
}
%input
.form-control.filtered-search
{
placeholder:
'Search or filter results...'
,
'data-id'
=>
'filtered-search'
}
=
icon
(
'filter'
)
=
icon
(
'filter'
)
%button
.clear-search.hidden
{
type:
'button'
}
%button
.clear-search.hidden
{
type:
'button'
}
=
icon
(
'times'
)
=
icon
(
'times'
)
...
...
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