richie-education 3.2.1 → 3.2.2-dev26
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/js/api/joanie.ts +144 -0
- package/js/components/PaymentInterfaces/types.ts +7 -0
- package/js/components/PaymentScheduleGrid/index.tsx +4 -2
- package/js/components/SaleTunnel/AddressSelector/index.spec.tsx +9 -2
- package/js/components/SaleTunnel/GenericSaleTunnel.tsx +33 -0
- package/js/components/SaleTunnel/SaleTunnelInformation/SaleTunnelInformationGroup.tsx +253 -0
- package/js/components/SaleTunnel/SaleTunnelInformation/SaleTunnelInformationSingular.tsx +314 -0
- package/js/components/SaleTunnel/SaleTunnelInformation/StepContent.tsx +528 -0
- package/js/components/SaleTunnel/SaleTunnelInformation/index.tsx +47 -271
- package/js/components/SaleTunnel/SaleTunnelSuccess/index.tsx +25 -11
- package/js/components/SaleTunnel/SubscriptionButton/index.tsx +54 -6
- package/js/components/SaleTunnel/_styles.scss +55 -0
- package/js/components/SaleTunnel/index.full-process-b2b.spec.tsx +356 -0
- package/js/components/SaleTunnel/{index.full-process.spec.tsx → index.full-process-b2c.spec.tsx} +4 -1
- package/js/components/SaleTunnel/index.spec.tsx +104 -0
- package/js/hooks/useBatchOrder/index.tsx +36 -0
- package/js/hooks/useContractArchive/index.ts +2 -0
- package/js/hooks/useOfferingOrganizations/index.tsx +38 -0
- package/js/hooks/useOrganizationAgreements.tsx/index.tsx +66 -0
- package/js/hooks/useOrganizationQuotes/index.tsx +56 -0
- package/js/hooks/useTeacherPendingAgreementsCount/index.ts +34 -0
- package/js/pages/DashboardBatchOrderLayout/_styles.scss +5 -0
- package/js/pages/DashboardBatchOrderLayout/index.spec.tsx +78 -0
- package/js/pages/DashboardBatchOrderLayout/index.tsx +45 -0
- package/js/pages/DashboardBatchOrders/index.spec.tsx +237 -0
- package/js/pages/DashboardBatchOrders/index.tsx +84 -0
- package/js/pages/TeacherDashboardContractsLayout/TeacherDashboardCourseContractsLayout/index.tsx +0 -1
- package/js/pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive/index.tsx +3 -1
- package/js/pages/TeacherDashboardOrganizationAgreements/AgreementActionsBar.tsx +49 -0
- package/js/pages/TeacherDashboardOrganizationAgreements/BulkAgreementContractButton.tsx +79 -0
- package/js/pages/TeacherDashboardOrganizationAgreements/OrganizationAgreementFrame.tsx +71 -0
- package/js/pages/TeacherDashboardOrganizationAgreements/SignOrganizationAgreementButton.tsx +60 -0
- package/js/pages/TeacherDashboardOrganizationAgreements/hooks/useAgreementsAbilities.tsx +8 -0
- package/js/pages/TeacherDashboardOrganizationAgreements/hooks/useHasAgreementToDownload.tsx +27 -0
- package/js/pages/TeacherDashboardOrganizationAgreements/hooks/useTeacherAgreementsToSign.tsx +32 -0
- package/js/pages/TeacherDashboardOrganizationAgreements/index.spec.tsx +433 -0
- package/js/pages/TeacherDashboardOrganizationAgreements/index.tsx +130 -0
- package/js/pages/TeacherDashboardOrganizationAgreementsLayout/index.tsx +25 -0
- package/js/pages/TeacherDashboardOrganizationCourseLoader/index.spec.tsx +9 -0
- package/js/pages/TeacherDashboardOrganizationQuotes/_styles.scss +40 -0
- package/js/pages/TeacherDashboardOrganizationQuotes/index.full-process.spec.tsx +194 -0
- package/js/pages/TeacherDashboardOrganizationQuotes/index.spec.tsx +144 -0
- package/js/pages/TeacherDashboardOrganizationQuotes/index.tsx +521 -0
- package/js/pages/TeacherDashboardOrganizationQuotesLayout/index.tsx +26 -0
- package/js/types/Joanie.ts +216 -1
- package/js/utils/AbilitiesHelper/agreementAbilities.ts +14 -0
- package/js/utils/AbilitiesHelper/index.ts +7 -0
- package/js/utils/AbilitiesHelper/types.ts +12 -3
- package/js/utils/ObjectHelper/index.ts +20 -0
- package/js/utils/OrderHelper/index.ts +10 -0
- package/js/utils/test/factories/joanie.ts +156 -1
- package/js/widgets/Dashboard/components/DashboardBatchOrderLoader/_styles.scss +14 -0
- package/js/widgets/Dashboard/components/DashboardBatchOrderLoader/index.tsx +32 -0
- package/js/widgets/Dashboard/components/DashboardCard/index.spec.tsx +18 -0
- package/js/widgets/Dashboard/components/DashboardCard/index.stories.tsx +25 -2
- package/js/widgets/Dashboard/components/DashboardCard/index.tsx +4 -2
- package/js/widgets/Dashboard/components/DashboardItem/BatchOrder/BatchOrderPaymentModal/BatchOrderPaymentManager.tsx +88 -0
- package/js/widgets/Dashboard/components/DashboardItem/BatchOrder/BatchOrderPaymentModal/index.tsx +216 -0
- package/js/widgets/Dashboard/components/DashboardItem/BatchOrder/DashboardBatchOrderSubItems.tsx +316 -0
- package/js/widgets/Dashboard/components/DashboardItem/BatchOrder/index.spec.tsx +27 -0
- package/js/widgets/Dashboard/components/DashboardItem/BatchOrder/index.tsx +175 -0
- package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.tsx +5 -2
- package/js/widgets/Dashboard/components/DashboardItem/Order/OrganizationBlock/index.tsx +4 -1
- package/js/widgets/Dashboard/components/DashboardItem/Order/_styles.scss +5 -0
- package/js/widgets/Dashboard/components/DashboardItem/_styles.scss +43 -0
- package/js/widgets/Dashboard/components/DashboardSidebar/components/AgreementNavLink/index.spec.tsx +214 -0
- package/js/widgets/Dashboard/components/DashboardSidebar/components/AgreementNavLink/index.tsx +47 -0
- package/js/widgets/Dashboard/components/LearnerDashboardSidebar/index.tsx +1 -0
- package/js/widgets/Dashboard/components/TeacherDashboardOrganizationSidebar/index.spec.tsx +21 -3
- package/js/widgets/Dashboard/components/TeacherDashboardOrganizationSidebar/index.tsx +9 -0
- package/js/widgets/Dashboard/utils/learnerRoutes.tsx +30 -0
- package/js/widgets/Dashboard/utils/learnerRoutesPaths.tsx +12 -0
- package/js/widgets/Dashboard/utils/teacherDashboardPaths.tsx +12 -0
- package/js/widgets/Dashboard/utils/teacherRoutes.tsx +17 -0
- package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/index.spec.tsx +8 -2
- package/package.json +4 -1
- package/scss/colors/_theme.scss +1 -1
- package/scss/components/_index.scss +1 -0
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { Button } from '@openfun/cunningham-react';
|
|
2
|
+
import { FormattedMessage, defineMessages } from 'react-intl';
|
|
3
|
+
import { useEffect } from 'react';
|
|
4
|
+
import useDownloadContractArchive, {
|
|
5
|
+
ContractDownloadStatus,
|
|
6
|
+
} from 'pages/TeacherDashboardContractsLayout/hooks/useDownloadContractArchive';
|
|
7
|
+
import { Offering, Organization } from 'types/Joanie';
|
|
8
|
+
|
|
9
|
+
const messages = defineMessages({
|
|
10
|
+
bulkDownloadButtonDownloadLabel: {
|
|
11
|
+
defaultMessage: 'Download contracts archive',
|
|
12
|
+
description: 'The label of the bulk download button when the zip archive is ready for download',
|
|
13
|
+
id: 'pages.TeacherDashboardContractsLayout.BulkDownloadContractButton.bulkDownloadButtonDownloadLabel',
|
|
14
|
+
},
|
|
15
|
+
bulkDownloadButtonPendingLabel: {
|
|
16
|
+
defaultMessage: 'Generating contracts archive...',
|
|
17
|
+
description: 'The label of the bulk download button when archive generation is pending',
|
|
18
|
+
id: 'pages.TeacherDashboardContractsLayout.BulkDownloadContractButton.bulkDownloadButtonPendingLabel',
|
|
19
|
+
},
|
|
20
|
+
bulkDownloadButtonRequestArchiveLabel: {
|
|
21
|
+
defaultMessage: 'Request contracts archive',
|
|
22
|
+
description: 'The label of the bulk download button to request the generation of a zip archive',
|
|
23
|
+
id: 'pages.TeacherDashboardContractsLayout.BulkDownloadContractButton.bulkDownloadButtonRequestArchiveLabel',
|
|
24
|
+
},
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
interface BulkDownloadAgreementButtonProps {
|
|
28
|
+
organizationId?: Organization['id'];
|
|
29
|
+
offeringId?: Offering['id'];
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const BulkDownloadAgreementButton = ({
|
|
33
|
+
organizationId,
|
|
34
|
+
offeringId,
|
|
35
|
+
}: BulkDownloadAgreementButtonProps) => {
|
|
36
|
+
const { downloadContractArchive, createContractArchive, status } = useDownloadContractArchive({
|
|
37
|
+
organizationId,
|
|
38
|
+
offeringId,
|
|
39
|
+
fromBatchOrder: true,
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
useEffect(() => {
|
|
43
|
+
// Trigger contract's archive polling when generation had already been requested
|
|
44
|
+
if (status === ContractDownloadStatus.PENDING) {
|
|
45
|
+
createContractArchive();
|
|
46
|
+
}
|
|
47
|
+
}, [status]);
|
|
48
|
+
|
|
49
|
+
if (status === ContractDownloadStatus.PENDING) {
|
|
50
|
+
return (
|
|
51
|
+
<Button
|
|
52
|
+
disabled={true}
|
|
53
|
+
color="tertiary"
|
|
54
|
+
size="small"
|
|
55
|
+
icon={<div className="spinner spinner--small" />}
|
|
56
|
+
>
|
|
57
|
+
<FormattedMessage {...messages.bulkDownloadButtonPendingLabel} />
|
|
58
|
+
</Button>
|
|
59
|
+
);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
return (
|
|
63
|
+
<Button
|
|
64
|
+
onClick={downloadContractArchive}
|
|
65
|
+
disabled={status === ContractDownloadStatus.INITIALIZING}
|
|
66
|
+
color={status === ContractDownloadStatus.READY ? 'primary' : 'tertiary'}
|
|
67
|
+
size="small"
|
|
68
|
+
icon={<span className="material-icons">download</span>}
|
|
69
|
+
>
|
|
70
|
+
<FormattedMessage
|
|
71
|
+
{...(status === ContractDownloadStatus.IDLE
|
|
72
|
+
? messages.bulkDownloadButtonRequestArchiveLabel
|
|
73
|
+
: messages.bulkDownloadButtonDownloadLabel)}
|
|
74
|
+
/>
|
|
75
|
+
</Button>
|
|
76
|
+
);
|
|
77
|
+
};
|
|
78
|
+
|
|
79
|
+
export default BulkDownloadAgreementButton;
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { useState } from 'react';
|
|
2
|
+
import { useQueryClient } from '@tanstack/react-query';
|
|
3
|
+
import { useJoanieApi } from 'contexts/JoanieApiContext';
|
|
4
|
+
import AbstractContractFrame, {
|
|
5
|
+
AbstractProps,
|
|
6
|
+
} from 'components/ContractFrame/AbstractContractFrame';
|
|
7
|
+
import { Agreement, Offering } from 'types/Joanie';
|
|
8
|
+
|
|
9
|
+
interface Props extends AbstractProps {
|
|
10
|
+
agreementIds?: Agreement['id'][];
|
|
11
|
+
organizationId: string;
|
|
12
|
+
offeringIds?: Offering['id'][];
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
const OrganizationAgreementFrame = ({
|
|
16
|
+
organizationId,
|
|
17
|
+
offeringIds = [],
|
|
18
|
+
agreementIds,
|
|
19
|
+
onDone,
|
|
20
|
+
...props
|
|
21
|
+
}: Props) => {
|
|
22
|
+
const api = useJoanieApi();
|
|
23
|
+
const queryClient = useQueryClient();
|
|
24
|
+
const [agreementsIdsToCheck, setAgreementsIdsToCheck] = useState(agreementIds);
|
|
25
|
+
|
|
26
|
+
const getInvitationLink = async () => {
|
|
27
|
+
/*
|
|
28
|
+
The API returns the invitation link to sign contracts and a list of contracts ids which should
|
|
29
|
+
be signed. We need to keep track of these ids to check if all contracts have been signed.
|
|
30
|
+
*/
|
|
31
|
+
const response = await api.organizations.contracts.getSignatureLinks({
|
|
32
|
+
offering_ids: offeringIds,
|
|
33
|
+
organization_id: organizationId,
|
|
34
|
+
contracts_ids: agreementIds,
|
|
35
|
+
from_batch_order: true,
|
|
36
|
+
});
|
|
37
|
+
setAgreementsIdsToCheck(response.contract_ids);
|
|
38
|
+
return response.invitation_link;
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
/*
|
|
42
|
+
* Check if all contracts to signed has been signed.
|
|
43
|
+
*/
|
|
44
|
+
const checkAgreementsSignature = async () => {
|
|
45
|
+
const { results: agreementsToCheck } = await api.organizations.agreements.get({
|
|
46
|
+
organization_id: organizationId,
|
|
47
|
+
contract_ids: agreementsIdsToCheck,
|
|
48
|
+
});
|
|
49
|
+
const isSigned = agreementsToCheck.every((agreement) =>
|
|
50
|
+
Boolean(agreement?.organization_signed_on),
|
|
51
|
+
);
|
|
52
|
+
|
|
53
|
+
return { isSigned };
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
const onDoneWithInvalidation = () => {
|
|
57
|
+
queryClient.invalidateQueries({ queryKey: ['user', 'organizationAgreements'] });
|
|
58
|
+
onDone?.();
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
return (
|
|
62
|
+
<AbstractContractFrame
|
|
63
|
+
getInvitationLink={getInvitationLink}
|
|
64
|
+
checkSignature={checkAgreementsSignature}
|
|
65
|
+
onDone={onDoneWithInvalidation}
|
|
66
|
+
{...props}
|
|
67
|
+
/>
|
|
68
|
+
);
|
|
69
|
+
};
|
|
70
|
+
|
|
71
|
+
export default OrganizationAgreementFrame;
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { useState } from 'react';
|
|
2
|
+
import { defineMessages, FormattedMessage } from 'react-intl';
|
|
3
|
+
import { Button } from '@openfun/cunningham-react';
|
|
4
|
+
|
|
5
|
+
import { Offering, Organization } from 'types/Joanie';
|
|
6
|
+
import OrganizationAgreementFrame from './OrganizationAgreementFrame';
|
|
7
|
+
|
|
8
|
+
const messages = defineMessages({
|
|
9
|
+
signAllPendingAgreements: {
|
|
10
|
+
defaultMessage: 'Sign all pending agreements ({ count })',
|
|
11
|
+
description: 'Button to sign all pending agreements',
|
|
12
|
+
id: 'pages.TeacherDashboardOrganizationAgreementsLayout.signAllPendingAgreements',
|
|
13
|
+
},
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
interface Props {
|
|
17
|
+
offeringIds?: Offering['id'][];
|
|
18
|
+
organizationId: Organization['id'];
|
|
19
|
+
agreementToSignCount: number;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const SignOrganizationAgreementButton = ({
|
|
23
|
+
organizationId,
|
|
24
|
+
agreementToSignCount,
|
|
25
|
+
offeringIds = [],
|
|
26
|
+
}: Props) => {
|
|
27
|
+
const [agreementFrameOpened, setAgreementFrameOpened] = useState(false);
|
|
28
|
+
const hasAgreementToSign = agreementToSignCount > 0;
|
|
29
|
+
|
|
30
|
+
return (
|
|
31
|
+
<>
|
|
32
|
+
{hasAgreementToSign && (
|
|
33
|
+
<Button
|
|
34
|
+
size="small"
|
|
35
|
+
color="primary"
|
|
36
|
+
onClick={() => setAgreementFrameOpened(true)}
|
|
37
|
+
disabled={agreementFrameOpened}
|
|
38
|
+
icon={
|
|
39
|
+
<span className="material-icons" aria-hidden={true}>
|
|
40
|
+
edit
|
|
41
|
+
</span>
|
|
42
|
+
}
|
|
43
|
+
>
|
|
44
|
+
<FormattedMessage
|
|
45
|
+
{...messages.signAllPendingAgreements}
|
|
46
|
+
values={{ count: agreementToSignCount }}
|
|
47
|
+
/>
|
|
48
|
+
</Button>
|
|
49
|
+
)}
|
|
50
|
+
<OrganizationAgreementFrame
|
|
51
|
+
offeringIds={offeringIds}
|
|
52
|
+
organizationId={organizationId}
|
|
53
|
+
isOpen={agreementFrameOpened}
|
|
54
|
+
onClose={() => setAgreementFrameOpened(false)}
|
|
55
|
+
/>
|
|
56
|
+
</>
|
|
57
|
+
);
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
export default SignOrganizationAgreementButton;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Agreement } from 'types/Joanie';
|
|
2
|
+
import AbilitiesHelper from 'utils/AbilitiesHelper';
|
|
3
|
+
|
|
4
|
+
const useAgreementAbilities = (agreements?: Agreement | Agreement[]) => {
|
|
5
|
+
return AbilitiesHelper.buildEntityInterface(agreements);
|
|
6
|
+
};
|
|
7
|
+
|
|
8
|
+
export default useAgreementAbilities;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { useOrganizationAgreements } from 'hooks/useOrganizationAgreements.tsx';
|
|
2
|
+
import { PER_PAGE } from 'settings';
|
|
3
|
+
import { ContractState, Offering, Organization } from 'types/Joanie';
|
|
4
|
+
|
|
5
|
+
const useHasAgreementToDownload = (
|
|
6
|
+
organizationId?: Organization['id'],
|
|
7
|
+
offeringId?: Offering['id'],
|
|
8
|
+
) => {
|
|
9
|
+
const {
|
|
10
|
+
items: agreements,
|
|
11
|
+
states: { isFetched },
|
|
12
|
+
} = useOrganizationAgreements({
|
|
13
|
+
organization_id: organizationId,
|
|
14
|
+
offering_id: offeringId,
|
|
15
|
+
signature_state: ContractState.SIGNED,
|
|
16
|
+
page: 1,
|
|
17
|
+
page_size: PER_PAGE.teacherContractList,
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
if (!isFetched) {
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
return agreements.length > 0;
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
export default useHasAgreementToDownload;
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { useOrganizationAgreements } from 'hooks/useOrganizationAgreements.tsx';
|
|
2
|
+
import { ContractState, Organization, Offering } from 'types/Joanie';
|
|
3
|
+
import { ContractActions } from 'utils/AbilitiesHelper/types';
|
|
4
|
+
import useAgreementAbilities from './useAgreementsAbilities';
|
|
5
|
+
|
|
6
|
+
interface UseTeacherAgreementsToSignProps {
|
|
7
|
+
organizationId?: Organization['id'];
|
|
8
|
+
offeringId?: Offering['id'];
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
const useTeacherAgreementsToSign = ({
|
|
12
|
+
organizationId,
|
|
13
|
+
offeringId,
|
|
14
|
+
}: UseTeacherAgreementsToSignProps) => {
|
|
15
|
+
const { items: agreementsToSign, meta: agreementsToSignMeta } = useOrganizationAgreements(
|
|
16
|
+
{
|
|
17
|
+
signature_state: ContractState.LEARNER_SIGNED,
|
|
18
|
+
organization_id: organizationId,
|
|
19
|
+
offering_id: offeringId,
|
|
20
|
+
},
|
|
21
|
+
{ enabled: !!organizationId },
|
|
22
|
+
);
|
|
23
|
+
const agreementAbilities = useAgreementAbilities(agreementsToSign);
|
|
24
|
+
const agreementToSignCount = agreementsToSignMeta?.pagination?.count ?? 0;
|
|
25
|
+
|
|
26
|
+
return {
|
|
27
|
+
canSignAgreements: organizationId && agreementAbilities.can(ContractActions.SIGN),
|
|
28
|
+
agreementToSignCount,
|
|
29
|
+
};
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
export default useTeacherAgreementsToSign;
|