Merge branch 'main' into dependabot/npm_and_yarn/follow-redirects-1.15.4

script/prerender/local.ts

@@ -5,8 +5,6 @@ import { ArchivePage, VersionedArchiveBookWithConfig } from '../../src/app/conte
 import config from '../../src/config';
 import createArchiveLoader from '../../src/gateways/createArchiveLoader';
 import createBookConfigLoader from '../../src/gateways/createBookConfigLoader';
-import createBuyPrintConfigLoader from '../../src/gateways/createBuyPrintConfigLoader';
-import { BuyPrintResponse } from '../../src/gateways/createBuyPrintConfigLoader';
 import createHighlightClient from '../../src/gateways/createHighlightClient';
 import createOSWebLoader from '../../src/gateways/createOSWebLoader';
 import { OSWebBook } from '../../src/gateways/createOSWebLoader';
@@ -29,7 +27,6 @@ import { renderSitemap, renderSitemapIndex } from './sitemap';
 import userLoader from './stubbedUserLoader';
 
 const {
-  REACT_APP_BUY_PRINT_CONFIG_URL,
   REACT_APP_HIGHLIGHTS_URL,
   REACT_APP_OS_WEB_API_URL,
   REACT_APP_SEARCH_URL,
@@ -59,17 +56,13 @@ async function render() {
   });
   const searchClient = createSearchClient(`http://localhost:${port}${REACT_APP_SEARCH_URL}`);
   const highlightClient = createHighlightClient(`http://localhost:${port}${REACT_APP_HIGHLIGHTS_URL}`);
-  const buyPrintConfigLoader = createBuyPrintConfigLoader(REACT_APP_BUY_PRINT_CONFIG_URL, {
-    cache: createDiskCache<string, BuyPrintResponse>('buy-print'),
-  });
   const practiceQuestionsLoader = createPracticeQuestionsLoader();
   const bookConfigLoader = createBookConfigLoader();
 
   const {server} = await startServer({port, onlyProxy: true});
   const renderHelpers = {
     archiveLoader,
     bookConfigLoader,
-    buyPrintConfigLoader,
     config,
     highlightClient,
     osWebLoader,

script/prerender/thread.ts

@@ -16,7 +16,6 @@ import { assertDefined, assertNotNull, assertObject, assertString, tuple } from
 import config from '../../src/config';
 import createArchiveLoader from '../../src/gateways/createArchiveLoader';
 import createBookConfigLoader from '../../src/gateways/createBookConfigLoader';
-import createBuyPrintConfigLoader from '../../src/gateways/createBuyPrintConfigLoader';
 import createHighlightClient from '../../src/gateways/createHighlightClient';
 import createOSWebLoader from '../../src/gateways/createOSWebLoader';
 import createPracticeQuestionsLoader from '../../src/gateways/createPracticeQuestionsLoader';
@@ -46,7 +45,6 @@ const {
   ARCHIVE_URL,
   HIGHLIGHTS_URL,
   OS_WEB_URL,
-  REACT_APP_BUY_PRINT_CONFIG_URL,
   REACT_APP_HIGHLIGHTS_URL,
   REACT_APP_OS_WEB_API_URL,
   REACT_APP_SEARCH_URL,
@@ -125,14 +123,12 @@ async function makeTaskFunctionsMap() {
   const osWebLoader = createOSWebLoader(`${OS_WEB_URL}${REACT_APP_OS_WEB_API_URL}`);
   const searchClient = createSearchClient(`${SEARCH_URL}${REACT_APP_SEARCH_URL}`);
   const highlightClient = createHighlightClient(`${HIGHLIGHTS_URL}${REACT_APP_HIGHLIGHTS_URL}`);
-  const buyPrintConfigLoader = createBuyPrintConfigLoader(REACT_APP_BUY_PRINT_CONFIG_URL);
   const practiceQuestionsLoader = createPracticeQuestionsLoader();
   const bookConfigLoader = createBookConfigLoader();
 
   const services = {
     archiveLoader,
     bookConfigLoader,
-    buyPrintConfigLoader,
     config,
     highlightClient,
     osWebLoader,

src/app/content/actions.ts

@@ -20,8 +20,6 @@ export const resetToc = createStandardAction('Content/resetToc')<void>();
 export const openMobileMenu = createStandardAction('Content/openMobileMenu')<void>();
 export const closeMobileMenu = createStandardAction('Content/closeMobileMenu')<void>();
 
-export const receiveBuyPrintConfig = createStandardAction('Content/receiveBuyPrintConfig')<State['buyPrint']>();
-
 export const requestBook = createStandardAction('Content/requestBook')<Params['book']>();
 export const receiveBook = createStandardAction('Content/receiveBook')<Book>();
 

src/app/content/components/BuyBook.spec.tsx

@@ -3,29 +3,34 @@ import renderer from 'react-test-renderer';
 import createTestStore from '../../../test/createTestStore';
 import TestContainer from '../../../test/TestContainer';
 import { Store } from '../../types';
-import { receiveBuyPrintConfig } from '../actions';
+import { Book } from '../types';
 import BuyBook from './BuyBook';
 
 describe('BuyBook', () => {
   let store: Store;
+  const bookWithLink = {
+    amazon_link: 'https://amazon.com/some-book',
+  } as Book;
+  const bookWithoutLink = {
+    amazon_link: '',
+  } as Book;
 
   beforeEach(() => {
     store = createTestStore();
   });
 
-  it('renders when config is available', () => {
-    store.dispatch(receiveBuyPrintConfig({url: 'https://example.com', disclosure: 'asdf'}));
+  it('renders when book has amazon_link', () => {
     const component = renderer.create(<TestContainer store={store}>
-      <BuyBook />
+      <BuyBook book={bookWithLink } />
     </TestContainer>);
 
     const tree = component.toJSON();
     expect(tree).toMatchSnapshot();
   });
 
-  it('returns null', () => {
+  it('returns null when book lacks amazon_link', () => {
     const component = renderer.create(<TestContainer store={store}>
-      <BuyBook />
+      <BuyBook book={bookWithoutLink} />
     </TestContainer>);
 
     const tree = component.toJSON();

src/app/content/components/BuyBook.tsx

@@ -1,12 +1,11 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useSelector } from 'react-redux';
 import styled from 'styled-components/macro';
-import { textRegularSize, textRegularStyle } from '../../components/Typography';
+import { textRegularSize } from '../../components/Typography';
 import theme from '../../theme';
-import { buyPrintConfig } from '../selectors';
 import { contentTextWidth } from './constants';
 import { disablePrint } from './utils/disablePrint';
+import { Book, BookWithOSWebData } from '../types';
 
 // tslint:disable-next-line:variable-name
 const BuyBookAlignment = styled.div`
@@ -34,34 +33,24 @@ const BuyBookLink = styled.a`
   font-weight: 700;
 `;
 
-// tslint:disable-next-line:variable-name
-const BuyPrintDisclosure = styled.p`
-  flex: 1;
-  align-self: stretch;
-  margin: 1.6rem 0 0 0;
-  ${textRegularStyle}
-  font-size: 1.2rem;
-  line-height: 1.7rem;
-`;
-
 // tslint:disable-next-line: variable-name
-const BuyBook = () => {
-  const config = useSelector(buyPrintConfig);
-
-  if (!config) { return null; }
+const BuyBook = ({book}: {book: Book}) => {
+  const bookWithOSwebData = book as BookWithOSWebData;
 
+  if (!bookWithOSwebData.amazon_link) {
+    return null;
+  }
   return <BuyBookAlignment>
     <BuyBookLink
       target='_blank'
       rel='noopener'
-      href={config.url}
+      href={bookWithOSwebData.amazon_link}
       data-analytics-label='buy-book'
     >
       <FormattedMessage id='i18n:toolbar:buy-book:text'>
         {(msg) => msg}
       </FormattedMessage>
     </BuyBookLink>
-    {config.disclosure && <BuyPrintDisclosure>{config.disclosure}</BuyPrintDisclosure>}
   </BuyBookAlignment>;
 };
 

src/app/content/components/Content.tsx

@@ -103,7 +103,7 @@ const Content = ({mobileExpanded, book}: {mobileExpanded: boolean; book: Book})
             <Page>
               <PrevNextBar />
               <LabsCTA />
-              <BuyBook />
+              <BuyBook book={book} />
             </Page>
             <Attribution />
             <Footer />

src/app/content/components/__snapshots__/BuyBook.spec.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`BuyBook renders when config is available 1`] = `
+exports[`BuyBook renders when book has amazon_link 1`] = `
 .c0 {
   width: 100%;
   display: -webkit-box;
@@ -40,21 +40,6 @@ exports[`BuyBook renders when config is available 1`] = `
   font-weight: 700;
 }
 
-.c2 {
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-  -webkit-align-self: stretch;
-  -ms-flex-item-align: stretch;
-  align-self: stretch;
-  margin: 1.6rem 0 0 0;
-  color: #424242;
-  font-size: 1.6rem;
-  line-height: 2.5rem;
-  font-size: 1.2rem;
-  line-height: 1.7rem;
-}
-
 @media print {
   .c0 {
     display: none;
@@ -67,18 +52,13 @@ exports[`BuyBook renders when config is available 1`] = `
   <a
     className="c1"
     data-analytics-label="buy-book"
-    href="https://example.com"
+    href="https://amazon.com/some-book"
     rel="noopener"
     target="_blank"
   >
     Order a print copy
   </a>
-  <p
-    className="c2"
-  >
-    asdf
-  </p>
 </div>
 `;
 
-exports[`BuyBook returns null 1`] = `null`;
+exports[`BuyBook returns null when book lacks amazon_link 1`] = `null`;

src/app/content/hooks/locationChange/index.ts

@@ -9,7 +9,6 @@ import { loadStudyGuides } from '../../studyGuides/hooks';
 import initializeIntl from '../intlHook';
 import receiveContent from '../receiveContent';
 import registerPageView from '../registerPageView';
-import loadBuyPrintConfig from './buyPrintConfig';
 import resolveContent, { resolveBook } from './resolveContent';
 
 export const contentRouteHookBody: RouteHookBody<typeof content> = (services) => {
@@ -28,7 +27,6 @@ export const contentRouteHookBody: RouteHookBody<typeof content> = (services) =>
     await Promise.all([
       boundRegisterPageView(action),
       syncSearch(services)(action),
-      loadBuyPrintConfig(services)(),
       loadStudyGuides(services)(),
       loadPracticeQuestions(services)(),
       initializeIntl(services)(),

src/app/content/reducer.ts

@@ -20,7 +20,6 @@ import { State } from './types';
 
 export const initialState = {
   bookStylesUrl: null,
-  buyPrint: null,
   highlights: initialHighlightState,
   loading: {},
   mobileMenuOpen: false,
@@ -96,9 +95,6 @@ function reduceContent(state: State, action: AnyAction) {
       const loading = omit('page', state.loading);
       return {...omit(['page', 'references'], state), loading, pageNotFoundId: action.payload};
     }
-    case getType(actions.receiveBuyPrintConfig): {
-      return {...state, buyPrint: action.payload};
-    }
     case getType(locationChange): {
       if (!matchForRoute(content, action.payload.match)) {
         return initialState;

src/app/content/selectors.ts

@@ -30,11 +30,6 @@ export const book = createSelector(
   (state) => state.book
 );
 
-export const buyPrintConfig = createSelector(
-  localState,
-  (state) => state.buyPrint
-);
-
 export const bookTheme = createSelector(
   book,
   (currentBook) => hasOSWebData(currentBook) ? currentBook.theme : defaultTheme

src/app/content/types.ts

@@ -1,5 +1,4 @@
 import { BooksConfig } from '../../gateways/createBookConfigLoader';
-import { BuyPrintResponse } from '../../gateways/createBuyPrintConfigLoader';
 import { Route, RouteParams } from '../navigation/types';
 import { TextResizerValue } from './constants';
 import { State as HighlightState } from './highlights/types';
@@ -55,7 +54,6 @@ export interface State {
   book?: Book;
   page?: Page;
   references: Array<PageReferenceMap | PageReferenceError>;
-  buyPrint: Pick<BuyPrintResponse['buy_urls'][number], 'url' | 'disclosure'> | null;
   textSize: TextResizerValue | null;
   bookStylesUrl: string | null;
 }