Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: New users page deactivated tab and active tab ui #32032

Merged
merged 11 commits into from
Jul 30, 2024

Conversation

rique223
Copy link
Contributor

@rique223 rique223 commented Mar 19, 2024

Proposed changes (including videos or screenshots)

Implemented a new tab on the users page labeled 'Deactivated', which displays all users who have logged in for the first time but are deactivated for any reason. Additionally, a useMemo hook was applied to optimize the table action menu options. Logic was also integrated to exclusively present the 'Status Change' and 'Delete' options within the table and contextual bar menus when navigating within the 'Deactivated' and 'Pending' tabs. Also added the active tab ui code back as it got lost during the merge process of the previous PR:
Demo images:
image
image

Issue(s)

Steps to test or reproduce

Further comments

Related to: #30236
Old Jira task: WM-87
New Jira task for Conn: CONN-264

Copy link

changeset-bot bot commented Mar 19, 2024

🦋 Changeset detected

Latest commit: 2644f7b

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

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Minor
@rocket.chat/core-typings Minor
@rocket.chat/rest-typings Minor
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/fuselage-ui-kit Major
@rocket.chat/gazzodown Major
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Major
@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/api-client Patch
@rocket.chat/ddp-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Major
@rocket.chat/ui-client Major
@rocket.chat/ui-video-conf Major
@rocket.chat/web-ui-registration Major
@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

Copy link

codecov bot commented Mar 19, 2024

Codecov Report

Attention: Patch coverage is 69.23077% with 8 lines in your changes missing coverage. Please review.

Project coverage is 55.70%. Comparing base (d15d315) to head (2644f7b).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32032      +/-   ##
===========================================
- Coverage    55.74%   55.70%   -0.05%     
===========================================
  Files         2637     2637              
  Lines        57399    57404       +5     
  Branches     11892    11894       +2     
===========================================
- Hits         31997    31976      -21     
- Misses       22687    22715      +28     
+ Partials      2715     2713       -2     
Flag Coverage Δ
e2e 54.34% <69.23%> (-0.09%) ⬇️
unit 72.37% <ø> (+0.01%) ⬆️

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

@rique223 rique223 added this to the 7.0 milestone Mar 21, 2024
Copy link
Contributor

dionisio-bot bot commented Apr 8, 2024

Looks like this PR is not ready to merge, because of the following issues:

  • This PR is targeting the wrong base branch. It should target 6.12.0, but it targets 6.11.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

@rique223 rique223 removed this from the 7.0 milestone Apr 10, 2024
@rique223 rique223 force-pushed the feat/new-user-panel-active branch from 5e31c7a to c6e5b7f Compare June 24, 2024 23:18
@tassoevan tassoevan force-pushed the feat/new-user-panel-active branch from 66844ff to d315d45 Compare July 10, 2024 05:46
Base automatically changed from feat/new-user-panel-active to develop July 16, 2024 22:02
@rique223 rique223 force-pushed the feat/new-user-panel-deactivated branch from 8b92ea5 to 733c1a5 Compare July 17, 2024 20:00
@rique223 rique223 closed this Jul 17, 2024
@rique223 rique223 force-pushed the feat/new-user-panel-deactivated branch from 7cb7f3e to 7d12186 Compare July 17, 2024 22:43
@rique223 rique223 reopened this Jul 17, 2024
@rique223 rique223 closed this Jul 17, 2024
@rique223 rique223 force-pushed the feat/new-user-panel-deactivated branch from 733c1a5 to 7d12186 Compare July 17, 2024 22:47
@rique223 rique223 reopened this Jul 17, 2024
rique223 added 3 commits July 17, 2024 20:04
Implemented a new tab in the users page called 'deactivated' that will list all users who have logged in for the first time but are deactivated for any reason, also added a useMemo to the table action menu for optimization and added logic to only show the Status change and Delete options in the menus of the table and the contextual bar when inside the deactivated and pending tabs.
@rique223 rique223 force-pushed the feat/new-user-panel-deactivated branch from 7cb7f3e to eced9c5 Compare July 17, 2024 23:07
@rique223 rique223 changed the title feat: New users page deactivated tab feat: New users page deactivated tab and active tab ui Jul 17, 2024
rique223 added 2 commits July 17, 2024 21:50
Fixed an alignment problem in which the table menu would be shown a little higher than it should due to transforming the GenericTableCell into display flex. Also solved an issue with the pagination in which if you changed tabs the pagination offset would not be reset.
@rique223 rique223 added this to the 6.11 milestone Jul 18, 2024
@rique223 rique223 marked this pull request as ready for review July 19, 2024 14:43
@rique223 rique223 requested a review from a team as a code owner July 19, 2024 14:43
rique223 and others added 2 commits July 19, 2024 11:57
We should avoid add new types in core-typings that are only used for UI.
@tassoevan tassoevan requested a review from a team as a code owner July 22, 2024 23:20
@casalsgh casalsgh removed this from the 6.11 milestone Jul 23, 2024
tassoevan
tassoevan previously approved these changes Jul 23, 2024
@rique223 rique223 added this to the 6.12 milestone Jul 29, 2024
@rique223 rique223 added the stat: QA assured Means it has been tested and approved by a company insider label Jul 29, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jul 29, 2024
@rique223 rique223 removed stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge labels Jul 29, 2024
@rique223 rique223 added the stat: QA assured Means it has been tested and approved by a company insider label Jul 30, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jul 30, 2024
@kodiakhq kodiakhq bot merged commit ccf6ff4 into develop Jul 30, 2024
48 checks passed
@kodiakhq kodiakhq bot deleted the feat/new-user-panel-deactivated branch July 30, 2024 17:13
gabriellsh added a commit that referenced this pull request Jul 31, 2024
…ove/threadMetrics

* 'develop' of github.com:RocketChat/Rocket.Chat: (26 commits)
  chore: Bump rocket.chat to 6.12.0-develop (#32936)
  test: Move Jest configuration to a package of presets (#32802)
  chore: bump turbo (#32938)
  feat: New users page deactivated tab and active tab ui (#32032)
  chore: bump traefik (#32892)
  test: fix flaky test `Archive department` (#32933)
  fix(Livechat): `After Registration Triggers` showing in wrong screen (#32928)
  refactor: Remove deprecated `Options.AvatarSize` constant (#32909)
  chore: improve `on login` cached collection (#32929)
  i18n: Rocket.Chat language update from Lingohub 🤖 on 2024-07-25Z (#32908)
  refactor: Circular imports (#32885)
  regression: notify user properly on logout (#32920)
  chore(client): stop replacing  `Meteor.user` (#32910)
  regression: Messagebox sending message instead of just selecting popup suggestion (#32890)
  refactor: move broadcastMessageFromData to notifyListener (#32843)
  chore: prevent destructuring _id of deleted users (#32899)
  ci: increase kernel limits (#32902)
  ci: lint issues
  Release 6.10.1
  fix: imported fixes (#32894)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants