Compare commits

...

4 Commits

Author SHA1 Message Date
Nicoleta Panaghiu
1894a378b5 RED-9742: fixed logo router link. 2024-07-31 13:21:03 +03:00
Nicoleta Panaghiu
701a69db95 RED-9571: fixed initials-avatar not updating in some cases. 2024-07-31 12:48:44 +03:00
Nicoleta Panaghiu
77f94a7983 RED-9589: enabled false positive option for some annotation configs. 2024-07-29 12:20:06 +03:00
Nicoleta Panaghiu
108a3315da RED-9657: additional fixes for help mode links. 2024-07-23 12:46:30 +03:00
7 changed files with 11 additions and 11 deletions

View File

@ -9,7 +9,7 @@
<redaction-breadcrumbs></redaction-breadcrumbs> <redaction-breadcrumbs></redaction-breadcrumbs>
</div> </div>
<a [matTooltip]="'top-bar.navigation-items.back-to-dashboard' | translate" [routerLink]="['/']" class="logo"> <a [matTooltip]="'top-bar.navigation-items.back-to-dashboard' | translate" [routerLink]="['/main']" class="logo">
<div [attr.help-mode-key]="'home'" class="actions"> <div [attr.help-mode-key]="'home'" class="actions">
<iqser-logo (iqserHiddenAction)="userPreferenceService.toggleDevFeatures()" icon="iqser:logo"></iqser-logo> <iqser-logo (iqserHiddenAction)="userPreferenceService.toggleDevFeatures()" icon="iqser:logo"></iqser-logo>
<div class="app-name">{{ titleService.getTitle() }}</div> <div class="app-name">{{ titleService.getTitle() }}</div>

View File

@ -16,10 +16,7 @@ export const canForceRedaction = (annotation: AnnotationWrapper, canAddRedaction
export const canAcceptRecommendation = (annotation: AnnotationWrapper) => annotation.isRecommendation && !annotation.pending; export const canAcceptRecommendation = (annotation: AnnotationWrapper) => annotation.isRecommendation && !annotation.pending;
export const canMarkAsFalsePositive = (annotation: AnnotationWrapper, annotationEntity: Dictionary) => export const canMarkAsFalsePositive = (annotation: AnnotationWrapper, annotationEntity: Dictionary) =>
annotation.canBeMarkedAsFalsePositive && annotation.canBeMarkedAsFalsePositive && !annotation.hasBeenResizedLocally && annotationEntity?.hasDictionary;
!annotation.hasBeenForcedRedaction &&
!annotation.hasBeenResizedLocally &&
annotationEntity?.hasDictionary;
export const canRemoveOnlyHere = (annotation: AnnotationWrapper, canAddRedaction: boolean, autoAnalysisDisabled: boolean) => export const canRemoveOnlyHere = (annotation: AnnotationWrapper, canAddRedaction: boolean, autoAnalysisDisabled: boolean) =>
canAddRedaction && canAddRedaction &&
@ -30,7 +27,7 @@ export const canRemoveFromDictionary = (annotation: AnnotationWrapper, autoAnaly
annotation.isModifyDictionary && annotation.isModifyDictionary &&
(annotation.isRedacted || annotation.isSkipped || annotation.isHint || (annotation.isIgnoredHint && !annotation.isRuleBased)) && (annotation.isRedacted || annotation.isSkipped || annotation.isHint || (annotation.isIgnoredHint && !annotation.isRuleBased)) &&
(autoAnalysisDisabled || !annotation.pending) && (autoAnalysisDisabled || !annotation.pending) &&
[LogEntryEngines.DICTIONARY, LogEntryEngines.DOSSIER_DICTIONARY].some(engine => annotation.engines.includes(engine)); annotation.isDictBased;
export const canRemoveRedaction = (annotation: AnnotationWrapper, permissions: AnnotationPermissions) => export const canRemoveRedaction = (annotation: AnnotationWrapper, permissions: AnnotationPermissions) =>
(!annotation.isIgnoredHint || !annotation.isRuleBased) && (!annotation.isIgnoredHint || !annotation.isRuleBased) &&

View File

@ -74,7 +74,7 @@ export class AnnotationWrapper implements IListable {
} }
get isDictBased() { get isDictBased() {
return this.engines.includes(LogEntryEngines.DICTIONARY); return [LogEntryEngines.DICTIONARY, LogEntryEngines.DOSSIER_DICTIONARY].some(engine => this.engines.includes(engine));
} }
get isRedactedImageHint() { get isRedactedImageHint() {

View File

@ -1,7 +1,7 @@
<div class="content-container" iqserHasScrollbar> <div class="content-container" iqserHasScrollbar>
<div class="dialog"> <div class="dialog">
<div class="dialog-header"> <div class="dialog-header">
<div [translate]="'entity.info.heading'" [attr.help-mode-key]="'entity_info'" class="heading-l"></div> <div [translate]="'entity.info.heading'" [attr.help-mode-key]="'entity_info'" class="heading-l w-full"></div>
<div *ngIf="!permissionsService.canEditEntities()" class="read-only-indicator all-caps-label primary"> <div *ngIf="!permissionsService.canEditEntities()" class="read-only-indicator all-caps-label primary">
<mat-icon class="mr-8" svgIcon="red:read-only"></mat-icon> <mat-icon class="mr-8" svgIcon="red:read-only"></mat-icon>
@ -26,8 +26,6 @@
></iqser-icon-button> ></iqser-icon-button>
<div (click)="revert()" [translate]="'entity.info.actions.revert'" class="all-caps-label cancel"></div> <div (click)="revert()" [translate]="'entity.info.actions.revert'" class="all-caps-label cancel"></div>
<iqser-help-button *ngIf="!config.IS_DOCUMINE"></iqser-help-button>
</div> </div>
</div> </div>
</div> </div>

View File

@ -26,3 +26,7 @@
min-height: unset; min-height: unset;
} }
} }
.w-full {
width: 100%;
}

View File

@ -158,6 +158,7 @@ export class AdminSideNavComponent implements OnInit {
{ {
screen: 'info', screen: 'info',
label: _('admin-side-nav.entity-info'), label: _('admin-side-nav.entity-info'),
helpModeKey: 'entity_info',
show: true, show: true,
}, },
{ {

@ -1 +1 @@
Subproject commit 98ac49fbc81bb9989c14a8ca06c11d98ed042c86 Subproject commit 43bfeb4e1ebb3a0950a0bfb7cdf9d9dccfd78960