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

stream: Show `(archived)` at the end of deactivated stream names. 

When a stream is deactivated the title area and messages are
re-rendered to update the stream name with `(archived)` suffix.
This commit is contained in:
sanchi-t 2024-01-28 00:52:27 +05:30 committed by Tim Abbott
parent 616e39c290
commit fa268877d3
14 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lib/capitalization.py
View File

@ -164,6 +164,8 @@ IGNORED_PHRASES = [
r"does not apply to users who can delete any message",
# Used as indicator with names for guest users.
r"guest",
# Used as indicator with names for archived streams.
r"archived",
# Used in pills for deactivated users.
r"deactivated",
# This is a reference to a setting/secret and should be lowercase.

2
web/src/inbox_ui.ts
View File

@ -71,6 +71,7 @@ const direct_message_context_properties: (keyof DirectMessageContext)[] = [
type StreamContext = {
is_stream: boolean;
is_archived: boolean;
invite_only: boolean;
is_web_public: boolean;
stream_name: string;
@ -372,6 +373,7 @@ function format_stream(stream_id: number): StreamContext {
return {
is_stream: true,
is_archived: stream_info.is_archived,
invite_only: stream_info.invite_only,
is_web_public: stream_info.is_web_public,
stream_name: stream_info.name,

2
web/src/message_list.ts
View File

@ -432,7 +432,7 @@ export class MessageList {
const is_web_public = sub?.is_web_public;
const can_toggle_subscription =
sub !== undefined && stream_data.can_toggle_subscription(sub);
if (sub === undefined) {
if (sub === undefined || sub.is_archived) {
deactivated = true;
} else if (!subscribed && !this.last_message_historical) {
just_unsubscribed = true;

3
web/src/message_list_view.ts
View File

@ -99,6 +99,7 @@ export type MessageGroup = {
stream_name?: string;
stream_privacy_icon_color: string;
stream_url: string;
is_archived: boolean;
subscribed?: boolean;
topic: string;
topic_is_resolved: boolean;
@ -468,6 +469,7 @@ function populate_group_from_message(
const topic = message.topic;
const match_topic = util.get_match_topic(message);
const stream_url = hash_util.by_stream_url(message.stream_id);
const is_archived = stream_data.is_stream_archived(message.stream_id);
const topic_url = hash_util.by_stream_topic_url(message.stream_id, message.topic);
const sub = sub_store.get(message.stream_id);
@ -508,6 +510,7 @@ function populate_group_from_message(
is_web_public,
match_topic,
stream_url,
is_archived,
topic_url,
stream_id,
is_subscribed,

1
web/src/server_events_dispatch.js
View File

@ -28,6 +28,7 @@ import * as message_edit from "./message_edit";
import * as message_events from "./message_events";
import * as message_lists from "./message_lists";
import * as message_live_update from "./message_live_update";
import * as message_view_header from "./message_view_header";
import * as muted_users_ui from "./muted_users_ui";
import * as narrow_state from "./narrow_state";
import * as narrow_title from "./narrow_title";

5
web/src/stream_data.ts
View File

@ -629,6 +629,11 @@ export function get_stream_privacy_policy(stream_id: number): string {
return settings_config.stream_privacy_policy_values.private_with_public_history.code;
}
export function is_stream_archived(stream_id: number): boolean {
const sub = sub_store.get(stream_id);
return sub ? sub.is_archived : false;
}
export function is_web_public(stream_id: number): boolean {
const sub = sub_store.get(stream_id);
return sub ? sub.is_web_public : false;

1
web/styles/app_variables.css
View File

@ -716,6 +716,7 @@
/* Text colors */
--color-text-default: hsl(0deg 0% 20%);
--color-text-message-default: hsl(0deg 0% 15%);
--color-text-message-header-archived: hsl(0deg 0% 50%);
--color-text-message-view-header: hsl(0deg 0% 20% / 100%);
--color-text-message-header: hsl(0deg 0% 15%);
/* Light and dark mode both use the same hover color on

4
web/styles/inbox.css
View File

@ -479,6 +479,10 @@
}
}
}
.inbox-header-stream-archived {
color: var(--color-text-message-header-archived);
}
}
#inbox-view {

9
web/styles/message_header.css
View File

@ -210,6 +210,15 @@
}
}
}
.message-header-stream-name {
overflow: hidden;
text-overflow: ellipsis;
}
.message-header-stream-archived {
color: var(--color-text-message-header-archived);
}
}
.recipient_bar_controls {

6
web/styles/message_view_header.css
View File

@ -66,6 +66,12 @@
text-overflow: ellipsis;
}
.message-header-archived {
color: var(--color-text-message-header-archived);
cursor: default;
padding-left: 5px;
}
.narrow_description {
/* Flexbox's baseline alignment is responsible for
matching the description's baseline to the title.

5
web/templates/inbox_view/inbox_stream_header_row.hbs
View File

@ -9,6 +9,11 @@
{{> ../stream_privacy }}
</span>
<a tabindex="-1" href="{{stream_url}}">{{stream_name}}</a>
{{#if is_archived}}
<span class="inbox-header-stream-archived">
<i class="archived-indicator">({{t 'archived' }})</i>
</span>
{{/if}}
</div>
</div>
<span class="unread_mention_info tippy-zulip-tooltip

6
web/templates/message_view_header.hbs
View File

@ -1,4 +1,5 @@
{{#if stream_settings_link}}
{{#unless stream.is_archived}}
<a class="message-header-stream-settings-button tippy-zulip-tooltip" data-tooltip-template-id="stream-details-tooltip-template" data-tippy-placement="bottom" href="{{stream_settings_link}}">
{{> navbar_icon_and_title }}
</a>
@ -12,6 +13,11 @@
{{/unless}}
</div>
</template>
{{else}}
<span class="navbar_title">
{{> navbar_icon_and_title }}
</span>
{{/unless}}
<span class="narrow_description rendered_markdown single-line-rendered-markdown">
{{#if rendered_narrow_description}}
{{rendered_markdown rendered_narrow_description}}

7
web/templates/navbar_icon_and_title.hbs
View File

@ -4,3 +4,10 @@
<i class="navbar-icon fa fa-{{icon}}" aria-hidden="true"></i>
{{/if}}
<span class="message-header-navbar-title">{{title}}</span>
{{#if stream}}
{{#if stream.is_archived}}
<span class="message-header-archived">
<i class="archived-indicator">({{t 'archived' }})</i>
</span>
{{/if}}
{{/if}}

7
web/templates/recipient_row.hbs
View File

@ -10,7 +10,12 @@
</span>
{{~! Recipient (e.g. stream/topic or topic) ~}}
{{~display_recipient~}}
<span class="message-header-stream-name">
{{~display_recipient~}}
</span>
{{#if is_archived}}
<span class="message-header-stream-archived"><i class="archived-indicator">({{t 'archived' }})</i></span>
{{/if}}
</a>
<span class="stream_topic_separator"><i class="zulip-icon zulip-icon-chevron-right"></i></span>