inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-2500] fix trashcan bug plus refactoring documentlist (#3136)

Browse Source 
* [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:
Eugenio Romano
2018-04-09 10:31:43 +01:00
committed by Denys Vuika
parent 79789cb070
commit 07c247ca11
57 changed files with 1103 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/core/models/pagination.model.ts Normal file
View File

@@ -0,0 +1,38 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Pagination } from 'alfresco-js-api';
export class PaginationModel implements Pagination {
count?: number;
hasMoreItems?: boolean;
merge?: boolean;
totalItems?: number;
skipCount?: number;
maxItems?: number;
constructor(obj?: any) {
if (obj) {
this.count = obj.count;
this.hasMoreItems = obj.hasMoreItems ? obj.hasMoreItems : false;
this.merge = obj.merge ? obj.merge : false;
this.totalItems = obj.totalItems;
this.skipCount = obj.skipCount;
this.maxItems = obj.maxItems;
}
}
}

1
lib/core/models/public-api.ts
View File

@@ -23,3 +23,4 @@ export * from './comment.model';
export * from './ecm-company.model';
export * from './redirection.model';
export * from './comment-process.model';
export * from './pagination.model';

2
lib/core/pagination/infinite-pagination.component.spec.ts
View File

@@ -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', () => {

45
lib/core/pagination/infinite-pagination.component.ts
View File

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

10
lib/core/pagination/paginated-component.interface.ts
View File

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

17
lib/core/pagination/pagination-query-params.interface.ts → lib/core/pagination/pagination-component.interface.ts
View File

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

37
lib/core/pagination/pagination.component.ts
View File

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

2
lib/core/pagination/public-api.ts
View File

@@ -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';

8
lib/core/services/content.service.ts
View File

@@ -17,7 +17,7 @@
import { Injectable } from '@angular/core';
import { DomSanitizer } from '@angular/platform-browser';
import { ContentApi, MinimalNodeEntryEntity } from 'alfresco-js-api';
import { ContentApi, MinimalNodeEntryEntity, Node } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { FolderCreatedEvent } from '../events/folder-created.event';
@@ -197,14 +197,14 @@ export class ContentService {
* @param permission Create, delete, update, updatePermissions, !create, !delete, !update, !updatePermissions
*
*/
hasPermission(node: any, permission: PermissionsEnum | string): boolean {
hasPermission(node: Node, permission: PermissionsEnum | string): boolean {
let hasPermission = false;
if (this.hasAllowableOperations(node)) {
if (permission && permission.startsWith('!')) {
hasPermission = !~node.allowableOperations.indexOf(permission.replace('!', ''));
hasPermission = node.allowableOperations.find(currentPermission => currentPermission === permission.replace('!', '')) ? false : true;
} else {
hasPermission = !!~node.allowableOperations.indexOf(permission);
hasPermission = node.allowableOperations.find(currentPermission => currentPermission === permission) ? true : false;
}
} else {

8
lib/core/services/search.service.spec.ts
View File

@@ -57,7 +57,7 @@ describe('SearchService', () => {
it('should call search API with no additional options', (done) => {
let searchTerm = 'searchTerm63688';
spyOn(searchMockApi.core.queriesApi, 'findNodes').and.returnValue(Promise.resolve(fakeSearch));
service.getNodeQueryResults(searchTerm).then(
service.getNodeQueryResults(searchTerm).subscribe(
() => {
expect(searchMockApi.core.queriesApi.findNodes).toHaveBeenCalledWith(searchTerm, undefined);
done();
@@ -72,7 +72,7 @@ describe('SearchService', () => {
nodeType: 'cm:content'
};
spyOn(searchMockApi.core.queriesApi, 'findNodes').and.returnValue(Promise.resolve(fakeSearch));
service.getNodeQueryResults(searchTerm, options).then(
service.getNodeQueryResults(searchTerm, options).subscribe(
() => {
expect(searchMockApi.core.queriesApi.findNodes).toHaveBeenCalledWith(searchTerm, options);
done();
@@ -81,7 +81,7 @@ describe('SearchService', () => {
});
it('should return search results returned from the API', (done) => {
service.getNodeQueryResults('').then(
service.getNodeQueryResults('').subscribe(
(res: any) => {
expect(res).toBeDefined();
expect(res).toEqual(fakeSearch);
@@ -92,7 +92,7 @@ describe('SearchService', () => {
it('should notify errors returned from the API', (done) => {
spyOn(searchMockApi.core.queriesApi, 'findNodes').and.returnValue(Promise.reject(mockError));
service.getNodeQueryResults('').then(
service.getNodeQueryResults('').subscribe(
() => {},
(res: any) => {
expect(res).toBeDefined();

51
lib/core/services/search.service.ts
View File

@@ -17,11 +17,11 @@
import { Injectable } from '@angular/core';
import { NodePaging, QueryBody } from 'alfresco-js-api';
import 'rxjs/add/observable/throw';
import { Subject } from 'rxjs/Subject';
import { Observable } from 'rxjs/Observable';
import { AlfrescoApiService } from './alfresco-api.service';
import 'rxjs/add/observable/throw';
import { SearchConfigurationService } from './search-configuration.service';
import { Subject } from 'rxjs/Subject';
@Injectable()
export class SearchService {
@@ -32,26 +32,45 @@ export class SearchService {
private searchConfigurationService: SearchConfigurationService) {
}
async getNodeQueryResults(term: string, options?: SearchOptions): Promise<NodePaging> {
const data = await this.apiService.getInstance().core.queriesApi.findNodes(term, options);
getNodeQueryResults(term: string, options?: SearchOptions): Observable<NodePaging> {
const promise = this.apiService.getInstance().core.queriesApi.findNodes(term, options);
this.dataLoaded.next(data);
return data;
promise.then((data: any) => {
this.dataLoaded.next(data);
});
return Observable
.fromPromise(promise)
.catch(err => this.handleError(err));
}
async search(searchTerm: string, maxResults: number, skipCount: number): Promise<NodePaging> {
const searchQuery = this.searchConfigurationService.generateQueryBody(searchTerm, maxResults, skipCount);
const data = await this.apiService.searchApi.search(searchQuery);
search(searchTerm: string, maxResults: number, skipCount: number): Observable<NodePaging> {
const searchQuery = Object.assign(this.searchConfigurationService.generateQueryBody(searchTerm, maxResults, skipCount));
const promise = this.apiService.getInstance().search.searchApi.search(searchQuery);
this.dataLoaded.next(data);
return data;
promise.then((data: any) => {
this.dataLoaded.next(data);
});
return Observable
.fromPromise(promise)
.catch(err => this.handleError(err));
}
async searchByQueryBody(queryBody: QueryBody): Promise<NodePaging> {
const data = await this.apiService.searchApi.search(queryBody);
searchByQueryBody(queryBody: QueryBody): Observable<NodePaging> {
const promise = this.apiService.getInstance().search.searchApi.search(queryBody);
this.dataLoaded.next(data);
return data;
promise.then((data: any) => {
this.dataLoaded.next(data);
});
return Observable
.fromPromise(promise)
.catch(err => this.handleError(err));
}
private handleError(error: any): Observable<any> {
return Observable.throw(error || 'Server error');
}
}