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

Remove deprecated use of getAlfrescoApi() #1094

Browse Source 
remove getAlfrescoApi from auth #1094
This commit is contained in:
Eugenio Romano
2016-11-28 14:04:58 +00:00
parent eed6902428
commit d87a768d20
18 changed files with 73 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts
View File

@@ -22,7 +22,8 @@ import { DocumentListService } from './../services/document-list.service';
import {
AlfrescoSettingsService,
AlfrescoAuthenticationService,
AlfrescoContentService
AlfrescoContentService,
AlfrescoApiService
} from 'ng2-alfresco-core';
export class DocumentListServiceMock extends DocumentListService {
@@ -34,9 +35,10 @@ export class DocumentListServiceMock extends DocumentListService {
constructor(
settings?: AlfrescoSettingsService,
authService?: AlfrescoAuthenticationService,
contentService?: AlfrescoContentService
contentService?: AlfrescoContentService,
apiService?: AlfrescoApiService
) {
super(authService, contentService);
super(authService, contentService, apiService);
}
getFolder(folder: string) {

2
ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts
View File

@@ -30,7 +30,7 @@ describe('DocumentActionsService', () => {
beforeEach(() => {
documentListService = new DocumentListServiceMock();
contentService = new AlfrescoContentService(null);
contentService = new AlfrescoContentService(null, null);
service = new DocumentActionsService(documentListService, contentService);
});

15
ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
View File

@@ -18,10 +18,11 @@
import { Injectable } from '@angular/core';
import { Response } from '@angular/http';
import { Observable } from 'rxjs/Rx';
import { AlfrescoApi, NodePaging, MinimalNodeEntity } from 'alfresco-js-api';
import { NodePaging, MinimalNodeEntity } from 'alfresco-js-api';
import {
AlfrescoAuthenticationService,
AlfrescoContentService
AlfrescoContentService,
AlfrescoApiService
} from 'ng2-alfresco-core';
@Injectable()
@@ -58,11 +59,7 @@ export class DocumentListService {
'application/vnd.apple.numbers': 'ft_ic_spreadsheet.svg'
};
constructor(private authService: AlfrescoAuthenticationService, private contentService: AlfrescoContentService) {
}
private getAlfrescoApi(): AlfrescoApi {
return this.authService.getAlfrescoApi();
constructor(private authService: AlfrescoAuthenticationService, private contentService: AlfrescoContentService, private apiService: AlfrescoApiService) {
}
private getNodesPromise(folder: string, opts?: any): Promise<NodePaging> {
@@ -81,11 +78,11 @@ export class DocumentListService {
}
}
return this.getAlfrescoApi().nodes.getNodeChildren(nodeId, params);
return this.apiService.getInstance().nodes.getNodeChildren(nodeId, params);
}
deleteNode(nodeId: string): Observable<any> {
return Observable.fromPromise(this.getAlfrescoApi().nodes.deleteNode(nodeId));
return Observable.fromPromise(this.apiService.getInstance().nodes.deleteNode(nodeId));
}
/**