From a9e5dbde3f6241a5345cda5ef5bb5fc407836764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Wed, 11 May 2022 15:53:03 +0300
Subject: [PATCH] RED-4013: Fixed dashboard in Firefox

---
 .../donut-chart/donut-chart.component.scss           |  4 ++++
 .../dossier-templates/dashboard-stats.service.ts     | 12 +++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.scss b/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.scss
index 51fdd8722..773493760 100644
--- a/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.scss
@@ -25,6 +25,10 @@
     }
 }
 
+.donut-chart {
+    flex-shrink: 0;
+}
+
 .text-container {
     position: absolute;
     display: flex;
diff --git a/apps/red-ui/src/app/services/dossier-templates/dashboard-stats.service.ts b/apps/red-ui/src/app/services/dossier-templates/dashboard-stats.service.ts
index 79819f682..2003fe426 100644
--- a/apps/red-ui/src/app/services/dossier-templates/dashboard-stats.service.ts
+++ b/apps/red-ui/src/app/services/dossier-templates/dashboard-stats.service.ts
@@ -6,6 +6,16 @@ import { Observable } from 'rxjs';
 import { map, switchMap, tap } from 'rxjs/operators';
 import { DossierStatesService } from '@services/entity-services/dossier-states.service';
 
+const templatesSorter = (a: DashboardStats, b: DashboardStats) => {
+    if (a.numberOfActiveDossiers > 0 && b.numberOfActiveDossiers === 0) {
+        return -1;
+    } else if (a.numberOfActiveDossiers === 0 && b.numberOfActiveDossiers > 0) {
+        return 1;
+    } else {
+        return 0;
+    }
+};
+
 @Injectable({
     providedIn: 'root',
 })
@@ -22,7 +32,7 @@ export class DashboardStatsService extends EntitiesService<DashboardStats, IDash
         return this.getAll(this._defaultModelPath).pipe(
             mapEach(entity => new DashboardStats(entity)),
             switchMap(entities => this._dossierStatesService.loadAllForAllTemplates().pipe(map(() => entities))),
-            tap(entities => entities.sort((a, b) => (a.numberOfActiveDossiers > 0 && b.numberOfActiveDossiers === 0 ? -1 : 1))),
+            tap(entities => entities.sort(templatesSorter)),
             tap(entities => this.setEntities(entities)),
         );
     }