fix: select session workflow (#59)

This commit is contained in:
Ben Warzeski
2022-11-01 14:14:07 -04:00
committed by GitHub
parent 0badf690a6
commit c8b729a65d
10 changed files with 106 additions and 87 deletions

View File

@@ -1,6 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import { useDispatch } from 'react-redux';
import { Button } from '@edx/paragon';
import { useIntl } from '@edx/frontend-platform/i18n';
@@ -13,8 +12,7 @@ export const SelectSessionButton = ({ cardId }) => {
const { canChange, hasSessions } = hooks.useCardEntitlementData(cardId);
const { isMasquerading } = hooks.useMasqueradeData();
const { formatMessage } = useIntl();
const dispatch = useDispatch();
const openSessionModal = hooks.useUpdateSelectSessionModalCallback(dispatch, cardId);
const openSessionModal = hooks.useUpdateSelectSessionModalCallback(cardId);
return (
<Button
disabled={isMasquerading || !hasAccess || (!canChange || !hasSessions)}

View File

@@ -1,6 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import { useDispatch } from 'react-redux';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Button, MailtoLink } from '@edx/paragon';
@@ -12,7 +11,6 @@ import Banner from 'components/Banner';
import messages from './messages';
export const EntitlementBanner = ({ cardId }) => {
const dispatch = useDispatch();
const {
isEntitlement,
hasSessions,
@@ -22,7 +20,7 @@ export const EntitlementBanner = ({ cardId }) => {
isExpired,
} = appHooks.useCardEntitlementData(cardId);
const { supportEmail } = appHooks.usePlatformSettingsData();
const openSessionModal = appHooks.useUpdateSelectSessionModalCallback(dispatch, cardId);
const openSessionModal = appHooks.useUpdateSelectSessionModalCallback(cardId);
const { formatMessage } = useIntl();
const formatDate = useFormatDate();

View File

@@ -1,6 +1,5 @@
import React from 'react';
import { shallow } from 'enzyme';
import { useDispatch } from 'react-redux';
import { hooks as appHooks } from 'data/redux';
import EntitlementBanner from './EntitlementBanner';
@@ -11,7 +10,7 @@ jest.mock('data/redux', () => ({
usePlatformSettingsData: jest.fn(),
useCardEntitlementData: jest.fn(),
useUpdateSelectSessionModalCallback: jest.fn(
(_, cardId) => jest.fn().mockName(`updateSelectSessionModalCallback(${cardId})`),
(cardId) => jest.fn().mockName(`updateSelectSessionModalCallback(${cardId})`),
),
},
}));
@@ -36,13 +35,11 @@ const render = (overrides = {}) => {
el = shallow(<EntitlementBanner cardId={cardId} />);
};
const dispatch = useDispatch();
describe('EntitlementBanner', () => {
test('initializes data with course number from entitlement', () => {
render();
expect(appHooks.useCardEntitlementData).toHaveBeenCalledWith(cardId);
expect(appHooks.useUpdateSelectSessionModalCallback).toHaveBeenCalledWith(dispatch, cardId);
expect(appHooks.useUpdateSelectSessionModalCallback).toHaveBeenCalledWith(cardId);
});
test('no display if not an entitlement', () => {
render({ entitlement: { isEntitlement: false } });

View File

@@ -37,7 +37,7 @@ export const useAccessMessage = ({ cardId }) => {
return null;
};
export const useCardDetailsData = ({ dispatch, cardId }) => {
export const useCardDetailsData = ({ cardId }) => {
const { formatMessage } = useIntl();
const providerName = appHooks.useCardProviderData(cardId).name;
const { courseNumber } = appHooks.useCardCourseData(cardId);
@@ -47,7 +47,7 @@ export const useCardDetailsData = ({ dispatch, cardId }) => {
canChange,
} = appHooks.useCardEntitlementData(cardId);
const openSessionModal = appHooks.useUpdateSelectSessionModalCallback(dispatch, cardId);
const openSessionModal = appHooks.useUpdateSelectSessionModalCallback(cardId);
return {
providerName: providerName || formatMessage(messages.unknownProviderName),

View File

@@ -1,6 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import { useDispatch } from 'react-redux';
import { Button } from '@edx/paragon';
@@ -8,7 +7,6 @@ import useCardDetailsData from './hooks';
import './index.scss';
export const CourseCardDetails = ({ cardId }) => {
const dispatch = useDispatch();
const {
providerName,
accessMessage,
@@ -18,7 +16,7 @@ export const CourseCardDetails = ({ cardId }) => {
openSessionModal,
courseNumber,
changeOrLeaveSessionMessage,
} = useCardDetailsData({ cardId, dispatch });
} = useCardDetailsData({ cardId });
return (
<span className="small" data-testid="CourseCardDetails">

View File

@@ -71,17 +71,17 @@ export const CourseCardMenu = ({ cardId }) => {
)}
*/}
{twitter.isEnabled && (
<ReactShare.TwitterShareButton
url={twitter.shareUrl}
title={formatMessage(messages.shareQuote, {
courseName,
socialBrand: twitter.socialBrand,
})}
resetButtonStyle={false}
className="pgn__dropdown-item dropdown-item"
>
{formatMessage(messages.shareToTwitter)}
</ReactShare.TwitterShareButton>
<ReactShare.TwitterShareButton
url={twitter.shareUrl}
title={formatMessage(messages.shareQuote, {
courseName,
socialBrand: twitter.socialBrand,
})}
resetButtonStyle={false}
className="pgn__dropdown-item dropdown-item"
>
{formatMessage(messages.shareToTwitter)}
</ReactShare.TwitterShareButton>
)}
</Dropdown.Menu>
</Dropdown>