From 519557774309c2fc4d83c5f2ea45436a692ce966 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Wed, 8 Feb 2023 14:48:02 +0200 Subject: [PATCH 1/6] RED-3800: prepare for adding ids --- .../base-admin-screen.component.ts | 3 +- .../dossier-details-stats.component.html | 24 +++---- .../dossier-details-stats.component.ts | 3 +- ...sier-overview-screen-header.component.html | 2 +- .../annotation-actions.component.ts | 17 ++--- .../readonly-banner.component.ts | 3 +- .../user-management.component.html | 4 +- .../view-switch/view-switch.component.ts | 72 ++++++++++--------- .../edit-dossier-dialog.component.html | 6 +- .../edit-dossier-general-info.component.html | 2 +- .../app/modules/shared/CustomDateAdapter.ts | 4 ++ .../assign-user-dropdown.component.html | 2 +- .../expandable-file-actions.component.html | 4 +- .../add-dossier-dialog.component.html | 4 +- .../upload-status-overlay.component.html | 13 ++-- libs/common-ui | 2 +- 16 files changed, 84 insertions(+), 81 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts index f15acbbb4..6da915279 100644 --- a/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/base-admin-screen/base-admin-screen.component.ts @@ -1,8 +1,7 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ templateUrl: './base-admin-screen.component.html', styleUrls: ['./base-admin-screen.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, }) export class BaseAdminScreenComponent {} diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html index 1a41e77de..bcd15950e 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html @@ -1,34 +1,34 @@
- {{ 'dossier-overview.dossier-details.stats.documents' | translate: { count: stats.numberOfFiles } }} + {{ 'dossier-overview.dossier-details.stats.documents' | translate : { count: stats.numberOfFiles } }}
{{ - 'dossier-overview.dossier-details.stats.processing-documents' | translate: { count: stats.numberOfProcessingFiles } + 'dossier-overview.dossier-details.stats.processing-documents' | translate : { count: stats.numberOfProcessingFiles } }}
- {{ 'dossier-overview.dossier-details.stats.people' | translate: { count: dossier.memberIds.length } }} + {{ 'dossier-overview.dossier-details.stats.people' | translate : { count: dossier.memberIds.length } }}
- {{ 'dossier-overview.dossier-details.stats.analysed-pages' | translate: { count: stats.numberOfPages | number } }} + {{ 'dossier-overview.dossier-details.stats.analysed-pages' | translate : { count: stats.numberOfPages | number } }}
-
+
- {{ 'dossier-overview.dossier-details.stats.created-on' | translate: { date: date } }} +
-
+
- {{ 'dossier-overview.dossier-details.stats.due-date' | translate: { date: dueDate } }} +
@@ -44,7 +44,7 @@
- {{ 'dossier-overview.dossier-details.stats.deleted' | translate: { count: stats.numberOfSoftDeletedFiles } }} + {{ 'dossier-overview.dossier-details.stats.deleted' | translate : { count: stats.numberOfSoftDeletedFiles } }}
@@ -55,14 +55,14 @@ [iqserHelpMode]="'edit_dossier_dossier_attributes'" class="all-caps-label show-attributes" > - {{ 'dossier-overview.dossier-details.attributes.expand' | translate: { count: dossierAttributes.length } }} + {{ 'dossier-overview.dossier-details.attributes.expand' | translate : { count: dossierAttributes.length } }}
-
+
{{ attr.label + ': -' }} - {{ attr.label + ': ' + (attr.value | date: 'd MMM yyyy') }} + {{ attr.label + ': ' + (attr.value | date : 'd MMM yyyy') }} {{ attr.label + ': ' + ('dossier-overview.dossier-details.attributes.image-uploaded' | translate) }} diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts index 561cb7575..767368052 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { Dossier, DossierAttributeWithValue, DossierStats } from '@red/domain'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; import { FilesService } from '@services/files/files.service'; @@ -10,7 +10,6 @@ import { DossiersDialogService } from '../../../shared-dossiers/services/dossier selector: 'redaction-dossier-details-stats', templateUrl: './dossier-details-stats.component.html', styleUrls: ['./dossier-details-stats.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, }) export class DossierDetailsStatsComponent implements OnInit { @Input() dossierAttributes: DossierAttributeWithValue[]; 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 bf669b731..c8fc509e7 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 @@ -40,8 +40,8 @@ a !== undefined); + const viewerAnnotations = this.viewerAnnotations ?? []; + this.isVisible = viewerAnnotations.reduce((acc, annotation) => annotation?.isVisible() && acc, true); + this.isImage = this._annotations?.reduce((accumulator, annotation) => annotation.isImage && accumulator, true); } get viewerAnnotations() { return this._annotationManager.get(this._annotations); } - get isVisible() { - return this.viewerAnnotations?.reduce((accumulator, annotation) => annotation?.isVisible() && accumulator, true); - } - - get isImage() { - return this.annotations?.reduce((accumulator, annotation) => annotation.isImage && accumulator, true); - } - get resizing() { return this.annotations?.length === 1 && this.annotations?.[0].resizing; } diff --git a/apps/red-ui/src/app/modules/file-preview/components/readonly-banner/readonly-banner.component.ts b/apps/red-ui/src/app/modules/file-preview/components/readonly-banner/readonly-banner.component.ts index 075839a18..4bd91805a 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/readonly-banner/readonly-banner.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/readonly-banner/readonly-banner.component.ts @@ -1,11 +1,10 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { File } from '@red/domain'; @Component({ selector: 'redaction-readonly-banner', templateUrl: './readonly-banner.component.html', styleUrls: ['./readonly-banner.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, }) export class ReadonlyBannerComponent { @Input() file: File; 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 206850858..debe7cbdf 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 @@ -34,8 +34,8 @@
diff --git a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts index 866bc3c9a..95c8c4f8a 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; +import { Component, Inject } from '@angular/core'; import { ViewMode, ViewModes } from '@red/domain'; import { ViewModeService } from '../../services/view-mode.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; @@ -15,7 +15,6 @@ import { ROLES } from '@users/roles'; selector: 'redaction-view-switch', templateUrl: './view-switch.component.html', styleUrls: ['./view-switch.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, }) export class ViewSwitchComponent { readonly viewModes = ViewModes; @@ -54,40 +53,45 @@ export class ViewSwitchComponent { async #switchToRedactedView() { const unapprovedSuggestionsWarning = this._userPreferenceService.getUnapprovedSuggestionsWarning(); - if (!unapprovedSuggestionsWarning) { - const suggestions = (await this._fileDataService.annotations).filter(a => a.isSuggestion); - if (suggestions.length) { - const displaySuggestionsInPreview = this._userPreferenceService.getDisplaySuggestionsInPreview(); - const question = displaySuggestionsInPreview - ? _('unapproved-suggestions.confirmation-dialog.displayed-question') - : _('unapproved-suggestions.confirmation-dialog.not-displayed-question'); - const data = new ConfirmationDialogInput({ - title: _('unapproved-suggestions.confirmation-dialog.title'), - question: question, - confirmationText: _('unapproved-suggestions.confirmation-dialog.confirmation-text'), - denyText: _('unapproved-suggestions.confirmation-dialog.deny-text'), - checkboxes: [ - { - label: _('unapproved-suggestions.confirmation-dialog.checkbox-text'), - value: false, - }, - ], - checkboxesValidation: false, - }); + if (unapprovedSuggestionsWarning) { + return this.viewModeService.switchToRedacted(); + } - return this._dialogService.openDialog('confirm', null, data, result => { - if (result) { - if (result === ConfirmOptions.SECOND_CONFIRM) { - this._userPreferenceService.toggleUnapprovedSuggestionsWarning(); - this._toaster.success(_('unapproved-suggestions.confirmation-dialog.success-confirmation-text'), { - params: { settingsUrl: `${this._baseHref}/main/account/warnings-preferences` }, - }); - } - this.viewModeService.switchToRedacted(); - } + const suggestions = (await this._fileDataService.annotations).filter(a => a.isSuggestion); + if (!suggestions.length) { + return this.viewModeService.switchToRedacted(); + } + + const displaySuggestionsInPreview = this._userPreferenceService.getDisplaySuggestionsInPreview(); + const question = displaySuggestionsInPreview + ? _('unapproved-suggestions.confirmation-dialog.displayed-question') + : _('unapproved-suggestions.confirmation-dialog.not-displayed-question'); + const data = new ConfirmationDialogInput({ + title: _('unapproved-suggestions.confirmation-dialog.title'), + question: question, + confirmationText: _('unapproved-suggestions.confirmation-dialog.confirmation-text'), + denyText: _('unapproved-suggestions.confirmation-dialog.deny-text'), + checkboxes: [ + { + label: _('unapproved-suggestions.confirmation-dialog.checkbox-text'), + value: false, + }, + ], + checkboxesValidation: false, + }); + + return this._dialogService.openDialog('confirm', null, data, result => { + if (!result) { + return; + } + + if (result === ConfirmOptions.SECOND_CONFIRM) { + this._userPreferenceService.toggleUnapprovedSuggestionsWarning(); + this._toaster.success(_('unapproved-suggestions.confirmation-dialog.success-confirmation-text'), { + params: { settingsUrl: `${this._baseHref}/main/account/warnings-preferences` }, }); } - } - return this.viewModeService.switchToRedacted(); + this.viewModeService.switchToRedacted(); + }); } } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html index 418984d6f..b4f5db284 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html @@ -58,13 +58,13 @@ [disabled]="disabled || !valid || !changed" [label]="'edit-dossier-dialog.actions.save' | translate" [type]="iconButtonTypes.primary" - id="editDossierSaveButton" + buttonId="editDossierSaveButton" > @@ -76,5 +76,5 @@
- + diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html index 13006ca6f..6836a8104 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html @@ -79,9 +79,9 @@ diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html index 1ece80983..40857cf4e 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html @@ -2,8 +2,8 @@ diff --git a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html index 121c9ab13..3c9be07e8 100644 --- a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html @@ -101,13 +101,13 @@ [disabled]="disabled" [label]="'add-dossier-dialog.actions.save' | translate" [type]="iconButtonTypes.primary" - id="createDossierSaveButton" + buttonId="createDossierSaveButton" >
- {{ 'upload-status.dialog.title' | translate: { len: uploadService.files.length } }} + {{ 'upload-status.dialog.title' | translate : { len: uploadService.files.length } }}
- + - +
@@ -31,9 +34,7 @@
{{ model.progress }}%
-
- {{ model.error?.message }} -
+
diff --git a/libs/common-ui b/libs/common-ui index 40517f145..fe9a50d36 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 40517f145e0f8719e49ef133ef271f242d8dd078 +Subproject commit fe9a50d367901bc6b3c21794f5fd189ab69ce2c1 From ffba497d5b2f5a3ea1444c3f7aa08e225dc6147e Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 8 Feb 2023 13:50:35 +0100 Subject: [PATCH 2/6] 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 a7393983f..4e5789bb4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.924.0", + "version": "3.925.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 81e3b33d580e19cb9e4ec3c0c58b6b34bb8e4b68..7e5218934cb3f322e7851c0ebcec323a2ecce5d9 100644 GIT binary patch delta 3353 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 S4s-ioYX1SgjMY5=PyhfWHgYZi From 589b6c2f8479592b4185c791e4018bfb791bc4c4 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Wed, 8 Feb 2023 17:24:58 +0200 Subject: [PATCH 3/6] RED-5820: fix resizing --- .../src/app/models/file/annotation.wrapper.ts | 1 - .../annotation-actions.component.html | 4 +--- .../annotation-actions.component.ts | 2 +- .../services/annotation-actions.service.ts | 12 +++++++++--- .../services/pdf-annotation-actions.service.ts | 4 +++- .../file-preview/services/pdf-proxy.service.ts | 15 ++++++++++----- .../services/annotation-manager.service.ts | 1 + libs/common-ui | 2 +- 8 files changed, 26 insertions(+), 15 deletions(-) diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 0f239074a..4788f33e9 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -48,7 +48,6 @@ export class AnnotationWrapper implements IListable, Record { recommendationType: string; legalBasisValue: string; legalBasisChangeValue?: string; - resizing = false; rectangle?: boolean; section?: string; reference: List; diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html index 714e1343b..f27d6f526 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html @@ -4,10 +4,9 @@ class="annotation-actions" > - + !!value && !!value.annotations)); dialogClosed.subscribe(({ annotations, comment: commentText }) => { + if (isJustOne(annotations) && this._annotationManager.resizingAnnotationId === annotations[0].id) { + this.cancelResize(null, annotations[0]).then(); + } const comment = commentText ? { text: commentText } : undefined; this.#processObsAndEmit(this._manualRedactionService.addRecommendation(annotations, dossierId, fileId, comment)); }); @@ -185,7 +189,7 @@ export class AnnotationActionsService { async resize($event: MouseEvent, annotationWrapper: AnnotationWrapper) { $event?.stopPropagation(); - annotationWrapper.resizing = true; + this._annotationManager.resizingAnnotationId = annotationWrapper.id; const viewerAnnotation = this._annotationManager.get(annotationWrapper); if (annotationWrapper.rectangle || annotationWrapper.imported || annotationWrapper.isImage) { @@ -226,6 +230,8 @@ export class AnnotationActionsService { updateDictionary: result.updateDictionary, }; + this.cancelResize(null, annotation).then(); + const { fileId, dossierId } = this._state; const request = this._manualRedactionService.resizeOrSuggestResize([resizeRequest], dossierId, fileId); this.#processObsAndEmit(request); @@ -235,7 +241,7 @@ export class AnnotationActionsService { async cancelResize($event: MouseEvent, annotationWrapper: AnnotationWrapper) { $event?.stopPropagation(); - annotationWrapper.resizing = false; + this._annotationManager.resizingAnnotationId = undefined; this._annotationManager.delete(annotationWrapper); await this._annotationDrawService.draw([annotationWrapper], this._skippedService.hideSkipped, this._state.dossierTemplateId); diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts index 569ccfa20..f1bc826ef 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts @@ -9,6 +9,7 @@ import { BASE_HREF_FN, IqserPermissionsService } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { IHeaderElement } from '@red/domain'; import { ROLES } from '@users/roles'; +import { REDAnnotationManager } from '../../pdf-viewer/services/annotation-manager.service'; @Injectable() export class PdfAnnotationActionsService { @@ -19,6 +20,7 @@ export class PdfAnnotationActionsService { readonly #convertPath = inject(BASE_HREF_FN); readonly #annotationActionsService = inject(AnnotationActionsService); readonly #iqserPermissionsService = inject(IqserPermissionsService); + readonly #annotationManager = inject(REDAnnotationManager); get(annotations: AnnotationWrapper[]): IHeaderElement[] { const availableActions: IHeaderElement[] = []; @@ -28,7 +30,7 @@ export class PdfAnnotationActionsService { if (permissions.canResize) { const firstAnnotation = annotations[0]; // if we already entered resize-mode previously - if (firstAnnotation.resizing) { + if (firstAnnotation.id === this.#annotationManager.resizingAnnotationId) { const acceptResizeButton = this.#getButton('check', _('annotation-actions.resize-accept.label'), () => this.#annotationActionsService.acceptResize(null, firstAnnotation), ); diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts index ece3bf308..f3b47a5bb 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts @@ -9,7 +9,7 @@ import { } from '@models/file/manual-redaction-entry.wrapper'; import { AnnotationDrawService } from '../../pdf-viewer/services/annotation-draw.service'; import { UserPreferenceService } from '@users/user-preference.service'; -import { BASE_HREF_FN, BaseHrefFn, IqserPermissionsService, shareDistinctLast } from '@iqser/common-ui'; +import { BASE_HREF_FN, BaseHrefFn, IqserPermissionsService, isJustOne, shareDistinctLast } from '@iqser/common-ui'; import { toPosition } from '../utils/pdf-calculation.utils'; import { MultiSelectService } from './multi-select.service'; import { FilePreviewStateService } from './file-preview-state.service'; @@ -161,19 +161,24 @@ export class PdfProxyService { } #cancelResizeIfIsResizing(annotations: Annotation[]) { - if (annotations.length !== 1) { + if (!isJustOne(annotations)) { return; } const annotation = annotations[0]; - const wrapper = this._fileDataService.find(annotation.Id); - if (!wrapper?.resizing) { + const isResizing = this._annotationManager.resizingAnnotationId === annotation.Id; + + if (!isResizing) { return; } // When resizing a rectangle, the original annotation is removed and triggers a deselect event and a new one is created // So we want to skip the first deselect event. - if ((wrapper.isImage || wrapper.rectangle) && annotation.ToolName !== AnnotationToolNames.AnnotationCreateRectangle) { + const wrapper = this._fileDataService.find(annotation.Id); + if ( + (wrapper.rectangle || wrapper.isImage || wrapper.imported) && + annotation.ToolName !== AnnotationToolNames.AnnotationCreateRectangle + ) { return; } diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-manager.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-manager.service.ts index d17a81d54..74cff5ed2 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-manager.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-manager.service.ts @@ -15,6 +15,7 @@ import Annotation = Core.Annotations.Annotation; export class REDAnnotationManager { annotationSelected$: Observable<[Annotation[], string]>; readonly hidden = new Set(); + resizingAnnotationId?: string = undefined; #manager: AnnotationManager; diff --git a/libs/common-ui b/libs/common-ui index fe9a50d36..3a5c09812 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit fe9a50d367901bc6b3c21794f5fd189ab69ce2c1 +Subproject commit 3a5c098128f8229aa3b961c0c03d0f9185089fcd From 0fabc1185f2b10d7949a17d1c7b4b051c4a8aa9e Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 8 Feb 2023 16:27:29 +0100 Subject: [PATCH 4/6] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e5789bb4..ece56f950 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.925.0", + "version": "3.926.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 7e5218934cb3f322e7851c0ebcec323a2ecce5d9..3e7c5c3278e93d5173e76d35eb81d920dab44d67 100644 GIT binary patch delta 3333 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 Pf2sWkBbqQI08jt`*qC~_ delta 3333 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 Date: Wed, 8 Feb 2023 17:26:29 +0200 Subject: [PATCH 5/6] RED-6129, add ids to various inputs. --- .../dossier-templates-listing-screen.component.html | 1 + .../dossier-template-actions.component.html | 3 +++ libs/common-ui | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html index 43fe510a5..686875d6a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.html @@ -29,6 +29,7 @@
diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html index 6d79cc2f8..a707dd9ed 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html @@ -1,6 +1,7 @@
Date: Wed, 8 Feb 2023 16:37:02 +0100 Subject: [PATCH 6/6] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ece56f950..b6a74fdc5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.926.0", + "version": "3.927.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 3e7c5c3278e93d5173e76d35eb81d920dab44d67..a56a27291aa9364bf002cd47eb48db1d75de842d 100644 GIT binary patch delta 3357 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 nxt-g&o!hyc+qs?FxfY$gBE|b{WAXt(Q@; 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