inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace the getApiService with the apiService in the tagService

Browse Source
This commit is contained in:
Eugenio Romano 2016-10-11 11:35:25 +01:00
parent 8b1b5e9926
commit c7ab5d79a9
5 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.spec.ts
View File

@ -52,7 +52,6 @@ describe('Test ng2-alfresco-tag Tag actions list', () => {
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(TagActionsComponent); fixture = TestBed.createComponent(TagActionsComponent);
component = fixture.componentInstance;
debug = fixture.debugElement; debug = fixture.debugElement;
element = fixture.nativeElement; element = fixture.nativeElement;
@ -122,11 +121,15 @@ describe('Test ng2-alfresco-tag Tag actions list', () => {
let deleteButton: any = element.querySelector('#tag_delete_0'); let deleteButton: any = element.querySelector('#tag_delete_0');
deleteButton.click(); deleteButton.click();
fixture.detectChanges();
expect(jasmine.Ajax.requests.at(1).url) expect(jasmine.Ajax.requests.at(1).url)
.toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/fake-node-id/tags/0ee933fa-57fc-4587-8a77-b787e814f1d2'); .toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/fake-node-id/tags/0ee933fa-57fc-4587-8a77-b787e814f1d2');
expect(jasmine.Ajax.requests.at(1).method).toBe('DELETE'); expect(jasmine.Ajax.requests.at(1).method).toBe('DELETE');
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200,
contentType: 'json'
});
done(); done();
}); });

1
ng2-components/ng2-alfresco-tag/src/components/tag-list.component.spec.ts
View File

@ -69,7 +69,6 @@ describe('Test ng2-alfresco-tag Tag list All ECM', () => {
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(TagList); fixture = TestBed.createComponent(TagList);
component = fixture.componentInstance;
debug = fixture.debugElement; debug = fixture.debugElement;
element = fixture.nativeElement; element = fixture.nativeElement;

7
ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.spec.ts
View File

@ -68,7 +68,6 @@ describe('Test ng2-alfresco-tag Tag relative node list', () => {
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(TagNodeList); fixture = TestBed.createComponent(TagNodeList);
component = fixture.componentInstance;
debug = fixture.debugElement; debug = fixture.debugElement;
element = fixture.nativeElement; element = fixture.nativeElement;
@ -124,6 +123,12 @@ describe('Test ng2-alfresco-tag Tag relative node list', () => {
expect(jasmine.Ajax.requests.mostRecent().url). expect(jasmine.Ajax.requests.mostRecent().url).
toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/fake-node-id/tags/0ee933fa-57fc-4587-8a77-b787e814f1d2'); toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/fake-node-id/tags/0ee933fa-57fc-4587-8a77-b787e814f1d2');
expect(jasmine.Ajax.requests.mostRecent().method).toBe('DELETE'); expect(jasmine.Ajax.requests.mostRecent().method).toBe('DELETE');
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200,
contentType: 'json'
});
done(); done();
}); });

10
ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts
View File

@ -43,8 +43,6 @@ describe('Tag service', () => {
service = injector.get(TagService); service = injector.get(TagService);
}); });
describe('Content tests', () => {
beforeEach(() => { beforeEach(() => {
jasmine.Ajax.install(); jasmine.Ajax.install();
}); });
@ -53,6 +51,8 @@ describe('Tag service', () => {
jasmine.Ajax.uninstall(); jasmine.Ajax.uninstall();
}); });
describe('Content tests', () => {
it('removeTag should perform a call against the server', (done) => { it('removeTag should perform a call against the server', (done) => {
service.removeTag('fake-node-id', 'fake-tag').subscribe(() => { service.removeTag('fake-node-id', 'fake-tag').subscribe(() => {
expect(jasmine.Ajax.requests.mostRecent().method).toBe('DELETE'); expect(jasmine.Ajax.requests.mostRecent().method).toBe('DELETE');
@ -80,7 +80,7 @@ describe('Tag service', () => {
}); });
it('getAllTheTags should perform a call against the server', (done) => { it('getAllTheTags should perform a call against the server', (done) => {
service.getAllTheTags('fake-node-id', 'fake-tag').subscribe(() => { service.getAllTheTags().subscribe(() => {
expect(jasmine.Ajax.requests.mostRecent().method).toBe('GET'); expect(jasmine.Ajax.requests.mostRecent().method).toBe('GET');
expect(jasmine.Ajax.requests.mostRecent().url) expect(jasmine.Ajax.requests.mostRecent().url)
.toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/tags'); .toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/tags');
@ -93,7 +93,7 @@ describe('Tag service', () => {
}); });
it('getTagsByNodeId should perform a call against the server', (done) => { it('getTagsByNodeId should perform a call against the server', (done) => {
service.getTagsByNodeId('fake-node-id', 'fake-tag').subscribe(() => { service.getTagsByNodeId('fake-node-id').subscribe(() => {
expect(jasmine.Ajax.requests.mostRecent().method).toBe('GET'); expect(jasmine.Ajax.requests.mostRecent().method).toBe('GET');
expect(jasmine.Ajax.requests.mostRecent().url) expect(jasmine.Ajax.requests.mostRecent().url)
.toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/fake-node-id/tags'); .toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/fake-node-id/tags');
@ -106,7 +106,7 @@ describe('Tag service', () => {
}); });
it('getTagsByNodeId catch errors call', (done) => { it('getTagsByNodeId catch errors call', (done) => {
service.getTagsByNodeId('fake-node-id', 'fake-tag').subscribe(() => { service.getTagsByNodeId('fake-node-id').subscribe(() => {
}, () => { }, () => {
done(); done();
}); });

17
ng2-components/ng2-alfresco-tag/src/services/tag.service.ts
View File

@ -16,8 +16,9 @@
*/ */
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { AlfrescoApiService } from 'ng2-alfresco-core';
/** /**
* @returns {TagService} . * @returns {TagService} .
@ -29,32 +30,32 @@ export class TagService {
/** /**
* Constructor * Constructor
* @param authService * @param apiService
*/ */
constructor(public authService: AlfrescoAuthenticationService) { constructor(private authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) {
} }
getTagsByNodeId(nodeId: string): any { getTagsByNodeId(nodeId: string): any {
return Observable.fromPromise(this.authService.getAlfrescoApi().core.tagsApi.getNodeTags(nodeId)) return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.getNodeTags(nodeId))
.catch(this.handleError); .catch(this.handleError);
} }
getAllTheTags() { getAllTheTags() {
return Observable.fromPromise(this.authService.getAlfrescoApi().core.tagsApi.getTags()) return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.getTags())
.catch(this.handleError); .catch(this.handleError);
} }
addTag(nodeId: string, tagName: string): any { addTag(nodeId: string, tagName: string): any {
let alfrescoApi: any = this.authService.getAlfrescoApi(); let alfrescoApi: any = this.apiService.getInstance();
let tagBody = new alfrescoApi.core.TagBody(); let tagBody = new alfrescoApi.core.TagBody();
tagBody.tag = tagName; tagBody.tag = tagName;
return Observable.fromPromise(this.authService.getAlfrescoApi().core.tagsApi.addTag(nodeId, tagBody)) return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.addTag(nodeId, tagBody))
.catch(this.handleError); .catch(this.handleError);
} }
removeTag(nodeId: string, tag: string): any { removeTag(nodeId: string, tag: string): any {
return Observable.fromPromise(this.authService.getAlfrescoApi().core.tagsApi.removeTag(nodeId, tag)) return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.removeTag(nodeId, tag))
.catch(this.handleError); .catch(this.handleError);
} }