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

update tag list with refresh event emitter when add or remove a tag #1507 (#1754)

Browse Source
This commit is contained in:
Eugenio Romano 2017-03-23 17:51:50 +00:00 committed by Mario Romano
parent e2c879409a
commit 9b36001510
8 changed files with 115 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ describe('Test ng2-alfresco-tag Tag actions list', () => {
it('Tag list relative a single node should be rendered', (done) => {
component.nodeId = 'fake-node-id';
component.resultsEmitter.subscribe(() => {
component.result.subscribe(() => {
fixture.detectChanges();
expect(element.querySelector('#tag_name_0').innerHTML).toBe('test1');
@ -109,7 +109,7 @@ describe('Test ng2-alfresco-tag Tag actions list', () => {
it('Tag list click on delete button should delete the tag', (done) => {
component.nodeId = 'fake-node-id';
component.resultsEmitter.subscribe(() => {
component.result.subscribe(() => {
fixture.detectChanges();
let deleteButton: any = element.querySelector('#tag_delete_0');
@ -142,11 +142,11 @@ describe('Test ng2-alfresco-tag Tag actions list', () => {
fixture.detectChanges();
component.addEmitter.subscribe(() => {
component.successAdd.subscribe(() => {
done();
});
component.resultsEmitter.subscribe(() => {
component.result.subscribe(() => {
fixture.detectChanges();
let addButton: any = element.querySelector('#add-tag');
@ -173,12 +173,12 @@ describe('Test ng2-alfresco-tag Tag actions list', () => {
fixture.detectChanges();
component.addEmitter.subscribe(() => {
component.successAdd.subscribe(() => {
expect(component.newTagName).toBe('');
done();
});
component.resultsEmitter.subscribe(() => {
component.result.subscribe(() => {
fixture.detectChanges();
let addButton: any = element.querySelector('#add-tag');
@ -207,11 +207,37 @@ describe('Test ng2-alfresco-tag Tag actions list', () => {
done();
});
it('Add tag should return an error if the tag is already present', (done) => {
component.nodeId = 'fake-node-id';
component.newTagName = 'test1';
fixture.detectChanges();
component.error.subscribe(() => {
done();
});
component.result.subscribe(() => {
fixture.detectChanges();
let addButton: any = element.querySelector('#add-tag');
addButton.click();
});
component.ngOnChanges();
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200,
contentType: 'json',
responseText: dataTag
});
});
it('Add tag should be disabled if the node id is not a correct node', (done) => {
component.nodeId = 'fake-node-id';
component.newTagName = 'fake-tag-name';
component.resultsEmitter.subscribe(() => {
component.result.subscribe(() => {
let addButton: any = element.querySelector('#add-tag');
expect(addButton.disabled).toEqual(true);
done();
@ -228,7 +254,7 @@ describe('Test ng2-alfresco-tag Tag actions list', () => {
component.nodeId = 'fake-node-id';
component.newTagName = 'fake-tag-name';
component.resultsEmitter.subscribe(() => {
component.result.subscribe(() => {
fixture.detectChanges();
let addButton: any = element.querySelector('#add-tag');

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

@ -41,10 +41,13 @@ export class TagActionsComponent {
isContextMenu: boolean = false;
@Output()
addEmitter: EventEmitter<any> = new EventEmitter();
successAdd: EventEmitter<any> = new EventEmitter();
@Output()
resultsEmitter = new EventEmitter();
error: EventEmitter<any> = new EventEmitter();
@Output()
result = new EventEmitter();
newTagName: string;
@ -58,6 +61,10 @@ export class TagActionsComponent {
if (translateService) {
translateService.addTranslationFolder('ng2-alfresco-tag', 'node_modules/ng2-alfresco-tag/src');
}
this.tagService.refresh.subscribe(() => {
this.refreshTag();
});
}
ngOnChanges() {
@ -68,11 +75,11 @@ export class TagActionsComponent {
this.tagService.getTagsByNodeId(this.nodeId).subscribe((data) => {
this.tagsEntries = data.list.entries;
this.disableAddTag = false;
this.resultsEmitter.emit(this.tagsEntries);
this.result.emit(this.tagsEntries);
}, () => {
this.tagsEntries = null;
this.disableAddTag = true;
this.resultsEmitter.emit(this.tagsEntries);
this.result.emit(this.tagsEntries);
});
}
@ -81,13 +88,13 @@ export class TagActionsComponent {
this.translateService.get('TAG.MESSAGES.EXIST').subscribe((error) => {
this.errorMsg = error;
});
this.error.emit(this.errorMsg);
}else {
this.tagService.addTag(this.nodeId, this.newTagName).subscribe(() => {
this.newTagName = '';
this.successAdd.emit(this.nodeId);
});
}
this.tagService.addTag(this.nodeId, this.newTagName).subscribe(() => {
this.newTagName = '';
this.refreshTag();
this.addEmitter.emit(this.nodeId);
});
}
searchTag(searchTagName: string) {
@ -103,8 +110,6 @@ export class TagActionsComponent {
}
removeTag(tag: string) {
this.tagService.removeTag(this.nodeId, tag).subscribe(() => {
this.refreshTag();
});
this.tagService.removeTag(this.nodeId, tag);
}
}

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

@ -82,7 +82,7 @@ describe('Test ng2-alfresco-tag Tag list All ECM', () => {
it('Tag list relative a single node should be rendered', (done) => {
component.nodeId = 'fake-node-id';
component.resultsEmitter.subscribe(() => {
component.result.subscribe(() => {
fixture.detectChanges();
expect(element.querySelector('#tag_name_0').innerHTML).toBe('test1');

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

@ -35,23 +35,26 @@ export class TagList {
tagsEntries: any;
@Output()
resultsEmitter = new EventEmitter();
result = new EventEmitter();
/**
* Constructor
* @param tagService
*/
constructor(private tagService: TagService) {
this.tagService.refresh.subscribe(() => {
this.refreshTag();
});
}
ngOnInit(changes) {
return this.refreshTagEcm();
ngOnInit() {
return this.refreshTag();
}
refreshTagEcm() {
refreshTag() {
this.tagService.getAllTheTags().subscribe((data) => {
this.tagsEntries = data.list.entries;
this.resultsEmitter.emit(this.tagsEntries);
this.result.emit(this.tagsEntries);
});
}
}

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

@ -82,7 +82,7 @@ describe('Test ng2-alfresco-tag Tag relative node list', () => {
it('Tag list relative a single node should be rendered', (done) => {
component.nodeId = 'fake-node-id';
component.resultsEmitter.subscribe(() => {
component.results.subscribe(() => {
fixture.detectChanges();
expect(element.querySelector('#tag_name_0').innerHTML).toBe('test1');
@ -108,7 +108,7 @@ describe('Test ng2-alfresco-tag Tag relative node list', () => {
it('Tag list click on delete button should delete the tag', (done) => {
component.nodeId = 'fake-node-id';
component.resultsEmitter.subscribe(() => {
component.results.subscribe(() => {
fixture.detectChanges();
let deleteButton: any = element.querySelector('#tag_delete_0');

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

@ -39,13 +39,16 @@ export class TagNodeList {
tagsEntries: any;
@Output()
resultsEmitter = new EventEmitter();
results = new EventEmitter();
/**
* Constructor
* @param tagService
*/
constructor(private tagService: TagService) {
this.tagService.refresh.subscribe(() => {
this.refreshTag();
});
}
ngOnChanges() {
@ -55,7 +58,7 @@ export class TagNodeList {
refreshTag() {
this.tagService.getTagsByNodeId(this.nodeId).subscribe((data) => {
this.tagsEntries = data.list.entries;
this.resultsEmitter.emit(this.tagsEntries);
this.results.emit(this.tagsEntries);
});
}

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

@ -118,5 +118,30 @@ describe('Tag service', () => {
status: 403
});
});
it('delete tag should trigger a refresh event', (done) => {
service.refresh.subscribe(() => {
done();
});
service.removeTag('fake-node-id', 'fake-tag');
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200
});
});
it('add tag should trigger a refresh event', (done) => {
service.refresh.subscribe(() => {
done();
});
service.addTag('fake-node-id', 'fake-tag');
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200
});
});
});
});

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

@ -15,7 +15,7 @@
* limitations under the License.
*/
import { Injectable } from '@angular/core';
import { Injectable, Output, EventEmitter } from '@angular/core';
import { Observable } from 'rxjs/Rx';
import { AlfrescoApiService, LogService } from 'ng2-alfresco-core';
@ -25,6 +25,9 @@ import { AlfrescoApiService, LogService } from 'ng2-alfresco-core';
@Injectable()
export class TagService {
@Output()
refresh = new EventEmitter();
constructor(private apiService: AlfrescoApiService,
private logService: LogService) {
}
@ -44,13 +47,27 @@ export class TagService {
let tagBody = new alfrescoApi.core.TagBody();
tagBody.tag = tagName;
return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.addTag(nodeId, tagBody))
.catch(err => this.handleError(err));
let promiseAdd = Observable.fromPromise(this.apiService.getInstance().core.tagsApi.addTag(nodeId, tagBody));
promiseAdd.subscribe((data) => {
this.refresh.emit(data);
}, (err) => {
this.handleError(err);
});
return promiseAdd;
}
removeTag(nodeId: string, tag: string): any {
return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.removeTag(nodeId, tag))
.catch(err => this.handleError(err));
let promiseRemove = Observable.fromPromise(this.apiService.getInstance().core.tagsApi.removeTag(nodeId, tag));
promiseRemove.subscribe((data) => {
this.refresh.emit(data);
}, (err) => {
this.handleError(err);
});
return promiseRemove;
}
private handleError(error: any) {