Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-10050: fixed navigating to doc with filtered annotations issue.

Browse Source
This commit is contained in:
Nicoleta Panaghiu 2024-09-18 13:54:39 +03:00
parent 7beddc6138
commit 7027de6f6e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
View File

@ -36,7 +36,7 @@ import { workloadTranslations } from '@translations/workload-translations';
import { UserPreferenceService } from '@users/user-preference.service'; import { UserPreferenceService } from '@users/user-preference.service';
import { getLocalStorageDataByFileId } from '@utils/local-storage'; import { getLocalStorageDataByFileId } from '@utils/local-storage';
import { combineLatest, delay, Observable } from 'rxjs'; 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 scrollIntoView from 'scroll-into-view-if-needed';
import { REDAnnotationManager } from '../../../pdf-viewer/services/annotation-manager.service'; import { REDAnnotationManager } from '../../../pdf-viewer/services/annotation-manager.service';
import { REDDocumentViewer } from '../../../pdf-viewer/services/document-viewer.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'); const secondary$ = this.filterService.getFilterModels$('secondaryFilters');
return combineLatest([ return combineLatest([
this._documentViewer.loaded$,
this.fileDataService.all$, this.fileDataService.all$,
primary$, primary$,
secondary$, secondary$,
@ -195,7 +196,8 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
this._pageRotationService.rotations$, this._pageRotationService.rotations$,
]).pipe( ]).pipe(
delay(0), delay(0),
map(([annotations, primary, secondary, componentReferenceIds]) => filter(([loaded]) => loaded),
map(([, annotations, primary, secondary, componentReferenceIds]) =>
this.#filterAnnotations(annotations, primary, secondary, componentReferenceIds), this.#filterAnnotations(annotations, primary, secondary, componentReferenceIds),
), ),
map(annotations => this.#mapListItemsFromAnnotationWrapperArray(annotations)), map(annotations => this.#mapListItemsFromAnnotationWrapperArray(annotations)),