Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

recent: Rename recent_topics templates.

This commit is contained in:
evykassirer 2023-09-06 14:35:51 -07:00 committed by Tim Abbott
parent 0b1a41ad09
commit d13a16055b
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/recent_view_ui.js
View File

@ -1,9 +1,9 @@
import $ from "jquery";
import _ from "lodash";
import render_recent_topic_row from "../templates/recent_topic_row.hbs";
import render_recent_topics_filters from "../templates/recent_topics_filters.hbs";
import render_recent_topics_body from "../templates/recent_topics_table.hbs";
import render_recent_view_filters from "../templates/recent_view_filters.hbs";
import render_recent_view_row from "../templates/recent_view_row.hbs";
import render_recent_view_body from "../templates/recent_view_table.hbs";
import render_user_with_status_icon from "../templates/user_with_status_icon.hbs";
import * as blueslip from "./blueslip";
@ -706,7 +706,7 @@ function show_selected_filters() {
}
export function update_filters_view() {
const rendered_filters = render_recent_topics_filters({
const rendered_filters = render_recent_view_filters({
filter_participated: filters.has("participated"),
filter_unread: filters.has("unread"),
filter_muted: filters.has("include_muted"),
@ -844,7 +844,7 @@ export function complete_rerender() {
return;
}
const rendered_body = render_recent_topics_body({
const rendered_body = render_recent_view_body({
filter_participated: filters.has("participated"),
filter_unread: filters.has("unread"),
filter_muted: filters.has("include_muted"),
@ -867,7 +867,7 @@ export function complete_rerender() {
get_item: ListWidget.default_get_item,
$parent_container: $("#recent_topics_table"),
modifier(item) {
return render_recent_topic_row(format_conversation(item));
return render_recent_view_row(format_conversation(item));
},
filter: {
// We use update_filters_view & filters_should_hide_topic to do all the

0
web/templates/recent_topics_filters.hbs → web/templates/recent_view_filters.hbs
View File

0
web/templates/recent_topic_row.hbs → web/templates/recent_view_row.hbs
View File

2
web/templates/recent_topics_table.hbs → web/templates/recent_view_table.hbs
View File

@ -1,6 +1,6 @@
<div id="recent_topics_filter_buttons" class="btn-group" role="group">
<div id="recent_filters_group">
{{> recent_topics_filters}}
{{> recent_view_filters}}
</div>
<div class="search_group" role="group">
<input type="text" id="recent_topics_search" class="filter_text_input" value="{{ search_val }}" autocomplete="off" placeholder="{{t 'Filter topics (t)' }}" />

44
web/tests/recent_topics.test.js
View File

@ -429,12 +429,12 @@ test("test_recent_topics_show", ({mock_template, override}) => {
is_spectator: false,
};
mock_template("recent_topics_table.hbs", false, (data) => {
mock_template("recent_view_table.hbs", false, (data) => {
assert.deepEqual(data, expected);
return "<recent_topics table stub>";
return "<recent_view table stub>";
});
mock_template("recent_topic_row.hbs", false, () => {});
mock_template("recent_view_row.hbs", false, () => {});
stub_out_filter_buttons();
// We don't test the css calls; we just skip over them.
@ -464,14 +464,14 @@ test("test_filter_all", ({mock_template}) => {
let row_data;
let i;
mock_template("recent_topics_table.hbs", false, (data) => {
mock_template("recent_view_table.hbs", false, (data) => {
assert.deepEqual(data, expected);
});
mock_template("recent_topic_row.hbs", false, (data) => {
mock_template("recent_view_row.hbs", false, (data) => {
i -= 1;
assert.deepEqual(data, row_data[i]);
return "<recent_topics row stub>";
return "<recent_view row stub>";
});
// topic is not muted
@ -523,7 +523,7 @@ test("test_filter_pm", ({mock_template}) => {
];
let i = 0;
mock_template("recent_topics_table.hbs", false, (data) => {
mock_template("recent_view_table.hbs", false, (data) => {
assert.deepEqual(data, expected);
});
@ -532,7 +532,7 @@ test("test_filter_pm", ({mock_template}) => {
i += 1;
});
mock_template("recent_topic_row.hbs", true, (_data, html) => {
mock_template("recent_view_row.hbs", true, (_data, html) => {
assert.ok(html.startsWith('<tr id="recent_conversation'));
});
@ -556,7 +556,7 @@ test("test_filter_unread", ({mock_template}) => {
let expected_filter_unread = false;
page_params.is_spectator = false;
mock_template("recent_topics_table.hbs", false, (data) => {
mock_template("recent_view_table.hbs", false, (data) => {
assert.deepEqual(data, {
filter_participated: false,
filter_unread: expected_filter_unread,
@ -567,10 +567,10 @@ test("test_filter_unread", ({mock_template}) => {
});
});
mock_template("recent_topics_filters.hbs", false, (data) => {
mock_template("recent_view_filters.hbs", false, (data) => {
assert.equal(data.filter_unread, expected_filter_unread);
assert.equal(data.filter_participated, false);
return "<recent_topics table stub>";
return "<recent_view table stub>";
});
let i = 0;
@ -587,13 +587,13 @@ test("test_filter_unread", ({mock_template}) => {
[1, "topic-1", 0, false],
]);
mock_template("recent_topic_row.hbs", false, (data) => {
mock_template("recent_view_row.hbs", false, (data) => {
// All the row will be processed.
if (row_data[i]) {
assert.deepEqual(data, row_data[i]);
i += 1;
}
return "<recent_topics row stub>";
return "<recent_view row stub>";
});
rt.clear_for_tests();
@ -678,7 +678,7 @@ test("test_filter_participated", ({mock_template}) => {
let expected_filter_participated;
page_params.is_spectator = false;
mock_template("recent_topics_table.hbs", false, (data) => {
mock_template("recent_view_table.hbs", false, (data) => {
assert.deepEqual(data, {
filter_participated: expected_filter_participated,
filter_unread: false,
@ -689,10 +689,10 @@ test("test_filter_participated", ({mock_template}) => {
});
});
mock_template("recent_topics_filters.hbs", false, (data) => {
mock_template("recent_view_filters.hbs", false, (data) => {
assert.equal(data.filter_unread, false);
assert.equal(data.filter_participated, expected_filter_participated);
return "<recent_topics table stub>";
return "<recent_view table stub>";
});
const row_data = generate_topic_data([
@ -708,13 +708,13 @@ test("test_filter_participated", ({mock_template}) => {
]);
let i = 0;
mock_template("recent_topic_row.hbs", false, (data) => {
mock_template("recent_view_row.hbs", false, (data) => {
// All the row will be processed.
if (row_data[i]) {
assert.deepEqual(data, row_data[i]);
i += 1;
}
return "<recent_topics row stub>";
return "<recent_view row stub>";
});
rt.clear_for_tests();
@ -814,8 +814,8 @@ test("basic assertions", ({mock_template, override_rewire}) => {
override_rewire(rt, "inplace_rerender", noop);
rt.clear_for_tests();
mock_template("recent_topics_table.hbs", false, () => {});
mock_template("recent_topic_row.hbs", true, (_data, html) => {
mock_template("recent_view_table.hbs", false, () => {});
mock_template("recent_view_row.hbs", true, (_data, html) => {
assert.ok(html.startsWith('<tr id="recent_conversation'));
});
@ -944,8 +944,8 @@ test("basic assertions", ({mock_template, override_rewire}) => {
});
test("test_reify_local_echo_message", ({mock_template}) => {
mock_template("recent_topics_table.hbs", false, () => {});
mock_template("recent_topic_row.hbs", false, () => {});
mock_template("recent_view_table.hbs", false, () => {});
mock_template("recent_view_row.hbs", false, () => {});
rt.clear_for_tests();
stub_out_filter_buttons();