core-940

Author: RoyEJohnson

src/app/lang/en.js

@@ -47,9 +47,6 @@ export default {
     'getit.pdf.download': ' Download a PDF',
     'getit.pdf.sample': ' sample',
     'getit.print': 'Order a print copy',
-    'getit.ibooks.download': 'Download on iBooks',
-    'getit.ibooks.part1': 'iBooks part 1',
-    'getit.ibooks.part2': 'iBooks part 2',
     'getit.kindle.header': 'Download for Kindle',
     'getit.kindle.disclaimer': 'As an Amazon Associate we earn from qualifying purchases',
     'how-using.how-many': 'How many students are using {title} each semester?',
@@ -89,7 +86,8 @@ export default {
     'pubInfo.pub.web': 'Web Version Last Updated:',
     'pubInfo.pub.color': 'Color',
     'pubInfo.pub.b-w': 'Black and White',
-    'pubInfo.pub.dig': 'Digital',
+    'pubInfo.pub.dig': 'Digital PDF',
+    'pubInfo.pub.assignable': 'Assignable',
     'school-type.College/University (4)': 'College/University (4)',
     'school-type.Technical/Community College (2)': 'Technical/Community College (2)',
     'school-type.Career School/For-Profit (2)': 'Career School/For-Profit (2)',

src/app/lang/es.js

@@ -47,9 +47,6 @@ export default {
     'getit.pdf.download': ' Descargar un PDF',
     'getit.pdf.sample': ' muestra',
     'getit.print': 'Solicitar una copia impresa',
-    'getit.ibooks.download': 'Descargar en iBooks',
-    'getit.ibooks.part1': 'iBooks parte 1',
-    'getit.ibooks.part2': 'iBooks parte 2',
     'getit.kindle.header': 'Descargar para Kindle',
     'getit.kindle.disclaimer': 'Como Asociado de Amazon, ganamos con las compras que califican',
     'how-using.how-many': '¿Cuántos estudiantes utilizan {title} cada semestre?',
@@ -89,7 +86,8 @@ export default {
     'pubInfo.pub.web': 'Última actualización de la versión web:',
     'pubInfo.pub.color': 'Color',
     'pubInfo.pub.b-w': 'Blanco y negro',
-    'pubInfo.pub.dig': 'Edición digital',
+    'pubInfo.pub.dig': 'Edición digital (PDF)',
+    'pubInfo.pub.assignable': 'Assignable',
     'school-type.College/University (4)': 'Facultad/Universidad (4)',
     'school-type.Technical/Community College (2)': 'Colegio técnico/comunitario (2)',
     'school-type.Career School/For-Profit (2)': 'Escuela profesional/Con fines de lucro (2)',

src/app/pages/details/common/get-this-title-files/options.tsx

@@ -8,7 +8,6 @@ import {faListOl} from '@fortawesome/free-solid-svg-icons/faListOl';
 import {faCloudDownloadAlt} from '@fortawesome/free-solid-svg-icons/faCloudDownloadAlt';
 import {faVolumeUp} from '@fortawesome/free-solid-svg-icons/faVolumeUp';
 import {faAmazon} from '@fortawesome/free-brands-svg-icons/faAmazon';
-import {faApple} from '@fortawesome/free-brands-svg-icons/faApple';
 import $ from '~/helpers/$';
 import {treatSpaceOrEnterAsClick} from '~/helpers/events';
 import {useIntl, FormattedMessage} from 'react-intl';
@@ -230,48 +229,6 @@ export function BookshareOption({model}: {model: Model}) {
     );
 }
 
-export function Ibooks2Volumes({model}: {model: Model}) {
-    const intl = useIntl();
-    const download = intl.formatMessage({id: 'getit.ibooks.download'});
-
-    return (
-        <React.Fragment>
-            <span className="option-header">
-                <IconAndText icon={faApple} text={download} />
-            </span>
-            <a href={model.ibookLink} data-track="iBooks">
-                <FormattedMessage
-                    id="getit.ibooks.part1"
-                    defaultMessage="iBooks part 1"
-                />
-            </a>
-            <a href={model.ibookLink2} data-track="iBooks">
-                <FormattedMessage
-                    id="getit.ibooks.part2"
-                    defaultMessage="iBooks part 2"
-                />
-            </a>
-        </React.Fragment>
-    );
-}
-
-export function IbooksOption({model}: {model: Model}) {
-    const intl = useIntl();
-    const download = intl.formatMessage({id: 'getit.ibooks.download'});
-
-    return (
-        <Option condition={model.ibookLink}>
-            {model.ibookLink2 ? (
-                <Ibooks2Volumes model={model} />
-            ) : (
-                <a href={model.ibookLink} data-track="iBooks">
-                    <IconAndText icon={faApple} text={download} />
-                </a>
-            )}
-        </Option>
-    );
-}
-
 export function KindleOption({model}: {model: Model}) {
     const intl = useIntl();
     const header = intl.formatMessage({id: 'getit.kindle.header'});

src/app/pages/details/common/get-this-title.tsx

@@ -5,7 +5,6 @@ import {
     WebviewOption,
     PdfOption,
     BookshareOption,
-    IbooksOption,
     KindleOption,
     CheggOption,
     OptionExpander
@@ -21,8 +20,6 @@ export type Model = {
     comingSoon: boolean;
     title: string;
     bookshareLink: string;
-    ibookLink: string;
-    ibookLink2: string;
     kindleLink: string;
     webviewRexLink: string;
     webviewLink: string;
@@ -34,22 +31,21 @@ export type Model = {
     cheggLink: string; // These may not be supported at all anymore,
     cheggLinkText: string; // but the CMS is still serving them.
 };
-type ModelKey = 'bookshareLink' | 'ibookLink' | 'kindleLink';
+type ModelKey = 'bookshareLink' | 'kindleLink';
 type TrackedMouseEvent = Parameters<typeof trackLink>[0];
 
 function AdditionalOptions({model}: {model: Model}) {
     return (
         <React.Fragment>
             <BookshareOption model={model} />
-            <IbooksOption model={model} />
             <KindleOption model={model} />
         </React.Fragment>
     );
 }
 
 export default function GetThisTitle({model}: {model: Model}) {
     const additionalOptions = (
-        ['bookshareLink', 'ibookLink', 'kindleLink'] as ModelKey[]
+        ['bookshareLink', 'kindleLink'] as ModelKey[]
     ).filter((key) => model[key]).length;
     const [expanded, toggleExpanded] = useToggle(additionalOptions < 1);
     const interceptLinkClicks = React.useCallback<React.MouseEventHandler>(

src/app/pages/details/common/publication-info.tsx

@@ -216,18 +216,14 @@ export default function PublicationInfo({url, polish}: {
     const model = useDetailsContext();
     const [webUpdate, setWebUpdate] = useState(model.lastUpdatedWeb);
     const intl = useIntl();
-    const [pub, web, hard, paper, dig] = [
+    const [pub, web, hard, paper, dig, assignable] = [
         intl.formatMessage({id: 'pubInfo.pub.pub'}),
         intl.formatMessage({id: 'pubInfo.pub.web'}),
         intl.formatMessage({id: 'pubInfo.pub.color'}),
         intl.formatMessage({id: 'pubInfo.pub.b-w'}),
-        intl.formatMessage({id: 'pubInfo.pub.dig'})
+        intl.formatMessage({id: 'pubInfo.pub.dig'}),
+        intl.formatMessage({id: 'pubInfo.pub.assignable'})
     ];
-    const iBooksLabel =
-        model.ibookVolume2Isbn10 || model.ibookVolume2Isbn13
-            ? intl.formatMessage({id: 'getit.ibooks.part1'})
-            : 'iBooks';
-    const labelPart2 = intl.formatMessage({id: 'getit.ibooks.part2'});
 
     useEffect(() => {
         const isRex = Boolean(model.webviewRexLink);
@@ -260,8 +256,7 @@ export default function PublicationInfo({url, polish}: {
             <IsbnInfo label={hard} tag="print" />
             <IsbnInfo label={paper} tag="printSoftcover" />
             <IsbnInfo label={dig} tag="digital" />
-            <IsbnInfo label={iBooksLabel} tag="ibook" />
-            <IsbnInfo label={labelPart2} tag="ibookVolume2" />
+            <IsbnInfo label={assignable} tag="assignable" />
             <LicenseInfo
                 name={model.licenseName}
                 text={model.licenseText}

src/app/pages/details/context.tsx

@@ -35,7 +35,7 @@ type Author = {
     seniorAuthor?: boolean;
 };
 
-export type IsbnType = 'print' | 'printSoftcover' | 'digital' | 'ibook' | 'ibookVolume2';
+export type IsbnType = 'print' | 'printSoftcover' | 'digital' | 'assignable';
 
 export type ContextValues = {
     id: number;
@@ -76,10 +76,8 @@ export type ContextValues = {
     printSoftcoverIsbn13: string;
     digitalIsbn10?: string;
     digitalIsbn13: string;
-    ibookIsbn10?: string;
-    ibookIsbn13: string | null;
-    ibookVolume2Isbn10?: string;
-    ibookVolume2Isbn13: string | null;
+    assignableIsbn10?: null;
+    assignableIsbn13?: string | null;
     lastUpdatedWeb?: string;
     lastUpdatedPdf: string | null;
     licenseName: string;

src/app/pages/errata-form/form/ErrorSourceSelector.js

@@ -63,12 +63,6 @@ function LabeledButton({selectedSource, sType, onChange, radioRef}) {
 function filterForBook(bookInfo) {
     // eslint-disable-next-line complexity
     return function (type) {
-        if (type.startsWith('iBooks')) {
-            return Boolean(bookInfo.ibook_link);
-        }
-        if (type.startsWith('Rover')) {
-            return false;
-        }
         if (type.startsWith('Assignable')) {
             return bookInfo.assignable_book;
         }

test/helpers/future-memory-router.tsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import {MemoryRouter} from 'react-router-dom';
+
+// @ts-expect-error does not exist on
+const {routerFuture} = global;
+
+export default function FutureMemoryRouter(props: Parameters<typeof MemoryRouter>[0]) {
+    return <MemoryRouter {...props} future={routerFuture} />;
+}

test/src/data/business-books.js

@@ -185,7 +185,6 @@ export default {
                                     amazonLink:
                                         'https://www.amazon.com/dp/1947172689',
                                     bookstoreComingSoon: true,
-                                    compCopyAvailable: false,
                                     salesforceAbbreviation:
                                         'Financial Accounting',
                                     salesforceName: 'Financial Accounting',
@@ -223,7 +222,6 @@ export default {
                                     amazonLink:
                                         'https://www.amazon.com/dp/1947172603',
                                     bookstoreComingSoon: true,
-                                    compCopyAvailable: false,
                                     salesforceAbbreviation:
                                         'Managerial Accounting',
                                     salesforceName: 'Managerial Accounting',
@@ -271,7 +269,6 @@ export default {
                                 amazonLink:
                                     'https://www.amazon.com/dp/1947172549',
                                 bookstoreComingSoon: false,
-                                compCopyAvailable: false,
                                 salesforceAbbreviation:
                                     'Introduction to Business',
                                 salesforceName: 'Introduction to Business',
@@ -304,7 +301,6 @@ export default {
                                 amazonComingSoon: false,
                                 amazonLink: '',
                                 bookstoreComingSoon: false,
-                                compCopyAvailable: true,
                                 salesforceAbbreviation: null,
                                 salesforceName: null,
                                 urls: [],
@@ -349,7 +345,6 @@ export default {
                                 amazonLink:
                                     'https://he.kendallhunt.com/sites/default/files/uploadedFiles/Kendall_Hunt/OPENSTAX_PRICE_LIST_and_ORDER_FORM.pdf',
                                 bookstoreComingSoon: false,
-                                compCopyAvailable: false,
                                 salesforceAbbreviation: null,
                                 salesforceName: null,
                                 urls: [],
@@ -408,7 +403,6 @@ export default {
                                 amazonLink:
                                     'https://www.amazon.com/dp/1947172689',
                                 bookstoreComingSoon: true,
-                                compCopyAvailable: false,
                                 salesforceAbbreviation: 'Financial Accounting',
                                 salesforceName: 'Financial Accounting',
                                 urls: [],
@@ -445,7 +439,6 @@ export default {
                                 amazonLink:
                                     'https://www.amazon.com/dp/1947172603',
                                 bookstoreComingSoon: true,
-                                compCopyAvailable: false,
                                 salesforceAbbreviation: 'Managerial Accounting',
                                 salesforceName: 'Managerial Accounting',
                                 urls: [],
@@ -497,7 +490,6 @@ export default {
                             amazonComingSoon: false,
                             amazonLink: 'https://www.amazon.com/dp/1947172549',
                             bookstoreComingSoon: false,
-                            compCopyAvailable: false,
                             salesforceAbbreviation: 'Introduction to Business',
                             salesforceName: 'Introduction to Business',
                             urls: [],
@@ -529,7 +521,6 @@ export default {
                             amazonComingSoon: false,
                             amazonLink: '',
                             bookstoreComingSoon: false,
-                            compCopyAvailable: true,
                             salesforceAbbreviation: null,
                             salesforceName: null,
                             urls: [],
@@ -568,8 +559,6 @@ export default {
                             coverColor: 'blue',
                             highResolutionPdfUrl: null,
                             lowResolutionPdfUrl: null,
-                            ibookLink: '',
-                            ibookLinkVolume2: '',
                             webviewLink:
                                 'https://dev.cnx.org/contents/547026cb-a330-4809-94bf-126be5f62381',
                             webviewRexLink:
@@ -580,7 +569,6 @@ export default {
                             amazonLink:
                                 'https://he.kendallhunt.com/sites/default/files/uploadedFiles/Kendall_Hunt/OPENSTAX_PRICE_LIST_and_ORDER_FORM.pdf',
                             bookstoreComingSoon: false,
-                            compCopyAvailable: false,
                             salesforceAbbreviation: null,
                             salesforceName: null,
                             urls: [],

test/src/data/college-algebra-postproc.js

@@ -436,8 +436,8 @@ export default {
     printIsbn13: '978-1-938168-38-3',
     printSoftcoverIsbn13: '978-1-50669-822-9',
     digitalIsbn13: '978-1-947172-12-8',
-    ibookIsbn13: null,
-    ibookVolume2Isbn13: null,
+    assignableIsbn10: null,
+    assignableIsbn13: '978-1-947172-12-14',
     licenseText: '',
     licenseName: 'Creative Commons Attribution License',
     licenseVersion: '4.0',
@@ -490,8 +490,6 @@ export default {
         link: 'https://openstax.org/webinars'
     },
     promoteSnippet: [],
-    ibookLink: '',
-    ibookLinkVolume2: '',
     webviewLink:
         'https://dev.cnx.org/contents/9b08c294-057f-4201-9f48-5d6ad992740d',
     webviewRexLink:
@@ -526,8 +524,6 @@ export default {
             buttonUrl: 'https://buyprint.openstax.org/bookstore-suppliers'
         }
     ],
-    compCopyAvailable: false,
-    compCopyContent: ['iBooks comp copy request'],
     tutorMarketingBook: false,
     assignableBook: false,
     partnerListLabel: 'Technology Partners',

test/src/data/details-biology-2e.js

@@ -213,24 +213,6 @@ export default {
             "featured": false,
             "k12": false
         },
-        {
-            "id": 2086,
-            "meta": {
-                "type": "books.BookFacultyResources"
-            },
-            "resource_heading": "Apple iBooks Comp Copy",
-            "resource_description": "<p>We don&#x27;t give out print copies, but instructors can get an enhanced, interactive version of the textbook with an Apple iBooks comp copy.</p>",
-            "resource_unlocked": false,
-            "creator_fest_resource": false,
-            "link_external": "http://www.openstax.org/comp-copy",
-            "link_page": null,
-            "link_text": "Request your copy",
-            "coming_soon_text": null,
-            "video_reference_number": null,
-            "updated": null,
-            "featured": false,
-            "k12": false
-        },
         {
             "id": 2087,
             "meta": {

test/src/layouts/landing/footer.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import userEvent from '@testing-library/user-event';
 import {render, screen, waitFor} from '@testing-library/preact';
 import {describe, it} from '@jest/globals';
-import { MemoryRouter } from 'react-router-dom';
+import MR from '~/../../test/helpers/future-memory-router';
 import { useContactDialog } from '~/layouts/landing/footer/flex';
 
 const user = userEvent.setup({advanceTimers: jest.advanceTimersByTime});
@@ -31,9 +31,9 @@ describe('flex landing footer', () => {
             ];
 
             render(
-                <MemoryRouter initialEntries={['']}>
+                <MR initialEntries={['']}>
                     <ShowContactDialog contactFormParams={contactFormParams} />
-                </MemoryRouter>
+                </MR>
             );
             expect(getIframe()).toBeNull();
             await user.click(await screen.findByText('Contact Us'));
@@ -48,5 +48,17 @@ describe('flex landing footer', () => {
             window.postMessage('CONTACT_FORM_SUBMITTED', '*');
             await waitFor(() => expect(getIframe()).toBeNull());
         });
+        it('handles undefined contactFormParams', async () => {
+            const getIframe = () => document.querySelector('iframe');
+
+            render(
+                <MR initialEntries={['']}>
+                    <ShowContactDialog />
+                </MR>
+            );
+            expect(getIframe()).toBeNull();
+            await user.click(await screen.findByText('Contact Us'));
+            expect(getIframe()?.src.endsWith('embedded/contact')).toBe(true);
+        });
     });
 });