From c3d6f20a4d6de122d8537ef0c5a07502c87f42a7 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Mon, 4 Oct 2021 13:46:55 +0300
Subject: [PATCH] fix merge

---
 .../base-screen/base-screen.component.html    | 55 ++++++-------------
 .../dossiers-listing-screen.component.ts      | 11 +++-
 2 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
index 30abc60e1..bb66bc9f6 100644
--- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html
+++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
@@ -3,25 +3,6 @@
 <div class="top-bar">
     <div *ngIf="!currentUser.isUser" class="menu-placeholder"></div>
 
-    <div *ngIf="currentUser.isUser" class="menu visible-lt-lg">
-        <button [matMenuTriggerFor]="menuNav" mat-flat-button>
-            <mat-icon svgIcon="red:menu"></mat-icon>
-        </button>
-        <mat-menu #menuNav="matMenu">
-            <button mat-menu-item routerLink="/main/dossiers" translate="top-bar.navigation-items.dossiers"></button>
-            <button *ngIf="appStateService.activeDossier" [routerLink]="'/main/dossiers/' + appStateService.activeDossierId" mat-menu-item>
-                {{ appStateService.activeDossier.dossierName }}
-            </button>
-            <button
-                *ngIf="appStateService.activeFile"
-                [routerLink]="'/main/dossiers/' + appStateService.activeDossierId + '/file/' + appStateService.activeFile.fileId"
-                mat-menu-item
-            >
-                {{ appStateService.activeFile.filename }}
-            </button>
-        </mat-menu>
-    </div>
-
     <div *ngIf="currentUser.isUser" class="menu flex-2 visible-lg breadcrumbs-container">
         <a *ngIf="(isDossiersView$ | async) === false" class="breadcrumb back" redactionNavigateLastDossiersScreen>
             <mat-icon svgIcon="iqser:expand"></mat-icon>
@@ -37,28 +18,26 @@
                 translate="top-bar.navigation-items.dossiers"
             ></a>
 
-            <mat-icon *ngIf="appStateService.activeDossier" svgIcon="iqser:arrow-right"></mat-icon>
+            <ng-container *ngIf="dossiersService.activeDossier$ | async as dossier">
+                <mat-icon svgIcon="iqser:arrow-right"></mat-icon>
 
-            <a
-                *ngIf="appStateService.activeDossier"
-                [routerLinkActiveOptions]="{ exact: true }"
-                [routerLink]="'/main/dossiers/' + appStateService.activeDossierId"
-                class="breadcrumb"
-                routerLinkActive="active"
-            >
-                {{ appStateService.activeDossier.dossierName }}
-            </a>
+                <a
+                    [routerLinkActiveOptions]="{ exact: true }"
+                    [routerLink]="dossier.routerLink"
+                    class="breadcrumb"
+                    routerLinkActive="active"
+                >
+                    {{ dossier.dossierName }}
+                </a>
+            </ng-container>
 
-            <mat-icon *ngIf="appStateService.activeFile" svgIcon="iqser:arrow-right"></mat-icon>
+            <ng-container *ngIf="appStateService.activeFile as activeFile">
+                <mat-icon svgIcon="iqser:arrow-right"></mat-icon>
 
-            <a
-                *ngIf="appStateService.activeFile"
-                [routerLink]="'/main/dossiers/' + appStateService.activeDossierId + '/file/' + appStateService.activeFile.fileId"
-                class="breadcrumb"
-                routerLinkActive="active"
-            >
-                {{ appStateService.activeFile.filename }}
-            </a>
+                <a [routerLink]="activeFile.routerLink" class="breadcrumb" routerLinkActive="active">
+                    {{ activeFile.filename }}
+                </a>
+            </ng-container>
         </ng-container>
     </div>
 
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
index e2622f0fe..071959d12 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
@@ -11,7 +11,16 @@ import { tap } from 'rxjs/operators';
 import { Router } from '@angular/router';
 import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
 import { groupBy, StatusSorter } from '@utils/index';
-import { DefaultListingServices, ListingComponent, OnAttach, OnDetach, TableComponent } from '@iqser/common-ui';
+import {
+    EntitiesService,
+    FilterService,
+    ListingComponent,
+    OnAttach,
+    OnDetach,
+    SearchService,
+    SortingService,
+    TableComponent
+} from '@iqser/common-ui';
 import { fileStatusTranslations } from '../../../translations/file-status-translations';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { ConfigService } from '../config.service';