Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'VM/RED-6960' into 'master'

Browse Source 
RED-6960 - Enter should always confirm a modal window

Closes RED-6960

See merge request redactmanager/red-ui!237
This commit is contained in:
Nicoleta Panaghiu 2023-12-20 09:34:42 +01:00
commit d85c59e9ba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
View File

@ -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;
}),

2
libs/common-ui

@ -1 +1 @@
Subproject commit 7f09e572488d1836aa24df7a9600f0c657b4a6be
Subproject commit da086cdaa648d1d35a9eb16ee23cb223e1de2316