From 2bee6f38d740a856dc76d451a16ad6ec39a1322e Mon Sep 17 00:00:00 2001 From: ayesha waris <73840786+ayesha-waris@users.noreply.github.com> Date: Tue, 3 Jun 2025 18:01:45 +0500 Subject: [PATCH] refactor: moved hardcoded support urls to constants (#1260) Co-authored-by: Ayesha Waris --- .env | 6 ++++- .env.development | 6 ++++- .../delete-account/DeleteAccount.jsx | 6 ++--- .../delete-account/PrintingInstructions.jsx | 2 +- .../__snapshots__/DeleteAccount.test.jsx.snap | 23 ++----------------- src/id-verification/panels/SummaryPanel.jsx | 2 +- src/index.jsx | 5 ++++ 7 files changed, 22 insertions(+), 28 deletions(-) diff --git a/.env b/.env index 402b896..862afa2 100644 --- a/.env +++ b/.env @@ -31,6 +31,10 @@ MARKETING_EMAILS_OPT_IN='' APP_ID= MFE_CONFIG_API_URL= PASSWORD_RESET_SUPPORT_LINK='' +SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='' +ACCOUNT_BASICS_SUPPORT_URL='' +EMAIL_CONFIRMATION_SUPPORT_URL='' +CERTIFICATES_SUPPORT_URL='' +LEARNER_SUPPORT_URL='' LEARNER_FEEDBACK_URL='' -SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://help.edx.org/edxlearner/s/article/How-do-I-link-or-unlink-my-edX-account-to-a-social-media-account' COUNTRIES_WITH_DELETE_ACCOUNT_DISABLED='[]' diff --git a/.env.development b/.env.development index 7abc30d..b84f0a3 100644 --- a/.env.development +++ b/.env.development @@ -33,5 +33,9 @@ APP_ID= MFE_CONFIG_API_URL= PASSWORD_RESET_SUPPORT_LINK='mailto:support@example.com' LEARNER_FEEDBACK_URL='' -SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://help.edx.org/edxlearner/s/article/How-do-I-link-or-unlink-my-edX-account-to-a-social-media-account' +SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='' +ACCOUNT_BASICS_SUPPORT_URL='' +EMAIL_CONFIRMATION_SUPPORT_URL='' +CERTIFICATES_SUPPORT_URL='' +LEARNER_SUPPORT_URL='' COUNTRIES_WITH_DELETE_ACCOUNT_DISABLED='[]' diff --git a/src/account-settings/delete-account/DeleteAccount.jsx b/src/account-settings/delete-account/DeleteAccount.jsx index 51d3fc7..3984ac0 100644 --- a/src/account-settings/delete-account/DeleteAccount.jsx +++ b/src/account-settings/delete-account/DeleteAccount.jsx @@ -59,7 +59,7 @@ export class DeleteAccount extends React.Component { hasLinkedTPA, isVerifiedAccount, status, errorType, intl, } = this.props; const canDelete = isVerifiedAccount && !hasLinkedTPA; - const supportArticleUrl = process.env.SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT; + const supportArticleUrl = getConfig().SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT; // TODO: We lack a good way of providing custom language for a particular site. This is a hack // to allow edx.org to fulfill its business requirements. @@ -102,7 +102,7 @@ export class DeleteAccount extends React.Component { )}

- + {intl.formatMessage(messages['account.settings.delete.account.text.change.instead'])}

@@ -118,7 +118,7 @@ export class DeleteAccount extends React.Component { {isVerifiedAccount ? null : ( )} {hasLinkedTPA ? ( diff --git a/src/account-settings/delete-account/PrintingInstructions.jsx b/src/account-settings/delete-account/PrintingInstructions.jsx index 788eb59..26c0772 100644 --- a/src/account-settings/delete-account/PrintingInstructions.jsx +++ b/src/account-settings/delete-account/PrintingInstructions.jsx @@ -11,7 +11,7 @@ const PrintingInstructions = (props) => { // TODO: What would a generic version of this link look like? Should // CERTIFICATE_SHARING_HELP_URL really be a configuration variable? In the meantime, // We've removed the link from the default message. - destination="https://help.edx.org/edxlearner/s/topic/0TOQq0000001UVVOA2/certificates" + destination={getConfig().CERTIFICATES_SUPPORT_URL} > {props.intl.formatMessage(messages['account.settings.delete.account.text.3.link'])} diff --git a/src/account-settings/delete-account/__snapshots__/DeleteAccount.test.jsx.snap b/src/account-settings/delete-account/__snapshots__/DeleteAccount.test.jsx.snap index d2585a0..2b7ad30 100644 --- a/src/account-settings/delete-account/__snapshots__/DeleteAccount.test.jsx.snap +++ b/src/account-settings/delete-account/__snapshots__/DeleteAccount.test.jsx.snap @@ -27,7 +27,6 @@ exports[`DeleteAccount should match default section snapshot 1`] = `

Want to change your email, name, or password instead? @@ -73,7 +72,6 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `

Want to change your email, name, or password instead? @@ -112,15 +110,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `

- Before proceeding, please - - activate your account - - . + Before proceeding, please activate your account.
@@ -153,7 +143,6 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `

Want to change your email, name, or password instead? @@ -192,15 +181,7 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `

- Before proceeding, please - - unlink all social media accounts - - . + Before proceeding, please unlink all social media accounts.
diff --git a/src/id-verification/panels/SummaryPanel.jsx b/src/id-verification/panels/SummaryPanel.jsx index cd5e81e..b0449c1 100644 --- a/src/id-verification/panels/SummaryPanel.jsx +++ b/src/id-verification/panels/SummaryPanel.jsx @@ -130,7 +130,7 @@ const SummaryPanel = (props) => { `} values={{ support_link: ( - + {props.intl.formatMessage( messages['id.verification.review.error'], { siteName: getConfig().SITE_NAME }, diff --git a/src/index.jsx b/src/index.jsx index 14c1906..b6f2daa 100755 --- a/src/index.jsx +++ b/src/index.jsx @@ -72,6 +72,11 @@ initialize({ ENABLE_DOB_UPDATE: (process.env.ENABLE_DOB_UPDATE || false), MARKETING_EMAILS_OPT_IN: (process.env.MARKETING_EMAILS_OPT_IN || false), PASSWORD_RESET_SUPPORT_LINK: process.env.PASSWORD_RESET_SUPPORT_LINK, + SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT: process.env.SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT, + ACCOUNT_BASICS_SUPPORT_URL: process.env.ACCOUNT_BASICS_SUPPORT_URL, + EMAIL_CONFIRMATION_SUPPORT_URL: process.env.EMAIL_CONFIRMATION_SUPPORT_URL, + CERTIFICATES_SUPPORT_URL: process.env.CERTIFICATES_SUPPORT_URL, + LEARNER_SUPPORT_URL: process.env.LEARNER_SUPPORT_URL, LEARNER_FEEDBACK_URL: process.env.LEARNER_FEEDBACK_URL, }, 'App loadConfig override handler'); },