Merge pull request #491 from audioverse-org/AV-663-not-filtering-by-A…

…udioBook-on-EGW-Browse-page

Av 663 not filtering by audio book on egw browse page

public/compiled-lang/en.json

@@ -912,7 +912,7 @@
   "cardSequence_egwAudiobookType": [
     {
       "type": 0,
-      "value": "ELLEN G. WHITE"
+      "value": "ELLEN WHITE"
     }
   ],
   "cardSequence_readByLabel": [
@@ -1374,7 +1374,7 @@
   "discoverCollections_egwAudiobooksHeading": [
     {
       "type": 0,
-      "value": "Discover Ellen G. White"
+      "value": "Discover Ellen White"
     }
   ],
   "discoverCollections_storySeasonsHeading": [
@@ -1616,13 +1616,13 @@
   "egwAudiobookList__heading": [
     {
       "type": 0,
-      "value": "Ellen G. White"
+      "value": "Ellen White"
     }
   ],
   "egwbooks__title": [
     {
       "type": 0,
-      "value": "Ellen G. White"
+      "value": "Ellen White"
     }
   ],
   "embed__partInfo": [
@@ -1884,7 +1884,7 @@
   "header__navItemCollections-egwbooks": [
     {
       "type": 0,
-      "value": "Ellen G. White"
+      "value": "Ellen White"
     }
   ],
   "header__navItemCollections-presenters": [
@@ -3884,7 +3884,7 @@
   "organismSection__egwAudiobooksHeading": [
     {
       "type": 0,
-      "value": "Ellen G. White"
+      "value": "Ellen White"
     }
   ],
   "organismSection__egwAudiobooksNext": [
@@ -4795,6 +4795,18 @@
       "value": "See All Matching Conferences"
     }
   ],
+  "search__egwbooksHeading": [
+    {
+      "type": 0,
+      "value": "Ellen White"
+    }
+  ],
+  "search__egwbooksSeeAll": [
+    {
+      "type": 0,
+      "value": "See All Matching Ellen White Audiobooks"
+    }
+  ],
   "search__emptyStateMessage": [
     {
       "type": 0,

public/lang/en.json

@@ -438,7 +438,7 @@
     "string": "{count} chapters"
   },
   "cardSequence_egwAudiobookType": {
-    "string": "ELLEN G. WHITE"
+    "string": "ELLEN WHITE"
   },
   "cardSequence_readByLabel": {
     "string": "Read By {name}"
@@ -646,7 +646,7 @@
     "string": "Conferences"
   },
   "discoverCollections_egwAudiobooksHeading": {
-    "string": "Discover Ellen G. White"
+    "string": "Discover Ellen White"
   },
   "discoverCollections_storySeasonsHeading": {
     "string": "Stories"
@@ -760,10 +760,10 @@
     "string": "{minutes}m"
   },
   "egwAudiobookList__heading": {
-    "string": "Ellen G. White"
+    "string": "Ellen White"
   },
   "egwbooks__title": {
-    "string": "Ellen G. White"
+    "string": "Ellen White"
   },
   "embed__partInfo": {
     "string": "Part {index} of {count}"
@@ -840,7 +840,7 @@
     "string": "Conferences"
   },
   "header__navItemCollections-egwbooks": {
-    "string": "Ellen G. White"
+    "string": "Ellen White"
   },
   "header__navItemCollections-presenters": {
     "string": "Presenters"
@@ -1837,7 +1837,7 @@
     "string": "Previous Bible books"
   },
   "organismSection__egwAudiobooksHeading": {
-    "string": "Ellen G. White"
+    "string": "Ellen White"
   },
   "organismSection__egwAudiobooksNext": {
     "string": "Next EGW audiobooks"
@@ -2292,6 +2292,12 @@
   "search__conferencesSeeAll": {
     "string": "See All Matching Conferences"
   },
+  "search__egwbooksHeading": {
+    "string": "Ellen White"
+  },
+  "search__egwbooksSeeAll": {
+    "string": "See All Matching Ellen White Audiobooks"
+  },
   "search__emptyStateMessage": {
     "string": "Try searching for something else"
   },

src/components/atoms/scrollToTop.tsx

@@ -0,0 +1,12 @@
+// scrollToTop.tsx
+import { useEffect } from 'react';
+
+const ScrollToTop: React.FC = () => {
+	useEffect(() => {
+		window.scrollTo(0, 0);
+	}, []);
+
+	return null;
+};
+
+export default ScrollToTop;

src/components/molecules/card/sequence.tsx

@@ -78,7 +78,7 @@ export default function CardSequence({
 				label: egw
 					? intl.formatMessage({
 							id: 'cardSequence_egwAudiobookType',
-							defaultMessage: 'ELLEN G. WHITE',
+							defaultMessage: 'ELLEN WHITE',
 					  })
 					: intl.formatMessage({
 							id: 'cardSequence_audiobookType',

src/components/organisms/cardSlider/section/egwAudiobooks.tsx

@@ -28,7 +28,7 @@ const EgwAudiobooks: React.FC<EgwAudiobooksProps> = ({ heading }) => {
 				heading ||
 				intl.formatMessage({
 					id: 'organismSection__egwAudiobooksHeading',
-					defaultMessage: 'Ellen G. White',
+					defaultMessage: 'Ellen White',
 				})
 			}
 			previous={intl.formatMessage({

src/components/organisms/searchResults.filters.tsx

@@ -5,6 +5,7 @@ import { FormattedMessage } from 'react-intl';
 import {
 	GetSearchAudiobooksDocument,
 	GetSearchConferencesDocument,
+	GetSearchEgwAudiobooksDocument,
 	GetSearchMusicTracksDocument,
 	GetSearchPersonsDocument,
 	GetSearchRecordingsDocument,
@@ -89,6 +90,21 @@ export const filters: Record<string, EntityFilter> = {
 		),
 		document: GetSearchAudiobooksDocument,
 	},
+	egwbooks: {
+		heading: (
+			<FormattedMessage
+				id="search__egwbooksHeading"
+				defaultMessage="Ellen White"
+			/>
+		),
+		seeAll: (
+			<FormattedMessage
+				id="search__egwbooksSeeAll"
+				defaultMessage="See All Matching Ellen White Audiobooks"
+			/>
+		),
+		document: GetSearchEgwAudiobooksDocument,
+	},
 	sponsors: {
 		heading: (
 			<FormattedMessage

src/components/organisms/searchResults.graphql

@@ -109,7 +109,53 @@ query getSearchAudiobooks(
 	$first: Int!
 	$after: String
 ) {
-	audiobooks(language: $language, search: $term, first: $first, after: $after) {
+	audiobooks(
+		language: $language
+		search: $term
+		first: $first
+		after: $after
+		excludePersons: [
+			{ personId: 128 }
+			{ personId: 381 }
+			{ personId: 445 }
+			{ personId: 506 }
+			{ personId: 1208 }
+			{ personId: 1884 }
+		]
+	) {
+		aggregate {
+			count
+		}
+		nodes {
+			...cardSequence
+		}
+		pageInfo {
+			hasNextPage
+			endCursor
+		}
+	}
+}
+
+query getSearchEgwAudiobooks(
+	$language: Language!
+	$term: String!
+	$first: Int!
+	$after: String
+) {
+	audiobooks(
+		language: $language
+		search: $term
+		first: $first
+		after: $after
+		persons: [
+			{ personId: 128 }
+			{ personId: 381 }
+			{ personId: 445 }
+			{ personId: 506 }
+			{ personId: 1208 }
+			{ personId: 1884 }
+		]
+	) {
 		aggregate {
 			count
 		}

src/components/organisms/searchResults.useResults.tsx

@@ -111,6 +111,7 @@ function useQueryResults(filter: EntityFilterId, term: string) {
 		teachings: useFilterQuery('teachings', vars, filter),
 		series: useFilterQuery('series', vars, filter),
 		books: useFilterQuery('books', vars, filter),
+		egwbooks: useFilterQuery('egwbooks', vars, filter),
 		sponsors: useFilterQuery('sponsors', vars, filter),
 		conferences: useFilterQuery('conferences', vars, filter),
 		music: useFilterQuery('music', vars, filter),

src/components/templates/andNavigation.tsx

@@ -1,5 +1,5 @@
 import clsx from 'clsx';
-import { useRouter } from 'next/router';
+import Router, { useRouter } from 'next/router';
 import React, { ReactNode, useEffect, useRef, useState } from 'react';
 
 import LanguageAlternativesAlert from '~components/molecules/languageAlternativesAlert';
@@ -39,9 +39,20 @@ export default function AndNavigation({
 	useEffect(() => {
 		if (scrollRef.current) scrollRef.current.scrollTop = 0;
 	}, [term, entityType]);
-
 	useEffect(() => setEntityType(contextualFilterId), [contextualFilterId]);
 
+	useEffect(() => {
+		const fn = () => {
+			if (scrollRef.current) scrollRef.current.scrollTop = 0;
+		};
+
+		Router.events.on('routeChangeComplete', fn);
+
+		return () => {
+			Router.events.off('routeChangeComplete', fn);
+		};
+	}, []);
+
 	const hideMobileSearch =
 		contextualFilterId === 'all' &&
 		!['/[language]/discover', '/[language]'].includes(pathname);

src/containers/audiobook/egwList.tsx

@@ -24,7 +24,7 @@ export function EgwAudiobooksList({
 			heading={
 				<FormattedMessage
 					id="egwAudiobookList__heading"
-					defaultMessage="Ellen G. White"
+					defaultMessage="Ellen White"
 				/>
 			}
 			makeRoute={(l, i) => root.lang(l).egwbooks.page(i).get()}

src/containers/discover/index.tsx

@@ -33,7 +33,7 @@ export default function Discover(): JSX.Element {
 				heading={
 					<FormattedMessage
 						id="discoverCollections_egwAudiobooksHeading"
-						defaultMessage="Discover Ellen G. White"
+						defaultMessage="Discover Ellen White"
 					/>
 				}
 			/>

src/lib/useNavigationItems.tsx

@@ -208,7 +208,7 @@ export function useNavigationItems(): INavigationItem[] {
 					Icon: iconMap.fa_feather,
 					label: intl.formatMessage({
 						id: `header__navItemCollections-egwbooks`, //egw
-						defaultMessage: 'Ellen G. White',
+						defaultMessage: 'Ellen White',
 					}),
 				},
 				{

src/pages/[language]/egwbooks/page/[i].tsx

@@ -33,7 +33,7 @@ export async function getStaticProps({
 		() => ({
 			title: intl.formatMessage({
 				id: 'egwbooks__title',
-				defaultMessage: 'Ellen G. White',
+				defaultMessage: 'Ellen White',
 			}),
 		})
 	);