Skip to content

Commit

Permalink
fix: display programs only if the url is configured
Browse files Browse the repository at this point in the history
  • Loading branch information
dcoa committed Oct 18, 2024
1 parent a174abb commit 46e2e9a
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const getLearnerHeaderMenu = (
courseSearchUrl,
authenticatedUser,
exploreCoursesClick,
programsEnabled = false,
) => ({
mainMenu: [
{
Expand All @@ -17,11 +18,11 @@ const getLearnerHeaderMenu = (
content: formatMessage(messages.course),
isActive: true,
},
{
...(programsEnabled ? [{
type: 'item',
href: `${urls.programsUrl()}`,
content: formatMessage(messages.program),
},
}] : []),
{
type: 'item',
href: `${urls.baseAppUrl(courseSearchUrl)}`,
Expand Down Expand Up @@ -70,6 +71,7 @@ const getLearnerHeaderMenu = (
],
},
],
});
}
);

export default getLearnerHeaderMenu;
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ exports[`LearnerDashboardHeader render 1`] = `
"isActive": true,
"type": "item",
},
{
"content": "Programs",
"href": "http://localhost:18000/dashboard/programs",
"type": "item",
},
{
"content": "Discover New",
"href": "http://localhost:18000/course-search-url",
Expand Down
4 changes: 3 additions & 1 deletion src/containers/LearnerDashboardHeader/hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import track from 'tracking';
import { StrictDict } from 'utils';
import { linkNames } from 'tracking/constants';

import { apiHooks } from 'hooks';
import getLearnerHeaderMenu from './LearnerDashboardMenu';

import * as module from './hooks';
Expand All @@ -30,8 +31,9 @@ export const findCoursesNavDropdownClicked = (href) => track.findCourses.findCou
export const useLearnerDashboardHeaderMenu = ({
courseSearchUrl, authenticatedUser, exploreCoursesClick,
}) => {
const { enabled: programsEnabled } = apiHooks.useProgramsConfig();
const { formatMessage } = useIntl();
return getLearnerHeaderMenu(formatMessage, courseSearchUrl, authenticatedUser, exploreCoursesClick);
return getLearnerHeaderMenu(formatMessage, courseSearchUrl, authenticatedUser, exploreCoursesClick, programsEnabled);
};

export const useLearnerDashboardHeaderData = () => {
Expand Down
7 changes: 6 additions & 1 deletion src/containers/LearnerDashboardHeader/hooks.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ jest.mock('tracking', () => ({
findCoursesClicked: jest.fn(),
},
}));
jest.mock('hooks', () => ({
apiHooks: {
useProgramsConfig: jest.fn(() => ({})),
},
}));

const url = 'http://example.com';

Expand Down Expand Up @@ -56,7 +61,7 @@ describe('LearnerDashboardHeader hooks', () => {
username: 'test',
};
const learnerHomeHeaderMenu = useLearnerDashboardHeaderMenu({ courseSearchUrl, authenticatedUser });
expect(learnerHomeHeaderMenu.mainMenu.length).toBe(3);
expect(learnerHomeHeaderMenu.mainMenu.length).toBe(2);
});
});

Expand Down
12 changes: 11 additions & 1 deletion src/containers/LearnerDashboardHeader/index.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { shallow } from '@edx/react-unit-test-utils';
import Header from '@edx/frontend-component-header';

import urls from 'data/services/lms/urls';
import { apiHooks } from 'hooks';
import LearnerDashboardHeader from '.';
import { findCoursesNavClicked } from './hooks';

Expand All @@ -12,6 +13,9 @@ jest.mock('hooks', () => ({
courseSearchUrl: '/course-search-url',
})),
},
apiHooks: {
useProgramsConfig: jest.fn(() => ({})),
},
}));
jest.mock('./hooks', () => ({
...jest.requireActual('./hooks'),
Expand All @@ -29,7 +33,13 @@ describe('LearnerDashboardHeader', () => {
expect(wrapper.instance.findByType('ConfirmEmailBanner')).toHaveLength(1);
expect(wrapper.instance.findByType('MasqueradeBar')).toHaveLength(1);
expect(wrapper.instance.findByType(Header)).toHaveLength(1);
wrapper.instance.findByType(Header)[0].props.mainMenuItems[2].onClick();
wrapper.instance.findByType(Header)[0].props.mainMenuItems[1].onClick();
expect(findCoursesNavClicked).toHaveBeenCalledWith(urls.baseAppUrl('/course-search-url'));
expect(wrapper.instance.findByType(Header)[0].props.mainMenuItems.length).toBe(2);
});
test('should display Programs link if the service is configured in the backend', () => {
apiHooks.useProgramsConfig.mockReturnValue({ enabled: true });
const wrapper = shallow(<LearnerDashboardHeader />);
expect(wrapper.instance.findByType(Header)[0].props.mainMenuItems.length).toBe(3);
});
});
3 changes: 3 additions & 0 deletions src/data/services/lms/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export const initializeList = ({ user } = {}) => get(
stringifyUrl(urls.getInitApiUrl(), { [apiKeys.user]: user }),
);

export const getProgramsConfig = () => get(urls.programsConfigUrl());

export const updateEntitlementEnrollment = ({ uuid, courseId }) => post(
urls.entitlementEnrollment(uuid),
{ [apiKeys.courseRunId]: courseId },
Expand Down Expand Up @@ -73,6 +75,7 @@ export const createCreditRequest = ({ providerId, courseId, username }) => post(

export default {
initializeList,
getProgramsConfig,
unenrollFromCourse,
updateEmailSettings,
updateEntitlementEnrollment,
Expand Down
2 changes: 2 additions & 0 deletions src/data/services/lms/urls.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const baseAppUrl = (url) => updateUrl(getBaseUrl(), url);
export const learningMfeUrl = (url) => updateUrl(getConfig().LEARNING_BASE_URL, url);

// static view url
const programsConfigUrl = () => baseAppUrl('/config/programs');
const programsUrl = () => baseAppUrl('/dashboard/programs');

export const creditPurchaseUrl = (courseId) => `${getEcommerceUrl()}/credit/checkout/${courseId}/`;
Expand All @@ -37,6 +38,7 @@ export default StrictDict({
event,
getInitApiUrl,
learningMfeUrl,
programsConfigUrl,
programsUrl,
updateEmailSettings,
});
19 changes: 19 additions & 0 deletions src/hooks/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,25 @@ export const useInitializeApp = () => {
});
};

export const useProgramsConfig = () => {
const [config, setConfig] = React.useState({});

React.useEffect(() => {
const fetchProgramsConfig = async () => {
try {
const { data } = await api.getProgramsConfig();
setConfig(data);

Check warning on line 41 in src/hooks/api.js

View check run for this annotation

Codecov / codecov/patch

src/hooks/api.js#L41

Added line #L41 was not covered by tests
} catch (error) {
console.error('Error accessing programs configuration', error);

Check warning on line 43 in src/hooks/api.js

View workflow job for this annotation

GitHub Actions / tests (18)

Unexpected console statement

Check warning on line 43 in src/hooks/api.js

View workflow job for this annotation

GitHub Actions / tests (20)

Unexpected console statement
}
};

fetchProgramsConfig();
}, []);

return config;
};

export const useNewEntitlementEnrollment = (cardId) => {
const { uuid } = reduxHooks.useCardEntitlementData(cardId);
const onSuccess = module.useInitializeApp();
Expand Down

0 comments on commit 46e2e9a

Please sign in to comment.