From 50a4fd8fe0e8e541cd6be951c541abca203be258 Mon Sep 17 00:00:00 2001 From: Okeino McGowan Date: Thu, 2 Nov 2023 05:18:43 -0400 Subject: [PATCH 1/6] added bible to search filter --- public/compiled-lang/en.json | 12 +++++++++ public/lang/en.json | 6 +++++ .../organisms/searchResults.filters.tsx | 13 ++++++++++ .../organisms/searchResults.graphql | 26 +++++++++++++++++++ .../organisms/searchResults.useResults.tsx | 1 + 5 files changed, 58 insertions(+) diff --git a/public/compiled-lang/en.json b/public/compiled-lang/en.json index f34314cef..7205054a9 100644 --- a/public/compiled-lang/en.json +++ b/public/compiled-lang/en.json @@ -4771,6 +4771,18 @@ "value": "All" } ], + "search__bibleBooksHeading": [ + { + "type": 0, + "value": "Bible" + } + ], + "search__bileBooksSeeAll": [ + { + "type": 0, + "value": "See All Matching Bible books" + } + ], "search__booksHeading": [ { "type": 0, diff --git a/public/lang/en.json b/public/lang/en.json index fb3d173f7..378c1b585 100644 --- a/public/lang/en.json +++ b/public/lang/en.json @@ -2280,6 +2280,12 @@ "search__allHeading": { "string": "All" }, + "search__bibleBooksHeading": { + "string": "Bible" + }, + "search__bileBooksSeeAll": { + "string": "See All Matching Bible books" + }, "search__booksHeading": { "string": "Audiobooks" }, diff --git a/src/components/organisms/searchResults.filters.tsx b/src/components/organisms/searchResults.filters.tsx index 729efe5ce..ebceeb45e 100644 --- a/src/components/organisms/searchResults.filters.tsx +++ b/src/components/organisms/searchResults.filters.tsx @@ -4,6 +4,7 @@ import { FormattedMessage } from 'react-intl'; import { GetSearchAudiobooksDocument, + GetSearchBiblebooksDocument, GetSearchConferencesDocument, GetSearchEgwAudiobooksDocument, GetSearchMusicTracksDocument, @@ -105,6 +106,18 @@ export const filters: Record = { ), document: GetSearchEgwAudiobooksDocument, }, + bible: { + heading: ( + + ), + seeAll: ( + + ), + document: GetSearchBiblebooksDocument, + }, sponsors: { heading: ( Date: Thu, 2 Nov 2023 05:22:10 -0400 Subject: [PATCH 2/6] updated search query --- src/components/organisms/searchResults.graphql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/organisms/searchResults.graphql b/src/components/organisms/searchResults.graphql index 2f499cfec..352e1fa2f 100644 --- a/src/components/organisms/searchResults.graphql +++ b/src/components/organisms/searchResults.graphql @@ -174,21 +174,21 @@ query getSearchBiblebooks( $first: Int! $after: String ) { - recordings( + recordings( language: $language contentType: BIBLE_CHAPTER first: 2 #after: $after #search: $term - orderBy: [{ field: ID, direction: ASC }] - ) { + orderBy: [{ field: ID, direction: ASC }] + ) { aggregate { count } nodes { - ...cardRecording - } - pageInfo { + ...cardRecording + } + pageInfo { hasNextPage endCursor } From 5cafee0db757c19feaaa361f62da6b0f9ee6097d Mon Sep 17 00:00:00 2001 From: Okeino McGowan Date: Mon, 6 Nov 2023 09:47:06 -0500 Subject: [PATCH 3/6] updated bible book search querry --- src/components/organisms/searchResults.graphql | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/organisms/searchResults.graphql b/src/components/organisms/searchResults.graphql index 352e1fa2f..4a8ed276d 100644 --- a/src/components/organisms/searchResults.graphql +++ b/src/components/organisms/searchResults.graphql @@ -174,20 +174,21 @@ query getSearchBiblebooks( $first: Int! $after: String ) { - recordings( + sequences( language: $language - contentType: BIBLE_CHAPTER - first: 2 - #after: $after - #search: $term + contentType: BIBLE_BOOK + first: $first + after: $after + search: $term orderBy: [{ field: ID, direction: ASC }] ) { aggregate { count } nodes { - ...cardRecording + ...cardSequence } + pageInfo { hasNextPage endCursor From a8f2a4a9aa9481e3216220592fee0a14ed0ed062 Mon Sep 17 00:00:00 2001 From: Okeino McGowan Date: Tue, 7 Nov 2023 06:15:21 -0500 Subject: [PATCH 4/6] updated search filter --- public/compiled-lang/en.json | 2 +- public/lang/en.json | 2 +- .../organisms/searchResults.filters.tsx | 29 +++++++++---------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/public/compiled-lang/en.json b/public/compiled-lang/en.json index 7205054a9..2ca38e063 100644 --- a/public/compiled-lang/en.json +++ b/public/compiled-lang/en.json @@ -4810,7 +4810,7 @@ "search__egwbooksHeading": [ { "type": 0, - "value": "Ellen White" + "value": "E.White" } ], "search__egwbooksSeeAll": [ diff --git a/public/lang/en.json b/public/lang/en.json index 378c1b585..44d2cd045 100644 --- a/public/lang/en.json +++ b/public/lang/en.json @@ -2299,7 +2299,7 @@ "string": "See All Matching Conferences" }, "search__egwbooksHeading": { - "string": "Ellen White" + "string": "E.White" }, "search__egwbooksSeeAll": { "string": "See All Matching Ellen White Audiobooks" diff --git a/src/components/organisms/searchResults.filters.tsx b/src/components/organisms/searchResults.filters.tsx index ebceeb45e..84ae443fb 100644 --- a/src/components/organisms/searchResults.filters.tsx +++ b/src/components/organisms/searchResults.filters.tsx @@ -79,6 +79,18 @@ export const filters: Record = { ), document: GetSearchSeriesDocument, }, + bible: { + heading: ( + + ), + seeAll: ( + + ), + document: GetSearchBiblebooksDocument, + }, books: { heading: ( @@ -93,10 +105,7 @@ export const filters: Record = { }, egwbooks: { heading: ( - + ), seeAll: ( = { ), document: GetSearchEgwAudiobooksDocument, }, - bible: { - heading: ( - - ), - seeAll: ( - - ), - document: GetSearchBiblebooksDocument, - }, sponsors: { heading: ( Date: Tue, 7 Nov 2023 14:32:15 -0500 Subject: [PATCH 5/6] updated to EGW for search filter --- public/compiled-lang/en.json | 2 +- public/lang/en.json | 2 +- src/components/organisms/searchResults.filters.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/compiled-lang/en.json b/public/compiled-lang/en.json index 2ca38e063..71a8320ae 100644 --- a/public/compiled-lang/en.json +++ b/public/compiled-lang/en.json @@ -4810,7 +4810,7 @@ "search__egwbooksHeading": [ { "type": 0, - "value": "E.White" + "value": "E.G.W" } ], "search__egwbooksSeeAll": [ diff --git a/public/lang/en.json b/public/lang/en.json index 44d2cd045..2d16041fd 100644 --- a/public/lang/en.json +++ b/public/lang/en.json @@ -2299,7 +2299,7 @@ "string": "See All Matching Conferences" }, "search__egwbooksHeading": { - "string": "E.White" + "string": "E.G.W" }, "search__egwbooksSeeAll": { "string": "See All Matching Ellen White Audiobooks" diff --git a/src/components/organisms/searchResults.filters.tsx b/src/components/organisms/searchResults.filters.tsx index 84ae443fb..74f056645 100644 --- a/src/components/organisms/searchResults.filters.tsx +++ b/src/components/organisms/searchResults.filters.tsx @@ -105,7 +105,7 @@ export const filters: Record = { }, egwbooks: { heading: ( - + ), seeAll: ( Date: Tue, 7 Nov 2023 20:08:27 -0500 Subject: [PATCH 6/6] updated E.G.W to EGW --- public/compiled-lang/en.json | 2 +- public/lang/en.json | 2 +- src/components/organisms/searchResults.filters.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/compiled-lang/en.json b/public/compiled-lang/en.json index 71a8320ae..270ca18d0 100644 --- a/public/compiled-lang/en.json +++ b/public/compiled-lang/en.json @@ -4810,7 +4810,7 @@ "search__egwbooksHeading": [ { "type": 0, - "value": "E.G.W" + "value": "EGW" } ], "search__egwbooksSeeAll": [ diff --git a/public/lang/en.json b/public/lang/en.json index 2d16041fd..ded538c88 100644 --- a/public/lang/en.json +++ b/public/lang/en.json @@ -2299,7 +2299,7 @@ "string": "See All Matching Conferences" }, "search__egwbooksHeading": { - "string": "E.G.W" + "string": "EGW" }, "search__egwbooksSeeAll": { "string": "See All Matching Ellen White Audiobooks" diff --git a/src/components/organisms/searchResults.filters.tsx b/src/components/organisms/searchResults.filters.tsx index 74f056645..15e11be0b 100644 --- a/src/components/organisms/searchResults.filters.tsx +++ b/src/components/organisms/searchResults.filters.tsx @@ -105,7 +105,7 @@ export const filters: Record = { }, egwbooks: { heading: ( - + ), seeAll: (