From 4ccd19081a86212794ff02d243d8d27d4f865e04 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 29 Jan 2019 15:47:32 +0100
Subject: [PATCH 01/16] 59415: Possibility to browse-by using a scope

---
 .../browse-by-author-page.component.ts                 |  4 +++-
 .../browse-by-title-page.component.ts                  |  7 +++++--
 src/app/core/browse/browse.service.ts                  |  4 ++++
 src/app/navbar/navbar.component.ts                     | 10 ----------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.ts b/src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.ts
index 813ee8a32f..6299dd896b 100644
--- a/src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.ts
+++ b/src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.ts
@@ -57,6 +57,7 @@ export class BrowseByAuthorPageComponent implements OnInit {
           const pageSize = +params.pageSize || this.paginationConfig.pageSize;
           const sortDirection = params.sortDirection || this.sortConfig.direction;
           const sortField = params.sortField || this.sortConfig.field;
+          const scope = params.scope;
           this.value = +params.value || params.value || '';
           const pagination = Object.assign({},
             this.paginationConfig,
@@ -68,7 +69,8 @@ export class BrowseByAuthorPageComponent implements OnInit {
           );
           const searchOptions = {
             pagination: pagination,
-            sort: sort
+            sort: sort,
+            scope: scope
           };
           if (isNotEmpty(this.value)) {
             this.updatePageWithItems(searchOptions, this.value);
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
index e9127dbbab..b5e9eb2427 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
@@ -56,6 +56,7 @@ export class BrowseByTitlePageComponent implements OnInit {
           const pageSize = +params.pageSize || this.paginationConfig.pageSize;
           const sortDirection = params.sortDirection || this.sortConfig.direction;
           const sortField = params.sortField || this.sortConfig.field;
+          const scopeID = params.scope;
           const pagination = Object.assign({},
             this.paginationConfig,
             { currentPage: page, pageSize: pageSize }
@@ -66,7 +67,8 @@ export class BrowseByTitlePageComponent implements OnInit {
           );
           this.updatePage({
             pagination: pagination,
-            sort: sort
+            sort: sort,
+            scopeID: scopeID
           });
         }));
   }
@@ -81,7 +83,8 @@ export class BrowseByTitlePageComponent implements OnInit {
     this.items$ = this.itemDataService.findAll({
       currentPage: searchOptions.pagination.currentPage,
       elementsPerPage: searchOptions.pagination.pageSize,
-      sort: searchOptions.sort
+      sort: searchOptions.sort,
+      scopeID: searchOptions.scopeID
     });
   }
 
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index ddce277e7e..9293343c24 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -90,6 +90,7 @@ export class BrowseService {
   getBrowseEntriesFor(definitionID: string, options: {
     pagination?: PaginationComponentOptions;
     sort?: SortOptions;
+    scope?: string;
   } = {}): Observable<RemoteData<PaginatedList<BrowseEntry>>> {
     const request$ = this.getBrowseDefinitions().pipe(
       getBrowseDefinitionLinks(definitionID),
@@ -99,6 +100,9 @@ export class BrowseService {
       map((href: string) => {
         // TODO nearly identical to PaginatedSearchOptions => refactor
         const args = [];
+        if (isNotEmpty(options.sort)) {
+          args.push(`scope=${options.scope}`);
+        }
         if (isNotEmpty(options.sort)) {
           args.push(`sort=${options.sort.field},${options.sort.direction}`);
         }
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 54d409d751..92bd0cd633 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -63,16 +63,6 @@ export class NavbarComponent extends MenuComponent implements OnInit {
         } as LinkMenuItemModel,
       },
       {
-        id: 'browse_global_global_by_issue_date',
-        parentID: 'browse_global',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.browse_global_by_issue_date',
-          link: '#'
-        } as LinkMenuItemModel,
-      },      {
         id: 'browse_global_global_by_title',
         parentID: 'browse_global',
         active: false,

From 0312e659a48d296cdf81c14d24487aba17515eec Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 29 Jan 2019 16:07:53 +0100
Subject: [PATCH 02/16] 59415: Browse-By links on community and collection
 pages'

---
 src/app/+collection-page/collection-page.component.html  | 2 ++
 src/app/+community-page/community-page.component.html    | 2 ++
 .../comcol-page-browse-by.component.html                 | 5 +++++
 .../comcol-page-browse-by.component.ts                   | 9 +++++++++
 src/app/shared/shared.module.ts                          | 2 ++
 5 files changed, 20 insertions(+)
 create mode 100644 src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
 create mode 100644 src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts

diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index a233163070..bc283968df 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -33,6 +33,8 @@
           [content]="collection.license"
           [title]="'collection.page.license'">
         </ds-comcol-page-content>
+        <!-- Browse-By Links -->
+        <ds-comcol-page-browse-by [id]="collection.id"></ds-comcol-page-browse-by>
       </div>
     </div>
     <ds-error *ngIf="collectionRD?.hasFailed" message="{{'error.collection' | translate}}"></ds-error>
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index a86a86c3da..ff62cda945 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -24,6 +24,8 @@
         [content]="communityPayload.copyrightText"
         [hasInnerHtml]="true">
       </ds-comcol-page-content>
+      <!-- Browse-By Links -->
+      <ds-comcol-page-browse-by [id]="communityPayload.id"></ds-comcol-page-browse-by>
       <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>
     </div>
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
new file mode 100644
index 0000000000..5750a909b5
--- /dev/null
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -0,0 +1,5 @@
+<h3>Browse</h3>
+<ul>
+  <li><a [routerLink]="['/browse/title']" [queryParams]="{scope: id}">By Title</a></li>
+  <li><a [routerLink]="['/browse/author']" [queryParams]="{scope: id}">By Author</a></li>
+</ul>
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
new file mode 100644
index 0000000000..a1d286992d
--- /dev/null
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -0,0 +1,9 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'ds-comcol-page-browse-by',
+  templateUrl: './comcol-page-browse-by.component.html',
+})
+export class ComcolPageBrowseByComponent {
+  @Input() id: string;
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 3561576046..5a7541018b 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -87,6 +87,7 @@ import { ObjectKeysPipe } from './utils/object-keys-pipe';
 import { MomentModule } from 'ngx-moment';
 import { MenuModule } from './menu/menu.module';
 import {LangSwitchComponent} from './lang-switch/lang-switch.component';
+import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -130,6 +131,7 @@ const COMPONENTS = [
   ComcolPageContentComponent,
   ComcolPageHeaderComponent,
   ComcolPageLogoComponent,
+  ComcolPageBrowseByComponent,
   DsDynamicFormComponent,
   DsDynamicFormControlComponent,
   DsDynamicListComponent,

From 551ed18fe580cfbf855d9ea760369fccca3b26f0 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 29 Jan 2019 16:18:46 +0100
Subject: [PATCH 03/16] 59415: Allow scope in browse-by-value

---
 src/app/core/browse/browse.service.ts                         | 4 ++++
 .../browse-entry-list-element.component.html                  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index 9293343c24..8e2c288ae8 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -149,6 +149,7 @@ export class BrowseService {
   getBrowseItemsFor(definitionID: string, filterValue: string, options: {
     pagination?: PaginationComponentOptions;
     sort?: SortOptions;
+    scope?: string;
   } = {}): Observable<RemoteData<PaginatedList<Item>>> {
     const request$ = this.getBrowseDefinitions().pipe(
       getBrowseDefinitionLinks(definitionID),
@@ -157,6 +158,9 @@ export class BrowseService {
       hasValueOperator(),
       map((href: string) => {
         const args = [];
+        if (isNotEmpty(options.sort)) {
+          args.push(`scope=${options.scope}`);
+        }
         if (isNotEmpty(options.sort)) {
           args.push(`sort=${options.sort.field},${options.sort.direction}`);
         }
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
index 198e79b453..6139e4a9df 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex flex-row">
-  <a [routerLink]="" [queryParams]="{value: object.value}" class="lead">
+  <a [routerLink]="" [queryParams]="{value: object.value}" [queryParamsHandling]="'merge'" class="lead">
     {{object.value}}
   </a>
   <span class="pr-2">&nbsp;</span>

From 3fdd32b383c4913080cbe6709120f4fd9f8be443 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 29 Jan 2019 17:00:25 +0100
Subject: [PATCH 04/16] 59415: Refactored Browse-By-Author to
 Browse-By-Metadata to support multiple metadata definitions

---
 resources/i18n/en.json                        |  7 +-
 .../browse-by-metadata-page.component.html}   |  6 +-
 .../browse-by-metadata-page.component.scss}   |  0
 .../browse-by-metadata-page.component.ts}     | 68 ++++++++++++++++---
 .../browse-by-title-page.component.html       |  2 +-
 .../+browse-by/browse-by-routing.module.ts    |  4 +-
 src/app/+browse-by/browse-by.module.ts        |  4 +-
 7 files changed, 71 insertions(+), 20 deletions(-)
 rename src/app/+browse-by/{+browse-by-author-page/browse-by-author-page.component.html => +browse-by-metadata-page/browse-by-metadata-page.component.html} (56%)
 rename src/app/+browse-by/{+browse-by-author-page/browse-by-author-page.component.scss => +browse-by-metadata-page/browse-by-metadata-page.component.scss} (100%)
 rename src/app/+browse-by/{+browse-by-author-page/browse-by-author-page.component.ts => +browse-by-metadata-page/browse-by-metadata-page.component.ts} (64%)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 4db7e4a3d4..229d278327 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -280,7 +280,12 @@
     }
   },
   "browse": {
-    "title": "Browsing {{ collection }} by {{ field }} {{ value }}"
+    "title": "Browsing {{ collection }} by {{ field }} {{ value }}",
+    "metadata": {
+      "title": "Title",
+      "author": "Author",
+      "subject": "Subject"
+    }
   },
   "admin": {
     "registries": {
diff --git a/src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.html b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
similarity index 56%
rename from src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.html
rename to src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
index 438c318994..c67096e29e 100644
--- a/src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.html
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -1,8 +1,8 @@
 <div class="container">
-  <div class="browse-by-author w-100 row">
+  <div class="browse-by-metadata w-100 row">
     <ds-browse-by class="col-xs-12 w-100"
-      title="{{'browse.title' | translate:{collection: '', field: 'Author', value: (value)? '&quot;' + value + '&quot;': ''} }}"
-      [objects$]="(items$ !== undefined)? items$ : authors$"
+      title="{{'browse.title' | translate:{collection: '', field: 'browse.metadata.' + metadata | translate, value: (value)? '&quot;' + value + '&quot;': ''} }}"
+      [objects$]="(items$ !== undefined)? items$ : browseEntries$"
       [currentUrl]="currentUrl"
       [paginationConfig]="paginationConfig"
       [sortConfig]="sortConfig">
diff --git a/src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.scss b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.scss
similarity index 100%
rename from src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.scss
rename to src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.scss
diff --git a/src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
similarity index 64%
rename from src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.ts
rename to src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
index 6299dd896b..f548699800 100644
--- a/src/app/+browse-by/+browse-by-author-page/browse-by-author-page.component.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -13,28 +13,72 @@ import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Item } from '../../core/shared/item.model';
 
 @Component({
-  selector: 'ds-browse-by-author-page',
-  styleUrls: ['./browse-by-author-page.component.scss'],
-  templateUrl: './browse-by-author-page.component.html'
+  selector: 'ds-browse-by-metadata-page',
+  styleUrls: ['./browse-by-metadata-page.component.scss'],
+  templateUrl: './browse-by-metadata-page.component.html'
 })
 /**
- * Component for browsing (items) by author (dc.contributor.author)
+ * Component for browsing (items) by metadata definition
+ * A metadata definition is a short term used to describe one or multiple metadata fields.
+ * An example would be 'author' for 'dc.contributor.*'
  */
-export class BrowseByAuthorPageComponent implements OnInit {
+export class BrowseByMetadataPageComponent implements OnInit {
 
-  authors$: Observable<RemoteData<PaginatedList<BrowseEntry>>>;
+  /**
+   * The list of browse-entries to display
+   */
+  browseEntries$: Observable<RemoteData<PaginatedList<BrowseEntry>>>;
+
+  /**
+   * The list of items to display when a value is present
+   */
   items$: Observable<RemoteData<PaginatedList<Item>>>;
+
+  /**
+   * The pagination config used to display the values
+   */
   paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'browse-by-author-pagination',
+    id: 'browse-by-metadata-pagination',
     currentPage: 1,
     pageSize: 20
   });
-  sortConfig: SortOptions = new SortOptions('dc.contributor.author', SortDirection.ASC);
+
+  /**
+   * The sorting config used to sort the values (defaults to Ascending)
+   */
+  sortConfig: SortOptions = new SortOptions('default', SortDirection.ASC);
+
+  /**
+   * List of subscriptions
+   */
   subs: Subscription[] = [];
+
+  /**
+   * The current URL
+   * used for navigation when clicking values
+   */
   currentUrl: string;
+
+  /**
+   * The default metadata definition to resort to when none is provided
+   */
+  defaultMetadata = 'author';
+
+  /**
+   * The current metadata definition
+   */
+  metadata = this.defaultMetadata;
+
+  /**
+   * The value we're browing items for
+   * - When the value is not empty, we're browing items
+   * - When the value is empty, we're browing browse-entries (values for the given metadata definition)
+   */
   value = '';
 
-  public constructor(private itemDataService: ItemDataService, private route: ActivatedRoute, private browseService: BrowseService) {
+  public constructor(private itemDataService: ItemDataService,
+                     private route: ActivatedRoute,
+                     private browseService: BrowseService) {
   }
 
   ngOnInit(): void {
@@ -53,6 +97,7 @@ export class BrowseByAuthorPageComponent implements OnInit {
           return Object.assign({}, params, queryParams);
         })
         .subscribe((params) => {
+          this.metadata = params.metadata || this.defaultMetadata;
           const page = +params.page || this.paginationConfig.currentPage;
           const pageSize = +params.pageSize || this.paginationConfig.pageSize;
           const sortDirection = params.sortDirection || this.sortConfig.direction;
@@ -68,6 +113,7 @@ export class BrowseByAuthorPageComponent implements OnInit {
             { direction: sortDirection, field: sortField }
           );
           const searchOptions = {
+            metadata: this.metadata,
             pagination: pagination,
             sort: sort,
             scope: scope
@@ -87,7 +133,7 @@ export class BrowseByAuthorPageComponent implements OnInit {
    *                          sort: SortOptions }
    */
   updatePage(searchOptions) {
-    this.authors$ = this.browseService.getBrowseEntriesFor('author', searchOptions);
+    this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions.metadata, searchOptions);
     this.items$ = undefined;
   }
 
@@ -99,7 +145,7 @@ export class BrowseByAuthorPageComponent implements OnInit {
    * @param author          The author's name for displaying items
    */
   updatePageWithItems(searchOptions, author: string) {
-    this.items$ = this.browseService.getBrowseItemsFor('author', author, searchOptions);
+    this.items$ = this.browseService.getBrowseItemsFor(searchOptions.metadata, author, searchOptions);
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
index d37727be36..1b746eae16 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="browse-by-title w-100 row">
     <ds-browse-by class="col-xs-12 w-100"
-      title="{{'browse.title' | translate:{collection: '', field: 'Title', value: ''} }}"
+      title="{{'browse.title' | translate:{collection: '', field: 'browse.metadata.title' | translate, value: ''} }}"
       [objects$]="items$"
       [currentUrl]="currentUrl"
       [paginationConfig]="paginationConfig"
diff --git a/src/app/+browse-by/browse-by-routing.module.ts b/src/app/+browse-by/browse-by-routing.module.ts
index 630a7c0db5..38915fffca 100644
--- a/src/app/+browse-by/browse-by-routing.module.ts
+++ b/src/app/+browse-by/browse-by-routing.module.ts
@@ -1,13 +1,13 @@
 import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
 import { BrowseByTitlePageComponent } from './+browse-by-title-page/browse-by-title-page.component';
-import { BrowseByAuthorPageComponent } from './+browse-by-author-page/browse-by-author-page.component';
+import { BrowseByMetadataPageComponent } from './+browse-by-metadata-page/browse-by-metadata-page.component';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: 'title', component: BrowseByTitlePageComponent },
-      { path: 'author', component: BrowseByAuthorPageComponent }
+      { path: ':metadata', component: BrowseByMetadataPageComponent }
     ])
   ]
 })
diff --git a/src/app/+browse-by/browse-by.module.ts b/src/app/+browse-by/browse-by.module.ts
index 51843a13d8..38e5001b80 100644
--- a/src/app/+browse-by/browse-by.module.ts
+++ b/src/app/+browse-by/browse-by.module.ts
@@ -4,8 +4,8 @@ import { BrowseByTitlePageComponent } from './+browse-by-title-page/browse-by-ti
 import { ItemDataService } from '../core/data/item-data.service';
 import { SharedModule } from '../shared/shared.module';
 import { BrowseByRoutingModule } from './browse-by-routing.module';
-import { BrowseByAuthorPageComponent } from './+browse-by-author-page/browse-by-author-page.component';
 import { BrowseService } from '../core/browse/browse.service';
+import { BrowseByMetadataPageComponent } from './+browse-by-metadata-page/browse-by-metadata-page.component';
 
 @NgModule({
   imports: [
@@ -15,7 +15,7 @@ import { BrowseService } from '../core/browse/browse.service';
   ],
   declarations: [
     BrowseByTitlePageComponent,
-    BrowseByAuthorPageComponent
+    BrowseByMetadataPageComponent
   ],
   providers: [
     ItemDataService,

From 64f301d1ddd80b3b18fdf1ee2b30f02127e4cfb0 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 29 Jan 2019 17:22:23 +0100
Subject: [PATCH 05/16] 59415: messages, subject link on comcol pages and
 documentation updates

---
 resources/i18n/en.json                        |  9 +++++++++
 .../browse-by-metadata-page.component.ts      | 20 +++++++++++--------
 src/app/navbar/navbar.component.ts            | 11 ++++++++++
 .../comcol-page-browse-by.component.html      |  7 ++++---
 .../comcol-page-browse-by.component.ts        |  7 +++++++
 5 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 229d278327..ec88ed4f09 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -285,6 +285,14 @@
       "title": "Title",
       "author": "Author",
       "subject": "Subject"
+    },
+    "comcol": {
+      "head": "Browse",
+      "by": {
+        "title": "By Title",
+        "author": "By Author",
+        "subject": "By Subject"
+      }
     }
   },
   "admin": {
@@ -382,6 +390,7 @@
       "browse_global_by_issue_date": "By Issue Date",
       "browse_global_by_author": "By Author",
       "browse_global_by_title": "By Title",
+      "browse_global_by_subject": "By Subject",
       "statistics": "Statistics",
       "browse_community": "This Community",
       "browse_community_by_issue_date": "By Issue Date",
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
index f548699800..67deed97d2 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -129,8 +129,10 @@ export class BrowseByMetadataPageComponent implements OnInit {
   /**
    * Updates the current page with searchOptions
    * @param searchOptions   Options to narrow down your search:
-   *                        { pagination: PaginationComponentOptions,
-   *                          sort: SortOptions }
+   *                        { metadata: string
+   *                          pagination: PaginationComponentOptions,
+   *                          sort: SortOptions,
+   *                          scope: string }
    */
   updatePage(searchOptions) {
     this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions.metadata, searchOptions);
@@ -138,14 +140,16 @@ export class BrowseByMetadataPageComponent implements OnInit {
   }
 
   /**
-   * Updates the current page with searchOptions and display items linked to author
+   * Updates the current page with searchOptions and display items linked to the given value
    * @param searchOptions   Options to narrow down your search:
-   *                        { pagination: PaginationComponentOptions,
-   *                          sort: SortOptions }
-   * @param author          The author's name for displaying items
+   *                        { metadata: string
+   *                          pagination: PaginationComponentOptions,
+   *                          sort: SortOptions,
+   *                          scope: string }
+   * @param value          The value of the browse-entry to display items for
    */
-  updatePageWithItems(searchOptions, author: string) {
-    this.items$ = this.browseService.getBrowseItemsFor(searchOptions.metadata, author, searchOptions);
+  updatePageWithItems(searchOptions, value: string) {
+    this.items$ = this.browseService.getBrowseItemsFor(searchOptions.metadata, value, searchOptions);
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 92bd0cd633..76b4e6f46d 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -84,6 +84,17 @@ export class NavbarComponent extends MenuComponent implements OnInit {
           link: '/browse/author'
         } as LinkMenuItemModel,
       },
+      {
+        id: 'browse_global_by_subject',
+        parentID: 'browse_global',
+        active: false,
+        visible: true,
+        model: {
+          type: MenuItemType.LINK,
+          text: 'menu.section.browse_global_by_subject',
+          link: '/browse/subject'
+        } as LinkMenuItemModel,
+      },
 
       /* Statistics */
       {
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
index 5750a909b5..653bd1ed53 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -1,5 +1,6 @@
-<h3>Browse</h3>
+<h3>{{'browse.comcol.head' | translate}}</h3>
 <ul>
-  <li><a [routerLink]="['/browse/title']" [queryParams]="{scope: id}">By Title</a></li>
-  <li><a [routerLink]="['/browse/author']" [queryParams]="{scope: id}">By Author</a></li>
+  <li><a [routerLink]="['/browse/title']" [queryParams]="{scope: id}">{{'browse.comcol.by.title' | translate}}</a></li>
+  <li><a [routerLink]="['/browse/author']" [queryParams]="{scope: id}">{{'browse.comcol.by.author' | translate}}</a></li>
+  <li><a [routerLink]="['/browse/subject']" [queryParams]="{scope: id}">{{'browse.comcol.by.subject' | translate}}</a></li>
 </ul>
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
index a1d286992d..85d40a77e0 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,9 +1,16 @@
 import { Component, Input } from '@angular/core';
 
+/**
+ * A component to display the "Browse By" section of a Community or Collection page
+ * It expects the ID of the Community or Collection as input to be passed on as a scope
+ */
 @Component({
   selector: 'ds-comcol-page-browse-by',
   templateUrl: './comcol-page-browse-by.component.html',
 })
 export class ComcolPageBrowseByComponent {
+  /**
+   * The ID of the Community or Collection
+   */
   @Input() id: string;
 }

From fde2e1cc6e12b96476021cdaa1c3ce828bc18de1 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 29 Jan 2019 17:44:28 +0100
Subject: [PATCH 06/16] 59415: Browse-Entries empty response handling and doc
 fix

---
 resources/i18n/en.json                                 |  3 ++-
 .../browse-by-metadata-page.component.ts               |  4 ++--
 .../data/browse-entries-response-parsing.service.ts    | 10 ++++++----
 src/app/shared/browse-by/browse-by.component.html      |  5 ++++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index ec88ed4f09..954a8ca087 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -293,7 +293,8 @@
         "author": "By Author",
         "subject": "By Subject"
       }
-    }
+    },
+    "empty": "No items to show."
   },
   "admin": {
     "registries": {
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
index 67deed97d2..775228c8a2 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -71,8 +71,8 @@ export class BrowseByMetadataPageComponent implements OnInit {
 
   /**
    * The value we're browing items for
-   * - When the value is not empty, we're browing items
-   * - When the value is empty, we're browing browse-entries (values for the given metadata definition)
+   * - When the value is not empty, we're browsing items
+   * - When the value is empty, we're browsing browse-entries (values for the given metadata definition)
    */
   value = '';
 
diff --git a/src/app/core/data/browse-entries-response-parsing.service.ts b/src/app/core/data/browse-entries-response-parsing.service.ts
index 171def60df..006654b7cc 100644
--- a/src/app/core/data/browse-entries-response-parsing.service.ts
+++ b/src/app/core/data/browse-entries-response-parsing.service.ts
@@ -30,10 +30,12 @@ export class BrowseEntriesResponseParsingService extends BaseResponseParsingServ
   }
 
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    if (isNotEmpty(data.payload) && isNotEmpty(data.payload._embedded)
-      && Array.isArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]])) {
-      const serializer = new DSpaceRESTv2Serializer(BrowseEntry);
-      const browseEntries = serializer.deserializeArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]]);
+    if (isNotEmpty(data.payload)) {
+      let browseEntries = [];
+      if (isNotEmpty(data.payload._embedded) && Array.isArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]])) {
+        const serializer = new DSpaceRESTv2Serializer(BrowseEntry);
+        browseEntries = serializer.deserializeArray(data.payload._embedded[Object.keys(data.payload._embedded)[0]]);
+      }
       return new GenericSuccessResponse(browseEntries, data.statusCode, this.processPageInfo(data.payload));
     } else {
       return new ErrorResponse(
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index f30c5b905c..f99c6a539a 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -7,6 +7,9 @@
       [objects]="objects">
     </ds-viewable-collection>
   </div>
-  <ds-loading *ngIf="!objects || objects?.payload?.page.length <= 0" message="{{'loading.browse-by' | translate}}"></ds-loading>
+  <ds-loading *ngIf="!objects || objects?.isLoading" message="{{'loading.browse-by' | translate}}"></ds-loading>
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
+  <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0" class="alert alert-info w-100" role="alert">
+    {{'browse.empty' | translate}}
+  </div>
 </ng-container>

From 7c267603eb4f56e548a3c91be6cc42e4edb24179 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 30 Jan 2019 10:49:07 +0100
Subject: [PATCH 07/16] 59415: Code cleanup and refactoring

---
 .../browse-by-metadata-page.component.html    |  1 -
 .../browse-by-metadata-page.component.ts      | 53 +++++++++----------
 .../browse-by-title-page.component.html       |  1 -
 .../browse-by-title-page.component.ts         | 42 +++++++--------
 .../shared/browse-by/browse-by.component.html |  2 +-
 .../shared/browse-by/browse-by.component.ts   | 18 +++++--
 6 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
index c67096e29e..2501dcda21 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -3,7 +3,6 @@
     <ds-browse-by class="col-xs-12 w-100"
       title="{{'browse.title' | translate:{collection: '', field: 'browse.metadata.' + metadata | translate, value: (value)? '&quot;' + value + '&quot;': ''} }}"
       [objects$]="(items$ !== undefined)? items$ : browseEntries$"
-      [currentUrl]="currentUrl"
       [paginationConfig]="paginationConfig"
       [sortConfig]="sortConfig">
     </ds-browse-by>
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
index 775228c8a2..975dc33d48 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -53,12 +53,6 @@ export class BrowseByMetadataPageComponent implements OnInit {
    */
   subs: Subscription[] = [];
 
-  /**
-   * The current URL
-   * used for navigation when clicking values
-   */
-  currentUrl: string;
-
   /**
    * The default metadata definition to resort to when none is provided
    */
@@ -82,9 +76,6 @@ export class BrowseByMetadataPageComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.currentUrl = this.route.snapshot.pathFromRoot
-      .map((snapshot) => (snapshot.routeConfig) ? snapshot.routeConfig.path : '')
-      .join('/');
     this.updatePage({
       pagination: this.paginationConfig,
       sort: this.sortConfig
@@ -98,26 +89,8 @@ export class BrowseByMetadataPageComponent implements OnInit {
         })
         .subscribe((params) => {
           this.metadata = params.metadata || this.defaultMetadata;
-          const page = +params.page || this.paginationConfig.currentPage;
-          const pageSize = +params.pageSize || this.paginationConfig.pageSize;
-          const sortDirection = params.sortDirection || this.sortConfig.direction;
-          const sortField = params.sortField || this.sortConfig.field;
-          const scope = params.scope;
           this.value = +params.value || params.value || '';
-          const pagination = Object.assign({},
-            this.paginationConfig,
-            { currentPage: page, pageSize: pageSize }
-          );
-          const sort = Object.assign({},
-            this.sortConfig,
-            { direction: sortDirection, field: sortField }
-          );
-          const searchOptions = {
-            metadata: this.metadata,
-            pagination: pagination,
-            sort: sort,
-            scope: scope
-          };
+          const searchOptions = browseParamsToOptions(params, this.paginationConfig, this.sortConfig, this.metadata);
           if (isNotEmpty(this.value)) {
             this.updatePageWithItems(searchOptions, this.value);
           } else {
@@ -157,3 +130,27 @@ export class BrowseByMetadataPageComponent implements OnInit {
   }
 
 }
+
+export function browseParamsToOptions(params: any,
+                                      paginationConfig: PaginationComponentOptions,
+                                      sortConfig: SortOptions,
+                                      metadata?: string): any {
+  return {
+    metadata: metadata,
+    pagination: Object.assign({},
+      paginationConfig,
+      {
+        currentPage: +params.page || paginationConfig.currentPage,
+        pageSize: +params.pageSize || paginationConfig.pageSize
+      }
+    ),
+    sort: Object.assign({},
+      sortConfig,
+      {
+        direction: params.sortDirection || sortConfig.direction,
+        field: params.sortField || sortConfig.field
+      }
+    ),
+    scope: params.scope
+  };
+}
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
index 1b746eae16..cd6adb30cd 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
@@ -3,7 +3,6 @@
     <ds-browse-by class="col-xs-12 w-100"
       title="{{'browse.title' | translate:{collection: '', field: 'browse.metadata.title' | translate, value: ''} }}"
       [objects$]="items$"
-      [currentUrl]="currentUrl"
       [paginationConfig]="paginationConfig"
       [sortConfig]="sortConfig">
     </ds-browse-by>
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
index b5e9eb2427..ace585ea5a 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
@@ -11,6 +11,7 @@ import { Item } from '../../core/shared/item.model';
 import { ActivatedRoute, PRIMARY_OUTLET, UrlSegmentGroup } from '@angular/router';
 import { hasValue } from '../../shared/empty.util';
 import { Collection } from '../../core/shared/collection.model';
+import { browseParamsToOptions } from '../+browse-by-metadata-page/browse-by-metadata-page.component';
 
 @Component({
   selector: 'ds-browse-by-title-page',
@@ -22,24 +23,36 @@ import { Collection } from '../../core/shared/collection.model';
  */
 export class BrowseByTitlePageComponent implements OnInit {
 
+  /**
+   * The list of items to display
+   */
   items$: Observable<RemoteData<PaginatedList<Item>>>;
+
+  /**
+   * The pagination configuration to use for displaying the list of items
+   */
   paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'browse-by-title-pagination',
     currentPage: 1,
     pageSize: 20
   });
+
+  /**
+   * The sorting configuration to use for displaying the list of items
+   * Sorted by title (Ascending by default)
+   */
   sortConfig: SortOptions = new SortOptions('dc.title', SortDirection.ASC);
+
+  /**
+   * List of subscriptions
+   */
   subs: Subscription[] = [];
-  currentUrl: string;
 
   public constructor(private itemDataService: ItemDataService, private route: ActivatedRoute) {
 
   }
 
   ngOnInit(): void {
-    this.currentUrl = this.route.snapshot.pathFromRoot
-      .map((snapshot) => (snapshot.routeConfig) ? snapshot.routeConfig.path : '')
-      .join('/');
     this.updatePage({
       pagination: this.paginationConfig,
       sort: this.sortConfig
@@ -52,24 +65,7 @@ export class BrowseByTitlePageComponent implements OnInit {
           return Object.assign({}, params, queryParams);
         })
         .subscribe((params) => {
-          const page = +params.page || this.paginationConfig.currentPage;
-          const pageSize = +params.pageSize || this.paginationConfig.pageSize;
-          const sortDirection = params.sortDirection || this.sortConfig.direction;
-          const sortField = params.sortField || this.sortConfig.field;
-          const scopeID = params.scope;
-          const pagination = Object.assign({},
-            this.paginationConfig,
-            { currentPage: page, pageSize: pageSize }
-          );
-          const sort = Object.assign({},
-            this.sortConfig,
-            { direction: sortDirection, field: sortField }
-          );
-          this.updatePage({
-            pagination: pagination,
-            sort: sort,
-            scopeID: scopeID
-          });
+          this.updatePage(browseParamsToOptions(params, this.paginationConfig, this.sortConfig));
         }));
   }
 
@@ -84,7 +80,7 @@ export class BrowseByTitlePageComponent implements OnInit {
       currentPage: searchOptions.pagination.currentPage,
       elementsPerPage: searchOptions.pagination.pageSize,
       sort: searchOptions.sort,
-      scopeID: searchOptions.scopeID
+      scopeID: searchOptions.scope
     });
   }
 
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index f99c6a539a..fc3300ae72 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngVar="(objects$ | async) as objects">
-  <h2 class="w-100">{{title}}</h2>
+  <h2 class="w-100">{{title | translate}}</h2>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
     <ds-viewable-collection
       [config]="paginationConfig"
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 94cf81f46e..2e9e825a6b 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -5,7 +5,6 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
 import { SortOptions } from '../../core/cache/models/sort-options.model';
 import { fadeIn, fadeInOut } from '../animations/fade';
 import { Observable } from 'rxjs';
-import { Item } from '../../core/shared/item.model';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 
 @Component({
@@ -21,10 +20,23 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode
  * Component to display a browse-by page for any ListableObject
  */
 export class BrowseByComponent {
+  /**
+   * The i18n message to display as title
+   */
   @Input() title: string;
+
+  /**
+   * The list of objects to display
+   */
   @Input() objects$: Observable<RemoteData<PaginatedList<ListableObject>>>;
+
+  /**
+   * The pagination configuration used for the list
+   */
   @Input() paginationConfig: PaginationComponentOptions;
+
+  /**
+   * The sorting configuration used for the list
+   */
   @Input() sortConfig: SortOptions;
-  @Input() currentUrl: string;
-  query: string;
 }

From da7723c27bfe4e56cccb7429d04dc187c92a0a85 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 30 Jan 2019 11:09:29 +0100
Subject: [PATCH 08/16] 59415: BrowseEntrySearchOptions to enforce correct use
 of parameters

---
 .../browse-by-metadata-page.component.ts      | 35 +++++++++++--------
 .../browse-by-title-page.component.ts         |  8 ++---
 .../browse-entry-search-options.model.ts      | 17 +++++++++
 src/app/core/browse/browse.service.ts         | 17 +++------
 4 files changed, 45 insertions(+), 32 deletions(-)
 create mode 100644 src/app/core/browse/browse-entry-search-options.model.ts

diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
index 975dc33d48..48f9c8b6ca 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -11,6 +11,7 @@ import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { BrowseService } from '../../core/browse/browse.service';
 import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Item } from '../../core/shared/item.model';
+import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 
 @Component({
   selector: 'ds-browse-by-metadata-page',
@@ -76,10 +77,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.updatePage({
-      pagination: this.paginationConfig,
-      sort: this.sortConfig
-    });
+    this.updatePage(new BrowseEntrySearchOptions(null, this.paginationConfig, this.sortConfig));
     this.subs.push(
       observableCombineLatest(
         this.route.params,
@@ -107,8 +105,8 @@ export class BrowseByMetadataPageComponent implements OnInit {
    *                          sort: SortOptions,
    *                          scope: string }
    */
-  updatePage(searchOptions) {
-    this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions.metadata, searchOptions);
+  updatePage(searchOptions: BrowseEntrySearchOptions) {
+    this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions);
     this.items$ = undefined;
   }
 
@@ -121,8 +119,8 @@ export class BrowseByMetadataPageComponent implements OnInit {
    *                          scope: string }
    * @param value          The value of the browse-entry to display items for
    */
-  updatePageWithItems(searchOptions, value: string) {
-    this.items$ = this.browseService.getBrowseItemsFor(searchOptions.metadata, value, searchOptions);
+  updatePageWithItems(searchOptions: BrowseEntrySearchOptions, value: string) {
+    this.items$ = this.browseService.getBrowseItemsFor(value, searchOptions);
   }
 
   ngOnDestroy(): void {
@@ -131,26 +129,33 @@ export class BrowseByMetadataPageComponent implements OnInit {
 
 }
 
+/**
+ * Function to transform query and url parameters into searchOptions used to fetch browse entries or items
+ * @param params            URL and query parameters
+ * @param paginationConfig  Pagination configuration
+ * @param sortConfig        Sorting configuration
+ * @param metadata          Optional metadata definition to fetch browse entries/items for
+ */
 export function browseParamsToOptions(params: any,
                                       paginationConfig: PaginationComponentOptions,
                                       sortConfig: SortOptions,
-                                      metadata?: string): any {
-  return {
-    metadata: metadata,
-    pagination: Object.assign({},
+                                      metadata?: string): BrowseEntrySearchOptions {
+  return new BrowseEntrySearchOptions(
+    metadata,
+    Object.assign({},
       paginationConfig,
       {
         currentPage: +params.page || paginationConfig.currentPage,
         pageSize: +params.pageSize || paginationConfig.pageSize
       }
     ),
-    sort: Object.assign({},
+    Object.assign({},
       sortConfig,
       {
         direction: params.sortDirection || sortConfig.direction,
         field: params.sortField || sortConfig.field
       }
     ),
-    scope: params.scope
-  };
+    params.scope
+  );
 }
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
index ace585ea5a..4af7495dad 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
@@ -12,6 +12,7 @@ import { ActivatedRoute, PRIMARY_OUTLET, UrlSegmentGroup } from '@angular/router
 import { hasValue } from '../../shared/empty.util';
 import { Collection } from '../../core/shared/collection.model';
 import { browseParamsToOptions } from '../+browse-by-metadata-page/browse-by-metadata-page.component';
+import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 
 @Component({
   selector: 'ds-browse-by-title-page',
@@ -53,10 +54,7 @@ export class BrowseByTitlePageComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.updatePage({
-      pagination: this.paginationConfig,
-      sort: this.sortConfig
-    });
+    this.updatePage(new BrowseEntrySearchOptions(null, this.paginationConfig, this.sortConfig));
     this.subs.push(
       observableCombineLatest(
         this.route.params,
@@ -75,7 +73,7 @@ export class BrowseByTitlePageComponent implements OnInit {
    *                        { pagination: PaginationComponentOptions,
    *                          sort: SortOptions }
    */
-  updatePage(searchOptions) {
+  updatePage(searchOptions: BrowseEntrySearchOptions) {
     this.items$ = this.itemDataService.findAll({
       currentPage: searchOptions.pagination.currentPage,
       elementsPerPage: searchOptions.pagination.pageSize,
diff --git a/src/app/core/browse/browse-entry-search-options.model.ts b/src/app/core/browse/browse-entry-search-options.model.ts
new file mode 100644
index 0000000000..94e2013ce0
--- /dev/null
+++ b/src/app/core/browse/browse-entry-search-options.model.ts
@@ -0,0 +1,17 @@
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { SortOptions } from '../cache/models/sort-options.model';
+
+/**
+ * A class that defines the search options to be used for fetching browse entries or items
+ * - metadataDefinition:  The metadata definition to fetch entries or items for
+ * - pagination:          The pagination options to use
+ * - sort:                The sorting options to use
+ * - scope:               An optional scope to limit the results within a specific collection or community
+ */
+export class BrowseEntrySearchOptions {
+  constructor(public metadataDefinition: string,
+              public pagination: PaginationComponentOptions,
+              public sort: SortOptions,
+              public scope?: string) {
+  }
+}
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index 8e2c288ae8..815570f348 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -37,6 +37,7 @@ import {
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { Item } from '../shared/item.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
+import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 
 @Injectable()
 export class BrowseService {
@@ -87,13 +88,9 @@ export class BrowseService {
     return this.rdb.toRemoteDataObservable(requestEntry$, responseCache$, payload$);
   }
 
-  getBrowseEntriesFor(definitionID: string, options: {
-    pagination?: PaginationComponentOptions;
-    sort?: SortOptions;
-    scope?: string;
-  } = {}): Observable<RemoteData<PaginatedList<BrowseEntry>>> {
+  getBrowseEntriesFor(options: BrowseEntrySearchOptions): Observable<RemoteData<PaginatedList<BrowseEntry>>> {
     const request$ = this.getBrowseDefinitions().pipe(
-      getBrowseDefinitionLinks(definitionID),
+      getBrowseDefinitionLinks(options.metadataDefinition),
       hasValueOperator(),
       map((_links: any) => _links.entries),
       hasValueOperator(),
@@ -146,13 +143,9 @@ export class BrowseService {
    *                                    sort: SortOptions }
    * @returns {Observable<RemoteData<PaginatedList<Item>>>}
    */
-  getBrowseItemsFor(definitionID: string, filterValue: string, options: {
-    pagination?: PaginationComponentOptions;
-    sort?: SortOptions;
-    scope?: string;
-  } = {}): Observable<RemoteData<PaginatedList<Item>>> {
+  getBrowseItemsFor(filterValue: string, options: BrowseEntrySearchOptions): Observable<RemoteData<PaginatedList<Item>>> {
     const request$ = this.getBrowseDefinitions().pipe(
-      getBrowseDefinitionLinks(definitionID),
+      getBrowseDefinitionLinks(options.metadataDefinition),
       hasValueOperator(),
       map((_links: any) => _links.items),
       hasValueOperator(),

From 18afb35e7489dd24c57f4c9b3543ec455b86371b Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 30 Jan 2019 11:32:12 +0100
Subject: [PATCH 09/16] 59415: Fixed existing tests

---
 .../browse/browse-entry-search-options.model.ts   |  8 ++++----
 src/app/core/browse/browse.service.spec.ts        | 13 +++++++------
 ...rowse-entries-response-parsing.service.spec.ts | 15 ---------------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/app/core/browse/browse-entry-search-options.model.ts b/src/app/core/browse/browse-entry-search-options.model.ts
index 94e2013ce0..a4911a33f1 100644
--- a/src/app/core/browse/browse-entry-search-options.model.ts
+++ b/src/app/core/browse/browse-entry-search-options.model.ts
@@ -4,14 +4,14 @@ import { SortOptions } from '../cache/models/sort-options.model';
 /**
  * A class that defines the search options to be used for fetching browse entries or items
  * - metadataDefinition:  The metadata definition to fetch entries or items for
- * - pagination:          The pagination options to use
- * - sort:                The sorting options to use
+ * - pagination:          Optional pagination options to use
+ * - sort:                Optional sorting options to use
  * - scope:               An optional scope to limit the results within a specific collection or community
  */
 export class BrowseEntrySearchOptions {
   constructor(public metadataDefinition: string,
-              public pagination: PaginationComponentOptions,
-              public sort: SortOptions,
+              public pagination?: PaginationComponentOptions,
+              public sort?: SortOptions,
               public scope?: string) {
   }
 }
diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index d43a26ed4b..79df1ea88c 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -10,6 +10,7 @@ import { BrowseEndpointRequest, BrowseEntriesRequest, BrowseItemsRequest } from
 import { RequestService } from '../data/request.service';
 import { BrowseDefinition } from '../shared/browse-definition.model';
 import { BrowseService } from './browse.service';
+import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 
 describe('BrowseService', () => {
   let scheduler: TestScheduler;
@@ -162,14 +163,14 @@ describe('BrowseService', () => {
       it('should configure a new BrowseEntriesRequest', () => {
         const expected = new BrowseEntriesRequest(requestService.generateRequestId(), browseDefinitions[1]._links.entries);
 
-        scheduler.schedule(() => service.getBrowseEntriesFor(browseDefinitions[1].id).subscribe());
+        scheduler.schedule(() => service.getBrowseEntriesFor(new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
         scheduler.flush();
 
         expect(requestService.configure).toHaveBeenCalledWith(expected);
       });
 
       it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
-        service.getBrowseEntriesFor(browseDefinitions[1].id);
+        service.getBrowseEntriesFor(new BrowseEntrySearchOptions(browseDefinitions[1].id));
 
         expect(rdbService.toRemoteDataObservable).toHaveBeenCalled();
 
@@ -181,14 +182,14 @@ describe('BrowseService', () => {
       it('should configure a new BrowseItemsRequest', () => {
         const expected = new BrowseItemsRequest(requestService.generateRequestId(), browseDefinitions[1]._links.items + '?filterValue=' + mockAuthorName);
 
-        scheduler.schedule(() => service.getBrowseItemsFor(browseDefinitions[1].id, mockAuthorName).subscribe());
+        scheduler.schedule(() => service.getBrowseItemsFor(mockAuthorName, new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
         scheduler.flush();
 
         expect(requestService.configure).toHaveBeenCalledWith(expected);
       });
 
       it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
-        service.getBrowseItemsFor(browseDefinitions[1].id, mockAuthorName);
+        service.getBrowseItemsFor(mockAuthorName, new BrowseEntrySearchOptions(browseDefinitions[1].id));
 
         expect(rdbService.toRemoteDataObservable).toHaveBeenCalled();
 
@@ -202,7 +203,7 @@ describe('BrowseService', () => {
         const definitionID = 'invalidID';
         const expected = cold('--#-', undefined, new Error(`No metadata browse definition could be found for id '${definitionID}'`))
 
-        expect(service.getBrowseEntriesFor(definitionID)).toBeObservable(expected);
+        expect(service.getBrowseEntriesFor(new BrowseEntrySearchOptions(definitionID))).toBeObservable(expected);
       });
     });
 
@@ -212,7 +213,7 @@ describe('BrowseService', () => {
         const definitionID = 'invalidID';
         const expected = cold('--#-', undefined, new Error(`No metadata browse definition could be found for id '${definitionID}'`))
 
-        expect(service.getBrowseItemsFor(definitionID, mockAuthorName)).toBeObservable(expected);
+        expect(service.getBrowseItemsFor(mockAuthorName, new BrowseEntrySearchOptions(definitionID))).toBeObservable(expected);
       });
     });
   });
diff --git a/src/app/core/data/browse-entries-response-parsing.service.spec.ts b/src/app/core/data/browse-entries-response-parsing.service.spec.ts
index dd04e4f2f5..087824ae6c 100644
--- a/src/app/core/data/browse-entries-response-parsing.service.spec.ts
+++ b/src/app/core/data/browse-entries-response-parsing.service.spec.ts
@@ -105,21 +105,6 @@ describe('BrowseEntriesResponseParsingService', () => {
     } as DSpaceRESTV2Response;
 
     const invalidResponseNotAList = {
-      payload: {
-        authority: null,
-        value: 'Arulmozhiyal, Ramaswamy',
-        valueLang: null,
-        count: 1,
-        type: 'browseEntry',
-        _links: {
-          self: {
-            href: 'https://rest.api/discover/browses/author/entries'
-          },
-          items: {
-            href: 'https://rest.api/discover/browses/author/items?filterValue=Arulmozhiyal, Ramaswamy'
-          }
-        },
-      },
       statusCode: '200'
     } as DSpaceRESTV2Response;
 

From 2acb55f58a66120b0c1bc1b75ccbab237cf47d4f Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 30 Jan 2019 13:47:14 +0100
Subject: [PATCH 10/16] 59415: Browse-by page component tests

---
 .../browse-by-metadata-page.component.spec.ts | 145 ++++++++++++++++++
 .../browse-by-metadata-page.component.ts      |   4 +-
 .../browse-by-title-page.component.spec.ts    |  67 ++++++++
 3 files changed, 213 insertions(+), 3 deletions(-)
 create mode 100644 src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
 create mode 100644 src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts

diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
new file mode 100644
index 0000000000..c11fa009aa
--- /dev/null
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -0,0 +1,145 @@
+import { BrowseByMetadataPageComponent, browseParamsToOptions } from './browse-by-metadata-page.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BrowseService } from '../../core/browse/browse.service';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
+import { SortDirection } from '../../core/cache/models/sort-options.model';
+import { Item } from '../../core/shared/item.model';
+
+describe('BrowseByMetadataPageComponent', () => {
+  let comp: BrowseByMetadataPageComponent;
+  let fixture: ComponentFixture<BrowseByMetadataPageComponent>;
+  let browseService: BrowseService;
+  let route: ActivatedRoute;
+
+  const mockEntries = [
+    {
+      type: 'author',
+      authority: null,
+      value: 'John Doe',
+      language: 'en',
+      count: 1
+    },
+    {
+      type: 'author',
+      authority: null,
+      value: 'James Doe',
+      language: 'en',
+      count: 3
+    },
+    {
+      type: 'subject',
+      authority: null,
+      value: 'Fake subject',
+      language: 'en',
+      count: 2
+    }
+  ];
+
+  const mockItems = [
+    Object.assign(new Item(), {
+      id: 'fakeId'
+    })
+  ];
+
+  const mockBrowseService = {
+    getBrowseEntriesFor: (options: BrowseEntrySearchOptions) => toRemoteData(mockEntries.filter((entry) => entry.type === options.metadataDefinition)),
+    getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData(mockItems)
+  };
+
+  const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
+    params: observableOf({})
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
+      declarations: [BrowseByMetadataPageComponent, EnumKeysPipe],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: BrowseService, useValue: mockBrowseService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BrowseByMetadataPageComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+    browseService = (comp as any).browseService;
+    route = (comp as any).route;
+    route.params = observableOf({});
+    comp.ngOnInit();
+    fixture.detectChanges();
+  });
+
+  it('should fetch the correct entries depending on the metadata definition', () => {
+    comp.browseEntries$.subscribe((result) => {
+      expect(result.payload.page).toEqual(mockEntries.filter((entry) => entry.type === 'author'));
+    });
+  });
+
+  it('should not fetch any items when no value is provided', () => {
+    expect(comp.items$).toBeUndefined();
+  });
+
+  describe('when a value is provided', () => {
+    beforeEach(() => {
+      const paramsWithValue = {
+        metadata: 'author',
+        value: 'John Doe'
+      };
+
+      route.params = observableOf(paramsWithValue);
+      comp.ngOnInit();
+    });
+
+    it('should fetch items', () => {
+      comp.items$.subscribe((result) => {
+        expect(result.payload.page).toEqual(mockItems);
+      });
+    })
+  });
+
+  describe('when calling browseParamsToOptions', () => {
+    let result: BrowseEntrySearchOptions;
+
+    beforeEach(() => {
+      const paramsWithPaginationAndScope = {
+        page: 5,
+        pageSize: 10,
+        sortDirection: SortDirection.ASC,
+        sortField: 'fake-field',
+        scope: 'fake-scope'
+      };
+
+      result = browseParamsToOptions(paramsWithPaginationAndScope, Object.assign({}), Object.assign({}), 'author');
+    });
+
+    it('should return BrowseEntrySearchOptions with the correct properties', () => {
+      expect(result.metadataDefinition).toEqual('author');
+      expect(result.pagination.currentPage).toEqual(5);
+      expect(result.pagination.pageSize).toEqual(10);
+      expect(result.sort.direction).toEqual(SortDirection.ASC);
+      expect(result.sort.field).toEqual('fake-field');
+      expect(result.scope).toEqual('fake-scope');
+    })
+  });
+});
+
+export function toRemoteData(objects: any[]): Observable<RemoteData<PaginatedList<any>>> {
+  return observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), objects)));
+}
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
index 48f9c8b6ca..31e8878d7c 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -3,7 +3,6 @@ import {combineLatest as observableCombineLatest,  Observable, Subscription } fr
 import { Component, OnInit } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list';
-import { ItemDataService } from '../../core/data/item-data.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { ActivatedRoute } from '@angular/router';
@@ -71,8 +70,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
    */
   value = '';
 
-  public constructor(private itemDataService: ItemDataService,
-                     private route: ActivatedRoute,
+  public constructor(private route: ActivatedRoute,
                      private browseService: BrowseService) {
   }
 
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
new file mode 100644
index 0000000000..530e57e3bb
--- /dev/null
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -0,0 +1,67 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { Item } from '../../core/shared/item.model';
+import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { toRemoteData } from '../+browse-by-metadata-page/browse-by-metadata-page.component.spec';
+import { BrowseByTitlePageComponent } from './browse-by-title-page.component';
+import { ItemDataService } from '../../core/data/item-data.service';
+
+describe('BrowseByTitlePageComponent', () => {
+  let comp: BrowseByTitlePageComponent;
+  let fixture: ComponentFixture<BrowseByTitlePageComponent>;
+  let itemDataService: ItemDataService;
+  let route: ActivatedRoute;
+
+  const mockItems = [
+    Object.assign(new Item(), {
+      id: 'fakeId',
+      metadata: [
+        {
+          key: 'dc.title',
+          value: 'Fake Title'
+        }
+      ]
+    })
+  ];
+
+  const mockItemDataService = {
+    findAll: () => toRemoteData(mockItems)
+  };
+
+  const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
+    params: observableOf({})
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
+      declarations: [BrowseByTitlePageComponent, EnumKeysPipe],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: ItemDataService, useValue: mockItemDataService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BrowseByTitlePageComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+    itemDataService = (comp as any).itemDataService;
+    route = (comp as any).route;
+  });
+
+  it('should initialize the list of items', () => {
+    comp.items$.subscribe((result) => {
+      expect(result.payload.page).toEqual(mockItems);
+    });
+  });
+});

From fbb9cadf45c81048aa6770fa0679b5d95f17de9a Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 5 Feb 2019 10:34:49 +0100
Subject: [PATCH 11/16] 59415: Browse-by on top of com-col pages + spacing

---
 src/app/+collection-page/collection-page.component.html       | 4 ++--
 src/app/+community-page/community-page.component.html         | 4 ++--
 .../comcol-page-content/comcol-page-content.component.html    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index bc283968df..6e411cb29d 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -7,6 +7,8 @@
         <ds-comcol-page-header
           [name]="collection.name">
         </ds-comcol-page-header>
+        <!-- Browse-By Links -->
+        <ds-comcol-page-browse-by [id]="collection.id"></ds-comcol-page-browse-by>
         <!-- Collection logo -->
         <ds-comcol-page-logo *ngIf="logoRD$"
                              [logo]="(logoRD$ | async)?.payload"
@@ -33,8 +35,6 @@
           [content]="collection.license"
           [title]="'collection.page.license'">
         </ds-comcol-page-content>
-        <!-- Browse-By Links -->
-        <ds-comcol-page-browse-by [id]="collection.id"></ds-comcol-page-browse-by>
       </div>
     </div>
     <ds-error *ngIf="collectionRD?.hasFailed" message="{{'error.collection' | translate}}"></ds-error>
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index ff62cda945..5cf1e39e7d 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -3,6 +3,8 @@
     <div *ngIf="communityRD?.payload; let communityPayload">
       <!-- Community name -->
       <ds-comcol-page-header [name]="communityPayload.name"></ds-comcol-page-header>
+      <!-- Browse-By Links -->
+      <ds-comcol-page-browse-by [id]="communityPayload.id"></ds-comcol-page-browse-by>
       <!-- Community logo -->
       <ds-comcol-page-logo *ngIf="logoRD$"
                            [logo]="(logoRD$ | async)?.payload"
@@ -24,8 +26,6 @@
         [content]="communityPayload.copyrightText"
         [hasInnerHtml]="true">
       </ds-comcol-page-content>
-      <!-- Browse-By Links -->
-      <ds-comcol-page-browse-by [id]="communityPayload.id"></ds-comcol-page-browse-by>
       <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>
     </div>
diff --git a/src/app/shared/comcol-page-content/comcol-page-content.component.html b/src/app/shared/comcol-page-content/comcol-page-content.component.html
index 4a0be8cfc7..16b20cde20 100644
--- a/src/app/shared/comcol-page-content/comcol-page-content.component.html
+++ b/src/app/shared/comcol-page-content/comcol-page-content.component.html
@@ -1,5 +1,5 @@
-<div *ngIf="content" class="content-with-optional-title">
+<div *ngIf="content" class="content-with-optional-title mb-2">
     <h2 *ngIf="title">{{ title | translate }}</h2>
     <div *ngIf="hasInnerHtml" [innerHtml]="content"></div>
     <div *ngIf="!hasInnerHtml">{{content}}</div>
-</div>
\ No newline at end of file
+</div>

From 47f8bf02a1e6f6b90aa44848a20f978c0909e451 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 7 Feb 2019 14:02:21 +0100
Subject: [PATCH 12/16] 59415: Browse by title and metadata shows
 community/collection name you're browsign

---
 .../browse-by-metadata-page.component.html    |  2 +-
 .../browse-by-metadata-page.component.ts      | 29 +++++++++++++++--
 .../browse-by-title-page.component.html       |  2 +-
 .../browse-by-title-page.component.ts         | 32 ++++++++++++++++---
 4 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
index 2501dcda21..b9be33409a 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="browse-by-metadata w-100 row">
     <ds-browse-by class="col-xs-12 w-100"
-      title="{{'browse.title' | translate:{collection: '', field: 'browse.metadata.' + metadata | translate, value: (value)? '&quot;' + value + '&quot;': ''} }}"
+      title="{{'browse.title' | translate:{collection: (parent$ | async)?.payload?.name, field: 'browse.metadata.' + metadata | translate, value: (value)? '&quot;' + value + '&quot;': ''} }}"
       [objects$]="(items$ !== undefined)? items$ : browseEntries$"
       [paginationConfig]="paginationConfig"
       [sortConfig]="sortConfig">
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
index 31e8878d7c..87ccb20c0b 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -1,5 +1,4 @@
-
-import {combineLatest as observableCombineLatest,  Observable, Subscription } from 'rxjs';
+import {combineLatest as observableCombineLatest, merge as observableMerge, Observable, Subscription } from 'rxjs';
 import { Component, OnInit } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list';
@@ -11,6 +10,11 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Item } from '../../core/shared/item.model';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
+import { Community } from '../../core/shared/community.model';
+import { Collection } from '../../core/shared/collection.model';
+import { getSucceededRemoteData } from '../../core/shared/operators';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
 
 @Component({
   selector: 'ds-browse-by-metadata-page',
@@ -34,6 +38,11 @@ export class BrowseByMetadataPageComponent implements OnInit {
    */
   items$: Observable<RemoteData<PaginatedList<Item>>>;
 
+  /**
+   * The current Community or Collection we're browsing metadata/items in
+   */
+  parent$: Observable<RemoteData<DSpaceObject>>;
+
   /**
    * The pagination config used to display the values
    */
@@ -71,7 +80,8 @@ export class BrowseByMetadataPageComponent implements OnInit {
   value = '';
 
   public constructor(private route: ActivatedRoute,
-                     private browseService: BrowseService) {
+                     private browseService: BrowseService,
+                     private dsoService: DSpaceObjectDataService) {
   }
 
   ngOnInit(): void {
@@ -92,6 +102,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
           } else {
             this.updatePage(searchOptions);
           }
+          this.updateParent(params.scope);
         }));
   }
 
@@ -121,6 +132,18 @@ export class BrowseByMetadataPageComponent implements OnInit {
     this.items$ = this.browseService.getBrowseItemsFor(value, searchOptions);
   }
 
+  /**
+   * Update the parent Community or Collection using their scope
+   * @param scope   The UUID of the Community or Collection to fetch
+   */
+  updateParent(scope: string) {
+    if (hasValue(scope)) {
+      this.parent$ = this.dsoService.findById(scope).pipe(
+        getSucceededRemoteData()
+      );
+    }
+  }
+
   ngOnDestroy(): void {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
index cd6adb30cd..efb6c9d6a0 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="browse-by-title w-100 row">
     <ds-browse-by class="col-xs-12 w-100"
-      title="{{'browse.title' | translate:{collection: '', field: 'browse.metadata.title' | translate, value: ''} }}"
+      title="{{'browse.title' | translate:{collection: (parent$ | async)?.payload?.name, field: 'browse.metadata.title' | translate, value: ''} }}"
       [objects$]="items$"
       [paginationConfig]="paginationConfig"
       [sortConfig]="sortConfig">
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
index 4af7495dad..6ba43c8f10 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts
@@ -1,18 +1,20 @@
-
-import {combineLatest as observableCombineLatest,  Observable ,  Subscription } from 'rxjs';
+import { combineLatest as observableCombineLatest, merge as observableMerge, Observable, Subscription } from 'rxjs';
 import { Component, OnInit } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { Item } from '../../core/shared/item.model';
-import { ActivatedRoute, PRIMARY_OUTLET, UrlSegmentGroup } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { hasValue } from '../../shared/empty.util';
 import { Collection } from '../../core/shared/collection.model';
 import { browseParamsToOptions } from '../+browse-by-metadata-page/browse-by-metadata-page.component';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
+import { Community } from '../../core/shared/community.model';
+import { getSucceededRemoteData } from '../../core/shared/operators';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
 
 @Component({
   selector: 'ds-browse-by-title-page',
@@ -29,6 +31,11 @@ export class BrowseByTitlePageComponent implements OnInit {
    */
   items$: Observable<RemoteData<PaginatedList<Item>>>;
 
+  /**
+   * The current Community or Collection we're browsing metadata/items in
+   */
+  parent$: Observable<RemoteData<DSpaceObject>>;
+
   /**
    * The pagination configuration to use for displaying the list of items
    */
@@ -49,7 +56,9 @@ export class BrowseByTitlePageComponent implements OnInit {
    */
   subs: Subscription[] = [];
 
-  public constructor(private itemDataService: ItemDataService, private route: ActivatedRoute) {
+  public constructor(private itemDataService: ItemDataService,
+                     private route: ActivatedRoute,
+                     private dsoService: DSpaceObjectDataService) {
 
   }
 
@@ -64,6 +73,7 @@ export class BrowseByTitlePageComponent implements OnInit {
         })
         .subscribe((params) => {
           this.updatePage(browseParamsToOptions(params, this.paginationConfig, this.sortConfig));
+          this.updateParent(params.scope)
         }));
   }
 
@@ -82,6 +92,18 @@ export class BrowseByTitlePageComponent implements OnInit {
     });
   }
 
+  /**
+   * Update the parent Community or Collection using their scope
+   * @param scope   The UUID of the Community or Collection to fetch
+   */
+  updateParent(scope: string) {
+    if (hasValue(scope)) {
+      this.parent$ = this.dsoService.findById(scope).pipe(
+        getSucceededRemoteData()
+      );
+    }
+  }
+
   ngOnDestroy(): void {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }

From 2f58128f5557bf1727281f9d1b4e9c7e7f22f3ac Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 7 Feb 2019 14:07:29 +0100
Subject: [PATCH 13/16] 59415: Disabled Communities & Collections link in
 navbar + fixed browse by title

---
 .../browse-by-metadata-page.component.html    |  2 +-
 .../browse-by-title-page.component.html       |  2 +-
 src/app/navbar/navbar.component.ts            | 22 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
index b9be33409a..08fb762db0 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="browse-by-metadata w-100 row">
     <ds-browse-by class="col-xs-12 w-100"
-      title="{{'browse.title' | translate:{collection: (parent$ | async)?.payload?.name, field: 'browse.metadata.' + metadata | translate, value: (value)? '&quot;' + value + '&quot;': ''} }}"
+      title="{{'browse.title' | translate:{collection: (parent$ | async)?.payload?.name || '', field: 'browse.metadata.' + metadata | translate, value: (value)? '&quot;' + value + '&quot;': ''} }}"
       [objects$]="(items$ !== undefined)? items$ : browseEntries$"
       [paginationConfig]="paginationConfig"
       [sortConfig]="sortConfig">
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
index efb6c9d6a0..84b0baf1f6 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="browse-by-title w-100 row">
     <ds-browse-by class="col-xs-12 w-100"
-      title="{{'browse.title' | translate:{collection: (parent$ | async)?.payload?.name, field: 'browse.metadata.title' | translate, value: ''} }}"
+      title="{{'browse.title' | translate:{collection: (parent$ | async)?.payload?.name || '', field: 'browse.metadata.title' | translate, value: ''} }}"
       [objects$]="items$"
       [paginationConfig]="paginationConfig"
       [sortConfig]="sortConfig">
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 76b4e6f46d..df6226aedc 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -51,17 +51,17 @@ export class NavbarComponent extends MenuComponent implements OnInit {
         } as TextMenuItemModel,
         index: 0
       },
-      {
-        id: 'browse_global_communities_and_collections',
-        parentID: 'browse_global',
-        active: false,
-        visible: true,
-        model: {
-          type: MenuItemType.LINK,
-          text: 'menu.section.browse_global_communities_and_collections',
-          link: '#'
-        } as LinkMenuItemModel,
-      },
+      // {
+      //   id: 'browse_global_communities_and_collections',
+      //   parentID: 'browse_global',
+      //   active: false,
+      //   visible: true,
+      //   model: {
+      //     type: MenuItemType.LINK,
+      //     text: 'menu.section.browse_global_communities_and_collections',
+      //     link: '#'
+      //   } as LinkMenuItemModel,
+      // },
       {
         id: 'browse_global_global_by_title',
         parentID: 'browse_global',

From f15162f500492a537ad0b63ea5bc73b088309cd4 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 7 Feb 2019 15:50:17 +0100
Subject: [PATCH 14/16] 59415: Prevent empty pages returning error, initialize
 empty array instead

---
 src/app/core/data/dso-response-parsing.service.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/core/data/dso-response-parsing.service.ts b/src/app/core/data/dso-response-parsing.service.ts
index aff450781f..a8e0664c2e 100644
--- a/src/app/core/data/dso-response-parsing.service.ts
+++ b/src/app/core/data/dso-response-parsing.service.ts
@@ -27,7 +27,13 @@ export class DSOResponseParsingService extends BaseResponseParsingService implem
   }
 
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const processRequestDTO = this.process<NormalizedObject,ResourceType>(data.payload, request.href);
+    let processRequestDTO;
+    // Prevent empty pages returning an error, initialize empty array instead.
+    if (hasValue(data.payload) && hasValue(data.payload.page) && data.payload.page.totalElements === 0) {
+      processRequestDTO = { page: [] };
+    } else {
+      processRequestDTO = this.process<NormalizedObject, ResourceType>(data.payload, request.href);
+    }
     let objectList = processRequestDTO;
     if (hasNoValue(processRequestDTO)) {
       return new DSOSuccessResponse([], data.statusCode, undefined)

From 49fc8918091264910e41dca5d2e9b75d26ee01f5 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 7 Feb 2019 16:10:32 +0100
Subject: [PATCH 15/16] 59415: Fixed tests

---
 .../browse-by-metadata-page.component.spec.ts     | 14 +++++++++++++-
 .../browse-by-title-page.component.spec.ts        | 15 ++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index c11fa009aa..87f9aa498d 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -17,6 +17,8 @@ import { PageInfo } from '../../core/shared/page-info.model';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { Item } from '../../core/shared/item.model';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { Community } from '../../core/shared/community.model';
 
 describe('BrowseByMetadataPageComponent', () => {
   let comp: BrowseByMetadataPageComponent;
@@ -24,6 +26,11 @@ describe('BrowseByMetadataPageComponent', () => {
   let browseService: BrowseService;
   let route: ActivatedRoute;
 
+  const mockCommunity = Object.assign(new Community(), {
+    id: 'test-uuid',
+    name: 'test community'
+  });
+
   const mockEntries = [
     {
       type: 'author',
@@ -59,6 +66,10 @@ describe('BrowseByMetadataPageComponent', () => {
     getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData(mockItems)
   };
 
+  const mockDsoService = {
+    findById: () => observableOf(new RemoteData(false, false, true, null, mockCommunity))
+  };
+
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({})
   });
@@ -69,7 +80,8 @@ describe('BrowseByMetadataPageComponent', () => {
       declarations: [BrowseByMetadataPageComponent, EnumKeysPipe],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: BrowseService, useValue: mockBrowseService }
+        { provide: BrowseService, useValue: mockBrowseService },
+        { provide: DSpaceObjectDataService, useValue: mockDsoService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
index 530e57e3bb..f99c2b0113 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -12,6 +12,9 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { toRemoteData } from '../+browse-by-metadata-page/browse-by-metadata-page.component.spec';
 import { BrowseByTitlePageComponent } from './browse-by-title-page.component';
 import { ItemDataService } from '../../core/data/item-data.service';
+import { Community } from '../../core/shared/community.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 
 describe('BrowseByTitlePageComponent', () => {
   let comp: BrowseByTitlePageComponent;
@@ -19,6 +22,11 @@ describe('BrowseByTitlePageComponent', () => {
   let itemDataService: ItemDataService;
   let route: ActivatedRoute;
 
+  const mockCommunity = Object.assign(new Community(), {
+    id: 'test-uuid',
+    name: 'test community'
+  });
+
   const mockItems = [
     Object.assign(new Item(), {
       id: 'fakeId',
@@ -35,6 +43,10 @@ describe('BrowseByTitlePageComponent', () => {
     findAll: () => toRemoteData(mockItems)
   };
 
+  const mockDsoService = {
+    findById: () => observableOf(new RemoteData(false, false, true, null, mockCommunity))
+  };
+
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({})
   });
@@ -45,7 +57,8 @@ describe('BrowseByTitlePageComponent', () => {
       declarations: [BrowseByTitlePageComponent, EnumKeysPipe],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: ItemDataService, useValue: mockItemDataService }
+        { provide: ItemDataService, useValue: mockItemDataService },
+        { provide: DSpaceObjectDataService, useValue: mockDsoService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

From 4bf94894b633dfd9d79c0cc4a1c1695de827fbf6 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 13 Feb 2019 13:34:21 +0100
Subject: [PATCH 16/16] 59415: Tests fix

---
 .../browse-by-metadata-page.component.spec.ts              | 7 ++++++-
 .../browse-by-title-page.component.spec.ts                 | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index 87f9aa498d..a53faf6b8b 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -28,7 +28,12 @@ describe('BrowseByMetadataPageComponent', () => {
 
   const mockCommunity = Object.assign(new Community(), {
     id: 'test-uuid',
-    name: 'test community'
+    metadata: [
+      {
+        key: 'dc.title',
+        value: 'test community'
+      }
+    ]
   });
 
   const mockEntries = [
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
index f99c2b0113..c92e5c64cb 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -24,7 +24,12 @@ describe('BrowseByTitlePageComponent', () => {
 
   const mockCommunity = Object.assign(new Community(), {
     id: 'test-uuid',
-    name: 'test community'
+    metadata: [
+      {
+        key: 'dc.title',
+        value: 'test community'
+      }
+    ]
   });
 
   const mockItems = [