WIP RED-2657 -> fixing more keys

This commit is contained in:
Valentin Mihai 2022-02-16 00:38:58 +02:00
parent ba6691f842
commit 3836ed3814
20 changed files with 103 additions and 161 deletions

View File

@ -20,10 +20,10 @@
*ngIf="(isSearchScreen$ | async) === false && (currentUser.isUser || currentUser.isManager)"
[actions]="searchActions"
[placeholder]="'search.placeholder' | translate"
iqserHelpMode="search-in-entire-application"
iqserHelpMode="search_in_entire_application"
></redaction-spotlight-search>
<redaction-notifications iqserHelpMode="open-notifications"></redaction-notifications>
<redaction-notifications iqserHelpMode="open_notifications"></redaction-notifications>
</div>
<redaction-user-button [matMenuTriggerFor]="userMenu" [userId]="currentUser.id"></redaction-user-button>

View File

@ -1,4 +1,4 @@
<div *ngIf="breadcrumbsService.breadcrumbs$ | async as breadcrumbs" class="breadcrumbs" iqserHelpMode="navigate-in-breadcrumbs">
<div *ngIf="breadcrumbsService.breadcrumbs$ | async as breadcrumbs" class="breadcrumbs" iqserHelpMode="navigate_in_breadcrumbs">
<a *ngIf="breadcrumbs.length === 0; else items" class="breadcrumb back" redactionNavigateLastDossiersScreen>
<mat-icon svgIcon="iqser:expand"></mat-icon>
{{ 'top-bar.navigation-items.back' | translate }}

View File

@ -24,7 +24,7 @@
class="ml-14"
icon="iqser:edit"
tooltipPosition="below"
iqserHelpMode="edit-dossier-owner"
iqserHelpMode="edit_dossier_owner"
></iqser-circle-button>
</ng-container>
</div>
@ -43,14 +43,14 @@
[strokeWidth]="15"
[subtitle]="'dossier-overview.dossier-details.charts.documents-in-dossier' | translate"
direction="row"
helpModeKey="filter-for-status"
helpModeKey="filter_for_status"
></redaction-simple-doughnut-chart>
</div>
<div
*ngIf="stats.hasFiles && needsWorkFilters$ | async as filters"
class="mt-24 legend pb-32"
iqserHelpMode="filter-for-editing-notes"
iqserHelpMode="filter_for_editing_notes"
>
<div
(click)="filterService.toggleFilter('needsWorkFilters', filter.id)"

View File

@ -1,7 +1,7 @@
<iqser-page-header
(closeAction)="routerHistoryService.navigateToLastDossiersScreen()"
[actionConfigs]="actionConfigs"
[helpModeKey]="'filter-document-list'"
[helpModeKey]="'document'"
[showCloseButton]="true"
[viewModeSelection]="viewModeSelection"
>
@ -9,6 +9,7 @@
[disabled]="listingService.areSomeSelected$ | async"
[files]="entitiesService.all$ | async"
tooltipPosition="below"
iqserHelpMode="edit_dossier_in_dossier"
></redaction-file-download-btn>
<iqser-circle-button
@ -37,6 +38,7 @@
class="ml-14"
icon="iqser:upload"
tooltipPosition="below"
iqserHelpMode="edit_dossier_in_dossier"
></iqser-circle-button>
</iqser-page-header>

View File

@ -109,7 +109,7 @@ export class ConfigService {
action: $event => this._openEditDossierDialog($event, dossierId),
icon: 'iqser:edit',
hide: !this._userService.currentUser.isManager,
helpModeKey: 'edit-dossier-attributes',
helpModeKey: 'edit_dossier_in_dossier',
disabled$,
},
];
@ -353,18 +353,21 @@ export class ConfigService {
label: this._translateService.instant('dossier-overview.quick-filters.assigned-to-me'),
checker: this._assignedToMeChecker,
disabled: entities.filter(this._assignedToMeChecker).length === 0,
helpModeKey: 'documents_quickfilter',
},
{
id: 'unassigned',
label: this._translateService.instant('dossier-overview.quick-filters.unassigned'),
checker: this._unassignedChecker,
disabled: entities.filter(this._unassignedChecker).length === 0,
helpModeKey: 'documents_quickfilter',
},
{
id: 'assigned-to-others',
label: this._translateService.instant('dossier-overview.quick-filters.assigned-to-others'),
checker: this._assignedToOthersChecker,
disabled: entities.filter(this._assignedToOthersChecker).length === 0,
helpModeKey: 'documents_quickfilter',
},
].map(filter => new NestedFilter(filter));
}

View File

@ -7,7 +7,7 @@
[tooltip]="(currentUser.isManager ? 'dossier-listing.edit.action' : 'dossier-listing.dossier-info.action') | translate"
[type]="circleButtonTypes.dark"
[icon]="currentUser.isManager ? 'iqser:edit' : 'red:info'"
iqserHelpMode="edit-dossier-from-list"
iqserHelpMode="edit_dossier"
></iqser-circle-button>
<iqser-circle-button
@ -18,5 +18,9 @@
icon="iqser:refresh"
></iqser-circle-button>
<redaction-file-download-btn [files]="files" [type]="circleButtonTypes.dark"></redaction-file-download-btn>
<redaction-file-download-btn
[files]="files"
[type]="circleButtonTypes.dark"
iqserHelpMode="download_dossier"
></redaction-file-download-btn>
</div>

View File

@ -155,6 +155,7 @@ export class ConfigService {
checker: dossierTemplateChecker,
});
console.log(this._quickFilters(entities));
filterGroups.push({
slug: 'quickFilters',
filters: this._quickFilters(entities),
@ -188,6 +189,7 @@ export class ConfigService {
label: myDossiersLabel,
checker: this._myDossiersChecker,
disabled: entities.filter(this._myDossiersChecker).length === 0,
helpModeKey: 'dossiers_quickfilter_my_dossiers',
},
{
id: 'to-approve',

View File

@ -1,5 +1,5 @@
<section>
<iqser-page-header [buttonConfigs]="buttonConfigs" [helpModeKey]="'filter-dossier-list'"></iqser-page-header>
<iqser-page-header [buttonConfigs]="buttonConfigs" [helpModeKey]="'dossier'"></iqser-page-header>
<div class="overlay-shadow"></div>

View File

@ -42,7 +42,7 @@
[tooltip]="'annotation-actions.edit-reason.label' | translate"
[type]="buttonType"
icon="iqser:edit"
iqserHelpMode="redaction-edit-reason"
iqserHelpMode="redaction_edit_reason"
></iqser-circle-button>
<iqser-circle-button
@ -52,7 +52,7 @@
[tooltip]="'annotation-actions.accept-recommendation.label' | translate"
[type]="buttonType"
icon="iqser:check"
iqserHelpMode="recommendation-accept-or-reject"
iqserHelpMode="recommendation_accept_or_reject"
></iqser-circle-button>
<iqser-circle-button
@ -143,7 +143,7 @@
[tooltip]="'annotation-actions.remove-annotation.remove-from-dict' | translate"
[type]="buttonType"
icon="red:remove-from-dict"
iqserHelpMode="redaction-remove-from-dictionary"
iqserHelpMode="redaction_remove_from_dictionary"
></iqser-circle-button>
<iqser-circle-button
@ -153,7 +153,7 @@
[tooltip]="'annotation-actions.remove-annotation.false-positive' | translate"
[type]="buttonType"
icon="red:thumb-down"
iqserHelpMode="redaction-false-positive"
iqserHelpMode="redaction_false_positive"
></iqser-circle-button>
<iqser-circle-button
@ -163,7 +163,7 @@
[tooltip]="'annotation-actions.remove-annotation.only-here' | translate"
[type]="buttonType"
icon="iqser:trash"
iqserHelpMode="redaction-remove-only-here"
iqserHelpMode="redaction_remove_only_here"
></iqser-circle-button>
</ng-container>
</div>

View File

@ -17,14 +17,14 @@
*ngIf="(multiSelectService.enabled$ | async) && (multiSelectInactive$ | async)"
class="all-caps-label primary pointer"
translate="file-preview.tabs.annotations.select"
iqserHelpMode="bulk-select-annotations"
iqserHelpMode="bulk_select_annotations"
></div>
<iqser-popup-filter
[actionsTemplate]="annotationFilterActionTemplate"
[primaryFiltersSlug]="'primaryFilters'"
[secondaryFiltersSlug]="'secondaryFilters'"
iqserHelpMode="workload-filter"
iqserHelpMode="workload_filter"
></iqser-popup-filter>
</div>
</div>

View File

@ -35,7 +35,7 @@
[tooltip]="assignTooltip$ | async"
icon="iqser:edit"
tooltipPosition="below"
iqserHelpMode="assign-reviewer"
iqserHelpMode="assign_reviewer"
></iqser-circle-button>
<iqser-circle-button

View File

@ -4,7 +4,7 @@
[class.active]="viewModeService.isStandard"
[matTooltip]="'file-preview.standard-tooltip' | translate"
class="red-tab"
iqserHelpMode="standard-view"
iqserHelpMode="standard_view"
>
{{ 'file-preview.standard' | translate }}
</button>
@ -15,7 +15,7 @@
[disabled]="(canSwitchToDeltaView$ | async) === false"
[matTooltip]="'file-preview.delta-tooltip' | translate"
class="red-tab"
iqserHelpMode="delta-view"
iqserHelpMode="delta_view"
>
{{ 'file-preview.delta' | translate }}
</button>
@ -26,7 +26,7 @@
[disabled]="(canSwitchToRedactedView$ | async) === false"
[matTooltip]="'file-preview.redacted-tooltip' | translate"
class="red-tab"
iqserHelpMode="preview-view"
iqserHelpMode="preview_view"
>
{{ 'file-preview.redacted' | translate }}
</button>

View File

@ -124,7 +124,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltip: _('dossier-overview.delete.action'),
icon: 'iqser:trash',
show: this.showDelete,
helpModeKey: 'delete-file-action',
},
{
type: ActionTypes.circleBtn,
@ -132,7 +131,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltip: this.assignTooltip,
icon: 'red:assign',
show: this.showAssign,
helpModeKey: 'assign-action',
},
{
type: ActionTypes.circleBtn,
@ -140,14 +138,12 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltip: _('dossier-overview.assign-me'),
icon: 'red:assign-me',
show: this.showAssignToSelf,
helpModeKey: 'assign-to-me-action',
},
{
type: ActionTypes.downloadBtn,
show: true,
files: [this.file],
tooltipClass: 'small',
helpModeKey: 'download-action',
},
{
type: ActionTypes.circleBtn,
@ -156,7 +152,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
ariaExpanded: this._documentInfoService?.shown$,
icon: 'red:status-info',
show: !!this._documentInfoService,
helpModeKey: 'document-info-action',
},
{
type: ActionTypes.circleBtn,
@ -166,7 +161,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
showDot: !!this.file.excludedPages?.length,
icon: 'red:exclude-pages',
show: !!this._excludedPagesService && !this.file.excluded,
helpModeKey: 'exclude-pages-action',
},
{
type: ActionTypes.circleBtn,
@ -174,7 +168,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltip: _('dossier-overview.under-approval'),
icon: 'red:ready-for-approval',
show: this.showUnderApproval,
helpModeKey: 'under-approval-action',
},
{
type: ActionTypes.circleBtn,
@ -182,7 +175,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltip: _('dossier-overview.under-review'),
icon: 'red:undo',
show: this.showUnderReview,
helpModeKey: 'under-review-action',
},
{
type: ActionTypes.circleBtn,
@ -191,7 +183,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
icon: 'red:approved',
disabled: !this.file.canBeApproved,
show: this.showApprove,
helpModeKey: 'approve-action',
},
{
type: ActionTypes.circleBtn,
@ -199,7 +190,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltip: _('dossier-overview.disable-auto-analysis'),
icon: 'red:stop',
show: this.canDisableAutoAnalysis,
helpModeKey: 'disable-automatic-analysis-action',
},
{
type: ActionTypes.circleBtn,
@ -207,7 +197,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltip: _('dossier-overview.enable-auto-analysis'),
icon: 'red:play',
show: this.canEnableAutoAnalysis,
helpModeKey: 'enable-automatic-analysis-action',
},
{
type: ActionTypes.circleBtn,
@ -215,7 +204,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltip: _('dossier-overview.under-approval'),
icon: 'red:undo',
show: this.showUndoApproval,
helpModeKey: 'under-approval-action',
},
{
type: ActionTypes.circleBtn,
@ -223,7 +211,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltip: _('dossier-overview.ocr-file'),
icon: 'iqser:ocr',
show: this.showOCR,
helpModeKey: 'ocr-action',
},
{
type: ActionTypes.circleBtn,
@ -233,7 +220,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltipClass: 'warn small',
icon: 'iqser:refresh',
show: this.showReanalyseFilePreview,
helpModeKey: 'reanalyse-action',
},
{
type: ActionTypes.circleBtn,
@ -241,7 +227,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
tooltip: _('dossier-overview.reanalyse.action'),
icon: 'iqser:refresh',
show: this.showReanalyseDossierOverview,
helpModeKey: 'reanalyse-action',
},
{
type: ActionTypes.toggle,
@ -251,7 +236,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
class: { 'mr-24': this.isDossierOverviewList },
checked: !this.file.excluded,
show: true,
helpModeKey: 'toggle-analysis-action',
},
].filter(btn => btn.show);
}

View File

@ -1,4 +1,4 @@
<button [class.overlay]="showDot" mat-button iqserHelpMode="open-usermenu">
<button [class.overlay]="showDot" mat-button iqserHelpMode="open_usermenu">
<redaction-initials-avatar [user]="userService.currentUser$ | async" [withName]="true"></redaction-initials-avatar>
<mat-icon svgIcon="iqser:arrow-down"></mat-icon>
</button>

View File

@ -10,7 +10,7 @@
[tooltipPosition]="tooltipPosition"
[tooltip]="btn.tooltip | translate"
[type]="btn.buttonType || buttonType"
[iqserHelpMode]="btn.helpModeKey"
[iqserHelpMode]="helpModeKey"
></iqser-circle-button>
<!-- download redacted file-->
@ -20,7 +20,7 @@
[tooltipClass]="btn.tooltipClass"
[tooltipPosition]="tooltipPosition"
[type]="buttonType"
[iqserHelpMode]="btn.helpModeKey"
[iqserHelpMode]="helpModeKey"
></redaction-file-download-btn>
<!-- exclude from redaction -->
@ -33,7 +33,7 @@
[matTooltipPosition]="tooltipPosition"
[matTooltip]="btn.tooltip | translate"
[ngClass]="btn.class"
[iqserHelpMode]="btn.helpModeKey"
[iqserHelpMode]="helpModeKey"
color="primary"
></mat-slide-toggle>
</div>

View File

@ -21,6 +21,7 @@ export class ExpandableFileActionsComponent implements OnChanges {
displayedButtons: Action[];
hiddenButtons: Action[];
expanded = false;
helpModeKey: string = 'document_features';
constructor(
private readonly _fileDownloadService: FileDownloadService,

View File

@ -26,7 +26,7 @@ export class SimpleDoughnutChartComponent implements OnChanges, OnInit {
@Input() totalType: 'sum' | 'count' = 'sum';
@Input() counterText: string;
@Input() filterKey = 'statusFilters';
@Input() helpModeKey: 'filter-for-status';
@Input() helpModeKey: 'filter_for_status';
filtersEnabled: boolean;
chartData: any[] = [];

View File

@ -26,7 +26,7 @@
[type]="circleButtonTypes.primary"
class="member"
icon="iqser:plus"
iqserHelpMode="edit-dossier-member"
iqserHelpMode="add_dossier_members"
></iqser-circle-button>
</div>

View File

@ -1,245 +1,191 @@
{
"approve-action": {
"assign_reviewer": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"assign-action": {
"bulk_select_annotations": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"assign-reviewer": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"assign-to-me-action": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"bulk-select-annotations": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"delete-file-action": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"delta-view": {
"delta_view": {
"en": "/en/editing-documents-in-the-editor/views-in-the-editor/delta-view.html",
"de": "",
"it": "",
"fr": ""
},
"disable-automatic-analysis-action": {
"document_features": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"document-features": {
"edit_dossier": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"document-info-action": {
"download_dossier": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"dossiers-quickfilter-my-dossiers": {
"add_dossier_members": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"edit_dossier_owner": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"edit_reason": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"filter_document_list": {
"en": "/en/create-and-manage-dossier/dossier-overview/dossier-list.html",
"de": "",
"it": "",
"fr": ""
},
"download-action": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"edit-dossier-attributes": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"edit-dossier-from-list": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"edit-dossier-member": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"edit-dossier-owner": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"edit-reason": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"enable-automatic-analysis-action": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"exclude-pages-action": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"filter-document-list": {
"en": "/en/create-and-manage-dossier/dossier-overview/dossier-list.html",
"de": "",
"it": "",
"fr": ""
},
"filter-dossier-list": {
"filter_dossier_list": {
"en": "/en/26024-features-and-actions-in-the-dossier-overview.html",
"de": "",
"it": "",
"fr": ""
},
"filter-for-editing-notes": {
"filter_for_editing_notes": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"filter-for-status": {
"filter_for_status": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"navigate-in-breadcrumbs": {
"navigate_in_breadcrumbs": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"new-dossier-button": {
"new_dossier_button": {
"en": "/en/creating-and-managing-dossiers/dossier-overview/creating-a-new-dossier.html",
"de": "",
"it": "",
"fr": ""
},
"ocr-action": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"open-notifications": {
"open_notifications": {
"en": "/en/15471-notifications.html",
"de": "",
"it": "",
"fr": ""
},
"open-usermenu": {
"open_usermenu": {
"en": "/en/23200-user-menu-and-account.html",
"de": "",
"it": "",
"fr": ""
},
"preview-view": {
"preview_view": {
"en": "/en/editing-documents-in-the-editor/views-in-the-editor/preview.html",
"de": "",
"it": "",
"fr": ""
},
"reanalyse-action": {
"recommendation_accept_or_reject": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"recommendation-accept-or-reject": {
"redaction_false_positive": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"redaction-false-positive": {
"redaction_remove_from_dictionary": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"redaction-remove-from-dictionary": {
"redaction_remove_only_here": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"redaction-remove-only-here": {
"reset_filters": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"reset-filters": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"search-in-entire-application": {
"search_in_entire_application": {
"en": "/en/15632-searching-the-application.html",
"de": "",
"it": "",
"fr": ""
},
"standard-view": {
"standard_view": {
"en": "/en/editing-documents-in-the-editor/views-in-the-editor/standard-view.html",
"de": "",
"it": "",
"fr": ""
},
"toggle-analysis-action": {
"workload_filter": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"under-approval-action": {
"dossiers_quickfilter_my_dossiers": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"under-review-action": {
"scroll_up_and_down": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"workload-filter": {
"delete_document_filter": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"delete_dossier_filter": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"document_features": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"edit_dossier_in_dossier": {
"en": "",
"de": "",
"it": "",

@ -1 +1 @@
Subproject commit 53c3a6b30494f063ca323cb21ffff072c3204db2
Subproject commit 77d0a4bb1b575d4ebb0dea2b55cfb538794ad66b