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
@@ -15,23 +15,14 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
EventEmitter,
|
||||
Input,
|
||||
OnInit,
|
||||
Output,
|
||||
ViewEncapsulation,
|
||||
ChangeDetectorRef,
|
||||
OnDestroy,
|
||||
HostBinding
|
||||
} from '@angular/core';
|
||||
import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation,
|
||||
ChangeDetectorRef, OnDestroy, HostBinding } from '@angular/core';
|
||||
|
||||
import { Pagination } from 'alfresco-js-api';
|
||||
import { PaginationQueryParams } from './pagination-query-params.interface';
|
||||
import { PaginatedComponent } from './paginated-component.interface';
|
||||
import { PaginationComponentInterface } from './pagination-component.interface';
|
||||
import { Subscription } from 'rxjs/Subscription';
|
||||
import { PaginationModel } from '../models/pagination.model';
|
||||
|
||||
@Component({
|
||||
selector: 'adf-pagination',
|
||||
@@ -41,7 +32,7 @@ import { Subscription } from 'rxjs/Subscription';
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
encapsulation: ViewEncapsulation.None
|
||||
})
|
||||
export class PaginationComponent implements OnInit, OnDestroy {
|
||||
export class PaginationComponent implements OnInit, OnDestroy, PaginationComponentInterface {
|
||||
|
||||
static DEFAULT_PAGINATION: Pagination = {
|
||||
skipCount: 0,
|
||||
@@ -66,27 +57,27 @@ export class PaginationComponent implements OnInit, OnDestroy {
|
||||
|
||||
/** Pagination object. */
|
||||
@Input()
|
||||
pagination: Pagination;
|
||||
pagination: PaginationModel = PaginationComponent.DEFAULT_PAGINATION;
|
||||
|
||||
/** Emitted when pagination changes in any way. */
|
||||
@Output()
|
||||
change: EventEmitter<PaginationQueryParams> = new EventEmitter<PaginationQueryParams>();
|
||||
change: EventEmitter<PaginationModel> = new EventEmitter<PaginationModel>();
|
||||
|
||||
/** Emitted when the page number changes. */
|
||||
@Output()
|
||||
changePageNumber: EventEmitter<Pagination> = new EventEmitter<Pagination>();
|
||||
changePageNumber: EventEmitter<PaginationModel> = new EventEmitter<PaginationModel>();
|
||||
|
||||
/** Emitted when the page size changes. */
|
||||
@Output()
|
||||
changePageSize: EventEmitter<Pagination> = new EventEmitter<Pagination>();
|
||||
changePageSize: EventEmitter<PaginationModel> = new EventEmitter<PaginationModel>();
|
||||
|
||||
/** Emitted when the next page is requested. */
|
||||
@Output()
|
||||
nextPage: EventEmitter<Pagination> = new EventEmitter<Pagination>();
|
||||
nextPage: EventEmitter<PaginationModel> = new EventEmitter<PaginationModel>();
|
||||
|
||||
/** Emitted when the previous page is requested. */
|
||||
@Output()
|
||||
prevPage: EventEmitter<Pagination> = new EventEmitter<Pagination>();
|
||||
prevPage: EventEmitter<PaginationModel> = new EventEmitter<PaginationModel>();
|
||||
|
||||
private paginationSubscription: Subscription;
|
||||
|
||||
@@ -95,8 +86,8 @@ export class PaginationComponent implements OnInit, OnDestroy {
|
||||
|
||||
ngOnInit() {
|
||||
if (this.target) {
|
||||
this.paginationSubscription = this.target.pagination.subscribe(page => {
|
||||
this.pagination = page;
|
||||
this.paginationSubscription = this.target.pagination.subscribe((pagination: PaginationModel) => {
|
||||
this.pagination = pagination;
|
||||
this.cdr.detectChanges();
|
||||
});
|
||||
}
|
||||
@@ -211,7 +202,7 @@ export class PaginationComponent implements OnInit, OnDestroy {
|
||||
});
|
||||
}
|
||||
|
||||
handlePaginationEvent(action: string, params: PaginationQueryParams) {
|
||||
handlePaginationEvent(action: string, params: PaginationModel) {
|
||||
const {
|
||||
NEXT_PAGE,
|
||||
PREV_PAGE,
|
||||
|
Reference in New Issue
Block a user