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
|
@@ -1,55 +1,67 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
DashboardAvatarPositionEnum,
|
|
7
|
-
DashboardSidebar,
|
|
8
|
-
} from 'widgets/Dashboard/components/DashboardSidebar';
|
|
1
|
+
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
|
|
2
|
+
import { useParams } from 'react-router-dom';
|
|
3
|
+
import { Spinner } from 'components/Spinner';
|
|
4
|
+
import { useOrganization } from 'hooks/useOrganizations';
|
|
5
|
+
import { DashboardSidebar, MenuLink } from 'widgets/Dashboard/components/DashboardSidebar';
|
|
9
6
|
import {
|
|
10
7
|
getDashboardRouteLabel,
|
|
11
8
|
getDashboardRoutePath,
|
|
12
9
|
} from 'widgets/Dashboard/utils/dashboardRoutes';
|
|
13
|
-
import {
|
|
14
|
-
import { Spinner } from 'components/Spinner';
|
|
10
|
+
import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherRouteMessages';
|
|
15
11
|
import { DashboardAvatar, DashboardAvatarVariantEnum } from '../DashboardAvatar';
|
|
12
|
+
import ContractNavLink from '../DashboardSidebar/components/ContractNavLink';
|
|
16
13
|
|
|
17
14
|
const messages = defineMessages({
|
|
18
15
|
subHeader: {
|
|
19
|
-
id: 'components.
|
|
16
|
+
id: 'components.TeacherDashboardOrganizationSidebar.subHeader',
|
|
20
17
|
description: 'Sub title of the organization dashboard sidebar',
|
|
21
18
|
defaultMessage: 'You are on the organization dashboard',
|
|
22
19
|
},
|
|
23
20
|
loading: {
|
|
24
21
|
defaultMessage: 'Loading organization...',
|
|
25
22
|
description: 'Message displayed while loading an organization',
|
|
26
|
-
id: 'components.
|
|
23
|
+
id: 'components.TeacherDashboardOrganizationSidebar.loading',
|
|
27
24
|
},
|
|
28
25
|
});
|
|
29
26
|
|
|
30
|
-
export const
|
|
27
|
+
export const TeacherDashboardOrganizationSidebar = () => {
|
|
31
28
|
const intl = useIntl();
|
|
32
29
|
const getRoutePath = getDashboardRoutePath(intl);
|
|
33
30
|
const getRouteLabel = getDashboardRouteLabel(intl);
|
|
34
|
-
const { organizationId } = useParams<{
|
|
31
|
+
const { organizationId, courseProductRelationId } = useParams<{
|
|
32
|
+
organizationId: string;
|
|
33
|
+
courseProductRelationId?: string;
|
|
34
|
+
}>();
|
|
35
35
|
const {
|
|
36
36
|
item: organization,
|
|
37
37
|
states: { fetching },
|
|
38
38
|
} = useOrganization(organizationId);
|
|
39
39
|
|
|
40
|
-
const
|
|
41
|
-
()
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
40
|
+
const getMenuLinkFromPath = (basePath: TeacherDashboardPaths) => {
|
|
41
|
+
const path = getRoutePath(basePath, { organizationId });
|
|
42
|
+
|
|
43
|
+
const menuLink: MenuLink = {
|
|
44
|
+
to: path,
|
|
45
|
+
label: getRouteLabel(basePath),
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
if (basePath === TeacherDashboardPaths.ORGANIZATION_CONTRACTS) {
|
|
49
|
+
menuLink.component = (
|
|
50
|
+
<ContractNavLink
|
|
51
|
+
link={menuLink}
|
|
52
|
+
organizationId={organizationId}
|
|
53
|
+
courseProductRelationId={courseProductRelationId}
|
|
54
|
+
/>
|
|
55
|
+
);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
return menuLink;
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
const links = [
|
|
62
|
+
TeacherDashboardPaths.ORGANIZATION_COURSES,
|
|
63
|
+
TeacherDashboardPaths.ORGANIZATION_CONTRACTS,
|
|
64
|
+
].map(getMenuLinkFromPath);
|
|
53
65
|
|
|
54
66
|
if (fetching) {
|
|
55
67
|
return (
|
|
@@ -66,12 +78,11 @@ export const TeacherOrganizationDashboardSidebar = () => {
|
|
|
66
78
|
menuLinks={links}
|
|
67
79
|
header={organization.title}
|
|
68
80
|
subHeader={intl.formatMessage(messages.subHeader)}
|
|
69
|
-
avatarPosition={DashboardAvatarPositionEnum.THREE_QUARTER}
|
|
70
81
|
avatar={
|
|
71
82
|
<DashboardAvatar
|
|
72
83
|
title={organization.title}
|
|
73
84
|
variant={DashboardAvatarVariantEnum.SQUARE}
|
|
74
|
-
|
|
85
|
+
image={organization.logo}
|
|
75
86
|
/>
|
|
76
87
|
}
|
|
77
88
|
/>
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
.dashboard-sidebar {
|
|
2
2
|
&__organization-section {
|
|
3
|
-
$padding-
|
|
4
|
-
padding: rem-calc(
|
|
3
|
+
$padding-inline: r-theme-val(dashboard-sidebar, menu-link-inline-padding);
|
|
4
|
+
padding: rem-calc(16px) rem-calc($padding-inline) 0 rem-calc($padding-inline);
|
|
5
5
|
|
|
6
6
|
&__title {
|
|
7
|
-
font-size:
|
|
8
|
-
font-weight:
|
|
7
|
+
font-size: 1rem;
|
|
8
|
+
font-weight: bold;
|
|
9
9
|
color: r-theme-val(dashboard-sidebar-organization-link-title, base-color);
|
|
10
10
|
}
|
|
11
11
|
|
|
@@ -18,24 +18,41 @@
|
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
&__link {
|
|
21
|
-
|
|
22
|
-
display: flex;
|
|
23
|
-
border: thin solid r-theme-val(organization-thumb, border-color);
|
|
21
|
+
align-items: center;
|
|
24
22
|
border-radius: rem-calc(8px);
|
|
23
|
+
border: thin solid r-theme-val(organization-thumb, border-color);
|
|
24
|
+
display: flex;
|
|
25
|
+
flex: 0 0 32%;
|
|
25
26
|
overflow: hidden;
|
|
26
27
|
justify-content: center;
|
|
27
|
-
align-items: center;
|
|
28
28
|
padding: rem-calc(2px);
|
|
29
|
+
aspect-ratio: 1 / 1;
|
|
30
|
+
|
|
29
31
|
&:hover,
|
|
30
32
|
&:focus,
|
|
31
33
|
&:active {
|
|
32
34
|
border-color: r-theme-val(organization-thumb, border-color-hover);
|
|
33
35
|
box-shadow: 0 0 rem-calc(3px) r-theme-val(organization-thumb, border-color);
|
|
36
|
+
text-decoration: none;
|
|
34
37
|
}
|
|
38
|
+
|
|
35
39
|
&__img {
|
|
36
|
-
object-fit:
|
|
40
|
+
object-fit: contain;
|
|
37
41
|
object-position: center center;
|
|
38
|
-
aspect-ratio:
|
|
42
|
+
aspect-ratio: 1/1;
|
|
43
|
+
border-radius: rem-calc(6px);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
&__abbr {
|
|
47
|
+
font-size: 1.5rem;
|
|
48
|
+
font-family: $r-font-family-montserrat;
|
|
49
|
+
font-weight: $font-weight-boldest;
|
|
50
|
+
text-transform: uppercase;
|
|
51
|
+
display: inline-block;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
@include media-breakpoint-down(lg) {
|
|
55
|
+
max-width: rem-calc(64px);
|
|
39
56
|
}
|
|
40
57
|
}
|
|
41
58
|
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { screen } from '@testing-library/react';
|
|
2
|
+
import { OrganizationFactory } from 'utils/test/factories/joanie';
|
|
3
|
+
import { render } from 'utils/test/render';
|
|
4
|
+
import { PresentationalAppWrapper } from 'utils/test/wrappers/PresentationalAppWrapper';
|
|
5
|
+
import OrganizationLinks from '.';
|
|
6
|
+
|
|
7
|
+
describe('OrganizationLinks', () => {
|
|
8
|
+
it('should render successfully organization with logo', () => {
|
|
9
|
+
const organization = OrganizationFactory({ title: 'Organization 1' }).one();
|
|
10
|
+
|
|
11
|
+
render(<OrganizationLinks organizations={[organization]} />, {
|
|
12
|
+
wrapper: PresentationalAppWrapper,
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
// A link to the organization should be rendered
|
|
16
|
+
const link = screen.getByRole('link', { name: 'Organization 1' });
|
|
17
|
+
expect(link).toHaveAttribute('href', `/teacher/organizations/${organization.id}/courses`);
|
|
18
|
+
|
|
19
|
+
// The link should contain the organization logo
|
|
20
|
+
const img = link.querySelector('img');
|
|
21
|
+
expect(img).toHaveAttribute('alt', organization.title);
|
|
22
|
+
expect(img).toHaveAttribute('src', organization.logo?.src);
|
|
23
|
+
expect(img).toHaveAttribute('srcset', organization.logo?.srcset);
|
|
24
|
+
|
|
25
|
+
// And not the abbreviation
|
|
26
|
+
const abbr = link.querySelector('span');
|
|
27
|
+
expect(abbr).toBeNull();
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
it('should render successfully organization with abbr', () => {
|
|
31
|
+
const organization = OrganizationFactory({ title: 'Organization 1', logo: null }).one();
|
|
32
|
+
|
|
33
|
+
render(<OrganizationLinks organizations={[organization]} />, {
|
|
34
|
+
wrapper: PresentationalAppWrapper,
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
// A link to the organization should be rendered
|
|
38
|
+
const link = screen.getByRole('link', { name: 'Organization 1' });
|
|
39
|
+
expect(link).toHaveAttribute('href', `/teacher/organizations/${organization.id}/courses`);
|
|
40
|
+
|
|
41
|
+
// The link should contain the organization abbreviation
|
|
42
|
+
const abbr = link.querySelector('span');
|
|
43
|
+
expect(abbr).toHaveTextContent('O1');
|
|
44
|
+
|
|
45
|
+
// And not the logo
|
|
46
|
+
const img = link.querySelector('img');
|
|
47
|
+
expect(img).toBeNull();
|
|
48
|
+
});
|
|
49
|
+
});
|
|
@@ -3,15 +3,16 @@ import { Link } from 'react-router-dom';
|
|
|
3
3
|
import { Organization } from 'types/Joanie';
|
|
4
4
|
import { getDashboardRoutePath } from 'widgets/Dashboard/utils/dashboardRoutes';
|
|
5
5
|
import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherRouteMessages';
|
|
6
|
+
import { StringHelper } from 'utils/StringHelper';
|
|
6
7
|
|
|
7
8
|
export const messages = defineMessages({
|
|
8
9
|
organizationsTitle: {
|
|
9
|
-
id: 'components.
|
|
10
|
+
id: 'components.TeacherDashboardProfileSidebar.OrganizationLinks.organizationsTitle',
|
|
10
11
|
description: 'Title of the organizations section',
|
|
11
12
|
defaultMessage: 'My universities',
|
|
12
13
|
},
|
|
13
14
|
organizationLinkTitle: {
|
|
14
|
-
id: 'components.
|
|
15
|
+
id: 'components.TeacherDashboardProfileSidebar.OrganizationLinks.organizationLinkTitle',
|
|
15
16
|
description: 'Organization link title',
|
|
16
17
|
defaultMessage: 'Link to organization "{organizationTitle}"',
|
|
17
18
|
},
|
|
@@ -40,11 +41,21 @@ const OrganizationLinks = ({ organizations }: OrganizationLinksProps) => {
|
|
|
40
41
|
organizationTitle: organization.title,
|
|
41
42
|
})}
|
|
42
43
|
>
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
44
|
+
{organization.logo ? (
|
|
45
|
+
<img
|
|
46
|
+
className="dashboard-sidebar__organization-section__link__img"
|
|
47
|
+
alt={organization.title}
|
|
48
|
+
src={organization.logo.src}
|
|
49
|
+
srcSet={organization.logo.srcset}
|
|
50
|
+
/>
|
|
51
|
+
) : (
|
|
52
|
+
<span
|
|
53
|
+
className="dashboard-sidebar__organization-section__link__abbr"
|
|
54
|
+
aria-label={organization.title}
|
|
55
|
+
>
|
|
56
|
+
{StringHelper.abbreviate(organization.title, 3)}
|
|
57
|
+
</span>
|
|
58
|
+
)}
|
|
48
59
|
</Link>
|
|
49
60
|
))}
|
|
50
61
|
</div>
|
|
@@ -1,22 +1,16 @@
|
|
|
1
1
|
import fetchMock from 'fetch-mock';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import { QueryClientProvider } from '@tanstack/react-query';
|
|
6
|
-
import {
|
|
7
|
-
RichieContextFactory as mockRichieContextFactory,
|
|
8
|
-
UserFactory,
|
|
9
|
-
} from 'utils/test/factories/richie';
|
|
2
|
+
import { screen } from '@testing-library/react';
|
|
3
|
+
import { createIntl } from 'react-intl';
|
|
4
|
+
import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
|
|
10
5
|
import {
|
|
11
6
|
TEACHER_DASHBOARD_ROUTE_LABELS,
|
|
12
7
|
TeacherDashboardPaths,
|
|
13
8
|
} from 'widgets/Dashboard/utils/teacherRouteMessages';
|
|
14
|
-
import { createTestQueryClient } from 'utils/test/createTestQueryClient';
|
|
15
|
-
import JoanieSessionProvider from 'contexts/SessionContext/JoanieSessionProvider';
|
|
16
9
|
import { OrganizationFactory } from 'utils/test/factories/joanie';
|
|
17
|
-
import { messages as organizationLinksMessages } from 'widgets/Dashboard/components/
|
|
18
|
-
|
|
19
|
-
import {
|
|
10
|
+
import { messages as organizationLinksMessages } from 'widgets/Dashboard/components/TeacherDashboardProfileSidebar/components/OrganizationLinks';
|
|
11
|
+
import { render } from 'utils/test/render';
|
|
12
|
+
import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
|
|
13
|
+
import { TeacherDashboardProfileSidebar } from '.';
|
|
20
14
|
|
|
21
15
|
jest.mock('utils/context', () => ({
|
|
22
16
|
__esModule: true,
|
|
@@ -34,38 +28,18 @@ jest.mock('utils/indirection/window', () => ({
|
|
|
34
28
|
|
|
35
29
|
const intl = createIntl({ locale: 'en' });
|
|
36
30
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
<IntlProvider locale="en">
|
|
40
|
-
<QueryClientProvider client={createTestQueryClient({ user: UserFactory().one() })}>
|
|
41
|
-
<JoanieSessionProvider>
|
|
42
|
-
<MemoryRouter>
|
|
43
|
-
<TeacherProfileDashboardSidebar />
|
|
44
|
-
</MemoryRouter>
|
|
45
|
-
</JoanieSessionProvider>
|
|
46
|
-
</QueryClientProvider>
|
|
47
|
-
</IntlProvider>,
|
|
48
|
-
);
|
|
31
|
+
describe('<TeacherDashboardProfileSidebar/>', () => {
|
|
32
|
+
const joanieSessionData = setupJoanieSession();
|
|
49
33
|
|
|
50
|
-
describe('<TeacherProfileDashboardSidebar/>', () => {
|
|
51
34
|
let nbApiRequest: number;
|
|
52
35
|
beforeEach(() => {
|
|
53
36
|
fetchMock.get('https://joanie.endpoint/api/v1.0/organizations/', []);
|
|
54
|
-
|
|
55
|
-
// JoanieSessionProvider inital requests
|
|
56
|
-
nbApiRequest = 3;
|
|
57
|
-
fetchMock.get('https://joanie.endpoint/api/v1.0/orders/', []);
|
|
58
|
-
fetchMock.get('https://joanie.endpoint/api/v1.0/addresses/', []);
|
|
59
|
-
fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', []);
|
|
60
|
-
});
|
|
61
|
-
afterEach(() => {
|
|
62
|
-
jest.clearAllMocks();
|
|
63
|
-
fetchMock.restore();
|
|
37
|
+
nbApiRequest = joanieSessionData.nbSessionApiRequest;
|
|
64
38
|
});
|
|
65
39
|
|
|
66
40
|
it('should display menu items', async () => {
|
|
67
41
|
nbApiRequest += 1; // call to organizations
|
|
68
|
-
|
|
42
|
+
render(<TeacherDashboardProfileSidebar />);
|
|
69
43
|
|
|
70
44
|
expect(
|
|
71
45
|
screen.getByRole('link', {
|
|
@@ -80,13 +54,13 @@ describe('<TeacherProfileDashboardSidebar/>', () => {
|
|
|
80
54
|
expect(fetchMock.calls()).toHaveLength(nbApiRequest);
|
|
81
55
|
});
|
|
82
56
|
|
|
83
|
-
it('should display
|
|
57
|
+
it('should display organization links', async () => {
|
|
84
58
|
const organizations = OrganizationFactory().many(3);
|
|
85
59
|
fetchMock.get('https://joanie.endpoint/api/v1.0/organizations/', organizations, {
|
|
86
60
|
overwriteRoutes: true,
|
|
87
61
|
});
|
|
88
62
|
nbApiRequest += 1; // call to organizations
|
|
89
|
-
|
|
63
|
+
render(<TeacherDashboardProfileSidebar />);
|
|
90
64
|
expect(await screen.findByTestId('organization-links')).toBeInTheDocument();
|
|
91
65
|
expect(fetchMock.calls()).toHaveLength(nbApiRequest);
|
|
92
66
|
|
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
import { Meta, StoryObj } from '@storybook/react';
|
|
2
2
|
import { createMemoryRouter, RouterProvider } from 'react-router-dom';
|
|
3
3
|
import { UserFactory } from 'utils/test/factories/richie';
|
|
4
|
-
import {
|
|
4
|
+
import { TeacherDashboardProfileSidebar } from 'widgets/Dashboard/components/TeacherDashboardProfileSidebar';
|
|
5
5
|
import { StorybookHelper } from 'utils/StorybookHelper';
|
|
6
6
|
|
|
7
7
|
export default {
|
|
8
|
-
component:
|
|
8
|
+
component: TeacherDashboardProfileSidebar,
|
|
9
9
|
render: () => {
|
|
10
10
|
const user = UserFactory().one();
|
|
11
11
|
const router = createMemoryRouter([
|
|
12
12
|
{
|
|
13
13
|
index: true,
|
|
14
|
-
element: <
|
|
14
|
+
element: <TeacherDashboardProfileSidebar />,
|
|
15
15
|
},
|
|
16
16
|
]);
|
|
17
17
|
|
|
18
18
|
return StorybookHelper.wrapInApp(<RouterProvider router={router} />, { user });
|
|
19
19
|
},
|
|
20
|
-
} as Meta<typeof
|
|
20
|
+
} as Meta<typeof TeacherDashboardProfileSidebar>;
|
|
21
21
|
|
|
22
|
-
type Story = StoryObj<typeof
|
|
22
|
+
type Story = StoryObj<typeof TeacherDashboardProfileSidebar>;
|
|
23
23
|
|
|
24
24
|
export const TeacherProfile: Story = {};
|
|
@@ -8,17 +8,18 @@ import {
|
|
|
8
8
|
} from 'widgets/Dashboard/utils/dashboardRoutes';
|
|
9
9
|
import { useSession } from 'contexts/SessionContext';
|
|
10
10
|
import { useOrganizations } from 'hooks/useOrganizations';
|
|
11
|
+
import { UserHelper } from 'utils/UserHelper';
|
|
11
12
|
import OrganizationLinks from './components/OrganizationLinks';
|
|
12
13
|
|
|
13
14
|
const messages = defineMessages({
|
|
14
15
|
subHeader: {
|
|
15
|
-
id: 'components.
|
|
16
|
+
id: 'components.TeacherDashboardProfileSidebar.subHeader',
|
|
16
17
|
description: 'Sub title of the dashboard sidebar',
|
|
17
18
|
defaultMessage: 'You are on your teacher dashboard',
|
|
18
19
|
},
|
|
19
20
|
});
|
|
20
21
|
|
|
21
|
-
export const
|
|
22
|
+
export const TeacherDashboardProfileSidebar = () => {
|
|
22
23
|
const intl = useIntl();
|
|
23
24
|
const { user } = useSession();
|
|
24
25
|
const getRoutePath = getDashboardRoutePath(intl);
|
|
@@ -37,7 +38,7 @@ export const TeacherProfileDashboardSidebar = () => {
|
|
|
37
38
|
return (
|
|
38
39
|
<DashboardSidebar
|
|
39
40
|
menuLinks={links}
|
|
40
|
-
header={user
|
|
41
|
+
header={user ? UserHelper.getName(user) : ''}
|
|
41
42
|
subHeader={intl.formatMessage(messages.subHeader)}
|
|
42
43
|
>
|
|
43
44
|
{organizations.length > 0 && <OrganizationLinks organizations={organizations} />}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { useIntl } from 'react-intl';
|
|
1
|
+
import { useIntl, defineMessages } from 'react-intl';
|
|
2
2
|
import { useState } from 'react';
|
|
3
3
|
import { Priority } from 'types';
|
|
4
4
|
import { confirm } from 'utils/indirection/window';
|
|
5
5
|
import { resolveAll } from 'utils/resolveAll';
|
|
6
|
-
import { CourseRun, Enrollment,
|
|
6
|
+
import { CourseRun, Enrollment, CredentialOrder } from 'types/Joanie';
|
|
7
7
|
import { useEnrollments } from 'hooks/useEnrollments';
|
|
8
8
|
|
|
9
|
-
const messages = {
|
|
9
|
+
const messages = defineMessages({
|
|
10
10
|
firstEnrollCourseConfirmation: {
|
|
11
11
|
id: 'components.DashboardItemEnrollment.firstEnrollCourseConfirmation',
|
|
12
12
|
description:
|
|
@@ -20,9 +20,9 @@ const messages = {
|
|
|
20
20
|
defaultMessage:
|
|
21
21
|
'Are you sure you want to change your session? You will be unrolled from the other session!',
|
|
22
22
|
},
|
|
23
|
-
};
|
|
23
|
+
});
|
|
24
24
|
|
|
25
|
-
export const useEnroll = (enrollments: Enrollment[], order?:
|
|
25
|
+
export const useEnroll = (enrollments: Enrollment[], order?: CredentialOrder) => {
|
|
26
26
|
const enrollmentResources = useEnrollments();
|
|
27
27
|
const [isLoading, setLoading] = useState(false);
|
|
28
28
|
const intl = useIntl();
|
|
@@ -48,7 +48,7 @@ export const useEnroll = (enrollments: Enrollment[], order?: Order) => {
|
|
|
48
48
|
await new Promise((resolve) => {
|
|
49
49
|
enrollmentResources.methods.update(
|
|
50
50
|
{
|
|
51
|
-
|
|
51
|
+
course_run_id: enrollment.course_run.id,
|
|
52
52
|
is_active: false,
|
|
53
53
|
id: enrollment!.id,
|
|
54
54
|
was_created_by_order: enrollment.was_created_by_order,
|
|
@@ -72,7 +72,7 @@ export const useEnroll = (enrollments: Enrollment[], order?: Order) => {
|
|
|
72
72
|
{
|
|
73
73
|
id: relatedEnrollment.id,
|
|
74
74
|
is_active: true,
|
|
75
|
-
|
|
75
|
+
course_run_id: courseRun.id,
|
|
76
76
|
was_created_by_order: !!order,
|
|
77
77
|
},
|
|
78
78
|
{ onSettled },
|
|
@@ -81,7 +81,7 @@ export const useEnroll = (enrollments: Enrollment[], order?: Order) => {
|
|
|
81
81
|
await enrollmentResources.methods.create(
|
|
82
82
|
{
|
|
83
83
|
is_active: true,
|
|
84
|
-
|
|
84
|
+
course_run_id: courseRun.id,
|
|
85
85
|
was_created_by_order: !!order,
|
|
86
86
|
},
|
|
87
87
|
{ onSettled },
|
|
@@ -61,10 +61,13 @@ describe('<Dashboard />', () => {
|
|
|
61
61
|
'https://joanie.endpoint/api/v1.0/enrollments/?page=1&page_size=50&was_created_by_order=false',
|
|
62
62
|
{ count: 0, results: [] },
|
|
63
63
|
);
|
|
64
|
-
fetchMock.get(
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
64
|
+
fetchMock.get(
|
|
65
|
+
'https://joanie.endpoint/api/v1.0/orders/?page=1&page_size=50&product__type=credential',
|
|
66
|
+
{
|
|
67
|
+
count: 0,
|
|
68
|
+
results: [],
|
|
69
|
+
},
|
|
70
|
+
);
|
|
68
71
|
});
|
|
69
72
|
|
|
70
73
|
afterEach(() => {
|
|
@@ -92,7 +95,7 @@ describe('<Dashboard />', () => {
|
|
|
92
95
|
const user = UserFactory().one();
|
|
93
96
|
|
|
94
97
|
render(<DashboardWithUser user={user} />);
|
|
95
|
-
expectBreadcrumbsToEqualParts(['
|
|
98
|
+
expectBreadcrumbsToEqualParts(['chevron_leftBack', 'My courses']);
|
|
96
99
|
});
|
|
97
100
|
|
|
98
101
|
it('changes route when using the sidebar', async () => {
|
|
@@ -117,7 +120,7 @@ describe('<Dashboard />', () => {
|
|
|
117
120
|
});
|
|
118
121
|
render(<DashboardWithUser user={user} />);
|
|
119
122
|
expectUrlMatchLocationDisplayed(LearnerDashboardPaths.COURSES);
|
|
120
|
-
expectBreadcrumbsToEqualParts(['
|
|
123
|
+
expectBreadcrumbsToEqualParts(['chevron_leftBack', 'My courses']);
|
|
121
124
|
|
|
122
125
|
// Go to "My Preferences" route.
|
|
123
126
|
const link = screen.getByRole('link', { name: 'My preferences' });
|
|
@@ -125,7 +128,7 @@ describe('<Dashboard />', () => {
|
|
|
125
128
|
fireEvent.click(link);
|
|
126
129
|
});
|
|
127
130
|
expectUrlMatchLocationDisplayed(LearnerDashboardPaths.PREFERENCES);
|
|
128
|
-
expectBreadcrumbsToEqualParts(['
|
|
131
|
+
expectBreadcrumbsToEqualParts(['chevron_leftBack', 'My preferences']);
|
|
129
132
|
|
|
130
133
|
// Go to the address edit route.
|
|
131
134
|
const button = await screen.findByRole('button', { name: 'Edit' });
|
|
@@ -136,18 +139,18 @@ describe('<Dashboard />', () => {
|
|
|
136
139
|
LearnerDashboardPaths.PREFERENCES_ADDRESS_EDITION.replace(':addressId', address.id),
|
|
137
140
|
);
|
|
138
141
|
expectBreadcrumbsToEqualParts([
|
|
139
|
-
'
|
|
142
|
+
'chevron_leftBack',
|
|
140
143
|
'My preferences',
|
|
141
144
|
'Edit address "' + address.title + '"',
|
|
142
145
|
]);
|
|
143
146
|
|
|
144
147
|
// Click on back button goes back to "My Preferences".
|
|
145
|
-
const backButton = await screen.findByRole('link', { name:
|
|
148
|
+
const backButton = await screen.findByRole('link', { name: /Back/ });
|
|
146
149
|
await act(async () => {
|
|
147
150
|
fireEvent.click(backButton);
|
|
148
151
|
});
|
|
149
152
|
expectUrlMatchLocationDisplayed(LearnerDashboardPaths.PREFERENCES);
|
|
150
|
-
expectBreadcrumbsToEqualParts(['
|
|
153
|
+
expectBreadcrumbsToEqualParts(['chevron_leftBack', 'My preferences']);
|
|
151
154
|
|
|
152
155
|
// Click again on back button to get redirect to website's root.
|
|
153
156
|
expect(location.replace).not.toHaveBeenCalled();
|
|
@@ -157,10 +160,17 @@ describe('<Dashboard />', () => {
|
|
|
157
160
|
expect(location.replace).toHaveBeenCalledWith('https://localhost');
|
|
158
161
|
});
|
|
159
162
|
|
|
160
|
-
it('should render username in sidebar', () => {
|
|
161
|
-
const user: User = UserFactory().one();
|
|
163
|
+
it('should render username in sidebar if full_name is not defined', () => {
|
|
164
|
+
const user: User = UserFactory({ full_name: undefined }).one();
|
|
162
165
|
render(<DashboardWithUser user={user} />);
|
|
163
166
|
const sidebar = screen.getByTestId('dashboard__sidebar');
|
|
164
167
|
getByText(sidebar, user.username, { exact: false });
|
|
165
168
|
});
|
|
169
|
+
|
|
170
|
+
it('should render full_name in sidebar', () => {
|
|
171
|
+
const user: User = UserFactory().one();
|
|
172
|
+
render(<DashboardWithUser user={user} />);
|
|
173
|
+
const sidebar = screen.getByTestId('dashboard__sidebar');
|
|
174
|
+
getByText(sidebar, user.full_name!, { exact: false });
|
|
175
|
+
});
|
|
166
176
|
});
|
|
@@ -8,8 +8,9 @@ export enum LearnerDashboardPaths {
|
|
|
8
8
|
ORDER = '/courses/orders/:orderId',
|
|
9
9
|
ORDER_RUNS = '/courses/orders/:orderId/runs',
|
|
10
10
|
COURSE = '/courses/:code',
|
|
11
|
-
PREFERENCES = '/preferences',
|
|
12
11
|
CERTIFICATES = '/certificates',
|
|
12
|
+
CONTRACTS = '/training-contracts',
|
|
13
|
+
PREFERENCES = '/preferences',
|
|
13
14
|
PREFERENCES_ADDRESS_EDITION = '/preferences/addresses/:addressId',
|
|
14
15
|
PREFERENCES_ADDRESS_CREATION = '/preferences/addresses/create',
|
|
15
16
|
PREFERENCES_CREDIT_CARD_EDITION = '/preferences/credit-cards/:creditCardId',
|
|
@@ -42,6 +43,11 @@ export const LEARNER_DASHBOARD_ROUTE_PATHS = defineMessages<LearnerDashboardPath
|
|
|
42
43
|
description: 'The path to display the certificates view.',
|
|
43
44
|
defaultMessage: '/certificates',
|
|
44
45
|
},
|
|
46
|
+
[LearnerDashboardPaths.CONTRACTS]: {
|
|
47
|
+
id: 'components.Dashboard.DashboardRoutes.contracts.path',
|
|
48
|
+
description: 'The path to display the training contracts view.',
|
|
49
|
+
defaultMessage: '/training-contracts',
|
|
50
|
+
},
|
|
45
51
|
[LearnerDashboardPaths.PREFERENCES]: {
|
|
46
52
|
id: 'components.Dashboard.DashboardRoutes.preferences.path',
|
|
47
53
|
description: 'The path to display the preferences view.',
|
|
@@ -91,6 +97,11 @@ export const LEARNER_DASHBOARD_ROUTE_LABELS = defineMessages<LearnerDashboardPat
|
|
|
91
97
|
description: 'Label of the certificates view used in navigation components.',
|
|
92
98
|
defaultMessage: 'My certificates',
|
|
93
99
|
},
|
|
100
|
+
[LearnerDashboardPaths.CONTRACTS]: {
|
|
101
|
+
id: 'components.Dashboard.DashboardRoutes.contracts.label',
|
|
102
|
+
description: 'Label of the training contracts view used in navigation components.',
|
|
103
|
+
defaultMessage: 'My training contracts',
|
|
104
|
+
},
|
|
94
105
|
[LearnerDashboardPaths.PREFERENCES]: {
|
|
95
106
|
id: 'components.Dashboard.DashboardRoutes.preferences.label',
|
|
96
107
|
description: 'Label of the preferences view used in navigation components.',
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
} from 'widgets/Dashboard/utils/learnerRouteMessages';
|
|
18
18
|
import { DashboardCertificates } from 'pages/DashboardCertificates';
|
|
19
19
|
import { DashboardOrderLayout } from 'pages/DashboardOrderLayout';
|
|
20
|
+
import { DashboardContracts } from 'pages/DashboardContracts';
|
|
20
21
|
|
|
21
22
|
export interface DashboardRouteHandle {
|
|
22
23
|
crumbLabel?: MessageDescriptor;
|
|
@@ -62,6 +63,11 @@ export function getLearnerDashboardRoutes() {
|
|
|
62
63
|
handle: { crumbLabel: LEARNER_DASHBOARD_ROUTE_LABELS[LearnerDashboardPaths.CERTIFICATES] },
|
|
63
64
|
element: <DashboardCertificates />,
|
|
64
65
|
},
|
|
66
|
+
{
|
|
67
|
+
path: getRoutePath(LearnerDashboardPaths.CONTRACTS),
|
|
68
|
+
handle: { crumbLabel: LEARNER_DASHBOARD_ROUTE_LABELS[LearnerDashboardPaths.CONTRACTS] },
|
|
69
|
+
element: <DashboardContracts />,
|
|
70
|
+
},
|
|
65
71
|
{
|
|
66
72
|
path: getRoutePath(LearnerDashboardPaths.COURSE, { code: ':code' }),
|
|
67
73
|
element: <RouteInfo title={getRouteLabel(LearnerDashboardPaths.COURSE)} />,
|