richie-education 2.25.0-b2.dev81 → 2.25.0-b2.dev83

package/js/components/RegisteredAddress/index.tsx

@@ -61,7 +61,7 @@ const RegisteredAddress = ({ promote, select, edit, remove, address }: Props) =>
       <Radio
         aria-describedby={`address-${address.id}-infos`}
         aria-label={intl.formatMessage(messages.promoteButtonLabel, { title: address.title })}
-        onClick={() => promote(address)}
+        onChange={() => promote(address)}
         title={intl.formatMessage(messages.promoteButtonLabel, { title: address.title })}
         name="registered-addresses"
         checked={address.is_main}

package/js/components/SaleTunnel/components/SaleTunnelStepPayment/index.spec.tsx

@@ -5,6 +5,7 @@ import { QueryClientProvider } from '@tanstack/react-query';
 import { CunninghamProvider } from '@openfun/cunningham-react';
 import { PropsWithChildren, useMemo, useState } from 'react';
 import userEvent from '@testing-library/user-event';
+import { queryByRole } from '@testing-library/dom';
 import {
   RichieContextFactory as mockRichieContextFactory,
   UserFactory,
@@ -210,6 +211,9 @@ describe('SaleTunnelStepPayment', () => {
       },
     );
 
+    // The select field should not be clearable
+    expect(queryByRole(dropdown, 'button', { name: 'Clear selection' })).toBeNull();
+
     // A button to add an address should be displayed
     const $button = screen.getByText('Add an address', { selector: 'button' });
 

package/js/components/SaleTunnel/components/SaleTunnelStepPayment/index.tsx

@@ -123,7 +123,7 @@ export const SaleTunnelStepPayment = ({ next }: SaleTunnelStepPaymentProps) => {
    * Retrieve address through its `id` provided by the event target value
    * then update `selectedAddress` state
    *
-   * @param {React.ChangeEvent<HTMLSelectElement>} event
+   * @param {string} newValue
    */
   const handleSelectAddress = (newValue: string) => {
     const targetedAddress = addresses.items.find((a) => a.id === newValue);
@@ -220,6 +220,7 @@ export const SaleTunnelStepPayment = ({ next }: SaleTunnelStepPaymentProps) => {
                 <Select
                   className="form-field--minimal"
                   name="invoice_address"
+                  clearable={false}
                   label={intl.formatMessage(messages.userBillingAddressSelectLabel)}
                   onChange={(e) => handleSelectAddress((e.target.value || '') as string)}
                   defaultValue={selectedAddress!.id || ''}

package/js/components/TeacherDashboardCourseList/index.spec.tsx

@@ -68,7 +68,7 @@ describe('components/TeacherDashboardCourseList', () => {
       title: "Full training: Let's dance, the online lesson",
     }).one();
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?page=1&page_size=${perPage}`,
+      `https://joanie.endpoint/api/v1.0/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
       mockPaginatedResponse([productCooking, productDancing], 15, false),
     );
 
@@ -98,7 +98,7 @@ describe('components/TeacherDashboardCourseList', () => {
       `https://joanie.endpoint/api/v1.0/courses/?has_listed_course_runs=true&page=1&page_size=${perPage}`,
     );
     expect(calledUrls).toContain(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?page=1&page_size=${perPage}`,
+      `https://joanie.endpoint/api/v1.0/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
     );
 
     expect(
@@ -124,7 +124,7 @@ describe('components/TeacherDashboardCourseList', () => {
       },
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?page=1&page_size=${perPage}`,
+      `https://joanie.endpoint/api/v1.0/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
       mockPaginatedResponse([], 0, false),
       {
         overwriteRoutes: true,
@@ -154,7 +154,7 @@ describe('components/TeacherDashboardCourseList', () => {
       `https://joanie.endpoint/api/v1.0/courses/?has_listed_course_runs=true&page=1&page_size=${perPage}`,
     );
     expect(calledUrls).toContain(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?page=1&page_size=${perPage}`,
+      `https://joanie.endpoint/api/v1.0/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
     );
 
     expect(await screen.findByText('You have no courses yet.')).toBeInTheDocument();

package/js/components/TeacherDashboardCourseList/index.tsx

@@ -6,6 +6,7 @@ import { Spinner } from 'components/Spinner';
 import context from 'utils/context';
 import { useCourseProductUnion } from 'hooks/useCourseProductUnion';
 import { useIntersectionObserver } from 'hooks/useIntersectionObserver';
+import { ProductType } from 'types/Joanie';
 
 const messages = defineMessages({
   loading: {
@@ -41,7 +42,7 @@ const TeacherDashboardCourseList = ({
     isLoading,
     next,
     hasMore,
-  } = useCourseProductUnion({ perPage: 25, organizationId });
+  } = useCourseProductUnion({ perPage: 25, organizationId, productType: ProductType.CREDENTIAL });
   useIntersectionObserver({
     target: loadMoreButtonRef,
     onIntersect: next,

package/js/hooks/useCourseProductUnion/index.ts

@@ -6,6 +6,7 @@ import {
   CourseProductRelation,
   CourseQueryFilters,
   CourseProductRelationQueryFilters,
+  ProductType,
 } from 'types/Joanie';
 import useUnionResource, { ResourceUnionPaginationProps } from 'hooks/useUnionResource';
 
@@ -26,11 +27,13 @@ const messages = defineMessages({
 
 interface UseCourseProductUnionProps extends ResourceUnionPaginationProps {
   organizationId?: string;
+  productType?: ProductType;
 }
 
 export const useCourseProductUnion = ({
   perPage = 50,
   organizationId,
+  productType,
 }: UseCourseProductUnionProps = {}) => {
   const api = useJoanieApi();
   return useUnionResource<
@@ -47,7 +50,7 @@ export const useCourseProductUnion = ({
     queryBConfig: {
       queryKey: ['user', 'course_product_relations'],
       fn: api.courseProductRelations.get,
-      filters: { organization_id: organizationId },
+      filters: { organization_id: organizationId, product_type: productType },
     },
     perPage,
     errorGetMessage: messages.errorGet,

package/js/pages/TeacherDashboardCoursesLoader/index.spec.tsx

@@ -57,7 +57,7 @@ describe('components/TeacherDashboardCoursesLoader', () => {
       mockPaginatedResponse(CourseListItemFactory().many(15), 15, false),
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?page=1&page_size=${perPage}`,
+      `https://joanie.endpoint/api/v1.0/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
       mockPaginatedResponse(CourseProductRelationFactory().many(15), 15, false),
     );
 
@@ -87,7 +87,7 @@ describe('components/TeacherDashboardCoursesLoader', () => {
     const calledUrls = fetchMock.calls().map((call) => call[0]);
     expect(calledUrls).toHaveLength(nbApiCalls);
     expect(calledUrls).toContain(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?page=1&page_size=${perPage}`,
+      `https://joanie.endpoint/api/v1.0/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
     );
 
     // section titles

package/js/types/Joanie.ts

@@ -435,6 +435,7 @@ export interface CourseProductQueryFilters extends ResourcesQuery {
 export interface CourseProductRelationQueryFilters extends PaginatedResourceQuery {
   id?: CourseProductRelation['id'];
   organization_id?: Organization['id'];
+  product_type?: ProductType;
 }
 
 export enum ContractState {

package/package.json

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