Andal.LND/frontend-app-discussions
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: moved feedback form links to edx-internal

Browse Source
This commit is contained in:
Mehak Nasir
2022-09-16 16:15:56 +05:00
committed by Mehak Nasir
parent 0f56b492a0
commit ac6765bbbd
5 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -20,3 +20,5 @@ SEGMENT_KEY=''
SITE_NAME=''
USER_INFO_COOKIE_NAME=''
SUPPORT_URL=''
TA_FEEDBACK_FORM: ''
STAFF_FEEDBACK_FORM: ''

2
.env.development
View File

@@ -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'

2
.env.test
View File

@@ -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'

16
src/discussions/discussions-home/InformationBanner.test.jsx
View File

@@ -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);
});
});

28
src/discussions/discussions-home/InformationsBanner.jsx
View File

@@ -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({
>
<div style={{ fontWeight: '500' }}>
{intl.formatMessage(messages.bannerMessage)}
<Hyperlink
destination={learnMoreLink}
target="_blank"
showLaunchIcon={false}
className="px-2.5"
variant="muted"
isInline
>
{intl.formatMessage(messages.learnMoreBannerLink)}
</Hyperlink>
{!hideLearnMoreButton
&& (
<Hyperlink
destination={showStaffLink ? staffFeedbackLink : learnerFeedbackLink}
destination={learnMoreLink}
target="_blank"
showLaunchIcon={false}
className="px-2.5"
variant="muted"
isInline
>
{intl.formatMessage(messages.shareFeedback)}
{intl.formatMessage(messages.learnMoreBannerLink)}
</Hyperlink>
)}
<Hyperlink
destination={showStaffLink ? staffFeedbackLink : TAFeedbackLink}
target="_blank"
showLaunchIcon={false}
variant="muted"
isInline
>
{intl.formatMessage(messages.shareFeedback)}
</Hyperlink>
</div>
</PageBanner>
);