paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 10:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with left-sidebar stream search and multiple words.

Browse Source 
If you typed in more than one word for a stream with multiple words in
it's name, it would not show up in the search list. This fixes that
and adds some more tests covering the entire functionality of the
filter.
This commit is contained in:
Sampriti Panda
2017-09-15 10:23:25 +05:30
committed by Tim Abbott
parent c4b506998f
commit e98d7a6ee8
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
frontend_tests/node_tests/stream_sort.js
View File

@@ -20,9 +20,9 @@ stream_data.add_sub('scalene', {
stream_id: 1, stream_id: 1,
pin_to_top: true, pin_to_top: true,
}); });
stream_data.add_sub('tortoise', { stream_data.add_sub('fast tortoise', {
subscribed: true, subscribed: true,
name: 'tortoise', name: 'fast tortoise',
stream_id: 2, stream_id: 2,
pin_to_top: false, pin_to_top: false,
}); });
@@ -53,7 +53,7 @@ with_overrides(function (override) {
// Test sorting into categories/alphabetized // Test sorting into categories/alphabetized
var sorted = stream_sort.sort_groups(""); var sorted = stream_sort.sort_groups("");
assert.deepEqual(sorted.pinned_streams, ['scalene']); assert.deepEqual(sorted.pinned_streams, ['scalene']);
assert.deepEqual(sorted.normal_streams, ['clarinet', 'tortoise']); assert.deepEqual(sorted.normal_streams, ['clarinet', 'fast tortoise']);
assert.deepEqual(sorted.dormant_streams, ['pneumonia']); assert.deepEqual(sorted.dormant_streams, ['pneumonia']);
// Test filtering // Test filtering
@@ -67,4 +67,16 @@ with_overrides(function (override) {
assert.deepEqual(sorted.pinned_streams, []); assert.deepEqual(sorted.pinned_streams, []);
assert.deepEqual(sorted.normal_streams, []); assert.deepEqual(sorted.normal_streams, []);
assert.deepEqual(sorted.dormant_streams, ['pneumonia']); assert.deepEqual(sorted.dormant_streams, ['pneumonia']);
// Test searching part of word
sorted = stream_sort.sort_groups("tortoise");
assert.deepEqual(sorted.pinned_streams, []);
assert.deepEqual(sorted.normal_streams, ['fast tortoise']);
assert.deepEqual(sorted.dormant_streams, []);
// Test searching stream with spaces
sorted = stream_sort.sort_groups("fast t");
assert.deepEqual(sorted.pinned_streams, []);
assert.deepEqual(sorted.normal_streams, ['fast tortoise']);
assert.deepEqual(sorted.dormant_streams, []);
}); });

6
static/js/stream_sort.js
View File

@@ -25,8 +25,10 @@ function filter_streams_by_search(streams, search_term) {
var filtered_streams = _.filter(streams, function (stream) { var filtered_streams = _.filter(streams, function (stream) {
return _.any(search_terms, function (search_term) { return _.any(search_terms, function (search_term) {
var lower_stream_name = stream.toLowerCase().split(" "); var lower_stream_name = stream.toLowerCase();
return _.any(lower_stream_name, function (name) { var cands = lower_stream_name.split(" ");
cands.push(lower_stream_name);
return _.any(cands, function (name) {
return name.indexOf(search_term) === 0; return name.indexOf(search_term) === 0;
}); });
}); });