From 84986155dddaf57fd21c38356fc40174a9381677 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 20 Dec 2023 10:33:25 +0200 Subject: [PATCH] RED-6960 - Enter should always confirm a modal window --- .../app/modules/file-preview/file-preview-screen.component.ts | 4 ++-- libs/common-ui | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index bd208d4c2..68f6444cd 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -669,12 +669,12 @@ export class FilePreviewScreenComponent const ref = this._dialogService.openDialog('confirm', data); return ref.afterClosed().pipe( switchMap(async (result: ConfirmOption) => { - const doNotShowWarningAgain = result === ConfirmOptions.SECOND_CONFIRM; + const doNotShowWarningAgain = result === ConfirmOptions.CONFIRM_WITH_ACTION; if (doNotShowWarningAgain) { await this.userPreferenceService.save(PreferencesKeys.loadAllAnnotationsWarning, 'true'); await this.userPreferenceService.reload(); } - const validOptions: number[] = [ConfirmOptions.CONFIRM, ConfirmOptions.SECOND_CONFIRM]; + const validOptions: number[] = [ConfirmOptions.CONFIRM, ConfirmOptions.CONFIRM_WITH_ACTION]; const shouldLoad = validOptions.includes(result); return [shouldLoad, annotations] as const; }), diff --git a/libs/common-ui b/libs/common-ui index 7f09e5724..da086cdaa 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 7f09e572488d1836aa24df7a9600f0c657b4a6be +Subproject commit da086cdaa648d1d35a9eb16ee23cb223e1de2316