Skip to content

Commit 3d8c0fb

Browse files
authored
[Portal] Fix disabled-user warning and reword account lockout text #5723
ref DEV-3591, DEV-3592
2 parents 16c04f2 + 5be47f7 commit 3d8c0fb

2 files changed

Lines changed: 24 additions & 4 deletions

File tree

portal/src/graphql/adminapi/UserDetailsAccountStatus.tsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import OutlinedActionButton from "../../components/common/OutlinedActionButton";
2222
import PrimaryButton from "../../PrimaryButton";
2323
import DefaultButton from "../../DefaultButton";
2424
import TextField from "../../TextField";
25+
import ExternalLink from "../../ExternalLink";
2526
import ErrorDialog from "../../error/ErrorDialog";
2627
import { useSetDisabledStatusMutation } from "./mutations/setDisabledStatusMutation";
2728
import { useSetAccountValidPeriodMutation } from "./mutations/setAccountValidPeriodMutation";
@@ -829,6 +830,19 @@ const AccountLockoutCell: React.VFC<AccountLockoutCellProps> =
829830
<FormattedMessage id="UserDetailsAccountStatus.account-lockout.body--unlocked" />
830831
)}
831832
</Text>
833+
<Text variant="small" style={{ marginTop: "8px", display: "block" }}>
834+
<FormattedMessage
835+
id="UserDetailsAccountStatus.account-lockout.learn-more"
836+
values={{
837+
// eslint-disable-next-line react/no-unstable-nested-components
838+
docLink: (chunks: React.ReactNode) => (
839+
<ExternalLink href="https://docs.authgear.com/reference/rate-limits/account-lockout">
840+
{chunks}
841+
</ExternalLink>
842+
),
843+
}}
844+
/>
845+
</Text>
832846
</div>
833847
{lockout.isLocked ? (
834848
<OutlinedActionButton
@@ -1944,8 +1958,13 @@ export function AccountStatusMessageBar(
19441958
return null;
19451959
}
19461960

1961+
// delayedRender={false} avoids FluentUI's DelayedRender wrapper, which
1962+
// intermittently renders an empty bar when the parent form updates state
1963+
// during mount (e.g. when navigating back to a disabled user's detail page).
19471964
return (
1948-
<MessageBar messageBarType={MessageBarType.warning}>{message}</MessageBar>
1965+
<MessageBar messageBarType={MessageBarType.warning} delayedRender={false}>
1966+
{message}
1967+
</MessageBar>
19491968
);
19501969
}
19511970

portal/src/locale-data/en.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,11 +404,12 @@
404404
"UserDetailsAccountStatus.remove-user.action.remove-now": "Remove now",
405405
"UserDetailsAccountStatus.remove-user.action.cancel": "Cancel removal",
406406
"UserDetailsAccountStatus.account-lockout.title": "Account Lockout",
407-
"UserDetailsAccountStatus.account-lockout.body--unlocked": "The user's account is not locked and can log in normally.",
408-
"UserDetailsAccountStatus.account-lockout.body--locked-per-user": "The user's account is locked.",
409-
"UserDetailsAccountStatus.account-lockout.body--locked-per-ip": "The user's account is locked from specific IP addresses.",
407+
"UserDetailsAccountStatus.account-lockout.body--unlocked": "This user is not locked out due to failed sign-in attempts.",
408+
"UserDetailsAccountStatus.account-lockout.body--locked-per-user": "This user is locked out due to failed sign-in attempts.",
409+
"UserDetailsAccountStatus.account-lockout.body--locked-per-ip": "This user is locked out from specific IP addresses due to failed sign-in attempts.",
410410
"UserDetailsAccountStatus.account-lockout.locked-until": "Locked until {until}",
411411
"UserDetailsAccountStatus.account-lockout.locked-ips": "Locked IP Addresses",
412+
"UserDetailsAccountStatus.account-lockout.learn-more": "<docLink>Learn more about Account Lockout</docLink>",
412413
"UserDetailsAccountStatus.account-lockout.action.reset": "Reset account lockout",
413414
"UserDetailsAccountStatus.account-lockout.confirm-dialog.title": "Reset Account Lockout",
414415
"UserDetailsAccountStatus.account-lockout.confirm-dialog.description": "Are you sure you want to reset the account lockout for <strong>{username}</strong>? The user will be able to log in again.",

0 commit comments

Comments
 (0)