richie-education 2.14.0 → 2.14.1

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

@@ -1,9 +1,17 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { IntlProvider } from 'react-intl';
-
+import { HistoryProvider } from 'data/useHistory';
 import LanguageSelector from '.';
 
+jest.mock('utils/indirection/window', () => ({
+  location: {
+    assign: jest.fn(),
+    replace: jest.fn(),
+    search: '?args=0',
+  },
+}));
+
 describe('<LanguageSelector />', () => {
   it('shows a dropdown menu that allows the user to change languages', async () => {
     const languages = {
@@ -41,4 +49,35 @@ describe('<LanguageSelector />', () => {
       name: 'Switch to Français (currently selected)',
     });
   });
+
+  it('should preserve location search parameters if there are any', async () => {
+    const languages = {
+      en: {
+        code: 'en',
+        name: 'Anglais',
+        url: '/switch/to/en/',
+      },
+      fr: {
+        code: 'fr',
+        name: 'Français',
+        url: '/switch/to/fr/',
+      },
+    };
+
+    render(
+      <HistoryProvider>
+        <IntlProvider locale="en">
+          <LanguageSelector currentLanguage="fr" languages={languages} />
+        </IntlProvider>
+      </HistoryProvider>,
+    );
+
+    const button = screen.getByLabelText('Select a language: Français', {
+      selector: 'button',
+    });
+
+    await userEvent.click(button);
+    const link = screen.getByRole('link', { name: 'Switch to Anglais' });
+    expect(link).toHaveAttribute('href', '/switch/to/en/?args=0');
+  });
 });

package/js/components/LanguageSelector/index.tsx

@@ -1,6 +1,6 @@
 import { useSelect } from 'downshift';
 import { FC } from 'react';
-import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { location } from 'utils/indirection/window';
 
@@ -51,7 +51,8 @@ const LanguageSelector: FC<LanguageSelectorProps> = ({ currentLanguage, language
     onSelectedItemChange: ({ selectedItem: newSelectedItem }) => {
       // Manually handle location changes in case the user interacted with a keyboard, and therefore with a
       // list item, and not by clicking on the actual links.
-      location.replace(newSelectedItem!.url);
+
+      location.replace(`${newSelectedItem!.url}${location.search}`);
     },
   });
 
@@ -77,7 +78,7 @@ const LanguageSelector: FC<LanguageSelectorProps> = ({ currentLanguage, language
                 className={`selector__list__link ${
                   highlightedIndex === index ? 'selector__list__link--highlighted' : ''
                 }`}
-                href={language.url}
+                href={`${language!.url}${location.search}`}
                 title={`${intl.formatMessage(messages.switchToLanguage, {
                   language: language.name,
                 })}${
@@ -87,7 +88,6 @@ const LanguageSelector: FC<LanguageSelectorProps> = ({ currentLanguage, language
                 }`}
               >
                 {language.name}
-                {}
               </a>
             </li>
           ))}

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

@@ -75,7 +75,7 @@ describe('<SearchFilterGroupModal />', () => {
       const coursesDeferred = new Deferred();
       fetchMock.get(
         '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=' +
-          range(0, 21).join(','),
+          range(0, 21).join('&universities_aggs='),
         coursesDeferred.promise,
       );
 
@@ -145,7 +145,7 @@ describe('<SearchFilterGroupModal />', () => {
       const coursesDeferred = new Deferred();
       fetchMock.get(
         '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=' +
-          range(21, 42).join(','),
+          range(21, 42).join('&universities_aggs='),
         coursesDeferred.promise,
       );
 
@@ -190,7 +190,7 @@ describe('<SearchFilterGroupModal />', () => {
       const coursesDeferred = new Deferred();
       fetchMock.get(
         '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=' +
-          range(42, 46).join(','),
+          range(42, 46).join('&universities_aggs='),
         coursesDeferred.promise,
       );
 
@@ -235,7 +235,7 @@ describe('<SearchFilterGroupModal />', () => {
       fetchMock.get('/api/v1.0/universities/?limit=21&offset=0', universitiesDeferred.promise);
       const coursesDeferred = new Deferred();
       fetchMock.get(
-        '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-42,L-84,L-99',
+        '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-42&universities_aggs=L-84&universities_aggs=L-99',
         coursesDeferred.promise,
       );
 
@@ -312,7 +312,7 @@ describe('<SearchFilterGroupModal />', () => {
       );
       const coursesDeferred = new Deferred();
       fetchMock.get(
-        '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-12,L-17',
+        '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-12&universities_aggs=L-17',
         coursesDeferred.promise,
       );
       fireEvent.change(field, { target: { value: 'user' } });
@@ -361,7 +361,7 @@ describe('<SearchFilterGroupModal />', () => {
       );
       const coursesDeferred = new Deferred();
       fetchMock.get(
-        '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-03,L-66',
+        '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-03&universities_aggs=L-66',
         coursesDeferred.promise,
       );
       fireEvent.change(field, { target: { value: 'user input' } });
@@ -409,7 +409,7 @@ describe('<SearchFilterGroupModal />', () => {
     fetchMock.get('/api/v1.0/universities/?limit=21&offset=0', universitiesDeferred.promise);
     const coursesDeferred = new Deferred();
     fetchMock.get(
-      '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-42,L-84,L-99',
+      '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-42&universities_aggs=L-84&universities_aggs=L-99',
       coursesDeferred.promise,
     );
 
@@ -468,7 +468,7 @@ describe('<SearchFilterGroupModal />', () => {
     fetchMock.get('/api/v1.0/universities/?limit=21&offset=0', universitiesDeferred.promise);
     const coursesDeferred = new Deferred();
     fetchMock.get(
-      '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-42,L-84,L-99',
+      '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-42&universities_aggs=L-84&universities_aggs=L-99',
       coursesDeferred.promise,
     );
 
@@ -583,7 +583,7 @@ describe('<SearchFilterGroupModal />', () => {
       objects: [{ id: 'L-42' }, { id: 'L-84' }, { id: 'L-99' }],
     });
     fetchMock.get(
-      '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-42,L-84,L-99',
+      '/api/v1.0/courses/?facet_sorting=name&limit=21&offset=0&scope=filters&universities_aggs=L-42&universities_aggs=L-84&universities_aggs=L-99',
       { throws: new Error('Failed to search for universities') },
     );
 

package/js/data/getResourceList/index.ts

@@ -17,14 +17,11 @@ export async function fetchList(
   params: APIListRequestParams = API_LIST_DEFAULT_PARAMS,
 ): Promise<FetchListResponse> {
   try {
-    const response = await fetch(
-      `/api/v1.0/${kind}/?${stringify(params, { arrayFormat: 'comma' })}`,
-      {
-        headers: {
-          'Content-Type': 'application/json',
-        },
+    const response = await fetch(`/api/v1.0/${kind}/?${stringify(params)}`, {
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+    });
 
     if (!response.ok) {
       // Push remote errors to the error channel for consistency

package/package.json

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

package/scss/objects/_course_glimpses.scss

@@ -157,7 +157,8 @@ $course-glimpse-content-padding-sides: 0.7rem !default;
     position: relative;
   }
 
-  &__title {
+  &__title,
+  &__title-text {
     @include font-size($h6-font-size);
     color: r-theme-val(course-glimpse, title-color);
     font-family: $r-font-family-montserrat;