paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

inbox_ui: Show unread @-mention indicator for DMs in inbox view.

Browse Source 
Earlier, only unread @-mentions in streams were shown in inbox view
while DMs lacked this indicators.

This commit introduces unread @-mention indicators for DM rows in inbox
view using `unread_mention_dms` which stores `user_ids_string` mapped to
`message_id`s having mention.

Fixes part of zulip#28849.
This commit is contained in:
Pratik Chanda
2024-08-25 04:22:29 +05:30
committed by Tim Abbott
parent 224024e683
commit 05fbee9f5a
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/inbox_ui.ts
View File

@@ -51,6 +51,7 @@ type DirectMessageContext = {
is_collapsed: boolean;
latest_msg_id: number;
column_indexes: typeof COLUMNS;
has_unread_mention: boolean;
};
const direct_message_context_properties: (keyof DirectMessageContext)[] = [
@@ -300,6 +301,7 @@ function format_dm(
is_bot = people.get_by_user_id(recipient_ids[0]).is_bot;
user_circle_class = is_bot ? false : buddy_data.get_user_circle_class(recipient_ids[0]);
}
const has_unread_mention = unread.num_unread_mentions_for_user_ids_strings(user_ids_string) > 0;
const context = {
conversation_key: user_ids_string,
@@ -315,6 +317,7 @@ function format_dm(
is_collapsed: collapsed_containers.has("inbox-dm-header"),
latest_msg_id,
column_indexes: COLUMNS,
has_unread_mention,
};
return context;
@@ -588,6 +591,7 @@ function reset_data(): {
is_dms_collapsed: boolean;
has_dms_post_filter: boolean;
has_visible_unreads: boolean;
has_unread_mention: boolean;
} {
dms_dict = new Map();
topics_dict = new Map();
@@ -596,6 +600,7 @@ function reset_data(): {
const unread_dms = unread.get_unread_pm();
const unread_dms_count = unread_dms.total_count;
const unread_dms_dict = unread_dms.pm_dict;
const has_unread_mention = unread.num_unread_mentions_in_dms() > 0;
const unread_stream_message = unread.get_unread_topics();
const unread_stream_msg_count = unread_stream_message.stream_unread_messages;
@@ -637,6 +642,7 @@ function reset_data(): {
const is_dms_collapsed = collapsed_containers.has("inbox-dm-header");
return {
has_unread_mention,
unread_dms_count,
is_dms_collapsed,
has_dms_post_filter,
@@ -1240,6 +1246,7 @@ export function update(): void {
const unread_dms = unread.get_unread_pm();
const unread_dms_count = unread_dms.total_count;
const unread_dms_dict = unread_dms.pm_dict;
const has_unread_mention = unread.num_unread_mentions_in_dms() > 0;
const unread_stream_message = unread.get_unread_topics();
const unread_streams_dict = unread_stream_message.topic_counts;
@@ -1273,6 +1280,7 @@ export function update(): void {
} else {
$inbox_dm_header.removeClass("hidden_by_filters");
$inbox_dm_header.find(".unread_count").text(unread_dms_count);
$inbox_dm_header.find(".unread_mention_info").toggleClass("hidden", !has_unread_mention);
}
let has_topics_post_filter = false;

3
web/templates/inbox_view/inbox_list.hbs
View File

@@ -9,6 +9,9 @@
<a tabindex="-1" role="button" href="/#narrow/is/private">{{t 'Direct messages'}}</a>
</div>
</div>
<span class="unread_mention_info tippy-zulip-tooltip
{{#unless has_unread_mention}}hidden{{/unless}}"
data-tippy-content="{{t 'You have unread mentions' }}">@</span>
<div class="unread-count-focus-outline" tabindex="0">
<span class="unread_count tippy-zulip-tooltip on_hover_all_dms_read"
data-tippy-content="{{t 'Mark as read' }}"

3
web/templates/inbox_view/inbox_row.hbs
View File

@@ -19,6 +19,9 @@
<span class="recipients_name">{{{rendered_dm_with}}}</span>
</span>
</a>
<span class="unread_mention_info tippy-zulip-tooltip
{{#unless has_unread_mention}}hidden{{/unless}}"
data-tippy-content="{{t 'You have unread mentions' }}">@</span>
<div class="unread-count-focus-outline" tabindex="0" data-col-index="{{ column_indexes.UNREAD_COUNT }}">
<span class="unread_count tippy-zulip-tooltip on_hover_dm_read"
data-user-ids-string="{{user_ids_string}}" data-tippy-content="{{t 'Mark as read' }}"