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

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

Browse Source 
RED-8252 - Separate help mode links

Closes RED-8252

See merge request redactmanager/red-ui!291
This commit is contained in:
Dan Percic 2024-02-07 09:19:22 +01:00
commit 964185fdcc
5 changed files with 77 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html
View File

@ -6,7 +6,7 @@
[attr.aria-expanded]="mode === listingModes.table"
[tooltip]="'view-mode.list' | translate"
[greySelected]="true"
[attr.help-mode-key]="'document_list'"
[attr.help-mode-key]="'document_list_view'"
icon="iqser:list"
></iqser-circle-button>

23
apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html
View File

@ -7,7 +7,6 @@
<ng-container *ngIf="resizing && annotationPermissions.canResizeAnnotation">
<iqser-circle-button
(action)="acceptResize()"
[attr.help-mode-key]="actionsHelpModeKey"
[class.disabled]="!resized"
[tooltipPosition]="tooltipPosition"
[tooltip]="resized ? ('annotation-actions.resize-accept.label' | translate) : ''"
@ -17,7 +16,6 @@
<iqser-circle-button
(action)="cancelResize()"
[attr.help-mode-key]="actionsHelpModeKey"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.resize-cancel.label' | translate"
[type]="buttonType"
@ -50,7 +48,7 @@
<iqser-circle-button
(action)="acceptRecommendation()"
*ngIf="canAcceptRecommendation"
[attr.help-mode-key]="actionsHelpModeKey"
[attr.help-mode-key]="helpModeKey('accept')"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.accept-recommendation.label' | translate"
[type]="buttonType"
@ -60,7 +58,6 @@
<iqser-circle-button
(action)="annotationActionsService.convertHighlights(annotations)"
*ngIf="viewModeService.isEarmarks()"
[attr.help-mode-key]="actionsHelpModeKey"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.convert-highlights.label' | translate"
[type]="buttonType"
@ -70,7 +67,6 @@
<iqser-circle-button
(action)="annotationActionsService.removeHighlights(annotations)"
*ngIf="viewModeService.isEarmarks()"
[attr.help-mode-key]="actionsHelpModeKey"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.remove-highlights.label' | translate"
[type]="buttonType"
@ -80,17 +76,6 @@
<iqser-circle-button
(action)="annotationActionsService.undoDirectAction(annotations)"
*allow="roles.redactions.deleteManual; if: annotationPermissions.canUndo"
[attr.help-mode-key]="actionsHelpModeKey"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.undo' | translate"
[type]="buttonType"
icon="red:undo"
></iqser-circle-button>
<iqser-circle-button
(action)="annotationActionsService.undoDirectAction(annotations)"
*allow="roles.redactions.deleteManual; if: annotationPermissions.canUndo"
[attr.help-mode-key]="actionsHelpModeKey"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.undo' | translate"
[type]="buttonType"
@ -100,7 +85,6 @@
<iqser-circle-button
(action)="annotationReferencesService.show(annotations[0])"
*ngIf="multiSelectService.inactive() && annotations[0].reference.length"
[attr.help-mode-key]="actionsHelpModeKey"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.see-references.label' | translate"
[type]="buttonType"
@ -110,7 +94,7 @@
<iqser-circle-button
(action)="annotationActionsService.forceAnnotation(annotations)"
*ngIf="canForceRedaction"
[attr.help-mode-key]="actionsHelpModeKey"
[attr.help-mode-key]="helpModeKey('force')"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.force-redaction.label' | translate"
[type]="buttonType"
@ -130,7 +114,7 @@
<iqser-circle-button
(action)="hideAnnotation()"
*ngIf="isImage && isVisible()"
[attr.help-mode-key]="actionsHelpModeKey"
[attr.help-mode-key]="helpModeKey('hide')"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.hide' | translate"
[type]="buttonType"
@ -140,7 +124,6 @@
<iqser-circle-button
(action)="showAnnotation()"
*ngIf="isImage && !isVisible()"
[attr.help-mode-key]="actionsHelpModeKey"
[tooltipPosition]="tooltipPosition"
[tooltip]="'annotation-actions.show' | translate"
[type]="buttonType"

2
apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts
View File

@ -157,7 +157,7 @@ export class AnnotationActionsComponent implements OnChanges {
}
helpModeKey(action: string) {
return this.#isDocumine ? `${action}_annotation` : this.actionsHelpModeKey;
return this.#isDocumine ? `${action}_annotation` : `${this.actionsHelpModeKey}_${action}`;
}
#setPermissions() {

8
apps/red-ui/src/app/modules/file-preview/utils/constants.ts
View File

@ -13,10 +13,10 @@ export const ActionsHelpModeKeys = {
'manual-redaction': 'redaction',
recommendation: 'recommendation',
skipped: 'skipped',
hint: 'hint_text',
'hint-ocr': 'hint_picture',
'hint-formula': 'hint_picture',
'hint-image': 'hint_picture',
hint: 'hint',
'hint-ocr': 'hint',
'hint-formula': 'hint',
'hint-image': 'hint',
} as const;
export const ALL_HOTKEYS: List = ['Escape', 'F', 'f', 'ArrowUp', 'ArrowDown', 'H', 'h'] as const;

78
apps/red-ui/src/assets/help-mode/help-mode-keys.json
View File

@ -105,32 +105,86 @@
"documentKey": "highlights"
},
{
"elementKey": "redaction",
"documentKey": "redaction",
"elementKey": "redaction_resize",
"documentKey": "redaction_resize",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "false_positive_entity",
"documentKey": "false_positive_entity",
"elementKey": "redaction_edit",
"documentKey": "redaction_edit",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "skipped",
"documentKey": "skipped",
"elementKey": "redaction_remove",
"documentKey": "redaction_remove",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "hint_text",
"documentKey": "hint_text",
"elementKey": "recommendation_resize",
"documentKey": "recommendation_resize",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "hint_picture",
"documentKey": "hint_picture",
"elementKey": "recommendation_accept",
"documentKey": "recommendation_accept",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "recommendation_remove",
"documentKey": "recommendation_remove",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "skipped_edit",
"documentKey": "skipped_edit",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "skipped_force",
"documentKey": "skipped_force",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "skipped_remove",
"documentKey": "skipped_remove",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "skipped_hide",
"documentKey": "skipped_hide",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "hint_resize",
"documentKey": "hint_resize",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "hint_edit",
"documentKey": "hint_edit",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "hint_remove",
"documentKey": "hint_remove",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
{
"elementKey": "hint_hide",
"documentKey": "hint_hide",
"scrollableParentView": "ANNOTATIONS_LIST",
"overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"]
},
@ -611,5 +665,9 @@
{
"elementKey": "editor_import_redactions",
"documentKey": "editor_import_redactions"
},
{
"elementKey": "document_list_view",
"documentKey": "document_list"
}
]