richie-education 2.25.0-b2.dev24 → 2.25.0-b2.dev26

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/js/settings.dev.dist.ts

@@ -1,14 +1,12 @@
-export default {
-  /**
-   * Available users:
-   *  * admin
-   *  * user0
-   *  * user1
-   *  * user2
-   *  * user3
-   *  * user4
-   *  * organization_owner
-   *  * student_user
-   */
-  CURRENT_JOANIE_DEV_DEMO_USER: 'admin',
-};
+/**
+ * Available users:
+ *  * admin
+ *  * user0
+ *  * user1
+ *  * user2
+ *  * user3
+ *  * user4
+ *  * organization_owner
+ *  * student_user
+ */
+export const CURRENT_JOANIE_DEV_DEMO_USER = 'admin';

package/js/settings.ts

@@ -1,4 +1,4 @@
-import defaultDevSettings from './settings.dev.dist';
+import * as defaultDevSettings from './settings.dev.dist';
 
 export const API_LIST_DEFAULT_PARAMS = {
   limit: '21',

package/package.json

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