From da881f7a30173c3b9b295144f68bb84b7b169a26 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Tue, 3 Oct 2017 11:05:42 +0200
Subject: [PATCH 01/40] Fixed and updated merge related issues for simple
 search

---
 .../search-options.model.ts                   |  0
 .../search-page-routing.module.ts             |  2 +-
 .../search-page.component.html                |  0
 .../search-page.component.scss                |  0
 .../search-page.component.ts                  |  6 ++---
 .../search-page.module.ts                     |  8 ++++---
 .../search-result.model.ts                    |  0
 .../search-results.component.html             |  0
 .../search-results.compontent.ts              |  4 ++--
 .../search.service.ts                         |  4 ++--
 src/app/app-routing.module.ts                 |  1 +
 .../collection-search-result.model.ts         |  2 +-
 .../community-search-result.model.ts          |  2 +-
 .../item-search-result.model.ts               |  2 +-
 .../search-result-list-element.component.ts   |  2 +-
 src/app/search/search.module.ts               | 17 -------------
 .../search-form/search-form.component.ts      | 24 ++-----------------
 17 files changed, 20 insertions(+), 54 deletions(-)
 rename src/app/{search => +search-page}/search-options.model.ts (100%)
 rename src/app/{search-page => +search-page}/search-page-routing.module.ts (82%)
 rename src/app/{search-page => +search-page}/search-page.component.html (100%)
 rename src/app/{search-page => +search-page}/search-page.component.scss (100%)
 rename src/app/{search-page => +search-page}/search-page.component.ts (94%)
 rename src/app/{search-page => +search-page}/search-page.module.ts (93%)
 rename src/app/{search => +search-page}/search-result.model.ts (100%)
 rename src/app/{search-page => +search-page}/search-results/search-results.component.html (100%)
 rename src/app/{search-page => +search-page}/search-results/search-results.compontent.ts (82%)
 rename src/app/{search => +search-page}/search.service.ts (96%)
 delete mode 100644 src/app/search/search.module.ts

diff --git a/src/app/search/search-options.model.ts b/src/app/+search-page/search-options.model.ts
similarity index 100%
rename from src/app/search/search-options.model.ts
rename to src/app/+search-page/search-options.model.ts
diff --git a/src/app/search-page/search-page-routing.module.ts b/src/app/+search-page/search-page-routing.module.ts
similarity index 82%
rename from src/app/search-page/search-page-routing.module.ts
rename to src/app/+search-page/search-page-routing.module.ts
index 76b7d9ad0c..de2d64c6c9 100644
--- a/src/app/search-page/search-page-routing.module.ts
+++ b/src/app/+search-page/search-page-routing.module.ts
@@ -6,7 +6,7 @@ import { SearchPageComponent } from './search-page.component';
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: 'search', component: SearchPageComponent }
+      { path: '', component: SearchPageComponent }
     ])
   ]
 })
diff --git a/src/app/search-page/search-page.component.html b/src/app/+search-page/search-page.component.html
similarity index 100%
rename from src/app/search-page/search-page.component.html
rename to src/app/+search-page/search-page.component.html
diff --git a/src/app/search-page/search-page.component.scss b/src/app/+search-page/search-page.component.scss
similarity index 100%
rename from src/app/search-page/search-page.component.scss
rename to src/app/+search-page/search-page.component.scss
diff --git a/src/app/search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
similarity index 94%
rename from src/app/search-page/search-page.component.ts
rename to src/app/+search-page/search-page.component.ts
index a35f6f01a3..90da376597 100644
--- a/src/app/search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -1,12 +1,12 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { SearchService } from '../search/search.service';
+import { SearchService } from './search.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../core/data/remote-data';
-import { SearchResult } from '../search/search-result.model';
+import { SearchResult } from './search-result.model';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { SortOptions } from '../core/cache/models/sort-options.model';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { SearchOptions } from '../search/search-options.model';
+import { SearchOptions } from './search-options.model';
 import { CommunityDataService } from '../core/data/community-data.service';
 import { isNotEmpty } from '../shared/empty.util';
 import { Community } from '../core/shared/community.model';
diff --git a/src/app/search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts
similarity index 93%
rename from src/app/search-page/search-page.module.ts
rename to src/app/+search-page/search-page.module.ts
index 67a88f579c..a4fe47f8ba 100644
--- a/src/app/search-page/search-page.module.ts
+++ b/src/app/+search-page/search-page.module.ts
@@ -8,10 +8,10 @@ import { SharedModule } from '../shared/shared.module';
 import { SearchPageRoutingModule } from './search-page-routing.module';
 import { SearchPageComponent } from './search-page.component';
 import { SearchResultsComponent } from './search-results/search-results.compontent';
-import { SearchModule } from '../search/search.module';
 import { ItemSearchResultListElementComponent } from '../object-list/search-result-list-element/item-search-result/item-search-result-list-element.component';
 import { CollectionSearchResultListElementComponent } from '../object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
 import { CommunitySearchResultListElementComponent } from '../object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
+import { SearchService } from './search.service';
 
 @NgModule({
   imports: [
@@ -19,8 +19,7 @@ import { CommunitySearchResultListElementComponent } from '../object-list/search
     CommonModule,
     TranslateModule,
     RouterModule,
-    SharedModule,
-    SearchModule
+    SharedModule
   ],
   declarations: [
     SearchPageComponent,
@@ -29,6 +28,9 @@ import { CommunitySearchResultListElementComponent } from '../object-list/search
     CollectionSearchResultListElementComponent,
     CommunitySearchResultListElementComponent
   ],
+  providers: [
+    SearchService
+  ],
   entryComponents: [
     ItemSearchResultListElementComponent,
     CollectionSearchResultListElementComponent,
diff --git a/src/app/search/search-result.model.ts b/src/app/+search-page/search-result.model.ts
similarity index 100%
rename from src/app/search/search-result.model.ts
rename to src/app/+search-page/search-result.model.ts
diff --git a/src/app/search-page/search-results/search-results.component.html b/src/app/+search-page/search-results/search-results.component.html
similarity index 100%
rename from src/app/search-page/search-results/search-results.component.html
rename to src/app/+search-page/search-results/search-results.component.html
diff --git a/src/app/search-page/search-results/search-results.compontent.ts b/src/app/+search-page/search-results/search-results.compontent.ts
similarity index 82%
rename from src/app/search-page/search-results/search-results.compontent.ts
rename to src/app/+search-page/search-results/search-results.compontent.ts
index 505a3eeae4..62357b8e8d 100644
--- a/src/app/search-page/search-results/search-results.compontent.ts
+++ b/src/app/+search-page/search-results/search-results.compontent.ts
@@ -1,8 +1,8 @@
 import { Component, Input } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
-import { SearchResult } from '../../search/search-result.model';
+import { SearchResult } from '../search-result.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { SearchOptions } from '../../search/search-options.model';
+import { SearchOptions } from '../search-options.model';
 
 /**
  * This component renders a simple item page.
diff --git a/src/app/search/search.service.ts b/src/app/+search-page/search.service.ts
similarity index 96%
rename from src/app/search/search.service.ts
rename to src/app/+search-page/search.service.ts
index 4236cad9ac..81d6a61c82 100644
--- a/src/app/search/search.service.ts
+++ b/src/app/+search-page/search.service.ts
@@ -84,8 +84,8 @@ export class SearchService {
     });
 
     const pageInfo = itemsRD.pageInfo.map((info: PageInfo) => {
-      info.totalElements = info.totalElements > 20 ? 20 : info.totalElements;
-      return info;
+      const totalElements = info.totalElements > 20 ? 20 : info.totalElements;
+      return Object.assign({}, info, {totalElements: totalElements});
     });
 
     const payload = itemsRD.payload.map((items: Item[]) => {
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 8fd2a03f3d..fb793df7dc 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -11,6 +11,7 @@ import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
       { path: 'communities', loadChildren: './+community-page/community-page.module#CommunityPageModule' },
       { path: 'collections', loadChildren: './+collection-page/collection-page.module#CollectionPageModule' },
       { path: 'items', loadChildren: './+item-page/item-page.module#ItemPageModule' },
+      { path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule' },
       { path: '**', pathMatch: 'full', component: PageNotFoundComponent },
     ])
   ],
diff --git a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts b/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts
index 081111e96c..fa7945dedd 100644
--- a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts
+++ b/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts
@@ -1,4 +1,4 @@
-import { SearchResult } from '../../../search/search-result.model';
+import { SearchResult } from '../../../+search-page/search-result.model';
 import { Collection } from '../../../core/shared/collection.model';
 
 export class CollectionSearchResult extends SearchResult<Collection> {
diff --git a/src/app/object-list/search-result-list-element/community-search-result/community-search-result.model.ts b/src/app/object-list/search-result-list-element/community-search-result/community-search-result.model.ts
index 522b41700e..79ea34b6cd 100644
--- a/src/app/object-list/search-result-list-element/community-search-result/community-search-result.model.ts
+++ b/src/app/object-list/search-result-list-element/community-search-result/community-search-result.model.ts
@@ -1,4 +1,4 @@
-import { SearchResult } from '../../../search/search-result.model';
+import { SearchResult } from '../../../+search-page/search-result.model';
 import { Community } from '../../../core/shared/community.model';
 
 export class CommunitySearchResult extends SearchResult<Community> {
diff --git a/src/app/object-list/search-result-list-element/item-search-result/item-search-result.model.ts b/src/app/object-list/search-result-list-element/item-search-result/item-search-result.model.ts
index dc5d282c25..d9af3539a0 100644
--- a/src/app/object-list/search-result-list-element/item-search-result/item-search-result.model.ts
+++ b/src/app/object-list/search-result-list-element/item-search-result/item-search-result.model.ts
@@ -1,4 +1,4 @@
-import { SearchResult } from '../../../search/search-result.model';
+import { SearchResult } from '../../../+search-page/search-result.model';
 import { Item } from '../../../core/shared/item.model';
 
 export class ItemSearchResult extends SearchResult<Item> {
diff --git a/src/app/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/object-list/search-result-list-element/search-result-list-element.component.ts
index 3a2bf51c97..4119bc3c2e 100644
--- a/src/app/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject } from '@angular/core';
 
 import { ObjectListElementComponent } from '../object-list-element/object-list-element.component';
 import { ListableObject } from '../listable-object/listable-object.model';
-import { SearchResult } from '../../search/search-result.model';
+import { SearchResult } from '../../+search-page/search-result.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { Metadatum } from '../../core/shared/metadatum.model';
 import { isEmpty, hasNoValue } from '../../shared/empty.util';
diff --git a/src/app/search/search.module.ts b/src/app/search/search.module.ts
deleted file mode 100644
index 5a7f919a56..0000000000
--- a/src/app/search/search.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CoreModule } from '../core/core.module';
-import { SearchService } from './search.service';
-
-@NgModule({
-  imports: [
-
-  ],
-  declarations: [
-  ],
-  exports: [
-  ],
-  providers: [
-    SearchService
-  ]
-})
-export class SearchModule { }
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index fa019e61d1..84d0509530 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { Router } from '@angular/router';
 import { isNotEmpty, hasValue, isEmpty } from '../empty.util';
@@ -15,14 +15,12 @@ import { Observable } from 'rxjs/Observable';
   styleUrls: ['./search-form.component.scss'],
   templateUrl: './search-form.component.html',
 })
-export class SearchFormComponent implements OnInit, OnDestroy {
+export class SearchFormComponent {
   @Input() query: string;
   selectedId = '';
   // Optional existing search parameters
   @Input() currentParams: {};
   @Input() scopes: Observable<DSpaceObject[]>;
-  scopeOptions: string[] = [];
-  sub;
 
   @Input()
   set scope(dso: DSpaceObject) {
@@ -31,19 +29,6 @@ export class SearchFormComponent implements OnInit, OnDestroy {
     }
   }
 
-  ngOnInit(): void {
-    if (this.scopes) {
-      this.sub =
-      this.scopes
-        .filter((scopes: DSpaceObject[]) => isEmpty(scopes))
-        .subscribe((scopes: DSpaceObject[]) => {
-            this.scopeOptions = scopes
-              .map((scope: DSpaceObject) => scope.id);
-          }
-        );
-    }
-  }
-
   constructor(private router: Router) {
   }
 
@@ -75,9 +60,4 @@ export class SearchFormComponent implements OnInit, OnDestroy {
     return id1 === id2;
   }
 
-  ngOnDestroy(): void {
-    if (this.sub) {
-      this.sub.unsubscribe();
-    }
-  }
 }

From 4ac23bd6769d216471fc6fc6c7d12636bd5b8a60 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Tue, 3 Oct 2017 11:13:58 +0200
Subject: [PATCH 02/40] 44878: first test files

---
 .../search-page.component.spec.ts             |  49 +++++
 .../search-form/search-form.component.spec.ts | 204 ++++++++++++++++++
 2 files changed, 253 insertions(+)
 create mode 100644 src/app/+search-page/search-page.component.spec.ts
 create mode 100644 src/app/shared/search-form/search-form.component.spec.ts

diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search-page.component.spec.ts
new file mode 100644
index 0000000000..c6b4d25498
--- /dev/null
+++ b/src/app/+search-page/search-page.component.spec.ts
@@ -0,0 +1,49 @@
+import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { SearchPageComponent } from './search-page.component';
+import { Router } from '@angular/router';
+import { SearchFormComponent } from '../shared/search-form/search-form.component';
+import { SearchResultsComponent } from './search-results/search-results.compontent';
+import { FormsModule } from '@angular/forms';
+import { ObjectListComponent } from '../shared/object-list/object-list.component';
+import { CommonModule } from '@angular/common';
+import { WrapperListElementComponent } from '../object-list/wrapper-list-element/wrapper-list-element.component';
+import { PaginationComponent } from '../shared/pagination/pagination.component';
+import { PaginatePipe } from 'ngx-pagination';
+import { NgbDropdown, NgbPagination } from '@ng-bootstrap/ng-bootstrap';
+import { EnumKeysPipe } from '../shared/utils/enum-keys-pipe';
+import { SearchService } from './search.service';
+import { ItemDataService } from '../core/data/item-data.service';
+import { ResponseCacheService } from '../core/cache/response-cache.service';
+import { StateObservable, Store } from '@ngrx/store';
+
+fdescribe('SearchPageComponent', () => {
+  let comp: SearchPageComponent;
+  let fixture: ComponentFixture<SearchPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [CommonModule, FormsModule, RouterTestingModule, TranslateModule.forRoot()],
+      declarations: [SearchPageComponent, SearchFormComponent, SearchResultsComponent, ObjectListComponent, WrapperListElementComponent, PaginationComponent, PaginatePipe, NgbPagination, NgbDropdown, EnumKeysPipe],
+      providers: [SearchService, ItemDataService, ResponseCacheService, Store, StateObservable],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SearchPageComponent);
+    comp = fixture.componentInstance; // SearchPageComponent test instance
+    fixture.detectChanges();
+  });
+
+  it('should set the scope and query based on the route parameters', inject([Router], (router: Router) => {
+    // const query = 'test query';
+    // const scope = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
+    // router.navigate([], {
+    //   queryParams: Object.assign({}, this.currentQueryParams, { query: query, scope: scope })
+    // });
+    // expect(this.comp.query).toBe(query);
+    // expect(this.comp.scope).toBe(scope);
+
+  }));
+});
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
new file mode 100644
index 0000000000..60942cd62d
--- /dev/null
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -0,0 +1,204 @@
+import { ComponentFixture, TestBed, async, tick, fakeAsync } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+import { SearchFormComponent } from './search-form.component';
+import { Observable } from 'rxjs/Observable';
+import { FormsModule } from '@angular/forms';
+import { ResourceType } from '../../core/shared/resource-type';
+import { RouterTestingModule } from '@angular/router/testing';
+import { Community } from '../../core/shared/community.model';
+import { TranslateModule } from '@ngx-translate/core';
+
+describe('SearchFormComponent', () => {
+  let comp: SearchFormComponent;
+  let fixture: ComponentFixture<SearchFormComponent>;
+  let de: DebugElement;
+  let el: HTMLElement;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [FormsModule, RouterTestingModule, TranslateModule.forRoot()],
+      declarations: [SearchFormComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SearchFormComponent);
+    comp = fixture.componentInstance; // SearchFormComponent test instance
+    de = fixture.debugElement.query(By.css('form'));
+    el = de.nativeElement;
+  });
+
+  it('should display scopes when available with default and all scopes', () => {
+    comp.scopes = Observable.of(objects);
+    fixture.detectChanges();
+    const select: HTMLElement = de.query(By.css('select')).nativeElement;
+    expect(select).toBeDefined();
+    const options: HTMLCollection = select.children;
+    const defOption: Element = options.item(0);
+    expect(defOption.getAttribute('value')).toBe('');
+
+    let index = 1;
+    objects.forEach((object) => {
+      expect(options.item(index).textContent).toBe(object.name);
+      expect(options.item(index).getAttribute('value')).toBe(object.uuid);
+      index++;
+    });
+  });
+
+  it('should not display scopes when empty', () => {
+    fixture.detectChanges();
+    const select = de.query(By.css('select'));
+    expect(select).toBeNull();
+  });
+
+  it('should display set query value in input field', fakeAsync(() => {
+    const testString = 'This is a test query';
+    comp.query = testString;
+
+    fixture.detectChanges();
+    tick();
+    const queryInput = de.query(By.css('input')).nativeElement;
+
+    expect(queryInput.value).toBe(testString);
+  }));
+
+  it('should select correct scope option in scope select', fakeAsync(() => {
+    comp.scopes = Observable.of(objects);
+    fixture.detectChanges();
+
+    const testCommunity = objects[1];
+    comp.scope = testCommunity;
+
+    fixture.detectChanges();
+    tick();
+    const scopeSelect = de.query(By.css('select')).nativeElement;
+
+    expect(scopeSelect.value).toBe(testCommunity.id);
+  }));
+  // fit('should call updateSearch when clicking the submit button with correct parameters', fakeAsync(() => {
+  //   comp.query = 'Test String'
+  //   fixture.detectChanges();
+  //   spyOn(comp, 'updateSearch').and.callThrough();
+  //   fixture.detectChanges();
+  //
+  //   const submit = de.query(By.css('button.search-button')).nativeElement;
+  //   const scope = '123456';
+  //   const query = 'test';
+  //   const select = de.query(By.css('select')).nativeElement;
+  //   const input = de.query(By.css('input')).nativeElement;
+  //
+  //   tick();
+  //   select.value = scope;
+  //   input.value = query;
+  //
+  //   fixture.detectChanges();
+  //
+  //   submit.click();
+  //
+  //   expect(comp.updateSearch).toHaveBeenCalledWith({ scope: scope, query: query });
+  // }));
+});
+
+export const objects = [
+  Object.assign(new Community(), {
+    handle: '10673/11',
+    logo: {
+      self: {
+        _isScalar: true,
+        value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/10b636d0-7890-4968-bcd6-0d83bf4e2b42',
+        scheduler: null
+      }
+    },
+    collections: {
+      self: {
+        _isScalar: true,
+        value: '1506937433727',
+        scheduler: null
+      }
+    },
+    self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/communities/7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+    id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+    uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+    type: ResourceType.Community,
+    name: 'OR2017 - Demonstration',
+    metadata: [
+      {
+        key: 'dc.description',
+        language: null,
+        value: ''
+      },
+      {
+        key: 'dc.description.abstract',
+        language: null,
+        value: 'This is a test community to hold content for the OR2017 demostration'
+      },
+      {
+        key: 'dc.description.tableofcontents',
+        language: null,
+        value: ''
+      },
+      {
+        key: 'dc.rights',
+        language: null,
+        value: ''
+      },
+      {
+        key: 'dc.title',
+        language: null,
+        value: 'OR2017 - Demonstration'
+      }
+    ]
+  }),
+  Object.assign(new Community(),
+    {
+      handle: '10673/1',
+      logo: {
+        self: {
+          _isScalar: true,
+          value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/f446c17d-6d51-45ea-a610-d58a73642d40',
+          scheduler: null
+        }
+      },
+      collections: {
+        self: {
+          _isScalar: true,
+          value: '1506937433727',
+          scheduler: null
+        }
+      },
+      self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/communities/9076bd16-e69a-48d6-9e41-0238cb40d863',
+      id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+      uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+      type: ResourceType.Community,
+      name: 'Sample Community',
+      metadata: [
+        {
+          key: 'dc.description',
+          language: null,
+          value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
+        },
+        {
+          key: 'dc.description.abstract',
+          language: null,
+          value: 'This is a sample top-level community'
+        },
+        {
+          key: 'dc.description.tableofcontents',
+          language: null,
+          value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
+        },
+        {
+          key: 'dc.rights',
+          language: null,
+          value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
+        },
+        {
+          key: 'dc.title',
+          language: null,
+          value: 'Sample Community'
+        }
+      ]
+    }
+  )
+];

From 663e6fd221251c8720718684ce4f8ea0c0bb07db Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Tue, 3 Oct 2017 13:54:31 +0200
Subject: [PATCH 03/40] 44878: dynamic test fix

---
 .../search-page.component.spec.ts             | 69 +++++++++++--------
 1 file changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search-page.component.spec.ts
index c6b4d25498..d577e0e7d8 100644
--- a/src/app/+search-page/search-page.component.spec.ts
+++ b/src/app/+search-page/search-page.component.spec.ts
@@ -1,32 +1,48 @@
-import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Observable } from 'rxjs/Observable';
+import { CommunityDataService } from '../core/data/community-data.service';
 import { SearchPageComponent } from './search-page.component';
-import { Router } from '@angular/router';
-import { SearchFormComponent } from '../shared/search-form/search-form.component';
-import { SearchResultsComponent } from './search-results/search-results.compontent';
-import { FormsModule } from '@angular/forms';
-import { ObjectListComponent } from '../shared/object-list/object-list.component';
-import { CommonModule } from '@angular/common';
-import { WrapperListElementComponent } from '../object-list/wrapper-list-element/wrapper-list-element.component';
-import { PaginationComponent } from '../shared/pagination/pagination.component';
-import { PaginatePipe } from 'ngx-pagination';
-import { NgbDropdown, NgbPagination } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../shared/utils/enum-keys-pipe';
 import { SearchService } from './search.service';
-import { ItemDataService } from '../core/data/item-data.service';
-import { ResponseCacheService } from '../core/cache/response-cache.service';
-import { StateObservable, Store } from '@ngrx/store';
+import { Community } from '../core/shared/community.model';
 
 fdescribe('SearchPageComponent', () => {
   let comp: SearchPageComponent;
   let fixture: ComponentFixture<SearchPageComponent>;
+  const mockResults = []; // TODO
+  const searchServiceStub = {
+    search: () => mockResults
+  };
+  const queryParam = 'test query';
+  const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
+  const activatedRouteStub = {
+    queryParams: Observable.of({
+      query: queryParam,
+      scope: scopeParam
+    })
+  };
+  const mockCommunityList = [];
+  const communityDataServiceStub = {
+    findAll: () => mockCommunityList,
+    findById: () => new Community()
+  };
+
+  class RouterStub {
+    navigateByUrl(url: string) { return url; }
+  }
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [CommonModule, FormsModule, RouterTestingModule, TranslateModule.forRoot()],
-      declarations: [SearchPageComponent, SearchFormComponent, SearchResultsComponent, ObjectListComponent, WrapperListElementComponent, PaginationComponent, PaginatePipe, NgbPagination, NgbDropdown, EnumKeysPipe],
-      providers: [SearchService, ItemDataService, ResponseCacheService, Store, StateObservable],
+      // imports: [ SearchPageModule ],
+      declarations: [ SearchPageComponent ],
+      providers: [
+        { provide: SearchService, useValue: searchServiceStub },
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: CommunityDataService, useValue: communityDataServiceStub },
+        { provide: Router, useClass: RouterStub }
+      ],
+      schemas:      [ NO_ERRORS_SCHEMA ]
     }).compileComponents();
   }));
 
@@ -36,14 +52,9 @@ fdescribe('SearchPageComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should set the scope and query based on the route parameters', inject([Router], (router: Router) => {
-    // const query = 'test query';
-    // const scope = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
-    // router.navigate([], {
-    //   queryParams: Object.assign({}, this.currentQueryParams, { query: query, scope: scope })
-    // });
-    // expect(this.comp.query).toBe(query);
-    // expect(this.comp.scope).toBe(scope);
+  it('should set the scope and query based on the route parameters', () => {
+    expect(comp.query).toBe(queryParam);
+    expect((comp as any).scope).toBe(scopeParam);
+  });
 
-  }));
 });

From b99bc7030275a4e46aea1d56c0b070a6c3d08e8a Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Tue, 3 Oct 2017 08:17:54 -0500
Subject: [PATCH 04/40] updated yarn lock

---
 yarn.lock | 140 ++++++------------------------------------------------
 1 file changed, 14 insertions(+), 126 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d70e3b3a2d..7ee4626496 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -195,19 +195,11 @@
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
 
-"@types/minimatch@*":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.1.tgz#b683eb60be358304ef146f5775db4c0e3696a550"
-
-"@types/minimatch@^2.0.29":
+"@types/minimatch@*", "@types/minimatch@^2.0.29":
   version "2.0.29"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a"
 
-"@types/node@*":
-  version "8.0.31"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.31.tgz#d9af61093cf4bfc9f066ca34de0175012cfb0ce9"
-
-"@types/node@8.0.26":
+"@types/node@*", "@types/node@8.0.26":
   version "8.0.26"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.26.tgz#4d58be925306fd22b1141085535a0268b8beb189"
 
@@ -245,11 +237,7 @@
   version "1.6.29"
   resolved "https://registry.yarnpkg.com/@types/webfontloader/-/webfontloader-1.6.29.tgz#c6b5f6eb8ca31d0aae6b02b6c1300349dd93ea8e"
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-
-abbrev@1.0.x:
+abbrev@1, abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
 
@@ -566,7 +554,7 @@ async@2.0.1:
   dependencies:
     lodash "^4.8.0"
 
-async@2.4.1:
+async@2.4.1, async@^2.0.0, async@^2.1.2, async@^2.1.5:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
   dependencies:
@@ -576,12 +564,6 @@ async@^0.9.0, async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
 
-async@^2.0.0, async@^2.1.2, async@^2.1.5:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
-  dependencies:
-    lodash "^4.14.0"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1544,14 +1526,10 @@ crc32-stream@^2.0.0:
     crc "^3.4.4"
     readable-stream "^2.0.0"
 
-crc@3.4.4:
+crc@3.4.4, crc@^3.4.4:
   version "3.4.4"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.4.4.tgz#9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"
 
-crc@^3.4.4:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964"
-
 create-ecdh@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
@@ -2422,7 +2400,7 @@ express-session@1.15.6:
     uid-safe "~2.1.5"
     utils-merge "1.0.1"
 
-express@4.16.1:
+express@4.16.1, express@^4.13.3, express@^4.15.2:
   version "4.16.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.1.tgz#6b33b560183c9b253b7b62144df33a4654ac9ed0"
   dependencies:
@@ -2457,41 +2435,6 @@ express@4.16.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-express@^4.13.3, express@^4.15.2:
-  version "4.16.0"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.0.tgz#b519638e4eb58e7178c81b498ef22f798cb2e255"
-  dependencies:
-    accepts "~1.3.4"
-    array-flatten "1.1.1"
-    body-parser "1.18.2"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.1"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.0"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.2"
-    qs "6.5.1"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.0"
-    serve-static "1.13.0"
-    setprototypeof "1.1.0"
-    statuses "~1.3.1"
-    type-is "~1.6.15"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -5017,7 +4960,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -5950,14 +5893,10 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-q@1.4.1:
+q@1.4.1, q@^1.1.2, q@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
-q@^1.1.2, q@^1.4.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
-
 qjobs@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
@@ -6089,7 +6028,7 @@ readable-stream@1.0, readable-stream@~1.0.2:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9:
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:
@@ -6639,24 +6578,6 @@ semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
-send@0.16.0:
-  version "0.16.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.0.tgz#16338dbb9a2ede4ad57b48420ec3b82d8e80a57b"
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.1"
-    destroy "~1.0.4"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.3.1"
-
 send@0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
@@ -6687,15 +6608,6 @@ serve-index@^1.7.2:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.0.tgz#810c91db800e94ba287eae6b4e06caab9fdc16f1"
-  dependencies:
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.0"
-
 serve-static@1.13.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
@@ -6953,14 +6865,10 @@ source-map-url@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
 
-source-map@0.5.x, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3:
+source-map@0.5.x, source-map@>=0.5.6, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@>=0.5.6:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-
 source-map@^0.1.38, source-map@^0.1.41, source-map@~0.1.33:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
@@ -7266,20 +7174,13 @@ throttleit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
 
-through2@2.0.1:
+through2@2.0.1, through2@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.1.tgz#384e75314d49f32de12eebb8136b8eb6b5d59da9"
   dependencies:
     readable-stream "~2.0.0"
     xtend "~4.0.0"
 
-through2@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
 through@2, through@X.X.X, through@~2.3, through@~2.3.1:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -7320,18 +7221,12 @@ tmp@0.0.30:
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.0.31:
+tmp@0.0.31, tmp@0.0.x:
   version "0.0.31"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.0.x:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
@@ -8045,20 +7940,13 @@ write-file-atomic@^2.0.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-ws@1.1.2:
+ws@1.1.2, ws@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f"
   dependencies:
     options ">=0.0.5"
     ultron "1.0.x"
 
-ws@^1.0.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
 ws@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-2.3.1.tgz#6b94b3e447cb6a363f785eaf94af6359e8e81c80"
@@ -8104,7 +7992,7 @@ xmlhttprequest-ssl@1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
 
-xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 

From ad59cb3276283da702dc62768eec4146149209d9 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Tue, 3 Oct 2017 15:49:26 +0200
Subject: [PATCH 05/40] 44878: more unit tests

---
 .../search-page.component.spec.ts             |  62 +++++++-
 src/app/+search-page/search-page.module.ts    |   2 +-
 .../search-results.component.spec.ts          | 147 ++++++++++++++++++
 ...pontent.ts => search-results.component.ts} |   0
 4 files changed, 204 insertions(+), 7 deletions(-)
 create mode 100644 src/app/+search-page/search-results/search-results.component.spec.ts
 rename src/app/+search-page/search-results/{search-results.compontent.ts => search-results.component.ts} (100%)

diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search-page.component.spec.ts
index d577e0e7d8..07f70cc648 100644
--- a/src/app/+search-page/search-page.component.spec.ts
+++ b/src/app/+search-page/search-page.component.spec.ts
@@ -1,16 +1,19 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 import { CommunityDataService } from '../core/data/community-data.service';
 import { SearchPageComponent } from './search-page.component';
 import { SearchService } from './search.service';
 import { Community } from '../core/shared/community.model';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
 
-fdescribe('SearchPageComponent', () => {
+describe('SearchPageComponent', () => {
   let comp: SearchPageComponent;
   let fixture: ComponentFixture<SearchPageComponent>;
-  const mockResults = []; // TODO
+  let searchServiceObject: SearchService;
+  const mockResults = ['test', 'data'];
   const searchServiceStub = {
     search: () => mockResults
   };
@@ -29,20 +32,22 @@ fdescribe('SearchPageComponent', () => {
   };
 
   class RouterStub {
-    navigateByUrl(url: string) { return url; }
+    navigateByUrl(url: string) {
+      return url;
+    }
   }
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       // imports: [ SearchPageModule ],
-      declarations: [ SearchPageComponent ],
+      declarations: [SearchPageComponent],
       providers: [
         { provide: SearchService, useValue: searchServiceStub },
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: CommunityDataService, useValue: communityDataServiceStub },
         { provide: Router, useClass: RouterStub }
       ],
-      schemas:      [ NO_ERRORS_SCHEMA ]
+      schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
 
@@ -50,6 +55,7 @@ fdescribe('SearchPageComponent', () => {
     fixture = TestBed.createComponent(SearchPageComponent);
     comp = fixture.componentInstance; // SearchPageComponent test instance
     fixture.detectChanges();
+    searchServiceObject = (comp as any).service;
   });
 
   it('should set the scope and query based on the route parameters', () => {
@@ -57,4 +63,48 @@ fdescribe('SearchPageComponent', () => {
     expect((comp as any).scope).toBe(scopeParam);
   });
 
+  describe('when update search results is called', () => {
+    let pagination;
+    let sort;
+    beforeEach(() => {
+      pagination = Object.assign(
+        {},
+        new PaginationComponentOptions(),
+        {
+          currentPage: 5,
+          pageSize: 15
+        }
+      );
+      sort = Object.assign({},
+        new SortOptions(),
+        {
+          direction: SortDirection.Ascending,
+          field: 'test-field'
+        }
+      );
+    });
+
+    it('should call the search function of the search service with the right parameters', () => {
+      spyOn(searchServiceObject, 'search').and.callThrough();
+
+      (comp as any).updateSearchResults({
+        pagination: pagination,
+        sort: sort
+      });
+
+      expect(searchServiceObject.search).toHaveBeenCalledWith(queryParam, scopeParam, {
+        pagination: pagination,
+        sort: sort
+      });
+    });
+
+    it('should update the results', () => {
+      spyOn(searchServiceObject, 'search').and.callThrough();
+
+      (comp as any).updateSearchResults({});
+
+      expect(comp.results as any).toBe(mockResults);
+      });
+
+  });
 });
diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts
index a4fe47f8ba..7cb5f6cbe6 100644
--- a/src/app/+search-page/search-page.module.ts
+++ b/src/app/+search-page/search-page.module.ts
@@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../shared/shared.module';
 import { SearchPageRoutingModule } from './search-page-routing.module';
 import { SearchPageComponent } from './search-page.component';
-import { SearchResultsComponent } from './search-results/search-results.compontent';
+import { SearchResultsComponent } from './search-results/search-results.component';
 import { ItemSearchResultListElementComponent } from '../object-list/search-result-list-element/item-search-result/item-search-result-list-element.component';
 import { CollectionSearchResultListElementComponent } from '../object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
 import { CommunitySearchResultListElementComponent } from '../object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
diff --git a/src/app/+search-page/search-results/search-results.component.spec.ts b/src/app/+search-page/search-results/search-results.component.spec.ts
new file mode 100644
index 0000000000..ffe7d4133e
--- /dev/null
+++ b/src/app/+search-page/search-results/search-results.component.spec.ts
@@ -0,0 +1,147 @@
+import { ComponentFixture, TestBed, async, tick, fakeAsync } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ResourceType } from '../../core/shared/resource-type';
+import { Community } from '../../core/shared/community.model';
+import { TranslateModule } from '@ngx-translate/core';
+import { SearchResultsComponent } from './search-results.component';
+import { Observable } from 'rxjs/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { PageInfo } from '../../core/shared/page-info.model';
+
+fdescribe('SearchResultsComponent', () => {
+  let comp: SearchResultsComponent;
+  let fixture: ComponentFixture<SearchResultsComponent>;
+  let heading: DebugElement;
+
+
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [SearchResultsComponent],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SearchResultsComponent);
+    comp = fixture.componentInstance; // SearchFormComponent test instance
+    heading = fixture.debugElement.query(By.css('heading'));
+  });
+
+  it('should display heading when results are not empty', fakeAsync(() => {
+    (comp as any).searchResults = 'test';
+    (comp as any).searchConfig = {pagination: ''};
+    fixture.detectChanges();
+    tick();
+    expect(heading).toBeDefined();
+  }));
+
+  it('should not display heading when results is empty', () => {
+    expect(heading).toBeNull();
+  });
+});
+
+export const objects = [
+  Object.assign(new Community(), {
+    handle: '10673/11',
+    logo: {
+      self: {
+        _isScalar: true,
+        value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/10b636d0-7890-4968-bcd6-0d83bf4e2b42',
+        scheduler: null
+      }
+    },
+    collections: {
+      self: {
+        _isScalar: true,
+        value: '1506937433727',
+        scheduler: null
+      }
+    },
+    self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/communities/7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+    id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+    uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+    type: ResourceType.Community,
+    name: 'OR2017 - Demonstration',
+    metadata: [
+      {
+        key: 'dc.description',
+        language: null,
+        value: ''
+      },
+      {
+        key: 'dc.description.abstract',
+        language: null,
+        value: 'This is a test community to hold content for the OR2017 demostration'
+      },
+      {
+        key: 'dc.description.tableofcontents',
+        language: null,
+        value: ''
+      },
+      {
+        key: 'dc.rights',
+        language: null,
+        value: ''
+      },
+      {
+        key: 'dc.title',
+        language: null,
+        value: 'OR2017 - Demonstration'
+      }
+    ]
+  }),
+  Object.assign(new Community(),
+    {
+      handle: '10673/1',
+      logo: {
+        self: {
+          _isScalar: true,
+          value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/f446c17d-6d51-45ea-a610-d58a73642d40',
+          scheduler: null
+        }
+      },
+      collections: {
+        self: {
+          _isScalar: true,
+          value: '1506937433727',
+          scheduler: null
+        }
+      },
+      self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/communities/9076bd16-e69a-48d6-9e41-0238cb40d863',
+      id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+      uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+      type: ResourceType.Community,
+      name: 'Sample Community',
+      metadata: [
+        {
+          key: 'dc.description',
+          language: null,
+          value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
+        },
+        {
+          key: 'dc.description.abstract',
+          language: null,
+          value: 'This is a sample top-level community'
+        },
+        {
+          key: 'dc.description.tableofcontents',
+          language: null,
+          value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
+        },
+        {
+          key: 'dc.rights',
+          language: null,
+          value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
+        },
+        {
+          key: 'dc.title',
+          language: null,
+          value: 'Sample Community'
+        }
+      ]
+    }
+  )
+];
diff --git a/src/app/+search-page/search-results/search-results.compontent.ts b/src/app/+search-page/search-results/search-results.component.ts
similarity index 100%
rename from src/app/+search-page/search-results/search-results.compontent.ts
rename to src/app/+search-page/search-results/search-results.component.ts

From 50cb2078f0f7fc00e1813fdc2add575da06ac23d Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Tue, 3 Oct 2017 16:24:14 +0200
Subject: [PATCH 06/40] 44878: Protractor tests

---
 e2e/search-page/search-page.e2e-spec.ts       | 25 +++++++++++++++
 e2e/search-page/search-page.po.ts             | 31 +++++++++++++++++++
 .../search-results.component.spec.ts          |  7 +----
 3 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 e2e/search-page/search-page.e2e-spec.ts
 create mode 100644 e2e/search-page/search-page.po.ts

diff --git a/e2e/search-page/search-page.e2e-spec.ts b/e2e/search-page/search-page.e2e-spec.ts
new file mode 100644
index 0000000000..8cfdd1bc72
--- /dev/null
+++ b/e2e/search-page/search-page.e2e-spec.ts
@@ -0,0 +1,25 @@
+import { ProtractorPage } from './search-page.po';
+
+fdescribe('protractor SearchPage', () => {
+  let page: ProtractorPage;
+
+  beforeEach(() => {
+    page = new ProtractorPage();
+  });
+
+  it('should contain query value when navigating to page with query parameter', () => {
+    const queryString = 'Interesting query string';
+    page.navigateToSearchWithQueryParameter(queryString);
+    page.getCurrentQuery().then((query: string) => {
+      expect<string>(query).toEqual(queryString);
+    });
+  });
+
+  it('should not contain element ds-pagenotfound when navigating to existing page', () => {
+    const scopeString = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
+    page.navigateToSearchWithScopeParameter(scopeString);
+    page.getCurrentScope().then((scope: string) => {
+      expect<string>(scope).toEqual(scopeString);
+    });
+  });
+});
diff --git a/e2e/search-page/search-page.po.ts b/e2e/search-page/search-page.po.ts
new file mode 100644
index 0000000000..faf0912635
--- /dev/null
+++ b/e2e/search-page/search-page.po.ts
@@ -0,0 +1,31 @@
+import { browser, element, by } from 'protractor';
+import { promise } from 'selenium-webdriver';
+
+export class ProtractorPage {
+  SEARCH = '/search';
+
+  navigateToSearch() {
+    return browser.get(this.SEARCH);
+  }
+
+  navigateToSearchWithQueryParameter(query: string) {
+    return browser.get(this.SEARCH + '?query=' + query);
+  }
+
+  navigateToSearchWithScopeParameter(scope: string) {
+    return browser.get(this.SEARCH + '?scope=' + scope);
+  }
+
+  getCurrentScope(): promise.Promise<string> {
+    return element(by.tagName('select')).getAttribute('value');
+  }
+
+  getCurrentQuery(): promise.Promise<string>  {
+    return element(by.tagName('input')).getAttribute('value');
+  }
+
+  elementTagExists(tag: string) {
+    return element(by.tagName(tag)).isPresent();
+  }
+
+}
diff --git a/src/app/+search-page/search-results/search-results.component.spec.ts b/src/app/+search-page/search-results/search-results.component.spec.ts
index ffe7d4133e..4f299c5c50 100644
--- a/src/app/+search-page/search-results/search-results.component.spec.ts
+++ b/src/app/+search-page/search-results/search-results.component.spec.ts
@@ -5,17 +5,12 @@ import { ResourceType } from '../../core/shared/resource-type';
 import { Community } from '../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { SearchResultsComponent } from './search-results.component';
-import { Observable } from 'rxjs/Observable';
-import { RemoteData } from '../../core/data/remote-data';
-import { PageInfo } from '../../core/shared/page-info.model';
 
-fdescribe('SearchResultsComponent', () => {
+describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
   let fixture: ComponentFixture<SearchResultsComponent>;
   let heading: DebugElement;
 
-
-
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],

From fa99152104c4e1d9bab086231d0a9653cdad1db6 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Tue, 3 Oct 2017 15:29:30 -0500
Subject: [PATCH 07/40] ngIf else ng-template for initial loading work

---
 .../collection-page.component.html            | 18 +++++---
 .../community-page.component.html             | 21 +++++----
 .../top-level-community-list.component.html   | 12 +++--
 .../full/full-item-page.component.html        | 43 ++++++++---------
 .../simple/item-page.component.html           | 46 +++++++++----------
 src/app/shared/loading/loading.component.html |  1 +
 src/app/shared/loading/loading.component.scss |  0
 src/app/shared/loading/loading.component.ts   | 12 +++++
 src/app/shared/shared.module.ts               |  4 +-
 9 files changed, 89 insertions(+), 68 deletions(-)
 create mode 100644 src/app/shared/loading/loading.component.html
 create mode 100644 src/app/shared/loading/loading.component.scss
 create mode 100644 src/app/shared/loading/loading.component.ts

diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index b1aae17f7c..e9d4f29257 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -1,13 +1,13 @@
 <div class="collection-page">
-  <div *ngIf="collectionData.hasSucceeded | async">
+  <div *ngIf="collectionData.hasSucceeded | async; else loadingCollection">
     <!-- Collection Name -->
     <ds-comcol-page-header
       [name]="(collectionData.payload | async)?.name">
     </ds-comcol-page-header>
     <!-- Collection logo -->
     <ds-comcol-page-logo *ngIf="logoData"
-                         [logo]="logoData.payload | async"
-                         [alternateText]="'Collection Logo'">
+      [logo]="logoData.payload | async"
+      [alternateText]="'Collection Logo'">
     </ds-comcol-page-logo>
     <!-- Introductionary text -->
     <ds-comcol-page-content
@@ -31,10 +31,16 @@
       [title]="'collection.page.license'">
     </ds-comcol-page-content>
   </div>
+  <ng-template #loadingCollection><ds-loading message="Loading collection..."></ds-loading></ng-template>
   <br>
-  <div *ngIf="(itemData.hasSucceeded | async)">
+  <div *ngIf="itemData.hasSucceeded | async; else loadingItems">
     <h2>{{'collection.page.browse.recent.head' | translate}}</h2>
-    <ds-object-list [config]="paginationConfig" [sortConfig]="sortConfig"
-                    [objects]="itemData" [hideGear]="false"></ds-object-list>
+    <ds-object-list
+      [config]="paginationConfig"
+      [sortConfig]="sortConfig"
+      [objects]="itemData"
+      [hideGear]="false">
+    </ds-object-list>
   </div>
+  <ng-template #loadingItems><ds-loading message="Loading items..."></ds-loading></ng-template>
 </div>
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index 4f02c885e6..e58b358c35 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -1,26 +1,27 @@
-<div class="community-page" *ngIf="communityData.hasSucceeded | async">
+<div class="community-page" *ngIf="communityData.hasSucceeded | async; else loadingCommunity">
   <!-- Community name -->
   <ds-comcol-page-header [name]="(communityData.payload | async)?.name"></ds-comcol-page-header>
   <!-- Community logo -->
   <ds-comcol-page-logo *ngIf="logoData"
-      [logo]="logoData.payload | async"
-      [alternateText]="'Community Logo'">
+    [logo]="logoData.payload | async"
+    [alternateText]="'Community Logo'">
   </ds-comcol-page-logo>
   <!-- Introductionary text -->
   <ds-comcol-page-content
-      [content]="(communityData.payload | async)?.introductoryText"
-      [hasInnerHtml]="true">
+    [content]="(communityData.payload | async)?.introductoryText"
+    [hasInnerHtml]="true">
   </ds-comcol-page-content>
   <!-- News -->
   <ds-comcol-page-content
-      [content]="(communityData.payload | async)?.sidebarText"
-      [hasInnerHtml]="true"
-      [title]="'community.page.news'">
+    [content]="(communityData.payload | async)?.sidebarText"
+    [hasInnerHtml]="true"
+    [title]="'community.page.news'">
   </ds-comcol-page-content>
   <!-- Copyright -->
   <ds-comcol-page-content
-      [content]="(communityData.payload | async)?.copyrightText"
-      [hasInnerHtml]="true">
+    [content]="(communityData.payload | async)?.copyrightText"
+    [hasInnerHtml]="true">
   </ds-comcol-page-content>
   <ds-community-page-sub-collection-list></ds-community-page-sub-collection-list>
 </div>
+<ng-template #loadingCommunity><ds-loading message="Loading community..."></ds-loading></ng-template>
diff --git a/src/app/+home/top-level-community-list/top-level-community-list.component.html b/src/app/+home/top-level-community-list/top-level-community-list.component.html
index 772eb66012..183be2605c 100644
--- a/src/app/+home/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/+home/top-level-community-list/top-level-community-list.component.html
@@ -1,6 +1,12 @@
-<div *ngIf="topLevelCommunities.hasSucceeded | async">
+<div *ngIf="topLevelCommunities.hasSucceeded | async; else loadingCollections">
   <h2>{{'home.top-level-communities.head' | translate}}</h2>
   <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
-  <ds-object-list [config]="config" [sortConfig]="sortConfig"
-                  [objects]="topLevelCommunities" [hideGear]="true" (paginationChange)="updatePage($event)"></ds-object-list>
+  <ds-object-list
+    [config]="config"
+    [sortConfig]="sortConfig"
+    [objects]="topLevelCommunities"
+    [hideGear]="true"
+    (paginationChange)="updatePage($event)">
+  </ds-object-list>
 </div>
+<ng-template #loadingCollections><ds-loading message="Loading top level communities..."></ds-loading></ng-template>
\ No newline at end of file
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index 59511d7d9d..ba8f7409d9 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -1,25 +1,20 @@
-<div class="item-page" *ngIf="item.hasSucceeded | async">
-    <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
-
-    <div class="simple-view-link">
-        <a class="btn btn-outline-primary col-4" [routerLink]="['/items/' + (item.payload | async)?.id]">
-            {{"item.page.link.simple" | translate}}
-        </a>
-    </div>
-
-    <table class="table table-responsive table-striped">
-        <tbody>
-            <tr *ngFor="let metadatum of (metadata | async)">
-                  <td>{{metadatum.key}}</td>
-                  <td>{{metadatum.value}}</td>
-                  <td>{{metadatum.language}}</td>
-            </tr>
-        </tbody>
-    </table>
-
-    <ds-item-page-full-file-section [item]="item.payload | async"></ds-item-page-full-file-section>
-
-    <ds-item-page-collections [item]="item.payload | async"></ds-item-page-collections>
-
-
+<div class="item-page" *ngIf="item.hasSucceeded | async; else loadingItem">
+  <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
+  <div class="simple-view-link">
+    <a class="btn btn-outline-primary col-4" [routerLink]="['/items/' + (item.payload | async)?.id]">
+      {{"item.page.link.simple" | translate}}
+    </a>
+  </div>
+  <table class="table table-responsive table-striped">
+    <tbody>
+      <tr *ngFor="let metadatum of (metadata | async)">
+        <td>{{metadatum.key}}</td>
+        <td>{{metadatum.value}}</td>
+        <td>{{metadatum.language}}</td>
+      </tr>
+    </tbody>
+  </table>
+  <ds-item-page-full-file-section [item]="item.payload | async"></ds-item-page-full-file-section>
+  <ds-item-page-collections [item]="item.payload | async"></ds-item-page-collections>
 </div>
+<ng-template #loadingItem><ds-loading message="Loading item..."></ds-loading></ng-template>
diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/+item-page/simple/item-page.component.html
index 94ab99482f..455b014add 100644
--- a/src/app/+item-page/simple/item-page.component.html
+++ b/src/app/+item-page/simple/item-page.component.html
@@ -1,26 +1,24 @@
-<div class="item-page" *ngIf="item.hasSucceeded | async">
-    <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
-    <div class="row">
-        <div class="col-xs-12 col-md-4">
-            <ds-metadata-field-wrapper>
-                <ds-thumbnail [thumbnail]="thumbnail | async"></ds-thumbnail>
-            </ds-metadata-field-wrapper>
-            <ds-item-page-file-section [item]="item.payload | async"></ds-item-page-file-section>
-            <ds-item-page-date-field [item]="item.payload | async"></ds-item-page-date-field>
-            <ds-item-page-author-field [item]="item.payload | async"></ds-item-page-author-field>
-
-        </div>
-        <div class="col-xs-12 col-md-6">
-            <ds-item-page-abstract-field
-                    [item]="item.payload | async"></ds-item-page-abstract-field>
-            <ds-item-page-uri-field [item]="item.payload | async"></ds-item-page-uri-field>
-            <ds-item-page-collections [item]="item.payload | async"></ds-item-page-collections>
-            <div>
-                <a class="btn btn-outline-primary" [routerLink]="['/items/' + (item.payload | async)?.id + '/full']">
-                    {{"item.page.link.full" | translate}}
-                </a>
-            </div>
-        </div>
-
+<div class="item-page" *ngIf="item.hasSucceeded | async; else loadingItem">
+  <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
+  <div class="row">
+    <div class="col-xs-12 col-md-4">
+      <ds-metadata-field-wrapper>
+        <ds-thumbnail [thumbnail]="thumbnail | async"></ds-thumbnail>
+      </ds-metadata-field-wrapper>
+      <ds-item-page-file-section [item]="item.payload | async"></ds-item-page-file-section>
+      <ds-item-page-date-field [item]="item.payload | async"></ds-item-page-date-field>
+      <ds-item-page-author-field [item]="item.payload | async"></ds-item-page-author-field>
     </div>
+    <div class="col-xs-12 col-md-6">
+      <ds-item-page-abstract-field [item]="item.payload | async"></ds-item-page-abstract-field>
+      <ds-item-page-uri-field [item]="item.payload | async"></ds-item-page-uri-field>
+      <ds-item-page-collections [item]="item.payload | async"></ds-item-page-collections>
+      <div>
+        <a class="btn btn-outline-primary" [routerLink]="['/items/' + (item.payload | async)?.id + '/full']">
+          {{"item.page.link.full" | translate}}
+        </a>
+      </div>
+    </div>
+  </div>
 </div>
+<ng-template #loadingItem><ds-loading message="Loading item..."></ds-loading></ng-template>
diff --git a/src/app/shared/loading/loading.component.html b/src/app/shared/loading/loading.component.html
new file mode 100644
index 0000000000..fb5224e1ac
--- /dev/null
+++ b/src/app/shared/loading/loading.component.html
@@ -0,0 +1 @@
+<div>{{ message }}</div>
\ No newline at end of file
diff --git a/src/app/shared/loading/loading.component.scss b/src/app/shared/loading/loading.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/loading/loading.component.ts b/src/app/shared/loading/loading.component.ts
new file mode 100644
index 0000000000..8bb47c20d6
--- /dev/null
+++ b/src/app/shared/loading/loading.component.ts
@@ -0,0 +1,12 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'ds-loading',
+  styleUrls: ['./loading.component.scss'],
+  templateUrl: './loading.component.html'
+})
+export class LoadingComponent {
+
+  @Input() message: "Loading...";
+
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 7f0975ea6e..669f490c13 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -27,6 +27,7 @@ import { TruncatePipe } from './utils/truncate.pipe';
 import { WrapperListElementComponent } from '../object-list/wrapper-list-element/wrapper-list-element.component';
 import { SearchResultListElementComponent } from '../object-list/search-result-list-element/search-result-list-element.component';
 import { SearchFormComponent } from './search-form/search-form.component';
+import { LoadingComponent } from './loading/loading.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -57,7 +58,8 @@ const COMPONENTS = [
   ObjectListComponent,
   ObjectListElementComponent,
   WrapperListElementComponent,
-  SearchFormComponent
+  SearchFormComponent,
+  LoadingComponent
 ];
 
 const ENTRY_COMPONENTS = [

From 16cff501733c4386e294efef4b2d4e7ab11c144c Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Wed, 4 Oct 2017 10:44:06 +0200
Subject: [PATCH 08/40] 44373: e2e test

---
 e2e/search-page/search-page.e2e-spec.ts | 32 +++++++++++++++++++++----
 e2e/search-page/search-page.po.ts       | 22 ++++++++++++++---
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/e2e/search-page/search-page.e2e-spec.ts b/e2e/search-page/search-page.e2e-spec.ts
index 8cfdd1bc72..fd7be52733 100644
--- a/e2e/search-page/search-page.e2e-spec.ts
+++ b/e2e/search-page/search-page.e2e-spec.ts
@@ -1,4 +1,6 @@
 import { ProtractorPage } from './search-page.po';
+import { browser } from 'protractor';
+import { promise } from 'selenium-webdriver';
 
 fdescribe('protractor SearchPage', () => {
   let page: ProtractorPage;
@@ -16,10 +18,32 @@ fdescribe('protractor SearchPage', () => {
   });
 
   it('should not contain element ds-pagenotfound when navigating to existing page', () => {
-    const scopeString = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
-    page.navigateToSearchWithScopeParameter(scopeString);
-    page.getCurrentScope().then((scope: string) => {
-      expect<string>(scope).toEqual(scopeString);
+    const scope: promise.Promise<string> = page.getRandomScopeOption();
+    scope.then((scopeString: string) => {
+      page.navigateToSearchWithScopeParameter(scopeString);
+      page.getCurrentScope().then((s: string) => {
+        expect<string>(s).toEqual(scopeString);
+      });
+    });
+  });
+
+  it('should redirect to the correct url when scope was set and submit button was triggered', () => {
+    const scope: promise.Promise<string> = page.getRandomScopeOption();
+    scope.then((scopeString: string) => {
+      page.setCurrentScope(scopeString);
+      page.submitSearchForm();
+      browser.getCurrentUrl().then((url: string) => {
+        expect(url.indexOf('scope=' + encodeURI(scopeString))).toBeGreaterThanOrEqual(0);
+      });
+    });
+  });
+
+  it('should redirect to the correct url when query was set and submit button was triggered', () => {
+    const queryString = 'Another interesting query string';
+    page.setCurrentQuery(queryString);
+    page.submitSearchForm();
+    browser.getCurrentUrl().then((url: string) => {
+      expect(url.indexOf('query=' + encodeURI(queryString))).toBeGreaterThanOrEqual(0);
     });
   });
 });
diff --git a/e2e/search-page/search-page.po.ts b/e2e/search-page/search-page.po.ts
index faf0912635..b5e43dcf82 100644
--- a/e2e/search-page/search-page.po.ts
+++ b/e2e/search-page/search-page.po.ts
@@ -20,12 +20,28 @@ export class ProtractorPage {
     return element(by.tagName('select')).getAttribute('value');
   }
 
-  getCurrentQuery(): promise.Promise<string>  {
+  getCurrentQuery(): promise.Promise<string> {
     return element(by.tagName('input')).getAttribute('value');
   }
 
-  elementTagExists(tag: string) {
-    return element(by.tagName(tag)).isPresent();
+  setCurrentScope(scope: string) {
+    element(by.css('option[value="' + scope + '"]')).click();
+  }
+
+  setCurrentQuery(query: string) {
+    element(by.css('input[name="query"]')).sendKeys(query);
+  }
+
+  submitSearchForm() {
+    element(by.css('button.search-button')).click();
+  }
+
+  getRandomScopeOption(): promise.Promise<string> {
+    const options = element(by.css('select[name="scope"]')).all(by.tagName('option'));
+    return options.count().then((c: number) => {
+      const index: number = Math.floor(Math.random() * c);
+      return options.get(index).getAttribute('value');
+    });
   }
 
 }

From f8496839bdce39d5c559384db9264826f98158a1 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Wed, 4 Oct 2017 10:46:55 +0200
Subject: [PATCH 09/40] 44878: fixed description

---
 e2e/search-page/search-page.e2e-spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/search-page/search-page.e2e-spec.ts b/e2e/search-page/search-page.e2e-spec.ts
index fd7be52733..43e49ded87 100644
--- a/e2e/search-page/search-page.e2e-spec.ts
+++ b/e2e/search-page/search-page.e2e-spec.ts
@@ -17,7 +17,7 @@ fdescribe('protractor SearchPage', () => {
     });
   });
 
-  it('should not contain element ds-pagenotfound when navigating to existing page', () => {
+  it('should have right scope selected when navigating to page with query parameter', () => {
     const scope: promise.Promise<string> = page.getRandomScopeOption();
     scope.then((scopeString: string) => {
       page.navigateToSearchWithScopeParameter(scopeString);

From 767c393a1d1a3f9e43cc2a7ff0cb4386d89be232 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Wed, 4 Oct 2017 10:47:36 +0200
Subject: [PATCH 10/40] 44878: fixed description

---
 e2e/search-page/search-page.e2e-spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/search-page/search-page.e2e-spec.ts b/e2e/search-page/search-page.e2e-spec.ts
index 43e49ded87..5403d695d2 100644
--- a/e2e/search-page/search-page.e2e-spec.ts
+++ b/e2e/search-page/search-page.e2e-spec.ts
@@ -17,7 +17,7 @@ fdescribe('protractor SearchPage', () => {
     });
   });
 
-  it('should have right scope selected when navigating to page with query parameter', () => {
+  it('should have right scope selected when navigating to page with scope parameter', () => {
     const scope: promise.Promise<string> = page.getRandomScopeOption();
     scope.then((scopeString: string) => {
       page.navigateToSearchWithScopeParameter(scopeString);

From 9243b29b3e66cfede7b801f4e8876dff50d66360 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Wed, 4 Oct 2017 11:28:33 +0200
Subject: [PATCH 11/40] 44878: removed f from describe

---
 e2e/search-page/search-page.e2e-spec.ts                  | 2 +-
 src/app/shared/search-form/search-form.component.spec.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2e/search-page/search-page.e2e-spec.ts b/e2e/search-page/search-page.e2e-spec.ts
index 5403d695d2..421781f585 100644
--- a/e2e/search-page/search-page.e2e-spec.ts
+++ b/e2e/search-page/search-page.e2e-spec.ts
@@ -2,7 +2,7 @@ import { ProtractorPage } from './search-page.po';
 import { browser } from 'protractor';
 import { promise } from 'selenium-webdriver';
 
-fdescribe('protractor SearchPage', () => {
+describe('protractor SearchPage', () => {
   let page: ProtractorPage;
 
   beforeEach(() => {
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 60942cd62d..0da50658a5 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -76,7 +76,7 @@ describe('SearchFormComponent', () => {
 
     expect(scopeSelect.value).toBe(testCommunity.id);
   }));
-  // fit('should call updateSearch when clicking the submit button with correct parameters', fakeAsync(() => {
+  // it('should call updateSearch when clicking the submit button with correct parameters', fakeAsync(() => {
   //   comp.query = 'Test String'
   //   fixture.detectChanges();
   //   spyOn(comp, 'updateSearch').and.callThrough();

From 91d2f4d1ef6e97d4a38faf044a8a87aae6f74429 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@outlook.com>
Date: Wed, 4 Oct 2017 06:54:27 -0500
Subject: [PATCH 12/40] fixed lint errror

---
 src/app/shared/loading/loading.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/loading/loading.component.ts b/src/app/shared/loading/loading.component.ts
index 8bb47c20d6..3aa63af3ab 100644
--- a/src/app/shared/loading/loading.component.ts
+++ b/src/app/shared/loading/loading.component.ts
@@ -7,6 +7,6 @@ import { Component, Input } from '@angular/core';
 })
 export class LoadingComponent {
 
-  @Input() message: "Loading...";
+  @Input() message: 'Loading...';
 
 }

From db890a65ed130ca17f4ac338bff415d4939c60ea Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Wed, 4 Oct 2017 07:46:15 -0500
Subject: [PATCH 13/40] test showing RemoteData isLoading

---
 .../top-level-community-list.component.html                 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/+home/top-level-community-list/top-level-community-list.component.html b/src/app/+home/top-level-community-list/top-level-community-list.component.html
index 183be2605c..36c27ecf26 100644
--- a/src/app/+home/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/+home/top-level-community-list/top-level-community-list.component.html
@@ -1,4 +1,5 @@
-<div *ngIf="topLevelCommunities.hasSucceeded | async; else loadingCollections">
+<!-- <div *ngIf="topLevelCommunities.hasSucceeded | async; else loadingCollections"> -->
+<div *ngIf="topLevelCommunities.hasSucceeded | async">
   <h2>{{'home.top-level-communities.head' | translate}}</h2>
   <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
   <ds-object-list
@@ -9,4 +10,5 @@
     (paginationChange)="updatePage($event)">
   </ds-object-list>
 </div>
-<ng-template #loadingCollections><ds-loading message="Loading top level communities..."></ds-loading></ng-template>
\ No newline at end of file
+<ds-loading *ngIf="topLevelCommunities.isLoading | async" message="Loading top level communities..."></ds-loading>
+<!-- <ng-template #loadingCollections><ds-loading message="Loading top level communities..."></ds-loading></ng-template> -->
\ No newline at end of file

From 3ab257697ae794fbe244162e274115386482c405 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@atmire.com>
Date: Wed, 4 Oct 2017 15:37:52 +0200
Subject: [PATCH 14/40] fixed an issue where the remote data state observable
 would only fire for the first time after the response had already returned

---
 .../builders/remote-data-build.service.ts     | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 744ef7fb25..046250efda 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -49,12 +49,20 @@ export class RemoteDataBuildService {
       requestHrefObs.flatMap((requestHref) => this.responseCache.get(requestHref)).filter((entry) => hasValue(entry))
     );
 
-    const requestPending = requestObs.map((entry: RequestEntry) => entry.requestPending).distinctUntilChanged();
+    const requestPending = requestObs
+      .map((entry: RequestEntry) => entry.requestPending)
+      .startWith(true)
+      .distinctUntilChanged();
 
-    const responsePending = requestObs.map((entry: RequestEntry) => entry.responsePending).distinctUntilChanged();
+    const responsePending = requestObs
+      .map((entry: RequestEntry) => entry.responsePending)
+      .startWith(false)
+      .distinctUntilChanged();
 
     const isSuccessFul = responseCacheObs
-      .map((entry: ResponseCacheEntry) => entry.response.isSuccessful).distinctUntilChanged();
+      .map((entry: ResponseCacheEntry) => entry.response.isSuccessful)
+      .startWith(false)
+      .distinctUntilChanged();
 
     const errorMessage = responseCacheObs
       .filter((entry: ResponseCacheEntry) => !entry.response.isSuccessful)
@@ -133,12 +141,20 @@ export class RemoteDataBuildService {
     const responseCacheObs = hrefObs.flatMap((href: string) => this.responseCache.get(href))
       .filter((entry) => hasValue(entry));
 
-    const requestPending = requestObs.map((entry: RequestEntry) => entry.requestPending).distinctUntilChanged();
+    const requestPending = requestObs
+      .map((entry: RequestEntry) => entry.requestPending)
+      .startWith(true)
+      .distinctUntilChanged();
 
-    const responsePending = requestObs.map((entry: RequestEntry) => entry.responsePending).distinctUntilChanged();
+    const responsePending = requestObs
+      .map((entry: RequestEntry) => entry.responsePending)
+      .startWith(false)
+      .distinctUntilChanged();
 
     const isSuccessFul = responseCacheObs
-      .map((entry: ResponseCacheEntry) => entry.response.isSuccessful).distinctUntilChanged();
+      .map((entry: ResponseCacheEntry) => entry.response.isSuccessful)
+      .startWith(false)
+      .distinctUntilChanged();
 
     const errorMessage = responseCacheObs
       .filter((entry: ResponseCacheEntry) => !entry.response.isSuccessful)

From f432fcb73bcd338f72aa44e07c79beac78cf63c4 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Wed, 4 Oct 2017 10:42:38 -0500
Subject: [PATCH 15/40] updated postcss dependency

---
 package.json |  2 +-
 yarn.lock    | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f758eae6e8..02bddc485e 100644
--- a/package.json
+++ b/package.json
@@ -163,7 +163,7 @@
     "node-sass": "4.5.3",
     "nodemon": "1.12.1",
     "npm-run-all": "4.1.1",
-    "postcss": "6.0.12",
+    "postcss": "6.0.13",
     "postcss-apply": "0.8.0",
     "postcss-cli": "4.1.1",
     "postcss-cssnext": "3.0.2",
diff --git a/yarn.lock b/yarn.lock
index 7ee4626496..054ae414d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5759,12 +5759,12 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@6.0.12, postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.5, postcss@^6.0.6, postcss@^6.0.8:
-  version "6.0.12"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.12.tgz#6b0155089d2d212f7bd6a0cecd4c58c007403535"
+postcss@6.0.13:
+  version "6.0.13"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.13.tgz#b9ecab4ee00c89db3ec931145bd9590bbf3f125f"
   dependencies:
     chalk "^2.1.0"
-    source-map "^0.5.7"
+    source-map "^0.6.1"
     supports-color "^4.4.0"
 
 postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.6:
@@ -5776,6 +5776,14 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.5, postcss@^6.0.6, postcss@^6.0.8:
+  version "6.0.12"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.12.tgz#6b0155089d2d212f7bd6a0cecd4c58c007403535"
+  dependencies:
+    chalk "^2.1.0"
+    source-map "^0.5.7"
+    supports-color "^4.4.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6881,6 +6889,10 @@ source-map@^0.4.2, source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"

From f595fda708c7c9a10a8ea9d0fbe55e45614f8460 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Wed, 4 Oct 2017 10:46:16 -0500
Subject: [PATCH 16/40] using fixed RemoteData isLoading

---
 src/app/+collection-page/collection-page.component.html   | 8 ++++----
 src/app/+community-page/community-page.component.html     | 4 ++--
 .../top-level-community-list.component.html               | 4 +---
 src/app/+item-page/full/full-item-page.component.html     | 4 ++--
 src/app/+item-page/simple/item-page.component.html        | 4 ++--
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index e9d4f29257..ee7d97f4c8 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -1,5 +1,5 @@
 <div class="collection-page">
-  <div *ngIf="collectionData.hasSucceeded | async; else loadingCollection">
+  <div *ngIf="collectionData.hasSucceeded | async">
     <!-- Collection Name -->
     <ds-comcol-page-header
       [name]="(collectionData.payload | async)?.name">
@@ -31,9 +31,9 @@
       [title]="'collection.page.license'">
     </ds-comcol-page-content>
   </div>
-  <ng-template #loadingCollection><ds-loading message="Loading collection..."></ds-loading></ng-template>
+  <ds-loading *ngIf="collectionData.isLoading | async" message="Loading collection..."></ds-loading>
   <br>
-  <div *ngIf="itemData.hasSucceeded | async; else loadingItems">
+  <div *ngIf="itemData.hasSucceeded | async">
     <h2>{{'collection.page.browse.recent.head' | translate}}</h2>
     <ds-object-list
       [config]="paginationConfig"
@@ -42,5 +42,5 @@
       [hideGear]="false">
     </ds-object-list>
   </div>
-  <ng-template #loadingItems><ds-loading message="Loading items..."></ds-loading></ng-template>
+  <ds-loading *ngIf="itemData.isLoading | async" message="Loading items..."></ds-loading>
 </div>
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index e58b358c35..a55a597c74 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -1,4 +1,4 @@
-<div class="community-page" *ngIf="communityData.hasSucceeded | async; else loadingCommunity">
+<div class="community-page" *ngIf="communityData.hasSucceeded | async">
   <!-- Community name -->
   <ds-comcol-page-header [name]="(communityData.payload | async)?.name"></ds-comcol-page-header>
   <!-- Community logo -->
@@ -24,4 +24,4 @@
   </ds-comcol-page-content>
   <ds-community-page-sub-collection-list></ds-community-page-sub-collection-list>
 </div>
-<ng-template #loadingCommunity><ds-loading message="Loading community..."></ds-loading></ng-template>
+<ds-loading *ngIf="communityData.isLoading | async" message="Loading community..."></ds-loading>
diff --git a/src/app/+home/top-level-community-list/top-level-community-list.component.html b/src/app/+home/top-level-community-list/top-level-community-list.component.html
index 36c27ecf26..bd5666122f 100644
--- a/src/app/+home/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/+home/top-level-community-list/top-level-community-list.component.html
@@ -1,4 +1,3 @@
-<!-- <div *ngIf="topLevelCommunities.hasSucceeded | async; else loadingCollections"> -->
 <div *ngIf="topLevelCommunities.hasSucceeded | async">
   <h2>{{'home.top-level-communities.head' | translate}}</h2>
   <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
@@ -10,5 +9,4 @@
     (paginationChange)="updatePage($event)">
   </ds-object-list>
 </div>
-<ds-loading *ngIf="topLevelCommunities.isLoading | async" message="Loading top level communities..."></ds-loading>
-<!-- <ng-template #loadingCollections><ds-loading message="Loading top level communities..."></ds-loading></ng-template> -->
\ No newline at end of file
+<ds-loading *ngIf="topLevelCommunities.isLoading | async" message="Loading top level communities..."></ds-loading>
\ No newline at end of file
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index ba8f7409d9..d6ff321794 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -1,4 +1,4 @@
-<div class="item-page" *ngIf="item.hasSucceeded | async; else loadingItem">
+<div class="item-page" *ngIf="item.hasSucceeded | async">
   <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
   <div class="simple-view-link">
     <a class="btn btn-outline-primary col-4" [routerLink]="['/items/' + (item.payload | async)?.id]">
@@ -17,4 +17,4 @@
   <ds-item-page-full-file-section [item]="item.payload | async"></ds-item-page-full-file-section>
   <ds-item-page-collections [item]="item.payload | async"></ds-item-page-collections>
 </div>
-<ng-template #loadingItem><ds-loading message="Loading item..."></ds-loading></ng-template>
+<ds-loading *ngIf="item.isLoading | async" message="Loading item..."></ds-loading>
diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/+item-page/simple/item-page.component.html
index 455b014add..6b650b9476 100644
--- a/src/app/+item-page/simple/item-page.component.html
+++ b/src/app/+item-page/simple/item-page.component.html
@@ -1,4 +1,4 @@
-<div class="item-page" *ngIf="item.hasSucceeded | async; else loadingItem">
+<div class="item-page" *ngIf="item.hasSucceeded | async">
   <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
   <div class="row">
     <div class="col-xs-12 col-md-4">
@@ -21,4 +21,4 @@
     </div>
   </div>
 </div>
-<ng-template #loadingItem><ds-loading message="Loading item..."></ds-loading></ng-template>
+<ds-loading *ngIf="item.isLoading | async" message="Loading item..."></ds-loading>

From a9faab683321bd7ceef76bf9cee740f8460bff36 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Wed, 4 Oct 2017 10:51:48 -0500
Subject: [PATCH 17/40] refactor home to home-page

---
 .../home-news/home-news.component.html              |  0
 .../home-news/home-news.component.scss              |  0
 .../home-news/home-news.component.ts                |  0
 src/app/+home-page/home-page-routing.module.ts      | 13 +++++++++++++
 .../home-page.component.html}                       |  0
 .../home-page.component.scss}                       |  0
 src/app/+home-page/home-page.component.ts           | 10 ++++++++++
 .../home-page.module.ts}                            | 10 +++++-----
 .../top-level-community-list.component.html         |  0
 .../top-level-community-list.component.scss         |  0
 .../top-level-community-list.component.ts           |  0
 src/app/+home/home-routing.module.ts                | 13 -------------
 src/app/+home/home.component.ts                     | 10 ----------
 src/app/app-routing.module.ts                       |  2 +-
 14 files changed, 29 insertions(+), 29 deletions(-)
 rename src/app/{+home => +home-page}/home-news/home-news.component.html (100%)
 rename src/app/{+home => +home-page}/home-news/home-news.component.scss (100%)
 rename src/app/{+home => +home-page}/home-news/home-news.component.ts (100%)
 create mode 100644 src/app/+home-page/home-page-routing.module.ts
 rename src/app/{+home/home.component.html => +home-page/home-page.component.html} (100%)
 rename src/app/{+home/home.component.scss => +home-page/home-page.component.scss} (100%)
 create mode 100644 src/app/+home-page/home-page.component.ts
 rename src/app/{+home/home.module.ts => +home-page/home-page.module.ts} (70%)
 rename src/app/{+home => +home-page}/top-level-community-list/top-level-community-list.component.html (100%)
 rename src/app/{+home => +home-page}/top-level-community-list/top-level-community-list.component.scss (100%)
 rename src/app/{+home => +home-page}/top-level-community-list/top-level-community-list.component.ts (100%)
 delete mode 100644 src/app/+home/home-routing.module.ts
 delete mode 100644 src/app/+home/home.component.ts

diff --git a/src/app/+home/home-news/home-news.component.html b/src/app/+home-page/home-news/home-news.component.html
similarity index 100%
rename from src/app/+home/home-news/home-news.component.html
rename to src/app/+home-page/home-news/home-news.component.html
diff --git a/src/app/+home/home-news/home-news.component.scss b/src/app/+home-page/home-news/home-news.component.scss
similarity index 100%
rename from src/app/+home/home-news/home-news.component.scss
rename to src/app/+home-page/home-news/home-news.component.scss
diff --git a/src/app/+home/home-news/home-news.component.ts b/src/app/+home-page/home-news/home-news.component.ts
similarity index 100%
rename from src/app/+home/home-news/home-news.component.ts
rename to src/app/+home-page/home-news/home-news.component.ts
diff --git a/src/app/+home-page/home-page-routing.module.ts b/src/app/+home-page/home-page-routing.module.ts
new file mode 100644
index 0000000000..e68b633a6d
--- /dev/null
+++ b/src/app/+home-page/home-page-routing.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { HomePageComponent } from './home-page.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: HomePageComponent, pathMatch: 'full' }
+    ])
+  ]
+})
+export class HomePageRoutingModule { }
diff --git a/src/app/+home/home.component.html b/src/app/+home-page/home-page.component.html
similarity index 100%
rename from src/app/+home/home.component.html
rename to src/app/+home-page/home-page.component.html
diff --git a/src/app/+home/home.component.scss b/src/app/+home-page/home-page.component.scss
similarity index 100%
rename from src/app/+home/home.component.scss
rename to src/app/+home-page/home-page.component.scss
diff --git a/src/app/+home-page/home-page.component.ts b/src/app/+home-page/home-page.component.ts
new file mode 100644
index 0000000000..ad25ec0155
--- /dev/null
+++ b/src/app/+home-page/home-page.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-home-page',
+  styleUrls: ['./home-page.component.scss'],
+  templateUrl: './home-page.component.html'
+})
+export class HomePageComponent {
+
+}
diff --git a/src/app/+home/home.module.ts b/src/app/+home-page/home-page.module.ts
similarity index 70%
rename from src/app/+home/home.module.ts
rename to src/app/+home-page/home-page.module.ts
index 7a68629deb..45c460c89c 100644
--- a/src/app/+home/home.module.ts
+++ b/src/app/+home-page/home-page.module.ts
@@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SharedModule } from '../shared/shared.module';
 
-import { HomeComponent } from './home.component';
-import { HomeRoutingModule } from './home-routing.module';
+import { HomePageComponent } from './home-page.component';
+import { HomePageRoutingModule } from './home-page-routing.module';
 import { TopLevelCommunityListComponent } from './top-level-community-list/top-level-community-list.component';
 import { HomeNewsComponent } from './home-news/home-news.component';
 
@@ -11,14 +11,14 @@ import { HomeNewsComponent } from './home-news/home-news.component';
   imports: [
     CommonModule,
     SharedModule,
-    HomeRoutingModule
+    HomePageRoutingModule
   ],
   declarations: [
-    HomeComponent,
+    HomePageComponent,
     TopLevelCommunityListComponent,
     HomeNewsComponent
   ]
 })
-export class HomeModule {
+export class HomePageModule {
 
 }
diff --git a/src/app/+home/top-level-community-list/top-level-community-list.component.html b/src/app/+home-page/top-level-community-list/top-level-community-list.component.html
similarity index 100%
rename from src/app/+home/top-level-community-list/top-level-community-list.component.html
rename to src/app/+home-page/top-level-community-list/top-level-community-list.component.html
diff --git a/src/app/+home/top-level-community-list/top-level-community-list.component.scss b/src/app/+home-page/top-level-community-list/top-level-community-list.component.scss
similarity index 100%
rename from src/app/+home/top-level-community-list/top-level-community-list.component.scss
rename to src/app/+home-page/top-level-community-list/top-level-community-list.component.scss
diff --git a/src/app/+home/top-level-community-list/top-level-community-list.component.ts b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
similarity index 100%
rename from src/app/+home/top-level-community-list/top-level-community-list.component.ts
rename to src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
diff --git a/src/app/+home/home-routing.module.ts b/src/app/+home/home-routing.module.ts
deleted file mode 100644
index 9bc4619f74..0000000000
--- a/src/app/+home/home-routing.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { HomeComponent } from './home.component';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      { path: '', component: HomeComponent, pathMatch: 'full' }
-    ])
-  ]
-})
-export class HomeRoutingModule { }
diff --git a/src/app/+home/home.component.ts b/src/app/+home/home.component.ts
deleted file mode 100644
index d1222b8ae0..0000000000
--- a/src/app/+home/home.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ds-home',
-  styleUrls: ['./home.component.scss'],
-  templateUrl: './home.component.html'
-})
-export class HomeComponent {
-
-}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index fb793df7dc..b3b8eacfce 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -7,7 +7,7 @@ import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
   imports: [
     RouterModule.forRoot([
       { path: '', redirectTo: '/home', pathMatch: 'full' },
-      { path: 'home', loadChildren: './+home/home.module#HomeModule' },
+      { path: 'home', loadChildren: './+home-page/home-page.module#HomePageModule' },
       { path: 'communities', loadChildren: './+community-page/community-page.module#CommunityPageModule' },
       { path: 'collections', loadChildren: './+collection-page/collection-page.module#CollectionPageModule' },
       { path: 'items', loadChildren: './+item-page/item-page.module#ItemPageModule' },

From 7937a47aa5a20f43eeef9ca74eb9e129b1a5b504 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Wed, 4 Oct 2017 14:17:19 -0500
Subject: [PATCH 18/40] added error component and coverage for new components

---
 .../collection-page.component.html            |  2 +
 .../community-page.component.html             |  1 +
 .../top-level-community-list.component.html   |  1 +
 .../full/full-item-page.component.html        |  1 +
 .../simple/item-page.component.html           |  1 +
 src/app/app.module.ts                         |  1 -
 src/app/shared/error/error.component.html     |  1 +
 src/app/shared/error/error.component.scss     |  0
 src/app/shared/error/error.component.spec.ts  | 45 +++++++++++++++++++
 src/app/shared/error/error.component.ts       | 12 +++++
 .../shared/loading/loading.component.spec.ts  | 45 +++++++++++++++++++
 src/app/shared/loading/loading.component.ts   |  2 +-
 src/app/shared/shared.module.ts               | 32 ++++++-------
 webpack/webpack.test.js                       | 14 ++++--
 14 files changed, 138 insertions(+), 20 deletions(-)
 create mode 100644 src/app/shared/error/error.component.html
 create mode 100644 src/app/shared/error/error.component.scss
 create mode 100644 src/app/shared/error/error.component.spec.ts
 create mode 100644 src/app/shared/error/error.component.ts
 create mode 100644 src/app/shared/loading/loading.component.spec.ts

diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index ee7d97f4c8..8a8f2f0aad 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -31,6 +31,7 @@
       [title]="'collection.page.license'">
     </ds-comcol-page-content>
   </div>
+  <ds-error *ngIf="collectionData.hasFailed | async" message="Error fetching collection"></ds-error>
   <ds-loading *ngIf="collectionData.isLoading | async" message="Loading collection..."></ds-loading>
   <br>
   <div *ngIf="itemData.hasSucceeded | async">
@@ -42,5 +43,6 @@
       [hideGear]="false">
     </ds-object-list>
   </div>
+  <ds-error *ngIf="itemData.hasFailed | async" message="Error fetching items"></ds-error>
   <ds-loading *ngIf="itemData.isLoading | async" message="Loading items..."></ds-loading>
 </div>
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index a55a597c74..f29fa364fb 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -24,4 +24,5 @@
   </ds-comcol-page-content>
   <ds-community-page-sub-collection-list></ds-community-page-sub-collection-list>
 </div>
+<ds-error *ngIf="communityData.hasFailed | async" message="Error fetching community"></ds-error>
 <ds-loading *ngIf="communityData.isLoading | async" message="Loading community..."></ds-loading>
diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.html b/src/app/+home-page/top-level-community-list/top-level-community-list.component.html
index bd5666122f..c8a889a4f7 100644
--- a/src/app/+home-page/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.html
@@ -9,4 +9,5 @@
     (paginationChange)="updatePage($event)">
   </ds-object-list>
 </div>
+<ds-error *ngIf="topLevelCommunities.hasFailed | async" message="Error fetching top level communities"></ds-error>
 <ds-loading *ngIf="topLevelCommunities.isLoading | async" message="Loading top level communities..."></ds-loading>
\ No newline at end of file
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index d6ff321794..ccd8ca3932 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -17,4 +17,5 @@
   <ds-item-page-full-file-section [item]="item.payload | async"></ds-item-page-full-file-section>
   <ds-item-page-collections [item]="item.payload | async"></ds-item-page-collections>
 </div>
+<ds-error *ngIf="item.hasFailed | async" message="Error fetching item"></ds-error>
 <ds-loading *ngIf="item.isLoading | async" message="Loading item..."></ds-loading>
diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/+item-page/simple/item-page.component.html
index 6b650b9476..fe7e1138e6 100644
--- a/src/app/+item-page/simple/item-page.component.html
+++ b/src/app/+item-page/simple/item-page.component.html
@@ -21,4 +21,5 @@
     </div>
   </div>
 </div>
+<ds-error *ngIf="item.hasFailed | async" message="Error fetching item"></ds-error>
 <ds-loading *ngIf="item.isLoading | async" message="Loading item..."></ds-loading>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 3ec0cdebab..a80a173297 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule, APP_BASE_HREF } from '@angular/common';
 import { HttpModule } from '@angular/http';
-import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 
 import { EffectsModule } from '@ngrx/effects';
diff --git a/src/app/shared/error/error.component.html b/src/app/shared/error/error.component.html
new file mode 100644
index 0000000000..fb5224e1ac
--- /dev/null
+++ b/src/app/shared/error/error.component.html
@@ -0,0 +1 @@
+<div>{{ message }}</div>
\ No newline at end of file
diff --git a/src/app/shared/error/error.component.scss b/src/app/shared/error/error.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/error/error.component.spec.ts b/src/app/shared/error/error.component.spec.ts
new file mode 100644
index 0000000000..078aa95592
--- /dev/null
+++ b/src/app/shared/error/error.component.spec.ts
@@ -0,0 +1,45 @@
+import { ComponentFixture, TestBed, async } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+
+import { ErrorComponent } from './error.component';
+
+describe('ErrorComponent (inline template)', () => {
+
+  let comp: ErrorComponent;
+  let fixture: ComponentFixture<ErrorComponent>;
+  let de: DebugElement;
+  let el: HTMLElement;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ErrorComponent ], // declare the test component
+    }).compileComponents();  // compile template and css
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ErrorComponent);
+
+    comp = fixture.componentInstance; // ErrorComponent test instance
+
+    // query for the title <div> by CSS element selector
+    de = fixture.debugElement.query(By.css('div'));
+    el = de.nativeElement;
+  });
+
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  it('should display default message', () => {
+    fixture.detectChanges();
+    expect(el.textContent).toContain(comp.message);
+  });
+
+  it('should display input message', () => {
+    comp.message = 'Test Message';
+    fixture.detectChanges();
+    expect(el.textContent).toContain('Test Message');
+  });
+
+});
diff --git a/src/app/shared/error/error.component.ts b/src/app/shared/error/error.component.ts
new file mode 100644
index 0000000000..b65979f7b0
--- /dev/null
+++ b/src/app/shared/error/error.component.ts
@@ -0,0 +1,12 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'ds-error',
+  styleUrls: ['./error.component.scss'],
+  templateUrl: './error.component.html'
+})
+export class ErrorComponent {
+
+  @Input() message = 'Error...';
+
+}
diff --git a/src/app/shared/loading/loading.component.spec.ts b/src/app/shared/loading/loading.component.spec.ts
new file mode 100644
index 0000000000..45583ed198
--- /dev/null
+++ b/src/app/shared/loading/loading.component.spec.ts
@@ -0,0 +1,45 @@
+import { ComponentFixture, TestBed, async } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+
+import { LoadingComponent } from './loading.component';
+
+describe('LoadingComponent (inline template)', () => {
+
+  let comp: LoadingComponent;
+  let fixture: ComponentFixture<LoadingComponent>;
+  let de: DebugElement;
+  let el: HTMLElement;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ LoadingComponent ], // declare the test component
+    }).compileComponents();  // compile template and css
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LoadingComponent);
+
+    comp = fixture.componentInstance; // LoadingComponent test instance
+
+    // query for the title <div> by CSS element selector
+    de = fixture.debugElement.query(By.css('div'));
+    el = de.nativeElement;
+  });
+
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  it('should display default message', () => {
+    fixture.detectChanges();
+    expect(el.textContent).toContain(comp.message);
+  });
+
+  it('should display input message', () => {
+    comp.message = 'Test Message';
+    fixture.detectChanges();
+    expect(el.textContent).toContain('Test Message');
+  });
+
+});
diff --git a/src/app/shared/loading/loading.component.ts b/src/app/shared/loading/loading.component.ts
index 3aa63af3ab..6bc7d99f4b 100644
--- a/src/app/shared/loading/loading.component.ts
+++ b/src/app/shared/loading/loading.component.ts
@@ -7,6 +7,6 @@ import { Component, Input } from '@angular/core';
 })
 export class LoadingComponent {
 
-  @Input() message: 'Loading...';
+  @Input() message = 'Loading...';
 
 }
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 669f490c13..21ca8c51c4 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -9,25 +9,26 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { NgxPaginationModule } from 'ngx-pagination';
 
-import { PaginationComponent } from './pagination/pagination.component';
+import { EnumKeysPipe } from './utils/enum-keys-pipe';
 import { FileSizePipe } from './utils/file-size-pipe';
-import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
 import { SafeUrlPipe } from './utils/safe-url-pipe';
+import { TruncatePipe } from './utils/truncate.pipe';
 
+import { CollectionListElementComponent } from '../object-list/collection-list-element/collection-list-element.component';
 import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component';
 import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-header.component';
 import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component';
-import { EnumKeysPipe } from './utils/enum-keys-pipe';
+import { CommunityListElementComponent } from '../object-list/community-list-element/community-list-element.component';
+import { ErrorComponent } from './error/error.component';
+import { LoadingComponent } from './loading/loading.component';
+import { ItemListElementComponent } from '../object-list/item-list-element/item-list-element.component';
 import { ObjectListComponent } from './object-list/object-list.component';
 import { ObjectListElementComponent } from '../object-list/object-list-element/object-list-element.component';
-import { ItemListElementComponent } from '../object-list/item-list-element/item-list-element.component';
-import { CommunityListElementComponent } from '../object-list/community-list-element/community-list-element.component';
-import { CollectionListElementComponent } from '../object-list/collection-list-element/collection-list-element.component';
-import { TruncatePipe } from './utils/truncate.pipe';
-import { WrapperListElementComponent } from '../object-list/wrapper-list-element/wrapper-list-element.component';
+import { PaginationComponent } from './pagination/pagination.component';
+import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
 import { SearchResultListElementComponent } from '../object-list/search-result-list-element/search-result-list-element.component';
 import { SearchFormComponent } from './search-form/search-form.component';
-import { LoadingComponent } from './loading/loading.component';
+import { WrapperListElementComponent } from '../object-list/wrapper-list-element/wrapper-list-element.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -42,31 +43,32 @@ const MODULES = [
 
 const PIPES = [
   // put shared pipes here
+  EnumKeysPipe,
   FileSizePipe,
   SafeUrlPipe,
-  EnumKeysPipe,
   TruncatePipe
 ];
 
 const COMPONENTS = [
   // put shared components here
-  PaginationComponent,
-  ThumbnailComponent,
   ComcolPageContentComponent,
   ComcolPageHeaderComponent,
   ComcolPageLogoComponent,
+  ErrorComponent,
+  LoadingComponent,
   ObjectListComponent,
   ObjectListElementComponent,
-  WrapperListElementComponent,
+  PaginationComponent,
   SearchFormComponent,
-  LoadingComponent
+  ThumbnailComponent,
+  WrapperListElementComponent
 ];
 
 const ENTRY_COMPONENTS = [
   // put shared entry components (components that are created dynamically) here
-  ItemListElementComponent,
   CollectionListElementComponent,
   CommunityListElementComponent,
+  ItemListElementComponent,
   SearchResultListElementComponent
 ];
 
diff --git a/webpack/webpack.test.js b/webpack/webpack.test.js
index a353dec9d6..818e348c7e 100644
--- a/webpack/webpack.test.js
+++ b/webpack/webpack.test.js
@@ -5,9 +5,10 @@ const {
 /**
  * Webpack Plugins
  */
-const ProvidePlugin = require('webpack/lib/ProvidePlugin');
+const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin');
 const DefinePlugin = require('webpack/lib/DefinePlugin');
 const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin');
+const ProvidePlugin = require('webpack/lib/ProvidePlugin');
 
 /**
  * Webpack Constants
@@ -75,8 +76,9 @@ module.exports = function (options) {
           loader: 'source-map-loader',
           exclude: [
             // these packages have problems with their sourcemaps
-            root('node_modules/rxjs'),
-            root('node_modules/@angular')
+            root('node_modules/@angular'),
+            root('node_modules/@nguniversal'),
+            root('node_modules/rxjs')
           ]
         },
 
@@ -221,6 +223,12 @@ module.exports = function (options) {
      */
     plugins: [
 
+      new ContextReplacementPlugin(
+        /angular(\\|\/)core(\\|\/)@angular/,
+        root('./src'),
+        {}
+      ),
+
       /**
        * Plugin: DefinePlugin
        * Description: Define free variables.

From 45ca74410c21fad99fa56050e49915d34d8e134f Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Wed, 4 Oct 2017 15:39:08 -0500
Subject: [PATCH 19/40] simple loading animation and fade in and out animations

---
 rollup.config.js                              | 42 +++++------
 .../collection-page.component.html            |  4 +-
 .../collection-page.component.ts              | 11 ++-
 .../community-page.component.html             |  2 +-
 .../community-page.component.ts               |  3 +
 ...ty-page-sub-collection-list.component.html |  4 +-
 ...nity-page-sub-collection-list.component.ts |  3 +
 .../top-level-community-list.component.html   |  2 +-
 .../top-level-community-list.component.ts     |  4 +-
 .../full/full-item-page.component.html        |  2 +-
 .../full/full-item-page.component.ts          |  5 ++
 .../simple/item-page.component.html           |  2 +-
 .../+item-page/simple/item-page.component.ts  |  5 ++
 .../+search-page/search-page.component.html   |  7 +-
 src/app/+search-page/search-page.component.ts | 12 ++--
 .../search-results.component.html             |  8 ++-
 src/app/app.component.html                    | 26 +++----
 src/app/browser-app.module.ts                 |  2 +
 .../object-list/object-list.component.html    |  5 +-
 src/app/server-app.module.ts                  |  2 +
 src/app/shared/animations/fade.ts             | 24 +++++++
 src/app/shared/error/error.component.html     |  4 +-
 src/app/shared/error/error.component.spec.ts  |  4 +-
 src/app/shared/loading/loading.component.html | 16 ++++-
 src/app/shared/loading/loading.component.scss | 72 +++++++++++++++++++
 .../shared/loading/loading.component.spec.ts  |  4 +-
 .../object-list/object-list.component.ts      |  5 +-
 27 files changed, 222 insertions(+), 58 deletions(-)
 create mode 100644 src/app/shared/animations/fade.ts

diff --git a/rollup.config.js b/rollup.config.js
index a47b46dd37..caa63ac03e 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,20 +1,22 @@
-import nodeResolve from 'rollup-plugin-node-resolve'
-import commonjs from 'rollup-plugin-commonjs';
-import uglify from 'rollup-plugin-uglify'
-
-export default {
-  entry: 'dist/client.js',
-  dest: 'dist/client.js',
-  sourceMap: false,
-  format: 'iife',
-  plugins: [
-    nodeResolve({
-      jsnext: true,
-      module: true
-    }),
-    commonjs({
-      include: 'node_modules/rxjs/**'
-    }),
-    uglify()
-  ]
-}
+import nodeResolve from 'rollup-plugin-node-resolve'
+import commonjs from 'rollup-plugin-commonjs';
+import uglify from 'rollup-plugin-uglify'
+
+export default {
+  input: 'dist/client.js',
+  output: {
+   file: 'dist/client.js',
+   format: 'iife',
+  },
+  sourceMap: false,
+  plugins: [
+    nodeResolve({
+      jsnext: true,
+      module: true
+    }),
+    commonjs({
+      include: 'node_modules/rxjs/**'
+    }),
+    uglify()
+  ]
+}
diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 8a8f2f0aad..a4e81cd272 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -1,5 +1,5 @@
 <div class="collection-page">
-  <div *ngIf="collectionData.hasSucceeded | async">
+  <div *ngIf="collectionData.hasSucceeded | async" @fadeInOut>
     <!-- Collection Name -->
     <ds-comcol-page-header
       [name]="(collectionData.payload | async)?.name">
@@ -34,7 +34,7 @@
   <ds-error *ngIf="collectionData.hasFailed | async" message="Error fetching collection"></ds-error>
   <ds-loading *ngIf="collectionData.isLoading | async" message="Loading collection..."></ds-loading>
   <br>
-  <div *ngIf="itemData.hasSucceeded | async">
+  <div *ngIf="itemData.hasSucceeded | async" @fadeIn>
     <h2>{{'collection.page.browse.recent.head' | translate}}</h2>
     <ds-object-list
       [config]="paginationConfig"
diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts
index ca349ce5bc..fc6f32290f 100644
--- a/src/app/+collection-page/collection-page.component.ts
+++ b/src/app/+collection-page/collection-page.component.ts
@@ -1,5 +1,8 @@
 import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
   OnInit
 } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
@@ -18,10 +21,16 @@ import { hasValue, isNotEmpty, isUndefined } from '../shared/empty.util';
 import { PageInfo } from '../core/shared/page-info.model';
 import { Observable } from 'rxjs/Observable';
 
+import { fadeIn, fadeInOut } from '../shared/animations/fade';
+
 @Component({
   selector: 'ds-collection-page',
   styleUrls: ['./collection-page.component.scss'],
   templateUrl: './collection-page.component.html',
+  animations:[
+    fadeIn,
+    fadeInOut
+  ]
 })
 export class CollectionPageComponent implements OnInit, OnDestroy {
   collectionData: RemoteData<Collection>;
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index f29fa364fb..1acaf2d89e 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -1,4 +1,4 @@
-<div class="community-page" *ngIf="communityData.hasSucceeded | async">
+<div class="community-page" *ngIf="communityData.hasSucceeded | async" @fadeInOut>
   <!-- Community name -->
   <ds-comcol-page-header [name]="(communityData.payload | async)?.name"></ds-comcol-page-header>
   <!-- Community logo -->
diff --git a/src/app/+community-page/community-page.component.ts b/src/app/+community-page/community-page.component.ts
index 2bd19b0f06..d1d1081757 100644
--- a/src/app/+community-page/community-page.component.ts
+++ b/src/app/+community-page/community-page.component.ts
@@ -9,10 +9,13 @@ import { RemoteData } from '../core/data/remote-data';
 import { CommunityDataService } from '../core/data/community-data.service';
 import { hasValue } from '../shared/empty.util';
 
+import { fadeInOut } from '../shared/animations/fade';
+
 @Component({
   selector: 'ds-community-page',
   styleUrls: ['./community-page.component.scss'],
   templateUrl: './community-page.component.html',
+  animations:[fadeInOut]
 })
 export class CommunityPageComponent implements OnInit, OnDestroy {
   communityData: RemoteData<Community>;
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
index f1f05a0467..82ae6bd3e1 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="subCollections.hasSucceeded | async">
+<div *ngIf="subCollections.hasSucceeded | async" @fadeIn>
   <h2>{{'community.sub-collection-list.head' | translate}}</h2>
   <ul>
     <li *ngFor="let collection of (subCollections.payload | async)">
@@ -9,3 +9,5 @@
     </li>
   </ul>
 </div>
+<ds-error *ngIf="subCollections.hasFailed | async" message="Error fetching sub collections"></ds-error>
+<ds-loading *ngIf="subCollections.isLoading | async" message="Loading sub collections..."></ds-loading>
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index caa764c39f..618890a60c 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -4,10 +4,13 @@ import { CollectionDataService } from '../../core/data/collection-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Collection } from '../../core/shared/collection.model';
 
+import { fadeIn } from '../../shared/animations/fade';
+
 @Component({
   selector: 'ds-community-page-sub-collection-list',
   styleUrls: ['./community-page-sub-collection-list.component.scss'],
   templateUrl: './community-page-sub-collection-list.component.html',
+  animations:[fadeIn]
 })
 export class CommunityPageSubCollectionListComponent implements OnInit {
   subCollections: RemoteData<Collection[]>;
diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.html b/src/app/+home-page/top-level-community-list/top-level-community-list.component.html
index c8a889a4f7..69df3b99d0 100644
--- a/src/app/+home-page/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="topLevelCommunities.hasSucceeded | async">
+<div *ngIf="topLevelCommunities.hasSucceeded | async" @fadeInOut>
   <h2>{{'home.top-level-communities.head' | translate}}</h2>
   <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
   <ds-object-list
diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
index a3882d7036..d7384dd038 100644
--- a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
@@ -7,12 +7,14 @@ import { PaginationComponentOptions } from '../../shared/pagination/pagination-c
 import { SortOptions, SortDirection } from '../../core/cache/models/sort-options.model';
 import { ActivatedRoute } from '@angular/router';
 
+import { fadeInOut } from '../../shared/animations/fade';
+
 @Component({
   selector: 'ds-top-level-community-list',
   styleUrls: ['./top-level-community-list.component.scss'],
   templateUrl: './top-level-community-list.component.html',
+  animations:[fadeInOut]
 })
-
 export class TopLevelCommunityListComponent {
   topLevelCommunities: RemoteData<Community[]>;
   config: PaginationComponentOptions;
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index ccd8ca3932..bc8ee3f3a8 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -1,4 +1,4 @@
-<div class="item-page" *ngIf="item.hasSucceeded | async">
+<div class="item-page" *ngIf="item.hasSucceeded | async" @fadeInOut>
   <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
   <div class="simple-view-link">
     <a class="btn btn-outline-primary col-4" [routerLink]="['/items/' + (item.payload | async)?.id]">
diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts
index c952954235..4617119402 100644
--- a/src/app/+item-page/full/full-item-page.component.ts
+++ b/src/app/+item-page/full/full-item-page.component.ts
@@ -1,4 +1,6 @@
 import { Component, OnInit } from '@angular/core';
+import { animate, state, transition, trigger, style, keyframes } from '@angular/animations';
+
 import { Observable } from 'rxjs/Observable';
 
 import { ItemPageComponent } from '../simple/item-page.component';
@@ -8,6 +10,8 @@ import { ActivatedRoute } from '@angular/router';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
 
+import { fadeInOut } from '../../shared/animations/fade';
+
 /**
  * This component renders a simple item page.
  * The route parameter 'id' is used to request the item it represents.
@@ -18,6 +22,7 @@ import { Item } from '../../core/shared/item.model';
   selector: 'ds-full-item-page',
   styleUrls: ['./full-item-page.component.scss'],
   templateUrl: './full-item-page.component.html',
+  animations:[fadeInOut ]
 })
 export class FullItemPageComponent extends ItemPageComponent implements OnInit {
 
diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/+item-page/simple/item-page.component.html
index fe7e1138e6..a08a62684a 100644
--- a/src/app/+item-page/simple/item-page.component.html
+++ b/src/app/+item-page/simple/item-page.component.html
@@ -1,4 +1,4 @@
-<div class="item-page" *ngIf="item.hasSucceeded | async">
+<div class="item-page" *ngIf="item.hasSucceeded | async" @fadeInOut>
   <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
   <div class="row">
     <div class="col-xs-12 col-md-4">
diff --git a/src/app/+item-page/simple/item-page.component.ts b/src/app/+item-page/simple/item-page.component.ts
index dd37036c21..3ea9180b8d 100644
--- a/src/app/+item-page/simple/item-page.component.ts
+++ b/src/app/+item-page/simple/item-page.component.ts
@@ -1,5 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { animate, state, transition, trigger, style, keyframes } from '@angular/animations';
+
 import { Observable } from 'rxjs/Observable';
 
 import { Item } from '../../core/shared/item.model';
@@ -7,6 +9,8 @@ import { ItemDataService } from '../../core/data/item-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Bitstream } from '../../core/shared/bitstream.model';
 
+import { fadeInOut } from '../../shared/animations/fade';
+
 /**
  * This component renders a simple item page.
  * The route parameter 'id' is used to request the item it represents.
@@ -16,6 +20,7 @@ import { Bitstream } from '../../core/shared/bitstream.model';
   selector: 'ds-item-page',
   styleUrls: ['./item-page.component.scss'],
   templateUrl: './item-page.component.html',
+  animations:[fadeInOut]
 })
 export class ItemPageComponent implements OnInit {
 
diff --git a/src/app/+search-page/search-page.component.html b/src/app/+search-page/search-page.component.html
index a8747a6cf9..d5e3a831eb 100644
--- a/src/app/+search-page/search-page.component.html
+++ b/src/app/+search-page/search-page.component.html
@@ -1,4 +1,9 @@
 <div class="search-page">
-    <ds-search-form [query]="query" [scope]="scopeObject?.payload | async" [currentParams]="currentParams" [scopes]="scopeList?.payload"></ds-search-form>
+    <ds-search-form
+      [query]="query"
+      [scope]="scopeObject?.payload | async"
+      [currentParams]="currentParams"
+      [scopes]="scopeList?.payload">
+    </ds-search-form>
     <ds-search-results [searchResults]="results" [searchConfig]="searchOptions"></ds-search-results>
 </div>
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index 90da376597..052eccd33a 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -23,18 +23,22 @@ import { Community } from '../core/shared/community.model';
   templateUrl: './search-page.component.html',
 })
 export class SearchPageComponent implements OnInit, OnDestroy {
+
   private sub;
-  query: string;
   private scope: string;
+
+  query: string;
   scopeObject: RemoteData<DSpaceObject>;
   results: RemoteData<Array<SearchResult<DSpaceObject>>>;
   currentParams = {};
   searchOptions: SearchOptions;
   scopeList: RemoteData<Community[]>;
 
-  constructor(private service: SearchService,
-              private route: ActivatedRoute,
-              private communityService: CommunityDataService,) {
+  constructor(
+    private service: SearchService,
+    private route: ActivatedRoute,
+    private communityService: CommunityDataService
+  ) {
     this.scopeList = communityService.findAll();
     // Initial pagination config
     const pagination: PaginationComponentOptions = new PaginationComponentOptions();
diff --git a/src/app/+search-page/search-results/search-results.component.html b/src/app/+search-page/search-results/search-results.component.html
index 7d769dbeb0..08e63d598d 100644
--- a/src/app/+search-page/search-results/search-results.component.html
+++ b/src/app/+search-page/search-results/search-results.component.html
@@ -1,3 +1,7 @@
 <h2 *ngIf="(searchResults.payload | async)?.length > 0">{{ 'search.results.title' | translate }}</h2>
-<ds-object-list [config]="searchConfig.pagination" [sortConfig]="searchConfig.sort"
-                [objects]="searchResults" [hideGear]="false"></ds-object-list>
\ No newline at end of file
+<ds-object-list
+  [config]="searchConfig.pagination"
+  [sortConfig]="searchConfig.sort"
+  [objects]="searchResults"
+  [hideGear]="false">
+</ds-object-list>
\ No newline at end of file
diff --git a/src/app/app.component.html b/src/app/app.component.html
index a227b80ab0..2a621be2c4 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,13 +1,13 @@
-<div class="outer-wrapper">
-  <div class="inner-wrapper">
-    <ds-header></ds-header>
-
-    <main class="main-content">
-      <div class="container-fluid">
-        <router-outlet></router-outlet>
-      </div>
-    </main>
-
-    <ds-footer></ds-footer>
-  </div>
-</div>
+<div class="outer-wrapper">
+  <div class="inner-wrapper">
+    <ds-header></ds-header>
+
+    <main class="main-content">
+      <div class="container-fluid">
+        <router-outlet></router-outlet>
+      </div>
+    </main>
+
+    <ds-footer></ds-footer>
+  </div>
+</div>
diff --git a/src/app/browser-app.module.ts b/src/app/browser-app.module.ts
index a8e6b08312..0904ba9ecc 100644
--- a/src/app/browser-app.module.ts
+++ b/src/app/browser-app.module.ts
@@ -2,6 +2,7 @@ import { NgModule, APP_INITIALIZER } from '@angular/core';
 import { HttpClientModule, HttpClient } from '@angular/common/http';
 import { RouterModule } from '@angular/router';
 import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { IdlePreload, IdlePreloadModule } from '@angularclass/idle-preload';
 
@@ -44,6 +45,7 @@ export function createTranslateLoader(http: HttpClient) {
       preloadingStrategy:
       IdlePreload
     }),
+    BrowserAnimationsModule,
     BrowserTransferStateModule,
     BrowserTransferStoreModule,
     TranslateModule.forRoot({
diff --git a/src/app/object-list/object-list.component.html b/src/app/object-list/object-list.component.html
index 0765e00476..1fa0a85165 100644
--- a/src/app/object-list/object-list.component.html
+++ b/src/app/object-list/object-list.component.html
@@ -9,10 +9,11 @@
                (sortDirectionChange)="onSortDirectionChange($event)"
                (sortFieldChange)="onSortDirectionChange($event)"
                (paginationChange)="onPaginationChange($event)">
-    <ul *ngIf="objects.hasSucceeded | async"> <!--class="list-unstyled"-->
+    <ul *ngIf="objects.hasSucceeded | async" @fadeIn> <!--class="list-unstyled"-->
         <li *ngFor="let object of (objects.payload | async) | paginate: { itemsPerPage: (pageInfo | async)?.elementsPerPage, currentPage: (pageInfo | async)?.currentPage, totalItems: (pageInfo | async)?.totalElements }">
             <ds-wrapper-list-element [object]="object"></ds-wrapper-list-element>
         </li>
     </ul>
-
+    <ds-error *ngIf="objects.hasFailed | async" message="Error fetching list"></ds-error>
+    <ds-loading *ngIf="objects.isLoading | async" message="Loading list..."></ds-loading>
 </ds-pagination>
diff --git a/src/app/server-app.module.ts b/src/app/server-app.module.ts
index 0b9a9fec1c..0eea0cac24 100644
--- a/src/app/server-app.module.ts
+++ b/src/app/server-app.module.ts
@@ -5,6 +5,7 @@ import { ApplicationRef, NgModule, APP_BOOTSTRAP_LISTENER } from '@angular/core'
 import { RouterModule } from '@angular/router';
 import { ServerModule } from '@angular/platform-server';
 import { BrowserModule } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 import { Request } from 'express';
 
@@ -53,6 +54,7 @@ export function createTranslateLoader() {
     RouterModule.forRoot([], {
       useHash: false
     }),
+    NoopAnimationsModule,
     ServerTransferStateModule,
     ServerTransferStoreModule,
     TranslateModule.forRoot({
diff --git a/src/app/shared/animations/fade.ts b/src/app/shared/animations/fade.ts
new file mode 100644
index 0000000000..e5272cc123
--- /dev/null
+++ b/src/app/shared/animations/fade.ts
@@ -0,0 +1,24 @@
+import { animate, state, transition, trigger, style, keyframes } from '@angular/animations';
+
+const fadeEnter =  transition(':enter', [
+  style({ opacity: 0 }),
+  animate(300, style({ opacity: 1 }))
+]);
+
+const fadeLeave = transition(':leave', [
+  style({ opacity: 1 }),
+  animate(400, style({ opacity: 0 }))
+]);
+
+export const fadeIn = trigger('fadeIn', [
+  fadeEnter
+]);
+
+export const fadeOut = trigger('fadeOut', [
+  fadeLeave
+]);
+
+export const fadeInOut = trigger('fadeInOut', [
+  fadeEnter,
+  fadeLeave
+]);
diff --git a/src/app/shared/error/error.component.html b/src/app/shared/error/error.component.html
index fb5224e1ac..83b189b6fe 100644
--- a/src/app/shared/error/error.component.html
+++ b/src/app/shared/error/error.component.html
@@ -1 +1,3 @@
-<div>{{ message }}</div>
\ No newline at end of file
+<div>
+  <span>{{ message }}</span>
+</div>
diff --git a/src/app/shared/error/error.component.spec.ts b/src/app/shared/error/error.component.spec.ts
index 078aa95592..1417d3ffe7 100644
--- a/src/app/shared/error/error.component.spec.ts
+++ b/src/app/shared/error/error.component.spec.ts
@@ -22,8 +22,8 @@ describe('ErrorComponent (inline template)', () => {
 
     comp = fixture.componentInstance; // ErrorComponent test instance
 
-    // query for the title <div> by CSS element selector
-    de = fixture.debugElement.query(By.css('div'));
+    // query for the message <span> by CSS element selector
+    de = fixture.debugElement.query(By.css('span'));
     el = de.nativeElement;
   });
 
diff --git a/src/app/shared/loading/loading.component.html b/src/app/shared/loading/loading.component.html
index fb5224e1ac..c5faa49365 100644
--- a/src/app/shared/loading/loading.component.html
+++ b/src/app/shared/loading/loading.component.html
@@ -1 +1,15 @@
-<div>{{ message }}</div>
\ No newline at end of file
+<div>
+  <span>{{ message }}</span>
+  <div class="loader">
+    <span class="l-1"></span>
+    <span class="l-2"></span>
+    <span class="l-3"></span>
+    <span class="l-4"></span>
+    <span class="l-5"></span>
+    <span class="l-6"></span>
+    <span class="l-7"></span>
+    <span class="l-8"></span>
+    <span class="l-9"></span>
+    <span class="l-10"></span>
+  </div>
+</div>
diff --git a/src/app/shared/loading/loading.component.scss b/src/app/shared/loading/loading.component.scss
index e69de29bb2..bb98849cae 100644
--- a/src/app/shared/loading/loading.component.scss
+++ b/src/app/shared/loading/loading.component.scss
@@ -0,0 +1,72 @@
+.loader {
+	margin: 0px 25px;
+}
+
+span {
+	display: block; 
+	margin: 0 auto;
+}
+
+span[class*="l-"] {
+	height: 4px; width: 4px;
+	background: #000;
+	display: inline-block;
+	margin: 12px 2px;
+	
+	border-radius: 100%;
+	-webkit-border-radius: 100%;
+	-moz-border-radius: 100%;
+	
+	-webkit-animation: loader 2s infinite;
+	-webkit-animation-timing-function: cubic-bezier(0.030, 0.615, 0.995, 0.415);
+	-webkit-animation-fill-mode: both;
+	-moz-animation: loader 2s infinite;
+	-moz-animation-timing-function: cubic-bezier(0.030, 0.615, 0.995, 0.415);
+	-moz-animation-fill-mode: both;
+	-ms-animation: loader 2s infinite;
+	-ms-animation-timing-function: cubic-bezier(0.030, 0.615, 0.995, 0.415);
+	-ms-animation-fill-mode: both;
+	animation: loader 2s infinite;
+	animation-timing-function: cubic-bezier(0.030, 0.615, 0.995, 0.415);
+	animation-fill-mode: both;
+}
+
+span.l-1 {-webkit-animation-delay: 1s;animation-delay: 1s;-ms-animation-delay: 1s;-moz-animation-delay: 1s;}
+span.l-2 {-webkit-animation-delay: 0.9s;animation-delay: 0.9s;-ms-animation-delay: 0.9s;-moz-animation-delay: 0.9s;}
+span.l-3 {-webkit-animation-delay: 0.8s;animation-delay: 0.8s;-ms-animation-delay: 0.8s;-moz-animation-delay: 0.8s;}
+span.l-4 {-webkit-animation-delay: 0.7s;animation-delay: 0.7s;-ms-animation-delay: 0.7s;-moz-animation-delay: 0.7s;}
+span.l-5 {-webkit-animation-delay: 0.6s;animation-delay: 0.6s;-ms-animation-delay: 0.6s;-moz-animation-delay: 0.6s;}
+span.l-6 {-webkit-animation-delay: 0.5s;animation-delay: 0.5s;-ms-animation-delay: 0.5s;-moz-animation-delay: 0.5s;}
+span.l-7 {-webkit-animation-delay: 0.4s;animation-delay: 0.4s;-ms-animation-delay: 0.4s;-moz-animation-delay: 0.4s;}
+span.l-8 {-webkit-animation-delay: 0.3s;animation-delay: 0.3s;-ms-animation-delay: 0.3s;-moz-animation-delay: 0.3s;}
+span.l-9 {-webkit-animation-delay: 0.2s;animation-delay: 0.2s;-ms-animation-delay: 0.2s;-moz-animation-delay: 0.2s;}
+span.l-9 {-webkit-animation-delay: 0.1s;animation-delay: 0.1s;-ms-animation-delay: 0.1s;-moz-animation-delay: 0.1s;}
+span.l-10 {-webkit-animation-delay: 0s;animation-delay: 0s;-ms-animation-delay: 0s;-moz-animation-delay: 0s;}
+
+@-webkit-keyframes loader {
+	0% {-webkit-transform: translateX(-30px); opacity: 0;}
+	25% {opacity: 1;}
+	50% {-webkit-transform: translateX(30px); opacity: 0;}
+	100% {opacity: 0;}
+}
+
+@-moz-keyframes loader {
+	0% {-moz-transform: translateX(-30px); opacity: 0;}
+	25% {opacity: 1;}
+	50% {-moz-transform: translateX(30px); opacity: 0;}
+	100% {opacity: 0;}
+}
+
+@-keyframes loader {
+	0% {-transform: translateX(-30px); opacity: 0;}
+	25% {opacity: 1;}
+	50% {-transform: translateX(30px); opacity: 0;}
+	100% {opacity: 0;}
+}
+
+@-ms-keyframes loader {
+	0% {-ms-transform: translateX(-30px); opacity: 0;}
+	25% {opacity: 1;}
+	50% {-ms-transform: translateX(30px); opacity: 0;}
+	100% {opacity: 0;}
+}
\ No newline at end of file
diff --git a/src/app/shared/loading/loading.component.spec.ts b/src/app/shared/loading/loading.component.spec.ts
index 45583ed198..e407083479 100644
--- a/src/app/shared/loading/loading.component.spec.ts
+++ b/src/app/shared/loading/loading.component.spec.ts
@@ -22,8 +22,8 @@ describe('LoadingComponent (inline template)', () => {
 
     comp = fixture.componentInstance; // LoadingComponent test instance
 
-    // query for the title <div> by CSS element selector
-    de = fixture.debugElement.query(By.css('div'));
+    // query for the message <span> by CSS element selector
+    de = fixture.debugElement.query(By.css('span'));
     el = de.nativeElement;
   });
 
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
index c3018b957c..dbc0c3b75c 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -18,12 +18,15 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
 import { SortOptions, SortDirection } from '../../core/cache/models/sort-options.model';
 import { ListableObject } from '../../object-list/listable-object/listable-object.model';
 
+import { fadeIn } from '../../shared/animations/fade';
+
 @Component({
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   selector: 'ds-object-list',
   styleUrls: ['../../object-list/object-list.component.scss'],
-  templateUrl: '../../object-list/object-list.component.html'
+  templateUrl: '../../object-list/object-list.component.html',
+  animations:[fadeIn]
 })
 export class ObjectListComponent implements OnChanges, OnInit {
 

From 05a9cb61bde8501b4532798f5db8ca09b4cd9781 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Wed, 4 Oct 2017 16:15:39 -0500
Subject: [PATCH 20/40] fixed search service remote data pending observables

---
 src/app/+search-page/search-page.component.ts |  1 -
 .../search-results.compontent.ts              |  2 --
 src/app/+search-page/search.service.ts        | 33 ++++++++++++++-----
 .../object-list/object-list.component.html    |  4 +--
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index 052eccd33a..16fe86c018 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -84,7 +84,6 @@ export class SearchPageComponent implements OnInit, OnDestroy {
   private updateSearchResults(searchOptions) {
     // Resolve search results
     this.results = this.service.search(this.query, this.scope, searchOptions);
-
   }
 
   ngOnDestroy() {
diff --git a/src/app/+search-page/search-results/search-results.compontent.ts b/src/app/+search-page/search-results/search-results.compontent.ts
index 62357b8e8d..c645489694 100644
--- a/src/app/+search-page/search-results/search-results.compontent.ts
+++ b/src/app/+search-page/search-results/search-results.compontent.ts
@@ -9,12 +9,10 @@ import { SearchOptions } from '../search-options.model';
  * The route parameter 'id' is used to request the item it represents.
  * All fields of the item that should be displayed, are defined in its template.
  */
-
 @Component({
   selector: 'ds-search-results',
   templateUrl: './search-results.component.html',
 })
-
 export class SearchResultsComponent {
   @Input() searchResults: RemoteData<Array<SearchResult<DSpaceObject>>>;
   @Input() searchConfig: SearchOptions;
diff --git a/src/app/+search-page/search.service.ts b/src/app/+search-page/search.service.ts
index 81d6a61c82..caf6e18076 100644
--- a/src/app/+search-page/search.service.ts
+++ b/src/app/+search-page/search.service.ts
@@ -1,15 +1,20 @@
 import { Injectable } from '@angular/core';
-import { RemoteData } from '../core/data/remote-data';
+
 import { Observable } from 'rxjs/Observable';
-import { SearchResult } from './search-result.model';
-import { ItemDataService } from '../core/data/item-data.service';
-import { PageInfo } from '../core/shared/page-info.model';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+
 import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { SearchOptions } from './search-options.model';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { Metadatum } from '../core/shared/metadatum.model';
 import { Item } from '../core/shared/item.model';
 import { ItemSearchResult } from '../object-list/search-result-list-element/item-search-result/item-search-result.model';
+import { Metadatum } from '../core/shared/metadatum.model';
+import { PageInfo } from '../core/shared/page-info.model';
+import { RemoteData } from '../core/data/remote-data';
+import { SearchOptions } from './search-options.model';
+import { SearchResult } from './search-result.model';
+
+import { ItemDataService } from '../core/data/item-data.service';
+
+import { hasValue, isNotEmpty } from '../shared/empty.util';
 
 function shuffle(array: any[]) {
   let i = 0;
@@ -63,8 +68,12 @@ export class SearchService {
     if (isNotEmpty(searchOptions) && hasValue(searchOptions.sort.field)) {
       self += `&sortField=${searchOptions.sort.field}`;
     }
-    const requestPending = Observable.of(false);
-    const responsePending = Observable.of(false);
+
+    const requestPendingSubject = new BehaviorSubject<boolean>(true);
+    const responsePendingSubject = new BehaviorSubject<boolean>(false);
+
+    const requestPending = requestPendingSubject.asObservable();
+    const responsePending = responsePendingSubject.asObservable();
     const errorMessage = Observable.of(undefined);
     const statusCode = Observable.of('200');
     const returningPageInfo = new PageInfo();
@@ -101,6 +110,11 @@ export class SearchService {
         });
     });
 
+    itemsRD.hasSucceeded.subscribe((success: boolean) => {
+      requestPendingSubject.next(!success);
+      responsePendingSubject.next(!success);
+    });
+
     return new RemoteData(
       Observable.of(self),
       requestPending,
@@ -112,4 +126,5 @@ export class SearchService {
       payload
     )
   }
+
 }
diff --git a/src/app/object-list/object-list.component.html b/src/app/object-list/object-list.component.html
index 1fa0a85165..d488b29365 100644
--- a/src/app/object-list/object-list.component.html
+++ b/src/app/object-list/object-list.component.html
@@ -14,6 +14,6 @@
             <ds-wrapper-list-element [object]="object"></ds-wrapper-list-element>
         </li>
     </ul>
-    <ds-error *ngIf="objects.hasFailed | async" message="Error fetching list"></ds-error>
-    <ds-loading *ngIf="objects.isLoading | async" message="Loading list..."></ds-loading>
+    <ds-error *ngIf="objects.hasFailed | async" message="Error fetching"></ds-error>
+    <ds-loading *ngIf="objects.isLoading | async" message="Loading..."></ds-loading>
 </ds-pagination>

From 80f883e287dfb41c50861d2170906d5699fe4551 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Wed, 4 Oct 2017 19:19:34 -0500
Subject: [PATCH 21/40] Update full-item-page.component.ts

---
 src/app/+item-page/full/full-item-page.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts
index 4617119402..ce0468b5ed 100644
--- a/src/app/+item-page/full/full-item-page.component.ts
+++ b/src/app/+item-page/full/full-item-page.component.ts
@@ -22,7 +22,7 @@ import { fadeInOut } from '../../shared/animations/fade';
   selector: 'ds-full-item-page',
   styleUrls: ['./full-item-page.component.scss'],
   templateUrl: './full-item-page.component.html',
-  animations:[fadeInOut ]
+  animations:[fadeInOut]
 })
 export class FullItemPageComponent extends ItemPageComponent implements OnInit {
 

From bd6557378d3aa3747674d88084d09fb08ce97894 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Wed, 4 Oct 2017 19:19:56 -0500
Subject: [PATCH 22/40] Update full-item-page.component.ts

---
 src/app/+item-page/full/full-item-page.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts
index ce0468b5ed..337c598021 100644
--- a/src/app/+item-page/full/full-item-page.component.ts
+++ b/src/app/+item-page/full/full-item-page.component.ts
@@ -22,7 +22,7 @@ import { fadeInOut } from '../../shared/animations/fade';
   selector: 'ds-full-item-page',
   styleUrls: ['./full-item-page.component.scss'],
   templateUrl: './full-item-page.component.html',
-  animations:[fadeInOut]
+  animations: [fadeInOut]
 })
 export class FullItemPageComponent extends ItemPageComponent implements OnInit {
 

From 893281765857427966c7fbe5e5cb4521efd959c3 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@outlook.com>
Date: Wed, 4 Oct 2017 19:41:20 -0500
Subject: [PATCH 23/40] reduce async observables with local assignment

---
 .../collection-page.component.html            | 62 ++++++++++---------
 .../collection-page.component.ts              |  2 +-
 .../community-page.component.html             | 50 ++++++++-------
 .../community-page.component.ts               |  2 +-
 .../top-level-community-list.component.ts     |  2 +-
 .../simple/item-page.component.html           | 38 ++++++------
 .../+item-page/simple/item-page.component.ts  |  2 +-
 .../object-list/object-list.component.html    | 37 +++++------
 .../object-list/object-list.component.ts      | 18 +++---
 .../search-form/search-form.component.ts      |  2 +-
 src/app/shared/shared.module.ts               |  2 +-
 11 files changed, 112 insertions(+), 105 deletions(-)
 rename src/app/{shared => }/object-list/object-list.component.ts (80%)

diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index a4e81cd272..5037da99c4 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -1,35 +1,37 @@
 <div class="collection-page">
   <div *ngIf="collectionData.hasSucceeded | async" @fadeInOut>
-    <!-- Collection Name -->
-    <ds-comcol-page-header
-      [name]="(collectionData.payload | async)?.name">
-    </ds-comcol-page-header>
-    <!-- Collection logo -->
-    <ds-comcol-page-logo *ngIf="logoData"
-      [logo]="logoData.payload | async"
-      [alternateText]="'Collection Logo'">
-    </ds-comcol-page-logo>
-    <!-- Introductionary text -->
-    <ds-comcol-page-content
-      [content]="(collectionData.payload | async)?.introductoryText"
-      [hasInnerHtml]="true">
-    </ds-comcol-page-content>
-    <!-- News -->
-    <ds-comcol-page-content
-      [content]="(collectionData.payload | async)?.sidebarText"
-      [hasInnerHtml]="true"
-      [title]="'community.page.news'">
-    </ds-comcol-page-content>
-    <!-- Copyright -->
-    <ds-comcol-page-content
-      [content]="(collectionData.payload | async)?.copyrightText"
-      [hasInnerHtml]="true">
-    </ds-comcol-page-content>
-    <!-- Licence -->
-    <ds-comcol-page-content
-      [content]="(collectionData.payload | async)?.license"
-      [title]="'collection.page.license'">
-    </ds-comcol-page-content>
+    <div *ngIf="collectionData.payload | async; let collectionPayload">
+      <!-- Collection Name -->
+      <ds-comcol-page-header
+        [name]="collectionPayload.name">
+      </ds-comcol-page-header>
+      <!-- Collection logo -->
+      <ds-comcol-page-logo *ngIf="logoData"
+        [logo]="logoData.payload | async"
+        [alternateText]="'Collection Logo'">
+      </ds-comcol-page-logo>
+      <!-- Introductionary text -->
+      <ds-comcol-page-content
+        [content]="collectionPayload.introductoryText"
+        [hasInnerHtml]="true">
+      </ds-comcol-page-content>
+      <!-- News -->
+      <ds-comcol-page-content
+        [content]="collectionPayload.sidebarText"
+        [hasInnerHtml]="true"
+        [title]="'community.page.news'">
+      </ds-comcol-page-content>
+      <!-- Copyright -->
+      <ds-comcol-page-content
+        [content]="collectionPayload.copyrightText"
+        [hasInnerHtml]="true">
+      </ds-comcol-page-content>
+      <!-- Licence -->
+      <ds-comcol-page-content
+        [content]="collectionPayload.license"
+        [title]="'collection.page.license'">
+      </ds-comcol-page-content>
+    </div>
   </div>
   <ds-error *ngIf="collectionData.hasFailed | async" message="Error fetching collection"></ds-error>
   <ds-loading *ngIf="collectionData.isLoading | async" message="Loading collection..."></ds-loading>
diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts
index fc6f32290f..65bf708727 100644
--- a/src/app/+collection-page/collection-page.component.ts
+++ b/src/app/+collection-page/collection-page.component.ts
@@ -27,7 +27,7 @@ import { fadeIn, fadeInOut } from '../shared/animations/fade';
   selector: 'ds-collection-page',
   styleUrls: ['./collection-page.component.scss'],
   templateUrl: './collection-page.component.html',
-  animations:[
+  animations: [
     fadeIn,
     fadeInOut
   ]
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index 1acaf2d89e..6795058d02 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -1,28 +1,30 @@
 <div class="community-page" *ngIf="communityData.hasSucceeded | async" @fadeInOut>
-  <!-- Community name -->
-  <ds-comcol-page-header [name]="(communityData.payload | async)?.name"></ds-comcol-page-header>
-  <!-- Community logo -->
-  <ds-comcol-page-logo *ngIf="logoData"
-    [logo]="logoData.payload | async"
-    [alternateText]="'Community Logo'">
-  </ds-comcol-page-logo>
-  <!-- Introductionary text -->
-  <ds-comcol-page-content
-    [content]="(communityData.payload | async)?.introductoryText"
-    [hasInnerHtml]="true">
-  </ds-comcol-page-content>
-  <!-- News -->
-  <ds-comcol-page-content
-    [content]="(communityData.payload | async)?.sidebarText"
-    [hasInnerHtml]="true"
-    [title]="'community.page.news'">
-  </ds-comcol-page-content>
-  <!-- Copyright -->
-  <ds-comcol-page-content
-    [content]="(communityData.payload | async)?.copyrightText"
-    [hasInnerHtml]="true">
-  </ds-comcol-page-content>
-  <ds-community-page-sub-collection-list></ds-community-page-sub-collection-list>
+  <div *ngIf="communityData.payload | async; let communityPayload">
+    <!-- Community name -->
+    <ds-comcol-page-header [name]="communityPayload.name"></ds-comcol-page-header>
+    <!-- Community logo -->
+    <ds-comcol-page-logo *ngIf="logoData"
+      [logo]="logoData.payload | async"
+      [alternateText]="'Community Logo'">
+    </ds-comcol-page-logo>
+    <!-- Introductionary text -->
+    <ds-comcol-page-content
+      [content]="communityPayload.introductoryText"
+      [hasInnerHtml]="true">
+    </ds-comcol-page-content>
+    <!-- News -->
+    <ds-comcol-page-content
+      [content]="communityPayload.sidebarText"
+      [hasInnerHtml]="true"
+      [title]="'community.page.news'">
+    </ds-comcol-page-content>
+    <!-- Copyright -->
+    <ds-comcol-page-content
+      [content]="communityPayload.copyrightText"
+      [hasInnerHtml]="true">
+    </ds-comcol-page-content>
+    <ds-community-page-sub-collection-list></ds-community-page-sub-collection-list>
+  </div>
 </div>
 <ds-error *ngIf="communityData.hasFailed | async" message="Error fetching community"></ds-error>
 <ds-loading *ngIf="communityData.isLoading | async" message="Loading community..."></ds-loading>
diff --git a/src/app/+community-page/community-page.component.ts b/src/app/+community-page/community-page.component.ts
index d1d1081757..1295e14521 100644
--- a/src/app/+community-page/community-page.component.ts
+++ b/src/app/+community-page/community-page.component.ts
@@ -15,7 +15,7 @@ import { fadeInOut } from '../shared/animations/fade';
   selector: 'ds-community-page',
   styleUrls: ['./community-page.component.scss'],
   templateUrl: './community-page.component.html',
-  animations:[fadeInOut]
+  animations: [fadeInOut]
 })
 export class CommunityPageComponent implements OnInit, OnDestroy {
   communityData: RemoteData<Community>;
diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
index d7384dd038..626d3cb6d3 100644
--- a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
@@ -13,7 +13,7 @@ import { fadeInOut } from '../../shared/animations/fade';
   selector: 'ds-top-level-community-list',
   styleUrls: ['./top-level-community-list.component.scss'],
   templateUrl: './top-level-community-list.component.html',
-  animations:[fadeInOut]
+  animations: [fadeInOut]
 })
 export class TopLevelCommunityListComponent {
   topLevelCommunities: RemoteData<Community[]>;
diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/+item-page/simple/item-page.component.html
index a08a62684a..8b41c9017d 100644
--- a/src/app/+item-page/simple/item-page.component.html
+++ b/src/app/+item-page/simple/item-page.component.html
@@ -1,22 +1,24 @@
 <div class="item-page" *ngIf="item.hasSucceeded | async" @fadeInOut>
-  <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
-  <div class="row">
-    <div class="col-xs-12 col-md-4">
-      <ds-metadata-field-wrapper>
-        <ds-thumbnail [thumbnail]="thumbnail | async"></ds-thumbnail>
-      </ds-metadata-field-wrapper>
-      <ds-item-page-file-section [item]="item.payload | async"></ds-item-page-file-section>
-      <ds-item-page-date-field [item]="item.payload | async"></ds-item-page-date-field>
-      <ds-item-page-author-field [item]="item.payload | async"></ds-item-page-author-field>
-    </div>
-    <div class="col-xs-12 col-md-6">
-      <ds-item-page-abstract-field [item]="item.payload | async"></ds-item-page-abstract-field>
-      <ds-item-page-uri-field [item]="item.payload | async"></ds-item-page-uri-field>
-      <ds-item-page-collections [item]="item.payload | async"></ds-item-page-collections>
-      <div>
-        <a class="btn btn-outline-primary" [routerLink]="['/items/' + (item.payload | async)?.id + '/full']">
-          {{"item.page.link.full" | translate}}
-        </a>
+  <div *ngIf="item.payload | async; let itemPayload">
+    <ds-item-page-title-field [item]="itemPayload"></ds-item-page-title-field>
+    <div class="row">
+      <div class="col-xs-12 col-md-4">
+        <ds-metadata-field-wrapper>
+          <ds-thumbnail [thumbnail]="thumbnail | async"></ds-thumbnail>
+        </ds-metadata-field-wrapper>
+        <ds-item-page-file-section [item]="itemPayload"></ds-item-page-file-section>
+        <ds-item-page-date-field [item]="itemPayload"></ds-item-page-date-field>
+        <ds-item-page-author-field [item]="itemPayload"></ds-item-page-author-field>
+      </div>
+      <div class="col-xs-12 col-md-6">
+        <ds-item-page-abstract-field [item]="itemPayload"></ds-item-page-abstract-field>
+        <ds-item-page-uri-field [item]="itemPayload"></ds-item-page-uri-field>
+        <ds-item-page-collections [item]="itemPayload"></ds-item-page-collections>
+        <div>
+          <a class="btn btn-outline-primary" [routerLink]="['/items/' + itemPayload.id + '/full']">
+            {{"item.page.link.full" | translate}}
+          </a>
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/app/+item-page/simple/item-page.component.ts b/src/app/+item-page/simple/item-page.component.ts
index 3ea9180b8d..84b76a5fb5 100644
--- a/src/app/+item-page/simple/item-page.component.ts
+++ b/src/app/+item-page/simple/item-page.component.ts
@@ -20,7 +20,7 @@ import { fadeInOut } from '../../shared/animations/fade';
   selector: 'ds-item-page',
   styleUrls: ['./item-page.component.scss'],
   templateUrl: './item-page.component.html',
-  animations:[fadeInOut]
+  animations: [fadeInOut]
 })
 export class ItemPageComponent implements OnInit {
 
diff --git a/src/app/object-list/object-list.component.html b/src/app/object-list/object-list.component.html
index d488b29365..6ef14d103c 100644
--- a/src/app/object-list/object-list.component.html
+++ b/src/app/object-list/object-list.component.html
@@ -1,19 +1,20 @@
-<ds-pagination [paginationOptions]="config"
-               [pageInfoState]="pageInfo"
-               [collectionSize]="(pageInfo | async)?.totalElements"
-               [sortOptions]="sortConfig"
-               [hideGear]="hideGear"
-               [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
-               (pageChange)="onPageChange($event)"
-               (pageSizeChange)="onPageSizeChange($event)"
-               (sortDirectionChange)="onSortDirectionChange($event)"
-               (sortFieldChange)="onSortDirectionChange($event)"
-               (paginationChange)="onPaginationChange($event)">
-    <ul *ngIf="objects.hasSucceeded | async" @fadeIn> <!--class="list-unstyled"-->
-        <li *ngFor="let object of (objects.payload | async) | paginate: { itemsPerPage: (pageInfo | async)?.elementsPerPage, currentPage: (pageInfo | async)?.currentPage, totalItems: (pageInfo | async)?.totalElements }">
-            <ds-wrapper-list-element [object]="object"></ds-wrapper-list-element>
-        </li>
-    </ul>
-    <ds-error *ngIf="objects.hasFailed | async" message="Error fetching"></ds-error>
-    <ds-loading *ngIf="objects.isLoading | async" message="Loading..."></ds-loading>
+<ds-pagination
+  [paginationOptions]="config"
+  [pageInfoState]="pageInfo"
+  [collectionSize]="(pageInfo | async)?.totalElements"
+  [sortOptions]="sortConfig"
+  [hideGear]="hideGear"
+  [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
+  (pageChange)="onPageChange($event)"
+  (pageSizeChange)="onPageSizeChange($event)"
+  (sortDirectionChange)="onSortDirectionChange($event)"
+  (sortFieldChange)="onSortDirectionChange($event)"
+  (paginationChange)="onPaginationChange($event)">
+  <ul *ngIf="objects.hasSucceeded | async" @fadeIn> <!--class="list-unstyled"-->
+      <li *ngFor="let object of (objects.payload | async) | paginate: { itemsPerPage: (pageInfo | async)?.elementsPerPage, currentPage: (pageInfo | async)?.currentPage, totalItems: (pageInfo | async)?.totalElements }">
+          <ds-wrapper-list-element [object]="object"></ds-wrapper-list-element>
+      </li>
+  </ul>
+  <ds-error *ngIf="objects.hasFailed | async" message="Error fetching"></ds-error>
+  <ds-loading *ngIf="objects.isLoading | async" message="Loading..."></ds-loading>
 </ds-pagination>
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/object-list/object-list.component.ts
similarity index 80%
rename from src/app/shared/object-list/object-list.component.ts
rename to src/app/object-list/object-list.component.ts
index dbc0c3b75c..c3a42a2e2a 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/object-list/object-list.component.ts
@@ -10,23 +10,23 @@ import {
 
 import { Observable } from 'rxjs/Observable';
 
-import { RemoteData } from '../../core/data/remote-data';
-import { PageInfo } from '../../core/shared/page-info.model';
+import { RemoteData } from '../core/data/remote-data';
+import { PageInfo } from '../core/shared/page-info.model';
 
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 
-import { SortOptions, SortDirection } from '../../core/cache/models/sort-options.model';
-import { ListableObject } from '../../object-list/listable-object/listable-object.model';
+import { SortOptions, SortDirection } from '../core/cache/models/sort-options.model';
+import { ListableObject } from '../object-list/listable-object/listable-object.model';
 
-import { fadeIn } from '../../shared/animations/fade';
+import { fadeIn } from '../shared/animations/fade';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   selector: 'ds-object-list',
-  styleUrls: ['../../object-list/object-list.component.scss'],
-  templateUrl: '../../object-list/object-list.component.html',
-  animations:[fadeIn]
+  styleUrls: ['./object-list.component.scss'],
+  templateUrl: './object-list.component.html',
+  animations: [fadeIn]
 })
 export class ObjectListComponent implements OnChanges, OnInit {
 
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 84d0509530..a30e0f0745 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -13,7 +13,7 @@ import { Observable } from 'rxjs/Observable';
 @Component({
   selector: 'ds-search-form',
   styleUrls: ['./search-form.component.scss'],
-  templateUrl: './search-form.component.html',
+  templateUrl: './search-form.component.html'
 })
 export class SearchFormComponent {
   @Input() query: string;
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 21ca8c51c4..99634543eb 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -22,7 +22,7 @@ import { CommunityListElementComponent } from '../object-list/community-list-ele
 import { ErrorComponent } from './error/error.component';
 import { LoadingComponent } from './loading/loading.component';
 import { ItemListElementComponent } from '../object-list/item-list-element/item-list-element.component';
-import { ObjectListComponent } from './object-list/object-list.component';
+import { ObjectListComponent } from '../object-list/object-list.component';
 import { ObjectListElementComponent } from '../object-list/object-list-element/object-list-element.component';
 import { PaginationComponent } from './pagination/pagination.component';
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component';

From 88ec5e8db9c68e8b5766bf8855804e03e1aa2d83 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Wed, 4 Oct 2017 20:12:50 -0500
Subject: [PATCH 24/40] Update item-page.component.ts

---
 src/app/+item-page/simple/item-page.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/+item-page/simple/item-page.component.ts b/src/app/+item-page/simple/item-page.component.ts
index 84b76a5fb5..8f1bd18b4e 100644
--- a/src/app/+item-page/simple/item-page.component.ts
+++ b/src/app/+item-page/simple/item-page.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { animate, state, transition, trigger, style, keyframes } from '@angular/animations';
 
 import { Observable } from 'rxjs/Observable';
 

From 5b45871bffc0010da9e25291efed72a44889d217 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@outlook.com>
Date: Thu, 5 Oct 2017 05:59:01 -0500
Subject: [PATCH 25/40] adding i18n to loading and errror messages (wip)

---
 resources/i18n/en.json                        | 20 +++++++++++
 ...ty-page-sub-collection-list.component.html |  4 +--
 .../full/full-item-page.component.html        | 34 ++++++++++---------
 src/app/shared/error/error.component.html     |  2 +-
 src/app/shared/error/error.component.spec.ts  |  4 +--
 src/app/shared/loading/loading.component.html |  2 +-
 .../shared/loading/loading.component.spec.ts  |  4 +--
 7 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index c605d76961..2dfaa4dfb1 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -78,5 +78,25 @@
     "results": {
       "title": "Search Results"
     }
+  },
+  "loader": {
+    "default": "Loading...",
+    "top-level-communities": "Loading top level communities...",
+    "community": "Loading community...",
+    "collection": "Loading collection...",
+    "sub-collection": "Loading sub-collections...",
+    "items": "Loading items...",
+    "item": "Loading item...",
+    "object-list": "Loading..."
+  },
+  "error": {
+    "default": "Error...",
+    "top-level-communities": "Error fetching top level communities",
+    "community": "Error fetching community",
+    "collection": "Error fetching collection",
+    "sub-collection": "Error fetching sub-collections",
+    "items": "Error fetching items",
+    "item": "Error fetching item",
+    "object-list": "Error fetching"
   }
 }
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
index 82ae6bd3e1..4a965d908f 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
@@ -9,5 +9,5 @@
     </li>
   </ul>
 </div>
-<ds-error *ngIf="subCollections.hasFailed | async" message="Error fetching sub collections"></ds-error>
-<ds-loading *ngIf="subCollections.isLoading | async" message="Loading sub collections..."></ds-loading>
+<ds-error *ngIf="subCollections.hasFailed | async" message="Error fetching sub-collections"></ds-error>
+<ds-loading *ngIf="subCollections.isLoading | async" message="Loading sub-collections..."></ds-loading>
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index bc8ee3f3a8..51979ebe3f 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -1,21 +1,23 @@
 <div class="item-page" *ngIf="item.hasSucceeded | async" @fadeInOut>
-  <ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
-  <div class="simple-view-link">
-    <a class="btn btn-outline-primary col-4" [routerLink]="['/items/' + (item.payload | async)?.id]">
-      {{"item.page.link.simple" | translate}}
-    </a>
+  <div *ngIf="item.payload | async; let itemPayload">
+    <ds-item-page-title-field [item]="itemPayload | async"></ds-item-page-title-field>
+    <div class="simple-view-link">
+      <a class="btn btn-outline-primary col-4" [routerLink]="['/items/' + itemPayload.id]">
+        {{"item.page.link.simple" | translate}}
+      </a>
+    </div>
+    <table class="table table-responsive table-striped">
+      <tbody>
+        <tr *ngFor="let metadatum of (metadata | async)">
+          <td>{{metadatum.key}}</td>
+          <td>{{metadatum.value}}</td>
+          <td>{{metadatum.language}}</td>
+        </tr>
+      </tbody>
+    </table>
+    <ds-item-page-full-file-section [item]="itemPayload"></ds-item-page-full-file-section>
+    <ds-item-page-collections [item]="itemPayload"></ds-item-page-collections>
   </div>
-  <table class="table table-responsive table-striped">
-    <tbody>
-      <tr *ngFor="let metadatum of (metadata | async)">
-        <td>{{metadatum.key}}</td>
-        <td>{{metadatum.value}}</td>
-        <td>{{metadatum.language}}</td>
-      </tr>
-    </tbody>
-  </table>
-  <ds-item-page-full-file-section [item]="item.payload | async"></ds-item-page-full-file-section>
-  <ds-item-page-collections [item]="item.payload | async"></ds-item-page-collections>
 </div>
 <ds-error *ngIf="item.hasFailed | async" message="Error fetching item"></ds-error>
 <ds-loading *ngIf="item.isLoading | async" message="Loading item..."></ds-loading>
diff --git a/src/app/shared/error/error.component.html b/src/app/shared/error/error.component.html
index 83b189b6fe..d41760e258 100644
--- a/src/app/shared/error/error.component.html
+++ b/src/app/shared/error/error.component.html
@@ -1,3 +1,3 @@
 <div>
-  <span>{{ message }}</span>
+  <label>{{ message }}</label>
 </div>
diff --git a/src/app/shared/error/error.component.spec.ts b/src/app/shared/error/error.component.spec.ts
index 1417d3ffe7..73a4e5a26e 100644
--- a/src/app/shared/error/error.component.spec.ts
+++ b/src/app/shared/error/error.component.spec.ts
@@ -22,8 +22,8 @@ describe('ErrorComponent (inline template)', () => {
 
     comp = fixture.componentInstance; // ErrorComponent test instance
 
-    // query for the message <span> by CSS element selector
-    de = fixture.debugElement.query(By.css('span'));
+    // query for the message <label> by CSS element selector
+    de = fixture.debugElement.query(By.css('label'));
     el = de.nativeElement;
   });
 
diff --git a/src/app/shared/loading/loading.component.html b/src/app/shared/loading/loading.component.html
index c5faa49365..4f6b1a34fa 100644
--- a/src/app/shared/loading/loading.component.html
+++ b/src/app/shared/loading/loading.component.html
@@ -1,5 +1,5 @@
 <div>
-  <span>{{ message }}</span>
+  <label>{{ message }}</label>
   <div class="loader">
     <span class="l-1"></span>
     <span class="l-2"></span>
diff --git a/src/app/shared/loading/loading.component.spec.ts b/src/app/shared/loading/loading.component.spec.ts
index e407083479..ed39708fbe 100644
--- a/src/app/shared/loading/loading.component.spec.ts
+++ b/src/app/shared/loading/loading.component.spec.ts
@@ -22,8 +22,8 @@ describe('LoadingComponent (inline template)', () => {
 
     comp = fixture.componentInstance; // LoadingComponent test instance
 
-    // query for the message <span> by CSS element selector
-    de = fixture.debugElement.query(By.css('span'));
+    // query for the message <label> by CSS element selector
+    de = fixture.debugElement.query(By.css('label'));
     el = de.nativeElement;
   });
 

From cb72e4db0749e8ae74e3f8151b50535bbaa911ca Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Thu, 5 Oct 2017 08:24:19 -0500
Subject: [PATCH 26/40] initial i18n messages for loading and error components

---
 resources/i18n/en.json                        | 12 ++++----
 .../collection-page.component.html            |  8 ++---
 .../community-page.component.html             |  4 +--
 ...ty-page-sub-collection-list.component.html |  4 +--
 .../top-level-community-list.component.html   |  4 +--
 .../full/full-item-page.component.html        |  4 +--
 .../simple/item-page.component.html           |  4 +--
 .../object-list/object-list.component.html    |  4 +--
 src/app/shared/error/error.component.spec.ts  | 13 ++++++++
 src/app/shared/error/error.component.ts       | 24 +++++++++++++++
 src/app/shared/loading/loading.component.scss |  3 +-
 .../shared/loading/loading.component.spec.ts  | 13 ++++++++
 src/app/shared/loading/loading.component.ts   | 30 +++++++++++++++++--
 13 files changed, 101 insertions(+), 26 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 2dfaa4dfb1..e59f758ebc 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -79,24 +79,24 @@
       "title": "Search Results"
     }
   },
-  "loader": {
+  "loading": {
     "default": "Loading...",
     "top-level-communities": "Loading top level communities...",
     "community": "Loading community...",
     "collection": "Loading collection...",
-    "sub-collection": "Loading sub-collections...",
+    "sub-collections": "Loading sub-collections...",
     "items": "Loading items...",
     "item": "Loading item...",
-    "object-list": "Loading..."
+    "objects": "Loading..."
   },
   "error": {
-    "default": "Error...",
+    "default": "Error",
     "top-level-communities": "Error fetching top level communities",
     "community": "Error fetching community",
     "collection": "Error fetching collection",
-    "sub-collection": "Error fetching sub-collections",
+    "sub-collections": "Error fetching sub-collections",
     "items": "Error fetching items",
     "item": "Error fetching item",
-    "object-list": "Error fetching"
+    "objects": "Error fetching"
   }
 }
diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 5037da99c4..e385de08b4 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -33,8 +33,8 @@
       </ds-comcol-page-content>
     </div>
   </div>
-  <ds-error *ngIf="collectionData.hasFailed | async" message="Error fetching collection"></ds-error>
-  <ds-loading *ngIf="collectionData.isLoading | async" message="Loading collection..."></ds-loading>
+  <ds-error *ngIf="collectionData.hasFailed | async" message="{{'error.collection' | translate}}"></ds-error>
+  <ds-loading *ngIf="collectionData.isLoading | async" message="{{'loading.collection' | translate}}"></ds-loading>
   <br>
   <div *ngIf="itemData.hasSucceeded | async" @fadeIn>
     <h2>{{'collection.page.browse.recent.head' | translate}}</h2>
@@ -45,6 +45,6 @@
       [hideGear]="false">
     </ds-object-list>
   </div>
-  <ds-error *ngIf="itemData.hasFailed | async" message="Error fetching items"></ds-error>
-  <ds-loading *ngIf="itemData.isLoading | async" message="Loading items..."></ds-loading>
+  <ds-error *ngIf="itemData.hasFailed | async" message="{{'error.items' | translate}}"></ds-error>
+  <ds-loading *ngIf="itemData.isLoading | async" message="{{'loading.items' | translate}}"></ds-loading>
 </div>
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index 6795058d02..3935ffccae 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -26,5 +26,5 @@
     <ds-community-page-sub-collection-list></ds-community-page-sub-collection-list>
   </div>
 </div>
-<ds-error *ngIf="communityData.hasFailed | async" message="Error fetching community"></ds-error>
-<ds-loading *ngIf="communityData.isLoading | async" message="Loading community..."></ds-loading>
+<ds-error *ngIf="communityData.hasFailed | async" message="{{'error.community' | translate}}"></ds-error>
+<ds-loading *ngIf="communityData.isLoading | async" message="{{'loading.community' | translate}}"></ds-loading>
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
index 4a965d908f..31dc2cd326 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
@@ -9,5 +9,5 @@
     </li>
   </ul>
 </div>
-<ds-error *ngIf="subCollections.hasFailed | async" message="Error fetching sub-collections"></ds-error>
-<ds-loading *ngIf="subCollections.isLoading | async" message="Loading sub-collections..."></ds-loading>
+<ds-error *ngIf="subCollections.hasFailed | async" message="{{'error.sub-collections' | translate}}"></ds-error>
+<ds-loading *ngIf="subCollections.isLoading | async" message="{{'loading.sub-collections' | translate}}"></ds-loading>
diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.html b/src/app/+home-page/top-level-community-list/top-level-community-list.component.html
index 69df3b99d0..a5bd6c5c5d 100644
--- a/src/app/+home-page/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.html
@@ -9,5 +9,5 @@
     (paginationChange)="updatePage($event)">
   </ds-object-list>
 </div>
-<ds-error *ngIf="topLevelCommunities.hasFailed | async" message="Error fetching top level communities"></ds-error>
-<ds-loading *ngIf="topLevelCommunities.isLoading | async" message="Loading top level communities..."></ds-loading>
\ No newline at end of file
+<ds-error *ngIf="topLevelCommunities.hasFailed | async" message="{{'error.top-level-communites' | translate}}"></ds-error>
+<ds-loading *ngIf="topLevelCommunities.isLoading | async" message="{{'loading.top-level-communities' | translate}}"></ds-loading>
\ No newline at end of file
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index 51979ebe3f..6a209566b7 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -19,5 +19,5 @@
     <ds-item-page-collections [item]="itemPayload"></ds-item-page-collections>
   </div>
 </div>
-<ds-error *ngIf="item.hasFailed | async" message="Error fetching item"></ds-error>
-<ds-loading *ngIf="item.isLoading | async" message="Loading item..."></ds-loading>
+<ds-error *ngIf="item.hasFailed | async" message="{{'error.item' | translate}}"></ds-error>
+<ds-loading *ngIf="item.isLoading | async" message="{{'loading.item' | translate}}"></ds-loading>
diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/+item-page/simple/item-page.component.html
index 8b41c9017d..10ceec2a6f 100644
--- a/src/app/+item-page/simple/item-page.component.html
+++ b/src/app/+item-page/simple/item-page.component.html
@@ -23,5 +23,5 @@
     </div>
   </div>
 </div>
-<ds-error *ngIf="item.hasFailed | async" message="Error fetching item"></ds-error>
-<ds-loading *ngIf="item.isLoading | async" message="Loading item..."></ds-loading>
+<ds-error *ngIf="item.hasFailed | async" message="{{'error.item' | translate}}"></ds-error>
+<ds-loading *ngIf="item.isLoading | async" message="{{'loading.item' | translate}}"></ds-loading>
diff --git a/src/app/object-list/object-list.component.html b/src/app/object-list/object-list.component.html
index 6ef14d103c..84c800fef4 100644
--- a/src/app/object-list/object-list.component.html
+++ b/src/app/object-list/object-list.component.html
@@ -15,6 +15,6 @@
           <ds-wrapper-list-element [object]="object"></ds-wrapper-list-element>
       </li>
   </ul>
-  <ds-error *ngIf="objects.hasFailed | async" message="Error fetching"></ds-error>
-  <ds-loading *ngIf="objects.isLoading | async" message="Loading..."></ds-loading>
+  <ds-error *ngIf="objects.hasFailed | async" message="{{'error.objects' | translate}}"></ds-error>
+  <ds-loading *ngIf="objects.isLoading | async" message="{{'loading.objects' | translate}}"></ds-loading>
 </ds-pagination>
diff --git a/src/app/shared/error/error.component.spec.ts b/src/app/shared/error/error.component.spec.ts
index 73a4e5a26e..a0226f7f86 100644
--- a/src/app/shared/error/error.component.spec.ts
+++ b/src/app/shared/error/error.component.spec.ts
@@ -2,6 +2,10 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 
+import { TranslateModule, TranslateLoader, TranslateService } from '@ngx-translate/core';
+
+import { MockTranslateLoader } from '../testing/mock-translate-loader';
+
 import { ErrorComponent } from './error.component';
 
 describe('ErrorComponent (inline template)', () => {
@@ -13,7 +17,16 @@ describe('ErrorComponent (inline template)', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: MockTranslateLoader
+          }
+        }),
+      ],
       declarations: [ ErrorComponent ], // declare the test component
+      providers: [ TranslateService ]
     }).compileComponents();  // compile template and css
   }));
 
diff --git a/src/app/shared/error/error.component.ts b/src/app/shared/error/error.component.ts
index b65979f7b0..08d06c31d6 100644
--- a/src/app/shared/error/error.component.ts
+++ b/src/app/shared/error/error.component.ts
@@ -1,5 +1,9 @@
 import { Component, Input } from '@angular/core';
 
+import { TranslateService } from '@ngx-translate/core';
+
+import { Subscription } from 'rxjs/Subscription';
+
 @Component({
   selector: 'ds-error',
   styleUrls: ['./error.component.scss'],
@@ -9,4 +13,24 @@ export class ErrorComponent {
 
   @Input() message = 'Error...';
 
+  private subscription: Subscription;
+
+  constructor(private translate: TranslateService) {
+
+  }
+
+  ngOnInit() {
+    if (this.message === undefined) {
+      this.subscription = this.translate.get('error.default').subscribe((message: string) => {
+        this.message = message;
+      });
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.subscription !== undefined) {
+      this.subscription.unsubscribe();
+    }
+  }
+
 }
diff --git a/src/app/shared/loading/loading.component.scss b/src/app/shared/loading/loading.component.scss
index bb98849cae..c9ccb5b2fa 100644
--- a/src/app/shared/loading/loading.component.scss
+++ b/src/app/shared/loading/loading.component.scss
@@ -8,7 +8,8 @@ span {
 }
 
 span[class*="l-"] {
-	height: 4px; width: 4px;
+	height: 4px;
+	width: 4px;
 	background: #000;
 	display: inline-block;
 	margin: 12px 2px;
diff --git a/src/app/shared/loading/loading.component.spec.ts b/src/app/shared/loading/loading.component.spec.ts
index ed39708fbe..0b758b8218 100644
--- a/src/app/shared/loading/loading.component.spec.ts
+++ b/src/app/shared/loading/loading.component.spec.ts
@@ -2,6 +2,10 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 
+import { TranslateModule, TranslateLoader, TranslateService } from '@ngx-translate/core';
+
+import { MockTranslateLoader } from '../testing/mock-translate-loader';
+
 import { LoadingComponent } from './loading.component';
 
 describe('LoadingComponent (inline template)', () => {
@@ -13,7 +17,16 @@ describe('LoadingComponent (inline template)', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: MockTranslateLoader
+          }
+        }),
+      ],
       declarations: [ LoadingComponent ], // declare the test component
+      providers: [ TranslateService ]
     }).compileComponents();  // compile template and css
   }));
 
diff --git a/src/app/shared/loading/loading.component.ts b/src/app/shared/loading/loading.component.ts
index 6bc7d99f4b..8276ab574a 100644
--- a/src/app/shared/loading/loading.component.ts
+++ b/src/app/shared/loading/loading.component.ts
@@ -1,12 +1,36 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+
+import { TranslateService } from '@ngx-translate/core';
+
+import { Subscription } from 'rxjs/Subscription';
 
 @Component({
   selector: 'ds-loading',
   styleUrls: ['./loading.component.scss'],
   templateUrl: './loading.component.html'
 })
-export class LoadingComponent {
+export class LoadingComponent implements OnDestroy, OnInit {
 
-  @Input() message = 'Loading...';
+  @Input() message: string;
+
+  private subscription: Subscription;
+
+  constructor(private translate: TranslateService) {
+
+  }
+
+  ngOnInit() {
+    if (this.message === undefined) {
+      this.subscription = this.translate.get('loading.default').subscribe((message: string) => {
+        this.message = message;
+      });
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.subscription !== undefined) {
+      this.subscription.unsubscribe();
+    }
+  }
 
 }

From fca61830c3dc7947cdfa4d47d138e28db2cd4803 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Thu, 5 Oct 2017 08:28:06 -0500
Subject: [PATCH 27/40] removed async pipe against local variable

---
 src/app/+item-page/full/full-item-page.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index 6a209566b7..7b25f88753 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -1,6 +1,6 @@
 <div class="item-page" *ngIf="item.hasSucceeded | async" @fadeInOut>
   <div *ngIf="item.payload | async; let itemPayload">
-    <ds-item-page-title-field [item]="itemPayload | async"></ds-item-page-title-field>
+    <ds-item-page-title-field [item]="itemPayload"></ds-item-page-title-field>
     <div class="simple-view-link">
       <a class="btn btn-outline-primary col-4" [routerLink]="['/items/' + itemPayload.id]">
         {{"item.page.link.simple" | translate}}

From 595a741df724d62ffa63b49872e3e9004ae55c25 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Thu, 5 Oct 2017 08:43:56 -0500
Subject: [PATCH 28/40] Update en.json

---
 resources/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index e59f758ebc..3388190295 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -97,6 +97,6 @@
     "sub-collections": "Error fetching sub-collections",
     "items": "Error fetching items",
     "item": "Error fetching item",
-    "objects": "Error fetching"
+    "objects": "Error fetching objects"
   }
 }

From 04f2878bd7a193ce324a5d2e8356221ce74e5884 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Thu, 5 Oct 2017 10:09:11 -0500
Subject: [PATCH 29/40] using itemsRD observables

---
 src/app/+search-page/search.service.ts | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/app/+search-page/search.service.ts b/src/app/+search-page/search.service.ts
index caf6e18076..fce3ca2bfb 100644
--- a/src/app/+search-page/search.service.ts
+++ b/src/app/+search-page/search.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 
 import { Observable } from 'rxjs/Observable';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { Item } from '../core/shared/item.model';
@@ -69,11 +68,6 @@ export class SearchService {
       self += `&sortField=${searchOptions.sort.field}`;
     }
 
-    const requestPendingSubject = new BehaviorSubject<boolean>(true);
-    const responsePendingSubject = new BehaviorSubject<boolean>(false);
-
-    const requestPending = requestPendingSubject.asObservable();
-    const responsePending = responsePendingSubject.asObservable();
     const errorMessage = Observable.of(undefined);
     const statusCode = Observable.of('200');
     const returningPageInfo = new PageInfo();
@@ -94,7 +88,7 @@ export class SearchService {
 
     const pageInfo = itemsRD.pageInfo.map((info: PageInfo) => {
       const totalElements = info.totalElements > 20 ? 20 : info.totalElements;
-      return Object.assign({}, info, {totalElements: totalElements});
+      return Object.assign({}, info, { totalElements: totalElements });
     });
 
     const payload = itemsRD.payload.map((items: Item[]) => {
@@ -110,15 +104,10 @@ export class SearchService {
         });
     });
 
-    itemsRD.hasSucceeded.subscribe((success: boolean) => {
-      requestPendingSubject.next(!success);
-      responsePendingSubject.next(!success);
-    });
-
     return new RemoteData(
       Observable.of(self),
-      requestPending,
-      responsePending,
+      itemsRD.isRequestPending,
+      itemsRD.isResponsePending,
       itemsRD.hasSucceeded,
       errorMessage,
       statusCode,

From 7b6546641d825014a24db40f663891f591abf1d9 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Fri, 6 Oct 2017 09:27:34 +0200
Subject: [PATCH 30/40] Fixed issue with e2e test after merging

---
 e2e/search-page/search-page.e2e-spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/e2e/search-page/search-page.e2e-spec.ts b/e2e/search-page/search-page.e2e-spec.ts
index 421781f585..dde4e1a054 100644
--- a/e2e/search-page/search-page.e2e-spec.ts
+++ b/e2e/search-page/search-page.e2e-spec.ts
@@ -32,6 +32,7 @@ describe('protractor SearchPage', () => {
     scope.then((scopeString: string) => {
       page.setCurrentScope(scopeString);
       page.submitSearchForm();
+      browser.sleep(10);
       browser.getCurrentUrl().then((url: string) => {
         expect(url.indexOf('scope=' + encodeURI(scopeString))).toBeGreaterThanOrEqual(0);
       });
@@ -42,6 +43,7 @@ describe('protractor SearchPage', () => {
     const queryString = 'Another interesting query string';
     page.setCurrentQuery(queryString);
     page.submitSearchForm();
+    browser.sleep(10);
     browser.getCurrentUrl().then((url: string) => {
       expect(url.indexOf('query=' + encodeURI(queryString))).toBeGreaterThanOrEqual(0);
     });

From 888aed46186145957fc06b105451a2a06b2d023b Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Fri, 6 Oct 2017 10:03:41 +0200
Subject: [PATCH 31/40] changed sleep to wait callback

---
 e2e/search-page/search-page.e2e-spec.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/e2e/search-page/search-page.e2e-spec.ts b/e2e/search-page/search-page.e2e-spec.ts
index dde4e1a054..cb9c92a87b 100644
--- a/e2e/search-page/search-page.e2e-spec.ts
+++ b/e2e/search-page/search-page.e2e-spec.ts
@@ -32,9 +32,10 @@ describe('protractor SearchPage', () => {
     scope.then((scopeString: string) => {
       page.setCurrentScope(scopeString);
       page.submitSearchForm();
-      browser.sleep(10);
-      browser.getCurrentUrl().then((url: string) => {
-        expect(url.indexOf('scope=' + encodeURI(scopeString))).toBeGreaterThanOrEqual(0);
+      browser.wait(() => {
+        return browser.getCurrentUrl().then((url: string) => {
+          return url.indexOf('scope=' + encodeURI(scopeString)) !== -1;
+        });
       });
     });
   });
@@ -43,9 +44,10 @@ describe('protractor SearchPage', () => {
     const queryString = 'Another interesting query string';
     page.setCurrentQuery(queryString);
     page.submitSearchForm();
-    browser.sleep(10);
-    browser.getCurrentUrl().then((url: string) => {
-      expect(url.indexOf('query=' + encodeURI(queryString))).toBeGreaterThanOrEqual(0);
+    browser.wait(() => {
+      return browser.getCurrentUrl().then((url: string) => {
+        return url.indexOf('query=' + encodeURI(queryString)) !== -1;
+      });
     });
   });
 });

From 5c77aee1a2afbdd7a232869151cbdcfae1fb9dbc Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Fri, 6 Oct 2017 11:37:38 +0200
Subject: [PATCH 32/40] Fixed e2e search page test

---
 e2e/search-page/search-page.po.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2e/search-page/search-page.po.ts b/e2e/search-page/search-page.po.ts
index b5e43dcf82..b1a17ee150 100644
--- a/e2e/search-page/search-page.po.ts
+++ b/e2e/search-page/search-page.po.ts
@@ -39,8 +39,8 @@ export class ProtractorPage {
   getRandomScopeOption(): promise.Promise<string> {
     const options = element(by.css('select[name="scope"]')).all(by.tagName('option'));
     return options.count().then((c: number) => {
-      const index: number = Math.floor(Math.random() * c);
-      return options.get(index).getAttribute('value');
+      const index: number = Math.floor(Math.random() * (c - 1));
+      return options.get(index + 1).getAttribute('value');
     });
   }
 

From f5a291e8e08fe131e7f7ad4465789c2617cc5e68 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Tue, 3 Oct 2017 13:46:00 +0200
Subject: [PATCH 33/40] 44835: added facet/filter methods to search service

---
 src/app/+search-page/search-page.component.ts |  15 ++-
 src/app/+search-page/search-page.module.ts    |   2 +-
 .../search-service/facet-value.model.ts       |   7 ++
 .../search-service/filter-type.model.ts       |   5 +
 .../search-filter-config.model.ts             |   9 ++
 .../{ => search-service}/search.service.ts    | 100 +++++++++++++++---
 6 files changed, 120 insertions(+), 18 deletions(-)
 create mode 100644 src/app/+search-page/search-service/facet-value.model.ts
 create mode 100644 src/app/+search-page/search-service/filter-type.model.ts
 create mode 100644 src/app/+search-page/search-service/search-filter-config.model.ts
 rename src/app/+search-page/{ => search-service}/search.service.ts (56%)

diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index 16fe86c018..fc045085d4 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { SearchService } from './search.service';
+import { SearchService } from './search-service/search.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../core/data/remote-data';
 import { SearchResult } from './search-result.model';
@@ -10,6 +10,8 @@ import { SearchOptions } from './search-options.model';
 import { CommunityDataService } from '../core/data/community-data.service';
 import { isNotEmpty } from '../shared/empty.util';
 import { Community } from '../core/shared/community.model';
+import { SearchFilterConfig } from './search-service/search-filter-config.model';
+import { FacetValue } from './search-service/facet-value.model';
 
 /**
  * This component renders a simple item page.
@@ -47,6 +49,13 @@ export class SearchPageComponent implements OnInit, OnDestroy {
     pagination.pageSize = 10;
     const sort: SortOptions = new SortOptions();
     this.searchOptions = { pagination: pagination, sort: sort };
+    this.service.getConfig().payload.subscribe((filters: SearchFilterConfig[]) => {
+      console.log(filters)
+    });
+    this.service.getFacetValuesFor('scope').payload.subscribe((values: FacetValue[]) => console.log(values));
+    this.service.getFacetValuesFor('author').payload.subscribe((values: FacetValue[]) => console.log(values));
+    this.service.getFacetValuesFor('date').payload.subscribe((values: FacetValue[]) => console.log(values));
+    this.service.getFacetValuesFor('subject').payload.subscribe((values: FacetValue[]) => console.log(values));
   }
 
   ngOnInit(): void {
@@ -57,8 +66,8 @@ export class SearchPageComponent implements OnInit, OnDestroy {
           this.currentParams = params;
           this.query = params.query || '';
           this.scope = params.scope;
-          const page = +params.page  || this.searchOptions.pagination.currentPage;
-          const pageSize = +params.pageSize  || this.searchOptions.pagination.pageSize;
+          const page = +params.page || this.searchOptions.pagination.currentPage;
+          const pageSize = +params.pageSize || this.searchOptions.pagination.pageSize;
           const sortDirection = +params.sortDirection || this.searchOptions.sort.direction;
           const pagination = Object.assign({},
             this.searchOptions.pagination,
diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts
index 7cb5f6cbe6..bfb7db89be 100644
--- a/src/app/+search-page/search-page.module.ts
+++ b/src/app/+search-page/search-page.module.ts
@@ -11,7 +11,7 @@ import { SearchResultsComponent } from './search-results/search-results.componen
 import { ItemSearchResultListElementComponent } from '../object-list/search-result-list-element/item-search-result/item-search-result-list-element.component';
 import { CollectionSearchResultListElementComponent } from '../object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
 import { CommunitySearchResultListElementComponent } from '../object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
-import { SearchService } from './search.service';
+import { SearchService } from './search-service/search.service';
 
 @NgModule({
   imports: [
diff --git a/src/app/+search-page/search-service/facet-value.model.ts b/src/app/+search-page/search-service/facet-value.model.ts
new file mode 100644
index 0000000000..a323970bc7
--- /dev/null
+++ b/src/app/+search-page/search-service/facet-value.model.ts
@@ -0,0 +1,7 @@
+
+export class FacetValue {
+
+  value: string;
+  count: number;
+  search: string;
+}
diff --git a/src/app/+search-page/search-service/filter-type.model.ts b/src/app/+search-page/search-service/filter-type.model.ts
new file mode 100644
index 0000000000..fba0edfac4
--- /dev/null
+++ b/src/app/+search-page/search-service/filter-type.model.ts
@@ -0,0 +1,5 @@
+export enum FilterType {
+  text,
+  range,
+  hierarchy
+}
diff --git a/src/app/+search-page/search-service/search-filter-config.model.ts b/src/app/+search-page/search-service/search-filter-config.model.ts
new file mode 100644
index 0000000000..2e26f41992
--- /dev/null
+++ b/src/app/+search-page/search-service/search-filter-config.model.ts
@@ -0,0 +1,9 @@
+import { FilterType } from './filter-type.model';
+
+export class SearchFilterConfig {
+
+  name: string;
+  type: FilterType;
+  hasFacets: boolean;
+  isOpenByDefault: boolean;
+}
diff --git a/src/app/+search-page/search.service.ts b/src/app/+search-page/search-service/search.service.ts
similarity index 56%
rename from src/app/+search-page/search.service.ts
rename to src/app/+search-page/search-service/search.service.ts
index fce3ca2bfb..db2c3b597f 100644
--- a/src/app/+search-page/search.service.ts
+++ b/src/app/+search-page/search-service/search.service.ts
@@ -1,19 +1,18 @@
 import { Injectable } from '@angular/core';
-
+import { RemoteData } from '../../core/data/remote-data';
 import { Observable } from 'rxjs/Observable';
-
-import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { Item } from '../core/shared/item.model';
-import { ItemSearchResult } from '../object-list/search-result-list-element/item-search-result/item-search-result.model';
-import { Metadatum } from '../core/shared/metadatum.model';
-import { PageInfo } from '../core/shared/page-info.model';
-import { RemoteData } from '../core/data/remote-data';
-import { SearchOptions } from './search-options.model';
-import { SearchResult } from './search-result.model';
-
-import { ItemDataService } from '../core/data/item-data.service';
-
-import { hasValue, isNotEmpty } from '../shared/empty.util';
+import { SearchResult } from '../search-result.model';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { SearchOptions } from '../search-options.model';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { Metadatum } from '../../core/shared/metadatum.model';
+import { Item } from '../../core/shared/item.model';
+import { ItemSearchResult } from '../../object-list/search-result-list-element/item-search-result/item-search-result.model';
+import { SearchFilterConfig } from './search-filter-config.model';
+import { FilterType } from './filter-type.model';
+import { FacetValue } from './facet-value.model';
 
 function shuffle(array: any[]) {
   let i = 0;
@@ -46,6 +45,33 @@ export class SearchService {
     '<em>The QSAR DataBank (QsarDB) repository</em>',
   );
 
+  config: SearchFilterConfig[] = [
+    {
+      name: 'scope',
+      type: FilterType.hierarchy,
+      hasFacets: true,
+      isOpenByDefault: true
+    },
+    {
+      name: 'author',
+      type: FilterType.text,
+      hasFacets: true,
+      isOpenByDefault: false
+    },
+    {
+      name: 'date',
+      type: FilterType.range,
+      hasFacets: true,
+      isOpenByDefault: false
+    },
+    {
+      name: 'subject',
+      type: FilterType.text,
+      hasFacets: false,
+      isOpenByDefault: false
+    }
+  ];
+
   constructor(private itemDataService: ItemDataService) {
 
   }
@@ -116,4 +142,50 @@ export class SearchService {
     )
   }
 
+  getConfig(): RemoteData<SearchFilterConfig[]> {
+    const requestPending = Observable.of(false);
+    const responsePending = Observable.of(false);
+    const isSuccessful = Observable.of(true);
+    const errorMessage = Observable.of(undefined);
+    const statusCode = Observable.of('200');
+    const returningPageInfo = Observable.of(new PageInfo());
+    return new RemoteData(
+      Observable.of('https://dspace7.4science.it/dspace-spring-rest/api/search'),
+      requestPending,
+      responsePending,
+      isSuccessful,
+      errorMessage,
+      statusCode,
+      returningPageInfo,
+      Observable.of(this.config)
+    );
+  }
+
+  getFacetValuesFor(searchFilterConfigName: string): RemoteData<FacetValue[]> {
+    const values: FacetValue[] = [];
+    for (let i = 0; i < 5; i++) {
+      const value = searchFilterConfigName + ' ' + (i + 1);
+      values.push({
+        value: value,
+        count: Math.floor(Math.random() * 20) + 20 * (5 - i), // make sure first results have the highest (random) count
+        search: 'https://dspace7.4science.it/dspace-spring-rest/api/search?query=' + searchFilterConfigName + ':' + encodeURI(value)
+      });
+    }
+    const requestPending = Observable.of(false);
+    const responsePending = Observable.of(false);
+    const isSuccessful = Observable.of(true);
+    const errorMessage = Observable.of(undefined);
+    const statusCode = Observable.of('200');
+    const returningPageInfo = Observable.of(new PageInfo());
+    return new RemoteData(
+      Observable.of('https://dspace7.4science.it/dspace-spring-rest/api/search'),
+      requestPending,
+      responsePending,
+      isSuccessful,
+      errorMessage,
+      statusCode,
+      returningPageInfo,
+      Observable.of(values)
+    );
+  }
 }

From 350fa1e31db0408f46bcb3256e94ec05f289e867 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Tue, 3 Oct 2017 13:49:03 +0200
Subject: [PATCH 34/40] 44835: removed console tests

---
 src/app/+search-page/search-page.component.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index fc045085d4..f4ca81c67d 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -49,13 +49,6 @@ export class SearchPageComponent implements OnInit, OnDestroy {
     pagination.pageSize = 10;
     const sort: SortOptions = new SortOptions();
     this.searchOptions = { pagination: pagination, sort: sort };
-    this.service.getConfig().payload.subscribe((filters: SearchFilterConfig[]) => {
-      console.log(filters)
-    });
-    this.service.getFacetValuesFor('scope').payload.subscribe((values: FacetValue[]) => console.log(values));
-    this.service.getFacetValuesFor('author').payload.subscribe((values: FacetValue[]) => console.log(values));
-    this.service.getFacetValuesFor('date').payload.subscribe((values: FacetValue[]) => console.log(values));
-    this.service.getFacetValuesFor('subject').payload.subscribe((values: FacetValue[]) => console.log(values));
   }
 
   ngOnInit(): void {

From 105f25f4f16f1efe75aca651049c9c7bfdc9c489 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Thu, 5 Oct 2017 14:55:17 +0200
Subject: [PATCH 35/40] 44835: added paramName to search filter config

---
 .../search-service/search-filter-config.model.ts |  7 +++++++
 .../search-service/search.service.ts             | 16 ++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/app/+search-page/search-service/search-filter-config.model.ts b/src/app/+search-page/search-service/search-filter-config.model.ts
index 2e26f41992..2335e1bb25 100644
--- a/src/app/+search-page/search-service/search-filter-config.model.ts
+++ b/src/app/+search-page/search-service/search-filter-config.model.ts
@@ -6,4 +6,11 @@ export class SearchFilterConfig {
   type: FilterType;
   hasFacets: boolean;
   isOpenByDefault: boolean;
+  /**
+   * Name of this configuration that can be used in a url
+   * @returns Parameter name
+   */
+  get paramName(): string {
+    return 'f.' + this.name;
+  }
 }
diff --git a/src/app/+search-page/search-service/search.service.ts b/src/app/+search-page/search-service/search.service.ts
index db2c3b597f..e2804960ef 100644
--- a/src/app/+search-page/search-service/search.service.ts
+++ b/src/app/+search-page/search-service/search.service.ts
@@ -46,30 +46,34 @@ export class SearchService {
   );
 
   config: SearchFilterConfig[] = [
-    {
+    Object.assign(new SearchFilterConfig(),
+      {
       name: 'scope',
       type: FilterType.hierarchy,
       hasFacets: true,
       isOpenByDefault: true
-    },
+    }),
+    Object.assign(new SearchFilterConfig(),
     {
       name: 'author',
       type: FilterType.text,
       hasFacets: true,
       isOpenByDefault: false
-    },
+    }),
+    Object.assign(new SearchFilterConfig(),
     {
       name: 'date',
       type: FilterType.range,
       hasFacets: true,
       isOpenByDefault: false
-    },
+    }),
+    Object.assign(new SearchFilterConfig(),
     {
       name: 'subject',
       type: FilterType.text,
       hasFacets: false,
       isOpenByDefault: false
-    }
+    })
   ];
 
   constructor(private itemDataService: ItemDataService) {
@@ -168,7 +172,7 @@ export class SearchService {
       values.push({
         value: value,
         count: Math.floor(Math.random() * 20) + 20 * (5 - i), // make sure first results have the highest (random) count
-        search: 'https://dspace7.4science.it/dspace-spring-rest/api/search?query=' + searchFilterConfigName + ':' + encodeURI(value)
+        search: 'https://dspace7.4science.it/dspace-spring-rest/api/search?f.' + searchFilterConfigName + '=' + encodeURI(value)
       });
     }
     const requestPending = Observable.of(false);

From bca6581c5eca2a31b5597cbbc1a436ba79d26351 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Fri, 6 Oct 2017 11:05:56 +0200
Subject: [PATCH 36/40] 44835: fixed search service import

---
 src/app/+search-page/search-page.component.spec.ts | 2 +-
 src/app/+search-page/search-page.component.ts      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search-page.component.spec.ts
index 07f70cc648..a3e314db69 100644
--- a/src/app/+search-page/search-page.component.spec.ts
+++ b/src/app/+search-page/search-page.component.spec.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 import { CommunityDataService } from '../core/data/community-data.service';
 import { SearchPageComponent } from './search-page.component';
-import { SearchService } from './search.service';
+import { SearchService } from './search-service/search.service';
 import { Community } from '../core/shared/community.model';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index f4ca81c67d..639e966a9b 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { SearchService } from './search-service/search.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { RemoteData } from '../core/data/remote-data';
 import { SearchResult } from './search-result.model';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
@@ -10,8 +10,6 @@ import { SearchOptions } from './search-options.model';
 import { CommunityDataService } from '../core/data/community-data.service';
 import { isNotEmpty } from '../shared/empty.util';
 import { Community } from '../core/shared/community.model';
-import { SearchFilterConfig } from './search-service/search-filter-config.model';
-import { FacetValue } from './search-service/facet-value.model';
 
 /**
  * This component renders a simple item page.

From c71a429c4e5d1e35936317d9fad5105da64887cd Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Mon, 9 Oct 2017 07:36:29 -0500
Subject: [PATCH 37/40] add rimraf script

---
 package.json | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 02bddc485e..bcbae98ec1 100644
--- a/package.json
+++ b/package.json
@@ -12,14 +12,15 @@
   },
   "scripts": {
     "global": "npm install -g @angular/cli marked node-gyp nodemon node-nightly npm-check-updates npm-run-all rimraf typescript ts-node typedoc webpack webpack-bundle-analyzer pm2 rollup",
-    "clean:coverage": "rimraf coverage",
-    "clean:dist": "rimraf dist",
-    "clean:doc": "rimraf doc",
-    "clean:log": "rimraf *.log*",
-    "clean:json": "rimraf *.records.json",
-    "clean:node": "rimraf node_modules",
+    "clean:coverage": "yarn run rimraf coverage",
+    "clean:dist": "yarn run rimraf dist",
+    "clean:doc": "yarn run rimraf doc",
+    "clean:log": "yarn run rimraf *.log*",
+    "clean:json": "yarn run rimraf *.records.json",
+    "clean:node": "yarn run rimraf node_modules",
     "clean:prod": "yarn run clean:coverage && yarn run clean:doc && yarn run clean:dist && yarn run clean:log && yarn run clean:json",
     "clean": "yarn run clean:prod && yarn run clean:node",
+    "rimraf": "rimraf",
     "prebuild": "yarn run clean:dist",
     "prebuild:aot": "yarn run prebuild",
     "prebuild:prod": "yarn run prebuild",

From d4602a23f7b8a85acc5a71e2509c623126f9e6ad Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Mon, 9 Oct 2017 07:38:26 -0500
Subject: [PATCH 38/40] upgrade some dependencies

---
 package.json |  14 ++--
 yarn.lock    | 214 ++++++++++++++++++++++++---------------------------
 2 files changed, 106 insertions(+), 122 deletions(-)

diff --git a/package.json b/package.json
index bcbae98ec1..6f761ef47c 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "methods": "1.1.2",
     "morgan": "1.9.0",
     "ngx-pagination": "3.0.1",
-    "pem": "1.12.0",
+    "pem": "1.12.2",
     "reflect-metadata": "0.1.10",
     "rxjs": "5.4.3",
     "ts-md5": "1.2.2",
@@ -130,12 +130,12 @@
     "ajv": "5.2.3",
     "ajv-keywords": "2.1.0",
     "angular2-template-loader": "0.6.2",
-    "autoprefixer": "7.1.4",
+    "autoprefixer": "7.1.5",
     "awesome-typescript-loader": "3.2.3",
     "caniuse-lite": "1.0.30000697",
-    "codelyzer": "3.2.0",
+    "codelyzer": "3.2.1",
     "compression-webpack-plugin": "1.0.1",
-    "copy-webpack-plugin": "4.1.0",
+    "copy-webpack-plugin": "4.1.1",
     "coveralls": "3.0.0",
     "css-loader": "0.28.7",
     "deep-freeze": "0.0.1",
@@ -144,7 +144,7 @@
     "imports-loader": "0.7.1",
     "istanbul-instrumenter-loader": "3.0.0",
     "jasmine-core": "2.8.0",
-    "jasmine-marbles": "0.1.0",
+    "jasmine-marbles": "0.2.0",
     "jasmine-spec-reporter": "4.2.1",
     "json-loader": "0.5.7",
     "karma": "1.7.1",
@@ -159,7 +159,7 @@
     "karma-remap-istanbul": "0.6.0",
     "karma-sourcemap-loader": "0.3.7",
     "karma-webdriver-launcher": "1.0.5",
-    "karma-webpack": "2.0.4",
+    "karma-webpack": "2.0.5",
     "ngrx-store-freeze": "0.2.0",
     "node-sass": "4.5.3",
     "nodemon": "1.12.1",
@@ -189,7 +189,7 @@
     "ts-helpers": "1.1.2",
     "ts-node": "3.3.0",
     "tslint": "5.7.0",
-    "typedoc": "0.8.0",
+    "typedoc": "0.9.0",
     "typescript": "2.5.3",
     "webpack": "3.6.0",
     "webpack-bundle-analyzer": "2.9.0",
diff --git a/yarn.lock b/yarn.lock
index 054ae414d5..109d1eb310 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -150,42 +150,35 @@
     "@types/express-serve-static-core" "*"
     "@types/serve-static" "*"
 
-"@types/fs-extra@^4.0.0":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.2.tgz#7b9b1bbf85962cbe029b5a83c9b530d7c75af3ba"
+"@types/fs-extra@4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.0.tgz#1dd742ad5c9bce308f7a52d02ebc01421bc9102f"
   dependencies:
     "@types/node" "*"
 
-"@types/glob@*":
-  version "5.0.32"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.32.tgz#aec5cfe987c72f099fdb1184452986aa506d5e8f"
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/hammerjs@2.0.35":
   version "2.0.35"
   resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.35.tgz#7b7c950c7d54593e23bffc8d2b4feba9866a7277"
 
-"@types/handlebars@^4.0.31":
-  version "4.0.36"
-  resolved "https://registry.yarnpkg.com/@types/handlebars/-/handlebars-4.0.36.tgz#ff57c77fa1ab6713bb446534ddc4d979707a3a79"
+"@types/handlebars@4.0.31":
+  version "4.0.31"
+  resolved "https://registry.yarnpkg.com/@types/handlebars/-/handlebars-4.0.31.tgz#a7fba66fafe42713aee88eeca8db91192efe6e72"
 
-"@types/highlight.js@^9.1.8":
-  version "9.1.10"
-  resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.1.10.tgz#b621f809cd9573b80992b90cffc5788208e3069c"
+"@types/highlight.js@9.1.8":
+  version "9.1.8"
+  resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.1.8.tgz#d227f18bcb8f3f187e16965f2444859a04689758"
 
 "@types/jasmine@2.6.0":
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.6.0.tgz#997b41a27752b4850af2683bc4a8d8222c25bd02"
 
-"@types/lodash@^4.14.37":
-  version "4.14.76"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.76.tgz#87874f766774d54e89589697340be9496fb8bf70"
+"@types/lodash@4.14.74":
+  version "4.14.74"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.74.tgz#ac3bd8db988e7f7038e5d22bd76a7ba13f876168"
 
-"@types/marked@0.0.28":
-  version "0.0.28"
-  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.0.28.tgz#44ba754e9fa51432583e8eb30a7c4dd249b52faa"
+"@types/marked@0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.3.0.tgz#583c223dd33385a1dda01aaf77b0cd0411c4b524"
 
 "@types/memory-cache@0.0.31":
   version "0.0.31"
@@ -195,7 +188,7 @@
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
 
-"@types/minimatch@*", "@types/minimatch@^2.0.29":
+"@types/minimatch@2.0.29":
   version "2.0.29"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a"
 
@@ -222,11 +215,10 @@
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-"@types/shelljs@^0.7.0":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.4.tgz#137b5f31306eaff4de120ffe5b9d74b297809cfc"
+"@types/shelljs@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.0.tgz#229c157c6bc1e67d6b990e6c5e18dbd2ff58cff0"
   dependencies:
-    "@types/glob" "*"
     "@types/node" "*"
 
 "@types/source-map@0.5.1":
@@ -576,15 +568,15 @@ atob@~1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
 
-autoprefixer@7.1.4, autoprefixer@^7.1.1:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.4.tgz#960847dbaa4016bc8e8e52ec891cbf8f1257a748"
+autoprefixer@7.1.5:
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.5.tgz#d65d14b83c7cd1dd7bc801daa00557addf5a06b2"
   dependencies:
-    browserslist "^2.4.0"
-    caniuse-lite "^1.0.30000726"
+    browserslist "^2.5.0"
+    caniuse-lite "^1.0.30000744"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^6.0.11"
+    postcss "^6.0.13"
     postcss-value-parser "^3.2.3"
 
 autoprefixer@^6.3.1:
@@ -598,6 +590,17 @@ autoprefixer@^6.3.1:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
+autoprefixer@^7.1.1:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.4.tgz#960847dbaa4016bc8e8e52ec891cbf8f1257a748"
+  dependencies:
+    browserslist "^2.4.0"
+    caniuse-lite "^1.0.30000726"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^6.0.11"
+    postcss-value-parser "^3.2.3"
+
 awesome-typescript-loader@3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.2.3.tgz#aa2119b7c808a031e2b28945b031450a8975367f"
@@ -790,14 +793,14 @@ blocking-proxy@0.0.5:
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^2.10.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
-
 bluebird@^3.3.0, bluebird@^3.4.7:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
+bluebird@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -979,6 +982,13 @@ browserslist@^2.0.0, browserslist@^2.4.0:
     caniuse-lite "^1.0.30000718"
     electron-to-chromium "^1.3.18"
 
+browserslist@^2.5.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.5.1.tgz#68e4bc536bbcc6086d62843a2ffccea8396821c6"
+  dependencies:
+    caniuse-lite "^1.0.30000744"
+    electron-to-chromium "^1.3.24"
+
 buffer-crc32@^0.2.1:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -1093,6 +1103,10 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000718, caniuse-lite@^1.0.30000726:
   version "1.0.30000740"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000740.tgz#f2c4c04d6564eb812e61006841700ad557f6f973"
 
+caniuse-lite@^1.0.30000744:
+  version "1.0.30000745"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000745.tgz#20d6fede1157a4935133502946fc7e0e6b880da5"
+
 capture-stack-trace@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
@@ -1245,9 +1259,9 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-codelyzer@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.2.0.tgz#68eb0a67771ea73006b517053c3035c1838abf14"
+codelyzer@3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.2.1.tgz#5b1ac75f7e0eb04647842ee29a322bf2167e7229"
   dependencies:
     app-root-path "^2.0.1"
     css-selector-tokenizer "^0.7.0"
@@ -1472,17 +1486,17 @@ copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
-copy-webpack-plugin@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.1.0.tgz#292a040318fe8ae3b1d7996ef05dfb483eb0b647"
+copy-webpack-plugin@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.1.1.tgz#53ae69e04955ebfa9fda411f54cbb968531d71fd"
   dependencies:
-    bluebird "^2.10.2"
-    fs-extra "^0.26.4"
-    glob "^6.0.4"
-    is-glob "^3.1.0"
+    bluebird "^3.5.1"
+    fs-extra "^4.0.2"
+    glob "^7.1.2"
+    is-glob "^4.0.0"
     loader-utils "^0.2.15"
     lodash "^4.3.0"
-    minimatch "^3.0.0"
+    minimatch "^3.0.4"
     node-dir "^0.1.10"
 
 core-js@2.5.1, core-js@^2.2.0, core-js@^2.4.0:
@@ -2028,7 +2042,7 @@ ejs@^2.5.6:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.18:
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.18, electron-to-chromium@^1.3.24:
   version "1.3.24"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz#9b7b88bb05ceb9fa016a177833cc2dde388f21b6"
 
@@ -2666,17 +2680,7 @@ fs-extra@^0.22.1:
     jsonfile "^2.1.0"
     rimraf "^2.2.8"
 
-fs-extra@^0.26.4:
-  version "0.26.7"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
-
-fs-extra@^4.0.0, fs-extra@^4.0.1:
+fs-extra@^4.0.0, fs-extra@^4.0.1, fs-extra@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b"
   dependencies:
@@ -2802,17 +2806,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -3430,7 +3424,7 @@ is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
-is-extglob@^2.1.0:
+is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
 
@@ -3462,6 +3456,12 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
@@ -3665,11 +3665,11 @@ jasmine-core@2.8.0, jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
 
-jasmine-marbles@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.1.0.tgz#c9ecdc64e20b6cf55b49a10201a5be33907dadcc"
+jasmine-marbles@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.2.0.tgz#b893d8508b75790b634876d3a1bea1345d65c156"
   dependencies:
-    lodash.isequal "^4.5.0"
+    lodash "^4.5.0"
 
 jasmine-spec-reporter@4.2.1:
   version "4.2.1"
@@ -3867,9 +3867,9 @@ karma-webdriver-launcher@1.0.5:
   dependencies:
     wd "^1.0.0"
 
-karma-webpack@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.4.tgz#3e2d4f48ba94a878e1c66bb8e1ae6128987a175b"
+karma-webpack@2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.5.tgz#4f56887e32cf4f9583391c2388415de06af06efd"
   dependencies:
     async "~0.9.0"
     loader-utils "^0.2.5"
@@ -4131,10 +4131,6 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@@ -5133,9 +5129,9 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-pem@1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/pem/-/pem-1.12.0.tgz#603d8207b9b5f83225e37ffcc36268c3aa3fecf3"
+pem@1.12.2:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/pem/-/pem-1.12.2.tgz#d2f1744c9ff8144f795f96d0c54a4b2be6f43b0c"
   dependencies:
     md5 "^2.2.1"
     os-tmpdir "^1.0.1"
@@ -5759,7 +5755,7 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@6.0.13:
+postcss@6.0.13, postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.5, postcss@^6.0.6, postcss@^6.0.8:
   version "6.0.13"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.13.tgz#b9ecab4ee00c89db3ec931145bd9590bbf3f125f"
   dependencies:
@@ -5776,14 +5772,6 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.5, postcss@^6.0.6, postcss@^6.0.8:
-  version "6.0.12"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.12.tgz#6b0155089d2d212f7bd6a0cecd4c58c007403535"
-  dependencies:
-    chalk "^2.1.0"
-    source-map "^0.5.7"
-    supports-color "^4.4.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6873,10 +6861,14 @@ source-map-url@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
 
-source-map@0.5.x, source-map@>=0.5.6, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3:
+source-map@0.5.x, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
+source-map@>=0.5.6, source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
 source-map@^0.1.38, source-map@^0.1.41, source-map@~0.1.33:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
@@ -6889,10 +6881,6 @@ source-map@^0.4.2, source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -6958,11 +6946,7 @@ split@0.3:
   dependencies:
     through "2"
 
-sprintf-js@^1.0.3:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
-
-sprintf-js@~1.0.2:
+sprintf-js@^1.0.3, sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
@@ -7409,17 +7393,17 @@ typedoc-default-themes@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.5.0.tgz#6dc2433e78ed8bea8e887a3acde2f31785bd6227"
 
-typedoc@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.8.0.tgz#d7172bc6a29964f451b7609c005beadadefe2361"
+typedoc@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.9.0.tgz#159bff7c7784ce5b91d86f3e4cc8928e62040957"
   dependencies:
-    "@types/fs-extra" "^4.0.0"
-    "@types/handlebars" "^4.0.31"
-    "@types/highlight.js" "^9.1.8"
-    "@types/lodash" "^4.14.37"
-    "@types/marked" "0.0.28"
-    "@types/minimatch" "^2.0.29"
-    "@types/shelljs" "^0.7.0"
+    "@types/fs-extra" "4.0.0"
+    "@types/handlebars" "4.0.31"
+    "@types/highlight.js" "9.1.8"
+    "@types/lodash" "4.14.74"
+    "@types/marked" "0.3.0"
+    "@types/minimatch" "2.0.29"
+    "@types/shelljs" "0.7.0"
     fs-extra "^4.0.0"
     handlebars "^4.0.6"
     highlight.js "^9.0.0"

From 8c4c533203971a639d4f5befc38c27ff6bfb73a9 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Mon, 9 Oct 2017 08:18:28 -0500
Subject: [PATCH 39/40] include all modules in coverage

---
 spec-bundle.js                              | 26 ++-------
 src/app/app.reducer.ts                      | 34 +++++------
 src/main.browser.ts                         | 62 ++++++++++-----------
 src/main.server.ts                          |  2 +-
 src/{ => modules}/app/browser-app.module.ts | 14 ++---
 src/{ => modules}/app/server-app.module.ts  | 18 +++---
 src/tsconfig.browser.json                   |  2 +-
 src/tsconfig.server.json                    |  2 +-
 src/tsconfig.test.json                      |  2 +-
 webpack/webpack.test.js                     |  3 +-
 10 files changed, 75 insertions(+), 90 deletions(-)
 rename src/{ => modules}/app/browser-app.module.ts (76%)
 rename src/{ => modules}/app/server-app.module.ts (74%)

diff --git a/spec-bundle.js b/spec-bundle.js
index 36026d530f..d2e4b2fd3e 100644
--- a/spec-bundle.js
+++ b/spec-bundle.js
@@ -38,25 +38,11 @@ testing.TestBed.initTestEnvironment(
   browser.platformBrowserDynamicTesting()
 );
 
-/*
- * Ok, this is kinda crazy. We can use the context method on
- * require that webpack created in order to tell webpack
- * what files we actually want to require or import.
- * Below, context will be a function/object with file names as keys.
- * Using that regex we are saying look in ../src then find
- * any file that ends with spec.ts and get its path. By passing in true
- * we say do this recursively
- */
-var testContext = require.context('./src', true, /\.spec\.ts/);
 
-/*
- * get all the files, for each file, call the context function
- * that will require the file and load it up here. Context will
- * loop and require those spec files here
- */
-function requireAll(requireContext) {
-  return requireContext.keys().map(requireContext);
-}
+var tests = require.context('./src', true, /\.spec\.ts$/);
 
-// requires and returns all modules that match
-var modules = requireAll(testContext);
+tests.keys().forEach(tests);
+
+const components = require.context('./src/app', true, /\.module\.ts$/);
+
+components.keys().forEach(components);
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index 646d7a26b5..baa3250549 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -1,17 +1,17 @@
-import { ActionReducerMap } from '@ngrx/store';
-import * as fromRouter from '@ngrx/router-store';
-
-import { headerReducer, HeaderState } from './header/header.reducer';
-import { hostWindowReducer, HostWindowState } from './shared/host-window.reducer';
-
-export interface AppState {
-  router: fromRouter.RouterReducerState;
-  hostWindow: HostWindowState;
-  header: HeaderState;
-}
-
-export const appReducers: ActionReducerMap<AppState> = {
-  router: fromRouter.routerReducer,
-  hostWindow: hostWindowReducer,
-  header: headerReducer
-};
+import { ActionReducerMap } from '@ngrx/store';
+import * as fromRouter from '@ngrx/router-store';
+
+import { headerReducer, HeaderState } from './header/header.reducer';
+import { hostWindowReducer, HostWindowState } from './shared/host-window.reducer';
+
+export interface AppState {
+  router: fromRouter.RouterReducerState;
+  hostWindow: HostWindowState;
+  header: HeaderState;
+}
+
+export const appReducers: ActionReducerMap<AppState> = {
+  router: fromRouter.routerReducer,
+  hostWindow: hostWindowReducer,
+  header: headerReducer
+};
diff --git a/src/main.browser.ts b/src/main.browser.ts
index 3f228b9d13..55e346108f 100644
--- a/src/main.browser.ts
+++ b/src/main.browser.ts
@@ -1,31 +1,31 @@
-import 'zone.js/dist/zone';
-import 'reflect-metadata';
-
-import { enableProdMode } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { bootloader } from '@angularclass/bootloader';
-
-import { load as loadWebFont } from 'webfontloader';
-
-import { BrowserAppModule } from './app/browser-app.module';
-
-import { ENV_CONFIG } from './config';
-
-if (ENV_CONFIG.production) {
-  enableProdMode();
-}
-
-export function main() {
-  // Load fonts async
-  // https://github.com/typekit/webfontloader#configuration
-  loadWebFont({
-    google: {
-      families: ['Droid Sans']
-    }
-  });
-
-  return platformBrowserDynamic().bootstrapModule(BrowserAppModule);
-}
-
-// support async tag or hmr
-bootloader(main);
+import 'zone.js/dist/zone';
+import 'reflect-metadata';
+
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { bootloader } from '@angularclass/bootloader';
+
+import { load as loadWebFont } from 'webfontloader';
+
+import { BrowserAppModule } from './modules/app/browser-app.module';
+
+import { ENV_CONFIG } from './config';
+
+if (ENV_CONFIG.production) {
+  enableProdMode();
+}
+
+export function main() {
+  // Load fonts async
+  // https://github.com/typekit/webfontloader#configuration
+  loadWebFont({
+    google: {
+      families: ['Droid Sans']
+    }
+  });
+
+  return platformBrowserDynamic().bootstrapModule(BrowserAppModule);
+}
+
+// support async tag or hmr
+bootloader(main);
diff --git a/src/main.server.ts b/src/main.server.ts
index f787f30514..aae5b89a62 100644
--- a/src/main.server.ts
+++ b/src/main.server.ts
@@ -17,7 +17,7 @@ import { enableProdMode } from '@angular/core';
 
 import { ngExpressEngine } from '@nguniversal/express-engine';
 
-import { ServerAppModule } from './app/server-app.module';
+import { ServerAppModule } from './modules/app/server-app.module';
 
 import { serverApi, createMockApi } from './backend/api';
 
diff --git a/src/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
similarity index 76%
rename from src/app/browser-app.module.ts
rename to src/modules/app/browser-app.module.ts
index 0904ba9ecc..aad1af9f4e 100644
--- a/src/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -11,15 +11,15 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 
 import { EffectsModule } from '@ngrx/effects';
 
-import { TransferState } from '../modules/transfer-state/transfer-state';
-import { BrowserTransferStateModule } from '../modules/transfer-state/browser-transfer-state.module';
-import { BrowserTransferStoreEffects } from '../modules/transfer-store/browser-transfer-store.effects';
-import { BrowserTransferStoreModule } from '../modules/transfer-store/browser-transfer-store.module';
+import { TransferState } from '../transfer-state/transfer-state';
+import { BrowserTransferStateModule } from '../transfer-state/browser-transfer-state.module';
+import { BrowserTransferStoreEffects } from '../transfer-store/browser-transfer-store.effects';
+import { BrowserTransferStoreModule } from '../transfer-store/browser-transfer-store.module';
 
-import { AppModule } from './app.module';
-import { CoreModule } from './core/core.module';
+import { AppModule } from '../../app/app.module';
+import { CoreModule } from '../../app/core/core.module';
 
-import { AppComponent } from './app.component';
+import { AppComponent } from '../../app/app.component';
 
 export function init(cache: TransferState) {
   return () => {
diff --git a/src/app/server-app.module.ts b/src/modules/app/server-app.module.ts
similarity index 74%
rename from src/app/server-app.module.ts
rename to src/modules/app/server-app.module.ts
index 0eea0cac24..d97c13a7bb 100644
--- a/src/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -16,21 +16,21 @@ import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 import { Store } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 
-import { TranslateUniversalLoader } from '../modules/translate-universal-loader';
+import { TranslateUniversalLoader } from '../translate-universal-loader';
 
-import { ServerTransferStateModule } from '../modules/transfer-state/server-transfer-state.module';
-import { TransferState } from '../modules/transfer-state/transfer-state';
+import { ServerTransferStateModule } from '../transfer-state/server-transfer-state.module';
+import { TransferState } from '../transfer-state/transfer-state';
 
-import { ServerTransferStoreEffects } from '../modules/transfer-store/server-transfer-store.effects';
-import { ServerTransferStoreModule } from '../modules/transfer-store/server-transfer-store.module';
+import { ServerTransferStoreEffects } from '../transfer-store/server-transfer-store.effects';
+import { ServerTransferStoreModule } from '../transfer-store/server-transfer-store.module';
 
-import { AppState } from './app.reducer';
+import { AppState } from '../../app/app.reducer';
 
-import { AppModule } from './app.module';
+import { AppModule } from '../../app/app.module';
 
-import { AppComponent } from './app.component';
+import { AppComponent } from '../../app/app.component';
 
-import { GLOBAL_CONFIG, GlobalConfig } from '../config';
+import { GLOBAL_CONFIG, GlobalConfig } from '../../config';
 
 export function boot(cache: TransferState, appRef: ApplicationRef, store: Store<AppState>, request: Request, config: GlobalConfig) {
   // authentication mechanism goes here
diff --git a/src/tsconfig.browser.json b/src/tsconfig.browser.json
index a14de3972a..f7140b9fe4 100644
--- a/src/tsconfig.browser.json
+++ b/src/tsconfig.browser.json
@@ -1,6 +1,6 @@
 {
   "extends": "../tsconfig.json",
   "angularCompilerOptions": {
-    "entryModule": "./app/browser-app.module#BrowserAppModule"
+    "entryModule": "./modules/app/browser-app.module#BrowserAppModule"
   }
 }
diff --git a/src/tsconfig.server.json b/src/tsconfig.server.json
index b86ab358f9..480b685a2a 100644
--- a/src/tsconfig.server.json
+++ b/src/tsconfig.server.json
@@ -1,6 +1,6 @@
 {
   "extends": "../tsconfig.json",
   "angularCompilerOptions": {
-    "entryModule": "./app/server-app.module#ServerAppModule"
+    "entryModule": "./modules/app/server-app.module#ServerAppModule"
   }
 }
diff --git a/src/tsconfig.test.json b/src/tsconfig.test.json
index 32a466a3e9..712ad1ab1c 100644
--- a/src/tsconfig.test.json
+++ b/src/tsconfig.test.json
@@ -4,6 +4,6 @@
     "sourceMap": true
   },
   "angularCompilerOptions": {
-    "entryModule": "./app/browser-app.module#BrowserAppModule"
+    "entryModule": "./modules/app/browser-app.module#BrowserAppModule"
   }
 }
diff --git a/webpack/webpack.test.js b/webpack/webpack.test.js
index 818e348c7e..703da033a2 100644
--- a/webpack/webpack.test.js
+++ b/webpack/webpack.test.js
@@ -225,8 +225,7 @@ module.exports = function (options) {
 
       new ContextReplacementPlugin(
         /angular(\\|\/)core(\\|\/)@angular/,
-        root('./src'),
-        {}
+        root('./src'), {}
       ),
 
       /**

From 7860951a337c49da06ae19582cc59291647b06c9 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Mon, 9 Oct 2017 08:30:21 -0500
Subject: [PATCH 40/40] minor refactoring and some formatting of karma config

---
 karma.conf.js  | 33 +++++++++++++++++++++------------
 spec-bundle.js |  6 +++---
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 8f51e61344..e43191d8ee 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -27,18 +27,18 @@ module.exports = function (config) {
     frameworks: ['jasmine'],
 
     plugins: [
-      require('karma-webpack'),
-      require('karma-jasmine'),
+      require("istanbul-instrumenter-loader"),
       require('karma-chrome-launcher'),
-      require('karma-phantomjs-launcher'),
-      require('karma-webdriver-launcher'),
       require('karma-coverage'),
-      require('karma-remap-coverage'),
+      require("karma-istanbul-preprocessor"),
+      require('karma-jasmine'),
       require('karma-mocha-reporter'),
+      require('karma-phantomjs-launcher'),
+      require('karma-remap-coverage'),
       require('karma-remap-istanbul'),
       require('karma-sourcemap-loader'),
-      require("istanbul-instrumenter-loader"),
-      require("karma-istanbul-preprocessor")
+      require('karma-webdriver-launcher'),
+      require('karma-webpack')
     ],
 
     // list of files to exclude
@@ -59,7 +59,11 @@ module.exports = function (config) {
      * available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
      */
     preprocessors: {
-      './spec-bundle.js': ['istanbul', 'webpack', 'sourcemap']
+      './spec-bundle.js': [
+        'istanbul',
+        'webpack',
+        'sourcemap'
+      ]
     },
 
     // Webpack Config at ./webpack.test.js
@@ -79,9 +83,9 @@ module.exports = function (config) {
     remapIstanbulReporter: {
       remapOptions: {}, //additional remap options
       reports: {
-        json: 'coverage/coverage.json',
-        lcovonly: 'coverage/lcov.info',
-        html: 'coverage/html/',
+        json: './coverage/coverage.json',
+        lcovonly: './coverage/lcov.info',
+        html: './coverage/html/',
       }
     },
 
@@ -111,7 +115,12 @@ module.exports = function (config) {
      * possible values: 'dots', 'progress'
      * available reporters: https://npmjs.org/browse/keyword/karma-reporter
      */
-    reporters: ['mocha', 'coverage', 'remap-coverage', 'karma-remap-istanbul'],
+    reporters: [
+      'mocha',
+      'coverage',
+      'remap-coverage',
+      'karma-remap-istanbul'
+    ],
 
     // Karma web server port
     port: 9876,
diff --git a/spec-bundle.js b/spec-bundle.js
index d2e4b2fd3e..b9df9bec5e 100644
--- a/spec-bundle.js
+++ b/spec-bundle.js
@@ -38,11 +38,11 @@ testing.TestBed.initTestEnvironment(
   browser.platformBrowserDynamicTesting()
 );
 
-
 var tests = require.context('./src', true, /\.spec\.ts$/);
 
 tests.keys().forEach(tests);
 
-const components = require.context('./src/app', true, /\.module\.ts$/);
+// includes all modules into test coverage
+const modules = require.context('./src/app', true, /\.module\.ts$/);
 
-components.keys().forEach(components);
+modules.keys().forEach(modules);