minor bug fixes and improvements

wso2 · Jul 1, 2024 · 156a656 · 156a656
1 parent 8449766
commit 156a656
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/.changeset/chilled-bats-taste.md b/.changeset/chilled-bats-taste.md
diff --git a/.changeset/tiny-dodos-press.md b/.changeset/tiny-dodos-press.md
@@ -0,0 +1,9 @@
+---
+"@wso2is/common.branding.v1": patch
+"@wso2is/admin.branding.v1": patch
+"@wso2is/identity-apps-core": patch
+"@wso2is/console": patch
+"@wso2is/i18n": patch
+---
+
+Add multi screen support for branding
diff --git a/...preview/sign-in-box/fragments/password-recovery/password-recovery-email-link-fragment.tsx b/...preview/sign-in-box/fragments/password-recovery/password-recovery-email-link-fragment.tsx
@@ -63,7 +63,7 @@ const PasswordRecoveryEmailLinkFragment: FunctionComponent<PasswordRecoveryEmail
                                             .TEXT_BUNDLE_KEYS.PASSWORD_RECOVERY
                                             .IDENTIFIER.INPUT.PLACEHOLDER, "Username")
                                     }
-                                    data-testid="login-page-username-input"
+                                    data-componentid="login-page-username-input"
                                 />
                                 <i aria-hidden="true" className="user outline icon"></i>
                                 <input id="username" name="username" type="hidden" />

diff --git a/...eview/sign-in-box/fragments/password-recovery/password-recovery-multi-option-fragment.tsx b/...eview/sign-in-box/fragments/password-recovery/password-recovery-multi-option-fragment.tsx
@@ -54,6 +54,10 @@ const PasswordRecoveryMultiOptionFragment: FunctionComponent<PasswordRecoveryMul
                     <div className="ui divider hidden"></div>
                     <div className="ui large form">
                         <div className="field">
+                            <label>
+                                { i18n(CustomTextPreferenceConstants.TEXT_BUNDLE_KEYS
+                                    .PASSWORD_RECOVERY.IDENTIFIER.INPUT.LABEL, "Username") }
+                            </label>
                             <div className="ui fluid left icon input">
                                 <input
                                     type="text"
@@ -64,7 +68,7 @@ const PasswordRecoveryMultiOptionFragment: FunctionComponent<PasswordRecoveryMul
                                             .TEXT_BUNDLE_KEYS.PASSWORD_RECOVERY
                                             .IDENTIFIER.INPUT.PLACEHOLDER, "Username")
                                     }
-                                    data-testid="login-page-username-input"
+                                    data-componentid="login-page-username-input"
                                 />
                                 <i aria-hidden="true" className="user outline icon"></i>
                                 <input id="username" name="username" type="hidden" />

diff --git a/features/admin.branding.v1/constants/custom-text-preference-constants.ts b/features/admin.branding.v1/constants/custom-text-preference-constants.ts
@@ -121,6 +121,7 @@ export class CustomTextPreferenceConstants {
             BODY: string;
             IDENTIFIER: {
                 INPUT: {
+                    LABEL: string;
                     PLACEHOLDER: string;
                 }
             };
@@ -180,12 +181,13 @@ export class CustomTextPreferenceConstants {
             BODY: "password.recovery.body",
             BUTTON: {
                 EMAIL_LINK: "password.recovery.button.email.link",
-                MULTI: "password.recovery.button.email.multi",
+                MULTI: "password.recovery.button.multi",
                 SMS_OTP: "password.recovery.button.smsotp"
             },
             HEADING: "password.recovery.heading",
             IDENTIFIER: {
                 INPUT: {
+                    LABEL: "Username",
                     PLACEHOLDER: "password.recovery.identifier.input.placeholder"
                 }
             },

diff --git a/identity-apps-core/apps/recovery-portal/src/main/webapp/password-recovery.jsp b/identity-apps-core/apps/recovery-portal/src/main/webapp/password-recovery.jsp
@@ -350,8 +350,7 @@
                                 <div class="ui radio checkbox">
                                     <input type="radio" name="recoveryOption" value="<%=EMAIL%>"
                                         <%=EMAIL.equals(selectedOption)?"checked":""%>/>
-                                    <label><%=IdentityManagementEndpointUtil.i18n(recoveryResourceBundle,
-                                        "send.email.link")%>
+                                    <label><%=i18n(recoveryResourceBundle, customText, "send.email.link")%>
                                     </label>
                                 </div>
                             </div>
@@ -363,8 +362,7 @@
                                 <div class="ui radio checkbox">
                                     <input type="radio" name="recoveryOption" value="<%=SMSOTP%>"
                                         <%=SMSOTP.equals(selectedOption)?"checked":""%>/>
-                                    <label><%=IdentityManagementEndpointUtil.i18n(recoveryResourceBundle,
-                                        "send.code.via.sms")%>
+                                    <label><%=i18n(recoveryResourceBundle, customText, "send.code.via.sms")%>
                                 </div>
                             </div>
                             <%
@@ -439,7 +437,8 @@
                         %>
                         <div class="mt-4">
                             <%
-                                String submitButtoni18nText = multipleRecoveryOptionsAvailable? "Submit" :
+                                String submitButtoni18nText =
+                                    multipleRecoveryOptionsAvailable? "password.recovery.button.multi" :
                                     ( isEmailRecoveryAvailable? "password.recovery.button.email.link" :
                                     ( isQuestionBasedPasswordRecoveryEnabledByTenant? "Recover.with.question" :
                                     ( isSMSRecoveryAvailable ? "password.recovery.button.smsotp" :
@@ -448,8 +447,7 @@
                             <button id="recoverySubmit"
                                     class="ui primary button large fluid"
                                     type="submit">
-                                    <%=IdentityManagementEndpointUtil.i18n(recoveryResourceBundle,
-                                        submitButtoni18nText)%>
+                                    <%=i18n(recoveryResourceBundle, customText, submitButtoni18nText)%>
                             </button>
                         </div>
                         <div class="mt-1 align-center">