Merge pull request #630 from geonetwork/handle-favorite-api-error

fix(favorites): do not crash search if favorites cannot be fetched
geonetwork · Sep 22, 2023 · 646215e · 646215e
2 parents a9fd646 + f50fc43
commit 646215e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 27 deletions.
diff --git a/libs/api/repository/src/lib/gn4/favorites/favorites.service.spec.ts b/libs/api/repository/src/lib/gn4/favorites/favorites.service.spec.ts
@@ -50,19 +50,24 @@ describe('FavoritesService', () => {
       })
     })
     describe('when an error happens', () => {
+      let originalConsoleError
+      beforeAll(() => {
+        originalConsoleError = window.console.error
+        window.console.error = jest.fn()
+      })
+      afterAll(() => {
+        window.console.error = originalConsoleError
+      })
       beforeEach(() => {
         userSelectionsService.getSelectionRecords = jest.fn(() =>
-          throwError(new Error('blargz'))
+          throwError(() => new Error('blargz'))
         )
       })
-      it('throws an error', async () => {
-        expect.assertions(2)
-        try {
-          await firstValueFrom(service.myFavoritesUuid$)
-        } catch (e: any) {
-          expect(e.message).toContain('fetching favorite records')
-          expect(e.message).toContain('blargz')
-        }
+      it('writes the error to the console', async () => {
+        await firstValueFrom(service.myFavoritesUuid$)
+        const errorMsg = (window.console.error as jest.Mock).mock.calls[0][0]
+        expect(errorMsg).toContain('fetching favorite records')
+        expect(errorMsg).toContain('blargz')
       })
     })
     it('emits a list of saved record uuids', async () => {
@@ -99,7 +104,7 @@ describe('FavoritesService', () => {
       it('throws an error', async () => {
         expect.assertions(1)
         try {
-          await service.addToFavorites(['aaa']).toPromise()
+          await firstValueFrom(service.addToFavorites(['aaa']))
         } catch (e: any) {
           expect(e.message).toContain('not authenticated')
         }
@@ -110,13 +115,13 @@ describe('FavoritesService', () => {
         favorites = null
         service.myFavoritesUuid$.subscribe((value) => (favorites = value))
         userSelectionsService.addToUserSelection = jest.fn(() =>
-          throwError(new Error('blargz'))
+          throwError(() => new Error('blargz'))
         )
       })
       it('throws an error', async () => {
         expect.assertions(2)
         try {
-          await service.addToFavorites(['aaa']).toPromise()
+          await firstValueFrom(service.addToFavorites(['aaa']))
         } catch (e: any) {
           expect(e.message).toContain('adding records')
           expect(e.message).toContain('blargz')
@@ -125,7 +130,7 @@ describe('FavoritesService', () => {
       it('does not add the record to favorites', async () => {
         expect.assertions(1)
         try {
-          await service.addToFavorites(['zzz']).toPromise()
+          await firstValueFrom(service.addToFavorites(['zzz']))
         } catch (e) {
           // ignore
         }
@@ -136,7 +141,7 @@ describe('FavoritesService', () => {
       beforeEach(async () => {
         favorites = null
         service.myFavoritesUuid$.subscribe((value) => (favorites = value))
-        await service.addToFavorites(['uvw', 'xyz']).toPromise()
+        await firstValueFrom(service.addToFavorites(['uvw', 'xyz']))
       })
       it('calls the corresponding API', () => {
         expect(userSelectionsService.addToUserSelection).toHaveBeenCalledWith(
@@ -161,7 +166,7 @@ describe('FavoritesService', () => {
       it('throws an error', async () => {
         expect.assertions(1)
         try {
-          await service.removeFromFavorites(['aaa']).toPromise()
+          await firstValueFrom(service.removeFromFavorites(['aaa']))
         } catch (e: any) {
           expect(e.message).toContain('not authenticated')
         }
@@ -172,13 +177,13 @@ describe('FavoritesService', () => {
         favorites = null
         service.myFavoritesUuid$.subscribe((value) => (favorites = value))
         userSelectionsService.deleteFromUserSelection = jest.fn(() =>
-          throwError(new Error('blargz'))
+          throwError(() => new Error('blargz'))
         )
       })
       it('throws an error', async () => {
         expect.assertions(2)
         try {
-          await service.removeFromFavorites(['aaa']).toPromise()
+          await firstValueFrom(service.removeFromFavorites(['aaa']))
         } catch (e: any) {
           expect(e.message).toContain('removing records')
           expect(e.message).toContain('blargz')
@@ -187,7 +192,7 @@ describe('FavoritesService', () => {
       it('does not remove the record from favorites', async () => {
         expect.assertions(1)
         try {
-          await service.removeFromFavorites(['abcd']).toPromise()
+          await firstValueFrom(service.removeFromFavorites(['abcd']))
         } catch (e) {
           // ignore
         }
@@ -198,7 +203,7 @@ describe('FavoritesService', () => {
       beforeEach(async () => {
         favorites = null
         service.myFavoritesUuid$.subscribe((value) => (favorites = value))
-        await service.removeFromFavorites(['abcd', 'ijkl']).toPromise()
+        await firstValueFrom(service.removeFromFavorites(['abcd', 'ijkl']))
       })
       it('calls the corresponding API', () => {
         expect(

diff --git a/libs/api/repository/src/lib/gn4/favorites/favorites.service.ts b/libs/api/repository/src/lib/gn4/favorites/favorites.service.ts
@@ -23,21 +23,19 @@ export class FavoritesService {
     .pipe(map((userInfo) => (userInfo ? parseInt(userInfo.id) : null)))
 
   // this observable loads the current list of favorites from the API
-  private myFavoritesUuidFromApi$ = this.myUserId$.pipe(
+  private myFavoritesUuidFromApi$: Observable<string[]> = this.myUserId$.pipe(
     switchMap(
       (userId) =>
         userId !== null
           ? this.userSelectionsService.getSelectionRecords(SELECTION_ID, userId)
           : of([] as string[]) // emit an empty array if the user is not authentified
     ),
-    catchError((e) =>
-      throwError(
-        () =>
-          new Error(
-            `An error occurred while fetching favorite records: ${e.message}`
-          )
+    catchError((e) => {
+      console.error(
+        `An error occurred while fetching favorite records: ${e.message}`
       )
-    )
+      return of([])
+    })
   )
 
   private modifiedFavorites$ = new Subject<string[]>()