paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 15:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

topic_popover: Convert module to TypeScript.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2024-11-27 18:10:32 -08:00
committed by Tim Abbott
parent 5d94541b6d
commit d8d8e620e7
6 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/test-js-with-node
View File

@@ -255,7 +255,7 @@ EXEMPT_FILES = make_set(
"web/src/tippyjs.ts", "web/src/tippyjs.ts",
"web/src/todo_widget.ts", "web/src/todo_widget.ts",
"web/src/topic_list.ts", "web/src/topic_list.ts",
"web/src/topic_popover.js", "web/src/topic_popover.ts",
"web/src/typing.ts", "web/src/typing.ts",
"web/src/typing_events.ts", "web/src/typing_events.ts",
"web/src/ui_init.js", "web/src/ui_init.js",

4
web/src/message_edit.ts
View File

@@ -785,7 +785,7 @@ export function toggle_resolve_topic(
message_id: number, message_id: number,
old_topic_name: string, old_topic_name: string,
report_errors_in_global_banner: boolean, report_errors_in_global_banner: boolean,
$row: JQuery, $row?: JQuery,
): void { ): void {
let new_topic_name; let new_topic_name;
const topic_is_resolved = resolved_topic.is_resolved(old_topic_name); const topic_is_resolved = resolved_topic.is_resolved(old_topic_name);
@@ -826,7 +826,7 @@ function do_toggle_resolve_topic(
new_topic_name: string, new_topic_name: string,
topic_is_resolved: boolean, topic_is_resolved: boolean,
report_errors_in_global_banner: boolean, report_errors_in_global_banner: boolean,
$row: JQuery, $row?: JQuery,
): void { ): void {
if ($row) { if ($row) {
show_toggle_resolve_topic_spinner($row); show_toggle_resolve_topic_spinner($row);

2
web/src/stream_popover.ts
View File

@@ -342,7 +342,7 @@ export async function build_move_topic_to_stream_popover(
current_stream_id: number, current_stream_id: number,
topic_name: string, topic_name: string,
only_topic_edit: boolean, only_topic_edit: boolean,
message: Message | undefined, message?: Message,
): Promise<void> { ): Promise<void> {
const current_stream_name = sub_store.get(current_stream_id)!.name; const current_stream_name = sub_store.get(current_stream_id)!.name;
const args: { const args: {

87
web/src/topic_popover.js → web/src/topic_popover.ts
View File

@@ -1,5 +1,7 @@
import ClipboardJS from "clipboard"; import ClipboardJS from "clipboard";
import $ from "jquery"; import $ from "jquery";
import assert from "minimalistic-assert";
import type * as tippy from "tippy.js";
import render_delete_topic_modal from "../templates/confirm_dialog/confirm_delete_topic.hbs"; import render_delete_topic_modal from "../templates/confirm_dialog/confirm_delete_topic.hbs";
import render_left_sidebar_topic_actions_popover from "../templates/popovers/left_sidebar/left_sidebar_topic_actions_popover.hbs"; import render_left_sidebar_topic_actions_popover from "../templates/popovers/left_sidebar/left_sidebar_topic_actions_popover.hbs";
@@ -17,7 +19,32 @@ import * as unread_ops from "./unread_ops.ts";
import * as user_topics from "./user_topics.ts"; import * as user_topics from "./user_topics.ts";
import * as util from "./util.ts"; import * as util from "./util.ts";
export function initialize() { function get_conversation(instance: tippy.Instance): {
stream_id: number;
topic_name: string;
url: string;
} {
let stream_id;
let topic_name;
let url;
if (instance.reference.classList.contains("inbox-topic-menu")) {
const $elt = $(instance.reference);
stream_id = Number.parseInt($elt.attr("data-stream-id")!, 10);
topic_name = $elt.attr("data-topic-name")!;
url = new URL($elt.attr("data-topic-url")!, realm.realm_url).href;
} else {
const $elt = $(instance.reference).closest(".topic-sidebar-menu-icon").expectOne();
const $stream_li = $elt.closest(".narrow-filter").expectOne();
topic_name = $elt.closest("li").expectOne().attr("data-topic-name")!;
url = util.the($elt.closest("li").find<HTMLAnchorElement>("a.sidebar-topic-name")).href;
stream_id = stream_popover.elem_to_stream_id($stream_li);
}
return {stream_id, topic_name, url};
}
export function initialize(): void {
popover_menus.register_popover_menu( popover_menus.register_popover_menu(
"#stream_filters .topic-sidebar-menu-icon, .inbox-row .inbox-topic-menu", "#stream_filters .topic-sidebar-menu-icon, .inbox-row .inbox-topic-menu",
{ {
@@ -26,37 +53,17 @@ export function initialize() {
popover_menus.popover_instances.topics_menu = instance; popover_menus.popover_instances.topics_menu = instance;
ui_util.show_left_sidebar_menu_icon(instance.reference); ui_util.show_left_sidebar_menu_icon(instance.reference);
popover_menus.on_show_prep(instance); popover_menus.on_show_prep(instance);
let stream_id;
let topic_name;
let url;
if (instance.reference.classList.contains("inbox-topic-menu")) { const context = popover_menus_data.get_topic_popover_content_context(
const $elt = $(instance.reference); get_conversation(instance),
stream_id = Number.parseInt($elt.attr("data-stream-id"), 10); );
topic_name = $elt.attr("data-topic-name");
url = new URL($elt.attr("data-topic-url"), realm.realm_url);
} else {
const $elt = $(instance.reference)
.closest(".topic-sidebar-menu-icon")
.expectOne();
const $stream_li = $elt.closest(".narrow-filter").expectOne();
topic_name = $elt.closest("li").expectOne().attr("data-topic-name");
url = $elt.closest("li").find(".sidebar-topic-name").expectOne().prop("href");
stream_id = stream_popover.elem_to_stream_id($stream_li);
}
instance.context = popover_menus_data.get_topic_popover_content_context({
stream_id,
topic_name,
url,
});
instance.setContent( instance.setContent(
ui_util.parse_html(render_left_sidebar_topic_actions_popover(instance.context)), ui_util.parse_html(render_left_sidebar_topic_actions_popover(context)),
); );
}, },
onMount(instance) { onMount(instance) {
const $popper = $(instance.popper); const $popper = $(instance.popper);
const {stream_id, topic_name} = instance.context; const {stream_id, topic_name} = get_conversation(instance);
if (!stream_id) { if (!stream_id) {
popover_menus.hide_current_popover_if_visible(instance); popover_menus.hide_current_popover_if_visible(instance);
@@ -66,11 +73,11 @@ export function initialize() {
$popper.on("change", "input[name='sidebar-topic-visibility-select']", (e) => { $popper.on("change", "input[name='sidebar-topic-visibility-select']", (e) => {
const start_time = Date.now(); const start_time = Date.now();
const visibility_policy = Number.parseInt( const visibility_policy = Number.parseInt(
$(e.currentTarget).attr("data-visibility-policy"), $(e.currentTarget).attr("data-visibility-policy")!,
10, 10,
); );
const success_cb = () => { const success_cb = (): void => {
setTimeout( setTimeout(
() => { () => {
popover_menus.hide_current_popover_if_visible(instance); popover_menus.hide_current_popover_if_visible(instance);
@@ -79,7 +86,7 @@ export function initialize() {
); );
}; };
const error_cb = () => { const error_cb = (): void => {
const prev_visibility_policy = user_topics.get_topic_visibility_policy( const prev_visibility_policy = user_topics.get_topic_visibility_policy(
stream_id, stream_id,
topic_name, topic_name,
@@ -108,10 +115,7 @@ export function initialize() {
}); });
$popper.one("click", ".sidebar-popover-unstar-all-in-topic", () => { $popper.one("click", ".sidebar-popover-unstar-all-in-topic", () => {
starred_messages_ui.confirm_unstar_all_messages_in_topic( starred_messages_ui.confirm_unstar_all_messages_in_topic(stream_id, topic_name);
Number.parseInt(stream_id, 10),
topic_name,
);
popover_menus.hide_current_popover_if_visible(instance); popover_menus.hide_current_popover_if_visible(instance);
}); });
@@ -142,6 +146,7 @@ export function initialize() {
$popper.one("click", ".sidebar-popover-toggle-resolved", () => { $popper.one("click", ".sidebar-popover-toggle-resolved", () => {
message_edit.with_first_message_id(stream_id, topic_name, (message_id) => { message_edit.with_first_message_id(stream_id, topic_name, (message_id) => {
assert(message_id !== undefined);
message_edit.toggle_resolve_topic(message_id, topic_name, true); message_edit.toggle_resolve_topic(message_id, topic_name, true);
}); });
@@ -149,16 +154,24 @@ export function initialize() {
}); });
$popper.one("click", ".sidebar-popover-move-topic-messages", () => { $popper.one("click", ".sidebar-popover-move-topic-messages", () => {
stream_popover.build_move_topic_to_stream_popover(stream_id, topic_name, false); void stream_popover.build_move_topic_to_stream_popover(
stream_id,
topic_name,
false,
);
popover_menus.hide_current_popover_if_visible(instance); popover_menus.hide_current_popover_if_visible(instance);
}); });
$popper.one("click", ".sidebar-popover-rename-topic-messages", () => { $popper.one("click", ".sidebar-popover-rename-topic-messages", () => {
stream_popover.build_move_topic_to_stream_popover(stream_id, topic_name, true); void stream_popover.build_move_topic_to_stream_popover(
stream_id,
topic_name,
true,
);
popover_menus.hide_current_popover_if_visible(instance); popover_menus.hide_current_popover_if_visible(instance);
}); });
new ClipboardJS($popper.find(".sidebar-popover-copy-link-to-topic")[0]).on( new ClipboardJS(util.the($popper.find(".sidebar-popover-copy-link-to-topic"))).on(
"success", "success",
() => { () => {
popover_menus.hide_current_popover_if_visible(instance); popover_menus.hide_current_popover_if_visible(instance);
@@ -167,7 +180,7 @@ export function initialize() {
}, },
onHidden(instance) { onHidden(instance) {
instance.destroy(); instance.destroy();
popover_menus.popover_instances.topics_menu = undefined; popover_menus.popover_instances.topics_menu = null;
ui_util.hide_left_sidebar_menu_icon(); ui_util.hide_left_sidebar_menu_icon();
}, },
}, },

2
web/src/ui_init.js
View File

@@ -133,7 +133,7 @@ import * as thumbnail from "./thumbnail.ts";
import * as timerender from "./timerender.ts"; import * as timerender from "./timerender.ts";
import * as tippyjs from "./tippyjs.ts"; import * as tippyjs from "./tippyjs.ts";
import * as topic_list from "./topic_list.ts"; import * as topic_list from "./topic_list.ts";
import * as topic_popover from "./topic_popover.js"; import * as topic_popover from "./topic_popover.ts";
import * as transmit from "./transmit.js"; import * as transmit from "./transmit.js";
import * as typeahead_helper from "./typeahead_helper.ts"; import * as typeahead_helper from "./typeahead_helper.ts";
import * as typing from "./typing.ts"; import * as typing from "./typing.ts";

2
web/src/ui_util.ts
View File

@@ -202,7 +202,7 @@ export function listener_for_preferred_color_scheme_change(callback: () => void)
} }
// Keep the menu icon over which the popover is based off visible. // Keep the menu icon over which the popover is based off visible.
export function show_left_sidebar_menu_icon(element: HTMLElement): void { export function show_left_sidebar_menu_icon(element: Element): void {
$(element).closest(".sidebar-menu-icon").addClass("left_sidebar_menu_icon_visible"); $(element).closest(".sidebar-menu-icon").addClass("left_sidebar_menu_icon_visible");
} }