diff --git a/package-lock.json b/package-lock.json index cf44f4b2..0e1fa2ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1413,9 +1413,9 @@ } }, "@edx/paragon": { - "version": "13.16.0", - "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-13.16.0.tgz", - "integrity": "sha512-E1XCpiHoD0TaTUV6o5FxfkxfUhtBmSsUCmR7LSTPXpiuI7ouK2PxbRoxCT8CnHbSAeeYKN0vPHNGEd9hFRm7zg==", + "version": "13.13.5", + "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-13.13.5.tgz", + "integrity": "sha512-6q60Lj5dbzZbcXfNrpHXqn4tKQYf1KmcISOe//un0JTSQr6/LnZjHZoZfmzDaRX/2KEDaLCTqCefvKTpB26qCQ==", "requires": { "@fortawesome/fontawesome-svg-core": "^1.2.30", "@fortawesome/free-solid-svg-icons": "^5.14.0", @@ -2307,9 +2307,9 @@ } }, "@popperjs/core": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.1.tgz", - "integrity": "sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA==" + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.0.tgz", + "integrity": "sha512-wjtKehFAIARq2OxK8j3JrggNlEslJfNuSm2ArteIbKyRMts2g0a7KzTxfRVNUM+O0gnBJ2hNV8nWPOYBgI1sew==" }, "@reduxjs/toolkit": { "version": "1.3.6", @@ -3016,12 +3016,11 @@ "dev": true }, "@types/react": { - "version": "17.0.3", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.3.tgz", - "integrity": "sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg==", + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.2.tgz", + "integrity": "sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==", "requires": { "@types/prop-types": "*", - "@types/scheduler": "*", "csstype": "^3.0.2" } }, @@ -3033,11 +3032,6 @@ "@types/react": "*" } }, - "@types/scheduler": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.1.tgz", - "integrity": "sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==" - }, "@types/schema-utils": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/@types/schema-utils/-/schema-utils-2.4.0.tgz", diff --git a/package.json b/package.json index bc8ef5c8..f30783e8 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@edx/frontend-component-footer": "10.1.4", "@edx/frontend-enterprise": "4.2.3", "@edx/frontend-platform": "1.8.4", - "@edx/paragon": "13.16.0", + "@edx/paragon": "13.13.5", "@fortawesome/fontawesome-svg-core": "1.2.34", "@fortawesome/free-brands-svg-icons": "5.13.1", "@fortawesome/free-regular-svg-icons": "5.13.1", diff --git a/src/course-home/dates-tab/DatesTab.jsx b/src/course-home/dates-tab/DatesTab.jsx index 7abdd015..54efc3f1 100644 --- a/src/course-home/dates-tab/DatesTab.jsx +++ b/src/course-home/dates-tab/DatesTab.jsx @@ -9,9 +9,6 @@ import DatesBannerContainer from '../dates-banner/DatesBannerContainer'; import { fetchDatesTab } from '../data'; import { useModel } from '../../generic/model-store'; -/** [MM-P2P] Experiment */ -import { initDatesMMP2P } from '../../experiments/mm-p2p'; - function DatesTab({ intl }) { const { courseId, @@ -23,25 +20,19 @@ function DatesTab({ intl }) { hasEnded, } = useModel('dates', courseId); - /** [MM-P2P] Experiment */ - const mmp2p = initDatesMMP2P(courseId); - return ( <>
{intl.formatMessage(messages.title)}
- { /** [MM-P2P] Experiment */ } - { !mmp2p.state.isEnabled && ( - - ) } - + + ); } diff --git a/src/course-home/dates-tab/Day.jsx b/src/course-home/dates-tab/Day.jsx index 25126341..c01c4a19 100644 --- a/src/course-home/dates-tab/Day.jsx +++ b/src/course-home/dates-tab/Day.jsx @@ -13,13 +13,7 @@ import { getBadgeListAndColor } from './badgelist'; import { isLearnerAssignment } from './utils'; function Day({ - date, - first, - intl, - items, - last, - /** [MM-P2P] Example */ - mmp2p, + date, first, intl, items, last, }) { const { courseId, @@ -32,11 +26,6 @@ function Day({ const { color, badges } = getBadgeListAndColor(date, intl, null, items); - /** [MM-P2P] Experiment */ - const mmp2pOverride = ( - mmp2p.state.isEnabled - && items.some((item) => item.dateType === 'verified-upgrade-deadline') - ); return (
  • {/* Top Line */} @@ -53,8 +42,7 @@ function Day({

    {items.map((item) => { - /** [MM-P2P] Experiment (conditional) */ - const { badges: itemBadges } = mmp2pOverride - ? getBadgeListAndColor(new Date(mmp2p.state.upgradeDeadline), intl, item, items) - : getBadgeListAndColor(date, intl, item, items); - + const { badges: itemBadges } = getBadgeListAndColor(date, intl, item, items); const showLink = item.link && isLearnerAssignment(item); const title = showLink ? ({item.title}) : item.title; const available = item.learnerHasAccess && (item.link || !isLearnerAssignment(item)); const textColor = available ? 'text-dark-500' : 'text-dark-200'; - return (

    @@ -93,15 +76,7 @@ function Day({ )}
    - { /** [MM-P2P] Experiment (conditional) */ } - { mmp2pOverride - ? ( -
    - You are still elligible to upgrade to a Verified Certificate! -   Unlock full course access and highlight the knowledge you'll gain. -
    - ) - : (item.description &&
    {item.description}
    )} + {item.description &&
    {item.description}
    }
    ); })} @@ -124,25 +99,11 @@ Day.propTypes = { title: PropTypes.string, })).isRequired, last: PropTypes.bool, - /** [MM-P2P] Experiment */ - mmp2p: PropTypes.shape({ - state: PropTypes.shape({ - isEnabled: PropTypes.bool.isRequired, - upgradeDeadline: PropTypes.string, - }), - }), }; Day.defaultProps = { first: false, last: false, - /** [MM-P2P] Experiment */ - mmp2p: { - state: { - isEnabled: false, - upgradeDeadline: '', - }, - }, }; export default injectIntl(Day); diff --git a/src/course-home/dates-tab/Timeline.jsx b/src/course-home/dates-tab/Timeline.jsx index 8a166663..44bfc2c3 100644 --- a/src/course-home/dates-tab/Timeline.jsx +++ b/src/course-home/dates-tab/Timeline.jsx @@ -1,6 +1,4 @@ import React from 'react'; -/** [MM-P2P] Experiment (import) */ -import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; import { useModel } from '../../generic/model-store'; @@ -8,8 +6,7 @@ import { useModel } from '../../generic/model-store'; import Day from './Day'; import { daycmp, isLearnerAssignment } from './utils'; -/** [MM-P2P] Experiment (argument) */ -export default function Timeline({ mmp2p }) { +export default function Timeline() { const { courseId, } = useSelector(state => state.courseHome); @@ -66,17 +63,8 @@ export default function Timeline({ mmp2p }) { return (
      {groupedDates.map((groupedDate) => ( - + ))}
    ); } - -/** [MM-P2P] Experiment */ -Timeline.propTypes = { - mmp2p: PropTypes.shape({}), -}; - -Timeline.defaultProps = { - mmp2p: {}, -}; diff --git a/src/course-home/outline-tab/DateSummary.jsx b/src/course-home/outline-tab/DateSummary.jsx index a7aadc84..43845c5d 100644 --- a/src/course-home/outline-tab/DateSummary.jsx +++ b/src/course-home/outline-tab/DateSummary.jsx @@ -1,7 +1,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faCalendarAlt } from '@fortawesome/free-regular-svg-icons'; import { FormattedDate } from '@edx/frontend-platform/i18n'; -import React from 'react'; +import React, { useState } from 'react'; import PropTypes from 'prop-types'; import { isLearnerAssignment } from '../dates-tab/utils'; import './DateSummary.scss'; @@ -9,14 +9,22 @@ import './DateSummary.scss'; export default function DateSummary({ dateBlock, userTimezone, - /** [MM-P2P] Experiment */ - mmp2p, }) { const linkedTitle = dateBlock.link && isLearnerAssignment(dateBlock); const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {}; - /** [MM-P2P] Experiment */ - const showMMP2P = mmp2p.state.isEnabled && (dateBlock.dateType === 'verified-upgrade-deadline'); + /** [MM-P2P experiment] */ + const [showMMP2P, setShowMMP2P] = useState(window.experiment__home_dates_bShowMMP2P); + if ( + dateBlock.dateType === 'verified-upgrade-deadline' + && window.experiment__home_dates_showMMP2P === undefined + ) { + window.experiment__home_dates_showMMP2P = (value) => { + setShowMMP2P(!!value); + window.experiment__home_dates_bShowMMP2P = !!value; + }; + } + const activateMMP2P = (showMMP2P && dateBlock.dateType === 'verified-upgrade-deadline'); return (
  • @@ -24,8 +32,7 @@ export default function DateSummary({
    - {/** [MM-P2P] Experiment (conditional) */} - { showMMP2P ? ( + {activateMMP2P ? (
    @@ -78,22 +84,8 @@ DateSummary.propTypes = { learnerHasAccess: PropTypes.bool, }).isRequired, userTimezone: PropTypes.string, - /** [MM-P2P] Experiment */ - mmp2p: PropTypes.shape({ - state: PropTypes.shape({ - isEnabled: PropTypes.bool.isRequired, - upgradeDeadline: PropTypes.string, - }), - }), }; DateSummary.defaultProps = { userTimezone: null, - /** [MM-P2P] Experiment */ - mmp2p: { - state: { - isEnabled: false, - upgradeDeadline: '', - }, - }, }; diff --git a/src/course-home/outline-tab/OutlineTab.jsx b/src/course-home/outline-tab/OutlineTab.jsx index 086a3723..64416731 100644 --- a/src/course-home/outline-tab/OutlineTab.jsx +++ b/src/course-home/outline-tab/OutlineTab.jsx @@ -28,9 +28,6 @@ import { useModel } from '../../generic/model-store'; import WelcomeMessage from './widgets/WelcomeMessage'; import ProctoringInfoPanel from './widgets/ProctoringInfoPanel'; -/** [MM-P2P] Experiment */ -import { initHomeMMP2P, MMP2PFlyover } from '../../experiments/mm-p2p'; - function OutlineTab({ intl }) { const { courseId, @@ -91,9 +88,6 @@ function OutlineTab({ intl }) { const courseSock = useRef(null); - /** [[MM-P2P] Experiment */ - const MMP2P = initHomeMMP2P(courseId); - return ( <> )}
    - {/** [MM-P2P] Experiment (className for optimizely trigger) */} -
    +
    - { /** [MM-P2P] Experiment (the conditional) */ } - { !MMP2P.state.isEnabled - && ( - - )} + {courseDateBlocks && ( )} {!courseGoalToDisplay && goalOptions && goalOptions.length > 0 && ( @@ -202,21 +189,12 @@ function OutlineTab({ intl }) { - { /** [MM-P2P] Experiment (conditional) */ } - { MMP2P.state.isEnabled - ? - : ( - { courseSock.current.showToUser(); } : null - } - /> - )} + { courseSock.current.showToUser(); } : null} + /> ))} @@ -49,14 +42,10 @@ function CourseDates({ CourseDates.propTypes = { courseId: PropTypes.string, intl: intlShape.isRequired, - /** [MM-P2P] Experiment */ - mmp2p: PropTypes.shape({}), }; CourseDates.defaultProps = { courseId: null, - /** [MM-P2P] Experiment */ - mmp2p: {}, }; export default injectIntl(CourseDates); diff --git a/src/courseware/course/Course.jsx b/src/courseware/course/Course.jsx index afae9884..2ebadcf4 100644 --- a/src/courseware/course/Course.jsx +++ b/src/courseware/course/Course.jsx @@ -16,9 +16,6 @@ import CourseBreadcrumbs from './CourseBreadcrumbs'; import CourseSock from '../../generic/course-sock'; import { useModel } from '../../generic/model-store'; -/** [MM-P2P] Experiment */ -import { initCoursewareMMP2P, MMP2PBlockModal } from '../../experiments/mm-p2p'; - function Course({ courseId, sequenceId, @@ -86,25 +83,19 @@ function Course({ }; // The above block of code should be reverted after the REV1512 experiment - /** [MM-P2P] Experiment */ - const MMP2P = initCoursewareMMP2P(courseId, sequenceId, unitId); - return ( <> {`${pageTitleBreadCrumbs.join(' | ')} | ${getConfig().SITE_NAME}`} - { /** This conditional is for the [MM-P2P] Experiment */} - { !MMP2P.state.isEnabled && ( - - )} + {celebrationOpen && ( )} - { /** [MM-P2P] Experiment */ } - { MMP2P.meta.modalLock && } ); } diff --git a/src/courseware/course/CourseBreadcrumbs.jsx b/src/courseware/course/CourseBreadcrumbs.jsx index 1111182f..b6e7b5a6 100644 --- a/src/courseware/course/CourseBreadcrumbs.jsx +++ b/src/courseware/course/CourseBreadcrumbs.jsx @@ -7,9 +7,6 @@ import { faHome } from '@fortawesome/free-solid-svg-icons'; import { useSelector } from 'react-redux'; import { useModel } from '../../generic/model-store'; -/** [MM-P2P] Experiment */ -import { MMP2PFlyoverTrigger } from '../../experiments/mm-p2p'; - function CourseBreadcrumb({ url, children, withSeparator, ...attrs }) { @@ -42,8 +39,6 @@ export default function CourseBreadcrumbs({ toggleREV1512Flyover, /* This line should be reverted after the REV1512 experiment */ REV1512FlyoverEnabled, /* This line should be reverted after the REV1512 experiment */ isREV1512FlyoverVisible, /* This line should be reverted after the REV1512 experiment */ - /** [MM-P2P] Experiment */ - mmp2p, }) { const course = useModel('coursewareMeta', courseId); const sequence = useModel('sequences', sequenceId); @@ -97,24 +92,20 @@ export default function CourseBreadcrumbs({ ))} {/* The below block of code should be reverted after the REV1512 experiment */} - {/** [MM-P2P] Experiment (additional conditional) */} - {REV1512FlyoverEnabled && !mmp2p.state.isEnabled && !isMobile && ( - - )} - {/** [MM-P2P] Experiment */} - {mmp2p.state.isEnabled && ( - + {REV1512FlyoverEnabled + && !isMobile && ( + )} @@ -128,19 +119,9 @@ CourseBreadcrumbs.propTypes = { toggleREV1512Flyover: PropTypes.func.isRequired, /* This line should be reverted after the REV1512 experiment */ REV1512FlyoverEnabled: PropTypes.bool.isRequired, /* This line should be reverted after the REV1512 experiment */ isREV1512FlyoverVisible: PropTypes.func.isRequired, /* This line should be reverted after the REV1512 experiment */ - - /** [MM-P2P] Experiment */ - mmp2p: PropTypes.shape({ - state: PropTypes.shape({ - isEnabled: PropTypes.bool.isRequired, - }), - }), }; CourseBreadcrumbs.defaultProps = { sectionId: null, sequenceId: null, - - /** [MM-P2P] Experiment */ - mmp2p: {}, }; diff --git a/src/courseware/course/sequence/Sequence.jsx b/src/courseware/course/sequence/Sequence.jsx index 36d21060..75ab27d8 100644 --- a/src/courseware/course/sequence/Sequence.jsx +++ b/src/courseware/course/sequence/Sequence.jsx @@ -24,9 +24,6 @@ import messages from './messages'; import { SequenceNavigation, UnitNavigation } from './sequence-navigation'; import SequenceContent from './SequenceContent'; -/** [MM-P2P] Experiment */ -import { MMP2PFlyover, MMP2PFlyoverMobile } from '../../../experiments/mm-p2p'; - function REV1512Flyover({ toggleREV1512Flyover }) { // This component should be reverted after the REV1512 experiment return ( @@ -195,8 +192,6 @@ function Sequence({ isREV1512FlyoverVisible, /* This line should be reverted after the REV1512 experiment */ REV1512FlyoverEnabled, /* This line should be reverted after the REV1512 experiment */ toggleREV1512Flyover, /* This line should be reverted after the REV1512 experiment */ - /** [MM-P2P] Experiment */ - mmp2p, }) { const course = useModel('coursewareMeta', courseId); const sequence = useModel('sequences', sequenceId); @@ -323,9 +318,6 @@ function Sequence({ toggleREV1512Flyover={toggleREV1512Flyover} /* This line should be reverted after REV1512 experiment */ REV1512FlyoverEnabled={REV1512FlyoverEnabled} /* This line should be reverted after REV1512 experiment */ isREV1512FlyoverVisible={isREV1512FlyoverVisible} /* should be reverted after REV1512 experiment */ - /** [MM-P2P] Experiment */ - mmp2p={mmp2p} - nextSequenceHandler={() => { logEvent('edx.ui.lms.sequence.next_selected', 'top'); handleNext(); @@ -347,8 +339,6 @@ function Sequence({ sequenceId={sequenceId} unitId={unitId} unitLoadedHandler={handleUnitLoaded} - /** [MM-P2P] Experiment */ - mmp2p={mmp2p} /> {unitHasLoaded && (
    {/* This block of code should be reverted post REV1512 experiment */} - {/** [MM-P2P] Experiment (additional conditional) */} - {!mmp2p.state.isEnabled && REV1512FlyoverEnabled && isREV1512FlyoverVisible() && ( + {REV1512FlyoverEnabled && isREV1512FlyoverVisible() && ( isMobile ? : )} - {/** [MM-P2P] Experiment */} - {(mmp2p.state.isEnabled && mmp2p.flyover.isVisible) && ( - isMobile - ? - : - )}
    @@ -405,31 +388,11 @@ Sequence.propTypes = { toggleREV1512Flyover: PropTypes.func.isRequired, /* This line should be reverted after the REV1512 experiment */ isREV1512FlyoverVisible: PropTypes.func.isRequired, /* This line should be reverted after the REV1512 experiment */ REV1512FlyoverEnabled: PropTypes.bool.isRequired, /* This line should be reverted after the REV1512 experiment */ - - /** [MM-P2P] Experiment */ - mmp2p: PropTypes.shape({ - flyover: PropTypes.shape({ - isVisible: PropTypes.bool.isRequired, - }), - meta: PropTypes.shape({ - showLock: PropTypes.bool, - }), - state: PropTypes.shape({ - isEnabled: PropTypes.bool.isRequired, - }), - }), }; Sequence.defaultProps = { sequenceId: null, unitId: null, - - /** [MM-P2P] Experiment */ - mmp2p: { - flyover: { isVisible: false }, - meta: { showLock: false }, - state: { isEnabled: false }, - }, }; export default injectIntl(Sequence); diff --git a/src/courseware/course/sequence/SequenceContent.jsx b/src/courseware/course/sequence/SequenceContent.jsx index d6eff201..51b796b8 100644 --- a/src/courseware/course/sequence/SequenceContent.jsx +++ b/src/courseware/course/sequence/SequenceContent.jsx @@ -10,14 +10,7 @@ import Unit from './Unit'; const ContentLock = React.lazy(() => import('./content-lock')); function SequenceContent({ - gated, - intl, - courseId, - sequenceId, - unitId, - unitLoadedHandler, - /** [MM-P2P] Experiment */ - mmp2p, + gated, intl, courseId, sequenceId, unitId, unitLoadedHandler, }) { const sequence = useModel('sequences', sequenceId); @@ -61,8 +54,6 @@ function SequenceContent({ key={unitId} id={unitId} onLoaded={unitLoadedHandler} - /** [MM-P2P] Experiment */ - mmp2p={mmp2p} /> ); } @@ -74,28 +65,10 @@ SequenceContent.propTypes = { unitId: PropTypes.string, unitLoadedHandler: PropTypes.func.isRequired, intl: intlShape.isRequired, - /** [MM-P2P] Experiment */ - mmp2p: PropTypes.shape({ - flyover: PropTypes.shape({ - isVisible: PropTypes.bool.isRequired, - }), - meta: PropTypes.shape({ - showLock: PropTypes.bool, - }), - state: PropTypes.shape({ - isEnabled: PropTypes.bool.isRequired, - }), - }), }; SequenceContent.defaultProps = { unitId: null, - /** [MM-P2P] Experiment */ - mmp2p: { - flyover: { isVisible: false }, - meta: { showLock: false }, - state: { isEnabled: false }, - }, }; export default injectIntl(SequenceContent); diff --git a/src/courseware/course/sequence/Unit.jsx b/src/courseware/course/sequence/Unit.jsx index 74ade1ba..78c53bec 100644 --- a/src/courseware/course/sequence/Unit.jsx +++ b/src/courseware/course/sequence/Unit.jsx @@ -18,8 +18,6 @@ import { useModel } from '../../../generic/model-store'; import PageLoading from '../../../generic/PageLoading'; import { processEvent } from '../../../course-home/data/thunks'; import { fetchCourse } from '../../data/thunks'; -/** [MM-P2P] Experiment */ -import { MMP2PLockPaywall } from '../../../experiments/mm-p2p'; const LockPaywall = React.lazy(() => import('./lock-paywall')); const LockPaywallValuePropExperiment = React.lazy(() => import('./lock-paywall-value-prop')); @@ -62,8 +60,6 @@ function Unit({ onLoaded, id, intl, - /** [MM-P2P] Experiment */ - mmp2p, }) { const { authenticatedUser } = useContext(AppContext); const view = authenticatedUser ? 'student_view' : 'public_view'; @@ -134,7 +130,7 @@ function Unit({ isBookmarked={unit.bookmarked} isProcessing={unit.bookmarkedUpdateState === 'loading'} /> - { !mmp2p.state.isEnabled && contentTypeGatingEnabled && unit.containsContentTypeGatedContent && ( + {contentTypeGatingEnabled && unit.containsContentTypeGatedContent && ( } )} - { /** [MM-P2P] Experiment */ } - { mmp2p.meta.showLock && ( - - )} - { /** [MM-P2P] Experiment (conditional) */ } - {!mmp2p.meta.blockContent && !hasLoaded && ( + {!hasLoaded && ( @@ -182,27 +173,24 @@ function Unit({ dialogClassName="modal-lti" /> )} - { /** [MM-P2P] Experiment (conditional) */ } - { !mmp2p.meta.blockContent && ( -
    -