From 7027de6f6e130e2d03315ec8aeefd2b0f15f9ec2 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Wed, 18 Sep 2024 13:54:39 +0300 Subject: [PATCH] RED-10050: fixed navigating to doc with filtered annotations issue. --- .../components/file-workload/file-workload.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts index a6e0675a4..6ccf8e4c7 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts @@ -36,7 +36,7 @@ import { workloadTranslations } from '@translations/workload-translations'; import { UserPreferenceService } from '@users/user-preference.service'; import { getLocalStorageDataByFileId } from '@utils/local-storage'; import { combineLatest, delay, Observable } from 'rxjs'; -import { map, tap } from 'rxjs/operators'; +import { filter, map, tap } from 'rxjs/operators'; import scrollIntoView from 'scroll-into-view-if-needed'; import { REDAnnotationManager } from '../../../pdf-viewer/services/annotation-manager.service'; import { REDDocumentViewer } from '../../../pdf-viewer/services/document-viewer.service'; @@ -187,6 +187,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On const secondary$ = this.filterService.getFilterModels$('secondaryFilters'); return combineLatest([ + this._documentViewer.loaded$, this.fileDataService.all$, primary$, secondary$, @@ -195,7 +196,8 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On this._pageRotationService.rotations$, ]).pipe( delay(0), - map(([annotations, primary, secondary, componentReferenceIds]) => + filter(([loaded]) => loaded), + map(([, annotations, primary, secondary, componentReferenceIds]) => this.#filterAnnotations(annotations, primary, secondary, componentReferenceIds), ), map(annotations => this.#mapListItemsFromAnnotationWrapperArray(annotations)),