Skip to content

Commit

Permalink
fix(UsersTable): mark remote users' registration as "Federated" inste…
Browse files Browse the repository at this point in the history
…ad of "Pending" (#33873)
  • Loading branch information
debdutdeb authored Dec 17, 2024
1 parent f750e21 commit f23e711
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .changeset/empty-pans-love.md
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.
30 changes: 24 additions & 6 deletions apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,40 @@ 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 (!active && lastLogin) {
return t('Deactivated');
}

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

if (!lastLogin && !usersExcludedFromPending.includes(type)) {
return t('Pending');
}

if (active && lastLogin) {
return t('Active');
}

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
Original file line number Diff line number Diff line change
Expand Up @@ -2428,6 +2428,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

0 comments on commit f23e711

Please sign in to comment.