From 51699fe1eabdf3ec0413f52a517816c33bc24cae Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Tue, 19 Oct 2021 10:47:00 +0300
Subject: [PATCH] bulk add filter groups

---
 .../screen/dossier-overview-screen.component.ts            | 5 +----
 .../dossier/screens/dossiers-listing/config.service.ts     | 7 ++-----
 .../screen/dossiers-listing-screen.component.ts            | 7 +++----
 apps/red-ui/src/app/services/general-settings.service.ts   | 3 +--
 libs/common-ui                                             | 2 +-
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
index 8e2e77b76..a4c8a8016 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
@@ -293,9 +293,6 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
             () => this.checkedRequiredFilters,
             () => this.checkedNotRequiredFilters,
         );
-
-        for (const filterGroup of filterGroups) {
-            this.filterService.addFilterGroup(filterGroup);
-        }
+        this.filterService.addFilterGroups(filterGroups);
     }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts
index 36c126a2d..9d7014889 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts
@@ -48,10 +48,7 @@ export class ConfigService {
             {
                 id: 'my-dossiers',
                 label: myDossiersLabel,
-                checker: (dw: Dossier) => {
-                    console.log(dw.ownerId, this._currentUser.id);
-                    return dw.ownerId === this._currentUser.id;
-                },
+                checker: (dw: Dossier) => dw.ownerId === this._currentUser.id,
             },
             {
                 id: 'to-approve',
@@ -190,7 +187,7 @@ export class ConfigService {
         filterGroups.push({
             slug: 'quickFilters',
             filters: quickFilters,
-            checker: (dw: Dossier) => quickFilters.reduce((acc, f) => acc || (f.checked && f.checker(dw)), false),
+            checker: (dw: Dossier, filter: NestedFilter) => filter.checked && filter.checker(dw),
         });
 
         const dossierFilters = entities.map(
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 39aa49ee3..ae1cea4a8 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
@@ -39,7 +39,8 @@ import { DossiersService } from '@services/entity-services/dossiers.service';
 })
 export class DossiersListingScreenComponent
     extends ListingComponent<Dossier>
-    implements OnInit, AfterViewInit, OnDestroy, OnAttach, OnDetach {
+    implements OnInit, AfterViewInit, OnDestroy, OnAttach, OnDetach
+{
     readonly currentUser = this._userService.currentUser;
     readonly tableColumnConfigs = this._configService.tableConfig;
     readonly tableHeaderLabel = _('dossier-listing.table-header.title');
@@ -143,8 +144,6 @@ export class DossiersListingScreenComponent
 
     private _computeAllFilters() {
         const filterGroups = this._configService.filterGroups(this.entitiesService.all, this._needsWorkFilterTemplate);
-        for (const filterGroup of filterGroups) {
-            this.filterService.addFilterGroup(filterGroup);
-        }
+        this.filterService.addFilterGroups(filterGroups);
     }
 }
diff --git a/apps/red-ui/src/app/services/general-settings.service.ts b/apps/red-ui/src/app/services/general-settings.service.ts
index d5ec9f93c..08613dfae 100644
--- a/apps/red-ui/src/app/services/general-settings.service.ts
+++ b/apps/red-ui/src/app/services/general-settings.service.ts
@@ -1,7 +1,6 @@
 import { Injectable, Injector } from '@angular/core';
 import { GenericService, RequiredParam, Validate } from '@iqser/common-ui';
 import { GeneralConfigurationModel } from '@redaction/red-ui-http';
-import { tap } from 'rxjs/operators';
 
 @Injectable({
     providedIn: 'root',
@@ -12,7 +11,7 @@ export class GeneralSettingsService extends GenericService<GeneralConfigurationM
     }
 
     getGeneralConfigurations() {
-        return this._getOne(['general']).pipe(tap(console.log));
+        return this._getOne(['general']);
     }
 
     @Validate()
diff --git a/libs/common-ui b/libs/common-ui
index fdbcb3656..5a232048f 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit fdbcb36565f18a4e1ed9530125aff7c92c9b8a9e
+Subproject commit 5a232048f2569fdc265b5e253c76e983f51d25b5