mirror of
https://github.com/zulip/zulip.git
synced 2025-11-03 21:43:21 +00:00
631811e686
This should make any operation on subscribed
streams faster (we won't need to filter out
unsubscribed streams every time).
I started writing this before I realized we
had a bug where we call `subscribed_streams`
in a nested loop.
After fixing the bugs, this is not as much of
a bottleneck, but it's still a speedup in many
important places:
* build left sidebar
* every keystroke in search bar
* first keystroke in making #stream_links
* every keystroke in compose stream box
The streams settings code is kinda complicated.
It does a non-deterministic sort of the "others"
bucket when you add elements to the left panel.
They get hidden, anyway. Our values() call now
puts subscribed streams first. It never guaranteed
order, but putting subscribed streams first is
probably a good behavior for most situations.
220 lines
7.3 KiB
JavaScript
220 lines
7.3 KiB
JavaScript
global.stub_out_jquery();
|
|
|
|
set_global('ui', {
|
|
get_content_element: element => element,
|
|
get_scroll_element: element => element,
|
|
});
|
|
zrequire('util');
|
|
zrequire('stream_data');
|
|
zrequire('search_util');
|
|
set_global('page_params', {});
|
|
|
|
set_global('location', {
|
|
hash: "#streams/1/announce",
|
|
});
|
|
|
|
zrequire('subs');
|
|
|
|
set_global('$', global.make_zjquery());
|
|
|
|
stream_data.update_calculated_fields = () => {};
|
|
|
|
run_test('filter_table', () => {
|
|
const stream_list = $(".streams-list");
|
|
|
|
let scrolltop_called = false;
|
|
stream_list.scrollTop = function (set) {
|
|
scrolltop_called = true;
|
|
if (!set) {
|
|
return 10;
|
|
}
|
|
assert.equal(set, 10);
|
|
};
|
|
|
|
// set-up sub rows stubs
|
|
const sub_row_data = {};
|
|
sub_row_data[1] = {
|
|
elem: 'denmark',
|
|
subscribed: false,
|
|
name: 'Denmark',
|
|
stream_id: 1,
|
|
description: 'Copenhagen',
|
|
};
|
|
sub_row_data[2] = {
|
|
elem: 'poland',
|
|
subscribed: true,
|
|
name: 'Poland',
|
|
stream_id: 2,
|
|
description: 'monday',
|
|
};
|
|
sub_row_data[3] = {
|
|
elem: 'pomona',
|
|
subscribed: true,
|
|
name: 'Pomona',
|
|
stream_id: 3,
|
|
description: 'college',
|
|
};
|
|
sub_row_data[4] = {
|
|
elem: 'cpp',
|
|
subscribed: true,
|
|
name: 'C++',
|
|
stream_id: 4,
|
|
description: 'programming lang',
|
|
};
|
|
|
|
_.each(sub_row_data, function (sub) {
|
|
stream_data.add_sub(sub.name, sub);
|
|
});
|
|
|
|
let populated_subs;
|
|
|
|
global.stub_templates((fn, data) => {
|
|
assert.equal(fn, 'subscriptions');
|
|
populated_subs = data.subscriptions;
|
|
});
|
|
|
|
subs.populate_stream_settings_left_panel();
|
|
|
|
const sub_stubs = [];
|
|
_.each(populated_subs, function (data) {
|
|
const sub_row = ".stream-row-" + data.elem;
|
|
sub_stubs.push(sub_row);
|
|
|
|
$(sub_row).attr("data-stream-id", data.stream_id);
|
|
$(sub_row).set_find_results('.sub-info-box [class$="-bar"] [class$="-count"]', $(".tooltip"));
|
|
$(sub_row).detach = function () {
|
|
return sub_row;
|
|
};
|
|
});
|
|
|
|
let tooltip_called = false;
|
|
$(".tooltip").tooltip = function (obj) {
|
|
tooltip_called = true;
|
|
assert.deepEqual(obj, {
|
|
placement: 'left',
|
|
animation: false,
|
|
});
|
|
};
|
|
|
|
$.stub_selector("#subscriptions_table .stream-row", sub_stubs);
|
|
|
|
const sub_table = $('#subscriptions_table .streams-list');
|
|
let sub_table_append = [];
|
|
sub_table.append = function (rows) {
|
|
sub_table_append.push(rows);
|
|
};
|
|
|
|
let ui_called = false;
|
|
ui.reset_scrollbar = function (elem) {
|
|
ui_called = true;
|
|
assert.equal(elem, $("#subscription_overlay .streams-list"));
|
|
};
|
|
|
|
// Search with single keyword
|
|
subs.filter_table({input: "Po", subscribed_only: false});
|
|
assert($(".stream-row-denmark").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-pomona").hasClass("notdisplayed"));
|
|
assert($(".stream-row-cpp").hasClass("notdisplayed"));
|
|
|
|
// assert these once and call it done
|
|
assert(ui_called);
|
|
assert(scrolltop_called);
|
|
assert(tooltip_called);
|
|
assert.deepEqual(sub_table_append, [
|
|
'.stream-row-poland',
|
|
'.stream-row-pomona',
|
|
'.stream-row-cpp',
|
|
'.stream-row-denmark',
|
|
]);
|
|
|
|
// Search with multiple keywords
|
|
subs.filter_table({input: "Denmark, Pol", subscribed_only: false});
|
|
assert(!$(".stream-row-denmark").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
|
|
assert($(".stream-row-pomona").hasClass("notdisplayed"));
|
|
assert($(".stream-row-cpp").hasClass("notdisplayed"));
|
|
|
|
subs.filter_table({input: "Den, Pol", subscribed_only: false});
|
|
assert(!$(".stream-row-denmark").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
|
|
assert($(".stream-row-pomona").hasClass("notdisplayed"));
|
|
assert($(".stream-row-cpp").hasClass("notdisplayed"));
|
|
|
|
// Search is case-insensitive
|
|
subs.filter_table({input: "po", subscribed_only: false});
|
|
assert($(".stream-row-denmark").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-pomona").hasClass("notdisplayed"));
|
|
assert($(".stream-row-cpp").hasClass("notdisplayed"));
|
|
|
|
// Search handles unusual characters like C++
|
|
subs.filter_table({input: "c++", subscribed_only: false});
|
|
assert($(".stream-row-denmark").hasClass("notdisplayed"));
|
|
assert($(".stream-row-poland").hasClass("notdisplayed"));
|
|
assert($(".stream-row-pomona").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-cpp").hasClass("notdisplayed"));
|
|
|
|
// Search subscribed streams only
|
|
subs.filter_table({input: "d", subscribed_only: true});
|
|
assert($(".stream-row-denmark").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
|
|
assert($(".stream-row-pomona").hasClass("notdisplayed"));
|
|
assert($(".stream-row-cpp").hasClass("notdisplayed"));
|
|
|
|
// Search terms match stream description
|
|
subs.filter_table({input: "Co", subscribed_only: false});
|
|
assert(!$(".stream-row-denmark").hasClass("notdisplayed"));
|
|
assert($(".stream-row-poland").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-pomona").hasClass("notdisplayed"));
|
|
assert($(".stream-row-cpp").hasClass("notdisplayed"));
|
|
|
|
// Search names AND descriptions
|
|
sub_table_append = [];
|
|
|
|
subs.filter_table({input: "Mon", subscribed_only: false});
|
|
assert($(".stream-row-denmark").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-pomona").hasClass("notdisplayed"));
|
|
assert($(".stream-row-cpp").hasClass("notdisplayed"));
|
|
assert.deepEqual(sub_table_append, [
|
|
'.stream-row-pomona',
|
|
'.stream-row-poland',
|
|
'.stream-row-cpp',
|
|
'.stream-row-denmark',
|
|
]);
|
|
|
|
// active stream-row is not included in results
|
|
$(".stream-row-denmark").addClass("active");
|
|
$(".stream-row.active").hasClass = function (cls) {
|
|
assert.equal(cls, "notdisplayed");
|
|
return $(".stream-row-denmark").hasClass("active");
|
|
};
|
|
$(".stream-row.active").removeClass = function (cls) {
|
|
assert.equal(cls, "active");
|
|
$(".stream-row-denmark").removeClass("active");
|
|
};
|
|
|
|
subs.filter_table({input: "d", subscribed_only: true});
|
|
assert(!$(".stream-row-denmark").hasClass("active"));
|
|
assert(!$(".right .settings").visible());
|
|
assert($(".nothing-selected").visible());
|
|
|
|
subs.filter_table({input: "d", subscribed_only: true});
|
|
assert($(".stream-row-denmark").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
|
|
assert($(".stream-row-pomona").hasClass("notdisplayed"));
|
|
assert($(".stream-row-cpp").hasClass("notdisplayed"));
|
|
|
|
subs.filter_table({input: "d", subscribed_only: true});
|
|
assert($(".stream-row-denmark").hasClass("notdisplayed"));
|
|
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
|
|
assert($(".stream-row-pomona").hasClass("notdisplayed"));
|
|
assert($(".stream-row-cpp").hasClass("notdisplayed"));
|
|
|
|
// test selected row set to active
|
|
$(".stream-row[data-stream-id='1']").removeClass("active");
|
|
subs.filter_table({input: "", subscribed_only: false});
|
|
assert($(".stream-row[data-stream-id='1']").hasClass("active"));
|
|
});
|