From 3e2f821576fe7b187dafef2565d61d5d2167b769 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Tue, 28 Mar 2023 15:21:22 +0300 Subject: [PATCH 01/27] RED-6436: Corrected tooltips positions. --- .../components/notifications/notifications.component.html | 2 ++ .../dossier-details/dossier-details.component.html | 1 - .../dossier-overview-screen-header.component.html | 4 ---- .../user-management/user-management.component.html | 3 --- .../components/view-switch/view-switch.component.html | 7 ++++--- .../file-preview/file-preview-screen.component.html | 3 --- .../components/file-actions/file-actions.component.ts | 6 ++---- apps/red-ui/src/assets/i18n/redact/de.json | 6 +++++- apps/red-ui/src/assets/i18n/redact/en.json | 6 +++++- libs/common-ui | 2 +- 10 files changed, 19 insertions(+), 21 deletions(-) diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.html b/apps/red-ui/src/app/components/notifications/notifications.component.html index 517a15f89..8b65174a4 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.html +++ b/apps/red-ui/src/app/components/notifications/notifications.component.html @@ -1,6 +1,8 @@ diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html index bb343b8be..bf4d3b642 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html @@ -23,7 +23,6 @@ [icon]="'iqser:edit'" [iqserHelpMode]="'dashboard_in_dossier'" [overlappingElements]="['USER_MENU']" - [tooltipPosition]="'below'" [tooltip]="'dossier-details.edit-owner' | translate" class="ml-14" > diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html index 1610f806f..85a93243d 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html @@ -13,7 +13,6 @@ [files]="entitiesService.all$ | async" [iqserHelpMode]="'edit_dossier_in_dossier'" [overlappingElements]="['USER_MENU']" - [tooltipPosition]="'below'" > @@ -33,7 +31,6 @@ [disabled]="listingService.areSomeSelected$ | async" [icon]="'iqser:refresh'" [tooltipClass]="'small warn'" - [tooltipPosition]="'below'" [tooltip]="'dossier-overview.new-rule.toast.actions.reanalyse-all' | translate" [type]="circleButtonTypes.warn" > @@ -45,7 +42,6 @@ [icon]="'iqser:upload'" [iqserHelpMode]="'edit_dossier_in_dossier'" [overlappingElements]="['USER_MENU']" - [tooltipPosition]="'below'" [tooltip]="'dossier-overview.header-actions.upload-document' | translate" [type]="circleButtonTypes.primary" class="ml-14" 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 6684b0f1b..544237635 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 @@ -9,7 +9,6 @@ @@ -38,7 +37,6 @@ [icon]="'iqser:edit'" [iqserHelpMode]="'document_features_in_editor'" [overlappingElements]="['USER_MENU']" - [tooltipPosition]="'below'" [tooltip]="assignTooltip$ | async" > @@ -46,7 +44,6 @@ (action)="fileAssignService.assignToMe([file])" *ngIf="canAssignToSelf$ | async" [icon]="'red:assign-me'" - [tooltipPosition]="'below'" [tooltip]="'file-preview.assign-me' | translate" buttonId="assign-me" > diff --git a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html index ec5944a2b..2ced8dc13 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html @@ -4,12 +4,13 @@ [class.active]="viewMode === viewModes.STANDARD" [iqserHelpMode]="'views'" [matTooltip]="'file-preview.standard-tooltip' | translate" + [matTooltipPosition]="'above'" class="red-tab" > {{ 'file-preview.standard' | translate }} -
+
-
+
-
+
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts index 287b6a518..2f55e51cb 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts @@ -8,7 +8,7 @@ import { getCurrentUser, IConfirmationDialogData, IqserPermissionsService, - IqserTooltipPosition, + IqserTooltipPositions, LoadingService, OverlappingElements, ScrollableParentView, @@ -76,7 +76,7 @@ export class FileActionsComponent implements OnChanges { isDossierOverviewList = false; isDossierOverviewWorkflow = false; isFilePreview = false; - tooltipPosition: IqserTooltipPosition; + tooltipPosition = IqserTooltipPositions.above; buttons: Action[]; scrollableParentView: ScrollableParentView; @@ -416,8 +416,6 @@ export class FileActionsComponent implements OnChanges { this.isDossierOverview = this.type.startsWith('dossier-overview'); this.isFilePreview = this.type === 'file-preview'; - this.tooltipPosition = this.isFilePreview ? 'below' : 'above'; - this.assignTooltip = this.file.isUnderApproval ? _('dossier-overview.assign-approver') : _('dossier-overview.assign-reviewer'); this.buttonType = this.isFilePreview ? CircleButtonTypes.default : CircleButtonTypes.dark; this.showAssign = diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index ba2c6f114..6abce8b1d 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -6,6 +6,9 @@ }, "multiple-values": "" }, + "user-menu": { + "button-text": "" + }, "account-settings": "Account Einstellungen", "actions": { "all": "Alle", @@ -1767,7 +1770,8 @@ "deleted-dossier": "", "label": "Benachrichtigungen", "mark-all-as-read": "Alle als gelesen markieren", - "mark-as": "" + "mark-as": "", + "button-text": "" }, "ocr": { "confirmation-dialog": { diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index a6950c81d..43581d4fa 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -6,6 +6,9 @@ }, "multiple-values": "Multiple recommendations selected" }, + "user-menu": { + "button-text": "User menu" + }, "account-settings": "Account Settings", "actions": { "all": "All", @@ -1767,7 +1770,8 @@ "deleted-dossier": "Deleted Dossier", "label": "Notifications", "mark-all-as-read": "Mark all as read", - "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}" + "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}", + "button-text": "Notifications" }, "ocr": { "confirmation-dialog": { diff --git a/libs/common-ui b/libs/common-ui index ba21886e2..bb562d63f 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit ba21886e27187490c526816c4692c541384e1f5f +Subproject commit bb562d63fd5ccc353c71b1ca026caa8de5a42926 From f3c8541fa197d50dd5b2d3aa46652ca2f072eb54 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 28 Mar 2023 14:24:25 +0200 Subject: [PATCH 02/27] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3443 -> 3443 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c1a034e50..41aea12bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.31.0", + "version": "4.32.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 752aacd0c4eabe09ced135474cd154efed8f4977..a1e6b927912a998e964af21d92771e649726441b 100644 GIT binary patch delta 3356 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 delta 3356 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 Date: Wed, 29 Mar 2023 17:58:50 +0300 Subject: [PATCH 03/27] 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 7784d0bdfccbc232e53ccfe42244eec2eafa1cee Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Thu, 30 Mar 2023 11:58:34 +0300 Subject: [PATCH 04/27] 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 bf157215b1eeb919eb259ae8ed0adeca834b7910 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 30 Mar 2023 11:04:41 +0200 Subject: [PATCH 05/27] 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 06/27] 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 07/27] 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 545e6e0f988445d3e1c0dc0179824d9a9fbfe7b4 Mon Sep 17 00:00:00 2001 From: George Date: Thu, 30 Mar 2023 14:52:04 +0300 Subject: [PATCH 08/27] 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 09/27] 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 10/27] 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 11/27] 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 12/27] 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 zcmV+!4d(Ln8uc2Gcz>(a%66XEjvd(U6BPU;*bG`zGh89`b1e1W*p|Bd<&T=(XQcjE z+VF7sd+vI5mjBPuj>^9xF^-t*TSj&LVQX*!ulyWV)e_T?{ z?f+cCii@ROQUfK)Kwx8PzUwj7Qb0t34;&TI^ju_*J zF^(AHh%t^BnF`2LIf4wsi#&o7o7Kb%=9!7-`O-!Bk)YtcL=Z??#J4!=@D zVf`)g1G{|l{D0!zV8(VElBB4Jm>J^ec2^Zm9$Qh771b6!bvK^tJL7pMb;K0T46CMZ z$ri1AzJPpnCzs_E!Mlv+#OhGltlNQmT8qujwrj|B73=h zAh5;bRvv1LrWcOX3rz={%^bmwnP1{Kruhy4xWI2`Jqt?6@^*4Be;k6S8b&x?Rg00( z(*t-ePJd@oUaW%cUE+%5?75NtsHtlHsw`;ENM+Ckn`?vkv*(epO^er(-v$MWV?PcA zq>Gn(5>t$dJiAAAR1uORoX6;yvPIT>zg-Df=6$V6(05xtnD_QTvVq*)?-ZhH;Auvz zvI#R9VJ?CRG6sB=*t(m688E4VbN$3HI>85gkaV{NC2H6Uf@ZF zLy}2Dbg*i!RDDL?FpGy1pn4H$6~Y8&62QPLwi+{`--xkFJs0u6*8g$Op<@kim)+N;N5rP#c&jTO5p zCQ(u0)~bUlkcu0lhhRP-6~+9yo0)-)x02Ro=F&|z-mCp4dyqP0RD zSy4)*r`61m{V>7+T!u~1MseMI`g9HLjDN8nX{-#9hU-6kDTCS_7W_DBm-+}yRX%@v z08iCeT_ysZIs5=tDvYCfN-D}myzAeCv%3Bqy`p(WC~NW^`uzH036L!yfn=7WV%B?^ z%fBVIy}s;b|Fx)YldQNK%ylQ{Zi0U9Ux3+74Y}D{SRCRR9fUUp!m)395MPqKVSjH) zwI})eAGyqsRaQkpvjH%F4lMu-M`=Z)l+m3DrC<_D;`LCzX`(b~@>>yy=<`?8Sh)TC zS0Tw^Wtt-%xpf2Vgg@5gKhch+;c{2%e9VsAhn>`O{Pzd322rA0CvPZ9C z%8F{JtM;U}1kngfNED(pqvZX+B%-h(8Xi1l5G@apb*A@$b5O*uq{Qp@KZ2xcu0umO z(|f|hJ)GZVfFmA}H@O*XH$LF-n?L>gAOEb;v-JHBO+t4BeN};aZ{Z_Ela{QhVhu7jjX0;OJ%ac z3Uc76YW87m^!B=vS+B0e??CL2h9Y-;4K_ zMZd2>KxIXNbcmnCmJG8-xmEFG|Jr~h)=*Fs+~BBgsmKcZr`_% z9oG{;7szoOb`1x*t@G>iQg`qYLQF5CK3~IdE+I>m8ucR21lSa@zDCJsge1y{a)UkX2@_Je|xhKt=3GBJ5r!Z@nZMh%z- zJ%4!wcVxs@%#UfSoFa?17C4SBys5QKouKJ$zc*A3H46I!7+vrhd&42Y6Qku=FI=-;xC6ZqN+$M!cv_tZje4d_%YF#94u9%0 zae+n>BaZ_lO^07SX@^&m!ov$7R6k7^YHD|3Lu!AY*x1vzXh3fjXDRs~;VgO<*qGlVgOzMp)l=_yMH1@_4=}4p-oxiB;uq!p>N(Hx4qSmU7 zzQ~0CQ!Qbsn<=-qo=b7&W4LBFsec#4P5rKe(SBK?>Z-4J2oSsY#5iLMJa{JWBov9o z?n`nt4q5v&R@`_i!ta2{>B|f1pw3z!JJ;z9n-YvbV#)U!X9~YUBr1@;y@0r5fmQ)8 zKRW)^XfcpnsWIPRlFiDko)YoP#55Y9C!AHzbzsN>Fp=Pxan=ECai1!@L69(B)2g+Jpm zlRA9z#*#j0-nFE`oSAoz2IxHcg3%D(V}f&Cd%CMa13Hi22YLV_9g{#$GP1Y6WmQBZ z2JIHv-?C<;Jn?@86QQAF3V%q(ywlm=mpHy}NZsca#^kFX@dB}U&-upYAUdPOI~!>Q$X=O4LTA&KwH?fm~y5dVLa z%LS_8%c@C5g_ZsE^;|(=>MYuaW&f1A{j2VYhh*|q_mukmtL`Zc`hQp5Q@ZM3bx&pY zU5%W=T<%HSKVB7?gPU1Ao*4RJHRDNOA5tnF$#dvr9{68E@5bsdgxLLe!bymM22s(b zAw+L3MBh^(D$4k1*E-VWQQY{jyhB19ho8qhnwVmCi(TjJTznEhQbf(vb(>H9AA#p~ jZs&Gx=XP%Ac5df(Zj)aP2@dD>ztsK%zjDFf08jt`G98H^ 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 13/27] 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 14/27] 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 15/27] 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())), ); } From da49faa940ef8b1b0dab0ccd4f7f9ddf7cac4c45 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 30 Mar 2023 18:47:14 +0200 Subject: [PATCH 16/27] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3445 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0bce0b5b3..25efd3ed8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.34.0", + "version": "4.35.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 99d8f24c2f29e19436c22389434b430b38f9f678..25c67523a81939fd2161879701ed282aae212d7a 100644 GIT binary patch delta 3358 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 delta 3359 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 From 1e1f9fc4094acf3c829d80d8ef4425d3638311d4 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Thu, 30 Mar 2023 20:32:37 +0300 Subject: [PATCH 17/27] RED-6453 - Value for attribute in file list cannot be set --- .../table-item/file-attribute/file-attribute.component.ts | 2 +- libs/common-ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts index 863ee9353..d867df3cb 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts @@ -78,7 +78,7 @@ export class FileAttributeComponent extends BaseFormComponent implements OnInit, const rawFormValue = this.form.getRawValue(); const fileAttrValue = rawFormValue[this.fileAttribute.id]; const attributeIdToValue = { - ...rawFormValue, + ...this.#getForm().getRawValue(), [this.fileAttribute.id]: this.#formatAttributeValue(fileAttrValue), }; try { diff --git a/libs/common-ui b/libs/common-ui index dbe1e9fae..79b688b21 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit dbe1e9fae14b313dd26ac1e8e0c0a8749f957cde +Subproject commit 79b688b218c4a0cc97a128cf7d4d882aefb5353d From 1641f7698efc7301fdac44c171ece5a298f2e9c0 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 30 Mar 2023 19:35:08 +0200 Subject: [PATCH 18/27] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3443 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25efd3ed8..153b20f6b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.35.0", + "version": "4.36.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 25c67523a81939fd2161879701ed282aae212d7a..4fcd91883013a3fd7dc87ffdbcc3462a3e704375 100644 GIT binary patch delta 3259 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 From 49b32f36d03b3487223bb99cf0431064b4b77dd7 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Thu, 30 Mar 2023 20:40:22 +0300 Subject: [PATCH 19/27] RED-6453 - update common ui --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 79b688b21..3c3badfca 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 79b688b218c4a0cc97a128cf7d4d882aefb5353d +Subproject commit 3c3badfca1ab434ad0acf8f4a5100135ef4dd510 From ae8032fa97ed157e346854a61220cb65c0472a61 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 30 Mar 2023 19:43:01 +0200 Subject: [PATCH 20/27] 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 153b20f6b..3ff0aaac5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.36.0", + "version": "4.37.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 4fcd91883013a3fd7dc87ffdbcc3462a3e704375..1c3a7b1e13ff922e47a8904af27f0c7091f2dd77 100644 GIT binary patch delta 3144 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 delta 3143 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 Date: Fri, 31 Mar 2023 12:31:42 +0300 Subject: [PATCH 21/27] RED-6523 - multitenancy --- apps/red-ui/src/app/app-routing.module.ts | 12 ++++++--- apps/red-ui/src/app/app.module.ts | 18 +++++-------- .../base-screen/base-screen.component.html | 4 +++ .../base-screen/base-screen.component.ts | 13 +++++++--- .../src/app/guards/dossier-files-guard.ts | 4 ++- .../guards/dossier-template-exists.guard.ts | 6 +++-- apps/red-ui/src/app/guards/dossiers.guard.ts | 4 ++- .../app/guards/entity-exists-guard.service.ts | 4 ++- .../src/app/guards/watermark-exists.guard.ts | 16 ++++++++++-- .../base-entity-screen.component.ts | 5 ++-- .../watermark-screen.component.ts | 8 +++++- .../dossier-template-actions.component.ts | 12 +++++++-- .../file-preview-screen.component.ts | 4 ++- .../file-actions/file-actions.component.ts | 4 ++- .../edit-dossier-general-info.component.ts | 13 ++++++++-- .../add-dossier-dialog.component.ts | 5 ++-- .../services/file-download.service.ts | 7 +++--- .../dossiers/archived-dossiers.service.ts | 4 ++- .../app/services/router-history.service.ts | 7 ++++-- apps/red-ui/src/app/users/red-role.guard.ts | 15 +++++------ .../app/utils/configuration.initializer.ts | 15 +++++++---- apps/red-ui/src/app/utils/tenant-context.ts | 8 ------ .../src/app/utils/tenant-id-interceptor.ts | 16 ------------ .../utils/tenant-id-response-interceptor.ts | 22 ---------------- apps/red-ui/src/assets/config/config.json | 4 +-- apps/red-ui/src/assets/i18n/redact/de.json | 25 +++++++++++-------- apps/red-ui/src/assets/i18n/redact/en.json | 25 +++++++++++-------- apps/red-ui/src/assets/i18n/scm/de.json | 19 ++++++++++---- apps/red-ui/src/assets/i18n/scm/en.json | 19 ++++++++++---- libs/common-ui | 2 +- 30 files changed, 185 insertions(+), 135 deletions(-) delete mode 100644 apps/red-ui/src/app/utils/tenant-context.ts delete mode 100644 apps/red-ui/src/app/utils/tenant-id-interceptor.ts delete mode 100644 apps/red-ui/src/app/utils/tenant-id-response-interceptor.ts diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index a42c3cb55..b6820fa72 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -6,6 +6,7 @@ import { IqserAuthGuard, IqserPermissionsGuard, IqserRoutes, + TenantResolveComponent, } from '@iqser/common-ui'; import { RedRoleGuard } from '@users/red-role.guard'; import { BaseScreenComponent } from '@components/base-screen/base-screen.component'; @@ -96,11 +97,14 @@ const dossierTemplateIdRoutes: IqserRoutes = [ const routes: IqserRoutes = [ { path: '', - redirectTo: 'main', - pathMatch: 'full', + component: TenantResolveComponent, }, { - path: 'main', + path: ':tenant', + component: TenantResolveComponent, + }, + { + path: ':tenant/main', component: BaseScreenComponent, children: [ { @@ -212,7 +216,7 @@ const routes: IqserRoutes = [ ], }, { - path: 'auth-error', + path: ':tenant/auth-error', component: AuthErrorComponent, canActivate: [IqserAuthGuard], }, diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 4da89584c..65adfd2ba 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -12,6 +12,7 @@ import { CommonUiModule, EmptyStateComponent, HiddenActionDirective, + IconButtonComponent, InputWithActionComponent, IqserAllowDirective, IqserDenyDirective, @@ -21,6 +22,7 @@ import { IqserPermissionsService, IqserTranslateModule, IqserUsersModule, + KeycloakStatusService, LanguageService, LogoComponent, MAX_RETRIES_ON_SERVER_ERROR, @@ -29,6 +31,7 @@ import { ServerErrorInterceptor, SkeletonComponent, StopPropagationDirective, + TenantsModule, ToastComponent, } from '@iqser/common-ui'; import { ToastrModule } from 'ngx-toastr'; @@ -66,13 +69,11 @@ import { AppConfig, ILoggerConfig } from '@red/domain'; import { SystemPreferencesService } from '@services/system-preferences.service'; import { PdfViewerModule } from './modules/pdf-viewer/pdf-viewer.module'; import { LicenseService } from '@services/license.service'; -import { TenantIdInterceptor } from '@utils/tenant-id-interceptor'; import { UI_CACHES } from '@utils/constants'; import { RedRoleGuard } from '@users/red-role.guard'; import { SkeletonTopBarComponent } from '@components/skeleton/skeleton-top-bar/skeleton-top-bar.component'; import { DossierSkeletonComponent } from '@components/skeleton/dossier-skeleton/dossier-skeleton.component'; import { SkeletonStatsComponent } from '@components/skeleton/skeleton-stats/skeleton-stats.component'; -import { TenantIdResponseInterceptor } from '@utils/tenant-id-response-interceptor'; const screens = [BaseScreenComponent, DownloadsListScreenComponent]; @@ -119,6 +120,7 @@ export const appModuleFactory = (config: AppConfig) => { preventDuplicates: true, resetTimeoutOnDuplicate: true, }), + TenantsModule.forRoot(), IqserTranslateModule.forRoot({ pathPrefix: config.BASE_TRANSLATIONS_DIRECTORY || '/assets/i18n/redact/' }), IqserLoadingModule.forRoot(), ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }), @@ -170,6 +172,7 @@ export const appModuleFactory = (config: AppConfig) => { IqserAllowDirective, IqserDenyDirective, IqserListingModule, + IconButtonComponent, ], providers: [ { @@ -181,22 +184,13 @@ export const appModuleFactory = (config: AppConfig) => { provide: ErrorHandler, useClass: GlobalErrorHandler, }, - { - provide: HTTP_INTERCEPTORS, - multi: true, - useClass: TenantIdInterceptor, - }, - { - provide: HTTP_INTERCEPTORS, - multi: true, - useClass: TenantIdResponseInterceptor, - }, { provide: APP_INITIALIZER, multi: true, useFactory: configurationInitializer, deps: [ BASE_HREF, + KeycloakStatusService, KeycloakService, ConfigService, SystemPreferencesService, diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index f9f73cfb2..f651a33a1 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -43,6 +43,10 @@ + + diff --git a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html index 4aac57f95..e43777811 100644 --- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html +++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html @@ -14,7 +14,7 @@ [id]="first ? 'navigateToActiveDossiers' : ''" [matTooltip]="breadcrumb.options.clamp && (breadcrumb.name$ | async)" [routerLinkActiveOptions]="breadcrumb.options.routerLinkActiveOptions || { exact: false }" - [routerLink]="breadcrumb.options.routerLink" + [routerLink]="breadcrumb.options.routerLink | tenant" class="breadcrumb" routerLinkActive="active" > @@ -30,7 +30,7 @@ diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index 881b9ddc6..8ce9a49ac 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -51,6 +51,7 @@ import { IqserUploadFileModule, IqserUsersModule, RoundCheckboxComponent, + TenantPipe, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { AuditInfoDialogComponent } from './dialogs/audit-info-dialog/audit-info-dialog.component'; @@ -121,6 +122,7 @@ const components = [ DetailsRadioComponent, IqserAllowDirective, IqserDenyDirective, + TenantPipe, ], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html index 6e8758ba7..1f613032f 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html @@ -110,7 +110,7 @@ @@ -59,7 +59,7 @@
diff --git a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts index 41731fbe6..a80730466 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts @@ -5,7 +5,7 @@ import { adminSideNavTranslations } from '@translations/admin-side-nav-translati import { ActivatedRoute, RouterLink, RouterLinkActive } from '@angular/router'; import { AdminSideNavType, AdminSideNavTypes, ENTITY_TYPE, User } from '@red/domain'; import { ROLES } from '@users/roles'; -import { getCurrentUser, IqserHelpModeModule, IqserPermissionsService, SideNavComponent } from '@iqser/common-ui'; +import { getCurrentUser, IqserHelpModeModule, IqserPermissionsService, SideNavComponent, TenantPipe } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { NgForOf, NgIf } from '@angular/common'; @@ -21,7 +21,7 @@ interface NavItem { templateUrl: './admin-side-nav.component.html', styleUrls: ['./admin-side-nav.component.scss'], standalone: true, - imports: [TranslateModule, NgIf, IqserHelpModeModule, RouterLink, RouterLinkActive, NgForOf, SideNavComponent], + imports: [TranslateModule, NgIf, IqserHelpModeModule, RouterLink, RouterLinkActive, NgForOf, SideNavComponent, TenantPipe], }) export class AdminSideNavComponent implements OnInit { @Input() type: AdminSideNavType; diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html index 72551498d..73574d744 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html @@ -2,25 +2,29 @@ - + {{ dossierTemplate.name }} - + {{ 'admin-side-nav.entities' | translate }} - + {{ activeDictionary.label }} diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts index 9c0c5a773..62e110ec2 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts @@ -8,13 +8,14 @@ import { DictionariesMapService } from '@services/entity-services/dictionaries-m import { AsyncPipe, NgIf } from '@angular/common'; import { MatIconModule } from '@angular/material/icon'; import { TranslateModule } from '@ngx-translate/core'; +import { TenantPipe } from '@iqser/common-ui'; @Component({ selector: 'redaction-dossier-template-breadcrumbs', templateUrl: './dossier-template-breadcrumbs.component.html', styleUrls: ['./dossier-template-breadcrumbs.component.scss'], standalone: true, - imports: [NgIf, AsyncPipe, RouterLink, MatIconModule, TranslateModule, RouterLinkActive], + imports: [NgIf, AsyncPipe, RouterLink, MatIconModule, TranslateModule, RouterLinkActive, TenantPipe], }) export class DossierTemplateBreadcrumbsComponent { @Input() root = false; diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html index 27720cc5e..d96e0a42d 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html @@ -1,7 +1,7 @@
-
+
{{ file.filename }}
diff --git a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts index 8f23b68c9..f5f0111cf 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts @@ -13,6 +13,7 @@ import { IqserUsersModule, StatusBarComponent, StopPropagationDirective, + TenantPipe, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; import { DossierOverviewScreenComponent } from './screen/dossier-overview-screen.component'; @@ -68,6 +69,7 @@ const routes: IqserRoutes = [ HasScrollbarDirective, DynamicInputComponent, IqserAllowDirective, + TenantPipe, ], }) export class DossierOverviewModule {} 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..e123015fb 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 @@ -36,9 +36,9 @@ @@ -64,7 +64,7 @@
diff --git a/apps/red-ui/src/app/modules/search/search.module.ts b/apps/red-ui/src/app/modules/search/search.module.ts index 160d2a5bb..1a6943185 100644 --- a/apps/red-ui/src/app/modules/search/search.module.ts +++ b/apps/red-ui/src/app/modules/search/search.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchScreenComponent } from './search-screen/search-screen.component'; import { RouterModule } from '@angular/router'; -import { IqserListingModule, IqserUsersModule, StatusBarComponent, StopPropagationDirective } from '@iqser/common-ui'; +import { IqserListingModule, IqserUsersModule, StatusBarComponent, StopPropagationDirective, TenantPipe } from '@iqser/common-ui'; import { SharedModule } from '@shared/shared.module'; import { TranslateModule } from '@ngx-translate/core'; import { SearchItemTemplateComponent } from './search-item-template/search-item-template.component'; @@ -20,6 +20,7 @@ const routes = [{ path: '', component: SearchScreenComponent }]; IqserListingModule, StatusBarComponent, StopPropagationDirective, + TenantPipe, ], }) export class SearchModule {} diff --git a/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html b/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html index c328c4ca3..c7d6ebb58 100644 --- a/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html +++ b/apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html @@ -20,7 +20,11 @@
- + {{ fileDossier.dossierName }} diff --git a/apps/red-ui/src/app/modules/trash/trash.module.ts b/apps/red-ui/src/app/modules/trash/trash.module.ts index a86df8312..aa1cfe00e 100644 --- a/apps/red-ui/src/app/modules/trash/trash.module.ts +++ b/apps/red-ui/src/app/modules/trash/trash.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { TrashScreenComponent } from './trash-screen/trash-screen.component'; -import { CircleButtonComponent, IqserListingModule, IqserUsersModule } from '@iqser/common-ui'; +import { CircleButtonComponent, IqserListingModule, IqserUsersModule, TenantPipe } from '@iqser/common-ui'; import { TrashTableItemComponent } from './trash-screen/trash-table-item/trash-table-item.component'; import { SharedModule } from '@shared/shared.module'; import { TrashDialogService } from './services/trash-dialog.service'; @@ -20,6 +20,7 @@ const routes = [{ path: '', component: TrashScreenComponent }]; TranslateModule, IqserListingModule, CircleButtonComponent, + TenantPipe, ], providers: [TrashDialogService], }) diff --git a/apps/red-ui/src/app/utils/configuration.initializer.ts b/apps/red-ui/src/app/utils/configuration.initializer.ts index cb1655efc..2472b86cc 100644 --- a/apps/red-ui/src/app/utils/configuration.initializer.ts +++ b/apps/red-ui/src/app/utils/configuration.initializer.ts @@ -33,6 +33,7 @@ export function configurationInitializer( licenseService: LicenseService, permissionsService: IqserPermissionsService, ) { + console.log('BASE HREF: ', baseHref); const setup = keycloakStatusService.keycloakStatus$.pipe( filter(event => event === KeycloakStatus.READY || event === KeycloakStatus.NOT_ACTIVE), map(() => featuresService.loadConfig()), diff --git a/libs/common-ui b/libs/common-ui index 00d55e470..5c24018d1 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 00d55e470f99fb1defa1ae7250af793d6fe70115 +Subproject commit 5c24018d1265f53ec312ce79f03bbc7af14a53f5 From 9171efba6c43a802e05fc3825b9192bcee288aee Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 31 Mar 2023 13:39:51 +0300 Subject: [PATCH 23/27] RED-6523: update common-ui --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 5c24018d1..86b52a643 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 5c24018d1265f53ec312ce79f03bbc7af14a53f5 +Subproject commit 86b52a643a1ffa0acd50dd59e90bf16e98999d27 From 51c66c6d8b2195f37202a684b0b99e0abec12b93 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Fri, 31 Mar 2023 15:55:59 +0300 Subject: [PATCH 24/27] RED-6523 - update common ui --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 3c3badfca..9bb761990 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 3c3badfca1ab434ad0acf8f4a5100135ef4dd510 +Subproject commit 9bb7619907b3965da28a3477addcb3a3082d4b3b From c7a93d1a6183d0c47532fb8579892bf0b4735cff Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 31 Mar 2023 15:00:16 +0200 Subject: [PATCH 25/27] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3442 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ff0aaac5..524695658 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.37.0", + "version": "4.38.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 1c3a7b1e13ff922e47a8904af27f0c7091f2dd77..39a2901221cff85dc36c4c5627a843d0f3cc6038 100644 GIT binary patch delta 3428 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 GPyhgSfvTwh delta 3415 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 Date: Fri, 31 Mar 2023 17:33:03 +0300 Subject: [PATCH 26/27] RED-6453 - Value for attribute in file list cannot be set --- .../file-attribute.component.html | 2 +- .../file-attribute.component.ts | 27 +++++++++---------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html index 602e751e4..ec156f82e 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html @@ -4,7 +4,7 @@ {{ fileAttributeValue ? (fileAttributeValue | date : 'd MMM yyyy') : '-' }} - +
{ this.#toggleEdit(); } @@ -111,7 +98,11 @@ export class FileAttributeComponent extends BaseFormComponent implements OnInit, #initFileAttributes() { const configs = this.fileAttributesService.getFileAttributeConfig(this.file.dossierTemplateId).fileAttributeConfigs; - configs.forEach(config => (this.file.fileAttributes.attributeIdToValue[config.id] = null)); + configs.forEach(config => { + if (!this.file.fileAttributes.attributeIdToValue[config.id]) { + this.file.fileAttributes.attributeIdToValue[config.id] = null; + } + }); } #getForm(): UntypedFormGroup { @@ -129,6 +120,12 @@ export class FileAttributeComponent extends BaseFormComponent implements OnInit, } #toggleEdit(): void { + if (!this.isInEditMode) { + this.#initFileAttributes(); + this.form = this.#getForm(); + this.initialFormValue = this.form.getRawValue(); + } + this.isInEditMode = !this.isInEditMode; this.fileAttributesService.isEditingFileAttribute$.next(this.isInEditMode); From e6bc6281485f2a751bc01ea22d1fc67693795d90 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 31 Mar 2023 16:35:50 +0200 Subject: [PATCH 27/27] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3442 -> 3445 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 524695658..077cd9ca0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.38.0", + "version": "4.39.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 39a2901221cff85dc36c4c5627a843d0f3cc6038..dc6137107b3174986c6e2df61466ba1631081efa 100644 GIT binary patch literal 3445 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 X&h6aJ?cC1of2sWkXWK5V08jt`Wh%A3 literal 3442 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 Ub2*oD`Clsk0okttc>quV0AZ}GIRF3v