diff --git a/.env b/.env index dfe6dc50..8ef3c4cc 100644 --- a/.env +++ b/.env @@ -20,3 +20,5 @@ SEGMENT_KEY='' SITE_NAME='' USER_INFO_COOKIE_NAME='' SUPPORT_URL='' +TA_FEEDBACK_FORM: '' +STAFF_FEEDBACK_FORM: '' diff --git a/.env.development b/.env.development index 81bd9d4a..b335b76e 100644 --- a/.env.development +++ b/.env.development @@ -21,3 +21,5 @@ SEGMENT_KEY='' SITE_NAME=localhost USER_INFO_COOKIE_NAME='edx-user-info' SUPPORT_URL='https://support.edx.org' +TA_FEEDBACK_FORM: 'https://learner-form.test' +STAFF_FEEDBACK_FORM: 'https://staff-form.test' \ No newline at end of file diff --git a/.env.test b/.env.test index dc866adc..1747a171 100644 --- a/.env.test +++ b/.env.test @@ -19,3 +19,5 @@ SEGMENT_KEY='' SITE_NAME=localhost USER_INFO_COOKIE_NAME='edx-user-info' SUPPORT_URL='https://support.edx.org' +TA_FEEDBACK_FORM: 'https://learner-form.test' +STAFF_FEEDBACK_FORM: 'https://staff-form.test' \ No newline at end of file diff --git a/src/discussions/discussions-home/InformationBanner.test.jsx b/src/discussions/discussions-home/InformationBanner.test.jsx index fa90cd3d..098ea0d0 100644 --- a/src/discussions/discussions-home/InformationBanner.test.jsx +++ b/src/discussions/discussions-home/InformationBanner.test.jsx @@ -59,11 +59,11 @@ describe('Information Banner learner view', () => { expect(element).toHaveTextContent(messages.bannerMessage.defaultMessage); }); - test('Test Banner has learn more button', async () => { - expect(element).toHaveTextContent(messages.learnMoreBannerLink.defaultMessage); + test('Test Banner do not have learn more button', async () => { + expect(element).not.toHaveTextContent(messages.learnMoreBannerLink.defaultMessage); }); - test('Test Banner do not have share feedback button', async () => { - expect(element).not.toHaveTextContent(messages.shareFeedback.defaultMessage); + test('Test Banner has share feedback button', async () => { + expect(element).toHaveTextContent(messages.shareFeedback.defaultMessage); }); }); @@ -92,12 +92,12 @@ describe('Information Banner moderators/staff/admin view', () => { test('Test Banner has learn more button', async () => { expect(element).toHaveTextContent(messages.learnMoreBannerLink.defaultMessage); }); - test('Test Banner do not have share feedback button', async () => { + test('Test Banner has share feedback button', async () => { expect(element).toHaveTextContent(messages.shareFeedback.defaultMessage); }); }); -describe('User id redirected according to url according to role', () => { +describe('User is redirected according to url according to role', () => { beforeEach(async () => { initializeMockApp({ authenticatedUser: { @@ -115,7 +115,7 @@ describe('User id redirected according to url according to role', () => { renderComponent(true); expect(screen.getByText(messages.shareFeedback.defaultMessage) .closest('a')) - .toHaveAttribute('href', 'https://forms.gle/foGYYQjHZfWTzBiR8'); + .toHaveAttribute('href', process.env.TA_FEEDBACK_FORM); }); test('admin/moderators are redirected to moderators feedback form', async () => { @@ -123,6 +123,6 @@ describe('User id redirected according to url according to role', () => { renderComponent(true); expect(screen.getByText(messages.shareFeedback.defaultMessage) .closest('a')) - .toHaveAttribute('href', 'https://forms.gle/APn3k39QHmieLfJaA'); + .toHaveAttribute('href', process.env.STAFF_FEEDBACK_FORM); }); }); diff --git a/src/discussions/discussions-home/InformationsBanner.jsx b/src/discussions/discussions-home/InformationsBanner.jsx index 312ed220..bf893e06 100644 --- a/src/discussions/discussions-home/InformationsBanner.jsx +++ b/src/discussions/discussions-home/InformationsBanner.jsx @@ -15,8 +15,8 @@ function InformationBanner({ const userRoles = useSelector(selectUserRoles); const isAdmin = useSelector(selectUserIsStaff); const learnMoreLink = 'https://openedx.atlassian.net/wiki/spaces/COMM/pages/3509551260/Overview+New+discussions+experience'; - const learnerFeedbackLink = 'https://forms.gle/foGYYQjHZfWTzBiR8'; - const staffFeedbackLink = 'https://forms.gle/APn3k39QHmieLfJaA'; + const TAFeedbackLink = process.env.TA_FEEDBACK_FORM || 'https://test-ta-feedback'; + const staffFeedbackLink = process.env.STAFF_FEEDBACK_FORM || 'https://test-staff-feedback'; const hideLearnMoreButton = ((userRoles.includes('Student') && userRoles.length === 1) || !userRoles.length) && !isAdmin; const showStaffLink = !hideLearnMoreButton && (userRoles.includes('Moderator') || userRoles.includes('Administrator')); @@ -29,28 +29,28 @@ function InformationBanner({ >
{intl.formatMessage(messages.bannerMessage)} - - {intl.formatMessage(messages.learnMoreBannerLink)} - {!hideLearnMoreButton && ( - {intl.formatMessage(messages.shareFeedback)} + {intl.formatMessage(messages.learnMoreBannerLink)} )} + + {intl.formatMessage(messages.shareFeedback)} +
);