resolved merge conflicts

src/app/object-list/item-list-element/item-list-element.component.html

-<a [routerLink]="['/items/' + item.id]" class="lead">
-    {{item.findMetadata("dc.title")}}
+<a [routerLink]="['/items/' + object.id]" class="lead">
+    {{object.findMetadata("dc.title")}}
 </a>
 <div>
   <span class="text-muted">
-    <span *ngIf="item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);" class="item-list-authors">
-        <span *ngFor="let authorMd of item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">{{authorMd.value}}
+    <span *ngIf="object.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);" class="item-list-authors">
+        <span *ngFor="let authorMd of object.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">{{authorMd.value}}
             <span *ngIf="!last">; </span>
         </span>
     </span>
-    (<span *ngIf="item.findMetadata('dc.publisher')" class="item-list-publisher">{{item.findMetadata("dc.publisher")}}, </span><span *ngIf="item.findMetadata('dc.date.issued')" class="item-list-date">{{item.findMetadata("dc.date.issued")}}</span>)
+    (<span *ngIf="object.findMetadata('dc.publisher')" class="item-list-publisher">{{object.findMetadata("dc.publisher")}}, </span><span *ngIf="object.findMetadata('dc.date.issued')" class="item-list-date">{{object.findMetadata("dc.date.issued")}}</span>)
   </span>
-  <div *ngIf="item.findMetadata('dc.description.abstract')" class="item-list-abstract">{{item.findMetadata("dc.description.abstract") | dsTruncate:[200] }}</div>
+  <div *ngIf="object.findMetadata('dc.description.abstract')" class="item-list-abstract">{{object.findMetadata("dc.description.abstract") | dsTruncate:[200] }}</div>
 </div>

src/app/object-list/item-list-element/item-list-element.component.ts

-import { Component, Input } from '@angular/core';
+import { Component, Input, Inject } from '@angular/core';
 
 import { Item } from '../../core/shared/item.model';
+import { ObjectListElementComponent } from '../object-list-element/object-list-element.component';
+import { listElementFor } from '../list-element-decorator';
 
 @Component({
   selector: 'ds-item-list-element',
   styleUrls: ['./item-list-element.component.scss'],
   templateUrl: './item-list-element.component.html'
 })
-export class ItemListElementComponent {
-  @Input() item: Item;
 
-  data: any = {};
-
-}
+@listElementFor(Item)
+export class ItemListElementComponent extends ObjectListElementComponent<Item> {}

src/app/object-list/list-element-decorator.ts

+import { ListableObject } from './listable-object/listable-object.model';
+import { GenericConstructor } from '../core/shared/generic-constructor';
+
+const listElementMap = new Map();
+export function listElementFor(listable: GenericConstructor<ListableObject>) {
+  return function decorator(objectElement: any) {
+    if (!objectElement) {
+      return;
+    }
+    listElementMap.set(listable, objectElement);
+  };
+}
+
+export function getListElementFor(listable: GenericConstructor<ListableObject>) {
+  return listElementMap.get(listable);
+}

src/app/object-list/listable-object/listable-object.model.ts

+export interface ListableObject {}

src/app/object-list/object-list-element/object-list-element.component.html

-<div [ngSwitch]="object.type">
-    <ds-item-list-element *ngSwitchCase="type.Item" [item]="object"></ds-item-list-element>
-    <ds-collection-list-element *ngSwitchCase="type.Collection" [collection]="object"></ds-collection-list-element>
-    <ds-community-list-element *ngSwitchCase="type.Community" [community]="object"></ds-community-list-element>
-</div>
\ No newline at end of file

src/app/object-list/object-list-element/object-list-element.component.scss

 @import '../../../styles/variables.scss';
-@import '../../../../node_modules/bootstrap/scss/variables';
 
 :host {
   display: block;
-  margin-bottom: $spacer-y;
+  margin-bottom: $spacer;
 }

src/app/object-list/object-list-element/object-list-element.component.ts

-import { Component, Input, OnInit } from '@angular/core';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { ResourceType } from '../../core/shared/resource-type';
+import { Component, Inject } from '@angular/core';
+import { ListableObject } from '../listable-object/listable-object.model';
 
 @Component({
   selector: 'ds-object-list-element',
   styleUrls: ['./object-list-element.component.scss'],
   templateUrl: './object-list-element.component.html'
 })
-export class ObjectListElementComponent {
-
-  public type = ResourceType;
-
-  @Input() object: DSpaceObject;
-
-  data: any = {};
-
+export class ObjectListElementComponent <T extends ListableObject> {
+  object: T;
+  public constructor(@Inject('objectElementProvider') public listable: ListableObject) {
+    this.object = listable as T;
+  }
 }

src/app/object-list/object-list.component.html

@@ -7,10 +7,11 @@
                (pageChange)="onPageChange($event)"
                (pageSizeChange)="onPageSizeChange($event)"
                (sortDirectionChange)="onSortDirectionChange($event)"
-               (sortFieldChange)="onSortDirectionChange($event)">
+               (sortFieldChange)="onSortDirectionChange($event)"
+               (paginationChange)="onPaginationChange($event)">
     <ul *ngIf="objects.hasSucceeded | async"> <!--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-object-list-element [object]="object"></ds-object-list-element>
+            <ds-wrapper-list-element [object]="object"></ds-wrapper-list-element>
         </li>
     </ul>
 

src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html

+<a [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="getFirstValue('dc.title')"></a>
+<div *ngIf="dso.shortDescription" class="text-muted" [innerHTML]="getFirstValue('dc.description.abstract')"></div>

src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss

+@import '../../../../styles/variables.scss';
\ No newline at end of file

src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts

+import { Component } from '@angular/core';
+
+import { listElementFor } from '../../list-element-decorator';
+import { CollectionSearchResult } from './collection-search-result.model';
+import { SearchResultListElementComponent } from '../search-result-list-element.component';
+import { Collection } from '../../../core/shared/collection.model';
+
+@Component({
+  selector: 'ds-collection-search-result-list-element',
+  styleUrls: ['../search-result-list-element.component.scss', 'collection-search-result-list-element.component.scss'],
+  templateUrl: 'collection-search-result-list-element.component.html'
+})
+
+@listElementFor(CollectionSearchResult)
+export class CollectionSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> {}

src/app/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts

+import { SearchResult } from '../../../search/search-result.model';
+import { Collection } from '../../../core/shared/collection.model';
+
+export class CollectionSearchResult extends SearchResult<Collection> {
+}

src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html

+<a [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="getFirstValue('dc.title')"></a>
+<div *ngIf="dso.shortDescription" class="text-muted" [innerHTML]="getFirstValue('dc.description.abstract')"></div>

src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss

+@import '../../../../styles/variables.scss';
\ No newline at end of file

src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts

+import { Component } from '@angular/core';
+
+import { listElementFor } from '../../list-element-decorator';
+import { CommunitySearchResult } from './community-search-result.model';
+import { SearchResultListElementComponent } from '../search-result-list-element.component';
+import { Community } from '../../../core/shared/community.model';
+
+@Component({
+  selector: 'ds-community-search-result-list-element',
+  styleUrls: ['../search-result-list-element.component.scss', 'community-search-result-list-element.component.scss'],
+  templateUrl: 'community-search-result-list-element.component.html'
+})
+
+@listElementFor(CommunitySearchResult)
+export class CommunitySearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> {
+
+}

src/app/object-list/search-result-list-element/community-search-result/community-search-result.model.ts

+import { SearchResult } from '../../../search/search-result.model';
+import { Community } from '../../../core/shared/community.model';
+
+export class CommunitySearchResult extends SearchResult<Community> {
+}

src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html

+<a [routerLink]="['/items/' + dso.id]" class="lead" [innerHTML]="getFirstValue('dc.title')"></a>
+<div>
+  <span class="text-muted">
+    <span *ngIf="dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);" class="item-list-authors">
+        <span *ngFor="let author of getValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
+            <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
+        </span>
+    </span>
+    (<span *ngIf="dso.findMetadata('dc.publisher')" class="item-list-publisher" [innerHTML]="getFirstValue('dc.publisher')">, </span><span *ngIf="dso.findMetadata('dc.date.issued')" class="item-list-date" [innerHTML]="getFirstValue('dc.date.issued')"></span>)
+  </span>
+    <div *ngIf="dso.findMetadata('dc.description.abstract')" class="item-list-abstract" [innerHTML]="getFirstValue('dc.description.abstract') | dsTruncate:[200]"></div>
+</div>

src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss

+@import '../../../../styles/variables.scss';
\ No newline at end of file

src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts

+import { Component } from '@angular/core';
+
+import { listElementFor } from '../../list-element-decorator';
+import { ItemSearchResult } from './item-search-result.model';
+import { SearchResultListElementComponent } from '../search-result-list-element.component';
+import { Item } from '../../../core/shared/item.model';
+
+@Component({
+  selector: 'ds-item-search-result-list-element',
+  styleUrls: ['../search-result-list-element.component.scss', 'item-search-result-list-element.component.scss'],
+  templateUrl: 'item-search-result-list-element.component.html'
+})
+
+@listElementFor(ItemSearchResult)
+export class ItemSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> {}

src/app/object-list/search-result-list-element/item-search-result/item-search-result.model.ts

+import { SearchResult } from '../../../search/search-result.model';
+import { Item } from '../../../core/shared/item.model';
+
+export class ItemSearchResult extends SearchResult<Item> {
+}