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
package/js/api/lms/dummy.ts
CHANGED
|
@@ -4,7 +4,54 @@ import { User } from 'types/User';
|
|
|
4
4
|
import { APILms } from 'types/api';
|
|
5
5
|
import { Enrollment, OpenEdXEnrollment } from 'types';
|
|
6
6
|
import { location } from 'utils/indirection/window';
|
|
7
|
-
import { RICHIE_USER_TOKEN } from 'settings';
|
|
7
|
+
import { CURRENT_JOANIE_DEV_DEMO_USER, RICHIE_USER_TOKEN } from 'settings';
|
|
8
|
+
import { base64Decode } from 'utils/base64Parser';
|
|
9
|
+
|
|
10
|
+
type JWTPayload = {
|
|
11
|
+
email: string;
|
|
12
|
+
exp: number;
|
|
13
|
+
full_name: string;
|
|
14
|
+
iat: number;
|
|
15
|
+
jti: string;
|
|
16
|
+
language: string;
|
|
17
|
+
token_type: 'access';
|
|
18
|
+
username: string;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
/* All JWT tokens will expire the 12 Dec 2024 ! */
|
|
22
|
+
const JOANIE_DEV_DEMO_USER_JWT_TOKENS = {
|
|
23
|
+
admin:
|
|
24
|
+
'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzMzOTI4MjE0LCJpYXQiOjE3MDIzNjU1MjMsImp0aSI6IjRhMzQxZWVmMmVhOTRkNGFiMzQ5OThkOWE4ZDM5MTI0IiwiZW1haWwiOiJhZG1pbkBleGFtcGxlLmNvbSIsImxhbmd1YWdlIjoiZW4tdXMiLCJ1c2VybmFtZSI6ImFkbWluIiwiZnVsbF9uYW1lIjoiIn0.rT8nymp8f4T7tIIXO-M5-ahXBwxoDNVqtaZIrb_GHuk',
|
|
25
|
+
user0:
|
|
26
|
+
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzMzOTI4MjE0LCJpYXQiOjE3MDIzOTIyMTQsImp0aSI6Ijc2ZDNlNmU2NGYwMzQ4NTg5NTNiOWIxNWIwNDhhNjI0IiwiZW1haWwiOiJjc3RlcGhlbnNvbkBleGFtcGxlLm9yZyIsImxhbmd1YWdlIjoiZnItZnIiLCJ1c2VybmFtZSI6InVzZXIwIiwiZnVsbF9uYW1lIjoiT3RoZXIgT3duZXIifQ.JQRHKdr3Utl9rw-BQyvM8zXsY16CSgscEh9NAaP2INc',
|
|
27
|
+
user1:
|
|
28
|
+
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzMzOTI4MjE0LCJpYXQiOjE3MDIzOTIyMTQsImp0aSI6IjY3NDBmYzFlOTlhNDQwNzBhN2I1NWNkMTE0M2UzNThhIiwiZW1haWwiOiJuYW5jeTgzQGV4YW1wbGUuY29tIiwibGFuZ3VhZ2UiOiJlbi11cyIsInVzZXJuYW1lIjoidXNlcjEiLCJmdWxsX25hbWUiOiJPdGhlciBPd25lciJ9.mWtt4zKA-SiSQG2Pfrauq9ZYzSCq53qPa0jjdGaqFWQ',
|
|
29
|
+
user2:
|
|
30
|
+
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzMzOTI4MjE0LCJpYXQiOjE3MDIzOTIyMTQsImp0aSI6IjBhNjkwY2QyZjA5ZTRjMWU4MTE4MzhmNGI0YjEzNGMyIiwiZW1haWwiOiJwYXVsYnJhbmRvbkBleGFtcGxlLm9yZyIsImxhbmd1YWdlIjoiZnItZnIiLCJ1c2VybmFtZSI6InVzZXIyIiwiZnVsbF9uYW1lIjoiT3RoZXIgT3duZXIifQ.EXUlkR-0IIj8xRRnlf9TWyVa8Gh_jPE7aNIu18BI83Q',
|
|
31
|
+
user3:
|
|
32
|
+
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzMzOTI4MjE0LCJpYXQiOjE3MDIzOTIyMTQsImp0aSI6IjQ5N2IyMTEzYjQ4MjQ2YWNhOWUyMWIyMmZmZGJkYWU5IiwiZW1haWwiOiJqZXNzaWNhNDFAZXhhbXBsZS5jb20iLCJsYW5ndWFnZSI6ImVuLXVzIiwidXNlcm5hbWUiOiJ1c2VyMyIsImZ1bGxfbmFtZSI6Ik90aGVyIE93bmVyIn0.MXEFrvlkxPxlCpS172ls4eNvbV6vEDBJK1T3PHS9CoY',
|
|
33
|
+
user4:
|
|
34
|
+
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzMzOTI4MjE0LCJpYXQiOjE3MDIzOTIyMTQsImp0aSI6ImMyYTBmMGU0NTI5MTRmNWFhZDdiYTE1YWQ3ZTQ5MjgwIiwiZW1haWwiOiJkb25uYTE5QGV4YW1wbGUubmV0IiwibGFuZ3VhZ2UiOiJlbi11cyIsInVzZXJuYW1lIjoidXNlcjQiLCJmdWxsX25hbWUiOiJPdGhlciBPd25lciJ9.sVmYGo2LO8I1Sz2hP8wRk8yd0n1bOcWsyFG0ZXi5SbE',
|
|
35
|
+
organization_owner:
|
|
36
|
+
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzMzOTI4MjE0LCJpYXQiOjE3MDIzOTIyMTQsImp0aSI6IjYxNTZiYmNmMjZmMzQzYTBiYTgzM2ZmYzU1M2U1NjBlIiwiZW1haWwiOiJqZWFuLWJhcHRpc3RlLnBlbnJhdGgrb3JnYW5pemF0aW9uX293bmVyQGZ1bi1tb29jLmZyIiwibGFuZ3VhZ2UiOiJlbi11cyIsInVzZXJuYW1lIjoib3JnYW5pemF0aW9uX293bmVyIiwiZnVsbF9uYW1lIjoiT3JnYSBPd25lciBPd25lciJ9.wkdYFBasBIk4U-Vr7SdnkfgoqAlhn7rmr0Bqcs777_w',
|
|
37
|
+
student_user:
|
|
38
|
+
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzMzOTI4MjE0LCJpYXQiOjE3MDIzOTIyMTQsImp0aSI6ImNkZjAyMGM4ODdjOTQxYzU5ZmExN2FkZGExNjNjMDIzIiwiZW1haWwiOiJqZWFuLWJhcHRpc3RlLnBlbnJhdGgrc3R1ZGVudF91c2VyQGZ1bi1tb29jLmZyIiwibGFuZ3VhZ2UiOiJmci1mciIsInVzZXJuYW1lIjoic3R1ZGVudF91c2VyIiwiZnVsbF9uYW1lIjoiXHUwMGM5dHVkaWFudCJ9.JMdnC2VXwq2VbNPrIYxj8PEq0oJJ4LZZT_ywWyE1lBM',
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
export type DevDemoUser = keyof typeof JOANIE_DEV_DEMO_USER_JWT_TOKENS;
|
|
42
|
+
|
|
43
|
+
export const RICHIE_DUMMY_IS_LOGGED_IN = 'RICHIE_DUMMY_IS_LOGGED_IN';
|
|
44
|
+
|
|
45
|
+
function getUserInfo(username: DevDemoUser): Maybe<User> {
|
|
46
|
+
const accessToken = JOANIE_DEV_DEMO_USER_JWT_TOKENS[username];
|
|
47
|
+
const JWTPayload: JWTPayload = JSON.parse(base64Decode(accessToken.split('.')[1]));
|
|
48
|
+
|
|
49
|
+
return {
|
|
50
|
+
access_token: accessToken,
|
|
51
|
+
username: JWTPayload.username,
|
|
52
|
+
full_name: JWTPayload.full_name,
|
|
53
|
+
};
|
|
54
|
+
}
|
|
8
55
|
|
|
9
56
|
const API = (APIConf: LMSBackend | AuthenticationBackend): APILms => {
|
|
10
57
|
const extractCourseIdFromUrl = (url: string): Maybe<Nullable<string>> => {
|
|
@@ -14,9 +61,9 @@ const API = (APIConf: LMSBackend | AuthenticationBackend): APILms => {
|
|
|
14
61
|
|
|
15
62
|
return {
|
|
16
63
|
user: {
|
|
17
|
-
me: async () =>
|
|
18
|
-
/* Simulate user is authenticated
|
|
19
|
-
JWT Token claim
|
|
64
|
+
me: async () => {
|
|
65
|
+
/* Simulate user is authenticated with a valid access_token to request Joanie API.
|
|
66
|
+
JWT Token claim looks like:
|
|
20
67
|
{
|
|
21
68
|
"email": "admin@example.com",
|
|
22
69
|
"exp": 10652256808,
|
|
@@ -28,13 +75,19 @@ const API = (APIConf: LMSBackend | AuthenticationBackend): APILms => {
|
|
|
28
75
|
"username": "admin",
|
|
29
76
|
}
|
|
30
77
|
*/
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
78
|
+
if (!localStorage.getItem(RICHIE_DUMMY_IS_LOGGED_IN)) {
|
|
79
|
+
return null;
|
|
80
|
+
}
|
|
81
|
+
return getUserInfo(CURRENT_JOANIE_DEV_DEMO_USER) || null;
|
|
82
|
+
},
|
|
83
|
+
login: () => {
|
|
84
|
+
localStorage.setItem(RICHIE_DUMMY_IS_LOGGED_IN, 'true');
|
|
85
|
+
location.reload();
|
|
86
|
+
},
|
|
36
87
|
register: () => location.reload(),
|
|
37
|
-
logout: async () =>
|
|
88
|
+
logout: async () => {
|
|
89
|
+
localStorage.removeItem(RICHIE_DUMMY_IS_LOGGED_IN);
|
|
90
|
+
},
|
|
38
91
|
accessToken: () => sessionStorage.getItem(RICHIE_USER_TOKEN),
|
|
39
92
|
},
|
|
40
93
|
enrollment: {
|
|
@@ -2,14 +2,18 @@ import {
|
|
|
2
2
|
CourseRunFactory,
|
|
3
3
|
RichieContextFactory as mockRichieContextFactory,
|
|
4
4
|
} from 'utils/test/factories/richie';
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
extractResourceId,
|
|
7
|
+
extractResourceMetadata,
|
|
8
|
+
isJoanieResourceLinkProduct,
|
|
9
|
+
} from 'api/lms/joanie';
|
|
6
10
|
|
|
7
11
|
jest.mock('utils/context', () => {
|
|
8
12
|
const mock = mockRichieContextFactory().one();
|
|
9
13
|
mock.lms_backends = [
|
|
10
14
|
{
|
|
11
15
|
backend: 'joanie',
|
|
12
|
-
course_regexp: '^.*/api/v1.0
|
|
16
|
+
course_regexp: '^.*/api/v1.0((?:/(?:courses|products|course-runs)/[^/]+)+)/?$',
|
|
13
17
|
endpoint: 'https://joanie.test',
|
|
14
18
|
},
|
|
15
19
|
{
|
|
@@ -26,54 +30,68 @@ jest.mock('utils/context', () => {
|
|
|
26
30
|
};
|
|
27
31
|
});
|
|
28
32
|
|
|
29
|
-
describe('
|
|
33
|
+
describe('isJoanieResourceLinkProduct', () => {
|
|
30
34
|
it('is not a joanie product because it is handled by a another LMSBackend than Joanie', () => {
|
|
31
|
-
|
|
35
|
+
const courseRun = CourseRunFactory().one();
|
|
36
|
+
expect(isJoanieResourceLinkProduct(courseRun.resource_link)).toBe(false);
|
|
32
37
|
});
|
|
33
38
|
|
|
34
39
|
it('is not a joanie product because it is a course run', () => {
|
|
35
|
-
expect(
|
|
36
|
-
isJoanieProduct({
|
|
37
|
-
...CourseRunFactory().one(),
|
|
38
|
-
resource_link: 'https://joanie.test/api/v1.0/course-runs/id/',
|
|
39
|
-
}),
|
|
40
|
-
).toBe(false);
|
|
40
|
+
expect(isJoanieResourceLinkProduct('https://joanie.test/api/v1.0/course-runs/id/')).toBe(false);
|
|
41
41
|
});
|
|
42
42
|
|
|
43
43
|
it('is a joanie product', () => {
|
|
44
44
|
expect(
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}),
|
|
45
|
+
isJoanieResourceLinkProduct(
|
|
46
|
+
'https://joanie.test/api/v1.0/courses/course-code/products/product-id/',
|
|
47
|
+
),
|
|
49
48
|
).toBe(true);
|
|
50
49
|
});
|
|
51
50
|
});
|
|
52
51
|
|
|
53
52
|
describe('extractResourceId', () => {
|
|
54
53
|
it('cannot extract resource id because it is handled by another LMSBackend than Joanie', () => {
|
|
55
|
-
|
|
54
|
+
const courseRun = CourseRunFactory().one();
|
|
55
|
+
expect(extractResourceId(courseRun.resource_link)).toBe(null);
|
|
56
56
|
});
|
|
57
|
+
|
|
57
58
|
it('cannot extract resource id because the regex does not match', () => {
|
|
58
|
-
expect(
|
|
59
|
-
extractResourceId({
|
|
60
|
-
...CourseRunFactory().one(),
|
|
61
|
-
resource_link: 'https://joanie.test/api/v1.0/not-a-real-entity/id/',
|
|
62
|
-
}),
|
|
63
|
-
).toBe(null);
|
|
59
|
+
expect(extractResourceId('https://joanie.test/api/v1.0/not-a-real-entity/id/')).toBe(null);
|
|
64
60
|
});
|
|
61
|
+
|
|
65
62
|
it('extracts resource id', () => {
|
|
63
|
+
expect(extractResourceId('https://joanie.test/api/v1.0/course-runs/id/')).toBe('id');
|
|
64
|
+
expect(
|
|
65
|
+
extractResourceId('https://joanie.test/api/v1.0/courses/course_id/products/product_id/'),
|
|
66
|
+
).toBe('course_id');
|
|
66
67
|
expect(
|
|
67
|
-
extractResourceId(
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
).toBe('
|
|
68
|
+
extractResourceId(
|
|
69
|
+
'https://joanie.test/api/v1.0/courses/course_id/products/product_id/',
|
|
70
|
+
'product',
|
|
71
|
+
),
|
|
72
|
+
).toBe('product_id');
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
describe('extractResourceMetadata', () => {
|
|
77
|
+
it('cannot extract metadata because the regex does not match', () => {
|
|
78
|
+
expect(extractResourceMetadata('https://joanie.test/api/v1.0/products/id/')).toBe(null);
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
it('extracts resource metadata from a course run', () => {
|
|
82
|
+
expect(extractResourceMetadata('https://joanie.test/api/v1.0/course-runs/id')).toEqual({
|
|
83
|
+
course_run: 'id',
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
it('extracts resource metadata from a course product', () => {
|
|
72
88
|
expect(
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
89
|
+
extractResourceMetadata(
|
|
90
|
+
'https://joanie.test/api/v1.0/courses/course_id/products/product_id/',
|
|
91
|
+
),
|
|
92
|
+
).toEqual({
|
|
93
|
+
course: 'course_id',
|
|
94
|
+
product: 'product_id',
|
|
95
|
+
});
|
|
78
96
|
});
|
|
79
97
|
});
|
package/js/api/lms/joanie.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { matchPath, PathMatch } from 'react-router-dom';
|
|
1
2
|
import JoanieApi from 'api/joanie';
|
|
2
|
-
import {
|
|
3
|
+
import { LMSBackend } from 'types/commonDataProps';
|
|
3
4
|
import { APIBackend, APILms } from 'types/api';
|
|
4
5
|
|
|
5
6
|
import { Maybe, Nullable } from 'types/utils';
|
|
@@ -9,50 +10,67 @@ import { CourseRun } from 'types';
|
|
|
9
10
|
import { findLmsBackend } from 'api/configuration';
|
|
10
11
|
|
|
11
12
|
enum JoanieResourceTypes {
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
PRODUCT = 'course-product',
|
|
14
|
+
COURSE_RUN = 'course_run',
|
|
14
15
|
}
|
|
15
16
|
|
|
16
|
-
export const
|
|
17
|
-
const
|
|
18
|
-
if (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const matches = courseRun.resource_link.match(handler.course_regexp);
|
|
22
|
-
if (!matches) {
|
|
23
|
-
return false;
|
|
24
|
-
}
|
|
25
|
-
const resourceType = matches[1];
|
|
26
|
-
return resourceType === JoanieResourceTypes.PRODUCTS;
|
|
17
|
+
export const isJoanieResourceLinkProduct = (resource_link: CourseRun['resource_link']) => {
|
|
18
|
+
const resources = extractResourceMetadata(resource_link);
|
|
19
|
+
if (resources === null) return false;
|
|
20
|
+
|
|
21
|
+
return Object.keys(resources).join('-') === JoanieResourceTypes.PRODUCT;
|
|
27
22
|
};
|
|
28
23
|
|
|
29
|
-
export const
|
|
30
|
-
const handler = findLmsBackend(
|
|
31
|
-
if (handler?.backend !== APIBackend.JOANIE)
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
24
|
+
export const extractResourceMetadata = (resource_link: CourseRun['resource_link']) => {
|
|
25
|
+
const handler = findLmsBackend(resource_link) as Maybe<LMSBackend>;
|
|
26
|
+
if (handler?.backend !== APIBackend.JOANIE) return null;
|
|
27
|
+
|
|
28
|
+
const matches: Nullable<RegExpMatchArray> | RegExpMatchArray[] = resource_link.match(
|
|
29
|
+
handler.course_regexp,
|
|
30
|
+
);
|
|
31
|
+
if (!matches) return null;
|
|
32
|
+
|
|
33
|
+
const resourceUri = matches[1];
|
|
34
|
+
const existingPathPatterns = ['/course-runs/:course_run', '/courses/:course/products/:product'];
|
|
35
|
+
let match: Nullable<PathMatch<string>>;
|
|
36
|
+
|
|
37
|
+
existingPathPatterns.some((pattern) => {
|
|
38
|
+
match = matchPath(
|
|
39
|
+
{
|
|
40
|
+
path: pattern,
|
|
41
|
+
end: true,
|
|
42
|
+
},
|
|
43
|
+
resourceUri,
|
|
44
|
+
);
|
|
45
|
+
|
|
46
|
+
return match !== null;
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
// @ts-ignore
|
|
50
|
+
if (!match) return null;
|
|
51
|
+
return match.params;
|
|
52
|
+
};
|
|
53
|
+
export const extractResourceId = (
|
|
54
|
+
resource_link: CourseRun['resource_link'],
|
|
55
|
+
resource_name?: 'product' | 'course' | 'course_run',
|
|
56
|
+
) => {
|
|
57
|
+
const resources = extractResourceMetadata(resource_link);
|
|
58
|
+
|
|
59
|
+
if (resources === null || (resource_name && !resources.hasOwnProperty(resource_name)))
|
|
36
60
|
return null;
|
|
37
|
-
|
|
38
|
-
return
|
|
61
|
+
|
|
62
|
+
return resource_name ? resources[resource_name] : Object.values(resources)[0];
|
|
39
63
|
};
|
|
40
64
|
|
|
41
|
-
const JoanieEnrollmentApiInterface = (
|
|
42
|
-
APIConf: AuthenticationBackend | LMSBackend,
|
|
43
|
-
): APILms['enrollment'] => {
|
|
65
|
+
const JoanieEnrollmentApiInterface = (): APILms['enrollment'] => {
|
|
44
66
|
const joanieAPI: API = JoanieApi();
|
|
45
67
|
|
|
46
|
-
const extractCourseRunIdFromUrl = (url: string): Maybe<Nullable<string>> => {
|
|
47
|
-
const matches = url.match((APIConf as LMSBackend).course_regexp);
|
|
48
|
-
return matches && matches[2] ? matches[2] : null;
|
|
49
|
-
};
|
|
50
68
|
return {
|
|
51
69
|
get(url: string) {
|
|
52
70
|
return new Promise((resolve, reject) => {
|
|
53
|
-
const courseRunId =
|
|
71
|
+
const courseRunId = extractResourceId(url, 'course_run');
|
|
54
72
|
joanieAPI.user.enrollments
|
|
55
|
-
.get
|
|
73
|
+
.get({ course_run_id: courseRunId as string })
|
|
56
74
|
.then((res) => {
|
|
57
75
|
if (res.count > 0) {
|
|
58
76
|
resolve(res.results[0]);
|
|
@@ -71,7 +89,7 @@ const JoanieEnrollmentApiInterface = (
|
|
|
71
89
|
enrollment: Maybe<Nullable<Enrollment>>,
|
|
72
90
|
isActive = true,
|
|
73
91
|
): Promise<boolean> {
|
|
74
|
-
const courseRunId =
|
|
92
|
+
const courseRunId = extractResourceId(url, 'course_run');
|
|
75
93
|
if (!courseRunId) {
|
|
76
94
|
return new Promise((resolve) => resolve(false));
|
|
77
95
|
}
|
|
@@ -80,7 +98,7 @@ const JoanieEnrollmentApiInterface = (
|
|
|
80
98
|
if (!enrollment) {
|
|
81
99
|
joanieAPI.user.enrollments
|
|
82
100
|
.create({
|
|
83
|
-
|
|
101
|
+
course_run_id: courseRunId,
|
|
84
102
|
is_active: true,
|
|
85
103
|
was_created_by_order: false,
|
|
86
104
|
})
|
|
@@ -93,7 +111,7 @@ const JoanieEnrollmentApiInterface = (
|
|
|
93
111
|
} else {
|
|
94
112
|
joanieAPI.user.enrollments
|
|
95
113
|
.update({
|
|
96
|
-
|
|
114
|
+
course_run_id: courseRunId,
|
|
97
115
|
id: enrollment.id,
|
|
98
116
|
is_active: isActive,
|
|
99
117
|
was_created_by_order: false,
|
|
@@ -2,7 +2,7 @@ import fetchMock from 'fetch-mock';
|
|
|
2
2
|
import { faker } from '@faker-js/faker';
|
|
3
3
|
import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
|
|
4
4
|
import { handle } from 'utils/errors/handle';
|
|
5
|
-
import { HttpError } from 'utils/errors/HttpError';
|
|
5
|
+
import { HttpError, HttpStatusCode } from 'utils/errors/HttpError';
|
|
6
6
|
import context from 'utils/context';
|
|
7
7
|
import API from './openedx-hawthorn';
|
|
8
8
|
|
|
@@ -39,7 +39,7 @@ describe('OpenEdX Hawthorn API', () => {
|
|
|
39
39
|
},
|
|
40
40
|
});
|
|
41
41
|
|
|
42
|
-
fetchMock.get(`${EDX_ENDPOINT}/my-custom-api/user/v2.0/whoami`,
|
|
42
|
+
fetchMock.get(`${EDX_ENDPOINT}/my-custom-api/user/v2.0/whoami`, HttpStatusCode.UNAUTHORIZED);
|
|
43
43
|
|
|
44
44
|
await expect(CustomApi.user.me()).resolves.toBe(null);
|
|
45
45
|
});
|
|
@@ -55,7 +55,10 @@ describe('OpenEdX Hawthorn API', () => {
|
|
|
55
55
|
|
|
56
56
|
describe('get', () => {
|
|
57
57
|
it('returns null if the user is not enrolled to the provided course_id', async () => {
|
|
58
|
-
fetchMock.get(
|
|
58
|
+
fetchMock.get(
|
|
59
|
+
`${EDX_ENDPOINT}/api/enrollment/v1/enrollment/${username},${courseId}`,
|
|
60
|
+
HttpStatusCode.OK,
|
|
61
|
+
);
|
|
59
62
|
const response = await HawthornApi.enrollment.get(
|
|
60
63
|
`https://demo.endpoint/courses?course_id=${courseId}`,
|
|
61
64
|
{ username },
|
|
@@ -73,7 +76,10 @@ describe('OpenEdX Hawthorn API', () => {
|
|
|
73
76
|
});
|
|
74
77
|
|
|
75
78
|
it('throws HttpError if request fails', async () => {
|
|
76
|
-
fetchMock.get(
|
|
79
|
+
fetchMock.get(
|
|
80
|
+
`${EDX_ENDPOINT}/api/enrollment/v1/enrollment/${username},${courseId}`,
|
|
81
|
+
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
82
|
+
);
|
|
77
83
|
|
|
78
84
|
await expect(
|
|
79
85
|
HawthornApi.enrollment.get(`https://demo.endpoint/courses?course_id=${courseId}`, {
|
|
@@ -118,7 +124,10 @@ describe('OpenEdX Hawthorn API', () => {
|
|
|
118
124
|
});
|
|
119
125
|
|
|
120
126
|
it('returns false if user is not enrolled', async () => {
|
|
121
|
-
fetchMock.get(
|
|
127
|
+
fetchMock.get(
|
|
128
|
+
`${EDX_ENDPOINT}/api/enrollment/v1/enrollment/${username},${courseId}`,
|
|
129
|
+
HttpStatusCode.OK,
|
|
130
|
+
);
|
|
122
131
|
|
|
123
132
|
const enrollment = await HawthornApi.enrollment.get(
|
|
124
133
|
`https://demo.endpoint/courses?course_id=${courseId}`,
|
|
@@ -145,7 +154,10 @@ describe('OpenEdX Hawthorn API', () => {
|
|
|
145
154
|
});
|
|
146
155
|
|
|
147
156
|
it('throws HttpError if request fails', async () => {
|
|
148
|
-
fetchMock.post(
|
|
157
|
+
fetchMock.post(
|
|
158
|
+
`${EDX_ENDPOINT}/api/enrollment/v1/enrollment`,
|
|
159
|
+
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
160
|
+
);
|
|
149
161
|
|
|
150
162
|
await expect(
|
|
151
163
|
HawthornApi.enrollment.set(`https://demo.endpoint/courses?course_id=${courseId}`, {
|
|
@@ -160,7 +172,7 @@ describe('OpenEdX Hawthorn API', () => {
|
|
|
160
172
|
|
|
161
173
|
it('throws HttpError.localizedMessage on enrollment failure', async () => {
|
|
162
174
|
fetchMock.post(`${EDX_ENDPOINT}/api/enrollment/v1/enrollment`, {
|
|
163
|
-
status:
|
|
175
|
+
status: HttpStatusCode.BAD_REQUEST,
|
|
164
176
|
body: { localizedMessage: 'You are not authorized to enroll in this course' },
|
|
165
177
|
});
|
|
166
178
|
|
|
@@ -169,13 +181,17 @@ describe('OpenEdX Hawthorn API', () => {
|
|
|
169
181
|
username,
|
|
170
182
|
}),
|
|
171
183
|
).rejects.toThrow(
|
|
172
|
-
new HttpError(
|
|
184
|
+
new HttpError(
|
|
185
|
+
HttpStatusCode.BAD_REQUEST,
|
|
186
|
+
'Bad Request',
|
|
187
|
+
'You are not authorized to enroll in this course',
|
|
188
|
+
),
|
|
173
189
|
);
|
|
174
190
|
});
|
|
175
191
|
|
|
176
192
|
it('throws HttpError on enrollment failure when localizedMessage property is not present in the payload', async () => {
|
|
177
193
|
fetchMock.post(`${EDX_ENDPOINT}/api/enrollment/v1/enrollment`, {
|
|
178
|
-
status:
|
|
194
|
+
status: HttpStatusCode.BAD_REQUEST,
|
|
179
195
|
body: { message: 'Bad Request' },
|
|
180
196
|
});
|
|
181
197
|
|
|
@@ -183,11 +199,11 @@ describe('OpenEdX Hawthorn API', () => {
|
|
|
183
199
|
HawthornApi.enrollment.set(`https://demo.endpoint/courses?course_id=${courseId}`, {
|
|
184
200
|
username,
|
|
185
201
|
}),
|
|
186
|
-
).rejects.toThrow(new HttpError(
|
|
202
|
+
).rejects.toThrow(new HttpError(HttpStatusCode.BAD_REQUEST, 'Bad Request'));
|
|
187
203
|
});
|
|
188
204
|
|
|
189
205
|
it('throws HttpError when response has no json payload', async () => {
|
|
190
|
-
fetchMock.post(`${EDX_ENDPOINT}/api/enrollment/v1/enrollment`,
|
|
206
|
+
fetchMock.post(`${EDX_ENDPOINT}/api/enrollment/v1/enrollment`, HttpStatusCode.BAD_REQUEST);
|
|
191
207
|
|
|
192
208
|
await expect(
|
|
193
209
|
HawthornApi.enrollment.set(`https://demo.endpoint/courses?course_id=${courseId}`, {
|
|
@@ -8,7 +8,7 @@ import { location } from 'utils/indirection/window';
|
|
|
8
8
|
import { handle } from 'utils/errors/handle';
|
|
9
9
|
import { EDX_CSRF_TOKEN_COOKIE_NAME } from 'settings';
|
|
10
10
|
import { Enrollment, OpenEdXEnrollment } from 'types';
|
|
11
|
-
import { HttpError } from 'utils/errors/HttpError';
|
|
11
|
+
import { HttpError, HttpStatusCode } from 'utils/errors/HttpError';
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
14
|
*
|
|
@@ -48,7 +48,8 @@ const API = (APIConf: AuthenticationBackend | LMSBackend, options?: APIOptions):
|
|
|
48
48
|
return fetch(ROUTES.user.me, { credentials: 'include' })
|
|
49
49
|
.then((res) => {
|
|
50
50
|
if (res.ok) return res.json();
|
|
51
|
-
if ([
|
|
51
|
+
if ([HttpStatusCode.FORBIDDEN, HttpStatusCode.UNAUTHORIZED].includes(res.status))
|
|
52
|
+
return null;
|
|
52
53
|
throw new Error(`[SESSION OpenEdX API] > Cannot retrieve user`);
|
|
53
54
|
})
|
|
54
55
|
.catch((error) => {
|
|
@@ -56,7 +57,7 @@ const API = (APIConf: AuthenticationBackend | LMSBackend, options?: APIOptions):
|
|
|
56
57
|
return null;
|
|
57
58
|
});
|
|
58
59
|
},
|
|
59
|
-
/*
|
|
60
|
+
/*
|
|
60
61
|
/ ! \ Prefix next param with richie.
|
|
61
62
|
In this way, OpenEdX Nginx conf knows that we want to go back to richie app after login/redirect
|
|
62
63
|
*/
|
|
@@ -81,7 +82,7 @@ const API = (APIConf: AuthenticationBackend | LMSBackend, options?: APIOptions):
|
|
|
81
82
|
? response.json()
|
|
82
83
|
: null;
|
|
83
84
|
}
|
|
84
|
-
if (response.status >=
|
|
85
|
+
if (response.status >= HttpStatusCode.INTERNAL_SERVER_ERROR) {
|
|
85
86
|
handle(new Error(`[GET - Enrollment] > ${response.status} - ${response.statusText}`));
|
|
86
87
|
}
|
|
87
88
|
throw new HttpError(response.status, response.statusText);
|
|
@@ -114,13 +115,13 @@ const API = (APIConf: AuthenticationBackend | LMSBackend, options?: APIOptions):
|
|
|
114
115
|
})
|
|
115
116
|
.then(async (response) => {
|
|
116
117
|
if (response.ok) return response.json();
|
|
117
|
-
if (response.status ===
|
|
118
|
+
if (response.status === HttpStatusCode.BAD_REQUEST) {
|
|
118
119
|
if (response.headers.get('Content-Type') === 'application/json') {
|
|
119
120
|
const { localizedMessage } = await response.json();
|
|
120
121
|
throw new HttpError(response.status, response.statusText, localizedMessage);
|
|
121
122
|
}
|
|
122
123
|
}
|
|
123
|
-
if (response.status >=
|
|
124
|
+
if (response.status >= HttpStatusCode.INTERNAL_SERVER_ERROR) {
|
|
124
125
|
// Send server errors to sentry
|
|
125
126
|
handle(new Error(`[SET - Enrollment] > ${response.status} - ${response.statusText}`));
|
|
126
127
|
}
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import { act, fireEvent, getByText, render, screen, within } from '@testing-library/react';
|
|
2
|
+
import { IntlProvider } from 'react-intl';
|
|
3
|
+
import countries from 'i18n-iso-countries';
|
|
4
|
+
import { CunninghamProvider } from '@openfun/cunningham-react';
|
|
5
|
+
import userEvent, { UserEvent } from '@testing-library/user-event';
|
|
6
|
+
import { Address } from 'types/Joanie';
|
|
7
|
+
import { AddressFactory } from 'utils/test/factories/joanie';
|
|
8
|
+
import { changeSelect, clearSelect } from 'components/Form/test-utils';
|
|
9
|
+
import AddressForm from './index';
|
|
10
|
+
|
|
11
|
+
jest.mock('hooks/useAddresses', () => ({
|
|
12
|
+
useAddresses: () => ({
|
|
13
|
+
states: {
|
|
14
|
+
creating: false,
|
|
15
|
+
updating: false,
|
|
16
|
+
},
|
|
17
|
+
}),
|
|
18
|
+
}));
|
|
19
|
+
|
|
20
|
+
describe('AddressForm', () => {
|
|
21
|
+
const handleReset = jest.fn();
|
|
22
|
+
const onSubmit = jest.fn();
|
|
23
|
+
const Wrapper = ({ address }: { address?: Address }) => (
|
|
24
|
+
<IntlProvider locale="en">
|
|
25
|
+
<CunninghamProvider>
|
|
26
|
+
<AddressForm handleReset={handleReset} onSubmit={onSubmit} address={address} />
|
|
27
|
+
</CunninghamProvider>
|
|
28
|
+
</IntlProvider>
|
|
29
|
+
);
|
|
30
|
+
let user: UserEvent;
|
|
31
|
+
|
|
32
|
+
beforeEach(() => {
|
|
33
|
+
jest.resetAllMocks();
|
|
34
|
+
jest.resetModules();
|
|
35
|
+
user = userEvent.setup();
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
it('shows a note about required fields', () => {
|
|
39
|
+
const { container } = render(<Wrapper />);
|
|
40
|
+
|
|
41
|
+
// we use this form of testing because screen.getByText doesn't seem
|
|
42
|
+
// to handle text broken into multiple DOM elements correctly
|
|
43
|
+
expect(container).toHaveTextContent('All fields are required unless marked optional');
|
|
44
|
+
|
|
45
|
+
// the note should be rendered before any inputs
|
|
46
|
+
// we assume that it's the case if it's the first child of the form
|
|
47
|
+
expect(
|
|
48
|
+
container.querySelector(
|
|
49
|
+
'form[name="address-form"] > .form__required-fields-note:first-child',
|
|
50
|
+
),
|
|
51
|
+
).not.toBeNull();
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
it('should initialize with given address', () => {
|
|
55
|
+
const address = AddressFactory().one();
|
|
56
|
+
render(<Wrapper address={address} />);
|
|
57
|
+
|
|
58
|
+
expect(screen.getByRole('textbox', { name: 'Address title' })).toHaveDisplayValue(
|
|
59
|
+
address.title,
|
|
60
|
+
);
|
|
61
|
+
expect(screen.getByRole('textbox', { name: "Recipient's first name" })).toHaveDisplayValue(
|
|
62
|
+
address.first_name,
|
|
63
|
+
);
|
|
64
|
+
expect(screen.getByRole('textbox', { name: "Recipient's last name" })).toHaveDisplayValue(
|
|
65
|
+
address.last_name,
|
|
66
|
+
);
|
|
67
|
+
expect(screen.getByRole('textbox', { name: 'Address' })).toHaveDisplayValue(address.address);
|
|
68
|
+
expect(screen.getByRole('textbox', { name: 'Postcode' })).toHaveDisplayValue(address.postcode);
|
|
69
|
+
expect(screen.getByRole('textbox', { name: 'City' })).toHaveDisplayValue(address.city);
|
|
70
|
+
expect(
|
|
71
|
+
within(screen.getByRole('combobox', { name: 'Country' })).getByDisplayValue(address.country),
|
|
72
|
+
).toBeInTheDocument();
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
it('should submit given address', async () => {
|
|
76
|
+
const address = AddressFactory().one();
|
|
77
|
+
render(<Wrapper address={address} />);
|
|
78
|
+
await user.click(screen.getByRole('button', { name: 'Update this address' }));
|
|
79
|
+
expect(onSubmit.mock.calls[0][0]).toStrictEqual(address);
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
it('renders a button with label "Use this address" when no address is provided', () => {
|
|
83
|
+
render(<Wrapper />);
|
|
84
|
+
|
|
85
|
+
screen.getByRole('button', { name: 'Use this address' });
|
|
86
|
+
expect(screen.queryByRole('button', { name: 'Cancel' })).toBeNull();
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
it('renders a button with label "Use this address" and a cancel button when no address is provided', async () => {
|
|
90
|
+
render(<Wrapper address={AddressFactory().one()} />);
|
|
91
|
+
|
|
92
|
+
screen.getByRole('button', { name: 'Update this address' });
|
|
93
|
+
|
|
94
|
+
const $button = screen.getByRole('button', { name: 'Cancel' });
|
|
95
|
+
await act(async () => {
|
|
96
|
+
fireEvent.click($button);
|
|
97
|
+
});
|
|
98
|
+
expect(handleReset).toHaveBeenCalledTimes(1);
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
it('renders an error message when a value in the form is invalid', async () => {
|
|
102
|
+
render(<Wrapper />);
|
|
103
|
+
|
|
104
|
+
// - submit button should be enabled even when the form is not valid,
|
|
105
|
+
// so that every user can get feedback easily (especially screen reader users)
|
|
106
|
+
const $submitButton = screen.getByRole('button', {
|
|
107
|
+
name: 'Use this address',
|
|
108
|
+
}) as HTMLButtonElement;
|
|
109
|
+
expect($submitButton.disabled).toBe(false);
|
|
110
|
+
|
|
111
|
+
// - User fulfills address fields
|
|
112
|
+
const address = AddressFactory().one();
|
|
113
|
+
const $titleInput = screen.getByRole('textbox', { name: 'Address title' });
|
|
114
|
+
const $firstnameInput = screen.getByRole('textbox', { name: "Recipient's first name" });
|
|
115
|
+
const $countryInput = screen.getByRole('combobox', { name: 'Country' });
|
|
116
|
+
await user.type($titleInput, address.title);
|
|
117
|
+
await user.type($firstnameInput, address.first_name);
|
|
118
|
+
await user.type(
|
|
119
|
+
screen.getByRole('textbox', { name: "Recipient's last name" }),
|
|
120
|
+
address.last_name,
|
|
121
|
+
);
|
|
122
|
+
await user.type(screen.getByRole('textbox', { name: 'Address' }), address.address);
|
|
123
|
+
await user.type(screen.getByRole('textbox', { name: 'City' }), address.city);
|
|
124
|
+
await user.type(screen.getByRole('textbox', { name: 'Postcode' }), address.postcode);
|
|
125
|
+
|
|
126
|
+
await changeSelect($countryInput, countries.getName(address?.country, 'en')!, user);
|
|
127
|
+
|
|
128
|
+
// Once the form has been fulfilled properly, submit button should still be enabled.
|
|
129
|
+
expect($submitButton.disabled).toBe(false);
|
|
130
|
+
|
|
131
|
+
// Before submitting, we change field values to corrupt the form data
|
|
132
|
+
await user.clear($titleInput);
|
|
133
|
+
await user.type($titleInput, 'a');
|
|
134
|
+
await user.clear($firstnameInput);
|
|
135
|
+
await clearSelect($countryInput, user);
|
|
136
|
+
|
|
137
|
+
await act(async () => {
|
|
138
|
+
fireEvent.click($submitButton);
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
expect(onSubmit).not.toHaveBeenCalled();
|
|
142
|
+
|
|
143
|
+
// Error messages should have been displayed.
|
|
144
|
+
// Title field should have a message saying that the value is too short.
|
|
145
|
+
expect(
|
|
146
|
+
getByText($titleInput.closest('.c__field')!, 'The minimum length is 2 chars.'),
|
|
147
|
+
).toBeInTheDocument();
|
|
148
|
+
// Firstname field should have a message saying that the value is required.
|
|
149
|
+
expect(
|
|
150
|
+
getByText($firstnameInput.closest('.c__field')!, 'This field is required.'),
|
|
151
|
+
).toBeInTheDocument();
|
|
152
|
+
// Country field should have a message saying that the value is not valid.
|
|
153
|
+
expect(
|
|
154
|
+
getByText($countryInput.closest('.c__field')!, /This field is required./),
|
|
155
|
+
).toBeInTheDocument();
|
|
156
|
+
});
|
|
157
|
+
});
|