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

search: Add format_as_suggestion to search_suggestions.js. 

`format_as_suggestion` formats a list of operators into a
suggestion using the Filter.describe and Filter.unparse methods.
This change aims to increase readability.
This commit is contained in:
Shubham Padia 2018-06-01 19:29:17 +05:30 committed by Tim Abbott
parent c92e909980
commit 561c9d7368
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
static/js/search_suggestion.js
View File

@ -52,6 +52,13 @@ function check_validity(last, operators, valid, invalid) {
return true; return true;
} }
function format_as_suggestion(terms) {
return {
description: Filter.describe(terms),
search_string: Filter.unparse(terms),
};
}
function compare_by_huddle(huddle) { function compare_by_huddle(huddle) {
huddle = _.map(huddle.slice(0, -1), function (person) { huddle = _.map(huddle.slice(0, -1), function (person) {
person = people.get_by_email(person); person = people.get_by_email(person);
@ -242,9 +249,7 @@ function get_default_suggestion(operators) {
if (operators.length === 0) { if (operators.length === 0) {
return {description: '', search_string: ''}; return {description: '', search_string: ''};
} }
var search_string = Filter.unparse(operators); return format_as_suggestion(operators);
var description = Filter.describe(operators);
return {description: description, search_string: search_string};
} }
function get_topic_suggestions(last, operators) { function get_topic_suggestions(last, operators) {
@ -335,9 +340,7 @@ function get_topic_suggestions(last, operators) {
return _.map(topics, function (topic) { return _.map(topics, function (topic) {
var topic_term = {operator: 'topic', operand: topic, negated: negated}; var topic_term = {operator: 'topic', operand: topic, negated: negated};
var operators = suggest_operators.concat([topic_term]); var operators = suggest_operators.concat([topic_term]);
var search_string = Filter.unparse(operators); return format_as_suggestion(operators);
var description = Filter.describe(operators);
return {description: description, search_string: search_string};
}); });
} }
@ -354,10 +357,7 @@ function get_operator_subset_suggestions(operators) {
for (i = operators.length - 1; i >= 1; i -= 1) { for (i = operators.length - 1; i >= 1; i -= 1) {
var subset = operators.slice(0, i); var subset = operators.slice(0, i);
var search_string = Filter.unparse(subset); suggestions.push(format_as_suggestion(subset));
var description = Filter.describe(subset);
var suggestion = {description: description, search_string: search_string};
suggestions.push(suggestion);
} }
return suggestions; return suggestions;
@ -536,9 +536,7 @@ function get_operator_suggestions(last) {
return _.map(choices, function (choice) { return _.map(choices, function (choice) {
var op = [{operator: choice, operand: '', negated: negated}]; var op = [{operator: choice, operand: '', negated: negated}];
var search_string = Filter.unparse(op); return format_as_suggestion(op);
var description = Filter.describe(op);
return {description: description, search_string: search_string};
}); });
} }