From 9144041d1ffa87bf76d25799d54928220fb19f1f Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 23 Feb 2022 13:00:55 +0200 Subject: [PATCH 1/6] =?UTF-8?q?RED-3332=20->=20if=20file=20requires=20anal?= =?UTF-8?q?ysis,=20updated=20approve=20action=20to=20display=20warning=20?= =?UTF-8?q?=E2=80=9EAnalysis=20required=20to=20detect=20new=20redactions.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen-header.component.html | 2 +- .../screen-header/screen-header.component.ts | 1 - .../dossier-overview-screen.component.html | 8 ++--- .../dossier-overview-screen.component.ts | 6 ---- .../services/bulk-actions.service.ts | 15 ++++++-- .../file-workload.component.html | 6 ---- .../file-actions/file-actions.component.ts | 34 ++++++++++++------- apps/red-ui/src/assets/i18n/de.json | 13 ++++++- apps/red-ui/src/assets/i18n/en.json | 13 ++++++- libs/common-ui | 2 +- libs/red-domain/src/lib/files/file.model.ts | 2 +- 11 files changed, 62 insertions(+), 40 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html index 9ca29d0ab..9242c472e 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html @@ -23,7 +23,7 @@ (); readonly circleButtonTypes = CircleButtonTypes; actionConfigs: List; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html index 7074f226c..760f1aff3 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html @@ -1,10 +1,6 @@ -
- +
+
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts index 00cb0711f..131c51dde 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts @@ -40,7 +40,6 @@ import { FileAttributesService } from '@services/entity-services/file-attributes import { ConfigService } from '../config.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { LongPressEvent } from '@shared/directives/long-press.directive'; import { UserPreferenceService } from '@services/user-preference.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; @@ -60,7 +59,6 @@ export class DossierOverviewScreenComponent extends ListingComponent imple collapsedDetails = false; dossierAttributes: DossierAttributeWithValue[] = []; tableColumnConfigs: readonly TableColumnConfig[]; - analysisForced: boolean; displayedInFileListAttributes: IFileAttributeConfig[] = []; displayedAttributes: IFileAttributeConfig[] = []; readonly workflowConfig: WorkflowConfig = this.configService.workflowConfig; @@ -170,10 +168,6 @@ export class DossierOverviewScreenComponent extends ListingComponent imple this._tableComponent?.scrollToLastIndex(); } - forceReanalysisAction($event: LongPressEvent) { - this.analysisForced = !$event.touchEnd && this._userPreferenceService.areDevFeaturesEnabled; - } - @HostListener('drop', ['$event']) onDrop(event: DragEvent): void { const currentDossier = this._dossiersService.find(this.dossierId); diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts index d7bbdd4a5..36f14f739 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts @@ -115,14 +115,23 @@ export class BulkActionsService { } async approve(files: File[]): Promise { + const foundAnalysisRequiredFile = files.find(file => file.analysisRequired); const foundUpdatedFile = files.find(file => file.hasUpdates); - if (foundUpdatedFile) { + if (foundAnalysisRequiredFile || foundUpdatedFile) { this._dialogService.openDialog( 'confirm', null, new ConfirmationDialogInput({ - title: _('confirmation-dialog.approve-multiple-files.title'), - question: _('confirmation-dialog.approve-multiple-files.question'), + title: foundAnalysisRequiredFile + ? _('confirmation-dialog.approve-multiple-files-without-analysis.title') + : _('confirmation-dialog.approve-multiple-files.title'), + question: foundAnalysisRequiredFile + ? _('confirmation-dialog.approve-multiple-files-without-analysis.question') + : _('confirmation-dialog.approve-multiple-files.question'), + confirmationText: foundAnalysisRequiredFile + ? _('confirmation-dialog.approve-multiple-files-without-analysis.confirmationText') + : null, + denyText: foundAnalysisRequiredFile ? _('confirmation-dialog.approve-multiple-files-without-analysis.denyText') : null, }), async () => { this._loadingService.start(); diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html index cd75fe63c..a39979f30 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html @@ -37,12 +37,6 @@ -
diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts index edfe8b159..829c33302 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts @@ -205,10 +205,19 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, icon: 'red:stop', show: this.canDisableAutoAnalysis, }, + { + type: ActionTypes.circleBtn, + action: $event => this._reanalyseFile($event), + tooltip: _('file-preview.reanalyse-notification'), + tooltipClass: 'warn small', + icon: 'iqser:refresh', + show: this.showReanalyseFilePreview, + }, { type: ActionTypes.circleBtn, action: $event => this.toggleAutomaticAnalysis($event), tooltip: _('dossier-overview.enable-auto-analysis'), + buttonType: this.isFilePreview ? CircleButtonTypes.warn : CircleButtonTypes.default, icon: 'red:play', show: this.canEnableAutoAnalysis, }, @@ -226,15 +235,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, icon: 'iqser:ocr', show: this.showOCR, }, - { - type: ActionTypes.circleBtn, - action: $event => this._reanalyseFile($event), - tooltip: _('file-preview.reanalyse-notification'), - buttonType: CircleButtonTypes.warn, - tooltipClass: 'warn small', - icon: 'iqser:refresh', - show: this.showReanalyseFilePreview, - }, { type: ActionTypes.circleBtn, action: $event => this._reanalyseFile($event), @@ -267,7 +267,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, async setFileApproved($event: MouseEvent) { $event.stopPropagation(); - if (!this.file.hasUpdates) { + if (!this.file.analysisRequired && !this.file.hasUpdates) { await this._setFileApproved(); return; } @@ -276,8 +276,16 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, 'confirm', $event, new ConfirmationDialogInput({ - title: _('confirmation-dialog.approve-file.title'), - question: _('confirmation-dialog.approve-file.question'), + title: this.file.analysisRequired + ? _('confirmation-dialog.approve-file-without-analysis.title') + : _('confirmation-dialog.approve-file.title'), + question: this.file.analysisRequired + ? _('confirmation-dialog.approve-file-without-analysis.question') + : _('confirmation-dialog.approve-file.question'), + confirmationText: this.file.analysisRequired + ? _('confirmation-dialog.approve-file-without-analysis.confirmationText') + : null, + denyText: this.file.analysisRequired ? _('confirmation-dialog.approve-file-without-analysis.denyText') : null, }), async () => { await this._setFileApproved(); @@ -417,7 +425,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, this.showImportRedactions = this._permissionsService.canImportRedactions(this.file); - const showReanalyse = (this.canReanalyse && this.file.excludedFromAutomaticAnalysis) || this.analysisForced; + const showReanalyse = this.canReanalyse || this.file.excludedFromAutomaticAnalysis || this.analysisForced; this.showReanalyseFilePreview = showReanalyse && this.isFilePreview; this.showReanalyseDossierOverview = showReanalyse && this.isDossierOverview; diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index b228549e1..64e622c8a 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -421,10 +421,22 @@ "warning": "Achtung: Diese Aktion kann nicht rückgängig gemacht werden!" }, "confirmation-dialog": { + "approve-file-without-analysis": { + "confirmationText": "", + "denyText": "", + "question": "", + "title": "" + }, "approve-file": { "question": "Dieses Dokument enthält ungesehene Änderungen. Möchten Sie es trotzdem genehmigen?", "title": "Warnung!" }, + "approve-multiple-files-without-analysis": { + "confirmationText": "", + "denyText": "", + "question": "", + "title": "" + }, "approve-multiple-files": { "question": "Mindestens eine der ausgewählten Dateien enthält ungesehene Änderungen. Möchten Sie sie trotzdem genehmigen?", "title": "Warnung!" @@ -599,7 +611,6 @@ "placeholder": "Begründung" } }, - "disabled-auto-analysis": "", "document-info": { "save": "Dokumenteninformation speichern", "title": "Datei-Attribute anlegen" diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 1f5f5db61..086f554f0 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -442,10 +442,22 @@ "warning": "Warning: this cannot be undone!" }, "confirmation-dialog": { + "approve-file-without-analysis": { + "confirmationText": "Approve without analysis", + "denyText": "Cancel", + "question": "Analysis required to detect new redactions.", + "title": "Warning!" + }, "approve-file": { "question": "This document has unseen changes, do you wish to approve it anyway?", "title": "Warning!" }, + "approve-multiple-files-without-analysis": { + "confirmationText": "Approve without analysis", + "denyText": "Cancel", + "question": "Analysis required to detect new redactions for at least one file.", + "title": "Warning" + }, "approve-multiple-files": { "question": "At least one of the files you selected has unseen changes, do you wish to approve them anyway?", "title": "Warning!" @@ -627,7 +639,6 @@ "placeholder": "Reason" } }, - "disabled-auto-analysis": "Automatic analysys is disabled", "document-info": { "save": "Save Document Info", "title": "Introduce File Attributes" diff --git a/libs/common-ui b/libs/common-ui index b4460732f..e2f853655 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit b4460732f80c3c7036ffca6aa5a876a3a91b56eb +Subproject commit e2f85365512c68b927465ee5fe4c0d8e3d5dfe1a diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts index 2c4f19da3..b5930769c 100644 --- a/libs/red-domain/src/lib/files/file.model.ts +++ b/libs/red-domain/src/lib/files/file.model.ts @@ -107,7 +107,7 @@ export class File extends Entity implements IFile { this.isNew = this.workflowStatus === WorkflowFileStatuses.NEW; this.isUnderReview = this.workflowStatus === WorkflowFileStatuses.UNDER_REVIEW; this.isUnderApproval = this.workflowStatus === WorkflowFileStatuses.UNDER_APPROVAL; - this.canBeApproved = !this.analysisRequired && !this.hasSuggestions && !this.isProcessing && !this.isError; + this.canBeApproved = !this.hasSuggestions && !this.isProcessing && !this.isError; this.canBeOpened = !this.isError && !this.isUnprocessed && this.numberOfAnalyses > 0; this.canBeOCRed = !this.excluded && !this.lastOCRTime && (this.isNew || this.isUnderReview || this.isUnderApproval); From 7d0deebff490a4560af1f67362c5ba85c4a39f81 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 23 Feb 2022 12:08:00 +0100 Subject: [PATCH 2/6] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5d6fca3d1..7207b17da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.258.0", + "version": "3.259.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 2f625b0cc661cdf65aefd60661a2bff246921a29..2a485997a3a269879d6ddaba24cc11a771a8825e 100644 GIT binary patch literal 3215 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 BM?nAp literal 3214 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 Date: Wed, 23 Feb 2022 13:54:04 +0200 Subject: [PATCH 3/6] RED-3459: only pages without annotations filters --- .../file-workload.component.html | 14 +++++-- .../file-workload/file-workload.component.ts | 40 ++++++++++++++----- .../file-preview-screen.component.ts | 11 +++-- .../services/annotation-processing.service.ts | 11 ++++- apps/red-ui/src/assets/i18n/en.json | 6 ++- libs/common-ui | 2 +- 6 files changed, 64 insertions(+), 20 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html index a39979f30..cc48bfa09 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html @@ -16,8 +16,8 @@ (click)="multiSelectService.activate()" *ngIf="(multiSelectService.enabled$ | async) && (multiSelectInactive$ | async)" class="all-caps-label primary pointer" - translate="file-preview.tabs.annotations.select" iqserHelpMode="bulk_select_annotations" + translate="file-preview.tabs.annotations.select" >
- + {{ 'file-preview.tabs.annotations.page-is' | translate }} . + + + {{ 'file-preview.tabs.annotations.wrong-filters' | translate }} + + {{ 'file-preview.tabs.annotations.the-filters' | translate }} +
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts index c3fd3396e..49e0d9989 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts @@ -34,6 +34,7 @@ import { MultiSelectService } from '../../services/multi-select.service'; import { DocumentInfoService } from '../../services/document-info.service'; import { SkippedService } from '../../services/skipped.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; const COMMAND_KEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Escape']; const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']; @@ -47,6 +48,8 @@ const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']; export class FileWorkloadComponent { readonly iconButtonTypes = IconButtonTypes; readonly circleButtonTypes = CircleButtonTypes; + readonly noDataI18NKey = _('file-preview.no-data.title'); + readonly resetFiltersI18NKey = _('file-preview.reset-filters'); displayedAnnotations = new Map(); @Input() selectedAnnotations: AnnotationWrapper[]; @@ -72,14 +75,14 @@ export class FileWorkloadComponent { @ViewChild('quickNavigation') private readonly _quickNavigationElement: ElementRef; constructor( - readonly excludedPagesService: ExcludedPagesService, - readonly multiSelectService: MultiSelectService, - readonly documentInfoService: DocumentInfoService, + readonly filterService: FilterService, readonly skippedService: SkippedService, readonly state: FilePreviewStateService, - private readonly _permissionsService: PermissionsService, + readonly multiSelectService: MultiSelectService, + readonly documentInfoService: DocumentInfoService, + readonly excludedPagesService: ExcludedPagesService, private readonly _changeDetectorRef: ChangeDetectorRef, - private readonly _filterService: FilterService, + private readonly _permissionsService: PermissionsService, private readonly _annotationProcessingService: AnnotationProcessingService, ) { this.displayedAnnotations$ = this._displayedAnnotations$; @@ -138,14 +141,18 @@ export class FileWorkloadComponent { } private get _displayedAnnotations$(): Observable> { - const primary$ = this._filterService.getFilterModels$('primaryFilters'); - const secondary$ = this._filterService.getFilterModels$('secondaryFilters'); + const primary$ = this.filterService.getFilterModels$('primaryFilters'); + const secondary$ = this.filterService.getFilterModels$('secondaryFilters'); return combineLatest([this._annotations$.asObservable(), primary$, secondary$]).pipe( map(([annotations, primary, secondary]) => this._filterAnnotations(annotations, primary, secondary)), ); } + get #allPages() { + return Array.from({ length: this.file?.numberOfPages }, (x, i) => i + 1); + } + private static _scrollToFirstElement(elements: HTMLElement[], mode: 'always' | 'if-needed' = 'if-needed') { if (elements.length > 0) { scrollIntoView(elements[0], { @@ -335,11 +342,26 @@ export class FileWorkloadComponent { secondary: INestedFilter[] = [], ): Map { if (!primary || primary.length === 0) { - this.displayedPages = Array.from({ length: this.file?.numberOfPages }, (x, i) => i + 1); + this.displayedPages = this.#allPages; return; } + this.displayedAnnotations = this._annotationProcessingService.filterAndGroupAnnotations(annotations, primary, secondary); - this.displayedPages = [...this.displayedAnnotations.keys()]; + const pagesThatDisplayAnnotations = [...this.displayedAnnotations.keys()]; + const enabledFilters = this.filterService.enabledFlatFilters; + if (enabledFilters.some(f => f.id === 'pages-without-annotations')) { + if (enabledFilters.length === 1) { + this.displayedPages = this.#allPages.filter(page => !pagesThatDisplayAnnotations.includes(page)); + } else { + this.displayedPages = []; + } + this.displayedAnnotations.clear(); + } else if (enabledFilters.length) { + this.displayedPages = pagesThatDisplayAnnotations; + } else { + this.displayedPages = this.#allPages; + } + return this.displayedAnnotations; } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts index fc17cf93a..785b034ce 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts @@ -435,10 +435,13 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni } async downloadOriginalFile(file: File) { - const data = await this._fileManagementService - .downloadOriginalFile(this.dossierId, this.fileId, 'response', file.cacheIdentifier) - .toPromise(); - download(data, file.filename); + const originalFile = this._fileManagementService.downloadOriginalFile( + this.dossierId, + this.fileId, + 'response', + file.cacheIdentifier, + ); + download(await firstValueFrom(originalFile), file.filename); } #deactivateMultiSelect(): void { diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts index 5c1ea0c65..06bbf924f 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts @@ -9,6 +9,7 @@ import { IViewedPage } from '@red/domain'; @Injectable() export class AnnotationProcessingService { static secondaryAnnotationFilters(viewedPages: IViewedPage[]): INestedFilter[] { + const _viewedPages = viewedPages.map(page => page.page); return [ { id: 'with-comments', @@ -32,7 +33,15 @@ export class AnnotationProcessingService { label: _('filter-menu.unseen-pages'), checked: false, topLevelFilter: true, - checker: (annotation: AnnotationWrapper) => !viewedPages.map(page => page.page).includes(annotation.pageNumber), + checker: (annotation: AnnotationWrapper) => !_viewedPages.includes(annotation.pageNumber), + }, + { + id: 'pages-without-annotations', + icon: 'iqser:pages', + label: _('filter-menu.pages-without-annotations'), + checked: false, + topLevelFilter: true, + checker: () => true, }, ].map(item => new NestedFilter(item)); } diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 086f554f0..ed148fdc3 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1226,9 +1226,12 @@ "jump-to-previous": "Jump to Previous", "label": "Workload", "page-is": "This page is", + "reset": "reset", "select": "Select", "select-all": "All", - "select-none": "None" + "select-none": "None", + "the-filters": "the filters", + "wrong-filters": "The selected filter combination is not possible. Please adjust or" }, "document-info": { "close": "Close Document Info", @@ -1284,6 +1287,7 @@ "filter-options": "Filter options", "filter-types": "Filter", "label": "Filter", + "pages-without-annotations": "Only pages without annotations", "redaction-changes": "Only annotations with redaction changes", "unseen-pages": "Only annotations on unseen pages", "with-comments": "Only annotations with comments" diff --git a/libs/common-ui b/libs/common-ui index e2f853655..174b239f2 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit e2f85365512c68b927465ee5fe4c0d8e3d5dfe1a +Subproject commit 174b239f26e9b877648f5c63432abf8c9bb97654 From aed3d45c9f28955e59b00ef1e824f05f3464f10f Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 23 Feb 2022 12:58:09 +0100 Subject: [PATCH 4/6] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3213 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7207b17da..c371dbd52 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.259.0", + "version": "3.260.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 2a485997a3a269879d6ddaba24cc11a771a8825e..7f32d7a966435147e4a9bd4d55c800e45a7844ca 100644 GIT binary patch delta 3166 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 GPyhfs^(c}6 From f95dcd7dee6a81108545f0efa1c3535e569828a2 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 23 Feb 2022 15:51:19 +0200 Subject: [PATCH 5/6] removed 'waitingForConfirmation' flag --- .../edit-dossier-dialog/edit-dossier-dialog.component.ts | 1 - libs/common-ui | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts index 1b2cfceed..8b0b8eb1a 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts @@ -166,7 +166,6 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A } this.activeNav = key; } - this._waitingForConfirmation = false; }); } else { this.activeNav = key; diff --git a/libs/common-ui b/libs/common-ui index 174b239f2..8f8ce778b 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 174b239f26e9b877648f5c63432abf8c9bb97654 +Subproject commit 8f8ce778bd78a42076db33c886b4e623a17d4f15 From c386354625eb4201ebc6e297a4a2d3d3c7d107cb Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 23 Feb 2022 14:56:04 +0100 Subject: [PATCH 6/6] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3213 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c371dbd52..81e9aee99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.260.0", + "version": "3.261.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 7f32d7a966435147e4a9bd4d55c800e45a7844ca..4541f9ed73388176e467555638ea2a4fa6c04bbc 100644 GIT binary patch literal 3214 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