From eeeb54c084333322e9e00315cc3b3695a2652168 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 29 Mar 2023 17:58:50 +0300 Subject: [PATCH 1/9] RED-6412, remove subscriptions from annotation details component. --- apps/red-ui/src/app/models/file/list-item.ts | 4 ++ .../annotation-details.component.html | 4 +- .../annotation-details.component.ts | 58 ++++++------------- .../annotation-wrapper.component.html | 20 +++---- .../annotation-wrapper.component.ts | 19 ++---- .../annotations-list.component.html | 7 ++- .../annotations-list.component.ts | 7 ++- .../file-workload/file-workload.component.ts | 37 ++++++++++-- 8 files changed, 79 insertions(+), 77 deletions(-) create mode 100644 apps/red-ui/src/app/models/file/list-item.ts diff --git a/apps/red-ui/src/app/models/file/list-item.ts b/apps/red-ui/src/app/models/file/list-item.ts new file mode 100644 index 000000000..7bf4a2dea --- /dev/null +++ b/apps/red-ui/src/app/models/file/list-item.ts @@ -0,0 +1,4 @@ +export interface ListItem { + item: T; + isSelected: boolean; +} diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.html index 317fe83b7..c30416ead 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.html @@ -1,5 +1,5 @@
- +
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts index 57777f99c..182504471 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts @@ -3,10 +3,9 @@ import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { TranslateService } from '@ngx-translate/core'; import { annotationChangesTranslations } from '@translations/annotation-changes-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { MultiSelectService } from '../../services/multi-select.service'; -import { KeysOf, shareDistinctLast } from '@iqser/common-ui'; -import { BehaviorSubject, combineLatest, filter, map, Observable, switchMap } from 'rxjs'; +import { KeysOf } from '@iqser/common-ui'; import { AnnotationsListingService } from '../../services/annotations-listing.service'; +import { ListItem } from '@models/file/list-item'; interface Engine { readonly icon: string; @@ -42,52 +41,29 @@ const changesProperties: KeysOf[] = [ styleUrls: ['./annotation-details.component.scss'], }) export class AnnotationDetailsComponent implements OnChanges { - @Input() annotation: AnnotationWrapper; - readonly noSelection$: Observable; + @Input() annotation: ListItem; isPopoverOpen = false; - readonly engines$: Observable; - readonly changesTooltip$: Observable; - readonly #annotationChanged$ = new BehaviorSubject(undefined); + engines: Engine[]; + changesTooltip: string; - constructor( - private readonly _translateService: TranslateService, - private readonly _listingService: AnnotationsListingService, - readonly multiSelectService: MultiSelectService, - ) { - const isSelected$ = this.#annotationChanged$.pipe(switchMap(annotation => this._listingService.isSelected$(annotation))); - this.noSelection$ = combineLatest([isSelected$, multiSelectService.inactive$]).pipe( - map(([isSelected, inactive]) => !isSelected || inactive), - shareDistinctLast(), - ); - this.engines$ = this.#engines$; - this.changesTooltip$ = this.#changesTooltip; - } + constructor(private readonly _translateService: TranslateService, private readonly _listingService: AnnotationsListingService) {} - get #engines$(): Observable { - return this.#annotationChanged$.pipe( - filter(annotation => !!annotation), - map(annotation => this.#extractEngines(annotation).filter(engine => engine.show)), - ); - } + getChangesTooltip(): string | undefined { + const changes = changesProperties.filter(key => this.annotation.item[key]); - get #changesTooltip(): Observable { - return this.#annotationChanged$.pipe( - filter(annotation => !!annotation), - map(annotation => changesProperties.filter(key => annotation[key])), - map(changes => { - if (!changes.length) { - return; - } - const header = this._translateService.instant(_('annotation-changes.header')); - const details = changes.map(change => this._translateService.instant(annotationChangesTranslations[change])); - return [header, ...details.map(change => `• ${change}`)].join('\n'); - }), - ); + if (!changes.length) { + return; + } + + const header = this._translateService.instant(_('annotation-changes.header')); + const details = changes.map(change => this._translateService.instant(annotationChangesTranslations[change])); + return [header, ...details.map(change => `• ${change}`)].join('\n'); } ngOnChanges() { - this.#annotationChanged$.next(this.annotation); + this.engines = this.#extractEngines(this.annotation.item).filter(engine => engine.show); + this.changesTooltip = this.getChangesTooltip(); } #extractEngines(annotation: AnnotationWrapper): Engine[] { diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html index b4c5a02da..4a0192977 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html @@ -1,37 +1,37 @@
-
+
-
+
- {{ annotation.comments.length }} + {{ annotation.item.comments.length }}
- +
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts index f6f52c154..a3113b484 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts @@ -1,12 +1,11 @@ import { Component, HostBinding, Input, OnChanges } from '@angular/core'; -import { BehaviorSubject, Observable } from 'rxjs'; -import { distinctUntilChanged, switchMap, tap } from 'rxjs/operators'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { MultiSelectService } from '../../services/multi-select.service'; import { AnnotationsListingService } from '../../services/annotations-listing.service'; import { PdfProxyService } from '../../services/pdf-proxy.service'; import { ScrollableParentViews } from '@iqser/common-ui'; import { ActionsHelpModeKeys } from '../../utils/constants'; +import { ListItem } from '@models/file/list-item'; @Component({ selector: 'redaction-annotation-wrapper [annotation]', @@ -14,29 +13,21 @@ import { ActionsHelpModeKeys } from '../../utils/constants'; styleUrls: ['./annotation-wrapper.component.scss'], }) export class AnnotationWrapperComponent implements OnChanges { - @Input() annotation!: AnnotationWrapper; + @Input() annotation!: ListItem; - readonly isSelected$!: Observable; @HostBinding('attr.annotation-id') annotationId: string; @HostBinding('class.active') active = false; readonly scrollableParentView = ScrollableParentViews.ANNOTATIONS_LIST; - readonly #annotationChanged$ = new BehaviorSubject(undefined); constructor( readonly listingService: AnnotationsListingService, readonly multiSelectService: MultiSelectService, readonly pdfProxyService: PdfProxyService, - ) { - this.isSelected$ = this.#annotationChanged$.pipe( - switchMap(entity => this.listingService.isSelected$(entity)), - distinctUntilChanged(), - tap(isSelected => (this.active = isSelected)), - ); - } + ) {} ngOnChanges() { - this.#annotationChanged$.next(this.annotation); - this.annotationId = this.annotation.id; + this.annotationId = this.annotation.item.id; + this.active = this.annotation.isSelected; } getActionsHelpModeKey(annotation: AnnotationWrapper): string { diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.html index 7637759e9..c93113416 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.html @@ -1,9 +1,12 @@
- +
- + []; @Output() readonly pagesPanelActive = new EventEmitter(); @@ -87,11 +88,11 @@ export class AnnotationsListComponent extends HasScrollbarDirective implements O const earmarksGroups: EarmarkGroup[] = []; let lastGroup: EarmarkGroup; for (let idx = 0; idx < this.annotations.length; ++idx) { - if (idx === 0 || this.annotations[idx].color !== this.annotations[idx - 1].color) { + if (idx === 0 || this.annotations[idx].item.color !== this.annotations[idx - 1].item.color) { if (lastGroup) { earmarksGroups.push(lastGroup); } - lastGroup = { startIdx: idx, length: 1, color: this.annotations[idx].color }; + lastGroup = { startIdx: idx, length: 1, color: this.annotations[idx].item.color }; } else { lastGroup.length += 1; } 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 595a6cbc2..893b58a6c 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 @@ -31,6 +31,7 @@ import { REDAnnotationManager } from '../../../pdf-viewer/services/annotation-ma import { AnnotationsListingService } from '../../services/annotations-listing.service'; import { REDDocumentViewer } from '../../../pdf-viewer/services/document-viewer.service'; import { SuggestionsService } from '../../services/suggestions.service'; +import { ListItem } from '@models/file/list-item'; const COMMAND_KEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Escape']; const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']; @@ -49,7 +50,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnDestroy @Input() file!: File; displayedPages: number[] = []; pagesPanelActive = true; - readonly displayedAnnotations$: Observable>; + readonly displayedAnnotations$: Observable[]>>; readonly multiSelectInactive$: Observable; readonly showExcludedPages$: Observable; readonly title$: Observable; @@ -95,8 +96,8 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnDestroy this.handleKeyEvent($event); }); - this.displayedAnnotations$ = this._displayedAnnotations$; this.multiSelectInactive$ = this._multiSelectInactive$; + this.displayedAnnotations$ = this._displayedAnnotations$; this.showExcludedPages$ = this._showExcludedPages$; this.isEarmarks$ = this._isEarmarks$; this.title$ = this._title$; @@ -149,13 +150,39 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnDestroy return this.listingService.selected.length ? this.listingService.selected[0] : null; } - private get _displayedAnnotations$(): Observable> { + private get _displayedAnnotations$(): Observable[]>> { const primary$ = this.filterService.getFilterModels$('primaryFilters'); const secondary$ = this.filterService.getFilterModels$('secondaryFilters'); - return combineLatest([this.fileDataService.all$, primary$, secondary$]).pipe( + return combineLatest([ + this.fileDataService.all$, + primary$, + secondary$, + this.multiSelectInactive$, + this.listingService.selected$, + ]).pipe( delay(0), - map(([annotations, primary, secondary]) => this._filterAnnotations(annotations, primary, secondary)), + map( + ([annotations, primary, secondary, multiSelectInactive]) => + [this._filterAnnotations(annotations, primary, secondary), multiSelectInactive] as [ + Map, + boolean, + ], + ), + map(([annotations, multiSelectInactive]) => { + const listItemsMap = new Map[]>(); + if (!annotations) { + return listItemsMap; + } + [...annotations.keys()].forEach(key => { + const newValue = annotations.get(key).map(annotation => ({ + item: annotation, + isSelected: this.listingService.isSelected(annotation) && !multiSelectInactive, + })); + listItemsMap.set(key, newValue); + }); + return listItemsMap; + }), ); } From 545e6e0f988445d3e1c0dc0179824d9a9fbfe7b4 Mon Sep 17 00:00:00 2001 From: George Date: Thu, 30 Mar 2023 14:52:04 +0300 Subject: [PATCH 2/9] RED-6412, some more refactoring. --- apps/red-ui/src/app/models/file/list-item.ts | 1 + .../annotation-details.component.html | 4 +- .../annotation-details.component.ts | 2 + .../annotation-wrapper.component.html | 2 +- .../annotation-wrapper.component.ts | 6 +-- .../file-workload/file-workload.component.ts | 46 ++++++++++--------- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/apps/red-ui/src/app/models/file/list-item.ts b/apps/red-ui/src/app/models/file/list-item.ts index 7bf4a2dea..71ba19148 100644 --- a/apps/red-ui/src/app/models/file/list-item.ts +++ b/apps/red-ui/src/app/models/file/list-item.ts @@ -1,4 +1,5 @@ export interface ListItem { item: T; isSelected: boolean; + multiSelectActive: boolean; } diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.html index c30416ead..c5dbee02b 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.html @@ -1,5 +1,5 @@
- +
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts index 182504471..183a6dd71 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.ts @@ -46,6 +46,7 @@ export class AnnotationDetailsComponent implements OnChanges { engines: Engine[]; changesTooltip: string; + noSelection: boolean; constructor(private readonly _translateService: TranslateService, private readonly _listingService: AnnotationsListingService) {} @@ -64,6 +65,7 @@ export class AnnotationDetailsComponent implements OnChanges { ngOnChanges() { this.engines = this.#extractEngines(this.annotation.item).filter(engine => engine.show); this.changesTooltip = this.getChangesTooltip(); + this.noSelection = !this.annotation.isSelected || !this.annotation.multiSelectActive; } #extractEngines(annotation: AnnotationWrapper): Engine[] { diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html index 4a0192977..994434dd0 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html @@ -20,7 +20,7 @@ {{ annotation.item.comments.length }}
-
+
- [this._filterAnnotations(annotations, primary, secondary), multiSelectInactive] as [ - Map, - boolean, - ], + [this._filterAnnotations(annotations, primary, secondary), multiSelectInactive] as const, ), - map(([annotations, multiSelectInactive]) => { - const listItemsMap = new Map[]>(); - if (!annotations) { - return listItemsMap; - } - [...annotations.keys()].forEach(key => { - const newValue = annotations.get(key).map(annotation => ({ - item: annotation, - isSelected: this.listingService.isSelected(annotation) && !multiSelectInactive, - })); - listItemsMap.set(key, newValue); - }); - return listItemsMap; - }), + this._mapListItemsFromAnnotationWrapperArray(), ); } @@ -484,4 +468,24 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnDestroy FileWorkloadComponent._scrollToFirstElement(elements); } } + + private _mapListItemsFromAnnotationWrapperArray() { + return pipe( + map(([annotations, multiSelectActive]) => { + const listItemsMap = new Map[]>(); + if (!annotations) { + return listItemsMap; + } + [...annotations.keys()].forEach(key => { + const newValue = annotations.get(key).map(annotation => ({ + item: annotation, + isSelected: this.listingService.isSelected(annotation), + multiSelectActive, + })); + listItemsMap.set(key, newValue); + }); + return listItemsMap; + }), + ); + } } From d23a9ee3ab03d5591dfa0bd7811fbdf9a827b3ec Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Thu, 30 Mar 2023 11:58:34 +0300 Subject: [PATCH 3/9] RED-6176: Fixed save button disabled. --- .../components/user-management/user-management.component.html | 2 +- .../components/user-management/user-management.component.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html index 544237635..b33e14d10 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html @@ -26,7 +26,7 @@ (save)="assignReviewer(file, $event)" *ngIf="editingReviewer" [options]="usersOptions$ | async" - [value]="file.assignee === null ? undefined : file.assignee" + [value]="file.assignee" >
diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts index 9d086d657..765c24b55 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.ts @@ -91,7 +91,6 @@ export class UserManagementComponent { this.usersOptions$ = combineLatest([this._canUnassignUser$, this.stateService.file$, this._dossier$]).pipe( map(([canUnassignUser, file, dossier]) => { const unassignUser = canUnassignUser && file.assignee ? [undefined] : []; - console.log(unassignUser); return file.isUnderApproval ? this.#customSort([...dossier.approverIds, ...unassignUser]) : this.#customSort([...dossier.memberIds, ...unassignUser]); From 99d6a158c690572d9d42a5ffd9798a4486bfe48d Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 30 Mar 2023 11:04:41 +0200 Subject: [PATCH 4/9] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3443 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 41aea12bb..366f22b72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.32.0", + "version": "4.33.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a1e6b927912a998e964af21d92771e649726441b..644d5ef2d2e2becbf2bd029058c3b68c38b4b324 100644 GIT binary patch delta 3359 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 Date: Thu, 30 Mar 2023 14:07:15 +0300 Subject: [PATCH 5/9] RED-6524: fix file preview close button --- .../modules/file-preview/file-preview-screen.component.html | 5 +++-- libs/common-ui | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html index 580ace65a..9742256e4 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html @@ -5,6 +5,7 @@
+
@@ -25,6 +26,7 @@
+ @@ -62,7 +64,6 @@ Date: Thu, 30 Mar 2023 13:10:16 +0200 Subject: [PATCH 6/9] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3445 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 366f22b72..0bce0b5b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.33.0", + "version": "4.34.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 644d5ef2d2e2becbf2bd029058c3b68c38b4b324..99d8f24c2f29e19436c22389434b430b38f9f678 100644 GIT binary patch delta 3353 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 delta 3353 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 From fdae158755901baa7aee95dcb52563b10a8f4fee Mon Sep 17 00:00:00 2001 From: George Date: Thu, 30 Mar 2023 15:46:38 +0300 Subject: [PATCH 7/9] RED-6412, add detech changes, simplify methods, remove additional pipes. --- .../file-workload/file-workload.component.ts | 43 ++++++++----------- 1 file changed, 19 insertions(+), 24 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 6abef5a7f..48d42db25 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 @@ -12,6 +12,7 @@ import { IconButtonTypes, INestedFilter, IqserEventTarget, + log, shareDistinctLast, shareLast, } from '@iqser/common-ui'; @@ -158,15 +159,13 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnDestroy this.fileDataService.all$, primary$, secondary$, - this.multiSelectService.active$.pipe(distinctUntilChanged()), this.listingService.selected$, + this.multiSelectService.active$, ]).pipe( delay(0), - map( - ([annotations, primary, secondary, multiSelectInactive]) => - [this._filterAnnotations(annotations, primary, secondary), multiSelectInactive] as const, - ), - this._mapListItemsFromAnnotationWrapperArray(), + map(([annotations, primary, secondary]) => this._filterAnnotations(annotations, primary, secondary)), + map(annotations => this._mapListItemsFromAnnotationWrapperArray(annotations)), + tap(() => this._changeDetectorRef.detectChanges()), ); } @@ -469,23 +468,19 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnDestroy } } - private _mapListItemsFromAnnotationWrapperArray() { - return pipe( - map(([annotations, multiSelectActive]) => { - const listItemsMap = new Map[]>(); - if (!annotations) { - return listItemsMap; - } - [...annotations.keys()].forEach(key => { - const newValue = annotations.get(key).map(annotation => ({ - item: annotation, - isSelected: this.listingService.isSelected(annotation), - multiSelectActive, - })); - listItemsMap.set(key, newValue); - }); - return listItemsMap; - }), - ); + private _mapListItemsFromAnnotationWrapperArray(annotations: Map) { + const listItemsMap = new Map[]>(); + if (!annotations) { + return listItemsMap; + } + [...annotations.keys()].forEach(key => { + const newValue = annotations.get(key).map(annotation => ({ + item: annotation, + isSelected: this.listingService.isSelected(annotation), + multiSelectActive: this.multiSelectService.isActive, + })); + listItemsMap.set(key, newValue); + }); + return listItemsMap; } } From a99810fea37c9200c6be1174c23dedce10b28611 Mon Sep 17 00:00:00 2001 From: George Date: Thu, 30 Mar 2023 16:53:19 +0300 Subject: [PATCH 8/9] RED-6412, remove unused imports, add trackby to stop flickering. --- .../annotation-wrapper/annotation-wrapper.component.ts | 1 - .../components/annotations-list/annotations-list.component.html | 2 +- .../components/annotations-list/annotations-list.component.ts | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts index 4d0c61752..1fd6e3c88 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts @@ -1,6 +1,5 @@ import { Component, HostBinding, Input, OnChanges } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; -import { MultiSelectService } from '../../services/multi-select.service'; import { AnnotationsListingService } from '../../services/annotations-listing.service'; import { PdfProxyService } from '../../services/pdf-proxy.service'; import { ScrollableParentViews } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.html index c93113416..ac61e425b 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.html @@ -1,4 +1,4 @@ - +
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts index b52637e79..2f793856f 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts @@ -22,6 +22,7 @@ export class AnnotationsListComponent extends HasScrollbarDirective implements O @Output() readonly pagesPanelActive = new EventEmitter(); readonly earmarkGroups$ = new BehaviorSubject([]); + protected readonly _trackBy = (index: number, listItem: ListItem) => listItem.item.id; constructor( protected readonly _elementRef: ElementRef, From 2d2ba49242bd3533536d0d75d4a2ef46054a6f3a Mon Sep 17 00:00:00 2001 From: George Date: Thu, 30 Mar 2023 17:31:32 +0300 Subject: [PATCH 9/9] RED-6412, fix document annotation select being delayed. --- .../components/file-workload/file-workload.component.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 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 48d42db25..682952d93 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 @@ -12,12 +12,11 @@ import { IconButtonTypes, INestedFilter, IqserEventTarget, - log, shareDistinctLast, shareLast, } from '@iqser/common-ui'; -import { combineLatest, delay, Observable, pipe } from 'rxjs'; -import { distinctUntilChanged, map, tap } from 'rxjs/operators'; +import { combineLatest, delay, Observable } from 'rxjs'; +import { map, tap } from 'rxjs/operators'; import { File } from '@red/domain'; import { ExcludedPagesService } from '../../services/excluded-pages.service'; import { MultiSelectService } from '../../services/multi-select.service'; @@ -165,7 +164,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnDestroy delay(0), map(([annotations, primary, secondary]) => this._filterAnnotations(annotations, primary, secondary)), map(annotations => this._mapListItemsFromAnnotationWrapperArray(annotations)), - tap(() => this._changeDetectorRef.detectChanges()), + tap(() => setTimeout(() => this._changeDetectorRef.detectChanges())), ); }