Merge branch 'main' into siyangcao/eng-1730-add-mutations-and-queries…

…-into-the-front-end
JesusFilm · Feb 3, 2025 · 0b50e14 · 0b50e14
2 parents 5b80272 + ad75f2e
commit 0b50e14
Show file tree

Hide file tree

Showing 8 changed files with 586 additions and 96 deletions.
diff --git a/apps/api-journeys/src/__generated__/gql.ts b/apps/api-journeys/src/__generated__/gql.ts
diff --git a/apps/api-media/src/workers/algolia/service/service.spec.ts b/apps/api-media/src/workers/algolia/service/service.spec.ts
@@ -1,4 +1,4 @@
-import algoliasearch from 'algoliasearch'
+import { algoliasearch } from 'algoliasearch'
 import clone from 'lodash/clone'
 
 import { VideoVariant } from '.prisma/api-media-client'
@@ -14,10 +14,6 @@ const saveObjectsSpy = jest
   .fn()
   .mockReturnValue({ wait: jest.fn().mockResolvedValue({}) })
 
-const initIndexSpy = jest.fn().mockReturnValue({
-  saveObjects: saveObjectsSpy
-})
-
 jest.mock('@apollo/client', () => {
   const originalModule = jest.requireActual('@apollo/client')
   return {
@@ -54,17 +50,13 @@ jest.mock('@apollo/client', () => {
   }
 })
 
-jest.mock('algoliasearch', () => {
-  return jest.fn().mockImplementation(() => {
-    return {
-      initIndex: initIndexSpy
-    }
-  })
-})
+jest.mock('algoliasearch', () => ({
+  algoliasearch: jest.fn().mockImplementation(() => ({
+    saveObjects: saveObjectsSpy
+  }))
+}))
 
-const mockAlgoliaSearch = algoliasearch as jest.MockedFunction<
-  typeof algoliasearch
->
+const mockAlgoliaSearch = algoliasearch
 
 describe('algolia/service', () => {
   const originalEnv = clone(process.env)
@@ -145,28 +137,31 @@ describe('algolia/service', () => {
         }
       })
       expect(mockAlgoliaSearch).toHaveBeenCalledWith('id', 'key')
-      expect(initIndexSpy).toHaveBeenCalledWith('video-variants')
-      expect(saveObjectsSpy).toHaveBeenCalledWith([
-        {
-          childrenCount: 1,
-          description: ['description'],
-          duration: 100,
-          image: `https://imagedelivery.net/${
-            process.env.CLOUDFLARE_IMAGE_ACCOUNT ?? 'testAccount'
-          }/imageId/f=jpg,w=1280,h=600,q=95`,
-          imageAlt: 'imageAlt',
-          label: 'label',
-          languageId: '21754',
-          languageEnglishName: 'Chinese, Simplified',
-          languagePrimaryName: '简体中文',
-          objectID: 'id',
-          slug: 'slug',
-          subtitles: ['21754'],
-          titles: ['title2', 'title'],
-          videoId: 'videoId',
-          manualRanking: 1
-        }
-      ])
+      expect(saveObjectsSpy).toHaveBeenCalledWith({
+        indexName: 'video-variants',
+        objects: [
+          {
+            childrenCount: 1,
+            description: ['description'],
+            duration: 100,
+            image: `https://imagedelivery.net/${
+              process.env.CLOUDFLARE_IMAGE_ACCOUNT ?? 'testAccount'
+            }/imageId/f=jpg,w=1280,h=600,q=95`,
+            imageAlt: 'imageAlt',
+            label: 'label',
+            languageId: '21754',
+            languageEnglishName: 'Chinese, Simplified',
+            languagePrimaryName: '简体中文',
+            objectID: 'id',
+            slug: 'slug',
+            subtitles: ['21754'],
+            titles: ['title2', 'title'],
+            videoId: 'videoId',
+            manualRanking: 1
+          }
+        ],
+        waitForTasks: true
+      })
     })
 
     it('should sync all videos to Algolia when prd', async () => {

diff --git a/apps/api-media/src/workers/algolia/service/service.ts b/apps/api-media/src/workers/algolia/service/service.ts
@@ -1,5 +1,5 @@
 import { ApolloClient, InMemoryCache, createHttpLink } from '@apollo/client'
-import algoliasearch from 'algoliasearch'
+import { algoliasearch } from 'algoliasearch'
 import { Logger } from 'pino'
 
 import { graphql } from '../../../lib/graphql/gatewayGraphql'
@@ -158,9 +158,12 @@ export async function service(logger?: Logger): Promise<void> {
         }
       })
 
-      const index = client.initIndex(appIndex)
       try {
-        await index.saveObjects(transformedVideos).wait()
+        await client.saveObjects({
+          indexName: appIndex,
+          objects: transformedVideos,
+          waitForTasks: true
+        })
         logger?.info(`exported ${offset} videos to algolia`)
       } catch (error) {
         logger?.error(error, 'unable to export videos to algolia')

diff --git a/apps/arclight/src/app/v2/resources/route.ts b/apps/arclight/src/app/v2/resources/route.ts
@@ -1,4 +1,4 @@
-import algoliasearch from 'algoliasearch'
+import { algoliasearch } from 'algoliasearch'
 import { ResultOf, graphql } from 'gql.tada'
 import { NextRequest } from 'next/server'
 
@@ -88,17 +88,21 @@ async function searchAlgolia(term: string) {
   }
   const client = algoliasearch(appID, apiKey)
 
-  const { results } = await client.search<AlgoliaHit>([
+  const { results } = await client.searchSingleIndex<AlgoliaHit>(
     {
       indexName,
-      query: term,
-      params: {
-        filters: `languageId:529`,
+      searchParams: {
+        query: term,
+        filters: `languageId:529`
+      }
+    },
+    {
+      queryParameters: {
         highlightPreTag: '<>',
         highlightPostTag: '<>'
       }
     }
-  ])
+  )
 
   if (!results[0] || !('hits' in results[0])) {
     throw new Error('Unexpected Algolia response format')
@@ -201,7 +205,8 @@ export async function GET(request: NextRequest): Promise<Response> {
                 ),
                 alternateLanguages: [],
                 mediaComponents: transformedVideos.map(
-                  (video) => video.mediaComponentId
+                  (video: { mediaComponentId: string }) =>
+                    video.mediaComponentId
                 )
               }
             }

diff --git a/libs/journeys/ui/src/libs/algolia/InstantSearchProvider/InstantSearchProvider.tsx b/libs/journeys/ui/src/libs/algolia/InstantSearchProvider/InstantSearchProvider.tsx
@@ -1,4 +1,4 @@
-import algoliasearch, { SearchClient } from 'algoliasearch'
+import { SearchClient, algoliasearch } from 'algoliasearch'
 import { ReactElement, ReactNode, createContext, useContext } from 'react'
 
 const searchClient = algoliasearch(

diff --git a/libs/journeys/ui/src/libs/algolia/InstantSearchTestWrapper.tsx b/libs/journeys/ui/src/libs/algolia/InstantSearchTestWrapper.tsx
@@ -1,4 +1,4 @@
-import algoliasearch from 'algoliasearch'
+import { algoliasearch } from 'algoliasearch'
 import type { UiState } from 'instantsearch.js'
 import type { ReactElement, ReactNode } from 'react'
 import { InstantSearch } from 'react-instantsearch'