From 9df5a508f1511b683ff675a53fbf6549eb98a4d1 Mon Sep 17 00:00:00 2001
From: Philip Vissenaekens <philipvissenaekens@atmire.com>
Date: Thu, 12 Dec 2019 13:11:54 +0100
Subject: [PATCH] 65240: Community and Collection logo layout

---
 .../collection-page.component.html            | 21 +++++++------------
 .../community-page.component.html             |  8 +++----
 src/app/core/data/comcol-data.service.ts      | 11 +++-------
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 1cd0318bd5..98552ed40b 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -5,15 +5,17 @@
             <div *ngIf="collectionRD?.payload as collection">
                 <ds-view-tracker [object]="collection"></ds-view-tracker>
                 <header class="comcol-header border-bottom mb-4 pb-4">
-                    <!-- Collection logo -->
-                    <ds-comcol-page-logo *ngIf="logoRD$"
-                        [logo]="(logoRD$ | async)?.payload" [alternateText]="'Collection Logo'">
-                        [alternateText]="'Collection Logo'">
-                    </ds-comcol-page-logo>
-                <!-- Collection Name -->
+                  <!-- Collection Name -->
                 <ds-comcol-page-header
                         [name]="collection.name">
                 </ds-comcol-page-header>
+                    <!-- Collection logo -->
+                    <ds-comcol-page-logo *ngIf="logoRD$"
+                                     [logo]="(logoRD$ | async)?.payload"
+                                     [alternateText]="'Collection Logo'"
+                        [alternateText]="'Collection Logo'">
+                    </ds-comcol-page-logo>
+
                  <!-- Handle -->
                 <ds-comcol-page-handle
                         [content]="collection.handle"
@@ -39,13 +41,6 @@
                       [contentType]="collection.type">
               </ds-comcol-page-browse-by>
 
-              <!-- Collection logo -->
-              <ds-comcol-page-logo *ngIf="logoRD$"
-                                   [logo]="(logoRD$ | async)?.payload"
-                                   [alternateText]="'Collection Logo'"
-                                   [alternateText]="'Collection Logo'">
-              </ds-comcol-page-logo>
-
             <ng-container *ngVar="(itemRD$ | async) as itemRD">
                 <div class="mt-4" *ngIf="itemRD?.hasSucceeded" @fadeIn>
                     <h3 class="sr-only">{{'collection.page.browse.recent.head' | translate}}</h3>
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index ed9d527067..dfd1ce93d9 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -3,9 +3,11 @@
     <div *ngIf="communityRD?.payload; let communityPayload">
       <ds-view-tracker [object]="communityPayload"></ds-view-tracker>
       <header class="comcol-header border-bottom mb-4 pb-4">
-
         <!-- Community name -->
         <ds-comcol-page-header [name]="communityPayload.name"></ds-comcol-page-header>
+        <!-- Community logo -->
+        <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Community Logo'">
+        </ds-comcol-page-logo>
         <!-- Handle -->
         <ds-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
         </ds-comcol-page-handle>
@@ -23,10 +25,6 @@
         <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
         </ds-comcol-page-browse-by>
 
-        <!-- Community logo -->
-        <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Community Logo'">
-        </ds-comcol-page-logo>
-
         <ds-community-page-sub-community-list [community]="communityPayload"></ds-community-page-sub-community-list>
         <ds-community-page-sub-collection-list [community]="communityPayload"></ds-community-page-sub-collection-list>
       </section>
diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts
index 63f8e9ef44..2ce0362a4e 100644
--- a/src/app/core/data/comcol-data.service.ts
+++ b/src/app/core/data/comcol-data.service.ts
@@ -1,24 +1,19 @@
 import {
   distinctUntilChanged,
-  filter, first,
-  map,
-  mergeMap,
-  share,
-  switchMap,
+  filter, first,map, mergeMap, share, switchMap,
   take,
   tap
 } from 'rxjs/operators';
-import { merge as observableMerge, Observable, throwError as observableThrowError } from 'rxjs';
+import { merge as observableMerge, Observable, throwError as observableThrowError, combineLatest as observableCombineLatest } from 'rxjs';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { NormalizedCommunity } from '../cache/models/normalized-community.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { CommunityDataService } from './community-data.service';
 
 import { DataService } from './data.service';
-import { DeleteRequest, FindAllOptions, FindByIDRequest, RestRequest } from './request.models';
+import { DeleteRequest, FindListOptions, FindByIDRequest, RestRequest } from './request.models';
 import { PaginatedList } from './paginated-list';
 import { RemoteData } from './remote-data';
-import { FindListOptions, FindByIDRequest } from './request.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import {
   configureRequest,