paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 08:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

combined-feed-ui: Add placeholder text to empty combined feed.

Browse Source 
Also, added live update behaviour to the combined feed narrow.

Fixes #31602.
This commit is contained in:
Maneesh Shukla
2024-12-21 19:14:12 +05:30
committed by Tim Abbott
parent 99f3de5855
commit 28cbc498d7
3 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web/src/message_list.ts
View File

@@ -579,19 +579,17 @@ export class MessageList {
this.view.clear_rendering_state(false); this.view.clear_rendering_state(false);
this.view.update_render_window(this.selected_idx(), false); this.view.update_render_window(this.selected_idx(), false);
if (!this.is_combined_feed_view) { if (
if ( this.visibly_empty() &&
this.visibly_empty() && this.data.fetch_status.has_found_oldest() &&
this.data.fetch_status.has_found_oldest() && this.data.fetch_status.has_found_newest()
this.data.fetch_status.has_found_newest() ) {
) { // Show the empty narrow message only if we're certain
// Show the empty narrow message only if we're certain // that the view doesn't have messages that we're
// that the view doesn't have messages that we're // waiting for the server to send us.
// waiting for the server to send us. narrow_banner.show_empty_narrow_message();
narrow_banner.show_empty_narrow_message(); } else {
} else { narrow_banner.hide_empty_narrow_message();
narrow_banner.hide_empty_narrow_message();
}
} }
this.rerender_view(); this.rerender_view();
} }

22
web/src/narrow_banner.ts
View File

@@ -128,10 +128,28 @@ export function pick_empty_narrow_banner(): NarrowBannerData {
const default_banner_for_multiple_filters = $t({defaultMessage: "No search results."}); const default_banner_for_multiple_filters = $t({defaultMessage: "No search results."});
const current_filter = narrow_state.filter(); const current_filter = narrow_state.filter();
if (current_filter === undefined) {
if (current_filter === undefined || current_filter.is_in_home()) { // We're in either the inbox or recent conversations view.
return default_banner; return default_banner;
} }
if (current_filter.is_in_home()) {
// We're in the combined feed view.
return {
title: $t({defaultMessage: "There are no messages in your combined feed."}),
html: page_params.is_spectator
? ""
: $t_html(
{
defaultMessage:
"Would you like to <z-link>view messages in all public channels</z-link>?",
},
{
"z-link": (content_html) =>
`<a href="#narrow/channels/public">${content_html.join("")}</a>`,
},
),
};
}
const first_term = current_filter.terms()[0]!; const first_term = current_filter.terms()[0]!;
const current_terms_types = current_filter.sorted_term_types(); const current_terms_types = current_filter.sorted_term_types();

12
web/tests/message_view.test.cjs
View File

@@ -248,6 +248,18 @@ run_test("show_empty_narrow_message", ({mock_template, override}) => {
), ),
); );
// for empty combined feed
const current_filter = new Filter([{operator: "in", operand: "home"}]);
message_lists.set_current({data: {filter: current_filter}});
narrow_banner.show_empty_narrow_message();
assert.equal(
$(".empty_feed_notice_main").html(),
empty_narrow_html(
"translated: There are no messages in your combined feed.",
'translated HTML: Would you like to <a href="#narrow/channels/public">view messages in all public channels</a>?',
),
);
// for non-existent or private stream // for non-existent or private stream
set_filter([["stream", "999"]]); set_filter([["stream", "999"]]);
narrow_banner.show_empty_narrow_message(); narrow_banner.show_empty_narrow_message();