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
@@ -16,13 +16,10 @@
|
||||
*/
|
||||
|
||||
import {
|
||||
AlfrescoApiService,
|
||||
AuthenticationService,
|
||||
ContentService,
|
||||
LogService,
|
||||
PermissionsEnum,
|
||||
ThumbnailService
|
||||
AlfrescoApiService, AuthenticationService, ContentService, LogService,
|
||||
PermissionsEnum, ThumbnailService
|
||||
} from '@alfresco/adf-core';
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Response } from '@angular/http';
|
||||
import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging } from 'alfresco-js-api';
|
||||
@@ -135,7 +132,7 @@ export class DocumentListService {
|
||||
* @param includeFields Extra information to include (available options are "aspectNames", "isLink" and "association")
|
||||
* @returns Details of the folder
|
||||
*/
|
||||
getFolderNode(nodeId: string, includeFields: string[] = []): Promise<MinimalNodeEntryEntity> {
|
||||
getFolderNode(nodeId: string, includeFields: string[] = []): Observable<MinimalNodeEntryEntity> {
|
||||
|
||||
let includeFieldsRequest = ['path', 'properties', 'allowableOperations', 'permissions', ...includeFields]
|
||||
.filter((element, index, array) => index === array.indexOf(element));
|
||||
@@ -145,8 +142,7 @@ export class DocumentListService {
|
||||
include: includeFieldsRequest
|
||||
};
|
||||
|
||||
let nodes: any = this.apiService.getInstance().nodes;
|
||||
return nodes.getNodeInfo(nodeId, opts);
|
||||
return Observable.fromPromise(this.apiService.getInstance().nodes.getNodeInfo(nodeId, opts));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -176,6 +172,7 @@ export class DocumentListService {
|
||||
}
|
||||
|
||||
/**
|
||||
* @Deprecated 2.3.0 use the one in the content service
|
||||
* Checks if a node has the specified permission.
|
||||
* @param node Target node
|
||||
* @param permission Permission level to query
|
||||
|
Reference in New Issue
Block a user