Skip to content

fix(UsersTable): mark remote users' registration as "Federated" instead of "Pending" #33873

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.

Sign up for GitHub

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

Merged
kodiakhq merged 6 commits into from
Dec 17, 2024
Merged

fix(UsersTable): mark remote users' registration as "Federated" instead of "Pending" #33873

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e275ea3
change federated user status to "Federated"
debdutdeb Nov 4, 2024
06fd424
lint baby
debdutdeb Nov 4, 2024
0a3557c
Create empty-pans-love.md
debdutdeb Nov 4, 2024
b4c0810
mark federated users deactivated on the ui
debdutdeb Dec 9, 2024
3a4c017
Merge branch 'develop' into SUP-630
debdutdeb Dec 9, 2024
94c2e04
Merge branch 'develop' into SUP-630
casalsgh Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/empty-pans-love.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/i18n": patch
---

Fixes the incorrect registration status shown on admin users page for federated remote users.
22 changes: 20 additions & 2 deletions apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,28 @@ const UsersTableRow = ({
}: UsersTableRowProps): ReactElement => {
const { t } = useTranslation();

const { _id, emails, username = '', name = '', roles, status, active, avatarETag, lastLogin, type, freeSwitchExtension } = user;
const {
_id,
emails,
username = '',
name = '',
roles,
status,
active,
avatarETag,
lastLogin,
type,
freeSwitchExtension,
federated,
} = user;

const registrationStatusText = useMemo(() => {
const usersExcludedFromPending = ['bot', 'app'];

if (federated) {
return t('Federated');
}

if (!lastLogin && !usersExcludedFromPending.includes(type)) {
return t('Pending');
}
Expand All @@ -57,7 +75,7 @@ const UsersTableRow = ({
if (!active && lastLogin) {
return t('Deactivated');
}
}, [active, lastLogin, t, type]);
}, [active, lastLogin, t, type, federated]);

const roleNames = (roles || [])
.map((roleId) => (Roles.findOne(roleId, { fields: { name: 1 } }) as IRole | undefined)?.name)
Expand Down
1 change: 1 addition & 0 deletions packages/i18n/src/locales/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2405,6 +2405,7 @@
"Federation_Matrix_serve_well_known_Alert": "Keep this off if using DNS srv records for federation, or use a reverse proxy to return static JSON if federation traffic is heavy. <a target=\"_blank\" href=\"https://matrix-org.github.io/synapse/latest/federate.html\">Read mode</a>.",
"Federation_Matrix_check_configuration": "Verify configuration",
"Federation_Matrix_configuration_status": "Configuration status",
"Federated": "Federated",
"Field": "Field",
"Field_removed": "Field removed",
"Field_required": "Field required",
Expand Down