From 6453436dd93457abfccfce7acf64e1821d0a27fb Mon Sep 17 00:00:00 2001
From: Nathan Arthur <nathan@nathanarthur.com>
Date: Tue, 3 Dec 2024 13:11:20 -0500
Subject: [PATCH] fix bible chapter links

---
 package-lock.json                             |  6 +--
 .../organisms/passageNavigation.graphql       | 17 +++------
 .../organisms/passageNavigation.tsx           | 37 +++++++------------
 src/containers/bible/index.graphql            | 19 ++++++++--
 src/containers/bible/index.tsx                | 11 +++---
 src/pages/[language]/bibles/index.tsx         | 35 +++++++++---------
 6 files changed, 61 insertions(+), 64 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d6c7c6758..03f46021a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11204,9 +11204,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001684",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz",
-            "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==",
+            "version": "1.0.30001686",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001686.tgz",
+            "integrity": "sha512-Y7deg0Aergpa24M3qLC5xjNklnKnhsmSyR/V89dLZ1n0ucJIFNs7PgR2Yfa/Zf6W79SbBicgtGxZr2juHkEUIA==",
             "funding": [
                 {
                     "type": "opencollective",
diff --git a/src/components/organisms/passageNavigation.graphql b/src/components/organisms/passageNavigation.graphql
index b81fc42f5..84424ff48 100644
--- a/src/components/organisms/passageNavigation.graphql
+++ b/src/components/organisms/passageNavigation.graphql
@@ -1,16 +1,11 @@
-fragment passageNavigation on BibleConnection {
-	nodes {
-		title
-		books {
+fragment passageNavigation on Sequence {
+	id
+	title
+	recordings(first: 150) {
+		nodes {
 			id
 			title
-			chapters {
-				title
-				url
-			}
+			canonicalPath
 		}
 	}
-	aggregate {
-		count
-	}
 }
diff --git a/src/components/organisms/passageNavigation.tsx b/src/components/organisms/passageNavigation.tsx
index 541faf134..96ca61f5f 100644
--- a/src/components/organisms/passageNavigation.tsx
+++ b/src/components/organisms/passageNavigation.tsx
@@ -2,56 +2,45 @@ import clsx from 'clsx';
 import React, { useState } from 'react';
 
 import Link from '~components/atoms/linkWithoutPrefetch';
-import root from '~src/lib/routes';
-import useLanguageRoute from '~src/lib/useLanguageRoute';
-import { IBibleBook } from '~src/services/fcbh/types';
 
+import { PassageNavigationFragment } from './__generated__/passageNavigation';
 import styles from './passageNavigation.module.scss';
 
 type Props = {
-	books: IBibleBook[];
+	books: Array<PassageNavigationFragment>;
 };
 
 export default function PassageNavigation({ books }: Props): JSX.Element {
-	const [selectedBook, setSelectedBook] = useState<string | null>(
-		books[0]?.name,
+	const [selectedBook, setSelectedBook] = useState<string | number | null>(
+		null,
 	);
 
-	const languageRoute = useLanguageRoute();
-
 	return (
 		<div className={styles.wrapper}>
 			<ul className={styles.books}>
 				{books.map((book) => {
-					const chapters = book.chapters;
+					const chapters = book.recordings.nodes;
 					return (
 						<li
-							key={book.name}
+							key={book.id}
 							className={clsx(styles.book, {
-								active: book.name === selectedBook,
+								active: book.id === selectedBook,
 							})}
 						>
 							<button
 								onClick={() => {
-									setSelectedBook(book.name);
+									setSelectedBook(book.id);
 								}}
 							>
-								{book.name}
+								{book.title}
 							</button>
-							{book.name === selectedBook ? (
+							{book.id === selectedBook ? (
 								<ul className={styles.chapters}>
-									{chapters?.map((n) => {
+									{chapters?.map((chapter) => {
+										const n = Number(chapter.title.split(' ').pop());
 										return (
 											<li key={n} className={styles.chapter}>
-												<Link
-													href={root
-														.lang(languageRoute)
-														.bibles.bookId(book.book_id)
-														.chapterNumber(n)
-														.get()}
-												>
-													{n}
-												</Link>
+												<Link href={chapter.canonicalPath}>{n}</Link>
 											</li>
 										);
 									})}
diff --git a/src/containers/bible/index.graphql b/src/containers/bible/index.graphql
index 47d92eaad..e49df25b3 100644
--- a/src/containers/bible/index.graphql
+++ b/src/containers/bible/index.graphql
@@ -1,5 +1,18 @@
-query getAudiobibleIndexData {
-	audiobibles {
-		...passageNavigation
+query getAudiobibleIndexData($language: Language!) {
+	collections(
+		language: $language
+		contentType: BIBLE_VERSION
+		first: 10
+		orderBy: [{ field: TITLE, direction: ASC }]
+	) {
+		nodes {
+			id
+			title
+			sequences(first: 66, orderBy: [{ field: ID, direction: ASC }]) {
+				nodes {
+					...passageNavigation
+				}
+			}
+		}
 	}
 }
diff --git a/src/containers/bible/index.tsx b/src/containers/bible/index.tsx
index 91aa05972..2e4bbd068 100644
--- a/src/containers/bible/index.tsx
+++ b/src/containers/bible/index.tsx
@@ -12,16 +12,17 @@ import Dropdown from '~src/components/molecules/dropdown';
 import IconButton from '~src/components/molecules/iconButton';
 import Tease from '~src/components/molecules/tease';
 import PassageNavigation from '~src/components/organisms/passageNavigation';
-import { IBibleVersion } from '~src/services/fcbh/types';
 
+import { GetAudiobibleIndexDataQuery } from './__generated__';
 import styles from './index.module.scss';
 
 // export type BibleIndexProps = GetAudiobibleIndexDataQuery;
 export type BibleIndexProps = {
-	audiobibles: IBibleVersion[];
+	data: GetAudiobibleIndexDataQuery;
 };
 function Bible(props: BibleIndexProps): JSX.Element {
 	console.log({ props });
+	const versions = props.data.collections.nodes || [];
 	return (
 		<Tease className={styles.base}>
 			<div className={styles.hat}>
@@ -69,7 +70,7 @@ function Bible(props: BibleIndexProps): JSX.Element {
 									/>
 								</a>
 							</p> */}
-							{props.audiobibles.map((audiobible) => (
+							{versions.map((audiobible) => (
 								<p key={audiobible.id}>
 									<a
 										href={`https://www.example.com/${audiobible.id}`}
@@ -93,12 +94,12 @@ function Bible(props: BibleIndexProps): JSX.Element {
 			</div>
 
 			<div className={styles.content}>
-				<PassageNavigation books={props.audiobibles[0].books} />
+				<PassageNavigation books={versions[0].sequences.nodes || []} />
 			</div>
 		</Tease>
 	);
 }
 
 export default withFailStates(Bible, {
-	useShould404: ({ audiobibles }) => !audiobibles.length,
+	useShould404: ({ data }) => !data.collections.nodes?.length,
 });
diff --git a/src/pages/[language]/bibles/index.tsx b/src/pages/[language]/bibles/index.tsx
index a29b56cb9..0e9a3fb8b 100644
--- a/src/pages/[language]/bibles/index.tsx
+++ b/src/pages/[language]/bibles/index.tsx
@@ -10,7 +10,7 @@ import { LANGUAGES, REVALIDATE, REVALIDATE_FAILURE } from '~lib/constants';
 import getIntl from '~lib/getIntl';
 import { getLanguageIdByRoute } from '~lib/getLanguageIdByRoute';
 import root from '~lib/routes';
-import { getBibles } from '~src/services/fcbh/getBibles';
+import { getAudiobibleIndexData } from '~src/containers/bible/__generated__';
 
 export default Bible;
 
@@ -19,36 +19,35 @@ export async function getStaticProps({
 }: GetStaticPropsContext<{ language: string }>): Promise<
 	GetStaticPropsResult<BibleIndexProps & IBaseProps>
 > {
-	const response = await getBibles().catch((e) => {
-		console.log(e);
-		return null;
-	});
-	// const apiBibles = await getAudiobibleVersionsData({
-	// 	language: getLanguageIdByRoute(params?.language),
-	// }).catch(() => ({ collections: { nodes: [] } }));
+	// const response = await getBibles().catch((e) => {
+	// 	console.log(e);
+	// 	return null;
+	// });
+	const apiBibles = await getAudiobibleIndexData({
+		language: getLanguageIdByRoute(params?.language),
+	}).catch(() => ({ collections: { nodes: [] } }));
 
-	// if (!apiBibles?.collections.nodes) {
-	// 	return {
-	// 		notFound: true,
-	// 		revalidate: REVALIDATE_FAILURE,
-	// 	};
-	// }
+	if (!apiBibles?.collections.nodes) {
+		return {
+			notFound: true,
+			revalidate: REVALIDATE_FAILURE,
+		};
+	}
 
 	const intl = await getIntl(getLanguageIdByRoute(params?.language));
 	return {
 		props: {
-			audiobibles: response || [],
 			// versions: [...(response || []), ...apiBibles.collections.nodes].sort(
 			// 	(a, b) => a.title.localeCompare(b.title),
 			// ),
-			// ...(await getAudiobibleIndexData({})),
+			data: apiBibles,
 			title: intl.formatMessage({
 				id: 'bible__title',
 				defaultMessage: 'Bible',
 			}),
 		},
-		revalidate: response ? REVALIDATE : REVALIDATE_FAILURE,
-		// revalidate: REVALIDATE,
+		// revalidate: response ? REVALIDATE : REVALIDATE_FAILURE,
+		revalidate: REVALIDATE,
 	};
 }