paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-27 01:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

search_suggestion: Convert make_attacher to an ES6 class Attacher.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-07-22 17:09:54 -07:00
committed by Tim Abbott
parent f96bd3839c
commit daf5a78e98
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
static/js/search_suggestion.js
View File

@@ -556,37 +556,40 @@ function get_operator_suggestions(last) {
});
}
function make_attacher(base) {
const self = {};
self.result = [];
const prev = new Set();
class Attacher {
result = [];
prev = new Set();
function prepend_base(suggestion) {
if (base && base.description.length > 0) {
suggestion.search_string = base.search_string + " " + suggestion.search_string;
suggestion.description = base.description + ", " + suggestion.description;
constructor(base) {
this.base = base;
}
prepend_base(suggestion) {
if (this.base && this.base.description.length > 0) {
suggestion.search_string = this.base.search_string + " " + suggestion.search_string;
suggestion.description = this.base.description + ", " + suggestion.description;
}
}
self.push = function (suggestion) {
if (!prev.has(suggestion.search_string)) {
prev.add(suggestion.search_string);
self.result.push(suggestion);
push(suggestion) {
if (!this.prev.has(suggestion.search_string)) {
this.prev.add(suggestion.search_string);
this.result.push(suggestion);
}
};
}
self.concat = function (suggestions) {
suggestions.forEach(self.push);
};
self.attach_many = function (suggestions) {
concat(suggestions) {
for (const suggestion of suggestions) {
prepend_base(suggestion);
self.push(suggestion);
this.push(suggestion);
}
};
}
return self;
attach_many(suggestions) {
for (const suggestion of suggestions) {
this.prepend_base(suggestion);
this.push(suggestion);
}
}
}
exports.get_search_result = function (base_query, query) {
@@ -646,7 +649,7 @@ exports.get_search_result = function (base_query, query) {
}
const base = get_default_suggestion(search_operators.slice(0, -1));
const attacher = make_attacher(base);
const attacher = new Attacher(base);
// Display the default first
// `has` and `is` operators work only on predefined categories. Default suggestion