mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-2500] fix trashcan bug plus refactoring documentlist (#3136)
* [ADF-2500] The full content of Trashcan is not displayed. fix pagination problem and add tests * refactor code * custom resources services * move custom resources in separate service part 2 * move custom resources in separate service part 3 * move isCustomResources in custom resources * move getCorrispondinNodeIds in custom services * reorganize code * add pagination interface * remove permissions check document list and use the common cs method remove the merge option and move it in the paginator * make infinte scrolling always use the target * restore loading infinite page * fix license header * fix type problems * breadcrumb test service * fix test * export CustomResourcesService * fix test pagination * fix content ndoe test * remove timeout content node selector test * fix after rebase * ripristinate observalbe in search service * fix wrong type return stub document list test * fix search service * fix test document list * move handle error in common method * restore observable in search control * Update search-control.component.spec.ts * fix after rebase * add import switchmap * core import in karma conf * missing commas * fix mocks * fix mock searchquerybody * search test fix
This commit is contained in:
committed by
Denys Vuika
parent
79789cb070
commit
07c247ca11
@@ -18,41 +18,37 @@
|
||||
/* tslint:disable:no-input-rename */
|
||||
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
ChangeDetectorRef,
|
||||
Component,
|
||||
EventEmitter,
|
||||
Input,
|
||||
OnInit,
|
||||
Output,
|
||||
OnDestroy,
|
||||
ViewEncapsulation
|
||||
ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter,
|
||||
Input, OnInit, Output, OnDestroy, ViewEncapsulation
|
||||
} from '@angular/core';
|
||||
|
||||
import { PaginatedComponent } from './paginated-component.interface';
|
||||
import { PaginationQueryParams } from './pagination-query-params.interface';
|
||||
import { Pagination } from 'alfresco-js-api';
|
||||
import { Subscription } from 'rxjs/Subscription';
|
||||
import { PaginationComponentInterface } from './pagination-component.interface';
|
||||
import { PaginationModel } from '../models/pagination.model';
|
||||
|
||||
@Component({
|
||||
selector: 'adf-infinite-pagination',
|
||||
host: { 'class': 'infinite-adf-pagination' },
|
||||
templateUrl: './infinite-pagination.component.html',
|
||||
styleUrls: [ './infinite-pagination.component.scss' ],
|
||||
styleUrls: ['./infinite-pagination.component.scss'],
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
encapsulation: ViewEncapsulation.None
|
||||
})
|
||||
export class InfinitePaginationComponent implements OnInit, OnDestroy {
|
||||
export class InfinitePaginationComponent implements OnInit, OnDestroy, PaginationComponentInterface {
|
||||
|
||||
static DEFAULT_PAGE_SIZE: number = 25;
|
||||
|
||||
static DEFAULT_PAGINATION: Pagination = {
|
||||
static DEFAULT_PAGINATION: PaginationModel = {
|
||||
skipCount: 0,
|
||||
hasMoreItems: false
|
||||
hasMoreItems: false,
|
||||
merge: true
|
||||
};
|
||||
|
||||
/** Pagination object. */
|
||||
@Input()
|
||||
pagination: Pagination;
|
||||
pagination: PaginationModel;
|
||||
|
||||
/** Component that provides custom pagination support. */
|
||||
@Input()
|
||||
@@ -62,23 +58,27 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy {
|
||||
@Input()
|
||||
pageSize: number = InfinitePaginationComponent.DEFAULT_PAGE_SIZE;
|
||||
|
||||
/** @deprecated 2.3.0 use the paginated component interface to use it. */
|
||||
/** Is a new page loading? */
|
||||
@Input('loading')
|
||||
isLoading: boolean = false;
|
||||
|
||||
/** @deprecated 2.3.0 use the paginated component interface to use it. */
|
||||
/** Emitted when the "Load More" button is clicked. */
|
||||
@Output()
|
||||
loadMore: EventEmitter<Pagination> = new EventEmitter<Pagination>();
|
||||
|
||||
private paginationSubscription: Subscription;
|
||||
|
||||
constructor(private cdr: ChangeDetectorRef) {}
|
||||
constructor(private cdr: ChangeDetectorRef) {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
if (this.target) {
|
||||
this.paginationSubscription = this.target.pagination.subscribe(page => {
|
||||
this.pagination = page;
|
||||
this.pageSize = page.maxItems;
|
||||
this.paginationSubscription = this.target.pagination.subscribe(pagination => {
|
||||
this.isLoading = false;
|
||||
this.pagination = pagination;
|
||||
this.pageSize = pagination.maxItems;
|
||||
this.cdr.detectChanges();
|
||||
});
|
||||
}
|
||||
@@ -90,10 +90,15 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy {
|
||||
|
||||
onLoadMore() {
|
||||
this.pagination.skipCount += this.pageSize;
|
||||
this.pagination.skipCount = this.pagination.skipCount;
|
||||
this.pagination.merge = true;
|
||||
this.loadMore.next(this.pagination);
|
||||
|
||||
if (this.target) {
|
||||
this.target.updatePagination(<PaginationQueryParams> this.pagination);
|
||||
this.target.pagination.value.merge = this.pagination.merge;
|
||||
this.target.pagination.value.skipCount = this.pagination.skipCount;
|
||||
this.isLoading = true;
|
||||
this.target.updatePagination(<PaginationModel> this.pagination);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user