fix: catch errors when file attachment not found

Aam-Digital · Feb 19, 2024 · 6da7fee · 6da7fee
1 parent 3ec317e
commit 6da7fee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/app/features/file/couchdb-file.service.ts b/src/app/features/file/couchdb-file.service.ts
@@ -159,7 +159,11 @@ export class CouchdbFileService extends FileService {
       });
   }
 
-  loadFile(entity: Entity, property: string): Observable<SafeUrl> {
+  loadFile(
+    entity: Entity,
+    property: string,
+    throwErrors: boolean = false,
+  ): Observable<SafeUrl> {
     const path = `${entity.getId()}/${property}`;
     if (!this.cache[path]) {
       this.cache[path] = this.http
@@ -168,6 +172,15 @@ export class CouchdbFileService extends FileService {
         })
         .pipe(
           map((blob) => URL.createObjectURL(blob)),
+          catchError((err) => {
+            this.logger.warn(
+              `Could not load file (${entity?.getId()} . ${property}): ${err}`,
+            );
+            if (throwErrors) {
+              throw err;
+            }
+            return "";
+          }),
           shareReplay(),
         );
     }

diff --git a/src/app/features/file/file.service.ts b/src/app/features/file/file.service.ts
@@ -18,7 +18,7 @@ export abstract class FileService {
   protected constructor(
     private entityMapper: EntityMapperService,
     private entities: EntityRegistry,
-    private logger: LoggingService,
+    protected logger: LoggingService,
     private syncState: SyncStateSubject,
   ) {
     // TODO maybe registration is too late (only when component is rendered)