From f2f6ffc254d83b1439c7d1beebb9a4c63e1be34d Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Wed, 29 Jun 2016 00:36:44 +0100 Subject: [PATCH 01/20] build before test browser --- ng2-components/ng2-alfresco-login/demo/package.json | 6 +++--- ng2-components/ng2-alfresco-viewer/demo/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json index f27b679ead..b9bfa78153 100644 --- a/ng2-components/ng2-alfresco-login/demo/package.json +++ b/ng2-components/ng2-alfresco-login/demo/package.json @@ -67,9 +67,9 @@ "material-design-lite": "1.1.3", "ng2-translate": "2.2.2", - "alfresco-js-api": "^0.1.0", - "ng2-alfresco-core": "^0.1.36", - "ng2-alfresco-login": "^0.1.29" + "alfresco-js-api": "0.1.0", + "ng2-alfresco-core": "0.1.36", + "ng2-alfresco-login": "file:../" }, "devDependencies": { "concurrently": "^2.0.0", diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json index 1d348240e1..c16978744c 100644 --- a/ng2-components/ng2-alfresco-viewer/demo/package.json +++ b/ng2-components/ng2-alfresco-viewer/demo/package.json @@ -39,7 +39,7 @@ "material-design-lite": "1.1.3", "pdfjs-dist": "1.5.258", - "ng2-alfresco-viewer": "^0.1.32" + "ng2-alfresco-viewer" : "file:../" }, "devDependencies": { "concurrently": "2.0.0", From 35d245bbaa0400a30276d4fd324f7aad7520f1b3 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Wed, 29 Jun 2016 00:37:54 +0100 Subject: [PATCH 02/20] login substitute new implementation --- ng2-components/ng2-alfresco-core/karma-test-shim.js | 3 ++- ng2-components/ng2-alfresco-core/karma.conf.js | 1 + ng2-components/ng2-alfresco-core/package.json | 13 +++++-------- .../src/services/AlfrescoContentService.service.ts | 12 +++--------- ng2-components/ng2-alfresco-login/demo/index.html | 2 +- .../src/components/alfresco-login.component.ts | 1 - 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/ng2-components/ng2-alfresco-core/karma-test-shim.js b/ng2-components/ng2-alfresco-core/karma-test-shim.js index d58df28667..3a95ee82c7 100644 --- a/ng2-components/ng2-alfresco-core/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-core/karma-test-shim.js @@ -14,7 +14,8 @@ var map = { var packages = { 'app': { main: 'main.js', defaultExtension: 'js' }, - 'rxjs': { defaultExtension: 'js' }, + 'rxjs': { defaultExtension: 'js' }, + 'alfresco-js-api' : { main: 'alfresco-js-api.js', defaultExtension: 'js' }, 'ng2-translate': { defaultExtension: 'js' } }; diff --git a/ng2-components/ng2-alfresco-core/karma.conf.js b/ng2-components/ng2-alfresco-core/karma.conf.js index f03e383ede..328986c938 100644 --- a/ng2-components/ng2-alfresco-core/karma.conf.js +++ b/ng2-components/ng2-alfresco-core/karma.conf.js @@ -15,6 +15,7 @@ module.exports = function (config) { {pattern: 'node_modules/rxjs/**/*.map', included: false, watched: false}, {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false}, {pattern: 'node_modules/@angular/**/*.map', included: false, watched: false}, + {pattern: 'node_modules/alfresco-js-api/dist/alfresco-js-api.js', included: true, watched: false}, {pattern: 'karma-test-shim.js', included: true, watched: true}, diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 0d43a8e029..d34b5864ad 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -6,19 +6,15 @@ "scripts": { "clean": "rimraf dist node_modules typings", "typings": "typings install", - "build": "npm run tslint && typings install && rimraf dist && tsc && npm run copytemplates && license-check", + "build": "npm run tslint && typings install && rimraf dist && tsc && license-check", + "build:w": "npm run tslint && typings install && rimraf dist && npm run watch-task", + "watch-task": "concurrently \"npm run tsc:w\" \"license-check\"", "tslint": "npm run tslint-src && npm run tslint-root", "tslint-src": "tslint -c tslint.json src/{,**/}**.ts", "tslint-root": "tslint -c tslint.json *.ts", - "copytemplates": "npm run copy-html-css && npm run copy-i18n", - "copy-html-css": "cpx \"./src/**/*.{html,css}\" ./dist/src", - "copy-html-css:w": "cpx \"./src/**/*.{html,css}\" ./dist/src -w", - "copy-i18n": "cpx \"./i18n/**/*.json\" ./dist/i18n", - "copy-i18n:w": "cpx \"./i18n/**/*.json\" ./dist/i18n -w", - "copy-images": "cpx \"./src/**/*.{png,jpg,gif,svg}\" ./dist/src", - "copy-images:w": "cpx \"./src/**/*.{png,jpg,gif,svg}\" ./dist/src -w", "licensecheck": "license-check", "tsc": "tsc", + "tsc:w": "tsc -w", "pretest": "npm run build", "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "karma start karma.conf.js --reporters kjhtml ", @@ -54,6 +50,7 @@ "alfresco" ], "dependencies": { + "alfresco-js-api": "0.1.0", "@angular/common": "2.0.0-rc.3", "@angular/compiler": "2.0.0-rc.3", "@angular/core": "2.0.0-rc.3", diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts index 4054068e80..e4a101a164 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts @@ -18,15 +18,11 @@ import { Injectable } from '@angular/core'; import { AlfrescoAuthenticationService } from './AlfrescoAuthenticationService.service'; -import { AlfrescoSettingsService } from './AlfrescoSettingsService.service'; @Injectable() export class AlfrescoContentService { - constructor( - private settings: AlfrescoSettingsService, - private authService: AlfrescoAuthenticationService - ) { + constructor(private authService: AlfrescoAuthenticationService) { } /** @@ -35,8 +31,7 @@ export class AlfrescoContentService { * @returns {string} URL address. */ getDocumentThumbnailUrl(document: any) { - return this.settings.getApiBaseUrl() + '/nodes/' + document.entry.id + - '/renditions/doclib/content' + '?attachment=false&alf_ticket=' + this.authService.getToken(); + this.authService.alfrescoApi.getDocumentThumbnailUrl(document.entry.id); } /** @@ -45,7 +40,6 @@ export class AlfrescoContentService { * @returns {string} URL address. */ getContentUrl(document: any) { - return this.settings.getApiBaseUrl() + '/nodes/' + document.entry.id + - '/content' + '?attachment=false&alf_ticket=' + this.authService.getToken(); + this.authService.alfrescoApi.getContentUrl(document.entry.id); } } diff --git a/ng2-components/ng2-alfresco-login/demo/index.html b/ng2-components/ng2-alfresco-login/demo/index.html index c277d15eef..382d4ab7b2 100644 --- a/ng2-components/ng2-alfresco-login/demo/index.html +++ b/ng2-components/ng2-alfresco-login/demo/index.html @@ -20,7 +20,7 @@ - + - + diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index d34b5864ad..f770962232 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -41,6 +41,10 @@ { "name": "Mario Romano", "email": "mario.romano83@gmail.com" + }, + { + "name": "Eugenio Romano", + "email": "eugenio.romano@alfresco.com" } ], "keywords": [ 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 939f07cd2f..8d487e97b2 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts @@ -90,6 +90,10 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase { }); } + getAlfrescoApi(): any { + return this.alfrescoApi; + } + /** * The method return tru if the user is logged in * @returns {boolean} diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts index e4a101a164..07ec940087 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts @@ -30,8 +30,8 @@ export class AlfrescoContentService { * @param document Node to get URL for. * @returns {string} URL address. */ - getDocumentThumbnailUrl(document: any) { - this.authService.alfrescoApi.getDocumentThumbnailUrl(document.entry.id); + getDocumentThumbnailUrl(document: any): string { + return this.authService.alfrescoApi.getDocumentThumbnailUrl(document.entry.id); } /** @@ -39,7 +39,7 @@ export class AlfrescoContentService { * @param document Node to get URL for. * @returns {string} URL address. */ - getContentUrl(document: any) { - this.authService.alfrescoApi.getContentUrl(document.entry.id); + getContentUrl(document: any): string { + return this.authService.alfrescoApi.getContentUrl(document.entry.id); } } diff --git a/ng2-components/ng2-alfresco-documentlist/demo/index.html b/ng2-components/ng2-alfresco-documentlist/demo/index.html index 0e4f578378..83e36b9f9c 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/index.html +++ b/ng2-components/ng2-alfresco-documentlist/demo/index.html @@ -20,7 +20,7 @@ - + - + - +