From fb8e747a84eadeecb2362ae7d77dbf53cb5ff854 Mon Sep 17 00:00:00 2001 From: Lauryn Menard Date: Thu, 13 Mar 2025 22:32:50 +0100 Subject: [PATCH] user-settings: Update tooltips for user and bot cases. Updates the classes that are being set on the deactivate and reactivate user buttons so that we can show better tooltips when the user is a bot. --- web/src/settings_users.ts | 16 +++++++++++++++- web/src/tippyjs.ts | 10 ++++++++-- .../settings/settings_user_list_row.hbs | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/web/src/settings_users.ts b/web/src/settings_users.ts index c6df42794e..5a0baa6187 100644 --- a/web/src/settings_users.ts +++ b/web/src/settings_users.ts @@ -124,7 +124,14 @@ export function update_view_on_deactivate(user_id: number, is_bot: boolean): voi $button.prop("disabled", false); $row.find("i.deactivated-user-icon").show(); $button.addClass("button-warning reactivate"); - $button.removeClass("deactivate button-danger"); + $button.removeClass("button-danger deactivate"); + if (is_bot) { + $button.addClass("reactivate-bot-tooltip"); + $button.removeClass("deactivate-bot-tooltip"); + } else { + $button.addClass("reactivate-user-tooltip"); + $button.removeClass("deactivate-user-tooltip"); + } $button.empty().append($("").addClass(["fa", "fa-user-plus"]).attr("aria-hidden", "true")); $row.removeClass("active-user"); $row.addClass("deactivated_user"); @@ -151,6 +158,13 @@ export function update_view_on_reactivate(user_id: number, is_bot: boolean): voi $row.find("i.deactivated-user-icon").hide(); $button.addClass("button-danger deactivate"); $button.removeClass("button-warning reactivate"); + if (is_bot) { + $button.addClass("deactivate-bot-tooltip"); + $button.removeClass("reactivate-bot-tooltip"); + } else { + $button.addClass("deactivate-user-tooltip"); + $button.removeClass("reactivate-user-tooltip"); + } $button.empty().append($("").addClass(["fa", "fa-user-times"]).attr("aria-hidden", "true")); $row.removeClass("deactivated_user"); $row.addClass("active-user"); diff --git a/web/src/tippyjs.ts b/web/src/tippyjs.ts index a4ee20dde1..7ffbe53061 100644 --- a/web/src/tippyjs.ts +++ b/web/src/tippyjs.ts @@ -507,12 +507,18 @@ export function initialize(): void { target: ".user_row .actions button", trigger: "mouseenter", onShow(instance) { - if ($(instance.reference).hasClass("deactivate")) { + if ($(instance.reference).hasClass("deactivate-user-tooltip")) { instance.setContent($t({defaultMessage: "Deactivate user"})); return undefined; - } else if ($(instance.reference).hasClass("reactivate")) { + } else if ($(instance.reference).hasClass("reactivate-user-tooltip")) { instance.setContent($t({defaultMessage: "Reactivate user"})); return undefined; + } else if ($(instance.reference).hasClass("deactivate-bot-tooltip")) { + instance.setContent($t({defaultMessage: "Deactivate bot"})); + return undefined; + } else if ($(instance.reference).hasClass("reactivate-bot-tooltip")) { + instance.setContent($t({defaultMessage: "Reactivate bot"})); + return undefined; } return false; }, diff --git a/web/templates/settings/settings_user_list_row.hbs b/web/templates/settings/settings_user_list_row.hbs index 4f72afe7c9..cb9f1bca38 100644 --- a/web/templates/settings/settings_user_list_row.hbs +++ b/web/templates/settings/settings_user_list_row.hbs @@ -46,12 +46,12 @@ {{#if is_active}} - {{else}} - {{/if}}