mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Try to hunt down some more unguarded subscriptions
This commit is contained in:
		| @@ -397,7 +397,14 @@ export class DocumentDetailComponent | ||||
|  | ||||
|   private loadDocument(documentId: number): void { | ||||
|     this.previewUrl = this.documentsService.getPreviewUrl(documentId) | ||||
|     this.http.get(this.previewUrl, { responseType: 'text' }).subscribe({ | ||||
|     this.http | ||||
|       .get(this.previewUrl, { responseType: 'text' }) | ||||
|       .pipe( | ||||
|         first(), | ||||
|         takeUntil(this.unsubscribeNotifier), | ||||
|         takeUntil(this.docChangeNotifier) | ||||
|       ) | ||||
|       .subscribe({ | ||||
|         next: (res) => (this.previewText = res.toString()), | ||||
|         error: (err) => | ||||
|           (this.previewText = $localize`An error occurred loading content: ${ | ||||
| @@ -412,7 +419,9 @@ export class DocumentDetailComponent | ||||
|           // 404 is handled in the subscribe below | ||||
|           return of(null) | ||||
|         }), | ||||
|         first() | ||||
|         first(), | ||||
|         takeUntil(this.unsubscribeNotifier), | ||||
|         takeUntil(this.docChangeNotifier) | ||||
|       ) | ||||
|       .subscribe({ | ||||
|         next: (doc) => { | ||||
| @@ -442,7 +451,14 @@ export class DocumentDetailComponent | ||||
|               ) | ||||
|             } | ||||
|           } else { | ||||
|             this.openDocumentService.openDocument(doc).pipe(first()).subscribe() | ||||
|             this.openDocumentService | ||||
|               .openDocument(doc) | ||||
|               .pipe( | ||||
|                 first(), | ||||
|                 takeUntil(this.unsubscribeNotifier), | ||||
|                 takeUntil(this.docChangeNotifier) | ||||
|               ) | ||||
|               .subscribe() | ||||
|           } | ||||
|           this.updateComponent(useDoc) | ||||
|           this.titleSubject | ||||
| @@ -533,7 +549,9 @@ export class DocumentDetailComponent | ||||
|         this.loadDocument(documentId) | ||||
|       }) | ||||
|  | ||||
|     this.route.paramMap.subscribe((paramMap) => { | ||||
|     this.route.paramMap | ||||
|       .pipe(takeUntil(this.unsubscribeNotifier)) | ||||
|       .subscribe((paramMap) => { | ||||
|         const section = paramMap.get('section') | ||||
|         if (section) { | ||||
|           const navIDKey: string = Object.keys(DocumentDetailNavIDs).find( | ||||
| @@ -777,7 +795,11 @@ export class DocumentDetailComponent | ||||
|   discard() { | ||||
|     this.documentsService | ||||
|       .get(this.documentId) | ||||
|       .pipe(first()) | ||||
|       .pipe( | ||||
|         first(), | ||||
|         takeUntil(this.unsubscribeNotifier), | ||||
|         takeUntil(this.docChangeNotifier) | ||||
|       ) | ||||
|       .subscribe({ | ||||
|         next: (doc) => { | ||||
|           Object.assign(this.document, doc) | ||||
| @@ -880,9 +902,10 @@ export class DocumentDetailComponent | ||||
|       .patch(this.getChangedFields()) | ||||
|       .pipe( | ||||
|         switchMap((updateResult) => { | ||||
|           return this.documentListViewService | ||||
|             .getNext(this.documentId) | ||||
|             .pipe(map((nextDocId) => ({ nextDocId, updateResult }))) | ||||
|           return this.documentListViewService.getNext(this.documentId).pipe( | ||||
|             map((nextDocId) => ({ nextDocId, updateResult })), | ||||
|             takeUntil(this.unsubscribeNotifier) | ||||
|           ) | ||||
|         }) | ||||
|       ) | ||||
|       .pipe( | ||||
| @@ -892,7 +915,10 @@ export class DocumentDetailComponent | ||||
|             return this.openDocumentService | ||||
|               .closeDocument(this.document) | ||||
|               .pipe( | ||||
|                 map((closeResult) => ({ updateResult, nextDocId, closeResult })) | ||||
|                 map( | ||||
|                   (closeResult) => ({ updateResult, nextDocId, closeResult }), | ||||
|                   takeUntil(this.unsubscribeNotifier) | ||||
|                 ) | ||||
|               ) | ||||
|           } | ||||
|         }) | ||||
| @@ -1412,7 +1438,14 @@ export class DocumentDetailComponent | ||||
|   } | ||||
|  | ||||
|   private tryRenderTiff() { | ||||
|     this.http.get(this.previewUrl, { responseType: 'arraybuffer' }).subscribe({ | ||||
|     this.http | ||||
|       .get(this.previewUrl, { responseType: 'arraybuffer' }) | ||||
|       .pipe( | ||||
|         first(), | ||||
|         takeUntil(this.unsubscribeNotifier), | ||||
|         takeUntil(this.docChangeNotifier) | ||||
|       ) | ||||
|       .subscribe({ | ||||
|         next: (res) => { | ||||
|           /* istanbul ignore next */ | ||||
|           try { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 shamoon
					shamoon