Skip to content

fix: hoist static InfoLabel JSX to module scope #10547

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

Open
Pravinath wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: hoist static InfoLabel JSX to module scope #10547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions ...in.applications.v1/components/settings/sign-on-methods/step-based-flow/authenticators.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ import { ApplicationManagementConstants } from "../../../../constants/applicatio
import { AuthenticationStepInterface } from "../../../../models/application";
import { SignInMethodUtils } from "../../../../utils/sign-in-method-utils";

const INFO_LABEL: JSX.Element = (
<Label attached="top">
<Icon name="info circle" /> Info
</Label>
);

/**
* Proptypes for the authenticators component.
*/
Expand Down Expand Up @@ -187,12 +193,6 @@ export const Authenticators: FunctionComponent<AuthenticatorsPropsInterface> = (
* @returns React element.
*/
const resolvePopupContent = (authenticator: GenericAuthenticatorInterface): ReactElement => {
const InfoLabel: JSX.Element = (
<Label attached="top">
<Icon name="info circle" /> Info
</Label>
);

if (
authenticator.category === AuthenticatorCategories.SECOND_FACTOR ||
authenticator.category === AuthenticatorCategories.TWO_FACTOR_CUSTOM
Expand All @@ -201,7 +201,7 @@ export const Authenticators: FunctionComponent<AuthenticatorsPropsInterface> = (
<>
{ currentStep === 0 ? (
<Fragment>
{ InfoLabel }
{ INFO_LABEL }
<Text>
{ applicationConfig.signInMethod.authenticatorSelection.messages
.secondFactorDisabledInFirstStep ??
Expand All @@ -214,7 +214,7 @@ export const Authenticators: FunctionComponent<AuthenticatorsPropsInterface> = (
</Fragment>
) : (
<Fragment>
{ InfoLabel }
{ INFO_LABEL }
<Text>
{ applicationConfig.signInMethod.authenticatorSelection.messages
.secondFactorDisabled ?? (
Expand Down Expand Up @@ -244,7 +244,7 @@ export const Authenticators: FunctionComponent<AuthenticatorsPropsInterface> = (
<>
{ currentStep === 0 ? (
<Fragment>
{ InfoLabel }
{ INFO_LABEL }
<Text>
{ t(
"applications:edit.sections" +
Expand All @@ -255,7 +255,7 @@ export const Authenticators: FunctionComponent<AuthenticatorsPropsInterface> = (
</Fragment>
) : (
<Fragment>
{ InfoLabel }
{ INFO_LABEL }
<Text>
{ t(
"applications:edit.sections" +
Expand All @@ -270,7 +270,7 @@ export const Authenticators: FunctionComponent<AuthenticatorsPropsInterface> = (
} else if (authenticator.category === AuthenticatorCategories.SOCIAL) {
return (
<Fragment>
{ InfoLabel }
{ INFO_LABEL }
<Text>
{ t(
"applications:edit.sections.signOnMethod.sections." +
Expand All @@ -291,7 +291,7 @@ export const Authenticators: FunctionComponent<AuthenticatorsPropsInterface> = (

return (
<Fragment>
{ InfoLabel }
{ INFO_LABEL }
<Text>
{
t(
Expand All @@ -307,7 +307,7 @@ export const Authenticators: FunctionComponent<AuthenticatorsPropsInterface> = (
.ACTIVE_SESSION_LIMIT_HANDLER_AUTHENTICATOR_NAME) {
return (
<Fragment>
{ InfoLabel }
{ INFO_LABEL }
<Text>
{
(authenticationSteps[currentStep]?.options?.length !== 0)
Expand Down