2020-02-04 21:50:55 +01:00
|
|
|
|
2017-11-08 18:25:20 +01:00
|
|
|
zrequire('people');
|
|
|
|
zrequire('Filter', 'js/filter');
|
|
|
|
zrequire('stream_data');
|
|
|
|
zrequire('narrow_state');
|
2017-06-01 20:45:32 +02:00
|
|
|
|
2018-04-24 01:14:51 +02:00
|
|
|
set_global('blueslip', global.make_zblueslip());
|
|
|
|
set_global('page_params', {});
|
2017-06-01 20:57:17 +02:00
|
|
|
|
2017-06-01 20:45:32 +02:00
|
|
|
function set_filter(operators) {
|
js: Convert _.map(a, …) to a.map(…).
And convert the corresponding function expressions to arrow style
while we’re here.
import * as babelParser from "recast/parsers/babel";
import * as recast from "recast";
import * as tsParser from "recast/parsers/typescript";
import { builders as b, namedTypes as n } from "ast-types";
import K from "ast-types/gen/kinds";
import fs from "fs";
import path from "path";
import process from "process";
const checkExpression = (node: n.Node): node is K.ExpressionKind =>
n.Expression.check(node);
for (const file of process.argv.slice(2)) {
console.log("Parsing", file);
const ast = recast.parse(fs.readFileSync(file, { encoding: "utf8" }), {
parser: path.extname(file) === ".ts" ? tsParser : babelParser,
});
let changed = false;
recast.visit(ast, {
visitCallExpression(path) {
const { callee, arguments: args } = path.node;
if (
n.MemberExpression.check(callee) &&
!callee.computed &&
n.Identifier.check(callee.object) &&
callee.object.name === "_" &&
n.Identifier.check(callee.property) &&
callee.property.name === "map" &&
args.length === 2 &&
checkExpression(args[0]) &&
checkExpression(args[1])
) {
const [arr, fn] = args;
path.replace(
b.callExpression(b.memberExpression(arr, b.identifier("map")), [
n.FunctionExpression.check(fn) ||
n.ArrowFunctionExpression.check(fn)
? b.arrowFunctionExpression(
fn.params,
n.BlockStatement.check(fn.body) &&
fn.body.body.length === 1 &&
n.ReturnStatement.check(fn.body.body[0])
? fn.body.body[0].argument || b.identifier("undefined")
: fn.body
)
: fn,
])
);
changed = true;
}
this.traverse(path);
},
});
if (changed) {
console.log("Writing", file);
fs.writeFileSync(file, recast.print(ast).code, { encoding: "utf8" });
}
}
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-02-08 02:43:49 +01:00
|
|
|
operators = operators.map(op => ({
|
|
|
|
operator: op[0],
|
|
|
|
operand: op[1],
|
|
|
|
}));
|
2017-06-01 20:45:32 +02:00
|
|
|
narrow_state.set_current_filter(new Filter(operators));
|
|
|
|
}
|
|
|
|
|
2017-06-01 20:57:17 +02:00
|
|
|
|
2018-05-15 12:40:07 +02:00
|
|
|
run_test('stream', () => {
|
2017-06-01 20:57:17 +02:00
|
|
|
assert.equal(narrow_state.public_operators(), undefined);
|
|
|
|
assert(!narrow_state.active());
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const test_stream = {name: 'Test', stream_id: 15};
|
2020-02-09 22:02:55 +01:00
|
|
|
stream_data.add_sub(test_stream);
|
2017-06-01 20:45:32 +02:00
|
|
|
|
|
|
|
assert(!narrow_state.is_for_stream_id(test_stream.stream_id));
|
|
|
|
|
2017-06-01 20:57:17 +02:00
|
|
|
set_filter([
|
|
|
|
['stream', 'Test'],
|
|
|
|
['topic', 'Bar'],
|
|
|
|
['search', 'yo'],
|
|
|
|
]);
|
|
|
|
assert(narrow_state.active());
|
2017-06-01 20:45:32 +02:00
|
|
|
|
|
|
|
assert.equal(narrow_state.stream(), 'Test');
|
2018-05-02 13:51:02 +02:00
|
|
|
assert.equal(narrow_state.stream_id(), test_stream.stream_id);
|
2017-06-01 20:45:32 +02:00
|
|
|
assert.equal(narrow_state.topic(), 'Bar');
|
|
|
|
assert(narrow_state.is_for_stream_id(test_stream.stream_id));
|
2017-06-01 20:57:17 +02:00
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const expected_operators = [
|
2017-06-01 20:57:17 +02:00
|
|
|
{ negated: false, operator: 'stream', operand: 'Test' },
|
|
|
|
{ negated: false, operator: 'topic', operand: 'Bar' },
|
|
|
|
{ negated: false, operator: 'search', operand: 'yo' },
|
|
|
|
];
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const public_operators = narrow_state.public_operators();
|
2017-06-01 20:57:17 +02:00
|
|
|
assert.deepEqual(public_operators, expected_operators);
|
|
|
|
assert.equal(narrow_state.search_string(), 'stream:Test topic:Bar yo');
|
2018-05-15 12:40:07 +02:00
|
|
|
});
|
2017-06-01 20:45:32 +02:00
|
|
|
|
|
|
|
|
2018-05-15 12:40:07 +02:00
|
|
|
run_test('narrowed', () => {
|
2017-06-01 20:45:32 +02:00
|
|
|
narrow_state.reset_current_filter(); // not narrowed, basically
|
|
|
|
assert(!narrow_state.narrowed_to_pms());
|
|
|
|
assert(!narrow_state.narrowed_by_reply());
|
|
|
|
assert(!narrow_state.narrowed_by_pm_reply());
|
|
|
|
assert(!narrow_state.narrowed_by_topic_reply());
|
|
|
|
assert(!narrow_state.narrowed_to_search());
|
|
|
|
assert(!narrow_state.narrowed_to_topic());
|
2017-04-21 22:51:25 +02:00
|
|
|
assert(!narrow_state.narrowed_by_stream_reply());
|
2018-05-02 13:51:02 +02:00
|
|
|
assert.equal(narrow_state.stream_id(), undefined);
|
2017-06-01 20:45:32 +02:00
|
|
|
|
|
|
|
set_filter([['stream', 'Foo']]);
|
|
|
|
assert(!narrow_state.narrowed_to_pms());
|
|
|
|
assert(!narrow_state.narrowed_by_reply());
|
|
|
|
assert(!narrow_state.narrowed_by_pm_reply());
|
|
|
|
assert(!narrow_state.narrowed_by_topic_reply());
|
|
|
|
assert(!narrow_state.narrowed_to_search());
|
|
|
|
assert(!narrow_state.narrowed_to_topic());
|
2017-04-21 22:51:25 +02:00
|
|
|
assert(narrow_state.narrowed_by_stream_reply());
|
2017-06-01 20:45:32 +02:00
|
|
|
|
|
|
|
set_filter([['pm-with', 'steve@zulip.com']]);
|
|
|
|
assert(narrow_state.narrowed_to_pms());
|
|
|
|
assert(narrow_state.narrowed_by_reply());
|
|
|
|
assert(narrow_state.narrowed_by_pm_reply());
|
|
|
|
assert(!narrow_state.narrowed_by_topic_reply());
|
|
|
|
assert(!narrow_state.narrowed_to_search());
|
|
|
|
assert(!narrow_state.narrowed_to_topic());
|
2017-04-21 22:51:25 +02:00
|
|
|
assert(!narrow_state.narrowed_by_stream_reply());
|
2017-06-01 20:45:32 +02:00
|
|
|
|
|
|
|
set_filter([['stream', 'Foo'], ['topic', 'bar']]);
|
|
|
|
assert(!narrow_state.narrowed_to_pms());
|
|
|
|
assert(narrow_state.narrowed_by_reply());
|
|
|
|
assert(!narrow_state.narrowed_by_pm_reply());
|
|
|
|
assert(narrow_state.narrowed_by_topic_reply());
|
|
|
|
assert(!narrow_state.narrowed_to_search());
|
|
|
|
assert(narrow_state.narrowed_to_topic());
|
2017-04-21 22:51:25 +02:00
|
|
|
assert(!narrow_state.narrowed_by_stream_reply());
|
2017-06-01 20:45:32 +02:00
|
|
|
|
|
|
|
set_filter([['search', 'grail']]);
|
|
|
|
assert(!narrow_state.narrowed_to_pms());
|
|
|
|
assert(!narrow_state.narrowed_by_reply());
|
|
|
|
assert(!narrow_state.narrowed_by_pm_reply());
|
|
|
|
assert(!narrow_state.narrowed_by_topic_reply());
|
|
|
|
assert(narrow_state.narrowed_to_search());
|
|
|
|
assert(!narrow_state.narrowed_to_topic());
|
2017-04-21 22:51:25 +02:00
|
|
|
assert(!narrow_state.narrowed_by_stream_reply());
|
2018-05-15 12:40:07 +02:00
|
|
|
});
|
2017-06-01 20:45:32 +02:00
|
|
|
|
2018-05-15 12:40:07 +02:00
|
|
|
run_test('operators', () => {
|
2017-06-01 20:45:32 +02:00
|
|
|
set_filter([['stream', 'Foo'], ['topic', 'Bar'], ['search', 'Yo']]);
|
2019-11-02 00:06:25 +01:00
|
|
|
let result = narrow_state.operators();
|
2017-06-01 20:45:32 +02:00
|
|
|
assert.equal(result.length, 3);
|
|
|
|
assert.equal(result[0].operator, 'stream');
|
|
|
|
assert.equal(result[0].operand, 'Foo');
|
|
|
|
|
|
|
|
assert.equal(result[1].operator, 'topic');
|
|
|
|
assert.equal(result[1].operand, 'Bar');
|
|
|
|
|
|
|
|
assert.equal(result[2].operator, 'search');
|
|
|
|
assert.equal(result[2].operand, 'yo');
|
2017-12-02 03:18:05 +01:00
|
|
|
|
|
|
|
narrow_state.reset_current_filter();
|
|
|
|
result = narrow_state.operators();
|
|
|
|
assert.equal(result.length, 0);
|
2018-05-15 12:40:07 +02:00
|
|
|
});
|
2017-06-01 20:45:32 +02:00
|
|
|
|
2018-05-15 12:40:07 +02:00
|
|
|
run_test('muting_enabled', () => {
|
2017-06-01 20:45:32 +02:00
|
|
|
set_filter([['stream', 'devel']]);
|
|
|
|
assert(narrow_state.muting_enabled());
|
|
|
|
|
|
|
|
narrow_state.reset_current_filter(); // not narrowed, basically
|
|
|
|
assert(narrow_state.muting_enabled());
|
|
|
|
|
|
|
|
set_filter([['stream', 'devel'], ['topic', 'mac']]);
|
|
|
|
assert(!narrow_state.muting_enabled());
|
|
|
|
|
|
|
|
set_filter([['search', 'whatever']]);
|
|
|
|
assert(!narrow_state.muting_enabled());
|
|
|
|
|
|
|
|
set_filter([['is', 'private']]);
|
|
|
|
assert(!narrow_state.muting_enabled());
|
|
|
|
|
2018-05-15 12:40:07 +02:00
|
|
|
});
|
2017-06-01 20:45:32 +02:00
|
|
|
|
2018-05-15 12:40:07 +02:00
|
|
|
run_test('set_compose_defaults', () => {
|
2017-06-01 20:45:32 +02:00
|
|
|
set_filter([['stream', 'Foo'], ['topic', 'Bar']]);
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const stream_and_subject = narrow_state.set_compose_defaults();
|
2017-12-02 03:13:43 +01:00
|
|
|
assert.equal(stream_and_subject.stream, 'Foo');
|
2018-11-15 19:14:16 +01:00
|
|
|
assert.equal(stream_and_subject.topic, 'Bar');
|
2017-06-01 20:45:32 +02:00
|
|
|
|
2017-11-29 23:47:13 +01:00
|
|
|
set_filter([['pm-with', 'foo@bar.com']]);
|
2019-11-02 00:06:25 +01:00
|
|
|
let pm_test = narrow_state.set_compose_defaults();
|
2018-05-28 11:44:28 +02:00
|
|
|
assert.equal(pm_test.private_message_recipient, undefined);
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const john = {
|
2018-05-28 11:44:28 +02:00
|
|
|
email: 'john@doe.com',
|
|
|
|
user_id: 57,
|
|
|
|
full_name: 'John Doe',
|
|
|
|
};
|
|
|
|
people.add(john);
|
2020-03-21 20:19:30 +01:00
|
|
|
people.add(john);
|
2018-05-28 11:44:28 +02:00
|
|
|
|
|
|
|
set_filter([['pm-with', 'john@doe.com']]);
|
|
|
|
pm_test = narrow_state.set_compose_defaults();
|
|
|
|
assert.equal(pm_test.private_message_recipient, 'john@doe.com');
|
2017-11-29 23:47:13 +01:00
|
|
|
|
2017-12-02 23:10:09 +01:00
|
|
|
set_filter([['topic', 'duplicate'], ['topic', 'duplicate']]);
|
|
|
|
assert.deepEqual(narrow_state.set_compose_defaults(), {});
|
|
|
|
|
2020-02-09 22:02:55 +01:00
|
|
|
stream_data.add_sub({name: 'ROME', stream_id: 99});
|
2017-06-01 20:45:32 +02:00
|
|
|
set_filter([['stream', 'rome']]);
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const stream_test = narrow_state.set_compose_defaults();
|
2017-12-02 03:13:43 +01:00
|
|
|
assert.equal(stream_test.stream, 'ROME');
|
2018-05-15 12:40:07 +02:00
|
|
|
});
|
2017-06-01 20:45:32 +02:00
|
|
|
|
2018-05-15 12:40:07 +02:00
|
|
|
run_test('update_email', () => {
|
2019-11-02 00:06:25 +01:00
|
|
|
const steve = {
|
2017-06-01 20:45:32 +02:00
|
|
|
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_state.update_email(steve.user_id, 'showell@foo.com');
|
2019-11-02 00:06:25 +01:00
|
|
|
const filter = narrow_state.filter();
|
2017-06-01 20:45:32 +02:00
|
|
|
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']);
|
2018-05-15 12:40:07 +02:00
|
|
|
});
|
2017-11-29 17:32:25 +01:00
|
|
|
|
2018-05-15 12:40:07 +02:00
|
|
|
run_test('topic', () => {
|
2017-11-29 17:32:25 +01:00
|
|
|
set_filter([['stream', 'Foo'], ['topic', 'Bar']]);
|
|
|
|
assert.equal(narrow_state.topic(), 'Bar');
|
|
|
|
|
|
|
|
set_filter([['stream', 'release'], ['topic', '@#$$^test']]);
|
|
|
|
assert.equal(narrow_state.topic(), '@#$$^test');
|
|
|
|
|
2020-02-08 01:27:04 +01:00
|
|
|
set_filter([]);
|
2017-11-29 17:32:25 +01:00
|
|
|
assert.equal(narrow_state.topic(), undefined);
|
|
|
|
|
|
|
|
set_filter([
|
|
|
|
['sender', 'test@foo.com'],
|
|
|
|
['pm-with', 'test@foo.com'],
|
|
|
|
]);
|
|
|
|
assert.equal(narrow_state.topic(), undefined);
|
2017-12-14 19:02:06 +01:00
|
|
|
|
|
|
|
narrow_state.set_current_filter(undefined);
|
|
|
|
assert.equal(narrow_state.topic(), undefined);
|
2018-05-15 12:40:07 +02:00
|
|
|
});
|
2017-11-29 17:32:25 +01:00
|
|
|
|
|
|
|
|
2018-05-15 12:40:07 +02:00
|
|
|
run_test('stream', () => {
|
2020-02-08 01:27:04 +01:00
|
|
|
set_filter([]);
|
2017-11-29 17:32:25 +01:00
|
|
|
assert.equal(narrow_state.stream(), undefined);
|
2018-05-02 13:51:02 +02:00
|
|
|
assert.equal(narrow_state.stream_id(), undefined);
|
2017-11-29 17:32:25 +01:00
|
|
|
|
|
|
|
set_filter([['stream', 'Foo'], ['topic', 'Bar']]);
|
|
|
|
assert.equal(narrow_state.stream(), 'Foo');
|
2018-05-02 13:51:02 +02:00
|
|
|
assert.equal(narrow_state.stream_sub(), undefined);
|
|
|
|
assert.equal(narrow_state.stream_id(), undefined);
|
|
|
|
|
|
|
|
const sub = {name: 'Foo', stream_id: 55};
|
2020-02-09 22:02:55 +01:00
|
|
|
stream_data.add_sub(sub);
|
2018-05-02 13:51:02 +02:00
|
|
|
assert.equal(narrow_state.stream_id(), 55);
|
|
|
|
assert.deepEqual(narrow_state.stream_sub(), sub);
|
2017-11-29 17:32:25 +01:00
|
|
|
|
|
|
|
set_filter([['sender', 'someone'], ['topic', 'random']]);
|
|
|
|
assert.equal(narrow_state.stream(), undefined);
|
2018-05-15 12:40:07 +02:00
|
|
|
});
|
2017-11-29 17:32:25 +01:00
|
|
|
|
2018-05-15 12:40:07 +02:00
|
|
|
run_test('pm_string', () => {
|
2018-02-09 22:26:45 +01:00
|
|
|
// This function will return undefined unless we're clearly
|
|
|
|
// narrowed to a specific PM (including huddles) with real
|
|
|
|
// users.
|
|
|
|
narrow_state.set_current_filter(undefined);
|
|
|
|
assert.equal(narrow_state.pm_string(), undefined);
|
|
|
|
|
|
|
|
set_filter([['stream', 'Foo'], ['topic', 'Bar']]);
|
|
|
|
assert.equal(narrow_state.pm_string(), undefined);
|
|
|
|
|
|
|
|
set_filter([['pm-with', '']]);
|
|
|
|
assert.equal(narrow_state.pm_string(), undefined);
|
|
|
|
|
|
|
|
set_filter([['pm-with', 'bogus@foo.com']]);
|
|
|
|
assert.equal(narrow_state.pm_string(), undefined);
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const alice = {
|
2018-02-09 22:26:45 +01:00
|
|
|
email: 'alice@foo.com',
|
|
|
|
user_id: 444,
|
|
|
|
full_name: 'Alice',
|
|
|
|
};
|
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const bob = {
|
2018-02-09 22:26:45 +01:00
|
|
|
email: 'bob@foo.com',
|
|
|
|
user_id: 555,
|
|
|
|
full_name: 'Bob',
|
|
|
|
};
|
|
|
|
|
|
|
|
people.add(alice);
|
|
|
|
people.add(bob);
|
|
|
|
|
|
|
|
set_filter([['pm-with', 'bob@foo.com,alice@foo.com']]);
|
|
|
|
assert.equal(narrow_state.pm_string(), '444,555');
|
2018-05-15 12:40:07 +02:00
|
|
|
});
|