richie-education 2.24.0 → 2.25.0-b2.dev101
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintignore +2 -0
- package/.nvmrc +1 -1
- package/.prettierignore +2 -0
- package/.storybook/preview-body.html +1 -1
- package/.storybook/preview.tsx +5 -2
- package/cunningham.cjs +52 -43
- package/i18n/locales/ar-SA.json +500 -100
- package/i18n/locales/es-ES.json +500 -100
- package/i18n/locales/fa-IR.json +500 -100
- package/i18n/locales/fr-CA.json +564 -164
- package/i18n/locales/fr-FR.json +517 -117
- package/i18n/locales/ko-KR.json +500 -100
- package/i18n/locales/pt-PT.json +526 -126
- package/i18n/locales/ru-RU.json +500 -100
- package/i18n/locales/vi-VN.json +1734 -0
- package/jest/setup.ts +11 -1
- package/js/api/enrollment.ts +1 -1
- package/js/api/joanie.spec.ts +63 -2
- package/js/api/joanie.ts +218 -141
- package/js/api/lms/dummy.spec.ts +9 -1
- package/js/api/lms/dummy.ts +63 -10
- package/js/api/lms/joanie.spec.ts +49 -31
- package/js/api/lms/joanie.ts +53 -35
- package/js/api/lms/openedx-hawthorn.spec.ts +27 -11
- package/js/api/lms/openedx-hawthorn.ts +7 -6
- package/js/components/AddressesManagement/AddressForm/index.spec.tsx +157 -0
- package/js/components/AddressesManagement/AddressForm/index.stories.tsx +36 -0
- package/js/components/AddressesManagement/AddressForm/index.tsx +163 -0
- package/js/components/AddressesManagement/{validationSchema.ts → AddressForm/validationSchema.ts} +1 -23
- package/js/components/AddressesManagement/_styles.scss +1 -1
- package/js/components/AddressesManagement/index.spec.tsx +171 -202
- package/js/components/AddressesManagement/index.stories.tsx +29 -0
- package/js/components/AddressesManagement/index.tsx +11 -3
- package/js/components/Badge/index.spec.tsx +17 -0
- package/js/components/Badge/index.stories.tsx +22 -0
- package/js/components/Badge/index.tsx +18 -0
- package/js/components/Banner/index.tsx +6 -1
- package/js/components/ContractFrame/AbstractContractFrame.spec.tsx +332 -0
- package/js/components/ContractFrame/AbstractContractFrame.tsx +289 -0
- package/js/components/ContractFrame/LearnerContractFrame.spec.tsx +125 -0
- package/js/components/ContractFrame/LearnerContractFrame.tsx +42 -0
- package/js/components/ContractFrame/OrganizationContractFrame.spec.tsx +167 -0
- package/js/components/ContractFrame/OrganizationContractFrame.tsx +70 -0
- package/js/components/ContractFrame/_styles.scss +62 -0
- package/js/components/ContractFrame/iframe-manager.js +158 -0
- package/js/components/ContractFrame/index.ts +5 -0
- package/js/components/ContractStatus/index.spec.tsx +120 -0
- package/js/components/ContractStatus/index.tsx +67 -0
- package/js/components/CourseGlimpse/CourseGlimpseFooter.tsx +7 -7
- package/js/components/CourseGlimpse/index.tsx +5 -1
- package/js/components/CourseGlimpse/utils.ts +24 -16
- package/js/components/CourseGlimpseList/index.spec.tsx +1 -1
- package/js/components/CourseGlimpseList/index.tsx +1 -1
- package/js/components/CourseGlimpseList/utils.ts +3 -2
- package/js/components/DjangoCMSTemplate/index.spec.tsx +2 -2
- package/js/components/DownloadCertificateButton/index.tsx +58 -0
- package/js/components/DownloadContractButton/index.spec.tsx +155 -0
- package/js/components/DownloadContractButton/index.tsx +48 -0
- package/js/components/Form/CountrySelectField.tsx +28 -16
- package/js/components/Form/Input/index.spec.tsx +76 -0
- package/js/components/Form/Input/index.tsx +47 -0
- package/js/components/Form/Select/index.spec.tsx +99 -0
- package/js/components/Form/Select/index.tsx +43 -0
- package/js/components/{AddressesManagement → Form}/ValidationErrors.ts +10 -5
- package/js/components/Form/index.ts +5 -1
- package/js/components/Form/messages.ts +14 -0
- package/js/components/Form/test-utils.ts +19 -0
- package/js/components/Form/utils.spec.ts +72 -0
- package/js/components/Form/utils.ts +37 -0
- package/js/components/Icon/index.stories.tsx +2 -1
- package/js/components/Modal/_styles.scss +0 -8
- package/js/components/Modal/index.spec.tsx +0 -6
- package/js/components/Modal/index.tsx +23 -17
- package/js/components/PaymentButton/_styles.scss +26 -0
- package/js/{widgets/CourseProductItem → components/PaymentButton}/components/PaymentInterfaces/Dummy.tsx +1 -1
- package/js/{widgets/CourseProductItem → components/PaymentButton}/components/PaymentInterfaces/PayplugLightbox.tsx +30 -7
- package/js/{widgets/CourseProductItem → components/PaymentButton}/components/PaymentInterfaces/__mocks__/index.tsx +1 -1
- package/js/{widgets/CourseProductItem → components/PaymentButton}/components/PaymentInterfaces/index.spec.tsx +5 -3
- package/js/{widgets/CourseProductItem → components/PaymentButton}/components/PaymentInterfaces/index.tsx +7 -5
- package/js/components/PaymentButton/hooks/useTerms.tsx +74 -0
- package/js/components/PaymentButton/index.spec.tsx +1038 -0
- package/js/{widgets/CourseProductItem/components → components}/PaymentButton/index.tsx +94 -41
- package/js/components/PurchaseButton/index.spec.tsx +377 -0
- package/js/components/PurchaseButton/index.stories.tsx +15 -0
- package/js/{widgets/CourseProductItem/components → components}/PurchaseButton/index.tsx +72 -23
- package/js/components/PurchaseButton/styles.scss +7 -0
- package/js/components/RegisteredAddress/_styles.scss +1 -3
- package/js/components/RegisteredAddress/index.spec.tsx +1 -1
- package/js/components/RegisteredAddress/index.stories.tsx +40 -0
- package/js/components/RegisteredAddress/index.tsx +17 -19
- package/js/components/SaleTunnel/_styles.scss +11 -0
- package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/RegisteredCreditCard/index.tsx +4 -10
- package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/SaleTunnelStepPayment/_styles.scss +7 -0
- package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/SaleTunnelStepPayment/index.spec.tsx +85 -61
- package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/SaleTunnelStepPayment/index.tsx +55 -57
- package/js/components/SaleTunnel/components/SaleTunnelStepResume/_styles.scss +63 -0
- package/js/components/SaleTunnel/components/SaleTunnelStepResume/index.spec.tsx +80 -0
- package/js/components/SaleTunnel/components/SaleTunnelStepResume/index.tsx +88 -0
- package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/SaleTunnelStepValidation/CourseRunsList.tsx +6 -2
- package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/SaleTunnelStepValidation/_styles.scss +5 -0
- package/js/components/SaleTunnel/components/SaleTunnelStepValidation/index.spec.tsx +170 -0
- package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/SaleTunnelStepValidation/index.tsx +41 -10
- package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/StepBreadcrumb/index.spec.tsx +1 -1
- package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/StepBreadcrumb/index.tsx +1 -1
- package/js/components/SaleTunnel/context.tsx +44 -0
- package/js/{widgets/CourseProductItem/components → components}/SaleTunnel/index.spec.tsx +27 -22
- package/js/{widgets/CourseProductItem/components → components}/SaleTunnel/index.tsx +96 -24
- package/js/components/SignContractButton/index.omniscientOrders.spec.tsx +135 -0
- package/js/components/SignContractButton/index.spec.tsx +213 -0
- package/js/components/SignContractButton/index.tsx +97 -0
- package/js/components/SuccessIcon/_styles.scss +66 -0
- package/js/components/SuccessIcon/index.tsx +10 -0
- package/js/components/TeacherDashboardCourseList/_styles.scss +0 -1
- package/js/components/TeacherDashboardCourseList/index.spec.tsx +9 -9
- package/js/components/TeacherDashboardCourseList/index.tsx +25 -31
- package/js/contexts/JoanieApiContext/index.spec.tsx +1 -1
- package/js/contexts/SessionContext/BaseSessionProvider.tsx +12 -22
- package/js/contexts/SessionContext/JoanieSessionProvider.spec.tsx +14 -0
- package/js/contexts/SessionContext/JoanieSessionProvider.tsx +33 -34
- package/js/contexts/SessionContext/index.spec.tsx +6 -7
- package/js/hooks/useBreadcrumbsPlaceholders.tsx +1 -1
- package/js/hooks/useContractAbilities/index.spec.ts +27 -0
- package/js/hooks/useContractAbilities/index.ts +8 -0
- package/js/hooks/useContractArchive/index.download.spec.tsx +126 -0
- package/js/hooks/useContractArchive/index.spec.tsx +91 -0
- package/js/hooks/useContractArchive/index.ts +64 -0
- package/js/hooks/useContracts/index.tsx +68 -0
- package/js/hooks/useCourseProductRelation/index.ts +8 -5
- package/js/hooks/useCourseProductUnion/index.spec.tsx +14 -10
- package/js/hooks/useCourseProductUnion/index.ts +6 -2
- package/js/hooks/useCourseProducts.ts +45 -0
- package/js/hooks/useCourseSearchParams/computeNewFilterValue.ts +3 -3
- package/js/hooks/useCourses/index.spec.tsx +2 -2
- package/js/hooks/useCourses/index.ts +4 -4
- package/js/hooks/useCreditCards/index.spec.tsx +4 -4
- package/js/hooks/useDashboardAddressForm.tsx +85 -87
- package/js/hooks/useDownloadCertificate/index.spec.tsx +19 -6
- package/js/hooks/useDownloadCertificate/index.tsx +2 -20
- package/js/hooks/useEnrollments.ts +1 -1
- package/js/hooks/useJoanieUserAbilities/index.not.isJoanieEnabled.spec.tsx +17 -0
- package/js/hooks/useJoanieUserAbilities/index.spec.tsx +68 -0
- package/js/hooks/useJoanieUserAbilities/index.tsx +11 -0
- package/js/hooks/useJoanieUserProfile.tsx +34 -0
- package/js/hooks/useOrders.ts +69 -26
- package/js/hooks/useOrganizations/index.ts +1 -1
- package/js/hooks/useProductOrder/index.spec.tsx +113 -0
- package/js/hooks/useProductOrder/index.tsx +33 -0
- package/js/hooks/useQueryKeyInvalidateListener.tsx +16 -0
- package/js/hooks/useResources/index.spec.tsx +30 -29
- package/js/hooks/useResources/index.tsx +11 -4
- package/js/hooks/useResources/useResourcesOmniscient.ts +2 -2
- package/js/hooks/useResources/useResourcesRoot.ts +21 -17
- package/js/hooks/useTeacherPendingContractsCount/index.ts +34 -0
- package/js/hooks/useUnionResource/index.spec.tsx +5 -2
- package/js/hooks/useUnionResource/index.ts +20 -3
- package/js/hooks/useUnionResource/utils/fetchEntity.ts +5 -4
- package/js/index.tsx +2 -2
- package/js/pages/DashboardAddressesManagement/DashboardAddressBox.tsx +1 -1
- package/js/pages/DashboardAddressesManagement/DashboardCreateAddress.spec.tsx +79 -72
- package/js/pages/DashboardAddressesManagement/DashboardCreateAddress.tsx +4 -4
- package/js/pages/DashboardAddressesManagement/DashboardEditAddress.spec.tsx +32 -23
- package/js/pages/DashboardAddressesManagement/DashboardEditAddress.tsx +6 -6
- package/js/pages/DashboardAddressesManagement/DashboardEditAddressLoader.tsx +2 -2
- package/js/pages/DashboardAddressesManagement/index.spec.tsx +4 -3
- package/js/pages/DashboardAddressesManagement/index.tsx +5 -5
- package/js/pages/DashboardCertificates/index.spec.tsx +3 -2
- package/js/pages/DashboardCertificates/index.tsx +2 -1
- package/js/pages/DashboardContracts/_styles.scss +8 -0
- package/js/pages/DashboardContracts/index.spec.tsx +147 -0
- package/js/pages/DashboardContracts/index.tsx +76 -0
- package/js/pages/DashboardCourses/index.spec.tsx +81 -61
- package/js/pages/DashboardCourses/index.tsx +15 -12
- package/js/pages/DashboardCourses/useOrdersEnrollments.tsx +34 -8
- package/js/pages/DashboardCreditCardsManagement/DashboardCreditCardBox.tsx +1 -1
- package/js/pages/DashboardCreditCardsManagement/DashboardEditCreditCard.spec.tsx +7 -6
- package/js/pages/DashboardCreditCardsManagement/DashboardEditCreditCard.tsx +43 -45
- package/js/pages/DashboardCreditCardsManagement/DashboardEditCreditCardLoader.tsx +2 -2
- package/js/pages/DashboardCreditCardsManagement/index.spec.tsx +13 -12
- package/js/pages/DashboardCreditCardsManagement/index.tsx +3 -3
- package/js/pages/DashboardOrderLayout/_styles.scss +5 -0
- package/js/pages/DashboardOrderLayout/index.spec.tsx +8 -8
- package/js/pages/DashboardOrderLayout/index.tsx +11 -6
- package/js/pages/TeacherDashboardContractsLayout/TeacherDashboardContracts/index.spec.tsx +358 -0
- package/js/pages/TeacherDashboardContractsLayout/TeacherDashboardContracts/index.tsx +129 -0
- package/js/pages/TeacherDashboardContractsLayout/TeacherDashboardCourseContractsLayout/index.tsx +26 -0
- package/js/pages/TeacherDashboardContractsLayout/TeacherDashboardOrganizationContractsLayout/index.tsx +26 -0
- package/js/pages/TeacherDashboardContractsLayout/components/BulkDownloadContractButton/index.spec.tsx +136 -0
- package/js/pages/TeacherDashboardContractsLayout/components/BulkDownloadContractButton/index.timer.spec.tsx +144 -0
- package/js/pages/TeacherDashboardContractsLayout/components/BulkDownloadContractButton/index.tsx +73 -0
- package/js/pages/TeacherDashboardContractsLayout/components/ContractActionsBar/index.spec.tsx +185 -0
- package/js/pages/TeacherDashboardContractsLayout/components/ContractActionsBar/index.tsx +47 -0
- package/js/pages/TeacherDashboardContractsLayout/components/ContractFiltersBar/index.spec.tsx +179 -0
- package/js/pages/TeacherDashboardContractsLayout/components/ContractFiltersBar/index.tsx +86 -0
- package/js/pages/TeacherDashboardContractsLayout/components/SignOrganizationContractButton/index.spec.tsx +109 -0
- package/js/pages/TeacherDashboardContractsLayout/components/SignOrganizationContractButton/index.tsx +60 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useCheckContractArchiveExists/index.spec.tsx +124 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useCheckContractArchiveExists/index.tsx +73 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useDefaultOrganizationId/index.spec.tsx +134 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useDefaultOrganizationId/index.tsx +28 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/contractArchiveLocalStorage.spec.ts +85 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/contractArchiveLocalStorage.ts +50 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/index.spec.tsx +266 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/index.tsx +153 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useHasContractToDownload/index.spec.tsx +100 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useHasContractToDownload/index.tsx +27 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useTeacherContractFilters/index.spec.tsx +193 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useTeacherContractFilters/index.tsx +44 -0
- package/js/pages/TeacherDashboardContractsLayout/hooks/useTeacherContractsToSign.tsx +32 -0
- package/js/pages/TeacherDashboardContractsLayout/index.ts +2 -0
- package/js/pages/TeacherDashboardContractsLayout/styles.scss +15 -0
- package/js/pages/{TeacherCourseDashboardLoader → TeacherDashboardCourseLoader}/CourseRunList/CourseRunListCell/index.spec.tsx +1 -1
- package/js/pages/{TeacherCourseDashboardLoader → TeacherDashboardCourseLoader}/CourseRunList/_styles.scss +1 -2
- package/js/pages/{TeacherCourseDashboardLoader → TeacherDashboardCourseLoader}/CourseRunList/index.spec.tsx +2 -2
- package/js/pages/{TeacherCourseDashboardLoader → TeacherDashboardCourseLoader}/CourseRunList/utils.spec.tsx +1 -1
- package/js/pages/{TeacherCourseDashboardLoader → TeacherDashboardCourseLoader}/CourseRunList/utils.tsx +11 -10
- package/js/pages/{TeacherCourseDashboardLoader → TeacherDashboardCourseLoader}/index.tsx +9 -8
- package/js/pages/{TeacherCoursesDashboardLoader → TeacherDashboardCoursesLoader}/index.spec.tsx +17 -17
- package/js/pages/{TeacherCoursesDashboardLoader → TeacherDashboardCoursesLoader}/index.tsx +7 -7
- package/js/pages/{TeacherOrganizationCourseDashboardLoader → TeacherDashboardOrganizationCourseLoader}/index.tsx +5 -5
- package/js/pages/{TeacherTrainingDashboard/TeacherTrainingDashboardLoader.tsx → TeacherDashboardTraining/TeacherDashboardTrainingLoader.tsx} +10 -9
- package/js/pages/{TeacherTrainingDashboard → TeacherDashboardTraining}/index.spec.tsx +76 -6
- package/js/pages/{TeacherTrainingDashboard → TeacherDashboardTraining}/index.tsx +6 -6
- package/js/settings.dev.dist.ts +3 -0
- package/js/settings.ts +29 -1
- package/js/translations/ar-SA.json +1 -1
- package/js/translations/es-ES.json +1 -1
- package/js/translations/fa-IR.json +1 -1
- package/js/translations/fr-CA.json +1 -1
- package/js/translations/fr-FR.json +1 -1
- package/js/translations/ko-KR.json +1 -1
- package/js/translations/pt-PT.json +1 -1
- package/js/translations/ru-RU.json +1 -1
- package/js/translations/vi-VN.json +1 -0
- package/js/types/Joanie.ts +263 -80
- package/js/types/Suggestion.ts +2 -2
- package/js/types/User.ts +19 -1
- package/js/types/commonDataProps.ts +3 -0
- package/js/types/index.ts +1 -1
- package/js/utils/AbilitiesHelper/contractAbilities.spec.ts +35 -0
- package/js/utils/AbilitiesHelper/contractAbilities.ts +14 -0
- package/js/utils/AbilitiesHelper/index.ts +71 -0
- package/js/utils/AbilitiesHelper/joanieUserProfileAbilities.spec.ts +55 -0
- package/js/utils/AbilitiesHelper/joanieUserProfileAbilities.ts +16 -0
- package/js/utils/AbilitiesHelper/types.ts +36 -0
- package/js/utils/ContractHelper/index.spec.ts +73 -0
- package/js/utils/ContractHelper/index.ts +72 -0
- package/js/utils/CourseRuns/index.spec.tsx +20 -1
- package/js/utils/CourseRuns/index.ts +14 -2
- package/js/utils/CoursesHelper/index.spec.ts +45 -55
- package/js/utils/CoursesHelper/index.ts +6 -7
- package/js/utils/CreditCardHelper/index.spec.tsx +26 -22
- package/js/utils/CreditCardHelper/index.tsx +19 -6
- package/js/utils/ObjectHelper/index.spec.ts +18 -10
- package/js/utils/ObjectHelper/index.ts +9 -0
- package/js/utils/OrderHelper/index.ts +32 -0
- package/js/utils/ProductHelper/index.ts +5 -1
- package/js/utils/StringHelper/index.spec.tsx +11 -0
- package/js/utils/StringHelper/index.ts +8 -0
- package/js/utils/UserHelper/index.spec.ts +18 -0
- package/js/utils/UserHelper/index.ts +8 -0
- package/js/utils/download.ts +43 -0
- package/js/utils/errors/HttpError.ts +10 -0
- package/js/utils/indirection/window.ts +1 -1
- package/js/utils/react-query/createQueryClient.ts +12 -21
- package/js/utils/react-query/useLocalizedQueryKey.ts +1 -1
- package/js/utils/react-query/useSessionMutation/index.spec.tsx +8 -8
- package/js/utils/react-query/useSessionMutation/index.ts +6 -11
- package/js/utils/react-query/useSessionQuery/index.spec.tsx +36 -8
- package/js/utils/react-query/useSessionQuery/index.ts +14 -21
- package/js/utils/search/getSuggestionsSection/index.spec.ts +4 -3
- package/js/utils/search/getSuggestionsSection/index.ts +4 -1
- package/js/utils/search/index.tsx +8 -3
- package/js/utils/test/createTestQueryClient.ts +7 -7
- package/js/utils/test/expectBanner.ts +16 -3
- package/js/utils/test/factories/factories.ts +4 -4
- package/js/utils/test/factories/joanie.spec.ts +7 -0
- package/js/utils/test/factories/joanie.ts +214 -63
- package/js/utils/test/factories/reactQuery.ts +1 -1
- package/js/utils/test/factories/richie.ts +4 -2
- package/js/utils/test/mockCourseProductWithOrder.ts +28 -0
- package/js/utils/test/mockPaginatedResponse.ts +1 -1
- package/js/utils/test/render.tsx +72 -0
- package/js/utils/test/wrappers/IntlWrapper.tsx +23 -0
- package/js/utils/test/wrappers/JoanieAppWrapper.tsx +42 -0
- package/js/utils/test/wrappers/PresentationalAppWrapper.tsx +18 -0
- package/js/utils/test/wrappers/ReactQueryWrapper.tsx +16 -0
- package/js/utils/test/wrappers/RouterWrapper.tsx +29 -0
- package/js/utils/test/wrappers/types.ts +26 -0
- package/js/widgets/Dashboard/components/DashboardAvatar/_styles.scss +17 -5
- package/js/widgets/Dashboard/components/DashboardAvatar/index.spec.tsx +9 -2
- package/js/widgets/Dashboard/components/DashboardAvatar/index.tsx +16 -5
- package/js/widgets/Dashboard/components/DashboardBox/index.stories.tsx +1 -1
- package/js/widgets/Dashboard/components/DashboardBreadcrumbs/_styles.scss +1 -0
- package/js/widgets/Dashboard/components/DashboardBreadcrumbs/index.tsx +7 -4
- package/js/widgets/Dashboard/components/DashboardCard/index.spec.tsx +1 -1
- package/js/widgets/Dashboard/components/DashboardCard/index.stories.tsx +3 -3
- package/js/widgets/Dashboard/components/DashboardCard/index.tsx +2 -2
- package/js/widgets/Dashboard/components/DashboardItem/Certificate/index.spec.tsx +49 -9
- package/js/widgets/Dashboard/components/DashboardItem/Certificate/index.tsx +27 -73
- package/js/widgets/Dashboard/components/DashboardItem/CertificateStatus/index.spec.tsx +65 -0
- package/js/widgets/Dashboard/components/DashboardItem/CertificateStatus/index.tsx +59 -0
- package/js/widgets/Dashboard/components/DashboardItem/Contract/_styles.scss +29 -0
- package/js/widgets/Dashboard/components/DashboardItem/Contract/index.spec.tsx +197 -0
- package/js/widgets/Dashboard/components/DashboardItem/Contract/index.stories.tsx +34 -0
- package/js/widgets/Dashboard/components/DashboardItem/Contract/index.tsx +53 -0
- package/js/widgets/Dashboard/components/DashboardItem/CourseEnrolling/hooks/useCourseRunPeriodMessage.ts +76 -0
- package/js/widgets/Dashboard/components/DashboardItem/CourseEnrolling/index.spec.tsx +158 -0
- package/js/widgets/Dashboard/components/DashboardItem/{DashboardItemCourseEnrolling.stories.tsx → CourseEnrolling/index.stories.tsx} +6 -6
- package/js/widgets/Dashboard/components/DashboardItem/{DashboardItemCourseEnrolling.tsx → CourseEnrolling/index.tsx} +141 -84
- package/js/widgets/Dashboard/components/DashboardItem/Enrollment/DashboardItemEnrollment.spec.tsx +40 -37
- package/js/widgets/Dashboard/components/DashboardItem/Enrollment/DashboardItemEnrollment.tsx +29 -11
- package/js/widgets/Dashboard/components/DashboardItem/Enrollment/ProductCertificateFooter/index.spec.tsx +248 -0
- package/js/widgets/Dashboard/components/DashboardItem/Enrollment/ProductCertificateFooter/index.tsx +89 -0
- package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.spec.tsx +188 -117
- package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.tsx +124 -78
- package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrderContract.spec.tsx +299 -0
- package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrderContract.useUnionResource.cache.spec.tsx +286 -0
- package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrderReadonly.stories.tsx +9 -5
- package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrderWritable.stories.tsx +10 -6
- package/js/widgets/Dashboard/components/DashboardItem/Order/OrderStateMessage/index.spec.tsx +121 -0
- package/js/widgets/Dashboard/components/DashboardItem/Order/OrderStateMessage/index.tsx +98 -0
- package/js/widgets/Dashboard/components/DashboardItem/Order/_styles.scss +43 -0
- package/js/widgets/Dashboard/components/DashboardItem/_styles.scss +34 -37
- package/js/widgets/Dashboard/components/DashboardItem/index.spec.tsx +74 -4
- package/js/widgets/Dashboard/components/DashboardItem/index.stories.tsx +18 -0
- package/js/widgets/Dashboard/components/DashboardItem/index.tsx +91 -26
- package/js/widgets/Dashboard/components/DashboardItem/stories.mock.ts +4 -8
- package/js/widgets/Dashboard/components/DashboardLayout/_styles.scss +14 -5
- package/js/widgets/Dashboard/components/DashboardLayout/index.tsx +10 -3
- package/js/widgets/Dashboard/components/DashboardListAvatar/_styles.scss +8 -0
- package/js/widgets/Dashboard/components/DashboardListAvatar/index.tsx +11 -0
- package/js/widgets/Dashboard/components/DashboardOrderLoader/_styles.scss +5 -0
- package/js/widgets/Dashboard/components/DashboardOrderLoader/index.tsx +50 -14
- package/js/widgets/Dashboard/components/DashboardSidebar/_styles.scss +37 -24
- package/js/widgets/Dashboard/components/DashboardSidebar/components/ContractNavLink/index.spec.tsx +244 -0
- package/js/widgets/Dashboard/components/DashboardSidebar/components/ContractNavLink/index.tsx +49 -0
- package/js/widgets/Dashboard/components/DashboardSidebar/components/MenuNavLink/index.spec.tsx +40 -0
- package/js/widgets/Dashboard/components/DashboardSidebar/components/MenuNavLink/index.tsx +28 -0
- package/js/widgets/Dashboard/components/DashboardSidebar/components/NavigationSelect.tsx +58 -0
- package/js/widgets/Dashboard/components/DashboardSidebar/index.stories.tsx +11 -1
- package/js/widgets/Dashboard/components/DashboardSidebar/index.tsx +18 -69
- package/js/widgets/Dashboard/components/DashboardSidebar/utils.ts +6 -0
- package/js/widgets/Dashboard/components/FilterOrganization/index.tsx +58 -0
- package/js/widgets/Dashboard/components/FiltersBar/index.tsx +9 -0
- package/js/widgets/Dashboard/components/LearnerDashboardSidebar/index.tsx +4 -2
- package/js/widgets/Dashboard/components/NavigateWithParams/index.spec.tsx +31 -40
- package/js/widgets/Dashboard/components/RouterButton/index.tsx +2 -1
- package/js/widgets/Dashboard/components/Signature/DummyContractPlaceholder.tsx +25 -0
- package/js/widgets/Dashboard/components/Signature/SignatureDummy.tsx +58 -0
- package/js/widgets/Dashboard/components/Signature/SignatureLexPersona.tsx +72 -0
- package/js/widgets/Dashboard/components/TeacherDashboardCourseSidebar/index.spec.tsx +215 -0
- package/js/widgets/Dashboard/components/{TeacherCourseDashboardSidebar → TeacherDashboardCourseSidebar}/index.tsx +75 -31
- package/js/widgets/Dashboard/components/TeacherDashboardCourseSidebar/utils.ts +23 -0
- package/js/widgets/Dashboard/components/TeacherDashboardOrganizationSidebar/index.spec.tsx +154 -0
- package/js/widgets/Dashboard/components/TeacherDashboardOrganizationSidebar/index.stories.tsx +42 -0
- package/js/widgets/Dashboard/components/{TeacherOrganizationDashboardSidebar → TeacherDashboardOrganizationSidebar}/index.tsx +40 -29
- package/js/widgets/Dashboard/components/{TeacherProfileDashboardSidebar → TeacherDashboardProfileSidebar}/components/OrganizationLinks/_styles.scss +27 -10
- package/js/widgets/Dashboard/components/TeacherDashboardProfileSidebar/components/OrganizationLinks/index.spec.tsx +49 -0
- package/js/widgets/Dashboard/components/{TeacherProfileDashboardSidebar → TeacherDashboardProfileSidebar}/components/OrganizationLinks/index.tsx +18 -7
- package/js/widgets/Dashboard/components/{TeacherProfileDashboardSidebar → TeacherDashboardProfileSidebar}/index.spec.tsx +13 -39
- package/js/widgets/Dashboard/components/{TeacherProfileDashboardSidebar → TeacherDashboardProfileSidebar}/index.stories.tsx +5 -5
- package/js/widgets/Dashboard/components/{TeacherProfileDashboardSidebar → TeacherDashboardProfileSidebar}/index.tsx +4 -3
- package/js/widgets/Dashboard/hooks/useEnroll/index.ts +8 -8
- package/js/widgets/Dashboard/index.spec.tsx +22 -12
- package/js/widgets/Dashboard/utils/learnerRouteMessages.tsx +12 -1
- package/js/widgets/Dashboard/utils/learnerRoutes.tsx +6 -0
- package/js/widgets/Dashboard/utils/teacherRouteMessages.tsx +60 -4
- package/js/widgets/Dashboard/utils/teacherRoutes.tsx +87 -13
- package/js/widgets/LtiConsumer/index.spec.tsx +44 -33
- package/js/widgets/LtiConsumer/index.tsx +11 -15
- package/js/widgets/Search/components/SearchFilterGroup/index.spec.tsx +0 -5
- package/js/widgets/Search/components/SearchFilterGroupModal/_styles.scss +0 -9
- package/js/widgets/Search/components/SearchFilterGroupModal/index.spec.tsx +0 -5
- package/js/widgets/Search/components/SearchFilterGroupModal/index.tsx +86 -60
- package/js/widgets/Search/components/SearchFilterValueParent/index.stories.tsx +51 -0
- package/js/widgets/Search/components/SearchFilterValueParent/index.tsx +7 -7
- package/js/widgets/Search/components/SearchFiltersPane/_styles.scss +2 -16
- package/js/widgets/Search/components/SearchFiltersPane/index.tsx +9 -6
- package/js/widgets/Search/hooks/useCourseSearch/index.ts +13 -7
- package/js/widgets/Search/index.spec.tsx +3 -2
- package/js/widgets/Search/utils/getResourceList/index.spec.ts +12 -5
- package/js/widgets/Search/utils/getResourceList/index.ts +6 -2
- package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/CourseProductItemFooter/index.tsx +74 -0
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/_styles.scss +11 -14
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseProductCertificateItem/_styles.scss +1 -1
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseProductCertificateItem/index.spec.tsx +13 -2
- package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/components/CourseProductCertificateItem/index.stories.tsx +33 -0
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseProductCertificateItem/index.tsx +5 -8
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseProductCourseRuns/CourseRunList.tsx +1 -1
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseProductCourseRuns/EnrollableCourseRunList.tsx +16 -8
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseProductCourseRuns/EnrolledCourseRun.tsx +5 -3
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseProductCourseRuns/_styles.scss +1 -0
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseProductCourseRuns/index.spec.tsx +100 -35
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseRunItem/index.spec.tsx +7 -4
- package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/components/CourseRunItem/index.stories.tsx +36 -0
- package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseRunItem/index.tsx +5 -3
- package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/components/ProductSignatureHeader/index.tsx +40 -0
- package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/index.spec.tsx +898 -0
- package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/index.stories.tsx +83 -0
- package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/index.tsx +253 -0
- package/js/widgets/SyllabusCourseRunsList/components/CourseRunEnrollment/CourseRunUnenrollmentButton/index.tsx +3 -2
- package/js/widgets/SyllabusCourseRunsList/components/CourseRunEnrollment/_styles.scss +0 -25
- package/js/widgets/SyllabusCourseRunsList/components/CourseRunEnrollment/index.joanie.spec.tsx +73 -30
- package/js/widgets/SyllabusCourseRunsList/components/CourseRunEnrollment/index.openedx.spec.tsx +10 -5
- package/js/widgets/SyllabusCourseRunsList/components/CourseRunEnrollment/index.tsx +54 -26
- package/js/widgets/SyllabusCourseRunsList/components/CourseRunItemWithEnrollment/index.tsx +1 -0
- package/js/widgets/SyllabusCourseRunsList/components/CourseWishButton/_styles.scss +0 -3
- package/js/widgets/SyllabusCourseRunsList/components/CourseWishButton/hooks/useCourseWish/index.spec.tsx +12 -9
- package/js/widgets/SyllabusCourseRunsList/components/CourseWishButton/index.login.spec.tsx +14 -12
- package/js/widgets/SyllabusCourseRunsList/components/CourseWishButton/index.logout.spec.tsx +4 -6
- package/js/widgets/SyllabusCourseRunsList/components/CourseWishButton/index.tsx +5 -5
- package/js/widgets/SyllabusCourseRunsList/components/SyllabusAsideList/index.tsx +2 -2
- package/js/widgets/SyllabusCourseRunsList/components/SyllabusCourseRun/index.tsx +19 -13
- package/js/widgets/SyllabusCourseRunsList/components/SyllabusSimpleCourseRunsList/index.tsx +1 -0
- package/js/widgets/SyllabusCourseRunsList/hooks/useCourseEnrollment/index.spec.tsx +2 -1
- package/js/widgets/SyllabusCourseRunsList/hooks/useCourseEnrollment/index.ts +14 -19
- package/js/widgets/SyllabusCourseRunsList/index.spec.tsx +54 -14
- package/js/widgets/SyllabusCourseRunsList/index.tsx +5 -8
- package/js/widgets/UserLogin/components/UserMenu/DesktopUserMenu.tsx +2 -1
- package/js/widgets/UserLogin/components/UserMenu/MobileUserMenu.tsx +2 -1
- package/js/widgets/UserLogin/components/UserMenu/index.tsx +6 -5
- package/js/widgets/UserLogin/index.not.isJoanieEnabled.spec.tsx +120 -0
- package/js/widgets/UserLogin/index.spec.tsx +108 -43
- package/js/widgets/UserLogin/index.stories.tsx +29 -0
- package/js/widgets/UserLogin/index.tsx +33 -15
- package/js/widgets/index.tsx +3 -6
- package/mocks/browser.ts +1 -1
- package/mocks/handlers/contracts.ts +16 -0
- package/mocks/handlers.ts +3 -1
- package/package.json +82 -78
- package/scss/_main.scss +2 -0
- package/scss/colors/_palette.scss +2 -2
- package/scss/colors/_theme.scss +6 -16
- package/scss/components/_content.scss +1 -1
- package/scss/components/_index.scss +24 -14
- package/scss/generic/_type.scss +1 -1
- package/scss/objects/_characteristics.scss +7 -14
- package/scss/objects/_course_glimpses.scss +3 -7
- package/scss/objects/_dashboard.scss +28 -0
- package/scss/objects/_form.scss +14 -355
- package/scss/objects/_index.scss +1 -0
- package/scss/objects/_list.scss +8 -0
- package/scss/objects/_organization_glimpses.scss +2 -8
- package/scss/objects/_selector.scss +1 -0
- package/scss/trumps/_bootstrap.scss +4 -0
- package/scss/vendors/css/cunningham-tokens.css +89 -25
- package/scss/vendors/cunningham-tokens.scss +208 -128
- package/js/components/AddressesManagement/AddressForm.spec.tsx +0 -206
- package/js/components/AddressesManagement/AddressForm.tsx +0 -169
- package/js/components/Button/index.spec.tsx +0 -36
- package/js/components/Button/index.stories.tsx +0 -26
- package/js/components/Button/index.tsx +0 -38
- package/js/components/Form/CheckboxField.stories.tsx +0 -12
- package/js/components/Form/Field.stories.config.tsx +0 -24
- package/js/components/Form/Inputs.tsx +0 -295
- package/js/components/Form/RadioField.stories.tsx +0 -18
- package/js/components/Form/SelectField.stories.tsx +0 -27
- package/js/components/Form/TextAreaField.stories.tsx +0 -12
- package/js/components/Form/TextField.stories.tsx +0 -12
- package/js/components/Form/index.spec.tsx +0 -297
- package/js/hooks/useProduct.ts +0 -28
- package/js/utils/test/mockProductWithOrder.ts +0 -17
- package/js/widgets/CourseProductItem/components/PaymentButton/_styles.scss +0 -12
- package/js/widgets/CourseProductItem/components/PaymentButton/index.spec.tsx +0 -473
- package/js/widgets/CourseProductItem/components/PurchaseButton/index.spec.tsx +0 -259
- package/js/widgets/CourseProductItem/components/SaleTunnel/_styles.scss +0 -41
- package/js/widgets/CourseProductItem/components/SaleTunnelStepResume/_styles.scss +0 -130
- package/js/widgets/CourseProductItem/components/SaleTunnelStepResume/index.spec.tsx +0 -29
- package/js/widgets/CourseProductItem/components/SaleTunnelStepResume/index.tsx +0 -59
- package/js/widgets/CourseProductItem/components/SaleTunnelStepValidation/index.spec.tsx +0 -71
- package/js/widgets/CourseProductItem/contexts/CourseProductContext/index.spec.tsx +0 -35
- package/js/widgets/CourseProductItem/contexts/CourseProductContext/index.tsx +0 -45
- package/js/widgets/CourseProductItem/index.spec.tsx +0 -486
- package/js/widgets/CourseProductItem/index.tsx +0 -205
- package/js/widgets/Dashboard/components/DashboardItem/DashboardItemCourseEnrolling.spec.tsx +0 -64
- package/js/widgets/Dashboard/components/TeacherCourseDashboardSidebar/index.spec.tsx +0 -105
- package/js/widgets/Dashboard/components/TeacherOrganizationDashboardSidebar/index.stories.tsx +0 -28
- /package/js/components/AddressesManagement/{validationSchema.spec.ts → AddressForm/validationSchema.spec.ts} +0 -0
- /package/js/{widgets/CourseProductItem/components → components}/EnrollmentDate/index.tsx +0 -0
- /package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/RegisteredCreditCard/_styles.scss +0 -0
- /package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/RegisteredCreditCard/index.spec.tsx +0 -0
- /package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/SaleTunnelStepValidation/TargetCourseDetail.tsx +0 -0
- /package/js/{widgets/CourseProductItem → components/SaleTunnel}/components/StepBreadcrumb/_styles.scss +0 -0
- /package/js/{widgets/CourseProductItem/hooks → hooks}/useStepManager/index.spec.ts +0 -0
- /package/js/{widgets/CourseProductItem/hooks → hooks}/useStepManager/index.ts +0 -0
- /package/js/pages/{TeacherCourseDashboardLoader → TeacherDashboardCourseLoader}/CourseRunList/CourseRunListCell/index.tsx +0 -0
- /package/js/pages/{TeacherCourseDashboardLoader → TeacherDashboardCourseLoader}/CourseRunList/index.tsx +0 -0
- /package/js/pages/{TeacherTrainingDashboard → TeacherDashboardTraining}/_styles.scss +0 -0
- /package/js/widgets/Dashboard/components/{TeacherCourseDashboardSidebar → TeacherDashboardCourseSidebar}/_styles.scss +0 -0
- /package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseProductCourseRuns/CourseRunSection.tsx +0 -0
- /package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/components/CourseProductCourseRuns/index.tsx +0 -0
- /package/js/widgets/{CourseProductItem → SyllabusCourseRunsList/components/CourseProductItem}/types/payments/payplug.d.ts +0 -0
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { Meta, StoryObj } from '@storybook/react';
|
|
2
|
+
import { QueryClientProvider } from '@tanstack/react-query';
|
|
3
|
+
import fetchMock from 'fetch-mock';
|
|
4
|
+
import { StorybookHelper } from 'utils/StorybookHelper';
|
|
5
|
+
import {
|
|
6
|
+
CourseLightFactory,
|
|
7
|
+
CourseProductRelationFactory,
|
|
8
|
+
CredentialOrderFactory,
|
|
9
|
+
CredentialProductFactory,
|
|
10
|
+
} from 'utils/test/factories/joanie';
|
|
11
|
+
import { createTestQueryClient } from 'utils/test/createTestQueryClient';
|
|
12
|
+
import { UserFactory } from 'utils/test/factories/richie';
|
|
13
|
+
import { CredentialOrder, OrderState } from 'types/Joanie';
|
|
14
|
+
import { Maybe } from 'types/utils';
|
|
15
|
+
import CourseProductItem, { CourseProductItemProps } from '.';
|
|
16
|
+
|
|
17
|
+
const render = (args: CourseProductItemProps, options?: Maybe<{ order: CredentialOrder }>) => {
|
|
18
|
+
fetchMock.get(`http://localhost:8071/api/v1.0/credit-cards/`, [], { overwriteRoutes: true });
|
|
19
|
+
fetchMock.get(`http://localhost:8071/api/v1.0/orders/`, [], { overwriteRoutes: true });
|
|
20
|
+
fetchMock.get(`http://localhost:8071/api/v1.0/addresses/`, [], { overwriteRoutes: true });
|
|
21
|
+
fetchMock.get(
|
|
22
|
+
`http://localhost:8071/api/v1.0/courses/${args.course.code}/products/${args.productId}/`,
|
|
23
|
+
CourseProductRelationFactory({ product: CredentialProductFactory().one() }).one(),
|
|
24
|
+
{ overwriteRoutes: true },
|
|
25
|
+
);
|
|
26
|
+
fetchMock.get(
|
|
27
|
+
`http://localhost:8071/api/v1.0/orders/?course_code=${args.course.code}&product_id=${args.productId}&state=pending&state=validated&state=submitted`,
|
|
28
|
+
options?.order ? [options?.order] : [],
|
|
29
|
+
{ overwriteRoutes: true },
|
|
30
|
+
);
|
|
31
|
+
return StorybookHelper.wrapInApp(
|
|
32
|
+
<QueryClientProvider client={createTestQueryClient({ user: UserFactory().one() })}>
|
|
33
|
+
<CourseProductItem {...args} />
|
|
34
|
+
</QueryClientProvider>,
|
|
35
|
+
);
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
export default {
|
|
39
|
+
component: CourseProductItem,
|
|
40
|
+
parameters: {
|
|
41
|
+
docs: {
|
|
42
|
+
source: {
|
|
43
|
+
code: 'Disabled for this story, see https://github.com/storybookjs/storybook/issues/11554',
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
},
|
|
47
|
+
args: {
|
|
48
|
+
productId: 'AAA',
|
|
49
|
+
course: CourseLightFactory({ code: 'BBB' }).one(),
|
|
50
|
+
},
|
|
51
|
+
render: (args) => render(args),
|
|
52
|
+
} as Meta<typeof CourseProductItem>;
|
|
53
|
+
|
|
54
|
+
type Story = StoryObj<typeof CourseProductItem>;
|
|
55
|
+
|
|
56
|
+
export const Default: Story = {};
|
|
57
|
+
|
|
58
|
+
export const WithPendingOrder: Story = {
|
|
59
|
+
args: {
|
|
60
|
+
productId: 'AAA',
|
|
61
|
+
course: CourseLightFactory({ code: 'BBB' }).one(),
|
|
62
|
+
},
|
|
63
|
+
render: (args) =>
|
|
64
|
+
render(args, { order: CredentialOrderFactory({ state: OrderState.PENDING }).one() }),
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
export const WithValidatedOrder: Story = {
|
|
68
|
+
args: {
|
|
69
|
+
productId: 'AAA',
|
|
70
|
+
course: CourseLightFactory({ code: 'BBB' }).one(),
|
|
71
|
+
},
|
|
72
|
+
render: (args) =>
|
|
73
|
+
render(args, { order: CredentialOrderFactory({ state: OrderState.VALIDATED }).one() }),
|
|
74
|
+
};
|
|
75
|
+
|
|
76
|
+
export const WithSubmittedOrder: Story = {
|
|
77
|
+
args: {
|
|
78
|
+
productId: 'AAA',
|
|
79
|
+
course: CourseLightFactory({ code: 'BBB' }).one(),
|
|
80
|
+
},
|
|
81
|
+
render: (args) =>
|
|
82
|
+
render(args, { order: CredentialOrderFactory({ state: OrderState.SUBMITTED }).one() }),
|
|
83
|
+
};
|
|
@@ -0,0 +1,253 @@
|
|
|
1
|
+
import { Children, useEffect, useMemo } from 'react';
|
|
2
|
+
import { defineMessages, FormattedMessage, FormattedNumber, useIntl } from 'react-intl';
|
|
3
|
+
import c from 'classnames';
|
|
4
|
+
import {
|
|
5
|
+
ProductType,
|
|
6
|
+
OrderState,
|
|
7
|
+
CourseLight,
|
|
8
|
+
Product,
|
|
9
|
+
CredentialOrder,
|
|
10
|
+
CredentialProduct,
|
|
11
|
+
} from 'types/Joanie';
|
|
12
|
+
import { useCourseProduct } from 'hooks/useCourseProducts';
|
|
13
|
+
import { Spinner } from 'components/Spinner';
|
|
14
|
+
import { Icon, IconTypeEnum } from 'components/Icon';
|
|
15
|
+
import { Maybe } from 'types/utils';
|
|
16
|
+
import useDateFormat from 'hooks/useDateFormat';
|
|
17
|
+
import { ProductHelper } from 'utils/ProductHelper';
|
|
18
|
+
import useProductOrder from 'hooks/useProductOrder';
|
|
19
|
+
import { OrderHelper } from 'utils/OrderHelper';
|
|
20
|
+
import { handle } from 'utils/errors/handle';
|
|
21
|
+
import { ProductSignatureHeader } from 'widgets/SyllabusCourseRunsList/components/CourseProductItem/components/ProductSignatureHeader';
|
|
22
|
+
import CertificateItem from './components/CourseProductCertificateItem';
|
|
23
|
+
import CourseRunItem from './components/CourseRunItem';
|
|
24
|
+
import CourseProductItemFooter from './CourseProductItemFooter';
|
|
25
|
+
|
|
26
|
+
const messages = defineMessages({
|
|
27
|
+
purchased: {
|
|
28
|
+
defaultMessage: 'Purchased',
|
|
29
|
+
description: 'Message displayed when authenticated user owned the product',
|
|
30
|
+
id: 'components.CourseProductItem.purchased',
|
|
31
|
+
},
|
|
32
|
+
pending: {
|
|
33
|
+
defaultMessage: 'Pending',
|
|
34
|
+
description:
|
|
35
|
+
'Message displayed when authenticated user has purchased the product but order is still pending',
|
|
36
|
+
id: 'components.CourseProductItem.pending',
|
|
37
|
+
},
|
|
38
|
+
loading: {
|
|
39
|
+
defaultMessage: 'Loading product information...',
|
|
40
|
+
description:
|
|
41
|
+
'Accessible text for the initial loading spinner displayed when product is fetching',
|
|
42
|
+
id: 'components.CourseProductItem.loadingInitial',
|
|
43
|
+
},
|
|
44
|
+
fromTo: {
|
|
45
|
+
defaultMessage: 'From {from} to {to}',
|
|
46
|
+
description: 'Course run date range',
|
|
47
|
+
id: 'components.CourseProductItem.fromTo',
|
|
48
|
+
},
|
|
49
|
+
availableIn: {
|
|
50
|
+
defaultMessage: 'Available in {languages}',
|
|
51
|
+
description: 'Course run languages',
|
|
52
|
+
id: 'components.CourseProductItem.availableIn',
|
|
53
|
+
},
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
export interface CourseProductItemProps {
|
|
57
|
+
compact?: boolean;
|
|
58
|
+
course: CourseLight;
|
|
59
|
+
productId: Product['id'];
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
type HeaderProps = {
|
|
63
|
+
compact: boolean;
|
|
64
|
+
hasPurchased: boolean;
|
|
65
|
+
canPurchase: boolean;
|
|
66
|
+
order: Maybe<CredentialOrder>;
|
|
67
|
+
product: Product;
|
|
68
|
+
};
|
|
69
|
+
const Header = ({ product, order, hasPurchased, canPurchase, compact }: HeaderProps) => {
|
|
70
|
+
const intl = useIntl();
|
|
71
|
+
const formatDate = useDateFormat();
|
|
72
|
+
|
|
73
|
+
// compact mode is available for product until they got a VALIDATED order.
|
|
74
|
+
const canShowMetadata = useMemo(() => {
|
|
75
|
+
return compact && (!order || [OrderState.SUBMITTED, OrderState.PENDING].includes(order!.state));
|
|
76
|
+
}, [compact, hasPurchased]);
|
|
77
|
+
|
|
78
|
+
const [minDate, maxDate] = useMemo(() => {
|
|
79
|
+
if (!canShowMetadata) return [undefined, undefined];
|
|
80
|
+
return ProductHelper.getDateRange(product);
|
|
81
|
+
}, [canShowMetadata, product]);
|
|
82
|
+
|
|
83
|
+
const languages = useMemo(() => {
|
|
84
|
+
if (!canShowMetadata) return '';
|
|
85
|
+
return ProductHelper.getLanguages(product, true, intl);
|
|
86
|
+
}, [canShowMetadata, product, intl]);
|
|
87
|
+
|
|
88
|
+
return (
|
|
89
|
+
<header className="product-widget__header">
|
|
90
|
+
<div className="product-widget__header-main">
|
|
91
|
+
<h3 className="product-widget__title">{product.title}</h3>
|
|
92
|
+
<strong className="product-widget__price h6">
|
|
93
|
+
{order?.state === OrderState.VALIDATED && <FormattedMessage {...messages.purchased} />}
|
|
94
|
+
{order?.state === OrderState.SUBMITTED && <FormattedMessage {...messages.pending} />}
|
|
95
|
+
{canPurchase && (
|
|
96
|
+
<FormattedNumber
|
|
97
|
+
currency={product.price_currency}
|
|
98
|
+
value={product.price}
|
|
99
|
+
style="currency"
|
|
100
|
+
/>
|
|
101
|
+
)}
|
|
102
|
+
</strong>
|
|
103
|
+
</div>
|
|
104
|
+
{canShowMetadata && (
|
|
105
|
+
<>
|
|
106
|
+
<p
|
|
107
|
+
className="product-widget__header-metadata"
|
|
108
|
+
data-testid="product-widget__header-metadata-dates"
|
|
109
|
+
>
|
|
110
|
+
<Icon name={IconTypeEnum.CALENDAR} size="small" />
|
|
111
|
+
<FormattedMessage
|
|
112
|
+
{...messages.fromTo}
|
|
113
|
+
values={{
|
|
114
|
+
from: formatDate(minDate!),
|
|
115
|
+
to: formatDate(maxDate!),
|
|
116
|
+
}}
|
|
117
|
+
/>
|
|
118
|
+
</p>
|
|
119
|
+
<p
|
|
120
|
+
className="product-widget__header-metadata"
|
|
121
|
+
data-testid="product-widget__header-metadata-languages"
|
|
122
|
+
>
|
|
123
|
+
<Icon name={IconTypeEnum.LANGUAGES} size="small" />
|
|
124
|
+
<FormattedMessage {...messages.availableIn} values={{ languages }} />
|
|
125
|
+
</p>
|
|
126
|
+
</>
|
|
127
|
+
)}
|
|
128
|
+
</header>
|
|
129
|
+
);
|
|
130
|
+
};
|
|
131
|
+
const Content = ({ product, order }: { product: Product; order?: CredentialOrder }) => {
|
|
132
|
+
const needsSignature = order
|
|
133
|
+
? OrderHelper.orderNeedsSignature(order, product.contract_definition)
|
|
134
|
+
: false;
|
|
135
|
+
const targetCourses = useMemo(() => {
|
|
136
|
+
if (order) {
|
|
137
|
+
return order.target_courses;
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
if (product) {
|
|
141
|
+
return product.target_courses;
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
return [];
|
|
145
|
+
}, [product, order]);
|
|
146
|
+
|
|
147
|
+
return (
|
|
148
|
+
<ol className="product-widget__content">
|
|
149
|
+
{needsSignature && <ProductSignatureHeader order={order} />}
|
|
150
|
+
{Children.toArray(
|
|
151
|
+
targetCourses.map((target_course) => (
|
|
152
|
+
<CourseRunItem targetCourse={target_course} order={order} product={product} />
|
|
153
|
+
)),
|
|
154
|
+
)}
|
|
155
|
+
{product.certificate_definition && (
|
|
156
|
+
<CertificateItem certificateDefinition={product.certificate_definition} order={order} />
|
|
157
|
+
)}
|
|
158
|
+
</ol>
|
|
159
|
+
);
|
|
160
|
+
};
|
|
161
|
+
|
|
162
|
+
const CourseProductItem = ({ productId, course, compact = false }: CourseProductItemProps) => {
|
|
163
|
+
// FIXME(rlecellier): useCourseProduct need's a filter on product.type that only return
|
|
164
|
+
// CredentialOrder
|
|
165
|
+
const { item: courseProductRelation, states: productQueryStates } = useCourseProduct({
|
|
166
|
+
product_id: productId,
|
|
167
|
+
course_id: course.code,
|
|
168
|
+
});
|
|
169
|
+
const product = courseProductRelation?.product;
|
|
170
|
+
const { item: productOrder, states: orderQueryStates } = useProductOrder({
|
|
171
|
+
productId,
|
|
172
|
+
courseCode: course.code,
|
|
173
|
+
});
|
|
174
|
+
|
|
175
|
+
const order = productOrder as CredentialOrder;
|
|
176
|
+
const canPurchase = !order || order.state === OrderState.PENDING;
|
|
177
|
+
const hasPurchased = (order && order.state === OrderState.VALIDATED) ?? false;
|
|
178
|
+
|
|
179
|
+
const hasError = Boolean(productQueryStates.error);
|
|
180
|
+
const isFetching = productQueryStates.fetching || orderQueryStates.fetching;
|
|
181
|
+
const canShowContent = !compact || hasPurchased;
|
|
182
|
+
|
|
183
|
+
useEffect(() => {
|
|
184
|
+
if (product && product.type !== ProductType.CREDENTIAL) {
|
|
185
|
+
handle(
|
|
186
|
+
new Error(
|
|
187
|
+
`Cannot render product "${product.type}" (${product.id}) through CourseProductItem on course ${course.code}`,
|
|
188
|
+
),
|
|
189
|
+
);
|
|
190
|
+
}
|
|
191
|
+
}, [product]);
|
|
192
|
+
|
|
193
|
+
if (product && product.type !== ProductType.CREDENTIAL) {
|
|
194
|
+
// CourseProductItem only handle CREDENTIAL products
|
|
195
|
+
return null;
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
const orderGroups = courseProductRelation
|
|
199
|
+
? ProductHelper.getActiveOrderGroups(courseProductRelation)
|
|
200
|
+
: [];
|
|
201
|
+
const orderGroupsAvailable = orderGroups.filter(
|
|
202
|
+
(orderGroup) => orderGroup.nb_available_seats > 0,
|
|
203
|
+
);
|
|
204
|
+
|
|
205
|
+
return (
|
|
206
|
+
<section
|
|
207
|
+
className={c('product-widget', {
|
|
208
|
+
'product-widget--has-error': hasError,
|
|
209
|
+
'product-widget--compact': compact,
|
|
210
|
+
'product-widget--purchased': hasPurchased,
|
|
211
|
+
})}
|
|
212
|
+
>
|
|
213
|
+
{isFetching && (
|
|
214
|
+
<div className="product-widget__overlay">
|
|
215
|
+
<Spinner aria-labelledby="loading-course" theme="light" size="large">
|
|
216
|
+
<span id="loading-course">
|
|
217
|
+
<FormattedMessage {...messages.loading} />
|
|
218
|
+
</span>
|
|
219
|
+
</Spinner>
|
|
220
|
+
</div>
|
|
221
|
+
)}
|
|
222
|
+
{hasError && (
|
|
223
|
+
<p className="product-widget__content">
|
|
224
|
+
<Icon name={IconTypeEnum.WARNING} size="small" />
|
|
225
|
+
{productQueryStates.error}
|
|
226
|
+
</p>
|
|
227
|
+
)}
|
|
228
|
+
{!hasError && product && (
|
|
229
|
+
<>
|
|
230
|
+
<Header
|
|
231
|
+
product={product}
|
|
232
|
+
order={order}
|
|
233
|
+
canPurchase={canPurchase}
|
|
234
|
+
hasPurchased={hasPurchased}
|
|
235
|
+
compact={compact}
|
|
236
|
+
/>
|
|
237
|
+
{canShowContent && <Content product={product} order={order} />}
|
|
238
|
+
<footer className="product-widget__footer">
|
|
239
|
+
<CourseProductItemFooter
|
|
240
|
+
course={course}
|
|
241
|
+
product={product as CredentialProduct}
|
|
242
|
+
orderGroups={orderGroups}
|
|
243
|
+
orderGroupsAvailable={orderGroupsAvailable}
|
|
244
|
+
canPurchase={canPurchase}
|
|
245
|
+
/>
|
|
246
|
+
</footer>
|
|
247
|
+
</>
|
|
248
|
+
)}
|
|
249
|
+
</section>
|
|
250
|
+
);
|
|
251
|
+
};
|
|
252
|
+
|
|
253
|
+
export default CourseProductItem;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Button } from '@openfun/cunningham-react';
|
|
1
2
|
import * as React from 'react';
|
|
2
3
|
import { defineMessages, FormattedMessage } from 'react-intl';
|
|
3
4
|
|
|
@@ -17,9 +18,9 @@ interface Props {
|
|
|
17
18
|
export const CourseRunUnenrollButton = (props: Props) => {
|
|
18
19
|
return (
|
|
19
20
|
<div className="course-run-unenrollment">
|
|
20
|
-
<
|
|
21
|
+
<Button fullWidth onClick={props.onUnenroll}>
|
|
21
22
|
<FormattedMessage {...messages.unenroll} />
|
|
22
|
-
</
|
|
23
|
+
</Button>
|
|
23
24
|
</div>
|
|
24
25
|
);
|
|
25
26
|
};
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
.subheader__aside {
|
|
2
2
|
.course-run-enrollment {
|
|
3
|
-
&__cta {
|
|
4
|
-
@include r-button-colors(
|
|
5
|
-
r-theme-val(course-detail, subheader-run-cta),
|
|
6
|
-
$apply-border: true,
|
|
7
|
-
$include-hover: true
|
|
8
|
-
);
|
|
9
|
-
}
|
|
10
|
-
|
|
11
3
|
&__helptext,
|
|
12
4
|
&__errortext {
|
|
13
5
|
color: r-theme-val('course-detail', 'subheader-run-feedback-color');
|
|
@@ -18,23 +10,6 @@
|
|
|
18
10
|
.course-run-unenrollment,
|
|
19
11
|
.course-run-enrollment {
|
|
20
12
|
&__cta {
|
|
21
|
-
width: 100%;
|
|
22
|
-
@include button-small($font-weight: bold);
|
|
23
|
-
@include r-button-colors(
|
|
24
|
-
r-theme-val(course-detail, run-cta),
|
|
25
|
-
$apply-border: true,
|
|
26
|
-
$include-hover: true
|
|
27
|
-
);
|
|
28
|
-
display: flex;
|
|
29
|
-
justify-content: center;
|
|
30
|
-
align-items: center;
|
|
31
|
-
font-size: 1rem;
|
|
32
|
-
|
|
33
|
-
&.disabled {
|
|
34
|
-
opacity: 0.65;
|
|
35
|
-
cursor: not-allowed;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
13
|
&--loading {
|
|
39
14
|
cursor: progress !important;
|
|
40
15
|
opacity: 0.7;
|
package/js/widgets/SyllabusCourseRunsList/components/CourseRunEnrollment/index.joanie.spec.tsx
CHANGED
|
@@ -3,8 +3,9 @@ import fetchMock from 'fetch-mock';
|
|
|
3
3
|
import { QueryClientProvider } from '@tanstack/react-query';
|
|
4
4
|
import { IntlProvider } from 'react-intl';
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import { faker } from '@faker-js/faker';
|
|
7
7
|
import { Deferred } from 'utils/test/deferred';
|
|
8
|
+
import { EnrollmentFactory as JoanieEnrollment } from 'utils/test/factories/joanie';
|
|
8
9
|
import {
|
|
9
10
|
CourseRunFactory,
|
|
10
11
|
RichieContextFactory as mockRichieContextFactory,
|
|
@@ -12,7 +13,8 @@ import {
|
|
|
12
13
|
} from 'utils/test/factories/richie';
|
|
13
14
|
import { SessionProvider } from 'contexts/SessionContext';
|
|
14
15
|
import { createTestQueryClient } from 'utils/test/createTestQueryClient';
|
|
15
|
-
import {
|
|
16
|
+
import { HttpStatusCode } from 'utils/errors/HttpError';
|
|
17
|
+
import { Priority } from 'types';
|
|
16
18
|
import CourseRunEnrollment from './index';
|
|
17
19
|
|
|
18
20
|
jest.mock('utils/errors/handle');
|
|
@@ -27,7 +29,7 @@ jest.mock('utils/context', () => ({
|
|
|
27
29
|
lms_backends: [
|
|
28
30
|
{
|
|
29
31
|
backend: 'joanie',
|
|
30
|
-
course_regexp: '(
|
|
32
|
+
course_regexp: '^.*/api/v1.0((?:/(?:courses|course-runs|products)/[^/]+)+)/?$',
|
|
31
33
|
endpoint: 'https://joanie.endpoint',
|
|
32
34
|
},
|
|
33
35
|
],
|
|
@@ -53,14 +55,13 @@ describe('<CourseRunEnrollment /> with joanie backend ', () => {
|
|
|
53
55
|
fetchMock.restore();
|
|
54
56
|
});
|
|
55
57
|
it('shows an "Enroll" button and allows the user to enroll', async () => {
|
|
56
|
-
const user
|
|
57
|
-
const courseRun
|
|
58
|
-
courseRun.resource_link =
|
|
59
|
-
courseRun.state.priority = 0;
|
|
58
|
+
const user = UserFactory().one();
|
|
59
|
+
const courseRun = CourseRunFactory().one();
|
|
60
|
+
courseRun.resource_link = `https://joanie.endpoint/api/v1.0/course-runs/${courseRun.id}`;
|
|
60
61
|
|
|
61
62
|
const enrollmentDeferred = new Deferred();
|
|
62
63
|
fetchMock.get(
|
|
63
|
-
`${endpoint}/api/v1.0/enrollments/?
|
|
64
|
+
`${endpoint}/api/v1.0/enrollments/?course_run_id=${courseRun.id}`,
|
|
64
65
|
enrollmentDeferred.promise,
|
|
65
66
|
);
|
|
66
67
|
|
|
@@ -96,12 +97,15 @@ describe('<CourseRunEnrollment /> with joanie backend ', () => {
|
|
|
96
97
|
});
|
|
97
98
|
|
|
98
99
|
it('shows an error message when enrollment get request failed', async () => {
|
|
99
|
-
const user
|
|
100
|
-
const courseRun
|
|
101
|
-
|
|
102
|
-
courseRun.
|
|
100
|
+
const user = UserFactory().one();
|
|
101
|
+
const courseRun = CourseRunFactory().one();
|
|
102
|
+
const joanieEnrollmentId = faker.string.uuid();
|
|
103
|
+
courseRun.resource_link = `https://joanie.endpoint/api/v1.0/course-runs/${joanieEnrollmentId}`;
|
|
103
104
|
|
|
104
|
-
fetchMock.get(
|
|
105
|
+
fetchMock.get(
|
|
106
|
+
`${endpoint}/api/v1.0/enrollments/?course_run_id=${joanieEnrollmentId}`,
|
|
107
|
+
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
108
|
+
);
|
|
105
109
|
|
|
106
110
|
await act(async () => {
|
|
107
111
|
render(
|
|
@@ -118,15 +122,53 @@ describe('<CourseRunEnrollment /> with joanie backend ', () => {
|
|
|
118
122
|
await screen.findByText('Enrollment fetching failed');
|
|
119
123
|
});
|
|
120
124
|
|
|
125
|
+
it('shows a link to the course if the user is already enrolled', async () => {
|
|
126
|
+
// Joanie session requests
|
|
127
|
+
let nbApiCalls = 3;
|
|
128
|
+
const user = UserFactory().one();
|
|
129
|
+
const joanieEnrollment = JoanieEnrollment({ is_active: true }).one();
|
|
130
|
+
const courseRun = CourseRunFactory().one();
|
|
131
|
+
courseRun.resource_link = `https://joanie.endpoint/api/v1.0/course-runs/${joanieEnrollment.course_run.id}/`;
|
|
132
|
+
courseRun.state.priority = Priority.ONGOING_OPEN;
|
|
133
|
+
|
|
134
|
+
fetchMock.get(
|
|
135
|
+
`${endpoint}/api/v1.0/enrollments/?course_run_id=${joanieEnrollment.course_run.id}`,
|
|
136
|
+
{
|
|
137
|
+
count: 1,
|
|
138
|
+
next: null,
|
|
139
|
+
previous: null,
|
|
140
|
+
results: [joanieEnrollment],
|
|
141
|
+
},
|
|
142
|
+
);
|
|
143
|
+
nbApiCalls += 1;
|
|
144
|
+
|
|
145
|
+
await act(async () => {
|
|
146
|
+
render(
|
|
147
|
+
<QueryClientProvider client={createTestQueryClient({ user })}>
|
|
148
|
+
<IntlProvider locale="en">
|
|
149
|
+
<SessionProvider>
|
|
150
|
+
<CourseRunEnrollment courseRun={courseRun} />
|
|
151
|
+
</SessionProvider>
|
|
152
|
+
</IntlProvider>
|
|
153
|
+
</QueryClientProvider>,
|
|
154
|
+
);
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
const $goToCourseButton = await screen.findByRole('link', { name: 'Go to course' });
|
|
158
|
+
expect($goToCourseButton).toBeInTheDocument();
|
|
159
|
+
expect($goToCourseButton).toHaveAttribute('href', joanieEnrollment.course_run.resource_link);
|
|
160
|
+
expect(screen.getByText('You are enrolled in this course run')).toBeInTheDocument();
|
|
161
|
+
expect(fetchMock.calls()).toHaveLength(nbApiCalls);
|
|
162
|
+
});
|
|
163
|
+
|
|
121
164
|
it('shows an "Unenroll" text and allows the user to unenroll', async () => {
|
|
122
|
-
const user
|
|
123
|
-
const courseRun
|
|
124
|
-
courseRun.resource_link =
|
|
125
|
-
courseRun.state.priority = 0;
|
|
165
|
+
const user = UserFactory().one();
|
|
166
|
+
const courseRun = CourseRunFactory().one();
|
|
167
|
+
courseRun.resource_link = `https://joanie.endpoint/api/v1.0/course-runs/${courseRun.id}`;
|
|
126
168
|
|
|
127
169
|
const enrollmentDeferred = new Deferred();
|
|
128
170
|
fetchMock.get(
|
|
129
|
-
`${endpoint}/api/v1.0/enrollments/?
|
|
171
|
+
`${endpoint}/api/v1.0/enrollments/?course_run_id=${courseRun.id}`,
|
|
130
172
|
enrollmentDeferred.promise,
|
|
131
173
|
);
|
|
132
174
|
|
|
@@ -175,14 +217,13 @@ describe('<CourseRunEnrollment /> with joanie backend ', () => {
|
|
|
175
217
|
});
|
|
176
218
|
|
|
177
219
|
it('shows an error message when the enrollment fails', async () => {
|
|
178
|
-
const user
|
|
179
|
-
const courseRun
|
|
180
|
-
courseRun.resource_link =
|
|
181
|
-
courseRun.state.priority = 0;
|
|
220
|
+
const user = UserFactory().one();
|
|
221
|
+
const courseRun = CourseRunFactory().one();
|
|
222
|
+
courseRun.resource_link = `https://joanie.endpoint/api/v1.0/course-runs/${courseRun.id}`;
|
|
182
223
|
|
|
183
224
|
const enrollmentDeferred = new Deferred();
|
|
184
225
|
fetchMock.get(
|
|
185
|
-
`${endpoint}/api/v1.0/enrollments/?
|
|
226
|
+
`${endpoint}/api/v1.0/enrollments/?course_run_id=${courseRun.id}`,
|
|
186
227
|
enrollmentDeferred.promise,
|
|
187
228
|
);
|
|
188
229
|
|
|
@@ -207,7 +248,7 @@ describe('<CourseRunEnrollment /> with joanie backend ', () => {
|
|
|
207
248
|
});
|
|
208
249
|
|
|
209
250
|
const button = await screen.findByRole('button', { name: 'Enroll now' });
|
|
210
|
-
fetchMock.post(`${endpoint}/api/v1.0/enrollments/`,
|
|
251
|
+
fetchMock.post(`${endpoint}/api/v1.0/enrollments/`, HttpStatusCode.INTERNAL_SERVER_ERROR);
|
|
211
252
|
await act(async () => {
|
|
212
253
|
fireEvent.click(button);
|
|
213
254
|
});
|
|
@@ -215,14 +256,13 @@ describe('<CourseRunEnrollment /> with joanie backend ', () => {
|
|
|
215
256
|
});
|
|
216
257
|
|
|
217
258
|
it('shows an error message when the unenrollment fails', async () => {
|
|
218
|
-
const user
|
|
219
|
-
const courseRun
|
|
220
|
-
courseRun.resource_link =
|
|
221
|
-
courseRun.state.priority = 0;
|
|
259
|
+
const user = UserFactory().one();
|
|
260
|
+
const courseRun = CourseRunFactory().one();
|
|
261
|
+
courseRun.resource_link = `https://joanie.endpoint/api/v1.0/course-runs/${courseRun.id}`;
|
|
222
262
|
|
|
223
263
|
const enrollmentDeferred = new Deferred();
|
|
224
264
|
fetchMock.get(
|
|
225
|
-
`${endpoint}/api/v1.0/enrollments/?
|
|
265
|
+
`${endpoint}/api/v1.0/enrollments/?course_run_id=${courseRun.id}`,
|
|
226
266
|
enrollmentDeferred.promise,
|
|
227
267
|
);
|
|
228
268
|
|
|
@@ -255,7 +295,10 @@ describe('<CourseRunEnrollment /> with joanie backend ', () => {
|
|
|
255
295
|
});
|
|
256
296
|
});
|
|
257
297
|
|
|
258
|
-
fetchMock.put(
|
|
298
|
+
fetchMock.put(
|
|
299
|
+
`${endpoint}/api/v1.0/enrollments/57b35536-5c92-4606-bca3-13aa53d04d07/`,
|
|
300
|
+
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
301
|
+
);
|
|
259
302
|
|
|
260
303
|
const unenroll = await screen.findByText('Unenroll from this course');
|
|
261
304
|
await act(async () => {
|
package/js/widgets/SyllabusCourseRunsList/components/CourseRunEnrollment/index.openedx.spec.tsx
CHANGED
|
@@ -2,7 +2,6 @@ import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
|
|
|
2
2
|
import fetchMock from 'fetch-mock';
|
|
3
3
|
import { QueryClientProvider } from '@tanstack/react-query';
|
|
4
4
|
import { IntlProvider } from 'react-intl';
|
|
5
|
-
|
|
6
5
|
import { CourseRun } from 'types';
|
|
7
6
|
import { Deferred } from 'utils/test/deferred';
|
|
8
7
|
import {
|
|
@@ -14,6 +13,7 @@ import { handle } from 'utils/errors/handle';
|
|
|
14
13
|
import { SessionProvider } from 'contexts/SessionContext';
|
|
15
14
|
import { createTestQueryClient } from 'utils/test/createTestQueryClient';
|
|
16
15
|
import { User } from 'types/User';
|
|
16
|
+
import { HttpStatusCode } from 'utils/errors/HttpError';
|
|
17
17
|
import CourseRunEnrollment from './index';
|
|
18
18
|
|
|
19
19
|
jest.mock('utils/errors/handle');
|
|
@@ -131,7 +131,10 @@ describe('<CourseRunEnrollment />', () => {
|
|
|
131
131
|
const button = await screen.findByRole('button', { name: 'Enroll now' });
|
|
132
132
|
|
|
133
133
|
// const enrollmentAction = new Deferred();
|
|
134
|
-
fetchMock.post(
|
|
134
|
+
fetchMock.post(
|
|
135
|
+
`${endpoint}/api/enrollment/v1/enrollment`,
|
|
136
|
+
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
137
|
+
);
|
|
135
138
|
|
|
136
139
|
await act(async () => {
|
|
137
140
|
expect(() => fireEvent.click(button)).not.toThrow();
|
|
@@ -179,7 +182,7 @@ describe('<CourseRunEnrollment />', () => {
|
|
|
179
182
|
|
|
180
183
|
// const enrollmentAction = new Deferred();
|
|
181
184
|
fetchMock.post(`${endpoint}/api/enrollment/v1/enrollment`, {
|
|
182
|
-
status:
|
|
185
|
+
status: HttpStatusCode.BAD_REQUEST,
|
|
183
186
|
body: { localizedMessage: 'You are not authorized to enroll' },
|
|
184
187
|
});
|
|
185
188
|
|
|
@@ -230,7 +233,9 @@ describe('<CourseRunEnrollment />', () => {
|
|
|
230
233
|
const courseRun: CourseRun = CourseRunFactory().one();
|
|
231
234
|
courseRun.state.priority = 0;
|
|
232
235
|
courseRun.resource_link = 'https://openedx.endpoint' + courseRun.resource_link;
|
|
233
|
-
|
|
236
|
+
const start = new Date();
|
|
237
|
+
start.setDate(new Date().getDate() + 3);
|
|
238
|
+
courseRun.start = start.toISOString();
|
|
234
239
|
courseRun.dashboard_link = 'https://edx.local.dev:8073/dashboard';
|
|
235
240
|
|
|
236
241
|
const enrollmentsDeferred = new Deferred();
|
|
@@ -264,7 +269,7 @@ describe('<CourseRunEnrollment />', () => {
|
|
|
264
269
|
'https://edx.local.dev:8073/dashboard',
|
|
265
270
|
),
|
|
266
271
|
);
|
|
267
|
-
screen.getByText('The course
|
|
272
|
+
screen.getByText('The course starts in 3 days');
|
|
268
273
|
});
|
|
269
274
|
|
|
270
275
|
it('shows a helpful message if the course run is closed', async () => {
|