From d036fe6046d5960104939727478e3f59d5579e8d Mon Sep 17 00:00:00 2001
From: Sean Engelhardt <sean.f.t.engelhardt@gmail.com>
Date: Mon, 15 Jul 2019 17:49:30 +0200
Subject: [PATCH] Add file manager patches for firefox

Lowers the change detection attempts to fix the file manager
for firefox
---
 .../search-value-selector.component.ts            |  5 +++--
 client/src/app/site/base/base-view.ts             |  8 ++++++++
 .../mediafile-list/mediafile-list.component.html  | 15 ++++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/client/src/app/shared/components/search-value-selector/search-value-selector.component.ts b/client/src/app/shared/components/search-value-selector/search-value-selector.component.ts
index 06404d6f5..23b9c2e45 100644
--- a/client/src/app/shared/components/search-value-selector/search-value-selector.component.ts
+++ b/client/src/app/shared/components/search-value-selector/search-value-selector.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, ViewChild, OnDestroy } from '@angular/core';
+import { Component, Input, ViewChild, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { MatSelect } from '@angular/material';
 
@@ -34,7 +34,8 @@ import { Selectable } from '../selectable';
 @Component({
     selector: 'os-search-value-selector',
     templateUrl: './search-value-selector.component.html',
-    styleUrls: ['./search-value-selector.component.scss']
+    styleUrls: ['./search-value-selector.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SearchValueSelectorComponent implements OnDestroy {
     /**
diff --git a/client/src/app/site/base/base-view.ts b/client/src/app/site/base/base-view.ts
index e8871677e..97fa404f9 100644
--- a/client/src/app/site/base/base-view.ts
+++ b/client/src/app/site/base/base-view.ts
@@ -91,6 +91,14 @@ export abstract class BaseViewComponent extends BaseComponent implements OnDestr
         }
     }
 
+    /**
+     * Translate alternative  avoid endless loops during change detection
+     * @param original the original string to translate
+     */
+    public translateSync(original: string): string {
+        return this.translate.instant(original);
+    }
+
     /**
      * To catch swipe gestures.
      * Should be overwritten by children which need swipe gestures
diff --git a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html
index 18b0a77a6..c9fbd6b4a 100644
--- a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html
+++ b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html
@@ -51,7 +51,14 @@
         </span>
         <span class="visibility" *ngIf="directory && directory.inherited_access_groups_id !== true">
             <span class="visible-for" *ngIf="directory.has_inherited_access_groups" translate>
-                <os-icon-container icon="visibility" matTooltip="{{ 'Allowed access groups for this directory' | translate }}">{{ directory.inherited_access_groups }}</os-icon-container>
+                <os-icon-container
+                    icon="visibility"
+                    matTooltip="{{ 'Allowed access groups for this directory' | translate }}"
+                >
+                    <span *ngFor="let group of directory.inherited_access_groups; let last = last">
+                        {{ translateSync(group.getTitle()) }}<span *ngIf="!last">,</span>
+                    </span>
+                </os-icon-container>
             </span>
         </span>
     </div>
@@ -84,10 +91,8 @@
     <!-- Info column -->
     <div *pblNgridCellDef="'info'; row as mediafile" class="fill clickable" (click)="onEditFile(mediafile)">
         <os-icon-container *ngIf="mediafile.access_groups.length" icon="group">
-            <span>
-                <span *ngFor="let group of mediafile.access_groups; let last = last">
-                    {{ group.getTitle() | translate }}<span *ngIf="!last">,</span>
-                </span>
+            <span *ngFor="let group of mediafile.access_groups; let last = last">
+                {{ translateSync(group.getTitle()) }}<span *ngIf="!last">,</span>
             </span>
         </os-icon-container>
     </div>