Fix chapter does not exist crashes

If the chapter being referenced doesn't exist, this crashed or spun the wheel in several places
sillsdev · Jan 17, 2025 · af2b1de · af2b1de
1 parent fb4f798
commit af2b1de
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/src/lib/components/BookSelector.svelte b/src/lib/components/BookSelector.svelte
@@ -48,7 +48,7 @@ The navbar component.
         return first;
     }
     function getVerseCount(chapter, chapters) {
-        if (!chapter || chapter === 'i' || !chapters || Object.keys(chapters).length === 0) {
+        if (!chapter || chapter === 'i' || !chapters || Object.keys(chapters).length === 0 || !chapters[chapter]) {
             return 0;
         }
         let count = Object.keys(chapters[chapter]).length;

diff --git a/src/lib/components/ChapterSelector.svelte b/src/lib/components/ChapterSelector.svelte
@@ -105,7 +105,7 @@ The navbar component.
         }
         let books = $refs.catalog.documents;
         let chapters = books.find((d) => d.bookCode === book)?.versesByChapters;
-        if (!chapters || Object.keys(chapters).length === 0) {
+        if (!chapters || Object.keys(chapters).length === 0 || !chapters[chapter]) {
             return 0;
         }
         let count = Object.keys(chapters[chapter]).length;

diff --git a/src/lib/components/ScriptureViewSofria.svelte b/src/lib/components/ScriptureViewSofria.svelte
@@ -2424,7 +2424,9 @@ LOGGING:
         if (chapterCount(currentBook) === 0) {
             cl.renderDocument({ docId, config: {}, output });
         } else {
-            cl.renderDocument({ docId, config: { chapters: [chapter] }, output });
+            if (chapterExists(chapter, chapters)) {
+                cl.renderDocument({ docId, config: { chapters: [chapter] }, output });
+            }
         }
         performance.mark('cl-render-end');
         performance.measure('cl-render-duration', 'cl-render-start', 'cl-render-end');
@@ -2457,6 +2459,15 @@ LOGGING:
         );
         return illustrations;
     }
+    function chapterExists(chapter, chapters) {
+        var value = true;
+        if (chapter !== 'i') {
+            if (!chapter || !chapters[chapter]) {
+                value = false;
+            }
+        }
+        return value;
+    }
     $: fontSize = bodyFontSize + 'px';
 
     $: lineHeight = bodyLineHeight + '%';
@@ -2474,6 +2485,9 @@ LOGGING:
     $: versePerLine = verseLayout === 'one-per-line';
     /**list of books in current docSet*/
     $: books = $refs.catalog.documents;
+    /**list of chapters in current book*/
+    $: chapters = books.find((d) => d.bookCode === currentBook)?.versesByChapters ?? [];
+    $: chapterValid = chapterExists(currentChapter, chapters);
     $: direction = config.bookCollections.find((x) => x.id === references.collection).style
         .textDirection;
     $: verseRangeSeparator = config.bookCollections.find((x) => x.id === references.collection)

diff --git a/src/lib/data/analytics.ts b/src/lib/data/analytics.ts
@@ -4,6 +4,9 @@ import type { AudioPlayer } from './audio';
 import type { HistoryItem } from './history';
 
 export function getBook(item: { collection?: string; book: string }) {
+    if (!item.collection) {
+        return null;
+    }
     return config.bookCollections
         .find((x) => x.id === item.collection)
         .books.find((x) => x.id === item.book);
@@ -25,6 +28,9 @@ function getDamId(item: { book: any; chapter: string }) {
 
 export function logScreenView(item: HistoryItem) {
     const book = getBook({ ...item });
+    if (!book) {
+        return;
+    }
     const chapter = item.chapter;
     const bookAbbrev = book.abbreviation;
     const damId = getDamId({ book, chapter });