paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add stream sorting widget to subscriptions page

Browse Source 
This change adds a toggle widget to the "add streams" page that
lets the user change the sort order of the streams list. So far,
this supports sorting by stream name, by number of subscribers,
or by estimated weekly traffic.
This commit is contained in:
Roland Crosby
2020-03-31 11:13:01 -04:00
committed by showell
parent 01a9b11e17
commit ac7ec426b0
4 changed files with 151 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
frontend_tests/node_tests/subs.js
View File

@@ -38,6 +38,8 @@ run_test('filter_table', () => {
name: 'Denmark',
stream_id: 1,
description: 'Copenhagen',
subscribers: {size: 1},
is_old_stream: false,
},
{
elem: 'poland',
@@ -45,6 +47,9 @@ run_test('filter_table', () => {
name: 'Poland',
stream_id: 2,
description: 'monday',
subscribers: {size: 3},
is_old_stream: true,
stream_weekly_traffic: 13,
},
{
elem: 'pomona',
@@ -52,6 +57,9 @@ run_test('filter_table', () => {
name: 'Pomona',
stream_id: 3,
description: 'college',
subscribers: {size: 0},
is_old_stream: true,
stream_weekly_traffic: 0,
},
{
elem: 'cpp',
@@ -59,6 +67,19 @@ run_test('filter_table', () => {
name: 'C++',
stream_id: 4,
description: 'programming lang',
subscribers: {size: 2},
is_old_stream: true,
stream_weekly_traffic: 6,
},
{
elem: 'zzyzx',
subscribed: true,
name: 'Zzyzx',
stream_id: 5,
description: 'california town',
subscribers: {size: 2},
is_old_stream: true,
stream_weekly_traffic: 6,
},
];
@@ -117,6 +138,7 @@ run_test('filter_table', () => {
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
assert(!$(".stream-row-pomona").hasClass("notdisplayed"));
assert($(".stream-row-cpp").hasClass("notdisplayed"));
assert($(".stream-row-zzyzx").hasClass("notdisplayed"));
// assert these once and call it done
assert(ui_called);
@@ -126,6 +148,7 @@ run_test('filter_table', () => {
'.stream-row-poland',
'.stream-row-pomona',
'.stream-row-cpp',
'.stream-row-zzyzx',
'.stream-row-denmark',
]);
@@ -135,12 +158,14 @@ run_test('filter_table', () => {
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
assert($(".stream-row-pomona").hasClass("notdisplayed"));
assert($(".stream-row-cpp").hasClass("notdisplayed"));
assert($(".stream-row-zzyzx").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"));
assert($(".stream-row-zzyzx").hasClass("notdisplayed"));
// Search is case-insensitive
subs.filter_table({input: "po", subscribed_only: false});
@@ -148,6 +173,7 @@ run_test('filter_table', () => {
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
assert(!$(".stream-row-pomona").hasClass("notdisplayed"));
assert($(".stream-row-cpp").hasClass("notdisplayed"));
assert($(".stream-row-zzyzx").hasClass("notdisplayed"));
// Search handles unusual characters like C++
subs.filter_table({input: "c++", subscribed_only: false});
@@ -155,6 +181,7 @@ run_test('filter_table', () => {
assert($(".stream-row-poland").hasClass("notdisplayed"));
assert($(".stream-row-pomona").hasClass("notdisplayed"));
assert(!$(".stream-row-cpp").hasClass("notdisplayed"));
assert($(".stream-row-zzyzx").hasClass("notdisplayed"));
// Search subscribed streams only
subs.filter_table({input: "d", subscribed_only: true});
@@ -162,6 +189,7 @@ run_test('filter_table', () => {
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
assert($(".stream-row-pomona").hasClass("notdisplayed"));
assert($(".stream-row-cpp").hasClass("notdisplayed"));
assert($(".stream-row-zzyzx").hasClass("notdisplayed"));
// Search terms match stream description
subs.filter_table({input: "Co", subscribed_only: false});
@@ -169,6 +197,7 @@ run_test('filter_table', () => {
assert($(".stream-row-poland").hasClass("notdisplayed"));
assert(!$(".stream-row-pomona").hasClass("notdisplayed"));
assert($(".stream-row-cpp").hasClass("notdisplayed"));
assert($(".stream-row-zzyzx").hasClass("notdisplayed"));
// Search names AND descriptions
sub_table_append = [];
@@ -178,10 +207,56 @@ run_test('filter_table', () => {
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
assert(!$(".stream-row-pomona").hasClass("notdisplayed"));
assert($(".stream-row-cpp").hasClass("notdisplayed"));
assert($(".stream-row-zzyzx").hasClass("notdisplayed"));
assert.deepEqual(sub_table_append, [
'.stream-row-pomona',
'.stream-row-poland',
'.stream-row-cpp',
'.stream-row-zzyzx',
'.stream-row-denmark',
]);
// Explicitly order streams by name
sub_table_append = [];
subs.filter_table({input: "", subscribed_only: false, sort_order: "by-stream-name"});
assert.deepEqual(sub_table_append, [
'.stream-row-cpp',
'.stream-row-denmark',
'.stream-row-poland',
'.stream-row-pomona',
'.stream-row-zzyzx',
]);
// Order streams by subscriber count
sub_table_append = [];
subs.filter_table({input: "", subscribed_only: false, sort_order: "by-subscriber-count"});
assert.deepEqual(sub_table_append, [
'.stream-row-poland',
'.stream-row-cpp',
'.stream-row-zzyzx',
'.stream-row-denmark',
'.stream-row-pomona',
]);
// Order streams by weekly traffic
sub_table_append = [];
subs.filter_table({input: "", subscribed_only: false, sort_order: "by-weekly-traffic"});
assert.deepEqual(sub_table_append, [
'.stream-row-poland',
'.stream-row-cpp',
'.stream-row-zzyzx',
'.stream-row-pomona',
'.stream-row-denmark',
]);
// Showing subscribed streams only puts un-subscribed DOM elements last
sub_table_append = [];
subs.filter_table({input: "", subscribed_only: true, sort_order: "by-subscriber-count"});
assert.deepEqual(sub_table_append, [
'.stream-row-poland',
'.stream-row-cpp',
'.stream-row-zzyzx',
'.stream-row-pomona',
'.stream-row-denmark',
]);
@@ -206,12 +281,14 @@ run_test('filter_table', () => {
assert(!$(".stream-row-poland").hasClass("notdisplayed"));
assert($(".stream-row-pomona").hasClass("notdisplayed"));
assert($(".stream-row-cpp").hasClass("notdisplayed"));
assert($(".stream-row-zzyzx").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"));
assert($(".stream-row-zzyzx").hasClass("notdisplayed"));
// test selected row set to active
$(".stream-row[data-stream-id='1']").removeClass("active");