Merge branch 'main' into fix-colorpicker-focus-blip

openstax · Apr 11, 2024 · c3b0c3e · c3b0c3e
2 parents 11717c5 + ffaa8cf
commit c3b0c3e
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 1 deletion.
diff --git a/src/app/content/hooks/locationChange.spec.ts b/src/app/content/hooks/locationChange.spec.ts
@@ -211,6 +211,7 @@ describe('contentRouteHookBody', () => {
       meta: {
         slug: 'new-book',
       },
+      polish_site_link: '',
       promote_image: null,
       publish_date: '2012-06-21',
     };

diff --git a/src/app/content/types.ts b/src/app/content/types.ts
@@ -88,6 +88,7 @@ export interface BookWithOSWebData extends VersionedArchiveBookWithConfig {
   };
   publish_date: string;
   amazon_link: string;
+  polish_site_link: string;
   subject: string;
   subjects: Array<{subject_name: string}>;
   categories: Array<{subject_name: string; subject_category: string}>;

diff --git a/src/app/content/utils.ts b/src/app/content/utils.ts
@@ -105,6 +105,7 @@ export const formatBookData = <O extends OSWebBook | undefined>(
   return {
     ...pickArchiveFields(archiveBook),
     amazon_link: osWebBook.amazon_link,
+    polish_site_link: osWebBook.polish_site_link,
     authors: osWebBook.authors,
     book_state: osWebBook.book_state,
     categories: osWebBook.book_categories,

diff --git a/src/app/content/utils/seoUtils.spec.data.ts b/src/app/content/utils/seoUtils.spec.data.ts
@@ -74,6 +74,7 @@ export const mockOsWebBook: OSWebBook = {
   promote_image: null,
   cnx_id: '',
   amazon_link: '',
+  polish_site_link: '',
 };
 
 export const emptyPage = {

diff --git a/src/app/content/utils/urlUtils.ts b/src/app/content/utils/urlUtils.ts
@@ -6,7 +6,7 @@ import { findArchiveTreeNodeById, findArchiveTreeNodeByPageParam } from './archi
 import { stripIdVersion } from './idUtils';
 
 export function bookDetailsUrl(book: BookWithOSWebData) {
-  return `/details/books/${book.slug}`;
+  return book.polish_site_link || `/details/books/${book.slug}`;
 }
 
 export const getBookPageUrlAndParams = (

diff --git a/src/gateways/createOSWebLoader.ts b/src/gateways/createOSWebLoader.ts
@@ -20,6 +20,7 @@ export interface OSWebBook {
   book_categories: Array<{subject_name: string; subject_category: string}>;
   cnx_id: string;
   amazon_link: string;
+  polish_site_link: string;
 }
 
 interface OSWebResponse {
@@ -35,6 +36,7 @@ export const fields = [
   'publish_date',
   'cover_color',
   'amazon_link',
+  'polish_site_link',
   'book_state',
   'promote_image',
   'book_subjects',

diff --git a/...book_categories%26cnx_id%3Dtestbook1-uuid → ...book_categories%26cnx_id%3Dtestbook1-uuid b/...book_categories%26cnx_id%3Dtestbook1-uuid → ...book_categories%26cnx_id%3Dtestbook1-uuid
diff --git a/src/test/mocks/osWebLoader.ts b/src/test/mocks/osWebLoader.ts
@@ -2,6 +2,7 @@ import { OSWebBook } from '../../gateways/createOSWebLoader';
 
 export const mockCmsBook: OSWebBook = {
   amazon_link: '',
+  polish_site_link: '',
   authors: [{value: {name: 'Bam Bammerson', senior_author: true}}],
   book_categories: [{subject_name: 'test subject', subject_category: 'test category'}],
   book_state: 'live',