richie-education 3.2.1 → 3.2.2-dev27

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

@@ -16,6 +16,9 @@ import {
   LearnerDashboardPaths,
 } from 'widgets/Dashboard/utils/learnerRoutesPaths';
 import { CertificateType } from 'types/Joanie';
+import { DashboardBatchOrders } from 'pages/DashboardBatchOrders';
+import { DashboardBatchOrderLayout } from 'pages/DashboardBatchOrderLayout';
+import { DashboardBatchOrderLoader } from '../components/DashboardBatchOrderLoader';
 
 export interface DashboardRouteHandle {
   crumbLabel?: MessageDescriptor;
@@ -53,6 +56,33 @@ export function getLearnerDashboardRoutes() {
         },
       ],
     },
+    {
+      path: LearnerDashboardPaths.BATCH_ORDERS,
+      handle: {
+        crumbLabel: LEARNER_DASHBOARD_ROUTE_LABELS[LearnerDashboardPaths.BATCH_ORDERS],
+      },
+      element: <Outlet />,
+      children: [
+        {
+          index: true,
+          element: <DashboardBatchOrders />,
+        },
+        {
+          path: LearnerDashboardPaths.BATCH_ORDER,
+          element: <DashboardBatchOrderLayout />,
+          handle: {
+            renderLayout: true,
+            crumbLabel: LEARNER_DASHBOARD_ROUTE_LABELS[LearnerDashboardPaths.BATCH_ORDER],
+          },
+          children: [
+            {
+              index: true,
+              element: <DashboardBatchOrderLoader />,
+            },
+          ],
+        },
+      ],
+    },
     {
       path: LearnerDashboardPaths.CERTIFICATES,
       children: [

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

@@ -16,6 +16,8 @@ export enum LearnerDashboardPaths {
   PREFERENCES_ADDRESS_EDITION = `${PREFERENCES}/addresses/:addressId`,
   PREFERENCES_ADDRESS_CREATION = `${PREFERENCES}/addresses/create`,
   PREFERENCES_CREDIT_CARD_EDITION = `${PREFERENCES}/credit-cards/:creditCardId`,
+  BATCH_ORDER = `/batch-orders/:batchOrderId`,
+  BATCH_ORDERS = `/batch-orders`,
 }
 
 export const LEARNER_DASHBOARD_ROUTE_LABELS = defineMessages<LearnerDashboardPaths>({
@@ -79,4 +81,14 @@ export const LEARNER_DASHBOARD_ROUTE_LABELS = defineMessages<LearnerDashboardPat
     description: 'Label of the credit cards edition view.',
     defaultMessage: 'Edit credit card "{creditCardTitle}"',
   },
+  [LearnerDashboardPaths.BATCH_ORDER]: {
+    id: 'components.Dashboard.DashboardRoutes.batchOrder.label',
+    description: 'Label of the order view used in navigation components.',
+    defaultMessage: '{batchOrderTitle}',
+  },
+  [LearnerDashboardPaths.BATCH_ORDERS]: {
+    id: 'components.Dashboard.DashboardRoutes.batchOrders.label',
+    description: 'Label of the order view used in navigation components.',
+    defaultMessage: 'My batch orders',
+  },
 });

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

@@ -9,6 +9,8 @@ export enum TeacherDashboardPaths {
   ORGANIZATION = `${ROOT}/organizations/:organizationId`,
   ORGANIZATION_CONTRACTS = `${ORGANIZATION}/contracts`,
   ORGANIZATION_COURSES = `${ORGANIZATION}/courses`,
+  ORGANIZATION_QUOTES = `${ORGANIZATION}/quotes`,
+  ORGANIZATION_AGREEMENTS = `${ORGANIZATION}/agreements`,
   ORGANIZATION_PRODUCT = `${ORGANIZATION_COURSES}/:courseId/products/:offeringId`,
   ORGANIZATION_COURSE_CONTRACTS = `${ORGANIZATION_COURSES}/:courseId/contracts`,
   ORGANIZATION_PRODUCT_CONTRACTS = `${ORGANIZATION_COURSES}/:courseId/products/:offeringId/contracts`,
@@ -42,6 +44,16 @@ export const TEACHER_DASHBOARD_ROUTE_LABELS = defineMessages<TeacherDashboardPat
     description: 'Label of the organization courses view.',
     defaultMessage: 'Courses',
   },
+  [TeacherDashboardPaths.ORGANIZATION_QUOTES]: {
+    id: 'components.TeacherDashboard.TeacherDashboardRoutes.organization.quotes.label',
+    description: 'Label of the organization quotes view.',
+    defaultMessage: 'Quotes',
+  },
+  [TeacherDashboardPaths.ORGANIZATION_AGREEMENTS]: {
+    id: 'components.TeacherDashboard.TeacherDashboardRoutes.organization.agreements.label',
+    description: 'Label of the organization agreements view.',
+    defaultMessage: 'Agreements',
+  },
   [TeacherDashboardPaths.ORGANIZATION_CONTRACTS]: {
     id: 'components.TeacherDashboard.TeacherDashboardRoutes.organization.contracts.label',
     description: 'Label of the organization contracts view.',

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

@@ -13,6 +13,8 @@ import {
   TEACHER_DASHBOARD_ROUTE_LABELS,
   TeacherDashboardPaths,
 } from 'widgets/Dashboard/utils/teacherDashboardPaths';
+import { TeacherDashboardOrganizationQuotesLayout } from 'pages/TeacherDashboardOrganizationQuotesLayout';
+import { TeacherDashboardOrganizationAgreementsLayout } from 'pages/TeacherDashboardOrganizationAgreementsLayout';
 
 export function getTeacherDashboardRoutes() {
   const routes: RouteObject[] = [
@@ -155,6 +157,21 @@ export function getTeacherDashboardRoutes() {
               TEACHER_DASHBOARD_ROUTE_LABELS[TeacherDashboardPaths.ORGANIZATION_CONTRACTS],
           },
         },
+        {
+          path: TeacherDashboardPaths.ORGANIZATION_QUOTES,
+          element: <TeacherDashboardOrganizationQuotesLayout />,
+          handle: {
+            crumbLabel: TEACHER_DASHBOARD_ROUTE_LABELS[TeacherDashboardPaths.ORGANIZATION_QUOTES],
+          },
+        },
+        {
+          path: TeacherDashboardPaths.ORGANIZATION_AGREEMENTS,
+          element: <TeacherDashboardOrganizationAgreementsLayout />,
+          handle: {
+            crumbLabel:
+              TEACHER_DASHBOARD_ROUTE_LABELS[TeacherDashboardPaths.ORGANIZATION_AGREEMENTS],
+          },
+        },
       ],
     },
   ];

package/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/index.spec.tsx

@@ -175,7 +175,10 @@ describe('CourseProductItem', () => {
         course={PacedCourseFactory({ code: '00000' }).one()}
         productId={product.id}
       />,
-      { queryOptions: { client: createTestQueryClient({ user: null }) } },
+      {
+        intlOptions: { timeZone: 'UTC' },
+        queryOptions: { client: createTestQueryClient({ user: null }) },
+      },
     );
 
     await screen.findByRole('heading', { level: 3, name: product.title });
@@ -238,7 +241,10 @@ describe('CourseProductItem', () => {
         course={PacedCourseFactory({ code: '00000' }).one()}
         productId={product.id}
       />,
-      { queryOptions: { client: createTestQueryClient({ user: null }) } },
+      {
+        intlOptions: { timeZone: 'UTC' },
+        queryOptions: { client: createTestQueryClient({ user: null }) },
+      },
     );
 
     await screen.findByRole('heading', { level: 3, name: product.title });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "richie-education",
-  "version": "3.2.1",
+  "version": "3.2.2-dev27",
   "description": "A CMS to build learning portals for Open Education",
   "main": "sandbox/manage.py",
   "scripts": {
@@ -44,11 +44,14 @@
     "@babel/preset-env": "7.26.9",
     "@babel/preset-react": "7.26.3",
     "@babel/preset-typescript": "7.26.0",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
     "@faker-js/faker": "9.6.0",
     "@formatjs/cli": "6.6.2",
     "@formatjs/intl-relativetimeformat": "11.4.11",
     "@hookform/resolvers": "4.1.3",
     "@lyracom/embedded-form-glue": "1.4.2",
+    "@mui/material": "^7.3.2",
     "@openfun/cunningham-react": "3.0.0",
     "@openfun/cunningham-tokens": "2.2.0",
     "@sentry/browser": "9.8.0",

package/scss/colors/_theme.scss

@@ -249,7 +249,7 @@ $r-theme: (
   ),
   category-badges: (
     primary-item: $indianred3-scheme,
-    secondary-item: $firebrick6-scheme,
+    secondary-item: $light-grey-scheme,
     tertiary-item: $smoke-scheme,
   ),
   category-tags: (

package/scss/components/_index.scss

@@ -17,6 +17,7 @@
 @import '../../js/components/RegisteredAddress/styles';
 @import '../../js/components/SearchInput/styles';
 @import '../../js/components/Spinner/styles';
+@import '../../js/pages/TeacherDashboardOrganizationQuotes/styles';
 @import '../../js/pages/DashboardAddressesManagement/styles';
 @import '../../js/pages/DashboardCertificates/styles';
 @import '../../js/pages/DashboardCourses/styles';