settings: Rename `user-list-admin` to `users`.

Renaming the url for better readability on the user's side.
We've also added a redirect for this, which will change the `section`
from `user-list-admin` to `users` whenever required.
See https://github.com/zulip/zulip/pull/30268#discussion_r1631539656
This commit is contained in:
Shubham Padia 2024-06-12 08:59:52 +00:00 committed by Tim Abbott
parent 9c47a7be28
commit e4c89771fd
14 changed files with 33 additions and 14 deletions

View File

@ -24,7 +24,7 @@ Organization administrators can always change any user's name.
{tab|via-organization-settings} {tab|via-organization-settings}
{settings_tab|user-list-admin} {settings_tab|users}
1. Find the user you would like to manage. Click the **pencil** 1. Find the user you would like to manage. Click the **pencil**
(<i class="fa fa-pencil"></i>) to the right of their name. (<i class="fa fa-pencil"></i>) to the right of their name.

View File

@ -48,7 +48,7 @@ When you deactivate a user:
{tab|via-organization-settings} {tab|via-organization-settings}
{settings_tab|user-list-admin} {settings_tab|users}
1. In the **Actions** column, click the **deactivate** (<i class="fa 1. In the **Actions** column, click the **deactivate** (<i class="fa
fa-user-times"></i>) icon for the user you want to deactivate. fa-user-times"></i>) icon for the user you want to deactivate.

View File

@ -107,7 +107,7 @@ GDPR:
* A Zulip user can change their profile information, delete their * A Zulip user can change their profile information, delete their
messages, uploaded files, etc., directly within the Zulip web app. messages, uploaded files, etc., directly within the Zulip web app.
* You can use the [organization users](/#organization/user-list-admin) * You can use the [organization users](/#organization/users)
panel to deactivate users, edit or delete their account details, panel to deactivate users, edit or delete their account details,
etc. etc.
* For complying with access requests, you'll want to start with that * For complying with access requests, you'll want to start with that

View File

@ -12,7 +12,7 @@
{tab|via-organization-settings} {tab|via-organization-settings}
{settings_tab|user-list-admin} {settings_tab|users}
1. Find the user you would like to manage. Click the **pencil** 1. Find the user you would like to manage. Click the **pencil**
(<i class="fa fa-pencil"></i>) to the right of their name. (<i class="fa fa-pencil"></i>) to the right of their name.

View File

@ -1,6 +1,6 @@
{start_tabs} {start_tabs}
{settings_tab|user-list-admin} {settings_tab|users}
1. Select the desired role from the dropdown above the **Users** table. 1. Select the desired role from the dropdown above the **Users** table.

View File

@ -12,7 +12,7 @@
{tab|via-organization-settings} {tab|via-organization-settings}
{settings_tab|user-list-admin} {settings_tab|users}
1. Find the user you would like to manage. Click the **pencil** 1. Find the user you would like to manage. Click the **pencil**
(<i class="fa fa-pencil"></i>) to the right of their name. (<i class="fa fa-pencil"></i>) to the right of their name.

View File

@ -14,7 +14,7 @@ async function navigate_to_user_list(page: Page): Promise<void> {
await page.click(organization_settings); await page.click(organization_settings);
await page.waitForSelector("#settings_overlay_container.show", {visible: true}); await page.waitForSelector("#settings_overlay_container.show", {visible: true});
await page.click("li[data-section='user-list-admin']"); await page.click("li[data-section='users']");
} }
async function user_row(page: Page, name: string): Promise<string> { async function user_row(page: Page, name: string): Promise<string> {

View File

@ -276,6 +276,10 @@ function do_hashchange_overlay(old_hash) {
// #settings/display-settings is being redirected to #settings/preferences. // #settings/display-settings is being redirected to #settings/preferences.
section = "preferences"; section = "preferences";
} }
if (section === "user-list-admin") {
// #settings/user-list-admin is being redirected to #settings/users after it was renamed.
section = "users";
}
if ((base === "settings" || base === "organization") && !section) { if ((base === "settings" || base === "organization") && !section) {
let settings_panel_object = settings_panel_menu.normal_settings; let settings_panel_object = settings_panel_menu.normal_settings;
if (base === "organization") { if (base === "organization") {

View File

@ -34,7 +34,7 @@ export function get_group(section) {
case "bot-list-admin": case "bot-list-admin":
return "org_bots"; return "org_bots";
case "user-list-admin": case "users":
case "deactivated-users-admin": case "deactivated-users-admin":
return "org_users"; return "org_users";

View File

@ -1 +1 @@
<a class="view-all-users-link" href="#organization/user-list-admin">{{t "View all users" }}</a> <a class="view-all-users-link" href="#organization/users">{{t "View all users" }}</a>

View File

@ -1,4 +1,4 @@
<div id="admin-user-list" class="settings-section" data-name="user-list-admin"> <div id="admin-user-list" class="settings-section" data-name="users">
<div class="clear-float"></div> <div class="clear-float"></div>

View File

@ -86,7 +86,7 @@
<i class="locked fa fa-lock tippy-zulip-tooltip" {{#if is_admin}}style="display: none;"{{/if}} data-tippy-content="{{t 'Only organization administrators can edit these settings.' }}"></i> <i class="locked fa fa-lock tippy-zulip-tooltip" {{#if is_admin}}style="display: none;"{{/if}} data-tippy-content="{{t 'Only organization administrators can edit these settings.' }}"></i>
</li> </li>
{{#unless is_guest}} {{#unless is_guest}}
<li tabindex="0" data-section="user-list-admin"> <li tabindex="0" data-section="users">
<i class="icon fa fa-user" aria-hidden="true"></i> <i class="icon fa fa-user" aria-hidden="true"></i>
<div class="text">{{t "Users" }}</div> <div class="text">{{t "Users" }}</div>
<i class="locked fa fa-lock tippy-zulip-tooltip" {{#if is_admin}}style="display: none;"{{/if}} data-tippy-content="{{t 'Only organization administrators can edit these settings.' }}"></i> <i class="locked fa fa-lock tippy-zulip-tooltip" {{#if is_admin}}style="display: none;"{{/if}} data-tippy-content="{{t 'Only organization administrators can edit these settings.' }}"></i>

View File

@ -361,7 +361,7 @@ run_test("hash_interactions", ({override, override_rewire}) => {
[settings, "launch"], [settings, "launch"],
]); ]);
window.location.hash = "#organization/user-list-admin"; window.location.hash = "#organization/users";
helper.clear_events(); helper.clear_events();
$window_stub.trigger("hashchange"); $window_stub.trigger("hashchange");
@ -369,7 +369,22 @@ run_test("hash_interactions", ({override, override_rewire}) => {
[overlays, "close_for_hash_change"], [overlays, "close_for_hash_change"],
[settings, "build_page"], [settings, "build_page"],
[admin, "build_page"], [admin, "build_page"],
[admin, "launch", ["user-list-admin"]], [admin, "launch", ["users"]],
]);
window.location.hash = "#organization/user-list-admin";
// Check whether `user-list-admin` is redirect to `users`, we
// cannot test the exact hashchange here, since the section url
// takes effect in `admin.launch` and that's why we're checking
// the arguments passed to `admin.launch`.
helper.clear_events();
$window_stub.trigger("hashchange");
helper.assert_events([
[overlays, "close_for_hash_change"],
[settings, "build_page"],
[admin, "build_page"],
[admin, "launch", ["users"]],
]); ]);
helper.clear_events(); helper.clear_events();

View File

@ -58,7 +58,7 @@ link_mapping = {
"Authentication methods", "Authentication methods",
"/#organization/auth-methods", "/#organization/auth-methods",
], ],
"user-list-admin": ["Organization settings", "Users", "/#organization/user-list-admin"], "users": ["Organization settings", "Users", "/#organization/users"],
"deactivated-users-admin": [ "deactivated-users-admin": [
"Organization settings", "Organization settings",
"Deactivated users", "Deactivated users",