From bd3c6377b4524daa8714a699a5a5074f233dabbc Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Tue, 6 Jul 2021 15:25:19 +0300
Subject: [PATCH] fix rebase

---
 .../base-screen/base-screen.component.html    |  2 +-
 .../base-screen/base-screen.component.ts      |  4 --
 .../popup-filter/popup-filter.component.html  |  4 +-
 apps/red-ui/src/assets/i18n/en.json           | 38 +++++++++++++++----
 4 files changed, 34 insertions(+), 14 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 166e42a9a..a4e3893fd 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
@@ -102,7 +102,7 @@
             ></redaction-user-button>
 
             <mat-menu #userMenu="matMenu" xPosition="before">
-                <ng-container *ngFor="let item of userMenuItems">
+                <ng-container *ngFor="let item of userMenuItems; trackBy: trackByName">
                     <button
                         (click)="(item.action)"
                         *ngIf="item.show"
diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts
index 2c8a17dd4..bb3359453 100644
--- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts
+++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts
@@ -81,10 +81,6 @@ export class BaseScreenComponent {
         this._userService.logout();
     }
 
-    changeLanguage(language: string) {
-        this._languageService.changeLanguage(language);
-    }
-
     trackByName(index: number, item: MenuItem) {
         return item.name;
     }
diff --git a/apps/red-ui/src/app/modules/shared/components/filters/popup-filter/popup-filter.component.html b/apps/red-ui/src/app/modules/shared/components/filters/popup-filter/popup-filter.component.html
index 801082a3c..b9d7671a4 100644
--- a/apps/red-ui/src/app/modules/shared/components/filters/popup-filter/popup-filter.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/filters/popup-filter/popup-filter.component.html
@@ -24,12 +24,12 @@
             <div class="all-caps-label" translate="filter-menu.filter-types"></div>
             <div class="actions">
                 <div
-                    (click)="activateAllFilters(); $event.stopPropagation()"
+                    (click)="activatePrimaryFilters(); $event.stopPropagation()"
                     class="all-caps-label primary pointer"
                     translate="actions.all"
                 ></div>
                 <div
-                    (click)="deactivateAllFilters(); $event.stopPropagation()"
+                    (click)="deactivateFilters(); $event.stopPropagation()"
                     class="all-caps-label primary pointer"
                     translate="actions.none"
                 ></div>
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index fb30e0b9d..25b455450 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -1271,6 +1271,34 @@
     },
     "title": "Configure SMTP Account"
   },
+  "trash": {
+    "label": "Trash",
+    "table-header": {
+      "title": "{{length}} deleted dossiers",
+      "info": "Deleted items can be restored up to {{hours}} hours from their deletions"
+    },
+    "bulk": {
+      "delete": "Forever Delete Selected Dossiers",
+      "restore": "Restore Selected Dossiers"
+    },
+    "action": {
+      "delete": "Delete forever",
+      "restore": "Restore"
+    },
+    "search": "Search...",
+    "table-col-names": {
+      "name": "Name",
+      "owner": "Owner",
+      "deleted-on": "Deleted on",
+      "time-to-restore": "Time to restore"
+    },
+    "no-data": {
+      "title": "There are no dossiers yet."
+    },
+    "no-match": {
+      "title": "No dossiers match your current filters."
+    }
+  },
   "sorting": {
     "alphabetically": "Alphabetically",
     "custom": "Custom",
@@ -1289,13 +1317,9 @@
         "children": {
           "admin": "Settings",
           "downloads": "My Downloads",
-          "language": {
-            "de": "German",
-            "en": "English",
-            "label": "Language"
-          },
-          "logout": "Logout",
-          "my-profile": "My Profile"
+          "my-profile": "My Profile",
+          "trash": "Trash",
+          "logout": "Logout"
         }
       }
     }