diff --git a/README.md b/README.md index bdeae7f1b0..a8f9444e61 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,16 @@ [![Join the chat at https://gitter.im/Alfresco/alfresco-ng2-components](https://badges.gitter.im/Alfresco/alfresco-ng2-components.svg)](https://gitter.im/Alfresco/alfresco-ng2-components?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

- + travis Status + + travis + Status + - Coverage Status + Coverage Status license diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000000..880b94401e --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,35 @@ +# Test against this version of Node.js +environment: + nodejs_version: "5" + + matrix: + - COMPONENT_NAME: ng2-alfresco-core + - COMPONENT_NAME: ng2-alfresco-datatable + - COMPONENT_NAME: ng2-alfresco-documentlist + - COMPONENT_NAME: ng2-alfresco-login + - COMPONENT_NAME: ng2-alfresco-search + - COMPONENT_NAME: ng2-alfresco-upload + - COMPONENT_NAME: ng2-alfresco-viewer + +# Install scripts. (runs after repo cloning) +install: + # Get the latest stable version of Node.js or io.js + - ps: Install-Product node $env:nodejs_version + # install module + - IF %COMPONENT_NAME% NEQ ng2-alfresco-core (cd ng2-components/ng2-alfresco-core && npm install && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-alfresco-documentlist (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm install && npm link && cd ../../) + - cd ng2-components/%COMPONENT_NAME% + - IF %COMPONENT_NAME% NEQ ng2-alfresco-core (npm link ng2-alfresco-core) + - IF %COMPONENT_NAME% EQU ng2-alfresco-documentlist (npm link ng2-alfresco-datatable) + - npm install + +# Post-install test scripts. +test_script: + # Output useful info for debugging. + - node --version + - npm --version + # run tests + - npm test + +# Don't actually build. +build: off diff --git a/demo-shell-ng2/app/components/login/login-demo.component.ts b/demo-shell-ng2/app/components/login/login-demo.component.ts index aaf82c21a2..31d5e7e84d 100644 --- a/demo-shell-ng2/app/components/login/login-demo.component.ts +++ b/demo-shell-ng2/app/components/login/login-demo.component.ts @@ -46,17 +46,26 @@ export class LoginDemoComponent { toggleECM(checked) { if (checked) { - this.providers[0] = 'ECM'; + this.providers.push('ECM'); } else { - this.providers[0] = ''; + this.removeElement('ECM'); } } toggleBPM(checked) { if (checked) { - this.providers[1] = 'BPM'; + this.providers.push('BPM'); } else { - this.providers[1] = ''; + this.removeElement('BPM'); + } + } + + removeElement(el: string) { + for (let i = 0; i < this.providers.length; i++) { + if (this.providers[i] === el) { + this.providers.splice(i, 1); + return false; + } } } diff --git a/ng2-components/README.md b/ng2-components/README.md index 085b7f7260..bffb887a03 100644 --- a/ng2-components/README.md +++ b/ng2-components/README.md @@ -1,12 +1,16 @@ # Alfresco Angular 2 Components

- + travis Status + + travis + Status + - Coverage Status + Coverage Status license diff --git a/ng2-components/ng2-alfresco-core/README.md b/ng2-components/ng2-alfresco-core/README.md index b46378c213..b7fec9eac1 100644 --- a/ng2-components/ng2-alfresco-core/README.md +++ b/ng2-components/ng2-alfresco-core/README.md @@ -1,12 +1,16 @@ # Alfresco Angular2 Components core

- + travis Status + + travis + Status + - Coverage Status + Coverage Status npm downloads diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index dd8fba3dea..0d43a8e029 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -22,7 +22,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "karma start karma.conf.js --reporters kjhtml ", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", + "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", "prepublish": "npm run build", "travis": "echo 'placeholder'" diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.spec.ts index 729e19b81b..a2537fac12 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.spec.ts @@ -84,13 +84,18 @@ describe('AlfrescoAuthentication', () => { return keys[i] || null; }); - service = injector.get(AlfrescoAuthenticationService); + // service = injector.get(AlfrescoAuthenticationService); }); describe('when the setting is ECM', () => { it('should create an AlfrescoAuthenticationECM instance', (done) => { let providers = ['ECM']; + + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); spyOn(AlfrescoAuthenticationECM.prototype, 'getCreateTicketPromise').and.returnValue(fakePromiseECM); service.login('fake-username', 'fake-password', providers) @@ -106,6 +111,10 @@ describe('AlfrescoAuthentication', () => { it('should return an ECM token after the login done', (done) => { let providers = ['ECM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); spyOn(AlfrescoAuthenticationECM.prototype, 'getCreateTicketPromise').and.returnValue(fakePromiseECM); service.login('fake-username', 'fake-password', providers) @@ -119,6 +128,10 @@ describe('AlfrescoAuthentication', () => { it('should return token undefined when the credentials are wrong', (done) => { let providers = ['ECM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); spyOn(AlfrescoAuthenticationECM.prototype, 'getCreateTicketPromise') .and.returnValue(Promise.reject('fake invalid credentials')); @@ -137,7 +150,10 @@ describe('AlfrescoAuthentication', () => { it('should return an error if no provider are defined calling the login', (done) => { let providers = []; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + service = injector.get(AlfrescoAuthenticationService); service.login('fake-username', 'fake-password', providers) .subscribe( (res) => { @@ -153,7 +169,10 @@ describe('AlfrescoAuthentication', () => { it('should return an error if an empty provider are defined calling the login', (done) => { let providers = ['']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + service = injector.get(AlfrescoAuthenticationService); service.login('fake-username', 'fake-password', providers) .subscribe( (res) => { @@ -161,7 +180,7 @@ describe('AlfrescoAuthentication', () => { }, (err: any) => { expect(err).toBeDefined(); - expect(err).toEqual('No providers defined'); + expect(err.message).toEqual('Wrong provider defined'); done(); } ); @@ -169,6 +188,10 @@ describe('AlfrescoAuthentication', () => { it('should return a token undefined after logout', (done) => { let providers = ['ECM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); localStorage.setItem('token-ECM', 'fake-post-token-ECM'); service.createProviderInstance(providers); spyOn(AlfrescoAuthenticationECM.prototype, 'getDeleteTicketPromise').and.returnValue(fakePromiseECM); @@ -184,6 +207,11 @@ describe('AlfrescoAuthentication', () => { }); it('should return an error if no provider are defined calling the logout', (done) => { + let providers = []; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); service.logout() .subscribe( (res) => { @@ -207,6 +235,10 @@ describe('AlfrescoAuthentication', () => { it('should create an AlfrescoAuthenticationBPM instance', (done) => { let providers = ['BPM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogin').and.returnValue(fakePromiseBPM); service.login('fake-username', 'fake-password', providers) @@ -222,6 +254,10 @@ describe('AlfrescoAuthentication', () => { it('should return an BPM token after the login done', (done) => { let providers = ['BPM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogin').and.returnValue(fakePromiseBPM); service.login('fake-username', 'fake-password', providers) @@ -235,6 +271,10 @@ describe('AlfrescoAuthentication', () => { it('should return token undefined when the credentials are wrong', (done) => { let providers = ['BPM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogin').and.returnValue(Promise.reject('fake invalid credentials')); service.login('fake-wrong-username', 'fake-wrong-password', providers) @@ -252,6 +292,10 @@ describe('AlfrescoAuthentication', () => { it('should return a token undefined after logout', (done) => { let providers = ['BPM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); localStorage.setItem('token-BPM', 'fake-post-token-BPM'); service.createProviderInstance(providers); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogout').and.returnValue(fakePromiseBPM); @@ -268,6 +312,10 @@ describe('AlfrescoAuthentication', () => { it('should throw an error when the logout return error', (done) => { let providers = ['BPM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); localStorage.setItem('token-BPM', 'fake-post-token-BPM'); service.createProviderInstance(providers); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogout').and.returnValue(Promise.reject('fake logout error')); @@ -293,6 +341,10 @@ describe('AlfrescoAuthentication', () => { it('should create both instances', (done) => { let providers = ['ECM', 'BPM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); spyOn(AlfrescoAuthenticationECM.prototype, 'getCreateTicketPromise').and.returnValue(fakePromiseECM); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogin').and.returnValue(fakePromiseBPM); @@ -311,6 +363,10 @@ describe('AlfrescoAuthentication', () => { it('should return both ECM and BPM tokens after the login done', (done) => { let providers = ['ECM', 'BPM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); spyOn(AlfrescoAuthenticationECM.prototype, 'getCreateTicketPromise').and.returnValue(fakePromiseECM); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogin').and.returnValue(fakePromiseBPM); @@ -327,6 +383,10 @@ describe('AlfrescoAuthentication', () => { it('should return token undefined when the credentials are correct for the ECM login but wrong for the BPM login', (done) => { let providers = ['ECM', 'BPM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); spyOn(AlfrescoAuthenticationECM.prototype, 'getCreateTicketPromise').and.returnValue(fakePromiseECM); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogin').and.returnValue(Promise.reject('fake invalid credentials')); @@ -347,6 +407,10 @@ describe('AlfrescoAuthentication', () => { it('should return token undefined when the credentials are correct for the BPM login but wrong for the ECM login', (done) => { let providers = ['ECM', 'BPM']; + let alfSetting = injector.get(AlfrescoSettingsService); + alfSetting.providers = providers; + + service = injector.get(AlfrescoAuthenticationService); spyOn(AlfrescoAuthenticationECM.prototype, 'getCreateTicketPromise') .and.returnValue(Promise.reject('fake invalid credentials')); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogin').and.returnValue(fakePromiseBPM); diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts index bc29410d14..939f07cd2f 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts @@ -40,6 +40,7 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase { constructor(private alfrescoSettingsService: AlfrescoSettingsService, private http: Http) { super(alfrescoSettingsService, http); + this.createProviderInstance(this.alfrescoSettingsService.getProviders()); } /** @@ -53,8 +54,7 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase { if (providers.length === 0) { return Observable.throw('No providers defined'); } else { - this.createProviderInstance(providers); - return this.performeLogin(username, password); + return this.performeLogin(username, password, providers); } } @@ -65,28 +65,29 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase { * @param password * @returns {Observable|Observable} */ - private performeLogin(username: string, password: string): Observable { + private performeLogin(username: string, password: string, providers: string []): Observable { let observableBatch = []; - if (this.providersInstance.length !== 0) { - this.providersInstance.forEach((authInstance) => { - observableBatch.push(authInstance.login(username, password)); - }); - return Observable.create(observer => { - Observable.forkJoin(observableBatch).subscribe( - (response: any[]) => { - this.performeSaveToken(); - /*response.forEach((res) => { - this.performeSaveToken(res.name, res.token); - });*/ - observer.next(response); - }, - (err: any) => { - observer.error(new Error(err)); - }); - }); - } else { - return Observable.throw('No providers defined'); - } + providers.forEach((provider) => { + let auth: AbstractAuthentication = this.findProviderInstance(provider); + if (auth) { + observableBatch.push(auth.login(username, password)); + } else { + observableBatch.push(Observable.throw('Wrong provider defined')); + } + }); + return Observable.create(observer => { + Observable.forkJoin(observableBatch).subscribe( + (response: any[]) => { + this.performeSaveToken(); + /*response.forEach((res) => { + this.performeSaveToken(res.name, res.token); + });*/ + observer.next(response); + }, + (err: any) => { + observer.error(new Error(err)); + }); + }); } /** diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts index 563ecaaf68..c9c590c416 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts @@ -28,6 +28,8 @@ export class AlfrescoSettingsService { private _contextPath = AlfrescoSettingsService.DEFAULT_CONTEXT_PATH; private _apiBasePath: string = AlfrescoSettingsService.DEFAULT_BASE_API_PATH; + private providers: string[] = ['ECM', 'BPM']; + public get host(): string { return this._host; } @@ -39,4 +41,8 @@ export class AlfrescoSettingsService { getApiBaseUrl(): string { return this._host + this._contextPath + this._apiBasePath; } + + getProviders(): string [] { + return this.providers; + } } diff --git a/ng2-components/ng2-alfresco-datatable/README.md b/ng2-components/ng2-alfresco-datatable/README.md index 63135e5966..1c97371dfc 100644 --- a/ng2-components/ng2-alfresco-datatable/README.md +++ b/ng2-components/ng2-alfresco-datatable/README.md @@ -1,12 +1,16 @@ # DataTable Component for Angular 2

- + travis Status + + travis + Status + - Coverage Status + Coverage Status npm downloads diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index 050b67245c..745a109906 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -24,7 +24,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", + "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", "prepublish": "npm run build", "travis": "npm link ng2-alfresco-core" diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index eeff0ed589..d14d17945b 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -1,12 +1,16 @@ # DocumentList Component for Angular 2

- + travis Status + + travis + Status + - Coverage Status + Coverage Status npm downloads diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 09e140b990..7791d27c1d 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -25,7 +25,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", + "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", "prepublish": "npm run build", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable" diff --git a/ng2-components/ng2-alfresco-login/README.md b/ng2-components/ng2-alfresco-login/README.md index 730b336941..f87b5fa89b 100644 --- a/ng2-components/ng2-alfresco-login/README.md +++ b/ng2-components/ng2-alfresco-login/README.md @@ -1,11 +1,15 @@ # Alfresco Login Component for Angular 2

- + travis Status + + travis + Status + - Coverage Status + Coverage Status npm downloads diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 1c68baa56e..bb98419089 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -25,7 +25,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", + "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", "prepublish": "npm run build", "travis": "npm link ng2-alfresco-core" diff --git a/ng2-components/ng2-alfresco-search/README.md b/ng2-components/ng2-alfresco-search/README.md index a9c992e91e..6b86be103a 100644 --- a/ng2-components/ng2-alfresco-search/README.md +++ b/ng2-components/ng2-alfresco-search/README.md @@ -1,12 +1,16 @@ # Search Component for Angular 2

- + travis Status + + travis + Status + - Coverage Status + Coverage Status npm downloads diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index ad57f721f2..75292f2645 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -25,7 +25,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", + "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", "prepublish": "npm run build", "travis": "npm link ng2-alfresco-core" diff --git a/ng2-components/ng2-alfresco-upload/README.md b/ng2-components/ng2-alfresco-upload/README.md index 5917e1a3a6..0096212377 100644 --- a/ng2-components/ng2-alfresco-upload/README.md +++ b/ng2-components/ng2-alfresco-upload/README.md @@ -1,11 +1,15 @@ # Alfresco Upload Component for Angular 2

- + travis Status + + travis + Status + - Coverage Status + Coverage Status npm downloads diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 59ec662870..acf24a2719 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -23,7 +23,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", + "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", "prepublish": "npm run build", "travis": "npm link ng2-alfresco-core" diff --git a/ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts b/ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts index fb4a14ca7e..ebbc1e7c45 100644 --- a/ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts +++ b/ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts @@ -24,6 +24,8 @@ export class AlfrescoSettingsServiceMock { static DEFAULT_CONTEXT_PATH: string = '/fake-path-alfresco'; static DEFAULT_BASE_API_PATH: string = '/fake-api/fake-public/fake-alfresco/fake-versions/1'; + private providers: string[] = ['ECM', 'BPM']; + private _host: string = AlfrescoSettingsServiceMock.DEFAULT_HOST_ADDRESS; private _contextPath = AlfrescoSettingsServiceMock.DEFAULT_CONTEXT_PATH; private _apiBasePath: string = AlfrescoSettingsServiceMock.DEFAULT_BASE_API_PATH; @@ -35,4 +37,8 @@ export class AlfrescoSettingsServiceMock { getApiBaseUrl(): string { return this._host + this._contextPath + this._apiBasePath; } + + getProviders(): string [] { + return this.providers; + } } diff --git a/ng2-components/ng2-alfresco-viewer/README.md b/ng2-components/ng2-alfresco-viewer/README.md index c6cb5e8753..dfb187f706 100644 --- a/ng2-components/ng2-alfresco-viewer/README.md +++ b/ng2-components/ng2-alfresco-viewer/README.md @@ -1,11 +1,15 @@ # Alfresco File Viewer Component for Angular 2

- + travis Status + + travis + Status + - Coverage Status + Coverage Status npm downloads diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index 6513141983..03f9015c47 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -23,7 +23,7 @@ "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", + "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", "prepublish": "npm run build", "travis": "echo 'placeholder'" diff --git a/scripts/npm-link-demo-shell.sh b/scripts/npm-link-demo-shell.sh index af832a4591..300327b4ad 100755 --- a/scripts/npm-link-demo-shell.sh +++ b/scripts/npm-link-demo-shell.sh @@ -2,22 +2,41 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +#LINK CORE +echo "====== linking component: ng2-alfresco-core =====" +cd "$DIR/../ng2-components/ng2-alfresco-core" +npm link + +#LINK DATATABLE +echo "====== linking component: ng2-alfresco-datatable =====" +cd "$DIR/../ng2-components/ng2-alfresco-datatable" +npm link ng2-alfresco-core +npm link + +#LINK DOCUMENTLIST +echo "====== linking component: ng2-alfresco-documentlist =====" +cd "$DIR/../ng2-components/ng2-alfresco-documentlist" +npm link ng2-alfresco-core +npm link ng2-alfresco-datatable +npm link + +#LINK ALL THE OTHERS COMPONENTS for PACKAGE in \ - ng2-alfresco-core \ - ng2-alfresco-datatable \ - ng2-alfresco-documentlist \ ng2-alfresco-login \ ng2-alfresco-search \ ng2-alfresco-upload \ ng2-alfresco-viewer do DESTDIR="$DIR/../ng2-components/${PACKAGE}" - echo "====== linking component: ${DESTDIR} =====" - npm link ${DESTDIR} --access public + echo "====== linking component: ${PACKAGE} =====" + cd "$DESTDIR" + npm link ng2-alfresco-core + npm link done -cd "$DIR/../demo-shell-ng2" +#LINK ALL THE COMPONENTS INSIDE THE DEMOSHELL +cd "$DIR/../demo-shell-ng2" for PACKAGE in \ ng2-alfresco-core \ ng2-alfresco-datatable \