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
|
@@ -2,6 +2,7 @@ import { Fragment, useEffect, useMemo, useRef, useState } from 'react';
|
|
|
2
2
|
import { defineMessages, FormattedMessage, MessageDescriptor, useIntl } from 'react-intl';
|
|
3
3
|
import { useInfiniteQuery } from '@tanstack/react-query';
|
|
4
4
|
|
|
5
|
+
import { Button } from '@openfun/cunningham-react';
|
|
5
6
|
import { Modal } from 'components/Modal';
|
|
6
7
|
import { Spinner } from 'components/Spinner';
|
|
7
8
|
import { CourseSearchParamsAction, useCourseSearchParams } from 'hooks/useCourseSearchParams';
|
|
@@ -90,7 +91,8 @@ const ModalContent = ({ filter, modalIsOpen, setModalIsOpen }: ModalContentProps
|
|
|
90
91
|
const { pageParam, queryKey } = args;
|
|
91
92
|
const [filterName, fetchCourseSearchParams, fetchQuery] = queryKey;
|
|
92
93
|
const searchResponse = await fetchList(filterName, {
|
|
93
|
-
|
|
94
|
+
offset: String(pageParam.offset),
|
|
95
|
+
...pageParam,
|
|
94
96
|
...(fetchQuery ? { query: fetchQuery } : {}),
|
|
95
97
|
});
|
|
96
98
|
|
|
@@ -115,23 +117,26 @@ const ModalContent = ({ filter, modalIsOpen, setModalIsOpen }: ModalContentProps
|
|
|
115
117
|
};
|
|
116
118
|
};
|
|
117
119
|
|
|
118
|
-
const { data, fetchNextPage, hasNextPage, isFetchingNextPage, status } = useInfiniteQuery(
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
getNextPageParam: (lastPage) => {
|
|
124
|
-
if (!lastPage) {
|
|
125
|
-
return undefined;
|
|
126
|
-
}
|
|
127
|
-
const newOffset = lastPage.meta.offset + lastPage.meta.count;
|
|
128
|
-
if (newOffset >= lastPage.meta.total_count) {
|
|
129
|
-
return undefined;
|
|
130
|
-
}
|
|
131
|
-
return { limit: API_LIST_DEFAULT_PARAMS.limit, offset: newOffset };
|
|
132
|
-
},
|
|
120
|
+
const { data, fetchNextPage, hasNextPage, isFetchingNextPage, status } = useInfiniteQuery({
|
|
121
|
+
enabled: modalIsOpen,
|
|
122
|
+
initialPageParam: {
|
|
123
|
+
...API_LIST_DEFAULT_PARAMS,
|
|
124
|
+
offset: Number(API_LIST_DEFAULT_PARAMS.offset),
|
|
133
125
|
},
|
|
134
|
-
|
|
126
|
+
queryFn: fetchResults,
|
|
127
|
+
queryKey: [filter.name, courseSearchParams, query.length > 2 ? query : ''],
|
|
128
|
+
getNextPageParam: (lastPage) => {
|
|
129
|
+
if (!lastPage) {
|
|
130
|
+
return undefined;
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
const newOffset = lastPage.meta.offset + lastPage.meta.count;
|
|
134
|
+
if (newOffset >= lastPage.meta.total_count) {
|
|
135
|
+
return undefined;
|
|
136
|
+
}
|
|
137
|
+
return { limit: API_LIST_DEFAULT_PARAMS.limit, offset: newOffset };
|
|
138
|
+
},
|
|
139
|
+
});
|
|
135
140
|
|
|
136
141
|
const searchInputRef = useRef<Nullable<HTMLInputElement>>(null);
|
|
137
142
|
useEffect(() => {
|
|
@@ -148,6 +153,62 @@ const ModalContent = ({ filter, modalIsOpen, setModalIsOpen }: ModalContentProps
|
|
|
148
153
|
enabled: !!hasNextPage,
|
|
149
154
|
});
|
|
150
155
|
|
|
156
|
+
const getSearchResultsList = () => {
|
|
157
|
+
if (error) {
|
|
158
|
+
return (
|
|
159
|
+
<div className="search-filter-group-modal__form__error">
|
|
160
|
+
<FormattedMessage {...messages.error} values={{ filterName: filter.human_name }} />
|
|
161
|
+
</div>
|
|
162
|
+
);
|
|
163
|
+
}
|
|
164
|
+
if (query.length > 0 && query.length < 3) {
|
|
165
|
+
return (
|
|
166
|
+
<div className="search-filter-group-modal__form__error">
|
|
167
|
+
<FormattedMessage {...messages.queryTooShort} />
|
|
168
|
+
</div>
|
|
169
|
+
);
|
|
170
|
+
}
|
|
171
|
+
if (status === 'error') {
|
|
172
|
+
return (
|
|
173
|
+
<div>
|
|
174
|
+
<FormattedMessage {...messages.error} values={{ filterName: filter.human_name }} />
|
|
175
|
+
</div>
|
|
176
|
+
);
|
|
177
|
+
}
|
|
178
|
+
if (['idle', 'pending'].includes(status)) {
|
|
179
|
+
return (
|
|
180
|
+
<Spinner>
|
|
181
|
+
<FormattedMessage {...messages.loadingResults} />
|
|
182
|
+
</Spinner>
|
|
183
|
+
);
|
|
184
|
+
}
|
|
185
|
+
return (
|
|
186
|
+
<ul className="search-filter-group-modal__form__values">
|
|
187
|
+
{data!.pages.map((page, pageIndex) => (
|
|
188
|
+
// eslint-disable-next-line react/no-array-index-key
|
|
189
|
+
<Fragment key={`search_results_${pageIndex}`}>
|
|
190
|
+
{page!.objects.map((value) => (
|
|
191
|
+
<li className="search-filter-group-modal__form__values__item" key={value.key}>
|
|
192
|
+
<button
|
|
193
|
+
onClick={() => {
|
|
194
|
+
dispatchCourseSearchParamsUpdate({
|
|
195
|
+
filter,
|
|
196
|
+
payload: value.key,
|
|
197
|
+
type: CourseSearchParamsAction.filterAdd,
|
|
198
|
+
});
|
|
199
|
+
setModalIsOpen(false);
|
|
200
|
+
}}
|
|
201
|
+
>
|
|
202
|
+
{value.human_name} {`(${value.count})`}
|
|
203
|
+
</button>
|
|
204
|
+
</li>
|
|
205
|
+
))}
|
|
206
|
+
</Fragment>
|
|
207
|
+
))}
|
|
208
|
+
</ul>
|
|
209
|
+
);
|
|
210
|
+
};
|
|
211
|
+
|
|
151
212
|
return (
|
|
152
213
|
<Fragment>
|
|
153
214
|
<fieldset className="search-filter-group-modal__form">
|
|
@@ -162,46 +223,7 @@ const ModalContent = ({ filter, modalIsOpen, setModalIsOpen }: ModalContentProps
|
|
|
162
223
|
})}
|
|
163
224
|
ref={searchInputRef}
|
|
164
225
|
/>
|
|
165
|
-
{
|
|
166
|
-
<div className="search-filter-group-modal__form__error">
|
|
167
|
-
<FormattedMessage {...messages.error} values={{ filterName: filter.human_name }} />
|
|
168
|
-
</div>
|
|
169
|
-
) : query.length > 0 && query.length < 3 ? (
|
|
170
|
-
<div className="search-filter-group-modal__form__error">
|
|
171
|
-
<FormattedMessage {...messages.queryTooShort} />
|
|
172
|
-
</div>
|
|
173
|
-
) : status === 'error' ? (
|
|
174
|
-
<div>
|
|
175
|
-
<FormattedMessage {...messages.error} values={{ filterName: filter.human_name }} />
|
|
176
|
-
</div>
|
|
177
|
-
) : ['idle', 'loading'].includes(status) ? (
|
|
178
|
-
<Spinner>
|
|
179
|
-
<FormattedMessage {...messages.loadingResults} />
|
|
180
|
-
</Spinner>
|
|
181
|
-
) : (
|
|
182
|
-
<ul className="search-filter-group-modal__form__values">
|
|
183
|
-
{data!.pages.map((page, pageIndex) => (
|
|
184
|
-
<Fragment key={pageIndex}>
|
|
185
|
-
{page!.objects.map((value) => (
|
|
186
|
-
<li className="search-filter-group-modal__form__values__item" key={value.key}>
|
|
187
|
-
<button
|
|
188
|
-
onClick={() => {
|
|
189
|
-
dispatchCourseSearchParamsUpdate({
|
|
190
|
-
filter,
|
|
191
|
-
payload: value.key,
|
|
192
|
-
type: CourseSearchParamsAction.filterAdd,
|
|
193
|
-
});
|
|
194
|
-
setModalIsOpen(false);
|
|
195
|
-
}}
|
|
196
|
-
>
|
|
197
|
-
{value.human_name} {`(${value.count})`}
|
|
198
|
-
</button>
|
|
199
|
-
</li>
|
|
200
|
-
))}
|
|
201
|
-
</Fragment>
|
|
202
|
-
))}
|
|
203
|
-
</ul>
|
|
204
|
-
)}
|
|
226
|
+
{getSearchResultsList()}
|
|
205
227
|
</fieldset>
|
|
206
228
|
{hasNextPage ? (
|
|
207
229
|
<button
|
|
@@ -224,7 +246,6 @@ interface SearchFilterGroupModalProps {
|
|
|
224
246
|
export const SearchFilterGroupModal = ({ filter }: SearchFilterGroupModalProps) => {
|
|
225
247
|
const [modalIsOpen, setModalIsOpen] = useState(false);
|
|
226
248
|
const intl = useIntl();
|
|
227
|
-
|
|
228
249
|
const modalExclude = useMemo(() => {
|
|
229
250
|
const exclude = document.getElementById('modal-exclude');
|
|
230
251
|
if (exclude) {
|
|
@@ -235,10 +256,15 @@ export const SearchFilterGroupModal = ({ filter }: SearchFilterGroupModalProps)
|
|
|
235
256
|
|
|
236
257
|
return (
|
|
237
258
|
<Fragment>
|
|
238
|
-
<
|
|
259
|
+
<Button
|
|
260
|
+
className="search-filter-group-modal-button"
|
|
261
|
+
fullWidth
|
|
262
|
+
size="small"
|
|
263
|
+
onClick={() => setModalIsOpen(true)}
|
|
264
|
+
>
|
|
239
265
|
<FormattedMessage {...messages.moreOptionsButton} />
|
|
240
266
|
<span className="offscreen">({filter.human_name})</span>
|
|
241
|
-
</
|
|
267
|
+
</Button>
|
|
242
268
|
<Modal
|
|
243
269
|
appElement={modalExclude}
|
|
244
270
|
bodyOpenClassName="has-search-filter-group-modal"
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { Meta, StoryObj } from '@storybook/react';
|
|
2
|
+
import { StorybookHelper } from 'utils/StorybookHelper';
|
|
3
|
+
import { HistoryProvider } from 'hooks/useHistory';
|
|
4
|
+
import { SearchFilterValueParent } from '.';
|
|
5
|
+
|
|
6
|
+
export default {
|
|
7
|
+
component: SearchFilterValueParent,
|
|
8
|
+
parameters: {
|
|
9
|
+
docs: {
|
|
10
|
+
source: {
|
|
11
|
+
code: 'Disabled for this story, see https://github.com/storybookjs/storybook/issues/11554',
|
|
12
|
+
},
|
|
13
|
+
},
|
|
14
|
+
},
|
|
15
|
+
args: {
|
|
16
|
+
filter: {
|
|
17
|
+
base_path: null,
|
|
18
|
+
human_name: 'Awesome filter',
|
|
19
|
+
is_autocompletable: false,
|
|
20
|
+
is_searchable: false,
|
|
21
|
+
name: 'Awesome filter',
|
|
22
|
+
position: 1,
|
|
23
|
+
has_more_values: true,
|
|
24
|
+
values: [
|
|
25
|
+
{
|
|
26
|
+
count: 10,
|
|
27
|
+
human_name: 'First value',
|
|
28
|
+
key: 'P-0000',
|
|
29
|
+
},
|
|
30
|
+
{ count: 20, human_name: 'Second value', key: 'P-0001' },
|
|
31
|
+
],
|
|
32
|
+
},
|
|
33
|
+
|
|
34
|
+
value: {
|
|
35
|
+
count: 10,
|
|
36
|
+
human_name: 'First value',
|
|
37
|
+
key: 'P-0000',
|
|
38
|
+
},
|
|
39
|
+
},
|
|
40
|
+
render: (args) => {
|
|
41
|
+
return StorybookHelper.wrapInApp(
|
|
42
|
+
<HistoryProvider>
|
|
43
|
+
<SearchFilterValueParent {...args} />
|
|
44
|
+
</HistoryProvider>,
|
|
45
|
+
);
|
|
46
|
+
},
|
|
47
|
+
} as Meta<typeof SearchFilterValueParent>;
|
|
48
|
+
|
|
49
|
+
type Story = StoryObj<typeof SearchFilterValueParent>;
|
|
50
|
+
|
|
51
|
+
export const Default: Story = {};
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { useState } from 'react';
|
|
1
|
+
import { useEffect, useState } from 'react';
|
|
2
2
|
import { defineMessages, useIntl } from 'react-intl';
|
|
3
|
-
|
|
4
3
|
import { useCourseSearchParams } from 'hooks/useCourseSearchParams';
|
|
5
4
|
import { FacetedFilterDefinition, FilterValue } from 'types/filters';
|
|
6
5
|
import { getMPTTChildrenPathMatcher } from 'utils/mptt';
|
|
@@ -61,11 +60,6 @@ export const SearchFilterValueParent = ({ filter, value }: SearchFilterValuePare
|
|
|
61
60
|
},
|
|
62
61
|
{
|
|
63
62
|
enabled: showChildren,
|
|
64
|
-
onSettled: (data) => {
|
|
65
|
-
if (data?.status === RequestStatus.FAILURE) {
|
|
66
|
-
handle(new Error(`Failed to get children filters for ${filter.name}/${value.key}`));
|
|
67
|
-
}
|
|
68
|
-
},
|
|
69
63
|
},
|
|
70
64
|
);
|
|
71
65
|
|
|
@@ -74,6 +68,12 @@ export const SearchFilterValueParent = ({ filter, value }: SearchFilterValuePare
|
|
|
74
68
|
? childrenResponse.content.filters[filter.name].values
|
|
75
69
|
: [];
|
|
76
70
|
|
|
71
|
+
useEffect(() => {
|
|
72
|
+
if (childrenResponse?.status === RequestStatus.FAILURE) {
|
|
73
|
+
handle(new Error(`Failed to get children filters for ${filter.name}/${value.key}`));
|
|
74
|
+
}
|
|
75
|
+
}, [childrenResponse]);
|
|
76
|
+
|
|
77
77
|
// We also need to know if the current filter is active itself and let the user toggle it directly
|
|
78
78
|
const [isActive, toggle] = useFilterValue(filter, value);
|
|
79
79
|
return (
|
|
@@ -9,21 +9,7 @@
|
|
|
9
9
|
color: r-theme-val(search-filters-pane, title-color);
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
-
&__clear {
|
|
13
|
-
|
|
14
|
-
display: block;
|
|
15
|
-
cursor: pointer;
|
|
16
|
-
margin: 0.2rem $r-search-filters-gutter;
|
|
17
|
-
padding: 0rem 0.5rem 0;
|
|
18
|
-
|
|
19
|
-
&,
|
|
20
|
-
&:hover,
|
|
21
|
-
&:active {
|
|
22
|
-
color: r-theme-val(search-filters-pane, clearer-hover-color);
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
&--hidden {
|
|
26
|
-
visibility: hidden;
|
|
27
|
-
}
|
|
12
|
+
&__clear--hidden {
|
|
13
|
+
visibility: hidden;
|
|
28
14
|
}
|
|
29
15
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { DetailedHTMLProps, HTMLAttributes } from 'react';
|
|
2
2
|
import { defineMessages, FormattedMessage } from 'react-intl';
|
|
3
|
+
import c from 'classnames';
|
|
3
4
|
|
|
5
|
+
import { Button } from '@openfun/cunningham-react';
|
|
4
6
|
import { CourseSearchParamsAction, useCourseSearchParams } from 'hooks/useCourseSearchParams';
|
|
5
7
|
import { API_LIST_DEFAULT_PARAMS } from 'settings';
|
|
6
8
|
import { Nullable } from 'types/utils';
|
|
@@ -31,7 +33,6 @@ export const SearchFiltersPane = ({
|
|
|
31
33
|
...passThroughProps
|
|
32
34
|
}: SearchFiltersPaneProps & DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>) => {
|
|
33
35
|
const filterList = filters && Object.values(filters).sort((f1, f2) => f1.position - f2.position);
|
|
34
|
-
|
|
35
36
|
const { courseSearchParams, dispatchCourseSearchParamsUpdate } = useCourseSearchParams();
|
|
36
37
|
|
|
37
38
|
const relevantFilters = Object.entries(courseSearchParams)
|
|
@@ -74,10 +75,12 @@ export const SearchFiltersPane = ({
|
|
|
74
75
|
>
|
|
75
76
|
<FormattedMessage {...messages.filter} />
|
|
76
77
|
</h2>
|
|
77
|
-
<
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
78
|
+
<Button
|
|
79
|
+
color="secondary"
|
|
80
|
+
size="small"
|
|
81
|
+
className={c({
|
|
82
|
+
'search-filters-pane__clear--hidden': !activeFilterCount,
|
|
83
|
+
})}
|
|
81
84
|
tabIndex={0}
|
|
82
85
|
onClick={() =>
|
|
83
86
|
dispatchCourseSearchParamsUpdate({
|
|
@@ -87,7 +90,7 @@ export const SearchFiltersPane = ({
|
|
|
87
90
|
>
|
|
88
91
|
<FormattedMessage {...messages.clearFilters} values={{ activeFilterCount }} />
|
|
89
92
|
<span className="offscreen"> ({activeFilterNames})</span>
|
|
90
|
-
</
|
|
93
|
+
</Button>
|
|
91
94
|
{filterList &&
|
|
92
95
|
filterList.map((filter) => <SearchFilterGroup filter={filter} key={filter.name} />)}
|
|
93
96
|
</div>
|
|
@@ -1,17 +1,21 @@
|
|
|
1
1
|
import queryString from 'query-string';
|
|
2
2
|
import { useQuery, UseQueryOptions } from '@tanstack/react-query';
|
|
3
3
|
|
|
4
|
+
import { keepPreviousData } from '@tanstack/query-core';
|
|
4
5
|
import { APIListRequestParams } from 'types/api';
|
|
5
6
|
import useLocalizedQueryKey from 'utils/react-query/useLocalizedQueryKey';
|
|
6
7
|
import { fetchList, FetchListResponse } from '../../utils/getResourceList';
|
|
7
8
|
|
|
8
9
|
export const useCourseSearch = (
|
|
9
10
|
searchParams: APIListRequestParams,
|
|
10
|
-
queryOptions:
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
11
|
+
queryOptions: Omit<
|
|
12
|
+
UseQueryOptions<
|
|
13
|
+
FetchListResponse,
|
|
14
|
+
unknown,
|
|
15
|
+
FetchListResponse,
|
|
16
|
+
readonly (string | APIListRequestParams)[]
|
|
17
|
+
>,
|
|
18
|
+
'queryKey' | 'queryFn'
|
|
15
19
|
> = {},
|
|
16
20
|
) => {
|
|
17
21
|
const queryKey = useLocalizedQueryKey([
|
|
@@ -23,8 +27,10 @@ export const useCourseSearch = (
|
|
|
23
27
|
unknown,
|
|
24
28
|
FetchListResponse,
|
|
25
29
|
readonly (string | APIListRequestParams)[]
|
|
26
|
-
>(
|
|
27
|
-
|
|
30
|
+
>({
|
|
31
|
+
queryKey,
|
|
32
|
+
queryFn: async () => fetchList('courses', searchParams),
|
|
33
|
+
placeholderData: keepPreviousData,
|
|
28
34
|
...queryOptions,
|
|
29
35
|
});
|
|
30
36
|
};
|
|
@@ -9,6 +9,7 @@ import * as mockWindow from 'utils/indirection/window';
|
|
|
9
9
|
import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
|
|
10
10
|
import context from 'utils/context';
|
|
11
11
|
import { createTestQueryClient } from 'utils/test/createTestQueryClient';
|
|
12
|
+
import { HttpStatusCode } from 'utils/errors/HttpError';
|
|
12
13
|
import Search from '.';
|
|
13
14
|
|
|
14
15
|
let mockMatches = false;
|
|
@@ -49,7 +50,7 @@ describe('<Search />', () => {
|
|
|
49
50
|
it('shows a spinner while the results are loading', async () => {
|
|
50
51
|
fetchMock.get('/api/v1.0/courses/?limit=20&offset=0', {
|
|
51
52
|
meta: {
|
|
52
|
-
total_count:
|
|
53
|
+
total_count: HttpStatusCode.OK,
|
|
53
54
|
},
|
|
54
55
|
objects: [],
|
|
55
56
|
});
|
|
@@ -131,7 +132,7 @@ describe('<Search />', () => {
|
|
|
131
132
|
});
|
|
132
133
|
|
|
133
134
|
it('shows an error message when it fails to get the results', async () => {
|
|
134
|
-
fetchMock.get('/api/v1.0/courses/?limit=20&offset=0',
|
|
135
|
+
fetchMock.get('/api/v1.0/courses/?limit=20&offset=0', HttpStatusCode.INTERNAL_SERVER_ERROR);
|
|
135
136
|
|
|
136
137
|
render(
|
|
137
138
|
<QueryClientProvider client={createTestQueryClient()}>
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import fetchMock from 'fetch-mock';
|
|
2
|
+
import { HttpError, HttpStatusCode } from 'utils/errors/HttpError';
|
|
2
3
|
|
|
4
|
+
import { handle as mockHandle } from 'utils/errors/handle';
|
|
3
5
|
import { RequestStatus } from '../../types/api';
|
|
4
6
|
import { fetchList } from '.';
|
|
5
7
|
|
|
8
|
+
jest.mock('utils/errors/handle', () => ({
|
|
9
|
+
handle: jest.fn(),
|
|
10
|
+
}));
|
|
11
|
+
|
|
6
12
|
describe('widgets/Search/utils/getResourceList', () => {
|
|
7
13
|
const course43 = {
|
|
8
14
|
categories: [45],
|
|
@@ -53,10 +59,7 @@ describe('widgets/Search/utils/getResourceList', () => {
|
|
|
53
59
|
});
|
|
54
60
|
|
|
55
61
|
it('rejects with a FetchListResponse containing an error when it fails to make the request', async () => {
|
|
56
|
-
fetchMock.mock(
|
|
57
|
-
'/api/v1.0/courses/?limit=2&offset=43',
|
|
58
|
-
Promise.reject(new Error('Failed to perform the request')),
|
|
59
|
-
);
|
|
62
|
+
fetchMock.mock('/api/v1.0/courses/?limit=2&offset=43', 500);
|
|
60
63
|
|
|
61
64
|
const response = (await fetchList('courses', {
|
|
62
65
|
limit: '2',
|
|
@@ -65,10 +68,14 @@ describe('widgets/Search/utils/getResourceList', () => {
|
|
|
65
68
|
|
|
66
69
|
expect(response.status).toEqual(RequestStatus.FAILURE);
|
|
67
70
|
expect(response.error).toBeInstanceOf(Error);
|
|
71
|
+
expect(mockHandle).toHaveBeenNthCalledWith(
|
|
72
|
+
1,
|
|
73
|
+
new HttpError(500, 'Failed to get list from courses search.'),
|
|
74
|
+
);
|
|
68
75
|
});
|
|
69
76
|
|
|
70
77
|
it('rejects with a FetchListResponse containing an error when the API returns an error code', async () => {
|
|
71
|
-
fetchMock.mock('/api/v1.0/courses/?limit=2&offset=43',
|
|
78
|
+
fetchMock.mock('/api/v1.0/courses/?limit=2&offset=43', HttpStatusCode.NOT_FOUND);
|
|
72
79
|
|
|
73
80
|
const response = (await fetchList('courses', {
|
|
74
81
|
limit: '2',
|
|
@@ -2,6 +2,8 @@ import queryString from 'query-string';
|
|
|
2
2
|
|
|
3
3
|
import { API_LIST_DEFAULT_PARAMS } from 'settings';
|
|
4
4
|
import { APIListRequestParams } from 'types/api';
|
|
5
|
+
import { HttpError } from 'utils/errors/HttpError';
|
|
6
|
+
import { handle } from 'utils/errors/handle';
|
|
5
7
|
import { APICourseSearchResponse, RequestStatus } from '../../types/api';
|
|
6
8
|
|
|
7
9
|
export interface GetListSagaSpecifics {
|
|
@@ -23,16 +25,18 @@ export async function fetchList(
|
|
|
23
25
|
'Content-Type': 'application/json',
|
|
24
26
|
},
|
|
25
27
|
});
|
|
26
|
-
|
|
27
28
|
if (!response.ok) {
|
|
28
29
|
// Push remote errors to the error channel for consistency
|
|
29
|
-
throw new
|
|
30
|
+
throw new HttpError(response.status, `Failed to get list from ${kind} search.`);
|
|
30
31
|
}
|
|
31
32
|
|
|
32
33
|
const content = await response.json();
|
|
33
34
|
|
|
34
35
|
return { status: RequestStatus.SUCCESS, content };
|
|
35
36
|
} catch (error) {
|
|
37
|
+
if (error instanceof HttpError && error.code >= 500) {
|
|
38
|
+
handle(error);
|
|
39
|
+
}
|
|
36
40
|
return { status: RequestStatus.FAILURE, error };
|
|
37
41
|
}
|
|
38
42
|
}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { FormattedMessage, defineMessages } from 'react-intl';
|
|
2
|
+
import PurchaseButton from 'components/PurchaseButton';
|
|
3
|
+
import { CourseLight, CredentialProduct, OrderGroup } from 'types/Joanie';
|
|
4
|
+
|
|
5
|
+
const messages = defineMessages({
|
|
6
|
+
noSeatsAvailable: {
|
|
7
|
+
defaultMessage: 'Sorry, no seats available for now',
|
|
8
|
+
description: 'Message displayed when no seats are available for the product',
|
|
9
|
+
id: 'components.CourseProductItem.noSeatsAvailable',
|
|
10
|
+
},
|
|
11
|
+
nbSeatsAvailable: {
|
|
12
|
+
defaultMessage: `{
|
|
13
|
+
nb,
|
|
14
|
+
plural,
|
|
15
|
+
=0 {No remaining seat}
|
|
16
|
+
one {Last remaining seat!}
|
|
17
|
+
other {# remaining seats}
|
|
18
|
+
}`,
|
|
19
|
+
description: 'Message displayed when seats are available for the product',
|
|
20
|
+
id: 'components.CourseProductItem.nbSeatsAvailable',
|
|
21
|
+
},
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
interface CourseProductItemFooterProps {
|
|
25
|
+
course: CourseLight;
|
|
26
|
+
product: CredentialProduct;
|
|
27
|
+
canPurchase: boolean;
|
|
28
|
+
orderGroups: OrderGroup[];
|
|
29
|
+
orderGroupsAvailable: OrderGroup[];
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const CourseProductItemFooter = ({
|
|
33
|
+
course,
|
|
34
|
+
product,
|
|
35
|
+
orderGroups,
|
|
36
|
+
orderGroupsAvailable,
|
|
37
|
+
canPurchase,
|
|
38
|
+
}: CourseProductItemFooterProps) => {
|
|
39
|
+
if (orderGroups.length === 0) {
|
|
40
|
+
return (
|
|
41
|
+
<PurchaseButton
|
|
42
|
+
course={course}
|
|
43
|
+
product={product}
|
|
44
|
+
disabled={!canPurchase}
|
|
45
|
+
buttonProps={{ fullWidth: true }}
|
|
46
|
+
/>
|
|
47
|
+
);
|
|
48
|
+
}
|
|
49
|
+
if (orderGroupsAvailable.length === 0) {
|
|
50
|
+
return (
|
|
51
|
+
<p className="product-widget__footer__message">
|
|
52
|
+
<FormattedMessage {...messages.noSeatsAvailable} />
|
|
53
|
+
</p>
|
|
54
|
+
);
|
|
55
|
+
}
|
|
56
|
+
return orderGroupsAvailable.map((orderGroup) => (
|
|
57
|
+
<div className="product-widget__footer__order-group" key={orderGroup.id}>
|
|
58
|
+
<PurchaseButton
|
|
59
|
+
course={course}
|
|
60
|
+
product={product}
|
|
61
|
+
disabled={!canPurchase}
|
|
62
|
+
orderGroup={orderGroup}
|
|
63
|
+
buttonProps={{ fullWidth: true }}
|
|
64
|
+
/>
|
|
65
|
+
<p>
|
|
66
|
+
<FormattedMessage
|
|
67
|
+
{...messages.nbSeatsAvailable}
|
|
68
|
+
values={{ nb: orderGroup.nb_available_seats }}
|
|
69
|
+
/>
|
|
70
|
+
</p>
|
|
71
|
+
</div>
|
|
72
|
+
));
|
|
73
|
+
};
|
|
74
|
+
export default CourseProductItemFooter;
|
|
@@ -138,23 +138,20 @@
|
|
|
138
138
|
|
|
139
139
|
&__footer {
|
|
140
140
|
padding: 0 0.875rem 1rem 0.875rem;
|
|
141
|
+
display: flex;
|
|
142
|
+
flex-direction: column;
|
|
143
|
+
gap: 0.5rem;
|
|
141
144
|
|
|
142
|
-
|
|
143
|
-
color: r-theme-val(product-item, feedback-color);
|
|
144
|
-
font-size: 0.8125rem;
|
|
145
|
-
line-height: 1.2em;
|
|
146
|
-
padding: 0.5rem 0.5rem 0 0.5rem;
|
|
145
|
+
&__message {
|
|
147
146
|
text-align: center;
|
|
148
147
|
}
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
background-color: r-theme-val(product-item, button-background);
|
|
157
|
-
width: 100%;
|
|
148
|
+
|
|
149
|
+
&__order-group {
|
|
150
|
+
text-align: center;
|
|
151
|
+
|
|
152
|
+
p {
|
|
153
|
+
margin-top: 0.25rem;
|
|
154
|
+
}
|
|
158
155
|
}
|
|
159
156
|
}
|
|
160
157
|
|
|
@@ -7,6 +7,7 @@ import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/fac
|
|
|
7
7
|
import { CertificationDefinitionFactory, OrderLiteFactory } from 'utils/test/factories/joanie';
|
|
8
8
|
import JoanieApiProvider from 'contexts/JoanieApiContext';
|
|
9
9
|
import { CertificateDefinition, OrderLite } from 'types/Joanie';
|
|
10
|
+
import { HttpStatusCode } from 'utils/errors/HttpError';
|
|
10
11
|
import CertificateItem from '.';
|
|
11
12
|
|
|
12
13
|
jest.mock('utils/errors/handle');
|
|
@@ -72,7 +73,7 @@ describe('CourseProductCertificateItem', () => {
|
|
|
72
73
|
|
|
73
74
|
it('displays a download button when order contains a certificate', async () => {
|
|
74
75
|
const certificateDefinition: CertificateDefinition = CertificationDefinitionFactory().one();
|
|
75
|
-
const order: OrderLite = OrderLiteFactory({
|
|
76
|
+
const order: OrderLite = OrderLiteFactory({ certificate_id: faker.string.uuid() }).one();
|
|
76
77
|
|
|
77
78
|
render(
|
|
78
79
|
<Wrapper>
|
|
@@ -88,7 +89,17 @@ describe('CourseProductCertificateItem', () => {
|
|
|
88
89
|
expect($button.disabled).toBe(false);
|
|
89
90
|
|
|
90
91
|
// When user clicks on "Download" button, the certificate should be downloaded
|
|
91
|
-
fetchMock.get(
|
|
92
|
+
fetchMock.get(
|
|
93
|
+
`https://joanie.test/api/v1.0/certificates/${order.certificate_id}/download/`,
|
|
94
|
+
() => ({
|
|
95
|
+
status: HttpStatusCode.OK,
|
|
96
|
+
body: new Blob(['test']),
|
|
97
|
+
headers: {
|
|
98
|
+
'Content-Disposition': 'attachment; filename="test.pdf";',
|
|
99
|
+
'Content-Type': 'application/pdf',
|
|
100
|
+
},
|
|
101
|
+
}),
|
|
102
|
+
);
|
|
92
103
|
|
|
93
104
|
fireEvent.click($button);
|
|
94
105
|
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { Meta, StoryObj } from '@storybook/react';
|
|
2
|
+
import { CertificationDefinitionFactory, OrderLiteFactory } from 'utils/test/factories/joanie';
|
|
3
|
+
import JoanieApiProvider from 'contexts/JoanieApiContext';
|
|
4
|
+
import { StorybookHelper } from 'utils/StorybookHelper';
|
|
5
|
+
import CertificateItem from '.';
|
|
6
|
+
|
|
7
|
+
export default {
|
|
8
|
+
component: CertificateItem,
|
|
9
|
+
parameters: {
|
|
10
|
+
docs: {
|
|
11
|
+
source: {
|
|
12
|
+
code: 'Disabled for this story, see https://github.com/storybookjs/storybook/issues/11554',
|
|
13
|
+
},
|
|
14
|
+
},
|
|
15
|
+
},
|
|
16
|
+
args: {
|
|
17
|
+
certificateDefinition: CertificationDefinitionFactory().one(),
|
|
18
|
+
order: OrderLiteFactory({
|
|
19
|
+
certificate_id: "Demo User's certificate for cours Demo Course",
|
|
20
|
+
}).one(),
|
|
21
|
+
},
|
|
22
|
+
render: (args) => {
|
|
23
|
+
return StorybookHelper.wrapInApp(
|
|
24
|
+
<JoanieApiProvider>
|
|
25
|
+
<CertificateItem {...args} />
|
|
26
|
+
</JoanieApiProvider>,
|
|
27
|
+
);
|
|
28
|
+
},
|
|
29
|
+
} as Meta<typeof CertificateItem>;
|
|
30
|
+
|
|
31
|
+
type Story = StoryObj<typeof CertificateItem>;
|
|
32
|
+
|
|
33
|
+
export const Default: Story = {};
|