richie-education 2.25.0-b2.dev25 → 2.25.0-b2.dev27

package/js/components/ContractFrame/AbstractContractFrame.spec.tsx

@@ -151,6 +151,11 @@ describe('<AbstractContractFrame />', () => {
     await waitFor(() => {
       expect(screen.getByRole('heading', { name: 'Verifying signature ...' })).toBeInTheDocument();
     });
+    expect(
+      screen.getByText(
+        'We are waiting for the signature to be validated from our signature platform. It can take up to few minutes. Do not close this page.',
+      ),
+    ).toBeInTheDocument();
     expect(screen.getByRole('status')).toBeInTheDocument();
 
     checkSignatureDeferred.resolve({ isSigned: true });
@@ -207,6 +212,11 @@ describe('<AbstractContractFrame />', () => {
     await waitFor(() => {
       expect(screen.getByRole('heading', { name: 'Verifying signature ...' })).toBeInTheDocument();
     });
+    expect(
+      screen.getByText(
+        'We are waiting for the signature to be validated from our signature platform. It can take up to few minutes. Do not close this page.',
+      ),
+    ).toBeInTheDocument();
     expect(screen.getByRole('status')).toBeInTheDocument();
 
     checkSignatureDeferred.reject(new HttpError(500, 'Interval server error'));
@@ -263,6 +273,11 @@ describe('<AbstractContractFrame />', () => {
     await waitFor(() => {
       expect(screen.getByRole('heading', { name: 'Verifying signature ...' })).toBeInTheDocument();
     });
+    expect(
+      screen.getByText(
+        'We are waiting for the signature to be validated from our signature platform. It can take up to few minutes. Do not close this page.',
+      ),
+    ).toBeInTheDocument();
     expect(screen.getByRole('status')).toBeInTheDocument();
 
     checkSignatureDeferred.resolve({ isSigned: false });

package/js/components/ContractFrame/AbstractContractFrame.tsx

@@ -50,6 +50,12 @@ export const messages = defineMessages({
     description: 'Message displayed inside the contract signin modal when polling the order.',
     id: 'components.DashboardItem.Order.ContractFrame.polling',
   },
+  pollingDescription: {
+    defaultMessage:
+      'We are waiting for the signature to be validated from our signature platform. It can take up to few minutes. Do not close this page.',
+    description: 'Message displayed inside the contract signin modal when polling the order.',
+    id: 'components.DashboardItem.Order.ContractFrame.pollingDescription',
+  },
   finishedCaption: {
     defaultMessage: 'Congratulations!',
     description: 'Title displayed inside the contract signin modal when the contract is signed.',
@@ -251,9 +257,14 @@ const ContractFrameContent = ({
       )}
       {step === ContractSteps.POLLING && (
         <div className="ContractFrame__loading-container">
-          <h3 className="ContractFrame__caption">
-            <FormattedMessage {...messages.polling} />
-          </h3>
+          <div>
+            <h3 className="ContractFrame__caption">
+              <FormattedMessage {...messages.polling} />
+            </h3>
+            <p className="ContractFrame__content">
+              <FormattedMessage {...messages.pollingDescription} />
+            </p>
+          </div>
           <Loader />
         </div>
       )}

package/js/components/ContractFrame/OrganizationContractFrame.spec.tsx

@@ -94,11 +94,11 @@ describe('OrganizationContractFrame', () => {
       user: true,
       queriesCallback: (queries) => {
         // Push contract and orders queries
-        queries.push(QueryStateFactory(['user', 'contracts'], { data: [] }));
+        queries.push(QueryStateFactory(['user', 'organization_contracts'], { data: [] }));
       },
     });
 
-    let contractsQueryState = client.getQueryState(['user', 'contracts']);
+    let contractsQueryState = client.getQueryState(['user', 'organization_contracts']);
     expect(contractsQueryState?.isInvalidated).toBe(false);
 
     await act(async () => {
@@ -126,7 +126,7 @@ describe('OrganizationContractFrame', () => {
 
     // onDone should be tweaked to invalidate the user orders and contracts queries
     // and passed down to AbstractContractFrame
-    contractsQueryState = client.getQueryState(['user', 'contracts']);
+    contractsQueryState = client.getQueryState(['user', 'organization_contracts']);
     expect(contractsQueryState?.isInvalidated).toBe(true);
     expect(handleDone).toHaveBeenCalledTimes(1);
 
@@ -158,11 +158,11 @@ describe('OrganizationContractFrame', () => {
       user: true,
       queriesCallback: (queries) => {
         // Push contract and orders queries
-        queries.push(QueryStateFactory(['user', 'contracts'], { data: [] }));
+        queries.push(QueryStateFactory(['user', 'organization_contracts'], { data: [] }));
       },
     });
 
-    let contractsQueryState = client.getQueryState(['user', 'contracts']);
+    let contractsQueryState = client.getQueryState(['user', 'organization_contracts']);
     expect(contractsQueryState?.isInvalidated).toBe(false);
 
     await act(async () => {
@@ -191,7 +191,7 @@ describe('OrganizationContractFrame', () => {
 
     // onDone should be tweaked to invalidate the user orders and contracts queries
     // and passed down to AbstractContractFrame
-    contractsQueryState = client.getQueryState(['user', 'contracts']);
+    contractsQueryState = client.getQueryState(['user', 'organization_contracts']);
     expect(contractsQueryState?.isInvalidated).toBe(true);
     expect(handleDone).toHaveBeenCalledTimes(1);
 

package/js/components/ContractFrame/OrganizationContractFrame.tsx

@@ -45,7 +45,7 @@ const OrganizationContractFrame = ({ organizationId, contractIds, onDone, ...pro
   };
 
   const onDoneWithInvalidation = () => {
-    queryClient.invalidateQueries({ queryKey: ['user', 'contracts'] });
+    queryClient.invalidateQueries({ queryKey: ['user', 'organization_contracts'] });
     onDone?.();
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "richie-education",
-  "version": "2.25.0-b2.dev25",
+  "version": "2.25.0-b2.dev27",
   "description": "A CMS to build learning portals for Open Education",
   "main": "sandbox/manage.py",
   "scripts": {