fix: new user not moving from Pending to Deactivated tab in admin UI #35828

cardoso · 2025-04-16T20:32:02Z

Proposed changes (including videos or screenshots)

Issue(s)

SUP-775

Steps to test or reproduce

Create a new user in RC and do not log in with the user
In the Pending tab on the Users admin panel, confirm that the pending action for the user is “User first log in”
Deactivate that user

Expected Behavior

The user should be listed in the Deactivated tab on the Users admin panel and not the pending tab

Actual Behavior

The user is still listed in the pending tab

Further comments

This pull request addresses an issue in the Rocket.Chat admin UI where new users who have not logged in remain incorrectly listed under the "Pending" tab even after being deactivated. The changes involve updating the useFilteredUsers hook by adding a status field to the pending user payload. This modification ensures consistency with other user status definitions and corrects the behavior so that deactivated users are appropriately moved to the "Deactivated" tab.

dionisio-bot · 2025-04-16T20:32:07Z

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

changeset-bot · 2025-04-16T20:32:07Z

🦋 Changeset detected

Latest commit: f45913a

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 36 packages

Name	Type
@rocket.chat/meteor	Patch
@rocket.chat/core-typings	Patch
@rocket.chat/rest-typings	Patch
@rocket.chat/uikit-playground	Patch
@rocket.chat/api-client	Patch
@rocket.chat/apps	Patch
@rocket.chat/core-services	Patch
@rocket.chat/cron	Patch
@rocket.chat/ddp-client	Patch
@rocket.chat/freeswitch	Patch
@rocket.chat/fuselage-ui-kit	Patch
@rocket.chat/gazzodown	Patch
@rocket.chat/livechat	Patch
@rocket.chat/model-typings	Patch
@rocket.chat/ui-contexts	Patch
@rocket.chat/account-service	Patch
@rocket.chat/authorization-service	Patch
@rocket.chat/ddp-streamer	Patch
@rocket.chat/omnichannel-transcript	Patch
@rocket.chat/presence-service	Patch
@rocket.chat/queue-worker	Patch
@rocket.chat/stream-hub-service	Patch
@rocket.chat/license	Patch
@rocket.chat/omnichannel-services	Patch
@rocket.chat/pdf-worker	Patch
@rocket.chat/presence	Patch
rocketchat-services	Patch
@rocket.chat/models	Patch
@rocket.chat/network-broker	Patch
@rocket.chat/mock-providers	Patch
@rocket.chat/ui-avatar	Patch
@rocket.chat/ui-client	Patch
@rocket.chat/ui-video-conf	Patch
@rocket.chat/ui-voip	Patch
@rocket.chat/web-ui-registration	Patch
@rocket.chat/instance-status	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

kodus-ai · 2025-04-16T20:32:13Z

Kody Review Complete

Great news! 🎉
No issues were found that match your current review configurations.

Keep up the excellent work! 🚀

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

…-users-admin-panel

kodus-ai · 2025-04-16T20:42:43Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

kodus-ai · 2025-04-16T20:44:26Z

Kody Review Complete

Great news! 🎉
No issues were found that match your current review configurations.

Keep up the excellent work! 🚀

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

…-users-admin-panel

kodus-ai · 2025-04-16T21:08:14Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

codecov · 2025-04-16T21:26:24Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 64.79%. Comparing base (1a1fe46) to head (f45913a).
Report is 1 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #35828      +/-   ##
===========================================
+ Coverage    64.63%   64.79%   +0.15%     
===========================================
  Files         3244     3093     -151     
  Lines        95398    92144    -3254     
  Branches     17859    17516     -343     
===========================================
- Hits         61665    59709    -1956     
+ Misses       30841    29683    -1158     
+ Partials      2892     2752     -140

Flag	Coverage Δ
e2e	`58.18% <ø> (+0.09%)`	⬆️
unit	`71.92% <ø> (-0.03%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

…-users-admin-panel

kodus-ai · 2025-04-16T22:40:25Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

apps/meteor/tests/e2e/admin-users.spec.ts

…nto SUP-775-issue-with-the-pending-tab-in-the-users-admin-panel

kodus-ai · 2025-04-17T13:44:41Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

github-actions · 2025-04-17T13:57:55Z

PR Preview Action v1.6.1
🚀 View preview at https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-35828/
Built to branch `gh-pages` at 2025-05-09 03:06 UTC. Preview will be ready when the GitHub Pages deployment is complete.

yash-rajpal

Can we please wrap callbacks like beforeAll and afterAll inside a test.describe callback, to follow a set pattern? You can check other tests.

Changes made

…-users-admin-panel

.changeset/fuzzy-gifts-move.md

apps/meteor/tests/e2e/admin-users.spec.ts

…-users-admin-panel

Changes made

…-users-admin-panel

fix: new user not moving from Pending to Deactivated tab

ee9a8d6

cardoso self-assigned this Apr 16, 2025

Merge branch 'develop' into SUP-775-issue-with-the-pending-tab-in-the…

e75ab0e

…-users-admin-panel

chore: add changeset file

8632e27

Merge branch 'develop' into SUP-775-issue-with-the-pending-tab-in-the…

4f6331c

…-users-admin-panel

cardoso marked this pull request as ready for review April 16, 2025 21:08

cardoso requested a review from a team as a code owner April 16, 2025 21:08

cardoso removed their assignment Apr 16, 2025

cardoso added 2 commits April 16, 2025 19:39

test: expect not visible after activated/deactivated

0fd5b72

Merge branch 'develop' into SUP-775-issue-with-the-pending-tab-in-the…

cb2cef9

…-users-admin-panel

scuciatto added this to the 7.7.0 milestone Apr 17, 2025

yash-rajpal reviewed Apr 17, 2025

View reviewed changes

apps/meteor/tests/e2e/admin-users.spec.ts Outdated Show resolved Hide resolved

Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…

b8c79b4

…nto SUP-775-issue-with-the-pending-tab-in-the-users-admin-panel

chore: modify test to use rest API to create a new user

95d4139

cardoso requested a review from yash-rajpal April 17, 2025 14:26

yash-rajpal previously requested changes Apr 17, 2025

View reviewed changes

cardoso added 2 commits April 18, 2025 14:15

chore: add top-level describe to test

139303d

chore: adhere to test pattern

f078b18

cardoso requested a review from yash-rajpal April 18, 2025 17:29

cardoso added 2 commits April 20, 2025 14:59

Merge branch 'develop' into SUP-775-issue-with-the-pending-tab-in-the…

4f00e43

…-users-admin-panel

Merge branch 'develop' into SUP-775-issue-with-the-pending-tab-in-the…

9bbd80d

…-users-admin-panel

MarcosSpessatto previously requested changes Apr 24, 2025

View reviewed changes

.changeset/fuzzy-gifts-move.md Outdated Show resolved Hide resolved

apps/meteor/tests/e2e/admin-users.spec.ts Outdated Show resolved Hide resolved

cardoso added 2 commits April 24, 2025 16:41

chore: improve changeset & test

8a0d9ed

Merge branch 'develop' into SUP-775-issue-with-the-pending-tab-in-the…

d8012a5

…-users-admin-panel

cardoso requested a review from MarcosSpessatto April 24, 2025 19:50

cardoso added 3 commits April 25, 2025 15:35

Merge branch 'develop' into SUP-775-issue-with-the-pending-tab-in-the…

ab5b502

…-users-admin-panel

Merge branch 'develop' into SUP-775-issue-with-the-pending-tab-in-the…

851cdf6

…-users-admin-panel

Merge branch 'develop' into SUP-775-issue-with-the-pending-tab-in-the…

a020fd7

…-users-admin-panel

MarcosSpessatto approved these changes May 6, 2025

View reviewed changes

yash-rajpal approved these changes May 8, 2025

View reviewed changes

scuciatto added the stat: QA assured Means it has been tested and approved by a company insider label May 9, 2025

dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label May 9, 2025

Merge branch 'develop' into SUP-775-issue-with-the-pending-tab-in-the…

f45913a

…-users-admin-panel

kodiakhq bot merged commit 079dcda into develop May 9, 2025
48 checks passed

kodiakhq bot deleted the SUP-775-issue-with-the-pending-tab-in-the-users-admin-panel branch May 9, 2025 10:34

rocketchat-github-ci mentioned this pull request May 20, 2025

Release 7.7.0 #36031

Open

cardoso mentioned this pull request May 28, 2025

fix: pending count in users admin panel #36104

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: new user not moving from Pending to Deactivated tab in admin UI #35828

fix: new user not moving from Pending to Deactivated tab in admin UI #35828

Uh oh!

cardoso commented Apr 16, 2025 •

edited by dougfabris

Loading

Uh oh!

dionisio-bot bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

changeset-bot bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

kodus-ai bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

kodus-ai bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

kodus-ai bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

kodus-ai bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

codecov bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

kodus-ai bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

Uh oh!

kodus-ai bot commented Apr 17, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Apr 17, 2025 •

edited

Loading

Built to branch `gh-pages` at 2025-05-09 03:06 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

Uh oh!

yash-rajpal left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fix: new user not moving from Pending to Deactivated tab in admin UI #35828

fix: new user not moving from Pending to Deactivated tab in admin UI #35828

Uh oh!

Conversation

cardoso commented Apr 16, 2025 • edited by dougfabris Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Expected Behavior

Actual Behavior

Further comments

Uh oh!

dionisio-bot bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

kodus-ai bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Kody Review Complete

Uh oh!

kodus-ai bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

kodus-ai bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Kody Review Complete

Uh oh!

kodus-ai bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

codecov bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

kodus-ai bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

Uh oh!

kodus-ai bot commented Apr 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

github-actions bot commented Apr 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Built to branch gh-pages at 2025-05-09 03:06 UTC. Preview will be ready when the GitHub Pages deployment is complete.

Uh oh!

yash-rajpal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cardoso commented Apr 16, 2025 •

edited by dougfabris

Loading

dionisio-bot bot commented Apr 16, 2025 •

edited

Loading

changeset-bot bot commented Apr 16, 2025 •

edited

Loading

kodus-ai bot commented Apr 16, 2025 •

edited

Loading

kodus-ai bot commented Apr 16, 2025 •

edited

Loading

kodus-ai bot commented Apr 16, 2025 •

edited

Loading

kodus-ai bot commented Apr 16, 2025 •

edited

Loading

codecov bot commented Apr 16, 2025 •

edited

Loading

kodus-ai bot commented Apr 16, 2025 •

edited

Loading

kodus-ai bot commented Apr 17, 2025 •

edited

Loading

github-actions bot commented Apr 17, 2025 •

edited

Loading

Built to branch `gh-pages` at 2025-05-09 03:06 UTC.
Preview will be ready when the GitHub Pages deployment is complete.