diff --git a/.env b/.env index 7c46f29..8a98641 100644 --- a/.env +++ b/.env @@ -41,5 +41,4 @@ ACCOUNT_PROFILE_URL='' ENABLE_NOTICES='' CAREER_LINK_URL='' OPTIMIZELY_FULL_STACK_SDK_KEY='' -EXPERIMENT_08_23_VAN_PAINTED_DOOR=true ENABLE_EDX_PERSONAL_DASHBOARD=false diff --git a/.env.test b/.env.test index 1ed1895..dcf23da 100644 --- a/.env.test +++ b/.env.test @@ -47,5 +47,4 @@ ACCOUNT_PROFILE_URL='http://account-profile-url.test' ENABLE_NOTICES='' CAREER_LINK_URL='' OPTIMIZELY_FULL_STACK_SDK_KEY='SDK Key' -EXPERIMENT_08_23_VAN_PAINTED_DOOR=true ENABLE_EDX_PERSONAL_DASHBOARD=true diff --git a/src/components/ZendeskFab/messages.js b/src/components/ZendeskFab/messages.js index 7212bef..0178ebb 100644 --- a/src/components/ZendeskFab/messages.js +++ b/src/components/ZendeskFab/messages.js @@ -1,6 +1,6 @@ -import { StrictDict } from 'utils'; +import { defineMessages } from '@edx/frontend-platform/i18n'; -export const messages = StrictDict({ +const messages = defineMessages({ supportTitle: { id: 'zendesk.supportTitle', description: 'Title for the support button', diff --git a/src/containers/CourseCard/components/CourseCardActions/messages.js b/src/containers/CourseCard/components/CourseCardActions/messages.js index c7d4c65..6c14f9b 100644 --- a/src/containers/CourseCard/components/CourseCardActions/messages.js +++ b/src/containers/CourseCard/components/CourseCardActions/messages.js @@ -1,6 +1,6 @@ -import { StrictDict } from 'utils'; +import { defineMessages } from '@edx/frontend-platform/i18n'; -export const messages = StrictDict({ +const messages = defineMessages({ upgrade: { id: 'learner-dash.courseCard.actions.upgrade', description: 'Course card upgrade button text', diff --git a/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/messages.js b/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/messages.js index 7c1d397..e66cc60 100644 --- a/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/messages.js +++ b/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/messages.js @@ -1,6 +1,6 @@ -import { StrictDict } from 'utils'; +import { defineMessages } from '@edx/frontend-platform/i18n'; -export const messages = StrictDict({ +const messages = defineMessages({ error: { id: 'learner-dash.courseCard.banners.credit.error', description: '', diff --git a/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/messages.js b/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/messages.js index 8f92a4e..45e7fd0 100644 --- a/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/messages.js +++ b/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/messages.js @@ -1,6 +1,6 @@ -import { StrictDict } from 'utils'; +import { defineMessages } from '@edx/frontend-platform/i18n'; -export const messages = StrictDict({ +const messages = defineMessages({ approved: { id: 'learner-dash.courseCard.banners.credit.approved', description: '', diff --git a/src/containers/CourseCard/components/CourseCardBanners/RelatedProgramsBanner/messages.js b/src/containers/CourseCard/components/CourseCardBanners/RelatedProgramsBanner/messages.js index ce0307d..f624476 100644 --- a/src/containers/CourseCard/components/CourseCardBanners/RelatedProgramsBanner/messages.js +++ b/src/containers/CourseCard/components/CourseCardBanners/RelatedProgramsBanner/messages.js @@ -1,6 +1,6 @@ -import { StrictDict } from 'utils'; +import { defineMessages } from '@edx/frontend-platform/i18n'; -export const messages = StrictDict({ +const messages = defineMessages({ relatedPrograms: { id: 'learner-dash.courseCard.banners.relatedPrograms', description: 'title for related programs banner', diff --git a/src/containers/CourseCard/components/CourseCardBanners/messages.js b/src/containers/CourseCard/components/CourseCardBanners/messages.js index 525f4b2..afd87c3 100644 --- a/src/containers/CourseCard/components/CourseCardBanners/messages.js +++ b/src/containers/CourseCard/components/CourseCardBanners/messages.js @@ -1,6 +1,6 @@ -import { StrictDict } from 'utils'; +import { defineMessages } from '@edx/frontend-platform/i18n'; -export const messages = StrictDict({ +const messages = defineMessages({ auditAccessExpired: { id: 'learner-dash.courseCard.banners.auditAccessExpired', description: 'Audit access expiration banner message', diff --git a/src/containers/CourseCard/components/CourseCardDetails/messages.js b/src/containers/CourseCard/components/CourseCardDetails/messages.js index 3e5ee85..a096aeb 100644 --- a/src/containers/CourseCard/components/CourseCardDetails/messages.js +++ b/src/containers/CourseCard/components/CourseCardDetails/messages.js @@ -1,6 +1,6 @@ -import { StrictDict } from 'utils'; +import { defineMessages } from '@edx/frontend-platform/i18n'; -export const messages = StrictDict({ +const messages = defineMessages({ accessExpired: { id: 'learner-dash.courseCard.CourseCardDetails.accessExpired', description: 'Course access expiration date message on course card for expired access.', diff --git a/src/containers/CourseCard/components/CourseCardMenu/SocialShareMenu.test.jsx b/src/containers/CourseCard/components/CourseCardMenu/SocialShareMenu.test.jsx index 979a978..fbcb8c2 100644 --- a/src/containers/CourseCard/components/CourseCardMenu/SocialShareMenu.test.jsx +++ b/src/containers/CourseCard/components/CourseCardMenu/SocialShareMenu.test.jsx @@ -21,6 +21,7 @@ jest.mock('tracking', () => ({ })); jest.mock('@edx/frontend-platform/i18n', () => ({ + ...jest.requireActual('@edx/frontend-platform/i18n'), useIntl: jest.fn().mockReturnValue({ formatMessage: jest.requireActual('@edx/react-unit-test-utils').formatMessage, }), diff --git a/src/containers/CourseCard/components/CourseCardMenu/index.test.jsx b/src/containers/CourseCard/components/CourseCardMenu/index.test.jsx index 20eaebe..2677eb2 100644 --- a/src/containers/CourseCard/components/CourseCardMenu/index.test.jsx +++ b/src/containers/CourseCard/components/CourseCardMenu/index.test.jsx @@ -12,6 +12,7 @@ import * as hooks from './hooks'; import CourseCardMenu, { testIds } from '.'; jest.mock('@edx/frontend-platform/i18n', () => ({ + ...jest.requireActual('@edx/frontend-platform/i18n'), useIntl: jest.fn().mockReturnValue({ formatMessage: jest.requireActual('@edx/react-unit-test-utils').formatMessage, }), diff --git a/src/containers/CourseCard/components/CourseCardMenu/messages.js b/src/containers/CourseCard/components/CourseCardMenu/messages.js index 023b38b..d01a6bc 100644 --- a/src/containers/CourseCard/components/CourseCardMenu/messages.js +++ b/src/containers/CourseCard/components/CourseCardMenu/messages.js @@ -1,6 +1,6 @@ -import { StrictDict } from 'utils'; +import { defineMessages } from '@edx/frontend-platform/i18n'; -export const messages = StrictDict({ +const messages = defineMessages({ unenroll: { id: 'learner-dash.courseCardMenu.unenroll', description: 'Course unenroll menu button', diff --git a/src/containers/CourseCard/messages.js b/src/containers/CourseCard/messages.js index bc68cce..cc71fb1 100644 --- a/src/containers/CourseCard/messages.js +++ b/src/containers/CourseCard/messages.js @@ -1,6 +1,6 @@ -import { StrictDict } from 'utils'; +import { defineMessages } from '@edx/frontend-platform/i18n'; -export const messages = StrictDict({ +const messages = defineMessages({ bannerAlt: { id: 'learner-dash.courseCard.bannerAlt', description: 'Course card banner alt-text', diff --git a/src/containers/CourseFilterControls/components/FilterForm.jsx b/src/containers/CourseFilterControls/components/FilterForm.jsx index 09954eb..0932a1c 100644 --- a/src/containers/CourseFilterControls/components/FilterForm.jsx +++ b/src/containers/CourseFilterControls/components/FilterForm.jsx @@ -1,11 +1,13 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { useIntl } from '@edx/frontend-platform/i18n'; import { FilterKeys } from 'data/constants/app'; import { Form } from '@openedx/paragon'; import Checkbox from './Checkbox'; +import messages from '../messages'; export const filterOrder = [ FilterKeys.inProgress, @@ -18,20 +20,23 @@ export const filterOrder = [ export const FilterForm = ({ filters, handleFilterChange, -}) => ( - -
Course Status
- - {filterOrder.map(filterKey => ( - - ))} - - -); +}) => { + const { formatMessage } = useIntl(); + return ( + +
{formatMessage(messages.courseStatus)}
+ + {filterOrder.map(filterKey => ( + + ))} + + + ); +}; FilterForm.propTypes = { filters: PropTypes.arrayOf(PropTypes.string).isRequired, handleFilterChange: PropTypes.func.isRequired, diff --git a/src/containers/CourseFilterControls/messages.js b/src/containers/CourseFilterControls/messages.js index af895dc..39875b7 100644 --- a/src/containers/CourseFilterControls/messages.js +++ b/src/containers/CourseFilterControls/messages.js @@ -1,6 +1,11 @@ import { defineMessages } from '@edx/frontend-platform/i18n'; const messages = defineMessages({ + courseStatus: { + id: 'learner-dash.courseListFilters.courseStatus', + description: 'course status filter form heading', + defaultMessage: 'Course Status', + }, inProgress: { id: 'learner-dash.courseListFilters.inProgress', description: 'in-progress filter checkbox label for course list filters', diff --git a/src/containers/EmailSettingsModal/messages.js b/src/containers/EmailSettingsModal/messages.js index 1112c94..8c97f06 100644 --- a/src/containers/EmailSettingsModal/messages.js +++ b/src/containers/EmailSettingsModal/messages.js @@ -1,7 +1,7 @@ /* eslint-disable quotes */ -import { StrictDict } from 'utils'; +import { defineMessages } from '@edx/frontend-platform/i18n'; -export const messages = StrictDict({ +const messages = defineMessages({ header: { id: 'learner-dash.emailSettings.header', description: 'Header for email settings modal', diff --git a/src/containers/LearnerDashboardHeader/CollapsedHeader/CollapseMenuBody.jsx b/src/containers/LearnerDashboardHeader/CollapsedHeader/CollapseMenuBody.jsx index af2e2d4..82de5aa 100644 --- a/src/containers/LearnerDashboardHeader/CollapsedHeader/CollapseMenuBody.jsx +++ b/src/containers/LearnerDashboardHeader/CollapsedHeader/CollapseMenuBody.jsx @@ -6,10 +6,8 @@ import { useIntl } from '@edx/frontend-platform/i18n'; import { AppContext } from '@edx/frontend-platform/react'; import { Button, Badge } from '@openedx/paragon'; -import WidgetNavbar from 'containers/WidgetContainers/WidgetNavbar'; import urls from 'data/services/lms/urls'; import { reduxHooks } from 'hooks'; -import { COLLAPSED_NAVBAR } from 'widgets/RecommendationsPaintedDoorBtn/constants'; import { findCoursesNavDropdownClicked } from '../hooks'; import messages from '../messages'; @@ -45,7 +43,6 @@ export const CollapseMenuBody = ({ isOpen }) => { > {formatMessage(messages.discoverNew)} - diff --git a/src/containers/LearnerDashboardHeader/CollapsedHeader/__snapshots__/CollapseMenuBody.test.jsx.snap b/src/containers/LearnerDashboardHeader/CollapsedHeader/__snapshots__/CollapseMenuBody.test.jsx.snap index 96efcfe..c8cc4de 100644 --- a/src/containers/LearnerDashboardHeader/CollapsedHeader/__snapshots__/CollapseMenuBody.test.jsx.snap +++ b/src/containers/LearnerDashboardHeader/CollapsedHeader/__snapshots__/CollapseMenuBody.test.jsx.snap @@ -26,9 +26,6 @@ exports[`CollapseMenuBody render 1`] = ` > Discover New - - - diff --git a/src/containers/LearnerDashboardHeader/ExpandedHeader/index.jsx b/src/containers/LearnerDashboardHeader/ExpandedHeader/index.jsx index 44c971f..f257cbc 100644 --- a/src/containers/LearnerDashboardHeader/ExpandedHeader/index.jsx +++ b/src/containers/LearnerDashboardHeader/ExpandedHeader/index.jsx @@ -4,10 +4,8 @@ import { getConfig } from '@edx/frontend-platform'; import { useIntl } from '@edx/frontend-platform/i18n'; import { Button } from '@openedx/paragon'; -import WidgetNavbar from 'containers/WidgetContainers/WidgetNavbar'; import urls from 'data/services/lms/urls'; import { reduxHooks } from 'hooks'; -import { EXPANDED_NAVBAR } from 'widgets/RecommendationsPaintedDoorBtn/constants'; import AuthenticatedUserDropdown from './AuthenticatedUserDropdown'; import { useIsCollapsed, findCoursesNavClicked } from '../hooks'; @@ -57,7 +55,6 @@ export const ExpandedHeader = () => { > {formatMessage(messages.discoverNew)} - - ); -}; - -NavbarButton.propTypes = { - placement: PropTypes.oneOf([COLLAPSED_NAVBAR, EXPANDED_NAVBAR]).isRequired, - handleClick: PropTypes.func.isRequired, -}; - -export default NavbarButton; diff --git a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/__snapshots__/index.test.jsx.snap b/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/__snapshots__/index.test.jsx.snap deleted file mode 100644 index 86aabf3..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/__snapshots__/index.test.jsx.snap +++ /dev/null @@ -1,52 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`ModalView snapshot should renders default ModalView 1`] = ` -
- <[object Object] - hasCloseButton={false} - isBlocking={true} - isFullscreenScroll={true} - isOpen={true} - onClose={[MockFunction]} - title="" - > - - - Thank you for your interest! - - - -
-

- Personalized recommendations feature is not yet available. We are working hard on bringing it to your learner home in the near future. -

-

- Would you like to be alerted when it becomes available? -

-
- - - - - Skip for now - - - Count me in! - - - - -
-`; diff --git a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/hooks.js b/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/hooks.js deleted file mode 100644 index 0b4dfa8..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/hooks.js +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; -import { StrictDict } from 'utils'; - -import * as module from './hooks'; - -export const state = StrictDict({ - isModalOpen: (val) => React.useState(val), // eslint-disable-line -}); - -export const usePaintedDoorModal = () => { - const [isModalOpen, setIsModalOpen] = module.state.isModalOpen(false); - const toggleModal = () => setIsModalOpen(!isModalOpen); - - return { - isModalOpen, - toggleModal, - }; -}; diff --git a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/hooks.test.js b/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/hooks.test.js deleted file mode 100644 index 736ede4..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/hooks.test.js +++ /dev/null @@ -1,30 +0,0 @@ -import { MockUseState } from 'testUtils'; - -import * as hooks from './hooks'; - -const state = new MockUseState(hooks); - -const { - usePaintedDoorModal, -} = hooks; - -describe('LearnerDashboardHeader hooks', () => { - describe('state fields', () => { - state.testGetter(state.keys.isModalOpen); - }); - describe('useRecommendationsModal', () => { - beforeEach(() => { - state.mock(); - }); - it('initializes isModalOpen with false', () => { - usePaintedDoorModal(); - state.expectInitializedWith(state.keys.isModalOpen, false); - }); - test('change isModalOpen value on toggle', () => { - const out = usePaintedDoorModal(); - state.expectInitializedWith(state.keys.isModalOpen, false); - out.toggleModal(); - expect(state.values.isModalOpen).toEqual(true); - }); - }); -}); diff --git a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/index.jsx b/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/index.jsx deleted file mode 100644 index fb9ebb8..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/index.jsx +++ /dev/null @@ -1,70 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; - -import { ModalDialog, ActionRow } from '@openedx/paragon'; -import { useIntl } from '@edx/frontend-platform/i18n'; -import messages from '../../messages'; - -import './index.scss'; -import { - trackPaintedDoorRecommendationHomeInterestBtnClicked, - trackPaintedDoorRecommendationHomeSkipBtnClicked, -} from '../../track'; - -export const ModalView = ({ - isOpen, - onClose, - variation, -}) => { - const { formatMessage } = useIntl(); - - const handleSkipBtnClick = () => trackPaintedDoorRecommendationHomeSkipBtnClicked(variation); - const handleInterestBtnClick = () => trackPaintedDoorRecommendationHomeInterestBtnClicked(variation); - - return ( -
- - - - {formatMessage(messages.recommendationsModalHeading)} - - - -
-

{formatMessage(messages.recommendationsFeatureText)}

-

{formatMessage(messages.recommendationsAlertText)}

-
- - - - - {formatMessage(messages.modalSkipButton)} - - - {formatMessage(messages.modalCountMeButton)} - - - - -
- ); -}; - -ModalView.defaultProps = { - isOpen: false, -}; - -ModalView.propTypes = { - onClose: PropTypes.func.isRequired, - isOpen: PropTypes.bool, - variation: PropTypes.string.isRequired, -}; - -export default ModalView; diff --git a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/index.scss b/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/index.scss deleted file mode 100644 index 3b7df28..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/index.scss +++ /dev/null @@ -1,15 +0,0 @@ -@import "@openedx/paragon/scss/core/core"; - -.modal-container { - display: none; -} - -@media (max-width: 464px) { - .pgn__action-row{ - flex-direction: column; - gap: 5px; - button { - width: 100%; - } - } -} diff --git a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/index.test.jsx b/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/index.test.jsx deleted file mode 100644 index fe5e79b..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/components/PaintedDoorModal/index.test.jsx +++ /dev/null @@ -1,33 +0,0 @@ -import { shallow } from '@edx/react-unit-test-utils'; - -import ModalView from '.'; - -jest.mock('../../track', () => ({ - trackPaintedDoorRecommendationHomeSkipBtnClicked: jest.fn(), - trackPaintedDoorRecommendationHomeInterestBtnClicked: jest.fn(), -})); -jest.mock('@openedx/paragon', () => ({ - ...jest.requireActual('@openedx/paragon'), - ModalDialog: { - Body: 'ModalDialog.Body', - Header: 'ModalDialog.Header', - Title: 'ModalDialog.Title', - Footer: 'ModalDialog.Footer', - CloseButton: 'ModalDialog.CloseButton', - }, - ActionRow: 'ActionRow', -})); - -describe('ModalView', () => { - const props = { - isOpen: true, - onClose: jest.fn(), - variation: '', - }; - describe('snapshot', () => { - test('should renders default ModalView', () => { - const wrapper = shallow(); - expect(wrapper.snapshot).toMatchSnapshot(); - }); - }); -}); diff --git a/src/widgets/RecommendationsPaintedDoorBtn/components/RecommendationsPanelButton.jsx b/src/widgets/RecommendationsPaintedDoorBtn/components/RecommendationsPanelButton.jsx deleted file mode 100644 index b8685a1..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/components/RecommendationsPanelButton.jsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from 'react'; -import { Button } from '@openedx/paragon'; -import { useIntl } from '@edx/frontend-platform/i18n'; -import PropTypes from 'prop-types'; -import messages from '../messages'; - -export const RecommendationsPanelButton = ({ handleClick }) => { - const { formatMessage } = useIntl(); - - return ( - - ); -}; - -RecommendationsPanelButton.propTypes = { - handleClick: PropTypes.func.isRequired, -}; - -export default RecommendationsPanelButton; diff --git a/src/widgets/RecommendationsPaintedDoorBtn/constants.js b/src/widgets/RecommendationsPaintedDoorBtn/constants.js deleted file mode 100644 index bbdc88a..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/constants.js +++ /dev/null @@ -1,3 +0,0 @@ -export const COLLAPSED_NAVBAR = 'collapsedNavbar'; -export const EXPANDED_NAVBAR = 'expendedNavbar'; -export const RECOMMENDATIONS_PANEL = 'recommendationsPanel'; diff --git a/src/widgets/RecommendationsPaintedDoorBtn/index.jsx b/src/widgets/RecommendationsPaintedDoorBtn/index.jsx deleted file mode 100644 index 1674fa3..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/index.jsx +++ /dev/null @@ -1,44 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import NavbarButton from './components/NavbarButton'; -import PaintedDoorModal from './components/PaintedDoorModal'; -import { usePaintedDoorModal } from './components/PaintedDoorModal/hooks'; -import { COLLAPSED_NAVBAR, EXPANDED_NAVBAR, RECOMMENDATIONS_PANEL } from './constants'; -import RecommendationsPanelButton from './components/RecommendationsPanelButton'; -import { trackPaintedDoorRecommendationHomeBtnClicked } from './track'; - -export const RecommendationsPaintedDoorBtn = ({ placement, experimentVariation }) => { - const { isModalOpen, toggleModal } = usePaintedDoorModal(); - - const handleClick = () => { - toggleModal(); - trackPaintedDoorRecommendationHomeBtnClicked(experimentVariation); - }; - - const getPaintedDoorButton = () => { - if ([COLLAPSED_NAVBAR, EXPANDED_NAVBAR].includes(placement)) { - return ( - - ); - } if (placement === RECOMMENDATIONS_PANEL) { - return ( - - ); - } - return null; - }; - - return ( - <> - {getPaintedDoorButton()} - - - ); -}; - -RecommendationsPaintedDoorBtn.propTypes = { - placement: PropTypes.oneOf([COLLAPSED_NAVBAR, EXPANDED_NAVBAR, RECOMMENDATIONS_PANEL]).isRequired, - experimentVariation: PropTypes.string.isRequired, -}; - -export default RecommendationsPaintedDoorBtn; diff --git a/src/widgets/RecommendationsPaintedDoorBtn/index.test.jsx b/src/widgets/RecommendationsPaintedDoorBtn/index.test.jsx deleted file mode 100644 index 6aa699e..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/index.test.jsx +++ /dev/null @@ -1,95 +0,0 @@ -import React from 'react'; -import { shallow } from '@edx/react-unit-test-utils'; -import { ModalDialog } from '@openedx/paragon'; -import RecommendationsPaintedDoorBtn from './index'; -import { EXPANDED_NAVBAR, RECOMMENDATIONS_PANEL } from './constants'; -import NavbarButton from './components/NavbarButton'; -import RecommendationsPanelButton from './components/RecommendationsPanelButton'; -import { trackPaintedDoorRecommendationHomeBtnClicked } from './track'; - -jest.mock('./components/PaintedDoorModal/hooks', () => ({ - usePaintedDoorModal: jest.fn(() => ({ - isModalOpen: false, - toggleModal: jest.fn(), - })), -})); - -jest.mock('./track', () => ({ - trackPaintedDoorRecommendationHomeBtnClicked: jest.fn(), -})); - -describe('RecommendationsPaintedDoorBtn', () => { - let props = { - placement: RECOMMENDATIONS_PANEL, - experimentVariation: '', - }; - - it('matches snapshot', () => { - expect(shallow().snapshot).toMatchSnapshot(); - }); - - it('renders painted door modal', () => { - const wrapper = shallow(); - - expect(wrapper.instance.findByType(ModalDialog)).toBeTruthy(); - }); - - it('renders painted door navbar button', () => { - props = { - ...props, - placement: EXPANDED_NAVBAR, - }; - const wrapper = shallow(); - - expect(wrapper.instance.findByType(NavbarButton)).not.toHaveLength(0); - expect(wrapper.instance.findByType(RecommendationsPanelButton)).toHaveLength(0); - }); - - it('renders painted door recommendations panel button', () => { - props = { - ...props, - placement: RECOMMENDATIONS_PANEL, - }; - const wrapper = shallow(); - - expect(wrapper.instance.findByType(NavbarButton)).toHaveLength(0); - expect(wrapper.instance.findByType(RecommendationsPanelButton)).not.toHaveLength(0); - }); - - it('test no button (null) rendered for invalid placement', () => { - props = { - ...props, - placement: '', - }; - const wrapper = shallow(); - - expect(wrapper.instance.findByType(NavbarButton)).toHaveLength(0); - expect(wrapper.instance.findByType(RecommendationsPanelButton)).toHaveLength(0); - }); - - it('test track event is fired on navbar button click', () => { - props = { - ...props, - placement: EXPANDED_NAVBAR, - }; - const wrapper = shallow(); - const navbarButton = wrapper.instance.findByType(NavbarButton)[0]; - - navbarButton.props.handleClick(); - - expect(trackPaintedDoorRecommendationHomeBtnClicked).toHaveBeenCalled(); - }); - - it('test track event is fired on recommendations panel button click', () => { - props = { - ...props, - placement: RECOMMENDATIONS_PANEL, - }; - const wrapper = shallow(); - const recommendationsPanelButton = wrapper.instance.findByType(RecommendationsPanelButton)[0]; - - recommendationsPanelButton.props.handleClick(); - - expect(trackPaintedDoorRecommendationHomeBtnClicked).toHaveBeenCalled(); - }); -}); diff --git a/src/widgets/RecommendationsPaintedDoorBtn/messages.js b/src/widgets/RecommendationsPaintedDoorBtn/messages.js deleted file mode 100644 index 7f4d53f..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/messages.js +++ /dev/null @@ -1,41 +0,0 @@ -import { defineMessages } from '@edx/frontend-platform/i18n'; - -const messages = defineMessages({ - recommendationsFeatureText: { - id: 'RecommendationsPanel.recommendationsFeatureText', - defaultMessage: 'Personalized recommendations feature is not yet available. We are working hard on bringing it to your learner home in the near future.', - description: 'recommendations feature text', - }, - recommendationsAlertText: { - id: 'RecommendationsPanel.recommendationsAlertText', - defaultMessage: 'Would you like to be alerted when it becomes available?', - description: 'recommendations alerted text', - }, - recommendationsModalHeading: { - id: 'RecommendationsPanel.recommendationsModalHeading', - defaultMessage: 'Thank you for your interest!', - description: 'Heading of modal', - }, - modalSkipButton: { - id: 'RecommendationsPanel.modalSkipButton', - defaultMessage: 'Skip for now', - description: 'button for Skip for now', - }, - modalCountMeButton: { - id: 'RecommendationsPanel.modalCountMeButton', - defaultMessage: 'Count me in!', - description: 'button for Count me in!', - }, - recommendedForYou: { - id: 'learnerVariantDashboard.recommendedForYou', - defaultMessage: 'Recommended For You', - description: 'Header link for recommended page.', - }, - seeAllRecommendationsButton: { - id: 'RecommendationsPanel.seeAllRecommendationsButton', - defaultMessage: 'See All Recommendations', - description: 'Button to see all recommendations', - }, -}); - -export default messages; diff --git a/src/widgets/RecommendationsPaintedDoorBtn/track.js b/src/widgets/RecommendationsPaintedDoorBtn/track.js deleted file mode 100644 index 304e127..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/track.js +++ /dev/null @@ -1,35 +0,0 @@ -import { StrictDict } from 'utils'; -import { createEventTracker } from 'data/services/segment/utils'; - -export const eventNames = StrictDict({ - variationGroup: 'edx.bi.user.recommendation_home.variation.group', - recommendationHomeBtnClicked: 'edx.bi.user.recommendation_home.btn.clicked', - recommendationHomeModalInterestBtnClicked: 'edx.bi.user.recommendation_home.modal.interest_btn.clicked', - recommendationHomeModalSkipBtnClicked: 'edx.bi.user.recommendation_home.modal.skip_btn.clicked', -}); - -export const trackPaintedDoorVariationGroup = (variation) => { - createEventTracker(eventNames.variationGroup, { - variation, - page: 'dashboard', - })(); -}; - -export const trackPaintedDoorRecommendationHomeBtnClicked = (variation) => { - createEventTracker(eventNames.recommendationHomeBtnClicked, { - variation, - page: 'dashboard', - })(); -}; - -export const trackPaintedDoorRecommendationHomeInterestBtnClicked = (variation) => { - createEventTracker(eventNames.recommendationHomeModalInterestBtnClicked, { - variation, - })(); -}; - -export const trackPaintedDoorRecommendationHomeSkipBtnClicked = (variation) => { - createEventTracker(eventNames.recommendationHomeModalSkipBtnClicked, { - variation, - })(); -}; diff --git a/src/widgets/RecommendationsPaintedDoorBtn/track.test.js b/src/widgets/RecommendationsPaintedDoorBtn/track.test.js deleted file mode 100644 index de91200..0000000 --- a/src/widgets/RecommendationsPaintedDoorBtn/track.test.js +++ /dev/null @@ -1,58 +0,0 @@ -import { createEventTracker } from 'data/services/segment/utils'; -import { - eventNames, - trackPaintedDoorRecommendationHomeBtnClicked, - trackPaintedDoorVariationGroup, - trackPaintedDoorRecommendationHomeSkipBtnClicked, - trackPaintedDoorRecommendationHomeInterestBtnClicked, -} from './track'; - -jest.mock('data/services/segment/utils', () => ({ - createEventTracker: jest.fn(() => () => {}), -})); - -const TEST_VARIATION = 'testVariation'; - -describe('Recommendations Painted Door experiment trackers', () => { - it('test creates an event tracker for painted door variation group', () => { - trackPaintedDoorVariationGroup(TEST_VARIATION); - expect(createEventTracker).toHaveBeenCalledWith( - eventNames.variationGroup, - { - variation: TEST_VARIATION, - page: 'dashboard', - }, - ); - }); - - it('test creates an event tracker for painted door button click', () => { - trackPaintedDoorRecommendationHomeBtnClicked(TEST_VARIATION); - expect(createEventTracker).toHaveBeenCalledWith( - eventNames.recommendationHomeBtnClicked, - { - variation: TEST_VARIATION, - page: 'dashboard', - }, - ); - }); - - it('test creates an event tracker for painted door skip button click', () => { - trackPaintedDoorRecommendationHomeSkipBtnClicked(TEST_VARIATION); - expect(createEventTracker).toHaveBeenCalledWith( - eventNames.recommendationHomeModalSkipBtnClicked, - { - variation: TEST_VARIATION, - }, - ); - }); - - it('test creates an event tracker for painted door interest button click', () => { - trackPaintedDoorRecommendationHomeInterestBtnClicked(TEST_VARIATION); - expect(createEventTracker).toHaveBeenCalledWith( - eventNames.recommendationHomeModalInterestBtnClicked, - { - variation: TEST_VARIATION, - }, - ); - }); -}); diff --git a/src/widgets/RecommendationsPanel/LoadedView.jsx b/src/widgets/RecommendationsPanel/LoadedView.jsx index b2e1a80..a4ae290 100644 --- a/src/widgets/RecommendationsPanel/LoadedView.jsx +++ b/src/widgets/RecommendationsPanel/LoadedView.jsx @@ -12,9 +12,6 @@ import CourseCard from './components/CourseCard'; import messages from './messages'; import './index.scss'; -import { usePaintedDoorExperimentContext } from '../RecommendationsPaintedDoorBtn/PaintedDoorExperimentContext'; -import { RECOMMENDATIONS_PANEL } from '../RecommendationsPaintedDoorBtn/constants'; -import RecommendationsPaintedDoorBtn from '../RecommendationsPaintedDoorBtn'; export const LoadedView = ({ courses, @@ -22,11 +19,6 @@ export const LoadedView = ({ }) => { const { formatMessage } = useIntl(); const { courseSearchUrl } = reduxHooks.usePlatformSettingsData(); - const { - experimentVariation, - isPaintedDoorWidgetBtnVariation, - experimentLoading, - } = usePaintedDoorExperimentContext(); return (
@@ -43,19 +35,15 @@ export const LoadedView = ({ ))}
- {!experimentLoading && isPaintedDoorWidgetBtnVariation ? ( - - ) : ( - - )} +
); diff --git a/src/widgets/RecommendationsPanel/LoadedView.test.jsx b/src/widgets/RecommendationsPanel/LoadedView.test.jsx index 18e0c62..6053603 100644 --- a/src/widgets/RecommendationsPanel/LoadedView.test.jsx +++ b/src/widgets/RecommendationsPanel/LoadedView.test.jsx @@ -1,12 +1,9 @@ import React from 'react'; import { shallow } from '@edx/react-unit-test-utils'; -import { Button } from '@openedx/paragon'; import LoadedView from './LoadedView'; import mockData from './mockData'; import messages from './messages'; -import { usePaintedDoorExperimentContext } from '../RecommendationsPaintedDoorBtn/PaintedDoorExperimentContext'; -import RecommendationsPaintedDoorBtn from '../RecommendationsPaintedDoorBtn'; jest.mock('hooks', () => ({ reduxHooks: { @@ -22,64 +19,24 @@ jest.mock('./track', () => ({ findCoursesWidgetClicked: (href) => jest.fn().mockName(`track.findCoursesWidgetClicked('${href}')`), })); jest.mock('./components/CourseCard', () => 'CourseCard'); -jest.mock('widgets/RecommendationsPaintedDoorBtn/PaintedDoorExperimentContext', () => ({ - usePaintedDoorExperimentContext: jest.fn(), -})); describe('RecommendationsPanel LoadedView', () => { const props = { courses: mockData.courses, isControl: null, }; - let mockExperimentContext = { - experimentVariation: '', - isPaintedDoorWidgetBtnVariation: true, - experimentLoading: false, - }; + describe('RecommendationPanelLoadedView', () => { test('without personalize recommendation', () => { - usePaintedDoorExperimentContext.mockReturnValueOnce(mockExperimentContext); const el = shallow(); expect(el.snapshot).toMatchSnapshot(); expect(el.instance.findByType('h3')[0].children[0].el).toEqual(messages.popularCoursesHeading.defaultMessage); }); test('with personalize recommendation', () => { - usePaintedDoorExperimentContext.mockReturnValueOnce(mockExperimentContext); const el = shallow(); expect(el.snapshot).toMatchSnapshot(); expect(el.instance.findByType('h3')[0].children[0].el).toEqual(messages.recommendationsHeading.defaultMessage); }); - - test('test painted door button is rendered if user is in variation', () => { - usePaintedDoorExperimentContext.mockReturnValueOnce(mockExperimentContext); - const wrapper = shallow(); - expect(wrapper.instance.findByType(RecommendationsPaintedDoorBtn)).not.toHaveLength(0); - }); - - test('test explore courses button is returned if user is not in variation', () => { - mockExperimentContext = { - ...mockExperimentContext, - isPaintedDoorWidgetBtnVariation: false, - }; - usePaintedDoorExperimentContext.mockReturnValueOnce(mockExperimentContext); - const wrapper = shallow(); - expect(wrapper.instance.findByType(RecommendationsPaintedDoorBtn)).toHaveLength(0); - expect(wrapper.instance.findByType(Button)[0].children[0].el) - .toEqual(messages.exploreCoursesButton.defaultMessage); - }); - - test('test explore courses button is returned if experiment is loading', () => { - mockExperimentContext = { - ...mockExperimentContext, - isPaintedDoorWidgetBtnVariation: false, - experimentLoading: true, - }; - usePaintedDoorExperimentContext.mockReturnValueOnce(mockExperimentContext); - const wrapper = shallow(); - expect(wrapper.instance.findByType(RecommendationsPaintedDoorBtn)).toHaveLength(0); - expect(wrapper.instance.findByType(Button)[0].children[0].el) - .toEqual(messages.exploreCoursesButton.defaultMessage); - }); }); }); diff --git a/src/widgets/RecommendationsPanel/__snapshots__/LoadedView.test.jsx.snap b/src/widgets/RecommendationsPanel/__snapshots__/LoadedView.test.jsx.snap index 11182a9..0634807 100644 --- a/src/widgets/RecommendationsPanel/__snapshots__/LoadedView.test.jsx.snap +++ b/src/widgets/RecommendationsPanel/__snapshots__/LoadedView.test.jsx.snap @@ -62,10 +62,15 @@ exports[`RecommendationsPanel LoadedView RecommendationPanelLoadedView with pers
- +
`; @@ -132,10 +137,15 @@ exports[`RecommendationsPanel LoadedView RecommendationPanelLoadedView without p
- +
`; diff --git a/src/widgets/RecommendationsPanel/index.jsx b/src/widgets/RecommendationsPanel/index.jsx index 1328e74..c091a8d 100644 --- a/src/widgets/RecommendationsPanel/index.jsx +++ b/src/widgets/RecommendationsPanel/index.jsx @@ -4,9 +4,6 @@ import LookingForChallengeWidget from 'widgets/LookingForChallengeWidget'; import LoadingView from './LoadingView'; import LoadedView from './LoadedView'; import hooks from './hooks'; -import RecommendationsPaintedDoorBtn from '../RecommendationsPaintedDoorBtn'; -import { RECOMMENDATIONS_PANEL } from '../RecommendationsPaintedDoorBtn/constants'; -import { usePaintedDoorExperimentContext } from '../RecommendationsPaintedDoorBtn/PaintedDoorExperimentContext'; export const RecommendationsPanel = () => { const { @@ -16,29 +13,6 @@ export const RecommendationsPanel = () => { isLoaded, isLoading, } = hooks.useRecommendationPanelData(); - const { - experimentVariation, - isPaintedDoorWidgetBtnVariation, - experimentLoading, - } = usePaintedDoorExperimentContext(); - - const getDefaultOrFailedStateWidget = () => { - if (!experimentLoading && isPaintedDoorWidgetBtnVariation) { - return ( - <> - -
- - - ); - } - return ( - - ); - }; if (isLoading) { return (); @@ -49,10 +23,10 @@ export const RecommendationsPanel = () => { ); } if (isFailed) { - return getDefaultOrFailedStateWidget(); + return (); } // default fallback - return getDefaultOrFailedStateWidget(); + return (); }; export default RecommendationsPanel; diff --git a/src/widgets/RecommendationsPanel/index.test.jsx b/src/widgets/RecommendationsPanel/index.test.jsx index b080689..fd92680 100644 --- a/src/widgets/RecommendationsPanel/index.test.jsx +++ b/src/widgets/RecommendationsPanel/index.test.jsx @@ -7,8 +7,6 @@ import mockData from './mockData'; import LoadedView from './LoadedView'; import LoadingView from './LoadingView'; import RecommendationsPanel from '.'; -import { usePaintedDoorExperimentContext } from '../RecommendationsPaintedDoorBtn/PaintedDoorExperimentContext'; -import RecommendationsPaintedDoorBtn from '../RecommendationsPaintedDoorBtn'; jest.mock('./hooks', () => ({ useRecommendationPanelData: jest.fn(), @@ -16,9 +14,6 @@ jest.mock('./hooks', () => ({ jest.mock('widgets/LookingForChallengeWidget', () => 'LookingForChallengeWidget'); jest.mock('./LoadingView', () => 'LoadingView'); jest.mock('./LoadedView', () => 'LoadedView'); -jest.mock('widgets/RecommendationsPaintedDoorBtn/PaintedDoorExperimentContext', () => ({ - usePaintedDoorExperimentContext: jest.fn(), -})); const { courses } = mockData; @@ -34,13 +29,6 @@ describe('RecommendationsPanel snapshot', () => { ...defaultLoadedViewProps, }; describe('RecommendationsPanel recommendations tests', () => { - beforeEach(() => { - usePaintedDoorExperimentContext.mockReturnValueOnce({ - experimentVariation: '', - isPaintedDoorWidgetBtnVariation: false, - experimentLoading: false, - }); - }); it('displays LoadingView if request is loading', () => { hooks.useRecommendationPanelData.mockReturnValueOnce({ ...defaultValues, @@ -77,65 +65,4 @@ describe('RecommendationsPanel snapshot', () => { ); }); }); - - describe('RecommendationsPanel painted door exp tests', () => { - it('displays painted door btn if user is in variation and request is failed', () => { - hooks.useRecommendationPanelData.mockReturnValueOnce({ - ...defaultValues, - isFailed: true, - }); - usePaintedDoorExperimentContext.mockReturnValueOnce({ - experimentVariation: '', - isPaintedDoorWidgetBtnVariation: true, - experimentLoading: false, - }); - - const wrapper = shallow(); - expect(wrapper.instance.findByType(RecommendationsPaintedDoorBtn)).not.toHaveLength(0); - }); - it('displays painted door btn if user is in variation and no flags are set (defaults)', () => { - hooks.useRecommendationPanelData.mockReturnValueOnce({ - ...defaultValues, - isFailed: true, - }); - usePaintedDoorExperimentContext.mockReturnValueOnce({ - experimentVariation: '', - isPaintedDoorWidgetBtnVariation: true, - experimentLoading: false, - }); - - const wrapper = shallow(); - expect(wrapper.instance.findByType(RecommendationsPaintedDoorBtn)).not.toHaveLength(0); - }); - it('renders only LookingForChallengeWidget if user is not in variation', () => { - hooks.useRecommendationPanelData.mockReturnValueOnce({ - ...defaultValues, - isFailed: true, - }); - usePaintedDoorExperimentContext.mockReturnValueOnce({ - experimentVariation: '', - isPaintedDoorWidgetBtnVariation: false, - experimentLoading: false, - }); - - expect({ ...shallow().shallowWrapper, children: expect.any(Array) }).toMatchObject( - shallow(), - ); - }); - it('renders only LookingForChallengeWidget if experiment is loading', () => { - hooks.useRecommendationPanelData.mockReturnValueOnce({ - ...defaultValues, - isFailed: true, - }); - usePaintedDoorExperimentContext.mockReturnValueOnce({ - experimentVariation: '', - isPaintedDoorWidgetBtnVariation: false, - experimentLoading: true, - }); - - expect({ ...shallow().shallowWrapper, children: expect.any(Array) }).toMatchObject( - shallow(), - ); - }); - }); });