RED-9516: fixed filter options alignment.

apps/red-ui/src/app/components/base-screen/base-screen.component.html

@@ -9,7 +9,7 @@
         <redaction-breadcrumbs></redaction-breadcrumbs>
     </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">
             <iqser-logo (iqserHiddenAction)="userPreferenceService.toggleDevFeatures()" icon="iqser:logo"></iqser-logo>
             <div class="app-name">{{ titleService.getTitle() }}</div>

apps/red-ui/src/app/models/file/annotation-permissions.utils.ts

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

apps/red-ui/src/app/models/file/annotation.wrapper.ts

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

apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html

@@ -1,7 +1,7 @@
 <div class="content-container" iqserHasScrollbar>
     <div class="dialog">
         <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">
                 <mat-icon class="mr-8" svgIcon="red:read-only"></mat-icon>
@@ -26,8 +26,6 @@
             ></iqser-icon-button>
 
             <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>

apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.scss

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

apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts

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

apps/red-ui/src/app/modules/shared/components/type-filter/type-filter.component.html

@@ -1,7 +1,5 @@
 <ng-container *ngIf="!filter.icon">
-    <div *ngIf="filter.id === 'comment'">
-        <mat-icon svgIcon="red:comment"></mat-icon>
-    </div>
+    <mat-icon *ngIf="filter.id === 'comment'" svgIcon="red:comment"></mat-icon>
 
     <redaction-annotation-icon
         *ngIf="filter.id !== 'comment'"

apps/red-ui/src/app/modules/shared/components/type-filter/type-filter.component.scss

@@ -12,6 +12,6 @@
         height: 16px;
         margin-right: 8px;
         opacity: 50%;
-        line-height: 16px;
+        line-height: 8px;
     }
 }

libs/common-ui

@@ -1 +1 @@
-Subproject commit 98ac49fbc81bb9989c14a8ca06c11d98ed042c86
+Subproject commit e6e0686794805acba763ab605ad8f080a1237da6