[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

lib/core/pagination/infinite-pagination.component.spec.ts

@@ -148,7 +148,7 @@ describe('InfinitePaginationComponent', () => {
 
             component.onLoadMore();
 
-            expect(testTarget.updatePagination).toHaveBeenCalledWith({ maxItems: 444, skipCount: 444, totalItems: 888, hasMoreItems: true });
+            expect(testTarget.updatePagination).toHaveBeenCalledWith({ maxItems: 444, skipCount: 444, totalItems: 888, hasMoreItems: true, merge: true });
         });
 
         it('should unsubscribe from the target\'s pagination on onDestroy', () => {

lib/core/pagination/infinite-pagination.component.ts

@@ -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);
         }
     }
 

lib/core/pagination/paginated-component.interface.ts

@@ -15,17 +15,15 @@
  * limitations under the License.
  */
 
-import { Pagination } from 'alfresco-js-api';
+import { PaginationModel } from '../models/pagination.model';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 
-import { PaginationQueryParams } from './pagination-query-params.interface';
-
 export interface PaginatedComponent {
-    pagination: BehaviorSubject<Pagination>;
+    pagination: BehaviorSubject<PaginationModel>;
     /**
-     * @deprecated : the supported page size should be retrieved via the user preferences
+     * @deprecated 2.3.0 : the supported page size should be retrieved via the user preferences
      * and given to the pagination component, and not retrieved by the paginated object
      */
     supportedPageSizes: number[];
-    updatePagination(params: PaginationQueryParams);
+    updatePagination(params: PaginationModel);
 }

lib/core/pagination/pagination-component.interface.ts

@@ -15,17 +15,10 @@
  * limitations under the License.
  */
 
-/**
- * PaginationQueryParams object is used to emit events regarding pagination having two
- * properties from the Pagination interface found in AlfrescoJS API
- *
- * The two properties are "skipCount" and "maxItems" that are sent as query parameters
- * to server to paginate results
- *
- * @TODO Contribute this to AlfrescoJS API
- */
+import { PaginatedComponent } from './paginated-component.interface';
+import { Pagination } from 'alfresco-js-api';
 
-export interface PaginationQueryParams {
-    skipCount: number;
-    maxItems: number;
+export interface PaginationComponentInterface {
+    target: PaginatedComponent;
+    pagination: Pagination;
 }

lib/core/pagination/pagination.component.ts

@@ -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,

lib/core/pagination/public-api.ts

@@ -18,4 +18,4 @@
 export * from './pagination.component';
 export * from './infinite-pagination.component';
 export * from './paginated-component.interface';
-export * from './pagination-query-params.interface';
+export * from './pagination-component.interface';