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
|
@@ -22,6 +22,7 @@ import { confirm } from 'utils/indirection/window';
|
|
|
22
22
|
import { expectBreadcrumbsToEqualParts } from 'utils/test/expectBreadcrumbsToEqualParts';
|
|
23
23
|
import { createTestQueryClient } from 'utils/test/createTestQueryClient';
|
|
24
24
|
import { expectBannerError } from 'utils/test/expectBanner';
|
|
25
|
+
import { HttpStatusCode } from 'utils/errors/HttpError';
|
|
25
26
|
|
|
26
27
|
jest.mock('utils/context', () => ({
|
|
27
28
|
__esModule: true,
|
|
@@ -59,7 +60,7 @@ describe('<DashboardCreditCardsManagement/>', () => {
|
|
|
59
60
|
</QueryClientProvider>,
|
|
60
61
|
);
|
|
61
62
|
});
|
|
62
|
-
expectBreadcrumbsToEqualParts(['
|
|
63
|
+
expectBreadcrumbsToEqualParts(['chevron_leftBack', 'My preferences']);
|
|
63
64
|
// The empty placeholder is shown.
|
|
64
65
|
await screen.findByText("You haven't created any credit cards yet.");
|
|
65
66
|
// No error is shown.
|
|
@@ -68,11 +69,11 @@ describe('<DashboardCreditCardsManagement/>', () => {
|
|
|
68
69
|
|
|
69
70
|
it('renders the correct label for expired date', async () => {
|
|
70
71
|
const date = faker.date.past();
|
|
71
|
-
const creditCard: CreditCard = {
|
|
72
|
-
...CreditCardFactory().one(),
|
|
72
|
+
const creditCard: CreditCard = CreditCardFactory({
|
|
73
73
|
expiration_month: date.getMonth() + 1,
|
|
74
74
|
expiration_year: date.getFullYear(),
|
|
75
|
-
};
|
|
75
|
+
}).one();
|
|
76
|
+
|
|
76
77
|
fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', [creditCard]);
|
|
77
78
|
await act(async () => {
|
|
78
79
|
render(
|
|
@@ -105,11 +106,11 @@ describe('<DashboardCreditCardsManagement/>', () => {
|
|
|
105
106
|
refDate.setMonth(refDate.getMonth() + 1);
|
|
106
107
|
refDate.setDate(1);
|
|
107
108
|
const futureLessThan3Months = faker.date.future({ years: 2.99 / 12, refDate });
|
|
108
|
-
const creditCard: CreditCard = {
|
|
109
|
-
...CreditCardFactory().one(),
|
|
109
|
+
const creditCard: CreditCard = CreditCardFactory({
|
|
110
110
|
expiration_month: futureLessThan3Months.getMonth() + 1,
|
|
111
111
|
expiration_year: futureLessThan3Months.getFullYear(),
|
|
112
|
-
};
|
|
112
|
+
}).one();
|
|
113
|
+
|
|
113
114
|
fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', [creditCard]);
|
|
114
115
|
await act(async () => {
|
|
115
116
|
render(
|
|
@@ -141,11 +142,11 @@ describe('<DashboardCreditCardsManagement/>', () => {
|
|
|
141
142
|
const refDate = new Date();
|
|
142
143
|
refDate.setMonth(refDate.getMonth() + 4);
|
|
143
144
|
const date = faker.date.future({ refDate });
|
|
144
|
-
const creditCard: CreditCard = {
|
|
145
|
-
...CreditCardFactory().one(),
|
|
145
|
+
const creditCard: CreditCard = CreditCardFactory({
|
|
146
146
|
expiration_month: date.getMonth() + 1,
|
|
147
147
|
expiration_year: date.getFullYear(),
|
|
148
|
-
};
|
|
148
|
+
}).one();
|
|
149
|
+
|
|
149
150
|
fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', [creditCard]);
|
|
150
151
|
await act(async () => {
|
|
151
152
|
render(
|
|
@@ -405,8 +406,8 @@ describe('<DashboardCreditCardsManagement/>', () => {
|
|
|
405
406
|
it('shows an error banner in case of API error', async () => {
|
|
406
407
|
// Mock the API route to return a 500 error.
|
|
407
408
|
fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', {
|
|
408
|
-
status:
|
|
409
|
-
body: '
|
|
409
|
+
status: HttpStatusCode.INTERNAL_SERVER_ERROR,
|
|
410
|
+
body: 'Internal Server Error',
|
|
410
411
|
});
|
|
411
412
|
|
|
412
413
|
await act(async () => {
|
|
@@ -32,7 +32,7 @@ interface Props {
|
|
|
32
32
|
export const DashboardCreditCardsManagement = ({ onClickEdit }: Props) => {
|
|
33
33
|
const intl = useIntl();
|
|
34
34
|
const {
|
|
35
|
-
states: { error,
|
|
35
|
+
states: { error, isPending },
|
|
36
36
|
methods: { setError, update, safeDelete },
|
|
37
37
|
...creditCards
|
|
38
38
|
} = useCreditCardsManagement();
|
|
@@ -68,8 +68,8 @@ export const DashboardCreditCardsManagement = ({ onClickEdit }: Props) => {
|
|
|
68
68
|
return (
|
|
69
69
|
<DashboardCard header={<FormattedMessage {...messages.header} />}>
|
|
70
70
|
<div className="dashboard-credit-cards">
|
|
71
|
-
{
|
|
72
|
-
{!
|
|
71
|
+
{isPending && <Spinner />}
|
|
72
|
+
{!isPending && (
|
|
73
73
|
<>
|
|
74
74
|
{error && <Banner message={error} type={BannerType.ERROR} rounded />}
|
|
75
75
|
{!error && creditCardsList.length === 0 && (
|
|
@@ -3,9 +3,9 @@ import { QueryClientProvider } from '@tanstack/react-query';
|
|
|
3
3
|
import { IntlProvider } from 'react-intl';
|
|
4
4
|
import fetchMock from 'fetch-mock';
|
|
5
5
|
import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
6
|
+
import { CredentialOrder } from 'types/Joanie';
|
|
7
|
+
import { CredentialOrderFactory, TargetCourseFactory } from 'utils/test/factories/joanie';
|
|
8
|
+
import { mockCourseProductWithOrder } from 'utils/test/mockCourseProductWithOrder';
|
|
9
9
|
import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
|
|
10
10
|
import { createTestQueryClient } from 'utils/test/createTestQueryClient';
|
|
11
11
|
import { SessionProvider } from 'contexts/SessionContext';
|
|
@@ -47,12 +47,12 @@ describe('<DashboardOrderLayout />', () => {
|
|
|
47
47
|
});
|
|
48
48
|
|
|
49
49
|
it('renders sidebar', async () => {
|
|
50
|
-
const order:
|
|
51
|
-
...OrderFactory().one(),
|
|
50
|
+
const order: CredentialOrder = CredentialOrderFactory({
|
|
52
51
|
target_courses: [TargetCourseFactory().one()],
|
|
53
|
-
|
|
54
|
-
};
|
|
55
|
-
|
|
52
|
+
target_enrollments: [],
|
|
53
|
+
}).one();
|
|
54
|
+
|
|
55
|
+
const { product } = mockCourseProductWithOrder(order);
|
|
56
56
|
fetchMock.get(
|
|
57
57
|
'https://joanie.endpoint/api/v1.0/orders/',
|
|
58
58
|
{ results: [order], next: null, previous: null, count: null },
|
|
@@ -7,17 +7,21 @@ import {
|
|
|
7
7
|
} from 'widgets/Dashboard/utils/dashboardRoutes';
|
|
8
8
|
import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRouteMessages';
|
|
9
9
|
import { DashboardLayout } from 'widgets/Dashboard/components/DashboardLayout';
|
|
10
|
-
import {
|
|
11
|
-
import { useProduct } from 'hooks/useProduct';
|
|
10
|
+
import { useOmniscientOrder } from 'hooks/useOrders';
|
|
12
11
|
import { useBreadcrumbsPlaceholders } from 'hooks/useBreadcrumbsPlaceholders';
|
|
13
12
|
import { CourseLight, Product } from 'types/Joanie';
|
|
14
13
|
import { LearnerDashboardSidebar } from 'widgets/Dashboard/components/LearnerDashboardSidebar';
|
|
14
|
+
import { useCourseProduct } from 'hooks/useCourseProducts';
|
|
15
15
|
|
|
16
16
|
export const DashboardOrderLayout = () => {
|
|
17
17
|
const params = useParams<{ orderId: string }>();
|
|
18
|
-
const order =
|
|
18
|
+
const order = useOmniscientOrder(params.orderId);
|
|
19
19
|
const course = order.item?.course as CourseLight;
|
|
20
|
-
const
|
|
20
|
+
const courseProduct = useCourseProduct({
|
|
21
|
+
product_id: order.item?.product_id,
|
|
22
|
+
course_id: course?.code,
|
|
23
|
+
});
|
|
24
|
+
const product = courseProduct?.item?.product;
|
|
21
25
|
const intl = useIntl();
|
|
22
26
|
const getRoutePath = getDashboardRoutePath(intl);
|
|
23
27
|
const getRouteLabel = getDashboardRouteLabel(intl);
|
|
@@ -34,9 +38,10 @@ export const DashboardOrderLayout = () => {
|
|
|
34
38
|
|
|
35
39
|
return (
|
|
36
40
|
<DashboardLayout
|
|
37
|
-
|
|
41
|
+
className="dashboard-order-layout"
|
|
42
|
+
sidebar={<LearnerDashboardSidebar menuLinks={links} title={product?.title} />}
|
|
38
43
|
>
|
|
39
|
-
<DashboardOrderLayoutContent product={product
|
|
44
|
+
<DashboardOrderLayoutContent product={product} />
|
|
40
45
|
</DashboardLayout>
|
|
41
46
|
);
|
|
42
47
|
};
|
|
@@ -0,0 +1,358 @@
|
|
|
1
|
+
import { IntlProvider } from 'react-intl';
|
|
2
|
+
import { QueryClientProvider } from '@tanstack/react-query';
|
|
3
|
+
import { CunninghamProvider } from '@openfun/cunningham-react';
|
|
4
|
+
import fetchMock from 'fetch-mock';
|
|
5
|
+
import { MemoryRouter, Route, Routes } from 'react-router-dom';
|
|
6
|
+
import { render, screen } from '@testing-library/react';
|
|
7
|
+
import { getAllByRole } from '@testing-library/dom';
|
|
8
|
+
import userEvent from '@testing-library/user-event';
|
|
9
|
+
import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
|
|
10
|
+
import JoanieSessionProvider from 'contexts/SessionContext/JoanieSessionProvider';
|
|
11
|
+
import { createTestQueryClient } from 'utils/test/createTestQueryClient';
|
|
12
|
+
import { ContractFactory, OrganizationFactory } from 'utils/test/factories/joanie';
|
|
13
|
+
import { expectNoSpinner } from 'utils/test/expectSpinner';
|
|
14
|
+
import { expectBannerError } from 'utils/test/expectBanner';
|
|
15
|
+
import { HttpStatusCode } from 'utils/errors/HttpError';
|
|
16
|
+
import TeacherDashboardContracts from '.';
|
|
17
|
+
|
|
18
|
+
jest.mock('utils/context', () => ({
|
|
19
|
+
__esModule: true,
|
|
20
|
+
default: mockRichieContextFactory({
|
|
21
|
+
authentication: { backend: 'fonzie', endpoint: 'https://auth.endpoint.test' },
|
|
22
|
+
joanie_backend: { endpoint: 'https://joanie.test' },
|
|
23
|
+
}).one(),
|
|
24
|
+
}));
|
|
25
|
+
|
|
26
|
+
jest.mock('components/ContractFrame', () => ({
|
|
27
|
+
__esModule: true,
|
|
28
|
+
OrganizationContractFrame: ({
|
|
29
|
+
isOpen,
|
|
30
|
+
organizationId,
|
|
31
|
+
}: {
|
|
32
|
+
isOpen: boolean;
|
|
33
|
+
organizationId: string;
|
|
34
|
+
}) => isOpen && <p>ContractFrame opened for {organizationId}</p>,
|
|
35
|
+
}));
|
|
36
|
+
|
|
37
|
+
const Wrapper = ({ path, initialEntry }: { path: string; initialEntry: string }) => {
|
|
38
|
+
return (
|
|
39
|
+
<IntlProvider locale="en">
|
|
40
|
+
<QueryClientProvider client={createTestQueryClient({ user: true })}>
|
|
41
|
+
<JoanieSessionProvider>
|
|
42
|
+
<CunninghamProvider>
|
|
43
|
+
<MemoryRouter initialEntries={[initialEntry]}>
|
|
44
|
+
<Routes>
|
|
45
|
+
<Route path={path} element={<TeacherDashboardContracts />} />
|
|
46
|
+
</Routes>
|
|
47
|
+
</MemoryRouter>
|
|
48
|
+
</CunninghamProvider>
|
|
49
|
+
</JoanieSessionProvider>
|
|
50
|
+
</QueryClientProvider>
|
|
51
|
+
</IntlProvider>
|
|
52
|
+
);
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
describe('pages/TeacherDashboardContracts', () => {
|
|
56
|
+
beforeEach(() => {
|
|
57
|
+
// Joanie providers calls
|
|
58
|
+
fetchMock.get('https://joanie.test/api/v1.0/orders/', []);
|
|
59
|
+
fetchMock.get('https://joanie.test/api/v1.0/credit-cards/', []);
|
|
60
|
+
fetchMock.get('https://joanie.test/api/v1.0/addresses/', []);
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
afterEach(() => {
|
|
64
|
+
fetchMock.restore();
|
|
65
|
+
jest.resetAllMocks();
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
it('should render a list of contracts for a course product relation', async () => {
|
|
69
|
+
const contracts = ContractFactory({
|
|
70
|
+
student_signed_on: Date.toString(),
|
|
71
|
+
organization_signed_on: Date.toString(),
|
|
72
|
+
}).many(3);
|
|
73
|
+
const organizations = OrganizationFactory().many(2);
|
|
74
|
+
const defaultOrganization = organizations[0];
|
|
75
|
+
|
|
76
|
+
// OrganizationContractFilter request all organizations forwho the user have access
|
|
77
|
+
fetchMock.get(`https://joanie.test/api/v1.0/organizations/`, organizations);
|
|
78
|
+
// TeacherDashboardContracts request a paginated list of contracts to display
|
|
79
|
+
fetchMock.get(
|
|
80
|
+
`https://joanie.test/api/v1.0/organizations/${defaultOrganization.id}/contracts/?course_product_relation_id=2&signature_state=signed&page=1&page_size=25`,
|
|
81
|
+
{ results: contracts, count: 0, previous: null, next: null },
|
|
82
|
+
);
|
|
83
|
+
// useTeacherContractsToSign request all contract to sign, without pagination
|
|
84
|
+
fetchMock.get(
|
|
85
|
+
`https://joanie.test/api/v1.0/organizations/${defaultOrganization.id}/contracts/?signature_state=half_signed&course_product_relation_id=2`,
|
|
86
|
+
{ results: [], count: 0, previous: null, next: null },
|
|
87
|
+
);
|
|
88
|
+
|
|
89
|
+
render(
|
|
90
|
+
<Wrapper
|
|
91
|
+
path="/courses/:courseId/products/:courseProductRelationId/contracts"
|
|
92
|
+
initialEntry="/courses/1/products/2/contracts"
|
|
93
|
+
/>,
|
|
94
|
+
);
|
|
95
|
+
|
|
96
|
+
await expectNoSpinner();
|
|
97
|
+
|
|
98
|
+
// Organization filter should have been rendered
|
|
99
|
+
const organizationFilter: HTMLInputElement = await screen.findByRole('combobox', {
|
|
100
|
+
name: 'Organization',
|
|
101
|
+
});
|
|
102
|
+
expect(organizationFilter).toHaveAttribute('value', defaultOrganization.title);
|
|
103
|
+
|
|
104
|
+
// Signature state filter should have been rendered
|
|
105
|
+
const signatureStateFilter: HTMLInputElement = screen.getByRole('combobox', {
|
|
106
|
+
name: 'Signature state',
|
|
107
|
+
hidden: true,
|
|
108
|
+
});
|
|
109
|
+
const value = (signatureStateFilter.querySelector('input[type="hidden"]') as HTMLInputElement)
|
|
110
|
+
?.value;
|
|
111
|
+
expect(value).toBe('signed');
|
|
112
|
+
|
|
113
|
+
await expectNoSpinner();
|
|
114
|
+
|
|
115
|
+
// Table listing all signed contracts should have been rendered
|
|
116
|
+
screen.getByRole('table');
|
|
117
|
+
|
|
118
|
+
// Table header should have been rendered with 3 columns
|
|
119
|
+
const columnHeaders = screen.getAllByRole('columnheader');
|
|
120
|
+
expect(columnHeaders.length).toBe(3);
|
|
121
|
+
expect(columnHeaders[0]).toHaveTextContent('Training');
|
|
122
|
+
expect(columnHeaders[1]).toHaveTextContent('Learner');
|
|
123
|
+
expect(columnHeaders[2]).toHaveTextContent('State');
|
|
124
|
+
|
|
125
|
+
// Table body should have been rendered with 3 rows (one per contract)
|
|
126
|
+
contracts.forEach((contract) => {
|
|
127
|
+
const row = screen.getByTestId(contract.id);
|
|
128
|
+
const cells = getAllByRole(row, 'cell');
|
|
129
|
+
expect(cells.length).toBe(3);
|
|
130
|
+
expect(cells[0]).toHaveTextContent(contract.order.product_title);
|
|
131
|
+
expect(cells[1]).toHaveTextContent(contract.order.owner_name);
|
|
132
|
+
expect(cells[2]).toHaveTextContent('Signed');
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
it('should render a list of contracts for an organization', async () => {
|
|
137
|
+
const contracts = ContractFactory({
|
|
138
|
+
student_signed_on: Date.toString(),
|
|
139
|
+
organization_signed_on: Date.toString(),
|
|
140
|
+
}).many(3);
|
|
141
|
+
|
|
142
|
+
fetchMock.get(
|
|
143
|
+
`https://joanie.test/api/v1.0/organizations/1/contracts/?signature_state=signed&page=1&page_size=25`,
|
|
144
|
+
{ results: contracts, count: 0, previous: null, next: null },
|
|
145
|
+
);
|
|
146
|
+
fetchMock.get(
|
|
147
|
+
`https://joanie.test/api/v1.0/organizations/1/contracts/?signature_state=half_signed`,
|
|
148
|
+
{ results: [], count: 0, previous: null, next: null },
|
|
149
|
+
);
|
|
150
|
+
|
|
151
|
+
render(
|
|
152
|
+
<Wrapper
|
|
153
|
+
path="/organizations/:organizationId/contracts"
|
|
154
|
+
initialEntry="/organizations/1/contracts"
|
|
155
|
+
/>,
|
|
156
|
+
);
|
|
157
|
+
|
|
158
|
+
await expectNoSpinner();
|
|
159
|
+
|
|
160
|
+
// Organization filter should not have been rendered
|
|
161
|
+
const organizationFilter = screen.queryByRole('combobox', {
|
|
162
|
+
name: 'Organization',
|
|
163
|
+
});
|
|
164
|
+
expect(organizationFilter).not.toBeInTheDocument();
|
|
165
|
+
|
|
166
|
+
// Signature state filter should have been rendered
|
|
167
|
+
const signatureStateFilter: HTMLInputElement = screen.getByRole('combobox', {
|
|
168
|
+
name: 'Signature state',
|
|
169
|
+
hidden: true,
|
|
170
|
+
});
|
|
171
|
+
const value = (signatureStateFilter.querySelector('input[type="hidden"]') as HTMLInputElement)
|
|
172
|
+
?.value;
|
|
173
|
+
expect(value).toBe('signed');
|
|
174
|
+
|
|
175
|
+
await expectNoSpinner();
|
|
176
|
+
|
|
177
|
+
// Table listing all signed contracts should have been rendered
|
|
178
|
+
screen.getByRole('table');
|
|
179
|
+
|
|
180
|
+
// Table header should have been rendered with 3 columns
|
|
181
|
+
const columnHeaders = screen.getAllByRole('columnheader');
|
|
182
|
+
expect(columnHeaders.length).toBe(3);
|
|
183
|
+
|
|
184
|
+
// Table body should have been rendered with 3 rows (one per contract)
|
|
185
|
+
contracts.forEach((contract) => {
|
|
186
|
+
const row = screen.getByTestId(contract.id);
|
|
187
|
+
const cells = getAllByRole(row, 'cell');
|
|
188
|
+
expect(cells.length).toBe(3);
|
|
189
|
+
expect(cells[0]).toHaveTextContent(contract.order.product_title);
|
|
190
|
+
expect(cells[1]).toHaveTextContent(contract.order.owner_name);
|
|
191
|
+
expect(cells[2]).toHaveTextContent('Signed');
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
|
|
195
|
+
it('should render an empty table if there are no contracts', async () => {
|
|
196
|
+
fetchMock.get(
|
|
197
|
+
`https://joanie.test/api/v1.0/organizations/1/contracts/?signature_state=signed&page=1&page_size=25`,
|
|
198
|
+
{ results: [], count: 0, previous: null, next: null },
|
|
199
|
+
);
|
|
200
|
+
fetchMock.get(
|
|
201
|
+
`https://joanie.test/api/v1.0/organizations/1/contracts/?signature_state=half_signed`,
|
|
202
|
+
{ results: [], count: 0, previous: null, next: null },
|
|
203
|
+
);
|
|
204
|
+
|
|
205
|
+
render(
|
|
206
|
+
<Wrapper
|
|
207
|
+
path="/organizations/:organizationId/contracts"
|
|
208
|
+
initialEntry="/organizations/1/contracts"
|
|
209
|
+
/>,
|
|
210
|
+
);
|
|
211
|
+
|
|
212
|
+
await expectNoSpinner();
|
|
213
|
+
|
|
214
|
+
// Organization filter should not have been rendered
|
|
215
|
+
const organizationFilter = screen.queryByRole('combobox', {
|
|
216
|
+
name: 'Organization',
|
|
217
|
+
});
|
|
218
|
+
expect(organizationFilter).not.toBeInTheDocument();
|
|
219
|
+
|
|
220
|
+
// Signature state filter should have been rendered
|
|
221
|
+
const signatureStateFilter: HTMLInputElement = screen.getByRole('combobox', {
|
|
222
|
+
name: 'Signature state',
|
|
223
|
+
hidden: true,
|
|
224
|
+
});
|
|
225
|
+
const value = (signatureStateFilter.querySelector('input[type="hidden"]') as HTMLInputElement)
|
|
226
|
+
?.value;
|
|
227
|
+
expect(value).toBe('signed');
|
|
228
|
+
|
|
229
|
+
await expectNoSpinner();
|
|
230
|
+
|
|
231
|
+
// A message should have been rendered to inform the user that there are no contracts
|
|
232
|
+
screen.getByRole('img', { name: /illustration of an empty table/i });
|
|
233
|
+
screen.getByText(/this table is empty/i);
|
|
234
|
+
});
|
|
235
|
+
|
|
236
|
+
it('should render a button to bulk sign contracts if user has abilities and there are contracts to sign', async () => {
|
|
237
|
+
const contracts = ContractFactory({
|
|
238
|
+
student_signed_on: Date.toString(),
|
|
239
|
+
abilities: { sign: true },
|
|
240
|
+
}).many(3);
|
|
241
|
+
|
|
242
|
+
fetchMock.get(
|
|
243
|
+
`https://joanie.test/api/v1.0/organizations/1/contracts/?signature_state=signed&page=1&page_size=25`,
|
|
244
|
+
{ results: [], count: 0, previous: null, next: null },
|
|
245
|
+
);
|
|
246
|
+
fetchMock.get(
|
|
247
|
+
`https://joanie.test/api/v1.0/organizations/1/contracts/?signature_state=half_signed&page=1&page_size=25`,
|
|
248
|
+
{ results: contracts, count: 3, previous: null, next: null },
|
|
249
|
+
);
|
|
250
|
+
fetchMock.get(
|
|
251
|
+
`https://joanie.test/api/v1.0/organizations/1/contracts/?signature_state=half_signed`,
|
|
252
|
+
{ results: contracts, count: 3, previous: null, next: null },
|
|
253
|
+
);
|
|
254
|
+
|
|
255
|
+
render(
|
|
256
|
+
<Wrapper
|
|
257
|
+
path="/organizations/:organizationId/contracts"
|
|
258
|
+
initialEntry="/organizations/1/contracts?signature_state=half_signed"
|
|
259
|
+
/>,
|
|
260
|
+
);
|
|
261
|
+
|
|
262
|
+
await expectNoSpinner();
|
|
263
|
+
|
|
264
|
+
// Organization filter should not have been rendered
|
|
265
|
+
const organizationFilter = screen.queryByRole('combobox', {
|
|
266
|
+
name: 'Organization',
|
|
267
|
+
});
|
|
268
|
+
expect(organizationFilter).not.toBeInTheDocument();
|
|
269
|
+
|
|
270
|
+
// Signature state filter should have been rendered
|
|
271
|
+
const signatureStateFilter: HTMLInputElement = screen.getByRole('combobox', {
|
|
272
|
+
name: 'Signature state',
|
|
273
|
+
hidden: true,
|
|
274
|
+
});
|
|
275
|
+
const value = (signatureStateFilter.querySelector('input[type="hidden"]') as HTMLInputElement)
|
|
276
|
+
?.value;
|
|
277
|
+
expect(value).toBe('half_signed');
|
|
278
|
+
|
|
279
|
+
// Table listing all signed contracts should have been rendered
|
|
280
|
+
screen.getByRole('table');
|
|
281
|
+
|
|
282
|
+
// Table header should have been rendered with 3 columns
|
|
283
|
+
const columnHeaders = screen.getAllByRole('columnheader');
|
|
284
|
+
expect(columnHeaders.length).toBe(3);
|
|
285
|
+
|
|
286
|
+
// Table body should have been rendered with 3 rows (one per contract)
|
|
287
|
+
contracts.forEach((contract) => {
|
|
288
|
+
const row = screen.getByTestId(contract.id);
|
|
289
|
+
const cells = getAllByRole(row, 'cell');
|
|
290
|
+
expect(cells.length).toBe(3);
|
|
291
|
+
expect(cells[2]).toHaveTextContent('Pending for signature');
|
|
292
|
+
});
|
|
293
|
+
|
|
294
|
+
// OrganizationContractFrame should not be opened yet
|
|
295
|
+
expect(screen.queryByText('ContractFrame opened for 1')).not.toBeInTheDocument();
|
|
296
|
+
|
|
297
|
+
// Bulk sign button should have been rendered
|
|
298
|
+
const bulkSignButton = screen.getByRole('button', {
|
|
299
|
+
name: 'Sign all pending contracts (3)',
|
|
300
|
+
});
|
|
301
|
+
const user = userEvent.setup();
|
|
302
|
+
await user.click(bulkSignButton);
|
|
303
|
+
|
|
304
|
+
// And now OrganizationContractFrame should be opened
|
|
305
|
+
screen.getByText('ContractFrame opened for 1');
|
|
306
|
+
});
|
|
307
|
+
|
|
308
|
+
it('should render an error banner if an error occured during contracts fetching', async () => {
|
|
309
|
+
fetchMock.get(
|
|
310
|
+
`https://joanie.test/api/v1.0/organizations/1/contracts/?signature_state=signed&page=1&page_size=25`,
|
|
311
|
+
HttpStatusCode.NOT_FOUND,
|
|
312
|
+
);
|
|
313
|
+
fetchMock.get(
|
|
314
|
+
`https://joanie.test/api/v1.0/organizations/1/contracts/?signature_state=half_signed`,
|
|
315
|
+
HttpStatusCode.NOT_FOUND,
|
|
316
|
+
);
|
|
317
|
+
|
|
318
|
+
render(
|
|
319
|
+
<Wrapper
|
|
320
|
+
path="/organizations/:organizationId/contracts"
|
|
321
|
+
initialEntry="/organizations/1/contracts"
|
|
322
|
+
/>,
|
|
323
|
+
);
|
|
324
|
+
|
|
325
|
+
await expectNoSpinner();
|
|
326
|
+
await expectBannerError('An error occurred while fetching contracts. Please retry later.');
|
|
327
|
+
});
|
|
328
|
+
|
|
329
|
+
it('should hide organization filter when user only have one organization', async () => {
|
|
330
|
+
const defaultOrganization = OrganizationFactory().one();
|
|
331
|
+
fetchMock.get('https://joanie.test/api/v1.0/organizations/', [defaultOrganization]);
|
|
332
|
+
|
|
333
|
+
const contracts = ContractFactory({
|
|
334
|
+
student_signed_on: Date.toString(),
|
|
335
|
+
abilities: { sign: true },
|
|
336
|
+
}).many(3);
|
|
337
|
+
fetchMock.get(
|
|
338
|
+
`https://joanie.test/api/v1.0/organizations/${defaultOrganization.id}/contracts/?signature_state=signed&page=1&page_size=25`,
|
|
339
|
+
{ results: [], count: 0, previous: null, next: null },
|
|
340
|
+
);
|
|
341
|
+
fetchMock.get(
|
|
342
|
+
`https://joanie.test/api/v1.0/organizations/${defaultOrganization.id}/contracts/?signature_state=half_signed`,
|
|
343
|
+
{ results: contracts, count: 3, previous: null, next: null },
|
|
344
|
+
);
|
|
345
|
+
render(<Wrapper path="/" initialEntry="" />);
|
|
346
|
+
await expectNoSpinner();
|
|
347
|
+
|
|
348
|
+
// Signature state filter should have been rendered
|
|
349
|
+
screen.getByRole('combobox', {
|
|
350
|
+
name: 'Signature state',
|
|
351
|
+
hidden: true,
|
|
352
|
+
});
|
|
353
|
+
|
|
354
|
+
// Organization filter should not have been rendered
|
|
355
|
+
const organizationFilter = screen.queryByRole('combobox', { name: 'Organization' });
|
|
356
|
+
expect(organizationFilter).not.toBeInTheDocument();
|
|
357
|
+
});
|
|
358
|
+
});
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import { defineMessages, useIntl } from 'react-intl';
|
|
2
|
+
|
|
3
|
+
import { DataGrid, usePagination } from '@openfun/cunningham-react';
|
|
4
|
+
import { useEffect, useMemo } from 'react';
|
|
5
|
+
import { useParams, useSearchParams } from 'react-router-dom';
|
|
6
|
+
import { ContractHelper, ContractStatePoV } from 'utils/ContractHelper';
|
|
7
|
+
import { useOrganizationContracts } from 'hooks/useContracts';
|
|
8
|
+
import Banner, { BannerType } from 'components/Banner';
|
|
9
|
+
import { PER_PAGE } from 'settings';
|
|
10
|
+
import { ContractResourceQuery } from 'types/Joanie';
|
|
11
|
+
|
|
12
|
+
import { useOrganizations } from 'hooks/useOrganizations';
|
|
13
|
+
import ContractFiltersBar from '../components/ContractFiltersBar';
|
|
14
|
+
import useTeacherContractFilters, {
|
|
15
|
+
TeacherDashboardContractsParams,
|
|
16
|
+
} from '../hooks/useTeacherContractFilters';
|
|
17
|
+
import ContractActionsBar from '../components/ContractActionsBar';
|
|
18
|
+
|
|
19
|
+
const messages = defineMessages({
|
|
20
|
+
columnProductTitle: {
|
|
21
|
+
defaultMessage: 'Training',
|
|
22
|
+
description: 'Label for productTitle column',
|
|
23
|
+
id: 'pages.TeacherDashboardOrganizationContractsLayout.columnProductTitle',
|
|
24
|
+
},
|
|
25
|
+
columnLearnerName: {
|
|
26
|
+
defaultMessage: 'Learner',
|
|
27
|
+
description: 'Label for learnerName column',
|
|
28
|
+
id: 'pages.TeacherDashboardOrganizationContractsLayout.columnLearnerName',
|
|
29
|
+
},
|
|
30
|
+
columnState: {
|
|
31
|
+
defaultMessage: 'State',
|
|
32
|
+
description: 'Label for state column',
|
|
33
|
+
id: 'pages.TeacherDashboardOrganizationContractsLayout.columnState',
|
|
34
|
+
},
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
const TeacherDashboardContracts = () => {
|
|
38
|
+
const intl = useIntl();
|
|
39
|
+
const [searchParams] = useSearchParams();
|
|
40
|
+
const page = searchParams.get('page') ?? '1';
|
|
41
|
+
const pagination = usePagination({
|
|
42
|
+
defaultPage: page ? parseInt(page, 10) : 1,
|
|
43
|
+
pageSize: PER_PAGE.teacherContractList,
|
|
44
|
+
});
|
|
45
|
+
const { organizationId: routeOrganizationId } = useParams<TeacherDashboardContractsParams>();
|
|
46
|
+
// organization list is used to show/hide organization filter.
|
|
47
|
+
// when organizationId is in route's params this filter is always hidden.
|
|
48
|
+
// therefore we don't need to enable this query.
|
|
49
|
+
const {
|
|
50
|
+
items: organizationList,
|
|
51
|
+
states: { isFetched: isOrganizationListFetched },
|
|
52
|
+
} = useOrganizations(undefined, { enabled: !!routeOrganizationId });
|
|
53
|
+
const hasMultipleOrganizations = isOrganizationListFetched && organizationList.length > 1;
|
|
54
|
+
const { initialFilters, filters, setFilters } = useTeacherContractFilters();
|
|
55
|
+
const {
|
|
56
|
+
items: contracts,
|
|
57
|
+
meta,
|
|
58
|
+
states: { fetching, isFetched, error },
|
|
59
|
+
} = useOrganizationContracts({
|
|
60
|
+
...filters,
|
|
61
|
+
page: pagination.page,
|
|
62
|
+
page_size: PER_PAGE.teacherContractList,
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
const rows = useMemo(() => {
|
|
66
|
+
return contracts.map((contract) => ({
|
|
67
|
+
id: contract.id,
|
|
68
|
+
learnerName: contract.order.owner_name,
|
|
69
|
+
productTitle: contract.order.product_title,
|
|
70
|
+
state: ContractHelper.getHumanReadableState(contract, ContractStatePoV.ORGANIZATION, intl),
|
|
71
|
+
}));
|
|
72
|
+
}, [contracts]);
|
|
73
|
+
|
|
74
|
+
const handleFiltersChange = (newFilters: Partial<ContractResourceQuery>) => {
|
|
75
|
+
// Reset pagination
|
|
76
|
+
pagination.setPage(1);
|
|
77
|
+
setFilters((prevFilters) => ({ ...prevFilters, ...newFilters }));
|
|
78
|
+
};
|
|
79
|
+
|
|
80
|
+
useEffect(() => {
|
|
81
|
+
if (isFetched && meta?.pagination?.count) {
|
|
82
|
+
pagination.setPagesCount(Math.ceil(meta!.pagination!.count / PER_PAGE.teacherContractList));
|
|
83
|
+
}
|
|
84
|
+
}, [meta, isFetched]);
|
|
85
|
+
|
|
86
|
+
if (error) {
|
|
87
|
+
return <Banner message={error} type={BannerType.ERROR} rounded />;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
return (
|
|
91
|
+
<div className="teacher-contract-page">
|
|
92
|
+
<div className="dashboard__page__actions">
|
|
93
|
+
<ContractActionsBar
|
|
94
|
+
organizationId={filters.organization_id!}
|
|
95
|
+
courseProductRelationId={filters.course_product_relation_id}
|
|
96
|
+
/>
|
|
97
|
+
<ContractFiltersBar
|
|
98
|
+
defaultValues={initialFilters}
|
|
99
|
+
onFiltersChange={handleFiltersChange}
|
|
100
|
+
hideFilterOrganization={!!(routeOrganizationId || !hasMultipleOrganizations)}
|
|
101
|
+
/>
|
|
102
|
+
</div>
|
|
103
|
+
<DataGrid
|
|
104
|
+
columns={[
|
|
105
|
+
{
|
|
106
|
+
field: 'productTitle',
|
|
107
|
+
headerName: intl.formatMessage(messages.columnProductTitle),
|
|
108
|
+
enableSorting: false,
|
|
109
|
+
},
|
|
110
|
+
{
|
|
111
|
+
field: 'learnerName',
|
|
112
|
+
headerName: intl.formatMessage(messages.columnLearnerName),
|
|
113
|
+
enableSorting: false,
|
|
114
|
+
},
|
|
115
|
+
{
|
|
116
|
+
field: 'state',
|
|
117
|
+
headerName: intl.formatMessage(messages.columnState),
|
|
118
|
+
enableSorting: false,
|
|
119
|
+
},
|
|
120
|
+
]}
|
|
121
|
+
rows={rows}
|
|
122
|
+
pagination={pagination}
|
|
123
|
+
isLoading={fetching}
|
|
124
|
+
/>
|
|
125
|
+
</div>
|
|
126
|
+
);
|
|
127
|
+
};
|
|
128
|
+
|
|
129
|
+
export default TeacherDashboardContracts;
|