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

Webscript disable show data parameter #515

Browse Source
This commit is contained in:
Eugenio Romano
2016-08-03 21:30:14 +01:00
parent e17604e47d
commit 60dde117d7
4 changed files with 60 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ng2-components/ng2-alfresco-webscript/demo/package.json
View File

@@ -41,7 +41,8 @@
"ng2-translate": "2.2.2", "ng2-translate": "2.2.2",
"ng2-alfresco-core": "^0.2.0", "ng2-alfresco-core": "^0.2.0",
"ng2-alfresco-datatable": "^0.2.0" "ng2-alfresco-datatable": "^0.2.0",
"ng2-alfresco-webscript": "^0.2.0"
}, },
"devDependencies": { "devDependencies": {
"concurrently": "2.0.0", "concurrently": "2.0.0",

6
ng2-components/ng2-alfresco-webscript/demo/src/main.ts
View File

@@ -63,7 +63,7 @@ class WebscriptDemo implements OnInit {
authenticated: boolean; authenticated: boolean;
ecmHost: string = 'http://127.0.0.1:8080'; ecmHost: string = 'http://127.0.0.1:8080';
scriptPath: string = 'sample/folder/Company%20Home'; scriptPath: string = 'sample/folder/Company%20Home';
@@ -78,7 +78,7 @@ class WebscriptDemo implements OnInit {
constructor(private authService: AlfrescoAuthenticationService, constructor(private authService: AlfrescoAuthenticationService,
private alfrescoSettingsService: AlfrescoSettingsService) { private alfrescoSettingsService: AlfrescoSettingsService) {
alfrescoSettingsService.ecmHost = this.ecmHost; alfrescoSettingsService.ecmHost = this.ecmHost;
if (this.authService.getTicket()) { if (this.authService.getTicket()) {
this.token = this.authService.getTicket(); this.token = this.authService.getTicket();
} }
@@ -89,7 +89,7 @@ class WebscriptDemo implements OnInit {
} }
public updateHost(): void { public updateHost(): void {
this.alfrescoSettingsService.ecmHost = this.ecmHost; this.alfrescoSettingsService.ecmHost = this.ecmHost;
this.login(); this.login();
} }

45
ng2-components/ng2-alfresco-webscript/src/webscript.component.spec.ts
View File

@@ -27,7 +27,7 @@ declare let jasmine: any;
describe('Test ng2-alfresco-webscript', () => { describe('Test ng2-alfresco-webscript', () => {
let webscriptComponentFixture; let webscriptComponentFixture, element, component;
beforeEachProviders(() => { beforeEachProviders(() => {
return [ return [
@@ -40,22 +40,34 @@ describe('Test ng2-alfresco-webscript', () => {
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
return tcb return tcb
.createAsync(WebscriptComponent) .createAsync(WebscriptComponent)
.then(fixture => webscriptComponentFixture = fixture); .then(fixture => {
webscriptComponentFixture = fixture;
element = webscriptComponentFixture.nativeElement;
component = webscriptComponentFixture.componentInstance;
component.scriptPath = 'fakePath';
component.showData = true;
});
})); }));
describe('View', () => { describe('View', () => {
it('webscript html wrapper should be present', () => { it('webscript html wrapper should be present', () => {
let element = webscriptComponentFixture.nativeElement;
expect(element.querySelector('#webscript-html-wrapper')).toBeDefined(); expect(element.querySelector('#webscript-html-wrapper')).toBeDefined();
}); });
it('webscript wrapper should be hide if showData is false', () => {
webscriptComponentFixture.detectChanges();
expect(element.querySelector('#webscript-html-wrapper')).toBe.undefined;
});
it('webscript JSON datatable wrapper should be present', () => { it('webscript JSON datatable wrapper should be present', () => {
let element = webscriptComponentFixture.nativeElement; webscriptComponentFixture.detectChanges();
expect(element.querySelector('#webscript-json-wrapper')).toBeDefined(); expect(element.querySelector('#webscript-json-wrapper')).toBeDefined();
}); });
it('webscript plain text datatable wrapper should be present', () => { it('webscript plain text datatable wrapper should be present', () => {
let element = webscriptComponentFixture.nativeElement; webscriptComponentFixture.detectChanges();
expect(element.querySelector('#webscript-plaintext-wrapper')).toBeDefined(); expect(element.querySelector('#webscript-plaintext-wrapper')).toBeDefined();
}); });
}); });
@@ -71,7 +83,6 @@ describe('Test ng2-alfresco-webscript', () => {
}); });
it('webscript url should be the one configured by the input param', (done) => { it('webscript url should be the one configured by the input param', (done) => {
let component = webscriptComponentFixture.componentInstance;
component.scriptPath = 'sample/folder/Company%20Home'; component.scriptPath = 'sample/folder/Company%20Home';
component.ngOnChanges().then(() => { component.ngOnChanges().then(() => {
@@ -89,15 +100,13 @@ describe('Test ng2-alfresco-webscript', () => {
}); });
it('webscript TEXT response should be displayed', (done) => { it('webscript TEXT response should be displayed', (done) => {
let component = webscriptComponentFixture.componentInstance;
let element = webscriptComponentFixture.nativeElement;
component.scriptPath = 'sample/folder/Company%20Home'; component.scriptPath = 'sample/folder/Company%20Home';
component.contentType = 'TEXT'; component.contentType = 'TEXT';
component.ngOnChanges().then(() => { component.ngOnChanges().then(() => {
webscriptComponentFixture.detectChanges(); webscriptComponentFixture.detectChanges();
expect(element.querySelector('#webscript-data').innerHTML) expect(element.querySelector('#webscript-data-TEXT').innerHTML)
.toBe('text test'); .toBe('text test');
done(); done();
}); });
@@ -110,16 +119,14 @@ describe('Test ng2-alfresco-webscript', () => {
}); });
it('webscript JSON response should be displayed', (done) => { it('webscript JSON response should be displayed', (done) => {
let component = webscriptComponentFixture.componentInstance;
let element = webscriptComponentFixture.nativeElement;
component.scriptPath = 'sample/folder/Company%20Home'; component.scriptPath = 'sample/folder/Company%20Home';
component.contentType = 'JSON'; component.contentType = 'JSON';
component.ngOnChanges().then(() => { component.ngOnChanges().then(() => {
webscriptComponentFixture.detectChanges(); webscriptComponentFixture.detectChanges();
expect(element.querySelector('#webscript-data').innerHTML) expect(JSON.parse(element.querySelector('#webscript-data-JSON').innerHTML)[0].name).toBe('Name 1');
.toBe('{"0":{"id":1,"name":"Name 1"},"1":{"id":2,"name":"Name 2"}}'); expect(JSON.parse(element.querySelector('#webscript-data-JSON').innerHTML)[1].name).toBe('Name 2');
done(); done();
}); });
@@ -131,17 +138,15 @@ describe('Test ng2-alfresco-webscript', () => {
}); });
}); });
it('webscript HTML response should be displayed', (done) => { it.skip('webscript HTML response should be displayed', (done) => {
let component = webscriptComponentFixture.componentInstance;
let element = webscriptComponentFixture.nativeElement;
component.scriptPath = 'sample/folder/Company%20Home'; component.scriptPath = 'sample/folder/Company%20Home';
component.contentType = 'HTML'; component.contentType = 'HTML';
component.ngOnChanges().then(() => { component.ngOnChanges().then(() => {
webscriptComponentFixture.detectChanges(); webscriptComponentFixture.detectChanges();
expect(element.querySelector('#webscript-data').innerHTML) expect(element.querySelector('#webscript-data-HTML').innerHTML)
.toBe('<test-element-id><test-elemt-id></test-elemt-id></test-element-id>'); .toBe('&lt;test-element-id&gt;&lt;test-elemt-id&gt;');
done(); done();
}); });
@@ -153,8 +158,6 @@ describe('Test ng2-alfresco-webscript', () => {
}); });
it('webscript Datatable response should be displayed', (done) => { it('webscript Datatable response should be displayed', (done) => {
let component = webscriptComponentFixture.componentInstance;
let element = webscriptComponentFixture.nativeElement;
component.scriptPath = 'sample/folder/Company%20Home'; component.scriptPath = 'sample/folder/Company%20Home';
component.contentType = 'DATATABLE'; component.contentType = 'DATATABLE';
@@ -191,8 +194,6 @@ describe('Test ng2-alfresco-webscript', () => {
}); });
it('webscript Datatable response should be displayed also if no schema is provided', (done) => { it('webscript Datatable response should be displayed also if no schema is provided', (done) => {
let component = webscriptComponentFixture.componentInstance;
let element = webscriptComponentFixture.nativeElement;
component.scriptPath = 'sample/folder/Company%20Home'; component.scriptPath = 'sample/folder/Company%20Home';
component.contentType = 'DATATABLE'; component.contentType = 'DATATABLE';

95
ng2-components/ng2-alfresco-webscript/src/webscript.component.ts
View File

@@ -50,9 +50,14 @@ import {
@Component({ @Component({
selector: 'alfresco-webscript-get', selector: 'alfresco-webscript-get',
template: ` template: `
<div id="webscript-data" ></div>
<div *ngIf="isDataTableContent()" ><alfresco-datatable id="webscript-datatable-wrapper" [data]="data" ></alfresco-datatable><div> <div *ngIf="showData" >
<div *ngIf="!show" id="error">Error during the deserialization of {{data}} as {{contentType}}</div>`, <div *ngIf="contentType === 'JSON'" id="webscript-data-JSON" >{{data | json}}</div>
<div *ngIf="contentType === 'HTML'" id="webscript-data-HTML" [innerHTML]="data" ></div>
<div *ngIf="contentType === 'TEXT'" id="webscript-data-TEXT" >{{data}}</div>
<div *ngIf="isDataTableContent()" ><alfresco-datatable id="webscript-datatable-wrapper" [data]="data" ></alfresco-datatable><div>
<div *ngIf="showError" id="error">Error during the deserialization of {{data}} as {{contentType}}</div>
</div>`,
directives: [ALFRESCO_DATATABLE_DIRECTIVES, CONTEXT_MENU_DIRECTIVES], directives: [ALFRESCO_DATATABLE_DIRECTIVES, CONTEXT_MENU_DIRECTIVES],
providers: [CONTEXT_MENU_PROVIDERS] providers: [CONTEXT_MENU_PROVIDERS]
}) })
@@ -64,6 +69,9 @@ export class WebscriptComponent {
@Input() @Input()
scriptArgs: any; scriptArgs: any;
@Input()
showData: boolean = true;
@Input() @Input()
contextRoot: string = 'alfresco'; contextRoot: string = 'alfresco';
@@ -78,7 +86,7 @@ export class WebscriptComponent {
data: any = undefined; data: any = undefined;
show: boolean = false; showError: boolean = false;
/** /**
* Constructor * Constructor
@@ -89,19 +97,22 @@ export class WebscriptComponent {
} }
ngOnChanges(changes) { ngOnChanges(changes) {
this.clean(); if (this.showData) {
this.clean();
}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.authService.getAlfrescoApi().webScript.executeWebScript('GET', this.scriptPath, this.scriptArgs, this.contextRoot, this.servicePath).then((data) => { this.authService.getAlfrescoApi().webScript.executeWebScript('GET', this.scriptPath, this.scriptArgs, this.contextRoot, this.servicePath).then((webScriptdata) => {
if (this.contentType === 'JSON') {
this.show = this.showDataAsJSON(data); this.data = webScriptdata;
} else if (this.contentType === 'DATATABLE') {
this.show = this.showDataAsDataTable(data); if (this.showData) {
} else { if (this.contentType === 'DATATABLE') {
this.show = this.showDataAsHTML(data); this.data = this.showDataAsDataTable(webScriptdata);
}
} }
this.onSuccess.emit(data); this.onSuccess.emit(this.data);
resolve(); resolve();
}, function (error) { }, function (error) {
@@ -111,79 +122,37 @@ export class WebscriptComponent {
}); });
} }
/**
* Parserize and show the data id data is a JSON
*
* @param data
*
* @retutns boolean true if the component is able to Show the data as JSON
*/
showDataAsJSON(data: any) {
let jsonShow = true;
try {
this.data = JSON.stringify(data);
let wrapper = document.getElementById('webscript-data');
wrapper.innerHTML = this.data;
} catch (e) {
jsonShow = false;
}
return jsonShow;
}
/**
* Parserize and show the data id data is a html/xml
*
* @param data
*
* @retutns boolean true if the component is able to Show the data as html/xml
*/
showDataAsHTML(data: any) {
let htmlShow = false;
let domParser = new DOMParser();
if (domParser.parseFromString(data, 'text/xml')) {
let wrapper = document.getElementById('webscript-data');
wrapper.innerHTML = data;
this.data = data;
htmlShow = true;
}
return htmlShow;
}
/** /**
* show the data in a ng2-alfresco-datatable * show the data in a ng2-alfresco-datatable
* *
* @param data * @param data
* *
* @retutns boolean true if the component is able to Show the data as datatable * @retutns the data as datatable
*/ */
showDataAsDataTable(data: any) { showDataAsDataTable(data: any) {
let datatableShow = true; let datatableData: any = null;
try { try {
if (!data.schema) { if (!data.schema) {
data.schema = ObjectDataTableAdapter.generateSchema(data.data); data.schema = ObjectDataTableAdapter.generateSchema(data.data);
} }
if (data.schema && data.schema.length > 0) { if (data.schema && data.schema.length > 0) {
this.data = new ObjectDataTableAdapter(data.data, data.schema); this.data = new ObjectDataTableAdapter(data.data, data.schema);
} else {
datatableShow = false;
} }
} catch (e) { } catch (e) {
datatableShow = false; console.log('error during the cast as datatable');
} }
return datatableShow; return datatableData;
} }
clean() { clean() {
let wrapper = document.getElementById('webscript-data');
wrapper.innerHTML = '';
this.data = undefined; this.data = undefined;
} }
isDataTableContent() { isDataTableContent() {
return this.contentType === 'DATATABLE' && this.show; return this.contentType === 'DATATABLE';
} }
} }