richie-education 2.25.0-b2.dev62 → 2.25.0-b2.dev65

package/js/api/lms/dummy.ts

@@ -38,9 +38,11 @@ const JOANIE_DEV_DEMO_USER_JWT_TOKENS = {
     'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzMzOTI4MjE0LCJpYXQiOjE3MDIzOTIyMTQsImp0aSI6ImNkZjAyMGM4ODdjOTQxYzU5ZmExN2FkZGExNjNjMDIzIiwiZW1haWwiOiJqZWFuLWJhcHRpc3RlLnBlbnJhdGgrc3R1ZGVudF91c2VyQGZ1bi1tb29jLmZyIiwibGFuZ3VhZ2UiOiJmci1mciIsInVzZXJuYW1lIjoic3R1ZGVudF91c2VyIiwiZnVsbF9uYW1lIjoiXHUwMGM5dHVkaWFudCJ9.JMdnC2VXwq2VbNPrIYxj8PEq0oJJ4LZZT_ywWyE1lBM',
 };
 
+export type DevDemoUser = keyof typeof JOANIE_DEV_DEMO_USER_JWT_TOKENS;
+
 export const RICHIE_DUMMY_IS_LOGGED_IN = 'RICHIE_DUMMY_IS_LOGGED_IN';
 
-function getUserInfo(username: keyof typeof JOANIE_DEV_DEMO_USER_JWT_TOKENS): Maybe<User> {
+function getUserInfo(username: DevDemoUser): Maybe<User> {
   const accessToken = JOANIE_DEV_DEMO_USER_JWT_TOKENS[username];
   const JWTPayload: JWTPayload = JSON.parse(base64Decode(accessToken.split('.')[1]));
 

package/js/settings.dev.dist.ts

@@ -1,12 +1,3 @@
-/**
- * Available users:
- *  * admin
- *  * user0
- *  * user1
- *  * user2
- *  * user3
- *  * user4
- *  * organization_owner
- *  * student_user
- */
-export const CURRENT_JOANIE_DEV_DEMO_USER = 'admin';
+import { DevDemoUser } from 'api/lms/dummy';
+
+export const CURRENT_JOANIE_DEV_DEMO_USER: DevDemoUser = 'admin';

package/js/utils/CreditCardHelper/index.spec.tsx

@@ -27,9 +27,10 @@ describe('CreditCardHelper', () => {
   });
 
   it('is soon expired', () => {
-    const expirationDate = faker.date.future({
-      refDate: new Date(),
-      years: 2.99 / 12,
+    const now = new Date();
+    const expirationDate = faker.date.between({
+      from: now,
+      to: new Date(now.getFullYear(), now.getMonth() + 4, 0, 23, 59, 59),
     });
 
     expect(
@@ -43,7 +44,10 @@ describe('CreditCardHelper', () => {
   });
 
   it('is expired', () => {
-    const date = faker.date.past();
+    const now = new Date();
+    const date = faker.date.past({
+      refDate: new Date(now.getFullYear(), now.getMonth(), 0, 23, 59, 59),
+    });
     expect(
       CreditCardHelper.getExpirationState(
         CreditCardFactory({

package/js/utils/CreditCardHelper/index.tsx

@@ -15,16 +15,29 @@ export class CreditCardHelper {
     if (!creditCard.expiration_month || !creditCard.expiration_year) {
       return false;
     }
-    const expirationDate = new Date(creditCard.expiration_year, creditCard.expiration_month - 1, 1);
-    const limitDate = new Date();
-    limitDate.setMonth(limitDate.getMonth() + 3);
-    return limitDate.getTime() > expirationDate.getTime();
+    const expirationDate = new Date(
+      creditCard.expiration_year,
+      creditCard.expiration_month,
+      0,
+      23,
+      59,
+      59,
+    );
+    const limitDate = new Date(new Date().getFullYear(), new Date().getMonth() + 4, 0, 23, 59, 59);
+    return limitDate.getTime() >= expirationDate.getTime();
   }
 
   static isExpired(creditCard: CreditCard): boolean {
-    const expirationDate = new Date(creditCard.expiration_year, creditCard.expiration_month - 1, 1);
+    const expirationDate = new Date(
+      creditCard.expiration_year,
+      creditCard.expiration_month,
+      0,
+      23,
+      59,
+      59,
+    );
     const now = new Date();
-    return expirationDate.getTime() < now.getTime();
+    return expirationDate.getTime() <= now.getTime();
   }
 
   static getExpirationState(creditCard: CreditCard): CreditCardExpirationStatus {

package/js/widgets/Dashboard/utils/teacherRouteMessages.tsx

@@ -141,7 +141,7 @@ export const TEACHER_DASHBOARD_ROUTE_LABELS = defineMessages<TeacherDashboardPat
   [TeacherDashboardPaths.ORGANIZATION_PRODUCT]: {
     id: 'components.TeacherDashboard.TeacherDashboardRoutes.organization.course.product.label',
     description: 'Label of the organization product view.',
-    defaultMessage: 'Training',
+    defaultMessage: 'General information',
   },
   [TeacherDashboardPaths.COURSE]: {
     id: 'components.TeacherDashboard.TeacherDashboardRoutes.course.label',
@@ -156,7 +156,7 @@ export const TEACHER_DASHBOARD_ROUTE_LABELS = defineMessages<TeacherDashboardPat
   [TeacherDashboardPaths.COURSE_PRODUCT]: {
     id: 'components.TeacherDashboard.TeacherDashboardRoutes.course.product.label',
     description: 'Label of the product view.',
-    defaultMessage: 'Training',
+    defaultMessage: 'General information',
   },
   [TeacherDashboardPaths.COURSE_CONTRACTS]: {
     id: 'components.TeacherDashboard.TeacherDashboardRoutes.course.contracts.label',

package/package.json

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