Core 597 include Spanish titles in renewal form (#2797)

* Include Spanish  books like adoption form does

* Simplify RawBook to Book

* Tests

* Test coverage

Author: RoyEJohnson

src/app/components/multiselect/book-tags/sf-book-context.ts

@@ -1,19 +1,23 @@
 import React from 'react';
 import buildContext from '~/components/jsx-helpers/build-context';
 import useMultiselectContext from '../multiselect-context';
-import fetchBooks from '~/models/books';
+import {fetchAllBooks} from '~/models/books';
 import {
     salesforceTitles,
     subjects as getSubjects,
     SalesforceBook
 } from '~/helpers/books';
+import { useDataFromPromise } from '~/helpers/page-data-utils';
 
 function useSFBooks() {
     const [books, setBooks] = React.useState<SalesforceBook[]>([]);
+    const fetched = useDataFromPromise(fetchAllBooks);
 
     React.useEffect(() => {
-        fetchBooks.then(salesforceTitles).then(setBooks);
-    }, []);
+        if (fetched) {
+            setBooks(salesforceTitles(fetched));
+        }
+    }, [fetched]);
     return books;
 }
 

src/app/components/shell/router-helpers/use-link-handler.ts

@@ -20,12 +20,12 @@ export type TrackedMouseEvent = React.MouseEvent<HTMLAnchorElement> & {
 function handleExternalLink(href: Location['href'], el: HTMLElement) {
     if (el.dataset.local === 'true') {
         // REX books open in the current window; track them
-        window.location.href = href;
+        window.location.assign(href);
     } else {
         const newWindow = window.open(href, '_blank');
 
         if (newWindow === null) {
-            window.location.href = href;
+            window.location.assign(href);
         }
     }
 }
@@ -45,7 +45,7 @@ export default function useLinkHandler() {
             const stripped = linkHelper.stripOpenStaxDomain(path);
 
             if (stripped.startsWith('http')) {
-                window.location.href = stripped;
+                window.location.assign(stripped);
             } else {
                 navigate(stripped, state);
             }

src/app/models/books.ts

@@ -24,19 +24,14 @@ const bookFields = [
 
 type RawBook = Omit<Book, 'subjects'> & {book_subjects: {subject_name: string}[];};
 
-function rawToBook(b: RawBook): Book {
-    const result = b as Book & RawBook;
-
-    result.subjects = b.book_subjects.map((sObj) => sObj.subject_name);
-
-    return result;
+function rawToBook(b: RawBook) {
+    return {
+        ...b,
+        subjects: b.book_subjects.map((sObj) => sObj.subject_name)
+    };
 }
 
 export const fetchAllBooks = cmsFetch(`pages/?type=books.Book&fields=${bookFields}&limit=250`)
 .then((r: {items: RawBook[]}) => {
-    for (const b of r.items) {
-        rawToBook(b);
-    }
-
-    return r.items;
+    return r.items.map(rawToBook);
 });

src/app/pages/renewal-form/renewal-form.tsx

@@ -61,15 +61,23 @@ function HiddenFields({
     const source = fromValue || 'email';
     const {selectedItems} = useBookTagsContext();
     const json = React.useMemo(
-        () =>
-            JSON.stringify({
-                Books: selectedItems.map(({value: name}) => ({
-                    name,
+        () => {
+            const rewrittenBookData = selectedItems.map(({value: name}) => {
+                const match = name.match(/(.*?) *\[(.*)\]/);
+                const [title, language] = match ? match.slice(1) : [name, 'English'];
+
+                return ({
+                    name: title,
                     students: +counts[name],
+                    language,
                     baseYear: year
-                }))
-            }),
-        [selectedItems, counts, year]
+                });
+            });
+
+            return JSON.stringify({
+                Books: rewrittenBookData
+            });
+        }, [selectedItems, counts, year]
     );
     const subjects = React.useMemo(
         () => selectedItems.map((i) => i.value).join(';'),

test/helpers/fetch-mocker.js

@@ -1,5 +1,5 @@
 import adoptionFormData from '../src/data/adoption-form';
-import allBooksData from '../src/data/all-books';
+import allBooksData from '../src/data/all-books.json';
 import amazonBlurb from '../src/data/amazon-blurb';
 import algebraData from '../src/data/details-college-algebra';
 import assignableData from '../src/data/assignable.json';
@@ -67,7 +67,7 @@ global.fetch = jest.fn().mockImplementation((...args) => {
     const isBlogCollection = args[0].includes('blogcollection');
     const isBooks = (/api\/books/).test(args[0]);
     const isBooksForAnalytics = (/book_student_resources/).test(args[0]);
-    const isBookTitles = (/fields=title,id/).test(args[0]);
+    const isBookTitles = args[0].endsWith('pages/?type=books.Book&fields=title,id,book_state,promote_snippet&limit=250');
     const isBuyprint = args[0].includes('buyprint');
     const isChemistry = args[0].endsWith('pages/93/?format=json');
     const isDonationPopup = args[0].includes('donation-popup');

test/src/components/book-selector.test.tsx

@@ -47,7 +47,7 @@ describe('book-selector', () => {
         render(<Component route='/selector?Calculus' />);
         const checkboxes = await screen.findAllByRole('checkbox');
 
-        expect(checkboxes).toHaveLength(9);
+        expect(checkboxes).toHaveLength(58);
         const checked = await screen.findByRole('checkbox', {checked: true});
         const unchecked = screen.getAllByRole('checkbox', {checked: false});
 

test/src/components/shell/use-link-handler.test.tsx

@@ -60,6 +60,7 @@ describe('use-link-handler', () => {
             <InnerComponent {...props} />
         </MemoryRouter>
     );
+    const saveError = console.error;
 
     afterEach(jest.resetAllMocks);
 
@@ -98,10 +99,29 @@ describe('use-link-handler', () => {
         (useNavigate as jest.Mock).mockReturnValue(navigate);
 
         render(<Component />);
+        console.error = jest.fn();
         await user.click(screen.getByRole('link'));
+        expect(console.error).toHaveBeenCalled();
+        console.error = saveError;
         expect(notPrevented).not.toBeCalled();
         expect(navigate).toBeCalledWith('whatever', {x: 0, y: 0});
     });
+    it('Changes window location when stripping does nothing', async () => {
+        setPortalPrefix('/portal');
+        const el = document.createElement('a');
+
+        jest.spyOn(linkHelper, 'validUrlClick').mockReturnValue(el);
+        jest.spyOn(linkHelper, 'stripOpenStaxDomain').mockReturnValue(
+            'http://whatever'
+        );
+
+        render(<Component />);
+        console.error = jest.fn();
+        await user.click(screen.getByRole('link'));
+        expect(console.error).toHaveBeenCalled();
+        console.error = saveError;
+        expect(notPrevented).not.toBeCalled();
+    });
     it('calls piTracker if available', async () => {
         setPortalPrefix('/portal');
         const navigate = jest.fn();
@@ -141,7 +161,10 @@ describe('use-link-handler', () => {
         (useNavigate as jest.Mock).mockReturnValue(navigate);
 
         render(<Component />);
+        console.error = jest.fn();
         await user.click(screen.getByRole('link'));
+        expect(console.error).toHaveBeenCalled();
+        console.error = saveError;
         expect(notPrevented).not.toBeCalled();
         expect(navigate).not.toBeCalled();
     });
@@ -163,7 +186,10 @@ describe('use-link-handler', () => {
         (useNavigate as jest.Mock).mockReturnValue(navigate);
 
         render(<Component />);
+        console.error = jest.fn();
         await user.click(screen.getByRole('link'));
+        expect(console.error).toHaveBeenCalled();
+        console.error = saveError;
         expect(notPrevented).not.toBeCalled();
         expect(navigate).not.toBeCalled();
     });
@@ -212,5 +238,6 @@ describe('use-link-handler', () => {
         );
         await user.click(screen.getByRole('link'));
         expect(console.error).toBeCalled();
+        console.error = saveError;
     });
 });