2926: Refactoring

native/src/routes/SearchModal.tsx

@@ -28,17 +28,17 @@ const SearchCounter = styled.Text`
 `
 
 export type SearchModalProps = {
-  allPossibleResults: SearchResult[]
-  allPossibleFallbackResults: SearchResult[]
+  allPossibleContentLanguageResults: SearchResult[]
+  allPossibleFallbackLanguageResults: SearchResult[]
   languageCode: string
   cityCode: string
   closeModal: (query: string) => void
   initialSearchText: string
 }
 
 const SearchModal = ({
-  allPossibleResults,
-  allPossibleFallbackResults,
+  allPossibleContentLanguageResults,
+  allPossibleFallbackLanguageResults,
   languageCode,
   cityCode,
   closeModal,
@@ -48,10 +48,10 @@ const SearchModal = ({
   const resourceCache = useResourceCache({ cityCode, languageCode })
   const { t } = useTranslation('search')
 
-  const mainResults = useSearch(allPossibleResults, query)
-  const fallbackResults = useSearch(allPossibleFallbackResults, query)
+  const contentLanguageResults = useSearch(allPossibleContentLanguageResults, query)
+  const fallbackLanguageResults = useSearch(allPossibleFallbackLanguageResults, query)
 
-  const searchResults = mainResults?.length === 0 ? fallbackResults : mainResults
+  const searchResults = contentLanguageResults?.length === 0 ? fallbackLanguageResults : contentLanguageResults
 
   if (!searchResults) {
     return null

native/src/routes/SearchModalContainer.tsx

@@ -1,7 +1,6 @@
-import React, { ReactElement, useMemo } from 'react'
+import React, { ReactElement } from 'react'
 
 import { SearchRouteType } from 'shared'
-import { CategoriesMapModel, EventModel, PoiModel } from 'shared/api'
 import { formatPossibleSearchResults } from 'shared/hooks/useSearch'
 import { config } from 'translations'
 
@@ -16,21 +15,15 @@ export type SearchModalContainerProps = {
   route: RouteProps<SearchRouteType>
 }
 
-const useMemoizeResults = (
-  categories?: CategoriesMapModel | null,
-  events?: EventModel[] | null,
-  pois?: PoiModel[] | null,
-) => useMemo(() => formatPossibleSearchResults(categories, events, pois), [categories, events, pois])
-
 const SearchModalContainer = ({ navigation, route }: SearchModalContainerProps): ReactElement | null => {
   const { cityCode, languageCode } = useCityAppContext()
   const initialSearchText = route.params.searchText ?? ''
   const { data, ...response } = useLoadCityContent({ cityCode, languageCode })
   const { data: fallbackData } = useLoadCityContent({ cityCode, languageCode: config.sourceLanguage })
 
-  const allPossibleResults = useMemoizeResults(data?.categories, data?.events, data?.pois)
+  const allPossibleContentLanguageResults = formatPossibleSearchResults(data?.categories, data?.events, data?.pois)
 
-  const allPossibleFallbackResults = useMemoizeResults(
+  const allPossibleFallbackLanguageResults = formatPossibleSearchResults(
     fallbackData?.categories,
     fallbackData?.events,
     fallbackData?.pois,
@@ -42,8 +35,8 @@ const SearchModalContainer = ({ navigation, route }: SearchModalContainerProps):
         <SearchModal
           cityCode={cityCode}
           closeModal={navigation.goBack}
-          allPossibleResults={allPossibleResults}
-          allPossibleFallbackResults={allPossibleFallbackResults}
+          allPossibleContentLanguageResults={allPossibleContentLanguageResults}
+          allPossibleFallbackLanguageResults={allPossibleFallbackLanguageResults}
           languageCode={languageCode}
           initialSearchText={initialSearchText}
         />

native/src/routes/__tests__/SearchModal.spec.tsx

@@ -47,15 +47,15 @@ describe('SearchModal', () => {
   const eventModels = new EventModelBuilder('testseed', 5, cityCode, languageCode).build()
   const poiModels = new PoiModelBuilder(3).build()
 
-  const allPossibleResults = [
+  const allPossibleContentLanguageResults = [
     ...categoriesMapModel.toArray().filter(category => !category.isRoot()),
     ...eventModels,
     ...poiModels,
   ]
 
   const props: SearchModalProps = {
-    allPossibleResults,
-    allPossibleFallbackResults: [],
+    allPossibleContentLanguageResults,
+    allPossibleFallbackLanguageResults: [],
     languageCode,
     cityCode,
     closeModal: dummy,

web/src/hooks/useAllPossibleSearchResults.ts

@@ -1,5 +1,3 @@
-import { useMemo } from 'react'
-
 import {
   createCategoriesEndpoint,
   createEventsEndpoint,
@@ -32,10 +30,7 @@ const useAllPossibleSearchResults = ({
   const events = useLoadFromEndpoint(createEventsEndpoint, cmsApiBaseUrl, params)
   const pois = useLoadFromEndpoint(createPOIsEndpoint, cmsApiBaseUrl, params)
 
-  const allPossibleResults = useMemo(
-    () => formatPossibleSearchResults(categories.data, events.data, pois.data),
-    [categories.data, events.data, pois.data],
-  )
+  const allPossibleResults = formatPossibleSearchResults(categories.data, events.data, pois.data)
 
   return {
     data: allPossibleResults,

web/src/routes/SearchPage.tsx

@@ -38,24 +38,24 @@ const SearchPage = ({ city, cityCode, languageCode, pathname }: CityRouteProps):
   const navigate = useNavigate()
 
   const {
-    data: allPossibleResults,
+    data: allPossibleContentLanguageResults,
     loading,
     error,
   } = useAllPossibleSearchResults({
     city: cityCode,
     language: languageCode,
     cmsApiBaseUrl,
   })
-  const mainResults = useSearch(allPossibleResults, query)
+  const contentLanguageResults = useSearch(allPossibleContentLanguageResults, query)
 
-  const { data: allPossibleFallbackResults } = useAllPossibleSearchResults({
+  const { data: allPossibleFallbackLanguageResults } = useAllPossibleSearchResults({
     city: cityCode,
     language: config.sourceLanguage,
     cmsApiBaseUrl,
   })
-  const fallbackResults = useSearch(allPossibleFallbackResults, query)
+  const fallbackLanguageResults = useSearch(allPossibleFallbackLanguageResults, query)
 
-  const results = mainResults?.length === 0 ? fallbackResults : mainResults
+  const results = contentLanguageResults?.length === 0 ? fallbackLanguageResults : contentLanguageResults
 
   if (!city) {
     return null