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
329b03b3
Commit
329b03b3
authored
Nov 14, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add token symbol matching
parent
01eb0571
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
6 deletions
+58
-6
filtered_search_manager.js.es6
...avascripts/filtered_search/filtered_search_manager.js.es6
+51
-3
filtered_search_tokenizer.es6
...javascripts/filtered_search/filtered_search_tokenizer.es6
+7
-3
No files found.
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
View file @
329b03b3
...
@@ -4,18 +4,37 @@
...
@@ -4,18 +4,37 @@
key: 'author',
key: 'author',
type: 'string',
type: 'string',
param: 'username',
param: 'username',
symbol: '@',
}, {
}, {
key: 'assignee',
key: 'assignee',
type: 'string',
type: 'string',
param: 'username',
param: 'username',
symbol: '@',
conditions: [{
keyword: 'none',
url: 'assignee_id=0',
}]
}, {
}, {
key: 'milestone',
key: 'milestone',
type: 'string',
type: 'string',
param: 'title',
param: 'title',
symbol: '%',
conditions: [{
keyword: 'none',
url: 'milestone_title=No+Milestone',
}, {
keyword: 'upcoming',
url: 'milestone_title=%23upcoming',
}]
}, {
}, {
key: 'label',
key: 'label',
type: 'array',
type: 'array',
param: 'name[]',
param: 'name[]',
symbol: '~',
conditions: [{
keyword: 'none',
url: 'label_name[]=No+Label',
}]
}];
}];
function clearSearch(e) {
function clearSearch(e) {
...
@@ -47,6 +66,18 @@
...
@@ -47,6 +66,18 @@
const key = decodeURIComponent(split[0]);
const key = decodeURIComponent(split[0]);
const value = split[1];
const value = split[1];
// Check if it matches edge conditions listed in validTokenKeys
let conditionIndex = 0;
const validCondition = validTokenKeys.filter(v => v.conditions && v.conditions.filter((c, index) => {
if (c.url === p) {
conditionIndex = index;
}
return c.url === p;
})[0])[0];
if (validCondition) {
inputValue += `${validCondition.key}:${validCondition.conditions[conditionIndex].keyword}`;
} else {
// Sanitize value since URL converts spaces into +
// Sanitize value since URL converts spaces into +
// Replace before decode so that we know what was originally + versus the encoded +
// Replace before decode so that we know what was originally + versus the encoded +
const sanitizedValue = value ? decodeURIComponent(value.replace(/[+]/g, ' ')) : value;
const sanitizedValue = value ? decodeURIComponent(value.replace(/[+]/g, ' ')) : value;
...
@@ -55,6 +86,7 @@
...
@@ -55,6 +86,7 @@
if (match) {
if (match) {
const sanitizedKey = key.slice(0, key.indexOf('_'));
const sanitizedKey = key.slice(0, key.indexOf('_'));
const valueHasSpace = sanitizedValue.indexOf(' ') !== -1;
const valueHasSpace = sanitizedValue.indexOf(' ') !== -1;
const symbol = match.symbol;
const preferredQuotations = '"';
const preferredQuotations = '"';
let quotationsToUse = preferredQuotations;
let quotationsToUse = preferredQuotations;
...
@@ -64,12 +96,13 @@
...
@@ -64,12 +96,13 @@
quotationsToUse = sanitizedValue.indexOf(preferredQuotations) === -1 ? preferredQuotations : '\'';
quotationsToUse = sanitizedValue.indexOf(preferredQuotations) === -1 ? preferredQuotations : '\'';
}
}
inputValue += valueHasSpace ? `${sanitizedKey}:${quotationsToUse}${sanitizedValue}${quotationsToUse}` : `${sanitizedKey}:
${sanitizedValue}`;
inputValue += valueHasSpace ? `${sanitizedKey}:${symbol}${quotationsToUse}${sanitizedValue}${quotationsToUse}` : `${sanitizedKey}:${symbol}
${sanitizedValue}`;
inputValue += ' ';
inputValue += ' ';
} else if (!match && key === 'search') {
} else if (!match && key === 'search') {
inputValue += sanitizedValue;
inputValue += sanitizedValue;
inputValue += ' ';
inputValue += ' ';
}
}
}
});
});
// Trim the last space value
// Trim the last space value
...
@@ -133,8 +166,23 @@
...
@@ -133,8 +166,23 @@
path += `&state=${currentState}`;
path += `&state=${currentState}`;
tokens.forEach((token) => {
tokens.forEach((token) => {
const param = validTokenKeys.filter(t => t.key === token.key)[0].param;
const match = validTokenKeys.filter(t => t.key === token.key)[0];
path += `&${token.key}_${param}=${encodeURIComponent(token.value)}`;
let tokenPath = '';
if (token.wildcard && match.conditions) {
const condition = match.conditions.filter(c => c.keyword === token.value.toLowerCase())[0];
if (condition) {
tokenPath = `${condition.url}`;
}
} else if (!token.wildcard) {
// Remove the wildcard token
tokenPath = `${token.key}_${match.param}=${encodeURIComponent(token.value.slice(1))}`;
} else {
tokenPath = `${token.key}_${match.param}=${encodeURIComponent(token.value)}`;
}
path += `&${tokenPath}`;
});
});
if (searchToken) {
if (searchToken) {
...
...
app/assets/javascripts/filtered_search/filtered_search_tokenizer.es6
View file @
329b03b3
...
@@ -57,7 +57,10 @@
...
@@ -57,7 +57,10 @@
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 = this.validTokenKeys.filter(v => v.key === tokenKey)[0];
const tokenSymbol = tokenValue[0];
console.log(tokenSymbol)
const keyMatch = this.validTokenKeys.filter(v => v.key === tokenKey)[0];
const symbolMatch = this.validTokenKeys.filter(v => v.symbol === tokenSymbol)[0];
if (tokenValue.indexOf('"') !== -1) {
if (tokenValue.indexOf('"') !== -1) {
lastQuotation = '"';
lastQuotation = '"';
...
@@ -67,10 +70,11 @@
...
@@ -67,10 +70,11 @@
incompleteToken = true;
incompleteToken = true;
}
}
if (
m
atch && tokenValue.length > 0) {
if (
keyM
atch && tokenValue.length > 0) {
this.tokens.push({
this.tokens.push({
key:
m
atch.key,
key:
keyM
atch.key,
value: tokenValue,
value: tokenValue,
wildcard: symbolMatch ? false : true,
});
});
return;
return;
...
...
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