Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve topic in search_suggestion.js. 

Also added some additional testing to handle
some edge cases that I'd like to make sure
don't break down.
This commit is contained in:
Cory Lynch 2017-06-03 16:54:35 -04:00 committed by Tim Abbott
parent 7cda7c4782
commit a7ec8cd1f3
2 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frontend_tests/node_tests/search_suggestion.js
View File

@ -589,6 +589,32 @@ init();
'stream:office -topic:test',
];
assert.deepEqual(suggestions.strings, expected);
suggestions = search.get_suggestions('is:alerted stream:devel is:starred topic:');
expected = [
'is:alerted stream:devel is:starred topic:',
'is:alerted stream:devel is:starred topic:REXX',
'is:alerted stream:devel is:starred',
'is:alerted stream:devel',
'is:alerted',
];
assert.deepEqual(suggestions.strings, expected);
suggestions = search.get_suggestions('is:private stream:devel topic:');
expected = [
'is:private stream:devel topic:',
'is:private stream:devel',
'is:private',
];
assert.deepEqual(suggestions.strings, expected);
suggestions = search.get_suggestions('topic:REXX stream:devel topic:');
expected = [
'topic:REXX stream:devel topic:',
'topic:REXX stream:devel',
'topic:REXX',
];
assert.deepEqual(suggestions.strings, expected);
}());
(function test_whitespace_glitch() {

42
static/js/search_suggestion.js
View File

@ -231,18 +231,28 @@ function get_default_suggestion(operators) {
return {description: description, search_string: search_string};
}
function get_topic_suggestions(query_operators) {
if (query_operators.length === 0) {
function get_topic_suggestions(last, operators) {
if (last.operator === '') {
return [];
}
var last_term = query_operators.slice(-1)[0];
var operator = Filter.canonicalize_operator(last_term.operator);
var operand = last_term.operand;
var negated = (operator === 'topic') && (last_term.negated);
var invalid = [
{operator: 'pm-with'},
{operator: 'is', operand: 'private'},
{operator: 'topic'},
];
if (match_criteria(operators, invalid)) {
return [];
}
var operator = Filter.canonicalize_operator(last.operator);
var operand = last.operand;
var negated = (operator === 'topic') && (last.negated);
var stream;
var guess;
var filter;
var filter = new Filter(operators);
var suggest_operators = [];
// stream:Rome -> show all Rome topics
// stream:Rome topic: -> show all Rome topics
@ -261,26 +271,18 @@ function get_topic_suggestions(query_operators) {
// i.e. "foo" and "search:foo" both become [{operator: 'search', operand: 'foo'}].
switch (operator) {
case 'stream':
filter = new Filter(query_operators);
if (filter.has_operator('topic')) {
return [];
}
guess = '';
stream = operand;
suggest_operators.push(last);
break;
case 'topic':
case 'search':
guess = operand;
query_operators = query_operators.slice(0, -1);
filter = new Filter(query_operators);
if (filter.has_operator('topic')) {
return [];
}
if (filter.has_operator('stream')) {
stream = filter.operands('stream')[0];
} else {
stream = narrow_state.stream();
query_operators.push({operator: 'stream', operand: stream});
suggest_operators.push({operator: 'stream', operand: stream});
}
break;
default:
@ -323,7 +325,7 @@ function get_topic_suggestions(query_operators) {
return _.map(topics, function (topic) {
var topic_term = {operator: 'topic', operand: topic, negated: negated};
var operators = query_operators.concat([topic_term]);
var operators = suggest_operators.concat([topic_term]);
var search_string = Filter.unparse(operators);
var description = Filter.describe(operators);
return {description: description, search_string: search_string};
@ -516,8 +518,8 @@ exports.get_suggestions = function (query) {
suggestions = get_group_suggestions(persons, last, base_operators);
attach_suggestions(result, base, suggestions);
suggestions = get_topic_suggestions(operators);
result = result.concat(suggestions);
suggestions = get_topic_suggestions(last, base_operators);
attach_suggestions(result, base, suggestions);
suggestions = get_operator_subset_suggestions(operators);
result = result.concat(suggestions);