From 647117b4880181305aed5df4595aa1f42c0b6b15 Mon Sep 17 00:00:00 2001
From: Cilibiu Bogdan <pionnegru@users.noreply.github.com>
Date: Mon, 26 Nov 2018 21:36:33 +0200
Subject: [PATCH] [ACA-2044] custom library icon consistency (#826)

* add custom library icon

* isLibrary custom type guard

* meaningfull cutom class name

* update isLibrary check for trash

* use custom image for libraries in trash

* remove duplicate subscriber

* change image source color

* remove custom class

* remove library image class

* remove custom type guard
---
 src/app/components/page.component.ts                     | 9 ++++++++-
 .../search-libraries-results.component.html              | 1 +
 src/app/components/trashcan/trashcan.component.html      | 1 +
 src/app/components/trashcan/trashcan.component.ts        | 1 -
 src/app/ui/overrides/adf-document-list.theme.scss        | 5 -----
 src/assets/app.extensions.json                           | 4 ++--
 src/assets/images/baseline-library_books-24px.svg        | 3 ++-
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/app/components/page.component.ts b/src/app/components/page.component.ts
index 3c3171dfd..3184392c4 100644
--- a/src/app/components/page.component.ts
+++ b/src/app/components/page.component.ts
@@ -73,7 +73,14 @@ export abstract class PageComponent implements OnInit, OnDestroy {
   }
 
   static isLibrary(entry) {
-    return Boolean(entry.role && entry.visibility);
+    return (
+      (entry.guid &&
+        entry.id &&
+        entry.preset &&
+        entry.title &&
+        entry.visibility) ||
+      entry.nodeType === 'st:site'
+    );
   }
 
   constructor(
diff --git a/src/app/components/search/search-libraries-results/search-libraries-results.component.html b/src/app/components/search/search-libraries-results/search-libraries-results.component.html
index 7e2c9f76a..766e62f57 100644
--- a/src/app/components/search/search-libraries-results/search-libraries-results.component.html
+++ b/src/app/components/search/search-libraries-results/search-libraries-results.component.html
@@ -36,6 +36,7 @@
                   [selectionMode]="'single'"
                   [sorting]="[ 'name', 'asc' ]"
                   [node]="data"
+                  [imageResolver]="imageResolver"
                   (node-dblclick)="navigateTo($event.detail?.node)"
                   (name-click)="navigateTo($event.detail?.node)">
 
diff --git a/src/app/components/trashcan/trashcan.component.html b/src/app/components/trashcan/trashcan.component.html
index 32929124a..f505b29ef 100644
--- a/src/app/components/trashcan/trashcan.component.html
+++ b/src/app/components/trashcan/trashcan.component.html
@@ -20,6 +20,7 @@
             currentFolderId="-trashcan-"
             selectionMode="multiple"
             [navigate]="false"
+            [imageResolver]="imageResolver"
             [sorting]="[ 'archivedAt', 'desc' ]">
 
             <empty-folder-content>
diff --git a/src/app/components/trashcan/trashcan.component.ts b/src/app/components/trashcan/trashcan.component.ts
index 2ee8a1168..8c05affda 100644
--- a/src/app/components/trashcan/trashcan.component.ts
+++ b/src/app/components/trashcan/trashcan.component.ts
@@ -59,7 +59,6 @@ export class TrashcanComponent extends PageComponent implements OnInit {
     this.subscriptions.push(
       this.content.nodesRestored.subscribe(() => this.reload()),
       this.content.nodesPurged.subscribe(() => this.reload()),
-      this.content.nodesRestored.subscribe(() => this.reload()),
 
       this.breakpointObserver
         .observe([Breakpoints.HandsetPortrait, Breakpoints.HandsetLandscape])
diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss
index c0f8f41bd..983978c68 100644
--- a/src/app/ui/overrides/adf-document-list.theme.scss
+++ b/src/app/ui/overrides/adf-document-list.theme.scss
@@ -15,11 +15,6 @@
     overflow-y: scroll;
   }
 
-  .custom-image-cell img {
-    filter: invert(91%) sepia(25%) saturate(1431%) hue-rotate(6deg)
-      brightness(101%) contrast(82%);
-  }
-
   .adf-data-table {
     border: none !important;
 
diff --git a/src/assets/app.extensions.json b/src/assets/app.extensions.json
index d82941e63..a57c0a972 100644
--- a/src/assets/app.extensions.json
+++ b/src/assets/app.extensions.json
@@ -1071,7 +1071,7 @@
           "id": "app.libraries.thumbnail",
           "key": "$thumbnail",
           "type": "image",
-          "class": "image-table-cell custom-image-cell",
+          "class": "image-table-cell",
           "sortable": false,
           "desktopOnly": false
         },
@@ -1109,7 +1109,7 @@
           "id": "app.favorite.libraries.thumbnail",
           "key": "$thumbnail",
           "type": "image",
-          "class": "image-table-cell custom-image-cell",
+          "class": "image-table-cell",
           "sortable": false,
           "desktopOnly": false
         },
diff --git a/src/assets/images/baseline-library_books-24px.svg b/src/assets/images/baseline-library_books-24px.svg
index 4e78ec510..8898592b7 100644
--- a/src/assets/images/baseline-library_books-24px.svg
+++ b/src/assets/images/baseline-library_books-24px.svg
@@ -1 +1,2 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M4 6H2v14c0 1.1.9 2 2 2h14v-2H4V6zm16-4H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-1 9H9V9h10v2zm-4 4H9v-2h6v2zm4-8H9V5h10v2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<path d="M0 0h24v24H0z" fill="none"/><path fill="#D9E021" d="M4 6H2v14c0 1.1.9 2 2 2h14v-2H4V6zm16-4H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-1 9H9V9h10v2zm-4 4H9v-2h6v2zm4-8H9V5h10v2z"/></svg>
\ No newline at end of file