hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-11 20:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-62372_Final-master-merge

Browse Source 
Conflicts:
	config/environment.default.js
	resources/i18n/en.json
	src/app/+search-page/paginated-search-options.model.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-options.model.ts
	src/app/+search-page/search-page.component.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search-service/search-configuration.service.ts
	src/app/core/cache/response.models.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
	src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
	src/app/shared/services/route.service.ts
This commit is contained in:
Kristof De Langhe
2019-05-13 12:47:21 +02:00
parent 7727d4a277 9e0846ac26
commit 0390f67d01
291 changed files with 9233 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/shared/object-collection/object-collection.component.ts
View File

@@ -1,20 +1,22 @@
import {map} from 'rxjs/operators';
import { Component, EventEmitter,
import {
ChangeDetectorRef,
Component,
EventEmitter,
Input,
OnChanges,
OnInit,
Output, SimpleChanges, OnChanges, ChangeDetectorRef } from '@angular/core';
Output,
SimpleChanges
} from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { RemoteData } from '../../core/data/remote-data';
import { PageInfo } from '../../core/shared/page-info.model';
import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
import { ListableObject } from './shared/listable-object.model';
import { SetViewMode } from '../view-mode';
import { hasValue, isNotEmpty } from '../empty.util';
@@ -29,6 +31,7 @@ export class ObjectCollectionComponent implements OnChanges, OnInit {
@Input() objects: RemoteData<ListableObject[]>;
@Input() config?: PaginationComponentOptions;
@Input() sortConfig: SortOptions;
@Input() hasBorder = false;
@Input() hideGear = false;
pageInfo: Observable<PageInfo>;
private sub;
@@ -80,13 +83,17 @@ export class ObjectCollectionComponent implements OnChanges, OnInit {
}
/**
* @param cdRef
* ChangeDetectorRef service provided by Angular.
* @param route
* Route is a singleton service provided by Angular.
* @param router
* Router is a singleton service provided by Angular.
*/
constructor(private cdRef: ChangeDetectorRef, private route: ActivatedRoute,
private router: Router) {
constructor(
private cdRef: ChangeDetectorRef,
private route: ActivatedRoute,
private router: Router) {
}
getViewMode(): SetViewMode {