From 2becb41931d6743bad175db8a38c48cdbee61d52 Mon Sep 17 00:00:00 2001
From: Shubham Padia <shubham@zulip.com>
Date: Wed, 10 Jul 2024 09:12:55 +0000
Subject: [PATCH] settings_users: Reactivated user should not get un-greyed on
 sort.

On reactivate or deactivate, we add appropriate class through JQuery.
But that class only remains there until sort, on sort any of these added
classes will be removed. We did not face the problem of un-greying for
active users page, because deactivated_users class was added to the HTML
always if `is_active` was false for the user.
In this commit, we rename `reactivated_user` to `active-user` and this
class will be present for all active users, even on the active users
table. For the deactivated users table, we will have scoped css that
will grey out the row with `active-user` class.
---
 web/src/settings_users.js                  | 4 ++--
 web/styles/settings.css                    | 2 +-
 web/templates/settings/admin_user_list.hbs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/settings_users.js b/web/src/settings_users.js
index beced298eb..e691d0510f 100644
--- a/web/src/settings_users.js
+++ b/web/src/settings_users.js
@@ -97,7 +97,7 @@ export function update_view_on_deactivate(user_id) {
     $button.addClass("btn-warning reactivate");
     $button.removeClass("deactivate btn-danger");
     $button.empty().append($("<i>").addClass(["fa", "fa-user-plus"]).attr("aria-hidden", "true"));
-    $row.removeClass("reactivated_user");
+    $row.removeClass("active-user");
     $row.addClass("deactivated_user");
 
     should_redraw_active_users_list = true;
@@ -116,7 +116,7 @@ export function update_view_on_reactivate(user_id) {
     $button.removeClass("btn-warning reactivate");
     $button.empty().append($("<i>").addClass(["fa", "fa-user-times"]).attr("aria-hidden", "true"));
     $row.removeClass("deactivated_user");
-    $row.addClass("reactivated_user");
+    $row.addClass("active-user");
 
     should_redraw_active_users_list = true;
     should_redraw_deactivated_users_list = true;
diff --git a/web/styles/settings.css b/web/styles/settings.css
index 1ea2d682ca..616897d569 100644
--- a/web/styles/settings.css
+++ b/web/styles/settings.css
@@ -1966,7 +1966,7 @@ $option_title_width: 180px;
 }
 
 #admin_users_table .deactivated_user,
-#admin_deactivated_users_table .reactivated_user {
+#admin_deactivated_users_table .active-user {
     color: hsl(0deg 0% 64%);
 
     & a {
diff --git a/web/templates/settings/admin_user_list.hbs b/web/templates/settings/admin_user_list.hbs
index 34a4ce7205..d37390175d 100644
--- a/web/templates/settings/admin_user_list.hbs
+++ b/web/templates/settings/admin_user_list.hbs
@@ -1,4 +1,4 @@
-<tr class="user_row{{#unless is_active}} deactivated_user{{/unless}}" data-user-id="{{user_id}}">
+<tr class="user_row{{#if is_active}} active-user{{else}} deactivated_user{{/if}}" data-user-id="{{user_id}}">
     <td>
         <span class="user_name" >
             <a data-user-id="{{user_id}}" class="view_user_profile" tabindex="0">{{full_name}}</a>