Make nicer slugs for "pm-with" narrows.
The slugs for PM-with narrows now have user ids in them, so they
are more resilient to email changes, and they have less escaping
characters and are generally prettier.
Examples:
narrow/pm-with/3-cordelia
narrow/pm-with/3,5-group
The part of the URL that is actionable is the comma-delimited
list of one or more userids.
When we decode the slugs, we only use the part before the dash; the
stuff after the dash is just for humans. If we don't see a number
before the dash, we fall back to the old decoding (which should only
matter during a transition period where folks may have old links).
For group PMS, we always say "group" after the dash. For single PMs,
we use the person's email userid, since it's usually fairly concise
and not noisy for a URL. We may tinker with this later.
Basically, the heart of this change is these two new methods:
people.emails_to_slug
people.slug_to_emails
And then we unify the encode codepath as follows:
narrow.pm_with_uri ->
hashchange.operators_to_hash ->
hashchange.encode_operand ->
people.emails_to_slug
The decode path didn't really require much modication in this commit,
other than to have hashchange.decode_operand call people.slug_to_emails
for the pm-with case.
2017-01-06 02:00:03 +01:00
|
|
|
global.stub_out_jquery();
|
|
|
|
|
2013-08-21 20:27:14 +02:00
|
|
|
add_dependencies({
|
2017-03-19 00:43:14 +01:00
|
|
|
hash_util: 'js/hash_util.js',
|
Make nicer slugs for "pm-with" narrows.
The slugs for PM-with narrows now have user ids in them, so they
are more resilient to email changes, and they have less escaping
characters and are generally prettier.
Examples:
narrow/pm-with/3-cordelia
narrow/pm-with/3,5-group
The part of the URL that is actionable is the comma-delimited
list of one or more userids.
When we decode the slugs, we only use the part before the dash; the
stuff after the dash is just for humans. If we don't see a number
before the dash, we fall back to the old decoding (which should only
matter during a transition period where folks may have old links).
For group PMS, we always say "group" after the dash. For single PMs,
we use the person's email userid, since it's usually fairly concise
and not noisy for a URL. We may tinker with this later.
Basically, the heart of this change is these two new methods:
people.emails_to_slug
people.slug_to_emails
And then we unify the encode codepath as follows:
narrow.pm_with_uri ->
hashchange.operators_to_hash ->
hashchange.encode_operand ->
people.emails_to_slug
The decode path didn't really require much modication in this commit,
other than to have hashchange.decode_operand call people.slug_to_emails
for the pm-with case.
2017-01-06 02:00:03 +01:00
|
|
|
hashchange: 'js/hashchange.js',
|
|
|
|
people: 'js/people.js',
|
2013-08-21 20:27:14 +02:00
|
|
|
stream_data: 'js/stream_data.js',
|
2016-12-03 23:17:57 +01:00
|
|
|
Filter: 'js/filter.js',
|
2013-08-21 20:27:14 +02:00
|
|
|
});
|
2013-08-09 02:05:23 +02:00
|
|
|
|
2013-08-21 20:27:14 +02:00
|
|
|
var narrow = require('js/narrow.js');
|
2013-08-10 01:31:31 +02:00
|
|
|
var Filter = global.Filter;
|
2013-08-19 21:04:28 +02:00
|
|
|
var stream_data = global.stream_data;
|
2014-02-10 18:59:48 +01:00
|
|
|
var _ = global._;
|
2013-08-09 02:05:23 +02:00
|
|
|
|
2013-09-18 19:01:21 +02:00
|
|
|
function set_filter(operators) {
|
2014-02-10 18:59:48 +01:00
|
|
|
operators = _.map(operators, function (op) {
|
|
|
|
return {operator: op[0], operand: op[1]};
|
|
|
|
});
|
2013-08-10 01:31:31 +02:00
|
|
|
narrow._set_current_filter(new Filter(operators));
|
2013-09-18 19:01:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
(function test_stream() {
|
2017-04-13 16:49:55 +02:00
|
|
|
var test_stream = {name: 'Test', stream_id: 15};
|
|
|
|
stream_data.add_sub('Test', test_stream);
|
2013-08-09 02:05:23 +02:00
|
|
|
|
2017-04-13 16:49:55 +02:00
|
|
|
assert(!narrow.is_for_stream_id(test_stream.stream_id));
|
|
|
|
|
|
|
|
set_filter([['stream', 'Test'], ['topic', 'Bar'], ['search', 'yo']]);
|
|
|
|
|
|
|
|
assert.equal(narrow.stream(), 'Test');
|
2016-11-10 18:43:34 +01:00
|
|
|
assert.equal(narrow.topic(), 'Bar');
|
2017-04-13 16:49:55 +02:00
|
|
|
assert(narrow.is_for_stream_id(test_stream.stream_id));
|
2013-08-09 02:05:23 +02:00
|
|
|
}());
|
|
|
|
|
2013-09-18 19:14:08 +02:00
|
|
|
|
|
|
|
(function test_narrowed() {
|
|
|
|
narrow._set_current_filter(undefined); // not narrowed, basically
|
|
|
|
assert(!narrow.narrowed_to_pms());
|
|
|
|
assert(!narrow.narrowed_by_reply());
|
2017-04-16 14:35:24 +02:00
|
|
|
assert(!narrow.narrowed_by_pm_reply());
|
2017-04-16 15:36:18 +02:00
|
|
|
assert(!narrow.narrowed_by_topic_reply());
|
2013-09-18 19:14:08 +02:00
|
|
|
assert(!narrow.narrowed_to_search());
|
2013-09-18 19:27:12 +02:00
|
|
|
assert(!narrow.narrowed_to_topic());
|
2013-09-18 19:14:08 +02:00
|
|
|
|
|
|
|
set_filter([['stream', 'Foo']]);
|
|
|
|
assert(!narrow.narrowed_to_pms());
|
|
|
|
assert(!narrow.narrowed_by_reply());
|
2017-04-16 14:35:24 +02:00
|
|
|
assert(!narrow.narrowed_by_pm_reply());
|
2017-04-16 15:36:18 +02:00
|
|
|
assert(!narrow.narrowed_by_topic_reply());
|
2013-09-18 19:14:08 +02:00
|
|
|
assert(!narrow.narrowed_to_search());
|
2013-09-18 19:27:12 +02:00
|
|
|
assert(!narrow.narrowed_to_topic());
|
2013-09-18 19:14:08 +02:00
|
|
|
|
|
|
|
set_filter([['pm-with', 'steve@zulip.com']]);
|
|
|
|
assert(narrow.narrowed_to_pms());
|
|
|
|
assert(narrow.narrowed_by_reply());
|
2017-04-16 14:35:24 +02:00
|
|
|
assert(narrow.narrowed_by_pm_reply());
|
2017-04-16 15:36:18 +02:00
|
|
|
assert(!narrow.narrowed_by_topic_reply());
|
2013-09-18 19:14:08 +02:00
|
|
|
assert(!narrow.narrowed_to_search());
|
2013-09-18 19:27:12 +02:00
|
|
|
assert(!narrow.narrowed_to_topic());
|
2013-09-18 19:14:08 +02:00
|
|
|
|
|
|
|
set_filter([['stream', 'Foo'], ['topic', 'bar']]);
|
|
|
|
assert(!narrow.narrowed_to_pms());
|
|
|
|
assert(narrow.narrowed_by_reply());
|
2017-04-16 14:35:24 +02:00
|
|
|
assert(!narrow.narrowed_by_pm_reply());
|
2017-04-16 15:36:18 +02:00
|
|
|
assert(narrow.narrowed_by_topic_reply());
|
2013-09-18 19:14:08 +02:00
|
|
|
assert(!narrow.narrowed_to_search());
|
2013-09-18 19:27:12 +02:00
|
|
|
assert(narrow.narrowed_to_topic());
|
2013-09-18 19:14:08 +02:00
|
|
|
|
|
|
|
set_filter([['search', 'grail']]);
|
|
|
|
assert(!narrow.narrowed_to_pms());
|
|
|
|
assert(!narrow.narrowed_by_reply());
|
2017-04-16 14:35:24 +02:00
|
|
|
assert(!narrow.narrowed_by_pm_reply());
|
2017-04-16 15:36:18 +02:00
|
|
|
assert(!narrow.narrowed_by_topic_reply());
|
2013-09-18 19:14:08 +02:00
|
|
|
assert(narrow.narrowed_to_search());
|
2013-09-18 19:27:12 +02:00
|
|
|
assert(!narrow.narrowed_to_topic());
|
2013-09-18 19:14:08 +02:00
|
|
|
}());
|
|
|
|
|
2013-08-09 02:05:23 +02:00
|
|
|
(function test_operators() {
|
2013-09-18 19:01:21 +02:00
|
|
|
set_filter([['stream', 'Foo'], ['topic', 'Bar'], ['search', 'Yo']]);
|
2014-01-30 00:05:36 +01:00
|
|
|
var result = narrow.operators();
|
|
|
|
assert.equal(result.length, 3);
|
|
|
|
assert.equal(result[0].operator, 'stream');
|
|
|
|
assert.equal(result[0].operand, 'Foo');
|
2013-08-09 02:05:23 +02:00
|
|
|
|
2014-01-30 00:05:36 +01:00
|
|
|
assert.equal(result[1].operator, 'topic');
|
|
|
|
assert.equal(result[1].operand, 'Bar');
|
|
|
|
|
|
|
|
assert.equal(result[2].operator, 'search');
|
|
|
|
assert.equal(result[2].operand, 'yo');
|
2013-08-09 02:05:23 +02:00
|
|
|
}());
|
2013-08-19 20:06:51 +02:00
|
|
|
|
2013-09-19 14:42:05 +02:00
|
|
|
(function test_muting_enabled() {
|
|
|
|
set_filter([['stream', 'devel']]);
|
|
|
|
assert(narrow.muting_enabled());
|
|
|
|
|
|
|
|
narrow._set_current_filter(undefined); // not narrowed, basically
|
|
|
|
assert(narrow.muting_enabled());
|
|
|
|
|
|
|
|
set_filter([['stream', 'devel'], ['topic', 'mac']]);
|
|
|
|
assert(!narrow.muting_enabled());
|
|
|
|
|
|
|
|
set_filter([['search', 'whatever']]);
|
|
|
|
assert(!narrow.muting_enabled());
|
|
|
|
|
|
|
|
set_filter([['is', 'private']]);
|
|
|
|
assert(!narrow.muting_enabled());
|
|
|
|
|
|
|
|
}());
|
|
|
|
|
2013-08-19 20:06:51 +02:00
|
|
|
(function test_set_compose_defaults() {
|
2013-09-18 19:01:21 +02:00
|
|
|
set_filter([['stream', 'Foo'], ['topic', 'Bar']]);
|
2013-08-19 20:06:51 +02:00
|
|
|
|
|
|
|
var opts = {};
|
|
|
|
narrow.set_compose_defaults(opts);
|
2013-08-20 15:56:27 +02:00
|
|
|
assert.equal(opts.stream, 'Foo');
|
2013-11-27 16:43:00 +01:00
|
|
|
assert.equal(opts.subject, 'Bar');
|
2013-08-19 21:04:28 +02:00
|
|
|
|
2014-02-05 20:35:16 +01:00
|
|
|
stream_data.add_sub('ROME', {name: 'ROME', stream_id: 99});
|
2013-09-18 19:01:21 +02:00
|
|
|
set_filter([['stream', 'rome']]);
|
2013-08-19 21:04:28 +02:00
|
|
|
|
|
|
|
opts = {};
|
|
|
|
narrow.set_compose_defaults(opts);
|
|
|
|
assert.equal(opts.stream, 'ROME');
|
2013-08-19 20:06:51 +02:00
|
|
|
}());
|
Make nicer slugs for "pm-with" narrows.
The slugs for PM-with narrows now have user ids in them, so they
are more resilient to email changes, and they have less escaping
characters and are generally prettier.
Examples:
narrow/pm-with/3-cordelia
narrow/pm-with/3,5-group
The part of the URL that is actionable is the comma-delimited
list of one or more userids.
When we decode the slugs, we only use the part before the dash; the
stuff after the dash is just for humans. If we don't see a number
before the dash, we fall back to the old decoding (which should only
matter during a transition period where folks may have old links).
For group PMS, we always say "group" after the dash. For single PMs,
we use the person's email userid, since it's usually fairly concise
and not noisy for a URL. We may tinker with this later.
Basically, the heart of this change is these two new methods:
people.emails_to_slug
people.slug_to_emails
And then we unify the encode codepath as follows:
narrow.pm_with_uri ->
hashchange.operators_to_hash ->
hashchange.encode_operand ->
people.emails_to_slug
The decode path didn't really require much modication in this commit,
other than to have hashchange.decode_operand call people.slug_to_emails
for the pm-with case.
2017-01-06 02:00:03 +01:00
|
|
|
|
|
|
|
(function test_uris() {
|
2017-01-06 14:42:52 +01:00
|
|
|
var ray = {
|
Make nicer slugs for "pm-with" narrows.
The slugs for PM-with narrows now have user ids in them, so they
are more resilient to email changes, and they have less escaping
characters and are generally prettier.
Examples:
narrow/pm-with/3-cordelia
narrow/pm-with/3,5-group
The part of the URL that is actionable is the comma-delimited
list of one or more userids.
When we decode the slugs, we only use the part before the dash; the
stuff after the dash is just for humans. If we don't see a number
before the dash, we fall back to the old decoding (which should only
matter during a transition period where folks may have old links).
For group PMS, we always say "group" after the dash. For single PMs,
we use the person's email userid, since it's usually fairly concise
and not noisy for a URL. We may tinker with this later.
Basically, the heart of this change is these two new methods:
people.emails_to_slug
people.slug_to_emails
And then we unify the encode codepath as follows:
narrow.pm_with_uri ->
hashchange.operators_to_hash ->
hashchange.encode_operand ->
people.emails_to_slug
The decode path didn't really require much modication in this commit,
other than to have hashchange.decode_operand call people.slug_to_emails
for the pm-with case.
2017-01-06 02:00:03 +01:00
|
|
|
email: 'ray@example.com',
|
|
|
|
user_id: 22,
|
|
|
|
full_name: 'Raymond',
|
|
|
|
};
|
2017-01-06 14:42:52 +01:00
|
|
|
people.add(ray);
|
|
|
|
|
|
|
|
var alice = {
|
|
|
|
email: 'alice@example.com',
|
|
|
|
user_id: 23,
|
|
|
|
full_name: 'Alice Smith',
|
|
|
|
};
|
|
|
|
people.add(alice);
|
|
|
|
|
|
|
|
var uri = narrow.pm_with_uri(ray.email);
|
Make nicer slugs for "pm-with" narrows.
The slugs for PM-with narrows now have user ids in them, so they
are more resilient to email changes, and they have less escaping
characters and are generally prettier.
Examples:
narrow/pm-with/3-cordelia
narrow/pm-with/3,5-group
The part of the URL that is actionable is the comma-delimited
list of one or more userids.
When we decode the slugs, we only use the part before the dash; the
stuff after the dash is just for humans. If we don't see a number
before the dash, we fall back to the old decoding (which should only
matter during a transition period where folks may have old links).
For group PMS, we always say "group" after the dash. For single PMs,
we use the person's email userid, since it's usually fairly concise
and not noisy for a URL. We may tinker with this later.
Basically, the heart of this change is these two new methods:
people.emails_to_slug
people.slug_to_emails
And then we unify the encode codepath as follows:
narrow.pm_with_uri ->
hashchange.operators_to_hash ->
hashchange.encode_operand ->
people.emails_to_slug
The decode path didn't really require much modication in this commit,
other than to have hashchange.decode_operand call people.slug_to_emails
for the pm-with case.
2017-01-06 02:00:03 +01:00
|
|
|
assert.equal(uri, '#narrow/pm-with/22-ray');
|
2017-01-06 14:42:52 +01:00
|
|
|
|
|
|
|
uri = narrow.huddle_with_uri("22,23");
|
|
|
|
assert.equal(uri, '#narrow/pm-with/22,23-group');
|
|
|
|
|
2017-01-19 03:53:50 +01:00
|
|
|
uri = narrow.by_sender_uri(ray.email);
|
|
|
|
assert.equal(uri, '#narrow/sender/22-ray');
|
|
|
|
|
2017-03-19 00:43:14 +01:00
|
|
|
var emails = global.hash_util.decode_operand('pm-with', '22,23-group');
|
2017-01-06 14:42:52 +01:00
|
|
|
assert.equal(emails, 'alice@example.com,ray@example.com');
|
Make nicer slugs for "pm-with" narrows.
The slugs for PM-with narrows now have user ids in them, so they
are more resilient to email changes, and they have less escaping
characters and are generally prettier.
Examples:
narrow/pm-with/3-cordelia
narrow/pm-with/3,5-group
The part of the URL that is actionable is the comma-delimited
list of one or more userids.
When we decode the slugs, we only use the part before the dash; the
stuff after the dash is just for humans. If we don't see a number
before the dash, we fall back to the old decoding (which should only
matter during a transition period where folks may have old links).
For group PMS, we always say "group" after the dash. For single PMs,
we use the person's email userid, since it's usually fairly concise
and not noisy for a URL. We may tinker with this later.
Basically, the heart of this change is these two new methods:
people.emails_to_slug
people.slug_to_emails
And then we unify the encode codepath as follows:
narrow.pm_with_uri ->
hashchange.operators_to_hash ->
hashchange.encode_operand ->
people.emails_to_slug
The decode path didn't really require much modication in this commit,
other than to have hashchange.decode_operand call people.slug_to_emails
for the pm-with case.
2017-01-06 02:00:03 +01:00
|
|
|
}());
|
2017-01-25 19:13:10 +01:00
|
|
|
|
|
|
|
(function test_show_empty_narrow_message() {
|
|
|
|
|
|
|
|
var hide_id;
|
|
|
|
var show_id;
|
|
|
|
global.$ = function (id) {
|
|
|
|
return {hide: function () {hide_id = id;}, show: function () {show_id = id;}};
|
|
|
|
};
|
|
|
|
|
|
|
|
narrow._set_current_filter(undefined);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#empty_narrow_message');
|
|
|
|
|
|
|
|
// for non-existent or private stream
|
|
|
|
set_filter([['stream', 'Foo']]);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#nonsubbed_private_nonexistent_stream_narrow_message');
|
|
|
|
|
|
|
|
// for non sub public stream
|
|
|
|
set_filter([['stream', 'Rome']]);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#nonsubbed_stream_narrow_message');
|
|
|
|
|
|
|
|
set_filter([['is', 'starred']]);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#empty_star_narrow_message');
|
|
|
|
|
|
|
|
set_filter([['is', 'mentioned']]);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#empty_narrow_all_mentioned');
|
|
|
|
|
|
|
|
set_filter([['is', 'private']]);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#empty_narrow_all_private_message');
|
|
|
|
|
|
|
|
set_filter([['pm-with', ['alice@example.com', 'Yo']]]);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#empty_narrow_multi_private_message');
|
|
|
|
|
|
|
|
set_filter([['pm-with', 'alice@example.com']]);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#empty_narrow_private_message');
|
|
|
|
|
|
|
|
set_filter([['sender', 'ray@example.com']]);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#silent_user');
|
|
|
|
|
|
|
|
set_filter([['sender', 'sinwar@example.com']]);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#non_existing_user');
|
|
|
|
|
|
|
|
set_filter([['search', 'grail']]);
|
|
|
|
narrow.show_empty_narrow_message();
|
|
|
|
assert.equal(hide_id,'.empty_feed_notice');
|
|
|
|
assert.equal(show_id, '#empty_search_narrow_message');
|
|
|
|
}());
|
2017-02-13 21:42:57 +01:00
|
|
|
|
|
|
|
(function test_update_email() {
|
|
|
|
var steve = {
|
|
|
|
email: 'steve@foo.com',
|
|
|
|
user_id: 43,
|
|
|
|
full_name: 'Steve',
|
|
|
|
};
|
|
|
|
|
|
|
|
people.add(steve);
|
|
|
|
set_filter([
|
|
|
|
['pm-with', 'steve@foo.com'],
|
|
|
|
['sender', 'steve@foo.com'],
|
|
|
|
['stream', 'steve@foo.com'], // try to be tricky
|
|
|
|
]);
|
|
|
|
narrow.update_email(steve.user_id, 'showell@foo.com');
|
|
|
|
var filter = narrow.filter();
|
|
|
|
assert.deepEqual(filter.operands('pm-with'), ['showell@foo.com']);
|
|
|
|
assert.deepEqual(filter.operands('sender'), ['showell@foo.com']);
|
|
|
|
assert.deepEqual(filter.operands('stream'), ['steve@foo.com']);
|
|
|
|
}());
|