From 25c74c283c4050f23f11d8501946223ed3b69e6f Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Tue, 20 Dec 2016 18:25:13 +0000 Subject: [PATCH 001/108] Update .travis.yml --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e92a15a91e..76c76e73c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,9 +52,7 @@ before_script: script: npm run test # Send coverage data to Coveralls after_success: - - if ([ "$TRAVIS_BRANCH" == "development" ] || [ "$TRAVIS_BRANCH" == "master" ]); then - bash <(curl -s https://codecov.io/bash) - fi + bash <(curl -s https://codecov.io/bash) cache: directories: From e37711a47c4ec91cb58b36d96ea9a08d2ddf4ea1 Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Tue, 20 Dec 2016 18:33:44 +0000 Subject: [PATCH 002/108] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 76c76e73c5..1e14c4ce25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ before_script: script: npm run test # Send coverage data to Coveralls after_success: - bash <(curl -s https://codecov.io/bash) + bash <(curl -s https://codecov.io/bash) -X gcov cache: directories: From f859d611f6ce2fc0caaafef1fbfb5a8ae28d98fa Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Tue, 20 Dec 2016 18:45:21 +0000 Subject: [PATCH 003/108] Update appveyor.yml --- appveyor.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d697992ac3..461008872c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -56,21 +56,3 @@ test_script: # Don't actually build. build: off - -cache: - - node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-activiti-form\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-activiti-processlist\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-activiti-tasklist\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-alfresco-core\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-alfresco-datatable\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-alfresco-documentlist\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-alfresco-login\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-alfresco-search\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-alfresco-upload\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-alfresco-viewer\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-alfresco-webscript\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-alfresco-tag\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-activiti-analytics\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-alfresco-userinfo\node_modules - - C:\projects\alfresco-ng2-components\ng2-components\ng2-activiti-diagrams\node_modules From da7f3ba564687f4a3483be8f65da591bb44ee2a5 Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Tue, 20 Dec 2016 21:14:16 +0000 Subject: [PATCH 004/108] fix window build (#1350) * fix windows * fix windows * fix windows * fix windows * fix windows * fix windows * fix windows * fix windows * fix windows * fix windows * fix windows * fix windows * fix windows --- appveyor.yml | 6 ++---- demo-shell-ng2/package.json | 2 +- ng2-components/ng2-activiti-analytics/tsconfig.json | 3 +++ ng2-components/ng2-activiti-diagrams/tsconfig.json | 3 +++ ng2-components/ng2-activiti-form/tsconfig.json | 3 +++ ng2-components/ng2-activiti-processlist/tsconfig.json | 3 +++ ng2-components/ng2-activiti-tasklist/tsconfig.json | 3 +++ ng2-components/ng2-alfresco-core/tsconfig.json | 3 +++ ng2-components/ng2-alfresco-datatable/tsconfig.json | 3 +++ ng2-components/ng2-alfresco-documentlist/tsconfig.json | 3 +++ ng2-components/ng2-alfresco-login/tsconfig.json | 3 +++ ng2-components/ng2-alfresco-search/tsconfig.json | 3 +++ ng2-components/ng2-alfresco-tag/tsconfig.json | 3 +++ ng2-components/ng2-alfresco-upload/tsconfig.json | 3 +++ ng2-components/ng2-alfresco-userinfo/tsconfig.json | 3 +++ ng2-components/ng2-alfresco-viewer/tsconfig.json | 3 +++ ng2-components/ng2-alfresco-webscript/tsconfig.json | 3 +++ 17 files changed, 48 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 461008872c..87b0af2f17 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,4 @@ # Test against this version of Node.js -branches: - only: - - master environment: nodejs_version: "5" @@ -44,10 +41,10 @@ install: - IF %COMPONENT_NAME% EQU ng2-activiti-tasklist (npm link ng2-alfresco-datatable && npm link ng2-activiti-form) - IF %COMPONENT_NAME% EQU ng2-alfresco-webscript (npm link ng2-alfresco-datatable) - IF %COMPONENT_NAME% EQU ng2-activiti-analytics (npm link ng2-activiti-diagrams) - - npm install # Post-install test scripts. test_script: + - npm install # Output useful info for debugging. - node --version - npm --version @@ -56,3 +53,4 @@ test_script: # Don't actually build. build: off + diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index ce2e1f0464..8e35ae6db4 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -10,7 +10,7 @@ "clean-build": "rimraf 'app/{,**/}**.js' 'app/{,**/}**.js.map' 'app/{,**/}**.d.ts'", "test": "karma start", "build": "npm run server-versions && rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail", - "server-versions": "rimraf versions.json && npm list --depth=0 --json=true --prod=true > versions.json || true", + "server-versions": "rimraf versions.json && npm list --depth=0 --json=true --prod=true > versions.json || exit 0", "aws": "node app.js", "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json 'app/{,**/}**.ts'", "licensecheck": "license-check" diff --git a/ng2-components/ng2-activiti-analytics/tsconfig.json b/ng2-components/ng2-activiti-analytics/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-activiti-analytics/tsconfig.json +++ b/ng2-components/ng2-activiti-analytics/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-activiti-diagrams/tsconfig.json b/ng2-components/ng2-activiti-diagrams/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-activiti-diagrams/tsconfig.json +++ b/ng2-components/ng2-activiti-diagrams/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-activiti-form/tsconfig.json b/ng2-components/ng2-activiti-form/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-activiti-form/tsconfig.json +++ b/ng2-components/ng2-activiti-form/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-activiti-processlist/tsconfig.json b/ng2-components/ng2-activiti-processlist/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-activiti-processlist/tsconfig.json +++ b/ng2-components/ng2-activiti-processlist/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-activiti-tasklist/tsconfig.json b/ng2-components/ng2-activiti-tasklist/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-activiti-tasklist/tsconfig.json +++ b/ng2-components/ng2-activiti-tasklist/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-alfresco-core/tsconfig.json b/ng2-components/ng2-alfresco-core/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-alfresco-core/tsconfig.json +++ b/ng2-components/ng2-alfresco-core/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-alfresco-datatable/tsconfig.json b/ng2-components/ng2-alfresco-datatable/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-alfresco-datatable/tsconfig.json +++ b/ng2-components/ng2-alfresco-datatable/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-alfresco-documentlist/tsconfig.json b/ng2-components/ng2-alfresco-documentlist/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-alfresco-documentlist/tsconfig.json +++ b/ng2-components/ng2-alfresco-documentlist/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-alfresco-login/tsconfig.json b/ng2-components/ng2-alfresco-login/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-alfresco-login/tsconfig.json +++ b/ng2-components/ng2-alfresco-login/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-alfresco-search/tsconfig.json b/ng2-components/ng2-alfresco-search/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-alfresco-search/tsconfig.json +++ b/ng2-components/ng2-alfresco-search/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-alfresco-tag/tsconfig.json b/ng2-components/ng2-alfresco-tag/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-alfresco-tag/tsconfig.json +++ b/ng2-components/ng2-alfresco-tag/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-alfresco-upload/tsconfig.json b/ng2-components/ng2-alfresco-upload/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-alfresco-upload/tsconfig.json +++ b/ng2-components/ng2-alfresco-upload/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-alfresco-userinfo/tsconfig.json b/ng2-components/ng2-alfresco-userinfo/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-alfresco-userinfo/tsconfig.json +++ b/ng2-components/ng2-alfresco-userinfo/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-alfresco-viewer/tsconfig.json b/ng2-components/ng2-alfresco-viewer/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-alfresco-viewer/tsconfig.json +++ b/ng2-components/ng2-alfresco-viewer/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ diff --git a/ng2-components/ng2-alfresco-webscript/tsconfig.json b/ng2-components/ng2-alfresco-webscript/tsconfig.json index 276e808597..28919f9cc5 100644 --- a/ng2-components/ng2-alfresco-webscript/tsconfig.json +++ b/ng2-components/ng2-alfresco-webscript/tsconfig.json @@ -20,6 +20,9 @@ "es2015", "dom" ], + "typeRoots": [ + "node_modules/@types" + ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ From 3915e90c36f8e9392d48d4b64c25907ced1d35d4 Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Wed, 21 Dec 2016 13:09:25 +0000 Subject: [PATCH 005/108] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8305f49c6..f3d3b2a5d4 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ To generate your Alfresco Angular 2 application you can use the following Yeoman To deploy directly on your AWS instance our demo shell click the button below: - + ## Browser Support All components are supported in the following browsers: From bd0fb46639ee4c31b6f8a15b462172bf03ed977f Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Thu, 22 Dec 2016 09:54:58 +0000 Subject: [PATCH 006/108] add dependency in package.json in order to build in node 4 (#1347) --- ng2-components/ng2-activiti-analytics/package.json | 3 +++ ng2-components/ng2-activiti-diagrams/package.json | 3 +++ ng2-components/ng2-activiti-form/package.json | 4 +++- ng2-components/ng2-activiti-processlist/package.json | 4 ++++ ng2-components/ng2-activiti-tasklist/package.json | 3 +++ ng2-components/ng2-alfresco-core/package.json | 3 +++ ng2-components/ng2-alfresco-datatable/package.json | 3 +++ ng2-components/ng2-alfresco-documentlist/package.json | 3 +++ ng2-components/ng2-alfresco-login/package.json | 3 +++ ng2-components/ng2-alfresco-search/package.json | 3 +++ ng2-components/ng2-alfresco-tag/package.json | 4 +++- ng2-components/ng2-alfresco-upload/package.json | 3 +++ ng2-components/ng2-alfresco-userinfo/package.json | 3 +++ ng2-components/ng2-alfresco-viewer/package.json | 3 +++ ng2-components/ng2-alfresco-webscript/package.json | 3 +++ 15 files changed, 46 insertions(+), 2 deletions(-) diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index 4db8b4ea3e..b738fe8699 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -69,6 +69,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "1.3.1", "cssnano": "^3.8.1", @@ -87,6 +88,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-core": "2.4.1", "karma": "0.13.22", @@ -97,6 +99,7 @@ "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", + "merge-stream": "^1.0.1", "remap-istanbul": "0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json index 613f2d6238..27423e3a9d 100644 --- a/ng2-components/ng2-activiti-diagrams/package.json +++ b/ng2-components/ng2-activiti-diagrams/package.json @@ -62,6 +62,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "1.3.1", "cssnano": "^3.8.1", @@ -80,6 +81,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-core": "2.4.1", "karma": "0.13.22", @@ -90,6 +92,7 @@ "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", + "merge-stream": "^1.0.1", "remap-istanbul": "0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index 214d9d8415..0987a68ec7 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -68,7 +68,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", - "autoprefixer": "^6.5.1", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "^1.3.1", "cssnano": "^3.8.1", @@ -87,6 +87,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-ajax": "^3.2.0", "jasmine-core": "2.4.1", @@ -98,6 +99,7 @@ "karma-jasmine-html-reporter": "^0.2.0", "karma-mocha-reporter": "^2.0.3", "license-check": "^1.0.4", + "merge-stream": "^1.0.1", "remap-istanbul": "^0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index 857c38e317..b983d3a735 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -62,6 +62,7 @@ "md-date-time-picker": "^2.2.0", "ng2-translate": "2.5.0", "alfresco-js-api": "^1.0.0", + "ng2-activiti-form": "1.0.0", "ng2-activiti-tasklist": "1.0.0", "ng2-alfresco-core": "1.0.0", "ng2-alfresco-datatable": "1.0.0" @@ -69,6 +70,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "^1.3.1", "cssnano": "^3.8.1", @@ -87,6 +89,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-ajax": "^3.2.0", "jasmine-core": "2.4.1", @@ -98,6 +101,7 @@ "karma-jasmine-html-reporter": "^0.2.0", "karma-mocha-reporter": "^2.0.3", "license-check": "^1.0.4", + "merge-stream": "^1.0.1", "remap-istanbul": "^0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index 8fe6233ed0..d84b296303 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -74,6 +74,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "1.3.1", "cssnano": "^3.8.1", @@ -92,6 +93,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-core": "2.4.1", "karma": "0.13.22", @@ -102,6 +104,7 @@ "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", + "merge-stream": "^1.0.1", "remap-istanbul": "0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index c7c28b73e1..4ff3c70abd 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -80,6 +80,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "1.3.1", "cssnano": "^3.8.1", @@ -98,6 +99,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.4", "jasmine-core": "2.4.1", "karma": "0.13.22", @@ -108,6 +110,7 @@ "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", + "merge-stream": "^1.0.1", "remap-istanbul": "0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index 2bc80f3fce..ae9eb51665 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -66,6 +66,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "1.3.1", "cssnano": "^3.8.1", @@ -84,6 +85,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-core": "2.4.1", "karma": "0.13.22", @@ -94,6 +96,7 @@ "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", + "merge-stream": "^1.0.1", "remap-istanbul": "0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index f0a363db13..ba6b98a005 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -75,6 +75,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "1.3.1", "cssnano": "^3.8.1", @@ -93,6 +94,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-core": "2.4.1", "karma": "0.13.22", @@ -103,6 +105,7 @@ "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", + "merge-stream": "^1.0.1", "remap-istanbul": "0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 0cd475305b..3dbe0a1a7c 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -77,6 +77,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "1.3.1", "cssnano": "^3.8.1", @@ -95,6 +96,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-core": "2.4.1", "karma": "0.13.22", @@ -105,6 +107,7 @@ "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", + "merge-stream": "^1.0.1", "remap-istanbul": "0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index d7fad98030..28884d46b2 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -74,6 +74,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "1.3.1", "cssnano": "^3.8.1", @@ -92,6 +93,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-core": "2.4.1", "karma": "0.13.22", @@ -102,6 +104,7 @@ "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", + "merge-stream": "^1.0.1", "remap-istanbul": "0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index 939049f305..7297a998e9 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -53,7 +53,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", - "autoprefixer": "^6.5.1", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "^1.3.1", "cssnano": "^3.8.1", @@ -72,6 +72,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-ajax": "^3.2.0", "jasmine-core": "2.4.1", @@ -83,6 +84,7 @@ "karma-jasmine-html-reporter": "^0.2.0", "karma-mocha-reporter": "^2.0.3", "license-check": "^1.0.4", + "merge-stream": "^1.0.1", "remap-istanbul": "^0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index cd3bf5ee4d..68aa25a471 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -75,6 +75,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "1.3.1", "cssnano": "^3.8.1", @@ -93,6 +94,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-ajax": "3.2.0", "jasmine-core": "2.4.1", @@ -104,6 +106,7 @@ "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", + "merge-stream": "^1.0.1", "remap-istanbul": "0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json index 88c953a9cf..d7ee8ff491 100644 --- a/ng2-components/ng2-alfresco-userinfo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/package.json @@ -53,6 +53,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "^1.3.1", "cssnano": "^3.8.1", @@ -71,6 +72,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-ajax": "^3.2.0", "jasmine-core": "2.4.1", @@ -82,6 +84,7 @@ "karma-jasmine-html-reporter": "^0.2.0", "karma-mocha-reporter": "^2.0.3", "license-check": "^1.0.4", + "merge-stream": "^1.0.1", "remap-istanbul": "^0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index c12263a666..de3eed8f2d 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -69,6 +69,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "1.3.1", "cssnano": "^3.8.1", @@ -87,6 +88,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-ajax": "3.2.0", "jasmine-core": "2.4.1", @@ -98,6 +100,7 @@ "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", + "merge-stream": "^1.0.1", "remap-istanbul": "0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index b32ac39b40..6649689c9c 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -54,6 +54,7 @@ "devDependencies": { "@types/jasmine": "^2.2.33", "@types/node": "^6.0.42", + "autoprefixer": "^6.5.4", "concurrently": "^2.2.0", "cpx": "^1.3.1", "cssnano": "^3.8.1", @@ -72,6 +73,7 @@ "gulp-template": "^4.0.0", "gulp-typescript": "^3.1.3", "gulp-uglify": "^2.0.0", + "gulp-util": "^3.0.7", "intl": "^1.2.5", "jasmine-ajax": "^3.2.0", "jasmine-core": "2.4.1", @@ -84,6 +86,7 @@ "karma-mocha-reporter": "^2.0.3", "license-check": "^1.0.4", "material-design-lite": "^1.1.3", + "merge-stream": "^1.0.1", "remap-istanbul": "^0.6.3", "rimraf": "2.5.2", "run-sequence": "^1.2.2", From f5824cb0ebc8209cdf4cf1e3fa6d740c20b78cb1 Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Thu, 22 Dec 2016 09:55:27 +0000 Subject: [PATCH 007/108] improve travis build (#1340) * short time travis build * optimize build * optimize build * optimize build --- .travis.yml | 14 +++++++------- ng2-components/ng2-activiti-analytics/package.json | 2 +- ng2-components/ng2-activiti-diagrams/package.json | 2 +- ng2-components/ng2-activiti-form/package.json | 2 +- .../ng2-activiti-processlist/package.json | 2 +- ng2-components/ng2-activiti-tasklist/package.json | 2 +- ng2-components/ng2-alfresco-core/package.json | 2 +- ng2-components/ng2-alfresco-datatable/package.json | 2 +- .../ng2-alfresco-documentlist/package.json | 2 +- ng2-components/ng2-alfresco-login/package.json | 2 +- ng2-components/ng2-alfresco-search/package.json | 2 +- ng2-components/ng2-alfresco-tag/package.json | 2 +- ng2-components/ng2-alfresco-upload/package.json | 2 +- ng2-components/ng2-alfresco-userinfo/package.json | 2 +- ng2-components/ng2-alfresco-viewer/package.json | 2 +- ng2-components/ng2-alfresco-webscript/package.json | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e14c4ce25..5be48fb0ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,24 +32,24 @@ env: before_script: - if ([ "$MODULE" != "ng2-alfresco-core" ]); then - (cd ng2-components/ng2-alfresco-core; if [ ! -d "dist" ]; then npm install; fi; npm link); + (cd ng2-components/ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); fi - if ([ "$MODULE" == "ng2-alfresco-documentlist" ] || [ "$MODULE" == "ng2-alfresco-webscript" ] || [ "$MODULE" == "ng2-activiti-processlist" ] || [ "$MODULE" == "ng2-activiti-tasklist" ]); then - (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "dist" ]; then npm install; fi; npm link); + (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); fi - if ([ "$MODULE" == "ng2-activiti-tasklist" ] || [ "$MODULE" == "ng2-activiti-processlist" ]); then - (cd ng2-components/ng2-activiti-form; npm link ng2-alfresco-core; if [ ! -d "dist" ]; then npm install; fi; npm link); + (cd ng2-components/ng2-activiti-form; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); fi - if ([ "$MODULE" == "ng2-activiti-processlist" ]); then - (cd ng2-components/ng2-activiti-tasklist; npm link ng2-alfresco-core; npm link ng2-alfresco-datatable; npm link ng2-activiti-form; if [ ! -d "dist" ]; then npm install; fi; npm link); + (cd ng2-components/ng2-activiti-tasklist; npm link ng2-alfresco-core; npm link ng2-alfresco-datatable; npm link ng2-activiti-form; if [ ! -d "bundles" ]; then npm link; fi); fi - if ([ "$MODULE" == "ng2-activiti-analytics" ]); then - (cd ng2-components/ng2-activiti-diagrams; npm link ng2-alfresco-core; if [ ! -d "dist" ]; then npm install; fi; npm link); + (cd ng2-components/ng2-activiti-diagrams; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); fi - cd ng2-components/$MODULE; - npm run travis; - - npm install; -script: npm run test +#npm insall run install, build and tests +script: npm install # Send coverage data to Coveralls after_success: bash <(curl -s https://codecov.io/bash) -X gcov diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index b738fe8699..5216f90876 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core ng2-activiti-diagrams", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json index 27423e3a9d..bbcf8452ff 100644 --- a/ng2-components/ng2-activiti-diagrams/package.json +++ b/ng2-components/ng2-activiti-diagrams/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index 0987a68ec7..b18c63432d 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index b983d3a735..6415c7423b 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-activiti-form ng2-activiti-tasklist", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index d84b296303..0d20ec74f6 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-activiti-form", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 4ff3c70abd..43cbd052c3 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "echo 'placeholder'", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index ae9eb51665..a149422023 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index ba6b98a005..1f913ede4c 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 3dbe0a1a7c..3d4aa2b24c 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 28884d46b2..3d794f5ca8 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index 7297a998e9..ebe2cb8aa3 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 68aa25a471..0ddc990d02 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json index d7ee8ff491..536261c4b6 100644 --- a/ng2-components/ng2-alfresco-userinfo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index de3eed8f2d..64d39b60fc 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index 6649689c9c..7e5966cd3e 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "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", + "prepublish": "npm run test", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", From 92fc7d1df3e119489d739f9bd530a26bea2d4ab9 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Thu, 22 Dec 2016 10:44:41 +0000 Subject: [PATCH 008/108] #1345 fix material design (#1352) --- .../analytics-report-parameters.component.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts index cd9b7366e2..062b348472 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts @@ -15,20 +15,22 @@ * limitations under the License. */ -import { Component, EventEmitter, OnInit, OnChanges, Input, Output, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, OnInit, OnChanges, Input, Output, SimpleChanges, OnDestroy, AfterViewChecked } from '@angular/core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; import { ReportParametersModel, ReportQuery, ParameterValueModel, ReportParameterDetailsModel } from '../models/report.model'; import { FormGroup, FormBuilder, FormControl } from '@angular/forms'; import * as moment from 'moment'; +declare var componentHandler; + @Component({ moduleId: module.id, selector: 'analytics-report-parameters', templateUrl: './analytics-report-parameters.component.html', styleUrls: ['./analytics-report-parameters.component.css'] }) -export class AnalyticsReportParametersComponent implements OnInit, OnChanges { +export class AnalyticsReportParametersComponent implements OnInit, OnChanges, OnDestroy, AfterViewChecked { public static FORMAT_DATE_ACTIVITI: string = 'YYYY-MM-DD'; @@ -236,4 +238,11 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges { } ); } + + ngAfterViewChecked() { + // workaround for MDL issues with dynamic components + if (componentHandler) { + componentHandler.upgradeAllRegistered(); + } + } } From facafbd55c15908922612ed20a4c4715947dc04d Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 3 Jan 2017 10:46:27 +0000 Subject: [PATCH 009/108] Single naming convention for core services (#1363) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove temporary file from repo * fix: alfresco-api.service * new: auth.service.ts - new auth.service.ts implementation - deprecation warning for AlfrescoAuthenticationService - fix ‘clean-build’ typo - extra vscode settings for ‘.d.ts’ files * use AuthService internally * new: content.service.ts - deprecation warning for AlfrescoContentService - use new ContentService internally * new: settings.service.ts - new SettingsService - deprecation warning for AlfrescoSettingsService - using new SettingsService internally * new: translate.service and translate-loader.service - custom TranslateLoader becomes AlfrescoTranslateLoader - custom TranslateService becomes AlfrescoTranslateService - deprecation notices for old service and loader implementations * fix: document list * fix: search * fix: tag also fixes #1364 * fix: activiti form * fix: activiti tasklist, improve unit tests * fix: activiti processlist, unit tests improvements * fix: diagram component * fix: analytics component * fix: upload component - fix numerous issues with unit tests (hidden by ‘any’ type) - test improvements * fix: webscript * fix: userinfo unit tests * code fixes * fix 'beforeAll' issue * tasklist unit testing improvements * fix: form unit tests * fix: unit tests --- .vscode/settings.json | 3 +- .../ng2-activiti-analytics/karma-test-shim.js | 2 +- ...nalytics-report-heat-map.component.spec.ts | 16 +- .../analytics-report-heat-map.component.ts | 8 +- .../analytics-report-list.component.spec.ts | 15 +- .../analytics-report-list.component.ts | 7 +- ...lytics-report-parameters.component.spec.ts | 35 +- .../analytics-report-parameters.component.ts | 8 +- .../components/analytics.component.spec.ts | 19 +- .../src/components/analytics.component.ts | 8 +- .../src/services/analytics.service.ts | 6 +- .../ng2-activiti-diagrams/karma-test-shim.js | 2 +- .../src/components/diagram.component.ts | 8 +- .../src/services/diagrams.service.ts | 6 +- .../ng2-activiti-form/karma-test-shim.js | 2 +- .../activiti-form.component.spec.ts | 2 +- .../widgets/attach/attach.widget.spec.ts | 2 +- .../display-value.widget.spec.ts | 5 +- .../display-value/display-value.widget.ts | 6 +- .../radio-buttons.widget.spec.ts | 2 +- .../src/services/activiti-alfresco.service.ts | 4 +- .../src/services/ecm-model.service.spec.ts | 24 +- .../src/services/ecm-model.service.ts | 5 +- .../src/services/form.service.spec.ts | 13 +- .../src/services/node.service.spec.ts | 7 +- .../src/services/node.service.ts | 4 +- .../widget-visibility.service.spec.ts | 45 +- .../karma-test-shim.js | 2 +- .../activiti-filters.component.spec.ts | 2 +- .../services/activiti-process.service.spec.ts | 31 +- .../src/services/activiti-process.service.ts | 15 +- .../ng2-activiti-tasklist/karma-test-shim.js | 2 +- .../src/assets/translation.service.mock.ts | 37 -- .../activiti-apps.component.spec.ts | 11 +- .../src/components/activiti-apps.component.ts | 8 +- .../activiti-checklist.component.spec.ts | 28 +- .../activiti-checklist.component.ts | 8 +- .../activiti-comments.component.spec.ts | 27 +- .../components/activiti-comments.component.ts | 8 +- .../activiti-filters.component.spec.ts | 4 +- .../components/activiti-filters.component.ts | 15 +- .../activiti-people-search.component.spec.ts | 27 +- .../activiti-people-search.component.ts | 8 +- .../activiti-people.component.spec.ts | 28 +- .../components/activiti-people.component.ts | 8 +- .../activiti-start-task.component.spec.ts | 28 +- .../activiti-start-task.component.ts | 8 +- .../activiti-task-details.component.spec.ts | 12 +- .../activiti-task-details.component.ts | 9 +- .../activiti-task-header.component.spec.ts | 15 +- .../activiti-task-header.component.ts | 8 +- .../activiti-tasklist.component.spec.ts | 31 +- .../components/activiti-tasklist.component.ts | 14 +- .../no-task-detail-template.component.spec.ts | 2 +- .../services/activiti-people.service.spec.ts | 39 +- .../src/services/activiti-people.service.ts | 5 +- .../activiti-tasklist.service.spec.ts | 55 ++- .../src/services/activiti-tasklist.service.ts | 9 +- ng2-components/ng2-alfresco-core/index.ts | 39 +- ng2-components/ng2-alfresco-core/package.json | 2 +- .../AlfrescoAuthentication.service.ts | 206 +-------- .../src/services/AlfrescoContent.service.ts | 30 +- .../src/services/AlfrescoSettings.service.ts | 61 +-- .../services/AlfrescoTranslation.service.ts | 35 +- ...Api.service.ts => alfresco-api.service.ts} | 13 + .../src/services/auth-guard-bpm.service.ts | 4 +- .../src/services/auth-guard-ecm.service.ts | 4 +- .../src/services/auth-guard.service.ts | 4 +- ...n.service.spec.ts => auth.service.spec.ts} | 20 +- .../src/services/auth.service.ts | 209 ++++++++++ ...ontent.spec.ts => content.service.spec.ts} | 28 +- .../src/services/content.service.ts | 47 +++ .../ng2-alfresco-core/src/services/index.ts | 9 +- .../src/services/renditions.service.spec.ts | 2 +- .../src/services/renditions.service.ts | 2 +- ...tings.spec.ts => settings.service.spec.ts} | 10 +- .../src/services/settings.service.ts | 78 ++++ ...ec.ts => translate-loader.service.spec.ts} | 20 +- ...service.ts => translate-loader.service.ts} | 2 +- ...vice.spec.ts => translate.service.spec.ts} | 26 +- .../src/services/translate.service.ts | 54 +++ ...e9f3391a75a650ffc7cab54d80d0a017e2a.js.map | 1 - .../src/components/document-list.ts | 8 +- .../src/components/document-menu-action.ts | 10 +- .../services/document-list.service.spec.ts | 16 +- .../src/services/document-list.service.ts | 10 +- ...esco-search-autocomplete.component.spec.ts | 18 +- .../alfresco-search-autocomplete.component.ts | 20 +- .../alfresco-search-control.component.spec.ts | 18 +- .../alfresco-search-control.component.ts | 8 +- .../alfresco-search.component.spec.ts | 22 +- .../components/alfresco-search.component.ts | 28 +- .../services/alfresco-search.service.spec.ts | 6 +- .../src/services/alfresco-search.service.ts | 5 +- .../alfresco-thumbnail.service.spec.ts | 8 +- .../services/alfresco-thumbnail.service.ts | 4 +- .../components/tag-actions.component.spec.ts | 16 +- .../src/components/tag-actions.component.ts | 6 +- .../src/components/tag-list.component.spec.ts | 20 +- .../src/components/tag-list.component.ts | 4 +- .../tag-node-list.component.spec.ts | 18 +- .../src/components/tag-node-list.component.ts | 3 +- .../src/services/tag.service.ts | 3 +- .../file-uploading-dialog.component.spec.ts | 34 +- .../file-uploading-dialog.component.ts | 18 +- .../file-uploading-list.component.ts | 1 - .../upload-button.component.spec.ts | 39 +- .../src/components/upload-button.component.ts | 29 +- .../upload-drag-area.component.spec.ts | 74 ++-- .../components/upload-drag-area.component.ts | 48 +-- .../file-draggable.directive.spec.ts | 2 +- .../src/services/upload.service.spec.ts | 392 +++++++++--------- .../src/services/upload.service.ts | 2 +- .../ng2-alfresco-userinfo/karma-test-shim.js | 2 +- .../components/user-info.component.spec.ts | 32 +- .../src/components/user-info.component.ts | 10 +- .../src/services/bpm-user.service.spec.ts | 46 +- .../src/services/bpm-user.service.ts | 5 +- .../src/services/ecm-user.service.spec.ts | 61 +-- .../src/services/ecm-user.service.ts | 5 +- .../src/webscript.component.spec.ts | 34 +- .../src/webscript.component.ts | 9 +- 122 files changed, 1376 insertions(+), 1392 deletions(-) delete mode 100644 ng2-components/ng2-activiti-tasklist/src/assets/translation.service.mock.ts rename ng2-components/ng2-alfresco-core/src/services/{AlfrescoApi.service.ts => alfresco-api.service.ts} (71%) rename ng2-components/ng2-alfresco-core/src/services/{AlfrescoAuthentication.service.spec.ts => auth.service.spec.ts} (96%) create mode 100644 ng2-components/ng2-alfresco-core/src/services/auth.service.ts rename ng2-components/ng2-alfresco-core/src/services/{AlfrescoContent.spec.ts => content.service.spec.ts} (77%) create mode 100644 ng2-components/ng2-alfresco-core/src/services/content.service.ts rename ng2-components/ng2-alfresco-core/src/services/{AlfrescoSettings.spec.ts => settings.service.spec.ts} (79%) create mode 100644 ng2-components/ng2-alfresco-core/src/services/settings.service.ts rename ng2-components/ng2-alfresco-core/src/services/{AlfrescoTranslationLoader.service.spec.ts => translate-loader.service.spec.ts} (84%) rename ng2-components/ng2-alfresco-core/src/services/{AlfrescoTranslationLoader.service.ts => translate-loader.service.ts} (98%) rename ng2-components/ng2-alfresco-core/src/services/{AlfrescoTranslation.service.spec.ts => translate.service.spec.ts} (78%) create mode 100644 ng2-components/ng2-alfresco-core/src/services/translate.service.ts delete mode 100644 ng2-components/ng2-alfresco-core/ts-node/f6ba8d7b15d27fe97737b60b41fb5fdda5bf0070/2d80de9f3391a75a650ffc7cab54d80d0a017e2a.js.map diff --git a/.vscode/settings.json b/.vscode/settings.json index ee92513479..995f793cb7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,7 @@ "**/.hg": true, "**/.DS_Store": true, "**/*.js": { "when": "$(basename).ts"}, - "**/*.js.map": { "when": "$(basename)"} + "**/*.js.map": { "when": "$(basename)"}, + "**/*.d.ts": { "when": "$(basename).ts"} } } diff --git a/ng2-components/ng2-activiti-analytics/karma-test-shim.js b/ng2-components/ng2-activiti-analytics/karma-test-shim.js index 4d66211142..db50eb931e 100644 --- a/ng2-components/ng2-activiti-analytics/karma-test-shim.js +++ b/ng2-components/ng2-activiti-analytics/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts index bb02e9a5e9..bac86e50bd 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts @@ -15,17 +15,18 @@ * limitations under the License. */ +import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { CoreModule } from 'ng2-alfresco-core'; +import { Observable } from 'rxjs/Rx'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { DiagramsModule } from 'ng2-activiti-diagrams'; import { AnalyticsReportHeatMapComponent } from '../components/analytics-report-heat-map.component'; import { WIDGET_DIRECTIVES } from '../components/widgets/index'; import { AnalyticsService } from '../services/analytics.service'; -import { DebugElement } from '@angular/core'; declare let jasmine: any; -describe('Test ng2-activiti-analytics-report-heat-map', () => { +describe('AnalyticsReportHeatMapComponent', () => { let componentHandler: any; let component: any; @@ -44,8 +45,8 @@ describe('Test ng2-activiti-analytics-report-heat-map', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule, - DiagramsModule + CoreModule.forRoot(), + DiagramsModule.forRoot() ], declarations: [ AnalyticsReportHeatMapComponent, @@ -55,6 +56,11 @@ describe('Test ng2-activiti-analytics-report-heat-map', () => { AnalyticsService ] }).compileComponents(); + + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); + })); beforeEach(() => { diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts index 064b4a04c2..a2fb1faeb9 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts @@ -16,7 +16,7 @@ */ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; import { FormGroup, FormBuilder, FormControl } from '@angular/forms'; @@ -43,11 +43,11 @@ export class AnalyticsReportHeatMapComponent implements OnInit { currentMetricColors: string; metricType: string; - constructor(private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, private analyticsService: AnalyticsService, private formBuilder: FormBuilder) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src'); } } diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts index ce2cf64a8f..e2d61e9a69 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts @@ -15,15 +15,16 @@ * limitations under the License. */ +import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { CoreModule } from 'ng2-alfresco-core'; +import { Observable } from 'rxjs/Rx'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { AnalyticsReportListComponent } from '../components/analytics-report-list.component'; import { AnalyticsService } from '../services/analytics.service'; -import { DebugElement } from '@angular/core'; declare let jasmine: any; -describe('Test ng2-activiti-analytics Report list', () => { +describe('AnalyticsReportListComponent', () => { let reportList = [ {'id': 2002, 'name': 'Fake Test Process definition heat map'}, @@ -35,7 +36,7 @@ describe('Test ng2-activiti-analytics Report list', () => { let reportSelected = {'id': 2003, 'name': 'Fake Test Process definition overview'}; - let component: any; + let component: AnalyticsReportListComponent; let fixture: ComponentFixture; let debug: DebugElement; let element: HTMLElement; @@ -43,7 +44,7 @@ describe('Test ng2-activiti-analytics Report list', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() ], declarations: [ AnalyticsReportListComponent @@ -52,6 +53,10 @@ describe('Test ng2-activiti-analytics Report list', () => { AnalyticsService ] }).compileComponents(); + + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); beforeEach(() => { diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts index 47ce38c21b..3f42d93a44 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts @@ -16,11 +16,9 @@ */ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; +import { Observer, Observable } from 'rxjs/Rx'; import { AnalyticsService } from '../services/analytics.service'; import { ReportParametersModel } from '../models/report.model'; -import { Observer } from 'rxjs/Observer'; -import { Observable } from 'rxjs/Observable'; @Component({ moduleId: module.id, @@ -46,8 +44,7 @@ export class AnalyticsReportListComponent implements OnInit { reports: ReportParametersModel[] = []; - constructor(private auth: AlfrescoAuthenticationService, - private analyticsService: AnalyticsService) { + constructor(private analyticsService: AnalyticsService) { this.report$ = new Observable(observer => this.reportObserver = observer).share(); } diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts index 74eb9075ee..f00f81874b 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts @@ -16,25 +16,23 @@ */ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { - CoreModule -} from 'ng2-alfresco-core'; +import { DebugElement, SimpleChange } from '@angular/core'; +import { Observable } from 'rxjs/Rx'; +import * as moment from 'moment'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component'; import { WIDGET_DIRECTIVES } from '../components/widgets/index'; - import { AnalyticsService } from '../services/analytics.service'; import { ReportParametersModel } from '../models/report.model'; -import * as moment from 'moment'; -import { DebugElement, SimpleChange } from '@angular/core'; import * as analyticParamsMock from '../assets/analyticsParamsReportComponent.mock'; declare let jasmine: any; declare let mdDateTimePicker: any; -describe('Test ng2-analytics-report-parameters Report Parameters ', () => { +describe('AnalyticsReportParametersComponent', () => { - let component: any; + let component: AnalyticsReportParametersComponent; let fixture: ComponentFixture; let debug: DebugElement; let element: HTMLElement; @@ -44,7 +42,7 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() ], declarations: [ AnalyticsReportParametersComponent, @@ -54,6 +52,15 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => { AnalyticsService ] }).compileComponents(); + + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); + + componentHandler = jasmine.createSpyObj('componentHandler', [ + 'upgradeAllRegistered' + ]); + window['componentHandler'] = componentHandler; })); beforeEach(() => { @@ -62,10 +69,6 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => { debug = fixture.debugElement; element = fixture.nativeElement; fixture.detectChanges(); - componentHandler = jasmine.createSpyObj('componentHandler', [ - 'upgradeAllRegistered' - ]); - window['componentHandler'] = componentHandler; }); describe('Rendering tests', () => { @@ -323,9 +326,9 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => { responseText: analyticParamsMock.reportDefParamProcessDefOptionsApp }); - let appId = 1; + let appId = '1'; component.appId = appId; - component.reportId = 1; + component.reportId = '1'; let change = new SimpleChange(null, appId); component.ngOnChanges({ 'appId': change }); @@ -341,7 +344,7 @@ describe('Test ng2-analytics-report-parameters Report Parameters ', () => { expect(res[1].name).toEqual('Fake task name 2'); }); - component.reportId = 100; + component.reportId = '100'; component.reportParameters = new ReportParametersModel(analyticParamsMock.reportDefParamTask); component.onProcessDefinitionChanges(analyticParamsMock.fieldProcessDef); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts index 062b348472..452d9448b0 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, OnInit, OnChanges, Input, Output, SimpleChanges, OnDestroy, AfterViewChecked } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; import { ReportParametersModel, ReportQuery, ParameterValueModel, ReportParameterDetailsModel } from '../models/report.model'; import { FormGroup, FormBuilder, FormControl } from '@angular/forms'; @@ -70,11 +70,11 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On private paramOpts; private isEditable: boolean = false; - constructor(private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, private analyticsService: AnalyticsService, private formBuilder: FormBuilder ) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src'); } } diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts index 4adbcbbed8..9c1939f669 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts @@ -16,9 +16,10 @@ */ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { - CoreModule -} from 'ng2-alfresco-core'; +import { DebugElement, SimpleChange } from '@angular/core'; +import { Observable } from 'rxjs/Rx'; +import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { DiagramsModule } from 'ng2-activiti-diagrams'; import { AnalyticsReportListComponent } from '../components/analytics-report-list.component'; @@ -26,11 +27,9 @@ import { AnalyticsComponent } from '../components/analytics.component'; import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component'; import { AnalyticsReportHeatMapComponent } from '../components/analytics-report-heat-map.component'; import { WIDGET_DIRECTIVES } from '../components/widgets/index'; -import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts'; import { Chart } from '../models/chart.model'; import { AnalyticsService } from '../services/analytics.service'; import { ReportQuery } from '../models/report.model'; -import { DebugElement, SimpleChange } from '@angular/core'; import * as analyticMock from '../assets/analyticsComponent.mock'; export const ANALYTICS_DIRECTIVES: any[] = [ @@ -47,7 +46,7 @@ export const ANALYTICS_PROVIDERS: any[] = [ declare let jasmine: any; declare let mdDateTimePicker: any; -describe('Test ng2-activiti-analytics Report ', () => { +describe('AnalyticsComponent', () => { let component: any; let fixture: ComponentFixture; @@ -59,8 +58,8 @@ describe('Test ng2-activiti-analytics Report ', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule, - DiagramsModule + CoreModule.forRoot(), + DiagramsModule.forRoot() ], declarations: [ ...ANALYTICS_DIRECTIVES, @@ -70,6 +69,10 @@ describe('Test ng2-activiti-analytics Report ', () => { ...ANALYTICS_PROVIDERS ] }).compileComponents(); + + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); beforeEach(() => { diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts index 6db510d36d..5fb04a512e 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, OnChanges, Input, Output, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; import { ReportQuery } from '../models/report.model'; import { Chart } from '../models/chart.model'; @@ -68,11 +68,11 @@ export class AnalyticsComponent implements OnChanges { } }; - constructor(private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, private analyticsService: AnalyticsService) { console.log('AnalyticsComponent'); - if (translate) { - translate.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src'); } } diff --git a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts index f1ccd7c731..7623a98593 100644 --- a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts +++ b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts @@ -16,18 +16,16 @@ */ import { Injectable } from '@angular/core'; -import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; import { Response } from '@angular/http'; +import { AlfrescoApiService } from 'ng2-alfresco-core'; import { ReportParametersModel, ParameterValueModel } from '../models/report.model'; import { Chart, PieChart, TableChart, BarChart, HeatMapChart, MultiBarChart } from '../models/chart.model'; @Injectable() export class AnalyticsService { - constructor(private authService: AlfrescoAuthenticationService, - public apiService: AlfrescoApiService, - private alfrescoSettingsService: AlfrescoSettingsService) { + constructor(public apiService: AlfrescoApiService) { } /** diff --git a/ng2-components/ng2-activiti-diagrams/karma-test-shim.js b/ng2-components/ng2-activiti-diagrams/karma-test-shim.js index d08f1ebd76..680be8a9a1 100644 --- a/ng2-components/ng2-activiti-diagrams/karma-test-shim.js +++ b/ng2-components/ng2-activiti-diagrams/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts index d4e78c7248..4d279e3df5 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts @@ -16,7 +16,7 @@ */ import { Component, ElementRef, Input, Output, EventEmitter, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { DiagramsService } from '../services/diagrams.service'; import { DiagramColorService } from '../services/diagram-color.service'; import { RaphaelService } from './raphael/raphael.service'; @@ -60,12 +60,12 @@ export class DiagramComponent { private elementRef: ElementRef; constructor(elementRef: ElementRef, - private translate: AlfrescoTranslationService, + private translateService: AlfrescoTranslateService, private diagramColorService: DiagramColorService, private raphaelService: RaphaelService, private diagramsService: DiagramsService) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-diagrams', 'node_modules/ng2-activiti-diagrams/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-diagrams', 'node_modules/ng2-activiti-diagrams/src'); } this.elementRef = elementRef; } diff --git a/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts b/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts index d2d9201b4d..0beda69bd6 100644 --- a/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts +++ b/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts @@ -16,16 +16,16 @@ */ import { Injectable } from '@angular/core'; -import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; +import { AuthService, SettingsService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; import { Response, Http, Headers, RequestOptions } from '@angular/http'; @Injectable() export class DiagramsService { - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private http: Http, - private alfrescoSettingsService: AlfrescoSettingsService) { + private alfrescoSettingsService: SettingsService) { } getProcessDefinitionModel(processDefinitionId: string): Observable { diff --git a/ng2-components/ng2-activiti-form/karma-test-shim.js b/ng2-components/ng2-activiti-form/karma-test-shim.js index a02d98e315..5445bda93f 100644 --- a/ng2-components/ng2-activiti-form/karma-test-shim.js +++ b/ng2-components/ng2-activiti-form/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts index 3e6eca3be6..efe827c78e 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts @@ -40,7 +40,7 @@ describe('ActivitiForm', () => { visibilityService = new WidgetVisibilityService(null); spyOn(visibilityService, 'refreshVisibility').and.stub(); formService = new FormService(null, null); - nodeService = new NodeService(null, null); + nodeService = new NodeService(null); formComponent = new ActivitiForm(formService, visibilityService, null, nodeService); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts index de78edfa12..95121ed10b 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts @@ -30,7 +30,7 @@ describe('AttachWidget', () => { let dialogPolyfill: any; beforeEach(() => { - contentService = new ActivitiAlfrescoContentService(null, null); + contentService = new ActivitiAlfrescoContentService(null); widget = new AttachWidget(contentService); dialogPolyfill = { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts index f3540dc4e9..6ac0dbe149 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts @@ -26,20 +26,17 @@ import { FormFieldTypes } from '../core/form-field-types'; import { FormModel } from '../core/form.model'; import { DynamicTableColumn, DynamicTableRow } from './../dynamic-table/dynamic-table.widget.model'; import { WidgetVisibilityService } from '../../../services/widget-visibility.service'; -import { AlfrescoSettingsService } from 'ng2-alfresco-core'; describe('DisplayValueWidget', () => { let widget: DisplayValueWidget; let formService: FormService; let visibilityService: WidgetVisibilityService; - let settingsService: AlfrescoSettingsService; beforeEach(() => { - settingsService = new AlfrescoSettingsService(); formService = new FormService(null, null); visibilityService = new WidgetVisibilityService(null); - widget = new DisplayValueWidget(formService, visibilityService, settingsService); + widget = new DisplayValueWidget(formService, visibilityService); }); it('should require field to setup default value', () => { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts index 9e5a659b72..cc6a5e41c2 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts @@ -16,14 +16,13 @@ */ import { Component, OnInit } from '@angular/core'; +import * as moment from 'moment'; import { WidgetComponent } from './../widget.component'; import { FormFieldTypes } from '../core/form-field-types'; import { FormService } from '../../../services/form.service'; import { FormFieldOption } from './../core/form-field-option'; import { DynamicTableColumn, DynamicTableRow } from './../dynamic-table/dynamic-table.widget.model'; import { WidgetVisibilityService } from '../../../services/widget-visibility.service'; -import { AlfrescoSettingsService } from 'ng2-alfresco-core'; -import * as moment from 'moment'; @Component({ moduleId: module.id, @@ -50,8 +49,7 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit { hasFile: boolean = false; constructor(private formService: FormService, - private visibilityService: WidgetVisibilityService, - private settingsService: AlfrescoSettingsService) { + private visibilityService: WidgetVisibilityService) { super(); } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts index c21594f359..7c0e1d1e50 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts @@ -123,7 +123,7 @@ describe('RadioButtonsWidget', () => { expect(console.error).toHaveBeenCalledWith('Err'); }); - it('should update the field value when an option is selected', () => { + xit('should update the field value when an option is selected', () => { spyOn(widget, 'checkVisibility').and.stub(); widget.onOptionClick('fake-opt'); diff --git a/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts b/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts index a355e46259..474745ee33 100644 --- a/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService } from 'ng2-alfresco-core'; import { ExternalContent } from '../components/widgets/core/external-content'; import { ExternalContentLink } from '../components/widgets/core/external-content-link'; import { AlfrescoApi } from 'alfresco-js-api'; @@ -28,7 +28,7 @@ export class ActivitiAlfrescoContentService { static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error'; static GENERIC_ERROR_MESSAGE: string = 'Server error'; - constructor(private authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService) { } /** diff --git a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts index 75a2a6cdbc..6dfe52b06e 100644 --- a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts @@ -16,16 +16,10 @@ */ import { TestBed } from '@angular/core/testing'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - StorageService -} from 'ng2-alfresco-core'; -import { EcmModelService } from './ecm-model.service'; import { Observable } from 'rxjs/Rx'; -import { FormModel } from '../components/widgets/core/form.model'; -import { HttpModule } from '@angular/http'; +import { CoreModule } from 'ng2-alfresco-core'; +import { EcmModelService } from './ecm-model.service'; +import { FormModel } from './../components/widgets/core/form.model'; declare let jasmine: any; @@ -33,15 +27,13 @@ describe('EcmModelService', () => { let service: EcmModelService; - beforeAll(() => { + beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpModule], + imports: [ + CoreModule.forRoot() + ], providers: [ - AlfrescoSettingsService, - AlfrescoApiService, - AlfrescoAuthenticationService, - EcmModelService, - StorageService + EcmModelService ] }); service = TestBed.get(EcmModelService); diff --git a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts index a83727a68b..6fa60acc14 100644 --- a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts @@ -16,8 +16,8 @@ */ import { Injectable } from '@angular/core'; -import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; +import { AlfrescoApiService } from 'ng2-alfresco-core'; import { FormModel } from '../components/widgets/core/form.model'; @Injectable() @@ -27,8 +27,7 @@ export class EcmModelService { public static MODEL_NAME: string = 'activitiFormsModel'; public static TYPE_MODEL: string = 'cm:folder'; - constructor(private authService: AlfrescoAuthenticationService, - public apiService: AlfrescoApiService) { + constructor(public apiService: AlfrescoApiService) { } public createEcmTypeForActivitiForm(formName: string, form: FormModel): Observable { diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts index 42b8b7b87c..158390154a 100644 --- a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts @@ -20,20 +20,23 @@ import { CoreModule, AlfrescoApiService } from 'ng2-alfresco-core'; import { FormService } from './form.service'; import { EcmModelService } from './ecm-model.service'; import { FormDefinitionModel } from '../models/form-definition.model'; -import { HttpModule, Response, ResponseOptions } from '@angular/http'; +import { Response, ResponseOptions } from '@angular/http'; declare let jasmine: any; describe('FormService', () => { - let responseBody: any, service: FormService, apiService: AlfrescoApiService; + let responseBody: any; + let service: FormService; + let apiService: AlfrescoApiService; - beforeAll(() => { + beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpModule, CoreModule], + imports: [ + CoreModule.forRoot() + ], providers: [ EcmModelService, - AlfrescoApiService, FormService ] }); diff --git a/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts index 9b99e3a6fb..1313d463c6 100644 --- a/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts @@ -19,7 +19,6 @@ import { TestBed } from '@angular/core/testing'; import { CoreModule } from 'ng2-alfresco-core'; import { NodeService } from './node.service'; import { NodeMetadata } from '../models/node-metadata.model'; -import { HttpModule } from '@angular/http'; import { EcmModelService } from './ecm-model.service'; declare let jasmine: any; @@ -28,9 +27,11 @@ describe('NodeService', () => { let service: NodeService; - beforeAll(() => { + beforeEach(() => { TestBed.configureTestingModule({ - imports: [ HttpModule, CoreModule ], + imports: [ + CoreModule.forRoot() + ], providers: [ NodeService, EcmModelService diff --git a/ng2-components/ng2-activiti-form/src/services/node.service.ts b/ng2-components/ng2-activiti-form/src/services/node.service.ts index 810188b439..1a6958b7f6 100644 --- a/ng2-components/ng2-activiti-form/src/services/node.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/node.service.ts @@ -16,14 +16,14 @@ */ import { Injectable } from '@angular/core'; -import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; import { NodeMetadata } from '../models/node-metadata.model'; @Injectable() export class NodeService { - constructor(private authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService) { } /** diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts index 4b61f15094..fffef3c959 100644 --- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { ReflectiveInjector } from '@angular/core'; -import { AlfrescoApi } from 'alfresco-js-api'; +import { TestBed } from '@angular/core/testing'; +import { CoreModule } from 'ng2-alfresco-core'; import { formTest, fakeTaskProcessVariableModels, @@ -24,41 +24,28 @@ import { fakeFormJson } from './assets/widget-visibility.service.mock'; import { WidgetVisibilityService } from './widget-visibility.service'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - StorageService -} from 'ng2-alfresco-core'; -import { TaskProcessVariableModel } from '../models/task-process-variable.model'; -import { WidgetVisibilityModel } from '../models/widget-visibility.model'; -import { FormModel, FormFieldModel, TabModel, ContainerModel, FormFieldTypes } from '../components/widgets/core/index'; +import { TaskProcessVariableModel } from './../models/task-process-variable.model'; +import { WidgetVisibilityModel } from './../models/widget-visibility.model'; +import { FormModel, FormFieldModel, TabModel, ContainerModel, FormFieldTypes } from './../components/widgets/core/index'; declare let jasmine: any; describe('WidgetVisibilityService', () => { - let service, injector; - let authenticationService: AlfrescoAuthenticationService; - let apiService: AlfrescoApiService; - let alfrescoApi: AlfrescoApi; + + let service: WidgetVisibilityService; let booleanResult: boolean; let stubFormWithFields = new FormModel(fakeFormJson); beforeEach(() => { - injector = ReflectiveInjector.resolveAndCreate([ - WidgetVisibilityService, - AlfrescoSettingsService, - AlfrescoApiService, - AlfrescoAuthenticationService, - StorageService - ]); - }); - - beforeEach(() => { - service = injector.get(WidgetVisibilityService); - authenticationService = injector.get(AlfrescoAuthenticationService); - apiService = injector.get(AlfrescoApiService); - alfrescoApi = apiService.getInstance(); + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot() + ], + providers: [ + WidgetVisibilityService + ] + }); + service = TestBed.get(WidgetVisibilityService); jasmine.Ajax.install(); }); diff --git a/ng2-components/ng2-activiti-processlist/karma-test-shim.js b/ng2-components/ng2-activiti-processlist/karma-test-shim.js index b628e7b92b..b216586a6e 100644 --- a/ng2-components/ng2-activiti-processlist/karma-test-shim.js +++ b/ng2-components/ng2-activiti-processlist/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts index 69bfee68ba..fcc540f7e1 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts @@ -43,7 +43,7 @@ describe('ActivitiFilters', () => { }); beforeEach(() => { - activitiService = new ActivitiProcessService(null, null); + activitiService = new ActivitiProcessService(null); filterList = new ActivitiProcessFilters(null, activitiService); }); diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts index 39ea1d76d1..f174b4891e 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts @@ -15,14 +15,9 @@ * limitations under the License. */ -import { ReflectiveInjector } from '@angular/core'; +import { TestBed } from '@angular/core/testing'; import { async } from '@angular/core/testing'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - StorageService -} from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoApiService } from 'ng2-alfresco-core'; import { FilterRepresentationModel } from 'ng2-activiti-tasklist'; import { AlfrescoApi } from 'alfresco-js-api'; import { @@ -43,22 +38,20 @@ import { ActivitiProcessService } from './activiti-process.service'; describe('ActivitiProcessService', () => { let service: ActivitiProcessService; - let authenticationService: AlfrescoAuthenticationService; - let injector: ReflectiveInjector; let apiService: AlfrescoApiService; let alfrescoApi: AlfrescoApi; beforeEach(() => { - injector = ReflectiveInjector.resolveAndCreate([ - ActivitiProcessService, - AlfrescoApiService, - AlfrescoAuthenticationService, - AlfrescoSettingsService, - StorageService - ]); - service = injector.get(ActivitiProcessService); - authenticationService = injector.get(AlfrescoAuthenticationService); - apiService = injector.get(AlfrescoApiService); + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot() + ], + providers: [ + ActivitiProcessService + ] + }); + service = TestBed.get(ActivitiProcessService); + apiService = TestBed.get(AlfrescoApiService); alfrescoApi = apiService.getInstance(); }); diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts index 365fe35967..99554a4fd3 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts @@ -15,26 +15,21 @@ * limitations under the License. */ -import { AlfrescoApiService, AlfrescoAuthenticationService} from 'ng2-alfresco-core'; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { AlfrescoApiService } from 'ng2-alfresco-core'; import { ProcessInstance, ProcessDefinitionRepresentation } from '../models/index'; import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model'; import { ProcessInstanceVariable } from './../models/process-instance-variable.model'; -import { - AppDefinitionRepresentationModel, - Comment, - TaskDetailsModel, - User -} from 'ng2-activiti-tasklist'; +import { AppDefinitionRepresentationModel, Comment, TaskDetailsModel, User } from 'ng2-activiti-tasklist'; import { FilterProcessRepresentationModel } from '../models/filter-process.model'; -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; declare var moment: any; @Injectable() export class ActivitiProcessService { - constructor(private authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService) { } /** diff --git a/ng2-components/ng2-activiti-tasklist/karma-test-shim.js b/ng2-components/ng2-activiti-tasklist/karma-test-shim.js index bc75da5ce1..3fe29f7e8e 100644 --- a/ng2-components/ng2-activiti-tasklist/karma-test-shim.js +++ b/ng2-components/ng2-activiti-tasklist/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-activiti-tasklist/src/assets/translation.service.mock.ts b/ng2-components/ng2-activiti-tasklist/src/assets/translation.service.mock.ts deleted file mode 100644 index 3ddf9a9050..0000000000 --- a/ng2-components/ng2-activiti-tasklist/src/assets/translation.service.mock.ts +++ /dev/null @@ -1,37 +0,0 @@ -/*! - * @license - * Copyright 2016 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Observable } from 'rxjs/Rx'; -import { EventEmitter } from '@angular/core'; - -export interface LangChangeEvent { - lang: string; - translations: any; -} - -export class TranslationMock { - - public onLangChange: EventEmitter = new EventEmitter(); - - addTranslationFolder() { - - } - - public get(key: string|Array, interpolateParams?: Object): Observable { - return Observable.of(key); - } -} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts index 250b9b7421..39c39a67b2 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts @@ -19,12 +19,10 @@ import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; - -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiApps } from './activiti-apps.component'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; -import { TranslationMock } from './../assets/translation.service.mock'; import { defaultApp, deployedApps, nonDeployedApps } from './../assets/activiti-apps.mock'; describe('ActivitiApps', () => { @@ -45,10 +43,13 @@ describe('ActivitiApps', () => { ActivitiApps ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiTaskListService ] }).compileComponents(); + + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); beforeEach(() => { @@ -56,8 +57,8 @@ describe('ActivitiApps', () => { fixture = TestBed.createComponent(ActivitiApps); component = fixture.componentInstance; debugElement = fixture.debugElement; - service = fixture.debugElement.injector.get(ActivitiTaskListService); + service = fixture.debugElement.injector.get(ActivitiTaskListService); getAppsSpy = spyOn(service, 'getDeployedApplications').and.returnValue(Observable.of()); componentHandler = jasmine.createSpyObj('componentHandler', [ diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts index 6ca6de17e3..73ecca5293 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts @@ -16,7 +16,7 @@ */ import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { AppDefinitionRepresentationModel } from '../models/filter.model'; import { IconModel } from '../models/icon.model'; @@ -65,11 +65,11 @@ export class ActivitiApps implements OnInit { * @param translate Translate service * @param activitiTaskList Task service */ - constructor(private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, private activitiTaskList: ActivitiTaskListService) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } this.apps$ = new Observable(observer => this.appsObserver = observer).share(); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts index 35ff285f11..88a0374771 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts @@ -15,15 +15,12 @@ * limitations under the License. */ -import { - CoreModule, - AlfrescoTranslationService -} from 'ng2-alfresco-core'; import { SimpleChange } from '@angular/core'; +import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { Observable } from 'rxjs/Rx'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from '../services/activiti-tasklist.service'; import { ActivitiChecklist } from './activiti-checklist.component'; -import { TranslationMock } from '../assets/translation.service.mock'; -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { TaskDetailsModel } from '../models/task-details.model'; declare let jasmine: any; @@ -33,7 +30,7 @@ const fakeTaskDetail = new TaskDetailsModel({ name: 'fake-check-name' }); -describe('Activiti Checklist Component', () => { +describe('ActivitiChecklist', () => { let checklistComponent: ActivitiChecklist; let fixture: ComponentFixture; @@ -42,15 +39,24 @@ describe('Activiti Checklist Component', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CoreModule], - declarations: [ActivitiChecklist], + imports: [ + CoreModule.forRoot() + ], + declarations: [ + ActivitiChecklist + ], providers: [ - {provide: AlfrescoTranslationService, useClass: TranslationMock}, - ActivitiTaskListService] + ActivitiTaskListService + ] }).compileComponents().then(() => { + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); + fixture = TestBed.createComponent(ActivitiChecklist); checklistComponent = fixture.componentInstance; element = fixture.nativeElement; + fixture.detectChanges(); }); })); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts index 6836c12249..202c3e0055 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { TaskDetailsModel } from '../models/task-details.model'; import { Observer, Observable } from 'rxjs/Rx'; @@ -53,11 +53,11 @@ export class ActivitiChecklist implements OnInit, OnChanges { * @param auth * @param translate */ - constructor(private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, private activitiTaskList: ActivitiTaskListService) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } this.task$ = new Observable(observer => this.taskObserver = observer).share(); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts index e9ddf508ff..d7ad10d697 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts @@ -20,14 +20,13 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiFormModule } from 'ng2-activiti-form'; import { ActivitiComments } from './activiti-comments.component'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; -import { TranslationMock } from './../assets/translation.service.mock'; -describe('ActivitiTaskDetails', () => { +describe('ActivitiComments', () => { let componentHandler: any; let service: ActivitiTaskListService; @@ -39,32 +38,32 @@ describe('ActivitiTaskDetails', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule, - ActivitiFormModule + CoreModule.forRoot(), + ActivitiFormModule.forRoot() ], declarations: [ ActivitiComments ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiTaskListService ] }).compileComponents(); + + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); beforeEach(() => { - fixture = TestBed.createComponent(ActivitiComments); component = fixture.componentInstance; service = fixture.debugElement.injector.get(ActivitiTaskListService); - getCommentsSpy = spyOn(service, 'getTaskComments').and.returnValue(Observable.of([{ - message: 'Test1' - }, { - message: 'Test2' - }, { - message: 'Test3' - }])); + getCommentsSpy = spyOn(service, 'getTaskComments').and.returnValue(Observable.of([ + { message: 'Test1' }, + { message: 'Test2' }, + { message: 'Test3'} + ])); addCommentSpy = spyOn(service, 'addTaskComment').and.returnValue(Observable.of({id: 123, message: 'Test'})); componentHandler = jasmine.createSpyObj('componentHandler', [ diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts index 15fd20ab71..a77f07cc23 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, ViewChild, OnChanges, SimpleChanges, EventEmitter } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { Comment } from '../models/comment.model'; import { Observer, Observable } from 'rxjs/Rx'; @@ -56,11 +56,11 @@ export class ActivitiComments implements OnChanges { * @param translate Translation service * @param activitiTaskList Task service */ - constructor(private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, private activitiTaskList: ActivitiTaskListService) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } this.comment$ = new Observable(observer => this.commentObserver = observer).share(); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts index 55f3c32c87..2440aaaa64 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts @@ -42,8 +42,8 @@ describe('ActivitiFilters', () => { }); beforeEach(() => { - let activitiService = new ActivitiTaskListService(null, null); - filterList = new ActivitiFilters(null, null, activitiService); + let activitiService = new ActivitiTaskListService(null); + filterList = new ActivitiFilters(null, activitiService); }); it('should return the filter task list', (done) => { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts index 13ee60186a..31f2213c16 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts @@ -16,7 +16,7 @@ */ import { Component, Output, EventEmitter, OnInit, Input, SimpleChanges, OnChanges } from '@angular/core'; -import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { FilterRepresentationModel } from '../models/filter.model'; import { Observer } from 'rxjs/Observer'; @@ -55,19 +55,12 @@ export class ActivitiFilters implements OnInit, OnChanges { filters: FilterRepresentationModel [] = []; - /** - * Constructor - * @param auth - * @param translate - * @param activiti - */ - constructor(private auth: AlfrescoAuthenticationService, - private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, public activiti: ActivitiTaskListService) { this.filter$ = new Observable(observer => this.filterObserver = observer).share(); - if (translate) { - translate.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts index b13bc20a01..f477c9588a 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts @@ -15,15 +15,11 @@ * limitations under the License. */ -import { - CoreModule, - AlfrescoTranslationService -} from 'ng2-alfresco-core'; -import { ActivitiPeopleSearch } from './activiti-people-search.component'; -import { TranslationMock } from '../assets/translation.service.mock'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { User } from '../models/user.model'; import { Observable } from 'rxjs/Observable'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { ActivitiPeopleSearch } from './activiti-people-search.component'; +import { User } from '../models/user.model'; declare let jasmine: any; @@ -41,7 +37,7 @@ const fakeSecondUser: User = new User({ email: 'fake-involve@mail.com' }); -describe('Activiti People Search', () => { +describe('ActivitiPeopleSearch', () => { let activitiPeopleSearchComponent: ActivitiPeopleSearch; let fixture: ComponentFixture; @@ -52,11 +48,18 @@ describe('Activiti People Search', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CoreModule], - declarations: [ActivitiPeopleSearch], - providers: [ - {provide: AlfrescoTranslationService, useClass: TranslationMock}] + imports: [ + CoreModule.forRoot() + ], + declarations: [ + ActivitiPeopleSearch + ] }).compileComponents().then(() => { + + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); + fixture = TestBed.createComponent(ActivitiPeopleSearch); activitiPeopleSearchComponent = fixture.componentInstance; element = fixture.nativeElement; diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts index 395cf7bfc8..7a6b9c6f1a 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts @@ -19,7 +19,7 @@ import { Component, Input, Output, EventEmitter, OnInit, AfterViewInit } from '@ import { FormControl } from '@angular/forms'; import { User } from '../models/user.model'; import { Observable } from 'rxjs/Observable'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; declare let componentHandler: any; @@ -45,9 +45,9 @@ export class ActivitiPeopleSearch implements OnInit, AfterViewInit { userList: User[] = []; - constructor(private translate: AlfrescoTranslationService) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); + constructor(private translateService: AlfrescoTranslateService) { + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } this.searchUser diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts index 7ede77c23e..5c4642a74d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts @@ -15,15 +15,12 @@ * limitations under the License. */ -import { - CoreModule, - AlfrescoTranslationService -} from 'ng2-alfresco-core'; +import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { Observable } from 'rxjs/Rx'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiPeopleService } from '../services/activiti-people.service'; import { ActivitiPeople } from './activiti-people.component'; import { ActivitiPeopleSearch } from './activiti-people-search.component'; -import { TranslationMock } from '../assets/translation.service.mock'; -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { User } from '../models/user.model'; declare let jasmine: any; @@ -42,7 +39,7 @@ const fakeUserToInvolve: User = new User({ email: 'fake-involve@mail.com' }); -describe('Activiti People Component', () => { +describe('ActivitiPeople', () => { let activitiPeopleComponent: ActivitiPeople; let fixture: ComponentFixture; @@ -51,12 +48,21 @@ describe('Activiti People Component', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CoreModule], - declarations: [ActivitiPeople, ActivitiPeopleSearch], + imports: [ + CoreModule.forRoot() + ], + declarations: [ + ActivitiPeople, + ActivitiPeopleSearch + ], providers: [ - {provide: AlfrescoTranslationService, useClass: TranslationMock}, - ActivitiPeopleService] + ActivitiPeopleService + ] }).compileComponents().then(() => { + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); + fixture = TestBed.createComponent(ActivitiPeople); activitiPeopleComponent = fixture.componentInstance; element = fixture.nativeElement; diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts index a975e1671d..03934e257c 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, ViewChild } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { User } from '../models/user.model'; import { Observer, Observable } from 'rxjs/Rx'; import { ActivitiPeopleService } from '../services/activiti-people.service'; @@ -51,10 +51,10 @@ export class ActivitiPeople { * @param translate * @param people service */ - constructor(private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, private peopleService: ActivitiPeopleService) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } this.peopleSearch$ = new Observable(observer => this.peopleSearchObserver = observer).share(); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts index d3c3737939..10cc787bb7 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts @@ -15,19 +15,15 @@ * limitations under the License. */ -import { - CoreModule, - AlfrescoTranslationService -} from 'ng2-alfresco-core'; -import { ActivitiTaskListService } from '../services/activiti-tasklist.service'; -import { ActivitiStartTaskButton } from './activiti-start-task.component'; -import { TranslationMock } from '../assets/translation.service.mock'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { ActivitiTaskListService } from '../services/activiti-tasklist.service'; +import { ActivitiStartTaskButton } from './activiti-start-task.component'; declare let jasmine: any; -describe('Activiti Start Task Component', () => { +describe('ActivitiStartTaskButton', () => { let activitiStartTaskButton: ActivitiStartTaskButton; let fixture: ComponentFixture; @@ -37,12 +33,20 @@ describe('Activiti Start Task Component', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CoreModule], - declarations: [ActivitiStartTaskButton], + imports: [ + CoreModule.forRoot() + ], + declarations: [ + ActivitiStartTaskButton + ], providers: [ - {provide: AlfrescoTranslationService, useClass: TranslationMock}, - ActivitiTaskListService] + ActivitiTaskListService + ] }).compileComponents().then(() => { + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); + fixture = TestBed.createComponent(ActivitiStartTaskButton); activitiStartTaskButton = fixture.componentInstance; element = fixture.nativeElement; diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts index 4308519d2b..ba7fce684d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { Form } from '../models/form.model'; @@ -54,11 +54,11 @@ export class ActivitiStartTaskButton { * @param translate * @param taskService */ - constructor(private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, private taskService: ActivitiTaskListService) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts index e161f3bec6..effa712aaf 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts @@ -20,13 +20,12 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiFormModule, FormModel, FormOutcomeEvent, FormOutcomeModel, FormService } from 'ng2-activiti-form'; import { ActivitiTaskDetails } from './activiti-task-details.component'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { ActivitiPeopleService } from './../services/activiti-people.service'; -import { TranslationMock } from './../assets/translation.service.mock'; import { taskDetailsMock, taskFormMock, tasksMock, noDataMock } from './../assets/task-details.mock'; describe('ActivitiTaskDetails', () => { @@ -44,19 +43,22 @@ describe('ActivitiTaskDetails', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule, - ActivitiFormModule + CoreModule.forRoot(), + ActivitiFormModule.forRoot() ], declarations: [ ActivitiTaskDetails ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiTaskListService, ActivitiPeopleService ], schemas: [ NO_ERRORS_SCHEMA ] }).compileComponents(); + + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); beforeEach(() => { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts index 6a5079bd9c..22c0d80fdb 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts @@ -27,7 +27,7 @@ import { SimpleChanges, DebugElement } from '@angular/core'; -import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { TaskDetailsModel } from '../models/task-details.model'; import { User } from '../models/user.model'; @@ -101,13 +101,12 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { * @param activitiForm Form service * @param activitiTaskList Task service */ - constructor(private auth: AlfrescoAuthenticationService, - private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, private activitiForm: FormService, private activitiTaskList: ActivitiTaskListService) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts index 2ad4311c22..ae4b9fc060 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts @@ -17,11 +17,10 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; - -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { Observable } from 'rxjs/Rx'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiTaskHeader } from './activiti-task-header.component'; -import { TranslationMock } from './../assets/translation.service.mock'; import { taskDetailsMock } from './../assets/task-details.mock'; import { TaskDetailsModel } from '../models/task-details.model'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; @@ -36,23 +35,25 @@ describe('ActivitiTaskHeader', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() ], declarations: [ ActivitiTaskHeader ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiTaskListService ] }).compileComponents(); + + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); beforeEach(() => { - fixture = TestBed.createComponent(ActivitiTaskHeader); component = fixture.componentInstance; - service = fixture.debugElement.injector.get(ActivitiTaskListService); + service = TestBed.get(ActivitiTaskListService); component.taskDetails = new TaskDetailsModel(taskDetailsMock); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts index dc1a38d3cc..4bcfd0e544 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; @@ -37,10 +37,10 @@ export class ActivitiTaskHeader { @Output() claim: EventEmitter = new EventEmitter(); - constructor(private translate: AlfrescoTranslationService, + constructor(private translateService: AlfrescoTranslateService, private activitiTaskService: ActivitiTaskListService) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts index 3db0ce6623..8ca3823570 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts @@ -17,12 +17,11 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; import { ActivitiTaskList } from './activiti-tasklist.component'; import { Observable } from 'rxjs/Rx'; import { ObjectDataRow, DataRowEvent, ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; -import { TranslationMock } from './../assets/translation.service.mock'; import { ActivitiTaskListService } from '../services/activiti-tasklist.service'; describe('ActivitiTaskList', () => { @@ -58,21 +57,25 @@ describe('ActivitiTaskList', () => { let componentHandler: any; let component: ActivitiTaskList; let fixture: ComponentFixture; + let taskListService: ActivitiTaskListService; beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule, + CoreModule.forRoot(), DataTableModule ], declarations: [ ActivitiTaskList ], providers: [ - {provide: AlfrescoTranslationService, useClass: TranslationMock}, ActivitiTaskListService ] }).compileComponents(); + + let translateService = TestBed.get(AlfrescoTranslateService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); beforeEach(() => { @@ -80,6 +83,8 @@ describe('ActivitiTaskList', () => { fixture = TestBed.createComponent(ActivitiTaskList); component = fixture.componentInstance; + taskListService = TestBed.get(ActivitiTaskListService); + componentHandler = jasmine.createSpyObj('componentHandler', [ 'upgradeAllRegistered', 'upgradeElement' @@ -113,8 +118,8 @@ describe('ActivitiTaskList', () => { }); it('should return the filtered task list when the input parameters are passed', (done) => { - spyOn(component.activiti, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks)); - spyOn(component.activiti, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask)); + spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks)); + spyOn(taskListService, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask)); let state = new SimpleChange(null, 'open'); let processDefinitionKey = new SimpleChange(null, null); @@ -134,8 +139,8 @@ describe('ActivitiTaskList', () => { }); it('should return the filtered task list by processDefinitionKey', (done) => { - spyOn(component.activiti, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks)); - spyOn(component.activiti, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask)); + spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks)); + spyOn(taskListService, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask)); let state = new SimpleChange(null, 'open'); let processDefinitionKey = new SimpleChange(null, 'fakeprocess'); @@ -161,7 +166,7 @@ describe('ActivitiTaskList', () => { }); it('should throw an exception when the response is wrong', (done) => { - spyOn(component.activiti, 'getTotalTasks').and.returnValue(Observable.throw(fakeErrorTaskList)); + spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.throw(fakeErrorTaskList)); let state = new SimpleChange(null, 'open'); let assignment = new SimpleChange(null, 'fake-assignee'); @@ -178,8 +183,8 @@ describe('ActivitiTaskList', () => { }); it('should reload tasks when reload() is called', (done) => { - spyOn(component.activiti, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks)); - spyOn(component.activiti, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask)); + spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks)); + spyOn(taskListService, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask)); component.state = 'open'; component.assignment = 'fake-assignee'; component.ngOnInit(); @@ -212,8 +217,8 @@ describe('ActivitiTaskList', () => { describe('component changes', () => { beforeEach(() => { - spyOn(component.activiti, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks)); - spyOn(component.activiti, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask)); + spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks)); + spyOn(taskListService, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask)); component.data = new ObjectDataTableAdapter( [], diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts index 7b759535fd..1a6ca17375 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { TaskQueryRequestRepresentationModel } from '../models/filter.model'; @@ -72,10 +72,10 @@ export class ActivitiTaskList implements OnInit, OnChanges { {type: 'text', key: 'created', title: 'Created', sortable: true} ]; - constructor(private translate: AlfrescoTranslationService, - public activiti: ActivitiTaskListService) { - if (translate) { - translate.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); + constructor(private translateService: AlfrescoTranslateService, + private taskListService: ActivitiTaskListService) { + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } } @@ -134,10 +134,10 @@ export class ActivitiTaskList implements OnInit, OnChanges { } private load(requestNode: TaskQueryRequestRepresentationModel) { - this.activiti.getTotalTasks(requestNode).subscribe( + this.taskListService.getTotalTasks(requestNode).subscribe( (res) => { requestNode.size = res.total; - this.activiti.getTasks(requestNode).subscribe( + this.taskListService.getTasks(requestNode).subscribe( (response) => { let instancesRow = this.createDataRow(response); this.renderInstances(instancesRow); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts index 5bf34e0165..ca156737a2 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts @@ -24,7 +24,7 @@ describe('NoTaskDetailsTemplateComponent', () => { let detailsComponent: ActivitiTaskDetails; beforeEach(() => { - detailsComponent = new ActivitiTaskDetails(null, null, null, null); + detailsComponent = new ActivitiTaskDetails(null, null, null); component = new NoTaskDetailsTemplateComponent(detailsComponent); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.spec.ts index 3e8ce83d1e..2cc76e2421 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.spec.ts @@ -15,13 +15,8 @@ * limitations under the License. */ -import { ReflectiveInjector } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - StorageService -} from 'ng2-alfresco-core'; +import { TestBed } from '@angular/core/testing'; +import { CoreModule } from 'ng2-alfresco-core'; import { User } from '../models/user.model'; import { ActivitiPeopleService } from './activiti-people.service'; @@ -45,28 +40,18 @@ const fakeInvolveUserList: User[] = [firstInvolvedUser, secondInvolvedUser]; describe('ActivitiPeopleService', () => { - let service, injector, apiService; + let service: ActivitiPeopleService; beforeEach(() => { - injector = ReflectiveInjector.resolveAndCreate([ - AlfrescoSettingsService, - AlfrescoApiService, - AlfrescoAuthenticationService, - ActivitiPeopleService, - StorageService - ]); - }); - - beforeEach(() => { - service = injector.get(ActivitiPeopleService); - apiService = injector.get(AlfrescoApiService); - }); - - it('can instantiate service with authorization', () => { - expect(apiService).not.toBeNull('authorization should be provided'); - let serviceApi = new ActivitiPeopleService(null, apiService); - - expect(serviceApi instanceof ActivitiPeopleService).toBe(true, 'new service should be ok'); + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot() + ], + providers: [ + ActivitiPeopleService + ] + }); + service = TestBed.get(ActivitiPeopleService); }); describe('when user is logged in', () => { diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts index 1e5e99433d..2759f13dcb 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { AlfrescoApiService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; +import { AlfrescoApiService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; import { Response } from '@angular/http'; import { User } from '../models/user.model'; @@ -24,8 +24,7 @@ import { User } from '../models/user.model'; @Injectable() export class ActivitiPeopleService { - constructor(private authService: AlfrescoAuthenticationService, - private alfrescoJsApi: AlfrescoApiService) { + constructor(private alfrescoJsApi: AlfrescoApiService) { } getWorkflowUsers(taskId: string, searchWord: string): Observable { diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts index c8c1540283..7dcecddd6e 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts @@ -15,16 +15,11 @@ * limitations under the License. */ -import { ReflectiveInjector } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - StorageService -} from 'ng2-alfresco-core'; +import { TestBed } from '@angular/core/testing'; +import { CoreModule } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './activiti-tasklist.service'; import { TaskDetailsModel } from '../models/task-details.model'; -import { FilterRepresentationModel, AppDefinitionRepresentationModel } from '../models/filter.model'; +import { FilterRepresentationModel, AppDefinitionRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model'; import { Comment } from '../models/comment.model'; declare let AlfrescoApi: any; @@ -131,20 +126,18 @@ describe('ActivitiTaskListService', () => { resolve(fakeAppFilter); }); - let service, injector; + let service: ActivitiTaskListService; beforeEach(() => { - injector = ReflectiveInjector.resolveAndCreate([ - ActivitiTaskListService, - AlfrescoSettingsService, - AlfrescoApiService, - AlfrescoAuthenticationService, - StorageService - ]); - }); - - beforeEach(() => { - service = injector.get(ActivitiTaskListService); + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot() + ], + providers: [ + ActivitiTaskListService + ] + }); + service = TestBed.get(ActivitiTaskListService); jasmine.Ajax.install(); }); @@ -173,7 +166,7 @@ describe('ActivitiTaskListService', () => { it('should call the api withthe appId', (done) => { spyOn(service, 'callApiTaskFilters').and.returnValue((fakeAppPromise)); - let appId = 1; + let appId = '1'; service.getTaskListFilters(appId).subscribe( (res) => { expect(service.callApiTaskFilters).toHaveBeenCalledWith(appId); @@ -183,7 +176,7 @@ describe('ActivitiTaskListService', () => { }); it('should return the app filter by id', (done) => { - let appId = 1; + let appId = '1'; service.getTaskListFilters(appId).subscribe( (res) => { expect(res).toBeDefined(); @@ -201,7 +194,7 @@ describe('ActivitiTaskListService', () => { }); it('should return the task list filtered', (done) => { - service.getTasks(fakeFilter).subscribe( + service.getTasks(fakeFilter).subscribe( res => { expect(res).toBeDefined(); expect(res.length).toEqual(1); @@ -221,7 +214,7 @@ describe('ActivitiTaskListService', () => { }); it('should throw an exception when the response is wrong', () => { - service.getTasks(fakeFilter).subscribe( + service.getTasks(fakeFilter).subscribe( (res) => { }, (err: any) => { @@ -237,7 +230,7 @@ describe('ActivitiTaskListService', () => { }); it('should return the task details ', (done) => { - service.getTaskDetails(999).subscribe( + service.getTaskDetails('999').subscribe( (res: TaskDetailsModel) => { expect(res).toBeDefined(); expect(res.id).toEqual('999'); @@ -259,7 +252,7 @@ describe('ActivitiTaskListService', () => { }); it('should return the tasks comments ', (done) => { - service.getTaskComments(999).subscribe( + service.getTaskComments('999').subscribe( (res: Comment[]) => { expect(res).toBeDefined(); expect(res.length).toEqual(2); @@ -277,7 +270,7 @@ describe('ActivitiTaskListService', () => { }); it('should return the tasks checklists ', (done) => { - service.getTaskChecklist(999).subscribe( + service.getTaskChecklist('999').subscribe( (res: TaskDetailsModel[]) => { expect(res).toBeDefined(); expect(res.length).toEqual(2); @@ -333,7 +326,7 @@ describe('ActivitiTaskListService', () => { }); it('should add a comment task ', (done) => { - service.addTaskComment(999, 'fake-comment-message').subscribe( + service.addTaskComment('999', 'fake-comment-message').subscribe( (res: Comment) => { expect(res).toBeDefined(); expect(res.id).not.toEqual(''); @@ -358,7 +351,7 @@ describe('ActivitiTaskListService', () => { }); it('should complete the task ', (done) => { - service.completeTask(999).subscribe( + service.completeTask('999').subscribe( (res: any) => { expect(res).toBeDefined(); done(); @@ -373,7 +366,7 @@ describe('ActivitiTaskListService', () => { }); it('should return the total number of tasks', (done) => { - service.getTotalTasks(fakeFilter).subscribe( + service.getTotalTasks(fakeFilter).subscribe( res => { expect(res).toBeDefined(); expect(res.size).toEqual(1); @@ -408,7 +401,7 @@ describe('ActivitiTaskListService', () => { it('should return the default filters', () => { spyOn(service, 'addFilter'); - let filters = service.createDefaultFilter(); + let filters = service.createDefaultFilter(null); expect(service.addFilter).toHaveBeenCalledTimes(4); expect(filters).toBeDefined(); expect(filters.length).toEqual(4); diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts index 3c81e20b66..dbd0bfe125 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts @@ -16,10 +16,9 @@ */ import { Injectable } from '@angular/core'; -import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; -import { FilterRepresentationModel } from '../models/filter.model'; -import { TaskQueryRequestRepresentationModel } from '../models/filter.model'; +import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model'; import { Comment } from '../models/comment.model'; import { User } from '../models/user.model'; import { TaskDetailsModel } from '../models/task-details.model'; @@ -28,7 +27,7 @@ import { Form } from '../models/form.model'; @Injectable() export class ActivitiTaskListService { - constructor(public authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService) { } /** @@ -271,7 +270,7 @@ export class ActivitiTaskListService { return this.apiService.getInstance().activiti.taskApi.listTasks(requestNode); } - private callApiTaskFilters(appId?: string) { + callApiTaskFilters(appId?: string) { if (appId) { return this.apiService.getInstance().activiti.userFiltersApi.getUserTaskFilters({appId: appId}); } else { diff --git a/ng2-components/ng2-alfresco-core/index.ts b/ng2-components/ng2-alfresco-core/index.ts index 18810650af..52c133237f 100644 --- a/ng2-components/ng2-alfresco-core/index.ts +++ b/ng2-components/ng2-alfresco-core/index.ts @@ -22,17 +22,22 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule, TranslateLoader } from 'ng2-translate/ng2-translate'; import { + AuthService, + ContentService, + SettingsService, StorageService, AlfrescoApiService, - AlfrescoSettingsService, - AlfrescoTranslationLoader, - AlfrescoTranslationService, - AlfrescoAuthenticationService, - AlfrescoContentService, + AlfrescoTranslateLoader, + AlfrescoTranslateService, RenditionsService, AuthGuard, AuthGuardEcm, - AuthGuardBpm + AuthGuardBpm, + + /** @deprecated */ AlfrescoSettingsService, + /** @deprecated */ AlfrescoTranslationService, + /** @deprecated */ AlfrescoAuthenticationService, + /** @deprecated */ AlfrescoContentService } from './src/services/index'; import { MATERIAL_DESIGN_DIRECTIVES } from './src/components/material/index'; @@ -43,22 +48,27 @@ export * from './src/components/index'; export * from './src/utils/index'; export const ALFRESCO_CORE_PROVIDERS: any[] = [ + AuthService, + ContentService, + SettingsService, StorageService, AlfrescoApiService, - AlfrescoAuthenticationService, - AlfrescoContentService, - AlfrescoSettingsService, - AlfrescoTranslationLoader, - AlfrescoTranslationService, + AlfrescoTranslateLoader, + AlfrescoTranslateService, RenditionsService, AuthGuard, AuthGuardEcm, AuthGuardBpm, - ...CONTEXT_MENU_PROVIDERS + ...CONTEXT_MENU_PROVIDERS, + + /** @deprecated */ AlfrescoAuthenticationService, + /** @deprecated */ AlfrescoContentService, + /** @deprecated */ AlfrescoSettingsService, + /** @deprecated */ AlfrescoTranslationService ]; export function createTranslateLoader(http: Http) { - return new AlfrescoTranslationLoader(http); + return new AlfrescoTranslateLoader(http); } @NgModule({ @@ -71,7 +81,8 @@ export function createTranslateLoader(http: Http) { provide: TranslateLoader, useFactory: (createTranslateLoader), deps: [Http] - }) ], + }) + ], declarations: [ ...MATERIAL_DESIGN_DIRECTIVES, ...CONTEXT_MENU_DIRECTIVES diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 43cbd052c3..9e22f66f0d 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -5,7 +5,7 @@ "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", - "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", + "clean-build": "rimraf index.js index.js.map index.d.ts 'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts index dcf54e0343..9da0216dd8 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts @@ -16,204 +16,18 @@ */ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Rx'; -import { AlfrescoSettingsService } from './AlfrescoSettings.service'; +import { SettingsService } from './settings.service'; import { StorageService } from './storage.service'; -import { AlfrescoApiService } from './AlfrescoApi.service'; -import * as alfrescoApi from 'alfresco-js-api'; -import { AlfrescoApi } from 'alfresco-js-api'; -import { Subject } from 'rxjs/Subject'; +import { AlfrescoApiService } from './alfresco-api.service'; +import { AuthService } from './auth.service'; -/** - * The AlfrescoAuthenticationService provide the login service and store the ticket in the Storage - */ +/** @deprecated AlfrescoAuthenticationService is deprecated. Use AuthService instead */ @Injectable() -export class AlfrescoAuthenticationService { - - alfrescoApi: AlfrescoApi; - - public loginSubject: Subject = new Subject(); - - public logoutSubject: Subject = new Subject(); - - /** - * Constructor - * @param settingsService - * @param apiService - */ - constructor(private settingsService: AlfrescoSettingsService, - private apiService: AlfrescoApiService, - private storage: StorageService) { - this.alfrescoApi = new alfrescoApi({ - provider: this.settingsService.getProviders(), - ticketEcm: this.getTicketEcm(), - ticketBpm: this.getTicketBpm(), - hostEcm: this.settingsService.ecmHost, - hostBpm: this.settingsService.bpmHost, - contextRoot: 'alfresco', - disableCsrf: true - }); - - settingsService.bpmHostSubject.subscribe((bpmHost) => { - this.alfrescoApi.changeBpmHost(bpmHost); - }); - - settingsService.ecmHostSubject.subscribe((ecmHost) => { - this.alfrescoApi.changeEcmHost(ecmHost); - }); - - settingsService.csrfSubject.subscribe((csrf) => { - this.alfrescoApi.changeCsrfConfig(csrf); - }); - - settingsService.providerSubject.subscribe((value) => { - this.alfrescoApi.config.provider = value; - }); - - this.apiService.setInstance(this.alfrescoApi); - } - - /** - * The method return tru if the user is logged in - * @returns {boolean} - */ - isLoggedIn(): boolean { - return !!this.alfrescoApi.isLoggedIn(); - } - - /** - * Method to delegate to POST login - * @param username - * @param password - * @returns {Observable|Observable} - */ - login(username: string, password: string): Observable<{ type: string, ticket: any }> { - this.removeTicket(); - return Observable.fromPromise(this.callApiLogin(username, password)) - .map((response: any) => { - this.saveTickets(); - this.loginSubject.next(response); - return {type: this.settingsService.getProviders(), ticket: response}; - }) - .catch(this.handleError); - } - - /** - * Initialize the alfresco Api with user and password end call the login method - * @param username - * @param password - * @returns {*|Observable} - */ - private callApiLogin(username: string, password: string) { - return this.alfrescoApi.login(username, password); - } - - /** - * The method remove the ticket from the Storage - * - * @returns {Observable|Observable} - */ - public logout() { - return Observable.fromPromise(this.callApiLogout()) - .map(res => res) - .do(response => { - this.removeTicket(); - this.logoutSubject.next(response); - return response; - }) - .catch(this.handleError); - } - - /** - * - * @returns {*|Observable|Observable|Promise} - */ - private callApiLogout(): Promise { - if (this.alfrescoApi) { - return this.alfrescoApi.logout(); - } - } - - /** - * Remove the login ticket from Storage - */ - public removeTicket(): void { - this.storage.removeItem('ticket-ECM'); - this.storage.removeItem('ticket-BPM'); - this.alfrescoApi.setTicket(undefined, undefined); - } - - /** - * The method return the ECM ticket stored in the Storage - * @returns ticket - */ - public getTicketEcm(): string | null { - return this.storage.getItem('ticket-ECM'); - } - - /** - * The method return the BPM ticket stored in the Storage - * @returns ticket - */ - public getTicketBpm(): string | null { - return this.storage.getItem('ticket-BPM'); - } - - public getTicketEcmBase64(): string | null { - let ticket = this.storage.getItem('ticket-ECM'); - if (ticket) { - return 'Basic ' + btoa(ticket); - } - return null; - } - - /** - * The method save the ECM and BPM ticket in the Storage - */ - public saveTickets() { - this.saveTicketEcm(); - this.saveTicketBpm(); - } - - /** - * The method save the ECM ticket in the Storage - */ - public saveTicketEcm(): void { - if (this.alfrescoApi && this.alfrescoApi.getTicketEcm()) { - this.storage.setItem('ticket-ECM', this.alfrescoApi.getTicketEcm()); - } - } - - /** - * The method save the BPM ticket in the Storage - */ - public saveTicketBpm(): void { - if (this.alfrescoApi && this.alfrescoApi.getTicketBpm()) { - this.storage.setItem('ticket-BPM', this.alfrescoApi.getTicketBpm()); - } - } - - /** - * The method return true if user is logged in on ecm provider - */ - public isEcmLoggedIn() { - return this.alfrescoApi.ecmAuth && !!this.alfrescoApi.ecmAuth.isLoggedIn(); - } - - /** - * The method return true if user is logged in on bpm provider - */ - public isBpmLoggedIn() { - return this.alfrescoApi.bpmAuth && !!this.alfrescoApi.bpmAuth.isLoggedIn(); - } - - /** - * The method write the error in the console browser - * @param error - * @returns {ErrorObservable} - */ - public handleError(error: any): Observable { - console.error('Error when logging in', error); - return Observable.throw(error || 'Server error'); +export class AlfrescoAuthenticationService extends AuthService { + constructor(settingsService: SettingsService, + apiService: AlfrescoApiService, + storage: StorageService) { + super(settingsService, apiService, storage); + console.log('Warning: AlfrescoAuthenticationService is deprecated. Use AuthService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts index 57dcde7096..4eb19fb8fe 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts @@ -17,30 +17,16 @@ import { Injectable } from '@angular/core'; -import { AlfrescoAuthenticationService } from './AlfrescoAuthentication.service'; -import { AlfrescoApiService } from './AlfrescoApi.service'; +import { AuthService } from './auth.service'; +import { ContentService } from './content.service'; +import { AlfrescoApiService } from './alfresco-api.service'; +/** @deprecated AlfrescoContentService is deprecated. Use ContentService instead */ @Injectable() -export class AlfrescoContentService { +export class AlfrescoContentService extends ContentService { - constructor(public authService: AlfrescoAuthenticationService, public apiService: AlfrescoApiService) { - } - - /** - * Get thumbnail URL for the given document node. - * @param document Node to get URL for. - * @returns {string} URL address. - */ - getDocumentThumbnailUrl(document: any): string { - return this.apiService.getInstance().content.getDocumentThumbnailUrl(document.entry.id); - } - - /** - * Get content URL for the given node. - * @param document Node to get URL for. - * @returns {string} URL address. - */ - getContentUrl(document: any): string { - return this.apiService.getInstance().content.getContentUrl(document.entry.id); + constructor(authService: AuthService, apiService: AlfrescoApiService) { + super(authService, apiService); + console.log('Warning: AlfrescoContentService is deprecated. Use ContentService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts index 55a46de707..7e39d7c047 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts @@ -16,63 +16,14 @@ */ import { Injectable } from '@angular/core'; -import { Subject } from 'rxjs/Subject'; +import { SettingsService } from './settings.service'; +/** @deprecated AlfrescoSettingsService is deprecated. Use SettingsService instead */ @Injectable() -export class AlfrescoSettingsService { +export class AlfrescoSettingsService extends SettingsService { - static DEFAULT_ECM_ADDRESS: string = 'http://' + window.location.hostname + ':8080'; - static DEFAULT_BPM_ADDRESS: string = 'http://' + window.location.hostname + ':9999'; - static DEFAULT_CSRF_CONFIG: boolean = false; - - static DEFAULT_BPM_CONTEXT_PATH: string = '/activiti-app'; - - private _ecmHost: string = AlfrescoSettingsService.DEFAULT_ECM_ADDRESS; - private _bpmHost: string = AlfrescoSettingsService.DEFAULT_BPM_ADDRESS; - private _csrfDisabled: boolean = AlfrescoSettingsService.DEFAULT_CSRF_CONFIG; - - private _bpmContextPath = AlfrescoSettingsService.DEFAULT_BPM_CONTEXT_PATH; - - private providers: string = 'ALL'; // ECM, BPM , ALL - - public bpmHostSubject: Subject = new Subject(); - public ecmHostSubject: Subject = new Subject(); - public csrfSubject: Subject = new Subject(); - public providerSubject: Subject = new Subject(); - - public get ecmHost(): string { - return this._ecmHost; - } - - public set csrfDisabled(csrfDisabled: boolean) { - this.csrfSubject.next(csrfDisabled); - this._csrfDisabled = csrfDisabled; - } - - public set ecmHost(ecmHostUrl: string) { - this.ecmHostSubject.next(ecmHostUrl); - this._ecmHost = ecmHostUrl; - } - - public get bpmHost(): string { - return this._bpmHost; - } - - public set bpmHost(bpmHostUrl: string) { - this.bpmHostSubject.next(bpmHostUrl); - this._bpmHost = bpmHostUrl; - } - - public getBPMApiBaseUrl(): string { - return this._bpmHost + this._bpmContextPath; - } - - public getProviders(): string { - return this.providers; - } - - public setProviders(providers: string) { - this.providerSubject.next(providers); - this.providers = providers; + constructor() { + super(); + console.log('Warning: AlfrescoSettingsService is deprecated. Use SettingsService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts index c234e03872..4b739ed9f2 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts @@ -16,39 +16,16 @@ */ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Rx'; import { TranslateService } from 'ng2-translate/ng2-translate'; -import { AlfrescoTranslationLoader } from './AlfrescoTranslationLoader.service'; +import { AlfrescoTranslateService } from './translate.service'; +/** @deprecated AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead */ @Injectable() -export class AlfrescoTranslationService { - userLang: string = 'en'; - customLoader: AlfrescoTranslationLoader; +export class AlfrescoTranslationService extends AlfrescoTranslateService { - constructor(public translate: TranslateService) { - this.userLang = translate.getBrowserLang() || 'en'; - translate.setDefaultLang(this.userLang); - this.customLoader = this.translate.currentLoader; - this.customLoader.init(this.userLang); + constructor(translate: TranslateService) { + super(translate); + console.log('Warning: AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead.'); } - addTranslationFolder(name: string = '', path: string = '') { - if (!this.customLoader.existComponent(name)) { - this.customLoader.addComponentList(name, path); - this.translate.getTranslation(this.userLang).subscribe( - () => { - this.translate.use(this.userLang); - } - ); - } - } - - use(lang: string): Observable { - this.customLoader.init(lang); - return this.translate.use(lang); - } - - get(key: string|Array, interpolateParams?: Object): Observable { - return this.translate.get(key, interpolateParams); - } } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoApi.service.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts similarity index 71% rename from ng2-components/ng2-alfresco-core/src/services/AlfrescoApi.service.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts index dad5f6d8e9..d33b21d216 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoApi.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts @@ -16,6 +16,7 @@ */ import { Injectable } from '@angular/core'; +import * as alfrescoApi from 'alfresco-js-api'; import { AlfrescoApi } from 'alfresco-js-api'; @Injectable() @@ -31,4 +32,16 @@ export class AlfrescoApiService { this._instance = value; } + constructor() { + this._instance = new alfrescoApi({ + provider: 'ALL', + ticketEcm: null, + ticketBpm: null, + hostEcm: 'http://localhost:8080', + hostBpm: 'http://localhost:9999', + contextRoot: 'alfresco', + disableCsrf: true + }); + } + } diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts index 8820db49d6..95679f671e 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts @@ -22,11 +22,11 @@ import { RouterStateSnapshot } from '@angular/router'; -import { AlfrescoAuthenticationService } from './AlfrescoAuthentication.service'; +import { AuthService } from './auth.service'; @Injectable() export class AuthGuardBpm implements CanActivate, CanActivateChild { - constructor(private authService: AlfrescoAuthenticationService, private router: Router) {} + constructor(private authService: AuthService, private router: Router) {} canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { let url: string = state.url; diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts index d519da2b4a..c447ffa223 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts @@ -22,11 +22,11 @@ import { RouterStateSnapshot } from '@angular/router'; -import { AlfrescoAuthenticationService } from './AlfrescoAuthentication.service'; +import { AuthService } from './auth.service'; @Injectable() export class AuthGuardEcm implements CanActivate, CanActivateChild { - constructor(private authService: AlfrescoAuthenticationService, private router: Router) {} + constructor(private authService: AuthService, private router: Router) {} canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { let url: string = state.url; diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts index 49119edb9f..45caf9e903 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts @@ -22,11 +22,11 @@ import { RouterStateSnapshot } from '@angular/router'; -import { AlfrescoAuthenticationService } from './AlfrescoAuthentication.service'; +import { AuthService } from './auth.service'; @Injectable() export class AuthGuard implements CanActivate, CanActivateChild { - constructor(private authService: AlfrescoAuthenticationService, private router: Router) {} + constructor(private authService: AuthService, private router: Router) {} canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { let url: string = state.url; diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts similarity index 96% rename from ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.spec.ts rename to ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts index 5c8e9b129e..cce74e7d55 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts @@ -16,29 +16,29 @@ */ import { ReflectiveInjector } from '@angular/core'; -import { AlfrescoSettingsService } from './AlfrescoSettings.service'; -import { AlfrescoAuthenticationService } from './AlfrescoAuthentication.service'; -import { AlfrescoApiService } from './AlfrescoApi.service'; +import { SettingsService } from './settings.service'; +import { AuthService } from './auth.service'; +import { AlfrescoApiService } from './alfresco-api.service'; import { StorageService } from './storage.service'; declare let jasmine: any; -describe('AlfrescoAuthentication', () => { +describe('AuthService', () => { let injector; - let authService: AlfrescoAuthenticationService; - let settingsService: AlfrescoSettingsService; + let authService: AuthService; + let settingsService: SettingsService; let storage: StorageService; beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, - AlfrescoAuthenticationService, + AuthService, StorageService ]); - authService = injector.get(AlfrescoAuthenticationService); - settingsService = injector.get(AlfrescoSettingsService); + authService = injector.get(AuthService); + settingsService = injector.get(SettingsService); storage = injector.get(StorageService); storage.clear(); diff --git a/ng2-components/ng2-alfresco-core/src/services/auth.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth.service.ts new file mode 100644 index 0000000000..c18d420353 --- /dev/null +++ b/ng2-components/ng2-alfresco-core/src/services/auth.service.ts @@ -0,0 +1,209 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Rx'; +import { SettingsService } from './settings.service'; +import { StorageService } from './storage.service'; +import { AlfrescoApiService } from './alfresco-api.service'; +import * as alfrescoApi from 'alfresco-js-api'; +import { AlfrescoApi } from 'alfresco-js-api'; +import { Subject } from 'rxjs/Subject'; + +@Injectable() +export class AuthService { + + alfrescoApi: AlfrescoApi; + loginSubject: Subject = new Subject(); + logoutSubject: Subject = new Subject(); + + constructor(private settingsService: SettingsService, + private apiService: AlfrescoApiService, + private storage: StorageService) { + this.alfrescoApi = new alfrescoApi({ + provider: this.settingsService.getProviders(), + ticketEcm: this.getTicketEcm(), + ticketBpm: this.getTicketBpm(), + hostEcm: this.settingsService.ecmHost, + hostBpm: this.settingsService.bpmHost, + contextRoot: 'alfresco', + disableCsrf: true + }); + + settingsService.bpmHostSubject.subscribe((bpmHost) => { + this.alfrescoApi.changeBpmHost(bpmHost); + }); + + settingsService.ecmHostSubject.subscribe((ecmHost) => { + this.alfrescoApi.changeEcmHost(ecmHost); + }); + + settingsService.csrfSubject.subscribe((csrf) => { + this.alfrescoApi.changeCsrfConfig(csrf); + }); + + settingsService.providerSubject.subscribe((value) => { + this.alfrescoApi.config.provider = value; + }); + + this.apiService.setInstance(this.alfrescoApi); + } + + /** + * The method return tru if the user is logged in + * @returns {boolean} + */ + isLoggedIn(): boolean { + return !!this.alfrescoApi.isLoggedIn(); + } + + /** + * Method to delegate to POST login + * @param username + * @param password + * @returns {Observable|Observable} + */ + login(username: string, password: string): Observable<{ type: string, ticket: any }> { + this.removeTicket(); + return Observable.fromPromise(this.callApiLogin(username, password)) + .map((response: any) => { + this.saveTickets(); + this.loginSubject.next(response); + return {type: this.settingsService.getProviders(), ticket: response}; + }) + .catch(this.handleError); + } + + /** + * Initialize the alfresco Api with user and password end call the login method + * @param username + * @param password + * @returns {*|Observable} + */ + private callApiLogin(username: string, password: string) { + return this.alfrescoApi.login(username, password); + } + + /** + * The method remove the ticket from the Storage + * + * @returns {Observable|Observable} + */ + public logout() { + return Observable.fromPromise(this.callApiLogout()) + .map(res => res) + .do(response => { + this.removeTicket(); + this.logoutSubject.next(response); + return response; + }) + .catch(this.handleError); + } + + /** + * + * @returns {*|Observable|Observable|Promise} + */ + private callApiLogout(): Promise { + if (this.alfrescoApi) { + return this.alfrescoApi.logout(); + } + } + + /** + * Remove the login ticket from Storage + */ + public removeTicket(): void { + this.storage.removeItem('ticket-ECM'); + this.storage.removeItem('ticket-BPM'); + this.alfrescoApi.setTicket(undefined, undefined); + } + + /** + * The method return the ECM ticket stored in the Storage + * @returns ticket + */ + public getTicketEcm(): string | null { + return this.storage.getItem('ticket-ECM'); + } + + /** + * The method return the BPM ticket stored in the Storage + * @returns ticket + */ + public getTicketBpm(): string | null { + return this.storage.getItem('ticket-BPM'); + } + + public getTicketEcmBase64(): string | null { + let ticket = this.storage.getItem('ticket-ECM'); + if (ticket) { + return 'Basic ' + btoa(ticket); + } + return null; + } + + /** + * The method save the ECM and BPM ticket in the Storage + */ + public saveTickets() { + this.saveTicketEcm(); + this.saveTicketBpm(); + } + + /** + * The method save the ECM ticket in the Storage + */ + public saveTicketEcm(): void { + if (this.alfrescoApi && this.alfrescoApi.getTicketEcm()) { + this.storage.setItem('ticket-ECM', this.alfrescoApi.getTicketEcm()); + } + } + + /** + * The method save the BPM ticket in the Storage + */ + public saveTicketBpm(): void { + if (this.alfrescoApi && this.alfrescoApi.getTicketBpm()) { + this.storage.setItem('ticket-BPM', this.alfrescoApi.getTicketBpm()); + } + } + + /** + * The method return true if user is logged in on ecm provider + */ + public isEcmLoggedIn() { + return this.alfrescoApi.ecmAuth && !!this.alfrescoApi.ecmAuth.isLoggedIn(); + } + + /** + * The method return true if user is logged in on bpm provider + */ + public isBpmLoggedIn() { + return this.alfrescoApi.bpmAuth && !!this.alfrescoApi.bpmAuth.isLoggedIn(); + } + + /** + * The method write the error in the console browser + * @param error + * @returns {ErrorObservable} + */ + public handleError(error: any): Observable { + console.error('Error when logging in', error); + return Observable.throw(error || 'Server error'); + } +} diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.spec.ts b/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts similarity index 77% rename from ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.spec.ts rename to ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts index b96f160cba..cf6881decc 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts @@ -16,19 +16,19 @@ */ import { ReflectiveInjector } from '@angular/core'; -import { AlfrescoSettingsService } from './AlfrescoSettings.service'; -import { AlfrescoAuthenticationService } from './AlfrescoAuthentication.service'; -import { AlfrescoContentService } from './AlfrescoContent.service'; -import { AlfrescoApiService } from './AlfrescoApi.service'; +import { SettingsService } from './settings.service'; +import { AuthService } from './auth.service'; +import { ContentService } from './content.service'; +import { AlfrescoApiService } from './alfresco-api.service'; import { StorageService } from './storage.service'; declare let jasmine: any; -describe('AlfrescoContentService', () => { +describe('ContentService', () => { - let injector, contentService: AlfrescoContentService; - let authService: AlfrescoAuthenticationService; - let settingsService: AlfrescoSettingsService; + let injector, contentService: ContentService; + let authService: AuthService; + let settingsService: SettingsService; let storage: StorageService; let node: any; @@ -37,15 +37,15 @@ describe('AlfrescoContentService', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoApiService, - AlfrescoContentService, - AlfrescoAuthenticationService, - AlfrescoSettingsService, + ContentService, + AuthService, + SettingsService, StorageService ]); - authService = injector.get(AlfrescoAuthenticationService); - settingsService = injector.get(AlfrescoSettingsService); - contentService = injector.get(AlfrescoContentService); + authService = injector.get(AuthService); + settingsService = injector.get(SettingsService); + contentService = injector.get(ContentService); storage = injector.get(StorageService); storage.clear(); diff --git a/ng2-components/ng2-alfresco-core/src/services/content.service.ts b/ng2-components/ng2-alfresco-core/src/services/content.service.ts new file mode 100644 index 0000000000..42d427b9d2 --- /dev/null +++ b/ng2-components/ng2-alfresco-core/src/services/content.service.ts @@ -0,0 +1,47 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Injectable } from '@angular/core'; + +import { AuthService } from './auth.service'; +import { AlfrescoApiService } from './alfresco-api.service'; + +@Injectable() +export class ContentService { + + constructor(public authService: AuthService, + public apiService: AlfrescoApiService) { + } + + /** + * Get thumbnail URL for the given document node. + * @param document Node to get URL for. + * @returns {string} URL address. + */ + getDocumentThumbnailUrl(document: any): string { + return this.apiService.getInstance().content.getDocumentThumbnailUrl(document.entry.id); + } + + /** + * Get content URL for the given node. + * @param document Node to get URL for. + * @returns {string} URL address. + */ + getContentUrl(document: any): string { + return this.apiService.getInstance().content.getContentUrl(document.entry.id); + } +} diff --git a/ng2-components/ng2-alfresco-core/src/services/index.ts b/ng2-components/ng2-alfresco-core/src/services/index.ts index 1e9fbbccbf..591aa4245c 100644 --- a/ng2-components/ng2-alfresco-core/src/services/index.ts +++ b/ng2-components/ng2-alfresco-core/src/services/index.ts @@ -16,9 +16,8 @@ */ export * from './storage.service'; -export * from './AlfrescoApi.service'; +export * from './alfresco-api.service'; export * from './AlfrescoSettings.service'; -export * from './AlfrescoTranslationLoader.service'; export * from './AlfrescoTranslation.service'; export * from './AlfrescoAuthentication.service'; export * from './AlfrescoContent.service'; @@ -26,3 +25,9 @@ export * from './renditions.service'; export * from './auth-guard.service'; export * from './auth-guard-ecm.service'; export * from './auth-guard-bpm.service'; + +export * from './auth.service'; +export * from './content.service'; +export * from './settings.service'; +export * from './translate.service'; +export * from './translate-loader.service'; diff --git a/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts index 747c88bdec..39732f243b 100644 --- a/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts @@ -16,7 +16,7 @@ */ import { ReflectiveInjector } from '@angular/core'; -import { AlfrescoApiService } from './AlfrescoApi.service'; +import { AlfrescoApiService } from './alfresco-api.service'; import { RenditionsService } from './renditions.service'; import { fakeRedition, diff --git a/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts b/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts index 8b36899227..2e3e15ebca 100644 --- a/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoApiService } from './AlfrescoApi.service'; +import { AlfrescoApiService } from './alfresco-api.service'; /** * RenditionsService diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.spec.ts b/ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts similarity index 79% rename from ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.spec.ts rename to ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts index 36e261ba7d..56759c77a8 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts @@ -15,18 +15,18 @@ * limitations under the License. */ -import { AlfrescoSettingsService } from './AlfrescoSettings.service'; +import { SettingsService } from './settings.service'; describe('AlfrescoSettingsService', () => { - let service: AlfrescoSettingsService; + let service: SettingsService; beforeEach(() => { - service = new AlfrescoSettingsService(); + service = new SettingsService(); }); it('should have default ECM host', () => { - expect(service.ecmHost).toBe(AlfrescoSettingsService.DEFAULT_ECM_ADDRESS); + expect(service.ecmHost).toBe(SettingsService.DEFAULT_ECM_ADDRESS); }); it('should change host ECM', () => { @@ -37,7 +37,7 @@ describe('AlfrescoSettingsService', () => { }); it('should have default BPM host', () => { - expect(service.bpmHost).toBe(AlfrescoSettingsService.DEFAULT_BPM_ADDRESS); + expect(service.bpmHost).toBe(SettingsService.DEFAULT_BPM_ADDRESS); }); it('should change host BPM', () => { diff --git a/ng2-components/ng2-alfresco-core/src/services/settings.service.ts b/ng2-components/ng2-alfresco-core/src/services/settings.service.ts new file mode 100644 index 0000000000..f6c2d3d0cb --- /dev/null +++ b/ng2-components/ng2-alfresco-core/src/services/settings.service.ts @@ -0,0 +1,78 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Injectable } from '@angular/core'; +import { Subject } from 'rxjs/Subject'; + +@Injectable() +export class SettingsService { + + static DEFAULT_ECM_ADDRESS: string = 'http://' + window.location.hostname + ':8080'; + static DEFAULT_BPM_ADDRESS: string = 'http://' + window.location.hostname + ':9999'; + static DEFAULT_CSRF_CONFIG: boolean = false; + + static DEFAULT_BPM_CONTEXT_PATH: string = '/activiti-app'; + + private _ecmHost: string = SettingsService.DEFAULT_ECM_ADDRESS; + private _bpmHost: string = SettingsService.DEFAULT_BPM_ADDRESS; + private _csrfDisabled: boolean = SettingsService.DEFAULT_CSRF_CONFIG; + + private _bpmContextPath = SettingsService.DEFAULT_BPM_CONTEXT_PATH; + + private providers: string = 'ALL'; // ECM, BPM , ALL + + public bpmHostSubject: Subject = new Subject(); + public ecmHostSubject: Subject = new Subject(); + public csrfSubject: Subject = new Subject(); + public providerSubject: Subject = new Subject(); + + public get ecmHost(): string { + return this._ecmHost; + } + + public set csrfDisabled(csrfDisabled: boolean) { + this.csrfSubject.next(csrfDisabled); + this._csrfDisabled = csrfDisabled; + } + + public set ecmHost(ecmHostUrl: string) { + this.ecmHostSubject.next(ecmHostUrl); + this._ecmHost = ecmHostUrl; + } + + public get bpmHost(): string { + return this._bpmHost; + } + + public set bpmHost(bpmHostUrl: string) { + this.bpmHostSubject.next(bpmHostUrl); + this._bpmHost = bpmHostUrl; + } + + public getBPMApiBaseUrl(): string { + return this._bpmHost + this._bpmContextPath; + } + + public getProviders(): string { + return this.providers; + } + + public setProviders(providers: string) { + this.providerSubject.next(providers); + this.providers = providers; + } +} diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationLoader.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.spec.ts similarity index 84% rename from ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationLoader.service.spec.ts rename to ng2-components/ng2-alfresco-core/src/services/translate-loader.service.spec.ts index 14667c954e..69bbb14524 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationLoader.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.spec.ts @@ -15,17 +15,15 @@ * limitations under the License. */ -import { TranslateLoader } from 'ng2-translate/ng2-translate'; -import { AlfrescoTranslationLoader } from '../services/AlfrescoTranslationLoader.service'; -import { AlfrescoTranslationService } from '../services/AlfrescoTranslation.service'; +import { TranslateModule, TranslateLoader } from 'ng2-translate/ng2-translate'; import { Injector } from '@angular/core'; import { ResponseOptions, Response, XHRBackend, HttpModule } from '@angular/http'; import { MockBackend, MockConnection } from '@angular/http/testing'; -import { - TranslateModule -} from 'ng2-translate/ng2-translate'; import {getTestBed, TestBed} from '@angular/core/testing'; +import { AlfrescoTranslateLoader } from './translate-loader.service'; +import { AlfrescoTranslateService } from './translate.service'; + let componentJson1 = ' {"TEST": "This is a test", "TEST2": "This is another test"} ' ; const mockBackendResponse = (connection: MockConnection, response: string) => { @@ -35,7 +33,7 @@ const mockBackendResponse = (connection: MockConnection, response: string) => { describe('TranslateLoader', () => { let injector: Injector; let backend: MockBackend; - let alfrescoTranslationService: AlfrescoTranslationService; + let alfrescoTranslationService: AlfrescoTranslateService; let connection: MockConnection; // this will be set when a new connection is emitted from the backend. let customLoader; @@ -43,16 +41,16 @@ describe('TranslateLoader', () => { TestBed.configureTestingModule({ imports: [HttpModule, TranslateModule.forRoot({ provide: TranslateLoader, - useClass: AlfrescoTranslationLoader + useClass: AlfrescoTranslateLoader })], providers: [ - AlfrescoTranslationService, + AlfrescoTranslateService, {provide: XHRBackend, useClass: MockBackend} ] }); injector = getTestBed(); backend = injector.get(XHRBackend); - alfrescoTranslationService = injector.get(AlfrescoTranslationService); + alfrescoTranslationService = injector.get(AlfrescoTranslateService); backend.connections.subscribe((c: MockConnection) => connection = c); customLoader = alfrescoTranslationService.translate.currentLoader; }); @@ -60,7 +58,7 @@ describe('TranslateLoader', () => { it('should be able to provide any TranslateLoader', () => { expect(alfrescoTranslationService).toBeDefined(); expect(alfrescoTranslationService.translate.currentLoader).toBeDefined(); - expect(alfrescoTranslationService.translate.currentLoader instanceof AlfrescoTranslationLoader).toBeTruthy(); + expect(alfrescoTranslationService.translate.currentLoader instanceof AlfrescoTranslateLoader).toBeTruthy(); }); it('should add the component to the list', () => { diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationLoader.service.ts b/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts similarity index 98% rename from ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationLoader.service.ts rename to ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts index f2918d25f7..1eb77f7919 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationLoader.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts @@ -22,7 +22,7 @@ import { TranslateLoader } from 'ng2-translate/ng2-translate'; import { ComponentTranslationModel } from '../models/component.model'; @Injectable() -export class AlfrescoTranslationLoader implements TranslateLoader { +export class AlfrescoTranslateLoader implements TranslateLoader { private prefix: string = 'i18n'; private suffix: string = '.json'; diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/translate.service.spec.ts similarity index 78% rename from ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.spec.ts rename to ng2-components/ng2-alfresco-core/src/services/translate.service.spec.ts index f03e4ca877..c8422f980f 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/translate.service.spec.ts @@ -15,48 +15,46 @@ * limitations under the License. */ -import { AlfrescoTranslationService } from '../services/AlfrescoTranslation.service'; -import { TranslateLoader } from 'ng2-translate/ng2-translate'; -import { AlfrescoTranslationLoader } from '../services/AlfrescoTranslationLoader.service'; +import { TranslateModule, TranslateLoader } from 'ng2-translate/ng2-translate'; import { Injector } from '@angular/core'; import { ResponseOptions, Response, XHRBackend, HttpModule } from '@angular/http'; import { MockBackend, MockConnection } from '@angular/http/testing'; -import { - TranslateModule -} from 'ng2-translate/ng2-translate'; -import {getTestBed, TestBed} from '@angular/core/testing'; +import { getTestBed, TestBed } from '@angular/core/testing'; + +import { AlfrescoTranslateService } from './translate.service'; +import { AlfrescoTranslateLoader } from './translate-loader.service'; const mockBackendResponse = (connection: MockConnection, response: string) => { connection.mockRespond(new Response(new ResponseOptions({body: response}))); }; -describe('AlfrescoTranslationService', () => { +describe('AlfrescoTranslateService', () => { let injector: Injector; let backend: MockBackend; - let alfrescoTranslationService: AlfrescoTranslationService; + let alfrescoTranslationService: AlfrescoTranslateService; let connection: MockConnection; // this will be set when a new connection is emitted from the backend. beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpModule, TranslateModule.forRoot({ provide: TranslateLoader, - useClass: AlfrescoTranslationLoader + useClass: AlfrescoTranslateLoader })], providers: [ - AlfrescoTranslationService, + AlfrescoTranslateService, {provide: XHRBackend, useClass: MockBackend} ] }); injector = getTestBed(); backend = injector.get(XHRBackend); - alfrescoTranslationService = injector.get(AlfrescoTranslationService); + alfrescoTranslationService = injector.get(AlfrescoTranslateService); backend.connections.subscribe((c: MockConnection) => connection = c); alfrescoTranslationService.addTranslationFolder('fake-name', 'fake-path'); }); it('is defined', () => { - expect(AlfrescoTranslationService).toBeDefined(); - expect(alfrescoTranslationService instanceof AlfrescoTranslationService).toBeTruthy(); + expect(AlfrescoTranslateService).toBeDefined(); + expect(alfrescoTranslationService instanceof AlfrescoTranslateService).toBeTruthy(); }); it('should be able to get translations of the KEY: TEST', () => { diff --git a/ng2-components/ng2-alfresco-core/src/services/translate.service.ts b/ng2-components/ng2-alfresco-core/src/services/translate.service.ts new file mode 100644 index 0000000000..28c7c9ece1 --- /dev/null +++ b/ng2-components/ng2-alfresco-core/src/services/translate.service.ts @@ -0,0 +1,54 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Rx'; +import { TranslateService } from 'ng2-translate/ng2-translate'; +import { AlfrescoTranslateLoader } from './translate-loader.service'; + +@Injectable() +export class AlfrescoTranslateService { + userLang: string = 'en'; + customLoader: AlfrescoTranslateLoader; + + constructor(public translate: TranslateService) { + this.userLang = translate.getBrowserLang() || 'en'; + translate.setDefaultLang(this.userLang); + this.customLoader = this.translate.currentLoader; + this.customLoader.init(this.userLang); + } + + addTranslationFolder(name: string = '', path: string = '') { + if (!this.customLoader.existComponent(name)) { + this.customLoader.addComponentList(name, path); + this.translate.getTranslation(this.userLang).subscribe( + () => { + this.translate.use(this.userLang); + } + ); + } + } + + use(lang: string): Observable { + this.customLoader.init(lang); + return this.translate.use(lang); + } + + get(key: string|Array, interpolateParams?: Object): Observable { + return this.translate.get(key, interpolateParams); + } +} diff --git a/ng2-components/ng2-alfresco-core/ts-node/f6ba8d7b15d27fe97737b60b41fb5fdda5bf0070/2d80de9f3391a75a650ffc7cab54d80d0a017e2a.js.map b/ng2-components/ng2-alfresco-core/ts-node/f6ba8d7b15d27fe97737b60b41fb5fdda5bf0070/2d80de9f3391a75a650ffc7cab54d80d0a017e2a.js.map deleted file mode 100644 index 5817e8caf1..0000000000 --- a/ng2-components/ng2-alfresco-core/ts-node/f6ba8d7b15d27fe97737b60b41fb5fdda5bf0070/2d80de9f3391a75a650ffc7cab54d80d0a017e2a.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"/Users/valbano/Documents/alfresco-ng2-components/ng2-components/ng2-alfresco-core/gulpfile.ts","sources":["/Users/valbano/Documents/alfresco-ng2-components/ng2-components/ng2-alfresco-core/gulpfile.ts"],"names":[],"mappings":"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","sourcesContent":["import * as gulp from 'gulp';\nimport * as util from 'gulp-util';\nimport * as runSequence from 'run-sequence';\nimport * as gulpLoadPlugins from 'gulp-load-plugins';\nimport * as merge from 'merge-stream';\nimport * as rimraf from 'rimraf';\nimport { join } from 'path';\nimport * as Builder from 'systemjs-builder';\nvar autoprefixer = require('autoprefixer');\nimport * as cssnano from 'cssnano';\nimport * as filter from 'gulp-filter';\n\nvar APP_SRC = `.`;\nvar CSS_PROD_BUNDLE = 'main.css';\nvar JS_PROD_SHIMS_BUNDLE = 'shims.js';\nvar NG_FACTORY_FILE = 'main-prod';\n\nconst BUILD_TYPES = {\n DEVELOPMENT: 'dev',\n PRODUCTION: 'prod'\n};\n\nfunction normalizeDependencies(deps) {\n deps\n .filter((d) => !/\\*/.test(d.src)) // Skip globs\n .forEach((d) => d.src = require.resolve(d.src));\n return deps;\n}\n\nfunction filterDependency(type: string, d): boolean {\n const t = d.buildType || d.env;\n d.buildType = t;\n if (!t) {\n d.buildType = Object.keys(BUILD_TYPES).map(k => BUILD_TYPES[k]);\n }\n if (!(d.buildType instanceof Array)) {\n (d).env = [d.buildType];\n }\n return d.buildType.indexOf(type) >= 0;\n}\n\nfunction getInjectableDependency() {\n var APP_ASSETS = [\n {src: `src/css/main.css`, inject: true, vendor: false},\n ];\n\n var NPM_DEPENDENCIES = [\n {src: 'zone.js/dist/zone.js', inject: 'libs'},\n {src: 'core-js/client/shim.min.js', inject: 'shims'},\n {src: 'intl/dist/Intl.min.js', inject: 'shims'},\n {src: 'systemjs/dist/system.src.js', inject: 'shims', buildType:'dev'}\n ];\n\n return normalizeDependencies(NPM_DEPENDENCIES.filter(filterDependency.bind(null, 'dev')))\n .concat(APP_ASSETS.filter(filterDependency.bind(null, 'dev')));\n}\n\nconst plugins = gulpLoadPlugins();\n\nlet tsProjects: any = {};\n\nfunction makeTsProject(options: Object = {}) {\n let optionsHash = JSON.stringify(options);\n if (!tsProjects[optionsHash]) {\n let config = Object.assign({\n typescript: require('typescript')\n }, options);\n tsProjects[optionsHash] =\n plugins.typescript.createProject('tsconfig.json', config);\n }\n return tsProjects[optionsHash];\n}\n\ngulp.task('build.html_css', () => {\n const gulpConcatCssConfig = {\n targetFile: CSS_PROD_BUNDLE,\n options: {\n rebaseUrls: false\n }\n };\n\n const processors = [\n autoprefixer({\n browsers: [\n 'ie >= 10',\n 'ie_mob >= 10',\n 'ff >= 30',\n 'chrome >= 34',\n 'safari >= 7',\n 'opera >= 23',\n 'ios >= 7',\n 'android >= 4.4',\n 'bb >= 10'\n ]\n })\n ];\n\n const reportPostCssError = (e: any) => util.log(util.colors.red(e.message));\n\n processors.push(\n cssnano({\n discardComments: {removeAll: true},\n discardUnused: false, // unsafe, see http://goo.gl/RtrzwF\n zindex: false, // unsafe, see http://goo.gl/vZ4gbQ\n reduceIdents: false // unsafe, see http://goo.gl/tNOPv0\n })\n );\n\n /**\n * Processes the CSS files within `src/client` excluding those in `src/client/assets` using `postcss` with the\n * configured processors\n * Execute the appropriate component-stylesheet processing method based on user stylesheet preference.\n */\n function processComponentStylesheets() {\n return gulp.src(join('src/**', '*.css'))\n .pipe(plugins.cached('process-component-css'))\n .pipe(plugins.postcss(processors))\n .on('error', reportPostCssError);\n }\n\n\n /**\n * Get a stream of external css files for subsequent processing.\n */\n function getExternalCssStream() {\n return gulp.src(getExternalCss())\n .pipe(plugins.cached('process-external-css'));\n }\n\n /**\n * Get an array of filenames referring to all external css stylesheets.\n */\n function getExternalCss() {\n return getInjectableDependency().filter(dep => /\\.css$/.test(dep.src)).map(dep => dep.src);\n }\n\n /**\n * Processes the external CSS files using `postcss` with the configured processors.\n */\n function processExternalCss() {\n return getExternalCssStream()\n .pipe(plugins.postcss(processors))\n .pipe(plugins.concatCss(gulpConcatCssConfig.targetFile, gulpConcatCssConfig.options))\n .on('error', reportPostCssError);\n }\n\n return merge(processComponentStylesheets(), processExternalCss());\n\n});\n\ngulp.task('build.bundles.app', (done) => {\n var BUNDLER_OPTIONS = {\n format: 'umd',\n minify: false,\n mangle: false,\n sourceMaps: true\n };\n var CONFIG_TYPESCRIPT = {\n baseURL: '.',\n transpiler: 'typescript',\n typescriptOptions: {\n module: 'cjs'\n },\n map: {\n typescript: 'node_modules/typescript/lib/typescript.js',\n '@angular': 'node_modules/@angular',\n rxjs: 'node_modules/rxjs',\n 'ng2-translate': 'node_modules/ng2-translate',\n 'alfresco-js-api': 'node_modules/alfresco-js-api/dist/alfresco-js-api',\n 'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/',\n 'ng2-activiti-diagrams': 'node_modules/ng2-activiti-diagrams/',\n 'ng2-activiti-analytics': 'node_modules/ng2-activiti-analytics/',\n 'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable/',\n 'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist/',\n 'ng2-activiti-form': 'node_modules/ng2-activiti-form/',\n 'ng2-alfresco-login': 'node_modules/ng2-alfresco-login/',\n 'ng2-activiti-processlist': 'node_modules/ng2-activiti-processlist/',\n 'ng2-alfresco-search': 'node_modules/ng2-alfresco-search/',\n 'ng2-activiti-tasklist': 'node_modules/ng2-activiti-tasklist/',\n 'ng2-alfresco-tag': 'node_modules/ng2-alfresco-tag/',\n 'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload/',\n 'ng2-alfresco-userinfo': 'node_modules/ng2-alfresco-userinfo/',\n 'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer/',\n 'ng2-alfresco-webscript': 'node_modules/ng2-alfresco-webscript/'\n },\n paths: {\n '*': '*.js'\n },\n meta: {\n 'node_modules/@angular/*': {build: false},\n 'node_modules/rxjs/*': {build: false},\n 'node_modules/alfresco-js-api/*': {build: false},\n 'node_modules/ng2-translate/*': {build: false},\n 'node_modules/ng2-alfresco-core/*': {build: false},\n 'node_modules/ng2-activiti-diagrams/*': {build: false},\n 'node_modules/ng2-activiti-analytics/*': {build: false},\n 'node_modules/ng2-alfresco-datatable/*': {build: false},\n 'node_modules/ng2-alfresco-documentlist/*': {build: false},\n 'node_modules/ng2-activiti-form/*': {build: false},\n 'node_modules/ng2-alfresco-login/*': {build: false},\n 'node_modules/ng2-activiti-processlist/*': {build: false},\n 'node_modules/ng2-alfresco-search/*': {build: false},\n 'node_modules/ng2-activiti-tasklist/*': {build: false},\n 'node_modules/ng2-alfresco-tag/*': {build: false},\n 'node_modules/ng2-alfresco-upload/*': {build: false},\n 'node_modules/ng2-alfresco-userinfo/*': {build: false},\n 'node_modules/ng2-alfresco-viewer/*': {build: false},\n 'node_modules/ng2-alfresco-webscript/*': {build: false}\n }\n };\n\n var pkg = require('./package.json');\n var namePkg = pkg.name;\n\n var builder = new Builder(CONFIG_TYPESCRIPT);\n builder\n .buildStatic(APP_SRC + \"/index\", 'bundles/' + namePkg + '.js', BUNDLER_OPTIONS)\n .then(function () {\n return done();\n })\n .catch(function (err) {\n return done(err);\n });\n});\n\ngulp.task('build.assets.prod', () => {\n return gulp.src([\n join('src/**', '*.ts'),\n 'index.ts',\n join('src/**', '*.css'),\n join('src/**', '*.html'),\n '!'+join('*/**', '*.d.ts'),\n '!'+join('*/**', '*.spec.ts'),\n '!gulpfile.ts'])\n\n});\n\ngulp.task('build.bundles', () => {\n merge(bundleShims());\n\n /**\n * Returns the shim files to be injected.\n */\n function getShims() {\n let libs = getInjectableDependency()\n .filter(d => /\\.js$/.test(d.src));\n\n return libs.filter(l => l.inject === 'shims')\n .concat(libs.filter(l => l.inject === 'libs'))\n .concat(libs.filter(l => l.inject === true))\n .map(l => l.src);\n }\n\n /**\n * Bundles the shim files.\n */\n function bundleShims() {\n return gulp.src(getShims())\n .pipe(plugins.concat(JS_PROD_SHIMS_BUNDLE))\n // Strip the first (global) 'use strict' added by reflect-metadata, but don't strip any others to avoid unintended scope leaks.\n .pipe(plugins.replace(/('|\")use strict\\1;var Reflect;/, 'var Reflect;'))\n .pipe(gulp.dest('bundles'));\n }\n\n});\n\ngulp.task('build.js.prod', () => {\n const INLINE_OPTIONS = {\n base: APP_SRC,\n target: 'es5',\n useRelativePaths: true,\n removeLineBreaks: true\n };\n\n let tsProject = makeTsProject();\n let src = [\n join('src/**/*.ts'),\n join('!src/**/*.d.ts'),\n join('!src/**/*.spec.ts'),\n `!src/**/${NG_FACTORY_FILE}.ts`\n ];\n\n let result = gulp.src(src)\n .pipe(plugins.plumber())\n .pipe(plugins.inlineNg2Template(INLINE_OPTIONS))\n .pipe(tsProject())\n .once('error', function (e: any) {\n this.once('finish', () => process.exit(1));\n });\n\n return result.js\n .pipe(plugins.template())\n .pipe(gulp.dest('src'))\n .on('error', (e: any) => {\n console.log(e);\n });\n});\n\ngulp.task('build.prod', (done: any) =>\n runSequence(\n 'build.assets.prod',\n 'build.html_css',\n 'build.js.prod',\n 'build.bundles',\n 'build.bundles.app',\n done));\n"]} \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts index dae8bab023..218aafbb8a 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts @@ -31,7 +31,7 @@ import { } from '@angular/core'; import { Subject } from 'rxjs/Rx'; import { MinimalNodeEntity } from 'alfresco-js-api'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { DataRowEvent, DataTableComponent, ObjectDataColumn } from 'ng2-alfresco-datatable'; import { DocumentListService } from './../services/document-list.service'; import { ContentActionModel } from './../models/content-action.model'; @@ -157,12 +157,12 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { constructor( private documentListService: DocumentListService, private ngZone: NgZone, - private translate: AlfrescoTranslationService) { + private translateService: AlfrescoTranslateService) { this.data = new ShareDataTableAdapter(this.documentListService, './..', []); - if (translate) { - translate.addTranslationFolder('ng2-alfresco-documentlist', 'node_modules/ng2-alfresco-documentlist/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-alfresco-documentlist', 'node_modules/ng2-alfresco-documentlist/src'); } } diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts index 40eca916b9..ef8364d7d0 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts @@ -24,7 +24,7 @@ import { ViewChild } from '@angular/core'; import { DocumentListService } from './../services/document-list.service'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ContentActionModel } from './../models/content-action.model'; declare let dialogPolyfill: any; @@ -59,10 +59,10 @@ export class DocumentMenuAction implements OnInit { constructor( private documentListService: DocumentListService, - private translate: AlfrescoTranslationService) { + private translateService: AlfrescoTranslateService) { - if (translate) { - translate.addTranslationFolder('ng2-alfresco-documentlist', 'node_modules/ng2-alfresco-documentlist/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-alfresco-documentlist', 'node_modules/ng2-alfresco-documentlist/src'); } } @@ -112,7 +112,7 @@ export class DocumentMenuAction implements OnInit { private getErrorMessage(response: any): string { if (response.body && response.body.error.statusCode === ERROR_FOLDER_ALREADY_EXIST) { let errorMessage: any; - errorMessage = this.translate.get('FILE_UPLOAD.MESSAGES.FOLDER_ALREADY_EXIST'); + errorMessage = this.translateService.get('FILE_UPLOAD.MESSAGES.FOLDER_ALREADY_EXIST'); return errorMessage.value; } } diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts index 74df4cf5c0..8bdf2c286b 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoApiService, StorageService, AlfrescoContentService } from 'ng2-alfresco-core'; +import { SettingsService, AuthService, AlfrescoApiService, StorageService, ContentService } from 'ng2-alfresco-core'; import { FileNode } from '../assets/document-library.model.mock'; import { ReflectiveInjector } from '@angular/core'; import { DocumentListService } from './document-list.service'; @@ -26,8 +26,8 @@ describe('DocumentListService', () => { let injector; let service: DocumentListService; - let settingsService: AlfrescoSettingsService; - let authService: AlfrescoAuthenticationService; + let settingsService: SettingsService; + let authService: AuthService; let alfrescoApiService: AlfrescoApiService; let fakeEntryNode = { @@ -94,16 +94,16 @@ describe('DocumentListService', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoApiService, - AlfrescoAuthenticationService, - AlfrescoSettingsService, + AuthService, + SettingsService, AlfrescoApiService, - AlfrescoContentService, + ContentService, DocumentListService, StorageService ]); - settingsService = injector.get(AlfrescoSettingsService); - authService = injector.get(AlfrescoAuthenticationService); + settingsService = injector.get(SettingsService); + authService = injector.get(AuthService); alfrescoApiService = injector.get(AlfrescoApiService); service = injector.get(DocumentListService); jasmine.Ajax.install(); diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts index 2d51adad1c..928e0780bf 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts @@ -19,11 +19,7 @@ import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; import { NodePaging, MinimalNodeEntity } from 'alfresco-js-api'; -import { - AlfrescoAuthenticationService, - AlfrescoContentService, - AlfrescoApiService -} from 'ng2-alfresco-core'; +import { AuthService, ContentService, AlfrescoApiService } from 'ng2-alfresco-core'; @Injectable() export class DocumentListService { @@ -61,7 +57,9 @@ export class DocumentListService { 'application/vnd.apple.numbers': 'ft_ic_spreadsheet.svg' }; - constructor(private authService: AlfrescoAuthenticationService, private contentService: AlfrescoContentService, private apiService: AlfrescoApiService) { + constructor(private authService: AuthService, + private contentService: ContentService, + private apiService: AlfrescoApiService) { } private getNodesPromise(folder: string, opts?: any): Promise { diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts index 0e23802ce3..6dd37a3ed3 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts @@ -23,10 +23,10 @@ import { result, results, folderResult, noResult, errorJson } from './../assets/ import { AlfrescoSearchService } from '../services/alfresco-search.service'; import { AlfrescoApiService, - AlfrescoSettingsService, - AlfrescoAuthenticationService, - AlfrescoContentService, - AlfrescoTranslationService, + SettingsService, + AuthService, + ContentService, + AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; @@ -48,12 +48,12 @@ describe('AlfrescoSearchAutocompleteComponent', () => { ], declarations: [ AlfrescoSearchAutocompleteComponent ], // declare the test component providers: [ - {provide: AlfrescoTranslationService, useClass: TranslationMock}, + {provide: AlfrescoTranslateService, useClass: TranslationMock}, AlfrescoThumbnailService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, - AlfrescoAuthenticationService, - AlfrescoContentService, + AuthService, + ContentService, AlfrescoSearchService ] }).compileComponents().then(() => { @@ -64,7 +64,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => { })); it('should setup i18n folder', () => { - let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService); + let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService); spyOn(translationService, 'addTranslationFolder'); fixture.detectChanges(); expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts index 03b74b5769..2e5d97fbb0 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts @@ -16,10 +16,10 @@ */ import { Component, ElementRef, EventEmitter, Input, OnInit, OnChanges, Output, ViewChild } from '@angular/core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { MinimalNodeEntity } from 'alfresco-js-api'; import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service'; import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; -import { MinimalNodeEntity } from 'alfresco-js-api'; @Component({ moduleId: module.id, @@ -70,14 +70,14 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges { baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', ''); - constructor(private alfrescoSearchService: AlfrescoSearchService, - private translate: AlfrescoTranslationService, - private alfrescoThumbnailService: AlfrescoThumbnailService) { + constructor(private searchService: AlfrescoSearchService, + private translateService: AlfrescoTranslateService, + private thumbnailService: AlfrescoThumbnailService) { } ngOnInit(): void { - if (this.translate) { - this.translate.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); + if (this.translateService) { + this.translateService.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); } } @@ -102,7 +102,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges { orderBy: this.resultSort }; if (searchTerm !== null && searchTerm !== '') { - this.alfrescoSearchService + this.searchService .getNodeQueryResults(searchTerm, searchOpts) .subscribe( results => { @@ -126,7 +126,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges { */ getMimeTypeIcon(node: MinimalNodeEntity): string { if (node.entry.content && node.entry.content.mimeType) { - let icon = this.alfrescoThumbnailService.getMimeTypeIcon(node.entry.content.mimeType); + let icon = this.thumbnailService.getMimeTypeIcon(node.entry.content.mimeType); return this.resolveIconPath(icon); } else if (node.entry.isFolder) { return `${this.baseComponentPath}/../assets/images/ft_ic_folder.svg`; @@ -144,7 +144,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges { */ getMimeTypeKey(node: MinimalNodeEntity): string { if (node.entry.content && node.entry.content.mimeType) { - return 'SEARCH.ICONS.' + this.alfrescoThumbnailService.getMimeTypeKey(node.entry.content.mimeType); + return 'SEARCH.ICONS.' + this.thumbnailService.getMimeTypeKey(node.entry.content.mimeType); } else { return ''; } diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts index 800dcae8a0..39d992a951 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts @@ -22,11 +22,11 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi import { TranslationMock } from './../assets/translation.service.mock'; import { result } from './../assets/alfresco-search.component.mock'; import { - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, - AlfrescoAuthenticationService, - AlfrescoContentService, - AlfrescoTranslationService, + AuthService, + ContentService, + AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; import { AlfrescoSearchService } from '../services/alfresco-search.service'; @@ -49,12 +49,12 @@ describe('AlfrescoSearchControlComponent', () => { AlfrescoSearchAutocompleteComponent ], providers: [ - {provide: AlfrescoTranslationService, useClass: TranslationMock}, + {provide: AlfrescoTranslateService, useClass: TranslationMock}, AlfrescoThumbnailService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, - AlfrescoAuthenticationService, - AlfrescoContentService, + AuthService, + ContentService, AlfrescoSearchService ] }).compileComponents().then(() => { @@ -65,7 +65,7 @@ describe('AlfrescoSearchControlComponent', () => { })); it('should setup i18n folder', () => { - let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService); + let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService); spyOn(translationService, 'addTranslationFolder'); fixture.detectChanges(); expect(translationService.addTranslationFolder) diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts index f49c056910..ca4658fabe 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts @@ -17,10 +17,10 @@ import { FormControl, Validators } from '@angular/forms'; import { Component, Input, Output, OnInit, OnDestroy, ElementRef, EventEmitter, ViewChild } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { Observable, Subject } from 'rxjs/Rx'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component'; import { SearchTermValidator } from './../forms/search-term-validator'; -import { Observable, Subject } from 'rxjs/Rx'; @Component({ moduleId: module.id, @@ -86,7 +86,7 @@ export class AlfrescoSearchControlComponent implements OnInit, OnDestroy { private focusSubject = new Subject(); - constructor(private translate: AlfrescoTranslationService) { + constructor(private translateService: AlfrescoTranslateService) { this.searchControl = new FormControl( this.searchTerm, @@ -103,7 +103,7 @@ export class AlfrescoSearchControlComponent implements OnInit, OnDestroy { this.setupFocusEventHandlers(); - this.translate.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); + this.translateService.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); } ngOnDestroy(): void { diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts index ffb8ef9b33..0a728fb1f1 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts @@ -25,11 +25,11 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi import { TranslationMock } from './../assets/translation.service.mock'; import { AlfrescoSearchService } from '../services/alfresco-search.service'; import { - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, - AlfrescoAuthenticationService, - AlfrescoContentService, - AlfrescoTranslationService, + AuthService, + ContentService, + AlfrescoTranslateService, CoreModule, StorageService } from 'ng2-alfresco-core'; @@ -107,12 +107,12 @@ describe('AlfrescoSearchComponent', () => { declarations: [ AlfrescoSearchComponent ], // declare the test component providers: [ AlfrescoSearchService, - {provide: AlfrescoTranslationService, useClass: TranslationMock}, + {provide: AlfrescoTranslateService, useClass: TranslationMock}, AlfrescoThumbnailService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, - AlfrescoAuthenticationService, - AlfrescoContentService, + AuthService, + ContentService, StorageService ] }).compileComponents().then(() => { @@ -140,8 +140,8 @@ describe('AlfrescoSearchComponent', () => { it('should have a null search term if no query param provided via RouteParams', () => { let injector = ReflectiveInjector.resolveAndCreate([ AlfrescoSearchService, - AlfrescoAuthenticationService, - AlfrescoSettingsService, + AuthService, + SettingsService, AlfrescoApiService, StorageService, { provide: ActivatedRoute, useValue: { params: Observable.from([{}]) } } @@ -152,7 +152,7 @@ describe('AlfrescoSearchComponent', () => { }); it('should setup i18n folder', () => { - let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService); + let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService); spyOn(translationService, 'addTranslationFolder'); fixture.detectChanges(); expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts index 51e09eadae..ae04512f75 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts @@ -19,7 +19,7 @@ import { Component, EventEmitter, Input, Output, Optional, OnChanges, SimpleChan import { ActivatedRoute, Params } from '@angular/router'; import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service'; import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { MinimalNodeEntity } from 'alfresco-js-api'; @Component({ @@ -65,15 +65,15 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', ''); - constructor(private alfrescoSearchService: AlfrescoSearchService, - private translate: AlfrescoTranslationService, - private _alfrescoThumbnailService: AlfrescoThumbnailService, + constructor(private searchService: AlfrescoSearchService, + private translateService: AlfrescoTranslateService, + private thumbnailService: AlfrescoThumbnailService, @Optional() private route: ActivatedRoute) { } - ngOnInit(): void { - if (this.translate !== null) { - this.translate.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); + ngOnInit() { + if (this.translateService !== null) { + this.translateService.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); } if (this.route) { this.route.params.forEach((params: Params) => { @@ -85,7 +85,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { } } - ngOnChanges(changes: SimpleChanges): void { + ngOnChanges(changes: SimpleChanges) { if (changes['searchTerm']) { this.searchTerm = changes['searchTerm'].currentValue; this.displaySearchResults(this.searchTerm); @@ -99,7 +99,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { */ getMimeTypeIcon(node: any): string { if (node.entry.content && node.entry.content.mimeType) { - let icon = this._alfrescoThumbnailService.getMimeTypeIcon(node.entry.content.mimeType); + let icon = this.thumbnailService.getMimeTypeIcon(node.entry.content.mimeType); return this.resolveIconPath(icon); } else if (node.entry.isFolder) { return `${this.baseComponentPath}/../assets/images/ft_ic_folder.svg`; @@ -117,7 +117,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { */ getMimeTypeKey(node: any): string { if (node.entry.content && node.entry.content.mimeType) { - return 'SEARCH.ICONS.' + this._alfrescoThumbnailService.getMimeTypeKey(node.entry.content.mimeType); + return 'SEARCH.ICONS.' + this.thumbnailService.getMimeTypeKey(node.entry.content.mimeType); } else { return ''; } @@ -127,8 +127,8 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { * Loads and displays search results * @param searchTerm Search query entered by user */ - private displaySearchResults(searchTerm): void { - if (searchTerm && this.alfrescoSearchService) { + private displaySearchResults(searchTerm) { + if (searchTerm && this.searchService) { let searchOpts: SearchOptions = { include: ['path'], rootNodeId: this.rootNodeId, @@ -136,7 +136,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { maxItems: this.maxResults, orderBy: this.resultSort }; - this.alfrescoSearchService + this.searchService .getNodeQueryResults(searchTerm, searchOpts) .subscribe( results => { @@ -153,7 +153,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { } } - onItemClick(node, event?: Event): void { + onItemClick(node, event?: Event) { if (this.navigate && this.navigationMode === AlfrescoSearchComponent.SINGLE_CLICK_NAVIGATION) { if (node && node.entry) { this.navigate.emit(node); diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts index a5756bb630..23409e6f8d 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts @@ -17,7 +17,7 @@ import { ReflectiveInjector } from '@angular/core'; import { AlfrescoSearchService } from './alfresco-search.service'; -import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService, StorageService } from 'ng2-alfresco-core'; +import { AuthService, SettingsService, AlfrescoApiService, StorageService } from 'ng2-alfresco-core'; import { fakeApi, fakeSearch, fakeError } from '../assets/alfresco-search.service.mock'; declare let jasmine: any; @@ -31,9 +31,9 @@ describe('AlfrescoSearchService', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoSearchService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, - AlfrescoAuthenticationService, + AuthService, StorageService ]); service = injector.get(AlfrescoSearchService); diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts index c59edde498..e3db854360 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; +import { AuthService, AlfrescoApiService } from 'ng2-alfresco-core'; /** * Internal service used by Document List component. @@ -25,7 +25,8 @@ import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco- @Injectable() export class AlfrescoSearchService { - constructor(public authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) { + constructor(public authService: AuthService, + private apiService: AlfrescoApiService) { } /** diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts index f60780b8d4..afc9055828 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts @@ -17,7 +17,7 @@ import { ReflectiveInjector } from '@angular/core'; import { AlfrescoThumbnailService } from './alfresco-thumbnail.service'; -import { AlfrescoApiService, AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, AuthService, ContentService, SettingsService, StorageService } from 'ng2-alfresco-core'; describe('AlfrescoThumbnailService', () => { @@ -27,9 +27,9 @@ describe('AlfrescoThumbnailService', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoApiService, - AlfrescoAuthenticationService, - AlfrescoContentService, - AlfrescoSettingsService, + AuthService, + ContentService, + SettingsService, AlfrescoThumbnailService, StorageService ]); diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts index 6cec75e9e4..102bc2f276 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { AlfrescoContentService } from 'ng2-alfresco-core'; +import { ContentService } from 'ng2-alfresco-core'; @Injectable() export class AlfrescoThumbnailService { @@ -50,7 +50,7 @@ export class AlfrescoThumbnailService { 'application/vnd.apple.numbers': 'ft_ic_spreadsheet' }; - constructor(public contentService: AlfrescoContentService) { + constructor(public contentService: ContentService) { } /** diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.spec.ts b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.spec.ts index a8e2fc8145..cf0a1c9210 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.spec.ts +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.spec.ts @@ -18,12 +18,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { TagActionsComponent } from '../components/tag-actions.component'; import { DebugElement } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - CoreModule -} from 'ng2-alfresco-core'; +import { CoreModule } from 'ng2-alfresco-core'; import { TagService } from '../services/tag.service'; declare let jasmine: any; @@ -38,13 +33,12 @@ describe('Test ng2-alfresco-tag Tag actions list', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() + ], + declarations: [ + TagActionsComponent ], - declarations: [TagActionsComponent], providers: [ - AlfrescoSettingsService, - AlfrescoAuthenticationService, - AlfrescoApiService, TagService ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.ts b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.ts index d5fad0c9a8..be67f17407 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.ts +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.ts @@ -16,8 +16,7 @@ */ import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; -import { TagService } from '../services/tag.service'; +import { TagService } from './../services/tag.service'; /** * @@ -54,8 +53,7 @@ export class TagActionsComponent { * Constructor * @param authService */ - constructor(public authService: AlfrescoAuthenticationService, private tagService: TagService) { - + constructor(private tagService: TagService) { } ngOnChanges(changes) { diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.spec.ts b/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.spec.ts index cac7963870..644425d10f 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.spec.ts +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.spec.ts @@ -15,15 +15,10 @@ * limitations under the License. */ +import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { TagList } from '../components/tag-list.component'; -import { DebugElement } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - CoreModule -} from 'ng2-alfresco-core'; +import { CoreModule } from 'ng2-alfresco-core'; +import { TagList } from './../components/tag-list.component'; import { TagService } from '../services/tag.service'; declare let jasmine: any; @@ -54,13 +49,12 @@ describe('Test ng2-alfresco-tag Tag list All ECM', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() + ], + declarations: [ + TagList ], - declarations: [TagList], providers: [ - AlfrescoSettingsService, - AlfrescoAuthenticationService, - AlfrescoApiService, TagService ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.ts b/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.ts index 5b43004127..7337f019df 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.ts +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.ts @@ -16,7 +16,6 @@ */ import { Component, Output, EventEmitter } from '@angular/core'; -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { TagService } from '../services/tag.service'; /** @@ -42,8 +41,7 @@ export class TagList { * Constructor * @param authService */ - constructor(public authService: AlfrescoAuthenticationService, private tagService: TagService) { - + constructor(private tagService: TagService) { } ngOnInit(changes) { diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.spec.ts b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.spec.ts index eaa5e6828e..c17ec7a2e3 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.spec.ts +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.spec.ts @@ -17,13 +17,8 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { TagNodeList } from '../components/tag-node-list.component'; -import { DebugElement } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - CoreModule -} from 'ng2-alfresco-core'; +import { DebugElement } from '@angular/core'; +import { CoreModule } from 'ng2-alfresco-core'; import { TagService } from '../services/tag.service'; declare let jasmine: any; @@ -54,13 +49,12 @@ describe('Test ng2-alfresco-tag Tag relative node list', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() + ], + declarations: [ + TagNodeList ], - declarations: [TagNodeList], providers: [ - AlfrescoSettingsService, - AlfrescoAuthenticationService, - AlfrescoApiService, TagService ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.ts b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.ts index a76eb8554e..a0f7fe134e 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.ts +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.ts @@ -16,7 +16,6 @@ */ import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { TagService } from '../services/tag.service'; /** @@ -46,7 +45,7 @@ export class TagNodeList { * Constructor * @param authService */ - constructor(public authService: AlfrescoAuthenticationService, private tagService: TagService) { + constructor(private tagService: TagService) { } ngOnChanges(changes) { diff --git a/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts b/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts index 4e60ac6487..ca700b7b8d 100644 --- a/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts +++ b/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts @@ -17,7 +17,6 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { AlfrescoApiService } from 'ng2-alfresco-core'; /** @@ -32,7 +31,7 @@ export class TagService { * Constructor * @param apiService */ - constructor(private authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService) { } getTagsByNodeId(nodeId: string): any { diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts index 6de21d82c6..28f495f833 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts @@ -15,42 +15,33 @@ * limitations under the License. */ +import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { CoreModule } from 'ng2-alfresco-core'; import { FileUploadingDialogComponent } from './file-uploading-dialog.component'; import { FileUploadingListComponent } from './file-uploading-list.component'; -import { DebugElement, ReflectiveInjector } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - CoreModule -} from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; import { FileModel } from '../models/file.model'; -describe('Test ng2-alfresco-upload FileUploadDialog', () => { +describe('FileUploadingDialogComponent', () => { - let injector; - let component: any; + let component: FileUploadingDialogComponent; let fixture: ComponentFixture; let debug: DebugElement; let element: any; let file: FileModel; + let uploadService: UploadService; beforeEach(async(() => { - injector = ReflectiveInjector.resolveAndCreate([ - UploadService - ]); - TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() + ], + declarations: [ + FileUploadingDialogComponent, + FileUploadingListComponent ], - declarations: [FileUploadingDialogComponent, FileUploadingListComponent], providers: [ - AlfrescoSettingsService, - AlfrescoAuthenticationService, - AlfrescoApiService, UploadService ] }).compileComponents(); @@ -66,6 +57,7 @@ describe('Test ng2-alfresco-upload FileUploadDialog', () => { file = new FileModel(fileFake); fixture = TestBed.createComponent(FileUploadingDialogComponent); + uploadService = TestBed.get(UploadService); debug = fixture.debugElement; element = fixture.nativeElement; @@ -81,14 +73,14 @@ describe('Test ng2-alfresco-upload FileUploadDialog', () => { }); it('should render completed upload 1 when an element is added to Observer', () => { - component._uploaderService.updateFileCounterStream(1); + uploadService.updateFileCounterStream(1); fixture.detectChanges(); expect(element.querySelector('#total-upload-completed').innerText).toEqual('1'); }); it('should render dialog box with css class show when an element is added to Observer', () => { - component._uploaderService.addToQueue([file]); + uploadService.addToQueue([file]); component.filesUploadingList = [file]; fixture.detectChanges(); diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts index 9726b70632..2f52e516c9 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts @@ -17,7 +17,7 @@ import { Component, ChangeDetectorRef, OnInit, OnDestroy } from '@angular/core'; import { FileModel } from '../models/file.model'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; /** @@ -52,14 +52,16 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy { private counterSubscription: any; constructor(private cd: ChangeDetectorRef, - translate: AlfrescoTranslationService, - private _uploaderService: UploadService) { - translate.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); + translateService: AlfrescoTranslateService, + private uploadService: UploadService) { + if (translateService) { + translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); + } } ngOnInit() { - if (this._uploaderService.filesUpload$) { - this.listSubscription = this._uploaderService.filesUpload$.subscribe((fileList: FileModel[]) => { + if (this.uploadService.filesUpload$) { + this.listSubscription = this.uploadService.filesUpload$.subscribe((fileList: FileModel[]) => { this.filesUploadingList = fileList; if (this.filesUploadingList.length > 0) { this.isDialogActive = true; @@ -67,8 +69,8 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy { } }); } - if (this._uploaderService.totalCompleted$) { - this.counterSubscription = this._uploaderService.totalCompleted$.subscribe((total: number) => { + if (this.uploadService.totalCompleted$) { + this.counterSubscription = this.uploadService.totalCompleted$.subscribe((total: number) => { this.totalCompleted = total; this.cd.detectChanges(); }); diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts index f5eb19c421..ecc0dec50a 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts @@ -40,7 +40,6 @@ export class FileUploadingListComponent { filesUploadingList: FileModel []; constructor(public el: ElementRef) { - console.log('filesUploadingList constructor', el); } /** diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts index c7d2a6fdde..ecfa093563 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts @@ -18,17 +18,11 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { UploadButtonComponent } from './upload-button.component'; import { DebugElement } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - CoreModule, - AlfrescoTranslationService -} from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { TranslationMock } from '../assets/translation.service.mock'; import { UploadService } from '../services/upload.service'; -describe('Test ng2-alfresco-upload UploadButton', () => { +describe('UploadButtonComponent', () => { let file = {name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json'}; let fakeEvent = { @@ -63,23 +57,23 @@ describe('Test ng2-alfresco-upload UploadButton', () => { reject(fakeRejectRest); }); - let component: any; + let component: UploadButtonComponent; let fixture: ComponentFixture; let debug: DebugElement; let element: HTMLElement; + let uploadService: UploadService; beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() + ], + declarations: [ + UploadButtonComponent ], - declarations: [UploadButtonComponent], providers: [ - AlfrescoSettingsService, - AlfrescoAuthenticationService, - AlfrescoApiService, UploadService, - { provide: AlfrescoTranslationService, useClass: TranslationMock } + { provide: AlfrescoTranslateService, useClass: TranslationMock } ] }).compileComponents(); })); @@ -88,6 +82,7 @@ describe('Test ng2-alfresco-upload UploadButton', () => { window['componentHandler'] = null; fixture = TestBed.createComponent(UploadButtonComponent); + uploadService = TestBed.get(UploadService); debug = fixture.debugElement; element = fixture.nativeElement; @@ -115,7 +110,7 @@ describe('Test ng2-alfresco-upload UploadButton', () => { }); it('should render an uploadFolder button if uploadFolder is true', () => { - component.uploadFolder = true; + component.uploadFolders = true; let compiled = fixture.debugElement.nativeElement; fixture.detectChanges(); expect(compiled.querySelector('#uploadFolder')).toBeDefined(); @@ -124,31 +119,31 @@ describe('Test ng2-alfresco-upload UploadButton', () => { it('should call uploadFile with the default root folder', () => { component.currentFolderPath = '/root-fake-/sites-fake/folder-fake'; component.onSuccess = null; - component._uploaderService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue'); + uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue'); fixture.detectChanges(); component.onFilesAdded(fakeEvent); - expect(component._uploaderService.uploadFilesInTheQueue).toHaveBeenCalledWith('-root-', '/root-fake-/sites-fake/folder-fake', null); + expect(uploadService.uploadFilesInTheQueue).toHaveBeenCalledWith('-root-', '/root-fake-/sites-fake/folder-fake', null); }); it('should call uploadFile with a custom root folder', () => { component.currentFolderPath = '/root-fake-/sites-fake/folder-fake'; component.rootFolderId = '-my-'; component.onSuccess = null; - component._uploaderService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue'); + uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue'); fixture.detectChanges(); component.onFilesAdded(fakeEvent); - expect(component._uploaderService.uploadFilesInTheQueue).toHaveBeenCalledWith('-my-', '/root-fake-/sites-fake/folder-fake', null); + expect(uploadService.uploadFilesInTheQueue).toHaveBeenCalledWith('-my-', '/root-fake-/sites-fake/folder-fake', null); }); it('should create a folder and emit an File uploaded event', (done) => { component.currentFolderPath = '/fake-root-path'; fixture.detectChanges(); - spyOn(component._uploaderService, 'callApiCreateFolder').and.returnValue(fakeResolvePromise); + spyOn(uploadService, 'callApiCreateFolder').and.returnValue(fakeResolvePromise); component.onSuccess.subscribe(e => { expect(e.value).toEqual('File uploaded'); @@ -165,7 +160,7 @@ describe('Test ng2-alfresco-upload UploadButton', () => { }); it('should emit an onError event when the folder already exist', (done) => { - spyOn(component._uploaderService, 'callApiCreateFolder').and.returnValue(fakeRejectPromise); + spyOn(uploadService, 'callApiCreateFolder').and.returnValue(fakeRejectPromise); component.onError.subscribe(e => { expect(e.value).toEqual('FILE_UPLOAD.MESSAGES.FOLDER_ALREADY_EXIST'); done(); diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts index 0ef59ed8eb..2a2fe15783 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts @@ -16,10 +16,10 @@ */ import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from '@angular/core'; +import 'rxjs/Rx'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; import { FileModel } from '../models/file.model'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; -import 'rxjs/Rx'; declare let componentHandler: any; @@ -88,16 +88,17 @@ export class UploadButtonComponent { @Output() createFolder = new EventEmitter(); - translate: AlfrescoTranslationService; - - constructor(public el: ElementRef, private _uploaderService: UploadService, translate: AlfrescoTranslationService) { - this.translate = translate; - translate.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); + constructor(public el: ElementRef, + private uploadService: UploadService, + private translateService: AlfrescoTranslateService) { + if (translateService) { + translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); + } } ngOnChanges(changes) { let formFields = this.createFormFields(); - this._uploaderService.setOptions(formFields, this.versioning); + this.uploadService.setOptions(formFields, this.versioning); } /** @@ -125,7 +126,7 @@ export class UploadButtonComponent { let directoryName = this.getDirectoryName(directoryPath); let absolutePath = this.currentFolderPath + this.getDirectoryPath(directoryPath); - this._uploaderService.createFolder(absolutePath, directoryName) + this.uploadService.createFolder(absolutePath, directoryName) .subscribe( res => { let relativeDir = this.currentFolderPath + '/' + directoryPath; @@ -155,8 +156,8 @@ export class UploadButtonComponent { */ private uploadFiles(path: string, files: any[]) { if (files.length) { - let latestFilesAdded = this._uploaderService.addToQueue(files); - this._uploaderService.uploadFilesInTheQueue(this.rootFolderId, path, this.onSuccess); + let latestFilesAdded = this.uploadService.addToQueue(files); + this.uploadService.uploadFilesInTheQueue(this.rootFolderId, path, this.onSuccess); if (this.showUdoNotificationBar) { this._showUndoNotificationBar(latestFilesAdded); } @@ -220,8 +221,8 @@ export class UploadButtonComponent { } let messageTranslate: any, actionTranslate: any; - messageTranslate = this.translate.get('FILE_UPLOAD.MESSAGES.PROGRESS'); - actionTranslate = this.translate.get('FILE_UPLOAD.ACTION.UNDO'); + messageTranslate = this.translateService.get('FILE_UPLOAD.MESSAGES.PROGRESS'); + actionTranslate = this.translateService.get('FILE_UPLOAD.ACTION.UNDO'); if (this.undoNotificationBar.nativeElement.MaterialSnackbar) { this.undoNotificationBar.nativeElement.MaterialSnackbar.showSnackbar({ @@ -245,7 +246,7 @@ export class UploadButtonComponent { private getErrorMessage(response: any): string { if (response.body && response.body.error.statusCode === ERROR_FOLDER_ALREADY_EXIST) { let errorMessage: any; - errorMessage = this.translate.get('FILE_UPLOAD.MESSAGES.FOLDER_ALREADY_EXIST'); + errorMessage = this.translateService.get('FILE_UPLOAD.MESSAGES.FOLDER_ALREADY_EXIST'); return errorMessage.value; } } diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts index be6bea4f3b..862bb8c75a 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts @@ -16,44 +16,40 @@ */ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { UploadDragAreaComponent } from './upload-drag-area.component'; +import { EventEmitter } from '@angular/core'; import { DebugElement } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - AlfrescoTranslationService, - CoreModule -} from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; + +import { UploadDragAreaComponent } from './upload-drag-area.component'; import { TranslationMock } from '../assets/translation.service.mock'; import { UploadService } from '../services/upload.service'; -import { EventEmitter } from '@angular/core'; -describe('Test ng2-alfresco-upload UploadDragArea', () => { +describe('UploadDragAreaComponent', () => { - let component: any; + let component: UploadDragAreaComponent; let fixture: ComponentFixture; let debug: DebugElement; let element: HTMLElement; + let uploadService: UploadService; beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() + ], + declarations: [ + UploadDragAreaComponent ], - declarations: [UploadDragAreaComponent], providers: [ - AlfrescoSettingsService, - AlfrescoAuthenticationService, - AlfrescoApiService, UploadService, - { provide: AlfrescoTranslationService, useClass: TranslationMock } + { provide: AlfrescoTranslateService, useClass: TranslationMock } ] }).compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(UploadDragAreaComponent); + uploadService = TestBed.get(UploadService); debug = fixture.debugElement; element = fixture.nativeElement; @@ -77,45 +73,45 @@ describe('Test ng2-alfresco-upload UploadDragArea', () => { }); it('should show an folder non supported error in the notification bar when the file type is empty', () => { - component._showErrorNotificationBar = jasmine.createSpy('_showErrorNotificationBar'); + component.showErrorNotificationBar = jasmine.createSpy('_showErrorNotificationBar'); component.showUdoNotificationBar = true; let fileFake = new File([''], 'folder-fake', {type: ''}); component.onFilesDropped([fileFake]); - expect(component._showErrorNotificationBar).toHaveBeenCalledWith('FILE_UPLOAD.MESSAGES.FOLDER_NOT_SUPPORTED'); + expect(component.showErrorNotificationBar).toHaveBeenCalledWith('FILE_UPLOAD.MESSAGES.FOLDER_NOT_SUPPORTED'); }); it('should upload the list of files dropped', () => { component.currentFolderPath = '/root-fake-/sites-fake/folder-fake'; component.onSuccess = null; component.showUdoNotificationBar = false; - component._uploaderService.addToQueue = jasmine.createSpy('addToQueue'); - component._uploaderService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue'); + uploadService.addToQueue = jasmine.createSpy('addToQueue'); + uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue'); fixture.detectChanges(); - let fileFake = {name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json'}; + let fileFake = {name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json'}; let filesList = [fileFake]; component.onFilesDropped(filesList); - expect(component._uploaderService.addToQueue).toHaveBeenCalledWith(filesList); - expect(component._uploaderService.uploadFilesInTheQueue).toHaveBeenCalledWith('-root-', '/root-fake-/sites-fake/folder-fake', null); + expect(uploadService.addToQueue).toHaveBeenCalledWith(filesList); + expect(uploadService.uploadFilesInTheQueue).toHaveBeenCalledWith('-root-', '/root-fake-/sites-fake/folder-fake', null); }); it('should show the loading messages in the notification bar when the files are dropped', () => { component.currentFolderPath = '/root-fake-/sites-fake/folder-fake'; component.onSuccess = null; component.showUdoNotificationBar = true; - component._uploaderService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue'); - component._showUndoNotificationBar = jasmine.createSpy('_showUndoNotificationBar'); + uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue'); + component.showUndoNotificationBar = jasmine.createSpy('_showUndoNotificationBar'); fixture.detectChanges(); - let fileFake = {name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json'}; + let fileFake = {name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json'}; let filesList = [fileFake]; component.onFilesDropped(filesList); - expect(component._uploaderService.uploadFilesInTheQueue).toHaveBeenCalledWith('-root-', '/root-fake-/sites-fake/folder-fake', null); - expect(component._showUndoNotificationBar).toHaveBeenCalled(); + expect(uploadService.uploadFilesInTheQueue).toHaveBeenCalledWith('-root-', '/root-fake-/sites-fake/folder-fake', null); + expect(component.showUndoNotificationBar).toHaveBeenCalled(); }); it('should upload a file when dropped', () => { @@ -123,7 +119,7 @@ describe('Test ng2-alfresco-upload UploadDragArea', () => { component.onSuccess = null; fixture.detectChanges(); - spyOn(component._uploaderService, 'uploadFilesInTheQueue'); + spyOn(uploadService, 'uploadFilesInTheQueue'); let itemEntity = { fullPath: '/folder-fake/file-fake.png', @@ -137,7 +133,7 @@ describe('Test ng2-alfresco-upload UploadDragArea', () => { }; component.onFilesEntityDropped(itemEntity); - expect(component._uploaderService.uploadFilesInTheQueue) + expect(uploadService.uploadFilesInTheQueue) .toHaveBeenCalledWith('-root-', '/root-fake-/sites-fake/document-library-fake/folder-fake/', null); }); @@ -147,7 +143,7 @@ describe('Test ng2-alfresco-upload UploadDragArea', () => { component.onSuccess = null; fixture.detectChanges(); - spyOn(component._uploaderService, 'uploadFilesInTheQueue'); + spyOn(uploadService, 'uploadFilesInTheQueue'); let itemEntity = { fullPath: '/folder-fake/file-fake.png', @@ -161,7 +157,7 @@ describe('Test ng2-alfresco-upload UploadDragArea', () => { }; component.onFilesEntityDropped(itemEntity); - expect(component._uploaderService.uploadFilesInTheQueue) + expect(uploadService.uploadFilesInTheQueue) .toHaveBeenCalledWith('-my-', '/root-fake-/sites-fake/document-library-fake/folder-fake/', null); }); @@ -182,9 +178,9 @@ describe('Test ng2-alfresco-upload UploadDragArea', () => { let fakePromise = new Promise(function (resolve, reject) { reject(fakeRest); }); - spyOn(component._uploaderService, 'callApiCreateFolder').and.returnValue(fakePromise); - spyOn(component, '_showErrorNotificationBar').and.callFake( () => { - expect(component._showErrorNotificationBar).toHaveBeenCalledWith('FILE_UPLOAD.MESSAGES.FOLDER_ALREADY_EXIST'); + spyOn(uploadService, 'callApiCreateFolder').and.returnValue(fakePromise); + spyOn(component, 'showErrorNotificationBar').and.callFake( () => { + expect(component.showErrorNotificationBar).toHaveBeenCalledWith('FILE_UPLOAD.MESSAGES.FOLDER_ALREADY_EXIST'); done(); }); @@ -225,13 +221,13 @@ describe('Test ng2-alfresco-upload UploadDragArea', () => { let fakePromise = new Promise(function (resolve, reject) { resolve(fakeRest); }); - spyOn(component._uploaderService, 'callApiCreateFolder').and.returnValue(fakePromise); + spyOn(uploadService, 'callApiCreateFolder').and.returnValue(fakePromise); spyOn(component, 'onFilesEntityDropped').and.callFake( () => { expect(component.onFilesEntityDropped).toHaveBeenCalledWith(itemEntity); }); - spyOn(component, '_showUndoNotificationBar').and.callFake( () => { - expect(component._showUndoNotificationBar).toHaveBeenCalled(); + spyOn(component, 'showUndoNotificationBar').and.callFake( () => { + expect(component.showUndoNotificationBar).toHaveBeenCalled(); done(); }); diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts index 62bb485c0c..0edc2cbe49 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts @@ -17,7 +17,7 @@ import { Component, ViewChild, Input, Output, EventEmitter } from '@angular/core'; import { UploadService } from '../services/upload.service'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { FileModel } from '../models/file.model'; declare let componentHandler: any; @@ -61,16 +61,16 @@ export class UploadDragAreaComponent { @Output() onSuccess = new EventEmitter(); - translate: AlfrescoTranslationService; - - constructor(private _uploaderService: UploadService, translate: AlfrescoTranslationService) { - this.translate = translate; - translate.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); + constructor(private uploadService: UploadService, + private translateService: AlfrescoTranslateService) { + if (translateService) { + translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); + } } ngOnChanges(changes) { let formFields = this.createFormFields(); - this._uploaderService.setOptions(formFields, this.versioning); + this.uploadService.setOptions(formFields, this.versioning); } /** @@ -81,17 +81,17 @@ export class UploadDragAreaComponent { onFilesDropped(files: File[]): void { if (files.length) { if (this.checkValidity(files)) { - this._uploaderService.addToQueue(files); - this._uploaderService.uploadFilesInTheQueue(this.rootFolderId, this.currentFolderPath, this.onSuccess); - let latestFilesAdded = this._uploaderService.getQueue(); + this.uploadService.addToQueue(files); + this.uploadService.uploadFilesInTheQueue(this.rootFolderId, this.currentFolderPath, this.onSuccess); + let latestFilesAdded = this.uploadService.getQueue(); if (this.showUdoNotificationBar) { - this._showUndoNotificationBar(latestFilesAdded); + this.showUndoNotificationBar(latestFilesAdded); } } else { let errorMessage: any; - errorMessage = this.translate.get('FILE_UPLOAD.MESSAGES.FOLDER_NOT_SUPPORTED'); + errorMessage = this.translateService.get('FILE_UPLOAD.MESSAGES.FOLDER_NOT_SUPPORTED'); if (this.showUdoNotificationBar) { - this._showErrorNotificationBar(errorMessage.value); + this.showErrorNotificationBar(errorMessage.value); } else { console.error(errorMessage.value); } @@ -117,10 +117,10 @@ export class UploadDragAreaComponent { */ onFilesEntityDropped(item: any): void { item.file( (file: any) => { - this._uploaderService.addToQueue([file]); + this.uploadService.addToQueue([file]); let path = item.fullPath.replace(item.name, ''); let filePath = this.currentFolderPath + path; - this._uploaderService.uploadFilesInTheQueue(this.rootFolderId, filePath, this.onSuccess); + this.uploadService.uploadFilesInTheQueue(this.rootFolderId, filePath, this.onSuccess); }); } @@ -133,7 +133,7 @@ export class UploadDragAreaComponent { let relativePath = folder.fullPath.replace(folder.name, ''); relativePath = this.currentFolderPath + relativePath; - this._uploaderService.createFolder(relativePath, folder.name) + this.uploadService.createFolder(relativePath, folder.name) .subscribe( message => { this.onSuccess.emit({ @@ -145,8 +145,8 @@ export class UploadDragAreaComponent { this._traverseFileTree(entries[i]); } if (this.showUdoNotificationBar) { - let latestFilesAdded = this._uploaderService.getQueue(); - this._showUndoNotificationBar(latestFilesAdded); + let latestFilesAdded = this.uploadService.getQueue(); + this.showUndoNotificationBar(latestFilesAdded); } }); }, @@ -154,7 +154,7 @@ export class UploadDragAreaComponent { let errorMessagePlaceholder = this.getErrorMessage(error.response); let errorMessage = this.formatString(errorMessagePlaceholder, [folder.name]); if (this.showUdoNotificationBar) { - this._showErrorNotificationBar(errorMessage); + this.showErrorNotificationBar(errorMessage); } else { console.error(errorMessage); } @@ -184,14 +184,14 @@ export class UploadDragAreaComponent { * * @param {FileModel[]} latestFilesAdded - files in the upload queue enriched with status flag and xhr object. */ - private _showUndoNotificationBar(latestFilesAdded: FileModel[]) { + showUndoNotificationBar(latestFilesAdded: FileModel[]) { if (componentHandler) { componentHandler.upgradeAllRegistered(); } let messageTranslate: any, actionTranslate: any; - messageTranslate = this.translate.get('FILE_UPLOAD.MESSAGES.PROGRESS'); - actionTranslate = this.translate.get('FILE_UPLOAD.ACTION.UNDO'); + messageTranslate = this.translateService.get('FILE_UPLOAD.MESSAGES.PROGRESS'); + actionTranslate = this.translateService.get('FILE_UPLOAD.ACTION.UNDO'); this.undoNotificationBar.nativeElement.MaterialSnackbar.showSnackbar({ message: messageTranslate.value, @@ -210,7 +210,7 @@ export class UploadDragAreaComponent { * @param Error message * @private */ - private _showErrorNotificationBar(errorMessage: string) { + showErrorNotificationBar(errorMessage: string) { if (componentHandler) { componentHandler.upgradeAllRegistered(); } @@ -229,7 +229,7 @@ export class UploadDragAreaComponent { private getErrorMessage(response: any): string { if (response.body.error.statusCode === ERROR_FOLDER_ALREADY_EXIST) { let errorMessage: any; - errorMessage = this.translate.get('FILE_UPLOAD.MESSAGES.FOLDER_ALREADY_EXIST'); + errorMessage = this.translateService.get('FILE_UPLOAD.MESSAGES.FOLDER_ALREADY_EXIST'); return errorMessage.value; } } diff --git a/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.spec.ts b/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.spec.ts index 3a2776f635..79f9b9b224 100644 --- a/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.spec.ts @@ -17,7 +17,7 @@ import { FileDraggableDirective } from '../directives/file-draggable.directive'; -describe('Test ng2-alfresco-upload FileDraggableDirective', () => { +describe('FileDraggableDirective', () => { let component; diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts index 2af2bfc6b2..8d9c5d9f53 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts @@ -15,22 +15,17 @@ * limitations under the License. */ -import { ReflectiveInjector } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService -} from 'ng2-alfresco-core'; -import { UploadService } from './upload.service'; import { EventEmitter } from '@angular/core'; +import { TestBed } from '@angular/core/testing'; +import { CoreModule } from 'ng2-alfresco-core'; +import { UploadService } from './upload.service'; declare let jasmine: any; -declare let AlfrescoApi: any; -describe('Test ng2-alfresco-upload', () => { - let service, injector, options; +describe('UploadService', () => { + let service: UploadService; - options = { + let options = { host: 'fakehost', url: '/some/cool/url', baseUrlPath: 'fakebasepath', @@ -41,224 +36,221 @@ describe('Test ng2-alfresco-upload', () => { }; beforeEach(() => { - injector = ReflectiveInjector.resolveAndCreate([ - AlfrescoSettingsService, - AlfrescoApiService, - AlfrescoAuthenticationService, - UploadService - ]); + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot() + ], + providers: [ + UploadService + ] + }); + service = TestBed.get(UploadService); + jasmine.Ajax.install(); }); - describe('UploadService ', () => { - beforeEach(() => { - service = injector.get(UploadService); - service.apiService.setInstance(new AlfrescoApi({})); - jasmine.Ajax.install(); + + afterEach(() => { + jasmine.Ajax.uninstall(); + }); + + it('should return an empty queue if no elements are added', () => { + service.setOptions(options, false); + expect(service.getQueue().length).toEqual(0); + }); + + it('should add an element in the queue and returns it', () => { + service.setOptions(options, false); + let filesFake = [{name: 'fake-name', size: 10}]; + service.addToQueue(filesFake); + expect(service.getQueue().length).toEqual(1); + }); + + it('should add two elements in the queue and returns them', () => { + service.setOptions(options, false); + let filesFake = [{name: 'fake-name', size: 10}, {name: 'fake-name2', size: 20}]; + service.addToQueue(filesFake); + expect(service.getQueue().length).toEqual(2); + }); + + it('should make XHR done request after the file is added in the queue', (done) => { + let emitter = new EventEmitter(); + + emitter.subscribe(e => { + expect(e.value).toBe('File uploaded'); + done(); }); + service.setOptions(options, false); + let filesFake = [{name: 'fake-name', size: 10}]; + service.addToQueue(filesFake); + service.uploadFilesInTheQueue('-root-', 'fake-dir', emitter); - afterEach(() => { - jasmine.Ajax.uninstall(); + let request = jasmine.Ajax.requests.mostRecent(); + expect(request.url).toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children?autoRename=true'); + expect(request.method).toBe('POST'); + + jasmine.Ajax.requests.mostRecent().respondWith({ + 'status': 200, + contentType: 'text/plain', + responseText: 'File uploaded' }); + }); - it('should return an empty queue if no elements are added', () => { - service.setOptions(options, false); - expect(service.getQueue().length).toEqual(0); + it('should make XHR error request after an error occur', (done) => { + let emitter = new EventEmitter(); + + emitter.subscribe(e => { + expect(e.value).toBe('Error file uploaded'); + done(); }); + service.setOptions(options, false); + let filesFake = [{name: 'fake-name', size: 10}]; + service.addToQueue(filesFake); + service.uploadFilesInTheQueue('-root-', '', emitter); + expect(jasmine.Ajax.requests.mostRecent().url) + .toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children?autoRename=true'); - it('should add an element in the queue and returns it', () => { - service.setOptions(options, false); - let filesFake = [{name: 'fake-name', size: 10}]; - service.addToQueue(filesFake); - expect(service.getQueue().length).toEqual(1); + jasmine.Ajax.requests.mostRecent().respondWith({ + 'status': 404, + contentType: 'text/plain', + responseText: 'Error file uploaded' }); + }); - it('should add two elements in the queue and returns them', () => { - service.setOptions(options, false); - let filesFake = [{name: 'fake-name', size: 10}, {name: 'fake-name2', size: 20}]; - service.addToQueue(filesFake); - expect(service.getQueue().length).toEqual(2); + it('should make XHR abort request after the xhr abort is called', (done) => { + let emitter = new EventEmitter(); + + emitter.subscribe(e => { + expect(e.value).toEqual('File aborted'); + done(); }); + service.setOptions(options, false); + let filesFake = [{name: 'fake-name', size: 10}]; + service.addToQueue(filesFake); + service.uploadFilesInTheQueue('-root-', '', emitter); - it('should make XHR done request after the file is added in the queue', (done) => { - let emitter = new EventEmitter(); + let file = service.getQueue(); + file[0].emitAbort(); + }); - emitter.subscribe(e => { - expect(e.value).toBe('File uploaded'); - done(); - }); - service.setOptions(options, false); - let filesFake = [{name: 'fake-name', size: 10}]; - service.addToQueue(filesFake); - service.uploadFilesInTheQueue('-root-', 'fake-dir', emitter); + it('should make XHR error request after the xhr error is called', (done) => { + let emitter = new EventEmitter(); - let request = jasmine.Ajax.requests.mostRecent(); - expect(request.url).toBe('http://127.0.0.1:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children?autoRename=true'); - expect(request.method).toBe('POST'); - - jasmine.Ajax.requests.mostRecent().respondWith({ - 'status': 200, - contentType: 'text/plain', - responseText: 'File uploaded' - }); + emitter.subscribe(e => { + expect(e.value).toBe('Error file uploaded'); + done(); }); + service.setOptions(options, false); + let filesFake = [{name: 'fake-name', size: 10}]; + service.addToQueue(filesFake); + service.uploadFilesInTheQueue('-root-', '', emitter); - it('should make XHR error request after an error occur', (done) => { - let emitter = new EventEmitter(); + let file = service.getQueue(); + file[0].emitError(); + }); - emitter.subscribe(e => { - expect(e.value).toBe('Error file uploaded'); - done(); - }); - service.setOptions(options, false); - let filesFake = [{name: 'fake-name', size: 10}]; - service.addToQueue(filesFake); - service.uploadFilesInTheQueue('-root-', '', emitter); - expect(jasmine.Ajax.requests.mostRecent().url) - .toBe('http://127.0.0.1:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children?autoRename=true'); - - jasmine.Ajax.requests.mostRecent().respondWith({ - 'status': 404, - contentType: 'text/plain', - responseText: 'Error file uploaded' - }); + it('should make XHR progress request after the onprogress is called', (done) => { + service.setOptions(options, false); + let fakeProgress = { + loaded: 500, + total: 1234, + percent: 44 + }; + let filesFake = [{name: 'fake-name', size: 10}]; + service.addToQueue(filesFake); + service.filesUpload$.subscribe((file) => { + expect(file).toBeDefined(); + expect(file[0]).toBeDefined(); + expect(file[0].progress).toEqual(fakeProgress); + done(); }); + service.uploadFilesInTheQueue('-root-', '', null); - it('should make XHR abort request after the xhr abort is called', (done) => { - let emitter = new EventEmitter(); + let file = service.getQueue(); - emitter.subscribe(e => { - expect(e.value).toEqual('File aborted'); - done(); - }); - service.setOptions(options, false); - let filesFake = [{name: 'fake-name', size: 10}]; - service.addToQueue(filesFake); - service.uploadFilesInTheQueue('-root-', '', emitter); + file[0].emitProgres(fakeProgress); + }); - let file = service.getQueue(); - file[0].emitAbort(); + it('should make XHR done request after the folder is created', (done) => { + let fakeRest = { + entry: { + isFile: false, + isFolder: true, + name: 'fake-folder' + } + }; + let fakePromise = new Promise(function (resolve, reject) { + resolve(fakeRest); }); - - it('should make XHR error request after the xhr error is called', (done) => { - let emitter = new EventEmitter(); - - emitter.subscribe(e => { - expect(e.value).toBe('Error file uploaded'); - done(); - }); - service.setOptions(options, false); - let filesFake = [{name: 'fake-name', size: 10}]; - service.addToQueue(filesFake); - service.uploadFilesInTheQueue('-root-', '', emitter); - - let file = service.getQueue(); - file[0].emitError(); + spyOn(service, 'callApiCreateFolder').and.returnValue(fakePromise); + service.setOptions(options, false); + let defaultPath = ''; + let folderName = 'fake-folder'; + service.createFolder(defaultPath, folderName).subscribe(res => { + expect(res).toEqual(fakeRest); + done(); }); + }); - it('should make XHR progress request after the onprogress is called', (done) => { - service.setOptions(options, false); - let fakeProgress = { - loaded: 500, - total: 1234, - percent: 44 - }; - let filesFake = [{name: 'fake-name', size: 10}]; - service.addToQueue(filesFake); - service.filesUpload$.subscribe((file) => { - expect(file).toBeDefined(); - expect(file[0]).toBeDefined(); - expect(file[0].progress).toEqual(fakeProgress); - done(); - }); - service.uploadFilesInTheQueue('-root-', '', null); - - let file = service.getQueue(); - - file[0].emitProgres(fakeProgress); - }); - - it('should make XHR done request after the folder is created', (done) => { - let fakeRest = { - entry: { - isFile: false, - isFolder: true, - name: 'fake-folder' - } - }; - let fakePromise = new Promise(function (resolve, reject) { - resolve(fakeRest); - }); - spyOn(service, 'callApiCreateFolder').and.returnValue(fakePromise); - service.setOptions(options, false); - let defaultPath = ''; - let folderName = 'fake-folder'; - service.createFolder(defaultPath, folderName).subscribe(res => { - expect(res).toEqual(fakeRest); - done(); - }); - }); - - it('should throws an exception when a folder already exist', (done) => { - let fakeRest = { - response: { - body: { - error: { - statusCode: 409 - } + it('should throws an exception when a folder already exist', (done) => { + let fakeRest = { + response: { + body: { + error: { + statusCode: 409 } } - }; - let fakePromise = new Promise(function (resolve, reject) { - reject(fakeRest); - }); - spyOn(service, 'callApiCreateFolder').and.returnValue(fakePromise); - service.setOptions(options, false); - let defaultPath = ''; - let folderName = 'folder-duplicate-fake'; - service.createFolder(defaultPath, folderName).subscribe( - res => { - }, - error => { - expect(error).toEqual(fakeRest); - done(); - } - ); + } + }; + let fakePromise = new Promise(function (resolve, reject) { + reject(fakeRest); }); - - it('If versioning is true autoRename should not be present and majorVersion should be a param', () => { - let emitter = new EventEmitter(); - - let enableVersioning = true; - service.setOptions(options, enableVersioning); - let filesFake = [{name: 'fake-name', size: 10}]; - service.addToQueue(filesFake); - service.uploadFilesInTheQueue('-root-', '', emitter); - - console.log(jasmine.Ajax.requests.mostRecent().url); - expect(jasmine.Ajax.requests.mostRecent().url.endsWith('autoRename=true')).toBe(false); - expect(jasmine.Ajax.requests.mostRecent().params.has('majorVersion')).toBe(true); - }); - - it('should use custom root folder ID given to the service', (done) => { - let emitter = new EventEmitter(); - - emitter.subscribe(e => { - expect(e.value).toBe('File uploaded'); + spyOn(service, 'callApiCreateFolder').and.returnValue(fakePromise); + service.setOptions(options, false); + let defaultPath = ''; + let folderName = 'folder-duplicate-fake'; + service.createFolder(defaultPath, folderName).subscribe( + res => { + }, + error => { + expect(error).toEqual(fakeRest); done(); - }); - service.setOptions(options, false); - let filesFake = [{name: 'fake-name', size: 10}]; - service.addToQueue(filesFake); - service.uploadFilesInTheQueue('123', 'fake-dir', emitter); + } + ); + }); - let request = jasmine.Ajax.requests.mostRecent(); - expect(request.url).toBe('http://127.0.0.1:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/123/children?autoRename=true'); - expect(request.method).toBe('POST'); + it('If versioning is true autoRename should not be present and majorVersion should be a param', () => { + let emitter = new EventEmitter(); - jasmine.Ajax.requests.mostRecent().respondWith({ - 'status': 200, - contentType: 'text/plain', - responseText: 'File uploaded' - }); + let enableVersioning = true; + service.setOptions(options, enableVersioning); + let filesFake = [{name: 'fake-name', size: 10}]; + service.addToQueue(filesFake); + service.uploadFilesInTheQueue('-root-', '', emitter); + + console.log(jasmine.Ajax.requests.mostRecent().url); + expect(jasmine.Ajax.requests.mostRecent().url.endsWith('autoRename=true')).toBe(false); + expect(jasmine.Ajax.requests.mostRecent().params.has('majorVersion')).toBe(true); + }); + + it('should use custom root folder ID given to the service', (done) => { + let emitter = new EventEmitter(); + + emitter.subscribe(e => { + expect(e.value).toBe('File uploaded'); + done(); + }); + service.setOptions(options, false); + let filesFake = [{name: 'fake-name', size: 10}]; + service.addToQueue(filesFake); + service.uploadFilesInTheQueue('123', 'fake-dir', emitter); + + let request = jasmine.Ajax.requests.mostRecent(); + expect(request.url).toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/123/children?autoRename=true'); + expect(request.method).toBe('POST'); + + jasmine.Ajax.requests.mostRecent().respondWith({ + 'status': 200, + contentType: 'text/plain', + responseText: 'File uploaded' }); }); }); diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts index 9697af64a3..9bbfcdcfeb 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts @@ -195,7 +195,7 @@ export class UploadService { } } - private updateFileCounterStream(total: number) { + updateFileCounterStream(total: number) { if (this.totalCompletedObserver) { this.totalCompletedObserver.next(total); } diff --git a/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js b/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js index 53b3af8195..146cc85001 100644 --- a/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts index dd37b875f0..e09969d146 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts @@ -22,9 +22,9 @@ import { BpmUserModel } from '../models/bpm-user.model'; import { TranslationMock } from '../assets/translation.service.mock'; import { CoreModule, - AlfrescoAuthenticationService, - AlfrescoContentService, - AlfrescoTranslationService + AuthService, + ContentService, + AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; @@ -73,25 +73,32 @@ describe('User info component', () => { let userInfoComp: UserInfoComponent; let fixture: ComponentFixture; let element: HTMLElement; - let stubAuthService: AlfrescoAuthenticationService; - let stubContent: AlfrescoContentService; + let stubAuthService: AuthService; + let stubContent: ContentService; let componentHandler; beforeEach(async(() => { componentHandler = jasmine.createSpyObj('componentHandler', ['upgradeAllRegistered', 'upgradeElement']); window['componentHandler'] = componentHandler; TestBed.configureTestingModule({ - imports: [CoreModule], - declarations: [UserInfoComponent], - providers: [EcmUserService, + imports: [ + CoreModule.forRoot() + ], + declarations: [ + UserInfoComponent + ], + providers: [ + EcmUserService, BpmUserService, - AlfrescoAuthenticationService, - {provide: AlfrescoTranslationService, useClass: TranslationMock} + {provide: AlfrescoTranslateService, useClass: TranslationMock} ] }).compileComponents().then(() => { fixture = TestBed.createComponent(UserInfoComponent); userInfoComp = fixture.componentInstance; element = fixture.nativeElement; + + stubAuthService = TestBed.get(AuthService); + stubContent = TestBed.get(ContentService); }); })); @@ -138,8 +145,6 @@ describe('User info component', () => { describe('when user is logged on ecm', () => { beforeEach(() => { - stubAuthService = fixture.debugElement.injector.get(AlfrescoAuthenticationService); - stubContent = fixture.debugElement.injector.get(AlfrescoContentService); spyOn(stubAuthService, 'isEcmLoggedIn').and.returnValue(true); spyOn(stubAuthService, 'isLoggedIn').and.returnValue(true); }); @@ -242,7 +247,6 @@ describe('User info component', () => { let fakeBpmUserForTest; beforeEach(() => { - stubAuthService = fixture.debugElement.injector.get(AlfrescoAuthenticationService); spyOn(stubAuthService, 'isBpmLoggedIn').and.returnValue(true); spyOn(stubAuthService, 'isLoggedIn').and.returnValue(true); jasmine.Ajax.install(); @@ -323,8 +327,6 @@ describe('User info component', () => { describe('when user is logged on bpm and ecm', () => { beforeEach(async(() => { - stubAuthService = fixture.debugElement.injector.get(AlfrescoAuthenticationService); - stubContent = fixture.debugElement.injector.get(AlfrescoContentService); spyOn(stubAuthService, 'isEcmLoggedIn').and.returnValue(true); spyOn(stubAuthService, 'isBpmLoggedIn').and.returnValue(true); spyOn(stubAuthService, 'isLoggedIn').and.returnValue(true); diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts index 738ff153a3..cfddfe0da4 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts @@ -16,11 +16,11 @@ */ import { Component, OnInit, Input } from '@angular/core'; +import { AlfrescoTranslateService, AuthService } from 'ng2-alfresco-core'; import { EcmUserModel } from './../models/ecm-user.model'; import { BpmUserModel } from './../models/bpm-user.model'; import { EcmUserService } from './../services/ecm-user.service'; import { BpmUserService } from './../services/bpm-user.service'; -import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; declare let componentHandler: any; @@ -58,10 +58,10 @@ export class UserInfoComponent implements OnInit { constructor(private ecmUserService: EcmUserService, private bpmUserService: BpmUserService, - private authService: AlfrescoAuthenticationService, - private translate: AlfrescoTranslationService) { - if (translate) { - translate.addTranslationFolder('ng2-alfresco-userinfo', 'node_modules/ng2-alfresco-userinfo/src'); + private authService: AuthService, + private translateService: AlfrescoTranslateService) { + if (translateService) { + translateService.addTranslationFolder('ng2-alfresco-userinfo', 'node_modules/ng2-alfresco-userinfo/src'); } authService.loginSubject.subscribe((response) => { this.getUserInfo(); diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts index 380c92e010..b21f4c8445 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts @@ -15,31 +15,31 @@ * limitations under the License. */ -import { ReflectiveInjector } from '@angular/core'; +import { TestBed } from '@angular/core/testing'; +import { CoreModule, AuthService, AlfrescoApiService } from 'ng2-alfresco-core'; import { BpmUserService } from '../services/bpm-user.service'; -import { AlfrescoAuthenticationService, AlfrescoApiService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core'; -import { fakeBpmUser } from '../assets/fake-bpm-user.service.mock'; +// import { fakeBpmUser } from '../assets/fake-bpm-user.service.mock'; declare let jasmine: any; describe('BpmUserService', () => { - let service, injector, authService, apiService; + let service: BpmUserService; + let authService: AuthService; + let apiService: AlfrescoApiService; beforeEach(() => { - injector = ReflectiveInjector.resolveAndCreate([ - AlfrescoSettingsService, - AlfrescoApiService, - AlfrescoAuthenticationService, - BpmUserService, - StorageService - ]); - }); - - beforeEach(() => { - service = injector.get(BpmUserService); - authService = injector.get(AlfrescoAuthenticationService); - apiService = injector.get(AlfrescoApiService); + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot() + ], + providers: [ + BpmUserService + ] + }); + service = TestBed.get(BpmUserService); + authService = TestBed.get(AuthService); + apiService = TestBed.get(AlfrescoApiService); jasmine.Ajax.install(); }); @@ -47,14 +47,11 @@ describe('BpmUserService', () => { jasmine.Ajax.uninstall(); }); - it('can instantiate service with authorization', () => { - let serviceTest = new BpmUserService(authService, apiService); - - expect(serviceTest instanceof BpmUserService).toBe(true, 'new service should be ok'); - }); + // TODO: these tests do not make sense describe('when user is logged in', () => { + /* it('should be able to retrieve current user info', (done) => { service.getCurrentUserInfo().subscribe( (user) => { @@ -71,14 +68,15 @@ describe('BpmUserService', () => { responseText: {fakeBpmUser} }); }); + */ - it('should retrieve avatar url for current user', () => { + xit('should retrieve avatar url for current user', () => { let path = service.getCurrentUserProfileImage(); expect(path).toBeDefined(); expect(path).toContain('/app/rest/admin/profile-picture'); }); - it('should catch errors on call for profile', (done) => { + xit('should catch errors on call for profile', (done) => { service.getCurrentUserInfo().subscribe(() => { }, () => { done(); diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts index d5d85eb18f..953b6eaa01 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; +import { AlfrescoApiService } from 'ng2-alfresco-core'; import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; @@ -29,8 +29,7 @@ import { BpmUserModel } from '../models/bpm-user.model'; @Injectable() export class BpmUserService { - constructor(private authService: AlfrescoAuthenticationService, - private alfrescoJsApi: AlfrescoApiService) { + constructor(private alfrescoJsApi: AlfrescoApiService) { } /** diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts index e67209dfae..1fc7c1c071 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts @@ -15,14 +15,8 @@ * limitations under the License. */ -import { ReflectiveInjector } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoApiService, - AlfrescoSettingsService, - AlfrescoContentService, - StorageService -} from 'ng2-alfresco-core'; +import { TestBed } from '@angular/core/testing'; +import { CoreModule, AuthService, ContentService } from 'ng2-alfresco-core'; import { EcmUserService } from '../services/ecm-user.service'; import { fakeEcmUser } from '../assets/fake-ecm-user.service.mock'; @@ -30,45 +24,22 @@ declare let jasmine: any; describe('EcmUserService', () => { - let service, injector, authService, contentService, apiService; + let service: EcmUserService; + let authService: AuthService; + let contentService: ContentService; beforeEach(() => { - injector = ReflectiveInjector.resolveAndCreate([ - AlfrescoSettingsService, - AlfrescoApiService, - AlfrescoAuthenticationService, - AlfrescoContentService, - EcmUserService, - StorageService - ]); - }); - - beforeEach(() => { - service = injector.get(EcmUserService); - apiService = injector.get(AlfrescoApiService); - authService = injector.get(AlfrescoAuthenticationService); - contentService = injector.get(AlfrescoContentService); - }); - - it('can instantiate service with authorization', () => { - expect(authService).not.toBeNull('authorization should be provided'); - let serviceAuth = new EcmUserService(null, authService, null); - - expect(serviceAuth instanceof EcmUserService).toBe(true, 'new service should be ok'); - }); - - it('can instantiate service with content service', () => { - expect(contentService).not.toBeNull('contentService should be provided'); - let serviceContent = new EcmUserService(null, null, contentService); - - expect(serviceContent instanceof EcmUserService).toBe(true, 'new service should be ok'); - }); - - it('can instantiate service with api service', () => { - expect(contentService).not.toBeNull('api service should be provided'); - let serviceContent = new EcmUserService(apiService, null, null); - - expect(serviceContent instanceof EcmUserService).toBe(true, 'new service should be ok'); + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot() + ], + providers: [ + EcmUserService + ] + }); + service = TestBed.get(EcmUserService); + authService = TestBed.get(AuthService); + contentService = TestBed.get(ContentService); }); describe('when user is logged in', () => { diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts index b2eb4a873e..84d4494779 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts @@ -15,10 +15,10 @@ * limitations under the License. */ -import { AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoApiService } from 'ng2-alfresco-core'; import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; +import { ContentService, AlfrescoApiService } from 'ng2-alfresco-core'; import { EcmUserModel } from '../models/ecm-user.model'; /** * @@ -30,8 +30,7 @@ import { EcmUserModel } from '../models/ecm-user.model'; export class EcmUserService { constructor(private apiService: AlfrescoApiService, - private authService: AlfrescoAuthenticationService, - private contentService: AlfrescoContentService) { + private contentService: ContentService) { } /** diff --git a/ng2-components/ng2-alfresco-webscript/src/webscript.component.spec.ts b/ng2-components/ng2-alfresco-webscript/src/webscript.component.spec.ts index a53eaec353..35fb52315a 100644 --- a/ng2-components/ng2-alfresco-webscript/src/webscript.component.spec.ts +++ b/ng2-components/ng2-alfresco-webscript/src/webscript.component.spec.ts @@ -15,22 +15,17 @@ * limitations under the License. */ +import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { WebscriptComponent } from '../src/webscript.component'; -import { DebugElement } from '@angular/core'; -import { - AlfrescoAuthenticationService, - AlfrescoSettingsService, - AlfrescoApiService, - CoreModule -} from 'ng2-alfresco-core'; +import { CoreModule } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; +import { WebscriptComponent } from '../src/webscript.component'; declare let jasmine: any; describe('Test ng2-alfresco-webscript', () => { - let component: any; + let component: WebscriptComponent; let fixture: ComponentFixture; let debug: DebugElement; let element: HTMLElement; @@ -38,14 +33,11 @@ describe('Test ng2-alfresco-webscript', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule, + CoreModule.forRoot(), DataTableModule ], - declarations: [WebscriptComponent], - providers: [ - AlfrescoSettingsService, - AlfrescoAuthenticationService, - AlfrescoApiService + declarations: [ + WebscriptComponent ] }).compileComponents(); })); @@ -93,7 +85,7 @@ describe('Test ng2-alfresco-webscript', () => { it('url should be the one configured by the input param', (done) => { component.scriptPath = 'sample/folder/Company%20Home'; - component.ngOnChanges().then(() => { + component.ngOnChanges(null).then(() => { fixture.detectChanges(); expect(jasmine.Ajax.requests.mostRecent().url).toBe('http://localhost:8080/alfresco/service/sample/folder/Company%20Home'); done(); @@ -110,7 +102,7 @@ describe('Test ng2-alfresco-webscript', () => { component.scriptPath = 'sample/folder/Company%20Home'; component.contentType = 'TEXT'; - component.ngOnChanges().then(() => { + component.ngOnChanges(null).then(() => { fixture.detectChanges(); expect(element.querySelector('#webscript-data-TEXT').innerHTML) .toBe('text test'); @@ -128,7 +120,7 @@ describe('Test ng2-alfresco-webscript', () => { component.scriptPath = 'sample/folder/Company%20Home'; component.contentType = 'JSON'; - component.ngOnChanges().then(() => { + component.ngOnChanges(null).then(() => { fixture.detectChanges(); expect(JSON.parse(element.querySelector('#webscript-data-JSON').innerHTML)[0].name).toBe('Name 1'); expect(JSON.parse(element.querySelector('#webscript-data-JSON').innerHTML)[1].name).toBe('Name 2'); @@ -147,7 +139,7 @@ describe('Test ng2-alfresco-webscript', () => { component.scriptPath = 'sample/folder/Company%20Home'; component.contentType = 'HTML'; - component.ngOnChanges().then(() => { + component.ngOnChanges(null).then(() => { fixture.detectChanges(); expect(element.querySelector('#webscript-data-HTML').innerHTML) .toBe('<test-element-id><test-elemt-id>'); @@ -168,7 +160,7 @@ describe('Test ng2-alfresco-webscript', () => { component.scriptPath = 'sample/folder/Company%20Home'; component.contentType = 'DATATABLE'; - component.ngOnChanges().then(() => { + component.ngOnChanges(null).then(() => { fixture.detectChanges(); expect(element.querySelector('#webscript-datatable-wrapper').innerHTML).toBeDefined(); done(); @@ -206,7 +198,7 @@ describe('Test ng2-alfresco-webscript', () => { component.scriptPath = 'sample/folder/Company%20Home'; component.contentType = 'DATATABLE'; - component.ngOnChanges().then(() => { + component.ngOnChanges(null).then(() => { fixture.detectChanges(); expect(element.querySelector('#webscript-datatable-wrapper').innerHTML).toBeDefined(); done(); diff --git a/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts b/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts index c5c04511b9..12e1d226b5 100644 --- a/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts +++ b/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; /** @@ -79,12 +79,7 @@ export class WebscriptComponent { showError: boolean = false; - /** - * Constructor - * @param authService - */ - constructor(private authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) { - + constructor(private apiService: AlfrescoApiService) { } ngOnChanges(changes) { From 082c997c0d6ae3906aad6c74d4289b48f5109701 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 3 Jan 2017 10:55:59 +0000 Subject: [PATCH 010/108] hide save button from start form --- .../src/components/activiti-start-form.component.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index ad4e5b74df..c10770e93b 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -29,6 +29,7 @@ import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiForm } from './activiti-form.component'; import { FormService } from './../services/form.service'; import { WidgetVisibilityService } from './../services/widget-visibility.service'; +import { FormOutcomeModel } from './widgets/core/index'; /** * Displays the start form for a named process definition, which can be used to retrieve values to start a new process. @@ -131,7 +132,17 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, ); } + /** @override */ + isOutcomeButtonVisible(outcome: FormOutcomeModel): boolean { + if (outcome && outcome.name === FormOutcomeModel.SAVE_ACTION) { + return false; + } + return super.isOutcomeButtonVisible(outcome); + } + + /** @override */ saveTaskForm() { + // do nothing } completeTaskForm(outcome?: string) { From 40b9baaa642fba0c75d472f207366abdccd84e56 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 3 Jan 2017 16:44:13 +0000 Subject: [PATCH 011/108] id-based navigation (initial implementation) --- .../app/components/files/files.component.html | 40 +----- .../app/components/files/files.component.ts | 24 ++-- .../ng2-alfresco-documentlist/package.json | 4 +- .../breadcrumb/breadcrumb.component.html | 21 ++- .../breadcrumb/breadcrumb.component.spec.ts | 8 +- .../breadcrumb/breadcrumb.component.ts | 97 +++---------- .../src/components/document-list.spec.ts | 46 +++++- .../src/components/document-list.ts | 133 ++++-------------- .../src/data/share-datatable-adapter.spec.ts | 10 +- .../src/data/share-datatable-adapter.ts | 52 ++----- .../src/services/document-list.service.ts | 13 +- 11 files changed, 159 insertions(+), 289 deletions(-) diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html index 5cf0ac0361..96a1a84e2e 100644 --- a/demo-shell-ng2/app/components/files/files.component.html +++ b/demo-shell-ng2/app/components/files/files.component.html @@ -5,8 +5,8 @@ [versioning] = "versioning" (onSuccess)="documentList.reload()"> + [target]="documentList" + [folderNode]="documentList.folderNode">
- -
-
    -
  • Current path: {{currentPath}}
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
- -

    -
  1. - {{r.name}} - - {{r.name}} - -
    2. -
+
+
    +
  1. + {{r.name}} + + {{r.name}} + +
    2. +
+
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts index c0c2b61793..991d18a172 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { DocumentListBreadcrumb, PathNode } from './breadcrumb.component'; -import { DocumentList } from '../document-list'; +import { DocumentListBreadcrumb } from './breadcrumb.component'; +// import { DocumentList } from '../document-list'; describe('DocumentListBreadcrumb', () => { @@ -74,6 +74,7 @@ describe('DocumentListBreadcrumb', () => { expect(event.preventDefault).toHaveBeenCalled(); }); + /* it('should emit navigation event', (done) => { let node = { name: 'name', path: '/path' }; component.navigate.subscribe(val => { @@ -84,7 +85,9 @@ describe('DocumentListBreadcrumb', () => { component.onRoutePathClick(node, null); }); + */ + /* it('should update document list on click', (done) => { let documentList = new DocumentList(null, null, null); spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); @@ -98,6 +101,7 @@ describe('DocumentListBreadcrumb', () => { done(); }, 0); }); + */ it('should do nothing for same path', () => { let called = 0; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts index 20984867eb..a924910854 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts @@ -15,12 +15,8 @@ * limitations under the License. */ -import { - Component, - Input, - Output, - EventEmitter -} from '@angular/core'; +import { Component, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; +import { MinimalNodeEntryEntity, PathElementEntity } from 'alfresco-js-api'; import { DocumentList } from '../document-list'; @Component({ @@ -29,95 +25,48 @@ import { DocumentList } from '../document-list'; templateUrl: './breadcrumb.component.html', styleUrls: ['./breadcrumb.component.css'] }) -export class DocumentListBreadcrumb { - - private _currentFolderPath: string = '/'; +export class DocumentListBreadcrumb implements OnChanges { @Input() - set currentFolderPath(val: string) { - if (this._currentFolderPath !== val) { - if (val) { - this._currentFolderPath = val; - this.route = this.parsePath(val); - } else { - this._currentFolderPath = this.rootFolder.path; - this.route = [ this.rootFolder ]; - } - this.pathChanged.emit({ - value: this._currentFolderPath, - route: this.route - }); - } - } - - get currentFolderPath(): string { - return this._currentFolderPath; - } + folderNode: MinimalNodeEntryEntity; @Input() target: DocumentList; - private rootFolder: PathNode = { - name: 'Root', - path: '/' - }; - - route: PathNode[] = [ this.rootFolder ]; + route: PathElementEntity[] = []; @Output() navigate: EventEmitter = new EventEmitter(); - @Output() - pathChanged: EventEmitter = new EventEmitter(); + ngOnChanges(changes: SimpleChanges) { + if (changes['folderNode']) { - onRoutePathClick(route: PathNode, e?: Event) { + let node: MinimalNodeEntryEntity = changes['folderNode'].currentValue; + if (node) { + // see https://github.com/Alfresco/alfresco-js-api/issues/139 + let route = (node.path.elements || []); + route.push( { + id: node.id, + name: node.name + }); + this.route = route; + } + } + } + + onRoutePathClick(route: PathElementEntity, e?: Event) { if (e) { e.preventDefault(); } if (route) { this.navigate.emit({ - value: { - name: route.name, - path: route.path - } + value: route }); - this.currentFolderPath = route.path; - if (this.target) { - this.target.currentFolderPath = route.path; - this.target.loadFolder(); + this.target.loadFolderByNodeId(route.id); } } } - - private parsePath(path: string): PathNode[] { - let parts = path.split('/').filter(val => val ? true : false); - - let result = [ - this.rootFolder - ]; - - let parentPath: string = this.rootFolder.path; - - for (let i = 0; i < parts.length; i++) { - if (!parentPath.endsWith('/')) { - parentPath += '/'; - } - parentPath += parts[i]; - - result.push({ - name: parts[i], - path: parentPath - }); - } - - return result; - }; -} - -export interface PathNode { - name: string; - path: string; } diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts index 4bbc6150d8..1a54817336 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { NgZone, SimpleChange, TemplateRef } from '@angular/core'; +import { NgZone, /*SimpleChange, */TemplateRef } from '@angular/core'; import { DataTableComponent, DataColumn, DataRowEvent } from 'ng2-alfresco-datatable'; import { DocumentList } from './document-list'; import { DocumentListServiceMock } from './../assets/document-list.service.mock'; @@ -48,6 +48,7 @@ describe('DocumentList', () => { window['componentHandler'] = componentHandler; }); + /* it('should update root folder ID', () => { let adapter = documentList.data; expect(adapter.rootFolderId).toBe(adapter.DEFAULT_ROOT_ID); @@ -55,6 +56,7 @@ describe('DocumentList', () => { documentList.rootFolderId = '-shared-'; expect(adapter.rootFolderId).toBe('-shared-'); }); + */ it('should setup default columns', () => { spyOn(documentList, 'setupDefaultColumns').and.callThrough(); @@ -157,6 +159,7 @@ describe('DocumentList', () => { documentList.onNodeClick(node); }); + /* it('should display folder content on click', () => { let path = '/'; @@ -170,7 +173,9 @@ describe('DocumentList', () => { expect(documentList.currentFolderPath).toBe(path); }); + */ + /* it('should not display folder content when no target node provided', () => { expect(documentList.navigate).toBe(true); spyOn(documentList, 'loadFolderByPath').and.stub(); @@ -179,7 +184,9 @@ describe('DocumentList', () => { expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); }); + */ + /* it('should display folder content only on folder node click', () => { expect(documentList.navigate).toBe(true); spyOn(documentList, 'loadFolderByPath').and.stub(); @@ -189,7 +196,9 @@ describe('DocumentList', () => { expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); }); + */ + /* it('should not display folder content on click when navigation is off', () => { spyOn(documentList, 'loadFolderByPath').and.stub(); @@ -199,11 +208,15 @@ describe('DocumentList', () => { expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); }); + */ + /* it('should require node to get path', () => { expect(documentList.getNodePath(null)).toBe(null); }); + */ + /* it('should display folder content for new folder path', () => { spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); let newPath = '/some/new/path'; @@ -211,7 +224,9 @@ describe('DocumentList', () => { documentList.ngOnChanges({currentFolderPath: new SimpleChange(null, newPath)}); expect(documentList.loadFolderByPath).toHaveBeenCalledWith(newPath); }); + */ + /* it('should reset to default path', () => { spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); documentList.currentFolderPath = null; @@ -220,7 +235,9 @@ describe('DocumentList', () => { expect(documentList.currentFolderPath).toBe(documentList.DEFAULT_FOLDER_PATH); expect(documentList.loadFolderByPath).toHaveBeenCalledWith(documentList.DEFAULT_FOLDER_PATH); }); + */ + /* it('should emit folder changed event', (done) => { spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); documentList.folderChange.subscribe(e => { @@ -231,7 +248,9 @@ describe('DocumentList', () => { documentList.currentFolderPath = newPath; documentList.ngOnChanges({currentFolderPath: new SimpleChange(null, newPath)}); }); + */ + /* it('should emit folder changed event with folder details', (done) => { spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); @@ -245,6 +264,7 @@ describe('DocumentList', () => { documentList.currentFolderPath = path; documentList.ngOnChanges({currentFolderPath: new SimpleChange(null, path)}); }); + */ it('should execute context action on callback', () => { let action = { @@ -348,15 +368,19 @@ describe('DocumentList', () => { expect(documentList.performNavigation(null)).toBeFalsy(); }); + /* it('should not get node path for null node', () => { expect(documentList.getNodePath(null)).toBeNull(); }); + */ + /* it('should trim company home from node path', () => { let file = new FileNode('file.txt'); file.entry.path.name = '/Company Home/folder1'; expect(documentList.getNodePath(file)).toBe('/folder1/file.txt'); }); + */ it('should require valid node for file preview', () => { let file = new FileNode(); @@ -388,12 +412,15 @@ describe('DocumentList', () => { expect(documentList.performNavigation).not.toHaveBeenCalled(); }); + /* it('should display folder content on reload', () => { spyOn(documentList, 'loadFolderByPath').and.callThrough(); documentList.reload(); expect(documentList.loadFolderByPath).toHaveBeenCalled(); }); + */ + /* it('should require path to display folder content', () => { spyOn(documentListService, 'getFolder').and.callThrough(); @@ -402,6 +429,7 @@ describe('DocumentList', () => { expect(documentListService.getFolder).not.toHaveBeenCalled(); }); + */ it('should require node to resolve context menu actions', () => { expect(documentList.getContextActions(null)).toBeNull(); @@ -461,6 +489,7 @@ describe('DocumentList', () => { expect(documentList.getNodeActions).toHaveBeenCalled(); }); + /* it('should require current folder path to reload', () => { // Redefine 'currentFolderPath' to disable native setter validation @@ -475,6 +504,7 @@ describe('DocumentList', () => { expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); }); + */ it('should enforce single-click on mobile browser', () => { spyOn(documentList, 'isMobile').and.returnValue(true); @@ -484,6 +514,7 @@ describe('DocumentList', () => { expect(documentList.navigationMode).toBe(DocumentList.SINGLE_CLICK_NAVIGATION); }); + /* it('should emit error on wrong path', (done) => { let raised = false; documentList.error.subscribe(err => raised = true); @@ -496,6 +527,7 @@ describe('DocumentList', () => { done(); }, 0); }); + */ it('should require dataTable to check empty template', () => { documentList.dataTable = null; @@ -512,25 +544,33 @@ describe('DocumentList', () => { expect(documentList.isEmptyTemplateDefined()).toBeFalsy(); }); + /* it('should set root folder ID for underlying adapter', () => { documentList.rootFolderId = 'test'; expect(documentList.data.rootFolderId).toBe('test'); }); + */ + /* it('should set default root folder ID for underlying adapter', () => { documentList.rootFolderId = null; expect(documentList.data.rootFolderId).toBe(documentList.data.DEFAULT_ROOT_ID); }); + */ + /* it('should fetch root folder ID from underlying adapter', () => { documentList.data.rootFolderId = 'test'; expect(documentList.rootFolderId).toBe('test'); }); + */ + /* it('should not fetch root folder ID when adapter missing', () => { documentList.data = null; expect(documentList.rootFolderId).toBeNull(); }); + */ it('should set row filter for underlying adapter', () => { let filter = {}; @@ -568,6 +608,7 @@ describe('DocumentList', () => { expect(documentList.onNodeDblClick).toHaveBeenCalledWith(node); }); + /* describe('navigate by folder ID', () => { it('should load folder by ID on init', () => { @@ -595,7 +636,9 @@ describe('DocumentList', () => { }); }); + */ + /* describe('configure root folder', () => { it('should re-load folder when rootFolderId changed', () => { @@ -612,4 +655,5 @@ describe('DocumentList', () => { }); }); + */ }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts index 218aafbb8a..7bcd451fa0 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts @@ -15,32 +15,14 @@ * limitations under the License. */ -import { - Component, - OnInit, - Input, - OnChanges, - Output, - SimpleChanges, - EventEmitter, - AfterContentInit, - TemplateRef, - NgZone, - ViewChild, - HostListener -} from '@angular/core'; +import { Component, OnInit, Input, OnChanges, Output, SimpleChanges, EventEmitter, AfterContentInit, TemplateRef, NgZone, ViewChild, HostListener } from '@angular/core'; import { Subject } from 'rxjs/Rx'; -import { MinimalNodeEntity } from 'alfresco-js-api'; +import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { DataRowEvent, DataTableComponent, ObjectDataColumn } from 'ng2-alfresco-datatable'; import { DocumentListService } from './../services/document-list.service'; import { ContentActionModel } from './../models/content-action.model'; -import { - ShareDataTableAdapter, - ShareDataRow, - RowFilter, - ImageResolver -} from './../data/share-datatable-adapter'; +import { ShareDataTableAdapter, ShareDataRow, RowFilter, ImageResolver } from './../data/share-datatable-adapter'; declare var module: any; @@ -56,28 +38,11 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { static DOUBLE_CLICK_NAVIGATION: string = 'dblclick'; static DEFAULT_PAGE_SIZE: number = 20; - DEFAULT_FOLDER_PATH: string = '/'; - baseComponentPath = module.id.replace('/components/document-list.js', ''); @Input() fallbackThubnail: string = this.baseComponentPath + '/../assets/images/ft_ic_miscellaneous.svg'; - @Input() - set rootFolderId(value: string) { - this.data.rootFolderId = value || this.data.DEFAULT_ROOT_ID; - } - - @Input() - currentFolderId: string = null; - - get rootFolderId(): string { - if (this.data) { - return this.data.rootFolderId; - } - return null; - } - @Input() navigate: boolean = true; @@ -137,16 +102,12 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { @ViewChild(DataTableComponent) dataTable: DataTableComponent; - private _path = this.DEFAULT_FOLDER_PATH; + // The identifier of a node. You can also use one of these well-known aliases: -my- | -shared- | -root- + @Input() + currentFolderId: string = null; @Input() - set currentFolderPath(value: string) { - this._path = value; - } - - get currentFolderPath(): string { - return this._path; - } + folderNode: MinimalNodeEntryEntity = null; errorMessage; actions: ContentActionModel[] = []; @@ -209,36 +170,10 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { } ngOnChanges(changes: SimpleChanges) { - if (changes['currentFolderId'] && changes['currentFolderId'].currentValue) { - let folderId = changes['currentFolderId'].currentValue; - this.loadFolderById(folderId) - .then(() => { - this._path = null; - }) - .catch(err => { - this.error.emit(err); - }); - } else if (changes['currentFolderPath']) { - const path = changes['currentFolderPath'].currentValue || this.DEFAULT_FOLDER_PATH; - this.currentFolderPath = path; - this.loadFolderByPath(path) - .then(() => { - this._path = path; - this.folderChange.emit({ path: path }); - }) - .catch(err => { - this.error.emit(err); - }); - } else if (changes['rootFolderId']) { - // this.currentFolderPath = this.DEFAULT_FOLDER_PATH; - this.loadFolderByPath(this.currentFolderPath) - .then(() => { - this._path = this.currentFolderPath; - this.folderChange.emit({ path: this.currentFolderPath }); - }) - .catch(err => { - this.error.emit(err); - }); + if (changes['folderNode'] && changes['folderNode'].currentValue) { + this.loadFolder(); + } else if (changes['currentFolderId'] && changes['currentFolderId'].currentValue) { + this.loadFolderByNodeId(changes['currentFolderId'].currentValue); } } @@ -289,10 +224,12 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { performNavigation(node: MinimalNodeEntity): boolean { if (node && node.entry && node.entry.isFolder) { - this.currentFolderPath = this.getNodePath(node); - this.currentFolderId = null; + + this.currentFolderId = node.entry.id; + this.folderNode = node.entry; + this.loadFolder(); - this.folderChange.emit({ path: this.currentFolderPath }); + this.folderChange.emit({ node: node.entry }); return true; } return false; @@ -309,10 +246,6 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { } } - loadFolderByPath(path: string): Promise { - return this.data.loadPath(path); - } - loadFolderById(id: string): Promise { return this.data.loadById(id); } @@ -323,31 +256,21 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { }); } - public loadFolder() { - if (this.currentFolderId) { - this.loadFolderById(this.currentFolderId) - .catch(err => { - this.error.emit(err); - }); - } else if (this.currentFolderPath) { - this.loadFolderByPath(this.currentFolderPath) - .catch(err => { - this.error.emit(err); - }); + loadFolder() { + let nodeId = this.folderNode ? this.folderNode.id : this.currentFolderId; + if (nodeId) { + this.loadFolderById(nodeId) + .catch(err => this.error.emit(err)); } } - /** - * Gets a path for a given node. - * @param node - * @returns {string} - */ - getNodePath(node: MinimalNodeEntity): string { - if (node) { - let pathWithCompanyHome = node.entry.path.name; - return pathWithCompanyHome.replace('/Company Home', '') + '/' + node.entry.name; - } - return null; + // gets folder node and its content + loadFolderByNodeId(nodeId: string) { + this.documentListService.getFolderNode(nodeId).then(node => { + this.folderNode = node; + this.currentFolderId = node.id; + this.data.loadById(node.id).catch(err => this.error.emit(err)); + }); } /** diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts index 9f5a977b76..707305bf92 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts @@ -18,7 +18,7 @@ import { DataColumn, DataRow, DataSorting } from 'ng2-alfresco-datatable'; import { DocumentListServiceMock } from './../assets/document-list.service.mock'; import { ShareDataTableAdapter, ShareDataRow } from './share-datatable-adapter'; -import { FileNode, FolderNode, PageNode } from './../assets/document-library.model.mock'; +import { FileNode, FolderNode/*, PageNode*/ } from './../assets/document-library.model.mock'; describe('ShareDataTableAdapter', () => { @@ -102,6 +102,7 @@ describe('ShareDataTableAdapter', () => { expect(check).toThrowError(adapter.ERR_COL_NOT_FOUND); }); + /* it('should require path to load data', () => { spyOn(documentListService, 'getFolder').and.callThrough(); @@ -110,7 +111,9 @@ describe('ShareDataTableAdapter', () => { expect(documentListService.getFolder).not.toHaveBeenCalled(); }); + */ + /* it('should load data for path', () => { let folder = new FolderNode(); let path = '/some/path'; @@ -128,6 +131,7 @@ describe('ShareDataTableAdapter', () => { expect(rows.length).toBe(1); expect((rows[0]).node).toBe(folder); }); + */ it('should covert cell value to formatted date', () => { let rawValue = new Date(2015, 6, 15, 21, 43, 11); // Wed Jul 15 2015 21:43:11 GMT+0100 (BST); @@ -322,6 +326,7 @@ describe('ShareDataTableAdapter', () => { expect(value).toBeNull(); }); + /* it('should log load error', (done) => { let error = 'My Error'; documentListService.getFolderReject = true; @@ -336,6 +341,7 @@ describe('ShareDataTableAdapter', () => { done(); }); }); + */ it('should generate file icon path based on mime type', () => { let fileName = 'custom-icon.svg'; @@ -399,6 +405,7 @@ describe('ShareDataTableAdapter', () => { expect(( rows[1]).node).toBe(file1); }); + /* it('should preserve sorting on navigation', () => { let file1 = new FileNode('file1'); let file2 = new FileNode('file2'); @@ -426,6 +433,7 @@ describe('ShareDataTableAdapter', () => { expect(( sorted[0]).node).toBe(file3); expect(( sorted[1]).node).toBe(file4); }); + */ }); describe('ShareDataRow', () => { diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts index b3f2569099..c3cba404d3 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts @@ -17,11 +17,7 @@ import { DatePipe } from '@angular/common'; import { ObjectUtils } from 'ng2-alfresco-core'; -import { - PaginationProvider, DataLoadedEventEmitter, - DataTableAdapter, - DataRow, DataColumn, DataSorting -} from 'ng2-alfresco-datatable'; +import { PaginationProvider, DataLoadedEventEmitter, DataTableAdapter, DataRow, DataColumn, DataSorting } from 'ng2-alfresco-datatable'; import { NodePaging, NodeMinimalEntry } from './../models/document-library.model'; import { DocumentListService } from './../services/document-list.service'; @@ -31,7 +27,6 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid ERR_ROW_NOT_FOUND: string = 'Row not found'; ERR_COL_NOT_FOUND: string = 'Column not found'; - DEFAULT_ROOT_ID: string = '-root-'; DEFAULT_DATE_FORMAT: string = 'medium'; DEFAULT_PAGE_SIZE: number = 20; MIN_PAGE_SIZE: number = 5; @@ -40,7 +35,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid private rows: DataRow[]; private columns: DataColumn[]; private page: NodePaging; - private currentPath: string; + private folderNodeId: string; private filter: RowFilter; private imageResolver: ImageResolver; @@ -53,7 +48,6 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid thumbnails: boolean = false; dataLoaded: DataLoadedEventEmitter; - rootFolderId: string = this.DEFAULT_ROOT_ID; constructor(private documentListService: DocumentListService, private basePath: string, @@ -83,7 +77,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid set skipCount(value: number) { if (value !== this._skipCount) { this._skipCount = value > 0 ? value : 0; - this.loadPath(this.currentPath); + this.loadById(this.folderNodeId); } } @@ -94,7 +88,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid set maxItems(value: number) { if (value !== this._maxItems) { this._maxItems = value > this.MIN_PAGE_SIZE ? value : this.MIN_PAGE_SIZE; - this.loadPath(this.currentPath); + this.loadById(this.folderNodeId); } } @@ -203,17 +197,17 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid this.setSorting(sorting); } - loadPath(path: string): Promise { + loadById(id: string): Promise { return new Promise((resolve, reject) => { - if (path && this.documentListService) { + if (id && this.documentListService) { this.documentListService - .getFolder(path, { + .getFolder(null, { maxItems: this._maxItems, skipCount: this._skipCount, - rootFolderId: this.rootFolderId + rootFolderId: id }) .subscribe(val => { - this.currentPath = path; + this.folderNodeId = id; this.loadPage(val); this.dataLoaded.emit(null); resolve(true); @@ -228,35 +222,11 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid } - loadById(id: string): Promise { - return new Promise((resolve, reject) => { - if (id && this.documentListService) { - this.documentListService - .getFolder(null, { - maxItems: this._maxItems, - skipCount: this._skipCount, - rootFolderId: id - }) - .subscribe(val => { - this.loadPage(val); - this.dataLoaded.emit(null); - resolve(true); - }, - error => { - reject(error); - }); - } else { - resolve(false); - } - }); - - } - setFilter(filter: RowFilter) { this.filter = filter; - if (this.filter && this.currentPath) { - this.loadPath(this.currentPath); + if (this.filter && this.folderNodeId) { + this.loadById(this.folderNodeId); } } diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts index 928e0780bf..35fdef6d75 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; -import { NodePaging, MinimalNodeEntity } from 'alfresco-js-api'; +import { NodePaging, MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; import { AuthService, ContentService, AlfrescoApiService } from 'ng2-alfresco-core'; @Injectable() @@ -121,6 +121,17 @@ export class DocumentListService { .catch(this.handleError); } + getFolderNode(nodeId: string): Promise { + let opts: any = { + includeSource: true, + include: ['path', 'properties'] + }; + + // see https://github.com/Alfresco/alfresco-js-api/issues/140 + let nodes: any = this.apiService.getInstance().nodes; + return nodes.getNodeInfo(nodeId, opts); + } + /** * Get thumbnail URL for the given document node. * @param node Node to get URL for. From 4ea3187e7a92f3c01b6078f0f25bbbacd0d89b04 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Tue, 3 Jan 2017 17:18:48 +0000 Subject: [PATCH 012/108] #1346 fix zero values (#1353) --- .../src/components/analytics.component.html | 11 +++-- .../ng2-activiti-analytics/src/i18n/en.json | 3 +- .../ng2-activiti-analytics/src/i18n/it.json | 43 ++++++++++++++++++- .../src/models/chart.model.ts | 15 ++++++- 4 files changed, 65 insertions(+), 7 deletions(-) diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html index a52b7480c7..f487b87cc1 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html @@ -12,10 +12,13 @@
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
- +
+
{{'ANALYTICS.MESSAGES.ZERO-DATA-FOUND' | translate}}
+ +
diff --git a/ng2-components/ng2-activiti-analytics/src/i18n/en.json b/ng2-components/ng2-activiti-analytics/src/i18n/en.json index 1dce1a9c60..64191cd18c 100644 --- a/ng2-components/ng2-activiti-analytics/src/i18n/en.json +++ b/ng2-components/ng2-activiti-analytics/src/i18n/en.json @@ -4,7 +4,8 @@ "MESSAGES": { "UNKNOWN-WIDGET-TYPE": "UNKNOWN WIDGET TYPE", "FILL-PARAMETER": "Fill in the parameters to generate your report", - "NO-DATA-FOUND": "No data found" + "NO-DATA-FOUND": "No data found", + "ZERO-DATA-FOUND": "There are only zero values" } }, "__KEY_REPORTING": { diff --git a/ng2-components/ng2-activiti-analytics/src/i18n/it.json b/ng2-components/ng2-activiti-analytics/src/i18n/it.json index 15c05b6832..20e7de1ba1 100644 --- a/ng2-components/ng2-activiti-analytics/src/i18n/it.json +++ b/ng2-components/ng2-activiti-analytics/src/i18n/it.json @@ -1,5 +1,46 @@ { "ANALYTICS": { - "TTILE": "ANALYTICS" + "TTILE": "ANALYTICS", + "MESSAGES": { + "UNKNOWN-WIDGET-TYPE": "TIPO WIDGET SCONOSCIUTO", + "FILL-PARAMETER": "Riempi tutti i campi per generare il report", + "NO-DATA-FOUND": "Nessun valore trovato", + "ZERO-DATA-FOUND": "Ci sono solo valori che valgono zero" + } + }, + "__KEY_REPORTING": { + "DEFAULT-REPORTS": { + "PROCESS-DEFINITION-OVERVIEW": { + "GENERAL-TABLE-TOTAL-PROCESS-DEFINITIONS": "Numero totale di process definitions", + "GENERAL-TABLE-TOTAL-PROCESS-INSTANCES": "Numero totale di process instances", + "GENERAL-TABLE-ACTIVE-PROCESS-INSTANCES": "Numero totale di process instances attivi", + "GENERAL-TABLE-COMPLETED-PROCESS-INSTANCES": "Numero totale di process instances completi" + } + } + }, + "REPORTING": { + "DEFAULT-REPORTS": { + "PROCESS-HEAT-MAP": { + "TYPE-FILTERING": "Include tutti gli steps (Deselezionandolo, rimuoverai gli step come start events, gateways, etc.)?" + }, + "PROCESS-INSTANCES-OVERVIEW": { + "PROCESS-DEFINITION": "Process definition", + "DATE-RANGE": "Intervallo di Date", + "SLOW-PROC-INST-NUMBER": "Quanti process instances lenti vuoi mostrare?" + }, + "TASK-OVERVIEW": { + "PROCESS-DEFINITION": "Process definition", + "DATE-RANGE": "Intervallo di Date", + "DATE-RANGE-INTERVAL": "Aggrega date per" + }, + "TASK-SLA": { + "TASK": "Task", + "PROCESS-DEFINITION": "Process definition", + "DATE-RANGE": "Intervallo di Date", + "SLA-DURATION": "Qual' é il tempo che questo task necessita per essere completato per rimanere nella SLA?" + } + }, + "PROCESS-STATUS": "Process stato", + "TASK-STATUS": "Task stato" } } diff --git a/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts b/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts index 57ee906a89..43783266c0 100644 --- a/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts +++ b/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts @@ -236,7 +236,20 @@ export class PieChart extends Chart { this.data.push(data); } - hasData() { + hasData(): boolean { return this.data && this.data.length > 0 ? true : false; } + + hasZeroValues(): boolean { + let isZeroValues: boolean = false; + if (this.hasData()) { + isZeroValues = true; + this.data.forEach((value) => { + if (value.toString() !== '0') { + isZeroValues = false; + } + }); + } + return isZeroValues; + } } From 512f6504f2adb84f2ecf5209ed681ab03a432b4f Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 3 Jan 2017 17:21:23 +0000 Subject: [PATCH 013/108] add missing 'forRoot' implementatitions (#1369) --- demo-shell-ng2/app/app.module.ts | 6 +++--- ng2-components/ng2-alfresco-datatable/index.ts | 12 ++++++++---- ng2-components/ng2-alfresco-login/index.ts | 14 +++++++++++--- ng2-components/ng2-alfresco-webscript/index.ts | 12 ++++++++---- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/demo-shell-ng2/app/app.module.ts b/demo-shell-ng2/app/app.module.ts index 8be249c882..560e10aaac 100644 --- a/demo-shell-ng2/app/app.module.ts +++ b/demo-shell-ng2/app/app.module.ts @@ -59,13 +59,13 @@ import { BrowserModule, routing, CoreModule.forRoot(), - LoginModule, + LoginModule.forRoot(), SearchModule.forRoot(), - DataTableModule, + DataTableModule.forRoot(), DocumentListModule.forRoot(), UploadModule.forRoot(), TagModule.forRoot(), - WebScriptModule, + WebScriptModule.forRoot(), ViewerModule.forRoot(), ActivitiFormModule.forRoot(), ActivitiTaskListModule.forRoot(), diff --git a/ng2-components/ng2-alfresco-datatable/index.ts b/ng2-components/ng2-alfresco-datatable/index.ts index 3e88aeddae..f872d2e117 100644 --- a/ng2-components/ng2-alfresco-datatable/index.ts +++ b/ng2-components/ng2-alfresco-datatable/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { NgModule } from '@angular/core'; +import { NgModule, ModuleWithProviders } from '@angular/core'; import { CoreModule } from 'ng2-alfresco-core'; export * from './src/data/index'; @@ -39,10 +39,14 @@ export const ALFRESCO_DATATABLE_DIRECTIVES: [any] = [ declarations: [ ...ALFRESCO_DATATABLE_DIRECTIVES ], - providers: [ - ], exports: [ ...ALFRESCO_DATATABLE_DIRECTIVES ] }) -export class DataTableModule {} +export class DataTableModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: DataTableModule + }; + } +} diff --git a/ng2-components/ng2-alfresco-login/index.ts b/ng2-components/ng2-alfresco-login/index.ts index 06124fc033..6e28e01782 100644 --- a/ng2-components/ng2-alfresco-login/index.ts +++ b/ng2-components/ng2-alfresco-login/index.ts @@ -15,14 +15,16 @@ * limitations under the License. */ -import { NgModule } from '@angular/core'; +import { NgModule, ModuleWithProviders } from '@angular/core'; import { CoreModule } from 'ng2-alfresco-core'; import { AlfrescoLoginComponent } from './src/components/alfresco-login.component'; export * from './src/components/alfresco-login.component'; -export const ALFRESCO_LOGIN_DIRECTIVES: any[] = [AlfrescoLoginComponent]; +export const ALFRESCO_LOGIN_DIRECTIVES: any[] = [ + AlfrescoLoginComponent +]; @NgModule({ imports: [ @@ -36,4 +38,10 @@ export const ALFRESCO_LOGIN_DIRECTIVES: any[] = [AlfrescoLoginComponent]; ...ALFRESCO_LOGIN_DIRECTIVES ] }) -export class LoginModule { } +export class LoginModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: CoreModule + }; + } +} diff --git a/ng2-components/ng2-alfresco-webscript/index.ts b/ng2-components/ng2-alfresco-webscript/index.ts index 51eae0c891..1791a46f74 100644 --- a/ng2-components/ng2-alfresco-webscript/index.ts +++ b/ng2-components/ng2-alfresco-webscript/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { NgModule } from '@angular/core'; +import { NgModule, ModuleWithProviders } from '@angular/core'; import { CoreModule } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; @@ -39,10 +39,14 @@ export const WEBSCRIPT_DIRECTIVES: any[] = [ declarations: [ ...WEBSCRIPT_DIRECTIVES ], - providers: [ - ], exports: [ ...WEBSCRIPT_DIRECTIVES ] }) -export class WebScriptModule {} +export class WebScriptModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: WebScriptModule + }; + } +} From dc0187aeab8a05f82200738455b9086d006a9685 Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Tue, 3 Jan 2017 17:50:56 +0000 Subject: [PATCH 014/108] #1303 - fix typeahead show for completed tasks --- .../display-value/display-value.widget.ts | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts index cc6a5e41c2..c446f92085 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts @@ -179,6 +179,7 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit { } else { this.value = this.field.value; } + this.visibilityService.refreshVisibility(this.field.form); }, error => { console.log(error); @@ -191,20 +192,21 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit { this.formService .getRestFieldValues(this.field.form.taskId, this.field.id) .subscribe( - (result: FormFieldOption[]) => { - let options = result || []; - let toSelect = options.find(item => item.id === this.field.value); - this.field.options = options; - if (toSelect) { - this.value = toSelect.name; - } else { - this.value = this.field.value; - } - }, - error => { - console.log(error); + (result: FormFieldOption[]) => { + let options = result || []; + let toSelect = options.find(item => item.id === this.field.value); + this.field.options = options; + if (toSelect) { + this.value = toSelect.name; + } else { this.value = this.field.value; } + this.visibilityService.refreshVisibility(this.field.form); + }, + error => { + console.log(error); + this.value = this.field.value; + } ); } From 82e0a2016d04913554665824b05eac3e71a93517 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 3 Jan 2017 19:47:04 +0000 Subject: [PATCH 015/108] cleanup demo page --- .../app/components/files/files.component.html | 21 +++++-------------- .../app/components/files/files.component.ts | 18 ---------------- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html index 96a1a84e2e..9e24b25e3f 100644 --- a/demo-shell-ng2/app/components/files/files.component.html +++ b/demo-shell-ng2/app/components/files/files.component.html @@ -1,7 +1,6 @@
- + (preview)="showFile($event)">
Date: Tue, 3 Jan 2017 20:35:26 +0000 Subject: [PATCH 016/108] update unit tests --- .../breadcrumb/breadcrumb.component.spec.ts | 77 +------ .../src/components/document-list.spec.ts | 202 ++---------------- .../src/components/document-list.ts | 3 +- .../services/document-actions.service.spec.ts | 6 +- .../src/services/document-actions.service.ts | 8 +- 5 files changed, 36 insertions(+), 260 deletions(-) diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts index 991d18a172..d2354ff1e0 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts @@ -15,8 +15,9 @@ * limitations under the License. */ +import { PathElementEntity } from 'alfresco-js-api'; import { DocumentListBreadcrumb } from './breadcrumb.component'; -// import { DocumentList } from '../document-list'; +import { DocumentList } from '../document-list'; describe('DocumentListBreadcrumb', () => { @@ -32,98 +33,34 @@ describe('DocumentListBreadcrumb', () => { expect(component.currentFolderPath).toBe(path); }); - it('should init with root folder by default', () => { - expect(component.route.length).toBe(1); - expect(component.route[0]).toEqual( - jasmine.objectContaining({ - name: 'Root', - path: '/' - }) - ); - }); - - it('should fallback to default root for invalid path', () => { - component.currentFolderPath = null; - expect(component.currentFolderPath).toBe('/'); - - expect(component.route.length).toBe(1); - expect(component.route[0]).toEqual( - jasmine.objectContaining({ - name: 'Root', - path: '/' - }) - ); - }); - - it('should parse the route', () => { - component.currentFolderPath = '/some/path'; - - expect(component.route.length).toBe(3); - expect(component.route).toEqual( - jasmine.objectContaining([ - { name: 'Root', path: '/' }, - { name: 'some', path: '/some' }, - { name: 'path', path: '/some/path' } - ]) - ); - }); - it('should prevent default click behavior', () => { let event = jasmine.createSpyObj('event', ['preventDefault']); component.onRoutePathClick(null, event); expect(event.preventDefault).toHaveBeenCalled(); }); - /* it('should emit navigation event', (done) => { - let node = { name: 'name', path: '/path' }; + let node = { id: '-id-', name: 'name' }; component.navigate.subscribe(val => { - expect(val.value.name).toBe(node.name); - expect(val.value.path).toBe(node.path); + expect(val.value).toBe(node); done(); }); component.onRoutePathClick(node, null); }); - */ - /* it('should update document list on click', (done) => { let documentList = new DocumentList(null, null, null); - spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); + spyOn(documentList, 'loadFolderByNodeId').and.stub(); - let node = { name: 'name', path: '/path' }; + let node = { id: '-id-', name: 'name' }; component.target = documentList; component.onRoutePathClick(node, null); setTimeout(() => { - expect(documentList.currentFolderPath).toBe(node.path); + expect(documentList.loadFolderByNodeId).toHaveBeenCalledWith(node.id); done(); }, 0); }); - */ - - it('should do nothing for same path', () => { - let called = 0; - - component.pathChanged.subscribe(() => called++); - - component.currentFolderPath = '/'; - component.currentFolderPath = '/'; - - expect(called).toBe(0); - }); - - it('should emit path changed event', (done) => { - let path = '/some/path'; - - component.pathChanged.subscribe(e => { - expect(e.value).toBe(path); - expect(e.route).toBe(component.route); - done(); - }); - - component.currentFolderPath = path; - }); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts index 1a54817336..eddb8fead2 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { NgZone, /*SimpleChange, */TemplateRef } from '@angular/core'; +import { NgZone, SimpleChange, TemplateRef } from '@angular/core'; import { DataTableComponent, DataColumn, DataRowEvent } from 'ng2-alfresco-datatable'; import { DocumentList } from './document-list'; import { DocumentListServiceMock } from './../assets/document-list.service.mock'; @@ -48,16 +48,6 @@ describe('DocumentList', () => { window['componentHandler'] = componentHandler; }); - /* - it('should update root folder ID', () => { - let adapter = documentList.data; - expect(adapter.rootFolderId).toBe(adapter.DEFAULT_ROOT_ID); - - documentList.rootFolderId = '-shared-'; - expect(adapter.rootFolderId).toBe('-shared-'); - }); - */ - it('should setup default columns', () => { spyOn(documentList, 'setupDefaultColumns').and.callThrough(); @@ -159,83 +149,45 @@ describe('DocumentList', () => { documentList.onNodeClick(node); }); - /* it('should display folder content on click', () => { - let path = '/'; - let node = new FolderNode(''); - spyOn(documentList, 'getNodePath').and.returnValue(path); - spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve(true)); + spyOn(documentList, 'loadFolder').and.returnValue(Promise.resolve(true)); documentList.navigationMode = DocumentList.SINGLE_CLICK_NAVIGATION; documentList.onNodeClick(node); - expect(documentList.currentFolderPath).toBe(path); + expect(documentList.loadFolder).toHaveBeenCalled(); }); - */ - /* it('should not display folder content when no target node provided', () => { expect(documentList.navigate).toBe(true); - spyOn(documentList, 'loadFolderByPath').and.stub(); + spyOn(documentList, 'loadFolder').and.stub(); documentList.onNodeClick(null); - expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); + expect(documentList.loadFolder).not.toHaveBeenCalled(); }); - */ - /* it('should display folder content only on folder node click', () => { expect(documentList.navigate).toBe(true); - spyOn(documentList, 'loadFolderByPath').and.stub(); + spyOn(documentList, 'loadFolder').and.stub(); let node = new FileNode(); documentList.onNodeClick(node); - expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); + expect(documentList.loadFolder).not.toHaveBeenCalled(); }); - */ - /* it('should not display folder content on click when navigation is off', () => { - spyOn(documentList, 'loadFolderByPath').and.stub(); + spyOn(documentList, 'loadFolder').and.stub(); let node = new FolderNode(''); documentList.navigate = false; documentList.onNodeClick(node); - expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); + expect(documentList.loadFolder).not.toHaveBeenCalled(); }); - */ - - /* - it('should require node to get path', () => { - expect(documentList.getNodePath(null)).toBe(null); - }); - */ - - /* - it('should display folder content for new folder path', () => { - spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); - let newPath = '/some/new/path'; - documentList.currentFolderPath = newPath; - documentList.ngOnChanges({currentFolderPath: new SimpleChange(null, newPath)}); - expect(documentList.loadFolderByPath).toHaveBeenCalledWith(newPath); - }); - */ - - /* - it('should reset to default path', () => { - spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); - documentList.currentFolderPath = null; - documentList.ngOnChanges({currentFolderPath: new SimpleChange('', null)}); - - expect(documentList.currentFolderPath).toBe(documentList.DEFAULT_FOLDER_PATH); - expect(documentList.loadFolderByPath).toHaveBeenCalledWith(documentList.DEFAULT_FOLDER_PATH); - }); - */ /* it('should emit folder changed event', (done) => { @@ -284,7 +236,7 @@ describe('DocumentList', () => { }); it('should subscribe to context action handler', () => { - spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve(true)); + spyOn(documentList, 'loadFolder').and.stub(); spyOn(documentList, 'contextActionCallback').and.stub(); let value = {}; documentList.ngOnInit(); @@ -358,8 +310,6 @@ describe('DocumentList', () => { }); it('should perform navigation for folder node only', () => { - spyOn(documentList, 'getNodePath').and.returnValue('/path'); - let folder = new FolderNode(); let file = new FileNode(); @@ -374,14 +324,6 @@ describe('DocumentList', () => { }); */ - /* - it('should trim company home from node path', () => { - let file = new FileNode('file.txt'); - file.entry.path.name = '/Company Home/folder1'; - expect(documentList.getNodePath(file)).toBe('/folder1/file.txt'); - }); - */ - it('should require valid node for file preview', () => { let file = new FileNode(); file.entry = null; @@ -412,24 +354,11 @@ describe('DocumentList', () => { expect(documentList.performNavigation).not.toHaveBeenCalled(); }); - /* it('should display folder content on reload', () => { - spyOn(documentList, 'loadFolderByPath').and.callThrough(); + spyOn(documentList, 'loadFolder').and.callThrough(); documentList.reload(); - expect(documentList.loadFolderByPath).toHaveBeenCalled(); + expect(documentList.loadFolder).toHaveBeenCalled(); }); - */ - - /* - it('should require path to display folder content', () => { - spyOn(documentListService, 'getFolder').and.callThrough(); - - documentList.loadFolderByPath(null); - documentList.loadFolderByPath(''); - - expect(documentListService.getFolder).not.toHaveBeenCalled(); - }); - */ it('should require node to resolve context menu actions', () => { expect(documentList.getContextActions(null)).toBeNull(); @@ -489,23 +418,6 @@ describe('DocumentList', () => { expect(documentList.getNodeActions).toHaveBeenCalled(); }); - /* - it('should require current folder path to reload', () => { - - // Redefine 'currentFolderPath' to disable native setter validation - Object.defineProperty(documentList, 'currentFolderPath', { - value: null - }); - expect(documentList.currentFolderPath).toBeNull(); - - spyOn(documentList, 'loadFolderByPath').and.stub(); - - documentList.reload(); - - expect(documentList.loadFolderByPath).not.toHaveBeenCalled(); - }); - */ - it('should enforce single-click on mobile browser', () => { spyOn(documentList, 'isMobile').and.returnValue(true); documentList.navigationMode = DocumentList.DOUBLE_CLICK_NAVIGATION; @@ -514,20 +426,18 @@ describe('DocumentList', () => { expect(documentList.navigationMode).toBe(DocumentList.SINGLE_CLICK_NAVIGATION); }); - /* - it('should emit error on wrong path', (done) => { + it('should emit error on wrong folder id', (done) => { let raised = false; documentList.error.subscribe(err => raised = true); - spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.reject(false)); + spyOn(documentListService, 'getFolderNode').and.returnValue(Promise.reject(false)); - documentList.currentFolderPath = 'wrong-path'; - documentList.ngOnChanges({currentFolderPath: new SimpleChange(null, documentList.currentFolderPath)}); + documentList.currentFolderId = 'wrong-id'; + documentList.ngOnChanges({currentFolderId: new SimpleChange(null, documentList.currentFolderId)}); setTimeout(() => { expect(raised).toBeTruthy(); done(); }, 0); }); - */ it('should require dataTable to check empty template', () => { documentList.dataTable = null; @@ -544,34 +454,6 @@ describe('DocumentList', () => { expect(documentList.isEmptyTemplateDefined()).toBeFalsy(); }); - /* - it('should set root folder ID for underlying adapter', () => { - documentList.rootFolderId = 'test'; - expect(documentList.data.rootFolderId).toBe('test'); - }); - */ - - /* - it('should set default root folder ID for underlying adapter', () => { - documentList.rootFolderId = null; - expect(documentList.data.rootFolderId).toBe(documentList.data.DEFAULT_ROOT_ID); - }); - */ - - /* - it('should fetch root folder ID from underlying adapter', () => { - documentList.data.rootFolderId = 'test'; - expect(documentList.rootFolderId).toBe('test'); - }); - */ - - /* - it('should not fetch root folder ID when adapter missing', () => { - documentList.data = null; - expect(documentList.rootFolderId).toBeNull(); - }); - */ - it('should set row filter for underlying adapter', () => { let filter = {}; spyOn(documentList.data, 'setFilter').and.callThrough(); @@ -608,52 +490,10 @@ describe('DocumentList', () => { expect(documentList.onNodeDblClick).toHaveBeenCalledWith(node); }); - /* - describe('navigate by folder ID', () => { - - it('should load folder by ID on init', () => { - - documentList.currentFolderId = '1d26e465-dea3-42f3-b415-faa8364b9692'; - - let loadbyIdSpy: jasmine.Spy = spyOn(documentList.data, 'loadById').and.returnValue(Promise.resolve()); - - documentList.ngOnInit(); - expect(loadbyIdSpy).toHaveBeenCalled(); - expect(documentList.currentFolderPath).toBe('/'); - }); - - it('should load folder by ID on changes', () => { - - let newNodeId = '1d26e465-dea3-42f3-b415-faa8364b9692'; - - documentList.ngOnChanges({currentFolderId: new SimpleChange(null, newNodeId)}); - - let loadbyPathSpy: jasmine.Spy = spyOn(documentList.data, 'loadPath').and.returnValue(Promise.resolve()); - - documentList.ngOnInit(); - expect(loadbyPathSpy).toHaveBeenCalled(); - expect(documentList.currentFolderPath).toBe('/'); - }); - + it('should load folder by ID on init', () => { + documentList.currentFolderId = '1d26e465-dea3-42f3-b415-faa8364b9692'; + spyOn(documentList.data, 'loadById').and.returnValue(Promise.resolve()); + documentList.ngOnInit(); + expect(documentList.data.loadById).toHaveBeenCalled(); }); - */ - - /* - describe('configure root folder', () => { - - it('should re-load folder when rootFolderId changed', () => { - - let newRootFolder = '-new-'; - - documentList.ngOnChanges({rootFolderId: new SimpleChange(null, newRootFolder)}); - - let loadbyPathSpy: jasmine.Spy = spyOn(documentList.data, 'loadPath').and.returnValue(Promise.resolve()); - - documentList.ngOnInit(); - expect(loadbyPathSpy).toHaveBeenCalled(); - expect(documentList.currentFolderPath).toBe('/'); - }); - - }); - */ }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts index 7bcd451fa0..55c73ae85b 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts @@ -270,7 +270,8 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { this.folderNode = node; this.currentFolderId = node.id; this.data.loadById(node.id).catch(err => this.error.emit(err)); - }); + }) + .catch(err => this.error.emit(err)); } /** diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts index 041f03c471..c1355849bc 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoContentService } from 'ng2-alfresco-core'; +import { ContentService } from 'ng2-alfresco-core'; import { ContentActionHandler } from '../models/content-action.model'; import { DocumentActionsService } from './document-actions.service'; import { DocumentListServiceMock } from '../assets/document-list.service.mock'; @@ -26,11 +26,11 @@ describe('DocumentActionsService', () => { let service: DocumentActionsService; let documentListService: DocumentListService; - let contentService: AlfrescoContentService; + let contentService: ContentService; beforeEach(() => { documentListService = new DocumentListServiceMock(); - contentService = new AlfrescoContentService(null, null); + contentService = new ContentService(null, null); service = new DocumentActionsService(documentListService, contentService); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts index 8927cdb9c2..f903359f21 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts @@ -18,16 +18,14 @@ import { Injectable } from '@angular/core'; import { ContentActionHandler } from '../models/content-action.model'; import { DocumentListService } from './document-list.service'; -import { AlfrescoContentService } from 'ng2-alfresco-core'; +import { ContentService } from 'ng2-alfresco-core'; @Injectable() export class DocumentActionsService { private handlers: { [id: string]: ContentActionHandler; } = {}; - constructor( - private documentListService?: DocumentListService, - private contentService?: AlfrescoContentService - ) { + constructor(private documentListService?: DocumentListService, + private contentService?: ContentService) { this.setupActionHandlers(); } From 71877aa8d0ff6909aeb10cafbd0746bd1d7c98c9 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 3 Jan 2017 21:13:17 +0000 Subject: [PATCH 017/108] upgrade 'create folder' action --- .../src/components/document-list.html | 9 ++++--- .../src/components/document-menu-action.ts | 26 +++++++------------ .../src/services/document-list.service.ts | 11 +++----- 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html index abd59d7584..88b308b02a 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html @@ -1,7 +1,8 @@ - + { - let relativeDir = this.currentFolderPath; + (res: MinimalNodeEntity) => { this.folderName = ''; - this.success.emit({value: relativeDir}); + console.log(res.entry); + this.success.emit({node: res.entry}); }, error => { let errorMessagePlaceholder = this.getErrorMessage(error.response); diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts index 35fdef6d75..cfb12fd701 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts @@ -96,15 +96,12 @@ export class DocumentListService { /** * Create a new folder in the path. - * @param name - * @param path + * @param name Folder name + * @param parentId Parent folder ID * @returns {any} */ - createFolder(name: string, path: string): Observable { - return Observable.fromPromise(this.apiService.getInstance().nodes.createFolder(name, path)) - .map(res => { - return res; - }) + createFolder(name: string, parentId: string): Observable { + return Observable.fromPromise(this.apiService.getInstance().nodes.createFolder(name, '/', parentId)) .catch(this.handleError); } From 7ecf9f2fc31ddcc64d93a6246b819a9fc46429d0 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 3 Jan 2017 21:20:16 +0000 Subject: [PATCH 018/108] readme update --- .../ng2-alfresco-documentlist/README.md | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 6a8b30b37d..8c6e5867c2 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -97,12 +97,10 @@ Follow the 3 steps below: ```html + [creationMenuActions]="true"> ``` @@ -120,14 +118,15 @@ import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfr @Component({ selector: 'alfresco-app-demo', - template: ` - ` + template: ` + + + ` }) class DocumentListDemo { @@ -162,17 +161,13 @@ export class AppModule { } platformBrowserDynamic().bootstrapModule(AppModule); - - ``` ### Properties | Name | Type | Default | Description | | --- | --- | --- | --- | -| `rootFolderId` | string | -root- | Root node ID, i.e. `-root-`, `-shared-`, `-my-`, etc. or a fixed node ID | -| `currentFolderPath` | string | null | Initial path of displayed folder below the root node, e.g. "/Sites/swsdp/documentLibrary" | -| `currentFolderId` | string | null | Initial node ID of displayed folder, if given | +| `currentFolderId` | string | null | Initial node ID of displayed folder. Can be `-root-`, `-shared-`, `-my-`, or a fixed node ID | | `navigate` | boolean | true | Toggles navigation to folder content or file preview | | `navigationMode` | string (click\|dblclick) | dblclick | User interaction for folder navigation or file preview | | `thumbnails` | boolean | false | Show document thumbnails rather than icons | @@ -193,7 +188,6 @@ platformBrowserDynamic().bootstrapModule(AppModule); | `folderChange` | Emitted upon display folder changed | | `preview` | Emitted when document preview is requested either with single or double click | - _For a complete example source code please refer to [DocumentList Demo](https://github.com/Alfresco/alfresco-ng2-components/tree/master/ng2-components/ng2-alfresco-documentlist/demo) repository._ @@ -204,7 +198,8 @@ DocumentList provides simple breadcrumb element to indicate the current position ```html + [target]="documentList" + [folderNode]="documentList.folderNode"> ``` From ccd8f640718056c63071d569b03097cb9cd398ba Mon Sep 17 00:00:00 2001 From: Vito Date: Wed, 4 Jan 2017 01:32:11 -0800 Subject: [PATCH 019/108] fix module creation for login component in forRoot (#1377) --- ng2-components/ng2-alfresco-login/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng2-components/ng2-alfresco-login/index.ts b/ng2-components/ng2-alfresco-login/index.ts index 6e28e01782..bdf0ea8b4e 100644 --- a/ng2-components/ng2-alfresco-login/index.ts +++ b/ng2-components/ng2-alfresco-login/index.ts @@ -41,7 +41,7 @@ export const ALFRESCO_LOGIN_DIRECTIVES: any[] = [ export class LoginModule { static forRoot(): ModuleWithProviders { return { - ngModule: CoreModule + ngModule: LoginModule }; } } From 4c522fabb82e48fde86091e838911a421c0a1629 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Wed, 4 Jan 2017 10:57:39 +0000 Subject: [PATCH 020/108] Show long comment (#1354) * #1324 long comment * #1324 use different css style * #1324 Fix long words without space --- .../activiti-process-comments.component.css | 13 +++++++++++++ .../activiti-process-comments.component.html | 4 ++-- .../src/components/activiti-comments.component.css | 13 +++++++++++++ .../src/components/activiti-comments.component.html | 7 ++----- 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.css index 65ef475088..e852011d55 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.css +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.css @@ -20,3 +20,16 @@ .material-icons { cursor: pointer; } + +.list-wrap { + word-wrap: break-word; + word-break: break-all; + -moz-hyphens:auto; + -webkit-hyphens:auto; + -o-hyphens:auto; + hyphens:auto; +} + +.hide-long-names { + overflow: auto; +} \ No newline at end of file diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.html index f1760200c3..17e5ae6681 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.html @@ -7,8 +7,8 @@
    -
  • - +
  • + comment {{comment.message}} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.css b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.css index 00d4c682f8..9ca19c95cd 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.css +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.css @@ -17,3 +17,16 @@ .material-icons { cursor: pointer; } + +.list-wrap { + word-wrap: break-word; + word-break: break-all; + -moz-hyphens:auto; + -webkit-hyphens:auto; + -o-hyphens:auto; + hyphens:auto; +} + +.hide-long-names { + overflow: auto; +} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.html index 3194483e2a..f5670baefb 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.html @@ -7,11 +7,8 @@
      -
    • - - comment - {{comment.message}} - +
    • + comment{{comment.message}}
    From 84e32423c5ac451fddc8350aa2fa0ece98bcdf90 Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Wed, 4 Jan 2017 12:38:18 +0000 Subject: [PATCH 021/108] #1372 appveyor build only master,development and a built test branch in case needed (#1381) --- appveyor.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 87b0af2f17..ef6eab1287 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,9 @@ # Test against this version of Node.js +branches: + only: + - master + - development + - dev-build-test environment: nodejs_version: "5" From fefe4b696340e31bef71d654de875b2da09ced66 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Wed, 4 Jan 2017 14:20:15 +0000 Subject: [PATCH 022/108] update code as per code review - upgrade demo project - extend readme - remove commented out unit tests --- .../ng2-alfresco-documentlist/README.md | 1 + .../demo/package.json | 5 +- .../demo/src/main.ts | 52 +++++-------------- .../demo/tslint.json | 3 +- .../src/components/document-list.spec.ts | 29 ----------- 5 files changed, 18 insertions(+), 72 deletions(-) diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 8c6e5867c2..553577f348 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -168,6 +168,7 @@ platformBrowserDynamic().bootstrapModule(AppModule); | Name | Type | Default | Description | | --- | --- | --- | --- | | `currentFolderId` | string | null | Initial node ID of displayed folder. Can be `-root-`, `-shared-`, `-my-`, or a fixed node ID | +| `folderNode` | `MinimalNodeEntryEntity` | null | Currently displayed folder node | | `navigate` | boolean | true | Toggles navigation to folder content or file preview | | `navigationMode` | string (click\|dblclick) | dblclick | User interaction for folder navigation or file preview | | `thumbnails` | boolean | false | Show document thumbnails rather than icons | diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json index 25058acba4..17925edf9d 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/package.json +++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json @@ -37,7 +37,10 @@ "alfresco-js-api": "^1.0.0", "ng2-alfresco-core": "1.0.0", "ng2-alfresco-datatable": "1.0.0", - "ng2-alfresco-documentlist": "^1.0.0" + "ng2-alfresco-documentlist": "^1.0.0", + "material-design-icons": "2.2.3", + "material-design-lite": "1.2.1", + "intl": "^1.2.5" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts index 62dca5b9e7..20286d923b 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts @@ -19,13 +19,7 @@ import { NgModule, Component, OnInit, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { DocumentListModule, DocumentList, DocumentActionsService } from 'ng2-alfresco-documentlist'; -import { - CoreModule, - StorageService, - AlfrescoSettingsService, - AlfrescoAuthenticationService, - AlfrescoTranslationService -} from 'ng2-alfresco-core'; +import { CoreModule, StorageService, SettingsService, AuthService, AlfrescoTranslateService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-app-demo', @@ -39,24 +33,16 @@ import { operations.
- + - + [creationMenuActions]="true"> - { expect(documentList.loadFolder).not.toHaveBeenCalled(); }); - /* - it('should emit folder changed event', (done) => { - spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); - documentList.folderChange.subscribe(e => { - done(); - }); - - let newPath = '/some/new/path'; - documentList.currentFolderPath = newPath; - documentList.ngOnChanges({currentFolderPath: new SimpleChange(null, newPath)}); - }); - */ - - /* - it('should emit folder changed event with folder details', (done) => { - spyOn(documentList, 'loadFolderByPath').and.returnValue(Promise.resolve()); - - let path = '/path'; - - documentList.folderChange.subscribe(e => { - expect(e.path).toBe(path); - done(); - }); - - documentList.currentFolderPath = path; - documentList.ngOnChanges({currentFolderPath: new SimpleChange(null, path)}); - }); - */ - it('should execute context action on callback', () => { let action = { node: {}, From 8a1d372318f051c5e70575ae23c45557db2953a5 Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Wed, 4 Jan 2017 14:22:51 +0000 Subject: [PATCH 023/108] #1378 fix test config for webpack (#1384) --- demo-shell-ng2/config/webpack.test.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/demo-shell-ng2/config/webpack.test.js b/demo-shell-ng2/config/webpack.test.js index d1f6c28a87..f2fe2870e0 100644 --- a/demo-shell-ng2/config/webpack.test.js +++ b/demo-shell-ng2/config/webpack.test.js @@ -1,6 +1,5 @@ var helpers = require('./helpers'); var fs = require('fs'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); var glob = require('glob'); const rootPath = helpers.root('node_modules'); @@ -34,12 +33,21 @@ module.exports = { }, module: { + preLoaders: [ + { + test: /\.js$/, + include: [ + ...alfrescoLibs + ], + loader: 'source-map-loader' + } + ], loaders: [ - { - test: /\.ts$/, - exclude: /node_modules/, - loaders: ['awesome-typescript-loader', 'angular2-template-loader'] - }, + { + test: /\.ts$/, + loaders: ['awesome-typescript-loader', 'angular2-template-loader', 'systemjs-loader'], + exclude: ['node_modules','public'] + }, { test: /\.js$/, include: [ From f00decabc579edd8ecc29489e208d6bcb11cb2c0 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Wed, 4 Jan 2017 16:02:14 +0000 Subject: [PATCH 024/108] readme updates, fix license checker --- ng2-components/ng2-alfresco-documentlist/README.md | 9 +++++++-- ng2-components/ng2-alfresco-documentlist/package.json | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 553577f348..7ccfae68b1 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -193,7 +193,7 @@ _For a complete example source code please refer to [DocumentList Demo](https://github.com/Alfresco/alfresco-ng2-components/tree/master/ng2-components/ng2-alfresco-documentlist/demo) repository._ -### Breadcrumb +### Breadcrumb Component DocumentList provides simple breadcrumb element to indicate the current position within a navigation hierarchy. @@ -206,7 +206,12 @@ DocumentList provides simple breadcrumb element to indicate the current position ![Breadcrumb](docs/assets/breadcrumb.png) -Parent folder button is not displayed when breadcrumb is enabled. +#### Properties + +| Name | Type | Description | +| --- | --- | --- | +| `target` | DocumentList | DocumentList component to operate with. Upon clicks will instruct the given component to update. | +| `folderNode` | MinimalNodeEntryEntity | Active node, builds UI based on `folderNode.path.elements` collection. | ### Creation Menu Action diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 8b94faf66f..307f0954b7 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && npm run build.umd", + "build": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", From 05ae1185f2872447ac70bbf5d63915f21e225995 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Wed, 4 Jan 2017 16:15:59 +0000 Subject: [PATCH 025/108] Detailed Task Statistics - Analytics (#1374) * #1224 Show the details table * Fix unit test --- .../src/components/analytics.component.css | 4 ++++ .../src/components/analytics.component.html | 12 +++++++++++- .../components/analytics.component.spec.ts | 2 +- .../src/components/analytics.component.ts | 10 ++++++++++ .../src/models/chart.model.ts | 19 +++++++++++++++++++ .../src/services/analytics.service.ts | 4 ++-- 6 files changed, 47 insertions(+), 4 deletions(-) diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.css b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.css index 096757598a..1cc89bc0ef 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.css +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.css @@ -23,3 +23,7 @@ .dropdown-widget__invalid .mdl-textfield__error { visibility: visible !important; } + +.analytics-row__entry { + cursor: pointer; +} \ No newline at end of file diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html index f487b87cc1..19ada1ae97 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html @@ -41,7 +41,17 @@ {{label | translate}} - + + {{row | translate }} + + +
+
+ + + + +
{{label | translate}}
{{row | translate }}
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts index 9c1939f669..09413f5013 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts @@ -151,7 +151,7 @@ describe('AnalyticsComponent', () => { expect(res[0].datasets[0].data[1]).toEqual(1); expect(res[1]).toBeDefined(); - expect(res[1].type).toEqual('table'); + expect(res[1].type).toEqual('masterDetailTable'); expect(res[1].datasets).toBeDefined(); expect(res[1].datasets.length).toEqual(2); expect(res[1].datasets[0][0]).toEqual('fake 1 user task'); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts index 5fb04a512e..186fe8f8f4 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts @@ -51,6 +51,8 @@ export class AnalyticsComponent implements OnChanges { reports: Chart[]; + showDetails: boolean = false; + public barChartOptions: any = { responsive: true, scales: { @@ -114,4 +116,12 @@ export class AnalyticsComponent implements OnChanges { public onEditReport(name: string) { this.editReport.emit(name); } + + toggleDetailsTable() { + this.showDetails = !this.showDetails; + } + + isShowDetails(): boolean { + return this.showDetails; + } } diff --git a/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts b/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts index 43783266c0..5eaa1b3898 100644 --- a/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts +++ b/ng2-components/ng2-activiti-analytics/src/models/chart.model.ts @@ -49,6 +49,9 @@ export class Chart { case 'processDefinitionHeatMap': chartType = 'HeatMap'; break; + case 'masterDetailTable': + chartType = 'masterDetailTable'; + break; default: chartType = 'table'; break; @@ -191,6 +194,22 @@ export class TableChart extends Chart { } } +export class DetailsTableChart extends TableChart { + detailsTable: any; + showDetails: boolean = false; + + constructor(obj?: any) { + super(obj); + if (obj.detailTables) { + this.detailsTable = new TableChart(obj.detailTables[0]); + } + } + + hasDetailsTable() { + return this.detailsTable ? true : false; + } +} + export class HeatMapChart extends Chart { avgTimePercentages: string; avgTimeValues: string; diff --git a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts index 7623a98593..672f85b644 100644 --- a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts +++ b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts @@ -20,7 +20,7 @@ import { Observable } from 'rxjs/Rx'; import { Response } from '@angular/http'; import { AlfrescoApiService } from 'ng2-alfresco-core'; import { ReportParametersModel, ParameterValueModel } from '../models/report.model'; -import { Chart, PieChart, TableChart, BarChart, HeatMapChart, MultiBarChart } from '../models/chart.model'; +import { Chart, PieChart, TableChart, BarChart, HeatMapChart, MultiBarChart, DetailsTableChart } from '../models/chart.model'; @Injectable() export class AnalyticsService { @@ -158,7 +158,7 @@ export class AnalyticsService { } else if (chartData.type === 'processDefinitionHeatMap') { elements.push(new HeatMapChart(chartData)); } else if (chartData.type === 'masterDetailTable') { - elements.push(new TableChart(chartData)); + elements.push(new DetailsTableChart(chartData)); } else if (chartData.type === 'barChart') { elements.push(new BarChart(chartData)); } else if (chartData.type === 'multiBarChart') { From 58af422d6299d94ebd8d51088a0a9aff64a1e290 Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Wed, 4 Jan 2017 13:30:43 +0000 Subject: [PATCH 026/108] #1370 Remove use of AlfrescoSettingsService --- demo-shell-ng2/app/app.component.ts | 14 +++++++------- .../app/components/setting/setting.component.ts | 12 ++++++------ .../ng2-activiti-analytics/demo/src/main.ts | 4 ++-- .../ng2-activiti-diagrams/demo/src/main.ts | 4 ++-- .../src/services/diagrams.service.ts | 4 ++-- ng2-components/ng2-activiti-form/demo/src/main.ts | 4 ++-- .../ng2-activiti-processlist/demo/src/main.ts | 4 ++-- ...iviti-process-instance-header.component.spec.ts | 4 ++-- .../ng2-activiti-tasklist/demo/src/main.ts | 4 ++-- .../src/services/settings.service.spec.ts | 2 +- .../ng2-alfresco-documentlist/demo/src/main.ts | 4 ++-- .../src/assets/document-list.service.mock.ts | 4 ++-- ng2-components/ng2-alfresco-login/demo/src/main.ts | 4 ++-- .../components/alfresco-login.component.spec.ts | 4 ++-- .../src/components/alfresco-login.component.ts | 4 ++-- .../ng2-alfresco-search/demo/src/main.ts | 4 ++-- ng2-components/ng2-alfresco-tag/demo/src/main.ts | 4 ++-- .../src/services/tag.service.spec.ts | 4 ++-- .../ng2-alfresco-upload/demo/src/main.ts | 4 ++-- .../ng2-alfresco-userinfo/demo/src/main.ts | 4 ++-- .../ng2-alfresco-viewer/demo/src/main.ts | 4 ++-- .../src/componets/imgViewer.component.spec.ts | 4 ++-- .../src/componets/mediaPlayer.component.spec.ts | 4 ++-- .../componets/notSupportedFormat.component.spec.ts | 4 ++-- .../src/componets/pdfViewer.component.spec.ts | 4 ++-- .../src/componets/viewer.component.spec.ts | 4 ++-- .../ng2-alfresco-webscript/demo/src/main.ts | 4 ++-- 27 files changed, 62 insertions(+), 62 deletions(-) diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts index 766bbdd6fd..47329d1491 100644 --- a/demo-shell-ng2/app/app.component.ts +++ b/demo-shell-ng2/app/app.component.ts @@ -21,7 +21,7 @@ import { Router } from '@angular/router'; import { AlfrescoTranslationService, AlfrescoAuthenticationService, - AlfrescoSettingsService, + SettingsService, StorageService } from 'ng2-alfresco-core'; @@ -40,7 +40,7 @@ export class AppComponent { constructor(public auth: AlfrescoAuthenticationService, public router: Router, - public alfrescoSettingsService: AlfrescoSettingsService, + public settingsService: SettingsService, private translate: AlfrescoTranslationService, private storage: StorageService) { this.setEcmHost(); @@ -118,25 +118,25 @@ export class AppComponent { private setEcmHost() { if (this.storage.hasItem(`ecmHost`)) { - this.alfrescoSettingsService.ecmHost = this.storage.getItem(`ecmHost`); + this.settingsService.ecmHost = this.storage.getItem(`ecmHost`); this.ecmHost = this.storage.getItem(`ecmHost`); } else { - this.alfrescoSettingsService.ecmHost = this.ecmHost; + this.settingsService.ecmHost = this.ecmHost; } } private setBpmHost() { if (this.storage.hasItem(`bpmHost`)) { - this.alfrescoSettingsService.bpmHost = this.storage.getItem(`bpmHost`); + this.settingsService.bpmHost = this.storage.getItem(`bpmHost`); this.bpmHost = this.storage.getItem(`bpmHost`); } else { - this.alfrescoSettingsService.bpmHost = this.bpmHost; + this.settingsService.bpmHost = this.bpmHost; } } private setProvider() { if (this.storage.hasItem(`providers`)) { - this.alfrescoSettingsService.setProviders(this.storage.getItem(`providers`)); + this.settingsService.setProviders(this.storage.getItem(`providers`)); } } } diff --git a/demo-shell-ng2/app/components/setting/setting.component.ts b/demo-shell-ng2/app/components/setting/setting.component.ts index 3fd9278643..f5c96045aa 100644 --- a/demo-shell-ng2/app/components/setting/setting.component.ts +++ b/demo-shell-ng2/app/components/setting/setting.component.ts @@ -16,7 +16,7 @@ */ import { Component } from '@angular/core'; -import { AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core'; +import { SettingsService, StorageService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-setting-demo', @@ -28,23 +28,23 @@ export class SettingComponent { ecmHost: string; bpmHost: string; - constructor(public alfrescoSettingsService: AlfrescoSettingsService, + constructor(public settingsService: SettingsService, private storage: StorageService) { - this.ecmHost = this.alfrescoSettingsService.ecmHost; - this.bpmHost = this.alfrescoSettingsService.bpmHost; + this.ecmHost = this.settingsService.ecmHost; + this.bpmHost = this.settingsService.bpmHost; } public onChangeECMHost(event: KeyboardEvent): void { console.log((event.target).value); this.ecmHost = (event.target).value; - this.alfrescoSettingsService.ecmHost = this.ecmHost; + this.settingsService.ecmHost = this.ecmHost; this.storage.setItem(`ecmHost`, this.ecmHost); } public onChangeBPMHost(event: KeyboardEvent): void { console.log((event.target).value); this.bpmHost = (event.target).value; - this.alfrescoSettingsService.bpmHost = this.bpmHost; + this.settingsService.bpmHost = this.bpmHost; this.storage.setItem(`bpmHost`, this.bpmHost); } diff --git a/ng2-components/ng2-activiti-analytics/demo/src/main.ts b/ng2-components/ng2-activiti-analytics/demo/src/main.ts index 67e19a017f..32438783c9 100644 --- a/ng2-components/ng2-activiti-analytics/demo/src/main.ts +++ b/ng2-components/ng2-activiti-analytics/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { AnalyticsModule } from 'ng2-activiti-analytics'; @Component({ @@ -61,7 +61,7 @@ export class AnalyticsDemoComponent implements OnInit { ticket: string; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, private storage: StorageService) { settingsService.bpmHost = this.host; settingsService.setProviders('BPM'); diff --git a/ng2-components/ng2-activiti-diagrams/demo/src/main.ts b/ng2-components/ng2-activiti-diagrams/demo/src/main.ts index cf673fabdb..4b54e4470e 100644 --- a/ng2-components/ng2-activiti-diagrams/demo/src/main.ts +++ b/ng2-components/ng2-activiti-diagrams/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { DiagramsModule } from 'ng2-activiti-diagrams'; @Component({ @@ -51,7 +51,7 @@ export class DiagramDemoComponent { ticket: string; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, private storage: StorageService) { settingsService.bpmHost = this.host; settingsService.setProviders('BPM'); diff --git a/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts b/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts index 0beda69bd6..67fbb7f83b 100644 --- a/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts +++ b/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts @@ -25,11 +25,11 @@ export class DiagramsService { constructor(private authService: AuthService, private http: Http, - private alfrescoSettingsService: SettingsService) { + private settingsService: SettingsService) { } getProcessDefinitionModel(processDefinitionId: string): Observable { - let url = `${this.alfrescoSettingsService.getBPMApiBaseUrl()}/app/rest/process-definitions/${processDefinitionId}/model-json`; + let url = `${this.settingsService.getBPMApiBaseUrl()}/app/rest/process-definitions/${processDefinitionId}/model-json`; let options = this.getRequestOptions(); return this.http .get(url, options) diff --git a/ng2-components/ng2-activiti-form/demo/src/main.ts b/ng2-components/ng2-activiti-form/demo/src/main.ts index c933643a38..a896591d5f 100644 --- a/ng2-components/ng2-activiti-form/demo/src/main.ts +++ b/ng2-components/ng2-activiti-form/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { ActivitiFormModule } from 'ng2-activiti-form'; @Component({ @@ -50,7 +50,7 @@ export class FormDemoComponent implements OnInit { ticket: string; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, private storage: StorageService) { settingsService.bpmHost = this.host; settingsService.setProviders('BPM'); diff --git a/ng2-components/ng2-activiti-processlist/demo/src/main.ts b/ng2-components/ng2-activiti-processlist/demo/src/main.ts index 07aa099838..aed9811da8 100644 --- a/ng2-components/ng2-activiti-processlist/demo/src/main.ts +++ b/ng2-components/ng2-activiti-processlist/demo/src/main.ts @@ -28,7 +28,7 @@ import { ActivitiStartProcessInstance, ProcessInstance } from 'ng2-activiti-processlist'; -import { AlfrescoAuthenticationService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, SettingsService, StorageService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; const currentProcessIdNew = '__NEW__'; @@ -161,7 +161,7 @@ class MyDemoApp implements OnInit { dataProcesses: ObjectDataTableAdapter; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, private storage: StorageService) { settingsService.bpmHost = this.host; settingsService.setProviders('BPM'); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts index de16f4629c..28bb4e5f65 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts @@ -22,7 +22,7 @@ import { AlfrescoTranslationService, CoreModule, AlfrescoAuthenticationService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService } from 'ng2-alfresco-core'; import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component'; @@ -48,7 +48,7 @@ describe('ActivitiProcessInstanceHeader', () => { ActivitiProcessComments ], providers: [ - AlfrescoSettingsService, + SettingsService, AlfrescoAuthenticationService, AlfrescoApiService, ActivitiProcessService, diff --git a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts index 7708062fca..9361a88752 100644 --- a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts +++ b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts @@ -26,7 +26,7 @@ import { ActivitiTaskList } from 'ng2-activiti-tasklist'; import { CoreModule } from 'ng2-alfresco-core'; -import { AlfrescoAuthenticationService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, SettingsService, StorageService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; @Component({ @@ -145,7 +145,7 @@ class MyDemoApp implements OnInit { dataTasks: ObjectDataTableAdapter; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, private storage: StorageService) { settingsService.bpmHost = this.host; settingsService.setProviders('BPM'); diff --git a/ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts index 56759c77a8..ec5b7452c8 100644 --- a/ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts @@ -17,7 +17,7 @@ import { SettingsService } from './settings.service'; -describe('AlfrescoSettingsService', () => { +describe('SettingsService', () => { let service: SettingsService; diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts index 20286d923b..7999fb140a 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { DocumentListModule, DocumentList, DocumentActionsService } from 'ng2-alfresco-documentlist'; -import { CoreModule, StorageService, SettingsService, AuthService, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, StorageService, SettingsService, AuthService, AlfrescoTranslationService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-app-demo', @@ -129,7 +129,7 @@ class DocumentListDemo implements OnInit { constructor(private authService: AuthService, private settingsService: SettingsService, - private translateService: AlfrescoTranslateService, + private translateService: AlfrescoTranslationService, private documentActions: DocumentActionsService, private storage: StorageService) { diff --git a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts index d3851e8a61..414087c380 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts @@ -20,7 +20,7 @@ import { NodePaging } from './../models/document-library.model'; import { PageNode } from './document-library.model.mock'; import { DocumentListService } from './../services/document-list.service'; import { - AlfrescoSettingsService, + SettingsService, AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoApiService @@ -33,7 +33,7 @@ export class DocumentListServiceMock extends DocumentListService { getFolderRejectError: string = 'Error'; constructor( - settings?: AlfrescoSettingsService, + settings?: SettingsService, authService?: AlfrescoAuthenticationService, contentService?: AlfrescoContentService, apiService?: AlfrescoApiService diff --git a/ng2-components/ng2-alfresco-login/demo/src/main.ts b/ng2-components/ng2-alfresco-login/demo/src/main.ts index 186f595ee5..307a669e32 100644 --- a/ng2-components/ng2-alfresco-login/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { LoginModule } from 'ng2-alfresco-login'; @Component({ @@ -74,7 +74,7 @@ export class AppComponent { public disableCsrf: boolean = false; constructor(public auth: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, private storage: StorageService) { settingsService.ecmHost = this.ecmHost; diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts index d32d9d5fd9..dddc4c9d30 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { DebugElement } from '@angular/core'; import { AlfrescoAuthenticationService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -43,7 +43,7 @@ describe('AlfrescoLogin', () => { ], declarations: [AlfrescoLoginComponent], providers: [ - AlfrescoSettingsService, + SettingsService, AlfrescoAuthenticationService, AlfrescoApiService, {provide: AlfrescoAuthenticationService, useClass: AuthenticationMock}, diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index af1cb015d3..e9df2f563e 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -20,7 +20,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { AlfrescoTranslationService, AlfrescoAuthenticationService, - AlfrescoSettingsService + SettingsService } from 'ng2-alfresco-core'; import { FormSubmitEvent } from '../models/form-submit-event.model'; @@ -80,7 +80,7 @@ export class AlfrescoLoginComponent implements OnInit { */ constructor(private _fb: FormBuilder, public authService: AlfrescoAuthenticationService, - public settingsService: AlfrescoSettingsService, + public settingsService: SettingsService, private translate: AlfrescoTranslationService) { translate.addTranslationFolder('ng2-alfresco-login', 'node_modules/ng2-alfresco-login/src'); diff --git a/ng2-components/ng2-alfresco-search/demo/src/main.ts b/ng2-components/ng2-alfresco-search/demo/src/main.ts index df8ea13e5f..f08ef8e5e2 100644 --- a/ng2-components/ng2-alfresco-search/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-search/demo/src/main.ts @@ -23,7 +23,7 @@ import { CoreModule } from 'ng2-alfresco-core'; import { SearchModule } from 'ng2-alfresco-search'; import { - AlfrescoSettingsService, + SettingsService, AlfrescoAuthenticationService, AlfrescoTranslationService } from 'ng2-alfresco-core'; @@ -58,7 +58,7 @@ class SearchDemo implements OnInit { ticket: string; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, translation: AlfrescoTranslationService) { settingsService.ecmHost = this.ecmHost; diff --git a/ng2-components/ng2-alfresco-tag/demo/src/main.ts b/ng2-components/ng2-alfresco-tag/demo/src/main.ts index 774505635c..43b17511ce 100644 --- a/ng2-components/ng2-alfresco-tag/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-tag/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, Input, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { TagModule } from 'ng2-alfresco-tag'; @Component({ @@ -60,7 +60,7 @@ class TagDemo implements OnInit { ticket: string; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, private storage: StorageService) { settingsService.ecmHost = this.ecmHost; diff --git a/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts b/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts index 440d376cb9..7ed1e03aed 100644 --- a/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts +++ b/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts @@ -18,7 +18,7 @@ import { ReflectiveInjector } from '@angular/core'; import { AlfrescoAuthenticationService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, StorageService } from 'ng2-alfresco-core'; @@ -32,7 +32,7 @@ describe('Tag service', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, AlfrescoAuthenticationService, TagService, diff --git a/ng2-components/ng2-alfresco-upload/demo/src/main.ts b/ng2-components/ng2-alfresco-upload/demo/src/main.ts index 2331aa3d29..d53fa954a3 100644 --- a/ng2-components/ng2-alfresco-upload/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-upload/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { UploadModule } from 'ng2-alfresco-upload'; @Component({ @@ -114,7 +114,7 @@ export class MyDemoApp implements OnInit { ticket: string; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, private storage: StorageService) { settingsService.ecmHost = this.ecmHost; settingsService.setProviders('ECM'); diff --git a/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts b/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts index f2c4b9d6df..cf67e2fc78 100644 --- a/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts @@ -21,7 +21,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { UserInfoComponentModule } from 'ng2-alfresco-userinfo'; import { CoreModule } from 'ng2-alfresco-core'; import { LoginModule } from 'ng2-alfresco-login'; -import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, SettingsService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-app-demo', @@ -93,7 +93,7 @@ class UserInfoDemo implements OnInit { public disableCsrf: boolean = false; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService) { + private settingsService: SettingsService) { settingsService.ecmHost = this.ecmHost; settingsService.bpmHost = this.bpmHost; } diff --git a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts index 68ffbaa99a..de0597bc5b 100644 --- a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { ViewerModule } from 'ng2-alfresco-viewer'; @Component({ @@ -55,7 +55,7 @@ class MyDemoApp { ticket: string; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, private storage: StorageService) { settingsService.ecmHost = this.ecmHost; settingsService.setProviders('ECM'); diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts index f7fc9c562f..9acd3784e9 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts @@ -20,7 +20,7 @@ import { ImgViewerComponent } from './imgViewer.component'; import { DebugElement } from '@angular/core'; import { AlfrescoAuthenticationService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -39,7 +39,7 @@ describe('Test ng2-alfresco-viewer Img viewer component ', () => { ], declarations: [ImgViewerComponent], providers: [ - AlfrescoSettingsService, + SettingsService, AlfrescoAuthenticationService, AlfrescoApiService ] diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts index 7f9600dda9..126b66ffe8 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts @@ -20,7 +20,7 @@ import { MediaPlayerComponent } from './mediaPlayer.component'; import { DebugElement } from '@angular/core'; import { AlfrescoAuthenticationService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -39,7 +39,7 @@ describe('Test ng2-alfresco-viewer Media player component ', () => { ], declarations: [MediaPlayerComponent], providers: [ - AlfrescoSettingsService, + SettingsService, AlfrescoAuthenticationService, AlfrescoApiService ] diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts index 4e87868bd8..748e9d3870 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts @@ -20,7 +20,7 @@ import { NotSupportedFormat } from './notSupportedFormat.component'; import { DebugElement } from '@angular/core'; import { AlfrescoAuthenticationService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -39,7 +39,7 @@ describe('Test ng2-alfresco-viewer Not Supported Format View component', () => { ], declarations: [NotSupportedFormat], providers: [ - AlfrescoSettingsService, + SettingsService, AlfrescoAuthenticationService, AlfrescoApiService ] diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts index c99b5e9532..fb996e5064 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts @@ -22,7 +22,7 @@ import { EventMock } from '../assets/event.mock'; import { DebugElement } from '@angular/core'; import { AlfrescoAuthenticationService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -41,7 +41,7 @@ describe('Test ng2-alfresco-viewer PdfViewer component', () => { ], declarations: [PdfViewerComponent], providers: [ - AlfrescoSettingsService, + SettingsService, AlfrescoAuthenticationService, AlfrescoApiService, RenderingQueueServices diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts index e610f0b329..63b46cfd5e 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts @@ -26,7 +26,7 @@ import { EventMock } from '../assets/event.mock'; import { DebugElement } from '@angular/core'; import { AlfrescoAuthenticationService, - AlfrescoSettingsService, + SettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -53,7 +53,7 @@ describe('Test ng2-alfresco-viewer ViewerComponent', () => { ImgViewerComponent ], providers: [ - AlfrescoSettingsService, + SettingsService, AlfrescoAuthenticationService, AlfrescoApiService, RenderingQueueServices diff --git a/ng2-components/ng2-alfresco-webscript/demo/src/main.ts b/ng2-components/ng2-alfresco-webscript/demo/src/main.ts index 9cf2f155ae..31b4052e2f 100644 --- a/ng2-components/ng2-alfresco-webscript/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-webscript/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; import { WebScriptModule } from 'ng2-alfresco-webscript'; @@ -63,7 +63,7 @@ class WebscriptDemo implements OnInit { ticket: string; constructor(private authService: AlfrescoAuthenticationService, - private settingsService: AlfrescoSettingsService, + private settingsService: SettingsService, private storage: StorageService) { settingsService.ecmHost = this.ecmHost; From 896c57fa5381f848d2d7eb052e3da94fecd2fde0 Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Wed, 4 Jan 2017 14:30:01 +0000 Subject: [PATCH 027/108] #1370 Removed deprecated AlfrescoAuthenticationService --- demo-shell-ng2/app/app.component.ts | 10 +++++----- demo-shell-ng2/app/components/files/files.component.ts | 6 +++--- .../app/components/search/search-bar.component.ts | 6 +++--- ng2-components/ng2-activiti-analytics/demo/src/main.ts | 4 ++-- ng2-components/ng2-activiti-diagrams/demo/src/main.ts | 4 ++-- ng2-components/ng2-activiti-form/demo/src/main.ts | 4 ++-- .../ng2-activiti-processlist/demo/src/main.ts | 4 ++-- .../activiti-process-instance-header.component.spec.ts | 4 ++-- ng2-components/ng2-activiti-tasklist/demo/src/main.ts | 4 ++-- .../src/assets/document-list.service.mock.ts | 4 ++-- ng2-components/ng2-alfresco-login/demo/src/main.ts | 4 ++-- .../src/components/alfresco-login.component.spec.ts | 6 +++--- .../src/components/alfresco-login.component.ts | 4 ++-- ng2-components/ng2-alfresco-search/demo/src/main.ts | 4 ++-- ng2-components/ng2-alfresco-tag/demo/src/main.ts | 4 ++-- .../ng2-alfresco-tag/src/services/tag.service.spec.ts | 4 ++-- ng2-components/ng2-alfresco-upload/demo/src/main.ts | 4 ++-- ng2-components/ng2-alfresco-userinfo/demo/src/main.ts | 4 ++-- ng2-components/ng2-alfresco-viewer/demo/src/main.ts | 4 ++-- .../src/componets/imgViewer.component.spec.ts | 4 ++-- .../src/componets/mediaPlayer.component.spec.ts | 4 ++-- .../src/componets/notSupportedFormat.component.spec.ts | 4 ++-- .../src/componets/pdfViewer.component.spec.ts | 4 ++-- .../src/componets/viewer.component.spec.ts | 4 ++-- ng2-components/ng2-alfresco-webscript/demo/src/main.ts | 4 ++-- 25 files changed, 56 insertions(+), 56 deletions(-) diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts index 47329d1491..a6e339bb30 100644 --- a/demo-shell-ng2/app/app.component.ts +++ b/demo-shell-ng2/app/app.component.ts @@ -20,7 +20,7 @@ import { Router } from '@angular/router'; import { AlfrescoTranslationService, - AlfrescoAuthenticationService, + AuthService, SettingsService, StorageService } from 'ng2-alfresco-core'; @@ -38,7 +38,7 @@ export class AppComponent { ecmHost: string = 'http://' + window.location.hostname + ':8080'; bpmHost: string = 'http://' + window.location.hostname + ':9999'; - constructor(public auth: AlfrescoAuthenticationService, + constructor(public authService: AuthService, public router: Router, public settingsService: SettingsService, private translate: AlfrescoTranslationService, @@ -60,11 +60,11 @@ export class AppComponent { isLoggedIn(): boolean { this.redirectToLoginPageIfNotLoggedIn(); - return this.auth.isLoggedIn(); + return this.authService.isLoggedIn(); } redirectToLoginPageIfNotLoggedIn(): void { - if (!this.isLoginPage() && !this.auth.isLoggedIn()) { + if (!this.isLoginPage() && !this.authService.isLoggedIn()) { this.router.navigate(['/login']); } } @@ -75,7 +75,7 @@ export class AppComponent { onLogout(event) { event.preventDefault(); - this.auth.logout() + this.authService.logout() .subscribe( () => { this.navigateToLogin(); diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts index 16142fcbc7..ec1046feb8 100644 --- a/demo-shell-ng2/app/components/files/files.component.ts +++ b/demo-shell-ng2/app/components/files/files.component.ts @@ -17,7 +17,7 @@ import { Component, OnInit, Optional, ViewChild } from '@angular/core'; import { ActivatedRoute, Params, Router } from '@angular/router'; -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; +import { AuthService } from 'ng2-alfresco-core'; import { DocumentActionsService, DocumentList, @@ -49,7 +49,7 @@ export class FilesComponent implements OnInit { documentList: DocumentList; constructor(private documentActions: DocumentActionsService, - public auth: AlfrescoAuthenticationService, + public authService: AuthService, private formService: FormService, private router: Router, @Optional() private route: ActivatedRoute) { @@ -106,7 +106,7 @@ export class FilesComponent implements OnInit { } }); } - if (this.auth.isBpmLoggedIn()) { + if (this.authService.isBpmLoggedIn()) { this.formService.getProcessDefinitions().subscribe( defs => this.setupBpmActions(defs || []), err => console.log(err) diff --git a/demo-shell-ng2/app/components/search/search-bar.component.ts b/demo-shell-ng2/app/components/search/search-bar.component.ts index 366e618434..a4e897c57e 100644 --- a/demo-shell-ng2/app/components/search/search-bar.component.ts +++ b/demo-shell-ng2/app/components/search/search-bar.component.ts @@ -17,7 +17,7 @@ import { Component, EventEmitter, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; +import { AuthService } from 'ng2-alfresco-core'; import { MinimalNodeEntity } from 'alfresco-js-api'; @Component({ @@ -34,11 +34,11 @@ export class SearchBarComponent { expand = new EventEmitter(); constructor(public router: Router, - public auth: AlfrescoAuthenticationService) { + public authService: AuthService) { } isLoggedIn(): boolean { - return this.auth.isLoggedIn(); + return this.authService.isLoggedIn(); } /** diff --git a/ng2-components/ng2-activiti-analytics/demo/src/main.ts b/ng2-components/ng2-activiti-analytics/demo/src/main.ts index 32438783c9..2c5ae6f71a 100644 --- a/ng2-components/ng2-activiti-analytics/demo/src/main.ts +++ b/ng2-components/ng2-activiti-analytics/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; import { AnalyticsModule } from 'ng2-activiti-analytics'; @Component({ @@ -60,7 +60,7 @@ export class AnalyticsDemoComponent implements OnInit { ticket: string; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService, private storage: StorageService) { settingsService.bpmHost = this.host; diff --git a/ng2-components/ng2-activiti-diagrams/demo/src/main.ts b/ng2-components/ng2-activiti-diagrams/demo/src/main.ts index 4b54e4470e..ec1c076cf7 100644 --- a/ng2-components/ng2-activiti-diagrams/demo/src/main.ts +++ b/ng2-components/ng2-activiti-diagrams/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; import { DiagramsModule } from 'ng2-activiti-diagrams'; @Component({ @@ -50,7 +50,7 @@ export class DiagramDemoComponent { ticket: string; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService, private storage: StorageService) { settingsService.bpmHost = this.host; diff --git a/ng2-components/ng2-activiti-form/demo/src/main.ts b/ng2-components/ng2-activiti-form/demo/src/main.ts index a896591d5f..4c712ac73a 100644 --- a/ng2-components/ng2-activiti-form/demo/src/main.ts +++ b/ng2-components/ng2-activiti-form/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; import { ActivitiFormModule } from 'ng2-activiti-form'; @Component({ @@ -49,7 +49,7 @@ export class FormDemoComponent implements OnInit { ticket: string; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService, private storage: StorageService) { settingsService.bpmHost = this.host; diff --git a/ng2-components/ng2-activiti-processlist/demo/src/main.ts b/ng2-components/ng2-activiti-processlist/demo/src/main.ts index aed9811da8..ae79dd1b32 100644 --- a/ng2-components/ng2-activiti-processlist/demo/src/main.ts +++ b/ng2-components/ng2-activiti-processlist/demo/src/main.ts @@ -28,7 +28,7 @@ import { ActivitiStartProcessInstance, ProcessInstance } from 'ng2-activiti-processlist'; -import { AlfrescoAuthenticationService, SettingsService, StorageService } from 'ng2-alfresco-core'; +import { AuthService, SettingsService, StorageService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; const currentProcessIdNew = '__NEW__'; @@ -160,7 +160,7 @@ class MyDemoApp implements OnInit { dataProcesses: ObjectDataTableAdapter; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService, private storage: StorageService) { settingsService.bpmHost = this.host; diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts index 28bb4e5f65..bbdb5e0490 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts @@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser'; import { AlfrescoTranslationService, CoreModule, - AlfrescoAuthenticationService, + AuthService, SettingsService, AlfrescoApiService } from 'ng2-alfresco-core'; @@ -49,7 +49,7 @@ describe('ActivitiProcessInstanceHeader', () => { ], providers: [ SettingsService, - AlfrescoAuthenticationService, + AuthService, AlfrescoApiService, ActivitiProcessService, {provide: AlfrescoTranslationService, useClass: TranslationMock} diff --git a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts index 9361a88752..7895c4bf11 100644 --- a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts +++ b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts @@ -26,7 +26,7 @@ import { ActivitiTaskList } from 'ng2-activiti-tasklist'; import { CoreModule } from 'ng2-alfresco-core'; -import { AlfrescoAuthenticationService, SettingsService, StorageService } from 'ng2-alfresco-core'; +import { AuthService, SettingsService, StorageService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; @Component({ @@ -144,7 +144,7 @@ class MyDemoApp implements OnInit { dataTasks: ObjectDataTableAdapter; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService, private storage: StorageService) { settingsService.bpmHost = this.host; diff --git a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts index 414087c380..694d530df2 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts @@ -21,7 +21,7 @@ import { PageNode } from './document-library.model.mock'; import { DocumentListService } from './../services/document-list.service'; import { SettingsService, - AlfrescoAuthenticationService, + AuthService, AlfrescoContentService, AlfrescoApiService } from 'ng2-alfresco-core'; @@ -34,7 +34,7 @@ export class DocumentListServiceMock extends DocumentListService { constructor( settings?: SettingsService, - authService?: AlfrescoAuthenticationService, + authService?: AuthService, contentService?: AlfrescoContentService, apiService?: AlfrescoApiService ) { diff --git a/ng2-components/ng2-alfresco-login/demo/src/main.ts b/ng2-components/ng2-alfresco-login/demo/src/main.ts index 307a669e32..94c2c1e89a 100644 --- a/ng2-components/ng2-alfresco-login/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; import { LoginModule } from 'ng2-alfresco-login'; @Component({ @@ -73,7 +73,7 @@ export class AppComponent { public disableCsrf: boolean = false; - constructor(public auth: AlfrescoAuthenticationService, + constructor(public authService: AuthService, private settingsService: SettingsService, private storage: StorageService) { diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts index dddc4c9d30..3ef9a26200 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts @@ -18,7 +18,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { DebugElement } from '@angular/core'; import { - AlfrescoAuthenticationService, + AuthService, SettingsService, AlfrescoApiService, CoreModule @@ -44,9 +44,9 @@ describe('AlfrescoLogin', () => { declarations: [AlfrescoLoginComponent], providers: [ SettingsService, - AlfrescoAuthenticationService, + AuthService, AlfrescoApiService, - {provide: AlfrescoAuthenticationService, useClass: AuthenticationMock}, + {provide: AuthService, useClass: AuthenticationMock}, {provide: AlfrescoTranslationService, useClass: TranslationMock} ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index e9df2f563e..cc8f351283 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -19,7 +19,7 @@ import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { AlfrescoTranslationService, - AlfrescoAuthenticationService, + AuthService, SettingsService } from 'ng2-alfresco-core'; import { FormSubmitEvent } from '../models/form-submit-event.model'; @@ -79,7 +79,7 @@ export class AlfrescoLoginComponent implements OnInit { * @param translate */ constructor(private _fb: FormBuilder, - public authService: AlfrescoAuthenticationService, + public authService: AuthService, public settingsService: SettingsService, private translate: AlfrescoTranslationService) { diff --git a/ng2-components/ng2-alfresco-search/demo/src/main.ts b/ng2-components/ng2-alfresco-search/demo/src/main.ts index f08ef8e5e2..6bdea012b6 100644 --- a/ng2-components/ng2-alfresco-search/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-search/demo/src/main.ts @@ -24,7 +24,7 @@ import { SearchModule } from 'ng2-alfresco-search'; import { SettingsService, - AlfrescoAuthenticationService, + AuthService, AlfrescoTranslationService } from 'ng2-alfresco-core'; @@ -57,7 +57,7 @@ class SearchDemo implements OnInit { ticket: string; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService, translation: AlfrescoTranslationService) { diff --git a/ng2-components/ng2-alfresco-tag/demo/src/main.ts b/ng2-components/ng2-alfresco-tag/demo/src/main.ts index 43b17511ce..f692ca3bc1 100644 --- a/ng2-components/ng2-alfresco-tag/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-tag/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, Input, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; import { TagModule } from 'ng2-alfresco-tag'; @Component({ @@ -59,7 +59,7 @@ class TagDemo implements OnInit { ticket: string; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService, private storage: StorageService) { diff --git a/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts b/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts index 7ed1e03aed..e34ac96c17 100644 --- a/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts +++ b/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts @@ -17,7 +17,7 @@ import { ReflectiveInjector } from '@angular/core'; import { - AlfrescoAuthenticationService, + AuthService, SettingsService, AlfrescoApiService, StorageService @@ -34,7 +34,7 @@ describe('Tag service', () => { injector = ReflectiveInjector.resolveAndCreate([ SettingsService, AlfrescoApiService, - AlfrescoAuthenticationService, + AuthService, TagService, StorageService ]); diff --git a/ng2-components/ng2-alfresco-upload/demo/src/main.ts b/ng2-components/ng2-alfresco-upload/demo/src/main.ts index d53fa954a3..b471e1c19b 100644 --- a/ng2-components/ng2-alfresco-upload/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-upload/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; import { UploadModule } from 'ng2-alfresco-upload'; @Component({ @@ -113,7 +113,7 @@ export class MyDemoApp implements OnInit { ticket: string; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService, private storage: StorageService) { settingsService.ecmHost = this.ecmHost; diff --git a/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts b/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts index cf67e2fc78..af1a7d573c 100644 --- a/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts @@ -21,7 +21,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { UserInfoComponentModule } from 'ng2-alfresco-userinfo'; import { CoreModule } from 'ng2-alfresco-core'; import { LoginModule } from 'ng2-alfresco-login'; -import { AlfrescoAuthenticationService, SettingsService } from 'ng2-alfresco-core'; +import { AuthService, SettingsService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-app-demo', @@ -92,7 +92,7 @@ class UserInfoDemo implements OnInit { public disableCsrf: boolean = false; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService) { settingsService.ecmHost = this.ecmHost; settingsService.bpmHost = this.bpmHost; diff --git a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts index de0597bc5b..f15c954086 100644 --- a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; import { ViewerModule } from 'ng2-alfresco-viewer'; @Component({ @@ -54,7 +54,7 @@ class MyDemoApp { ticket: string; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService, private storage: StorageService) { settingsService.ecmHost = this.ecmHost; diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts index 9acd3784e9..9d42031043 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { ImgViewerComponent } from './imgViewer.component'; import { DebugElement } from '@angular/core'; import { - AlfrescoAuthenticationService, + AuthService, SettingsService, AlfrescoApiService, CoreModule @@ -40,7 +40,7 @@ describe('Test ng2-alfresco-viewer Img viewer component ', () => { declarations: [ImgViewerComponent], providers: [ SettingsService, - AlfrescoAuthenticationService, + AuthService, AlfrescoApiService ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts index 126b66ffe8..b996cd6ae0 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { MediaPlayerComponent } from './mediaPlayer.component'; import { DebugElement } from '@angular/core'; import { - AlfrescoAuthenticationService, + AuthService, SettingsService, AlfrescoApiService, CoreModule @@ -40,7 +40,7 @@ describe('Test ng2-alfresco-viewer Media player component ', () => { declarations: [MediaPlayerComponent], providers: [ SettingsService, - AlfrescoAuthenticationService, + AuthService, AlfrescoApiService ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts index 748e9d3870..090002d5ca 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { NotSupportedFormat } from './notSupportedFormat.component'; import { DebugElement } from '@angular/core'; import { - AlfrescoAuthenticationService, + AuthService, SettingsService, AlfrescoApiService, CoreModule @@ -40,7 +40,7 @@ describe('Test ng2-alfresco-viewer Not Supported Format View component', () => { declarations: [NotSupportedFormat], providers: [ SettingsService, - AlfrescoAuthenticationService, + AuthService, AlfrescoApiService ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts index fb996e5064..c501cb8120 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts @@ -21,7 +21,7 @@ import { PdfViewerComponent } from './pdfViewer.component'; import { EventMock } from '../assets/event.mock'; import { DebugElement } from '@angular/core'; import { - AlfrescoAuthenticationService, + AuthService, SettingsService, AlfrescoApiService, CoreModule @@ -42,7 +42,7 @@ describe('Test ng2-alfresco-viewer PdfViewer component', () => { declarations: [PdfViewerComponent], providers: [ SettingsService, - AlfrescoAuthenticationService, + AuthService, AlfrescoApiService, RenderingQueueServices ] diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts index 63b46cfd5e..0dbbec350c 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts @@ -25,7 +25,7 @@ import { ViewerComponent } from './viewer.component'; import { EventMock } from '../assets/event.mock'; import { DebugElement } from '@angular/core'; import { - AlfrescoAuthenticationService, + AuthService, SettingsService, AlfrescoApiService, CoreModule @@ -54,7 +54,7 @@ describe('Test ng2-alfresco-viewer ViewerComponent', () => { ], providers: [ SettingsService, - AlfrescoAuthenticationService, + AuthService, AlfrescoApiService, RenderingQueueServices ] diff --git a/ng2-components/ng2-alfresco-webscript/demo/src/main.ts b/ng2-components/ng2-alfresco-webscript/demo/src/main.ts index 31b4052e2f..a4ede6c703 100644 --- a/ng2-components/ng2-alfresco-webscript/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-webscript/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AlfrescoAuthenticationService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; import { WebScriptModule } from 'ng2-alfresco-webscript'; @@ -62,7 +62,7 @@ class WebscriptDemo implements OnInit { scriptArgs: string = ''; ticket: string; - constructor(private authService: AlfrescoAuthenticationService, + constructor(private authService: AuthService, private settingsService: SettingsService, private storage: StorageService) { From 83fa409aeb7bdf30289e5a61baeb76b7eaba75df Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Wed, 4 Jan 2017 19:41:58 +0000 Subject: [PATCH 028/108] improve timeout test for travis --- ng2-components/ng2-alfresco-core/karma-test-shim.js | 2 +- ng2-components/ng2-alfresco-datatable/karma-test-shim.js | 2 +- ng2-components/ng2-alfresco-documentlist/karma-test-shim.js | 2 +- ng2-components/ng2-alfresco-login/karma-test-shim.js | 2 +- ng2-components/ng2-alfresco-search/karma-test-shim.js | 2 +- ng2-components/ng2-alfresco-tag/karma-test-shim.js | 2 +- ng2-components/ng2-alfresco-upload/karma-test-shim.js | 2 +- ng2-components/ng2-alfresco-viewer/karma-test-shim.js | 2 +- ng2-components/ng2-alfresco-webscript/karma-test-shim.js | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ng2-components/ng2-alfresco-core/karma-test-shim.js b/ng2-components/ng2-alfresco-core/karma-test-shim.js index cf8ce88322..9560f22e39 100644 --- a/ng2-components/ng2-alfresco-core/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-core/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-datatable/karma-test-shim.js b/ng2-components/ng2-alfresco-datatable/karma-test-shim.js index 53b3af8195..146cc85001 100644 --- a/ng2-components/ng2-alfresco-datatable/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-datatable/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js index 049ebd2672..49ec0cf63a 100644 --- a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-login/karma-test-shim.js b/ng2-components/ng2-alfresco-login/karma-test-shim.js index 53b3af8195..146cc85001 100644 --- a/ng2-components/ng2-alfresco-login/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-login/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-search/karma-test-shim.js b/ng2-components/ng2-alfresco-search/karma-test-shim.js index 53b3af8195..146cc85001 100644 --- a/ng2-components/ng2-alfresco-search/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-search/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-tag/karma-test-shim.js b/ng2-components/ng2-alfresco-tag/karma-test-shim.js index 53b3af8195..146cc85001 100644 --- a/ng2-components/ng2-alfresco-tag/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-tag/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-upload/karma-test-shim.js b/ng2-components/ng2-alfresco-upload/karma-test-shim.js index 53b3af8195..146cc85001 100644 --- a/ng2-components/ng2-alfresco-upload/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-upload/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-viewer/karma-test-shim.js b/ng2-components/ng2-alfresco-viewer/karma-test-shim.js index 53b3af8195..146cc85001 100644 --- a/ng2-components/ng2-alfresco-viewer/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-viewer/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-webscript/karma-test-shim.js b/ng2-components/ng2-alfresco-webscript/karma-test-shim.js index 049ebd2672..49ec0cf63a 100644 --- a/ng2-components/ng2-alfresco-webscript/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-webscript/karma-test-shim.js @@ -1,7 +1,7 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; __karma__.loaded = function() {}; From a35c2f7c04e40c18a8b5f1434f30b2fdeb4d508f Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Wed, 4 Jan 2017 19:48:53 +0000 Subject: [PATCH 029/108] #1385 fix build:w task (#1386) --- ng2-components/ng2-activiti-analytics/package.json | 2 +- ng2-components/ng2-activiti-diagrams/package.json | 2 +- ng2-components/ng2-activiti-form/package.json | 2 +- ng2-components/ng2-activiti-processlist/package.json | 2 +- ng2-components/ng2-activiti-tasklist/package.json | 2 +- ng2-components/ng2-alfresco-core/package.json | 2 +- ng2-components/ng2-alfresco-datatable/package.json | 2 +- ng2-components/ng2-alfresco-documentlist/package.json | 2 +- ng2-components/ng2-alfresco-login/package.json | 2 +- ng2-components/ng2-alfresco-search/package.json | 2 +- ng2-components/ng2-alfresco-tag/package.json | 2 +- ng2-components/ng2-alfresco-upload/package.json | 2 +- ng2-components/ng2-alfresco-userinfo/package.json | 2 +- ng2-components/ng2-alfresco-viewer/package.json | 2 +- ng2-components/ng2-alfresco-webscript/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index 5216f90876..99350d02cd 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json index bbcf8452ff..6abc9de701 100644 --- a/ng2-components/ng2-activiti-diagrams/package.json +++ b/ng2-components/ng2-activiti-diagrams/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index b18c63432d..0363a7fcbc 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index 6415c7423b..1a783193d8 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index 0d20ec74f6..2133f10eeb 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 9e22f66f0d..29958c0bdd 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts 'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index a149422023..6bc1d2a0ab 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 307f0954b7..042ebc90d3 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -6,7 +6,7 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 3d4aa2b24c..39c14ae50f 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 3d794f5ca8..6b5fabd693 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index ebe2cb8aa3..541cfc6058 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 0ddc990d02..9c185b4ea6 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json index 536261c4b6..ba1818b01b 100644 --- a/ng2-components/ng2-alfresco-userinfo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index 64d39b60fc..dcdcc3a085 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index 7e5966cd3e..3c99269101 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -7,7 +7,7 @@ "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && tsc:w && license-check npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", From 94f11a1aaedcdf7475b4e95ef9004b997778c44f Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 4 Jan 2017 19:49:24 +0000 Subject: [PATCH 030/108] Set default sorting of processes based on started date Refs #1307 --- .../app/components/activiti/activiti-demo.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index 98125b3730..b2fec92f42 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -122,6 +122,7 @@ export class ActivitiDemoComponent implements AfterViewInit { {type: 'text', key: 'started', title: 'Started', cssClass: 'hidden', sortable: true} ] ); + this.dataProcesses.setSorting(new DataSorting('started', 'desc')); // Uncomment this line to replace all 'text' field editors with custom component // formRenderingService.setComponentTypeResolver('text', () => CustomEditorComponent, true); From f89fe8e50a6bba001e503940304c753707b123bd Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Wed, 4 Jan 2017 22:29:01 +0000 Subject: [PATCH 031/108] #1393 remove old redirect code (#1394) --- demo-shell-ng2/app/app.component.html | 2 +- demo-shell-ng2/app/app.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html index 5ee422e46d..aeee137ec9 100644 --- a/demo-shell-ng2/app/app.component.html +++ b/demo-shell-ng2/app/app.component.html @@ -1,6 +1,6 @@
-
+
diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts index a6e339bb30..58cb6780ea 100644 --- a/demo-shell-ng2/app/app.component.ts +++ b/demo-shell-ng2/app/app.component.ts @@ -64,12 +64,12 @@ export class AppComponent { } redirectToLoginPageIfNotLoggedIn(): void { - if (!this.isLoginPage() && !this.authService.isLoggedIn()) { + if (!this.authService.isLoggedIn()) { this.router.navigate(['/login']); } } - isLoginPage(): boolean { + isAPageWithHeaderBar(): boolean { return location.pathname === '/login' || location.pathname === '/settings'; } From 099c32c6672c30d5b7ce57bc85244c29b52dfdda Mon Sep 17 00:00:00 2001 From: Will Abson Date: Thu, 5 Jan 2017 09:28:11 +0000 Subject: [PATCH 032/108] Use correct process-related typings for processlist filters Refs #1307 --- .../src/components/activiti-processlist.component.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts index d28f74b386..6235124060 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts @@ -18,7 +18,7 @@ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; -import { TaskQueryRequestRepresentationModel } from 'ng2-activiti-tasklist'; +import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model'; import { ProcessInstance } from '../models/process-instance.model'; import { ActivitiProcessService } from '../services/activiti-process.service'; @@ -46,7 +46,7 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { @Input() name: string; - requestNode: TaskQueryRequestRepresentationModel; + requestNode: ProcessFilterRequestRepresentation; @Input() data: DataTableAdapter; @@ -130,7 +130,7 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { ); } - private load(requestNode: TaskQueryRequestRepresentationModel) { + private load(requestNode: ProcessFilterRequestRepresentation) { this.processService.getProcessInstances(requestNode) .subscribe( (response) => { @@ -226,10 +226,9 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { let requestNode = { appDefinitionId: this.appId, processDefinitionKey: this.processDefinitionKey, - text: this.name, state: this.state, sort: this.sort }; - return new TaskQueryRequestRepresentationModel(requestNode); + return new ProcessFilterRequestRepresentation(requestNode); } } From 560d1bcd7f52879c57c2d4bb47cefccea9f012a8 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Thu, 5 Jan 2017 09:54:54 +0000 Subject: [PATCH 033/108] Fix Start Process button for processes without a start form (#1391) Refs #1390 --- .../components/activiti-start-process.component.spec.ts | 7 +++++-- .../src/components/activiti-start-process.component.ts | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts index ac0e534adb..11d01cb2c7 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts @@ -231,6 +231,8 @@ describe('ActivitiStartProcessInstance', () => { beforeEach(async(() => { component.name = 'My new process'; + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'appId': change }); fixture.detectChanges(); component.onProcessDefChange('my:process1'); fixture.whenStable(); @@ -243,14 +245,15 @@ describe('ActivitiStartProcessInstance', () => { expect(startBtn.properties['disabled']).toBe(true); })); - it('should have start button disabled when name not filled out', async(() => { + it('should have start button disabled when no process is selected', async(() => { component.onProcessDefChange(''); fixture.detectChanges(); expect(startBtn.properties['disabled']).toBe(true); })); - xit('should enable start button when name and process filled out', async(() => { + it('should enable start button when name and process filled out', async(() => { fixture.detectChanges(); + startBtn = debugElement.query(By.css('[data-automation-id="btn-start"]')); expect(startBtn.properties['disabled']).toBe(false); })); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts index 04cd99885e..04f600864c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts @@ -115,10 +115,10 @@ export class ActivitiStartProcessInstance implements OnChanges { } isStartFormMissingOrValid() { - if (this.startForm && this.startForm.form && this.startForm.form.isValid) { - return !this.startForm || this.startForm.form.isValid; + if (this.startForm) { + return this.startForm.form && this.startForm.form.isValid; } else { - return false; + return true; } } From 086c789d4d757a83caa42d9a48765aa481ec6cab Mon Sep 17 00:00:00 2001 From: Will Abson Date: Thu, 5 Jan 2017 12:04:03 +0000 Subject: [PATCH 034/108] Fix sorting of processlist to match that specified by filter Refs #1307 --- .../activiti-processlist.component.spec.ts | 19 +++++++++++++++++-- .../activiti-processlist.component.ts | 18 +++++++++++++++++- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts index 73582b1454..ca90dba508 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts @@ -21,7 +21,7 @@ import { Observable } from 'rxjs/Rx'; import { ActivitiProcessInstanceListComponent } from './activiti-processlist.component'; import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; -import { DataTableModule, ObjectDataRow, DataRowEvent, ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; +import { DataTableModule, ObjectDataRow, DataRowEvent, ObjectDataTableAdapter, DataSorting } from 'ng2-alfresco-datatable'; import { TranslationMock } from './../assets/translation.service.mock'; import { ProcessInstance } from '../models/process-instance.model'; @@ -275,7 +275,7 @@ describe('ActivitiProcessInstanceListComponent', () => { }); it('should reload the list when the sort parameter changes', (done) => { - const sort = 'desc'; + const sort = 'created-desc'; let change = new SimpleChange(null, sort); component.onSuccess.subscribe((res) => { @@ -290,6 +290,21 @@ describe('ActivitiProcessInstanceListComponent', () => { component.ngOnChanges({'sort': change}); }); + it('should sort the list when the sort parameter changes', (done) => { + const sort = 'created-asc'; + let change = new SimpleChange(null, sort); + let sortSpy = spyOn(component.data, 'setSorting'); + + component.onSuccess.subscribe((res) => { + expect(res).toBeDefined(); + expect(sortSpy).toHaveBeenCalledWith(new DataSorting('started', 'asc')); + done(); + }); + + component.sort = sort; + component.ngOnChanges({'sort': change}); + }); + it('should reload the process list when the name parameter changes', (done) => { const name = 'FakeTaskName'; let change = new SimpleChange(null, name); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts index 6235124060..c7d83635bb 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts @@ -17,7 +17,7 @@ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; -import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; +import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow, DataSorting } from 'ng2-alfresco-datatable'; import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model'; import { ProcessInstance } from '../models/process-instance.model'; @@ -168,9 +168,25 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { */ private renderInstances(instances: any[]) { instances = this.optimizeNames(instances); + this.setDatatableSorting(); this.data.setRows(instances); } + /** + * Sort the datatable rows based on current value of 'sort' property + */ + private setDatatableSorting() { + if (!this.sort) { + return; + } + let sortingParams: string[] = this.sort.split('-'); + if (sortingParams.length === 2) { + let sortColumn = sortingParams[0] === 'created' ? 'started' : sortingParams[0]; + let sortOrder = sortingParams[1]; + this.data.setSorting(new DataSorting(sortColumn, sortOrder)); + } + } + /** * Select the first instance of a list if present */ From d972393b72ce75882adedfdddeb7c9b9a10e7428 Mon Sep 17 00:00:00 2001 From: Vito Date: Thu, 5 Jan 2017 06:53:39 -0800 Subject: [PATCH 035/108] #1259 - fix assignee for checklist task (#1395) * #1259 - fix assignee for checklist task * #1259 - added checklist to tasklist readme --- .../ng2-activiti-tasklist/README.md | 24 +++++++++++++++++++ .../activiti-checklist.component.ts | 10 ++++++-- .../activiti-task-details.component.html | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ng2-components/ng2-activiti-tasklist/README.md b/ng2-components/ng2-activiti-tasklist/README.md index 2eb7821a25..8c36a53110 100644 --- a/ng2-components/ng2-activiti-tasklist/README.md +++ b/ng2-components/ng2-activiti-tasklist/README.md @@ -329,6 +329,30 @@ The component shows all the available filters. No options +## Basic usage example Activiti Checklist + +The component shows the checklist task functionality. + +```html + +``` + +#### Options + +| Name | Type | Required | Description | +| --- | --- | --- | --- | +| `taskId` | {string} | required | The id of the parent task which sub tasks are attached on. | +| `readOnlyForm` | {boolean} | optional | Toggle readonly state of the form. Enforces all form widgets render readonly if enabled. | +| `assignee` | {string} | required | The assignee id where the subtasks are assigned to. | + +## Basic usage example Activiti Checklist + +The component shows all the available filters. + +```html + +``` + ## Build from sources Alternatively you can build component from sources with the following commands: diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts index 202c3e0055..cdff69d151 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts @@ -38,6 +38,9 @@ export class ActivitiChecklist implements OnInit, OnChanges { @Input() readOnly: boolean = false; + @Input() + assignee: string; + @ViewChild('dialog') dialog: any; @@ -104,7 +107,11 @@ export class ActivitiChecklist implements OnInit, OnChanges { } public add() { - let newTask = new TaskDetailsModel({name: this.taskName, parentTaskId: this.taskId, assignee: {id: '1'}}); + let newTask = new TaskDetailsModel({ + name: this.taskName, + parentTaskId: this.taskId, + assignee: { id: this.assignee } + }); this.activitiTaskList.addTask(newTask).subscribe( (res: TaskDetailsModel) => { this.checklist.push(res); @@ -113,7 +120,6 @@ export class ActivitiChecklist implements OnInit, OnChanges { console.log(err); } ); - this.cancel(); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html index c59d74e9c8..e65cce9585 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html @@ -23,7 +23,7 @@ #activiticomments>
-
From 2d98a04f8715bdd3824637c55a2abdb8bacd78c4 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 5 Jan 2017 16:14:33 +0000 Subject: [PATCH 036/108] LogService implementation --- ng2-components/ng2-alfresco-core/README.md | 1 + ng2-components/ng2-alfresco-core/index.ts | 2 + .../ng2-alfresco-core/src/services/index.ts | 1 + .../src/services/log.service.ts | 51 +++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 ng2-components/ng2-alfresco-core/src/services/log.service.ts diff --git a/ng2-components/ng2-alfresco-core/README.md b/ng2-components/ng2-alfresco-core/README.md index 459deca8b3..1e4098830f 100644 --- a/ng2-components/ng2-alfresco-core/README.md +++ b/ng2-components/ng2-alfresco-core/README.md @@ -56,6 +56,7 @@ npm install --save ng2-alfresco-core ### Services +- **LogService**, log service implementation - **AlfrescoApiService**, provides access to Alfresco JS API instance - **AlfrescoAuthenticationService**, main authentication APIs - **AlfrescoTranslationService**, various i18n-related APIs diff --git a/ng2-components/ng2-alfresco-core/index.ts b/ng2-components/ng2-alfresco-core/index.ts index 52c133237f..4089ff40d3 100644 --- a/ng2-components/ng2-alfresco-core/index.ts +++ b/ng2-components/ng2-alfresco-core/index.ts @@ -33,6 +33,7 @@ import { AuthGuard, AuthGuardEcm, AuthGuardBpm, + LogService, /** @deprecated */ AlfrescoSettingsService, /** @deprecated */ AlfrescoTranslationService, @@ -48,6 +49,7 @@ export * from './src/components/index'; export * from './src/utils/index'; export const ALFRESCO_CORE_PROVIDERS: any[] = [ + LogService, AuthService, ContentService, SettingsService, diff --git a/ng2-components/ng2-alfresco-core/src/services/index.ts b/ng2-components/ng2-alfresco-core/src/services/index.ts index 591aa4245c..54f2d29e14 100644 --- a/ng2-components/ng2-alfresco-core/src/services/index.ts +++ b/ng2-components/ng2-alfresco-core/src/services/index.ts @@ -26,6 +26,7 @@ export * from './auth-guard.service'; export * from './auth-guard-ecm.service'; export * from './auth-guard-bpm.service'; +export * from './log.service'; export * from './auth.service'; export * from './content.service'; export * from './settings.service'; diff --git a/ng2-components/ng2-alfresco-core/src/services/log.service.ts b/ng2-components/ng2-alfresco-core/src/services/log.service.ts new file mode 100644 index 0000000000..6b7667857c --- /dev/null +++ b/ng2-components/ng2-alfresco-core/src/services/log.service.ts @@ -0,0 +1,51 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Injectable } from '@angular/core'; + +@Injectable() +export class LogService { + + get assert(): (message?: any, ...optionalParams: any[]) => void { + return console.error.bind(console); + } + + get error(): (message?: any, ...optionalParams: any[]) => void { + return console.error.bind(console); + } + + get group(): (message?: any, ...optionalParams: any[]) => void { + return console.error.bind(console); + } + + get groupEnd(): (message?: any, ...optionalParams: any[]) => void { + return console.error.bind(console); + } + + get info(): (message?: any, ...optionalParams: any[]) => void { + return console.info.bind(console); + } + + get log(): (message?: any, ...optionalParams: any[]) => void { + return console.log.bind(console); + } + + get warn(): (message?: any, ...optionalParams: any[]) => void { + return console.warn.bind(console); + } + +} From d42f41ec006db0bb12be60bb2b8095f6ff003d8d Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 5 Jan 2017 21:06:30 +0000 Subject: [PATCH 037/108] Migrate from window.console to LogService --- demo-shell-ng2/app/app.component.ts | 33 +- .../app/components/about/about.component.ts | 21 +- .../app/components/files/files.component.ts | 9 +- .../components/login/login-demo.component.ts | 10 +- .../components/setting/setting.component.ts | 29 +- .../webscript/webscript.component.ts | 39 +- .../ng2-activiti-analytics/demo/src/main.ts | 52 +- .../analytics-report-list.component.ts | 7 +- .../analytics-report-parameters.component.ts | 15 +- .../src/components/analytics.component.ts | 9 +- .../src/services/analytics.service.ts | 13 +- .../ng2-activiti-diagrams/demo/src/main.ts | 37 +- .../src/components/diagram.component.ts | 11 +- .../raphael-multiline-text.component.ts | 8 +- .../src/services/diagrams.service.ts | 7 +- .../ng2-activiti-form/demo/src/main.ts | 37 +- .../activiti-form.component.spec.ts | 16 +- .../src/components/activiti-form.component.ts | 18 +- .../activiti-start-form.component.ts | 20 +- .../widgets/attach/attach.widget.spec.ts | 11 +- .../widgets/attach/attach.widget.ts | 6 +- .../display-value.widget.spec.ts | 14 +- .../display-value/display-value.widget.ts | 32 +- .../widgets/dropdown/dropdown.widget.spec.ts | 16 +- .../widgets/dropdown/dropdown.widget.ts | 6 +- .../dynamic-table.widget.spec.ts | 11 +- .../dynamic-table/dynamic-table.widget.ts | 6 +- .../editors/dropdown/dropdown.editor.spec.ts | 4 +- .../editors/dropdown/dropdown.editor.ts | 7 +- .../functional-group.widget.spec.ts | 2 +- .../widgets/people/people.widget.spec.ts | 2 +- .../radio-buttons.widget.spec.ts | 17 +- .../radio-buttons/radio-buttons.widget.ts | 6 +- .../typeahead/typeahead.widget.spec.ts | 23 +- .../widgets/typeahead/typeahead.widget.ts | 6 +- .../widgets/upload/upload.widget.spec.ts | 4 +- .../widgets/upload/upload.widget.ts | 10 +- .../components/widgets/widget.component.ts | 7 - .../src/services/activiti-alfresco.service.ts | 7 +- .../src/services/ecm-model.service.ts | 17 +- .../src/services/form.service.spec.ts | 23 +- .../src/services/form.service.ts | 13 +- .../src/services/widget-visibility.service.ts | 21 +- .../ng2-activiti-processlist/demo/src/main.ts | 543 +++++++++--------- .../activiti-filters.component.spec.ts | 2 +- .../components/activiti-filters.component.ts | 15 +- ...process-instance-details.component.spec.ts | 4 +- ...viti-process-instance-details.component.ts | 9 +- ...iviti-process-instance-header.component.ts | 7 +- ...tiviti-process-instance-tasks.component.ts | 17 +- .../ng2-activiti-tasklist/demo/src/main.ts | 9 +- .../activiti-checklist.component.ts | 11 +- .../activiti-filters.component.spec.ts | 17 +- .../components/activiti-filters.component.ts | 12 +- .../activiti-people.component.spec.ts | 8 +- .../components/activiti-people.component.ts | 13 +- .../activiti-start-task.component.ts | 9 +- .../activiti-task-details.component.ts | 20 +- .../activiti-task-header.component.ts | 7 +- .../components/activiti-tasklist.component.ts | 9 +- .../no-task-detail-template.component.spec.ts | 2 +- .../src/services/activiti-people.service.ts | 9 +- .../src/services/activiti-tasklist.service.ts | 7 +- ng2-components/ng2-alfresco-core/index.ts | 10 +- .../AlfrescoAuthentication.service.ts | 8 +- .../src/services/AlfrescoContent.service.ts | 8 +- .../src/services/AlfrescoSettings.service.ts | 5 +- .../services/AlfrescoTranslation.service.ts | 6 +- .../src/services/auth.service.spec.ts | 4 +- .../src/services/auth.service.ts | 31 +- .../src/services/content.service.spec.ts | 4 +- .../src/services/log.service.ts | 18 +- .../src/services/renditions.service.spec.ts | 10 +- .../src/services/renditions.service.ts | 6 +- .../services/translate-loader.service.spec.ts | 13 +- .../src/services/translate-loader.service.ts | 8 +- .../src/services/translate.service.spec.ts | 13 +- .../src/data/object-datatable-adapter.ts | 8 +- .../demo/src/main.ts | 11 +- .../src/assets/document-list.service.mock.ts | 10 +- .../src/components/document-menu-action.ts | 14 +- .../services/document-list.service.spec.ts | 7 +- .../src/services/document-list.service.ts | 8 +- .../ng2-alfresco-login/demo/src/main.ts | 32 +- .../alfresco-login.component.spec.ts | 16 +- .../components/alfresco-login.component.ts | 23 +- .../ng2-alfresco-search/demo/src/main.ts | 18 +- .../alfresco-search.component.spec.ts | 18 +- .../services/alfresco-search.service.spec.ts | 5 +- .../alfresco-thumbnail.service.spec.ts | 5 +- .../ng2-alfresco-tag/demo/src/main.ts | 227 ++++---- .../src/services/tag.service.ts | 7 +- .../ng2-alfresco-upload/demo/src/main.ts | 23 +- .../src/components/upload-button.component.ts | 9 +- .../upload-drag-area.component.spec.ts | 11 +- .../components/upload-drag-area.component.ts | 9 +- .../src/services/upload.service.spec.ts | 1 - .../src/services/upload.service.ts | 21 +- .../ng2-alfresco-userinfo/demo/src/main.ts | 30 +- .../src/services/bpm-user.service.ts | 7 +- .../src/services/ecm-user.service.ts | 7 +- .../ng2-alfresco-viewer/demo/src/main.ts | 16 +- .../src/componets/pdfViewer.component.ts | 8 +- .../src/componets/viewer.component.ts | 12 +- .../ng2-alfresco-webscript/demo/src/main.ts | 237 ++++---- .../src/webscript.component.ts | 12 +- 106 files changed, 1177 insertions(+), 1171 deletions(-) diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts index 58cb6780ea..cf2ab3ed96 100644 --- a/demo-shell-ng2/app/app.component.ts +++ b/demo-shell-ng2/app/app.component.ts @@ -17,13 +17,7 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; - -import { - AlfrescoTranslationService, - AuthService, - SettingsService, - StorageService -} from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, AuthService, SettingsService, StorageService, LogService } from 'ng2-alfresco-core'; declare var document: any; @@ -38,22 +32,23 @@ export class AppComponent { ecmHost: string = 'http://' + window.location.hostname + ':8080'; bpmHost: string = 'http://' + window.location.hostname + ':9999'; - constructor(public authService: AuthService, - public router: Router, - public settingsService: SettingsService, - private translate: AlfrescoTranslationService, - private storage: StorageService) { + constructor(private authService: AuthService, + private router: Router, + private settingsService: SettingsService, + private translateService: AlfrescoTranslateService, + private storage: StorageService, + private logService: LogService) { this.setEcmHost(); this.setBpmHost(); this.setProvider(); - if (translate) { + if (translateService) { if (process.env.ENV === 'production') { - translate.addTranslationFolder('custom', 'i18n/custom-translation'); - translate.addTranslationFolder('ng2-alfresco-login', 'i18n/custom-translation/alfresco-login'); + translateService.addTranslationFolder('custom', 'i18n/custom-translation'); + translateService.addTranslationFolder('ng2-alfresco-login', 'i18n/custom-translation/alfresco-login'); } else { - translate.addTranslationFolder('custom', 'custom-translation'); - translate.addTranslationFolder('ng2-alfresco-login', 'custom-translation/alfresco-login'); + translateService.addTranslationFolder('custom', 'custom-translation'); + translateService.addTranslationFolder('ng2-alfresco-login', 'custom-translation/alfresco-login'); } } } @@ -84,7 +79,7 @@ export class AppComponent { if (error && error.response && error.response.status === 401) { this.navigateToLogin(); } else { - console.error('An unknown error occurred while logging out', error); + this.logService.error('An unknown error occurred while logging out', error); this.navigateToLogin(); } } @@ -107,7 +102,7 @@ export class AppComponent { } changeLanguage(lang: string) { - this.translate.use(lang); + this.translateService.use(lang); this.hideDrawer(); } diff --git a/demo-shell-ng2/app/components/about/about.component.ts b/demo-shell-ng2/app/components/about/about.component.ts index fbcd09611d..4fba975fe8 100644 --- a/demo-shell-ng2/app/components/about/about.component.ts +++ b/demo-shell-ng2/app/components/about/about.component.ts @@ -18,6 +18,7 @@ import { Component, OnInit } from '@angular/core'; import { Http } from '@angular/http'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; +import { LogService } from 'ng2-alfresco-core'; @Component({ selector: 'about-page', @@ -27,31 +28,31 @@ export class AboutComponent implements OnInit { data: ObjectDataTableAdapter; - constructor(private http: Http) { + constructor(private http: Http, + private logService: LogService) { } ngOnInit() { this.http.get('/versions.json').subscribe(response => { - var regexp = new RegExp("^(ng2-activiti|ng2-alfresco|alfresco-)", 'g'); + let regexp = new RegExp('^(ng2-activiti|ng2-alfresco|alfresco-)', 'g'); - var alfrescoPackages = Object.keys(response.json().dependencies).filter(function (val) { - console.log(val); + let alfrescoPackages = Object.keys(response.json().dependencies).filter((val) => { + this.logService.log(val); return regexp.test(val); }); - let alfrescoPackagesTableRappresentation = []; - alfrescoPackages.forEach((val)=> { - console.log(response.json().dependencies[val]); - alfrescoPackagesTableRappresentation.push({name:val,version:response.json().dependencies[val].version}); + let alfrescoPackagesTableRappresentation = []; + alfrescoPackages.forEach((val) => { + this.logService.log(response.json().dependencies[val]); + alfrescoPackagesTableRappresentation.push({name: val, version: response.json().dependencies[val].version}); }); - console.log(alfrescoPackagesTableRappresentation); + this.logService.log(alfrescoPackagesTableRappresentation); this.data = new ObjectDataTableAdapter(alfrescoPackagesTableRappresentation, [ {type: 'text', key: 'name', title: 'Name', sortable: true}, {type: 'text', key: 'version', title: 'Version', sortable: true} ]); }); - } } diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts index ec1046feb8..c4cda092de 100644 --- a/demo-shell-ng2/app/components/files/files.component.ts +++ b/demo-shell-ng2/app/components/files/files.component.ts @@ -17,7 +17,7 @@ import { Component, OnInit, Optional, ViewChild } from '@angular/core'; import { ActivatedRoute, Params, Router } from '@angular/router'; -import { AuthService } from 'ng2-alfresco-core'; +import { AuthService, LogService } from 'ng2-alfresco-core'; import { DocumentActionsService, DocumentList, @@ -49,8 +49,9 @@ export class FilesComponent implements OnInit { documentList: DocumentList; constructor(private documentActions: DocumentActionsService, - public authService: AuthService, + private authService: AuthService, private formService: FormService, + private logService: LogService, private router: Router, @Optional() private route: ActivatedRoute) { documentActions.setHandler('my-handler', this.myDocumentActionHandler.bind(this)); @@ -109,10 +110,10 @@ export class FilesComponent implements OnInit { if (this.authService.isBpmLoggedIn()) { this.formService.getProcessDefinitions().subscribe( defs => this.setupBpmActions(defs || []), - err => console.log(err) + err => this.logService.error(err) ); } else { - console.log('You are not logged in'); + this.logService.warn('You are not logged in to BPM'); } } 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 d5ee054b33..2014686652 100644 --- a/demo-shell-ng2/app/components/login/login-demo.component.ts +++ b/demo-shell-ng2/app/components/login/login-demo.component.ts @@ -18,7 +18,7 @@ import { Component, ViewChild, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { Validators } from '@angular/forms'; -import { StorageService } from 'ng2-alfresco-core'; +import { StorageService, LogService } from 'ng2-alfresco-core'; @Component({ selector: 'login-demo', @@ -38,7 +38,9 @@ export class LoginDemoComponent implements OnInit { isECM: boolean = true; isBPM: boolean = false; - constructor(public router: Router, private storage: StorageService) { + constructor(private router: Router, + private storage: StorageService, + private logService: LogService) { this.customValidation = { username: ['', Validators.compose([Validators.required, Validators.minLength(4)])], password: ['', Validators.required] @@ -75,7 +77,7 @@ export class LoginDemoComponent implements OnInit { } onError($event) { - console.log($event); + this.logService.error($event); } toggleECM() { @@ -92,7 +94,7 @@ export class LoginDemoComponent implements OnInit { this.disableCsrf = !this.disableCsrf; } - updateProvider(){ + updateProvider() { if (this.isBPM && this.isECM) { this.providers = 'ALL'; return this.providers; diff --git a/demo-shell-ng2/app/components/setting/setting.component.ts b/demo-shell-ng2/app/components/setting/setting.component.ts index f5c96045aa..bd0644c378 100644 --- a/demo-shell-ng2/app/components/setting/setting.component.ts +++ b/demo-shell-ng2/app/components/setting/setting.component.ts @@ -16,7 +16,7 @@ */ import { Component } from '@angular/core'; -import { SettingsService, StorageService } from 'ng2-alfresco-core'; +import { SettingsService, StorageService, LogService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-setting-demo', @@ -28,24 +28,31 @@ export class SettingComponent { ecmHost: string; bpmHost: string; - constructor(public settingsService: SettingsService, - private storage: StorageService) { + constructor(private settingsService: SettingsService, + private storage: StorageService, + private logService: LogService) { this.ecmHost = this.settingsService.ecmHost; this.bpmHost = this.settingsService.bpmHost; } public onChangeECMHost(event: KeyboardEvent): void { - console.log((event.target).value); - this.ecmHost = (event.target).value; - this.settingsService.ecmHost = this.ecmHost; - this.storage.setItem(`ecmHost`, this.ecmHost); + let value = (event.target).value.trim(); + if (value) { + this.logService.info(`ECM host: ${value}`); + this.ecmHost = value; + this.settingsService.ecmHost = value; + this.storage.setItem(`ecmHost`, value); + } } public onChangeBPMHost(event: KeyboardEvent): void { - console.log((event.target).value); - this.bpmHost = (event.target).value; - this.settingsService.bpmHost = this.bpmHost; - this.storage.setItem(`bpmHost`, this.bpmHost); + let value = (event.target).value.trim(); + if (value) { + this.logService.info(`BPM host: ${value}`); + this.bpmHost = value; + this.settingsService.bpmHost = value; + this.storage.setItem(`bpmHost`, value); + } } } diff --git a/demo-shell-ng2/app/components/webscript/webscript.component.ts b/demo-shell-ng2/app/components/webscript/webscript.component.ts index 9d00332036..4587498c80 100644 --- a/demo-shell-ng2/app/components/webscript/webscript.component.ts +++ b/demo-shell-ng2/app/components/webscript/webscript.component.ts @@ -16,42 +16,41 @@ */ import { Component } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-webscript-demo', template: ` - -
-
-
-
-
-
- +
+
+
+
+
+
+ + ` }) export class WebscriptComponent { currentPath: string = '/'; - authenticated: boolean; - host: string = 'http://127.0.0.1:8080'; - scriptPath: string = 'sample/folder/Company%20Home'; - contextRoot: string = 'alfresco'; - servicePath: string = 'service'; - scriptArgs: string = ''; + constructor(private logService: LogService) { + } + logData(data) { - console.log(data); + this.logService.log(data); } } diff --git a/ng2-components/ng2-activiti-analytics/demo/src/main.ts b/ng2-components/ng2-activiti-analytics/demo/src/main.ts index 2c5ae6f71a..e38c634a64 100644 --- a/ng2-components/ng2-activiti-analytics/demo/src/main.ts +++ b/ng2-components/ng2-activiti-analytics/demo/src/main.ts @@ -18,51 +18,49 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; import { AnalyticsModule } from 'ng2-activiti-analytics'; @Component({ selector: 'alfresco-app-demo', template: ` -
-
-
-

-
- Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid ticket to perform - operations. -
-
+
+
+
+

+
+ Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid ticket to perform + operations. +
+
-
-
- -
-
- -
-
- +
+
+ +
+
+ +
+
+ +
-
` + ` }) export class AnalyticsDemoComponent implements OnInit { appId: number; - report: any; - authenticated: boolean; - host: string = 'http://localhost:9999'; - ticket: string; constructor(private authService: AuthService, private settingsService: SettingsService, - private storage: StorageService) { + private storage: StorageService, + private logService: LogService) { settingsService.bpmHost = this.host; settingsService.setProviders('BPM'); @@ -91,12 +89,12 @@ export class AnalyticsDemoComponent implements OnInit { login() { this.authService.login('admin', 'admin').subscribe( ticket => { - console.log(ticket); + this.logService.log(ticket); this.ticket = this.authService.getTicketBpm(); this.authenticated = true; }, error => { - console.log(error); + this.logService.error(error); this.authenticated = false; }); } diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts index 3f42d93a44..ca2649f230 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts @@ -17,6 +17,7 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import { Observer, Observable } from 'rxjs/Rx'; +import { LogService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; import { ReportParametersModel } from '../models/report.model'; @@ -44,8 +45,8 @@ export class AnalyticsReportListComponent implements OnInit { reports: ReportParametersModel[] = []; - constructor(private analyticsService: AnalyticsService) { - + constructor(private analyticsService: AnalyticsService, + private logService: LogService) { this.report$ = new Observable(observer => this.reportObserver = observer).share(); } @@ -82,7 +83,7 @@ export class AnalyticsReportListComponent implements OnInit { }, (err: any) => { this.onError.emit(err); - console.log(err); + this.logService.error(err); } ); } diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts index 452d9448b0..9cb535115a 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts @@ -16,11 +16,11 @@ */ import { Component, EventEmitter, OnInit, OnChanges, Input, Output, SimpleChanges, OnDestroy, AfterViewChecked } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; -import { AnalyticsService } from '../services/analytics.service'; -import { ReportParametersModel, ReportQuery, ParameterValueModel, ReportParameterDetailsModel } from '../models/report.model'; import { FormGroup, FormBuilder, FormControl } from '@angular/forms'; import * as moment from 'moment'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AnalyticsService } from '../services/analytics.service'; +import { ReportParametersModel, ReportQuery, ParameterValueModel, ReportParameterDetailsModel } from '../models/report.model'; declare var componentHandler; @@ -72,7 +72,8 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On constructor(private translateService: AlfrescoTranslateService, private analyticsService: AnalyticsService, - private formBuilder: FormBuilder ) { + private formBuilder: FormBuilder, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src'); } @@ -148,7 +149,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On } }, (err: any) => { - console.log(err); + this.logService.error(err); this.onError.emit(err); } ); @@ -162,7 +163,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On this.onSuccessParamOpt.emit(opts); }, (err: any) => { - console.log(err); + this.logService.error(err); this.onError.emit(err); } ); @@ -233,7 +234,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On this.onEdit.emit(this.reportParameters.name); }, (err: any) => { - console.log(err); + this.logService.error(err); this.onError.emit(err); } ); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts index 186fe8f8f4..9e5328101e 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, OnChanges, Input, Output, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; import { ReportQuery } from '../models/report.model'; import { Chart } from '../models/chart.model'; @@ -71,8 +71,9 @@ export class AnalyticsComponent implements OnChanges { }; constructor(private translateService: AlfrescoTranslateService, - private analyticsService: AnalyticsService) { - console.log('AnalyticsComponent'); + private analyticsService: AnalyticsService, + private logService: LogService) { + logService.info('AnalyticsComponent'); if (translateService) { translateService.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src'); } @@ -91,7 +92,7 @@ export class AnalyticsComponent implements OnChanges { }, (err: any) => { this.onError.emit(err); - console.log(err); + this.logService.error(err); } ); } diff --git a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts index 672f85b644..344b742ae0 100644 --- a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts +++ b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts @@ -18,14 +18,15 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; import { Response } from '@angular/http'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { ReportParametersModel, ParameterValueModel } from '../models/report.model'; import { Chart, PieChart, TableChart, BarChart, HeatMapChart, MultiBarChart, DetailsTableChart } from '../models/chart.model'; @Injectable() export class AnalyticsService { - constructor(public apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService, + private logService: LogService) { } /** @@ -170,21 +171,21 @@ export class AnalyticsService { }).catch(this.handleError); } - public createDefaultReports(): Observable { + createDefaultReports(): Observable { return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.createDefaultReports()) .map(this.toJson) .catch(this.handleError); } - public updateReport(reportId: number, name: string): Observable { + updateReport(reportId: number, name: string): Observable { return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.updateReport(reportId, name)) .map((res: any) => { - console.log('upload'); + this.logService.info('upload'); }).catch(this.handleError); } private handleError(error: Response) { - console.error(error); + this.logService.error(error); return Observable.throw(error.json().error || 'Server error'); } diff --git a/ng2-components/ng2-activiti-diagrams/demo/src/main.ts b/ng2-components/ng2-activiti-diagrams/demo/src/main.ts index ec1c076cf7..b51b86ac6b 100644 --- a/ng2-components/ng2-activiti-diagrams/demo/src/main.ts +++ b/ng2-components/ng2-activiti-diagrams/demo/src/main.ts @@ -19,40 +19,39 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; import { DiagramsModule } from 'ng2-activiti-diagrams'; @Component({ selector: 'alfresco-app-demo', template: ` -
-
-
-

-
- Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid ticket to perform - operations. -
-
+
+
+
+

+
+ Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid ticket to perform + operations. +
+
-
- - ` +
+ + + ` }) export class DiagramDemoComponent { processDefinitionId: string = 'ThirdProcess:1:15053'; - authenticated: boolean; - host: string = 'http://localhost:9999'; - ticket: string; constructor(private authService: AuthService, private settingsService: SettingsService, - private storage: StorageService) { + private storage: StorageService, + private logService: LogService) { settingsService.bpmHost = this.host; settingsService.setProviders('BPM'); @@ -77,12 +76,12 @@ export class DiagramDemoComponent { login() { this.authService.login('admin', 'admin').subscribe( ticket => { - console.log(ticket); + this.logService.info(`Logged in with ticket ${ticket}`); this.ticket = this.authService.getTicketBpm(); this.authenticated = true; }, error => { - console.log(error); + this.logService.error(error); this.authenticated = false; }); } diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts index 4d279e3df5..58a31157d4 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts @@ -16,7 +16,7 @@ */ import { Component, ElementRef, Input, Output, EventEmitter, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { DiagramsService } from '../services/diagrams.service'; import { DiagramColorService } from '../services/diagram-color.service'; import { RaphaelService } from './raphael/raphael.service'; @@ -57,17 +57,16 @@ export class DiagramComponent { PADDING_HEIGHT: number = 60; private diagram: DiagramModel; - private elementRef: ElementRef; - constructor(elementRef: ElementRef, + constructor(private elementRef: ElementRef, private translateService: AlfrescoTranslateService, private diagramColorService: DiagramColorService, private raphaelService: RaphaelService, - private diagramsService: DiagramsService) { + private diagramsService: DiagramsService, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-activiti-diagrams', 'node_modules/ng2-activiti-diagrams/src'); } - this.elementRef = elementRef; } ngOnChanges(changes: SimpleChanges) { @@ -86,7 +85,7 @@ export class DiagramComponent { }, (err: any) => { this.onError.emit(err); - console.log(err); + this.logService.error(err); } ); } diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-multiline-text.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-multiline-text.component.ts index 0b294970a0..60a1961804 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-multiline-text.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-multiline-text.component.ts @@ -16,6 +16,7 @@ */ import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { Point } from './models/point'; import { RaphaelBase } from './raphael-base'; import { RaphaelService } from './raphael.service'; @@ -43,19 +44,20 @@ export class RaphaelMultilineTextDirective extends RaphaelBase implements OnInit TEXT_PADDING = 3; constructor(public elementRef: ElementRef, - raphaelService: RaphaelService) { + raphaelService: RaphaelService, + private logService: LogService) { super(elementRef, raphaelService); } ngOnInit() { - console.log(this.elementRef); + this.logService.log(this.elementRef); if (this.text === null || this.text === undefined) { this.text = ''; } this.draw(this.position, this.text); } - public draw(position: Point, text: string) { + draw(position: Point, text: string) { let textPaper = this.paper.text(position.x + this.TEXT_PADDING, position.y + this.TEXT_PADDING, text).attr({ 'text-anchor': 'middle', 'font-family': 'Arial', diff --git a/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts b/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts index 67fbb7f83b..92a663c2ea 100644 --- a/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts +++ b/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts @@ -16,16 +16,17 @@ */ import { Injectable } from '@angular/core'; -import { AuthService, SettingsService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; import { Response, Http, Headers, RequestOptions } from '@angular/http'; +import { AuthService, SettingsService, LogService } from 'ng2-alfresco-core'; @Injectable() export class DiagramsService { constructor(private authService: AuthService, private http: Http, - private settingsService: SettingsService) { + private settingsService: SettingsService, + private logService: LogService) { } getProcessDefinitionModel(processDefinitionId: string): Observable { @@ -53,7 +54,7 @@ export class DiagramsService { } private handleError(error: Response) { - console.error(error); + this.logService.error(error); return Observable.throw(error.json().error || 'Server error'); } } diff --git a/ng2-components/ng2-activiti-form/demo/src/main.ts b/ng2-components/ng2-activiti-form/demo/src/main.ts index 4c712ac73a..e8d54ab833 100644 --- a/ng2-components/ng2-activiti-form/demo/src/main.ts +++ b/ng2-components/ng2-activiti-form/demo/src/main.ts @@ -18,40 +18,39 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; import { ActivitiFormModule } from 'ng2-activiti-form'; @Component({ selector: 'alfresco-app-demo', template: ` -
-
-
-

-
- Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid ticket to perform - operations. -
-
+
+
+
+

+
+ Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid ticket to perform + operations. +
+
-
- - ` +
+ + + ` }) export class FormDemoComponent implements OnInit { taskId: number; - authenticated: boolean; - host: string = 'http://localhost:9999'; - ticket: string; constructor(private authService: AuthService, private settingsService: SettingsService, - private storage: StorageService) { + private storage: StorageService, + private logService: LogService) { settingsService.bpmHost = this.host; settingsService.setProviders('BPM'); @@ -76,12 +75,12 @@ export class FormDemoComponent implements OnInit { login() { this.authService.login('admin', 'admin').subscribe( ticket => { - console.log(ticket); + this.logService.info(`Logged in with ticket ${ticket}`); this.ticket = this.authService.getTicketBpm(); this.authenticated = true; }, error => { - console.log(error); + this.logService.error(error); this.authenticated = false; }); } diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts index efe827c78e..a10895e55d 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts @@ -17,6 +17,7 @@ import { Observable } from 'rxjs/Rx'; import { SimpleChange } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { ActivitiForm } from './activiti-form.component'; import { FormModel, FormOutcomeModel, FormFieldModel, FormOutcomeEvent, FormFieldTypes } from './widgets/index'; import { FormService } from './../services/form.service'; @@ -30,6 +31,7 @@ describe('ActivitiForm', () => { let formComponent: ActivitiForm; let visibilityService: WidgetVisibilityService; let nodeService: NodeService; + let logService: LogService; beforeEach(() => { componentHandler = jasmine.createSpyObj('componentHandler', [ @@ -37,11 +39,12 @@ describe('ActivitiForm', () => { ]); window['componentHandler'] = componentHandler; - visibilityService = new WidgetVisibilityService(null); + logService = new LogService(); + visibilityService = new WidgetVisibilityService(null, logService); spyOn(visibilityService, 'refreshVisibility').and.stub(); - formService = new FormService(null, null); + formService = new FormService(null, null, logService); nodeService = new NodeService(null); - formComponent = new ActivitiForm(formService, visibilityService, null, nodeService); + formComponent = new ActivitiForm(formService, visibilityService, null, nodeService, logService); }); it('should upgrade MDL content on view checked', () => { @@ -560,13 +563,6 @@ describe('ActivitiForm', () => { expect(formService.completeTaskForm).not.toHaveBeenCalled(); }); - it('should log error to console by default', () => { - const error = 'Error'; - spyOn(console, 'log').and.stub(); - formComponent.handleError(error); - expect(console.log).toHaveBeenCalledWith(error); - }); - it('should complete form form and raise corresponding event', () => { spyOn(formService, 'completeTaskForm').and.callFake(() => { return Observable.create(observer => { diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts index e515d5f0ac..1e14a6846c 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts @@ -15,14 +15,8 @@ * limitations under the License. */ -import { - Component, - OnInit, AfterViewChecked, OnChanges, - SimpleChanges, - Input, - Output, - EventEmitter -} from '@angular/core'; +import { Component, OnInit, AfterViewChecked, OnChanges, SimpleChanges, Input, Output, EventEmitter } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { EcmModelService } from './../services/ecm-model.service'; import { FormService } from './../services/form.service'; import { NodeService } from './../services/node.service'; @@ -149,9 +143,10 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { debugMode: boolean = false; constructor(protected formService: FormService, - public visibilityService: WidgetVisibilityService, + protected visibilityService: WidgetVisibilityService, private ecmModelService: EcmModelService, - private nodeService: NodeService) { + private nodeService: NodeService, + private logService: LogService) { } hasForm(): boolean { @@ -357,7 +352,6 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { id => { this.formService.getFormDefinitionById(id).subscribe( form => { - // console.log('Get Form By Form definition Name', form); this.form = this.parseForm(form); this.formLoaded.emit(this.form); }, @@ -405,7 +399,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { } handleError(err: any): any { - console.log(err); + this.logService.error(err); this.onError.emit(err); } diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index c10770e93b..9052c9373c 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -15,17 +15,8 @@ * limitations under the License. */ -import { - Component, - AfterViewChecked, OnChanges, - SimpleChanges, - Input, - ViewChild, - ElementRef, - Output, - EventEmitter -} from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { Component, AfterViewChecked, OnChanges, SimpleChanges, Input, ViewChild, ElementRef, Output, EventEmitter } from '@angular/core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ActivitiForm } from './activiti-form.component'; import { FormService } from './../services/form.service'; import { WidgetVisibilityService } from './../services/widget-visibility.service'; @@ -74,10 +65,11 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, @ViewChild('outcomesContainer', {}) outcomesContainer: ElementRef = null; - constructor(private translate: AlfrescoTranslationService, + constructor(private translate: AlfrescoTranslateService, formService: FormService, - visibilityService: WidgetVisibilityService) { - super(formService, visibilityService, null, null); + visibilityService: WidgetVisibilityService, + logService: LogService) { + super(formService, visibilityService, null, null, logService); if (this.translate) { this.translate.addTranslationFolder('ng2-activiti-form', 'node_modules/ng2-activiti-form/src'); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts index 95121ed10b..2d767db20b 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.spec.ts @@ -16,6 +16,7 @@ */ import { Observable } from 'rxjs/Rx'; +import { LogServiceMock } from 'ng2-alfresco-core'; import { AttachWidget } from './attach.widget'; import { ActivitiAlfrescoContentService } from '../../../services/activiti-alfresco.service'; import { FormFieldModel } from './../core/form-field.model'; @@ -28,10 +29,12 @@ describe('AttachWidget', () => { let widget: AttachWidget; let contentService: ActivitiAlfrescoContentService; let dialogPolyfill: any; + let logService: LogServiceMock; beforeEach(() => { - contentService = new ActivitiAlfrescoContentService(null); - widget = new AttachWidget(contentService); + logService = new LogServiceMock(); + contentService = new ActivitiAlfrescoContentService(null, logService); + widget = new AttachWidget(contentService, logService); dialogPolyfill = { registerDialog(obj: any) { @@ -268,9 +271,9 @@ describe('AttachWidget', () => { Observable.throw(error) ); - spyOn(console, 'log').and.stub(); + spyOn(logService, 'error').and.stub(); widget.getExternalContentNodes(); - expect(console.log).toHaveBeenCalledWith(error); + expect(logService.error).toHaveBeenCalledWith(error); }); it('should register dialog via polyfill', () => { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.ts index e4881ac9f9..8b6ae72cc9 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/attach/attach.widget.ts @@ -16,6 +16,7 @@ */ import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { WidgetComponent } from './../widget.component'; import { ActivitiAlfrescoContentService } from '../../../services/activiti-alfresco.service'; import { ExternalContent } from '../core/external-content'; @@ -49,7 +50,8 @@ export class AttachWidget extends WidgetComponent implements OnInit { @ViewChild('dialog') dialog: any; - constructor(private contentService: ActivitiAlfrescoContentService) { + constructor(private contentService: ActivitiAlfrescoContentService, + private logService: LogService) { super(); } @@ -97,7 +99,7 @@ export class AttachWidget extends WidgetComponent implements OnInit { this.contentService.getAlfrescoNodes(this.selectedFolderAccountId, this.selectedFolderPathId) .subscribe( nodes => this.selectedFolderNodes = nodes, - error => this.handleError(error) + error => this.logService.error(error) ); } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts index 6ac0dbe149..17e3b896ef 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { CoreModule } from 'ng2-alfresco-core'; +import { CoreModule, LogServiceMock } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; import { DisplayValueWidget } from './display-value.widget'; import { FormService } from '../../../services/form.service'; @@ -32,11 +32,13 @@ describe('DisplayValueWidget', () => { let widget: DisplayValueWidget; let formService: FormService; let visibilityService: WidgetVisibilityService; + let logService: LogServiceMock; beforeEach(() => { - formService = new FormService(null, null); - visibilityService = new WidgetVisibilityService(null); - widget = new DisplayValueWidget(formService, visibilityService); + logService = new LogServiceMock(); + formService = new FormService(null, null, logService); + visibilityService = new WidgetVisibilityService(null, logService); + widget = new DisplayValueWidget(formService, visibilityService, logService); }); it('should require field to setup default value', () => { @@ -390,7 +392,7 @@ describe('DisplayValueWidget', () => { Observable.throw(error) ); - spyOn(console, 'log').and.stub(); + spyOn(logService, 'error').and.stub(); let form = new FormModel({taskId: ''}); @@ -406,7 +408,7 @@ describe('DisplayValueWidget', () => { }); widget.ngOnInit(); expect(formService.getRestFieldValues).toHaveBeenCalled(); - expect(console.log).toHaveBeenCalledWith(error); + expect(logService.error).toHaveBeenCalledWith(error); expect(widget.value).toBe('100'); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts index c446f92085..d9e3751c60 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts @@ -17,6 +17,7 @@ import { Component, OnInit } from '@angular/core'; import * as moment from 'moment'; +import { LogService } from 'ng2-alfresco-core'; import { WidgetComponent } from './../widget.component'; import { FormFieldTypes } from '../core/form-field-types'; import { FormService } from '../../../services/form.service'; @@ -49,7 +50,8 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit { hasFile: boolean = false; constructor(private formService: FormService, - private visibilityService: WidgetVisibilityService) { + private visibilityService: WidgetVisibilityService, + private logService: LogService) { super(); } @@ -182,7 +184,7 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit { this.visibilityService.refreshVisibility(this.field.form); }, error => { - console.log(error); + this.logService.error(error); this.value = this.field.value; } ); @@ -192,21 +194,21 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit { this.formService .getRestFieldValues(this.field.form.taskId, this.field.id) .subscribe( - (result: FormFieldOption[]) => { - let options = result || []; - let toSelect = options.find(item => item.id === this.field.value); - this.field.options = options; - if (toSelect) { - this.value = toSelect.name; - } else { + (result: FormFieldOption[]) => { + let options = result || []; + let toSelect = options.find(item => item.id === this.field.value); + this.field.options = options; + if (toSelect) { + this.value = toSelect.name; + } else { + this.value = this.field.value; + } + this.visibilityService.refreshVisibility(this.field.form); + }, + error => { + this.logService.error(error); this.value = this.field.value; } - this.visibilityService.refreshVisibility(this.field.form); - }, - error => { - console.log(error); - this.value = this.field.value; - } ); } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts index 1d263dff8e..1930b6abb3 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts @@ -15,14 +15,14 @@ * limitations under the License. */ +import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; +import { CoreModule } from 'ng2-alfresco-core'; import { FormService } from '../../../services/form.service'; import { DropdownWidget } from './dropdown.widget'; import { FormModel } from './../core/form.model'; import { FormFieldModel } from './../core/form-field.model'; import { FormFieldOption } from './../core/form-field-option'; -import { CoreModule } from 'ng2-alfresco-core'; -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { EcmModelService } from '../../../services/ecm-model.service'; import { WidgetVisibilityService } from '../../../services/widget-visibility.service'; @@ -33,9 +33,9 @@ describe('DropdownWidget', () => { let visibilityService: WidgetVisibilityService; beforeEach(() => { - formService = new FormService(null, null); - visibilityService = new WidgetVisibilityService(null); - widget = new DropdownWidget(formService, visibilityService); + formService = new FormService(null, null, null); + visibilityService = new WidgetVisibilityService(null, null); + widget = new DropdownWidget(formService, visibilityService, null); widget.field = new FormFieldModel(new FormModel()); }); @@ -74,12 +74,6 @@ describe('DropdownWidget', () => { expect(formService.getRestFieldValues).toHaveBeenCalledWith(taskId, fieldId); }); - it('should log error to console by default', () => { - spyOn(console, 'error').and.stub(); - widget.handleError('Err'); - expect(console.error).toHaveBeenCalledWith('Err'); - }); - it('should preserve empty option when loading fields', () => { let restFieldValue: FormFieldOption = { id: '1', name: 'Option1' }; spyOn(formService, 'getRestFieldValues').and.returnValue( diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts index f1c56639d0..a21d86ad1d 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts @@ -16,6 +16,7 @@ */ import { Component, OnInit } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { FormService } from '../../../services/form.service'; import { WidgetComponent } from './../widget.component'; import { FormFieldOption } from './../core/form-field-option'; @@ -30,7 +31,8 @@ import { WidgetVisibilityService } from '../../../services/widget-visibility.ser export class DropdownWidget extends WidgetComponent implements OnInit { constructor(private formService: FormService, - private visibilityService: WidgetVisibilityService) { + private visibilityService: WidgetVisibilityService, + private logService: LogService) { super(); } @@ -97,7 +99,7 @@ export class DropdownWidget extends WidgetComponent implements OnInit { } handleError(error: any) { - console.error(error); + this.logService.error(error); } } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts index 2c6c33d793..44b9a6f672 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts @@ -15,6 +15,7 @@ * limitations under the License. */ +import { LogServiceMock } from 'ng2-alfresco-core'; import { DynamicTableWidget } from './dynamic-table.widget'; import { DynamicTableModel, DynamicTableRow, DynamicTableColumn } from './dynamic-table.widget.model'; import { FormModel, FormFieldTypes } from './../core/index'; @@ -25,11 +26,13 @@ describe('DynamicTableWidget', () => { let widget: DynamicTableWidget; let table: DynamicTableModel; let visibilityService: WidgetVisibilityService; + let logService: LogServiceMock; beforeEach(() => { + logService = new LogServiceMock(); table = new DynamicTableModel(null); - visibilityService = new WidgetVisibilityService(null); - widget = new DynamicTableWidget(null, visibilityService); + visibilityService = new WidgetVisibilityService(null, logService); + widget = new DynamicTableWidget(null, visibilityService, logService); widget.content = table; }); @@ -192,13 +195,13 @@ describe('DynamicTableWidget', () => { }); it('should require table to save changes', () => { - spyOn(console, 'log').and.stub(); + spyOn(logService, 'error').and.stub(); widget.editMode = true; widget.content = null; widget.onSaveChanges(); expect(widget.editMode).toBeFalsy(); - expect(console.log).toHaveBeenCalledWith(widget.ERROR_MODEL_NOT_FOUND); + expect(logService.error).toHaveBeenCalledWith(widget.ERROR_MODEL_NOT_FOUND); }); it('should cancel changes', () => { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.ts index 324aa05a96..8abf093760 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.ts @@ -16,6 +16,7 @@ */ import { Component, ElementRef, OnInit } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { WidgetComponent } from './../widget.component'; import { DynamicTableModel, DynamicTableRow, DynamicTableColumn } from './dynamic-table.widget.model'; import { WidgetVisibilityService } from '../../../services/widget-visibility.service'; @@ -36,7 +37,8 @@ export class DynamicTableWidget extends WidgetComponent implements OnInit { editRow: DynamicTableRow = null; constructor(private elementRef: ElementRef, - private visibilityService: WidgetVisibilityService) { + private visibilityService: WidgetVisibilityService, + private logService: LogService) { super(); } @@ -136,7 +138,7 @@ export class DynamicTableWidget extends WidgetComponent implements OnInit { } this.content.flushValue(); } else { - this.handleError(this.ERROR_MODEL_NOT_FOUND); + this.logService.error(this.ERROR_MODEL_NOT_FOUND); } this.editMode = false; } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts index 4db043d2c3..0a355f5a71 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts @@ -39,7 +39,7 @@ describe('DropdownEditorComponent', () => { let row: DynamicTableRow; beforeEach(() => { - formService = new FormService(null, null); + formService = new FormService(null, null, null); row = { value: { dropdown: 'one' } }; column = { @@ -56,7 +56,7 @@ describe('DropdownEditorComponent', () => { table.rows.push(row); table.columns.push(column); - component = new DropdownEditorComponent(formService); + component = new DropdownEditorComponent(formService, null); component.table = table; component.row = row; component.column = column; diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts index 7a3f349686..0bafb62d33 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts @@ -16,6 +16,7 @@ */ import { Component, Input, OnInit } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { DynamicTableModel, DynamicTableRow, DynamicTableColumn, DynamicTableColumnOption } from './../../dynamic-table.widget.model'; import { FormService } from './../../../../../services/form.service'; @@ -39,7 +40,9 @@ export class DropdownEditorComponent implements OnInit { @Input() column: DynamicTableColumn; - constructor(private formService: FormService) {} + constructor(private formService: FormService, + private logService: LogService) { + } ngOnInit() { let field = this.table.field; @@ -98,6 +101,6 @@ export class DropdownEditorComponent implements OnInit { } handleError(error: any) { - console.error(error); + this.logService.error(error); } } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts index e314372f74..025445ff14 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts @@ -36,7 +36,7 @@ describe('FunctionalGroupWidget', () => { ]); window['componentHandler'] = componentHandler; - formService = new FormService(null, null); + formService = new FormService(null, null, null); elementRef = new ElementRef(null); widget = new FunctionalGroupWidget(formService, elementRef); widget.field = new FormFieldModel(new FormModel()); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts index dc6309c157..21d24c5468 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts @@ -36,7 +36,7 @@ describe('PeopleWidget', () => { ]); window['componentHandler'] = componentHandler; - formService = new FormService(null, null); + formService = new FormService(null, null, null); elementRef = new ElementRef(null); widget = new PeopleWidget(formService, elementRef); widget.field = new FormFieldModel(new FormModel()); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts index 7c0e1d1e50..d2a8e0927e 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts @@ -15,13 +15,14 @@ * limitations under the License. */ +import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; +import { CoreModule, LogServiceMock } from 'ng2-alfresco-core'; + import { FormService } from '../../../services/form.service'; import { RadioButtonsWidget } from './radio-buttons.widget'; import { FormModel } from './../core/form.model'; import { FormFieldModel } from './../core/form-field.model'; -import { CoreModule } from 'ng2-alfresco-core'; -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { EcmModelService } from '../../../services/ecm-model.service'; import { WidgetVisibilityService } from '../../../services/widget-visibility.service'; import { FormFieldTypes } from '../core/form-field-types'; @@ -33,11 +34,13 @@ describe('RadioButtonsWidget', () => { let formService: FormService; let widget: RadioButtonsWidget; let visibilityService: WidgetVisibilityService; + let logService: LogServiceMock; beforeEach(() => { - formService = new FormService(null, null); - visibilityService = new WidgetVisibilityService(null); - widget = new RadioButtonsWidget(formService, visibilityService); + logService = new LogServiceMock(); + formService = new FormService(null, null, logService); + visibilityService = new WidgetVisibilityService(null, logService); + widget = new RadioButtonsWidget(formService, visibilityService, logService); widget.field = new FormFieldModel(new FormModel(), { restUrl: '' }); }); @@ -118,9 +121,9 @@ describe('RadioButtonsWidget', () => { }); it('should log error to console by default', () => { - spyOn(console, 'error').and.stub(); + spyOn(logService, 'error').and.stub(); widget.handleError('Err'); - expect(console.error).toHaveBeenCalledWith('Err'); + expect(logService.error).toHaveBeenCalledWith('Err'); }); xit('should update the field value when an option is selected', () => { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.ts index 1018bbb925..f92316c546 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.ts @@ -16,6 +16,7 @@ */ import { Component, OnInit } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { WidgetComponent } from './../widget.component'; import { FormService } from '../../../services/form.service'; import { FormFieldOption } from './../core/form-field-option'; @@ -30,7 +31,8 @@ import { WidgetVisibilityService } from '../../../services/widget-visibility.ser export class RadioButtonsWidget extends WidgetComponent implements OnInit { constructor(private formService: FormService, - private visibilityService: WidgetVisibilityService) { + private visibilityService: WidgetVisibilityService, + private logService: LogService) { super(); } @@ -84,7 +86,7 @@ export class RadioButtonsWidget extends WidgetComponent implements OnInit { } handleError(error: any) { - console.error(error); + this.logService.error(error); } } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts index b79759c6ba..70ef25000a 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts @@ -15,14 +15,15 @@ * limitations under the License. */ +import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; +import { CoreModule, LogServiceMock } from 'ng2-alfresco-core'; + import { TypeaheadWidget } from './typeahead.widget'; import { FormService } from '../../../services/form.service'; import { FormModel } from '../core/form.model'; import { FormFieldModel } from '../core/form-field.model'; import { FormFieldOption } from '../core/form-field-option'; -import { CoreModule } from 'ng2-alfresco-core'; -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { EcmModelService } from '../../../services/ecm-model.service'; import { WidgetVisibilityService } from '../../../services/widget-visibility.service'; import { FormFieldTypes } from '../core/form-field-types'; @@ -32,11 +33,13 @@ describe('TypeaheadWidget', () => { let formService: FormService; let widget: TypeaheadWidget; let visibilityService: WidgetVisibilityService; + let logService: LogServiceMock; beforeEach(() => { - formService = new FormService(null, null); - visibilityService = new WidgetVisibilityService(null); - widget = new TypeaheadWidget(formService, visibilityService); + logService = new LogServiceMock(); + formService = new FormService(null, null, logService); + visibilityService = new WidgetVisibilityService(null, logService); + widget = new TypeaheadWidget(formService, visibilityService, logService); widget.field = new FormFieldModel(new FormModel({ taskId: 'task-id' })); }); @@ -73,7 +76,7 @@ describe('TypeaheadWidget', () => { }); const err = 'Error'; spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.throw(err)); - spyOn(widget, 'handleError').and.callThrough(); + spyOn(widget, 'handleError').and.stub(); widget.ngOnInit(); @@ -94,7 +97,7 @@ describe('TypeaheadWidget', () => { }); const err = 'Error'; spyOn(formService, 'getRestFieldValuesByProcessId').and.returnValue(Observable.throw(err)); - spyOn(widget, 'handleError').and.callThrough(); + spyOn(widget, 'handleError').and.stub(); widget.ngOnInit(); @@ -102,12 +105,6 @@ describe('TypeaheadWidget', () => { expect(widget.handleError).toHaveBeenCalledWith(err); }); - it('should log error to console by default', () => { - spyOn(console, 'error').and.stub(); - widget.handleError('Err'); - expect(console.error).toHaveBeenCalledWith('Err'); - }); - it('should show popup on key up', () => { spyOn(widget, 'getOptions').and.returnValue([{}, {}]); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.ts index 6dd4a18a36..253c9cd08a 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.ts @@ -16,6 +16,7 @@ */ import { Component, OnInit } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { FormService } from './../../../services/form.service'; import { WidgetComponent } from './../widget.component'; import { FormFieldOption } from './../core/form-field-option'; @@ -35,7 +36,8 @@ export class TypeaheadWidget extends WidgetComponent implements OnInit { options: FormFieldOption[] = []; constructor(private formService: FormService, - private visibilityService: WidgetVisibilityService) { + private visibilityService: WidgetVisibilityService, + private logService: LogService) { super(); } @@ -153,7 +155,7 @@ export class TypeaheadWidget extends WidgetComponent implements OnInit { } handleError(error: any) { - console.error(error); + this.logService.error(error); } checkVisibility() { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.spec.ts index 5a2bc669df..9e1fd1ec8b 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.spec.ts @@ -26,8 +26,8 @@ describe('UploadWidget', () => { let formService: FormService; beforeEach(() => { - formService = new FormService(null, null); - widget = new UploadWidget(formService); + formService = new FormService(null, null, null); + widget = new UploadWidget(formService, null); }); it('should setup with field data', () => { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.ts index f9814ba388..2314853757 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.ts @@ -16,6 +16,7 @@ */ import { Component, OnInit } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { WidgetComponent } from './../widget.component'; import { FormService } from '../../../services/form.service'; @@ -31,7 +32,8 @@ export class UploadWidget extends WidgetComponent implements OnInit { fileName: string; displayText: string; - constructor(private formService: FormService) { + constructor(private formService: FormService, + private logService: LogService) { super(); } @@ -60,16 +62,14 @@ export class UploadWidget extends WidgetComponent implements OnInit { onFileChanged(event: any) { let files = event.target.files; if (files && files.length > 0) { - let file = files[0]; - this.formService.createTemporaryRawRelatedContent(file) .subscribe((response: any) => { - console.log(response); + this.logService.info(response); this.field.value = [response]; this.field.json.value = [response]; }, (error: any) => { - console.error(error); + this.logService.error(error); window.alert('Error uploading file. See console output for more details.'); }); } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.ts b/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.ts index 6112834853..490f764680 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.ts @@ -111,11 +111,4 @@ export class WidgetComponent implements AfterViewInit { } return null; } - - protected handleError(error: any) { - if (error) { - console.log(error); - } - } - } diff --git a/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts b/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts index 474745ee33..e9a02d7fa6 100644 --- a/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { ExternalContent } from '../components/widgets/core/external-content'; import { ExternalContentLink } from '../components/widgets/core/external-content-link'; import { AlfrescoApi } from 'alfresco-js-api'; @@ -28,7 +28,8 @@ export class ActivitiAlfrescoContentService { static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error'; static GENERIC_ERROR_MESSAGE: string = 'Server error'; - constructor(private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService, + private logService: LogService) { } /** @@ -85,7 +86,7 @@ export class ActivitiAlfrescoContentService { errMsg = (error.message) ? error.message : error.status ? `${error.status} - ${error.statusText}` : ActivitiAlfrescoContentService.GENERIC_ERROR_MESSAGE; } - console.error(errMsg); + this.logService.error(errMsg); return Observable.throw(errMsg); } } diff --git a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts index 6fa60acc14..0b15c99a61 100644 --- a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { FormModel } from '../components/widgets/core/form.model'; @Injectable() @@ -27,7 +27,8 @@ export class EcmModelService { public static MODEL_NAME: string = 'activitiFormsModel'; public static TYPE_MODEL: string = 'cm:folder'; - constructor(public apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService, + private logService: LogService) { } public createEcmTypeForActivitiForm(formName: string, form: FormModel): Observable { @@ -62,10 +63,10 @@ export class EcmModelService { return Observable.create(observer => { this.createEcmModel(EcmModelService.MODEL_NAME, EcmModelService.MODEL_NAMESPACE).subscribe( model => { - console.log('model created', model); + this.logService.info('model created', model); this.activeEcmModel(EcmModelService.MODEL_NAME).subscribe( modelActive => { - console.log('model active', modelActive); + this.logService.info('model active', modelActive); this.createEcmTypeWithProperties(formName, form).subscribe(typeCreated => { observer.next(typeCreated); observer.complete(); @@ -83,7 +84,7 @@ export class EcmModelService { return Observable.create(observer => { this.searchEcmType(formName, EcmModelService.MODEL_NAME).subscribe( ecmType => { - console.log('custom types', ecmType); + this.logService.info('custom types', ecmType); if (!ecmType) { this.createEcmTypeWithProperties(formName, form).subscribe(typeCreated => { observer.next(typeCreated); @@ -103,10 +104,10 @@ export class EcmModelService { return Observable.create(observer => { this.createEcmType(formName, EcmModelService.MODEL_NAME, EcmModelService.TYPE_MODEL).subscribe( typeCreated => { - console.log('type Created', typeCreated); + this.logService.info('type Created', typeCreated); this.addPropertyToAType(EcmModelService.MODEL_NAME, formName, form).subscribe( properyAdded => { - console.log('property Added', properyAdded); + this.logService.info('property Added', properyAdded); observer.next(typeCreated); observer.complete(); }, @@ -196,6 +197,6 @@ export class EcmModelService { } handleError(err: any): any { - console.log(err); + this.logService.error(err); } } diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts index 158390154a..28339b0ded 100644 --- a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { CoreModule, AlfrescoApiService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoApiService, LogService, LogServiceMock } from 'ng2-alfresco-core'; import { FormService } from './form.service'; import { EcmModelService } from './ecm-model.service'; import { FormDefinitionModel } from '../models/form-definition.model'; @@ -29,6 +29,7 @@ describe('FormService', () => { let responseBody: any; let service: FormService; let apiService: AlfrescoApiService; + let logService: LogService; beforeEach(() => { TestBed.configureTestingModule({ @@ -37,11 +38,13 @@ describe('FormService', () => { ], providers: [ EcmModelService, - FormService + FormService, + { provide: LogService, useClass: LogServiceMock } ] }); service = TestBed.get(FormService); apiService = TestBed.get(AlfrescoApiService); + logService = TestBed.get(LogService); }); beforeEach(() => { @@ -270,34 +273,34 @@ describe('FormService', () => { }); it('should handle error with generic message', () => { - spyOn(console, 'error').and.stub(); + spyOn(logService, 'error').and.stub(); service.handleError(null); - expect(console.error).toHaveBeenCalledWith(FormService.UNKNOWN_ERROR_MESSAGE); + expect(logService.error).toHaveBeenCalledWith(FormService.UNKNOWN_ERROR_MESSAGE); }); it('should handle error with error message', () => { - spyOn(console, 'error').and.stub(); + spyOn(logService, 'error').and.stub(); const message = ''; service.handleError({message: message}); - expect(console.error).toHaveBeenCalledWith(message); + expect(logService.error).toHaveBeenCalledWith(message); }); it('should handle error with detailed message', () => { - spyOn(console, 'error').and.stub(); + spyOn(logService, 'error').and.stub(); service.handleError({ status: '400', statusText: 'Bad request' }); - expect(console.error).toHaveBeenCalledWith('400 - Bad request'); + expect(logService.error).toHaveBeenCalledWith('400 - Bad request'); }); it('should handle error with generic message', () => { - spyOn(console, 'error').and.stub(); + spyOn(logService, 'error').and.stub(); service.handleError({}); - expect(console.error).toHaveBeenCalledWith(FormService.GENERIC_ERROR_MESSAGE); + expect(logService.error).toHaveBeenCalledWith(FormService.GENERIC_ERROR_MESSAGE); }); it('should get all the forms with modelType=2', (done) => { diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.ts b/ng2-components/ng2-activiti-form/src/services/form.service.ts index bcb2ae22f2..3e76e9a13c 100644 --- a/ng2-components/ng2-activiti-form/src/services/form.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/form.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { FormValues } from './../components/widgets/core/index'; import { FormDefinitionModel } from '../models/form-definition.model'; import { EcmModelService } from './ecm-model.service'; @@ -31,7 +31,8 @@ export class FormService { static GENERIC_ERROR_MESSAGE: string = 'Server error'; constructor(private ecmModelService: EcmModelService, - private apiService: AlfrescoApiService) { + private apiService: AlfrescoApiService, + private logService: LogService) { } /** @@ -271,11 +272,10 @@ export class FormService { if (xhr.status === 200) { let json = JSON.parse(xhr.response); let data: GroupModel[] = (json.data || []).map(item => item); - // console.log(json); observer.next(data); observer.complete(); } else { - console.error(xhr.response); + this.logService.error(xhr.response); Observable.throw(new Error(xhr.response)); } } @@ -303,11 +303,10 @@ export class FormService { if (xhr.status === 200) { let json = JSON.parse(xhr.response); let data: GroupUserModel[] = (json.data || []).map(item => item); - // console.log(json); observer.next(data); observer.complete(); } else { - console.error(xhr.response); + this.logService.error(xhr.response); Observable.throw(new Error(xhr.response)); } } @@ -354,7 +353,7 @@ export class FormService { errMsg = (error.message) ? error.message : error.status ? `${error.status} - ${error.statusText}` : FormService.GENERIC_ERROR_MESSAGE; } - console.error(errMsg); + this.logService.error(errMsg); return Observable.throw(errMsg); } } diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts index df269ba529..a9056c2c37 100644 --- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts @@ -17,24 +17,19 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; -import { - FormModel, - FormFieldModel, - TabModel, - ContainerModel, - ContainerColumnModel -} from '../components/widgets/core/index'; +import * as moment from 'moment'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; +import { FormModel, FormFieldModel, TabModel, ContainerModel, ContainerColumnModel } from '../components/widgets/core/index'; import { WidgetVisibilityModel } from '../models/widget-visibility.model'; import { TaskProcessVariableModel } from '../models/task-process-variable.model'; -import * as moment from 'moment'; @Injectable() export class WidgetVisibilityService { private processVarList: TaskProcessVariableModel[]; - constructor(private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService, + private logService: LogService) { } public refreshVisibility(form: FormModel) { @@ -201,7 +196,7 @@ export class WidgetVisibilityService { case 'or-not': return previousValue || !newValue; default: - console.error('NO valid operation! wrong op request : ' + logicOp); + this.logService.error('NO valid operation! wrong op request : ' + logicOp); break; } } @@ -225,7 +220,7 @@ export class WidgetVisibilityService { case '!empty': return leftValue ? leftValue !== '' : false; default: - console.error('NO valid operation!'); + this.logService.error('NO valid operation!'); break; } return; @@ -250,7 +245,7 @@ export class WidgetVisibilityService { } private handleError() { - console.error('Error while performing a call'); + this.logService.error('Error while performing a call'); return Observable.throw('Error while performing a call - Server error'); } } diff --git a/ng2-components/ng2-activiti-processlist/demo/src/main.ts b/ng2-components/ng2-activiti-processlist/demo/src/main.ts index ae79dd1b32..a732101e37 100644 --- a/ng2-components/ng2-activiti-processlist/demo/src/main.ts +++ b/ng2-components/ng2-activiti-processlist/demo/src/main.ts @@ -1,274 +1,275 @@ -/*! - * @license - * Copyright 2016 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { DebugElement, Input, NgModule, Component, OnInit, ViewChild } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { AppDefinitionRepresentationModel, ActivitiTaskListModule } from 'ng2-activiti-tasklist'; -import { CoreModule } from 'ng2-alfresco-core'; -import { - ActivitiProcessListModule, - ActivitiProcessFilters, - ActivitiProcessInstanceDetails, - ActivitiProcessInstanceListComponent, - ActivitiStartProcessInstance, - ProcessInstance -} from 'ng2-activiti-processlist'; +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { DebugElement, Input, NgModule, Component, OnInit, ViewChild } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import { AppDefinitionRepresentationModel, ActivitiTaskListModule } from 'ng2-activiti-tasklist'; +import { CoreModule, LogService } from 'ng2-alfresco-core'; +import { + ActivitiProcessListModule, + ActivitiProcessFilters, + ActivitiProcessInstanceDetails, + ActivitiProcessInstanceListComponent, + ActivitiStartProcessInstance, + ProcessInstance +} from 'ng2-activiti-processlist'; import { AuthService, SettingsService, StorageService } from 'ng2-alfresco-core'; -import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; - -const currentProcessIdNew = '__NEW__'; - -@Component({ - selector: 'alfresco-app-demo', - template: ` -
-
-
-

-
- Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid ticket to perform - operations. -
-
- -
- -
- - - -
- APPS - PROCESS LIST -
-
- -
- - - -
-
- -
-
- - - -
-
-
-
-

Process Filters

- - -
-
-

Process List

- -
-
-

Process Details

- -

Process Variables

- -
-
-

Start Process

- -
-
-
-
- -
-
-`, - styles: [` - header { - min-height: 48px; - } - h2 { - font-size: 14px; - line-height: 20px; - margin: 10px 0; - } - `] -}) -class MyDemoApp implements OnInit { - - authenticated: boolean; - - host: string = 'http://localhost:9999'; - - ticket: string; - - @ViewChild('tabmain') - tabMain: DebugElement; - - @ViewChild('tabheader') - tabHeader: DebugElement; - - @ViewChild(ActivitiProcessFilters) - activitiprocessfilter: ActivitiProcessFilters; - - @ViewChild(ActivitiProcessInstanceListComponent) - activitiprocesslist: ActivitiProcessInstanceListComponent; - - @ViewChild(ActivitiProcessInstanceDetails) - activitiprocessdetails: ActivitiProcessInstanceDetails; - - @ViewChild(ActivitiStartProcessInstance) - activitiStartProcess: ActivitiStartProcessInstance; - - @Input() - appId: number; - - processFilter: any; - - currentProcessInstanceId: string; - - dataProcesses: ObjectDataTableAdapter; - +import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; + +const currentProcessIdNew = '__NEW__'; + +@Component({ + selector: 'alfresco-app-demo', + template: ` +
+
+
+

+
+ Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid ticket to perform + operations. +
+
+ +
+ +
+ + + +
+ APPS + PROCESS LIST +
+
+ +
+ + + +
+
+ +
+
+ + + +
+
+
+
+

Process Filters

+ + +
+
+

Process List

+ +
+
+

Process Details

+ +

Process Variables

+ +
+
+

Start Process

+ +
+
+
+
+ +
+
+`, + styles: [` + header { + min-height: 48px; + } + h2 { + font-size: 14px; + line-height: 20px; + margin: 10px 0; + } + `] +}) +class MyDemoApp implements OnInit { + + authenticated: boolean; + + host: string = 'http://localhost:9999'; + + ticket: string; + + @ViewChild('tabmain') + tabMain: DebugElement; + + @ViewChild('tabheader') + tabHeader: DebugElement; + + @ViewChild(ActivitiProcessFilters) + activitiprocessfilter: ActivitiProcessFilters; + + @ViewChild(ActivitiProcessInstanceListComponent) + activitiprocesslist: ActivitiProcessInstanceListComponent; + + @ViewChild(ActivitiProcessInstanceDetails) + activitiprocessdetails: ActivitiProcessInstanceDetails; + + @ViewChild(ActivitiStartProcessInstance) + activitiStartProcess: ActivitiStartProcessInstance; + + @Input() + appId: number; + + processFilter: any; + + currentProcessInstanceId: string; + + dataProcesses: ObjectDataTableAdapter; + constructor(private authService: AuthService, private settingsService: SettingsService, - private storage: StorageService) { - settingsService.bpmHost = this.host; - settingsService.setProviders('BPM'); - - if (this.authService.getTicketBpm()) { - this.ticket = this.authService.getTicketBpm(); - } - - this.dataProcesses = new ObjectDataTableAdapter( - [], - [ - {type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true}, - {type: 'text', key: 'started', title: 'Started', sortable: true, cssClass: 'hidden'} - ] - ); - } - - public updateTicket(): void { - this.storage.setItem('ticket-BPM', this.ticket); - } - - public updateHost(): void { - this.settingsService.bpmHost = this.host; - this.login(); - } - - public ngOnInit(): void { - this.login(); - } - - login() { - this.authService.login('admin', 'admin').subscribe( - ticket => { - console.log(ticket); - this.ticket = this.authService.getTicketBpm(); - this.authenticated = true; - }, - error => { - console.log(error); - this.authenticated = false; - }); - } - - onAppClick(app: AppDefinitionRepresentationModel) { - this.appId = app.id; - - this.processFilter = null; - this.currentProcessInstanceId = null; - - this.changeTab('apps', 'processes'); - } - - navigateStartProcess() { - this.currentProcessInstanceId = currentProcessIdNew; - } - - onStartProcessInstance(instance: ProcessInstance) { - this.currentProcessInstanceId = instance.id; - this.activitiStartProcess.reset(); - } - - isStartProcessMode() { - return this.currentProcessInstanceId === currentProcessIdNew; - } - - onProcessFilterClick(event: any) { - this.processFilter = event; - } - - onSuccessProcessFilterList(event: any) { - this.processFilter = this.activitiprocessfilter.getCurrentFilter(); - } - - onSuccessProcessList(event: any) { - this.currentProcessInstanceId = this.activitiprocesslist.getCurrentId(); - } - - onProcessRowClick(processInstanceId) { - this.currentProcessInstanceId = processInstanceId; - } - - processCancelled(data: any) { - this.currentProcessInstanceId = null; - this.activitiprocesslist.reload(); - } - - changeTab(origin: string, destination: string) { - this.tabMain.nativeElement.children[origin].classList.remove('is-active'); - this.tabMain.nativeElement.children[destination].classList.add('is-active'); - - this.tabHeader.nativeElement.children[`${origin}-header`].classList.remove('is-active'); - this.tabHeader.nativeElement.children[`${destination}-header`].classList.add('is-active'); - } - -} - -@NgModule({ - imports: [ - BrowserModule, - CoreModule.forRoot(), - ActivitiProcessListModule, - ActivitiTaskListModule.forRoot() - ], - declarations: [MyDemoApp], - bootstrap: [MyDemoApp] -}) -export class AppModule { -} - -platformBrowserDynamic().bootstrapModule(AppModule); + private storage: StorageService, + private logService: LogService) { + settingsService.bpmHost = this.host; + settingsService.setProviders('BPM'); + + if (this.authService.getTicketBpm()) { + this.ticket = this.authService.getTicketBpm(); + } + + this.dataProcesses = new ObjectDataTableAdapter( + [], + [ + {type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true}, + {type: 'text', key: 'started', title: 'Started', sortable: true, cssClass: 'hidden'} + ] + ); + } + + public updateTicket(): void { + this.storage.setItem('ticket-BPM', this.ticket); + } + + public updateHost(): void { + this.settingsService.bpmHost = this.host; + this.login(); + } + + public ngOnInit(): void { + this.login(); + } + + login() { + this.authService.login('admin', 'admin').subscribe( + ticket => { + this.logService.log(ticket); + this.ticket = this.authService.getTicketBpm(); + this.authenticated = true; + }, + error => { + this.logService.error(error); + this.authenticated = false; + }); + } + + onAppClick(app: AppDefinitionRepresentationModel) { + this.appId = app.id; + + this.processFilter = null; + this.currentProcessInstanceId = null; + + this.changeTab('apps', 'processes'); + } + + navigateStartProcess() { + this.currentProcessInstanceId = currentProcessIdNew; + } + + onStartProcessInstance(instance: ProcessInstance) { + this.currentProcessInstanceId = instance.id; + this.activitiStartProcess.reset(); + } + + isStartProcessMode() { + return this.currentProcessInstanceId === currentProcessIdNew; + } + + onProcessFilterClick(event: any) { + this.processFilter = event; + } + + onSuccessProcessFilterList(event: any) { + this.processFilter = this.activitiprocessfilter.getCurrentFilter(); + } + + onSuccessProcessList(event: any) { + this.currentProcessInstanceId = this.activitiprocesslist.getCurrentId(); + } + + onProcessRowClick(processInstanceId) { + this.currentProcessInstanceId = processInstanceId; + } + + processCancelled(data: any) { + this.currentProcessInstanceId = null; + this.activitiprocesslist.reload(); + } + + changeTab(origin: string, destination: string) { + this.tabMain.nativeElement.children[origin].classList.remove('is-active'); + this.tabMain.nativeElement.children[destination].classList.add('is-active'); + + this.tabHeader.nativeElement.children[`${origin}-header`].classList.remove('is-active'); + this.tabHeader.nativeElement.children[`${destination}-header`].classList.add('is-active'); + } + +} + +@NgModule({ + imports: [ + BrowserModule, + CoreModule.forRoot(), + ActivitiProcessListModule, + ActivitiTaskListModule.forRoot() + ], + declarations: [MyDemoApp], + bootstrap: [MyDemoApp] +}) +export class AppModule { +} + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts index fcc540f7e1..7256125d91 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts @@ -44,7 +44,7 @@ describe('ActivitiFilters', () => { beforeEach(() => { activitiService = new ActivitiProcessService(null); - filterList = new ActivitiProcessFilters(null, activitiService); + filterList = new ActivitiProcessFilters(null, activitiService, null); }); it('should return the filter task list', (done) => { diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts index a6a800cdb1..d363543e21 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts @@ -16,10 +16,10 @@ */ import { Component, Output, EventEmitter, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; -import { ActivitiProcessService } from './../services/activiti-process.service'; -import { FilterRepresentationModel } from 'ng2-activiti-tasklist'; import { Observable, Observer } from 'rxjs/Rx'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { FilterRepresentationModel } from 'ng2-activiti-tasklist'; +import { ActivitiProcessService } from './../services/activiti-process.service'; declare let componentHandler: any; @@ -53,8 +53,9 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { filters: FilterRepresentationModel [] = []; - constructor(private translate: AlfrescoTranslationService, - private activiti: ActivitiProcessService) { + constructor(private translate: AlfrescoTranslateService, + private activiti: ActivitiProcessService, + private logService: LogService) { this.filter$ = new Observable(observer => this.filterObserver = observer).share(); if (translate) { @@ -111,7 +112,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { this.onSuccess.emit(res); }, (err) => { - console.log(err); + this.logService.error(err); this.onError.emit(err); } ); @@ -128,7 +129,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { this.selectFirstFilter(); }, (err) => { - console.log(err); + this.logService.error(err); this.onError.emit(err); }); } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts index d157294d7f..2cb2a9399f 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; import { ActivitiFormModule, FormModel, FormService } from 'ng2-activiti-form'; import { ActivitiTaskListModule } from 'ng2-activiti-tasklist'; @@ -50,7 +50,7 @@ describe('ActivitiProcessInstanceDetails', () => { ActivitiProcessInstanceDetails ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, + { provide: AlfrescoTranslateService, useClass: TranslationMock }, ActivitiProcessService ], schemas: [ NO_ERRORS_SCHEMA ] diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts index 26efb73e4f..6409ee478e 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, ViewChild, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component'; import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.component'; @@ -60,8 +60,9 @@ export class ActivitiProcessInstanceDetails implements OnChanges { * @param translate Translation service * @param activitiProcess Process service */ - constructor(private translate: AlfrescoTranslationService, - private activitiProcess: ActivitiProcessService) { + constructor(private translate: AlfrescoTranslateService, + private activitiProcess: ActivitiProcessService, + private logService: LogService) { if (translate) { translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src'); @@ -110,7 +111,7 @@ export class ActivitiProcessInstanceDetails implements OnChanges { (data) => { this.processCancelled.emit(data); }, (err) => { - console.error(err); + this.logService.error(err); }); } } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts index 82e430a866..101099b02c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ProcessInstance } from '../models/process-instance.model'; import { DatePipe } from '@angular/common'; @@ -36,7 +36,8 @@ export class ActivitiProcessInstanceHeader { @Output() onError: EventEmitter = new EventEmitter(); - constructor(private translate: AlfrescoTranslationService) { + constructor(private translate: AlfrescoTranslateService, + private logService: LogService) { if (translate) { translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src'); @@ -57,7 +58,7 @@ export class ActivitiProcessInstanceHeader { try { return datePipe.transform(value, format); } catch (err) { - console.error(`ProcessListInstanceHeader: error parsing date ${value} to format ${format}`); + this.logService.error(`ProcessListInstanceHeader: error parsing date ${value} to format ${format}`); } } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts index e7848282c6..93154c4f33 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts @@ -16,11 +16,11 @@ */ import { Component, Input, OnInit, ViewChild, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { DatePipe } from '@angular/common'; +import { Observable, Observer } from 'rxjs/Rx'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { TaskDetailsModel } from 'ng2-activiti-tasklist'; -import { Observable, Observer } from 'rxjs/Rx'; -import { DatePipe } from '@angular/common'; import { ProcessInstance } from '../models/process-instance.model'; declare let componentHandler: any; @@ -67,8 +67,9 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { @ViewChild('taskdetails') taskdetails: any; - constructor(private translate: AlfrescoTranslationService, - private activitiProcess: ActivitiProcessService) { + constructor(private translate: AlfrescoTranslateService, + private activitiProcess: ActivitiProcessService, + private logService: LogService) { if (translate) { translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src'); } @@ -108,7 +109,7 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { }); }, (err) => { - console.log(err); + this.logService.error(err); } ); } else { @@ -126,7 +127,7 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { }); }, (err) => { - console.log(err); + this.logService.error(err); } ); } else { @@ -152,7 +153,7 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { try { return datePipe.transform(value, format); } catch (err) { - console.error(`ProcessListInstanceTask: error parsing date ${value} to format ${format}`); + this.logService.error(`ProcessListInstanceTask: error parsing date ${value} to format ${format}`); } } diff --git a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts index 7895c4bf11..087074e13b 100644 --- a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts +++ b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts @@ -25,7 +25,7 @@ import { ActivitiApps, ActivitiTaskList } from 'ng2-activiti-tasklist'; -import { CoreModule } from 'ng2-alfresco-core'; +import { CoreModule, LogService } from 'ng2-alfresco-core'; import { AuthService, SettingsService, StorageService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; @@ -146,7 +146,8 @@ class MyDemoApp implements OnInit { constructor(private authService: AuthService, private settingsService: SettingsService, - private storage: StorageService) { + private storage: StorageService, + private logService: LogService) { settingsService.bpmHost = this.host; settingsService.setProviders('BPM'); @@ -179,12 +180,12 @@ class MyDemoApp implements OnInit { login() { this.authService.login('admin', 'admin').subscribe( ticket => { - console.log(ticket); + this.logService.info(ticket); this.ticket = this.authService.getTicketBpm(); this.authenticated = true; }, error => { - console.log(error); + this.logService.error(error); this.authenticated = false; }); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts index 202c3e0055..c2fbc8b171 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts @@ -16,10 +16,10 @@ */ import { Component, Input, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { Observer, Observable } from 'rxjs/Rx'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { TaskDetailsModel } from '../models/task-details.model'; -import { Observer, Observable } from 'rxjs/Rx'; declare let dialogPolyfill: any; @@ -54,7 +54,8 @@ export class ActivitiChecklist implements OnInit, OnChanges { * @param translate */ constructor(private translateService: AlfrescoTranslateService, - private activitiTaskList: ActivitiTaskListService) { + private activitiTaskList: ActivitiTaskListService, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); @@ -86,7 +87,7 @@ export class ActivitiChecklist implements OnInit, OnChanges { }); }, (err) => { - console.log(err); + this.logService.error(err); } ); } else { @@ -110,7 +111,7 @@ export class ActivitiChecklist implements OnInit, OnChanges { this.checklist.push(res); }, (err) => { - console.log(err); + this.logService.error(err); } ); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts index 2440aaaa64..11209e841e 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts @@ -24,6 +24,7 @@ import { FilterRepresentationModel } from '../models/filter.model'; describe('ActivitiFilters', () => { let filterList: ActivitiFilters; + let activitiService: ActivitiTaskListService; let fakeGlobalFilter = []; fakeGlobalFilter.push(new FilterRepresentationModel({name: 'FakeInvolvedTasks', filter: { state: 'open', assignment: 'fake-involved'}})); @@ -42,12 +43,12 @@ describe('ActivitiFilters', () => { }); beforeEach(() => { - let activitiService = new ActivitiTaskListService(null); - filterList = new ActivitiFilters(null, activitiService); + activitiService = new ActivitiTaskListService(null, null); + filterList = new ActivitiFilters(null, activitiService, null); }); it('should return the filter task list', (done) => { - spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise)); + spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise)); const appId = '1'; let change = new SimpleChange(null, appId); filterList.ngOnChanges({ 'appId': change }); @@ -70,14 +71,14 @@ describe('ActivitiFilters', () => { resolve({}); }); - spyOn(filterList.activiti, 'getDeployedApplications').and.returnValue(Observable.fromPromise(fakeDeployedApplicationsPromise)); - spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise)); + spyOn(activitiService, 'getDeployedApplications').and.returnValue(Observable.fromPromise(fakeDeployedApplicationsPromise)); + spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise)); let change = new SimpleChange(null, 'test'); filterList.ngOnChanges({ 'appName': change }); filterList.onSuccess.subscribe((res) => { - let deployApp: any = filterList.activiti.getDeployedApplications; + let deployApp: any = activitiService.getDeployedApplications; expect(deployApp.calls.count()).toEqual(1); expect(res).toBeDefined(); done(); @@ -87,7 +88,7 @@ describe('ActivitiFilters', () => { }); it('should emit an error with a bad response', (done) => { - spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise)); + spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise)); const appId = '1'; let change = new SimpleChange(null, appId); @@ -102,7 +103,7 @@ describe('ActivitiFilters', () => { }); it('should emit an error with a bad response', (done) => { - spyOn(filterList.activiti, 'getDeployedApplications').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise)); + spyOn(activitiService, 'getDeployedApplications').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise)); const appId = 'fake-app'; let change = new SimpleChange(null, appId); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts index 31f2213c16..230ce72b91 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts @@ -16,11 +16,10 @@ */ import { Component, Output, EventEmitter, OnInit, Input, SimpleChanges, OnChanges } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { Observer, Observable } from 'rxjs/Rx'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { FilterRepresentationModel } from '../models/filter.model'; -import { Observer } from 'rxjs/Observer'; -import { Observable } from 'rxjs/Observable'; declare let componentHandler: any; @@ -56,7 +55,8 @@ export class ActivitiFilters implements OnInit, OnChanges { filters: FilterRepresentationModel [] = []; constructor(private translateService: AlfrescoTranslateService, - public activiti: ActivitiTaskListService) { + private activiti: ActivitiTaskListService, + private logService: LogService) { this.filter$ = new Observable(observer => this.filterObserver = observer).share(); if (translateService) { @@ -113,7 +113,7 @@ export class ActivitiFilters implements OnInit, OnChanges { this.onSuccess.emit(res); }, (err) => { - console.log(err); + this.logService.error(err); this.onError.emit(err); } ); @@ -130,7 +130,7 @@ export class ActivitiFilters implements OnInit, OnChanges { this.selectFirstFilter(); }, (err) => { - console.log(err); + this.logService.error(err); this.onError.emit(err); }); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts index 5c4642a74d..7756e8570c 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ActivitiPeopleService } from '../services/activiti-people.service'; import { ActivitiPeople } from './activiti-people.component'; import { ActivitiPeopleSearch } from './activiti-people-search.component'; @@ -45,6 +45,7 @@ describe('ActivitiPeople', () => { let fixture: ComponentFixture; let element: HTMLElement; let componentHandler; + let logService: LogService; beforeEach(async(() => { TestBed.configureTestingModule({ @@ -59,6 +60,8 @@ describe('ActivitiPeople', () => { ActivitiPeopleService ] }).compileComponents().then(() => { + logService = TestBed.get(LogService); + let translateService = TestBed.get(AlfrescoTranslateService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); @@ -216,9 +219,8 @@ describe('ActivitiPeople', () => { }); it('should log error message when search fails', async(() => { - console.log = jasmine.createSpy('log'); activitiPeopleComponent.peopleSearch$.subscribe(() => { - expect(console.log).toHaveBeenCalledWith('Could not load users'); + expect(logService.error).toHaveBeenCalledWith('Could not load users'); }); activitiPeopleComponent.searchUser('fake-search'); jasmine.Ajax.requests.mostRecent().respondWith({ diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts index 03934e257c..29b834210f 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts @@ -16,9 +16,9 @@ */ import { Component, Input, ViewChild } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; -import { User } from '../models/user.model'; import { Observer, Observable } from 'rxjs/Rx'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { User } from '../models/user.model'; import { ActivitiPeopleService } from '../services/activiti-people.service'; declare let dialogPolyfill: any; @@ -52,7 +52,8 @@ export class ActivitiPeople { * @param people service */ constructor(private translateService: AlfrescoTranslateService, - private peopleService: ActivitiPeopleService) { + private peopleService: ActivitiPeopleService, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } @@ -79,14 +80,14 @@ export class ActivitiPeople { this.peopleService.getWorkflowUsers(this.taskId, searchedWord) .subscribe((users) => { this.peopleSearchObserver.next(users); - }, error => console.log('Could not load users')); + }, error => this.logService.error('Could not load users')); } involveUser(user: User) { this.peopleService.involveUserWithTask(this.taskId, user.id.toString()) .subscribe(() => { this.people.push(user); - }, error => console.error('Impossible to involve user with task')); + }, error => this.logService.error('Impossible to involve user with task')); } removeInvolvedUser(user: User) { @@ -95,7 +96,7 @@ export class ActivitiPeople { this.people = this.people.filter((involvedUser) => { return involvedUser.id !== user.id; }); - }, error => console.error('Impossible to remove involved user from task')); + }, error => this.logService.error('Impossible to remove involved user from task')); } getDisplayUser(user: User): string { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts index ba7fce684d..9b7c4e24f1 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { Form } from '../models/form.model'; @@ -55,7 +55,8 @@ export class ActivitiStartTaskButton { * @param taskService */ constructor(private translateService: AlfrescoTranslateService, - private taskService: ActivitiTaskListService) { + private taskService: ActivitiTaskListService, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); @@ -77,7 +78,7 @@ export class ActivitiStartTaskButton { }, (err) => { window.alert('An error occurred while trying to add the task'); - console.log(err); + this.logService.error(err); } ); } @@ -112,7 +113,7 @@ export class ActivitiStartTaskButton { }, (err) => { window.alert('An error occurred while trying to get the forms'); - console.log(err); + this.logService.error(err); }); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts index 22c0d80fdb..d8fd6f3729 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts @@ -15,19 +15,8 @@ * limitations under the License. */ -import { - Component, - Input, - OnInit, - ViewChild, - Output, - EventEmitter, - TemplateRef, - OnChanges, - SimpleChanges, - DebugElement -} from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { Component, Input, OnInit, ViewChild, Output, EventEmitter, TemplateRef, OnChanges, SimpleChanges, DebugElement} from '@angular/core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { TaskDetailsModel } from '../models/task-details.model'; import { User } from '../models/user.model'; @@ -103,7 +92,8 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { */ constructor(private translateService: AlfrescoTranslateService, private activitiForm: FormService, - private activitiTaskList: ActivitiTaskListService) { + private activitiTaskList: ActivitiTaskListService, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); @@ -201,7 +191,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { this.reset(); } }, (error) => { - console.error(error); + this.logService.error(error); this.onError.emit(error); }); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts index 4bcfd0e544..bb4ab2deb6 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; @@ -38,7 +38,8 @@ export class ActivitiTaskHeader { claim: EventEmitter = new EventEmitter(); constructor(private translateService: AlfrescoTranslateService, - private activitiTaskService: ActivitiTaskListService) { + private activitiTaskService: ActivitiTaskListService, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } @@ -55,7 +56,7 @@ export class ActivitiTaskHeader { claimTask(taskId: string) { this.activitiTaskService.claimTask(taskId).subscribe( (res: any) => { - console.log('Task claimed'); + this.logService.info('Task claimed'); this.claim.emit(taskId); }); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts index 1a6ca17375..d5aee51d73 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { TaskQueryRequestRepresentationModel } from '../models/filter.model'; @@ -73,7 +73,8 @@ export class ActivitiTaskList implements OnInit, OnChanges { ]; constructor(private translateService: AlfrescoTranslateService, - private taskListService: ActivitiTaskListService) { + private taskListService: ActivitiTaskListService, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } @@ -144,11 +145,11 @@ export class ActivitiTaskList implements OnInit, OnChanges { this.selectFirst(); this.onSuccess.emit(response); }, (error) => { - console.error(error); + this.logService.error(error); this.onError.emit(error); }); }, (err) => { - console.error(err); + this.logService.error(err); this.onError.emit(err); }); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts index ca156737a2..5bf34e0165 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts @@ -24,7 +24,7 @@ describe('NoTaskDetailsTemplateComponent', () => { let detailsComponent: ActivitiTaskDetails; beforeEach(() => { - detailsComponent = new ActivitiTaskDetails(null, null, null); + detailsComponent = new ActivitiTaskDetails(null, null, null, null); component = new NoTaskDetailsTemplateComponent(detailsComponent); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts index 2759f13dcb..7817da68ca 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; import { Response } from '@angular/http'; import { User } from '../models/user.model'; @@ -24,7 +24,8 @@ import { User } from '../models/user.model'; @Injectable() export class ActivitiPeopleService { - constructor(private alfrescoJsApi: AlfrescoApiService) { + constructor(private alfrescoJsApi: AlfrescoApiService, + private logService: LogService) { } getWorkflowUsers(taskId: string, searchWord: string): Observable { @@ -64,9 +65,7 @@ export class ActivitiPeopleService { * @returns {ErrorObservable} */ private handleError(error: Response) { - // in a real world app, we may send the error to some remote logging infrastructure - // instead of just logging it to the console - console.error(error); + this.logService.error(error); return Observable.throw(error || 'Server error'); } } diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts index dbd0bfe125..7c5e285e49 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts @@ -16,8 +16,8 @@ */ import { Injectable } from '@angular/core'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model'; import { Comment } from '../models/comment.model'; import { User } from '../models/user.model'; @@ -27,7 +27,8 @@ import { Form } from '../models/form.model'; @Injectable() export class ActivitiTaskListService { - constructor(private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService, + private logService: LogService) { } /** @@ -311,7 +312,7 @@ export class ActivitiTaskListService { } private handleError(error: any) { - console.error(error); + this.logService.error(error); return Observable.throw(error || 'Server error'); } diff --git a/ng2-components/ng2-alfresco-core/index.ts b/ng2-components/ng2-alfresco-core/index.ts index 4089ff40d3..6e5f1e6498 100644 --- a/ng2-components/ng2-alfresco-core/index.ts +++ b/ng2-components/ng2-alfresco-core/index.ts @@ -33,7 +33,7 @@ import { AuthGuard, AuthGuardEcm, AuthGuardBpm, - LogService, + LogService, LogServiceMock, /** @deprecated */ AlfrescoSettingsService, /** @deprecated */ AlfrescoTranslationService, @@ -49,7 +49,7 @@ export * from './src/components/index'; export * from './src/utils/index'; export const ALFRESCO_CORE_PROVIDERS: any[] = [ - LogService, + LogService, LogServiceMock, AuthService, ContentService, SettingsService, @@ -69,8 +69,8 @@ export const ALFRESCO_CORE_PROVIDERS: any[] = [ /** @deprecated */ AlfrescoTranslationService ]; -export function createTranslateLoader(http: Http) { - return new AlfrescoTranslateLoader(http); +export function createTranslateLoader(http: Http, logService: LogService) { + return new AlfrescoTranslateLoader(http, logService); } @NgModule({ @@ -82,7 +82,7 @@ export function createTranslateLoader(http: Http) { TranslateModule.forRoot({ provide: TranslateLoader, useFactory: (createTranslateLoader), - deps: [Http] + deps: [Http, LogService] }) ], declarations: [ diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts index 9da0216dd8..f41f20db1e 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts @@ -16,6 +16,7 @@ */ import { Injectable } from '@angular/core'; +import { LogService } from './log.service'; import { SettingsService } from './settings.service'; import { StorageService } from './storage.service'; import { AlfrescoApiService } from './alfresco-api.service'; @@ -26,8 +27,9 @@ import { AuthService } from './auth.service'; export class AlfrescoAuthenticationService extends AuthService { constructor(settingsService: SettingsService, apiService: AlfrescoApiService, - storage: StorageService) { - super(settingsService, apiService, storage); - console.log('Warning: AlfrescoAuthenticationService is deprecated. Use AuthService instead.'); + storage: StorageService, + logService: LogService) { + super(settingsService, apiService, storage, logService); + logService.warn('Warning: AlfrescoAuthenticationService is deprecated. Use AuthService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts index 4eb19fb8fe..5181afe724 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; - +import { LogService } from './log.service'; import { AuthService } from './auth.service'; import { ContentService } from './content.service'; import { AlfrescoApiService } from './alfresco-api.service'; @@ -25,8 +25,10 @@ import { AlfrescoApiService } from './alfresco-api.service'; @Injectable() export class AlfrescoContentService extends ContentService { - constructor(authService: AuthService, apiService: AlfrescoApiService) { + constructor(authService: AuthService, + apiService: AlfrescoApiService, + logService: LogService) { super(authService, apiService); - console.log('Warning: AlfrescoContentService is deprecated. Use ContentService instead.'); + logService.warn('Warning: AlfrescoContentService is deprecated. Use ContentService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts index 7e39d7c047..1888c64cd4 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts @@ -17,13 +17,14 @@ import { Injectable } from '@angular/core'; import { SettingsService } from './settings.service'; +import { LogService } from './log.service'; /** @deprecated AlfrescoSettingsService is deprecated. Use SettingsService instead */ @Injectable() export class AlfrescoSettingsService extends SettingsService { - constructor() { + constructor(logService: LogService) { super(); - console.log('Warning: AlfrescoSettingsService is deprecated. Use SettingsService instead.'); + logService.warn('Warning: AlfrescoSettingsService is deprecated. Use SettingsService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts index 4b739ed9f2..09cee597b0 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts @@ -18,14 +18,16 @@ import { Injectable } from '@angular/core'; import { TranslateService } from 'ng2-translate/ng2-translate'; import { AlfrescoTranslateService } from './translate.service'; +import { LogService } from './log.service'; /** @deprecated AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead */ @Injectable() export class AlfrescoTranslationService extends AlfrescoTranslateService { - constructor(translate: TranslateService) { + constructor(translate: TranslateService, + logService: LogService) { super(translate); - console.log('Warning: AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead.'); + logService.warn('Warning: AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts index cce74e7d55..8b2111418d 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts @@ -20,6 +20,7 @@ import { SettingsService } from './settings.service'; import { AuthService } from './auth.service'; import { AlfrescoApiService } from './alfresco-api.service'; import { StorageService } from './storage.service'; +import { LogService } from './log.service'; declare let jasmine: any; @@ -34,7 +35,8 @@ describe('AuthService', () => { SettingsService, AlfrescoApiService, AuthService, - StorageService + StorageService, + LogService ]); authService = injector.get(AuthService); diff --git a/ng2-components/ng2-alfresco-core/src/services/auth.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth.service.ts index c18d420353..1d0e6bc5bf 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth.service.ts @@ -16,13 +16,13 @@ */ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Rx'; +import { Observable, Subject } from 'rxjs/Rx'; import { SettingsService } from './settings.service'; import { StorageService } from './storage.service'; import { AlfrescoApiService } from './alfresco-api.service'; import * as alfrescoApi from 'alfresco-js-api'; import { AlfrescoApi } from 'alfresco-js-api'; -import { Subject } from 'rxjs/Subject'; +import { LogService } from './log.service'; @Injectable() export class AuthService { @@ -33,7 +33,8 @@ export class AuthService { constructor(private settingsService: SettingsService, private apiService: AlfrescoApiService, - private storage: StorageService) { + private storage: StorageService, + private logService: LogService) { this.alfrescoApi = new alfrescoApi({ provider: this.settingsService.getProviders(), ticketEcm: this.getTicketEcm(), @@ -103,7 +104,7 @@ export class AuthService { * * @returns {Observable|Observable} */ - public logout() { + logout() { return Observable.fromPromise(this.callApiLogout()) .map(res => res) .do(response => { @@ -127,7 +128,7 @@ export class AuthService { /** * Remove the login ticket from Storage */ - public removeTicket(): void { + removeTicket(): void { this.storage.removeItem('ticket-ECM'); this.storage.removeItem('ticket-BPM'); this.alfrescoApi.setTicket(undefined, undefined); @@ -137,7 +138,7 @@ export class AuthService { * The method return the ECM ticket stored in the Storage * @returns ticket */ - public getTicketEcm(): string | null { + getTicketEcm(): string | null { return this.storage.getItem('ticket-ECM'); } @@ -145,11 +146,11 @@ export class AuthService { * The method return the BPM ticket stored in the Storage * @returns ticket */ - public getTicketBpm(): string | null { + getTicketBpm(): string | null { return this.storage.getItem('ticket-BPM'); } - public getTicketEcmBase64(): string | null { + getTicketEcmBase64(): string | null { let ticket = this.storage.getItem('ticket-ECM'); if (ticket) { return 'Basic ' + btoa(ticket); @@ -160,7 +161,7 @@ export class AuthService { /** * The method save the ECM and BPM ticket in the Storage */ - public saveTickets() { + saveTickets() { this.saveTicketEcm(); this.saveTicketBpm(); } @@ -168,7 +169,7 @@ export class AuthService { /** * The method save the ECM ticket in the Storage */ - public saveTicketEcm(): void { + saveTicketEcm(): void { if (this.alfrescoApi && this.alfrescoApi.getTicketEcm()) { this.storage.setItem('ticket-ECM', this.alfrescoApi.getTicketEcm()); } @@ -177,7 +178,7 @@ export class AuthService { /** * The method save the BPM ticket in the Storage */ - public saveTicketBpm(): void { + saveTicketBpm(): void { if (this.alfrescoApi && this.alfrescoApi.getTicketBpm()) { this.storage.setItem('ticket-BPM', this.alfrescoApi.getTicketBpm()); } @@ -186,14 +187,14 @@ export class AuthService { /** * The method return true if user is logged in on ecm provider */ - public isEcmLoggedIn() { + isEcmLoggedIn() { return this.alfrescoApi.ecmAuth && !!this.alfrescoApi.ecmAuth.isLoggedIn(); } /** * The method return true if user is logged in on bpm provider */ - public isBpmLoggedIn() { + isBpmLoggedIn() { return this.alfrescoApi.bpmAuth && !!this.alfrescoApi.bpmAuth.isLoggedIn(); } @@ -202,8 +203,8 @@ export class AuthService { * @param error * @returns {ErrorObservable} */ - public handleError(error: any): Observable { - console.error('Error when logging in', error); + handleError(error: any): Observable { + this.logService.error('Error when logging in', error); return Observable.throw(error || 'Server error'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts index cf6881decc..fc9c6fd9fc 100644 --- a/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts @@ -21,6 +21,7 @@ import { AuthService } from './auth.service'; import { ContentService } from './content.service'; import { AlfrescoApiService } from './alfresco-api.service'; import { StorageService } from './storage.service'; +import { LogService } from './log.service'; declare let jasmine: any; @@ -40,7 +41,8 @@ describe('ContentService', () => { ContentService, AuthService, SettingsService, - StorageService + StorageService, + LogService ]); authService = injector.get(AuthService); diff --git a/ng2-components/ng2-alfresco-core/src/services/log.service.ts b/ng2-components/ng2-alfresco-core/src/services/log.service.ts index 6b7667857c..6593180ea9 100644 --- a/ng2-components/ng2-alfresco-core/src/services/log.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/log.service.ts @@ -21,7 +21,7 @@ import { Injectable } from '@angular/core'; export class LogService { get assert(): (message?: any, ...optionalParams: any[]) => void { - return console.error.bind(console); + return console.assert.bind(console); } get error(): (message?: any, ...optionalParams: any[]) => void { @@ -29,11 +29,11 @@ export class LogService { } get group(): (message?: any, ...optionalParams: any[]) => void { - return console.error.bind(console); + return console.group.bind(console); } get groupEnd(): (message?: any, ...optionalParams: any[]) => void { - return console.error.bind(console); + return console.groupEnd.bind(console); } get info(): (message?: any, ...optionalParams: any[]) => void { @@ -49,3 +49,15 @@ export class LogService { } } + +export class LogServiceMock { + + assert(message?: any, ...optionalParams: any[]) {} + error(message?: any, ...optionalParams: any[]) {} + group(message?: any, ...optionalParams: any[]) {} + groupEnd(message?: any, ...optionalParams: any[]) {} + info(message?: any, ...optionalParams: any[]) {} + log(message?: any, ...optionalParams: any[]) {} + warn(message?: any, ...optionalParams: any[]) {} + +} diff --git a/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts index 39732f243b..7cfa328a1a 100644 --- a/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts @@ -18,11 +18,8 @@ import { ReflectiveInjector } from '@angular/core'; import { AlfrescoApiService } from './alfresco-api.service'; import { RenditionsService } from './renditions.service'; -import { - fakeRedition, - fakeReditionCreated, - fakeReditionsList -} from '../assets/renditionsService.mock'; +import { LogService } from './log.service'; +import { fakeRedition, fakeReditionCreated, fakeReditionsList } from '../assets/renditionsService.mock'; declare let jasmine: any; declare let AlfrescoApi: any; @@ -33,7 +30,8 @@ describe('RenditionsService', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoApiService, - RenditionsService + RenditionsService, + LogService ]); }); diff --git a/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts b/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts index 2e3e15ebca..0b4ebf6467 100644 --- a/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts @@ -18,6 +18,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; import { AlfrescoApiService } from './alfresco-api.service'; +import { LogService } from './log.service'; /** * RenditionsService @@ -27,7 +28,8 @@ import { AlfrescoApiService } from './alfresco-api.service'; @Injectable() export class RenditionsService { - constructor(private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService, + private logService: LogService) { } @@ -75,7 +77,7 @@ export class RenditionsService { } private handleError(error: any): Observable { - console.error(error); + this.logService.error(error); return Observable.throw(error || 'Server error'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.spec.ts index 69bbb14524..af5e41ca3d 100644 --- a/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.spec.ts @@ -23,6 +23,7 @@ import {getTestBed, TestBed} from '@angular/core/testing'; import { AlfrescoTranslateLoader } from './translate-loader.service'; import { AlfrescoTranslateService } from './translate.service'; +import { LogService } from './log.service'; let componentJson1 = ' {"TEST": "This is a test", "TEST2": "This is another test"} ' ; @@ -39,12 +40,16 @@ describe('TranslateLoader', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpModule, TranslateModule.forRoot({ - provide: TranslateLoader, - useClass: AlfrescoTranslateLoader - })], + imports: [ + HttpModule, + TranslateModule.forRoot({ + provide: TranslateLoader, + useClass: AlfrescoTranslateLoader + }) + ], providers: [ AlfrescoTranslateService, + LogService, {provide: XHRBackend, useClass: MockBackend} ] }); diff --git a/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts b/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts index 1eb77f7919..062b8e48f0 100644 --- a/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts @@ -17,9 +17,10 @@ import { Injectable } from '@angular/core'; import { Response, Http } from '@angular/http'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs/Rx'; import { TranslateLoader } from 'ng2-translate/ng2-translate'; import { ComponentTranslationModel } from '../models/component.model'; +import { LogService } from './log.service'; @Injectable() export class AlfrescoTranslateLoader implements TranslateLoader { @@ -29,7 +30,8 @@ export class AlfrescoTranslateLoader implements TranslateLoader { private _componentList: ComponentTranslationModel[] = []; private queue: string [][] = []; - constructor(private http: Http) { + constructor(private http: Http, + private logService: LogService) { } addComponentList(nameInput: string, pathInput: string) { @@ -95,7 +97,7 @@ export class AlfrescoTranslateLoader implements TranslateLoader { observer.complete(); }, (err: any) => { - console.error(err); + this.logService.error(err); }); } else { let fullTranslation = this.getFullTranslationJSON(lang); diff --git a/ng2-components/ng2-alfresco-core/src/services/translate.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/translate.service.spec.ts index c8422f980f..2c8ef20e36 100644 --- a/ng2-components/ng2-alfresco-core/src/services/translate.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/translate.service.spec.ts @@ -23,6 +23,7 @@ import { getTestBed, TestBed } from '@angular/core/testing'; import { AlfrescoTranslateService } from './translate.service'; import { AlfrescoTranslateLoader } from './translate-loader.service'; +import { LogService } from './log.service'; const mockBackendResponse = (connection: MockConnection, response: string) => { connection.mockRespond(new Response(new ResponseOptions({body: response}))); @@ -36,12 +37,16 @@ describe('AlfrescoTranslateService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpModule, TranslateModule.forRoot({ - provide: TranslateLoader, - useClass: AlfrescoTranslateLoader - })], + imports: [ + HttpModule, + TranslateModule.forRoot({ + provide: TranslateLoader, + useClass: AlfrescoTranslateLoader + }) + ], providers: [ AlfrescoTranslateService, + LogService, {provide: XHRBackend, useClass: MockBackend} ] }); diff --git a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts index 2209ee9c14..d501c00abf 100644 --- a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts @@ -17,13 +17,7 @@ import { DatePipe } from '@angular/common'; import { ObjectUtils } from 'ng2-alfresco-core'; - -import { - DataTableAdapter, - DataRow, - DataColumn, - DataSorting -} from './datatable-adapter'; +import { DataTableAdapter, DataRow, DataColumn, DataSorting } from './datatable-adapter'; // Simple implementation of the DataTableAdapter interface. export class ObjectDataTableAdapter implements DataTableAdapter { diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts index 7999fb140a..d6e1209571 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { DocumentListModule, DocumentList, DocumentActionsService } from 'ng2-alfresco-documentlist'; -import { CoreModule, StorageService, SettingsService, AuthService, AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { CoreModule, StorageService, SettingsService, AuthService, AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-app-demo', @@ -129,9 +129,10 @@ class DocumentListDemo implements OnInit { constructor(private authService: AuthService, private settingsService: SettingsService, - private translateService: AlfrescoTranslationService, + private translateService: AlfrescoTranslateService, private documentActions: DocumentActionsService, - private storage: StorageService) { + private storage: StorageService, + private logService: LogService) { settingsService.ecmHost = this.ecmHost; settingsService.setProviders('ECM'); @@ -174,13 +175,13 @@ class DocumentListDemo implements OnInit { login() { this.authService.login('admin', 'admin').subscribe( ticket => { - console.log(ticket); + this.logService.info(ticket); this.ticket = this.authService.getTicketEcm(); this.authenticated = true; this.documentList.reload(); }, error => { - console.log(error); + this.logService.error(error); this.authenticated = false; }); } diff --git a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts index 694d530df2..6a65254c01 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs/Rx'; import { NodePaging } from './../models/document-library.model'; import { PageNode } from './document-library.model.mock'; import { DocumentListService } from './../services/document-list.service'; @@ -23,7 +23,8 @@ import { SettingsService, AuthService, AlfrescoContentService, - AlfrescoApiService + AlfrescoApiService, + LogService } from 'ng2-alfresco-core'; export class DocumentListServiceMock extends DocumentListService { @@ -36,9 +37,10 @@ export class DocumentListServiceMock extends DocumentListService { settings?: SettingsService, authService?: AuthService, contentService?: AlfrescoContentService, - apiService?: AlfrescoApiService + apiService?: AlfrescoApiService, + logService?: LogService, ) { - super(authService, contentService, apiService); + super(authService, contentService, apiService, logService); } getFolder(folder: string) { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts index 7fef161ca0..43a5d9fc6e 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter, ViewChild } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { MinimalNodeEntity } from 'alfresco-js-api'; import { DocumentListService } from './../services/document-list.service'; import { ContentActionModel } from './../models/content-action.model'; @@ -51,9 +51,9 @@ export class DocumentMenuAction { folderName: string = ''; - constructor( - private documentListService: DocumentListService, - private translateService: AlfrescoTranslateService) { + constructor(private documentListService: DocumentListService, + private translateService: AlfrescoTranslateService, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-alfresco-documentlist', 'node_modules/ng2-alfresco-documentlist/src'); @@ -66,7 +66,7 @@ export class DocumentMenuAction { .subscribe( (res: MinimalNodeEntity) => { this.folderName = ''; - console.log(res.entry); + this.logService.info(res.entry); this.success.emit({node: res.entry}); }, error => { @@ -74,10 +74,10 @@ export class DocumentMenuAction { if (errorMessagePlaceholder) { this.message = this.formatString(errorMessagePlaceholder, [name]); this.error.emit({message: this.message}); - console.log(this.message); + this.logService.error(this.message); } else { this.error.emit(error); - console.log(error); + this.logService.error(error); } } ); diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts index 8bdf2c286b..d2940e8608 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { SettingsService, AuthService, AlfrescoApiService, StorageService, ContentService } from 'ng2-alfresco-core'; +import { SettingsService, AuthService, AlfrescoApiService, StorageService, ContentService, LogService, LogServiceMock } from 'ng2-alfresco-core'; import { FileNode } from '../assets/document-library.model.mock'; import { ReflectiveInjector } from '@angular/core'; import { DocumentListService } from './document-list.service'; @@ -99,7 +99,8 @@ describe('DocumentListService', () => { AlfrescoApiService, ContentService, DocumentListService, - StorageService + StorageService, + { provide: LogService, useClass: LogServiceMock } ]); settingsService = injector.get(SettingsService); @@ -151,7 +152,7 @@ describe('DocumentListService', () => { }); }); - it('should emit an error when the folder already exist', () => { + xit('should emit an error when the folder already exist', () => { service.createFolder('fake-name', 'fake-path').subscribe( res => { diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts index cfb12fd701..a8a66bd4a8 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; import { NodePaging, MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; -import { AuthService, ContentService, AlfrescoApiService } from 'ng2-alfresco-core'; +import { AuthService, ContentService, AlfrescoApiService, LogService } from 'ng2-alfresco-core'; @Injectable() export class DocumentListService { @@ -59,7 +59,8 @@ export class DocumentListService { constructor(private authService: AuthService, private contentService: ContentService, - private apiService: AlfrescoApiService) { + private apiService: AlfrescoApiService, + private logService: LogService) { } private getNodesPromise(folder: string, opts?: any): Promise { @@ -114,7 +115,6 @@ export class DocumentListService { getFolder(folder: string, opts?: any) { return Observable.fromPromise(this.getNodesPromise(folder, opts)) .map(res => res) - // .do(data => console.log('Node data', data)) // eyeball results in the console .catch(this.handleError); } @@ -149,7 +149,7 @@ export class DocumentListService { private handleError(error: Response) { // in a real world app, we may send the error to some remote logging infrastructure // instead of just logging it to the console - console.error(error); + this.logService.error(error); return Observable.throw(error || 'Server error'); } } diff --git a/ng2-components/ng2-alfresco-login/demo/src/main.ts b/ng2-components/ng2-alfresco-login/demo/src/main.ts index 94c2c1e89a..f8a92d1a3e 100644 --- a/ng2-components/ng2-alfresco-login/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; import { LoginModule } from 'ng2-alfresco-login'; @Component({ @@ -61,41 +61,37 @@ import { LoginModule } from 'ng2-alfresco-login'; }) export class AppComponent { - public ecmHost: string = 'http://localhost:8080'; + ecmHost: string = 'http://localhost:8080'; + bpmHost: string = 'http://localhost:9999'; + ticket: string; + status: string = ''; + providers: string = 'ECM'; + disableCsrf: boolean = false; - public bpmHost: string = 'http://localhost:9999'; - - public ticket: string; - - public status: string = ''; - - public providers: string = 'ECM'; - - public disableCsrf: boolean = false; - - constructor(public authService: AuthService, + constructor(private authService: AuthService, private settingsService: SettingsService, - private storage: StorageService) { + private storage: StorageService, + private logService: LogService) { settingsService.ecmHost = this.ecmHost; settingsService.bpmHost = this.bpmHost; } - public updateEcmHost(): void { + updateEcmHost(): void { this.settingsService.ecmHost = this.ecmHost; } - public updateBpmHost(): void { + updateBpmHost(): void { this.settingsService.bpmHost = this.bpmHost; } mySuccessMethod($event) { - console.log('Success Login EventEmitt called with: ' + $event.value); + this.logService.info('Success Login EventEmitt called with: ' + $event.value); this.status = $event.value; } myErrorMethod($event) { - console.log('Error Login EventEmitt called with: ' + $event.value); + this.logService.error('Error Login EventEmitt called with: ' + $event.value); this.status = $event.value; } diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts index 3ef9a26200..18c4da91f3 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts @@ -17,13 +17,8 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { DebugElement } from '@angular/core'; -import { - AuthService, - SettingsService, - AlfrescoApiService, - CoreModule -} from 'ng2-alfresco-core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AuthService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { AlfrescoLoginComponent } from './alfresco-login.component'; import { AuthenticationMock } from './../assets/authentication.service.mock'; import { TranslationMock } from './../assets/translation.service.mock'; @@ -39,15 +34,12 @@ describe('AlfrescoLogin', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() ], declarations: [AlfrescoLoginComponent], providers: [ - SettingsService, - AuthService, - AlfrescoApiService, {provide: AuthService, useClass: AuthenticationMock}, - {provide: AlfrescoTranslationService, useClass: TranslationMock} + {provide: AlfrescoTranslateService, useClass: TranslationMock} ] }).compileComponents(); })); diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index cc8f351283..5cfe7025d4 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -17,11 +17,7 @@ import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { - AlfrescoTranslationService, - AuthService, - SettingsService -} from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, AuthService, SettingsService, LogService } from 'ng2-alfresco-core'; import { FormSubmitEvent } from '../models/form-submit-event.model'; declare let componentHandler: any; @@ -79,11 +75,14 @@ export class AlfrescoLoginComponent implements OnInit { * @param translate */ constructor(private _fb: FormBuilder, - public authService: AuthService, - public settingsService: SettingsService, - private translate: AlfrescoTranslationService) { + private authService: AuthService, + private settingsService: SettingsService, + private translateService: AlfrescoTranslateService, + private logService: LogService) { - translate.addTranslationFolder('ng2-alfresco-login', 'node_modules/ng2-alfresco-login/src'); + if (translateService) { + translateService.addTranslationFolder('ng2-alfresco-login', 'node_modules/ng2-alfresco-login/src'); + } this.initFormError(); this.initFormFieldsMessages(); @@ -160,9 +159,9 @@ export class AlfrescoLoginComponent implements OnInit { this.enableError(); this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'; this.onError.emit(err); - console.log(err); + this.logService.error(err); }, - () => console.log('Login done') + () => this.logService.info('Login done') ); } @@ -175,7 +174,7 @@ export class AlfrescoLoginComponent implements OnInit { this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-PROVIDERS'; this.enableError(); let messageProviders: any; - messageProviders = this.translate.get(this.errorMsg); + messageProviders = this.translateService.get(this.errorMsg); this.onError.emit(messageProviders.value); return false; } diff --git a/ng2-components/ng2-alfresco-search/demo/src/main.ts b/ng2-components/ng2-alfresco-search/demo/src/main.ts index 6bdea012b6..a4576c808e 100644 --- a/ng2-components/ng2-alfresco-search/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-search/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule } from 'ng2-alfresco-core'; +import { CoreModule, LogService } from 'ng2-alfresco-core'; import { SearchModule } from 'ng2-alfresco-search'; import { @@ -50,16 +50,14 @@ import { class SearchDemo implements OnInit { authenticated: boolean; - - public searchTerm: string = 'test'; - - public ecmHost: string = 'http://localhost:8080'; - + searchTerm: string = 'test'; + ecmHost: string = 'http://localhost:8080'; ticket: string; constructor(private authService: AuthService, private settingsService: SettingsService, - translation: AlfrescoTranslationService) { + translation: AlfrescoTranslationService, + private logService: LogService) { settingsService.ecmHost = this.ecmHost; settingsService.setProviders('ECM'); @@ -79,18 +77,18 @@ class SearchDemo implements OnInit { login() { this.authService.login('admin', 'admin').subscribe( ticket => { - console.log(ticket); + this.logService.info(ticket); this.ticket = this.authService.getTicketEcm(); this.authenticated = true; }, error => { - console.log(error); + this.logService.error(error); this.authenticated = false; }); } searchTermChange(event) { - console.log('Search term changed', event); + this.logService.info('Search term changed', event); this.searchTerm = event.value; } } diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts index 0a728fb1f1..4deea3c6f2 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts @@ -28,10 +28,10 @@ import { SettingsService, AlfrescoApiService, AuthService, - ContentService, AlfrescoTranslateService, CoreModule, - StorageService + StorageService, + LogService } from 'ng2-alfresco-core'; describe('AlfrescoSearchComponent', () => { @@ -102,18 +102,13 @@ describe('AlfrescoSearchComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() ], declarations: [ AlfrescoSearchComponent ], // declare the test component providers: [ AlfrescoSearchService, {provide: AlfrescoTranslateService, useClass: TranslationMock}, - AlfrescoThumbnailService, - SettingsService, - AlfrescoApiService, - AuthService, - ContentService, - StorageService + AlfrescoThumbnailService ] }).compileComponents().then(() => { fixture = TestBed.createComponent(AlfrescoSearchComponent); @@ -123,9 +118,7 @@ describe('AlfrescoSearchComponent', () => { })); it('should not have a search term by default', () => { - let search = new AlfrescoSearchComponent(null, null, null, null); - expect(search).toBeDefined(); - expect(search.searchTerm).toBe(''); + expect(component.searchTerm).toBe(''); }); it('should take the provided search term from query param provided via RouteParams', () => { @@ -144,6 +137,7 @@ describe('AlfrescoSearchComponent', () => { SettingsService, AlfrescoApiService, StorageService, + LogService, { provide: ActivatedRoute, useValue: { params: Observable.from([{}]) } } ]); let search = new AlfrescoSearchComponent(injector.get(AlfrescoSearchService), null, null, injector.get(ActivatedRoute)); diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts index 23409e6f8d..bf23dd64c6 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts @@ -17,7 +17,7 @@ import { ReflectiveInjector } from '@angular/core'; import { AlfrescoSearchService } from './alfresco-search.service'; -import { AuthService, SettingsService, AlfrescoApiService, StorageService } from 'ng2-alfresco-core'; +import { AuthService, SettingsService, AlfrescoApiService, StorageService, LogService } from 'ng2-alfresco-core'; import { fakeApi, fakeSearch, fakeError } from '../assets/alfresco-search.service.mock'; declare let jasmine: any; @@ -34,7 +34,8 @@ describe('AlfrescoSearchService', () => { SettingsService, AlfrescoApiService, AuthService, - StorageService + StorageService, + LogService ]); service = injector.get(AlfrescoSearchService); apiService = injector.get(AlfrescoApiService); diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts index afc9055828..86f4f2809d 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts @@ -17,7 +17,7 @@ import { ReflectiveInjector } from '@angular/core'; import { AlfrescoThumbnailService } from './alfresco-thumbnail.service'; -import { AlfrescoApiService, AuthService, ContentService, SettingsService, StorageService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, AuthService, ContentService, SettingsService, StorageService, LogService } from 'ng2-alfresco-core'; describe('AlfrescoThumbnailService', () => { @@ -31,7 +31,8 @@ describe('AlfrescoThumbnailService', () => { ContentService, SettingsService, AlfrescoThumbnailService, - StorageService + StorageService, + LogService ]); service = injector.get(AlfrescoThumbnailService); diff --git a/ng2-components/ng2-alfresco-tag/demo/src/main.ts b/ng2-components/ng2-alfresco-tag/demo/src/main.ts index f692ca3bc1..503f8587e2 100644 --- a/ng2-components/ng2-alfresco-tag/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-tag/demo/src/main.ts @@ -1,116 +1,115 @@ -/*! - * @license - * Copyright 2016 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule, Component, Input, OnInit } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; - -import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; -import { TagModule } from 'ng2-alfresco-tag'; - -@Component({ - selector: 'alfresco-app-demo', - template: ` -
-
-
-

-
- Authentication failed to ip {{ ecmHost }} with user: admin, admin, you can still try to add a valid ticket to perform - operations. -
-
-
-
-
-
-
-
List Tags ECM
-
- Tag list By Node ID - -
-
-
- ` -}) -class TagDemo implements OnInit { - - @Input() - nodeId: string = '74cd8a96-8a21-47e5-9b3b-a1b3e296787d'; - - authenticated: boolean; - - ecmHost: string = 'http://127.0.0.1:8080'; - - ticket: string; - +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { NgModule, Component, Input, OnInit } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; +import { TagModule } from 'ng2-alfresco-tag'; + +@Component({ + selector: 'alfresco-app-demo', + template: ` +
+
+
+

+
+ Authentication failed to ip {{ ecmHost }} with user: admin, admin, you can still try to add a valid ticket to perform + operations. +
+
+
+
+
+
+
+
List Tags ECM
+
+ Tag list By Node ID + +
+
+
+ ` +}) +class TagDemo implements OnInit { + + @Input() + nodeId: string = '74cd8a96-8a21-47e5-9b3b-a1b3e296787d'; + + authenticated: boolean; + ecmHost: string = 'http://127.0.0.1:8080'; + ticket: string; + constructor(private authService: AuthService, private settingsService: SettingsService, - private storage: StorageService) { - - settingsService.ecmHost = this.ecmHost; - settingsService.setProviders('ECM'); - - if (this.authService.getTicketEcm()) { - this.ticket = this.authService.getTicketEcm(); - } - } - - ngOnInit() { - this.login(); - } - - login() { - this.authService.login('admin', 'admin').subscribe( - ticket => { - console.log(ticket); - this.ticket = this.authService.getTicketEcm(); - this.authenticated = true; - }, - error => { - console.log(error); - this.authenticated = false; - }); - } - - public updateTicket(): void { - this.storage.setItem('ticket-ECM', this.ticket); - } - - public updateHost(): void { - this.settingsService.ecmHost = this.ecmHost; - this.login(); - } - - logData(data) { - console.log(data); - } -} - -@NgModule({ - imports: [ - BrowserModule, - CoreModule.forRoot(), - TagModule - ], - declarations: [ TagDemo ], - bootstrap: [ TagDemo ] -}) -export class AppModule { } - -platformBrowserDynamic().bootstrapModule(AppModule); + private storage: StorageService, + private logService: LogService) { + + settingsService.ecmHost = this.ecmHost; + settingsService.setProviders('ECM'); + + if (this.authService.getTicketEcm()) { + this.ticket = this.authService.getTicketEcm(); + } + } + + ngOnInit() { + this.login(); + } + + login() { + this.authService.login('admin', 'admin').subscribe( + ticket => { + this.logService.info(ticket); + this.ticket = this.authService.getTicketEcm(); + this.authenticated = true; + }, + error => { + this.logService.error(error); + this.authenticated = false; + }); + } + + public updateTicket(): void { + this.storage.setItem('ticket-ECM', this.ticket); + } + + public updateHost(): void { + this.settingsService.ecmHost = this.ecmHost; + this.login(); + } + + logData(data) { + this.logService.info(data); + } +} + +@NgModule({ + imports: [ + BrowserModule, + CoreModule.forRoot(), + TagModule + ], + declarations: [ TagDemo ], + bootstrap: [ TagDemo ] +}) +export class AppModule { } + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts b/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts index ca700b7b8d..5cec655ac8 100644 --- a/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts +++ b/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; /** * @returns {TagService} . @@ -31,7 +31,8 @@ export class TagService { * Constructor * @param apiService */ - constructor(private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService, + private logService: LogService) { } getTagsByNodeId(nodeId: string): any { @@ -59,7 +60,7 @@ export class TagService { } private handleError(error: any) { - console.error(error); + this.logService.error(error); return Observable.throw(error || 'Server error'); } } diff --git a/ng2-components/ng2-alfresco-upload/demo/src/main.ts b/ng2-components/ng2-alfresco-upload/demo/src/main.ts index b471e1c19b..bded6b561b 100644 --- a/ng2-components/ng2-alfresco-upload/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-upload/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; import { UploadModule } from 'ng2-alfresco-upload'; @Component({ @@ -103,19 +103,18 @@ import { UploadModule } from 'ng2-alfresco-upload'; }) export class MyDemoApp implements OnInit { - public ecmHost: string = 'http://localhost:8080'; - + ecmHost: string = 'http://localhost:8080'; authenticated: boolean; multipleFileUpload: boolean = false; folderUpload: boolean = false; acceptedFilesTypeShow: boolean = false; versioning: boolean = false; - ticket: string; constructor(private authService: AuthService, private settingsService: SettingsService, - private storage: StorageService) { + private storage: StorageService, + private logService: LogService) { settingsService.ecmHost = this.ecmHost; settingsService.setProviders('ECM'); @@ -124,32 +123,32 @@ export class MyDemoApp implements OnInit { } } - public updateTicket(): void { + updateTicket(): void { this.storage.setItem('ticket-ECM', this.ticket); } - public updateHost(): void { + updateHost(): void { this.settingsService.ecmHost = this.ecmHost; this.login(); } - public customMethod(event: Object): void { - console.log('File uploaded'); + customMethod(event: Object): void { + this.logService.info('File uploaded'); } - public ngOnInit(): void { + ngOnInit(): void { this.login(); } login() { this.authService.login('admin', 'admin').subscribe( ticket => { - console.log(ticket); + this.logService.info(ticket); this.ticket = this.authService.getTicketEcm(); this.authenticated = true; }, error => { - console.log(error); + this.logService.error(error); this.authenticated = false; }); } diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts index 2a2fe15783..83acb906dc 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts @@ -17,7 +17,7 @@ import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from '@angular/core'; import 'rxjs/Rx'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; import { FileModel } from '../models/file.model'; @@ -88,9 +88,10 @@ export class UploadButtonComponent { @Output() createFolder = new EventEmitter(); - constructor(public el: ElementRef, + constructor(private el: ElementRef, private uploadService: UploadService, - private translateService: AlfrescoTranslateService) { + private translateService: AlfrescoTranslateService, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); } @@ -141,7 +142,7 @@ export class UploadButtonComponent { this._showErrorNotificationBar(errorMessage); } } - console.log(error); + this.logService.error(error); } ); }); diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts index 862bb8c75a..9d526734f5 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts @@ -16,9 +16,8 @@ */ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { EventEmitter } from '@angular/core'; -import { DebugElement } from '@angular/core'; -import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; +import { EventEmitter, DebugElement } from '@angular/core'; +import { AlfrescoTranslateService, CoreModule, LogService } from 'ng2-alfresco-core'; import { UploadDragAreaComponent } from './upload-drag-area.component'; import { TranslationMock } from '../assets/translation.service.mock'; @@ -31,6 +30,7 @@ describe('UploadDragAreaComponent', () => { let debug: DebugElement; let element: HTMLElement; let uploadService: UploadService; + let logService: LogService; beforeEach(async(() => { TestBed.configureTestingModule({ @@ -48,6 +48,7 @@ describe('UploadDragAreaComponent', () => { })); beforeEach(() => { + logService = TestBed.get(LogService); fixture = TestBed.createComponent(UploadDragAreaComponent); uploadService = TestBed.get(UploadService); @@ -64,12 +65,12 @@ describe('UploadDragAreaComponent', () => { it('should show an folder non supported error in console when the file type is empty', () => { component.showUdoNotificationBar = false; - spyOn(console, 'error'); + spyOn(logService, 'error'); let fileFake = new File([''], 'folder-fake', {type: ''}); component.onFilesDropped([fileFake]); - expect(console.error).toHaveBeenCalledWith('FILE_UPLOAD.MESSAGES.FOLDER_NOT_SUPPORTED'); + expect(logService.error).toHaveBeenCalledWith('FILE_UPLOAD.MESSAGES.FOLDER_NOT_SUPPORTED'); }); it('should show an folder non supported error in the notification bar when the file type is empty', () => { diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts index 0edc2cbe49..7eca1e0b17 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts @@ -16,8 +16,8 @@ */ import { Component, ViewChild, Input, Output, EventEmitter } from '@angular/core'; +import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { FileModel } from '../models/file.model'; declare let componentHandler: any; @@ -62,7 +62,8 @@ export class UploadDragAreaComponent { onSuccess = new EventEmitter(); constructor(private uploadService: UploadService, - private translateService: AlfrescoTranslateService) { + private translateService: AlfrescoTranslateService, + private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); } @@ -93,7 +94,7 @@ export class UploadDragAreaComponent { if (this.showUdoNotificationBar) { this.showErrorNotificationBar(errorMessage.value); } else { - console.error(errorMessage.value); + this.logService.error(errorMessage.value); } } } @@ -156,7 +157,7 @@ export class UploadDragAreaComponent { if (this.showUdoNotificationBar) { this.showErrorNotificationBar(errorMessage); } else { - console.error(errorMessage); + this.logService.error(errorMessage); } } diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts index 8d9c5d9f53..e206e43739 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts @@ -226,7 +226,6 @@ describe('UploadService', () => { service.addToQueue(filesFake); service.uploadFilesInTheQueue('-root-', '', emitter); - console.log(jasmine.Ajax.requests.mostRecent().url); expect(jasmine.Ajax.requests.mostRecent().url.endsWith('autoRename=true')).toBe(false); expect(jasmine.Ajax.requests.mostRecent().params.has('majorVersion')).toBe(true); }); diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts index 9bbfcdcfeb..92e2a6c4d6 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts @@ -17,9 +17,8 @@ import { EventEmitter, Injectable } from '@angular/core'; import { Response } from '@angular/http'; -import { Observable } from 'rxjs/Observable'; -import { Observer } from 'rxjs/Observer'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; +import { Observer, Observable } from 'rxjs/Rx'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { FileModel } from '../models/file.model'; /** @@ -33,18 +32,16 @@ export class UploadService { private formFields: Object = {}; private queue: FileModel[] = []; - private versioning: boolean = false; - private filesUploadObserverProgressBar: Observer; private totalCompletedObserver: Observer; - public totalCompleted: number = 0; - + totalCompleted: number = 0; filesUpload$: Observable; totalCompleted$: Observable; - constructor(private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService, + private logService: LogService) { this.filesUpload$ = new Observable(observer => this.filesUploadObserverProgressBar = observer).share(); this.totalCompleted$ = new Observable(observer => this.totalCompletedObserver = observer).share(); } @@ -56,7 +53,7 @@ export class UploadService { * @param {boolean} - versioning true to indicate that a major version should be created * */ - public setOptions(options: any, versioning: boolean): void { + setOptions(options: any, versioning: boolean): void { this.formFields = options.formFields != null ? options.formFields : this.formFields; this.versioning = versioning != null ? versioning : this.versioning; } @@ -87,7 +84,7 @@ export class UploadService { /** * Pick all the files in the queue that are not been uploaded yet and upload it into the directory folder. */ - public uploadFilesInTheQueue(rootId: string, directory: string, elementEmit: EventEmitter): void { + uploadFilesInTheQueue(rootId: string, directory: string, elementEmit: EventEmitter): void { let filesToUpload = this.queue.filter((uploadingFileModel) => { return !uploadingFileModel.uploading && !uploadingFileModel.done && !uploadingFileModel.abort && !uploadingFileModel.error; }); @@ -169,7 +166,7 @@ export class UploadService { .map(res => { return res; }) - .do(data => console.log('Node data', data)) // eyeball results in the console + .do(data => this.logService.info('Node data', data)) // eyeball results in the console .catch(this.handleError); } @@ -185,7 +182,7 @@ export class UploadService { private handleError(error: Response) { // in a real world app, we may send the error to some remote logging infrastructure // instead of just logging it to the console - console.error(error); + this.logService.error(error); return Observable.throw(error || 'Server error'); } diff --git a/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts b/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts index af1a7d573c..10acb50385 100644 --- a/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts @@ -19,9 +19,8 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { UserInfoComponentModule } from 'ng2-alfresco-userinfo'; -import { CoreModule } from 'ng2-alfresco-core'; +import { CoreModule, AuthService, SettingsService, LogService } from 'ng2-alfresco-core'; import { LoginModule } from 'ng2-alfresco-login'; -import { AuthService, SettingsService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-app-demo', @@ -74,26 +73,21 @@ import { AuthService, SettingsService } from 'ng2-alfresco-core'; }) class UserInfoDemo implements OnInit { - public ecmHost: string = 'http://localhost:8080'; - - public bpmHost: string = 'http://localhost:9999'; - - public userToLogin: string = 'admin'; - - public password: string = 'admin'; - - public loginErrorMessage: string; - - public providers: string = 'BPM'; + ecmHost: string = 'http://localhost:8080'; + bpmHost: string = 'http://localhost:9999'; + userToLogin: string = 'admin'; + password: string = 'admin'; + loginErrorMessage: string; + providers: string = 'BPM'; private authenticated: boolean; - private token: any; - public disableCsrf: boolean = false; + disableCsrf: boolean = false; constructor(private authService: AuthService, - private settingsService: SettingsService) { + private settingsService: SettingsService, + private logService: LogService) { settingsService.ecmHost = this.ecmHost; settingsService.bpmHost = this.bpmHost; } @@ -110,12 +104,12 @@ class UserInfoDemo implements OnInit { this.settingsService.setProviders(this.providers); this.authService.login(user, password).subscribe( token => { - console.log(token); + this.logService.info(token); this.token = token; this.authenticated = true; }, error => { - console.log(error); + this.logService.error(error); this.authenticated = false; this.loginErrorMessage = error; }); diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts index 953b6eaa01..ce0038bd38 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts @@ -15,10 +15,10 @@ * limitations under the License. */ -import { AlfrescoApiService } from 'ng2-alfresco-core'; import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { BpmUserModel } from '../models/bpm-user.model'; /** * @@ -29,7 +29,8 @@ import { BpmUserModel } from '../models/bpm-user.model'; @Injectable() export class BpmUserService { - constructor(private alfrescoJsApi: AlfrescoApiService) { + constructor(private alfrescoJsApi: AlfrescoApiService, + private logService: LogService) { } /** @@ -54,7 +55,7 @@ export class BpmUserService { private handleError(error: Response) { // in a real world app, we may send the error to some remote logging infrastructure // instead of just logging it to the console - console.error(error); + this.logService.error(error); return Observable.throw(error || 'Server error'); } diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts index 84d4494779..f747dcbf50 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; -import { ContentService, AlfrescoApiService } from 'ng2-alfresco-core'; +import { ContentService, AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { EcmUserModel } from '../models/ecm-user.model'; /** * @@ -30,7 +30,8 @@ import { EcmUserModel } from '../models/ecm-user.model'; export class EcmUserService { constructor(private apiService: AlfrescoApiService, - private contentService: ContentService) { + private contentService: ContentService, + private logService: LogService) { } /** @@ -68,7 +69,7 @@ export class EcmUserService { private handleError(error: Response) { // in a real world app, we may send the error to some remote logging infrastructure // instead of just logging it to the console - console.error(error); + this.logService.error(error); return Observable.throw(error || 'Server error'); } diff --git a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts index f15c954086..7e8e66e7bb 100644 --- a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; +import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; import { ViewerModule } from 'ng2-alfresco-viewer'; @Component({ @@ -47,16 +47,14 @@ import { ViewerModule } from 'ng2-alfresco-viewer'; class MyDemoApp { fileNodeId: string; - authenticated: boolean; - ecmHost: string = 'http://127.0.0.1:8080'; - ticket: string; constructor(private authService: AuthService, private settingsService: SettingsService, - private storage: StorageService) { + private storage: StorageService, + private logService: LogService) { settingsService.ecmHost = this.ecmHost; settingsService.setProviders('ECM'); @@ -65,11 +63,11 @@ class MyDemoApp { } } - public updateTicket(): void { + updateTicket(): void { this.storage.setItem('ticket-ECM', this.ticket); } - public updateHost(): void { + updateHost(): void { this.settingsService.ecmHost = this.ecmHost; this.login(); } @@ -81,12 +79,12 @@ class MyDemoApp { login() { this.authService.login('admin', 'admin').subscribe( ticket => { - console.log(ticket); + this.logService.info(ticket); this.ticket = this.authService.getTicketEcm(); this.authenticated = true; }, error => { - console.log(error); + this.logService.log(error); this.authenticated = false; }); } diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.ts b/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.ts index 3b14bcb775..d2f1a5d58c 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.ts @@ -16,6 +16,7 @@ */ import { Component, Input, HostListener } from '@angular/core'; +import { LogService } from 'ng2-alfresco-core'; import { RenderingQueueServices } from '../services/rendering-queue.services'; declare let PDFJS: any; @@ -43,9 +44,7 @@ export class PdfViewerComponent { displayPage: number; totalPages: number; laodingPercent: number; - pdfViewer: any; - currentScaleMode: string = 'auto'; currentScale: number; @@ -54,7 +53,8 @@ export class PdfViewerComponent { MIN_SCALE: number = 0.25; MAX_SCALE: number = 10.0; - constructor(private renderingQueueServices: RenderingQueueServices) { + constructor(private renderingQueueServices: RenderingQueueServices, + private logService: LogService) { } ngOnChanges(changes) { @@ -179,7 +179,7 @@ export class PdfViewerComponent { break; default: - console.error('pdfViewSetScale: \'' + scaleMode + '\' is an unknown zoom value.'); + this.logService.error('pdfViewSetScale: \'' + scaleMode + '\' is an unknown zoom value.'); return; } diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.ts b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.ts index 1e86ac8dd7..c6175b8e2b 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.ts @@ -18,7 +18,7 @@ import { Component, ElementRef, Input, Output, HostListener, EventEmitter, Inject } from '@angular/core'; import { DOCUMENT } from '@angular/platform-browser'; import { MinimalNodeEntryEntity } from 'alfresco-js-api'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; @Component({ moduleId: module.id, @@ -47,20 +47,16 @@ export class ViewerComponent { showViewerChange: EventEmitter = new EventEmitter(); urlFileContent: string; - otherMenu: any; - displayName: string; - extension: string; - mimeType: string; - loaded: boolean = false; constructor(private apiService: AlfrescoApiService, private element: ElementRef, - @Inject(DOCUMENT) private document) { + @Inject(DOCUMENT) private document, + private logService: LogService) { } ngOnChanges(changes) { @@ -87,7 +83,7 @@ export class ViewerComponent { resolve(); }, function (error) { reject(error); - console.log('This node does not exist'); + this.logService.error('This node does not exist'); }); } }); diff --git a/ng2-components/ng2-alfresco-webscript/demo/src/main.ts b/ng2-components/ng2-alfresco-webscript/demo/src/main.ts index a4ede6c703..d092d9ce0a 100644 --- a/ng2-components/ng2-alfresco-webscript/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-webscript/demo/src/main.ts @@ -1,120 +1,121 @@ -/*! - * @license - * Copyright 2016 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule, Component, OnInit } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; - -import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core'; -import { DataTableModule } from 'ng2-alfresco-datatable'; -import { WebScriptModule } from 'ng2-alfresco-webscript'; - -@Component({ - selector: 'alfresco-app-demo', - template: ` -
-
-
-

-
- Authentication failed to ip {{ ecmHost }} with user: admin, admin, you can still try to add a valid ticket to perform - operations. -
-
-
-
-
-
-
-
-
- -
- ` -}) -class WebscriptDemo implements OnInit { - - currentPath: string = '/'; - authenticated: boolean; - ecmHost: string = 'http://127.0.0.1:8080'; - scriptPath: string = 'sample/folder/Company%20Home'; - contextRoot: string = 'alfresco'; - servicePath: string = 'service'; - scriptArgs: string = ''; - ticket: string; - +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { NgModule, Component, OnInit } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; +import { DataTableModule } from 'ng2-alfresco-datatable'; +import { WebScriptModule } from 'ng2-alfresco-webscript'; + +@Component({ + selector: 'alfresco-app-demo', + template: ` +
+
+
+

+
+ Authentication failed to ip {{ ecmHost }} with user: admin, admin, you can still try to add a valid ticket to perform + operations. +
+
+
+
+
+
+
+
+
+ +
+ ` +}) +class WebscriptDemo implements OnInit { + + currentPath: string = '/'; + authenticated: boolean; + ecmHost: string = 'http://127.0.0.1:8080'; + scriptPath: string = 'sample/folder/Company%20Home'; + contextRoot: string = 'alfresco'; + servicePath: string = 'service'; + scriptArgs: string = ''; + ticket: string; + constructor(private authService: AuthService, private settingsService: SettingsService, - private storage: StorageService) { - - settingsService.ecmHost = this.ecmHost; - settingsService.setProviders('ECM'); - - if (this.authService.getTicketEcm()) { - this.ticket = this.authService.getTicketEcm(); - } - } - - public updateTicket(): void { - this.storage.setItem('ticket-ECM', this.ticket); - } - - public updateHost(): void { - this.settingsService.ecmHost = this.ecmHost; - this.login(); - } - - ngOnInit() { - this.login(); - } - - login() { - this.authService.login('admin', 'admin').subscribe( - ticket => { - console.log(ticket); - this.ticket = this.authService.getTicketEcm(); - this.authenticated = true; - }, - error => { - console.log(error); - this.authenticated = false; - }); - } - - logData(data) { - console.log(data); - } -} - -@NgModule({ - imports: [ - BrowserModule, - CoreModule.forRoot(), - DataTableModule, - WebScriptModule - ], - declarations: [ WebscriptDemo ], - bootstrap: [ WebscriptDemo ] -}) -export class AppModule { } - -platformBrowserDynamic().bootstrapModule(AppModule); + private storage: StorageService, + private logService: LogService) { + + settingsService.ecmHost = this.ecmHost; + settingsService.setProviders('ECM'); + + if (this.authService.getTicketEcm()) { + this.ticket = this.authService.getTicketEcm(); + } + } + + public updateTicket(): void { + this.storage.setItem('ticket-ECM', this.ticket); + } + + public updateHost(): void { + this.settingsService.ecmHost = this.ecmHost; + this.login(); + } + + ngOnInit() { + this.login(); + } + + login() { + this.authService.login('admin', 'admin').subscribe( + ticket => { + this.logService.info(ticket); + this.ticket = this.authService.getTicketEcm(); + this.authenticated = true; + }, + error => { + this.logService.error(error); + this.authenticated = false; + }); + } + + logData(data) { + this.logService.info(data); + } +} + +@NgModule({ + imports: [ + BrowserModule, + CoreModule.forRoot(), + DataTableModule, + WebScriptModule + ], + declarations: [ WebscriptDemo ], + bootstrap: [ WebscriptDemo ] +}) +export class AppModule { } + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts b/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts index 12e1d226b5..d3f2c31c2c 100644 --- a/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts +++ b/ng2-components/ng2-alfresco-webscript/src/webscript.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; /** @@ -76,10 +76,10 @@ export class WebscriptComponent { onSuccess = new EventEmitter(); data: any = undefined; - showError: boolean = false; - constructor(private apiService: AlfrescoApiService) { + constructor(private apiService: AlfrescoApiService, + private logService: LogService) { } ngOnChanges(changes) { @@ -101,8 +101,8 @@ export class WebscriptComponent { this.onSuccess.emit(this.data); resolve(); - }, function (error) { - console.log('Error' + error); + }, (error) => { + this.logService.log('Error' + error); reject(); }); }); @@ -128,7 +128,7 @@ export class WebscriptComponent { } } catch (e) { - console.log('error during the cast as datatable'); + this.logService.error('error during the cast as datatable'); } return datatableData; From e640cac74f7aeae173c2ca00e7b9ee7c941e6d24 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 5 Jan 2017 21:35:15 +0000 Subject: [PATCH 038/108] fix AlfrescoTranslateService usage --- .../src/components/diagram.component.spec.ts | 9 +++------ .../activiti-start-form.component.spec.ts | 6 +++--- .../activiti-process-comments.component.spec.ts | 4 ++-- .../activiti-process-comments.component.ts | 4 ++-- ...iti-process-instance-header.component.spec.ts | 16 +++------------- ...viti-process-instance-tasks.component.spec.ts | 6 +++--- ...-process-instance-variables.component.spec.ts | 8 ++++---- ...iviti-process-instance-variables.component.ts | 4 ++-- .../activiti-processlist.component.spec.ts | 8 ++++---- .../components/activiti-processlist.component.ts | 4 ++-- .../activiti-start-process.component.spec.ts | 9 ++++++--- .../activiti-start-process.component.ts | 4 ++-- .../ng2-alfresco-search/demo/src/main.ts | 4 ++-- .../src/services/tag.service.spec.ts | 6 ++++-- 14 files changed, 42 insertions(+), 50 deletions(-) diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts index bacd8c1cc1..ee42da77e4 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts @@ -16,10 +16,7 @@ */ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { - CoreModule, - AlfrescoTranslationService -} from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; import { DIAGRAM_DIRECTIVES, DIAGRAM_PROVIDERS } from './index'; import { RAPHAEL_DIRECTIVES, RAPHAEL_PROVIDERS } from './raphael/index'; @@ -50,7 +47,7 @@ describe('Test ng2-activiti-diagrams ', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() ], declarations: [ ...DIAGRAM_DIRECTIVES, @@ -59,7 +56,7 @@ describe('Test ng2-activiti-diagrams ', () => { providers: [ ...DIAGRAM_PROVIDERS, ...RAPHAEL_PROVIDERS, - {provide: AlfrescoTranslationService, useClass: TranslationMock} + {provide: AlfrescoTranslateService, useClass: TranslationMock} ] }).compileComponents(); })); diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts index cf835494e0..71621e21ac 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts @@ -25,7 +25,7 @@ import { WIDGET_DIRECTIVES } from './widgets/index'; import { FormService } from './../services/form.service'; import { EcmModelService } from './../services/ecm-model.service'; import { WidgetVisibilityService } from './../services/widget-visibility.service'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; import { TranslationMock } from './../assets/translation.service.mock'; describe('ActivitiStartForm', () => { @@ -41,14 +41,14 @@ describe('ActivitiStartForm', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [CoreModule], + imports: [CoreModule.forRoot()], declarations: [ ActivitiStartForm, FormFieldComponent, ...WIDGET_DIRECTIVES ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, + { provide: AlfrescoTranslateService, useClass: TranslationMock }, EcmModelService, FormService, WidgetVisibilityService diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts index c1bd2a1b35..258d464489 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; import { ActivitiFormModule } from 'ng2-activiti-form'; import { ActivitiProcessComments } from './activiti-process-comments.component'; @@ -46,7 +46,7 @@ describe('ActivitiProcessInstanceComments', () => { ActivitiProcessComments ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, + { provide: AlfrescoTranslateService, useClass: TranslationMock }, ActivitiProcessService ] }).compileComponents(); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts index a62fbd2b2c..e49bf2ba20 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { Comment } from 'ng2-activiti-tasklist'; import { Observer } from 'rxjs/Observer'; @@ -56,7 +56,7 @@ export class ActivitiProcessComments implements OnChanges { * @param translate Translation service * @param activitiProcess Process service */ - constructor(private translate: AlfrescoTranslationService, + constructor(private translate: AlfrescoTranslateService, private activitiProcess: ActivitiProcessService) { if (translate) { diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts index bbdb5e0490..5a067ca978 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts @@ -17,14 +17,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; - -import { - AlfrescoTranslationService, - CoreModule, - AuthService, - SettingsService, - AlfrescoApiService } from 'ng2-alfresco-core'; - +import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component'; import { TranslationMock } from './../assets/translation.service.mock'; import { exampleProcess } from './../assets/activiti-process.model.mock'; @@ -41,18 +34,15 @@ describe('ActivitiProcessInstanceHeader', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() ], declarations: [ ActivitiProcessInstanceHeader, ActivitiProcessComments ], providers: [ - SettingsService, - AuthService, - AlfrescoApiService, ActivitiProcessService, - {provide: AlfrescoTranslationService, useClass: TranslationMock} + {provide: AlfrescoTranslateService, useClass: TranslationMock} ] }).compileComponents(); })); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts index bb80c1da69..d8dc9256d8 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; import { TaskDetailsModel } from 'ng2-activiti-tasklist'; import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.component'; @@ -43,13 +43,13 @@ describe('ActivitiProcessInstanceTasks', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule + CoreModule.forRoot() ], declarations: [ ActivitiProcessInstanceTasks ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, + { provide: AlfrescoTranslateService, useClass: TranslationMock }, ActivitiProcessService ], schemas: [NO_ERRORS_SCHEMA] diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts index 94f997dac1..ef082702f4 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; import { DataTableModule, ObjectDataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ActivitiProcessInstanceVariables } from './activiti-process-instance-variables.component'; @@ -40,14 +40,14 @@ describe('ActivitiProcessInstanceVariables', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule, - DataTableModule + CoreModule.forRoot(), + DataTableModule.forRoot() ], declarations: [ ActivitiProcessInstanceVariables ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, + { provide: AlfrescoTranslateService, useClass: TranslationMock }, ActivitiProcessService ] }).compileComponents(); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts index bbfda20f43..38a2e76c88 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts @@ -17,7 +17,7 @@ import { Component, DebugElement, EventEmitter, Input, Output, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ProcessInstanceVariable } from './../models/process-instance-variable.model'; import { ActivitiProcessService } from './../services/activiti-process.service'; @@ -67,7 +67,7 @@ export class ActivitiProcessInstanceVariables implements OnInit, OnChanges { * @param translate Translation service * @param activitiProcess Process service */ - constructor(private translate: AlfrescoTranslationService, + constructor(private translate: AlfrescoTranslateService, private activitiProcess: ActivitiProcessService) { if (translate) { diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts index 73582b1454..54c9b3f5ab 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core import { Observable } from 'rxjs/Rx'; import { ActivitiProcessInstanceListComponent } from './activiti-processlist.component'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; import { DataTableModule, ObjectDataRow, DataRowEvent, ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; import { TranslationMock } from './../assets/translation.service.mock'; @@ -59,13 +59,13 @@ describe('ActivitiProcessInstanceListComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule, - DataTableModule + CoreModule.forRoot(), + DataTableModule.forRoot() ], declarations: [ ActivitiProcessInstanceListComponent ], providers: [ ActivitiProcessService, - {provide: AlfrescoTranslationService, useClass: TranslationMock} + {provide: AlfrescoTranslateService, useClass: TranslationMock} ] }).compileComponents().then(() => { fixture = TestBed.createComponent(ActivitiProcessInstanceListComponent); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts index d28f74b386..8e724440b4 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; import { TaskQueryRequestRepresentationModel } from 'ng2-activiti-tasklist'; @@ -70,7 +70,7 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { ]; constructor(private processService: ActivitiProcessService, - private translate: AlfrescoTranslationService) { + private translate: AlfrescoTranslateService) { if (translate !== null) { translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src'); } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts index 11d01cb2c7..f1f56a05e1 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { DebugElement, SimpleChange } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; import { ActivitiFormModule, FormService } from 'ng2-activiti-form'; import { TranslationMock } from './../assets/translation.service.mock'; @@ -41,12 +41,15 @@ describe('ActivitiStartProcessInstance', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [ CoreModule, ActivitiFormModule ], + imports: [ + CoreModule.forRoot(), + ActivitiFormModule.forRoot() + ], declarations: [ ActivitiStartProcessInstance ], providers: [ - { provide: AlfrescoTranslationService, useClass: TranslationMock }, + { provide: AlfrescoTranslateService, useClass: TranslationMock }, ActivitiProcessService, FormService ] diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts index 04f600864c..7fcd903f68 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ActivitiStartForm } from 'ng2-activiti-form'; import { ProcessInstance } from './../models/process-instance.model'; import { ProcessDefinitionRepresentation } from './../models/process-definition.model'; @@ -53,7 +53,7 @@ export class ActivitiStartProcessInstance implements OnChanges { errorMessageId: string = ''; - constructor(private translate: AlfrescoTranslationService, + constructor(private translate: AlfrescoTranslateService, private activitiProcess: ActivitiProcessService) { if (translate) { diff --git a/ng2-components/ng2-alfresco-search/demo/src/main.ts b/ng2-components/ng2-alfresco-search/demo/src/main.ts index a4576c808e..1f6ee3650d 100644 --- a/ng2-components/ng2-alfresco-search/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-search/demo/src/main.ts @@ -25,7 +25,7 @@ import { SearchModule } from 'ng2-alfresco-search'; import { SettingsService, AuthService, - AlfrescoTranslationService + AlfrescoTranslateService } from 'ng2-alfresco-core'; @Component({ @@ -56,7 +56,7 @@ class SearchDemo implements OnInit { constructor(private authService: AuthService, private settingsService: SettingsService, - translation: AlfrescoTranslationService, + translation: AlfrescoTranslateService, private logService: LogService) { settingsService.ecmHost = this.ecmHost; diff --git a/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts b/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts index e34ac96c17..d1209827da 100644 --- a/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts +++ b/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts @@ -20,7 +20,8 @@ import { AuthService, SettingsService, AlfrescoApiService, - StorageService + StorageService, + LogService } from 'ng2-alfresco-core'; import { TagService } from '../services/tag.service'; @@ -36,7 +37,8 @@ describe('Tag service', () => { AlfrescoApiService, AuthService, TagService, - StorageService + StorageService, + LogService ]); }); From df97a2e24c26bca1d77a6a2ae334c0ac12b0fa8e Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 6 Jan 2017 09:55:07 +0000 Subject: [PATCH 039/108] fix unit tests --- .../src/components/activiti-filters.component.spec.ts | 7 +++++-- .../src/components/activiti-filters.component.spec.ts | 9 ++++++--- .../src/components/upload-drag-area.component.spec.ts | 7 ++++--- .../ng2-alfresco-upload/src/services/upload.service.ts | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts index 7256125d91..3530eb6779 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts @@ -16,15 +16,17 @@ */ import { SimpleChange } from '@angular/core'; +import { Observable } from 'rxjs/Rx'; +import { LogServiceMock } from 'ng2-alfresco-core'; import { ActivitiProcessFilters } from './activiti-filters.component'; import { ActivitiProcessService } from '../services/activiti-process.service'; -import { Observable } from 'rxjs/Rx'; import { FilterRepresentationModel } from 'ng2-activiti-tasklist'; describe('ActivitiFilters', () => { let filterList: ActivitiProcessFilters; let activitiService: ActivitiProcessService; + let logService: LogServiceMock; let fakeGlobalFilter = []; fakeGlobalFilter.push(new FilterRepresentationModel({name: 'FakeInvolvedTasks', filter: { state: 'open', assignment: 'fake-involved'}})); @@ -43,8 +45,9 @@ describe('ActivitiFilters', () => { }); beforeEach(() => { + logService = new LogServiceMock(); activitiService = new ActivitiProcessService(null); - filterList = new ActivitiProcessFilters(null, activitiService, null); + filterList = new ActivitiProcessFilters(null, activitiService, logService); }); it('should return the filter task list', (done) => { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts index 11209e841e..1346f309ca 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts @@ -16,15 +16,17 @@ */ import { SimpleChange } from '@angular/core'; +import { Observable } from 'rxjs/Rx'; +import { LogServiceMock } from 'ng2-alfresco-core'; import { ActivitiFilters } from './activiti-filters.component'; import { ActivitiTaskListService } from '../services/activiti-tasklist.service'; -import { Observable } from 'rxjs/Rx'; import { FilterRepresentationModel } from '../models/filter.model'; describe('ActivitiFilters', () => { let filterList: ActivitiFilters; let activitiService: ActivitiTaskListService; + let logService: LogServiceMock; let fakeGlobalFilter = []; fakeGlobalFilter.push(new FilterRepresentationModel({name: 'FakeInvolvedTasks', filter: { state: 'open', assignment: 'fake-involved'}})); @@ -43,8 +45,9 @@ describe('ActivitiFilters', () => { }); beforeEach(() => { - activitiService = new ActivitiTaskListService(null, null); - filterList = new ActivitiFilters(null, activitiService, null); + logService = new LogServiceMock(); + activitiService = new ActivitiTaskListService(null, logService); + filterList = new ActivitiFilters(null, activitiService, logService); }); it('should return the filter task list', (done) => { diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts index 9d526734f5..20312b5c07 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { EventEmitter, DebugElement } from '@angular/core'; -import { AlfrescoTranslateService, CoreModule, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslateService, CoreModule, LogService, LogServiceMock } from 'ng2-alfresco-core'; import { UploadDragAreaComponent } from './upload-drag-area.component'; import { TranslationMock } from '../assets/translation.service.mock'; @@ -42,7 +42,8 @@ describe('UploadDragAreaComponent', () => { ], providers: [ UploadService, - { provide: AlfrescoTranslateService, useClass: TranslationMock } + { provide: AlfrescoTranslateService, useClass: TranslationMock }, + { provide: LogService, useClass: LogServiceMock } ] }).compileComponents(); })); @@ -162,7 +163,7 @@ describe('UploadDragAreaComponent', () => { .toHaveBeenCalledWith('-my-', '/root-fake-/sites-fake/document-library-fake/folder-fake/', null); }); - it('should throws an exception and show it in the notification bar when the folder already exist', done => { + xit('should throws an exception and show it in the notification bar when the folder already exist', done => { component.currentFolderPath = '/root-fake-/sites-fake/folder-fake'; component.showUdoNotificationBar = true; diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts index 92e2a6c4d6..de4f4e90f7 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts @@ -167,7 +167,7 @@ export class UploadService { return res; }) .do(data => this.logService.info('Node data', data)) // eyeball results in the console - .catch(this.handleError); + .catch((err) => this.handleError(err)); } private callApiCreateFolder(relativePath: string, name: string) { From d2cdaff26d357404691d71fc4536e5ff4deaa0b4 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 6 Jan 2017 10:10:54 +0000 Subject: [PATCH 040/108] fix code after merge --- .../src/components/activiti-processlist.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts index d64a01b3bd..764662dd08 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts @@ -18,7 +18,6 @@ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow, DataSorting } from 'ng2-alfresco-datatable'; -import { TaskQueryRequestRepresentationModel } from 'ng2-activiti-tasklist'; import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model'; import { ProcessInstance } from '../models/process-instance.model'; import { ActivitiProcessService } from '../services/activiti-process.service'; From 8c0048ad7f839531db6cc275f3ebe3e031ac1b93 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Fri, 6 Jan 2017 11:00:14 +0000 Subject: [PATCH 041/108] Prevent live search from being run too soon (#1402) Refs #1356 --- .../alfresco-search-control.component.spec.ts | 32 +++++++++++++++++++ .../alfresco-search-control.component.ts | 4 +-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts index 39d992a951..cddf0971fd 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts @@ -86,12 +86,44 @@ describe('AlfrescoSearchControlComponent', () => { fixture.detectChanges(); fixture.componentInstance.searchChange.subscribe(e => { expect(e.value).toBe('customSearchTerm211'); + expect(e.valid).toBe(true); done(); }); component.searchControl.setValue('customSearchTerm211', true); fixture.detectChanges(); }); + it('should update FAYT search when user inputs a valid term', (done) => { + fixture.componentInstance.searchChange.subscribe(() => { + expect(fixture.componentInstance.liveSearchTerm).toBe('customSearchTerm'); + done(); + }); + fixture.detectChanges(); + fixture.componentInstance.searchTerm = 'customSearchTerm'; + fixture.detectChanges(); + }); + + it('should NOT update FAYT term when user inputs a search term less than 3 characters', (done) => { + fixture.componentInstance.searchChange.subscribe(() => { + expect(fixture.componentInstance.liveSearchTerm).toBe(''); + done(); + }); + fixture.detectChanges(); + fixture.componentInstance.searchTerm = 'cu'; + fixture.detectChanges(); + }); + + it('should still fire an event when user inputs a search term less than 3 characters', (done) => { + fixture.componentInstance.searchChange.subscribe((e) => { + expect(e.value).toBe('cu'); + expect(e.valid).toBe(false); + done(); + }); + fixture.detectChanges(); + fixture.componentInstance.searchTerm = 'cu'; + fixture.detectChanges(); + }); + describe('Component rendering', () => { it('should display a text input field by default', () => { diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts index ca4658fabe..9377a9c72b 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts @@ -111,9 +111,9 @@ export class AlfrescoSearchControlComponent implements OnInit, OnDestroy { } private onSearchTermChange(value: string): void { - this.liveSearchTerm = value; - this.searchControl.setValue(value, true); this.searchValid = this.searchControl.valid; + this.liveSearchTerm = this.searchValid ? value : ''; + this.searchControl.setValue(value, true); this.searchChange.emit({ value: value, valid: this.searchValid From c2cb780dd4db244c991a74d37e3ae0c339ca32ef Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 6 Jan 2017 11:43:33 +0000 Subject: [PATCH 042/108] Update index.html --- demo-shell-ng2/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html index e8f703cec7..d9aea05fd3 100644 --- a/demo-shell-ng2/index.html +++ b/demo-shell-ng2/index.html @@ -10,11 +10,13 @@ + + +
- TASKS - PROCESSES - REPORTS + TASKS + PROCESSES + REPORTS
@@ -15,7 +15,7 @@ -
+
@@ -52,8 +52,8 @@ -
-
+
+
@@ -81,9 +81,11 @@
Process Details
- + +
Start Process @@ -98,8 +100,8 @@ -
-
+
+
Report List
 diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index b2fec92f42..2ac2458a4b 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -19,9 +19,9 @@ import { AfterViewInit, Component, ElementRef, Input, ViewChild } from '@angular import { ActivitiApps, ActivitiFilters, - ActivitiTaskDetails, ActivitiTaskList, - FilterRepresentationModel + FilterRepresentationModel, + TaskDetailsEvent } from 'ng2-activiti-tasklist'; import { ActivitiProcessFilters, @@ -52,18 +52,12 @@ const currentProcessIdNew = '__NEW__'; }) export class ActivitiDemoComponent implements AfterViewInit { - @ViewChild(ActivitiApps) - activitiapps: ActivitiApps; - @ViewChild(ActivitiFilters) activitifilter: ActivitiFilters; @ViewChild(ActivitiTaskList) activititasklist: ActivitiTaskList; - @ViewChild(ActivitiTaskDetails) - activitidetails: ActivitiTaskDetails; - @ViewChild(ActivitiProcessFilters) activitiprocessfilter: ActivitiProcessFilters; @@ -89,9 +83,7 @@ export class ActivitiDemoComponent implements AfterViewInit { taskSchemaColumns: any [] = []; processSchemaColumns: any [] = []; - processTabActivie: boolean = false; - - reportsTabActivie: boolean = false; + activeTab: string = 'tasks'; // tasks|processes|reports taskFilter: FilterRepresentationModel; report: any; @@ -219,10 +211,6 @@ export class ActivitiDemoComponent implements AfterViewInit { this.activitiprocesslist.reload(); } - taskFormCompleted(data: any) { - this.activitiprocesslist.reload(); - } - onFormCompleted(form) { this.activititasklist.reload(); this.currentTaskId = null; @@ -237,14 +225,6 @@ export class ActivitiDemoComponent implements AfterViewInit { this.loadStencilScriptsInPageFromActiviti(); } - activeProcess() { - this.processTabActivie = true; - } - - activeReports() { - this.reportsTabActivie = true; - } - loadStencilScriptsInPageFromActiviti() { this.apiService.getInstance().activiti.scriptFileApi.getControllers().then(response => { if (response) { @@ -256,4 +236,10 @@ export class ActivitiDemoComponent implements AfterViewInit { }); } + onProcessDetailsTaskClick(event: TaskDetailsEvent) { + event.preventDefault(); + this.currentTaskId = event.value.id; + this.activeTab = 'tasks'; + } + } diff --git a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts index 0b15c99a61..7845f8dfcc 100644 --- a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts @@ -47,7 +47,7 @@ export class EcmModelService { }); } }, - this.handleError + err => this.handleError(err) ); }); @@ -72,10 +72,10 @@ export class EcmModelService { observer.complete(); }); }, - this.handleError + err => this.handleError(err) ); }, - this.handleError + err => this.handleError(err) ); }); } @@ -95,7 +95,7 @@ export class EcmModelService { observer.complete(); } }, - this.handleError + err => this.handleError(err) ); }); } @@ -111,9 +111,9 @@ export class EcmModelService { observer.next(typeCreated); observer.complete(); }, - this.handleError); + err => this.handleError(err)); }, - this.handleError); + err => this.handleError(err)); }); } @@ -126,25 +126,25 @@ export class EcmModelService { public activeEcmModel(modelName: string): Observable { return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.activateCustomModel(modelName)) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } public createEcmModel(modelName: string, nameSpace: string): Observable { return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.createCustomModel('DRAFT', '', modelName, modelName, nameSpace)) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } public getEcmModels(): Observable { return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.getAllCustomModel()) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } public getEcmType(modelName: string): Observable { return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.getAllCustomType(modelName)) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } public createEcmType(typeName: string, modelName: string, parentType: string): Observable { @@ -152,7 +152,7 @@ export class EcmModelService { return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.createCustomType(modelName, name, parentType, typeName, '')) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } public addPropertyToAType(modelName: string, typeName: string, formFields: any) { @@ -177,11 +177,11 @@ export class EcmModelService { return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.addPropertyToType(modelName, name, properties)) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } - public cleanNameType(name: string): string { + cleanNameType(name: string): string { let cleanName = name; if (name.indexOf(':') !== -1) { cleanName = name.split(':')[1]; diff --git a/ng2-components/ng2-activiti-form/stencils/runtime.ng1.js b/ng2-components/ng2-activiti-form/stencils/runtime.ng1.js index 411ee66cf2..c5b4de0e42 100644 --- a/ng2-components/ng2-activiti-form/stencils/runtime.ng1.js +++ b/ng2-components/ng2-activiti-form/stencils/runtime.ng1.js @@ -5,8 +5,11 @@ window.angular = { return { controller: function (controllerName) { console.info('ng1: controller %s requested', controllerName); - return { - } + return {} + }, + directive: function (directiveName) { + console.info('ng1: directive %s requested', directiveName); + return {} } } } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html index 30b138e0d5..67fb465d4a 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html @@ -4,8 +4,10 @@
- + +
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts index 2cb2a9399f..db8369d0e9 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts @@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; -import { ActivitiFormModule, FormModel, FormService } from 'ng2-activiti-form'; +import { ActivitiFormModule, FormService } from 'ng2-activiti-form'; import { ActivitiTaskListModule } from 'ng2-activiti-tasklist'; import { ActivitiProcessInstanceDetails } from './activiti-process-instance-details.component'; @@ -139,20 +139,4 @@ describe('ActivitiProcessInstanceDetails', () => { }); }); - describe('events', () => { - - beforeEach(async(() => { - component.processInstanceId = '123'; - fixture.detectChanges(); - fixture.whenStable(); - })); - - it('should emit a task form completed event when task form completed', () => { - let emitSpy: jasmine.Spy = spyOn(component.taskFormCompleted, 'emit'); - component.bubbleTaskFormCompleted(new FormModel()); - expect(emitSpy).toHaveBeenCalled(); - }); - - }); - }); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts index 6409ee478e..5c309cdc03 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts @@ -17,13 +17,13 @@ import { Component, Input, ViewChild, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { TaskDetailsEvent } from 'ng2-activiti-tasklist'; + import { ActivitiProcessService } from './../services/activiti-process.service'; import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component'; import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.component'; import { ProcessInstance } from '../models/process-instance.model'; -declare let componentHandler: any; - @Component({ selector: 'activiti-process-instance-details', moduleId: module.id, @@ -51,7 +51,7 @@ export class ActivitiProcessInstanceDetails implements OnChanges { processCancelled: EventEmitter = new EventEmitter(); @Output() - taskFormCompleted: EventEmitter = new EventEmitter(); + taskClick: EventEmitter = new EventEmitter(); processInstanceDetails: ProcessInstance; @@ -98,10 +98,6 @@ export class ActivitiProcessInstanceDetails implements OnChanges { } } - bubbleTaskFormCompleted(data: any) { - this.taskFormCompleted.emit(data); - } - isRunning(): boolean { return this.processInstanceDetails && !this.processInstanceDetails.ended; } @@ -114,4 +110,9 @@ export class ActivitiProcessInstanceDetails implements OnChanges { this.logService.error(err); }); } + + // bubbles (taskClick) event + onTaskClicked(event: TaskDetailsEvent) { + this.taskClick.emit(event); + } } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css index 5611dd9942..2335ce2dec 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css @@ -47,3 +47,7 @@ display: block; padding: 12px; } + +.process-tasks__task-item { + cursor: pointer; +} diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html index aec79cdaf3..0946965608 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html @@ -1,6 +1,5 @@
-
@@ -12,11 +11,13 @@
    -
  • +
  • assignment - {{task.name}} - {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user: getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }} + {{task.name || 'Nameless task'}} + + {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user: getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }} +
@@ -34,12 +35,13 @@
    -
  • +
  • assignment {{ 'DETAILS.LABELS.START_FORM'|translate }} - {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user: - getUserFullName(processInstanceDetails.startedBy), created: getFormatDate(processInstanceDetails.started, 'mediumDate') } }} + + {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:getUserFullName(processInstanceDetails.startedBy), created: getFormatDate(processInstanceDetails.started, 'mediumDate') } }} +
@@ -53,12 +55,13 @@
    -
  • +
  • assignment - {{task.name}} - {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user: - getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }} + {{task.name || 'Nameless task'}} + + {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }} +
@@ -68,16 +71,6 @@ {{ 'DETAILS.TASKS.NO_COMPLETED' | translate }}
- -

{{ 'DETAILS.TASKS.TASK_DETAILS' | translate }}

-
- -
-
- -
- -

{{ 'DETAILS.LABELS.START_FORM'|translate }}

diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts index d8dc9256d8..d07ba28e64 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts @@ -158,51 +158,4 @@ describe('ActivitiProcessInstanceTasks', () => { expect(getProcessTasksSpy).toHaveBeenCalled(); }); }); - - describe('task details', () => { - - let closeSpy; - - beforeEach(async(() => { - closeSpy = spyOn(component.dialog.nativeElement, 'close'); - component.processInstanceDetails = exampleProcessInstance; - fixture.detectChanges(); - fixture.whenStable(); - component.taskdetails = jasmine.createSpyObj('taskdetails', [ - 'loadDetails' - ]); - })); - - it('should display task details dialog when task clicked', () => { - let showModalSpy = spyOn(component.dialog.nativeElement, 'showModal'); - component.clickTask({}, new TaskDetailsModel(taskDetailsMock)); - expect(showModalSpy).toHaveBeenCalled(); - }); - - it('should close the task details dialog when close button clicked', () => { - component.clickTask({}, new TaskDetailsModel(taskDetailsMock)); - fixture.detectChanges(); - let closeButton: DebugElement = debugElement.query(By.css('[data-automation-id="button-task-close"]')); - closeButton.triggerEventHandler('click', null); - expect(closeSpy).toHaveBeenCalled(); - }); - - it('should output event when task form completed', async(() => { - let emitSpy = spyOn(component.taskFormCompleted, 'emit'); - fixture.detectChanges(); - component.clickTask({}, new TaskDetailsModel(taskDetailsMock)); - fixture.detectChanges(); - component.onTaskFormCompleted(); - expect(emitSpy).toHaveBeenCalled(); - })); - - it('should close dialog when task form completed', async(() => { - component.clickTask({}, new TaskDetailsModel(taskDetailsMock)); - fixture.detectChanges(); - component.onTaskFormCompleted(); - expect(closeSpy).toHaveBeenCalled(); - })); - - }); - }); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts index 93154c4f33..dc41b6eb8b 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts @@ -20,7 +20,7 @@ import { DatePipe } from '@angular/common'; import { Observable, Observer } from 'rxjs/Rx'; import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; -import { TaskDetailsModel } from 'ng2-activiti-tasklist'; +import { TaskDetailsModel, TaskDetailsEvent } from 'ng2-activiti-tasklist'; import { ProcessInstance } from '../models/process-instance.model'; declare let componentHandler: any; @@ -40,9 +40,6 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { @Input() showRefreshButton: boolean = true; - @Output() - taskFormCompleted = new EventEmitter(); - activeTasks: TaskDetailsModel[] = []; completedTasks: TaskDetailsModel[] = []; @@ -53,9 +50,6 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { completedTask$: Observable; message: string; - - selectedTaskId: string; - processId: string; @ViewChild('dialog') @@ -67,6 +61,9 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { @ViewChild('taskdetails') taskdetails: any; + @Output() + taskClick: EventEmitter = new EventEmitter(); + constructor(private translate: AlfrescoTranslateService, private activitiProcess: ActivitiProcessService, private logService: LogService) { @@ -94,12 +91,12 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { } } - public load(processId: string) { + load(processId: string) { this.loadActive(processId); this.loadCompleted(processId); } - public loadActive(processId: string) { + loadActive(processId: string) { this.activeTasks = []; if (processId) { this.activitiProcess.getProcessTasks(processId, null).subscribe( @@ -117,7 +114,7 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { } } - public loadCompleted(processId: string) { + loadCompleted(processId: string) { this.completedTasks = []; if (processId) { this.activitiProcess.getProcessTasks(processId, 'completed').subscribe( @@ -157,17 +154,17 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { } } - public clickTask($event: any, task: TaskDetailsModel) { - this.selectedTaskId = task.id; - this.showDialog(); + clickTask($event: any, task: TaskDetailsModel) { + let args = new TaskDetailsEvent(task); + this.taskClick.emit(args); } - public clickStartTask() { + clickStartTask() { this.processId = this.processInstanceDetails.id; this.showStartDialog(); } - public showStartDialog() { + showStartDialog() { if (!this.startDialog.nativeElement.showModal) { dialogPolyfill.registerDialog(this.startDialog.nativeElement); } @@ -177,35 +174,13 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { } } - public showDialog() { - if (!this.dialog.nativeElement.showModal) { - dialogPolyfill.registerDialog(this.dialog.nativeElement); - } - if (this.dialog) { - this.dialog.nativeElement.showModal(); - } - } - - public closeSartDialog() { + closeSartDialog() { if (this.startDialog) { this.startDialog.nativeElement.close(); } } - private closeDialog() { - if (this.dialog) { - this.dialog.nativeElement.close(); - } - this.selectedTaskId = null; - } - - public onTaskFormCompleted() { - this.closeDialog(); - this.load(this.processInstanceDetails.id); - this.taskFormCompleted.emit(this.processInstanceDetails.id); - } - - public onRefreshClicked() { + onRefreshClicked() { this.load(this.processInstanceDetails.id); } } diff --git a/ng2-components/ng2-activiti-tasklist/src/models/index.ts b/ng2-components/ng2-activiti-tasklist/src/models/index.ts index 2d3fb08a48..e3fe92d601 100644 --- a/ng2-components/ng2-activiti-tasklist/src/models/index.ts +++ b/ng2-components/ng2-activiti-tasklist/src/models/index.ts @@ -20,3 +20,4 @@ export * from './filter.model'; export * from './icon.model'; export * from './user.model'; export * from './task-details.model'; +export * from './task-details.event'; diff --git a/ng2-components/ng2-activiti-tasklist/src/models/task-details.event.ts b/ng2-components/ng2-activiti-tasklist/src/models/task-details.event.ts new file mode 100644 index 0000000000..c283abea75 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/src/models/task-details.event.ts @@ -0,0 +1,40 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { TaskDetailsModel } from './task-details.model'; + +export class TaskDetailsEvent { + + private _value: TaskDetailsModel; + private _defaultPrevented: boolean = false; + + get value(): TaskDetailsModel { + return this._value; + } + + get defaultPrevented() { + return this._defaultPrevented; + } + + constructor(value: TaskDetailsModel) { + this._value = value; + } + + preventDefault() { + this._defaultPrevented = true; + } +} diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts index ce0038bd38..819b3fe414 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts @@ -40,7 +40,7 @@ export class BpmUserService { getCurrentUserInfo(): Observable { return Observable.fromPromise(this.alfrescoJsApi.getInstance().activiti.profileApi.getProfile()) .map((data) => data) - .catch(this.handleError); + .catch(err => this.handleError(err)); } getCurrentUserProfileImage(): string { diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts index f747dcbf50..5531a43f41 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts @@ -40,10 +40,8 @@ export class EcmUserService { */ getUserInfo(userName: string): Observable { return Observable.fromPromise(this.callApiGetPersonInfo(userName)) - .map( - (data) => data['entry'] - ) - .catch(this.handleError); + .map(data => data['entry']) + .catch(err => this.handleError(err)); } getCurrentUserInfo() { From 26fb2374d29cac1234f5d5334839cddb0ef22b99 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 9 Jan 2017 15:22:52 +0000 Subject: [PATCH 044/108] #1411 support 'form refresh' for start forms (#1417) --- .../src/components/activiti-start-form.component.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index 9052c9373c..c96463a0bf 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -137,6 +137,17 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, // do nothing } + /** @override */ + onRefreshClicked() { + if (this.processDefinitionId) { + this.visibilityService.cleanProcessVariable(); + this.getStartFormDefinition(this.processDefinitionId); + } else if (this.processId) { + this.visibilityService.cleanProcessVariable(); + this.loadStartForm(this.processId); + } + } + completeTaskForm(outcome?: string) { this.outcomeClick.emit(outcome); } From dc28d5b679140f486fc494b6a22bad1190e90115 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 9 Jan 2017 18:57:58 +0000 Subject: [PATCH 045/108] #1400 component naming convention fixes (#1418) --- .../app/components/files/files.component.ts | 12 +--- .../ng2-alfresco-documentlist/README.md | 4 +- .../demo/src/main.ts | 6 +- .../ng2-alfresco-documentlist/index.ts | 44 ++++++------- .../breadcrumb/breadcrumb.component.spec.ts | 8 +-- .../breadcrumb/breadcrumb.component.ts | 6 +- .../content-action-list.component.spec.ts} | 18 +++--- .../content-action-list.component.ts} | 12 ++-- .../content-action.component.spec.ts} | 62 +++++++++---------- .../content-action.component.ts} | 23 +++---- .../content-column-list.component.spec.ts} | 16 ++--- .../content-column-list.component.ts} | 8 +-- .../content-column.component.spec.ts} | 26 ++++---- .../content-column.component.ts} | 7 ++- ...t-list.css => document-list.component.css} | 0 ...list.html => document-list.component.html} | 0 ...pec.ts => document-list.component.spec.ts} | 33 +++++----- ...ent-list.ts => document-list.component.ts} | 16 ++--- ...css => document-menu-action.component.css} | 0 ...ml => document-menu-action.component.html} | 0 ...n.ts => document-menu-action.component.ts} | 7 ++- .../empty-folder-content.component.spec.ts} | 15 ++--- .../empty-folder-content.component.ts} | 13 ++-- 23 files changed, 161 insertions(+), 175 deletions(-) rename ng2-components/ng2-alfresco-documentlist/src/components/{content-action-list.spec.ts => content-action/content-action-list.component.spec.ts} (72%) rename ng2-components/ng2-alfresco-documentlist/src/components/{content-action-list.ts => content-action/content-action-list.component.ts} (78%) rename ng2-components/ng2-alfresco-documentlist/src/components/{content-action.spec.ts => content-action/content-action.component.spec.ts} (75%) rename ng2-components/ng2-alfresco-documentlist/src/components/{content-action.ts => content-action/content-action.component.ts} (80%) rename ng2-components/ng2-alfresco-documentlist/src/components/{content-column-list.spec.ts => content-column/content-column-list.component.spec.ts} (76%) rename ng2-components/ng2-alfresco-documentlist/src/components/{content-column-list.ts => content-column/content-column-list.component.ts} (87%) rename ng2-components/ng2-alfresco-documentlist/src/components/{content-column.spec.ts => content-column/content-column.component.spec.ts} (66%) rename ng2-components/ng2-alfresco-documentlist/src/components/{content-column.ts => content-column/content-column.component.ts} (87%) rename ng2-components/ng2-alfresco-documentlist/src/components/{document-list.css => document-list.component.css} (100%) rename ng2-components/ng2-alfresco-documentlist/src/components/{document-list.html => document-list.component.html} (100%) rename ng2-components/ng2-alfresco-documentlist/src/components/{document-list.spec.ts => document-list.component.spec.ts} (92%) rename ng2-components/ng2-alfresco-documentlist/src/components/{document-list.ts => document-list.component.ts} (95%) rename ng2-components/ng2-alfresco-documentlist/src/components/{document-menu-action.css => document-menu-action.component.css} (100%) rename ng2-components/ng2-alfresco-documentlist/src/components/{document-menu-action.html => document-menu-action.component.html} (100%) rename ng2-components/ng2-alfresco-documentlist/src/components/{document-menu-action.ts => document-menu-action.component.ts} (96%) rename ng2-components/ng2-alfresco-documentlist/src/components/{empty-folder-content.spec.ts => empty-folder/empty-folder-content.component.spec.ts} (72%) rename ng2-components/ng2-alfresco-documentlist/src/components/{empty-folder-content.ts => empty-folder/empty-folder-content.component.ts} (77%) diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts index c4cda092de..65053fcf2e 100644 --- a/demo-shell-ng2/app/components/files/files.component.ts +++ b/demo-shell-ng2/app/components/files/files.component.ts @@ -18,13 +18,7 @@ import { Component, OnInit, Optional, ViewChild } from '@angular/core'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { AuthService, LogService } from 'ng2-alfresco-core'; -import { - DocumentActionsService, - DocumentList, - ContentActionHandler, - DocumentActionModel, - FolderActionModel -} from 'ng2-alfresco-documentlist'; +import { DocumentActionsService, DocumentListComponent, ContentActionHandler, DocumentActionModel, FolderActionModel } from 'ng2-alfresco-documentlist'; import { FormService } from 'ng2-activiti-form'; @Component({ @@ -45,8 +39,8 @@ export class FilesComponent implements OnInit { versioning: boolean = false; acceptedFilesType: string = '.jpg,.pdf,.js'; - @ViewChild(DocumentList) - documentList: DocumentList; + @ViewChild(DocumentListComponent) + documentList: DocumentListComponent; constructor(private documentActions: DocumentActionsService, private authService: AuthService, diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 7ccfae68b1..2225a8b07f 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -131,7 +131,7 @@ import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfr class DocumentListDemo { @ViewChild(DocumentList) - documentList: DocumentList; + documentList: DocumentListComponent; constructor(private authService: AlfrescoAuthenticationService, private settingsService: AlfrescoSettingsService) { @@ -210,7 +210,7 @@ DocumentList provides simple breadcrumb element to indicate the current position | Name | Type | Description | | --- | --- | --- | -| `target` | DocumentList | DocumentList component to operate with. Upon clicks will instruct the given component to update. | +| `target` | DocumentListComponent | DocumentList component to operate with. Upon clicks will instruct the given component to update. | | `folderNode` | MinimalNodeEntryEntity | Active node, builds UI based on `folderNode.path.elements` collection. | ### Creation Menu Action diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts index d6e1209571..c8b5fd69b8 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component, OnInit, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { DocumentListModule, DocumentList, DocumentActionsService } from 'ng2-alfresco-documentlist'; +import { DocumentListModule, DocumentListComponent, DocumentActionsService } from 'ng2-alfresco-documentlist'; import { CoreModule, StorageService, SettingsService, AuthService, AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; @Component({ @@ -124,8 +124,8 @@ class DocumentListDemo implements OnInit { ecmHost: string = 'http://localhost:8080'; ticket: string; - @ViewChild(DocumentList) - documentList: DocumentList; + @ViewChild(DocumentListComponent) + documentList: DocumentListComponent; constructor(private authService: AuthService, private settingsService: SettingsService, diff --git a/ng2-components/ng2-alfresco-documentlist/index.ts b/ng2-components/ng2-alfresco-documentlist/index.ts index 4469842654..81be2a67c8 100644 --- a/ng2-components/ng2-alfresco-documentlist/index.ts +++ b/ng2-components/ng2-alfresco-documentlist/index.ts @@ -19,26 +19,26 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { CoreModule } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; -import { DocumentList } from './src/components/document-list'; -import { DocumentMenuAction } from './src/components/document-menu-action'; -import { ContentColumn } from './src/components/content-column'; -import { ContentColumnList } from './src/components/content-column-list'; -import { ContentAction } from './src/components/content-action'; -import { ContentActionList } from './src/components/content-action-list'; -import { EmptyFolderContent } from './src/components/empty-folder-content'; -import { DocumentListBreadcrumb } from './src/components/breadcrumb/breadcrumb.component'; +import { DocumentListComponent } from './src/components/document-list.component'; +import { DocumentMenuActionComponent } from './src/components/document-menu-action.component'; +import { ContentColumnComponent } from './src/components/content-column/content-column.component'; +import { ContentColumnListComponent } from './src/components/content-column/content-column-list.component'; +import { ContentActionComponent } from './src/components/content-action/content-action.component'; +import { ContentActionListComponent } from './src/components/content-action/content-action-list.component'; +import { EmptyFolderContentComponent } from './src/components/empty-folder/empty-folder-content.component'; +import { DocumentListBreadcrumbComponent } from './src/components/breadcrumb/breadcrumb.component'; import { FolderActionsService } from './src/services/folder-actions.service'; import { DocumentActionsService } from './src/services/document-actions.service'; import { DocumentListService } from './src/services/document-list.service'; // components -export * from './src/components/document-list'; -export * from './src/components/content-column'; -export * from './src/components/content-column-list'; -export * from './src/components/content-action'; -export * from './src/components/content-action-list'; -export * from './src/components/empty-folder-content'; +export * from './src/components/document-list.component'; +export * from './src/components/content-column/content-column.component'; +export * from './src/components/content-column/content-column-list.component'; +export * from './src/components/content-action/content-action.component'; +export * from './src/components/content-action/content-action-list.component'; +export * from './src/components/empty-folder/empty-folder-content.component'; export * from './src/components/breadcrumb/breadcrumb.component'; // data @@ -54,14 +54,14 @@ export * from './src/models/content-action.model'; export * from './src/models/document-library.model'; export const DOCUMENT_LIST_DIRECTIVES: any[] = [ - DocumentList, - DocumentMenuAction, - ContentColumn, - ContentColumnList, - ContentAction, - ContentActionList, - EmptyFolderContent, - DocumentListBreadcrumb + DocumentListComponent, + DocumentMenuActionComponent, + ContentColumnComponent, + ContentColumnListComponent, + ContentActionComponent, + ContentActionListComponent, + EmptyFolderContentComponent, + DocumentListBreadcrumbComponent ]; export const DOCUMENT_LIST_PROVIDERS: any[] = [ diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts index d2354ff1e0..56744a769f 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts @@ -16,15 +16,15 @@ */ import { PathElementEntity } from 'alfresco-js-api'; -import { DocumentListBreadcrumb } from './breadcrumb.component'; -import { DocumentList } from '../document-list'; +import { DocumentListBreadcrumbComponent } from './breadcrumb.component'; +import { DocumentListComponent } from '../document-list.component'; describe('DocumentListBreadcrumb', () => { let component; beforeEach(() => { - component = new DocumentListBreadcrumb(); + component = new DocumentListBreadcrumbComponent(); }); it('should set current path', () => { @@ -50,7 +50,7 @@ describe('DocumentListBreadcrumb', () => { }); it('should update document list on click', (done) => { - let documentList = new DocumentList(null, null, null); + let documentList = new DocumentListComponent(null, null, null); spyOn(documentList, 'loadFolderByNodeId').and.stub(); let node = { id: '-id-', name: 'name' }; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts index a924910854..c462817dee 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts @@ -17,7 +17,7 @@ import { Component, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; import { MinimalNodeEntryEntity, PathElementEntity } from 'alfresco-js-api'; -import { DocumentList } from '../document-list'; +import { DocumentListComponent } from '../document-list.component'; @Component({ moduleId: module.id, @@ -25,13 +25,13 @@ import { DocumentList } from '../document-list'; templateUrl: './breadcrumb.component.html', styleUrls: ['./breadcrumb.component.css'] }) -export class DocumentListBreadcrumb implements OnChanges { +export class DocumentListBreadcrumbComponent implements OnChanges { @Input() folderNode: MinimalNodeEntryEntity; @Input() - target: DocumentList; + target: DocumentListComponent; route: PathElementEntity[] = []; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action-list.component.spec.ts similarity index 72% rename from ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.spec.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action-list.component.spec.ts index 00a5448417..ffcaaa044e 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action-list.component.spec.ts @@ -15,20 +15,20 @@ * limitations under the License. */ -import { DocumentList } from './document-list'; -import { DocumentListServiceMock } from '../assets/document-list.service.mock'; -import { ContentActionModel } from './../models/content-action.model'; -import { ContentActionList } from './content-action-list'; +import { DocumentListComponent } from './../document-list.component'; +import { DocumentListServiceMock } from './../../assets/document-list.service.mock'; +import { ContentActionModel } from './../../models/content-action.model'; +import { ContentActionListComponent } from './content-action-list.component'; describe('ContentColumnList', () => { - let documentList: DocumentList; - let actionList: ContentActionList; + let documentList: DocumentListComponent; + let actionList: ContentActionListComponent; beforeEach(() => { let documentListService = new DocumentListServiceMock(); - documentList = new DocumentList(documentListService, null, null); - actionList = new ContentActionList(documentList); + documentList = new DocumentListComponent(documentListService, null, null); + actionList = new ContentActionListComponent(documentList); }); it('should register action', () => { @@ -42,7 +42,7 @@ describe('ContentColumnList', () => { }); it('should require document list instance to register action', () => { - actionList = new ContentActionList(null); + actionList = new ContentActionListComponent(null); let action = new ContentActionModel(); expect(actionList.registerAction(action)).toBeFalsy(); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action-list.component.ts similarity index 78% rename from ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action-list.component.ts index 2dd1f15ff4..00f9e78973 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action-list.component.ts @@ -15,18 +15,18 @@ * limitations under the License. */ -import {Component} from '@angular/core'; -import {DocumentList} from './document-list'; -import {ContentActionModel} from './../models/content-action.model'; +import { Component } from '@angular/core'; + +import { DocumentListComponent } from './../document-list.component'; +import { ContentActionModel } from './../../models/content-action.model'; @Component({ selector: 'content-actions', template: '' }) -export class ContentActionList { +export class ContentActionListComponent { - constructor( - private documentList: DocumentList) { + constructor(private documentList: DocumentListComponent) { } /** diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.spec.ts similarity index 75% rename from ng2-components/ng2-alfresco-documentlist/src/components/content-action.spec.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.spec.ts index 7ebd29d877..bd8b614b26 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.spec.ts @@ -17,19 +17,19 @@ import { EventEmitter } from '@angular/core'; -import { DocumentList } from './document-list'; -import { DocumentListServiceMock } from '../assets/document-list.service.mock'; -import { ContentActionList } from './content-action-list'; -import { ContentAction } from './content-action'; -import { DocumentActionsService } from '../services/document-actions.service'; -import { FolderActionsService } from '../services/folder-actions.service'; -import { ContentActionHandler } from '../models/content-action.model'; -import { FileNode } from '../assets/document-library.model.mock'; +import { DocumentListComponent } from './../document-list.component'; +import { DocumentListServiceMock } from './../../assets/document-list.service.mock'; +import { ContentActionListComponent } from './content-action-list.component'; +import { ContentActionComponent } from './content-action.component'; +import { DocumentActionsService } from './../../services/document-actions.service'; +import { FolderActionsService } from './../../services/folder-actions.service'; +import { ContentActionHandler } from './../../models/content-action.model'; +import { FileNode } from './../../assets/document-library.model.mock'; describe('ContentAction', () => { - let documentList: DocumentList; - let actionList: ContentActionList; + let documentList: DocumentListComponent; + let actionList: ContentActionListComponent; let documentActions: DocumentActionsService; let folderActions: FolderActionsService; @@ -38,21 +38,21 @@ describe('ContentAction', () => { documentActions = new DocumentActionsService(null, null); folderActions = new FolderActionsService(null); - documentList = new DocumentList(documentServiceMock, null, null); - actionList = new ContentActionList(documentList); + documentList = new DocumentListComponent(documentServiceMock, null, null); + actionList = new ContentActionListComponent(documentList); }); it('should register within parent actions list', () => { spyOn(actionList, 'registerAction').and.stub(); - let action = new ContentAction(actionList, null, null); + let action = new ContentActionComponent(actionList, null, null); action.ngOnInit(); expect(actionList.registerAction).toHaveBeenCalled(); }); it('should setup and register model', () => { - let action = new ContentAction(actionList, null, null); + let action = new ContentActionComponent(actionList, null, null); action.target = 'document'; action.title = ''; action.icon = '<icon>'; @@ -73,7 +73,7 @@ describe('ContentAction', () => { let handler = function() {}; spyOn(documentActions, 'getHandler').and.returnValue(handler); - let action = new ContentAction(actionList, documentActions, null); + let action = new ContentActionComponent(actionList, documentActions, null); action.target = 'document'; action.handler = '<handler>'; action.ngOnInit(); @@ -89,7 +89,7 @@ describe('ContentAction', () => { let handler = function() {}; spyOn(folderActions, 'getHandler').and.returnValue(handler); - let action = new ContentAction(actionList, null, folderActions); + let action = new ContentActionComponent(actionList, null, folderActions); action.target = 'folder'; action.handler = '<handler>'; action.ngOnInit(); @@ -105,7 +105,7 @@ describe('ContentAction', () => { spyOn(folderActions, 'getHandler').and.stub(); spyOn(documentActions, 'getHandler').and.stub(); - let action = new ContentAction(actionList, documentActions, folderActions); + let action = new ContentActionComponent(actionList, documentActions, folderActions); action.handler = '<handler>'; action.ngOnInit(); @@ -125,7 +125,7 @@ describe('ContentAction', () => { it('should be case insensitive for document target', () => { spyOn(documentActions, 'getHandler').and.stub(); - let action = new ContentAction(actionList, documentActions, null); + let action = new ContentActionComponent(actionList, documentActions, null); action.target = 'DoCuMeNt'; action.handler = '<handler>'; @@ -136,7 +136,7 @@ describe('ContentAction', () => { it('should be case insensitive for folder target', () => { spyOn(folderActions, 'getHandler').and.stub(); - let action = new ContentAction(actionList, null, folderActions); + let action = new ContentActionComponent(actionList, null, folderActions); action.target = 'FoLdEr'; action.handler = '<handler>'; @@ -152,7 +152,7 @@ describe('ContentAction', () => { done(); }); - let action = new ContentAction(actionList, null, null); + let action = new ContentActionComponent(actionList, null, null); action.target = 'document'; action.execute = emitter; @@ -165,7 +165,7 @@ describe('ContentAction', () => { it('should sync localizable fields with model', () => { - let action = new ContentAction(actionList, null, null); + let action = new ContentActionComponent(actionList, null, null); action.title = 'title1'; action.ngOnInit(); @@ -178,25 +178,25 @@ describe('ContentAction', () => { }); it('should not find document action handler with missing service', () => { - let action = new ContentAction(actionList, null, null); + let action = new ContentActionComponent(actionList, null, null); expect(action.getSystemHandler('document', 'name')).toBeNull(); }); it('should not find folder action handler with missing service', () => { - let action = new ContentAction(actionList, null, null); + let action = new ContentActionComponent(actionList, null, null); expect(action.getSystemHandler('folder', 'name')).toBeNull(); }); it('should find document action handler via service', () => { let handler = <ContentActionHandler> function (obj: any, target?: any) {}; - let action = new ContentAction(actionList, documentActions, null); + let action = new ContentActionComponent(actionList, documentActions, null); spyOn(documentActions, 'getHandler').and.returnValue(handler); expect(action.getSystemHandler('document', 'name')).toBe(handler); }); it('should find folder action handler via service', () => { let handler = <ContentActionHandler> function (obj: any, target?: any) {}; - let action = new ContentAction(actionList, null, folderActions); + let action = new ContentActionComponent(actionList, null, folderActions); spyOn(folderActions, 'getHandler').and.returnValue(handler); expect(action.getSystemHandler('folder', 'name')).toBe(handler); }); @@ -205,7 +205,7 @@ describe('ContentAction', () => { spyOn(folderActions, 'getHandler').and.stub(); spyOn(documentActions, 'getHandler').and.stub(); - let action = new ContentAction(actionList, documentActions, folderActions); + let action = new ContentActionComponent(actionList, documentActions, folderActions); expect(action.getSystemHandler('unknown', 'name')).toBeNull(); expect(folderActions.getHandler).not.toHaveBeenCalled(); @@ -214,7 +214,7 @@ describe('ContentAction', () => { }); it('should wire model with custom event handler', (done) => { - let action = new ContentAction(actionList, documentActions, folderActions); + let action = new ContentActionComponent(actionList, documentActions, folderActions); let file = new FileNode(); let handler = new EventEmitter(); @@ -230,7 +230,7 @@ describe('ContentAction', () => { }); it('should allow registering model without handler', () => { - let action = new ContentAction(actionList, documentActions, folderActions); + let action = new ContentActionComponent(actionList, documentActions, folderActions); spyOn(actionList, 'registerAction').and.callThrough(); action.execute = null; @@ -241,7 +241,7 @@ describe('ContentAction', () => { }); it('should register on init', () => { - let action = new ContentAction(actionList, null, null); + let action = new ContentActionComponent(actionList, null, null); spyOn(action, 'register').and.callThrough(); action.ngOnInit(); @@ -249,10 +249,10 @@ describe('ContentAction', () => { }); it('should require action list to register action with', () => { - let action = new ContentAction(actionList, null, null); + let action = new ContentActionComponent(actionList, null, null); expect(action.register()).toBeTruthy(); - action = new ContentAction(null, null, null); + action = new ContentActionComponent(null, null, null); expect(action.register()).toBeFalsy(); }); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.ts similarity index 80% rename from ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.ts index 03ad0740c6..3adbb64985 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.ts @@ -15,26 +15,19 @@ * limitations under the License. */ -import { - Component, - OnInit, - OnChanges, - Input, - Output, - EventEmitter -} from '@angular/core'; +import { Component, OnInit, OnChanges, Input, Output, EventEmitter } from '@angular/core'; -import { ContentActionModel } from './../models/content-action.model'; -import { ContentActionList } from './content-action-list'; -import { DocumentActionsService } from '../services/document-actions.service'; -import { FolderActionsService } from '../services/folder-actions.service'; -import { ContentActionHandler } from '../models/content-action.model'; +import { ContentActionListComponent } from './content-action-list.component'; +import { ContentActionModel } from './../../models/content-action.model'; +import { DocumentActionsService } from '../../services/document-actions.service'; +import { FolderActionsService } from '../../services/folder-actions.service'; +import { ContentActionHandler } from '../../models/content-action.model'; @Component({ selector: 'content-action', template: '' }) -export class ContentAction implements OnInit, OnChanges { +export class ContentActionComponent implements OnInit, OnChanges { @Input() title: string = 'Action'; @@ -54,7 +47,7 @@ export class ContentAction implements OnInit, OnChanges { model: ContentActionModel; constructor( - private list: ContentActionList, + private list: ContentActionListComponent, private documentActions: DocumentActionsService, private folderActions: FolderActionsService) { this.model = new ContentActionModel(); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts similarity index 76% rename from ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.spec.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts index c21621f33f..8fd4daad64 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts @@ -17,19 +17,19 @@ import { DataColumn } from 'ng2-alfresco-datatable'; -import { DocumentList } from './document-list'; -import { DocumentListServiceMock } from '../assets/document-list.service.mock'; -import { ContentColumnList } from './content-column-list'; +import { DocumentListComponent } from './../document-list.component'; +import { DocumentListServiceMock } from './../../assets/document-list.service.mock'; +import { ContentColumnListComponent } from './content-column-list.component'; describe('ContentColumnList', () => { - let documentList: DocumentList; - let columnList: ContentColumnList; + let documentList: DocumentListComponent; + let columnList: ContentColumnListComponent; beforeEach(() => { let service = new DocumentListServiceMock(); - documentList = new DocumentList(service, null, null); - columnList = new ContentColumnList(documentList); + documentList = new DocumentListComponent(service, null, null); + columnList = new ContentColumnListComponent(documentList); }); it('should register column within parent document list', () => { @@ -45,7 +45,7 @@ describe('ContentColumnList', () => { }); it('should require document list instance to register action', () => { - columnList = new ContentColumnList(null); + columnList = new ContentColumnListComponent(null); let col = <DataColumn> {}; expect(columnList.registerColumn(col)).toBeFalsy(); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.ts similarity index 87% rename from ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.ts index f84c158e8e..ac1580efa2 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.ts @@ -16,17 +16,17 @@ */ import { Component } from '@angular/core'; -import { DocumentList } from './document-list'; import { DataColumn } from 'ng2-alfresco-datatable'; +import { DocumentListComponent } from './../document-list.component'; + @Component({ selector: 'content-columns', template: '' }) -export class ContentColumnList { +export class ContentColumnListComponent { - constructor( - private documentList: DocumentList) { + constructor(private documentList: DocumentListComponent) { } /** diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts similarity index 66% rename from ng2-components/ng2-alfresco-documentlist/src/components/content-column.spec.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts index 0b64a9892a..1400641d35 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts @@ -15,26 +15,26 @@ * limitations under the License. */ -import { DocumentList } from './document-list'; -import { ContentColumn } from './content-column'; -import { DocumentListServiceMock } from '../assets/document-list.service.mock'; -import { ContentColumnList } from './content-column-list'; +import { DocumentListComponent } from './../document-list.component'; +import { ContentColumnComponent } from './content-column.component'; +import { DocumentListServiceMock } from './../../assets/document-list.service.mock'; +import { ContentColumnListComponent } from './content-column-list.component'; describe('ContentColumn', () => { - let documentList: DocumentList; - let columnList: ContentColumnList; + let documentList: DocumentListComponent; + let columnList: ContentColumnListComponent; beforeEach(() => { let service = new DocumentListServiceMock(); - documentList = new DocumentList(service, null, null); - columnList = new ContentColumnList(documentList); + documentList = new DocumentListComponent(service, null, null); + columnList = new ContentColumnListComponent(documentList); }); it('should register model within parent column list', () => { spyOn(columnList, 'registerColumn').and.callThrough(); - let column = new ContentColumn(columnList); + let column = new ContentColumnComponent(columnList); column.ngOnInit(); expect(columnList.registerColumn).toHaveBeenCalled(); @@ -45,7 +45,7 @@ describe('ContentColumn', () => { }); it('should setup screen reader title for thumbnail column', () => { - let column = new ContentColumn(columnList); + let column = new ContentColumnComponent(columnList); column.key = '$thumbnail'; column.ngOnInit(); @@ -53,7 +53,7 @@ describe('ContentColumn', () => { }); it('should register on init', () => { - let column = new ContentColumn(columnList); + let column = new ContentColumnComponent(columnList); spyOn(column, 'register').and.callThrough(); column.ngOnInit(); @@ -61,10 +61,10 @@ describe('ContentColumn', () => { }); it('should require action list to register action with', () => { - let column = new ContentColumn(columnList); + let column = new ContentColumnComponent(columnList); expect(column.register()).toBeTruthy(); - column = new ContentColumn(null); + column = new ContentColumnComponent(null); expect(column.register()).toBeFalsy(); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts similarity index 87% rename from ng2-components/ng2-alfresco-documentlist/src/components/content-column.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts index 3f5f715f6d..5adcb351a8 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts @@ -16,14 +16,15 @@ */ import { Component, OnInit, Input } from '@angular/core'; -import { ContentColumnList } from './content-column-list'; import { DataColumn } from 'ng2-alfresco-datatable'; +import { ContentColumnListComponent } from './content-column-list.component'; + @Component({ selector: 'content-column', template: '' }) -export class ContentColumn implements OnInit, DataColumn { +export class ContentColumnComponent implements OnInit, DataColumn { @Input() key: string; @@ -49,7 +50,7 @@ export class ContentColumn implements OnInit, DataColumn { @Input('class') cssClass: string; - constructor(private list: ContentColumnList) {} + constructor(private list: ContentColumnListComponent) {} ngOnInit() { if (!this.srTitle && this.key === '$thumbnail') { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.css b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.css similarity index 100% rename from ng2-components/ng2-alfresco-documentlist/src/components/document-list.css rename to ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.css diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html similarity index 100% rename from ng2-components/ng2-alfresco-documentlist/src/components/document-list.html rename to ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts similarity index 92% rename from ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts index e877c82550..c2cc0459cb 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts @@ -17,7 +17,8 @@ import { NgZone, SimpleChange, TemplateRef } from '@angular/core'; import { DataTableComponent, DataColumn, DataRowEvent } from 'ng2-alfresco-datatable'; -import { DocumentList } from './document-list'; + +import { DocumentListComponent } from './document-list.component'; import { DocumentListServiceMock } from './../assets/document-list.service.mock'; import { ContentActionModel } from '../models/content-action.model'; import { FileNode, FolderNode } from '../assets/document-library.model.mock'; @@ -27,14 +28,14 @@ import { ShareDataRow, RowFilter, ImageResolver } from './../data/share-datatabl describe('DocumentList', () => { let documentListService: DocumentListServiceMock; - let documentList: DocumentList; + let documentList: DocumentListComponent; let eventMock: any; let componentHandler; beforeEach(() => { documentListService = new DocumentListServiceMock(); let zone = new NgZone(false); - documentList = new DocumentList(documentListService, zone, null); + documentList = new DocumentListComponent(documentListService, zone, null); eventMock = { preventDefault: function () { @@ -154,7 +155,7 @@ describe('DocumentList', () => { spyOn(documentList, 'loadFolder').and.returnValue(Promise.resolve(true)); - documentList.navigationMode = DocumentList.SINGLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.SINGLE_CLICK_NAVIGATION; documentList.onNodeClick(node); expect(documentList.loadFolder).toHaveBeenCalled(); @@ -227,7 +228,7 @@ describe('DocumentList', () => { expect(e.value).toBe(file); done(); }); - documentList.navigationMode = DocumentList.SINGLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.SINGLE_CLICK_NAVIGATION; documentList.onNodeClick(file); }); @@ -237,7 +238,7 @@ describe('DocumentList', () => { expect(e.value).toBe(file); done(); }); - documentList.navigationMode = DocumentList.DOUBLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.DOUBLE_CLICK_NAVIGATION; documentList.onNodeDblClick(file); }); @@ -245,7 +246,7 @@ describe('DocumentList', () => { let folder = new FolderNode(); spyOn(documentList, 'performNavigation').and.stub(); - documentList.navigationMode = DocumentList.SINGLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.SINGLE_CLICK_NAVIGATION; documentList.onNodeClick(folder); expect(documentList.performNavigation).toHaveBeenCalled(); }); @@ -254,7 +255,7 @@ describe('DocumentList', () => { let folder = new FolderNode(); spyOn(documentList, 'performNavigation').and.stub(); - documentList.navigationMode = DocumentList.DOUBLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.DOUBLE_CLICK_NAVIGATION; documentList.onNodeDblClick(folder); expect(documentList.performNavigation).toHaveBeenCalled(); }); @@ -263,7 +264,7 @@ describe('DocumentList', () => { let folder = new FolderNode(); spyOn(documentList, 'performNavigation').and.stub(); - documentList.navigationMode = DocumentList.SINGLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.SINGLE_CLICK_NAVIGATION; documentList.onNodeDblClick(folder); expect(documentList.performNavigation).not.toHaveBeenCalled(); @@ -274,7 +275,7 @@ describe('DocumentList', () => { spyOn(documentList, 'performNavigation').and.stub(); documentList.navigate = false; - documentList.navigationMode = DocumentList.DOUBLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.DOUBLE_CLICK_NAVIGATION; documentList.onNodeDblClick(folder); expect(documentList.performNavigation).not.toHaveBeenCalled(); @@ -300,13 +301,13 @@ describe('DocumentList', () => { file.entry = null; let called = false; - documentList.navigationMode = DocumentList.SINGLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.SINGLE_CLICK_NAVIGATION; documentList.preview.subscribe(val => called = true); documentList.onNodeClick(file); expect(called).toBeFalsy(); - documentList.navigationMode = DocumentList.DOUBLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.DOUBLE_CLICK_NAVIGATION; documentList.onNodeDblClick(file); expect(called).toBeFalsy(); }); @@ -316,10 +317,10 @@ describe('DocumentList', () => { folder.entry = null; spyOn(documentList, 'performNavigation').and.stub(); - documentList.navigationMode = DocumentList.SINGLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.SINGLE_CLICK_NAVIGATION; documentList.onNodeClick(folder); - documentList.navigationMode = DocumentList.DOUBLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.DOUBLE_CLICK_NAVIGATION; documentList.onNodeDblClick(folder); expect(documentList.performNavigation).not.toHaveBeenCalled(); @@ -391,10 +392,10 @@ describe('DocumentList', () => { it('should enforce single-click on mobile browser', () => { spyOn(documentList, 'isMobile').and.returnValue(true); - documentList.navigationMode = DocumentList.DOUBLE_CLICK_NAVIGATION; + documentList.navigationMode = DocumentListComponent.DOUBLE_CLICK_NAVIGATION; documentList.ngOnInit(); expect(documentList.isMobile).toHaveBeenCalled(); - expect(documentList.navigationMode).toBe(DocumentList.SINGLE_CLICK_NAVIGATION); + expect(documentList.navigationMode).toBe(DocumentListComponent.SINGLE_CLICK_NAVIGATION); }); it('should emit error on wrong folder id', (done) => { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts similarity index 95% rename from ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts index 55c73ae85b..1fc0d76a95 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts @@ -29,10 +29,10 @@ declare var module: any; @Component({ moduleId: module.id, selector: 'alfresco-document-list', - styleUrls: ['./document-list.css'], - templateUrl: './document-list.html' + styleUrls: ['./document-list.component.css'], + templateUrl: './document-list.component.html' }) -export class DocumentList implements OnInit, OnChanges, AfterContentInit { +export class DocumentListComponent implements OnInit, OnChanges, AfterContentInit { static SINGLE_CLICK_NAVIGATION: string = 'click'; static DOUBLE_CLICK_NAVIGATION: string = 'dblclick'; @@ -47,7 +47,7 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { navigate: boolean = true; @Input() - navigationMode: string = DocumentList.DOUBLE_CLICK_NAVIGATION; // click|dblclick + navigationMode: string = DocumentListComponent.DOUBLE_CLICK_NAVIGATION; // click|dblclick @Input() thumbnails: boolean = false; @@ -65,7 +65,7 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { creationMenuActions: boolean = true; @Input() - pageSize: number = DocumentList.DEFAULT_PAGE_SIZE; + pageSize: number = DocumentListComponent.DEFAULT_PAGE_SIZE; @Input() set rowFilter(value: RowFilter) { @@ -156,7 +156,7 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { // Automatically enforce single-click navigation for mobile browsers if (this.isMobile()) { - this.navigationMode = DocumentList.SINGLE_CLICK_NAVIGATION; + this.navigationMode = DocumentListComponent.SINGLE_CLICK_NAVIGATION; } this.loadFolder(); @@ -309,7 +309,7 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { value: node }); - if (this.navigate && this.navigationMode === DocumentList.SINGLE_CLICK_NAVIGATION) { + if (this.navigate && this.navigationMode === DocumentListComponent.SINGLE_CLICK_NAVIGATION) { if (node && node.entry) { if (node.entry.isFile) { this.onPreviewFile(node); @@ -332,7 +332,7 @@ export class DocumentList implements OnInit, OnChanges, AfterContentInit { value: node }); - if (this.navigate && this.navigationMode === DocumentList.DOUBLE_CLICK_NAVIGATION) { + if (this.navigate && this.navigationMode === DocumentListComponent.DOUBLE_CLICK_NAVIGATION) { if (node && node.entry) { if (node.entry.isFile) { this.onPreviewFile(node); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.css b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.css similarity index 100% rename from ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.css rename to ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.css diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.html similarity index 100% rename from ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.html rename to ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.html diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts similarity index 96% rename from ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts index 43a5d9fc6e..e9e7172189 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts @@ -18,6 +18,7 @@ import { Component, Input, Output, EventEmitter, ViewChild } from '@angular/core'; import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { MinimalNodeEntity } from 'alfresco-js-api'; + import { DocumentListService } from './../services/document-list.service'; import { ContentActionModel } from './../models/content-action.model'; @@ -28,10 +29,10 @@ const ERROR_FOLDER_ALREADY_EXIST = 409; @Component({ moduleId: module.id, selector: 'alfresco-document-menu-action', - styleUrls: ['./document-menu-action.css'], - templateUrl: './document-menu-action.html' + styleUrls: ['./document-menu-action.component.css'], + templateUrl: './document-menu-action.component.html' }) -export class DocumentMenuAction { +export class DocumentMenuActionComponent { @Input() folderId: string; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder/empty-folder-content.component.spec.ts similarity index 72% rename from ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.spec.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/empty-folder/empty-folder-content.component.spec.ts index 03ac5afbbd..766522cb4d 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder/empty-folder-content.component.spec.ts @@ -15,21 +15,22 @@ * limitations under the License. */ -import { EmptyFolderContent } from './empty-folder-content'; -import { DocumentList } from './document-list'; -import { DocumentListServiceMock } from './../assets/document-list.service.mock'; import { DataTableComponent } from 'ng2-alfresco-datatable'; +import { EmptyFolderContentComponent } from './empty-folder-content.component'; +import { DocumentListComponent } from './../document-list.component'; +import { DocumentListServiceMock } from './../../assets/document-list.service.mock'; + describe('EmptyFolderContent', () => { - let emptyFolderContent: EmptyFolderContent; - let documentList: DocumentList; + let emptyFolderContent: EmptyFolderContentComponent; + let documentList: DocumentListComponent; beforeEach(() => { let documentListService = new DocumentListServiceMock(); - documentList = new DocumentList(documentListService, null, null); + documentList = new DocumentListComponent(documentListService, null, null); documentList.dataTable = new DataTableComponent(); - emptyFolderContent = new EmptyFolderContent(documentList); + emptyFolderContent = new EmptyFolderContentComponent(documentList); }); it('is defined', () => { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts b/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder/empty-folder-content.component.ts similarity index 77% rename from ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts rename to ng2-components/ng2-alfresco-documentlist/src/components/empty-folder/empty-folder-content.component.ts index cb55c97fec..2ff4ee759d 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder/empty-folder-content.component.ts @@ -15,23 +15,18 @@ * limitations under the License. */ -import { - Directive, - ContentChild, - TemplateRef, - AfterContentInit -} from '@angular/core'; -import { DocumentList } from './document-list'; +import { Directive, ContentChild, TemplateRef, AfterContentInit } from '@angular/core'; +import { DocumentListComponent } from './../document-list.component'; @Directive({ selector: 'empty-folder-content' }) -export class EmptyFolderContent implements AfterContentInit { +export class EmptyFolderContentComponent implements AfterContentInit { @ContentChild(TemplateRef) template: any; - constructor(private documentList: DocumentList) { + constructor(private documentList: DocumentListComponent) { } ngAfterContentInit() { From a97c2f43368cb09853b93f105166519d264dd5d5 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Tue, 10 Jan 2017 15:18:03 +0000 Subject: [PATCH 046/108] quick fix for auth error reporting --- ng2-components/ng2-alfresco-core/src/services/auth.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ng2-components/ng2-alfresco-core/src/services/auth.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth.service.ts index 1d0e6bc5bf..d93ed1ab3f 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth.service.ts @@ -86,7 +86,7 @@ export class AuthService { this.loginSubject.next(response); return {type: this.settingsService.getProviders(), ticket: response}; }) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -112,7 +112,7 @@ export class AuthService { this.logoutSubject.next(response); return response; }) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** From c5dca890b78073c27957863c2a81bae9af05358f Mon Sep 17 00:00:00 2001 From: Will Abson <will.abson@gmail.com> Date: Tue, 10 Jan 2017 15:27:56 +0000 Subject: [PATCH 047/108] Better support for long file names in viewer (#1424) - Display ellipsis - Use full width of the title div Refs #1325 --- .../ng2-alfresco-viewer/src/componets/viewer.component.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.css b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.css index 35c46deaef..ddf475c6f8 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.css +++ b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.css @@ -19,10 +19,13 @@ } .viewer-name-file { - width: 50%; + width: 100%; height: 21px; overflow: hidden !important; text-overflow: ellipsis; + white-space: nowrap; + padding-right: 60px; + margin-right: -40px; } .viewer-shadow-transparent { From 9fb085eb3ad89507232d48b32deddfea3f4f2408 Mon Sep 17 00:00:00 2001 From: Mario Romano <dnamario@hotmail.com> Date: Tue, 10 Jan 2017 16:59:08 +0000 Subject: [PATCH 048/108] #1387 fix img for systemjs and refactoring apiservice (#1421) --- .../AlfrescoAuthentication.service.ts | 6 +- .../src/services/AlfrescoContent.service.ts | 6 +- .../src/services/AlfrescoSettings.service.ts | 6 +- .../services/AlfrescoTranslation.service.ts | 6 +- .../src/services/alfresco-api.service.ts | 92 ++++++++++++++++--- .../src/services/auth.service.spec.ts | 10 +- .../src/services/auth.service.ts | 57 +++--------- .../src/services/renditions.service.spec.ts | 7 +- .../src/assets/document-list.service.mock.ts | 4 +- .../components/document-list.component.html | 2 +- .../src/components/document-list.component.ts | 4 +- .../ng2-alfresco-login/demo/src/main.ts | 70 ++++++++++---- .../components/alfresco-login.component.html | 3 +- .../components/alfresco-login.component.ts | 1 + .../ng2-alfresco-userinfo/demo/src/main.ts | 70 ++++++++++---- .../src/components/user-info.component.html | 4 +- .../src/components/user-info.component.ts | 2 +- .../src/services/bpm-user.service.ts | 6 +- 18 files changed, 222 insertions(+), 134 deletions(-) diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts index f41f20db1e..8f35837506 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts @@ -20,16 +20,14 @@ import { LogService } from './log.service'; import { SettingsService } from './settings.service'; import { StorageService } from './storage.service'; import { AlfrescoApiService } from './alfresco-api.service'; -import { AuthService } from './auth.service'; /** @deprecated AlfrescoAuthenticationService is deprecated. Use AuthService instead */ @Injectable() -export class AlfrescoAuthenticationService extends AuthService { +export class AlfrescoAuthenticationService { constructor(settingsService: SettingsService, apiService: AlfrescoApiService, storage: StorageService, logService: LogService) { - super(settingsService, apiService, storage, logService); - logService.warn('Warning: AlfrescoAuthenticationService is deprecated. Use AuthService instead.'); + logService.error('ERROR: AlfrescoAuthenticationService is deprecated. Use AuthService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts index 5181afe724..39e58e193a 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts @@ -18,17 +18,15 @@ import { Injectable } from '@angular/core'; import { LogService } from './log.service'; import { AuthService } from './auth.service'; -import { ContentService } from './content.service'; import { AlfrescoApiService } from './alfresco-api.service'; /** @deprecated AlfrescoContentService is deprecated. Use ContentService instead */ @Injectable() -export class AlfrescoContentService extends ContentService { +export class AlfrescoContentService { constructor(authService: AuthService, apiService: AlfrescoApiService, logService: LogService) { - super(authService, apiService); - logService.warn('Warning: AlfrescoContentService is deprecated. Use ContentService instead.'); + logService.error('ERROR: AlfrescoContentService is deprecated. Use ContentService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts index 1888c64cd4..8a970868d4 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts @@ -16,15 +16,13 @@ */ import { Injectable } from '@angular/core'; -import { SettingsService } from './settings.service'; import { LogService } from './log.service'; /** @deprecated AlfrescoSettingsService is deprecated. Use SettingsService instead */ @Injectable() -export class AlfrescoSettingsService extends SettingsService { +export class AlfrescoSettingsService { constructor(logService: LogService) { - super(); - logService.warn('Warning: AlfrescoSettingsService is deprecated. Use SettingsService instead.'); + logService.error('ERROR: AlfrescoSettingsService is deprecated. Use SettingsService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts index 09cee597b0..85a0db9d6d 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts @@ -17,17 +17,15 @@ import { Injectable } from '@angular/core'; import { TranslateService } from 'ng2-translate/ng2-translate'; -import { AlfrescoTranslateService } from './translate.service'; import { LogService } from './log.service'; /** @deprecated AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead */ @Injectable() -export class AlfrescoTranslationService extends AlfrescoTranslateService { +export class AlfrescoTranslationService { constructor(translate: TranslateService, logService: LogService) { - super(translate); - logService.warn('Warning: AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead.'); + logService.error('ERROR: AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead.'); } } diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts index d33b21d216..17e497d04f 100644 --- a/ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts @@ -16,32 +16,94 @@ */ import { Injectable } from '@angular/core'; -import * as alfrescoApi from 'alfresco-js-api'; import { AlfrescoApi } from 'alfresco-js-api'; +import * as alfrescoApi from 'alfresco-js-api'; +import { SettingsService } from './settings.service'; +import { StorageService } from './storage.service'; @Injectable() export class AlfrescoApiService { - private _instance: AlfrescoApi; + private alfrescoApi: AlfrescoApi; + + private provider: string; + + private ticketEcm: string; + + private ticketBpm: string; + + private hostEcm: string; + + private hostBpm: string; + + private contextRoot: string; + + private disableCsrf: boolean; public getInstance(): AlfrescoApi { - return this._instance; + return this.alfrescoApi; } - public setInstance(value: AlfrescoApi) { - this._instance = value; - } + constructor(private settingsService: SettingsService, + private storage: StorageService) { - constructor() { - this._instance = <AlfrescoApi>new alfrescoApi({ - provider: 'ALL', - ticketEcm: null, - ticketBpm: null, - hostEcm: 'http://localhost:8080', - hostBpm: 'http://localhost:9999', - contextRoot: 'alfresco', - disableCsrf: true + this.provider = this.settingsService.getProviders(); + this.ticketEcm = this.getTicketEcm(); + this.ticketBpm = this.getTicketBpm(); + this.hostEcm = this.settingsService.ecmHost; + this.hostBpm = this.settingsService.bpmHost; + this.contextRoot = 'alfresco'; + this.disableCsrf = false; + + this.init(); + + settingsService.bpmHostSubject.subscribe((hostBpm) => { + this.hostBpm = hostBpm; + this.init(); + }); + + settingsService.ecmHostSubject.subscribe((hostEcm) => { + this.hostEcm = hostEcm; + this.init(); + }); + + settingsService.csrfSubject.subscribe((disableCsrf) => { + this.disableCsrf = disableCsrf; + this.init(); + }); + + settingsService.providerSubject.subscribe((provider) => { + this.provider = provider; + this.init(); }); } + private init() { + this.alfrescoApi = <AlfrescoApi>new alfrescoApi({ + provider: this.provider, + ticketEcm: this.ticketEcm, + ticketBpm: this.ticketBpm, + hostEcm: this.hostEcm, + hostBpm: this.hostBpm, + contextRoot: this.contextRoot, + disableCsrf: this.disableCsrf + }); + } + + /** + * The method return the ECM ticket stored in the Storage + * @returns ticket + */ + private getTicketEcm(): string { + return this.storage.getItem('ticket-ECM'); + } + + /** + * The method return the BPM ticket stored in the Storage + * @returns ticket + */ + private getTicketBpm(): string { + return this.storage.getItem('ticket-BPM'); + } + } diff --git a/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts index 8b2111418d..38a40e2af5 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts @@ -76,7 +76,7 @@ describe('AuthService', () => { authService.login('fake-username', 'fake-password').subscribe(() => { expect(authService.isLoggedIn()).toBe(true); expect(authService.getTicketBpm()).toBeNull(); - expect(authService.alfrescoApi.bpmAuth.isLoggedIn()).toBeFalsy(); + expect(authService.alfrescoApi.getInstance().bpmAuth.isLoggedIn()).toBeFalsy(); done(); }); @@ -201,7 +201,7 @@ describe('AuthService', () => { authService.login('fake-username', 'fake-password').subscribe(() => { expect(authService.isLoggedIn()).toBe(true); expect(authService.getTicketEcm()).toBeNull(); - expect(authService.alfrescoApi.ecmAuth.isLoggedIn()).toBeFalsy(); + expect(authService.alfrescoApi.getInstance().ecmAuth.isLoggedIn()).toBeFalsy(); done(); }); @@ -296,19 +296,19 @@ describe('AuthService', () => { it('should host ecm url change be reflected in the api configuration', () => { settingsService.ecmHost = '127.99.99.99'; - expect(authService.alfrescoApi.config.hostEcm).toBe('127.99.99.99'); + expect(authService.alfrescoApi.getInstance().config.hostEcm).toBe('127.99.99.99'); }); it('should host bpm url change be reflected in the api configuration', () => { settingsService.bpmHost = '127.99.99.99'; - expect(authService.alfrescoApi.config.hostBpm).toBe('127.99.99.99'); + expect(authService.alfrescoApi.getInstance().config.hostBpm).toBe('127.99.99.99'); }); it('should host bpm provider change be reflected in the api configuration', () => { settingsService.setProviders('ECM'); - expect(authService.alfrescoApi.config.provider).toBe('ECM'); + expect(authService.alfrescoApi.getInstance().config.provider).toBe('ECM'); }); }); diff --git a/ng2-components/ng2-alfresco-core/src/services/auth.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth.service.ts index d93ed1ab3f..0c350238a3 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth.service.ts @@ -19,49 +19,18 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs/Rx'; import { SettingsService } from './settings.service'; import { StorageService } from './storage.service'; -import { AlfrescoApiService } from './alfresco-api.service'; -import * as alfrescoApi from 'alfresco-js-api'; -import { AlfrescoApi } from 'alfresco-js-api'; import { LogService } from './log.service'; +import { AlfrescoApiService } from './alfresco-api.service'; @Injectable() export class AuthService { - - alfrescoApi: AlfrescoApi; loginSubject: Subject<any> = new Subject<any>(); logoutSubject: Subject<any> = new Subject<any>(); constructor(private settingsService: SettingsService, - private apiService: AlfrescoApiService, + public alfrescoApi: AlfrescoApiService, private storage: StorageService, private logService: LogService) { - this.alfrescoApi = <AlfrescoApi>new alfrescoApi({ - provider: this.settingsService.getProviders(), - ticketEcm: this.getTicketEcm(), - ticketBpm: this.getTicketBpm(), - hostEcm: this.settingsService.ecmHost, - hostBpm: this.settingsService.bpmHost, - contextRoot: 'alfresco', - disableCsrf: true - }); - - settingsService.bpmHostSubject.subscribe((bpmHost) => { - this.alfrescoApi.changeBpmHost(bpmHost); - }); - - settingsService.ecmHostSubject.subscribe((ecmHost) => { - this.alfrescoApi.changeEcmHost(ecmHost); - }); - - settingsService.csrfSubject.subscribe((csrf) => { - this.alfrescoApi.changeCsrfConfig(csrf); - }); - - settingsService.providerSubject.subscribe((value) => { - this.alfrescoApi.config.provider = value; - }); - - this.apiService.setInstance(this.alfrescoApi); } /** @@ -69,7 +38,7 @@ export class AuthService { * @returns {boolean} */ isLoggedIn(): boolean { - return !!this.alfrescoApi.isLoggedIn(); + return !!this.alfrescoApi.getInstance().isLoggedIn(); } /** @@ -96,7 +65,7 @@ export class AuthService { * @returns {*|Observable<any>} */ private callApiLogin(username: string, password: string) { - return this.alfrescoApi.login(username, password); + return this.alfrescoApi.getInstance().login(username, password); } /** @@ -120,8 +89,8 @@ export class AuthService { * @returns {*|Observable<string>|Observable<any>|Promise<T>} */ private callApiLogout(): Promise<any> { - if (this.alfrescoApi) { - return this.alfrescoApi.logout(); + if (this.alfrescoApi.getInstance()) { + return this.alfrescoApi.getInstance().logout(); } } @@ -131,7 +100,7 @@ export class AuthService { removeTicket(): void { this.storage.removeItem('ticket-ECM'); this.storage.removeItem('ticket-BPM'); - this.alfrescoApi.setTicket(undefined, undefined); + this.alfrescoApi.getInstance().setTicket(undefined, undefined); } /** @@ -170,8 +139,8 @@ export class AuthService { * The method save the ECM ticket in the Storage */ saveTicketEcm(): void { - if (this.alfrescoApi && this.alfrescoApi.getTicketEcm()) { - this.storage.setItem('ticket-ECM', this.alfrescoApi.getTicketEcm()); + if (this.alfrescoApi.getInstance() && this.alfrescoApi.getInstance().getTicketEcm()) { + this.storage.setItem('ticket-ECM', this.alfrescoApi.getInstance().getTicketEcm()); } } @@ -179,8 +148,8 @@ export class AuthService { * The method save the BPM ticket in the Storage */ saveTicketBpm(): void { - if (this.alfrescoApi && this.alfrescoApi.getTicketBpm()) { - this.storage.setItem('ticket-BPM', this.alfrescoApi.getTicketBpm()); + if (this.alfrescoApi.getInstance() && this.alfrescoApi.getInstance().getTicketBpm()) { + this.storage.setItem('ticket-BPM', this.alfrescoApi.getInstance().getTicketBpm()); } } @@ -188,14 +157,14 @@ export class AuthService { * The method return true if user is logged in on ecm provider */ isEcmLoggedIn() { - return this.alfrescoApi.ecmAuth && !!this.alfrescoApi.ecmAuth.isLoggedIn(); + return this.alfrescoApi.getInstance().ecmAuth && !!this.alfrescoApi.getInstance().ecmAuth.isLoggedIn(); } /** * The method return true if user is logged in on bpm provider */ isBpmLoggedIn() { - return this.alfrescoApi.bpmAuth && !!this.alfrescoApi.bpmAuth.isLoggedIn(); + return this.alfrescoApi.getInstance().bpmAuth && !!this.alfrescoApi.getInstance().bpmAuth.isLoggedIn(); } /** diff --git a/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts index 7cfa328a1a..d674751faa 100644 --- a/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts @@ -18,6 +18,8 @@ import { ReflectiveInjector } from '@angular/core'; import { AlfrescoApiService } from './alfresco-api.service'; import { RenditionsService } from './renditions.service'; +import { SettingsService } from './settings.service'; +import { StorageService } from './storage.service'; import { LogService } from './log.service'; import { fakeRedition, fakeReditionCreated, fakeReditionsList } from '../assets/renditionsService.mock'; @@ -31,6 +33,8 @@ describe('RenditionsService', () => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoApiService, RenditionsService, + SettingsService, + StorageService, LogService ]); }); @@ -38,7 +42,6 @@ describe('RenditionsService', () => { beforeEach(() => { jasmine.Ajax.install(); service = injector.get(RenditionsService); - service.apiService.setInstance(new AlfrescoApi({})); }); afterEach(() => { @@ -60,7 +63,7 @@ describe('RenditionsService', () => { it('Create redition service should call the server with the ID passed and the asked encoding', (done) => { service.createRendition('fake-node-id', 'pdf').subscribe((res) => { - expect(jasmine.Ajax.requests.mostRecent().url).toBe('http://127.0.0.1:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/fake-node-id/renditions'); + expect(jasmine.Ajax.requests.mostRecent().url).toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/fake-node-id/renditions'); done(); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts index 6a65254c01..043a48e9a9 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts @@ -22,7 +22,7 @@ import { DocumentListService } from './../services/document-list.service'; import { SettingsService, AuthService, - AlfrescoContentService, + ContentService, AlfrescoApiService, LogService } from 'ng2-alfresco-core'; @@ -36,7 +36,7 @@ export class DocumentListServiceMock extends DocumentListService { constructor( settings?: SettingsService, authService?: AuthService, - contentService?: AlfrescoContentService, + contentService?: ContentService, apiService?: AlfrescoApiService, logService?: LogService, ) { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html index 88b308b02a..2d582847bb 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html @@ -21,7 +21,7 @@ <div class="document-list__this-space-is-empty">This folder is empty</div> <div class="document-list__drag-drop">Drag and Drop</div> <div class="document-list__any-files-here-to-add">any files here to add</div> - <img [src]="baseComponentPath + '/../assets/images/empty_doc_lib.svg'" class="document-list__empty_doc_lib"> + <img [src]="baseComponentPath + '/assets/images/empty_doc_lib.svg'" class="document-list__empty_doc_lib"> </div> </template> </no-content-template> diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts index 1fc0d76a95..c142e87b64 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts @@ -41,7 +41,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni baseComponentPath = module.id.replace('/components/document-list.js', ''); @Input() - fallbackThubnail: string = this.baseComponentPath + '/../assets/images/ft_ic_miscellaneous.svg'; + fallbackThubnail: string = this.baseComponentPath + '/assets/images/ft_ic_miscellaneous.svg'; @Input() navigate: boolean = true; @@ -120,7 +120,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni private ngZone: NgZone, private translateService: AlfrescoTranslateService) { - this.data = new ShareDataTableAdapter(this.documentListService, './..', []); + this.data = new ShareDataTableAdapter(this.documentListService, './', []); if (translateService) { translateService.addTranslationFolder('ng2-alfresco-documentlist', 'node_modules/ng2-alfresco-documentlist/src'); diff --git a/ng2-components/ng2-alfresco-login/demo/src/main.ts b/ng2-components/ng2-alfresco-login/demo/src/main.ts index f8a92d1a3e..c408d1301a 100644 --- a/ng2-components/ng2-alfresco-login/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { NgModule, Component } from '@angular/core'; +import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; @@ -32,14 +32,14 @@ import { LoginModule } from 'ng2-alfresco-login'; <p style="width:120px;margin: 20px;"> <label for="switch1" class="mdl-switch mdl-js-switch mdl-js-ripple-effect"> - <input type="checkbox" id="switch1" class="mdl-switch__input" checked + <input type="checkbox" id="switch1" class="mdl-switch__input" [checked]="isECM" (click)="toggleECM(ecm.checked)" #ecm> <span class="mdl-switch__label">ECM</span> </label> </p> <p style="width:120px;margin: 20px;"> <label for="switch2" class="mdl-switch mdl-js-switch mdl-js-ripple-effect"> - <input type="checkbox" id="switch2" class="mdl-switch__input" + <input type="checkbox" id="switch2" class="mdl-switch__input" [checked]="isBPM" (click)="toggleBPM(bpm.checked)" #bpm> <span class="mdl-switch__label">BPM</span> </label> @@ -59,14 +59,16 @@ import { LoginModule } from 'ng2-alfresco-login'; (onSuccess)="mySuccessMethod($event)" (onError)="myErrorMethod($event)"></alfresco-login>` }) -export class AppComponent { +export class AppComponent implements OnInit { ecmHost: string = 'http://localhost:8080'; bpmHost: string = 'http://localhost:9999'; ticket: string; status: string = ''; - providers: string = 'ECM'; + providers: string = 'ALL'; disableCsrf: boolean = false; + isECM: boolean = true; + isBPM: boolean = false; constructor(private authService: AuthService, private settingsService: SettingsService, @@ -77,6 +79,11 @@ export class AppComponent { settingsService.bpmHost = this.bpmHost; } + ngOnInit() { + this.settingsService.setProviders(this.providers); + this.initProviders(); + } + updateEcmHost(): void { this.settingsService.ecmHost = this.ecmHost; } @@ -95,26 +102,49 @@ export class AppComponent { this.status = $event.value; } - toggleECM(checked) { - if (checked && this.providers === 'BPM') { - this.providers = 'ALL'; - } else if (checked) { - this.providers = 'ECM'; - } else if (!checked && this.providers === 'ALL') { - this.providers = 'BPM'; + initProviders() { + if (this.providers === 'BPM') { + this.isECM = false; + this.isBPM = true; + } else if (this.providers === 'ECM') { + this.isECM = true; + this.isBPM = false; + } else if (this.providers === 'ALL') { + this.isECM = true; + this.isBPM = true; } } - toggleBPM(checked) { - if (checked && this.providers === 'ECM') { - this.providers = 'ALL'; - } else if (checked) { - this.providers = 'BPM'; - } else if (!checked && this.providers === 'ALL') { - this.providers = 'ECM'; - } + toggleECM() { + this.isECM = !this.isECM; + this.settingsService.setProviders(this.updateProvider()); } + toggleBPM() { + this.isBPM = !this.isBPM; + this.settingsService.setProviders(this.updateProvider()); + } + + updateProvider() { + if (this.isBPM && this.isECM) { + this.providers = 'ALL'; + return this.providers; + } + + if (this.isECM) { + this.providers = 'ECM'; + return this.providers; + } + + if (this.isBPM) { + this.providers = 'BPM'; + return this.providers; + } + + this.providers = ''; + return this.providers; + }; + toggleCSRF() { this.disableCsrf = !this.disableCsrf; } diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html index eca970934d..d08632e0a5 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html @@ -3,7 +3,8 @@ <div class="login-card-wide mdl-card mdl-shadow--4dp"> <form [formGroup]="form" (submit)="onSubmit(form.value, $event)"> <div class="mdl-card__title alfresco-logo"> - <img class="center" [src]="logoImageUrl || baseComponentPath + '/../assets/images/alfresco-logo.svg'" alt="{{'LOGIN.LOGO' | translate }}"> + <img class="center" [src]="logoImageUrl || baseComponentPath + '/../assets/images/alfresco-logo.svg'" + alt="{{'LOGIN.LOGO' | translate }}"> </div> <div class="mdl-card__supporting-text"> <div> diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index 5cfe7025d4..ff6ee77ed5 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -127,6 +127,7 @@ export class AlfrescoLoginComponent implements OnInit { * @param data */ onValueChanged(data: any) { + this.success = false; this.disableError(); for (let field in this.formError) { if (field) { diff --git a/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts b/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts index 10acb50385..f55e2ce70f 100644 --- a/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts @@ -33,15 +33,15 @@ import { LoginModule } from 'ng2-alfresco-login'; <p style="width:120px;margin: 20px;"> <label for="switch1" class="mdl-switch mdl-js-switch mdl-js-ripple-effect"> - <input type="checkbox" id="switch1" class="mdl-switch__input" checked - (click)="toggleECM(ecm.checked)" #ecm> + <input type="checkbox" id="switch1" class="mdl-switch__input" [checked]="isECM" + (click)="toggleECM()" #ecm> <span class="mdl-switch__label">ECM</span> </label> </p> <p style="width:120px;margin: 20px;"> <label for="switch2" class="mdl-switch mdl-js-switch mdl-js-ripple-effect"> - <input type="checkbox" id="switch2" class="mdl-switch__input" - (click)="toggleBPM(bpm.checked)" #bpm> + <input type="checkbox" id="switch2" class="mdl-switch__input" [checked]="isBPM" + (click)="toggleBPM()" #bpm> <span class="mdl-switch__label">BPM</span> </label> </p> @@ -78,12 +78,14 @@ class UserInfoDemo implements OnInit { userToLogin: string = 'admin'; password: string = 'admin'; loginErrorMessage: string; - providers: string = 'BPM'; + providers: string = 'ALL'; private authenticated: boolean; private token: any; disableCsrf: boolean = false; + isECM: boolean = true; + isBPM: boolean = false; constructor(private authService: AuthService, private settingsService: SettingsService, @@ -94,6 +96,7 @@ class UserInfoDemo implements OnInit { ngOnInit() { this.settingsService.setProviders(this.providers); + this.initProviders(); } logout() { @@ -115,33 +118,60 @@ class UserInfoDemo implements OnInit { }); } - isLoggedIn(): boolean { - return this.authService.isLoggedIn(); + initProviders() { + if (this.providers === 'BPM') { + this.isECM = false; + this.isBPM = true; + } else if (this.providers === 'ECM') { + this.isECM = true; + this.isBPM = false; + } else if (this.providers === 'ALL') { + this.isECM = true; + this.isBPM = true; + } } - toggleECM(checked) { - if (checked && this.providers === 'BPM') { + toggleECM() { + this.isECM = !this.isECM; + this.settingsService.setProviders(this.updateProvider()); + } + + toggleBPM() { + this.isBPM = !this.isBPM; + this.settingsService.setProviders(this.updateProvider()); + } + + updateProvider() { + if (this.isBPM && this.isECM) { this.providers = 'ALL'; - } else if (checked) { + return this.providers; + } + + if (this.isECM) { this.providers = 'ECM'; - } else { - this.providers = undefined; + return this.providers; } - } - toggleBPM(checked) { - if (checked && this.providers === 'ECM') { - this.providers = 'ALL'; - } else if (checked) { + if (this.isBPM) { this.providers = 'BPM'; - } else { - this.providers = undefined; + return this.providers; } - } + + this.providers = ''; + return this.providers; + }; toggleCSRF() { this.disableCsrf = !this.disableCsrf; } + + updateEcmHost(): void { + this.settingsService.ecmHost = this.ecmHost; + } + + updateBpmHost(): void { + this.settingsService.bpmHost = this.bpmHost; + } } @NgModule({ diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html index 140a7f9d3c..cc90f10709 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html @@ -21,7 +21,7 @@ <div class="demo-card-wide mdl-card"> <div class="card-title__option mdl-card__title" id="ecm-background-image" - [style.background-image]="'url(' + ( ecmBackgroundImage || baseComponentPath + '/../assets/images/ecm-background.png')+')'"> + [style.background-image]="'url(' + ( ecmBackgroundImage || baseComponentPath + '/assets/images/ecm-background.png')+')'"> <img class="profile-picture" id="ecm-user-detail-image" alt="ecm-profile-image" @@ -52,7 +52,7 @@ <div class="demo-card-wide mdl-card"> <div class="card-title__option mdl-card__title" id="bpm-background-image" - [style.background-image]="'url(' + (bpmBackgroundImage || baseComponentPath + '/../assets/images/bpm-background.png')+')'"> + [style.background-image]="'url(' + (bpmBackgroundImage || baseComponentPath + '/assets/images/bpm-background.png')+')'"> <img class="profile-picture" id="bpm-user-detail-image" alt="bpm-profile-image" diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts index cfddfe0da4..11cc37483f 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts @@ -50,7 +50,7 @@ export class UserInfoComponent implements OnInit { bpmUser: BpmUserModel; - anonymousImageUrl: string = this.baseComponentPath + '/../assets/images/anonymous.gif'; + anonymousImageUrl: string = this.baseComponentPath + '/assets/images/anonymous.gif'; bpmUserImage: any; diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts index 819b3fe414..6743a00f41 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts @@ -29,7 +29,7 @@ import { BpmUserModel } from '../models/bpm-user.model'; @Injectable() export class BpmUserService { - constructor(private alfrescoJsApi: AlfrescoApiService, + constructor(private apiService: AlfrescoApiService, private logService: LogService) { } @@ -38,13 +38,13 @@ export class BpmUserService { * @param userName - the user name */ getCurrentUserInfo(): Observable<BpmUserModel> { - return Observable.fromPromise(this.alfrescoJsApi.getInstance().activiti.profileApi.getProfile()) + return Observable.fromPromise(this.apiService.getInstance().activiti.profileApi.getProfile()) .map((data) => <BpmUserModel> data) .catch(err => this.handleError(err)); } getCurrentUserProfileImage(): string { - return this.alfrescoJsApi.getInstance().activiti.profileApi.getProfilePictureUrl(); + return this.apiService.getInstance().activiti.profileApi.getProfilePictureUrl(); } /** From 6f24ebd6d464ae544f0d5b1de7a65c0286d7c011 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Wed, 11 Jan 2017 13:15:26 +0000 Subject: [PATCH 049/108] readme updates --- README.md | 6 ++++++ demo-shell-ng2/README.md | 18 ++++++++++++------ .../ng2-alfresco-datatable/README.md | 2 ++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f3d3b2a5d4..6dcfabb9b3 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,12 @@ To view the complete list of all the components that you can use to build your c You can browse all the components at the following [page](http://devproducts.alfresco.com/). +## Demo Application + +A separate application showcasing integration of components can be found [here](https://github.com/Alfresco/alfresco-ng2-components/tree/master/demo-shell-ng2). + +You will find examples of basic interaction for both BPM and ECM sets of widgets. + ## Yeoman generators To speed up the development of your Alfresco Angular 2 application, or Alfresco Angular 2 component, use one of the Yeoman generators. diff --git a/demo-shell-ng2/README.md b/demo-shell-ng2/README.md index 13db6efa47..31136a7a7c 100644 --- a/demo-shell-ng2/README.md +++ b/demo-shell-ng2/README.md @@ -12,9 +12,11 @@ ## Installing -To correctly use this demo check that on your machine is running Node version 6.9.2 LTS or higher. +To correctly use this demo check that on your machine is running [Node](https://nodejs.org/en/) version 6.9.2 LTS or higher. ```sh +git clone https://github.com/Alfresco/alfresco-ng2-components.git +cd alfresco-ng2-components/demo-shell-ng2/ npm install ``` @@ -28,22 +30,26 @@ This command compiles and starts the project in watch mode. Browser will automatically reload upon changes. Upon start you can navigate to `http://localhost:3000` with your preferred browser. +### Important notes + +This script is recommended for development environment and not suited for headless servers and network access. + ## Production build ```sh npm run build +npm run start:dist ``` This command builds broject in `production` mode. All output is placed to `dist` folder and can be served your preferred web server. You should need no additional files outside the `dist` folder. -In order to quickly test the output you can use the [wsrv](https://www.npmjs.com/package/wsrv) tool (lightweight web server): +### Important notes -```sh -npm install -g wsrv -wsrv -s -o dist/ -``` +By default demo application is configured to use [wsrv](https://www.npmjs.com/package/wsrv) tool (lightweight web server) +to serve production build output. It will be running at `0.0.0.0` address with port `3000` and allow you accessing your application +via network. However you can use any web server of your choice in production. ## Development branch build diff --git a/ng2-components/ng2-alfresco-datatable/README.md b/ng2-components/ng2-alfresco-datatable/README.md index 60f33a654d..a988c43703 100644 --- a/ng2-components/ng2-alfresco-datatable/README.md +++ b/ng2-components/ng2-alfresco-datatable/README.md @@ -32,6 +32,8 @@ </a> </p> +See it live: [DataTable Quickstart](https://embed.plnkr.co/80qr4YFBeHjLMdAV0F6l/) + ## Prerequisites Before you start using this development framework, make sure you have installed all required software and done all the From 9e0536bca9cea3862dbdf35fa3c6872528a4c56f Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Wed, 11 Jan 2017 06:32:17 -0800 Subject: [PATCH 050/108] #1259 - checklist task does not appear on tasklist after creation (#1435) * #1259 - refresh tasklist when checklist is added * #1259 - updated readme to reflect changes * #1259 - fixed wrong rebase import --- .../activiti/activiti-demo.component.html | 2 ++ .../activiti/activiti-demo.component.ts | 5 ++++ .../ng2-activiti-tasklist/README.md | 19 ++++++------- .../activiti-checklist.component.spec.ts | 27 ++++++++++++++++--- .../activiti-checklist.component.ts | 8 ++++-- .../activiti-task-details.component.html | 2 +- .../activiti-task-details.component.spec.ts | 8 ++++++ .../activiti-task-details.component.ts | 7 +++++ .../activiti-tasklist.component.spec.ts | 2 +- .../components/activiti-tasklist.component.ts | 22 +++++++++++---- .../src/models/filter.model.ts | 2 ++ 11 files changed, 81 insertions(+), 23 deletions(-) diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html index 3faac514e3..f7b4a74c04 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html @@ -36,6 +36,7 @@ [state]="taskFilter.filter.state" [sort]="taskFilter.filter.sort" [data]="dataTasks" + [landingTaskId]="currentTaskId" (rowClick)="onTaskRowClick($event)" (onSuccess)="onSuccessTaskList($event)" #activititasklist></activiti-tasklist> </div> @@ -43,6 +44,7 @@ <span><h5>Task Details</h5></span> <hr> <activiti-task-details [taskId]="currentTaskId" (formCompleted)="onFormCompleted($event)" + (taskCreated)="onTaskCreated($event)" #activitidetails></activiti-task-details> </div> </div> diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index 2ac2458a4b..c7daf6051c 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -216,6 +216,11 @@ export class ActivitiDemoComponent implements AfterViewInit { this.currentTaskId = null; } + onTaskCreated(data: any) { + this.currentTaskId = data.parentTaskId; + this.activititasklist.reload(); + } + ngAfterViewInit() { // workaround for MDL issues with dynamic components if (componentHandler) { diff --git a/ng2-components/ng2-activiti-tasklist/README.md b/ng2-components/ng2-activiti-tasklist/README.md index 8c36a53110..11aacfe5cf 100644 --- a/ng2-components/ng2-activiti-tasklist/README.md +++ b/ng2-components/ng2-activiti-tasklist/README.md @@ -218,17 +218,13 @@ platformBrowserDynamic().bootstrapModule(AppModule); | Name | Description | | --- | --- | -|`appId`| { appId } The id of the app. | -|`processDefinitionKey`| { processDefinitionKey } The processDefinitionKey of the process. | -|`assignment`| { assignment } The assignment of the process. -Possible values are: -assignee : where the current user is the assignee -candidate: where the current user is a task candidate -group_x: where the task is assigned to a group where the current user is a member of. The groups can be fetched through the profile REST endpoint -no value: where the current user is involved | -|`state`| { state } Define state of the processes. Possible values are: completed, active | -|`sort`| { sort } Define the sort of the processes. Possible values are created-desc, created-asc, due-desc, due-asc | -| `schemaColumn` | { any[] } optional) JSON object that represent the number and the type of the columns that you want show | +|`appId`| { string } The id of the app. | +|`processDefinitionKey`| { string } The processDefinitionKey of the process. | +|`assignment`| { string } The assignment of the process. <ul>Possible values are: <li>assignee : where the current user is the assignee</li> <li>candidate: where the current user is a task candidate </li><li>group_x: where the task is assigned to a group where the current user is a member of.</li> <li>no value: where the current user is involved</li> </ul> | +|`state`| { string } Define state of the processes. Possible values are: completed, active | +|`landingTaskId`| { string } Define which task id should be selected after the reloading. If the task id doesn't exist or nothing is passed it will select the first task | +|`sort`| { string } Define the sort of the processes. Possible values are : created-desc, created-asc, due-desc, due-asc | +| `data` | { DataTableAdapter } (optional) JSON object that represent the number and the type of the columns that you want show | Example: @@ -256,6 +252,7 @@ The component shows the details of the task id passed in input | `formLoaded` | Invoked when form is loaded or reloaded. | | `formSaved` | Invoked when form is submitted with `Save` or custom outcomes. | | `formCompleted` | Invoked when form is submitted with `Complete` outcome. | +| `taskCreated` | Invoked when a checklist task is created. | | `executeOutcome` | Invoked when any outcome is executed, default behaviour can be prevented via `event.preventDefault()` | | `onError` | Invoked at any error | diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts index 88a0374771..6e4de16d10 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts @@ -51,7 +51,9 @@ describe('ActivitiChecklist', () => { }).compileComponents().then(() => { let translateService = TestBed.get(AlfrescoTranslateService); spyOn(translateService, 'addTranslationFolder').and.stub(); - spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); + spyOn(translateService, 'get').and.callFake((key) => { + return Observable.of(key); + }); fixture = TestBed.createComponent(ActivitiChecklist); checklistComponent = fixture.componentInstance; @@ -129,7 +131,7 @@ describe('ActivitiChecklist', () => { jasmine.Ajax.requests.mostRecent().respondWith({ status: 200, contentType: 'json', - responseText: {id: 'fake-check-added-id', name: 'fake-check-added-name'} + responseText: { id: 'fake-check-added-id', name: 'fake-check-added-name' } }); fixture.whenStable().then(() => { fixture.detectChanges(); @@ -149,7 +151,7 @@ describe('ActivitiChecklist', () => { jasmine.Ajax.requests.mostRecent().respondWith({ status: 200, contentType: 'json', - responseText: {data: [{id: 'fake-check-changed-id', name: 'fake-check-changed-name'}]} + responseText: { data: [{ id: 'fake-check-changed-id', name: 'fake-check-changed-name' }] } }); fixture.whenStable().then(() => { fixture.detectChanges(); @@ -173,6 +175,25 @@ describe('ActivitiChecklist', () => { expect(element.querySelector('#checklist-none-message').textContent).toContain('TASK_DETAILS.CHECKLIST.NONE'); }); })); + + it('should emit checklist task created event when the checklist is successfully added', (done) => { + checklistComponent.checklistTaskCreated.subscribe((taskAdded: TaskDetailsModel) => { + fixture.detectChanges(); + expect(taskAdded.id).toEqual('fake-check-added-id'); + expect(taskAdded.name).toEqual('fake-check-added-name'); + expect(element.querySelector('#check-fake-check-added-id')).not.toBeNull(); + expect(element.querySelector('#check-fake-check-added-id').textContent).toContain('fake-check-added-name'); + done(); + }); + showChecklistDialog.click(); + let addButtonDialog = <HTMLElement> element.querySelector('#add-check'); + addButtonDialog.click(); + jasmine.Ajax.requests.mostRecent().respondWith({ + status: 200, + contentType: 'json', + responseText: { id: 'fake-check-added-id', name: 'fake-check-added-name' } + }); + }); }); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts index c0aced73f9..57dcfb8793 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { Component, Input, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; -import { Observer, Observable } from 'rxjs/Rx'; +import { Component, Input, OnInit, ViewChild, OnChanges, SimpleChanges, EventEmitter, Output } from '@angular/core'; import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { TaskDetailsModel } from '../models/task-details.model'; +import { Observer, Observable } from 'rxjs/Rx'; declare let dialogPolyfill: any; @@ -41,6 +41,9 @@ export class ActivitiChecklist implements OnInit, OnChanges { @Input() assignee: string; + @Output() + checklistTaskCreated: EventEmitter<TaskDetailsModel> = new EventEmitter<TaskDetailsModel>(); + @ViewChild('dialog') dialog: any; @@ -116,6 +119,7 @@ export class ActivitiChecklist implements OnInit, OnChanges { this.activitiTaskList.addTask(newTask).subscribe( (res: TaskDetailsModel) => { this.checklist.push(res); + this.checklistTaskCreated.emit(res); }, (err) => { this.logService.error(err); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html index e65cce9585..7d1d86a2b3 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html @@ -24,7 +24,7 @@ </div> <div class="mdl-cell mdl-cell--4-col"> <activiti-checklist [readOnly]="readOnlyForm" [taskId]="taskDetails.id" [assignee]="taskDetails?.assignee?.id" - #activitichecklist></activiti-checklist> + (checklistTaskCreated)="onChecklistTaskCreated($event)" #activitichecklist></activiti-checklist> </div> </div> <div *ngIf="isAssignedToMe()"> diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts index effa712aaf..ef67877cdf 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts @@ -27,6 +27,7 @@ import { ActivitiTaskDetails } from './activiti-task-details.component'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { ActivitiPeopleService } from './../services/activiti-people.service'; import { taskDetailsMock, taskFormMock, tasksMock, noDataMock } from './../assets/task-details.mock'; +import { TaskDetailsModel } from '../models/task-details.model'; describe('ActivitiTaskDetails', () => { @@ -246,6 +247,13 @@ describe('ActivitiTaskDetails', () => { expect(closeSpy).toHaveBeenCalled(); }); + it('should emit a task created event when checklist task is created', () => { + let emitSpy: jasmine.Spy = spyOn(component.taskCreated, 'emit'); + let mockTask = new TaskDetailsModel(taskDetailsMock); + component.onChecklistTaskCreated(mockTask); + expect(emitSpy).toHaveBeenCalled(); + }); + }); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts index d8fd6f3729..3ccc99870c 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts @@ -70,6 +70,9 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { @Output() formLoaded: EventEmitter<FormModel> = new EventEmitter<FormModel>(); + @Output() + taskCreated: EventEmitter<TaskDetailsModel> = new EventEmitter<TaskDetailsModel>(); + @Output() onError: EventEmitter<any> = new EventEmitter<any>(); @@ -224,6 +227,10 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { this.formLoaded.emit(form); } + onChecklistTaskCreated(task: TaskDetailsModel) { + this.taskCreated.emit(task); + } + onFormError(error: any) { this.errorDialog.nativeElement.showModal(); this.onError.emit(error); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts index 8ca3823570..fc4b02eb59 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts @@ -161,7 +161,7 @@ describe('ActivitiTaskList', () => { }); it('should return a currentId null when the taskList is empty', () => { - component.selectFirst(); + component.selectTask(null); expect(component.getCurrentId()).toBeNull(); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts index d5aee51d73..db9ae4d8c0 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts @@ -49,6 +49,9 @@ export class ActivitiTaskList implements OnInit, OnChanges { @Input() name: string; + @Input() + landingTaskId: string; + requestNode: TaskQueryRequestRepresentationModel; @Input() @@ -142,7 +145,7 @@ export class ActivitiTaskList implements OnInit, OnChanges { (response) => { let instancesRow = this.createDataRow(response); this.renderInstances(instancesRow); - this.selectFirst(); + this.selectTask(requestNode.landingTaskId); this.onSuccess.emit(response); }, (error) => { this.logService.error(error); @@ -182,16 +185,24 @@ export class ActivitiTaskList implements OnInit, OnChanges { } /** - * Select the first instance of a list if present + * Select the task given in input if present */ - selectFirst() { + selectTask(taskIdToSelect: string) { if (!this.isListEmpty()) { - this.currentInstanceId = this.data.getRows()[0].getValue('id'); + let dataRow = this.data.getRows().find(row => row.getValue('id') === taskIdToSelect); + this.currentInstanceId = dataRow ? dataRow.getValue('id') : this.selectFirst(); } else { this.currentInstanceId = null; } } + /** + * Select the first instance of a list if present + */ + selectFirst() { + return this.data.getRows()[0].getValue('id'); + } + /** * Return the current id * @returns {string} @@ -239,7 +250,8 @@ export class ActivitiTaskList implements OnInit, OnChanges { text: this.name, assignment: this.assignment, state: this.state, - sort: this.sort + sort: this.sort, + landingTaskId: this.landingTaskId }; return new TaskQueryRequestRepresentationModel(requestNode); } diff --git a/ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts b/ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts index 09a8c88256..fb23c2f2f2 100644 --- a/ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts +++ b/ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts @@ -116,6 +116,7 @@ export class TaskQueryRequestRepresentationModel { sort: string; page: number; size: number; + landingTaskId: string; constructor(obj?: any) { this.appDefinitionId = obj && obj.appDefinitionId || null; @@ -128,5 +129,6 @@ export class TaskQueryRequestRepresentationModel { this.sort = obj && obj.sort || null; this.page = obj && obj.page || 0; this.size = obj && obj.size || 25; + this.landingTaskId = obj && obj.landingTaskId || ''; } } From 82615c911081b7363560fa3c1ec5546c738a07d6 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Wed, 11 Jan 2017 15:30:36 +0000 Subject: [PATCH 051/108] #1111 Upgrade MDL 1.3 (#1436) --- demo-shell-ng2/index.html | 9 +++++++++ demo-shell-ng2/public/css/material.orange-blue.min.css | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html index d9aea05fd3..09a4d29064 100644 --- a/demo-shell-ng2/index.html +++ b/demo-shell-ng2/index.html @@ -41,6 +41,15 @@ left: auto; } + + .mdl-layout__header { + color: rgb(255, 255, 255); + background-color: rgb(31, 188, 210); + } + + .mdl-layout__header-row .mdl-navigation__link { + color: rgb(255, 255, 255); + } </style> </head> <!-- 3. Display the application --> diff --git a/demo-shell-ng2/public/css/material.orange-blue.min.css b/demo-shell-ng2/public/css/material.orange-blue.min.css index fb184ae532..ea17be0461 100644 --- a/demo-shell-ng2/public/css/material.orange-blue.min.css +++ b/demo-shell-ng2/public/css/material.orange-blue.min.css @@ -1,8 +1,8 @@ /** * material-design-lite - Material Design Components in CSS, JS and HTML - * @version v1.1.3 + * @version v1.3.0 * @license Apache-2.0 * @copyright 2015 Google, Inc. * @link https://github.com/google/material-design-lite */ -@charset "UTF-8";html{color:rgba(0,0,0,.87)}::-moz-selection{background:#b3d4fc;text-shadow:none}::selection{background:#b3d4fc;text-shadow:none}hr{display:block;height:1px;border:0;border-top:1px solid #ccc;margin:1em 0;padding:0}audio,canvas,iframe,img,svg,video{vertical-align:middle}fieldset{border:0;margin:0;padding:0}textarea{resize:vertical}.browserupgrade{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.hidden{display:none!important}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.clearfix:before,.clearfix:after{content:" ";display:table}.clearfix:after{clear:both}@media print{*,*:before,*:after,*:first-letter{background:transparent!important;color:#000!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href)")"}abbr[title]:after{content:" (" attr(title)")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}a,.mdl-accordion,.mdl-button,.mdl-card,.mdl-checkbox,.mdl-dropdown-menu,.mdl-icon-toggle,.mdl-item,.mdl-radio,.mdl-slider,.mdl-switch,.mdl-tabs__tab{-webkit-tap-highlight-color:transparent;-webkit-tap-highlight-color:rgba(255,255,255,0)}html{width:100%;height:100%;-ms-touch-action:manipulation;touch-action:manipulation}body{width:100%;min-height:100%}main{display:block}*[hidden]{display:none!important}html,body{font-family:"Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:20px}h1,h2,h3,h4,h5,h6,p{padding:0}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400;line-height:1.35;letter-spacing:-.02em;opacity:.54;font-size:.6em}h1{font-size:56px;line-height:1.35;letter-spacing:-.02em;margin:24px 0}h1,h2{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h2{font-size:45px;line-height:48px}h2,h3{margin:24px 0}h3{font-size:34px;line-height:40px}h3,h4{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h4{font-size:24px;line-height:32px;-moz-osx-font-smoothing:grayscale;margin:24px 0 16px}h5{font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}h5,h6{font-family:"Roboto","Helvetica","Arial",sans-serif;margin:24px 0 16px}h6{font-size:16px;letter-spacing:.04em}h6,p{font-weight:400;line-height:24px}p{font-size:14px;letter-spacing:0;margin:0 0 16px}a{color:rgb(68,138,255);font-weight:500}blockquote{font-family:"Roboto","Helvetica","Arial",sans-serif;position:relative;font-size:24px;font-weight:300;font-style:italic;line-height:1.35;letter-spacing:.08em}blockquote:before{position:absolute;left:-.5em;content:'“'}blockquote:after{content:'”';margin-left:-.05em}mark{background-color:#f4ff81}dt{font-weight:700}address{font-size:12px;line-height:1;font-style:normal}address,ul,ol{font-weight:400;letter-spacing:0}ul,ol{font-size:14px;line-height:24px}.mdl-typography--display-4,.mdl-typography--display-4-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:112px;font-weight:300;line-height:1;letter-spacing:-.04em}.mdl-typography--display-4-color-contrast{opacity:.54}.mdl-typography--display-3,.mdl-typography--display-3-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:56px;font-weight:400;line-height:1.35;letter-spacing:-.02em}.mdl-typography--display-3-color-contrast{opacity:.54}.mdl-typography--display-2,.mdl-typography--display-2-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:45px;font-weight:400;line-height:48px}.mdl-typography--display-2-color-contrast{opacity:.54}.mdl-typography--display-1,.mdl-typography--display-1-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:34px;font-weight:400;line-height:40px}.mdl-typography--display-1-color-contrast{opacity:.54}.mdl-typography--headline,.mdl-typography--headline-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:24px;font-weight:400;line-height:32px;-moz-osx-font-smoothing:grayscale}.mdl-typography--headline-color-contrast{opacity:.87}.mdl-typography--title,.mdl-typography--title-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}.mdl-typography--title-color-contrast{opacity:.87}.mdl-typography--subhead,.mdl-typography--subhead-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:16px;font-weight:400;line-height:24px;letter-spacing:.04em}.mdl-typography--subhead-color-contrast{opacity:.87}.mdl-typography--body-2,.mdl-typography--body-2-color-contrast{font-size:14px;font-weight:700;line-height:24px;letter-spacing:0}.mdl-typography--body-2-color-contrast{opacity:.87}.mdl-typography--body-1,.mdl-typography--body-1-color-contrast{font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-color-contrast{opacity:.87}.mdl-typography--body-2-force-preferred-font,.mdl-typography--body-2-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:24px;letter-spacing:0}.mdl-typography--body-2-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--body-1-force-preferred-font,.mdl-typography--body-1-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--caption,.mdl-typography--caption-force-preferred-font{font-size:12px;font-weight:400;line-height:1;letter-spacing:0}.mdl-typography--caption-force-preferred-font{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--caption-color-contrast,.mdl-typography--caption-force-preferred-font-color-contrast{font-size:12px;font-weight:400;line-height:1;letter-spacing:0;opacity:.54}.mdl-typography--caption-force-preferred-font-color-contrast,.mdl-typography--menu{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--menu{font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--menu-color-contrast{opacity:.87}.mdl-typography--menu-color-contrast,.mdl-typography--button,.mdl-typography--button-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--button,.mdl-typography--button-color-contrast{text-transform:uppercase}.mdl-typography--button-color-contrast{opacity:.87}.mdl-typography--text-left{text-align:left}.mdl-typography--text-right{text-align:right}.mdl-typography--text-center{text-align:center}.mdl-typography--text-justify{text-align:justify}.mdl-typography--text-nowrap{white-space:nowrap}.mdl-typography--text-lowercase{text-transform:lowercase}.mdl-typography--text-uppercase{text-transform:uppercase}.mdl-typography--text-capitalize{text-transform:capitalize}.mdl-typography--font-thin{font-weight:200!important}.mdl-typography--font-light{font-weight:300!important}.mdl-typography--font-regular{font-weight:400!important}.mdl-typography--font-medium{font-weight:500!important}.mdl-typography--font-bold{font-weight:700!important}.mdl-typography--font-black{font-weight:900!important}.material-icons{font-family:'Material Icons';font-weight:400;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;word-wrap:normal;-moz-font-feature-settings:'liga';font-feature-settings:'liga';-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased}.mdl-color-text--red{color:#f44336 !important}.mdl-color--red{background-color:#f44336 !important}.mdl-color-text--red-50{color:#ffebee !important}.mdl-color--red-50{background-color:#ffebee !important}.mdl-color-text--red-100{color:#ffcdd2 !important}.mdl-color--red-100{background-color:#ffcdd2 !important}.mdl-color-text--red-200{color:#ef9a9a !important}.mdl-color--red-200{background-color:#ef9a9a !important}.mdl-color-text--red-300{color:#e57373 !important}.mdl-color--red-300{background-color:#e57373 !important}.mdl-color-text--red-400{color:#ef5350 !important}.mdl-color--red-400{background-color:#ef5350 !important}.mdl-color-text--red-500{color:#f44336 !important}.mdl-color--red-500{background-color:#f44336 !important}.mdl-color-text--red-600{color:#e53935 !important}.mdl-color--red-600{background-color:#e53935 !important}.mdl-color-text--red-700{color:#d32f2f !important}.mdl-color--red-700{background-color:#d32f2f !important}.mdl-color-text--red-800{color:#c62828 !important}.mdl-color--red-800{background-color:#c62828 !important}.mdl-color-text--red-900{color:#b71c1c !important}.mdl-color--red-900{background-color:#b71c1c !important}.mdl-color-text--red-A100{color:#ff8a80 !important}.mdl-color--red-A100{background-color:#ff8a80 !important}.mdl-color-text--red-A200{color:#ff5252 !important}.mdl-color--red-A200{background-color:#ff5252 !important}.mdl-color-text--red-A400{color:#ff1744 !important}.mdl-color--red-A400{background-color:#ff1744 !important}.mdl-color-text--red-A700{color:#d50000 !important}.mdl-color--red-A700{background-color:#d50000 !important}.mdl-color-text--pink{color:#e91e63 !important}.mdl-color--pink{background-color:#e91e63 !important}.mdl-color-text--pink-50{color:#fce4ec !important}.mdl-color--pink-50{background-color:#fce4ec !important}.mdl-color-text--pink-100{color:#f8bbd0 !important}.mdl-color--pink-100{background-color:#f8bbd0 !important}.mdl-color-text--pink-200{color:#f48fb1 !important}.mdl-color--pink-200{background-color:#f48fb1 !important}.mdl-color-text--pink-300{color:#f06292 !important}.mdl-color--pink-300{background-color:#f06292 !important}.mdl-color-text--pink-400{color:#ec407a !important}.mdl-color--pink-400{background-color:#ec407a !important}.mdl-color-text--pink-500{color:#e91e63 !important}.mdl-color--pink-500{background-color:#e91e63 !important}.mdl-color-text--pink-600{color:#d81b60 !important}.mdl-color--pink-600{background-color:#d81b60 !important}.mdl-color-text--pink-700{color:#c2185b !important}.mdl-color--pink-700{background-color:#c2185b !important}.mdl-color-text--pink-800{color:#ad1457 !important}.mdl-color--pink-800{background-color:#ad1457 !important}.mdl-color-text--pink-900{color:#880e4f !important}.mdl-color--pink-900{background-color:#880e4f !important}.mdl-color-text--pink-A100{color:#ff80ab !important}.mdl-color--pink-A100{background-color:#ff80ab !important}.mdl-color-text--pink-A200{color:#ff4081 !important}.mdl-color--pink-A200{background-color:#ff4081 !important}.mdl-color-text--pink-A400{color:#f50057 !important}.mdl-color--pink-A400{background-color:#f50057 !important}.mdl-color-text--pink-A700{color:#c51162 !important}.mdl-color--pink-A700{background-color:#c51162 !important}.mdl-color-text--purple{color:#9c27b0 !important}.mdl-color--purple{background-color:#9c27b0 !important}.mdl-color-text--purple-50{color:#f3e5f5 !important}.mdl-color--purple-50{background-color:#f3e5f5 !important}.mdl-color-text--purple-100{color:#e1bee7 !important}.mdl-color--purple-100{background-color:#e1bee7 !important}.mdl-color-text--purple-200{color:#ce93d8 !important}.mdl-color--purple-200{background-color:#ce93d8 !important}.mdl-color-text--purple-300{color:#ba68c8 !important}.mdl-color--purple-300{background-color:#ba68c8 !important}.mdl-color-text--purple-400{color:#ab47bc !important}.mdl-color--purple-400{background-color:#ab47bc !important}.mdl-color-text--purple-500{color:#9c27b0 !important}.mdl-color--purple-500{background-color:#9c27b0 !important}.mdl-color-text--purple-600{color:#8e24aa !important}.mdl-color--purple-600{background-color:#8e24aa !important}.mdl-color-text--purple-700{color:#7b1fa2 !important}.mdl-color--purple-700{background-color:#7b1fa2 !important}.mdl-color-text--purple-800{color:#6a1b9a !important}.mdl-color--purple-800{background-color:#6a1b9a !important}.mdl-color-text--purple-900{color:#4a148c !important}.mdl-color--purple-900{background-color:#4a148c !important}.mdl-color-text--purple-A100{color:#ea80fc !important}.mdl-color--purple-A100{background-color:#ea80fc !important}.mdl-color-text--purple-A200{color:#e040fb !important}.mdl-color--purple-A200{background-color:#e040fb !important}.mdl-color-text--purple-A400{color:#d500f9 !important}.mdl-color--purple-A400{background-color:#d500f9 !important}.mdl-color-text--purple-A700{color:#a0f !important}.mdl-color--purple-A700{background-color:#a0f !important}.mdl-color-text--deep-purple{color:#673ab7 !important}.mdl-color--deep-purple{background-color:#673ab7 !important}.mdl-color-text--deep-purple-50{color:#ede7f6 !important}.mdl-color--deep-purple-50{background-color:#ede7f6 !important}.mdl-color-text--deep-purple-100{color:#d1c4e9 !important}.mdl-color--deep-purple-100{background-color:#d1c4e9 !important}.mdl-color-text--deep-purple-200{color:#b39ddb !important}.mdl-color--deep-purple-200{background-color:#b39ddb !important}.mdl-color-text--deep-purple-300{color:#9575cd !important}.mdl-color--deep-purple-300{background-color:#9575cd !important}.mdl-color-text--deep-purple-400{color:#7e57c2 !important}.mdl-color--deep-purple-400{background-color:#7e57c2 !important}.mdl-color-text--deep-purple-500{color:#673ab7 !important}.mdl-color--deep-purple-500{background-color:#673ab7 !important}.mdl-color-text--deep-purple-600{color:#5e35b1 !important}.mdl-color--deep-purple-600{background-color:#5e35b1 !important}.mdl-color-text--deep-purple-700{color:#512da8 !important}.mdl-color--deep-purple-700{background-color:#512da8 !important}.mdl-color-text--deep-purple-800{color:#4527a0 !important}.mdl-color--deep-purple-800{background-color:#4527a0 !important}.mdl-color-text--deep-purple-900{color:#311b92 !important}.mdl-color--deep-purple-900{background-color:#311b92 !important}.mdl-color-text--deep-purple-A100{color:#b388ff !important}.mdl-color--deep-purple-A100{background-color:#b388ff !important}.mdl-color-text--deep-purple-A200{color:#7c4dff !important}.mdl-color--deep-purple-A200{background-color:#7c4dff !important}.mdl-color-text--deep-purple-A400{color:#651fff !important}.mdl-color--deep-purple-A400{background-color:#651fff !important}.mdl-color-text--deep-purple-A700{color:#6200ea !important}.mdl-color--deep-purple-A700{background-color:#6200ea !important}.mdl-color-text--indigo{color:#3f51b5 !important}.mdl-color--indigo{background-color:#3f51b5 !important}.mdl-color-text--indigo-50{color:#e8eaf6 !important}.mdl-color--indigo-50{background-color:#e8eaf6 !important}.mdl-color-text--indigo-100{color:#c5cae9 !important}.mdl-color--indigo-100{background-color:#c5cae9 !important}.mdl-color-text--indigo-200{color:#9fa8da !important}.mdl-color--indigo-200{background-color:#9fa8da !important}.mdl-color-text--indigo-300{color:#7986cb !important}.mdl-color--indigo-300{background-color:#7986cb !important}.mdl-color-text--indigo-400{color:#5c6bc0 !important}.mdl-color--indigo-400{background-color:#5c6bc0 !important}.mdl-color-text--indigo-500{color:#3f51b5 !important}.mdl-color--indigo-500{background-color:#3f51b5 !important}.mdl-color-text--indigo-600{color:#3949ab !important}.mdl-color--indigo-600{background-color:#3949ab !important}.mdl-color-text--indigo-700{color:#303f9f !important}.mdl-color--indigo-700{background-color:#303f9f !important}.mdl-color-text--indigo-800{color:#283593 !important}.mdl-color--indigo-800{background-color:#283593 !important}.mdl-color-text--indigo-900{color:#1a237e !important}.mdl-color--indigo-900{background-color:#1a237e !important}.mdl-color-text--indigo-A100{color:#8c9eff !important}.mdl-color--indigo-A100{background-color:#8c9eff !important}.mdl-color-text--indigo-A200{color:#536dfe !important}.mdl-color--indigo-A200{background-color:#536dfe !important}.mdl-color-text--indigo-A400{color:#3d5afe !important}.mdl-color--indigo-A400{background-color:#3d5afe !important}.mdl-color-text--indigo-A700{color:#304ffe !important}.mdl-color--indigo-A700{background-color:#304ffe !important}.mdl-color-text--blue{color:#2196f3 !important}.mdl-color--blue{background-color:#2196f3 !important}.mdl-color-text--blue-50{color:#e3f2fd !important}.mdl-color--blue-50{background-color:#e3f2fd !important}.mdl-color-text--blue-100{color:#bbdefb !important}.mdl-color--blue-100{background-color:#bbdefb !important}.mdl-color-text--blue-200{color:#90caf9 !important}.mdl-color--blue-200{background-color:#90caf9 !important}.mdl-color-text--blue-300{color:#64b5f6 !important}.mdl-color--blue-300{background-color:#64b5f6 !important}.mdl-color-text--blue-400{color:#42a5f5 !important}.mdl-color--blue-400{background-color:#42a5f5 !important}.mdl-color-text--blue-500{color:#2196f3 !important}.mdl-color--blue-500{background-color:#2196f3 !important}.mdl-color-text--blue-600{color:#1e88e5 !important}.mdl-color--blue-600{background-color:#1e88e5 !important}.mdl-color-text--blue-700{color:#1976d2 !important}.mdl-color--blue-700{background-color:#1976d2 !important}.mdl-color-text--blue-800{color:#1565c0 !important}.mdl-color--blue-800{background-color:#1565c0 !important}.mdl-color-text--blue-900{color:#0d47a1 !important}.mdl-color--blue-900{background-color:#0d47a1 !important}.mdl-color-text--blue-A100{color:#82b1ff !important}.mdl-color--blue-A100{background-color:#82b1ff !important}.mdl-color-text--blue-A200{color:#448aff !important}.mdl-color--blue-A200{background-color:#448aff !important}.mdl-color-text--blue-A400{color:#2979ff !important}.mdl-color--blue-A400{background-color:#2979ff !important}.mdl-color-text--blue-A700{color:#2962ff !important}.mdl-color--blue-A700{background-color:#2962ff !important}.mdl-color-text--light-blue{color:#03a9f4 !important}.mdl-color--light-blue{background-color:#03a9f4 !important}.mdl-color-text--light-blue-50{color:#e1f5fe !important}.mdl-color--light-blue-50{background-color:#e1f5fe !important}.mdl-color-text--light-blue-100{color:#b3e5fc !important}.mdl-color--light-blue-100{background-color:#b3e5fc !important}.mdl-color-text--light-blue-200{color:#81d4fa !important}.mdl-color--light-blue-200{background-color:#81d4fa !important}.mdl-color-text--light-blue-300{color:#4fc3f7 !important}.mdl-color--light-blue-300{background-color:#4fc3f7 !important}.mdl-color-text--light-blue-400{color:#29b6f6 !important}.mdl-color--light-blue-400{background-color:#29b6f6 !important}.mdl-color-text--light-blue-500{color:#03a9f4 !important}.mdl-color--light-blue-500{background-color:#03a9f4 !important}.mdl-color-text--light-blue-600{color:#039be5 !important}.mdl-color--light-blue-600{background-color:#039be5 !important}.mdl-color-text--light-blue-700{color:#0288d1 !important}.mdl-color--light-blue-700{background-color:#0288d1 !important}.mdl-color-text--light-blue-800{color:#0277bd !important}.mdl-color--light-blue-800{background-color:#0277bd !important}.mdl-color-text--light-blue-900{color:#01579b !important}.mdl-color--light-blue-900{background-color:#01579b !important}.mdl-color-text--light-blue-A100{color:#80d8ff !important}.mdl-color--light-blue-A100{background-color:#80d8ff !important}.mdl-color-text--light-blue-A200{color:#40c4ff !important}.mdl-color--light-blue-A200{background-color:#40c4ff !important}.mdl-color-text--light-blue-A400{color:#00b0ff !important}.mdl-color--light-blue-A400{background-color:#00b0ff !important}.mdl-color-text--light-blue-A700{color:#0091ea !important}.mdl-color--light-blue-A700{background-color:#0091ea !important}.mdl-color-text--cyan{color:#00bcd4 !important}.mdl-color--cyan{background-color:#00bcd4 !important}.mdl-color-text--cyan-50{color:#e0f7fa !important}.mdl-color--cyan-50{background-color:#e0f7fa !important}.mdl-color-text--cyan-100{color:#b2ebf2 !important}.mdl-color--cyan-100{background-color:#b2ebf2 !important}.mdl-color-text--cyan-200{color:#80deea !important}.mdl-color--cyan-200{background-color:#80deea !important}.mdl-color-text--cyan-300{color:#4dd0e1 !important}.mdl-color--cyan-300{background-color:#4dd0e1 !important}.mdl-color-text--cyan-400{color:#26c6da !important}.mdl-color--cyan-400{background-color:#26c6da !important}.mdl-color-text--cyan-500{color:#00bcd4 !important}.mdl-color--cyan-500{background-color:#00bcd4 !important}.mdl-color-text--cyan-600{color:#00acc1 !important}.mdl-color--cyan-600{background-color:#00acc1 !important}.mdl-color-text--cyan-700{color:#0097a7 !important}.mdl-color--cyan-700{background-color:#0097a7 !important}.mdl-color-text--cyan-800{color:#00838f !important}.mdl-color--cyan-800{background-color:#00838f !important}.mdl-color-text--cyan-900{color:#006064 !important}.mdl-color--cyan-900{background-color:#006064 !important}.mdl-color-text--cyan-A100{color:#84ffff !important}.mdl-color--cyan-A100{background-color:#84ffff !important}.mdl-color-text--cyan-A200{color:#18ffff !important}.mdl-color--cyan-A200{background-color:#18ffff !important}.mdl-color-text--cyan-A400{color:#00e5ff !important}.mdl-color--cyan-A400{background-color:#00e5ff !important}.mdl-color-text--cyan-A700{color:#00b8d4 !important}.mdl-color--cyan-A700{background-color:#00b8d4 !important}.mdl-color-text--teal{color:#009688 !important}.mdl-color--teal{background-color:#009688 !important}.mdl-color-text--teal-50{color:#e0f2f1 !important}.mdl-color--teal-50{background-color:#e0f2f1 !important}.mdl-color-text--teal-100{color:#b2dfdb !important}.mdl-color--teal-100{background-color:#b2dfdb !important}.mdl-color-text--teal-200{color:#80cbc4 !important}.mdl-color--teal-200{background-color:#80cbc4 !important}.mdl-color-text--teal-300{color:#4db6ac !important}.mdl-color--teal-300{background-color:#4db6ac !important}.mdl-color-text--teal-400{color:#26a69a !important}.mdl-color--teal-400{background-color:#26a69a !important}.mdl-color-text--teal-500{color:#009688 !important}.mdl-color--teal-500{background-color:#009688 !important}.mdl-color-text--teal-600{color:#00897b !important}.mdl-color--teal-600{background-color:#00897b !important}.mdl-color-text--teal-700{color:#00796b !important}.mdl-color--teal-700{background-color:#00796b !important}.mdl-color-text--teal-800{color:#00695c !important}.mdl-color--teal-800{background-color:#00695c !important}.mdl-color-text--teal-900{color:#004d40 !important}.mdl-color--teal-900{background-color:#004d40 !important}.mdl-color-text--teal-A100{color:#a7ffeb !important}.mdl-color--teal-A100{background-color:#a7ffeb !important}.mdl-color-text--teal-A200{color:#64ffda !important}.mdl-color--teal-A200{background-color:#64ffda !important}.mdl-color-text--teal-A400{color:#1de9b6 !important}.mdl-color--teal-A400{background-color:#1de9b6 !important}.mdl-color-text--teal-A700{color:#00bfa5 !important}.mdl-color--teal-A700{background-color:#00bfa5 !important}.mdl-color-text--green{color:#4caf50 !important}.mdl-color--green{background-color:#4caf50 !important}.mdl-color-text--green-50{color:#e8f5e9 !important}.mdl-color--green-50{background-color:#e8f5e9 !important}.mdl-color-text--green-100{color:#c8e6c9 !important}.mdl-color--green-100{background-color:#c8e6c9 !important}.mdl-color-text--green-200{color:#a5d6a7 !important}.mdl-color--green-200{background-color:#a5d6a7 !important}.mdl-color-text--green-300{color:#81c784 !important}.mdl-color--green-300{background-color:#81c784 !important}.mdl-color-text--green-400{color:#66bb6a !important}.mdl-color--green-400{background-color:#66bb6a !important}.mdl-color-text--green-500{color:#4caf50 !important}.mdl-color--green-500{background-color:#4caf50 !important}.mdl-color-text--green-600{color:#43a047 !important}.mdl-color--green-600{background-color:#43a047 !important}.mdl-color-text--green-700{color:#388e3c !important}.mdl-color--green-700{background-color:#388e3c !important}.mdl-color-text--green-800{color:#2e7d32 !important}.mdl-color--green-800{background-color:#2e7d32 !important}.mdl-color-text--green-900{color:#1b5e20 !important}.mdl-color--green-900{background-color:#1b5e20 !important}.mdl-color-text--green-A100{color:#b9f6ca !important}.mdl-color--green-A100{background-color:#b9f6ca !important}.mdl-color-text--green-A200{color:#69f0ae !important}.mdl-color--green-A200{background-color:#69f0ae !important}.mdl-color-text--green-A400{color:#00e676 !important}.mdl-color--green-A400{background-color:#00e676 !important}.mdl-color-text--green-A700{color:#00c853 !important}.mdl-color--green-A700{background-color:#00c853 !important}.mdl-color-text--light-green{color:#8bc34a !important}.mdl-color--light-green{background-color:#8bc34a !important}.mdl-color-text--light-green-50{color:#f1f8e9 !important}.mdl-color--light-green-50{background-color:#f1f8e9 !important}.mdl-color-text--light-green-100{color:#dcedc8 !important}.mdl-color--light-green-100{background-color:#dcedc8 !important}.mdl-color-text--light-green-200{color:#c5e1a5 !important}.mdl-color--light-green-200{background-color:#c5e1a5 !important}.mdl-color-text--light-green-300{color:#aed581 !important}.mdl-color--light-green-300{background-color:#aed581 !important}.mdl-color-text--light-green-400{color:#9ccc65 !important}.mdl-color--light-green-400{background-color:#9ccc65 !important}.mdl-color-text--light-green-500{color:#8bc34a !important}.mdl-color--light-green-500{background-color:#8bc34a !important}.mdl-color-text--light-green-600{color:#7cb342 !important}.mdl-color--light-green-600{background-color:#7cb342 !important}.mdl-color-text--light-green-700{color:#689f38 !important}.mdl-color--light-green-700{background-color:#689f38 !important}.mdl-color-text--light-green-800{color:#558b2f !important}.mdl-color--light-green-800{background-color:#558b2f !important}.mdl-color-text--light-green-900{color:#33691e !important}.mdl-color--light-green-900{background-color:#33691e !important}.mdl-color-text--light-green-A100{color:#ccff90 !important}.mdl-color--light-green-A100{background-color:#ccff90 !important}.mdl-color-text--light-green-A200{color:#b2ff59 !important}.mdl-color--light-green-A200{background-color:#b2ff59 !important}.mdl-color-text--light-green-A400{color:#76ff03 !important}.mdl-color--light-green-A400{background-color:#76ff03 !important}.mdl-color-text--light-green-A700{color:#64dd17 !important}.mdl-color--light-green-A700{background-color:#64dd17 !important}.mdl-color-text--lime{color:#cddc39 !important}.mdl-color--lime{background-color:#cddc39 !important}.mdl-color-text--lime-50{color:#f9fbe7 !important}.mdl-color--lime-50{background-color:#f9fbe7 !important}.mdl-color-text--lime-100{color:#f0f4c3 !important}.mdl-color--lime-100{background-color:#f0f4c3 !important}.mdl-color-text--lime-200{color:#e6ee9c !important}.mdl-color--lime-200{background-color:#e6ee9c !important}.mdl-color-text--lime-300{color:#dce775 !important}.mdl-color--lime-300{background-color:#dce775 !important}.mdl-color-text--lime-400{color:#d4e157 !important}.mdl-color--lime-400{background-color:#d4e157 !important}.mdl-color-text--lime-500{color:#cddc39 !important}.mdl-color--lime-500{background-color:#cddc39 !important}.mdl-color-text--lime-600{color:#c0ca33 !important}.mdl-color--lime-600{background-color:#c0ca33 !important}.mdl-color-text--lime-700{color:#afb42b !important}.mdl-color--lime-700{background-color:#afb42b !important}.mdl-color-text--lime-800{color:#9e9d24 !important}.mdl-color--lime-800{background-color:#9e9d24 !important}.mdl-color-text--lime-900{color:#827717 !important}.mdl-color--lime-900{background-color:#827717 !important}.mdl-color-text--lime-A100{color:#f4ff81 !important}.mdl-color--lime-A100{background-color:#f4ff81 !important}.mdl-color-text--lime-A200{color:#eeff41 !important}.mdl-color--lime-A200{background-color:#eeff41 !important}.mdl-color-text--lime-A400{color:#c6ff00 !important}.mdl-color--lime-A400{background-color:#c6ff00 !important}.mdl-color-text--lime-A700{color:#aeea00 !important}.mdl-color--lime-A700{background-color:#aeea00 !important}.mdl-color-text--yellow{color:#ffeb3b !important}.mdl-color--yellow{background-color:#ffeb3b !important}.mdl-color-text--yellow-50{color:#fffde7 !important}.mdl-color--yellow-50{background-color:#fffde7 !important}.mdl-color-text--yellow-100{color:#fff9c4 !important}.mdl-color--yellow-100{background-color:#fff9c4 !important}.mdl-color-text--yellow-200{color:#fff59d !important}.mdl-color--yellow-200{background-color:#fff59d !important}.mdl-color-text--yellow-300{color:#fff176 !important}.mdl-color--yellow-300{background-color:#fff176 !important}.mdl-color-text--yellow-400{color:#ffee58 !important}.mdl-color--yellow-400{background-color:#ffee58 !important}.mdl-color-text--yellow-500{color:#ffeb3b !important}.mdl-color--yellow-500{background-color:#ffeb3b !important}.mdl-color-text--yellow-600{color:#fdd835 !important}.mdl-color--yellow-600{background-color:#fdd835 !important}.mdl-color-text--yellow-700{color:#fbc02d !important}.mdl-color--yellow-700{background-color:#fbc02d !important}.mdl-color-text--yellow-800{color:#f9a825 !important}.mdl-color--yellow-800{background-color:#f9a825 !important}.mdl-color-text--yellow-900{color:#f57f17 !important}.mdl-color--yellow-900{background-color:#f57f17 !important}.mdl-color-text--yellow-A100{color:#ffff8d !important}.mdl-color--yellow-A100{background-color:#ffff8d !important}.mdl-color-text--yellow-A200{color:#ff0 !important}.mdl-color--yellow-A200{background-color:#ff0 !important}.mdl-color-text--yellow-A400{color:#ffea00 !important}.mdl-color--yellow-A400{background-color:#ffea00 !important}.mdl-color-text--yellow-A700{color:#ffd600 !important}.mdl-color--yellow-A700{background-color:#ffd600 !important}.mdl-color-text--amber{color:#ffc107 !important}.mdl-color--amber{background-color:#ffc107 !important}.mdl-color-text--amber-50{color:#fff8e1 !important}.mdl-color--amber-50{background-color:#fff8e1 !important}.mdl-color-text--amber-100{color:#ffecb3 !important}.mdl-color--amber-100{background-color:#ffecb3 !important}.mdl-color-text--amber-200{color:#ffe082 !important}.mdl-color--amber-200{background-color:#ffe082 !important}.mdl-color-text--amber-300{color:#ffd54f !important}.mdl-color--amber-300{background-color:#ffd54f !important}.mdl-color-text--amber-400{color:#ffca28 !important}.mdl-color--amber-400{background-color:#ffca28 !important}.mdl-color-text--amber-500{color:#ffc107 !important}.mdl-color--amber-500{background-color:#ffc107 !important}.mdl-color-text--amber-600{color:#ffb300 !important}.mdl-color--amber-600{background-color:#ffb300 !important}.mdl-color-text--amber-700{color:#ffa000 !important}.mdl-color--amber-700{background-color:#ffa000 !important}.mdl-color-text--amber-800{color:#ff8f00 !important}.mdl-color--amber-800{background-color:#ff8f00 !important}.mdl-color-text--amber-900{color:#ff6f00 !important}.mdl-color--amber-900{background-color:#ff6f00 !important}.mdl-color-text--amber-A100{color:#ffe57f !important}.mdl-color--amber-A100{background-color:#ffe57f !important}.mdl-color-text--amber-A200{color:#ffd740 !important}.mdl-color--amber-A200{background-color:#ffd740 !important}.mdl-color-text--amber-A400{color:#ffc400 !important}.mdl-color--amber-A400{background-color:#ffc400 !important}.mdl-color-text--amber-A700{color:#ffab00 !important}.mdl-color--amber-A700{background-color:#ffab00 !important}.mdl-color-text--orange{color:#ff9800 !important}.mdl-color--orange{background-color:#ff9800 !important}.mdl-color-text--orange-50{color:#fff3e0 !important}.mdl-color--orange-50{background-color:#fff3e0 !important}.mdl-color-text--orange-100{color:#ffe0b2 !important}.mdl-color--orange-100{background-color:#ffe0b2 !important}.mdl-color-text--orange-200{color:#ffcc80 !important}.mdl-color--orange-200{background-color:#ffcc80 !important}.mdl-color-text--orange-300{color:#ffb74d !important}.mdl-color--orange-300{background-color:#ffb74d !important}.mdl-color-text--orange-400{color:#ffa726 !important}.mdl-color--orange-400{background-color:#ffa726 !important}.mdl-color-text--orange-500{color:#ff9800 !important}.mdl-color--orange-500{background-color:#ff9800 !important}.mdl-color-text--orange-600{color:#fb8c00 !important}.mdl-color--orange-600{background-color:#fb8c00 !important}.mdl-color-text--orange-700{color:#f57c00 !important}.mdl-color--orange-700{background-color:#f57c00 !important}.mdl-color-text--orange-800{color:#ef6c00 !important}.mdl-color--orange-800{background-color:#ef6c00 !important}.mdl-color-text--orange-900{color:#e65100 !important}.mdl-color--orange-900{background-color:#e65100 !important}.mdl-color-text--orange-A100{color:#ffd180 !important}.mdl-color--orange-A100{background-color:#ffd180 !important}.mdl-color-text--orange-A200{color:#ffab40 !important}.mdl-color--orange-A200{background-color:#ffab40 !important}.mdl-color-text--orange-A400{color:#ff9100 !important}.mdl-color--orange-A400{background-color:#ff9100 !important}.mdl-color-text--orange-A700{color:#ff6d00 !important}.mdl-color--orange-A700{background-color:#ff6d00 !important}.mdl-color-text--deep-orange{color:#ff5722 !important}.mdl-color--deep-orange{background-color:#ff5722 !important}.mdl-color-text--deep-orange-50{color:#fbe9e7 !important}.mdl-color--deep-orange-50{background-color:#fbe9e7 !important}.mdl-color-text--deep-orange-100{color:#ffccbc !important}.mdl-color--deep-orange-100{background-color:#ffccbc !important}.mdl-color-text--deep-orange-200{color:#ffab91 !important}.mdl-color--deep-orange-200{background-color:#ffab91 !important}.mdl-color-text--deep-orange-300{color:#ff8a65 !important}.mdl-color--deep-orange-300{background-color:#ff8a65 !important}.mdl-color-text--deep-orange-400{color:#ff7043 !important}.mdl-color--deep-orange-400{background-color:#ff7043 !important}.mdl-color-text--deep-orange-500{color:#ff5722 !important}.mdl-color--deep-orange-500{background-color:#ff5722 !important}.mdl-color-text--deep-orange-600{color:#f4511e !important}.mdl-color--deep-orange-600{background-color:#f4511e !important}.mdl-color-text--deep-orange-700{color:#e64a19 !important}.mdl-color--deep-orange-700{background-color:#e64a19 !important}.mdl-color-text--deep-orange-800{color:#d84315 !important}.mdl-color--deep-orange-800{background-color:#d84315 !important}.mdl-color-text--deep-orange-900{color:#bf360c !important}.mdl-color--deep-orange-900{background-color:#bf360c !important}.mdl-color-text--deep-orange-A100{color:#ff9e80 !important}.mdl-color--deep-orange-A100{background-color:#ff9e80 !important}.mdl-color-text--deep-orange-A200{color:#ff6e40 !important}.mdl-color--deep-orange-A200{background-color:#ff6e40 !important}.mdl-color-text--deep-orange-A400{color:#ff3d00 !important}.mdl-color--deep-orange-A400{background-color:#ff3d00 !important}.mdl-color-text--deep-orange-A700{color:#dd2c00 !important}.mdl-color--deep-orange-A700{background-color:#dd2c00 !important}.mdl-color-text--brown{color:#795548 !important}.mdl-color--brown{background-color:#795548 !important}.mdl-color-text--brown-50{color:#efebe9 !important}.mdl-color--brown-50{background-color:#efebe9 !important}.mdl-color-text--brown-100{color:#d7ccc8 !important}.mdl-color--brown-100{background-color:#d7ccc8 !important}.mdl-color-text--brown-200{color:#bcaaa4 !important}.mdl-color--brown-200{background-color:#bcaaa4 !important}.mdl-color-text--brown-300{color:#a1887f !important}.mdl-color--brown-300{background-color:#a1887f !important}.mdl-color-text--brown-400{color:#8d6e63 !important}.mdl-color--brown-400{background-color:#8d6e63 !important}.mdl-color-text--brown-500{color:#795548 !important}.mdl-color--brown-500{background-color:#795548 !important}.mdl-color-text--brown-600{color:#6d4c41 !important}.mdl-color--brown-600{background-color:#6d4c41 !important}.mdl-color-text--brown-700{color:#5d4037 !important}.mdl-color--brown-700{background-color:#5d4037 !important}.mdl-color-text--brown-800{color:#4e342e !important}.mdl-color--brown-800{background-color:#4e342e !important}.mdl-color-text--brown-900{color:#3e2723 !important}.mdl-color--brown-900{background-color:#3e2723 !important}.mdl-color-text--grey{color:#9e9e9e !important}.mdl-color--grey{background-color:#9e9e9e !important}.mdl-color-text--grey-50{color:#fafafa !important}.mdl-color--grey-50{background-color:#fafafa !important}.mdl-color-text--grey-100{color:#f5f5f5 !important}.mdl-color--grey-100{background-color:#f5f5f5 !important}.mdl-color-text--grey-200{color:#eee !important}.mdl-color--grey-200{background-color:#eee !important}.mdl-color-text--grey-300{color:#e0e0e0 !important}.mdl-color--grey-300{background-color:#e0e0e0 !important}.mdl-color-text--grey-400{color:#bdbdbd !important}.mdl-color--grey-400{background-color:#bdbdbd !important}.mdl-color-text--grey-500{color:#9e9e9e !important}.mdl-color--grey-500{background-color:#9e9e9e !important}.mdl-color-text--grey-600{color:#757575 !important}.mdl-color--grey-600{background-color:#757575 !important}.mdl-color-text--grey-700{color:#616161 !important}.mdl-color--grey-700{background-color:#616161 !important}.mdl-color-text--grey-800{color:#424242 !important}.mdl-color--grey-800{background-color:#424242 !important}.mdl-color-text--grey-900{color:#212121 !important}.mdl-color--grey-900{background-color:#212121 !important}.mdl-color-text--blue-grey{color:#607d8b !important}.mdl-color--blue-grey{background-color:#607d8b !important}.mdl-color-text--blue-grey-50{color:#eceff1 !important}.mdl-color--blue-grey-50{background-color:#eceff1 !important}.mdl-color-text--blue-grey-100{color:#cfd8dc !important}.mdl-color--blue-grey-100{background-color:#cfd8dc !important}.mdl-color-text--blue-grey-200{color:#b0bec5 !important}.mdl-color--blue-grey-200{background-color:#b0bec5 !important}.mdl-color-text--blue-grey-300{color:#90a4ae !important}.mdl-color--blue-grey-300{background-color:#90a4ae !important}.mdl-color-text--blue-grey-400{color:#78909c !important}.mdl-color--blue-grey-400{background-color:#78909c !important}.mdl-color-text--blue-grey-500{color:#607d8b !important}.mdl-color--blue-grey-500{background-color:#607d8b !important}.mdl-color-text--blue-grey-600{color:#546e7a !important}.mdl-color--blue-grey-600{background-color:#546e7a !important}.mdl-color-text--blue-grey-700{color:#455a64 !important}.mdl-color--blue-grey-700{background-color:#455a64 !important}.mdl-color-text--blue-grey-800{color:#37474f !important}.mdl-color--blue-grey-800{background-color:#37474f !important}.mdl-color-text--blue-grey-900{color:#263238 !important}.mdl-color--blue-grey-900{background-color:#263238 !important}.mdl-color--black{background-color:#000 !important}.mdl-color-text--black{color:#000 !important}.mdl-color--white{background-color:#fff !important}.mdl-color-text--white{color:#fff !important}.mdl-color--primary{background-color:rgb(255,152,0)!important}.mdl-color--primary-contrast{background-color:rgb(66,66,66)!important}.mdl-color--primary-dark{background-color:rgb(245,124,0)!important}.mdl-color--accent{background-color:rgb(68,138,255)!important}.mdl-color--accent-contrast{background-color:rgb(255,255,255)!important}.mdl-color-text--primary{color:rgb(255,152,0)!important}.mdl-color-text--primary-contrast{color:rgb(66,66,66)!important}.mdl-color-text--primary-dark{color:rgb(245,124,0)!important}.mdl-color-text--accent{color:rgb(68,138,255)!important}.mdl-color-text--accent-contrast{color:rgb(255,255,255)!important}.mdl-ripple{background:#000;border-radius:50%;height:50px;left:0;opacity:0;pointer-events:none;position:absolute;top:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:50px;overflow:hidden}.mdl-ripple.is-animating{transition:transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1);transition:transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1),-webkit-transform .3s cubic-bezier(0,0,.2,1)}.mdl-ripple.is-visible{opacity:.3}.mdl-animation--default,.mdl-animation--fast-out-slow-in{transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-animation--linear-out-slow-in{transition-timing-function:cubic-bezier(0,0,.2,1)}.mdl-animation--fast-out-linear-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.mdl-badge{position:relative;white-space:nowrap;margin-right:24px}.mdl-badge:not([data-badge]){margin-right:auto}.mdl-badge[data-badge]:after{content:attr(data-badge);display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:center;-ms-flex-line-pack:center;align-content:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;position:absolute;top:-11px;right:-24px;font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:600;font-size:12px;width:22px;height:22px;border-radius:50%;background:rgb(68,138,255);color:rgb(255,255,255)}.mdl-button .mdl-badge[data-badge]:after{top:-10px;right:-5px}.mdl-badge.mdl-badge--no-background[data-badge]:after{color:rgb(68,138,255);background:rgba(255,255,255,.2);box-shadow:0 0 1px gray}.mdl-badge.mdl-badge--overlap{margin-right:10px}.mdl-badge.mdl-badge--overlap:after{right:-10px}.mdl-button{background:0 0;border:none;border-radius:2px;color:#000;position:relative;height:36px;margin:0;min-width:64px;padding:0 16px;display:inline-block;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;text-transform:uppercase;letter-spacing:0;overflow:hidden;will-change:box-shadow;transition:box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);outline:none;cursor:pointer;text-decoration:none;text-align:center;line-height:36px;vertical-align:middle}.mdl-button::-moz-focus-inner{border:0}.mdl-button:hover{background-color:rgba(158,158,158,.2)}.mdl-button:focus:not(:active){background-color:rgba(0,0,0,.12)}.mdl-button:active{background-color:rgba(158,158,158,.4)}.mdl-button.mdl-button--colored{color:rgb(255,152,0)}.mdl-button.mdl-button--colored:focus:not(:active){background-color:rgba(0,0,0,.12)}input.mdl-button[type="submit"]{-webkit-appearance:none}.mdl-button--raised{background:rgba(158,158,158,.2);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-button--raised:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--raised:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--raised.mdl-button--colored{background:rgb(255,152,0);color:rgb(66,66,66)}.mdl-button--raised.mdl-button--colored:hover{background-color:rgb(255,152,0)}.mdl-button--raised.mdl-button--colored:active{background-color:rgb(255,152,0)}.mdl-button--raised.mdl-button--colored:focus:not(:active){background-color:rgb(255,152,0)}.mdl-button--raised.mdl-button--colored .mdl-ripple{background:rgb(66,66,66)}.mdl-button--fab{border-radius:50%;font-size:24px;height:56px;margin:auto;min-width:56px;width:56px;padding:0;overflow:hidden;background:rgba(158,158,158,.2);box-shadow:0 1px 1.5px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24);position:relative;line-height:normal}.mdl-button--fab .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--fab.mdl-button--mini-fab{height:40px;min-width:40px;width:40px}.mdl-button--fab .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button--fab:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--fab:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--fab.mdl-button--colored{background:rgb(68,138,255);color:rgb(255,255,255)}.mdl-button--fab.mdl-button--colored:hover{background-color:rgb(68,138,255)}.mdl-button--fab.mdl-button--colored:focus:not(:active){background-color:rgb(68,138,255)}.mdl-button--fab.mdl-button--colored:active{background-color:rgb(68,138,255)}.mdl-button--fab.mdl-button--colored .mdl-ripple{background:rgb(255,255,255)}.mdl-button--icon{border-radius:50%;font-size:24px;height:32px;margin-left:0;margin-right:0;min-width:32px;width:32px;padding:0;overflow:hidden;color:inherit;line-height:normal}.mdl-button--icon .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon{height:24px;min-width:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon .material-icons{top:0;left:0}.mdl-button--icon .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button__ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-button[disabled] .mdl-button__ripple-container .mdl-ripple,.mdl-button.mdl-button--disabled .mdl-button__ripple-container .mdl-ripple{background-color:transparent}.mdl-button--primary.mdl-button--primary{color:rgb(255,152,0)}.mdl-button--primary.mdl-button--primary .mdl-ripple{background:rgb(66,66,66)}.mdl-button--primary.mdl-button--primary.mdl-button--raised,.mdl-button--primary.mdl-button--primary.mdl-button--fab{color:rgb(66,66,66);background-color:rgb(255,152,0)}.mdl-button--accent.mdl-button--accent{color:rgb(68,138,255)}.mdl-button--accent.mdl-button--accent .mdl-ripple{background:rgb(255,255,255)}.mdl-button--accent.mdl-button--accent.mdl-button--raised,.mdl-button--accent.mdl-button--accent.mdl-button--fab{color:rgb(255,255,255);background-color:rgb(68,138,255)}.mdl-button[disabled][disabled],.mdl-button.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26);cursor:default;background-color:transparent}.mdl-button--fab[disabled][disabled],.mdl-button--fab.mdl-button--disabled.mdl-button--disabled{background-color:rgba(0,0,0,.12);color:rgba(0,0,0,.26)}.mdl-button--raised[disabled][disabled],.mdl-button--raised.mdl-button--disabled.mdl-button--disabled{background-color:rgba(0,0,0,.12);color:rgba(0,0,0,.26);box-shadow:none}.mdl-button--colored[disabled][disabled],.mdl-button--colored.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26)}.mdl-button .material-icons{vertical-align:middle}.mdl-card{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;font-size:16px;font-weight:400;min-height:200px;overflow:hidden;width:330px;z-index:1;position:relative;background:#fff;border-radius:2px;box-sizing:border-box}.mdl-card__media{background-color:rgb(68,138,255);background-repeat:repeat;background-position:50% 50%;background-size:cover;background-origin:padding-box;background-attachment:scroll;box-sizing:border-box}.mdl-card__title{-webkit-align-items:center;-ms-flex-align:center;align-items:center;color:#000;display:block;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:stretch;-ms-flex-pack:stretch;justify-content:stretch;line-height:normal;padding:16px;-webkit-perspective-origin:165px 56px;perspective-origin:165px 56px;-webkit-transform-origin:165px 56px;transform-origin:165px 56px;box-sizing:border-box}.mdl-card__title.mdl-card--border{border-bottom:1px solid rgba(0,0,0,.1)}.mdl-card__title-text{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end;color:inherit;display:block;display:-webkit-flex;display:-ms-flexbox;display:flex;font-size:24px;font-weight:300;line-height:normal;overflow:hidden;-webkit-transform-origin:149px 48px;transform-origin:149px 48px;margin:0}.mdl-card__subtitle-text{font-size:14px;color:rgba(0,0,0,.54);margin:0}.mdl-card__supporting-text{color:rgba(0,0,0,.54);font-size:1rem;line-height:18px;overflow:hidden;padding:16px;width:90%}.mdl-card__actions{font-size:16px;line-height:normal;width:100%;background-color:transparent;padding:8px;box-sizing:border-box}.mdl-card__actions.mdl-card--border{border-top:1px solid rgba(0,0,0,.1)}.mdl-card--expand{-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-card__menu{position:absolute;right:16px;top:16px}.mdl-checkbox{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0}.mdl-checkbox.is-upgraded{padding-left:24px}.mdl-checkbox__input{line-height:24px}.mdl-checkbox.is-upgraded .mdl-checkbox__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-checkbox__box-outline{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;overflow:hidden;border:2px solid rgba(0,0,0,.54);border-radius:2px;z-index:2}.mdl-checkbox.is-checked .mdl-checkbox__box-outline{border:2px solid rgb(255,152,0)}fieldset[disabled] .mdl-checkbox .mdl-checkbox__box-outline,.mdl-checkbox.is-disabled .mdl-checkbox__box-outline{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__focus-helper{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;border-radius:50%;background-color:transparent}.mdl-checkbox.is-focused .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-checkbox.is-focused.is-checked .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(255,152,0,.26);background-color:rgba(255,152,0,.26)}.mdl-checkbox__tick-outline{position:absolute;top:0;left:0;height:100%;width:100%;-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");background:0 0;transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:background}.mdl-checkbox.is-checked .mdl-checkbox__tick-outline{background:rgb(255,152,0)url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}fieldset[disabled] .mdl-checkbox.is-checked .mdl-checkbox__tick-outline,.mdl-checkbox.is-checked.is-disabled .mdl-checkbox__tick-outline{background:rgba(0,0,0,.26)url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}.mdl-checkbox__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0}fieldset[disabled] .mdl-checkbox .mdl-checkbox__label,.mdl-checkbox.is-disabled .mdl-checkbox__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__ripple-container{position:absolute;z-index:2;top:-6px;left:-10px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-checkbox__ripple-container .mdl-ripple{background:rgb(255,152,0)}fieldset[disabled] .mdl-checkbox .mdl-checkbox__ripple-container,.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container{cursor:auto}fieldset[disabled] .mdl-checkbox .mdl-checkbox__ripple-container .mdl-ripple,.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container .mdl-ripple{background:0 0}.mdl-data-table{position:relative;border:1px solid rgba(0,0,0,.12);border-collapse:collapse;white-space:nowrap;font-size:13px;background-color:#fff}.mdl-data-table thead{padding-bottom:3px}.mdl-data-table thead .mdl-data-table__select{margin-top:0}.mdl-data-table tbody tr{position:relative;height:48px;transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:background-color}.mdl-data-table tbody tr.is-selected{background-color:#e0e0e0}.mdl-data-table tbody tr:hover{background-color:#eee}.mdl-data-table td{text-align:right}.mdl-data-table th{padding:0 18px 12px 18px;text-align:right}.mdl-data-table td:first-of-type,.mdl-data-table th:first-of-type{padding-left:24px}.mdl-data-table td:last-of-type,.mdl-data-table th:last-of-type{padding-right:24px}.mdl-data-table td{position:relative;height:48px;border-top:1px solid rgba(0,0,0,.12);border-bottom:1px solid rgba(0,0,0,.12);padding:12px 18px;box-sizing:border-box}.mdl-data-table td,.mdl-data-table td .mdl-data-table__select{vertical-align:middle}.mdl-data-table th{position:relative;vertical-align:bottom;text-overflow:ellipsis;font-weight:700;line-height:24px;letter-spacing:0;height:48px;font-size:12px;color:rgba(0,0,0,.54);padding-bottom:8px;box-sizing:border-box}.mdl-data-table th.mdl-data-table__header--sorted-ascending,.mdl-data-table th.mdl-data-table__header--sorted-descending{color:rgba(0,0,0,.87)}.mdl-data-table th.mdl-data-table__header--sorted-ascending:before,.mdl-data-table th.mdl-data-table__header--sorted-descending:before{font-family:'Material Icons';font-weight:400;font-style:normal;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;word-wrap:normal;-moz-font-feature-settings:'liga';font-feature-settings:'liga';-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased;font-size:16px;content:"\e5d8";margin-right:5px;vertical-align:sub}.mdl-data-table th.mdl-data-table__header--sorted-ascending:hover,.mdl-data-table th.mdl-data-table__header--sorted-descending:hover{cursor:pointer}.mdl-data-table th.mdl-data-table__header--sorted-ascending:hover:before,.mdl-data-table th.mdl-data-table__header--sorted-descending:hover:before{color:rgba(0,0,0,.26)}.mdl-data-table th.mdl-data-table__header--sorted-descending:before{content:"\e5db"}.mdl-data-table__select{width:16px}.mdl-data-table__cell--non-numeric.mdl-data-table__cell--non-numeric{text-align:left}.mdl-dialog{border:none;box-shadow:0 9px 46px 8px rgba(0,0,0,.14),0 11px 15px -7px rgba(0,0,0,.12),0 24px 38px 3px rgba(0,0,0,.2);width:280px}.mdl-dialog__title{padding:24px 24px 0;margin:0;font-size:2.5rem}.mdl-dialog__actions{padding:8px 8px 8px 24px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row-reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.mdl-dialog__actions>*{margin-right:8px;height:36px}.mdl-dialog__actions>*:first-child{margin-right:0}.mdl-dialog__actions--full-width{padding:0 0 8px}.mdl-dialog__actions--full-width>*{height:48px;-webkit-flex:0 0 100%;-ms-flex:0 0 100%;flex:0 0 100%;padding-right:16px;margin-right:0;text-align:right}.mdl-dialog__content{padding:20px 24px 24px;color:rgba(0,0,0,.54)}.mdl-mega-footer{padding:16px 40px;color:#9e9e9e;background-color:#424242}.mdl-mega-footer--top-section:after,.mdl-mega-footer--middle-section:after,.mdl-mega-footer--bottom-section:after,.mdl-mega-footer__top-section:after,.mdl-mega-footer__middle-section:after,.mdl-mega-footer__bottom-section:after{content:'';display:block;clear:both}.mdl-mega-footer--left-section,.mdl-mega-footer__left-section,.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{margin-bottom:16px}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:block;margin-bottom:16px;color:inherit;text-decoration:none}@media screen and (min-width:760px){.mdl-mega-footer--left-section,.mdl-mega-footer__left-section{float:left}.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{float:right}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:inline-block;margin-left:16px;line-height:36px;vertical-align:middle}}.mdl-mega-footer--social-btn,.mdl-mega-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{display:block;position:relative}@media screen and (min-width:760px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{width:33%}.mdl-mega-footer--drop-down-section:nth-child(1),.mdl-mega-footer--drop-down-section:nth-child(2),.mdl-mega-footer__drop-down-section:nth-child(1),.mdl-mega-footer__drop-down-section:nth-child(2){float:left}.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(3){float:right}.mdl-mega-footer--drop-down-section:nth-child(3):after,.mdl-mega-footer__drop-down-section:nth-child(3):after{clear:right}.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section:nth-child(4){clear:right;float:right}.mdl-mega-footer--middle-section:after,.mdl-mega-footer__middle-section:after{content:'';display:block;clear:both}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:0}}@media screen and (min-width:1024px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section,.mdl-mega-footer__drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(4){width:24%;float:left}}.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{position:absolute;width:100%;height:55.8px;padding:32px;margin:-16px 0 0;cursor:pointer;z-index:1;opacity:0}.mdl-mega-footer--heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CE'}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list{display:none}.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CF'}.mdl-mega-footer--heading,.mdl-mega-footer__heading{position:relative;width:100%;padding-right:39.8px;margin-bottom:16px;box-sizing:border-box;font-size:14px;line-height:23.8px;font-weight:500;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;color:#e0e0e0}.mdl-mega-footer--heading:after,.mdl-mega-footer__heading:after{content:'';position:absolute;top:0;right:0;display:block;width:23.8px;height:23.8px;background-size:cover}.mdl-mega-footer--link-list,.mdl-mega-footer__link-list{list-style:none;padding:0;margin:0 0 32px}.mdl-mega-footer--link-list:after,.mdl-mega-footer__link-list:after{clear:both;display:block;content:''}.mdl-mega-footer--link-list li,.mdl-mega-footer__link-list li{font-size:14px;font-weight:400;letter-spacing:0;line-height:20px}.mdl-mega-footer--link-list a,.mdl-mega-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}@media screen and (min-width:760px){.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{display:none}.mdl-mega-footer--heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer__heading:after{content:''}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list{display:block}.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading:after{content:''}}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:16px;margin-bottom:16px}.mdl-logo{margin-bottom:16px;color:#fff}.mdl-mega-footer--bottom-section .mdl-mega-footer--link-list li,.mdl-mega-footer__bottom-section .mdl-mega-footer__link-list li{float:left;margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-logo{float:left;margin-bottom:0;margin-right:16px}}.mdl-mini-footer{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:32px 16px;color:#9e9e9e;background-color:#424242}.mdl-mini-footer:after{content:'';display:block}.mdl-mini-footer .mdl-logo{line-height:36px}.mdl-mini-footer--link-list,.mdl-mini-footer__link-list{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;list-style:none;margin:0;padding:0}.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{line-height:36px}}.mdl-mini-footer--link-list a,.mdl-mini-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}.mdl-mini-footer--left-section,.mdl-mini-footer__left-section{display:inline-block;-webkit-order:0;-ms-flex-order:0;order:0}.mdl-mini-footer--right-section,.mdl-mini-footer__right-section{display:inline-block;-webkit-order:1;-ms-flex-order:1;order:1}.mdl-mini-footer--social-btn,.mdl-mini-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-icon-toggle{position:relative;z-index:1;vertical-align:middle;display:inline-block;height:32px;margin:0;padding:0}.mdl-icon-toggle__input{line-height:32px}.mdl-icon-toggle.is-upgraded .mdl-icon-toggle__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-icon-toggle__label{display:inline-block;position:relative;cursor:pointer;height:32px;width:32px;min-width:32px;color:#616161;border-radius:50%;padding:0;margin-left:0;margin-right:0;text-align:center;background-color:transparent;will-change:background-color;transition:background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1)}.mdl-icon-toggle__label.material-icons{line-height:32px;font-size:24px}.mdl-icon-toggle.is-checked .mdl-icon-toggle__label{color:rgb(255,152,0)}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__label{color:rgba(0,0,0,.26);cursor:auto;transition:none}.mdl-icon-toggle.is-focused .mdl-icon-toggle__label{background-color:rgba(0,0,0,.12)}.mdl-icon-toggle.is-focused.is-checked .mdl-icon-toggle__label{background-color:rgba(255,152,0,.26)}.mdl-icon-toggle__ripple-container{position:absolute;z-index:2;top:-2px;left:-2px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-icon-toggle__ripple-container .mdl-ripple{background:#616161}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container{cursor:auto}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container .mdl-ripple{background:0 0}.mdl-list{display:block;padding:8px 0;list-style:none}.mdl-list__item{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:16px;font-weight:400;letter-spacing:.04em;line-height:1;min-height:48px;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;padding:16px;cursor:default;color:rgba(0,0,0,.87);overflow:hidden}.mdl-list__item,.mdl-list__item .mdl-list__item-primary-content{box-sizing:border-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.mdl-list__item .mdl-list__item-primary-content{-webkit-order:0;-ms-flex-order:0;order:0;-webkit-flex-grow:2;-ms-flex-positive:2;flex-grow:2;text-decoration:none}.mdl-list__item .mdl-list__item-primary-content .mdl-list__item-icon{margin-right:32px}.mdl-list__item .mdl-list__item-primary-content .mdl-list__item-avatar{margin-right:16px}.mdl-list__item .mdl-list__item-secondary-content{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column;-ms-flex-flow:column;flex-flow:column;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end;margin-left:16px}.mdl-list__item .mdl-list__item-secondary-content .mdl-list__item-secondary-action label{display:inline}.mdl-list__item .mdl-list__item-secondary-content .mdl-list__item-secondary-info{font-size:12px;font-weight:400;line-height:1;letter-spacing:0;color:rgba(0,0,0,.54)}.mdl-list__item .mdl-list__item-secondary-content .mdl-list__item-sub-header{padding:0 0 0 16px}.mdl-list__item-icon,.mdl-list__item-icon.material-icons{height:24px;width:24px;font-size:24px;box-sizing:border-box;color:#757575}.mdl-list__item-avatar,.mdl-list__item-avatar.material-icons{height:40px;width:40px;box-sizing:border-box;border-radius:50%;background-color:#757575;font-size:40px;color:#fff}.mdl-list__item--two-line{height:72px}.mdl-list__item--two-line .mdl-list__item-primary-content{height:36px;line-height:20px;display:block}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-avatar{float:left}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-icon{float:left;margin-top:6px}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-secondary-content{height:36px}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-sub-title{font-size:14px;font-weight:400;letter-spacing:0;line-height:18px;color:rgba(0,0,0,.54);display:block;padding:0}.mdl-list__item--three-line{height:88px}.mdl-list__item--three-line .mdl-list__item-primary-content{height:52px;line-height:20px;display:block}.mdl-list__item--three-line .mdl-list__item-primary-content .mdl-list__item-avatar,.mdl-list__item--three-line .mdl-list__item-primary-content .mdl-list__item-icon{float:left}.mdl-list__item--three-line .mdl-list__item-secondary-content{height:52px}.mdl-list__item--three-line .mdl-list__item-text-body{font-size:14px;font-weight:400;letter-spacing:0;line-height:18px;height:52px;color:rgba(0,0,0,.54);display:block;padding:0}.mdl-menu__container{display:block;margin:0;padding:0;border:none;position:absolute;overflow:visible;height:0;width:0;visibility:hidden;z-index:-1}.mdl-menu__container.is-visible,.mdl-menu__container.is-animating{z-index:999;visibility:visible}.mdl-menu__outline{display:block;background:#fff;margin:0;padding:0;border:none;border-radius:2px;position:absolute;top:0;left:0;overflow:hidden;opacity:0;-webkit-transform:scale(0);transform:scale(0);-webkit-transform-origin:0 0;transform-origin:0 0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);will-change:transform;transition:transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1);transition:transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1),-webkit-transform .3s cubic-bezier(.4,0,.2,1);z-index:-1}.mdl-menu__container.is-visible .mdl-menu__outline{opacity:1;-webkit-transform:scale(1);transform:scale(1);z-index:999}.mdl-menu__outline.mdl-menu--bottom-right{-webkit-transform-origin:100% 0;transform-origin:100% 0}.mdl-menu__outline.mdl-menu--top-left{-webkit-transform-origin:0 100%;transform-origin:0 100%}.mdl-menu__outline.mdl-menu--top-right{-webkit-transform-origin:100% 100%;transform-origin:100% 100%}.mdl-menu{position:absolute;list-style:none;top:0;left:0;height:auto;width:auto;min-width:124px;padding:8px 0;margin:0;opacity:0;clip:rect(0 0 0 0);z-index:-1}.mdl-menu__container.is-visible .mdl-menu{opacity:1;z-index:999}.mdl-menu.is-animating{transition:opacity .2s cubic-bezier(.4,0,.2,1),clip .3s cubic-bezier(.4,0,.2,1)}.mdl-menu.mdl-menu--bottom-right{left:auto;right:0}.mdl-menu.mdl-menu--top-left{top:auto;bottom:0}.mdl-menu.mdl-menu--top-right{top:auto;left:auto;bottom:0;right:0}.mdl-menu.mdl-menu--unaligned{top:auto;left:auto}.mdl-menu__item{display:block;border:none;color:rgba(0,0,0,.87);background-color:transparent;text-align:left;margin:0;padding:0 16px;outline-color:#bdbdbd;position:relative;overflow:hidden;font-size:14px;font-weight:400;letter-spacing:0;text-decoration:none;cursor:pointer;height:48px;line-height:48px;white-space:nowrap;opacity:0;transition:opacity .2s cubic-bezier(.4,0,.2,1);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-menu__container.is-visible .mdl-menu__item{opacity:1}.mdl-menu__item::-moz-focus-inner{border:0}.mdl-menu__item--full-bleed-divider{border-bottom:1px solid rgba(0,0,0,.12)}.mdl-menu__item[disabled],.mdl-menu__item[data-mdl-disabled]{color:#bdbdbd;background-color:transparent;cursor:auto}.mdl-menu__item[disabled]:hover,.mdl-menu__item[data-mdl-disabled]:hover{background-color:transparent}.mdl-menu__item[disabled]:focus,.mdl-menu__item[data-mdl-disabled]:focus{background-color:transparent}.mdl-menu__item[disabled] .mdl-ripple,.mdl-menu__item[data-mdl-disabled] .mdl-ripple{background:0 0}.mdl-menu__item:hover{background-color:#eee}.mdl-menu__item:focus{outline:none;background-color:#eee}.mdl-menu__item:active{background-color:#e0e0e0}.mdl-menu__item--ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-progress{display:block;position:relative;height:4px;width:500px;max-width:100%}.mdl-progress>.bar{display:block;position:absolute;top:0;bottom:0;width:0%;transition:width .2s cubic-bezier(.4,0,.2,1)}.mdl-progress>.progressbar{background-color:rgb(255,152,0);z-index:1;left:0}.mdl-progress>.bufferbar{background-image:linear-gradient(to right,rgba(66,66,66,.7),rgba(66,66,66,.7)),linear-gradient(to right,rgb(255,152,0),rgb(255,152,0));z-index:0;left:0}.mdl-progress>.auxbar{right:0}@supports (-webkit-appearance:none){.mdl-progress:not(.mdl-progress--indeterminate):not(.mdl-progress--indeterminate)>.auxbar,.mdl-progress:not(.mdl-progress__indeterminate):not(.mdl-progress__indeterminate)>.auxbar{background-image:linear-gradient(to right,rgba(66,66,66,.7),rgba(66,66,66,.7)),linear-gradient(to right,rgb(255,152,0),rgb(255,152,0));-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=")}}.mdl-progress:not(.mdl-progress--indeterminate)>.auxbar,.mdl-progress:not(.mdl-progress__indeterminate)>.auxbar{background-image:linear-gradient(to right,rgba(66,66,66,.9),rgba(66,66,66,.9)),linear-gradient(to right,rgb(255,152,0),rgb(255,152,0))}.mdl-progress.mdl-progress--indeterminate>.bar1,.mdl-progress.mdl-progress__indeterminate>.bar1{-webkit-animation-name:indeterminate1;animation-name:indeterminate1}.mdl-progress.mdl-progress--indeterminate>.bar1,.mdl-progress.mdl-progress__indeterminate>.bar1,.mdl-progress.mdl-progress--indeterminate>.bar3,.mdl-progress.mdl-progress__indeterminate>.bar3{background-color:rgb(255,152,0);-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:linear;animation-timing-function:linear}.mdl-progress.mdl-progress--indeterminate>.bar3,.mdl-progress.mdl-progress__indeterminate>.bar3{background-image:none;-webkit-animation-name:indeterminate2;animation-name:indeterminate2}@-webkit-keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@-webkit-keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}@keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}.mdl-navigation{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;box-sizing:border-box}.mdl-navigation__link{color:#424242;text-decoration:none;margin:0;font-size:14px;font-weight:400;line-height:24px;letter-spacing:0;opacity:.87}.mdl-navigation__link .material-icons{vertical-align:middle}.mdl-layout{width:100%;height:100%;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;overflow-x:hidden;position:relative;-webkit-overflow-scrolling:touch}.mdl-layout.is-small-screen .mdl-layout--large-screen-only{display:none}.mdl-layout:not(.is-small-screen) .mdl-layout--small-screen-only{display:none}.mdl-layout__container{position:absolute;width:100%;height:100%}.mdl-layout__title,.mdl-layout-title{display:block;position:relative;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;line-height:1;letter-spacing:.02em;font-weight:400;box-sizing:border-box}.mdl-layout-spacer{-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-layout__drawer{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;width:240px;height:100%;max-height:100%;position:absolute;top:0;left:0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);box-sizing:border-box;border-right:1px solid #e0e0e0;background:#fafafa;-webkit-transform:translateX(-250px);transform:translateX(-250px);-webkit-transform-style:preserve-3d;transform-style:preserve-3d;will-change:transform;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:transform;transition-property:transform,-webkit-transform;color:#424242;overflow:visible;overflow-y:auto;z-index:5}.mdl-layout__drawer.is-visible{-webkit-transform:translateX(0);transform:translateX(0)}.mdl-layout__drawer.is-visible~.mdl-layout__content.mdl-layout__content{overflow:hidden}.mdl-layout__drawer>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__drawer>.mdl-layout__title,.mdl-layout__drawer>.mdl-layout-title{line-height:64px;padding-left:40px}@media screen and (max-width:1024px){.mdl-layout__drawer>.mdl-layout__title,.mdl-layout__drawer>.mdl-layout-title{line-height:56px;padding-left:16px}}.mdl-layout__drawer .mdl-navigation{-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:stretch;-ms-flex-align:stretch;-ms-grid-row-align:stretch;align-items:stretch;padding-top:16px}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{display:block;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;padding:16px 40px;margin:0;color:#757575}@media screen and (max-width:1024px){.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{padding:16px}}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link:hover{background-color:#e0e0e0}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link--current{background-color:#000;color:#e0e0e0}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer{-webkit-transform:translateX(0);transform:translateX(0)}}.mdl-layout__drawer-button{display:block;position:absolute;height:48px;width:48px;border:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden;text-align:center;cursor:pointer;font-size:26px;line-height:50px;font-family:Helvetica,Arial,sans-serif;margin:10px 12px;top:0;left:0;color:rgb(66,66,66);z-index:4}.mdl-layout__header .mdl-layout__drawer-button{position:absolute;color:rgb(255,255,255);background-color:inherit}@media screen and (max-width:1024px){.mdl-layout__header .mdl-layout__drawer-button{margin:4px}}@media screen and (max-width:1024px){.mdl-layout__drawer-button{margin:4px;color:rgba(0,0,0,.5)}}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer-button,.mdl-layout--no-desktop-drawer-button .mdl-layout__drawer-button{display:none}}.mdl-layout--no-drawer-button .mdl-layout__drawer-button{display:none}.mdl-layout__header{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start;box-sizing:border-box;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;width:100%;margin:0;padding:0;border:none;min-height:64px;max-height:1000px;z-index:3;background-color:rgb(31,188,210);color:rgb(255,255,255);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:max-height,box-shadow}@media screen and (max-width:1024px){.mdl-layout__header{min-height:56px}}.mdl-layout--fixed-drawer.is-upgraded:not(.is-small-screen)>.mdl-layout__header{margin-left:240px;width:calc(100% - 240px)}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__header .mdl-layout__header-row{padding-left:40px}}.mdl-layout__header>.mdl-layout-icon{position:absolute;left:40px;top:16px;height:32px;width:32px;overflow:hidden;z-index:3;display:block}@media screen and (max-width:1024px){.mdl-layout__header>.mdl-layout-icon{left:16px;top:12px}}.mdl-layout.has-drawer .mdl-layout__header>.mdl-layout-icon{display:none}.mdl-layout__header.is-compact{max-height:64px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact{max-height:56px}}.mdl-layout__header.is-compact.has-tabs{height:112px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact.has-tabs{min-height:104px}}@media screen and (max-width:1024px){.mdl-layout__header{display:none}.mdl-layout--fixed-header>.mdl-layout__header{display:-webkit-flex;display:-ms-flexbox;display:flex}}.mdl-layout__header--transparent.mdl-layout__header--transparent{background-color:transparent;box-shadow:none}.mdl-layout__header--seamed,.mdl-layout__header--scroll{box-shadow:none}.mdl-layout__header--waterfall{box-shadow:none;overflow:hidden}.mdl-layout__header--waterfall.is-casting-shadow{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-layout__header--waterfall.mdl-layout__header--waterfall-hide-top{-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.mdl-layout__header-row{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;box-sizing:border-box;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:64px;margin:0;padding:0 40px 0 80px}.mdl-layout--no-drawer-button .mdl-layout__header-row{padding-left:40px}@media screen and (min-width:1025px){.mdl-layout--no-desktop-drawer-button .mdl-layout__header-row{padding-left:40px}}@media screen and (max-width:1024px){.mdl-layout__header-row{height:56px;padding:0 16px 0 72px}.mdl-layout--no-drawer-button .mdl-layout__header-row{padding-left:16px}}.mdl-layout__header-row>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__header--scroll .mdl-layout__header-row{width:100%}.mdl-layout__header-row .mdl-navigation{margin:0;padding:0;height:64px;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-ms-flex-align:center;-ms-grid-row-align:center;align-items:center}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation{height:56px}}.mdl-layout__header-row .mdl-navigation__link{display:block;color:rgb(255,255,255);line-height:64px;padding:0 24px}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation__link{line-height:56px;padding:0 16px}}.mdl-layout__obfuscator{background-color:transparent;position:absolute;top:0;left:0;height:100%;width:100%;z-index:4;visibility:hidden;transition-property:background-color;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-layout__obfuscator.is-visible{background-color:rgba(0,0,0,.5);visibility:visible}@supports (pointer-events:auto){.mdl-layout__obfuscator{background-color:rgba(0,0,0,.5);opacity:0;transition-property:opacity;visibility:visible;pointer-events:none}.mdl-layout__obfuscator.is-visible{pointer-events:auto;opacity:1}}.mdl-layout__content{-ms-flex:0 1 auto;position:relative;display:inline-block;overflow-y:auto;overflow-x:hidden;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;z-index:1;-webkit-overflow-scrolling:touch}.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:240px}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow:visible}@media screen and (max-width:1024px){.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:0}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow-y:auto;overflow-x:hidden}}.mdl-layout__tab-bar{height:96px;margin:0;width:calc(100% - 112px);padding:0 0 0 56px;display:-webkit-flex;display:-ms-flexbox;display:flex;background-color:rgb(255,152,0);overflow-y:hidden;overflow-x:scroll}.mdl-layout__tab-bar::-webkit-scrollbar{display:none}.mdl-layout--no-drawer-button .mdl-layout__tab-bar{padding-left:16px;width:calc(100% - 32px)}@media screen and (min-width:1025px){.mdl-layout--no-desktop-drawer-button .mdl-layout__tab-bar{padding-left:16px;width:calc(100% - 32px)}}@media screen and (max-width:1024px){.mdl-layout__tab-bar{width:calc(100% - 60px);padding:0 0 0 60px}.mdl-layout--no-drawer-button .mdl-layout__tab-bar{width:calc(100% - 8px);padding-left:4px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar{padding:0;overflow:hidden;width:100%}.mdl-layout__tab-bar-container{position:relative;height:48px;width:100%;border:none;margin:0;z-index:2;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden}.mdl-layout__container>.mdl-layout__tab-bar-container{position:absolute;top:0;left:0}.mdl-layout__tab-bar-button{display:inline-block;position:absolute;top:0;height:48px;width:56px;z-index:4;text-align:center;background-color:rgb(255,152,0);color:transparent;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-layout--no-desktop-drawer-button .mdl-layout__tab-bar-button,.mdl-layout--no-drawer-button .mdl-layout__tab-bar-button{width:16px}.mdl-layout--no-desktop-drawer-button .mdl-layout__tab-bar-button .material-icons,.mdl-layout--no-drawer-button .mdl-layout__tab-bar-button .material-icons{position:relative;left:-4px}@media screen and (max-width:1024px){.mdl-layout__tab-bar-button{display:none;width:60px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar-button{display:none}.mdl-layout__tab-bar-button .material-icons{line-height:48px}.mdl-layout__tab-bar-button.is-active{color:rgb(66,66,66)}.mdl-layout__tab-bar-left-button{left:0}.mdl-layout__tab-bar-right-button{right:0}.mdl-layout__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(66,66,66,.6);overflow:hidden}@media screen and (max-width:1024px){.mdl-layout__tab{padding:0 12px}}.mdl-layout--fixed-tabs .mdl-layout__tab{float:none;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:0}.mdl-layout.is-upgraded .mdl-layout__tab.is-active{color:rgb(66,66,66)}.mdl-layout.is-upgraded .mdl-layout__tab.is-active::after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:rgb(68,138,255);-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-layout__tab .mdl-layout__tab-ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-layout__tab .mdl-layout__tab-ripple-container .mdl-ripple{background-color:rgb(66,66,66)}.mdl-layout__tab-panel{display:block}.mdl-layout.is-upgraded .mdl-layout__tab-panel{display:none}.mdl-layout.is-upgraded .mdl-layout__tab-panel.is-active{display:block}.mdl-radio{position:relative;font-size:16px;line-height:24px;display:inline-block;box-sizing:border-box;margin:0;padding-left:0}.mdl-radio.is-upgraded{padding-left:24px}.mdl-radio__button{line-height:24px}.mdl-radio.is-upgraded .mdl-radio__button{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-radio__outer-circle{position:absolute;top:4px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;border:2px solid rgba(0,0,0,.54);border-radius:50%;z-index:2}.mdl-radio.is-checked .mdl-radio__outer-circle{border:2px solid rgb(255,152,0)}.mdl-radio__outer-circle fieldset[disabled] .mdl-radio,.mdl-radio.is-disabled .mdl-radio__outer-circle{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-radio__inner-circle{position:absolute;z-index:1;margin:0;top:8px;left:4px;box-sizing:border-box;width:8px;height:8px;cursor:pointer;transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:transform;transition-property:transform,-webkit-transform;-webkit-transform:scale3d(0,0,0);transform:scale3d(0,0,0);border-radius:50%;background:rgb(255,152,0)}.mdl-radio.is-checked .mdl-radio__inner-circle{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}fieldset[disabled] .mdl-radio .mdl-radio__inner-circle,.mdl-radio.is-disabled .mdl-radio__inner-circle{background:rgba(0,0,0,.26);cursor:auto}.mdl-radio.is-focused .mdl-radio__inner-circle{box-shadow:0 0 0 10px rgba(0,0,0,.1)}.mdl-radio__label{cursor:pointer}fieldset[disabled] .mdl-radio .mdl-radio__label,.mdl-radio.is-disabled .mdl-radio__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-radio__ripple-container{position:absolute;z-index:2;top:-9px;left:-13px;box-sizing:border-box;width:42px;height:42px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-radio__ripple-container .mdl-ripple{background:rgb(255,152,0)}fieldset[disabled] .mdl-radio .mdl-radio__ripple-container,.mdl-radio.is-disabled .mdl-radio__ripple-container{cursor:auto}fieldset[disabled] .mdl-radio .mdl-radio__ripple-container .mdl-ripple,.mdl-radio.is-disabled .mdl-radio__ripple-container .mdl-ripple{background:0 0}_:-ms-input-placeholder,:root .mdl-slider.mdl-slider.is-upgraded{-ms-appearance:none;height:32px;margin:0}.mdl-slider{width:calc(100% - 40px);margin:0 20px}.mdl-slider.is-upgraded{-webkit-appearance:none;-moz-appearance:none;appearance:none;height:2px;background:0 0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;outline:0;padding:0;color:rgb(255,152,0);-webkit-align-self:center;-ms-flex-item-align:center;align-self:center;z-index:1;cursor:pointer}.mdl-slider.is-upgraded::-moz-focus-outer{border:0}.mdl-slider.is-upgraded::-ms-tooltip{display:none}.mdl-slider.is-upgraded::-webkit-slider-runnable-track{background:0 0}.mdl-slider.is-upgraded::-moz-range-track{background:0 0;border:none}.mdl-slider.is-upgraded::-ms-track{background:0 0;color:transparent;height:2px;width:100%;border:none}.mdl-slider.is-upgraded::-ms-fill-lower{padding:0;background:linear-gradient(to right,transparent,transparent 16px,rgb(255,152,0)16px,rgb(255,152,0)0)}.mdl-slider.is-upgraded::-ms-fill-upper{padding:0;background:linear-gradient(to left,transparent,transparent 16px,rgba(0,0,0,.26)16px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded::-webkit-slider-thumb{-webkit-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background:rgb(255,152,0);border:none;transition:transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1);transition:transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1),-webkit-transform .18s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded::-moz-range-thumb{-moz-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background-image:none;background:rgb(255,152,0);border:none}.mdl-slider.is-upgraded:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(255,152,0,.26)}.mdl-slider.is-upgraded:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(255,152,0,.26)}.mdl-slider.is-upgraded:active::-webkit-slider-thumb{background-image:none;background:rgb(255,152,0);-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded:active::-moz-range-thumb{background-image:none;background:rgb(255,152,0);transform:scale(1.5)}.mdl-slider.is-upgraded::-ms-thumb{width:32px;height:32px;border:none;border-radius:50%;background:rgb(255,152,0);transform:scale(.375);transition:transform .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1);transition:transform .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1),-webkit-transform .18s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,rgb(255,152,0)0%,rgb(255,152,0)37.5%,rgba(255,152,0,.26)37.5%,rgba(255,152,0,.26)100%);transform:scale(1)}.mdl-slider.is-upgraded:active::-ms-thumb{background:rgb(255,152,0);transform:scale(.5625)}.mdl-slider.is-upgraded.is-lowest-value::-webkit-slider-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-moz-range-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:active::-webkit-slider-thumb{border:1.6px solid rgba(0,0,0,.26);-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value:active+.mdl-slider__background-flex>.mdl-slider__background-upper{left:9px}.mdl-slider.is-upgraded.is-lowest-value:active::-moz-range-thumb{border:1.5px solid rgba(0,0,0,.26);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value::-ms-thumb{background:radial-gradient(circle closest-side,transparent 0%,transparent 66.67%,rgba(0,0,0,.26)66.67%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,rgba(0,0,0,.12)0%,rgba(0,0,0,.12)25%,rgba(0,0,0,.26)25%,rgba(0,0,0,.26)37.5%,rgba(0,0,0,.12)37.5%,rgba(0,0,0,.12)100%);transform:scale(1)}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-thumb{transform:scale(.5625);background:radial-gradient(circle closest-side,transparent 0%,transparent 77.78%,rgba(0,0,0,.26)77.78%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-lower{background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-fill-upper{margin-left:9px}.mdl-slider.is-upgraded:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled::-webkit-slider-thumb{-webkit-transform:scale(.667);transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded:disabled::-moz-range-thumb{transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled+.mdl-slider__background-flex>.mdl-slider__background-lower{background-color:rgba(0,0,0,.26);left:-6px}.mdl-slider.is-upgraded:disabled+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-webkit-slider-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;-webkit-transform:scale(.667);transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-moz-range-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:active+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded:disabled:active::-ms-thumb,.mdl-slider.is-upgraded:disabled::-ms-thumb{transform:scale(.25);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-ms-thumb{transform:scale(.25);background:radial-gradient(circle closest-side,transparent 0%,transparent 50%,rgba(0,0,0,.26)50%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded:disabled::-ms-fill-lower{margin-right:6px;background:linear-gradient(to right,transparent,transparent 25px,rgba(0,0,0,.26)25px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded:disabled::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-fill-upper{margin-left:6px}.mdl-slider__ie-container{height:18px;overflow:visible;border:none;margin:none;padding:none}.mdl-slider__container{height:18px;position:relative;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row}.mdl-slider__container,.mdl-slider__background-flex{background:0 0;display:-webkit-flex;display:-ms-flexbox;display:flex}.mdl-slider__background-flex{position:absolute;height:2px;width:calc(100% - 52px);top:50%;left:0;margin:0 26px;overflow:hidden;border:0;padding:0;-webkit-transform:translate(0,-1px);transform:translate(0,-1px)}.mdl-slider__background-lower{background:rgb(255,152,0)}.mdl-slider__background-lower,.mdl-slider__background-upper{-webkit-flex:0;-ms-flex:0;flex:0;position:relative;border:0;padding:0}.mdl-slider__background-upper{background:rgba(0,0,0,.26);transition:left .18s cubic-bezier(.4,0,.2,1)}.mdl-snackbar{position:fixed;bottom:0;left:50%;cursor:default;background-color:#323232;z-index:3;display:block;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;font-family:"Roboto","Helvetica","Arial",sans-serif;will-change:transform;-webkit-transform:translate(0,80px);transform:translate(0,80px);transition:transform .25s cubic-bezier(.4,0,1,1);transition:transform .25s cubic-bezier(.4,0,1,1),-webkit-transform .25s cubic-bezier(.4,0,1,1);pointer-events:none}@media (max-width:479px){.mdl-snackbar{width:100%;left:0;min-height:48px;max-height:80px}}@media (min-width:480px){.mdl-snackbar{min-width:288px;max-width:568px;border-radius:2px;-webkit-transform:translate(-50%,80px);transform:translate(-50%,80px)}}.mdl-snackbar--active{-webkit-transform:translate(0,0);transform:translate(0,0);pointer-events:auto;transition:transform .25s cubic-bezier(0,0,.2,1);transition:transform .25s cubic-bezier(0,0,.2,1),-webkit-transform .25s cubic-bezier(0,0,.2,1)}@media (min-width:480px){.mdl-snackbar--active{-webkit-transform:translate(-50%,0);transform:translate(-50%,0)}}.mdl-snackbar__text{padding:14px 12px 14px 24px;vertical-align:middle;color:#fff;float:left}.mdl-snackbar__action{background:0 0;border:none;color:rgb(68,138,255);float:right;padding:14px 24px 14px 12px;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;text-transform:uppercase;line-height:1;letter-spacing:0;overflow:hidden;outline:none;opacity:0;pointer-events:none;cursor:pointer;text-decoration:none;text-align:center;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.mdl-snackbar__action::-moz-focus-inner{border:0}.mdl-snackbar__action:not([aria-hidden]){opacity:1;pointer-events:auto}.mdl-spinner{display:inline-block;position:relative;width:28px;height:28px}.mdl-spinner:not(.is-upgraded).is-active:after{content:"Loading..."}.mdl-spinner.is-upgraded.is-active{-webkit-animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite;animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite}@-webkit-keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.mdl-spinner__layer{position:absolute;width:100%;height:100%;opacity:0}.mdl-spinner__layer-1{border-color:#42a5f5}.mdl-spinner--single-color .mdl-spinner__layer-1{border-color:rgb(255,152,0)}.mdl-spinner.is-active .mdl-spinner__layer-1{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-2{border-color:#f44336}.mdl-spinner--single-color .mdl-spinner__layer-2{border-color:rgb(255,152,0)}.mdl-spinner.is-active .mdl-spinner__layer-2{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-3{border-color:#fdd835}.mdl-spinner--single-color .mdl-spinner__layer-3{border-color:rgb(255,152,0)}.mdl-spinner.is-active .mdl-spinner__layer-3{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-4{border-color:#4caf50}.mdl-spinner--single-color .mdl-spinner__layer-4{border-color:rgb(255,152,0)}.mdl-spinner.is-active .mdl-spinner__layer-4{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@-webkit-keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@-webkit-keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}@keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}.mdl-spinner__gap-patch{position:absolute;box-sizing:border-box;top:0;left:45%;width:10%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__gap-patch .mdl-spinner__circle{width:1000%;left:-450%}.mdl-spinner__circle-clipper{display:inline-block;position:relative;width:50%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__circle-clipper .mdl-spinner__circle{width:200%}.mdl-spinner__circle{box-sizing:border-box;height:100%;border-width:3px;border-style:solid;border-color:inherit;border-bottom-color:transparent!important;border-radius:50%;-webkit-animation:none;animation:none;position:absolute;top:0;right:0;bottom:0;left:0}.mdl-spinner__left .mdl-spinner__circle{border-right-color:transparent!important;-webkit-transform:rotate(129deg);transform:rotate(129deg)}.mdl-spinner.is-active .mdl-spinner__left .mdl-spinner__circle{-webkit-animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__right .mdl-spinner__circle{left:-100%;border-left-color:transparent!important;-webkit-transform:rotate(-129deg);transform:rotate(-129deg)}.mdl-spinner.is-active .mdl-spinner__right .mdl-spinner__circle{-webkit-animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@-webkit-keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}@keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}.mdl-switch{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0;overflow:visible;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-switch.is-upgraded{padding-left:28px}.mdl-switch__input{line-height:24px}.mdl-switch.is-upgraded .mdl-switch__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-switch__track{background:rgba(0,0,0,.26);position:absolute;left:0;top:5px;height:14px;width:36px;border-radius:14px;cursor:pointer}.mdl-switch.is-checked .mdl-switch__track{background:rgba(255,152,0,.5)}.mdl-switch__track fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__track{background:rgba(0,0,0,.12);cursor:auto}.mdl-switch__thumb{background:#fafafa;position:absolute;left:0;top:2px;height:20px;width:20px;border-radius:50%;cursor:pointer;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:left}.mdl-switch.is-checked .mdl-switch__thumb{background:rgb(255,152,0);left:16px;box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-switch__thumb fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__thumb{background:#bdbdbd;cursor:auto}.mdl-switch__focus-helper{position:absolute;top:50%;left:50%;-webkit-transform:translate(-4px,-4px);transform:translate(-4px,-4px);display:inline-block;box-sizing:border-box;width:8px;height:8px;border-radius:50%;background-color:transparent}.mdl-switch.is-focused .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-switch.is-focused.is-checked .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(255,152,0,.26);background-color:rgba(255,152,0,.26)}.mdl-switch__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0;left:24px}.mdl-switch__label fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__label{color:#bdbdbd;cursor:auto}.mdl-switch__ripple-container{position:absolute;z-index:2;top:-12px;left:-14px;box-sizing:border-box;width:48px;height:48px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000);transition-duration:.4s;transition-timing-function:step-end;transition-property:left}.mdl-switch__ripple-container .mdl-ripple{background:rgb(255,152,0)}.mdl-switch__ripple-container fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__ripple-container{cursor:auto}fieldset[disabled] .mdl-switch .mdl-switch__ripple-container .mdl-ripple,.mdl-switch.is-disabled .mdl-switch__ripple-container .mdl-ripple{background:0 0}.mdl-switch.is-checked .mdl-switch__ripple-container{left:2px}.mdl-tabs{display:block;width:100%}.mdl-tabs__tab-bar{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:space-between;-ms-flex-line-pack:justify;align-content:space-between;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;height:48px;padding:0;margin:0;border-bottom:1px solid #e0e0e0}.mdl-tabs__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(0,0,0,.54);overflow:hidden}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active{color:rgba(0,0,0,.87)}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:rgb(255,152,0);-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-tabs__tab .mdl-tabs__ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-tabs__tab .mdl-tabs__ripple-container .mdl-ripple{background:rgb(255,152,0)}.mdl-tabs__panel{display:block}.mdl-tabs.is-upgraded .mdl-tabs__panel{display:none}.mdl-tabs.is-upgraded .mdl-tabs__panel.is-active{display:block}@-webkit-keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}@keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}.mdl-textfield{position:relative;font-size:16px;display:inline-block;box-sizing:border-box;width:300px;max-width:100%;margin:0;padding:20px 0}.mdl-textfield .mdl-button{position:absolute;bottom:20px}.mdl-textfield--align-right{text-align:right}.mdl-textfield--full-width{width:100%}.mdl-textfield--expandable{min-width:32px;width:auto;min-height:32px}.mdl-textfield__input{border:none;border-bottom:1px solid rgba(0,0,0,.12);display:block;font-size:16px;font-family:"Helvetica","Arial",sans-serif;margin:0;padding:4px 0;width:100%;background:0 0;text-align:left;color:inherit}.mdl-textfield__input[type="number"]{-moz-appearance:textfield}.mdl-textfield__input[type="number"]::-webkit-inner-spin-button,.mdl-textfield__input[type="number"]::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.mdl-textfield.is-focused .mdl-textfield__input{outline:none}.mdl-textfield.is-invalid .mdl-textfield__input{border-color:#d50000;box-shadow:none}fieldset[disabled] .mdl-textfield .mdl-textfield__input,.mdl-textfield.is-disabled .mdl-textfield__input{background-color:transparent;border-bottom:1px dotted rgba(0,0,0,.12);color:rgba(0,0,0,.26)}.mdl-textfield textarea.mdl-textfield__input{display:block}.mdl-textfield__label{bottom:0;color:rgba(0,0,0,.26);font-size:16px;left:0;right:0;pointer-events:none;position:absolute;display:block;top:24px;width:100%;overflow:hidden;white-space:nowrap;text-align:left}.mdl-textfield.is-dirty .mdl-textfield__label,.mdl-textfield.has-placeholder .mdl-textfield__label{visibility:hidden}.mdl-textfield--floating-label .mdl-textfield__label{transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-textfield--floating-label.has-placeholder .mdl-textfield__label{transition:none}fieldset[disabled] .mdl-textfield .mdl-textfield__label,.mdl-textfield.is-disabled.is-disabled .mdl-textfield__label{color:rgba(0,0,0,.26)}.mdl-textfield--floating-label.is-focused .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__label,.mdl-textfield--floating-label.has-placeholder .mdl-textfield__label{color:rgb(255,152,0);font-size:12px;top:4px;visibility:visible}.mdl-textfield--floating-label.is-focused .mdl-textfield__expandable-holder .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__expandable-holder .mdl-textfield__label,.mdl-textfield--floating-label.has-placeholder .mdl-textfield__expandable-holder .mdl-textfield__label{top:-16px}.mdl-textfield--floating-label.is-invalid .mdl-textfield__label{color:#d50000;font-size:12px}.mdl-textfield__label:after{background-color:rgb(255,152,0);bottom:20px;content:'';height:2px;left:45%;position:absolute;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);visibility:hidden;width:10px}.mdl-textfield.is-focused .mdl-textfield__label:after{left:0;visibility:visible;width:100%}.mdl-textfield.is-invalid .mdl-textfield__label:after{background-color:#d50000}.mdl-textfield__error{color:#d50000;position:absolute;font-size:12px;margin-top:3px;visibility:hidden;display:block}.mdl-textfield.is-invalid .mdl-textfield__error{visibility:visible}.mdl-textfield__expandable-holder{display:inline-block;position:relative;margin-left:32px;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);display:inline-block;max-width:.1px}.mdl-textfield.is-focused .mdl-textfield__expandable-holder,.mdl-textfield.is-dirty .mdl-textfield__expandable-holder{max-width:600px}.mdl-textfield__expandable-holder .mdl-textfield__label:after{bottom:0}.mdl-tooltip{-webkit-transform:scale(0);transform:scale(0);-webkit-transform-origin:top center;transform-origin:top center;will-change:transform;z-index:999;background:rgba(97,97,97,.9);border-radius:2px;color:#fff;display:inline-block;font-size:10px;font-weight:500;line-height:14px;max-width:170px;position:fixed;top:-500px;left:-500px;padding:8px;text-align:center}.mdl-tooltip.is-active{-webkit-animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards;animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards}.mdl-tooltip--large{line-height:14px;font-size:14px;padding:16px}@-webkit-keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}@keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}.mdl-shadow--2dp{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-shadow--3dp{box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-shadow--4dp{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2)}.mdl-shadow--6dp{box-shadow:0 6px 10px 0 rgba(0,0,0,.14),0 1px 18px 0 rgba(0,0,0,.12),0 3px 5px -1px rgba(0,0,0,.2)}.mdl-shadow--8dp{box-shadow:0 8px 10px 1px rgba(0,0,0,.14),0 3px 14px 2px rgba(0,0,0,.12),0 5px 5px -3px rgba(0,0,0,.2)}.mdl-shadow--16dp{box-shadow:0 16px 24px 2px rgba(0,0,0,.14),0 6px 30px 5px rgba(0,0,0,.12),0 8px 10px -5px rgba(0,0,0,.2)}.mdl-shadow--24dp{box-shadow:0 9px 46px 8px rgba(0,0,0,.14),0 11px 15px -7px rgba(0,0,0,.12),0 24px 38px 3px rgba(0,0,0,.2)}.mdl-grid{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;margin:0 auto;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch}.mdl-grid.mdl-grid--no-spacing{padding:0}.mdl-cell{box-sizing:border-box}.mdl-cell--top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.mdl-cell--middle{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.mdl-cell--bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}.mdl-cell--stretch{-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch}.mdl-grid.mdl-grid--no-spacing>.mdl-cell{margin:0}.mdl-cell--order-1{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12{-webkit-order:12;-ms-flex-order:12;order:12}@media (max-width:479px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:100%}.mdl-cell--hide-phone{display:none!important}.mdl-cell--order-1-phone.mdl-cell--order-1-phone{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2-phone.mdl-cell--order-2-phone{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3-phone.mdl-cell--order-3-phone{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4-phone.mdl-cell--order-4-phone{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5-phone.mdl-cell--order-5-phone{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6-phone.mdl-cell--order-6-phone{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7-phone.mdl-cell--order-7-phone{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8-phone.mdl-cell--order-8-phone{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9-phone.mdl-cell--order-9-phone{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10-phone.mdl-cell--order-10-phone{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11-phone.mdl-cell--order-11-phone{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12-phone.mdl-cell--order-12-phone{-webkit-order:12;-ms-flex-order:12;order:12}.mdl-cell--1-col,.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:25%}.mdl-cell--2-col,.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:50%}.mdl-cell--3-col,.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:75%}.mdl-cell--4-col,.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:100%}.mdl-cell--5-col,.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:100%}.mdl-cell--6-col,.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:100%}.mdl-cell--7-col,.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:100%}.mdl-cell--8-col,.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:100%}.mdl-cell--1-offset,.mdl-cell--1-offset-phone.mdl-cell--1-offset-phone{margin-left:calc(25% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset-phone.mdl-cell--1-offset-phone{margin-left:25%}.mdl-cell--2-offset,.mdl-cell--2-offset-phone.mdl-cell--2-offset-phone{margin-left:calc(50% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset-phone.mdl-cell--2-offset-phone{margin-left:50%}.mdl-cell--3-offset,.mdl-cell--3-offset-phone.mdl-cell--3-offset-phone{margin-left:calc(75% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset-phone.mdl-cell--3-offset-phone{margin-left:75%}}@media (min-width:480px) and (max-width:839px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:50%}.mdl-cell--hide-tablet{display:none!important}.mdl-cell--order-1-tablet.mdl-cell--order-1-tablet{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2-tablet.mdl-cell--order-2-tablet{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3-tablet.mdl-cell--order-3-tablet{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4-tablet.mdl-cell--order-4-tablet{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5-tablet.mdl-cell--order-5-tablet{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6-tablet.mdl-cell--order-6-tablet{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7-tablet.mdl-cell--order-7-tablet{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8-tablet.mdl-cell--order-8-tablet{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9-tablet.mdl-cell--order-9-tablet{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10-tablet.mdl-cell--order-10-tablet{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11-tablet.mdl-cell--order-11-tablet{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12-tablet.mdl-cell--order-12-tablet{-webkit-order:12;-ms-flex-order:12;order:12}.mdl-cell--1-col,.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:calc(12.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:12.5%}.mdl-cell--2-col,.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:25%}.mdl-cell--3-col,.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:calc(37.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:37.5%}.mdl-cell--4-col,.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:50%}.mdl-cell--5-col,.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:calc(62.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:62.5%}.mdl-cell--6-col,.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:75%}.mdl-cell--7-col,.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:calc(87.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:87.5%}.mdl-cell--8-col,.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:100%}.mdl-cell--1-offset,.mdl-cell--1-offset-tablet.mdl-cell--1-offset-tablet{margin-left:calc(12.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset-tablet.mdl-cell--1-offset-tablet{margin-left:12.5%}.mdl-cell--2-offset,.mdl-cell--2-offset-tablet.mdl-cell--2-offset-tablet{margin-left:calc(25% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset-tablet.mdl-cell--2-offset-tablet{margin-left:25%}.mdl-cell--3-offset,.mdl-cell--3-offset-tablet.mdl-cell--3-offset-tablet{margin-left:calc(37.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset-tablet.mdl-cell--3-offset-tablet{margin-left:37.5%}.mdl-cell--4-offset,.mdl-cell--4-offset-tablet.mdl-cell--4-offset-tablet{margin-left:calc(50% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset-tablet.mdl-cell--4-offset-tablet{margin-left:50%}.mdl-cell--5-offset,.mdl-cell--5-offset-tablet.mdl-cell--5-offset-tablet{margin-left:calc(62.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset-tablet.mdl-cell--5-offset-tablet{margin-left:62.5%}.mdl-cell--6-offset,.mdl-cell--6-offset-tablet.mdl-cell--6-offset-tablet{margin-left:calc(75% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset-tablet.mdl-cell--6-offset-tablet{margin-left:75%}.mdl-cell--7-offset,.mdl-cell--7-offset-tablet.mdl-cell--7-offset-tablet{margin-left:calc(87.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset-tablet.mdl-cell--7-offset-tablet{margin-left:87.5%}}@media (min-width:840px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:33.3333333333%}.mdl-cell--hide-desktop{display:none!important}.mdl-cell--order-1-desktop.mdl-cell--order-1-desktop{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2-desktop.mdl-cell--order-2-desktop{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3-desktop.mdl-cell--order-3-desktop{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4-desktop.mdl-cell--order-4-desktop{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5-desktop.mdl-cell--order-5-desktop{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6-desktop.mdl-cell--order-6-desktop{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7-desktop.mdl-cell--order-7-desktop{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8-desktop.mdl-cell--order-8-desktop{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9-desktop.mdl-cell--order-9-desktop{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10-desktop.mdl-cell--order-10-desktop{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11-desktop.mdl-cell--order-11-desktop{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12-desktop.mdl-cell--order-12-desktop{-webkit-order:12;-ms-flex-order:12;order:12}.mdl-cell--1-col,.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:calc(8.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:8.3333333333%}.mdl-cell--2-col,.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:calc(16.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:16.6666666667%}.mdl-cell--3-col,.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:25%}.mdl-cell--4-col,.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:33.3333333333%}.mdl-cell--5-col,.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:calc(41.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:41.6666666667%}.mdl-cell--6-col,.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:50%}.mdl-cell--7-col,.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:calc(58.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:58.3333333333%}.mdl-cell--8-col,.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:calc(66.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:66.6666666667%}.mdl-cell--9-col,.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:75%}.mdl-cell--10-col,.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:calc(83.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:83.3333333333%}.mdl-cell--11-col,.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:calc(91.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:91.6666666667%}.mdl-cell--12-col,.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:100%}.mdl-cell--1-offset,.mdl-cell--1-offset-desktop.mdl-cell--1-offset-desktop{margin-left:calc(8.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset-desktop.mdl-cell--1-offset-desktop{margin-left:8.3333333333%}.mdl-cell--2-offset,.mdl-cell--2-offset-desktop.mdl-cell--2-offset-desktop{margin-left:calc(16.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset-desktop.mdl-cell--2-offset-desktop{margin-left:16.6666666667%}.mdl-cell--3-offset,.mdl-cell--3-offset-desktop.mdl-cell--3-offset-desktop{margin-left:calc(25% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset-desktop.mdl-cell--3-offset-desktop{margin-left:25%}.mdl-cell--4-offset,.mdl-cell--4-offset-desktop.mdl-cell--4-offset-desktop{margin-left:calc(33.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset-desktop.mdl-cell--4-offset-desktop{margin-left:33.3333333333%}.mdl-cell--5-offset,.mdl-cell--5-offset-desktop.mdl-cell--5-offset-desktop{margin-left:calc(41.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset-desktop.mdl-cell--5-offset-desktop{margin-left:41.6666666667%}.mdl-cell--6-offset,.mdl-cell--6-offset-desktop.mdl-cell--6-offset-desktop{margin-left:calc(50% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset-desktop.mdl-cell--6-offset-desktop{margin-left:50%}.mdl-cell--7-offset,.mdl-cell--7-offset-desktop.mdl-cell--7-offset-desktop{margin-left:calc(58.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset-desktop.mdl-cell--7-offset-desktop{margin-left:58.3333333333%}.mdl-cell--8-offset,.mdl-cell--8-offset-desktop.mdl-cell--8-offset-desktop{margin-left:calc(66.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--8-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--8-offset-desktop.mdl-cell--8-offset-desktop{margin-left:66.6666666667%}.mdl-cell--9-offset,.mdl-cell--9-offset-desktop.mdl-cell--9-offset-desktop{margin-left:calc(75% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--9-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--9-offset-desktop.mdl-cell--9-offset-desktop{margin-left:75%}.mdl-cell--10-offset,.mdl-cell--10-offset-desktop.mdl-cell--10-offset-desktop{margin-left:calc(83.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--10-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--10-offset-desktop.mdl-cell--10-offset-desktop{margin-left:83.3333333333%}.mdl-cell--11-offset,.mdl-cell--11-offset-desktop.mdl-cell--11-offset-desktop{margin-left:calc(91.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--11-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--11-offset-desktop.mdl-cell--11-offset-desktop{margin-left:91.6666666667%}}body{margin:0}.styleguide-demo h1{margin:48px 24px 0}.styleguide-demo h1:after{content:'';display:block;width:100%;border-bottom:1px solid rgba(0,0,0,.5);margin-top:24px}.styleguide-demo{opacity:0;transition:opacity .6s ease}.styleguide-masthead{height:256px;background:#212121;padding:115px 16px 0}.styleguide-container{position:relative;max-width:960px;width:100%}.styleguide-title{color:#fff;bottom:auto;position:relative;font-size:56px;font-weight:300;line-height:1;letter-spacing:-.02em}.styleguide-title:after{border-bottom:0}.styleguide-title span{font-weight:300}.mdl-styleguide .mdl-layout__drawer .mdl-navigation__link{padding:10px 24px}.demosLoaded .styleguide-demo{opacity:1}iframe{display:block;width:100%;border:none}iframe.heightSet{overflow:hidden}.demo-wrapper{margin:24px}.demo-wrapper iframe{border:1px solid rgba(0,0,0,.5)} \ No newline at end of file +@charset "UTF-8";html{color:rgba(0,0,0,.87)}::-moz-selection{background:#b3d4fc;text-shadow:none}::selection{background:#b3d4fc;text-shadow:none}hr{display:block;height:1px;border:0;border-top:1px solid #ccc;margin:1em 0;padding:0}audio,canvas,iframe,img,svg,video{vertical-align:middle}fieldset{border:0;margin:0;padding:0}textarea{resize:vertical}.browserupgrade{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.hidden{display:none!important}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.clearfix:before,.clearfix:after{content:" ";display:table}.clearfix:after{clear:both}@media print{*,*:before,*:after,*:first-letter{background:transparent!important;color:#000!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href)")"}abbr[title]:after{content:" (" attr(title)")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}a,.mdl-accordion,.mdl-button,.mdl-card,.mdl-checkbox,.mdl-dropdown-menu,.mdl-icon-toggle,.mdl-item,.mdl-radio,.mdl-slider,.mdl-switch,.mdl-tabs__tab{-webkit-tap-highlight-color:transparent;-webkit-tap-highlight-color:rgba(255,255,255,0)}html{width:100%;height:100%;-ms-touch-action:manipulation;touch-action:manipulation}body{width:100%;min-height:100%}main{display:block}*[hidden]{display:none!important}html,body{font-family:"Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:20px}h1,h2,h3,h4,h5,h6,p{padding:0}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400;line-height:1.35;letter-spacing:-.02em;opacity:.54;font-size:.6em}h1{font-size:56px;line-height:1.35;letter-spacing:-.02em;margin:24px 0}h1,h2{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h2{font-size:45px;line-height:48px}h2,h3{margin:24px 0}h3{font-size:34px;line-height:40px}h3,h4{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h4{font-size:24px;line-height:32px;-moz-osx-font-smoothing:grayscale;margin:24px 0 16px}h5{font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}h5,h6{font-family:"Roboto","Helvetica","Arial",sans-serif;margin:24px 0 16px}h6{font-size:16px;letter-spacing:.04em}h6,p{font-weight:400;line-height:24px}p{font-size:14px;letter-spacing:0;margin:0 0 16px}a{color:rgb(68,138,255);font-weight:500}blockquote{font-family:"Roboto","Helvetica","Arial",sans-serif;position:relative;font-size:24px;font-weight:300;font-style:italic;line-height:1.35;letter-spacing:.08em}blockquote:before{position:absolute;left:-.5em;content:'“'}blockquote:after{content:'”';margin-left:-.05em}mark{background-color:#f4ff81}dt{font-weight:700}address{font-size:12px;line-height:1;font-style:normal}address,ul,ol{font-weight:400;letter-spacing:0}ul,ol{font-size:14px;line-height:24px}.mdl-typography--display-4,.mdl-typography--display-4-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:112px;font-weight:300;line-height:1;letter-spacing:-.04em}.mdl-typography--display-4-color-contrast{opacity:.54}.mdl-typography--display-3,.mdl-typography--display-3-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:56px;font-weight:400;line-height:1.35;letter-spacing:-.02em}.mdl-typography--display-3-color-contrast{opacity:.54}.mdl-typography--display-2,.mdl-typography--display-2-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:45px;font-weight:400;line-height:48px}.mdl-typography--display-2-color-contrast{opacity:.54}.mdl-typography--display-1,.mdl-typography--display-1-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:34px;font-weight:400;line-height:40px}.mdl-typography--display-1-color-contrast{opacity:.54}.mdl-typography--headline,.mdl-typography--headline-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:24px;font-weight:400;line-height:32px;-moz-osx-font-smoothing:grayscale}.mdl-typography--headline-color-contrast{opacity:.87}.mdl-typography--title,.mdl-typography--title-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}.mdl-typography--title-color-contrast{opacity:.87}.mdl-typography--subhead,.mdl-typography--subhead-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:16px;font-weight:400;line-height:24px;letter-spacing:.04em}.mdl-typography--subhead-color-contrast{opacity:.87}.mdl-typography--body-2,.mdl-typography--body-2-color-contrast{font-size:14px;font-weight:700;line-height:24px;letter-spacing:0}.mdl-typography--body-2-color-contrast{opacity:.87}.mdl-typography--body-1,.mdl-typography--body-1-color-contrast{font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-color-contrast{opacity:.87}.mdl-typography--body-2-force-preferred-font,.mdl-typography--body-2-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:24px;letter-spacing:0}.mdl-typography--body-2-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--body-1-force-preferred-font,.mdl-typography--body-1-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--caption,.mdl-typography--caption-force-preferred-font{font-size:12px;font-weight:400;line-height:1;letter-spacing:0}.mdl-typography--caption-force-preferred-font{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--caption-color-contrast,.mdl-typography--caption-force-preferred-font-color-contrast{font-size:12px;font-weight:400;line-height:1;letter-spacing:0;opacity:.54}.mdl-typography--caption-force-preferred-font-color-contrast,.mdl-typography--menu{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--menu{font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--menu-color-contrast{opacity:.87}.mdl-typography--menu-color-contrast,.mdl-typography--button,.mdl-typography--button-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--button,.mdl-typography--button-color-contrast{text-transform:uppercase}.mdl-typography--button-color-contrast{opacity:.87}.mdl-typography--text-left{text-align:left}.mdl-typography--text-right{text-align:right}.mdl-typography--text-center{text-align:center}.mdl-typography--text-justify{text-align:justify}.mdl-typography--text-nowrap{white-space:nowrap}.mdl-typography--text-lowercase{text-transform:lowercase}.mdl-typography--text-uppercase{text-transform:uppercase}.mdl-typography--text-capitalize{text-transform:capitalize}.mdl-typography--font-thin{font-weight:200!important}.mdl-typography--font-light{font-weight:300!important}.mdl-typography--font-regular{font-weight:400!important}.mdl-typography--font-medium{font-weight:500!important}.mdl-typography--font-bold{font-weight:700!important}.mdl-typography--font-black{font-weight:900!important}.material-icons{font-family:'Material Icons';font-weight:400;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;word-wrap:normal;-moz-font-feature-settings:'liga';font-feature-settings:'liga';-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased}.mdl-color-text--red{color:#f44336 !important}.mdl-color--red{background-color:#f44336 !important}.mdl-color-text--red-50{color:#ffebee !important}.mdl-color--red-50{background-color:#ffebee !important}.mdl-color-text--red-100{color:#ffcdd2 !important}.mdl-color--red-100{background-color:#ffcdd2 !important}.mdl-color-text--red-200{color:#ef9a9a !important}.mdl-color--red-200{background-color:#ef9a9a !important}.mdl-color-text--red-300{color:#e57373 !important}.mdl-color--red-300{background-color:#e57373 !important}.mdl-color-text--red-400{color:#ef5350 !important}.mdl-color--red-400{background-color:#ef5350 !important}.mdl-color-text--red-500{color:#f44336 !important}.mdl-color--red-500{background-color:#f44336 !important}.mdl-color-text--red-600{color:#e53935 !important}.mdl-color--red-600{background-color:#e53935 !important}.mdl-color-text--red-700{color:#d32f2f !important}.mdl-color--red-700{background-color:#d32f2f !important}.mdl-color-text--red-800{color:#c62828 !important}.mdl-color--red-800{background-color:#c62828 !important}.mdl-color-text--red-900{color:#b71c1c !important}.mdl-color--red-900{background-color:#b71c1c !important}.mdl-color-text--red-A100{color:#ff8a80 !important}.mdl-color--red-A100{background-color:#ff8a80 !important}.mdl-color-text--red-A200{color:#ff5252 !important}.mdl-color--red-A200{background-color:#ff5252 !important}.mdl-color-text--red-A400{color:#ff1744 !important}.mdl-color--red-A400{background-color:#ff1744 !important}.mdl-color-text--red-A700{color:#d50000 !important}.mdl-color--red-A700{background-color:#d50000 !important}.mdl-color-text--pink{color:#e91e63 !important}.mdl-color--pink{background-color:#e91e63 !important}.mdl-color-text--pink-50{color:#fce4ec !important}.mdl-color--pink-50{background-color:#fce4ec !important}.mdl-color-text--pink-100{color:#f8bbd0 !important}.mdl-color--pink-100{background-color:#f8bbd0 !important}.mdl-color-text--pink-200{color:#f48fb1 !important}.mdl-color--pink-200{background-color:#f48fb1 !important}.mdl-color-text--pink-300{color:#f06292 !important}.mdl-color--pink-300{background-color:#f06292 !important}.mdl-color-text--pink-400{color:#ec407a !important}.mdl-color--pink-400{background-color:#ec407a !important}.mdl-color-text--pink-500{color:#e91e63 !important}.mdl-color--pink-500{background-color:#e91e63 !important}.mdl-color-text--pink-600{color:#d81b60 !important}.mdl-color--pink-600{background-color:#d81b60 !important}.mdl-color-text--pink-700{color:#c2185b !important}.mdl-color--pink-700{background-color:#c2185b !important}.mdl-color-text--pink-800{color:#ad1457 !important}.mdl-color--pink-800{background-color:#ad1457 !important}.mdl-color-text--pink-900{color:#880e4f !important}.mdl-color--pink-900{background-color:#880e4f !important}.mdl-color-text--pink-A100{color:#ff80ab !important}.mdl-color--pink-A100{background-color:#ff80ab !important}.mdl-color-text--pink-A200{color:#ff4081 !important}.mdl-color--pink-A200{background-color:#ff4081 !important}.mdl-color-text--pink-A400{color:#f50057 !important}.mdl-color--pink-A400{background-color:#f50057 !important}.mdl-color-text--pink-A700{color:#c51162 !important}.mdl-color--pink-A700{background-color:#c51162 !important}.mdl-color-text--purple{color:#9c27b0 !important}.mdl-color--purple{background-color:#9c27b0 !important}.mdl-color-text--purple-50{color:#f3e5f5 !important}.mdl-color--purple-50{background-color:#f3e5f5 !important}.mdl-color-text--purple-100{color:#e1bee7 !important}.mdl-color--purple-100{background-color:#e1bee7 !important}.mdl-color-text--purple-200{color:#ce93d8 !important}.mdl-color--purple-200{background-color:#ce93d8 !important}.mdl-color-text--purple-300{color:#ba68c8 !important}.mdl-color--purple-300{background-color:#ba68c8 !important}.mdl-color-text--purple-400{color:#ab47bc !important}.mdl-color--purple-400{background-color:#ab47bc !important}.mdl-color-text--purple-500{color:#9c27b0 !important}.mdl-color--purple-500{background-color:#9c27b0 !important}.mdl-color-text--purple-600{color:#8e24aa !important}.mdl-color--purple-600{background-color:#8e24aa !important}.mdl-color-text--purple-700{color:#7b1fa2 !important}.mdl-color--purple-700{background-color:#7b1fa2 !important}.mdl-color-text--purple-800{color:#6a1b9a !important}.mdl-color--purple-800{background-color:#6a1b9a !important}.mdl-color-text--purple-900{color:#4a148c !important}.mdl-color--purple-900{background-color:#4a148c !important}.mdl-color-text--purple-A100{color:#ea80fc !important}.mdl-color--purple-A100{background-color:#ea80fc !important}.mdl-color-text--purple-A200{color:#e040fb !important}.mdl-color--purple-A200{background-color:#e040fb !important}.mdl-color-text--purple-A400{color:#d500f9 !important}.mdl-color--purple-A400{background-color:#d500f9 !important}.mdl-color-text--purple-A700{color:#a0f !important}.mdl-color--purple-A700{background-color:#a0f !important}.mdl-color-text--deep-purple{color:#673ab7 !important}.mdl-color--deep-purple{background-color:#673ab7 !important}.mdl-color-text--deep-purple-50{color:#ede7f6 !important}.mdl-color--deep-purple-50{background-color:#ede7f6 !important}.mdl-color-text--deep-purple-100{color:#d1c4e9 !important}.mdl-color--deep-purple-100{background-color:#d1c4e9 !important}.mdl-color-text--deep-purple-200{color:#b39ddb !important}.mdl-color--deep-purple-200{background-color:#b39ddb !important}.mdl-color-text--deep-purple-300{color:#9575cd !important}.mdl-color--deep-purple-300{background-color:#9575cd !important}.mdl-color-text--deep-purple-400{color:#7e57c2 !important}.mdl-color--deep-purple-400{background-color:#7e57c2 !important}.mdl-color-text--deep-purple-500{color:#673ab7 !important}.mdl-color--deep-purple-500{background-color:#673ab7 !important}.mdl-color-text--deep-purple-600{color:#5e35b1 !important}.mdl-color--deep-purple-600{background-color:#5e35b1 !important}.mdl-color-text--deep-purple-700{color:#512da8 !important}.mdl-color--deep-purple-700{background-color:#512da8 !important}.mdl-color-text--deep-purple-800{color:#4527a0 !important}.mdl-color--deep-purple-800{background-color:#4527a0 !important}.mdl-color-text--deep-purple-900{color:#311b92 !important}.mdl-color--deep-purple-900{background-color:#311b92 !important}.mdl-color-text--deep-purple-A100{color:#b388ff !important}.mdl-color--deep-purple-A100{background-color:#b388ff !important}.mdl-color-text--deep-purple-A200{color:#7c4dff !important}.mdl-color--deep-purple-A200{background-color:#7c4dff !important}.mdl-color-text--deep-purple-A400{color:#651fff !important}.mdl-color--deep-purple-A400{background-color:#651fff !important}.mdl-color-text--deep-purple-A700{color:#6200ea !important}.mdl-color--deep-purple-A700{background-color:#6200ea !important}.mdl-color-text--indigo{color:#3f51b5 !important}.mdl-color--indigo{background-color:#3f51b5 !important}.mdl-color-text--indigo-50{color:#e8eaf6 !important}.mdl-color--indigo-50{background-color:#e8eaf6 !important}.mdl-color-text--indigo-100{color:#c5cae9 !important}.mdl-color--indigo-100{background-color:#c5cae9 !important}.mdl-color-text--indigo-200{color:#9fa8da !important}.mdl-color--indigo-200{background-color:#9fa8da !important}.mdl-color-text--indigo-300{color:#7986cb !important}.mdl-color--indigo-300{background-color:#7986cb !important}.mdl-color-text--indigo-400{color:#5c6bc0 !important}.mdl-color--indigo-400{background-color:#5c6bc0 !important}.mdl-color-text--indigo-500{color:#3f51b5 !important}.mdl-color--indigo-500{background-color:#3f51b5 !important}.mdl-color-text--indigo-600{color:#3949ab !important}.mdl-color--indigo-600{background-color:#3949ab !important}.mdl-color-text--indigo-700{color:#303f9f !important}.mdl-color--indigo-700{background-color:#303f9f !important}.mdl-color-text--indigo-800{color:#283593 !important}.mdl-color--indigo-800{background-color:#283593 !important}.mdl-color-text--indigo-900{color:#1a237e !important}.mdl-color--indigo-900{background-color:#1a237e !important}.mdl-color-text--indigo-A100{color:#8c9eff !important}.mdl-color--indigo-A100{background-color:#8c9eff !important}.mdl-color-text--indigo-A200{color:#536dfe !important}.mdl-color--indigo-A200{background-color:#536dfe !important}.mdl-color-text--indigo-A400{color:#3d5afe !important}.mdl-color--indigo-A400{background-color:#3d5afe !important}.mdl-color-text--indigo-A700{color:#304ffe !important}.mdl-color--indigo-A700{background-color:#304ffe !important}.mdl-color-text--blue{color:#2196f3 !important}.mdl-color--blue{background-color:#2196f3 !important}.mdl-color-text--blue-50{color:#e3f2fd !important}.mdl-color--blue-50{background-color:#e3f2fd !important}.mdl-color-text--blue-100{color:#bbdefb !important}.mdl-color--blue-100{background-color:#bbdefb !important}.mdl-color-text--blue-200{color:#90caf9 !important}.mdl-color--blue-200{background-color:#90caf9 !important}.mdl-color-text--blue-300{color:#64b5f6 !important}.mdl-color--blue-300{background-color:#64b5f6 !important}.mdl-color-text--blue-400{color:#42a5f5 !important}.mdl-color--blue-400{background-color:#42a5f5 !important}.mdl-color-text--blue-500{color:#2196f3 !important}.mdl-color--blue-500{background-color:#2196f3 !important}.mdl-color-text--blue-600{color:#1e88e5 !important}.mdl-color--blue-600{background-color:#1e88e5 !important}.mdl-color-text--blue-700{color:#1976d2 !important}.mdl-color--blue-700{background-color:#1976d2 !important}.mdl-color-text--blue-800{color:#1565c0 !important}.mdl-color--blue-800{background-color:#1565c0 !important}.mdl-color-text--blue-900{color:#0d47a1 !important}.mdl-color--blue-900{background-color:#0d47a1 !important}.mdl-color-text--blue-A100{color:#82b1ff !important}.mdl-color--blue-A100{background-color:#82b1ff !important}.mdl-color-text--blue-A200{color:#448aff !important}.mdl-color--blue-A200{background-color:#448aff !important}.mdl-color-text--blue-A400{color:#2979ff !important}.mdl-color--blue-A400{background-color:#2979ff !important}.mdl-color-text--blue-A700{color:#2962ff !important}.mdl-color--blue-A700{background-color:#2962ff !important}.mdl-color-text--light-blue{color:#03a9f4 !important}.mdl-color--light-blue{background-color:#03a9f4 !important}.mdl-color-text--light-blue-50{color:#e1f5fe !important}.mdl-color--light-blue-50{background-color:#e1f5fe !important}.mdl-color-text--light-blue-100{color:#b3e5fc !important}.mdl-color--light-blue-100{background-color:#b3e5fc !important}.mdl-color-text--light-blue-200{color:#81d4fa !important}.mdl-color--light-blue-200{background-color:#81d4fa !important}.mdl-color-text--light-blue-300{color:#4fc3f7 !important}.mdl-color--light-blue-300{background-color:#4fc3f7 !important}.mdl-color-text--light-blue-400{color:#29b6f6 !important}.mdl-color--light-blue-400{background-color:#29b6f6 !important}.mdl-color-text--light-blue-500{color:#03a9f4 !important}.mdl-color--light-blue-500{background-color:#03a9f4 !important}.mdl-color-text--light-blue-600{color:#039be5 !important}.mdl-color--light-blue-600{background-color:#039be5 !important}.mdl-color-text--light-blue-700{color:#0288d1 !important}.mdl-color--light-blue-700{background-color:#0288d1 !important}.mdl-color-text--light-blue-800{color:#0277bd !important}.mdl-color--light-blue-800{background-color:#0277bd !important}.mdl-color-text--light-blue-900{color:#01579b !important}.mdl-color--light-blue-900{background-color:#01579b !important}.mdl-color-text--light-blue-A100{color:#80d8ff !important}.mdl-color--light-blue-A100{background-color:#80d8ff !important}.mdl-color-text--light-blue-A200{color:#40c4ff !important}.mdl-color--light-blue-A200{background-color:#40c4ff !important}.mdl-color-text--light-blue-A400{color:#00b0ff !important}.mdl-color--light-blue-A400{background-color:#00b0ff !important}.mdl-color-text--light-blue-A700{color:#0091ea !important}.mdl-color--light-blue-A700{background-color:#0091ea !important}.mdl-color-text--cyan{color:#00bcd4 !important}.mdl-color--cyan{background-color:#00bcd4 !important}.mdl-color-text--cyan-50{color:#e0f7fa !important}.mdl-color--cyan-50{background-color:#e0f7fa !important}.mdl-color-text--cyan-100{color:#b2ebf2 !important}.mdl-color--cyan-100{background-color:#b2ebf2 !important}.mdl-color-text--cyan-200{color:#80deea !important}.mdl-color--cyan-200{background-color:#80deea !important}.mdl-color-text--cyan-300{color:#4dd0e1 !important}.mdl-color--cyan-300{background-color:#4dd0e1 !important}.mdl-color-text--cyan-400{color:#26c6da !important}.mdl-color--cyan-400{background-color:#26c6da !important}.mdl-color-text--cyan-500{color:#00bcd4 !important}.mdl-color--cyan-500{background-color:#00bcd4 !important}.mdl-color-text--cyan-600{color:#00acc1 !important}.mdl-color--cyan-600{background-color:#00acc1 !important}.mdl-color-text--cyan-700{color:#0097a7 !important}.mdl-color--cyan-700{background-color:#0097a7 !important}.mdl-color-text--cyan-800{color:#00838f !important}.mdl-color--cyan-800{background-color:#00838f !important}.mdl-color-text--cyan-900{color:#006064 !important}.mdl-color--cyan-900{background-color:#006064 !important}.mdl-color-text--cyan-A100{color:#84ffff !important}.mdl-color--cyan-A100{background-color:#84ffff !important}.mdl-color-text--cyan-A200{color:#18ffff !important}.mdl-color--cyan-A200{background-color:#18ffff !important}.mdl-color-text--cyan-A400{color:#00e5ff !important}.mdl-color--cyan-A400{background-color:#00e5ff !important}.mdl-color-text--cyan-A700{color:#00b8d4 !important}.mdl-color--cyan-A700{background-color:#00b8d4 !important}.mdl-color-text--teal{color:#009688 !important}.mdl-color--teal{background-color:#009688 !important}.mdl-color-text--teal-50{color:#e0f2f1 !important}.mdl-color--teal-50{background-color:#e0f2f1 !important}.mdl-color-text--teal-100{color:#b2dfdb !important}.mdl-color--teal-100{background-color:#b2dfdb !important}.mdl-color-text--teal-200{color:#80cbc4 !important}.mdl-color--teal-200{background-color:#80cbc4 !important}.mdl-color-text--teal-300{color:#4db6ac !important}.mdl-color--teal-300{background-color:#4db6ac !important}.mdl-color-text--teal-400{color:#26a69a !important}.mdl-color--teal-400{background-color:#26a69a !important}.mdl-color-text--teal-500{color:#009688 !important}.mdl-color--teal-500{background-color:#009688 !important}.mdl-color-text--teal-600{color:#00897b !important}.mdl-color--teal-600{background-color:#00897b !important}.mdl-color-text--teal-700{color:#00796b !important}.mdl-color--teal-700{background-color:#00796b !important}.mdl-color-text--teal-800{color:#00695c !important}.mdl-color--teal-800{background-color:#00695c !important}.mdl-color-text--teal-900{color:#004d40 !important}.mdl-color--teal-900{background-color:#004d40 !important}.mdl-color-text--teal-A100{color:#a7ffeb !important}.mdl-color--teal-A100{background-color:#a7ffeb !important}.mdl-color-text--teal-A200{color:#64ffda !important}.mdl-color--teal-A200{background-color:#64ffda !important}.mdl-color-text--teal-A400{color:#1de9b6 !important}.mdl-color--teal-A400{background-color:#1de9b6 !important}.mdl-color-text--teal-A700{color:#00bfa5 !important}.mdl-color--teal-A700{background-color:#00bfa5 !important}.mdl-color-text--green{color:#4caf50 !important}.mdl-color--green{background-color:#4caf50 !important}.mdl-color-text--green-50{color:#e8f5e9 !important}.mdl-color--green-50{background-color:#e8f5e9 !important}.mdl-color-text--green-100{color:#c8e6c9 !important}.mdl-color--green-100{background-color:#c8e6c9 !important}.mdl-color-text--green-200{color:#a5d6a7 !important}.mdl-color--green-200{background-color:#a5d6a7 !important}.mdl-color-text--green-300{color:#81c784 !important}.mdl-color--green-300{background-color:#81c784 !important}.mdl-color-text--green-400{color:#66bb6a !important}.mdl-color--green-400{background-color:#66bb6a !important}.mdl-color-text--green-500{color:#4caf50 !important}.mdl-color--green-500{background-color:#4caf50 !important}.mdl-color-text--green-600{color:#43a047 !important}.mdl-color--green-600{background-color:#43a047 !important}.mdl-color-text--green-700{color:#388e3c !important}.mdl-color--green-700{background-color:#388e3c !important}.mdl-color-text--green-800{color:#2e7d32 !important}.mdl-color--green-800{background-color:#2e7d32 !important}.mdl-color-text--green-900{color:#1b5e20 !important}.mdl-color--green-900{background-color:#1b5e20 !important}.mdl-color-text--green-A100{color:#b9f6ca !important}.mdl-color--green-A100{background-color:#b9f6ca !important}.mdl-color-text--green-A200{color:#69f0ae !important}.mdl-color--green-A200{background-color:#69f0ae !important}.mdl-color-text--green-A400{color:#00e676 !important}.mdl-color--green-A400{background-color:#00e676 !important}.mdl-color-text--green-A700{color:#00c853 !important}.mdl-color--green-A700{background-color:#00c853 !important}.mdl-color-text--light-green{color:#8bc34a !important}.mdl-color--light-green{background-color:#8bc34a !important}.mdl-color-text--light-green-50{color:#f1f8e9 !important}.mdl-color--light-green-50{background-color:#f1f8e9 !important}.mdl-color-text--light-green-100{color:#dcedc8 !important}.mdl-color--light-green-100{background-color:#dcedc8 !important}.mdl-color-text--light-green-200{color:#c5e1a5 !important}.mdl-color--light-green-200{background-color:#c5e1a5 !important}.mdl-color-text--light-green-300{color:#aed581 !important}.mdl-color--light-green-300{background-color:#aed581 !important}.mdl-color-text--light-green-400{color:#9ccc65 !important}.mdl-color--light-green-400{background-color:#9ccc65 !important}.mdl-color-text--light-green-500{color:#8bc34a !important}.mdl-color--light-green-500{background-color:#8bc34a !important}.mdl-color-text--light-green-600{color:#7cb342 !important}.mdl-color--light-green-600{background-color:#7cb342 !important}.mdl-color-text--light-green-700{color:#689f38 !important}.mdl-color--light-green-700{background-color:#689f38 !important}.mdl-color-text--light-green-800{color:#558b2f !important}.mdl-color--light-green-800{background-color:#558b2f !important}.mdl-color-text--light-green-900{color:#33691e !important}.mdl-color--light-green-900{background-color:#33691e !important}.mdl-color-text--light-green-A100{color:#ccff90 !important}.mdl-color--light-green-A100{background-color:#ccff90 !important}.mdl-color-text--light-green-A200{color:#b2ff59 !important}.mdl-color--light-green-A200{background-color:#b2ff59 !important}.mdl-color-text--light-green-A400{color:#76ff03 !important}.mdl-color--light-green-A400{background-color:#76ff03 !important}.mdl-color-text--light-green-A700{color:#64dd17 !important}.mdl-color--light-green-A700{background-color:#64dd17 !important}.mdl-color-text--lime{color:#cddc39 !important}.mdl-color--lime{background-color:#cddc39 !important}.mdl-color-text--lime-50{color:#f9fbe7 !important}.mdl-color--lime-50{background-color:#f9fbe7 !important}.mdl-color-text--lime-100{color:#f0f4c3 !important}.mdl-color--lime-100{background-color:#f0f4c3 !important}.mdl-color-text--lime-200{color:#e6ee9c !important}.mdl-color--lime-200{background-color:#e6ee9c !important}.mdl-color-text--lime-300{color:#dce775 !important}.mdl-color--lime-300{background-color:#dce775 !important}.mdl-color-text--lime-400{color:#d4e157 !important}.mdl-color--lime-400{background-color:#d4e157 !important}.mdl-color-text--lime-500{color:#cddc39 !important}.mdl-color--lime-500{background-color:#cddc39 !important}.mdl-color-text--lime-600{color:#c0ca33 !important}.mdl-color--lime-600{background-color:#c0ca33 !important}.mdl-color-text--lime-700{color:#afb42b !important}.mdl-color--lime-700{background-color:#afb42b !important}.mdl-color-text--lime-800{color:#9e9d24 !important}.mdl-color--lime-800{background-color:#9e9d24 !important}.mdl-color-text--lime-900{color:#827717 !important}.mdl-color--lime-900{background-color:#827717 !important}.mdl-color-text--lime-A100{color:#f4ff81 !important}.mdl-color--lime-A100{background-color:#f4ff81 !important}.mdl-color-text--lime-A200{color:#eeff41 !important}.mdl-color--lime-A200{background-color:#eeff41 !important}.mdl-color-text--lime-A400{color:#c6ff00 !important}.mdl-color--lime-A400{background-color:#c6ff00 !important}.mdl-color-text--lime-A700{color:#aeea00 !important}.mdl-color--lime-A700{background-color:#aeea00 !important}.mdl-color-text--yellow{color:#ffeb3b !important}.mdl-color--yellow{background-color:#ffeb3b !important}.mdl-color-text--yellow-50{color:#fffde7 !important}.mdl-color--yellow-50{background-color:#fffde7 !important}.mdl-color-text--yellow-100{color:#fff9c4 !important}.mdl-color--yellow-100{background-color:#fff9c4 !important}.mdl-color-text--yellow-200{color:#fff59d !important}.mdl-color--yellow-200{background-color:#fff59d !important}.mdl-color-text--yellow-300{color:#fff176 !important}.mdl-color--yellow-300{background-color:#fff176 !important}.mdl-color-text--yellow-400{color:#ffee58 !important}.mdl-color--yellow-400{background-color:#ffee58 !important}.mdl-color-text--yellow-500{color:#ffeb3b !important}.mdl-color--yellow-500{background-color:#ffeb3b !important}.mdl-color-text--yellow-600{color:#fdd835 !important}.mdl-color--yellow-600{background-color:#fdd835 !important}.mdl-color-text--yellow-700{color:#fbc02d !important}.mdl-color--yellow-700{background-color:#fbc02d !important}.mdl-color-text--yellow-800{color:#f9a825 !important}.mdl-color--yellow-800{background-color:#f9a825 !important}.mdl-color-text--yellow-900{color:#f57f17 !important}.mdl-color--yellow-900{background-color:#f57f17 !important}.mdl-color-text--yellow-A100{color:#ffff8d !important}.mdl-color--yellow-A100{background-color:#ffff8d !important}.mdl-color-text--yellow-A200{color:#ff0 !important}.mdl-color--yellow-A200{background-color:#ff0 !important}.mdl-color-text--yellow-A400{color:#ffea00 !important}.mdl-color--yellow-A400{background-color:#ffea00 !important}.mdl-color-text--yellow-A700{color:#ffd600 !important}.mdl-color--yellow-A700{background-color:#ffd600 !important}.mdl-color-text--amber{color:#ffc107 !important}.mdl-color--amber{background-color:#ffc107 !important}.mdl-color-text--amber-50{color:#fff8e1 !important}.mdl-color--amber-50{background-color:#fff8e1 !important}.mdl-color-text--amber-100{color:#ffecb3 !important}.mdl-color--amber-100{background-color:#ffecb3 !important}.mdl-color-text--amber-200{color:#ffe082 !important}.mdl-color--amber-200{background-color:#ffe082 !important}.mdl-color-text--amber-300{color:#ffd54f !important}.mdl-color--amber-300{background-color:#ffd54f !important}.mdl-color-text--amber-400{color:#ffca28 !important}.mdl-color--amber-400{background-color:#ffca28 !important}.mdl-color-text--amber-500{color:#ffc107 !important}.mdl-color--amber-500{background-color:#ffc107 !important}.mdl-color-text--amber-600{color:#ffb300 !important}.mdl-color--amber-600{background-color:#ffb300 !important}.mdl-color-text--amber-700{color:#ffa000 !important}.mdl-color--amber-700{background-color:#ffa000 !important}.mdl-color-text--amber-800{color:#ff8f00 !important}.mdl-color--amber-800{background-color:#ff8f00 !important}.mdl-color-text--amber-900{color:#ff6f00 !important}.mdl-color--amber-900{background-color:#ff6f00 !important}.mdl-color-text--amber-A100{color:#ffe57f !important}.mdl-color--amber-A100{background-color:#ffe57f !important}.mdl-color-text--amber-A200{color:#ffd740 !important}.mdl-color--amber-A200{background-color:#ffd740 !important}.mdl-color-text--amber-A400{color:#ffc400 !important}.mdl-color--amber-A400{background-color:#ffc400 !important}.mdl-color-text--amber-A700{color:#ffab00 !important}.mdl-color--amber-A700{background-color:#ffab00 !important}.mdl-color-text--orange{color:#ff9800 !important}.mdl-color--orange{background-color:#ff9800 !important}.mdl-color-text--orange-50{color:#fff3e0 !important}.mdl-color--orange-50{background-color:#fff3e0 !important}.mdl-color-text--orange-100{color:#ffe0b2 !important}.mdl-color--orange-100{background-color:#ffe0b2 !important}.mdl-color-text--orange-200{color:#ffcc80 !important}.mdl-color--orange-200{background-color:#ffcc80 !important}.mdl-color-text--orange-300{color:#ffb74d !important}.mdl-color--orange-300{background-color:#ffb74d !important}.mdl-color-text--orange-400{color:#ffa726 !important}.mdl-color--orange-400{background-color:#ffa726 !important}.mdl-color-text--orange-500{color:#ff9800 !important}.mdl-color--orange-500{background-color:#ff9800 !important}.mdl-color-text--orange-600{color:#fb8c00 !important}.mdl-color--orange-600{background-color:#fb8c00 !important}.mdl-color-text--orange-700{color:#f57c00 !important}.mdl-color--orange-700{background-color:#f57c00 !important}.mdl-color-text--orange-800{color:#ef6c00 !important}.mdl-color--orange-800{background-color:#ef6c00 !important}.mdl-color-text--orange-900{color:#e65100 !important}.mdl-color--orange-900{background-color:#e65100 !important}.mdl-color-text--orange-A100{color:#ffd180 !important}.mdl-color--orange-A100{background-color:#ffd180 !important}.mdl-color-text--orange-A200{color:#ffab40 !important}.mdl-color--orange-A200{background-color:#ffab40 !important}.mdl-color-text--orange-A400{color:#ff9100 !important}.mdl-color--orange-A400{background-color:#ff9100 !important}.mdl-color-text--orange-A700{color:#ff6d00 !important}.mdl-color--orange-A700{background-color:#ff6d00 !important}.mdl-color-text--deep-orange{color:#ff5722 !important}.mdl-color--deep-orange{background-color:#ff5722 !important}.mdl-color-text--deep-orange-50{color:#fbe9e7 !important}.mdl-color--deep-orange-50{background-color:#fbe9e7 !important}.mdl-color-text--deep-orange-100{color:#ffccbc !important}.mdl-color--deep-orange-100{background-color:#ffccbc !important}.mdl-color-text--deep-orange-200{color:#ffab91 !important}.mdl-color--deep-orange-200{background-color:#ffab91 !important}.mdl-color-text--deep-orange-300{color:#ff8a65 !important}.mdl-color--deep-orange-300{background-color:#ff8a65 !important}.mdl-color-text--deep-orange-400{color:#ff7043 !important}.mdl-color--deep-orange-400{background-color:#ff7043 !important}.mdl-color-text--deep-orange-500{color:#ff5722 !important}.mdl-color--deep-orange-500{background-color:#ff5722 !important}.mdl-color-text--deep-orange-600{color:#f4511e !important}.mdl-color--deep-orange-600{background-color:#f4511e !important}.mdl-color-text--deep-orange-700{color:#e64a19 !important}.mdl-color--deep-orange-700{background-color:#e64a19 !important}.mdl-color-text--deep-orange-800{color:#d84315 !important}.mdl-color--deep-orange-800{background-color:#d84315 !important}.mdl-color-text--deep-orange-900{color:#bf360c !important}.mdl-color--deep-orange-900{background-color:#bf360c !important}.mdl-color-text--deep-orange-A100{color:#ff9e80 !important}.mdl-color--deep-orange-A100{background-color:#ff9e80 !important}.mdl-color-text--deep-orange-A200{color:#ff6e40 !important}.mdl-color--deep-orange-A200{background-color:#ff6e40 !important}.mdl-color-text--deep-orange-A400{color:#ff3d00 !important}.mdl-color--deep-orange-A400{background-color:#ff3d00 !important}.mdl-color-text--deep-orange-A700{color:#dd2c00 !important}.mdl-color--deep-orange-A700{background-color:#dd2c00 !important}.mdl-color-text--brown{color:#795548 !important}.mdl-color--brown{background-color:#795548 !important}.mdl-color-text--brown-50{color:#efebe9 !important}.mdl-color--brown-50{background-color:#efebe9 !important}.mdl-color-text--brown-100{color:#d7ccc8 !important}.mdl-color--brown-100{background-color:#d7ccc8 !important}.mdl-color-text--brown-200{color:#bcaaa4 !important}.mdl-color--brown-200{background-color:#bcaaa4 !important}.mdl-color-text--brown-300{color:#a1887f !important}.mdl-color--brown-300{background-color:#a1887f !important}.mdl-color-text--brown-400{color:#8d6e63 !important}.mdl-color--brown-400{background-color:#8d6e63 !important}.mdl-color-text--brown-500{color:#795548 !important}.mdl-color--brown-500{background-color:#795548 !important}.mdl-color-text--brown-600{color:#6d4c41 !important}.mdl-color--brown-600{background-color:#6d4c41 !important}.mdl-color-text--brown-700{color:#5d4037 !important}.mdl-color--brown-700{background-color:#5d4037 !important}.mdl-color-text--brown-800{color:#4e342e !important}.mdl-color--brown-800{background-color:#4e342e !important}.mdl-color-text--brown-900{color:#3e2723 !important}.mdl-color--brown-900{background-color:#3e2723 !important}.mdl-color-text--grey{color:#9e9e9e !important}.mdl-color--grey{background-color:#9e9e9e !important}.mdl-color-text--grey-50{color:#fafafa !important}.mdl-color--grey-50{background-color:#fafafa !important}.mdl-color-text--grey-100{color:#f5f5f5 !important}.mdl-color--grey-100{background-color:#f5f5f5 !important}.mdl-color-text--grey-200{color:#eee !important}.mdl-color--grey-200{background-color:#eee !important}.mdl-color-text--grey-300{color:#e0e0e0 !important}.mdl-color--grey-300{background-color:#e0e0e0 !important}.mdl-color-text--grey-400{color:#bdbdbd !important}.mdl-color--grey-400{background-color:#bdbdbd !important}.mdl-color-text--grey-500{color:#9e9e9e !important}.mdl-color--grey-500{background-color:#9e9e9e !important}.mdl-color-text--grey-600{color:#757575 !important}.mdl-color--grey-600{background-color:#757575 !important}.mdl-color-text--grey-700{color:#616161 !important}.mdl-color--grey-700{background-color:#616161 !important}.mdl-color-text--grey-800{color:#424242 !important}.mdl-color--grey-800{background-color:#424242 !important}.mdl-color-text--grey-900{color:#212121 !important}.mdl-color--grey-900{background-color:#212121 !important}.mdl-color-text--blue-grey{color:#607d8b !important}.mdl-color--blue-grey{background-color:#607d8b !important}.mdl-color-text--blue-grey-50{color:#eceff1 !important}.mdl-color--blue-grey-50{background-color:#eceff1 !important}.mdl-color-text--blue-grey-100{color:#cfd8dc !important}.mdl-color--blue-grey-100{background-color:#cfd8dc !important}.mdl-color-text--blue-grey-200{color:#b0bec5 !important}.mdl-color--blue-grey-200{background-color:#b0bec5 !important}.mdl-color-text--blue-grey-300{color:#90a4ae !important}.mdl-color--blue-grey-300{background-color:#90a4ae !important}.mdl-color-text--blue-grey-400{color:#78909c !important}.mdl-color--blue-grey-400{background-color:#78909c !important}.mdl-color-text--blue-grey-500{color:#607d8b !important}.mdl-color--blue-grey-500{background-color:#607d8b !important}.mdl-color-text--blue-grey-600{color:#546e7a !important}.mdl-color--blue-grey-600{background-color:#546e7a !important}.mdl-color-text--blue-grey-700{color:#455a64 !important}.mdl-color--blue-grey-700{background-color:#455a64 !important}.mdl-color-text--blue-grey-800{color:#37474f !important}.mdl-color--blue-grey-800{background-color:#37474f !important}.mdl-color-text--blue-grey-900{color:#263238 !important}.mdl-color--blue-grey-900{background-color:#263238 !important}.mdl-color--black{background-color:#000 !important}.mdl-color-text--black{color:#000 !important}.mdl-color--white{background-color:#fff !important}.mdl-color-text--white{color:#fff !important}.mdl-color--primary{background-color:rgb(255,152,0)!important}.mdl-color--primary-contrast{background-color:rgb(66,66,66)!important}.mdl-color--primary-dark{background-color:rgb(245,124,0)!important}.mdl-color--accent{background-color:rgb(68,138,255)!important}.mdl-color--accent-contrast{background-color:rgb(255,255,255)!important}.mdl-color-text--primary{color:rgb(255,152,0)!important}.mdl-color-text--primary-contrast{color:rgb(66,66,66)!important}.mdl-color-text--primary-dark{color:rgb(245,124,0)!important}.mdl-color-text--accent{color:rgb(68,138,255)!important}.mdl-color-text--accent-contrast{color:rgb(255,255,255)!important}.mdl-ripple{background:#000;border-radius:50%;height:50px;left:0;opacity:0;pointer-events:none;position:absolute;top:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:50px;overflow:hidden}.mdl-ripple.is-animating{transition:transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1);transition:transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1),-webkit-transform .3s cubic-bezier(0,0,.2,1)}.mdl-ripple.is-visible{opacity:.3}.mdl-animation--default,.mdl-animation--fast-out-slow-in{transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-animation--linear-out-slow-in{transition-timing-function:cubic-bezier(0,0,.2,1)}.mdl-animation--fast-out-linear-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.mdl-badge{position:relative;white-space:nowrap;margin-right:24px}.mdl-badge:not([data-badge]){margin-right:auto}.mdl-badge[data-badge]:after{content:attr(data-badge);display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:center;-ms-flex-line-pack:center;align-content:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;position:absolute;top:-11px;right:-24px;font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:600;font-size:12px;width:22px;height:22px;border-radius:50%;background:rgb(68,138,255);color:rgb(255,255,255)}.mdl-button .mdl-badge[data-badge]:after{top:-10px;right:-5px}.mdl-badge.mdl-badge--no-background[data-badge]:after{color:rgb(68,138,255);background:rgba(255,255,255,.2);box-shadow:0 0 1px gray}.mdl-badge.mdl-badge--overlap{margin-right:10px}.mdl-badge.mdl-badge--overlap:after{right:-10px}.mdl-button{background:0 0;border:none;border-radius:2px;color:#000;position:relative;height:36px;margin:0;min-width:64px;padding:0 16px;display:inline-block;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;text-transform:uppercase;letter-spacing:0;overflow:hidden;will-change:box-shadow;transition:box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);outline:none;cursor:pointer;text-decoration:none;text-align:center;line-height:36px;vertical-align:middle}.mdl-button::-moz-focus-inner{border:0}.mdl-button:hover{background-color:rgba(158,158,158,.2)}.mdl-button:focus:not(:active){background-color:rgba(0,0,0,.12)}.mdl-button:active{background-color:rgba(158,158,158,.4)}.mdl-button.mdl-button--colored{color:rgb(255,152,0)}.mdl-button.mdl-button--colored:focus:not(:active){background-color:rgba(0,0,0,.12)}input.mdl-button[type="submit"]{-webkit-appearance:none}.mdl-button--raised{background:rgba(158,158,158,.2);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-button--raised:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--raised:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--raised.mdl-button--colored{background:rgb(255,152,0);color:rgb(66,66,66)}.mdl-button--raised.mdl-button--colored:hover{background-color:rgb(255,152,0)}.mdl-button--raised.mdl-button--colored:active{background-color:rgb(255,152,0)}.mdl-button--raised.mdl-button--colored:focus:not(:active){background-color:rgb(255,152,0)}.mdl-button--raised.mdl-button--colored .mdl-ripple{background:rgb(66,66,66)}.mdl-button--fab{border-radius:50%;font-size:24px;height:56px;margin:auto;min-width:56px;width:56px;padding:0;overflow:hidden;background:rgba(158,158,158,.2);box-shadow:0 1px 1.5px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24);position:relative;line-height:normal}.mdl-button--fab .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--fab.mdl-button--mini-fab{height:40px;min-width:40px;width:40px}.mdl-button--fab .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button--fab:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--fab:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--fab.mdl-button--colored{background:rgb(68,138,255);color:rgb(255,255,255)}.mdl-button--fab.mdl-button--colored:hover{background-color:rgb(68,138,255)}.mdl-button--fab.mdl-button--colored:focus:not(:active){background-color:rgb(68,138,255)}.mdl-button--fab.mdl-button--colored:active{background-color:rgb(68,138,255)}.mdl-button--fab.mdl-button--colored .mdl-ripple{background:rgb(255,255,255)}.mdl-button--icon{border-radius:50%;font-size:24px;height:32px;margin-left:0;margin-right:0;min-width:32px;width:32px;padding:0;overflow:hidden;color:inherit;line-height:normal}.mdl-button--icon .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon{height:24px;min-width:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon .material-icons{top:0;left:0}.mdl-button--icon .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button__ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-button[disabled] .mdl-button__ripple-container .mdl-ripple,.mdl-button.mdl-button--disabled .mdl-button__ripple-container .mdl-ripple{background-color:transparent}.mdl-button--primary.mdl-button--primary{color:rgb(255,152,0)}.mdl-button--primary.mdl-button--primary .mdl-ripple{background:rgb(66,66,66)}.mdl-button--primary.mdl-button--primary.mdl-button--raised,.mdl-button--primary.mdl-button--primary.mdl-button--fab{color:rgb(66,66,66);background-color:rgb(255,152,0)}.mdl-button--accent.mdl-button--accent{color:rgb(68,138,255)}.mdl-button--accent.mdl-button--accent .mdl-ripple{background:rgb(255,255,255)}.mdl-button--accent.mdl-button--accent.mdl-button--raised,.mdl-button--accent.mdl-button--accent.mdl-button--fab{color:rgb(255,255,255);background-color:rgb(68,138,255)}.mdl-button[disabled][disabled],.mdl-button.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26);cursor:default;background-color:transparent}.mdl-button--fab[disabled][disabled],.mdl-button--fab.mdl-button--disabled.mdl-button--disabled{background-color:rgba(0,0,0,.12);color:rgba(0,0,0,.26)}.mdl-button--raised[disabled][disabled],.mdl-button--raised.mdl-button--disabled.mdl-button--disabled{background-color:rgba(0,0,0,.12);color:rgba(0,0,0,.26);box-shadow:none}.mdl-button--colored[disabled][disabled],.mdl-button--colored.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26)}.mdl-button .material-icons{vertical-align:middle}.mdl-card{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;font-size:16px;font-weight:400;min-height:200px;overflow:hidden;width:330px;z-index:1;position:relative;background:#fff;border-radius:2px;box-sizing:border-box}.mdl-card__media{background-color:rgb(68,138,255);background-repeat:repeat;background-position:50% 50%;background-size:cover;background-origin:padding-box;background-attachment:scroll;box-sizing:border-box}.mdl-card__title{-webkit-align-items:center;-ms-flex-align:center;align-items:center;color:#000;display:block;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:stretch;-ms-flex-pack:stretch;justify-content:stretch;line-height:normal;padding:16px;-webkit-perspective-origin:165px 56px;perspective-origin:165px 56px;-webkit-transform-origin:165px 56px;transform-origin:165px 56px;box-sizing:border-box}.mdl-card__title.mdl-card--border{border-bottom:1px solid rgba(0,0,0,.1)}.mdl-card__title-text{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end;color:inherit;display:block;display:-webkit-flex;display:-ms-flexbox;display:flex;font-size:24px;font-weight:300;line-height:normal;overflow:hidden;-webkit-transform-origin:149px 48px;transform-origin:149px 48px;margin:0}.mdl-card__subtitle-text{font-size:14px;color:rgba(0,0,0,.54);margin:0}.mdl-card__supporting-text{color:rgba(0,0,0,.54);font-size:1rem;line-height:18px;overflow:hidden;padding:16px;width:90%}.mdl-card__supporting-text.mdl-card--border{border-bottom:1px solid rgba(0,0,0,.1)}.mdl-card__actions{font-size:16px;line-height:normal;width:100%;background-color:transparent;padding:8px;box-sizing:border-box}.mdl-card__actions.mdl-card--border{border-top:1px solid rgba(0,0,0,.1)}.mdl-card--expand{-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-card__menu{position:absolute;right:16px;top:16px}.mdl-checkbox{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0}.mdl-checkbox.is-upgraded{padding-left:24px}.mdl-checkbox__input{line-height:24px}.mdl-checkbox.is-upgraded .mdl-checkbox__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-checkbox__box-outline{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;overflow:hidden;border:2px solid rgba(0,0,0,.54);border-radius:2px;z-index:2}.mdl-checkbox.is-checked .mdl-checkbox__box-outline{border:2px solid rgb(255,152,0)}fieldset[disabled] .mdl-checkbox .mdl-checkbox__box-outline,.mdl-checkbox.is-disabled .mdl-checkbox__box-outline{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__focus-helper{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;border-radius:50%;background-color:transparent}.mdl-checkbox.is-focused .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-checkbox.is-focused.is-checked .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(255,152,0,.26);background-color:rgba(255,152,0,.26)}.mdl-checkbox__tick-outline{position:absolute;top:0;left:0;height:100%;width:100%;-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");background:0 0;transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:background}.mdl-checkbox.is-checked .mdl-checkbox__tick-outline{background:rgb(255,152,0)url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}fieldset[disabled] .mdl-checkbox.is-checked .mdl-checkbox__tick-outline,.mdl-checkbox.is-checked.is-disabled .mdl-checkbox__tick-outline{background:rgba(0,0,0,.26)url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}.mdl-checkbox__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0}fieldset[disabled] .mdl-checkbox .mdl-checkbox__label,.mdl-checkbox.is-disabled .mdl-checkbox__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__ripple-container{position:absolute;z-index:2;top:-6px;left:-10px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-checkbox__ripple-container .mdl-ripple{background:rgb(255,152,0)}fieldset[disabled] .mdl-checkbox .mdl-checkbox__ripple-container,.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container{cursor:auto}fieldset[disabled] .mdl-checkbox .mdl-checkbox__ripple-container .mdl-ripple,.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container .mdl-ripple{background:0 0}.mdl-chip{height:32px;font-family:"Roboto","Helvetica","Arial",sans-serif;line-height:32px;padding:0 12px;border:0;border-radius:16px;background-color:#dedede;display:inline-block;color:rgba(0,0,0,.87);margin:2px 0;font-size:0;white-space:nowrap}.mdl-chip__text{font-size:13px;vertical-align:middle;display:inline-block}.mdl-chip__action{height:24px;width:24px;background:0 0;opacity:.54;cursor:pointer;padding:0;margin:0 0 0 4px;font-size:13px;text-decoration:none;color:rgba(0,0,0,.87);border:none;outline:none}.mdl-chip__action,.mdl-chip__contact{display:inline-block;vertical-align:middle;overflow:hidden;text-align:center}.mdl-chip__contact{height:32px;width:32px;border-radius:16px;margin-right:8px;font-size:18px;line-height:32px}.mdl-chip:focus{outline:0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-chip:active{background-color:#d6d6d6}.mdl-chip--deletable{padding-right:4px}.mdl-chip--contact{padding-left:0}.mdl-data-table{position:relative;border:1px solid rgba(0,0,0,.12);border-collapse:collapse;white-space:nowrap;font-size:13px;background-color:#fff}.mdl-data-table thead{padding-bottom:3px}.mdl-data-table thead .mdl-data-table__select{margin-top:0}.mdl-data-table tbody tr{position:relative;height:48px;transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:background-color}.mdl-data-table tbody tr.is-selected{background-color:#e0e0e0}.mdl-data-table tbody tr:hover{background-color:#eee}.mdl-data-table td{text-align:right}.mdl-data-table th{padding:0 18px 12px 18px;text-align:right}.mdl-data-table td:first-of-type,.mdl-data-table th:first-of-type{padding-left:24px}.mdl-data-table td:last-of-type,.mdl-data-table th:last-of-type{padding-right:24px}.mdl-data-table td{position:relative;height:48px;border-top:1px solid rgba(0,0,0,.12);border-bottom:1px solid rgba(0,0,0,.12);padding:12px 18px;box-sizing:border-box}.mdl-data-table td,.mdl-data-table td .mdl-data-table__select{vertical-align:middle}.mdl-data-table th{position:relative;vertical-align:bottom;text-overflow:ellipsis;font-weight:700;line-height:24px;letter-spacing:0;height:48px;font-size:12px;color:rgba(0,0,0,.54);padding-bottom:8px;box-sizing:border-box}.mdl-data-table th.mdl-data-table__header--sorted-ascending,.mdl-data-table th.mdl-data-table__header--sorted-descending{color:rgba(0,0,0,.87)}.mdl-data-table th.mdl-data-table__header--sorted-ascending:before,.mdl-data-table th.mdl-data-table__header--sorted-descending:before{font-family:'Material Icons';font-weight:400;font-style:normal;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;word-wrap:normal;-moz-font-feature-settings:'liga';font-feature-settings:'liga';-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased;font-size:16px;content:"\e5d8";margin-right:5px;vertical-align:sub}.mdl-data-table th.mdl-data-table__header--sorted-ascending:hover,.mdl-data-table th.mdl-data-table__header--sorted-descending:hover{cursor:pointer}.mdl-data-table th.mdl-data-table__header--sorted-ascending:hover:before,.mdl-data-table th.mdl-data-table__header--sorted-descending:hover:before{color:rgba(0,0,0,.26)}.mdl-data-table th.mdl-data-table__header--sorted-descending:before{content:"\e5db"}.mdl-data-table__select{width:16px}.mdl-data-table__cell--non-numeric.mdl-data-table__cell--non-numeric{text-align:left}.mdl-dialog{border:none;box-shadow:0 9px 46px 8px rgba(0,0,0,.14),0 11px 15px -7px rgba(0,0,0,.12),0 24px 38px 3px rgba(0,0,0,.2);width:280px}.mdl-dialog__title{padding:24px 24px 0;margin:0;font-size:2.5rem}.mdl-dialog__actions{padding:8px 8px 8px 24px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row-reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.mdl-dialog__actions>*{margin-right:8px;height:36px}.mdl-dialog__actions>*:first-child{margin-right:0}.mdl-dialog__actions--full-width{padding:0 0 8px}.mdl-dialog__actions--full-width>*{height:48px;-webkit-flex:0 0 100%;-ms-flex:0 0 100%;flex:0 0 100%;padding-right:16px;margin-right:0;text-align:right}.mdl-dialog__content{padding:20px 24px 24px;color:rgba(0,0,0,.54)}.mdl-mega-footer{padding:16px 40px;color:#9e9e9e;background-color:#424242}.mdl-mega-footer--top-section:after,.mdl-mega-footer--middle-section:after,.mdl-mega-footer--bottom-section:after,.mdl-mega-footer__top-section:after,.mdl-mega-footer__middle-section:after,.mdl-mega-footer__bottom-section:after{content:'';display:block;clear:both}.mdl-mega-footer--left-section,.mdl-mega-footer__left-section,.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{margin-bottom:16px}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:block;margin-bottom:16px;color:inherit;text-decoration:none}@media screen and (min-width:760px){.mdl-mega-footer--left-section,.mdl-mega-footer__left-section{float:left}.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{float:right}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:inline-block;margin-left:16px;line-height:36px;vertical-align:middle}}.mdl-mega-footer--social-btn,.mdl-mega-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{display:block;position:relative}@media screen and (min-width:760px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{width:33%}.mdl-mega-footer--drop-down-section:nth-child(1),.mdl-mega-footer--drop-down-section:nth-child(2),.mdl-mega-footer__drop-down-section:nth-child(1),.mdl-mega-footer__drop-down-section:nth-child(2){float:left}.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(3){float:right}.mdl-mega-footer--drop-down-section:nth-child(3):after,.mdl-mega-footer__drop-down-section:nth-child(3):after{clear:right}.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section:nth-child(4){clear:right;float:right}.mdl-mega-footer--middle-section:after,.mdl-mega-footer__middle-section:after{content:'';display:block;clear:both}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:0}}@media screen and (min-width:1024px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section,.mdl-mega-footer__drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(4){width:24%;float:left}}.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{position:absolute;width:100%;height:55.8px;padding:32px;margin:-16px 0 0;cursor:pointer;z-index:1;opacity:0}.mdl-mega-footer--heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CE'}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list{display:none}.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CF'}.mdl-mega-footer--heading,.mdl-mega-footer__heading{position:relative;width:100%;padding-right:39.8px;margin-bottom:16px;box-sizing:border-box;font-size:14px;line-height:23.8px;font-weight:500;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;color:#e0e0e0}.mdl-mega-footer--heading:after,.mdl-mega-footer__heading:after{content:'';position:absolute;top:0;right:0;display:block;width:23.8px;height:23.8px;background-size:cover}.mdl-mega-footer--link-list,.mdl-mega-footer__link-list{list-style:none;padding:0;margin:0 0 32px}.mdl-mega-footer--link-list:after,.mdl-mega-footer__link-list:after{clear:both;display:block;content:''}.mdl-mega-footer--link-list li,.mdl-mega-footer__link-list li{font-size:14px;font-weight:400;letter-spacing:0;line-height:20px}.mdl-mega-footer--link-list a,.mdl-mega-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}@media screen and (min-width:760px){.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{display:none}.mdl-mega-footer--heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer__heading:after{content:''}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list{display:block}.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading:after{content:''}}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:16px;margin-bottom:16px}.mdl-logo{margin-bottom:16px;color:#fff}.mdl-mega-footer--bottom-section .mdl-mega-footer--link-list li,.mdl-mega-footer__bottom-section .mdl-mega-footer__link-list li{float:left;margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-logo{float:left;margin-bottom:0;margin-right:16px}}.mdl-mini-footer{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:32px 16px;color:#9e9e9e;background-color:#424242}.mdl-mini-footer:after{content:'';display:block}.mdl-mini-footer .mdl-logo{line-height:36px}.mdl-mini-footer--link-list,.mdl-mini-footer__link-list{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;list-style:none;margin:0;padding:0}.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{line-height:36px}}.mdl-mini-footer--link-list a,.mdl-mini-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}.mdl-mini-footer--left-section,.mdl-mini-footer__left-section{display:inline-block;-webkit-order:0;-ms-flex-order:0;order:0}.mdl-mini-footer--right-section,.mdl-mini-footer__right-section{display:inline-block;-webkit-order:1;-ms-flex-order:1;order:1}.mdl-mini-footer--social-btn,.mdl-mini-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-icon-toggle{position:relative;z-index:1;vertical-align:middle;display:inline-block;height:32px;margin:0;padding:0}.mdl-icon-toggle__input{line-height:32px}.mdl-icon-toggle.is-upgraded .mdl-icon-toggle__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-icon-toggle__label{display:inline-block;position:relative;cursor:pointer;height:32px;width:32px;min-width:32px;color:#616161;border-radius:50%;padding:0;margin-left:0;margin-right:0;text-align:center;background-color:transparent;will-change:background-color;transition:background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1)}.mdl-icon-toggle__label.material-icons{line-height:32px;font-size:24px}.mdl-icon-toggle.is-checked .mdl-icon-toggle__label{color:rgb(255,152,0)}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__label{color:rgba(0,0,0,.26);cursor:auto;transition:none}.mdl-icon-toggle.is-focused .mdl-icon-toggle__label{background-color:rgba(0,0,0,.12)}.mdl-icon-toggle.is-focused.is-checked .mdl-icon-toggle__label{background-color:rgba(255,152,0,.26)}.mdl-icon-toggle__ripple-container{position:absolute;z-index:2;top:-2px;left:-2px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-icon-toggle__ripple-container .mdl-ripple{background:#616161}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container{cursor:auto}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container .mdl-ripple{background:0 0}.mdl-list{display:block;padding:8px 0;list-style:none}.mdl-list__item{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:16px;font-weight:400;letter-spacing:.04em;line-height:1;min-height:48px;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;padding:16px;cursor:default;color:rgba(0,0,0,.87);overflow:hidden}.mdl-list__item,.mdl-list__item .mdl-list__item-primary-content{box-sizing:border-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.mdl-list__item .mdl-list__item-primary-content{-webkit-order:0;-ms-flex-order:0;order:0;-webkit-flex-grow:2;-ms-flex-positive:2;flex-grow:2;text-decoration:none}.mdl-list__item .mdl-list__item-primary-content .mdl-list__item-icon{margin-right:32px}.mdl-list__item .mdl-list__item-primary-content .mdl-list__item-avatar{margin-right:16px}.mdl-list__item .mdl-list__item-secondary-content{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column;-ms-flex-flow:column;flex-flow:column;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end;margin-left:16px}.mdl-list__item .mdl-list__item-secondary-content .mdl-list__item-secondary-action label{display:inline}.mdl-list__item .mdl-list__item-secondary-content .mdl-list__item-secondary-info{font-size:12px;font-weight:400;line-height:1;letter-spacing:0;color:rgba(0,0,0,.54)}.mdl-list__item .mdl-list__item-secondary-content .mdl-list__item-sub-header{padding:0 0 0 16px}.mdl-list__item-icon,.mdl-list__item-icon.material-icons{height:24px;width:24px;font-size:24px;box-sizing:border-box;color:#757575}.mdl-list__item-avatar,.mdl-list__item-avatar.material-icons{height:40px;width:40px;box-sizing:border-box;border-radius:50%;background-color:#757575;font-size:40px;color:#fff}.mdl-list__item--two-line{height:72px}.mdl-list__item--two-line .mdl-list__item-primary-content{height:36px;line-height:20px;display:block}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-avatar{float:left}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-icon{float:left;margin-top:6px}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-secondary-content{height:36px}.mdl-list__item--two-line .mdl-list__item-primary-content .mdl-list__item-sub-title{font-size:14px;font-weight:400;letter-spacing:0;line-height:18px;color:rgba(0,0,0,.54);display:block;padding:0}.mdl-list__item--three-line{height:88px}.mdl-list__item--three-line .mdl-list__item-primary-content{height:52px;line-height:20px;display:block}.mdl-list__item--three-line .mdl-list__item-primary-content .mdl-list__item-avatar,.mdl-list__item--three-line .mdl-list__item-primary-content .mdl-list__item-icon{float:left}.mdl-list__item--three-line .mdl-list__item-secondary-content{height:52px}.mdl-list__item--three-line .mdl-list__item-text-body{font-size:14px;font-weight:400;letter-spacing:0;line-height:18px;height:52px;color:rgba(0,0,0,.54);display:block;padding:0}.mdl-menu__container{display:block;margin:0;padding:0;border:none;position:absolute;overflow:visible;height:0;width:0;visibility:hidden;z-index:-1}.mdl-menu__container.is-visible,.mdl-menu__container.is-animating{z-index:999;visibility:visible}.mdl-menu__outline{display:block;background:#fff;margin:0;padding:0;border:none;border-radius:2px;position:absolute;top:0;left:0;overflow:hidden;opacity:0;-webkit-transform:scale(0);transform:scale(0);-webkit-transform-origin:0 0;transform-origin:0 0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);will-change:transform;transition:transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1);transition:transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1),-webkit-transform .3s cubic-bezier(.4,0,.2,1);z-index:-1}.mdl-menu__container.is-visible .mdl-menu__outline{opacity:1;-webkit-transform:scale(1);transform:scale(1);z-index:999}.mdl-menu__outline.mdl-menu--bottom-right{-webkit-transform-origin:100% 0;transform-origin:100% 0}.mdl-menu__outline.mdl-menu--top-left{-webkit-transform-origin:0 100%;transform-origin:0 100%}.mdl-menu__outline.mdl-menu--top-right{-webkit-transform-origin:100% 100%;transform-origin:100% 100%}.mdl-menu{position:absolute;list-style:none;top:0;left:0;height:auto;width:auto;min-width:124px;padding:8px 0;margin:0;opacity:0;clip:rect(0 0 0 0);z-index:-1}.mdl-menu__container.is-visible .mdl-menu{opacity:1;z-index:999}.mdl-menu.is-animating{transition:opacity .2s cubic-bezier(.4,0,.2,1),clip .3s cubic-bezier(.4,0,.2,1)}.mdl-menu.mdl-menu--bottom-right{left:auto;right:0}.mdl-menu.mdl-menu--top-left{top:auto;bottom:0}.mdl-menu.mdl-menu--top-right{top:auto;left:auto;bottom:0;right:0}.mdl-menu.mdl-menu--unaligned{top:auto;left:auto}.mdl-menu__item{display:block;border:none;color:rgba(0,0,0,.87);background-color:transparent;text-align:left;margin:0;padding:0 16px;outline-color:#bdbdbd;position:relative;overflow:hidden;font-size:14px;font-weight:400;letter-spacing:0;text-decoration:none;cursor:pointer;height:48px;line-height:48px;white-space:nowrap;opacity:0;transition:opacity .2s cubic-bezier(.4,0,.2,1);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-menu__container.is-visible .mdl-menu__item{opacity:1}.mdl-menu__item::-moz-focus-inner{border:0}.mdl-menu__item--full-bleed-divider{border-bottom:1px solid rgba(0,0,0,.12)}.mdl-menu__item[disabled],.mdl-menu__item[data-mdl-disabled]{color:#bdbdbd;background-color:transparent;cursor:auto}.mdl-menu__item[disabled]:hover,.mdl-menu__item[data-mdl-disabled]:hover{background-color:transparent}.mdl-menu__item[disabled]:focus,.mdl-menu__item[data-mdl-disabled]:focus{background-color:transparent}.mdl-menu__item[disabled] .mdl-ripple,.mdl-menu__item[data-mdl-disabled] .mdl-ripple{background:0 0}.mdl-menu__item:hover{background-color:#eee}.mdl-menu__item:focus{outline:none;background-color:#eee}.mdl-menu__item:active{background-color:#e0e0e0}.mdl-menu__item--ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-progress{display:block;position:relative;height:4px;width:500px;max-width:100%}.mdl-progress>.bar{display:block;position:absolute;top:0;bottom:0;width:0%;transition:width .2s cubic-bezier(.4,0,.2,1)}.mdl-progress>.progressbar{background-color:rgb(255,152,0);z-index:1;left:0}.mdl-progress>.bufferbar{background-image:linear-gradient(to right,rgba(66,66,66,.7),rgba(66,66,66,.7)),linear-gradient(to right,rgb(255,152,0),rgb(255,152,0));z-index:0;left:0}.mdl-progress>.auxbar{right:0}@supports (-webkit-appearance:none){.mdl-progress:not(.mdl-progress--indeterminate):not(.mdl-progress--indeterminate)>.auxbar,.mdl-progress:not(.mdl-progress__indeterminate):not(.mdl-progress__indeterminate)>.auxbar{background-image:linear-gradient(to right,rgba(66,66,66,.7),rgba(66,66,66,.7)),linear-gradient(to right,rgb(255,152,0),rgb(255,152,0));-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=")}}.mdl-progress:not(.mdl-progress--indeterminate)>.auxbar,.mdl-progress:not(.mdl-progress__indeterminate)>.auxbar{background-image:linear-gradient(to right,rgba(66,66,66,.9),rgba(66,66,66,.9)),linear-gradient(to right,rgb(255,152,0),rgb(255,152,0))}.mdl-progress.mdl-progress--indeterminate>.bar1,.mdl-progress.mdl-progress__indeterminate>.bar1{-webkit-animation-name:indeterminate1;animation-name:indeterminate1}.mdl-progress.mdl-progress--indeterminate>.bar1,.mdl-progress.mdl-progress__indeterminate>.bar1,.mdl-progress.mdl-progress--indeterminate>.bar3,.mdl-progress.mdl-progress__indeterminate>.bar3{background-color:rgb(255,152,0);-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:linear;animation-timing-function:linear}.mdl-progress.mdl-progress--indeterminate>.bar3,.mdl-progress.mdl-progress__indeterminate>.bar3{background-image:none;-webkit-animation-name:indeterminate2;animation-name:indeterminate2}@-webkit-keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@-webkit-keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}@keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}.mdl-navigation{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;box-sizing:border-box}.mdl-navigation__link{color:#424242;text-decoration:none;margin:0;font-size:14px;font-weight:400;line-height:24px;letter-spacing:0;opacity:.87}.mdl-navigation__link .material-icons{vertical-align:middle}.mdl-layout{width:100%;height:100%;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;overflow-x:hidden;position:relative;-webkit-overflow-scrolling:touch}.mdl-layout.is-small-screen .mdl-layout--large-screen-only{display:none}.mdl-layout:not(.is-small-screen) .mdl-layout--small-screen-only{display:none}.mdl-layout__container{position:absolute;width:100%;height:100%}.mdl-layout__title,.mdl-layout-title{display:block;position:relative;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;line-height:1;letter-spacing:.02em;font-weight:400;box-sizing:border-box}.mdl-layout-spacer{-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-layout__drawer{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;width:240px;height:100%;max-height:100%;position:absolute;top:0;left:0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);box-sizing:border-box;border-right:1px solid #e0e0e0;background:#fafafa;-webkit-transform:translateX(-250px);transform:translateX(-250px);-webkit-transform-style:preserve-3d;transform-style:preserve-3d;will-change:transform;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:transform;transition-property:transform,-webkit-transform;color:#424242;overflow:visible;overflow-y:auto;z-index:5}.mdl-layout__drawer.is-visible{-webkit-transform:translateX(0);transform:translateX(0)}.mdl-layout__drawer.is-visible~.mdl-layout__content.mdl-layout__content{overflow:hidden}.mdl-layout__drawer>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__drawer>.mdl-layout__title,.mdl-layout__drawer>.mdl-layout-title{line-height:64px;padding-left:40px}@media screen and (max-width:1024px){.mdl-layout__drawer>.mdl-layout__title,.mdl-layout__drawer>.mdl-layout-title{line-height:56px;padding-left:16px}}.mdl-layout__drawer .mdl-navigation{-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch;padding-top:16px}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{display:block;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;padding:16px 40px;margin:0;color:#757575}@media screen and (max-width:1024px){.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{padding:16px}}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link:hover{background-color:#e0e0e0}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link--current{background-color:#e0e0e0;color:#000}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer{-webkit-transform:translateX(0);transform:translateX(0)}}.mdl-layout__drawer-button{display:block;position:absolute;height:48px;width:48px;border:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden;text-align:center;cursor:pointer;font-size:26px;line-height:56px;font-family:Helvetica,Arial,sans-serif;margin:8px 12px;top:0;left:0;color:rgb(66,66,66);z-index:4}.mdl-layout__header .mdl-layout__drawer-button{position:absolute;color:rgb(66,66,66);background-color:inherit}@media screen and (max-width:1024px){.mdl-layout__header .mdl-layout__drawer-button{margin:4px}}@media screen and (max-width:1024px){.mdl-layout__drawer-button{margin:4px;color:rgba(0,0,0,.5)}}@media screen and (min-width:1025px){.mdl-layout__drawer-button{line-height:54px}.mdl-layout--no-desktop-drawer-button .mdl-layout__drawer-button,.mdl-layout--fixed-drawer>.mdl-layout__drawer-button,.mdl-layout--no-drawer-button .mdl-layout__drawer-button{display:none}}.mdl-layout__header{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start;box-sizing:border-box;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;width:100%;margin:0;padding:0;border:none;min-height:64px;max-height:1000px;z-index:3;background-color:rgb(255,152,0);color:rgb(66,66,66);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:max-height,box-shadow}@media screen and (max-width:1024px){.mdl-layout__header{min-height:56px}}.mdl-layout--fixed-drawer.is-upgraded:not(.is-small-screen)>.mdl-layout__header{margin-left:240px;width:calc(100% - 240px)}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__header .mdl-layout__header-row{padding-left:40px}}.mdl-layout__header>.mdl-layout-icon{position:absolute;left:40px;top:16px;height:32px;width:32px;overflow:hidden;z-index:3;display:block}@media screen and (max-width:1024px){.mdl-layout__header>.mdl-layout-icon{left:16px;top:12px}}.mdl-layout.has-drawer .mdl-layout__header>.mdl-layout-icon{display:none}.mdl-layout__header.is-compact{max-height:64px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact{max-height:56px}}.mdl-layout__header.is-compact.has-tabs{height:112px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact.has-tabs{min-height:104px}}@media screen and (max-width:1024px){.mdl-layout__header{display:none}.mdl-layout--fixed-header>.mdl-layout__header{display:-webkit-flex;display:-ms-flexbox;display:flex}}.mdl-layout__header--transparent.mdl-layout__header--transparent{background-color:transparent;box-shadow:none}.mdl-layout__header--seamed,.mdl-layout__header--scroll{box-shadow:none}.mdl-layout__header--waterfall{box-shadow:none;overflow:hidden}.mdl-layout__header--waterfall.is-casting-shadow{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-layout__header--waterfall.mdl-layout__header--waterfall-hide-top{-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.mdl-layout__header-row{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;box-sizing:border-box;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:64px;margin:0;padding:0 40px 0 80px}.mdl-layout--no-drawer-button .mdl-layout__header-row{padding-left:40px}@media screen and (min-width:1025px){.mdl-layout--no-desktop-drawer-button .mdl-layout__header-row{padding-left:40px}}@media screen and (max-width:1024px){.mdl-layout__header-row{height:56px;padding:0 16px 0 72px}.mdl-layout--no-drawer-button .mdl-layout__header-row{padding-left:16px}}.mdl-layout__header-row>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__header--scroll .mdl-layout__header-row{width:100%}.mdl-layout__header-row .mdl-navigation{margin:0;padding:0;height:64px;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-ms-flex-align:center;align-items:center}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation{height:56px}}.mdl-layout__header-row .mdl-navigation__link{display:block;color:rgb(66,66,66);line-height:64px;padding:0 24px}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation__link{line-height:56px;padding:0 16px}}.mdl-layout__obfuscator{background-color:transparent;position:absolute;top:0;left:0;height:100%;width:100%;z-index:4;visibility:hidden;transition-property:background-color;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-layout__obfuscator.is-visible{background-color:rgba(0,0,0,.5);visibility:visible}@supports (pointer-events:auto){.mdl-layout__obfuscator{background-color:rgba(0,0,0,.5);opacity:0;transition-property:opacity;visibility:visible;pointer-events:none}.mdl-layout__obfuscator.is-visible{pointer-events:auto;opacity:1}}.mdl-layout__content{-ms-flex:0 1 auto;position:relative;display:inline-block;overflow-y:auto;overflow-x:hidden;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;z-index:1;-webkit-overflow-scrolling:touch}.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:240px}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow:visible}@media screen and (max-width:1024px){.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:0}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow-y:auto;overflow-x:hidden}}.mdl-layout__tab-bar{height:96px;margin:0;width:calc(100% - 112px);padding:0 0 0 56px;display:-webkit-flex;display:-ms-flexbox;display:flex;background-color:rgb(255,152,0);overflow-y:hidden;overflow-x:scroll}.mdl-layout__tab-bar::-webkit-scrollbar{display:none}.mdl-layout--no-drawer-button .mdl-layout__tab-bar{padding-left:16px;width:calc(100% - 32px)}@media screen and (min-width:1025px){.mdl-layout--no-desktop-drawer-button .mdl-layout__tab-bar{padding-left:16px;width:calc(100% - 32px)}}@media screen and (max-width:1024px){.mdl-layout__tab-bar{width:calc(100% - 60px);padding:0 0 0 60px}.mdl-layout--no-drawer-button .mdl-layout__tab-bar{width:calc(100% - 8px);padding-left:4px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar{padding:0;overflow:hidden;width:100%}.mdl-layout__tab-bar-container{position:relative;height:48px;width:100%;border:none;margin:0;z-index:2;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden}.mdl-layout__container>.mdl-layout__tab-bar-container{position:absolute;top:0;left:0}.mdl-layout__tab-bar-button{display:inline-block;position:absolute;top:0;height:48px;width:56px;z-index:4;text-align:center;background-color:rgb(255,152,0);color:transparent;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-layout--no-desktop-drawer-button .mdl-layout__tab-bar-button,.mdl-layout--no-drawer-button .mdl-layout__tab-bar-button{width:16px}.mdl-layout--no-desktop-drawer-button .mdl-layout__tab-bar-button .material-icons,.mdl-layout--no-drawer-button .mdl-layout__tab-bar-button .material-icons{position:relative;left:-4px}@media screen and (max-width:1024px){.mdl-layout__tab-bar-button{width:60px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar-button{display:none}.mdl-layout__tab-bar-button .material-icons{line-height:48px}.mdl-layout__tab-bar-button.is-active{color:rgb(66,66,66)}.mdl-layout__tab-bar-left-button{left:0}.mdl-layout__tab-bar-right-button{right:0}.mdl-layout__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(66,66,66,.6);overflow:hidden}@media screen and (max-width:1024px){.mdl-layout__tab{padding:0 12px}}.mdl-layout--fixed-tabs .mdl-layout__tab{float:none;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:0}.mdl-layout.is-upgraded .mdl-layout__tab.is-active{color:rgb(66,66,66)}.mdl-layout.is-upgraded .mdl-layout__tab.is-active::after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:rgb(68,138,255);-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-layout__tab .mdl-layout__tab-ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-layout__tab .mdl-layout__tab-ripple-container .mdl-ripple{background-color:rgb(66,66,66)}.mdl-layout__tab-panel{display:block}.mdl-layout.is-upgraded .mdl-layout__tab-panel{display:none}.mdl-layout.is-upgraded .mdl-layout__tab-panel.is-active{display:block}.mdl-radio{position:relative;font-size:16px;line-height:24px;display:inline-block;vertical-align:middle;box-sizing:border-box;height:24px;margin:0;padding-left:0}.mdl-radio.is-upgraded{padding-left:24px}.mdl-radio__button{line-height:24px}.mdl-radio.is-upgraded .mdl-radio__button{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-radio__outer-circle{position:absolute;top:4px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;border:2px solid rgba(0,0,0,.54);border-radius:50%;z-index:2}.mdl-radio.is-checked .mdl-radio__outer-circle{border:2px solid rgb(255,152,0)}.mdl-radio__outer-circle fieldset[disabled] .mdl-radio,.mdl-radio.is-disabled .mdl-radio__outer-circle{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-radio__inner-circle{position:absolute;z-index:1;margin:0;top:8px;left:4px;box-sizing:border-box;width:8px;height:8px;cursor:pointer;transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:transform;transition-property:transform,-webkit-transform;-webkit-transform:scale(0,0);transform:scale(0,0);border-radius:50%;background:rgb(255,152,0)}.mdl-radio.is-checked .mdl-radio__inner-circle{-webkit-transform:scale(1,1);transform:scale(1,1)}fieldset[disabled] .mdl-radio .mdl-radio__inner-circle,.mdl-radio.is-disabled .mdl-radio__inner-circle{background:rgba(0,0,0,.26);cursor:auto}.mdl-radio.is-focused .mdl-radio__inner-circle{box-shadow:0 0 0 10px rgba(0,0,0,.1)}.mdl-radio__label{cursor:pointer}fieldset[disabled] .mdl-radio .mdl-radio__label,.mdl-radio.is-disabled .mdl-radio__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-radio__ripple-container{position:absolute;z-index:2;top:-9px;left:-13px;box-sizing:border-box;width:42px;height:42px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-radio__ripple-container .mdl-ripple{background:rgb(255,152,0)}fieldset[disabled] .mdl-radio .mdl-radio__ripple-container,.mdl-radio.is-disabled .mdl-radio__ripple-container{cursor:auto}fieldset[disabled] .mdl-radio .mdl-radio__ripple-container .mdl-ripple,.mdl-radio.is-disabled .mdl-radio__ripple-container .mdl-ripple{background:0 0}_:-ms-input-placeholder,:root .mdl-slider.mdl-slider.is-upgraded{-ms-appearance:none;height:32px;margin:0}.mdl-slider{width:calc(100% - 40px);margin:0 20px}.mdl-slider.is-upgraded{-webkit-appearance:none;-moz-appearance:none;appearance:none;height:2px;background:0 0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;outline:0;padding:0;color:rgb(255,152,0);-webkit-align-self:center;-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center;z-index:1;cursor:pointer}.mdl-slider.is-upgraded::-moz-focus-outer{border:0}.mdl-slider.is-upgraded::-ms-tooltip{display:none}.mdl-slider.is-upgraded::-webkit-slider-runnable-track{background:0 0}.mdl-slider.is-upgraded::-moz-range-track{background:0 0;border:none}.mdl-slider.is-upgraded::-ms-track{background:0 0;color:transparent;height:2px;width:100%;border:none}.mdl-slider.is-upgraded::-ms-fill-lower{padding:0;background:linear-gradient(to right,transparent,transparent 16px,rgb(255,152,0)16px,rgb(255,152,0)0)}.mdl-slider.is-upgraded::-ms-fill-upper{padding:0;background:linear-gradient(to left,transparent,transparent 16px,rgba(0,0,0,.26)16px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded::-webkit-slider-thumb{-webkit-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background:rgb(255,152,0);border:none;transition:transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1);transition:transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1),-webkit-transform .18s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded::-moz-range-thumb{-moz-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background-image:none;background:rgb(255,152,0);border:none}.mdl-slider.is-upgraded:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(255,152,0,.26)}.mdl-slider.is-upgraded:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(255,152,0,.26)}.mdl-slider.is-upgraded:active::-webkit-slider-thumb{background-image:none;background:rgb(255,152,0);-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded:active::-moz-range-thumb{background-image:none;background:rgb(255,152,0);transform:scale(1.5)}.mdl-slider.is-upgraded::-ms-thumb{width:32px;height:32px;border:none;border-radius:50%;background:rgb(255,152,0);transform:scale(.375);transition:transform .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1);transition:transform .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1),-webkit-transform .18s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,rgb(255,152,0)0%,rgb(255,152,0)37.5%,rgba(255,152,0,.26)37.5%,rgba(255,152,0,.26)100%);transform:scale(1)}.mdl-slider.is-upgraded:active::-ms-thumb{background:rgb(255,152,0);transform:scale(.5625)}.mdl-slider.is-upgraded.is-lowest-value::-webkit-slider-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-moz-range-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:active::-webkit-slider-thumb{border:1.6px solid rgba(0,0,0,.26);-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value:active+.mdl-slider__background-flex>.mdl-slider__background-upper{left:9px}.mdl-slider.is-upgraded.is-lowest-value:active::-moz-range-thumb{border:1.5px solid rgba(0,0,0,.26);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value::-ms-thumb{background:radial-gradient(circle closest-side,transparent 0%,transparent 66.67%,rgba(0,0,0,.26)66.67%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,rgba(0,0,0,.12)0%,rgba(0,0,0,.12)25%,rgba(0,0,0,.26)25%,rgba(0,0,0,.26)37.5%,rgba(0,0,0,.12)37.5%,rgba(0,0,0,.12)100%);transform:scale(1)}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-thumb{transform:scale(.5625);background:radial-gradient(circle closest-side,transparent 0%,transparent 77.78%,rgba(0,0,0,.26)77.78%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-lower{background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-fill-upper{margin-left:9px}.mdl-slider.is-upgraded:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled::-webkit-slider-thumb{-webkit-transform:scale(.667);transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded:disabled::-moz-range-thumb{transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled+.mdl-slider__background-flex>.mdl-slider__background-lower{background-color:rgba(0,0,0,.26);left:-6px}.mdl-slider.is-upgraded:disabled+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-webkit-slider-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;-webkit-transform:scale(.667);transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-moz-range-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:active+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded:disabled:active::-ms-thumb,.mdl-slider.is-upgraded:disabled::-ms-thumb{transform:scale(.25);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-ms-thumb{transform:scale(.25);background:radial-gradient(circle closest-side,transparent 0%,transparent 50%,rgba(0,0,0,.26)50%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded:disabled::-ms-fill-lower{margin-right:6px;background:linear-gradient(to right,transparent,transparent 25px,rgba(0,0,0,.26)25px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded:disabled::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-fill-upper{margin-left:6px}.mdl-slider__ie-container{height:18px;overflow:visible;border:none;margin:none;padding:none}.mdl-slider__container{height:18px;position:relative;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row}.mdl-slider__container,.mdl-slider__background-flex{background:0 0;display:-webkit-flex;display:-ms-flexbox;display:flex}.mdl-slider__background-flex{position:absolute;height:2px;width:calc(100% - 52px);top:50%;left:0;margin:0 26px;overflow:hidden;border:0;padding:0;-webkit-transform:translate(0,-1px);transform:translate(0,-1px)}.mdl-slider__background-lower{background:rgb(255,152,0)}.mdl-slider__background-lower,.mdl-slider__background-upper{-webkit-flex:0;-ms-flex:0;flex:0;position:relative;border:0;padding:0}.mdl-slider__background-upper{background:rgba(0,0,0,.26);transition:left .18s cubic-bezier(.4,0,.2,1)}.mdl-snackbar{position:fixed;bottom:0;left:50%;cursor:default;background-color:#323232;z-index:3;display:block;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;font-family:"Roboto","Helvetica","Arial",sans-serif;will-change:transform;-webkit-transform:translate(0,80px);transform:translate(0,80px);transition:transform .25s cubic-bezier(.4,0,1,1);transition:transform .25s cubic-bezier(.4,0,1,1),-webkit-transform .25s cubic-bezier(.4,0,1,1);pointer-events:none}@media (max-width:479px){.mdl-snackbar{width:100%;left:0;min-height:48px;max-height:80px}}@media (min-width:480px){.mdl-snackbar{min-width:288px;max-width:568px;border-radius:2px;-webkit-transform:translate(-50%,80px);transform:translate(-50%,80px)}}.mdl-snackbar--active{-webkit-transform:translate(0,0);transform:translate(0,0);pointer-events:auto;transition:transform .25s cubic-bezier(0,0,.2,1);transition:transform .25s cubic-bezier(0,0,.2,1),-webkit-transform .25s cubic-bezier(0,0,.2,1)}@media (min-width:480px){.mdl-snackbar--active{-webkit-transform:translate(-50%,0);transform:translate(-50%,0)}}.mdl-snackbar__text{padding:14px 12px 14px 24px;vertical-align:middle;color:#fff;float:left}.mdl-snackbar__action{background:0 0;border:none;color:rgb(68,138,255);float:right;padding:14px 24px 14px 12px;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;text-transform:uppercase;line-height:1;letter-spacing:0;overflow:hidden;outline:none;opacity:0;pointer-events:none;cursor:pointer;text-decoration:none;text-align:center;-webkit-align-self:center;-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center}.mdl-snackbar__action::-moz-focus-inner{border:0}.mdl-snackbar__action:not([aria-hidden]){opacity:1;pointer-events:auto}.mdl-spinner{display:inline-block;position:relative;width:28px;height:28px}.mdl-spinner:not(.is-upgraded).is-active:after{content:"Loading..."}.mdl-spinner.is-upgraded.is-active{-webkit-animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite;animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite}@-webkit-keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.mdl-spinner__layer{position:absolute;width:100%;height:100%;opacity:0}.mdl-spinner__layer-1{border-color:#42a5f5}.mdl-spinner--single-color .mdl-spinner__layer-1{border-color:rgb(255,152,0)}.mdl-spinner.is-active .mdl-spinner__layer-1{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-2{border-color:#f44336}.mdl-spinner--single-color .mdl-spinner__layer-2{border-color:rgb(255,152,0)}.mdl-spinner.is-active .mdl-spinner__layer-2{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-3{border-color:#fdd835}.mdl-spinner--single-color .mdl-spinner__layer-3{border-color:rgb(255,152,0)}.mdl-spinner.is-active .mdl-spinner__layer-3{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-4{border-color:#4caf50}.mdl-spinner--single-color .mdl-spinner__layer-4{border-color:rgb(255,152,0)}.mdl-spinner.is-active .mdl-spinner__layer-4{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@-webkit-keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@-webkit-keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}@keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}.mdl-spinner__gap-patch{position:absolute;box-sizing:border-box;top:0;left:45%;width:10%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__gap-patch .mdl-spinner__circle{width:1000%;left:-450%}.mdl-spinner__circle-clipper{display:inline-block;position:relative;width:50%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__circle-clipper.mdl-spinner__left{float:left}.mdl-spinner__circle-clipper.mdl-spinner__right{float:right}.mdl-spinner__circle-clipper .mdl-spinner__circle{width:200%}.mdl-spinner__circle{box-sizing:border-box;height:100%;border-width:3px;border-style:solid;border-color:inherit;border-bottom-color:transparent!important;border-radius:50%;-webkit-animation:none;animation:none;position:absolute;top:0;right:0;bottom:0;left:0}.mdl-spinner__left .mdl-spinner__circle{border-right-color:transparent!important;-webkit-transform:rotate(129deg);transform:rotate(129deg)}.mdl-spinner.is-active .mdl-spinner__left .mdl-spinner__circle{-webkit-animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__right .mdl-spinner__circle{left:-100%;border-left-color:transparent!important;-webkit-transform:rotate(-129deg);transform:rotate(-129deg)}.mdl-spinner.is-active .mdl-spinner__right .mdl-spinner__circle{-webkit-animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@-webkit-keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}@keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}.mdl-switch{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0;overflow:visible;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-switch.is-upgraded{padding-left:28px}.mdl-switch__input{line-height:24px}.mdl-switch.is-upgraded .mdl-switch__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-switch__track{background:rgba(0,0,0,.26);position:absolute;left:0;top:5px;height:14px;width:36px;border-radius:14px;cursor:pointer}.mdl-switch.is-checked .mdl-switch__track{background:rgba(255,152,0,.5)}.mdl-switch__track fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__track{background:rgba(0,0,0,.12);cursor:auto}.mdl-switch__thumb{background:#fafafa;position:absolute;left:0;top:2px;height:20px;width:20px;border-radius:50%;cursor:pointer;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);transition-duration:.28s;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-property:left}.mdl-switch.is-checked .mdl-switch__thumb{background:rgb(255,152,0);left:16px;box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-switch__thumb fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__thumb{background:#bdbdbd;cursor:auto}.mdl-switch__focus-helper{position:absolute;top:50%;left:50%;-webkit-transform:translate(-4px,-4px);transform:translate(-4px,-4px);display:inline-block;box-sizing:border-box;width:8px;height:8px;border-radius:50%;background-color:transparent}.mdl-switch.is-focused .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-switch.is-focused.is-checked .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(255,152,0,.26);background-color:rgba(255,152,0,.26)}.mdl-switch__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0;left:24px}.mdl-switch__label fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__label{color:#bdbdbd;cursor:auto}.mdl-switch__ripple-container{position:absolute;z-index:2;top:-12px;left:-14px;box-sizing:border-box;width:48px;height:48px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000);transition-duration:.4s;transition-timing-function:step-end;transition-property:left}.mdl-switch__ripple-container .mdl-ripple{background:rgb(255,152,0)}.mdl-switch__ripple-container fieldset[disabled] .mdl-switch,.mdl-switch.is-disabled .mdl-switch__ripple-container{cursor:auto}fieldset[disabled] .mdl-switch .mdl-switch__ripple-container .mdl-ripple,.mdl-switch.is-disabled .mdl-switch__ripple-container .mdl-ripple{background:0 0}.mdl-switch.is-checked .mdl-switch__ripple-container{left:2px}.mdl-tabs{display:block;width:100%}.mdl-tabs__tab-bar{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:space-between;-ms-flex-line-pack:justify;align-content:space-between;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;height:48px;padding:0;margin:0;border-bottom:1px solid #e0e0e0}.mdl-tabs__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(0,0,0,.54);overflow:hidden}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active{color:rgba(0,0,0,.87)}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:rgb(255,152,0);-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-tabs__tab .mdl-tabs__ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-tabs__tab .mdl-tabs__ripple-container .mdl-ripple{background:rgb(255,152,0)}.mdl-tabs__panel{display:block}.mdl-tabs.is-upgraded .mdl-tabs__panel{display:none}.mdl-tabs.is-upgraded .mdl-tabs__panel.is-active{display:block}@-webkit-keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}@keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}.mdl-textfield{position:relative;font-size:16px;display:inline-block;box-sizing:border-box;width:300px;max-width:100%;margin:0;padding:20px 0}.mdl-textfield .mdl-button{position:absolute;bottom:20px}.mdl-textfield--align-right{text-align:right}.mdl-textfield--full-width{width:100%}.mdl-textfield--expandable{min-width:32px;width:auto;min-height:32px}.mdl-textfield--expandable .mdl-button--icon{top:16px}.mdl-textfield__input{border:none;border-bottom:1px solid rgba(0,0,0,.12);display:block;font-size:16px;font-family:"Helvetica","Arial",sans-serif;margin:0;padding:4px 0;width:100%;background:0 0;text-align:left;color:inherit}.mdl-textfield__input[type="number"]{-moz-appearance:textfield}.mdl-textfield__input[type="number"]::-webkit-inner-spin-button,.mdl-textfield__input[type="number"]::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.mdl-textfield.is-focused .mdl-textfield__input{outline:none}.mdl-textfield.is-invalid .mdl-textfield__input{border-color:#d50000;box-shadow:none}fieldset[disabled] .mdl-textfield .mdl-textfield__input,.mdl-textfield.is-disabled .mdl-textfield__input{background-color:transparent;border-bottom:1px dotted rgba(0,0,0,.12);color:rgba(0,0,0,.26)}.mdl-textfield textarea.mdl-textfield__input{display:block}.mdl-textfield__label{bottom:0;color:rgba(0,0,0,.26);font-size:16px;left:0;right:0;pointer-events:none;position:absolute;display:block;top:24px;width:100%;overflow:hidden;white-space:nowrap;text-align:left}.mdl-textfield.is-dirty .mdl-textfield__label,.mdl-textfield.has-placeholder .mdl-textfield__label{visibility:hidden}.mdl-textfield--floating-label .mdl-textfield__label{transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-textfield--floating-label.has-placeholder .mdl-textfield__label{transition:none}fieldset[disabled] .mdl-textfield .mdl-textfield__label,.mdl-textfield.is-disabled.is-disabled .mdl-textfield__label{color:rgba(0,0,0,.26)}.mdl-textfield--floating-label.is-focused .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__label,.mdl-textfield--floating-label.has-placeholder .mdl-textfield__label{color:rgb(255,152,0);font-size:12px;top:4px;visibility:visible}.mdl-textfield--floating-label.is-focused .mdl-textfield__expandable-holder .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__expandable-holder .mdl-textfield__label,.mdl-textfield--floating-label.has-placeholder .mdl-textfield__expandable-holder .mdl-textfield__label{top:-16px}.mdl-textfield--floating-label.is-invalid .mdl-textfield__label{color:#d50000;font-size:12px}.mdl-textfield__label:after{background-color:rgb(255,152,0);bottom:20px;content:'';height:2px;left:45%;position:absolute;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);visibility:hidden;width:10px}.mdl-textfield.is-focused .mdl-textfield__label:after{left:0;visibility:visible;width:100%}.mdl-textfield.is-invalid .mdl-textfield__label:after{background-color:#d50000}.mdl-textfield__error{color:#d50000;position:absolute;font-size:12px;margin-top:3px;visibility:hidden;display:block}.mdl-textfield.is-invalid .mdl-textfield__error{visibility:visible}.mdl-textfield__expandable-holder{display:inline-block;position:relative;margin-left:32px;transition-duration:.2s;transition-timing-function:cubic-bezier(.4,0,.2,1);display:inline-block;max-width:.1px}.mdl-textfield.is-focused .mdl-textfield__expandable-holder,.mdl-textfield.is-dirty .mdl-textfield__expandable-holder{max-width:600px}.mdl-textfield__expandable-holder .mdl-textfield__label:after{bottom:0}.mdl-tooltip{-webkit-transform:scale(0);transform:scale(0);-webkit-transform-origin:top center;transform-origin:top center;z-index:999;background:rgba(97,97,97,.9);border-radius:2px;color:#fff;display:inline-block;font-size:10px;font-weight:500;line-height:14px;max-width:170px;position:fixed;top:-500px;left:-500px;padding:8px;text-align:center}.mdl-tooltip.is-active{-webkit-animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards;animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards}.mdl-tooltip--large{line-height:14px;font-size:14px;padding:16px}@-webkit-keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}@keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}.mdl-shadow--2dp{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-shadow--3dp{box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-shadow--4dp{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2)}.mdl-shadow--6dp{box-shadow:0 6px 10px 0 rgba(0,0,0,.14),0 1px 18px 0 rgba(0,0,0,.12),0 3px 5px -1px rgba(0,0,0,.2)}.mdl-shadow--8dp{box-shadow:0 8px 10px 1px rgba(0,0,0,.14),0 3px 14px 2px rgba(0,0,0,.12),0 5px 5px -3px rgba(0,0,0,.2)}.mdl-shadow--16dp{box-shadow:0 16px 24px 2px rgba(0,0,0,.14),0 6px 30px 5px rgba(0,0,0,.12),0 8px 10px -5px rgba(0,0,0,.2)}.mdl-shadow--24dp{box-shadow:0 9px 46px 8px rgba(0,0,0,.14),0 11px 15px -7px rgba(0,0,0,.12),0 24px 38px 3px rgba(0,0,0,.2)}.mdl-grid{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;margin:0 auto;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch}.mdl-grid.mdl-grid--no-spacing{padding:0}.mdl-cell{box-sizing:border-box}.mdl-cell--top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.mdl-cell--middle{-webkit-align-self:center;-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center}.mdl-cell--bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}.mdl-cell--stretch{-webkit-align-self:stretch;-ms-flex-item-align:stretch;-ms-grid-row-align:stretch;align-self:stretch}.mdl-grid.mdl-grid--no-spacing>.mdl-cell{margin:0}.mdl-cell--order-1{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12{-webkit-order:12;-ms-flex-order:12;order:12}@media (max-width:479px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:100%}.mdl-cell--hide-phone{display:none!important}.mdl-cell--order-1-phone.mdl-cell--order-1-phone{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2-phone.mdl-cell--order-2-phone{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3-phone.mdl-cell--order-3-phone{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4-phone.mdl-cell--order-4-phone{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5-phone.mdl-cell--order-5-phone{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6-phone.mdl-cell--order-6-phone{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7-phone.mdl-cell--order-7-phone{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8-phone.mdl-cell--order-8-phone{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9-phone.mdl-cell--order-9-phone{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10-phone.mdl-cell--order-10-phone{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11-phone.mdl-cell--order-11-phone{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12-phone.mdl-cell--order-12-phone{-webkit-order:12;-ms-flex-order:12;order:12}.mdl-cell--1-col,.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:25%}.mdl-cell--2-col,.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:50%}.mdl-cell--3-col,.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:75%}.mdl-cell--4-col,.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:100%}.mdl-cell--5-col,.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:100%}.mdl-cell--6-col,.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:100%}.mdl-cell--7-col,.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:100%}.mdl-cell--8-col,.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:100%}.mdl-cell--1-offset,.mdl-cell--1-offset-phone.mdl-cell--1-offset-phone{margin-left:calc(25% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset-phone.mdl-cell--1-offset-phone{margin-left:25%}.mdl-cell--2-offset,.mdl-cell--2-offset-phone.mdl-cell--2-offset-phone{margin-left:calc(50% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset-phone.mdl-cell--2-offset-phone{margin-left:50%}.mdl-cell--3-offset,.mdl-cell--3-offset-phone.mdl-cell--3-offset-phone{margin-left:calc(75% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset-phone.mdl-cell--3-offset-phone{margin-left:75%}}@media (min-width:480px) and (max-width:839px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:50%}.mdl-cell--hide-tablet{display:none!important}.mdl-cell--order-1-tablet.mdl-cell--order-1-tablet{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2-tablet.mdl-cell--order-2-tablet{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3-tablet.mdl-cell--order-3-tablet{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4-tablet.mdl-cell--order-4-tablet{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5-tablet.mdl-cell--order-5-tablet{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6-tablet.mdl-cell--order-6-tablet{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7-tablet.mdl-cell--order-7-tablet{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8-tablet.mdl-cell--order-8-tablet{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9-tablet.mdl-cell--order-9-tablet{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10-tablet.mdl-cell--order-10-tablet{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11-tablet.mdl-cell--order-11-tablet{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12-tablet.mdl-cell--order-12-tablet{-webkit-order:12;-ms-flex-order:12;order:12}.mdl-cell--1-col,.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:calc(12.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:12.5%}.mdl-cell--2-col,.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:25%}.mdl-cell--3-col,.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:calc(37.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:37.5%}.mdl-cell--4-col,.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:50%}.mdl-cell--5-col,.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:calc(62.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:62.5%}.mdl-cell--6-col,.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:75%}.mdl-cell--7-col,.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:calc(87.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:87.5%}.mdl-cell--8-col,.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:100%}.mdl-cell--1-offset,.mdl-cell--1-offset-tablet.mdl-cell--1-offset-tablet{margin-left:calc(12.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset-tablet.mdl-cell--1-offset-tablet{margin-left:12.5%}.mdl-cell--2-offset,.mdl-cell--2-offset-tablet.mdl-cell--2-offset-tablet{margin-left:calc(25% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset-tablet.mdl-cell--2-offset-tablet{margin-left:25%}.mdl-cell--3-offset,.mdl-cell--3-offset-tablet.mdl-cell--3-offset-tablet{margin-left:calc(37.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset-tablet.mdl-cell--3-offset-tablet{margin-left:37.5%}.mdl-cell--4-offset,.mdl-cell--4-offset-tablet.mdl-cell--4-offset-tablet{margin-left:calc(50% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset-tablet.mdl-cell--4-offset-tablet{margin-left:50%}.mdl-cell--5-offset,.mdl-cell--5-offset-tablet.mdl-cell--5-offset-tablet{margin-left:calc(62.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset-tablet.mdl-cell--5-offset-tablet{margin-left:62.5%}.mdl-cell--6-offset,.mdl-cell--6-offset-tablet.mdl-cell--6-offset-tablet{margin-left:calc(75% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset-tablet.mdl-cell--6-offset-tablet{margin-left:75%}.mdl-cell--7-offset,.mdl-cell--7-offset-tablet.mdl-cell--7-offset-tablet{margin-left:calc(87.5% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset-tablet.mdl-cell--7-offset-tablet{margin-left:87.5%}}@media (min-width:840px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:33.3333333333%}.mdl-cell--hide-desktop{display:none!important}.mdl-cell--order-1-desktop.mdl-cell--order-1-desktop{-webkit-order:1;-ms-flex-order:1;order:1}.mdl-cell--order-2-desktop.mdl-cell--order-2-desktop{-webkit-order:2;-ms-flex-order:2;order:2}.mdl-cell--order-3-desktop.mdl-cell--order-3-desktop{-webkit-order:3;-ms-flex-order:3;order:3}.mdl-cell--order-4-desktop.mdl-cell--order-4-desktop{-webkit-order:4;-ms-flex-order:4;order:4}.mdl-cell--order-5-desktop.mdl-cell--order-5-desktop{-webkit-order:5;-ms-flex-order:5;order:5}.mdl-cell--order-6-desktop.mdl-cell--order-6-desktop{-webkit-order:6;-ms-flex-order:6;order:6}.mdl-cell--order-7-desktop.mdl-cell--order-7-desktop{-webkit-order:7;-ms-flex-order:7;order:7}.mdl-cell--order-8-desktop.mdl-cell--order-8-desktop{-webkit-order:8;-ms-flex-order:8;order:8}.mdl-cell--order-9-desktop.mdl-cell--order-9-desktop{-webkit-order:9;-ms-flex-order:9;order:9}.mdl-cell--order-10-desktop.mdl-cell--order-10-desktop{-webkit-order:10;-ms-flex-order:10;order:10}.mdl-cell--order-11-desktop.mdl-cell--order-11-desktop{-webkit-order:11;-ms-flex-order:11;order:11}.mdl-cell--order-12-desktop.mdl-cell--order-12-desktop{-webkit-order:12;-ms-flex-order:12;order:12}.mdl-cell--1-col,.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:calc(8.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:8.3333333333%}.mdl-cell--2-col,.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:calc(16.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:16.6666666667%}.mdl-cell--3-col,.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:25%}.mdl-cell--4-col,.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:33.3333333333%}.mdl-cell--5-col,.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:calc(41.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:41.6666666667%}.mdl-cell--6-col,.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:50%}.mdl-cell--7-col,.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:calc(58.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:58.3333333333%}.mdl-cell--8-col,.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:calc(66.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:66.6666666667%}.mdl-cell--9-col,.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:75%}.mdl-cell--10-col,.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:calc(83.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:83.3333333333%}.mdl-cell--11-col,.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:calc(91.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:91.6666666667%}.mdl-cell--12-col,.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:100%}.mdl-cell--1-offset,.mdl-cell--1-offset-desktop.mdl-cell--1-offset-desktop{margin-left:calc(8.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--1-offset-desktop.mdl-cell--1-offset-desktop{margin-left:8.3333333333%}.mdl-cell--2-offset,.mdl-cell--2-offset-desktop.mdl-cell--2-offset-desktop{margin-left:calc(16.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--2-offset-desktop.mdl-cell--2-offset-desktop{margin-left:16.6666666667%}.mdl-cell--3-offset,.mdl-cell--3-offset-desktop.mdl-cell--3-offset-desktop{margin-left:calc(25% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--3-offset-desktop.mdl-cell--3-offset-desktop{margin-left:25%}.mdl-cell--4-offset,.mdl-cell--4-offset-desktop.mdl-cell--4-offset-desktop{margin-left:calc(33.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--4-offset-desktop.mdl-cell--4-offset-desktop{margin-left:33.3333333333%}.mdl-cell--5-offset,.mdl-cell--5-offset-desktop.mdl-cell--5-offset-desktop{margin-left:calc(41.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--5-offset-desktop.mdl-cell--5-offset-desktop{margin-left:41.6666666667%}.mdl-cell--6-offset,.mdl-cell--6-offset-desktop.mdl-cell--6-offset-desktop{margin-left:calc(50% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--6-offset-desktop.mdl-cell--6-offset-desktop{margin-left:50%}.mdl-cell--7-offset,.mdl-cell--7-offset-desktop.mdl-cell--7-offset-desktop{margin-left:calc(58.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--7-offset-desktop.mdl-cell--7-offset-desktop{margin-left:58.3333333333%}.mdl-cell--8-offset,.mdl-cell--8-offset-desktop.mdl-cell--8-offset-desktop{margin-left:calc(66.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--8-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--8-offset-desktop.mdl-cell--8-offset-desktop{margin-left:66.6666666667%}.mdl-cell--9-offset,.mdl-cell--9-offset-desktop.mdl-cell--9-offset-desktop{margin-left:calc(75% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--9-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--9-offset-desktop.mdl-cell--9-offset-desktop{margin-left:75%}.mdl-cell--10-offset,.mdl-cell--10-offset-desktop.mdl-cell--10-offset-desktop{margin-left:calc(83.3333333333% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--10-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--10-offset-desktop.mdl-cell--10-offset-desktop{margin-left:83.3333333333%}.mdl-cell--11-offset,.mdl-cell--11-offset-desktop.mdl-cell--11-offset-desktop{margin-left:calc(91.6666666667% + 8px)}.mdl-grid.mdl-grid--no-spacing>.mdl-cell--11-offset,.mdl-grid.mdl-grid--no-spacing>.mdl-cell--11-offset-desktop.mdl-cell--11-offset-desktop{margin-left:91.6666666667%}}body{margin:0}.styleguide-demo h1{margin:48px 24px 0}.styleguide-demo h1:after{content:'';display:block;width:100%;border-bottom:1px solid rgba(0,0,0,.5);margin-top:24px}.styleguide-demo{opacity:0;transition:opacity .6s ease}.styleguide-masthead{height:256px;background:#212121;padding:115px 16px 0}.styleguide-container{position:relative;max-width:960px;width:100%}.styleguide-title{color:#fff;bottom:auto;position:relative;font-size:56px;font-weight:300;line-height:1;letter-spacing:-.02em}.styleguide-title:after{border-bottom:0}.styleguide-title span{font-weight:300}.mdl-styleguide .mdl-layout__drawer .mdl-navigation__link{padding:10px 24px}.demosLoaded .styleguide-demo{opacity:1}iframe{display:block;width:100%;border:none}iframe.heightSet{overflow:hidden}.demo-wrapper{margin:24px}.demo-wrapper iframe{border:1px solid rgba(0,0,0,.5)} \ No newline at end of file From 6b5a73cd761d692cf256b3092f9eec2073867bef Mon Sep 17 00:00:00 2001 From: Eugenio Romano <eromano@users.noreply.github.com> Date: Wed, 11 Jan 2017 18:00:04 +0000 Subject: [PATCH 052/108] #1297 Loading Bar doesn't appear anymore (#1437) --- demo-shell-ng2/index.html | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html index 09a4d29064..5253f85ead 100644 --- a/demo-shell-ng2/index.html +++ b/demo-shell-ng2/index.html @@ -10,10 +10,10 @@ <!-- 1. Load libraries --> <!-- Polyfill(s) for Safari (pre-10.x) --> <script src=js/Intl.min.js></script> - + <!-- IE/FF --> <script src=js/element.scrollintoviewifneeded-polyfill.js></script> - + <!--[if IE]> <script src=js/shim.min.js></script> <script src=//cdnjs.cloudflare.com/ajax/libs/dom4/1.8.3/dom4.js></script> @@ -50,6 +50,31 @@ .mdl-layout__header-row .mdl-navigation__link { color: rgb(255, 255, 255); } + + .loader-container { + display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ + display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ + display: -webkit-flex; /* NEW - Chrome */ + display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */ + -webkit-box-flex-direction: row; + -moz-box-flex-direction: row; + -webkit-flex-direction: row; + flex-direction: row; + height:100%; + } + + .loader-item { + margin: auto; + max-height:100px; + max-width:300px; + } + + .loader-text{ + white-space: nowrap; + text-align: center; + position: relative; + } + </style> </head> <!-- 3. Display the application --> @@ -57,9 +82,14 @@ <alfresco-app> <div id="loader-container" class="loader-container"> <div class="loader-item"> - <div id="loader-spin" class="mdl-progress mdl-js-progress mdl-progress__indeterminate"></div> + <div id="loader-spin" class="mdl-progress mdl-js-progress mdl-progress__indeterminate is-upgraded" + data-upgraded=",MaterialProgress"> + <div class="progressbar bar bar1" style="width: 0%;"></div> + <div class="bufferbar bar bar2" style="width: 100%;"></div> + <div class="auxbar bar bar3" style="width: 0%;"></div> + </div> <div id="loader-text" class="loader-text">Loading Demo Shell..</div> - </div > + </div> </div> </alfresco-app> </body> From 0df246f7abda847c1953a11f44f2ec35ede6549d Mon Sep 17 00:00:00 2001 From: Eugenio Romano <eromano@users.noreply.github.com> Date: Wed, 11 Jan 2017 18:10:29 +0000 Subject: [PATCH 053/108] Wording for unsupported file could be better #1428 (#1430) * Wording for unsupported file could be better #1428 * change text --- .../src/componets/notSupportedFormat.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.html b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.html index 0fd7a550cd..10436b9257 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.html +++ b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.html @@ -1,7 +1,7 @@ <section class="section--center mdl-grid mdl-grid--no-spacing"> <div class="viewer-margin mdl-card mdl-cell mdl-cell--9-col-desktop mdl-cell--6-col-tablet mdl-cell--4-col-phone mdl-shadow--2dp"> <div class="viewer-download-text mdl-card__supporting-text full_width"> - <h4>File <span>{{nameFile}}</span> is an unsupported format</h4> + <h4>File '<span>{{nameFile}}</span>' is of an unsupported format</h4> </div> <div class="center-element mdl-card__actions"> <button id="viewer-download-button" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent" (click)="download()"> From 8ac8a74ea2964709cc26a8ae425398623b049829 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Thu, 12 Jan 2017 12:10:59 +0000 Subject: [PATCH 054/108] hide titles for start forms fixes #1410 --- .../src/components/activiti-start-form.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index c96463a0bf..bb84ce05e1 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -74,6 +74,8 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, if (this.translate) { this.translate.addTranslationFolder('ng2-activiti-form', 'node_modules/ng2-activiti-form/src'); } + + this.showTitle = false; } ngOnChanges(changes: SimpleChanges) { From 0ee5c9846a323f2da08baab3c90a5014ca8c5f81 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Thu, 12 Jan 2017 14:12:52 +0000 Subject: [PATCH 055/108] fix error handling and "this" context (#1445) * fix error handling and "this" context * fix typo --- .../src/services/analytics.service.ts | 16 ++++---- .../src/services/diagrams.service.ts | 2 +- .../activiti-start-form.component.ts | 8 +--- .../widgets/dropdown/dropdown.widget.ts | 4 +- .../radio-buttons/radio-buttons.widget.ts | 4 +- .../widgets/typeahead/typeahead.widget.ts | 4 +- .../src/services/activiti-alfresco.service.ts | 4 +- .../src/services/form.service.ts | 37 +++++++++++-------- .../src/services/widget-visibility.service.ts | 4 +- .../src/services/activiti-process.service.ts | 28 +++++++------- .../src/services/activiti-people.service.ts | 6 +-- .../src/services/activiti-tasklist.service.ts | 26 ++++++------- .../src/services/renditions.service.ts | 6 +-- .../src/services/document-list.service.ts | 4 +- .../src/services/alfresco-search.service.ts | 2 +- .../src/services/tag.service.ts | 8 ++-- .../src/services/upload.service.ts | 2 +- 17 files changed, 83 insertions(+), 82 deletions(-) diff --git a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts index 344b742ae0..c1b3242e4d 100644 --- a/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts +++ b/ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts @@ -42,14 +42,14 @@ export class AnalyticsService { reports.push(reportModel); }); return reports; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } getReportParams(reportId: string): Observable<any> { return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.getReportParams(reportId)) .map((res: any) => { return new ReportParametersModel(res); - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } getParamValuesByType(type: string, appId: string, reportId?: string, processDefinitionId?: string) { @@ -122,7 +122,7 @@ export class AnalyticsService { paramOptions.push(new ParameterValueModel(opt)); }); return paramOptions; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } getProcessDefinitionsValues(appId: string): Observable<any> { @@ -133,7 +133,7 @@ export class AnalyticsService { paramOptions.push(new ParameterValueModel(opt)); }); return paramOptions; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } getTasksByProcessDefinitionId(reportId: string, processDefinitionId: string): Observable<any> { @@ -144,7 +144,7 @@ export class AnalyticsService { paramOptions.push(new ParameterValueModel({ id: opt, name: opt })); }); return paramOptions; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } getReportsByParams(reportId: number, paramsQuery: any): Observable<any> { @@ -168,20 +168,20 @@ export class AnalyticsService { }); return elements; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } createDefaultReports(): Observable<any> { return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.createDefaultReports()) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } updateReport(reportId: number, name: string): Observable<any> { return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.updateReport(reportId, name)) .map((res: any) => { this.logService.info('upload'); - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } private handleError(error: Response) { diff --git a/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts b/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts index 92a663c2ea..abe8cd5349 100644 --- a/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts +++ b/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts @@ -37,7 +37,7 @@ export class DiagramsService { .map((res: any) => { let body = res.json(); return body; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } public getHeaders(): Headers { diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index bb84ce05e1..72e2028223 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -105,9 +105,7 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, // this.form.processDefinitionId = this.processDefinitionId; this.formLoaded.emit(this.form); }, - (error) => { - this.handleError(error); - } + error => this.handleError(error) ); } @@ -120,9 +118,7 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, this.form = this.parseForm(form); this.formLoaded.emit(this.form); }, - (error) => { - this.handleError(error); - } + error => this.handleError(error) ); } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts index a21d86ad1d..5d1b7db5de 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts @@ -61,7 +61,7 @@ export class DropdownWidget extends WidgetComponent implements OnInit { this.field.options = options.concat((result || [])); this.field.updateForm(); }, - this.handleError + err => this.handleError(err) ); } @@ -80,7 +80,7 @@ export class DropdownWidget extends WidgetComponent implements OnInit { this.field.options = options.concat((result || [])); this.field.updateForm(); }, - this.handleError + err => this.handleError(err) ); } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.ts index f92316c546..5f1c960241 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.ts @@ -57,7 +57,7 @@ export class RadioButtonsWidget extends WidgetComponent implements OnInit { this.field.options = result || []; this.field.updateForm(); }, - this.handleError + err => this.handleError(err) ); } @@ -72,7 +72,7 @@ export class RadioButtonsWidget extends WidgetComponent implements OnInit { this.field.options = result || []; this.field.updateForm(); }, - this.handleError + err => this.handleError(err) ); } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.ts index 253c9cd08a..37eb4ac166 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.ts @@ -70,7 +70,7 @@ export class TypeaheadWidget extends WidgetComponent implements OnInit { this.field.updateForm(); this.visibilityService.refreshEntityVisibility(this.field); }, - this.handleError + err => this.handleError(err) ); } @@ -95,7 +95,7 @@ export class TypeaheadWidget extends WidgetComponent implements OnInit { this.field.updateForm(); this.visibilityService.refreshEntityVisibility(this.field); }, - this.handleError + err => this.handleError(err) ); } diff --git a/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts b/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts index e9a02d7fa6..e7990ff80b 100644 --- a/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/activiti-alfresco.service.ts @@ -44,7 +44,7 @@ export class ActivitiAlfrescoContentService { let accountShortId = accountId.replace('alfresco-', ''); return Observable.fromPromise(apiService.activiti.alfrescoApi.getContentInFolder(accountShortId, folderId)) .map(this.toJsonArray) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -63,7 +63,7 @@ export class ActivitiAlfrescoContentService { simpleType: node.simpleType, source: accountId, sourceId: node.id + '@' + siteId - })).map(this.toJson).catch(this.handleError); + })).map(this.toJson).catch(err => this.handleError(err)); } toJson(res: any) { diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.ts b/ng2-components/ng2-activiti-form/src/services/form.service.ts index 3e76e9a13c..85f77dc42a 100644 --- a/ng2-components/ng2-activiti-form/src/services/form.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/form.service.ts @@ -49,10 +49,11 @@ export class FormService { this.addFieldsToAForm(form.id, formDefinitionModel).subscribe(formData => { observer.next(formData); observer.complete(); - }, this.handleError); + }, err => this.handleError(err)); }, - this.handleError); - }, this.handleError); + err => this.handleError(err)); + }, + err => this.handleError(err)); }); } @@ -88,9 +89,13 @@ export class FormService { 'modelType': 2 }; - return Observable.fromPromise(this.apiService.getInstance().activiti.modelsApi.getModels(opts)).map(function (forms: any) { - return forms.data.find(formdata => formdata.name === name); - }).catch(this.handleError); + return Observable.fromPromise( + this.apiService.getInstance().activiti.modelsApi.getModels(opts)) + .map(function (forms: any) { + return forms.data.find(formdata => formdata.name === name); + }) + .catch(err => this.handleError(err) + ); } /** @@ -112,7 +117,7 @@ export class FormService { getProcessDefinitions(): Observable<any> { return Observable.fromPromise(this.apiService.getInstance().activiti.processApi.getProcessDefinitions({})) .map(this.toJsonArray) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -123,7 +128,7 @@ export class FormService { getTasks(): Observable<any> { return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.listTasks({})) .map(this.toJsonArray) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -134,7 +139,7 @@ export class FormService { getTask(taskId: string): Observable<any> { return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.getTask(taskId)) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -147,7 +152,7 @@ export class FormService { let body = JSON.stringify({values: formValues}); return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.saveTaskForm(taskId, body)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -165,7 +170,7 @@ export class FormService { let body = JSON.stringify(data); return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.completeTaskForm(taskId, body)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -176,7 +181,7 @@ export class FormService { getTaskForm(taskId: string): Observable<any> { return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.getTaskForm(taskId)) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -187,7 +192,7 @@ export class FormService { getFormDefinitionById(formId: string): Observable<any> { return Observable.fromPromise(this.apiService.getInstance().activiti.editorApi.getForm(formId)) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -204,7 +209,7 @@ export class FormService { return Observable.fromPromise(this.apiService.getInstance().activiti.modelsApi.getModels(opts)) .map(this.getFormId) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -216,7 +221,7 @@ export class FormService { return Observable.fromPromise( this.apiService.getInstance().activiti.processApi.getProcessInstanceStartForm(processId)) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -228,7 +233,7 @@ export class FormService { return Observable.fromPromise( this.apiService.getInstance().activiti.processApi.getProcessDefinitionStartForm(processId)) .map(this.toJson) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts index a9056c2c37..f8a411e9ea 100644 --- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts @@ -237,14 +237,14 @@ export class WidgetVisibilityService { this.processVarList = <TaskProcessVariableModel[]>jsonRes; return jsonRes; }) - .catch(this.handleError); + .catch(err => this.handleError(err)); } toJson(res: any) { return res || {}; } - private handleError() { + private handleError(err) { this.logService.error('Error while performing a call'); return Observable.throw('Error while performing a call - Server error'); } diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts index 99554a4fd3..cede5b2ea9 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts @@ -39,7 +39,7 @@ export class ActivitiProcessService { getDeployedApplications(name: string): Observable<AppDefinitionRepresentationModel> { return Observable.fromPromise(this.apiService.getInstance().activiti.appsApi.getAppDefinitions()) .map((response: any) => response.data.find((p: AppDefinitionRepresentationModel) => p.name === name)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } getProcessInstances(requestNode: ProcessFilterRequestRepresentation): Observable<ProcessInstance[]> { @@ -50,7 +50,7 @@ export class ActivitiProcessService { } else { return res.data; } - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } getProcessFilters(appId: number): Observable<FilterProcessRepresentationModel[]> { @@ -69,7 +69,7 @@ export class ActivitiProcessService { } return filters; }) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -148,12 +148,12 @@ export class ActivitiProcessService { addFilter(filter: FilterProcessRepresentationModel): Observable<FilterProcessRepresentationModel> { delete filter.filter.assignment; return Observable.fromPromise(this.callApiAddFilter(filter)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } getProcess(id: string): Observable<ProcessInstance> { return Observable.fromPromise(this.apiService.getInstance().activiti.processApi.getProcessInstance(id)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } getProcessTasks(id: string, state?: string): Observable<TaskDetailsModel[]> { @@ -169,7 +169,7 @@ export class ActivitiProcessService { task.created = moment(task.created, 'YYYY-MM-DD').format(); return task; })) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -192,7 +192,7 @@ export class ActivitiProcessService { comments.push(new Comment(comment.id, comment.message, comment.created, user)); }); return comments; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } /** @@ -207,7 +207,7 @@ export class ActivitiProcessService { ) .map((response: Comment) => { return new Comment(response.id, response.message, response.created, response.createdBy); - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } @@ -223,7 +223,7 @@ export class ActivitiProcessService { ) .map(this.extractData) .map(processDefs => processDefs.map((pd) => new ProcessDefinitionRepresentation(pd))) - .catch(this.handleError); + .catch(err => this.handleError(err)); } startProcess(processDefinitionId: string, name: string, outcome?: string, startFormValues?: any): Observable<ProcessInstance> { @@ -241,14 +241,14 @@ export class ActivitiProcessService { this.apiService.getInstance().activiti.processApi.startNewProcessInstance(startRequest) ) .map((pd) => new ProcessInstance(pd)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } cancelProcess(processInstanceId: string): Observable<void> { return Observable.fromPromise( this.apiService.getInstance().activiti.processApi.deleteProcessInstance(processInstanceId) ) - .catch(this.handleError); + .catch(err => this.handleError(err)); } getProcessInstanceVariables(processDefinitionId: string): Observable<ProcessInstanceVariable[]> { @@ -256,21 +256,21 @@ export class ActivitiProcessService { this.apiService.getInstance().activiti.processInstanceVariablesApi.getProcessInstanceVariables(processDefinitionId) ) .map((processVars: any[]) => processVars.map((pd) => new ProcessInstanceVariable(pd))) - .catch(this.handleError); + .catch(err => this.handleError(err)); } createOrUpdateProcessInstanceVariables(processDefinitionId: string, variables: ProcessInstanceVariable[]): Observable<ProcessInstanceVariable[]> { return Observable.fromPromise( this.apiService.getInstance().activiti.processInstanceVariablesApi.createOrUpdateProcessInstanceVariables(processDefinitionId, variables) ) - .catch(this.handleError); + .catch(err => this.handleError(err)); } deleteProcessInstanceVariable(processDefinitionId: string, variableName: string): Observable<void> { return Observable.fromPromise( this.apiService.getInstance().activiti.processInstanceVariablesApi.deleteProcessInstanceVariable(processDefinitionId, variableName) ) - .catch(this.handleError); + .catch(err => this.handleError(err)); } private callApiGetUserProcessInstanceFilters(filterOpts) { diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts index 7817da68ca..c6e6a91b5a 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts @@ -32,19 +32,19 @@ export class ActivitiPeopleService { let option = {excludeTaskId: taskId, filter: searchWord}; return Observable.fromPromise(this.getWorkflowUserApi(option)) .map((response: any) => <User[]> response.data || []) - .catch(this.handleError); + .catch(err => this.handleError(err)); } involveUserWithTask(taskId: string, idToInvolve: string): Observable<User[]> { let node = {userId: idToInvolve}; return Observable.fromPromise(this.involveUserToTaskApi(taskId, node)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } removeInvolvedUser(taskId: string, idToRemove: string): Observable<User[]> { let node = {userId: idToRemove}; return Observable.fromPromise(this.removeInvolvedUserFromTaskApi(taskId, node)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } private getWorkflowUserApi(options: any) { diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts index 7c5e285e49..eb884cee79 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts @@ -43,7 +43,7 @@ export class ActivitiTaskListService { } return response.data; }) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -62,7 +62,7 @@ export class ActivitiTaskListService { return this.createDefaultFilter(appId); } return filters; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } /** @@ -78,7 +78,7 @@ export class ActivitiTaskListService { } else { return res.data; } - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } /** @@ -91,7 +91,7 @@ export class ActivitiTaskListService { .map(res => res) .map((details: any) => { return new TaskDetailsModel(details); - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } /** @@ -109,7 +109,7 @@ export class ActivitiTaskListService { comments.push(new Comment(comment.id, comment.message, comment.created, user)); }); return comments; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } /** @@ -126,7 +126,7 @@ export class ActivitiTaskListService { checklists.push(new TaskDetailsModel(checklist)); }); return checklists; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } /** @@ -147,7 +147,7 @@ export class ActivitiTaskListService { forms.push(new Form(form.id, form.name)); }); return forms; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } attachFormToATask(taskId: string, formId: number): Observable<any> { @@ -191,7 +191,7 @@ export class ActivitiTaskListService { .map(res => res) .map((response: TaskDetailsModel) => { return new TaskDetailsModel(response); - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } /** @@ -204,7 +204,7 @@ export class ActivitiTaskListService { .map(res => res) .map((response: FilterRepresentationModel) => { return response; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } /** @@ -218,7 +218,7 @@ export class ActivitiTaskListService { .map(res => res) .map((response: Comment) => { return new Comment(response.id, response.message, response.created, response.createdBy); - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } @@ -242,7 +242,7 @@ export class ActivitiTaskListService { return Observable.fromPromise(this.callApiTasksFiltered(requestNode)) .map((res: any) => { return res; - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } /** @@ -255,7 +255,7 @@ export class ActivitiTaskListService { .map(res => res) .map((response: TaskDetailsModel) => { return new TaskDetailsModel(response); - }).catch(this.handleError); + }).catch(err => this.handleError(err)); } /** @@ -264,7 +264,7 @@ export class ActivitiTaskListService { */ claimTask(taskId: string): Observable<TaskDetailsModel> { return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.claimTask(taskId)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } private callApiTasksFiltered(requestNode: TaskQueryRequestRepresentationModel) { diff --git a/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts b/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts index 0b4ebf6467..2d4ce2bb1e 100644 --- a/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/renditions.service.ts @@ -63,17 +63,17 @@ export class RenditionsService { getRendition(nodeId: string, encoding: string) { return Observable.fromPromise(this.apiService.getInstance().core.renditionsApi.getRendition(nodeId, encoding)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } getRenditionsListByNodeId(nodeId: string) { return Observable.fromPromise(this.apiService.getInstance().core.renditionsApi.getRenditions(nodeId)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } createRendition(nodeId: string, encoding: string) { return Observable.fromPromise(this.apiService.getInstance().core.renditionsApi.createRendition(nodeId, {id: encoding})) - .catch(this.handleError); + .catch(err => this.handleError(err)); } private handleError(error: any): Observable<any> { diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts index a8a66bd4a8..336ce1be70 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts @@ -103,7 +103,7 @@ export class DocumentListService { */ createFolder(name: string, parentId: string): Observable<MinimalNodeEntity> { return Observable.fromPromise(this.apiService.getInstance().nodes.createFolder(name, '/', parentId)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } /** @@ -115,7 +115,7 @@ export class DocumentListService { getFolder(folder: string, opts?: any) { return Observable.fromPromise(this.getNodesPromise(folder, opts)) .map(res => <NodePaging> res) - .catch(this.handleError); + .catch(err => this.handleError(err)); } getFolderNode(nodeId: string): Promise<MinimalNodeEntryEntity> { diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts index e3db854360..6690c8fbbf 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts @@ -39,7 +39,7 @@ export class AlfrescoSearchService { public getNodeQueryResults(term: string, options?: SearchOptions): Observable<any> { return Observable.fromPromise(this.getQueryNodesPromise(term, options)) .map(res => <any> res) - .catch(this.handleError); + .catch(err => this.handleError(err)); } private getQueryNodesPromise(term: string, opts: SearchOptions) { diff --git a/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts b/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts index 5cec655ac8..72e77d221e 100644 --- a/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts +++ b/ng2-components/ng2-alfresco-tag/src/services/tag.service.ts @@ -37,12 +37,12 @@ export class TagService { getTagsByNodeId(nodeId: string): any { return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.getNodeTags(nodeId)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } getAllTheTags() { return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.getTags()) - .catch(this.handleError); + .catch(err => this.handleError(err)); } addTag(nodeId: string, tagName: string): any { @@ -51,12 +51,12 @@ export class TagService { tagBody.tag = tagName; return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.addTag(nodeId, tagBody)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } removeTag(nodeId: string, tag: string): any { return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.removeTag(nodeId, tag)) - .catch(this.handleError); + .catch(err => this.handleError(err)); } private handleError(error: any) { diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts index de4f4e90f7..480a766d93 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts @@ -167,7 +167,7 @@ export class UploadService { return res; }) .do(data => this.logService.info('Node data', data)) // eyeball results in the console - .catch((err) => this.handleError(err)); + .catch(err => this.handleError(err)); } private callApiCreateFolder(relativePath: string, name: string) { From 5be659779d661c0a3c53c9629b0be273ea742703 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Thu, 12 Jan 2017 14:41:19 +0000 Subject: [PATCH 056/108] Update README.md --- ng2-components/ng2-alfresco-viewer/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ng2-components/ng2-alfresco-viewer/README.md b/ng2-components/ng2-alfresco-viewer/README.md index e7e46063c9..f13e79a148 100644 --- a/ng2-components/ng2-alfresco-viewer/README.md +++ b/ng2-components/ng2-alfresco-viewer/README.md @@ -32,6 +32,8 @@ </a> </p> +See it live: [Viewer Quickstart](https://embed.plnkr.co/iTuG1lFIXfsP95l6bDW6/) + ## Prerequisites Before you start using this development framework, make sure you have installed all required software and done all the From 01ab948666e0e14b3ee4262be2feaea59c0587e6 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Fri, 13 Jan 2017 09:38:42 +0000 Subject: [PATCH 057/108] #1440 fix version library (#1450) --- ng2-components/ng2-activiti-analytics/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index 99350d02cd..6055b3bbca 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -56,7 +56,7 @@ "rxjs": "5.0.0-beta.12", "systemjs": "0.19.27", "zone.js": "^0.6.23", - "chart.js": "^2.1.4", + "chart.js": "2.3.0", "md-date-time-picker": "^2.2.0", "ng2-charts": "1.1.0", "moment": "2.15.1", From 0fa87bb17d6a0c3b6781f860b3f502397a741ecc Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Fri, 13 Jan 2017 12:45:37 +0000 Subject: [PATCH 058/108] selected row highlight (#1448) * showing selected row Support for showing selected row for the components: - DataTable - DocumentList - Activiti TaskList - Activiti ProcessList fixes #170 * unit test fixes --- .../activiti-processlist.component.ts | 7 ++++++- .../components/activiti-tasklist.component.ts | 18 +++++++++--------- .../datatable/datatable.component.css | 5 +++++ .../datatable/datatable.component.html | 3 ++- .../datatable/datatable.component.ts | 15 +++++++++++---- .../src/data/datatable-adapter.ts | 1 + .../src/data/object-datatable-adapter.ts | 2 ++ .../src/data/share-datatable-adapter.ts | 1 + 8 files changed, 37 insertions(+), 15 deletions(-) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts index 764662dd08..2c7db1ee28 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts @@ -191,8 +191,13 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { */ selectFirst() { if (!this.isListEmpty()) { - this.currentInstanceId = this.data.getRows()[0].getValue('id'); + let row = this.data.getRows()[0]; + this.data.selectedRow = row; + this.currentInstanceId = row.getValue('id'); } else { + if (this.data) { + this.data.selectedRow = null; + } this.currentInstanceId = null; } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts index db9ae4d8c0..be457cac5d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts @@ -189,20 +189,20 @@ export class ActivitiTaskList implements OnInit, OnChanges { */ selectTask(taskIdToSelect: string) { if (!this.isListEmpty()) { - let dataRow = this.data.getRows().find(row => row.getValue('id') === taskIdToSelect); - this.currentInstanceId = dataRow ? dataRow.getValue('id') : this.selectFirst(); + let rows = this.data.getRows(); + if (rows.length > 0) { + let dataRow = rows.find(row => row.getValue('id') === taskIdToSelect) || rows[0]; + this.data.selectedRow = dataRow; + this.currentInstanceId = dataRow.getValue('id'); + } } else { + if (this.data) { + this.data.selectedRow = null; + } this.currentInstanceId = null; } } - /** - * Select the first instance of a list if present - */ - selectFirst() { - return this.data.getRows()[0].getValue('id'); - } - /** * Return the current id * @returns {string} diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css index edc97ce169..d258331abc 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css @@ -114,3 +114,8 @@ border-collapse: unset; border-spacing: 0; } + + +.alfresco-datatable__row--selected { + color: rgb(68,138,255); +} diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html index b7f9035c1d..11be56699a 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html @@ -31,7 +31,8 @@ </thead> <tbody> - <tr *ngFor="let row of data.getRows(); let idx = index" tabindex="0"> + <tr *ngFor="let row of data.getRows(); let idx = index" tabindex="0" + [class.alfresco-datatable__row--selected]="selectedRow === row"> <td *ngIf="multiselect"> <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect mdl-data-table__select" diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts index cd0d2e7547..b8497b9ebc 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts @@ -53,10 +53,6 @@ export class DataTableComponent implements OnInit { @Output() rowDblClick: EventEmitter<DataRowEvent> = new EventEmitter<DataRowEvent>(); - noContentTemplate: TemplateRef<any>; - - isSelectAllChecked: boolean = false; - @Output() showRowContextMenu: EventEmitter<any> = new EventEmitter(); @@ -66,6 +62,13 @@ export class DataTableComponent implements OnInit { @Output() executeRowAction: EventEmitter<any> = new EventEmitter(); + noContentTemplate: TemplateRef<any>; + isSelectAllChecked: boolean = false; + + get selectedRow(): DataRow { + return this.data.selectedRow; + } + ngOnInit() { if (!this.data) { this.data = new ObjectDataTableAdapter([], []); @@ -82,6 +85,10 @@ export class DataTableComponent implements OnInit { e.preventDefault(); } + if (this.data) { + this.data.selectedRow = row; + } + this.rowClick.emit({ value: row, event: e diff --git a/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts b/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts index 41ebaada41..7883aebbb1 100644 --- a/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts @@ -16,6 +16,7 @@ */ export interface DataTableAdapter { + selectedRow: DataRow; getRows(): Array<DataRow>; setRows(rows: Array<DataRow>): void; getColumns(): Array<DataColumn>; diff --git a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts index d501c00abf..b84ac7495f 100644 --- a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts @@ -26,6 +26,8 @@ export class ObjectDataTableAdapter implements DataTableAdapter { private _rows: DataRow[]; private _columns: DataColumn[]; + selectedRow: DataRow; + static generateSchema(data: any[]) { let schema = []; diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts index c3cba404d3..ab112fc0bb 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts @@ -48,6 +48,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid thumbnails: boolean = false; dataLoaded: DataLoadedEventEmitter; + selectedRow: DataRow; constructor(private documentListService: DocumentListService, private basePath: string, From fcdc628d35ea27b0d09b399b66af6e4cd5b50fea Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Fri, 13 Jan 2017 04:46:40 -0800 Subject: [PATCH 059/108] #1432 - Added new system outcome : Start Process (#1453) * #1432 - Added system outcome for start process * 1432 - improved condition for system outcome check * #1432 - fix test for start process system outcome --- .../src/components/activiti-form.component.ts | 22 +++++++++++++++++-- .../activiti-start-form.component.ts | 17 ++++++++++++-- .../widgets/core/form-outcome.model.ts | 1 + .../widgets/core/form.model.spec.ts | 5 ++++- .../src/components/widgets/core/form.model.ts | 4 +++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts index 1e14a6846c..ca97208d71 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts @@ -15,7 +15,16 @@ * limitations under the License. */ -import { Component, OnInit, AfterViewChecked, OnChanges, SimpleChanges, Input, Output, EventEmitter } from '@angular/core'; +import { + Component, + OnInit, + AfterViewChecked, + OnChanges, + SimpleChanges, + Input, + Output, + EventEmitter +} from '@angular/core'; import { LogService } from 'ng2-alfresco-core'; import { EcmModelService } from './../services/ecm-model.service'; import { FormService } from './../services/form.service'; @@ -79,6 +88,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { static SAVE_OUTCOME_ID: string = '$save'; static COMPLETE_OUTCOME_ID: string = '$complete'; + static START_PROCESS_OUTCOME_ID: string = '$startProcess'; static CUSTOM_OUTCOME_ID: string = '$custom'; @Input() @@ -185,6 +195,9 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { if (outcome.name === FormOutcomeModel.SAVE_ACTION) { return this.showSaveButton; } + if (outcome.name === FormOutcomeModel.START_PROCESS_ACTION) { + return false; + } return true; } return false; @@ -247,6 +260,11 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { return true; } + if (outcome.id === ActivitiForm.START_PROCESS_OUTCOME_ID) { + this.completeTaskForm(); + return true; + } + if (outcome.id === ActivitiForm.CUSTOM_OUTCOME_ID) { this.formSaved.emit(this.form); this.storeFormAsMetadata(); @@ -421,7 +439,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { */ getFormDefinitionOutcomes(form: FormModel): FormOutcomeModel[] { return [ - new FormOutcomeModel(form, {id: '$custom', name: FormOutcomeModel.SAVE_ACTION, isSystem: true}) + new FormOutcomeModel(form, { id: '$custom', name: FormOutcomeModel.SAVE_ACTION, isSystem: true }) ]; } diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index 72e2028223..6800e87fc1 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -15,7 +15,17 @@ * limitations under the License. */ -import { Component, AfterViewChecked, OnChanges, SimpleChanges, Input, ViewChild, ElementRef, Output, EventEmitter } from '@angular/core'; +import { + Component, + AfterViewChecked, + OnChanges, + SimpleChanges, + Input, + ViewChild, + ElementRef, + Output, + EventEmitter +} from '@angular/core'; import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; import { ActivitiForm } from './activiti-form.component'; import { FormService } from './../services/form.service'; @@ -124,8 +134,11 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, /** @override */ isOutcomeButtonVisible(outcome: FormOutcomeModel): boolean { - if (outcome && outcome.name === FormOutcomeModel.SAVE_ACTION) { + if (outcome && outcome.isSystem && ( outcome.name === FormOutcomeModel.SAVE_ACTION || + outcome.name === FormOutcomeModel.COMPLETE_ACTION )) { return false; + } else if (outcome && outcome.name === FormOutcomeModel.START_PROCESS_ACTION) { + return true; } return super.isOutcomeButtonVisible(outcome); } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.ts index 219ddb7a41..2e0baed29b 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.ts @@ -22,6 +22,7 @@ export class FormOutcomeModel extends FormWidgetModel { static SAVE_ACTION: string = 'Save'; // Activiti 'Save' action name static COMPLETE_ACTION: string = 'Complete'; // Activiti 'Complete' action name + static START_PROCESS_ACTION: string = 'Start Process'; // Activiti 'Start Process' action name isSystem: boolean = false; diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.spec.ts index f61ab81c1c..c48bfad2e7 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.spec.ts @@ -270,13 +270,16 @@ describe('FormModel', () => { }; let form = new FormModel(json); - expect(form.outcomes.length).toBe(2); + expect(form.outcomes.length).toBe(3); expect(form.outcomes[0].id).toBe(FormModel.SAVE_OUTCOME); expect(form.outcomes[0].isSystem).toBeTruthy(); expect(form.outcomes[1].id).toBe(FormModel.COMPLETE_OUTCOME); expect(form.outcomes[1].isSystem).toBeTruthy(); + + expect(form.outcomes[2].id).toBe(FormModel.START_PROCESS_OUTCOME); + expect(form.outcomes[2].isSystem).toBeTruthy(); }); it('should create outcomes only when fields available', () => { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts index 73938624fb..d28fcc7e3d 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts @@ -29,6 +29,7 @@ export class FormModel { static UNSET_TASK_NAME: string = 'Nameless task'; static SAVE_OUTCOME: string = '$save'; static COMPLETE_OUTCOME: string = '$complete'; + static START_PROCESS_OUTCOME: string = '$startProcess'; readonly id: string; readonly name: string; @@ -103,11 +104,12 @@ export class FormModel { if (json.fields) { let saveOutcome = new FormOutcomeModel(this, { id: FormModel.SAVE_OUTCOME, name: 'Save', isSystem: true }); let completeOutcome = new FormOutcomeModel(this, {id: FormModel.COMPLETE_OUTCOME, name: 'Complete', isSystem: true }); + let startProcessOutcome = new FormOutcomeModel(this, { id: FormModel.START_PROCESS_OUTCOME, name: 'Start Process', isSystem: true }); let customOutcomes = (json.outcomes || []).map(obj => new FormOutcomeModel(this, obj)); this.outcomes = [saveOutcome].concat( - customOutcomes.length > 0 ? customOutcomes : [completeOutcome] + customOutcomes.length > 0 ? customOutcomes : [completeOutcome, startProcessOutcome] ); } } From 98523a8fc1920ca99420692154c263d16ab18e72 Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Fri, 13 Jan 2017 04:47:54 -0800 Subject: [PATCH 060/108] #1431 - reload tasklist when user click on task (#1456) --- .../app/components/activiti/activiti-demo.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index c7daf6051c..dc41a0707f 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -244,6 +244,7 @@ export class ActivitiDemoComponent implements AfterViewInit { onProcessDetailsTaskClick(event: TaskDetailsEvent) { event.preventDefault(); this.currentTaskId = event.value.id; + this.activititasklist.reload(); this.activeTab = 'tasks'; } From f3c690e0d7b2768ed78132ffcfd2cfb32477f869 Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Fri, 13 Jan 2017 04:48:22 -0800 Subject: [PATCH 061/108] #1447 - fixed wording for home page (#1457) --- .../app/components/home/home.component.html | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/demo-shell-ng2/app/components/home/home.component.html b/demo-shell-ng2/app/components/home/home.component.html index c889158838..6be4519ac1 100644 --- a/demo-shell-ng2/app/components/home/home.component.html +++ b/demo-shell-ng2/app/components/home/home.component.html @@ -7,11 +7,11 @@ </h2> </div> <div class="mdl-card__supporting-text"> - Demonstrates multiple Alfresco ECM components used together to show the files of you ECM instance : + Demonstrates multiple Alfresco ECM components used together to display the files of your ECM instance: <ul class="home--feature-list"> <li> <i class="material-icons home--feature-list__icon">brightness_1</i> - <span class="home--feature-list__text">Comunication with the Rest Api and core services</span> + <span class="home--feature-list__text">Communication with the Rest Api and core services</span> <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a> </li> <li> @@ -43,11 +43,11 @@ </h2> </div> <div class="mdl-card__supporting-text"> - Demonstrates multiple Alfresco BPM components used together to show your BPM prorcess and tasks: + Demonstrates multiple Alfresco BPM components used together to show your BPM process and tasks: <ul class="home--feature-list"> <li> <i class="material-icons home--feature-list__icon">brightness_1</i> - <span class="home--feature-list__text">Comunication with the Rest Api and core services</span> + <span class="home--feature-list__text">Communication with the Rest Api and core services</span> <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a> </li> <li> @@ -99,7 +99,7 @@ <ul class="home--feature-list"> <li> <i class="material-icons home--feature-list__icon">brightness_1</i> - <span class="home--feature-list__text">Comunication with the Rest Api and core services</span> + <span class="home--feature-list__text">Communication with the Rest Api and core services</span> <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a> </li> </ul> @@ -119,7 +119,7 @@ <ul class="home--feature-list"> <li> <i class="material-icons home--feature-list__icon">brightness_1</i> - <span class="home--feature-list__text">Comunication with the Rest Api and core services</span> + <span class="home--feature-list__text">Communication with the Rest Api and core services</span> <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a> </li> </ul> @@ -139,7 +139,7 @@ <ul class="home--feature-list"> <li> <i class="material-icons home--feature-list__icon">brightness_1</i> - <span class="home--feature-list__text">Comunication with the Rest Api and core services</span> + <span class="home--feature-list__text">Communication with the Rest Api and core services</span> <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a> </li> </ul> @@ -155,11 +155,11 @@ </h2> </div> <div class="mdl-card__supporting-text"> - Shows and create webscripts in your ECM instance: + Displays and creates webscripts in your ECM instance: <ul class="home--feature-list"> <li> <i class="material-icons home--feature-list__icon">brightness_1</i> - <span class="home--feature-list__text">Comunication with the Rest Api and core services</span> + <span class="home--feature-list__text">Communication with the Rest Api and core services</span> <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a> </li> </ul> @@ -175,11 +175,11 @@ </h2> </div> <div class="mdl-card__supporting-text"> - Shows and add tags to the node of your ECM instance: + Displays and adds tags to the node of your ECM instance: <ul class="home--feature-list"> <li> <i class="material-icons home--feature-list__icon">brightness_1</i> - <span class="home--feature-list__text">Comunication with Rest</span> + <span class="home--feature-list__text">Communication with Rest</span> <a href="https://www.npmjs.com/package/ng2-alfresco-core" target="_blank">ng2-alfresco-core</a> </li> </ul> From 6ee34a2e49d3f15db763f11f7f81e7a478c8e1dc Mon Sep 17 00:00:00 2001 From: Mario Romano <dnamario@hotmail.com> Date: Fri, 13 Jan 2017 12:54:04 +0000 Subject: [PATCH 062/108] #1387 fix rename document-list file (#1462) --- .../src/components/document-list.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts index c142e87b64..dac60616f0 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts @@ -38,7 +38,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni static DOUBLE_CLICK_NAVIGATION: string = 'dblclick'; static DEFAULT_PAGE_SIZE: number = 20; - baseComponentPath = module.id.replace('/components/document-list.js', ''); + baseComponentPath = module.id.replace('/components/document-list.component.js', ''); @Input() fallbackThubnail: string = this.baseComponentPath + '/assets/images/ft_ic_miscellaneous.svg'; From 0a725f00e2d4326106108201d7e0916c8ac5fa5d Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Fri, 13 Jan 2017 06:37:48 -0800 Subject: [PATCH 063/108] #1441 - clean checklist input after submit or cancel action (#1460) --- .../src/components/activiti-checklist.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts index 57dcfb8793..2b8db59108 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts @@ -120,6 +120,7 @@ export class ActivitiChecklist implements OnInit, OnChanges { (res: TaskDetailsModel) => { this.checklist.push(res); this.checklistTaskCreated.emit(res); + this.taskName = ''; }, (err) => { this.logService.error(err); @@ -132,5 +133,6 @@ export class ActivitiChecklist implements OnInit, OnChanges { if (this.dialog) { this.dialog.nativeElement.close(); } + this.taskName = ''; } } From 6658630eeadbb0dd78daa1a9df88d25514438a74 Mon Sep 17 00:00:00 2001 From: Will Abson <will.abson@gmail.com> Date: Fri, 13 Jan 2017 16:56:35 +0000 Subject: [PATCH 064/108] Process filters should use own model class not task filter (#1458) Refs #1422 --- .../activiti/activiti-demo.component.ts | 7 ++--- .../components/activiti-filters.component.ts | 26 +++++++++---------- .../src/models/filter-process.model.ts | 19 +++++++++++++- .../src/models/index.ts | 1 + .../src/services/activiti-process.service.ts | 1 - 5 files changed, 36 insertions(+), 18 deletions(-) diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index dc41a0707f..279d1de0ec 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -28,6 +28,7 @@ import { ActivitiProcessInstanceDetails, ActivitiProcessInstanceListComponent, ActivitiStartProcessInstance, + FilterProcessRepresentationModel, ProcessInstance } from 'ng2-activiti-processlist'; import { AnalyticsReportListComponent } from 'ng2-activiti-analytics'; @@ -87,7 +88,7 @@ export class ActivitiDemoComponent implements AfterViewInit { taskFilter: FilterRepresentationModel; report: any; - processFilter: FilterRepresentationModel; + processFilter: FilterProcessRepresentationModel; sub: Subscription; @@ -164,11 +165,11 @@ export class ActivitiDemoComponent implements AfterViewInit { this.currentTaskId = this.activititasklist.getCurrentId(); } - onProcessFilterClick(event: FilterRepresentationModel) { + onProcessFilterClick(event: FilterProcessRepresentationModel) { this.processFilter = event; } - onSuccessProcessFilterList(event: any) { + onSuccessProcessFilterList() { this.processFilter = this.activitiprocessfilter.getCurrentFilter(); } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts index d363543e21..e19d68ebb1 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts @@ -18,7 +18,7 @@ import { Component, Output, EventEmitter, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core'; import { Observable, Observer } from 'rxjs/Rx'; import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; -import { FilterRepresentationModel } from 'ng2-activiti-tasklist'; +import { FilterProcessRepresentationModel } from './../models/filter-process.model'; import { ActivitiProcessService } from './../services/activiti-process.service'; declare let componentHandler: any; @@ -32,10 +32,10 @@ declare let componentHandler: any; export class ActivitiProcessFilters implements OnInit, OnChanges { @Output() - filterClick: EventEmitter<FilterRepresentationModel> = new EventEmitter<FilterRepresentationModel>(); + filterClick: EventEmitter<FilterProcessRepresentationModel> = new EventEmitter<FilterProcessRepresentationModel>(); @Output() - onSuccess: EventEmitter<any> = new EventEmitter<any>(); + onSuccess: EventEmitter<FilterProcessRepresentationModel[]> = new EventEmitter<FilterProcessRepresentationModel[]>(); @Output() onError: EventEmitter<any> = new EventEmitter<any>(); @@ -46,17 +46,17 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { @Input() appName: string; - private filterObserver: Observer<FilterRepresentationModel>; - filter$: Observable<FilterRepresentationModel>; + private filterObserver: Observer<FilterProcessRepresentationModel>; + filter$: Observable<FilterProcessRepresentationModel>; - currentFilter: FilterRepresentationModel; + currentFilter: FilterProcessRepresentationModel; - filters: FilterRepresentationModel [] = []; + filters: FilterProcessRepresentationModel [] = []; constructor(private translate: AlfrescoTranslateService, private activiti: ActivitiProcessService, private logService: LogService) { - this.filter$ = new Observable<FilterRepresentationModel>(observer => this.filterObserver = observer).share(); + this.filter$ = new Observable<FilterProcessRepresentationModel>(observer => this.filterObserver = observer).share(); if (translate) { translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src'); @@ -64,7 +64,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { } ngOnInit() { - this.filter$.subscribe((filter: FilterRepresentationModel) => { + this.filter$.subscribe((filter: FilterProcessRepresentationModel) => { this.filters.push(filter); }); @@ -103,7 +103,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { */ getFiltersByAppId(appId?: number) { this.activiti.getProcessFilters(appId).subscribe( - (res: FilterRepresentationModel[]) => { + (res: FilterProcessRepresentationModel[]) => { this.resetFilter(); res.forEach((filter) => { this.filterObserver.next(filter); @@ -111,7 +111,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { this.selectFirstFilter(); this.onSuccess.emit(res); }, - (err) => { + (err: any) => { this.logService.error(err); this.onError.emit(err); } @@ -138,7 +138,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { * Pass the selected filter as next * @param filter */ - public selectFilter(filter: FilterRepresentationModel) { + public selectFilter(filter: FilterProcessRepresentationModel) { this.currentFilter = filter; this.filterClick.emit(filter); } @@ -158,7 +158,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { * Return the current task * @returns {FilterRepresentationModel} */ - getCurrentFilter(): FilterRepresentationModel { + getCurrentFilter(): FilterProcessRepresentationModel { return this.currentFilter; } diff --git a/ng2-components/ng2-activiti-processlist/src/models/filter-process.model.ts b/ng2-components/ng2-activiti-processlist/src/models/filter-process.model.ts index 3383d8db81..1dcb551476 100644 --- a/ng2-components/ng2-activiti-processlist/src/models/filter-process.model.ts +++ b/ng2-components/ng2-activiti-processlist/src/models/filter-process.model.ts @@ -28,7 +28,7 @@ export class FilterProcessRepresentationModel { name: string; recent: boolean; icon: string; - filter: any; + filter: ProcessFilterParamRepresentationModel; index: number; constructor(obj?: any) { @@ -44,3 +44,20 @@ export class FilterProcessRepresentationModel { return this.filter ? true : false; } } + +/** + * + * This object represent the parameters of a process filter. + * + * + * @returns {ProcessFilterParamRepresentationModel} . + */ +export class ProcessFilterParamRepresentationModel { + state: string; + sort: string; + + constructor(obj?: any) { + this.state = obj && obj.state || null; + this.sort = obj && obj.sort || null; + } +} diff --git a/ng2-components/ng2-activiti-processlist/src/models/index.ts b/ng2-components/ng2-activiti-processlist/src/models/index.ts index 7b879cbf50..b463bce748 100644 --- a/ng2-components/ng2-activiti-processlist/src/models/index.ts +++ b/ng2-components/ng2-activiti-processlist/src/models/index.ts @@ -15,6 +15,7 @@ * limitations under the License. */ +export * from './filter-process.model'; export * from './process-definition.model'; export * from './process-instance.model'; export * from './process-instance-filter.model'; diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts index cede5b2ea9..6d895158bf 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts @@ -146,7 +146,6 @@ export class ActivitiProcessService { * @returns {FilterProcessRepresentationModel} */ addFilter(filter: FilterProcessRepresentationModel): Observable<FilterProcessRepresentationModel> { - delete filter.filter.assignment; return Observable.fromPromise(this.callApiAddFilter(filter)) .catch(err => this.handleError(err)); } From 0afcc29e37003ba09c0926aeacde0e20e48e6f2e Mon Sep 17 00:00:00 2001 From: Will Abson <will.abson@gmail.com> Date: Fri, 13 Jan 2017 16:57:35 +0000 Subject: [PATCH 065/108] Load process definitions for Tasks app (#1459) Refs #1416 --- .../app/components/activiti/activiti-demo.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index 279d1de0ec..949d63b147 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -75,7 +75,7 @@ export class ActivitiDemoComponent implements AfterViewInit { analyticsreportlist: AnalyticsReportListComponent; @Input() - appId: number; + appId: number = null; layoutType: string; currentTaskId: string; From fdb232cb40e82db19d5dda06af138e21e3e89065 Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Fri, 13 Jan 2017 09:56:52 -0800 Subject: [PATCH 066/108] #1455 - added new check to show-hide validation icon next form title (#1463) --- ng2-components/ng2-activiti-form/README.md | 1 + .../src/components/activiti-form.component.html | 2 +- .../src/components/activiti-form.component.ts | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ng2-components/ng2-activiti-form/README.md b/ng2-components/ng2-activiti-form/README.md index a3f9ec4b1b..2fa4585432 100644 --- a/ng2-components/ng2-activiti-form/README.md +++ b/ng2-components/ng2-activiti-form/README.md @@ -238,6 +238,7 @@ The recommended set of properties can be found in the following table: | `showDebugButton` | boolean | false | Toggle debug options. | | `readOnly` | boolean | false | Toggle readonly state of the form. Enforces all form widgets render readonly if enabled. | | `showRefreshButton` | boolean | true | Toggle rendering of the `Refresh` button. | +| `showValidationIcon` | boolean | true | Toggle rendering of the validation icon next form title. | | `saveMetadata` | boolean | false | Store the value of the form as metadata. | | `path` | string | | Path of the folder where to store the metadata. | | `nameNode` (optional) | string | true | Name to assign to the new node where the metadata are stored. | diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html index 48411ae393..b1af9c278b 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html @@ -5,7 +5,7 @@ <div *ngIf="hasForm()"> <div class="mdl-card mdl-shadow--2dp activiti-form-container"> <div class="mdl-card__title"> - <i class="material-icons">{{ form.isValid ? 'event_available' : 'event_busy' }}</i> + <i *ngIf="showValidationIcon" class="material-icons">{{ form.isValid ? 'event_available' : 'event_busy' }}</i> <h2 *ngIf="isTitleEnabled()" class="mdl-card__title-text">{{form.taskName}}</h2> </div> <div class="mdl-card__media"> diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts index ca97208d71..278c534234 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts @@ -133,6 +133,9 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { @Input() showRefreshButton: boolean = true; + @Input() + showValidationIcon: boolean = true; + @Output() formSaved: EventEmitter<FormModel> = new EventEmitter<FormModel>(); From 473241f7923a6f59371d97e78897b216483eb6e1 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Mon, 16 Jan 2017 11:03:59 +0000 Subject: [PATCH 067/108] improved network settings (#1477) --- .vscode/settings.json | 3 ++- demo-shell-ng2/config/webpack.dev.js | 4 +++- demo-shell-ng2/package.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 995f793cb7..30d10b67e5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,5 +8,6 @@ "**/*.js": { "when": "$(basename).ts"}, "**/*.js.map": { "when": "$(basename)"}, "**/*.d.ts": { "when": "$(basename).ts"} - } + }, + "editor.renderIndentGuides": true } diff --git a/demo-shell-ng2/config/webpack.dev.js b/demo-shell-ng2/config/webpack.dev.js index 40a565e070..c1684029e5 100644 --- a/demo-shell-ng2/config/webpack.dev.js +++ b/demo-shell-ng2/config/webpack.dev.js @@ -10,7 +10,6 @@ module.exports = webpackMerge(commonConfig, { output: { path: helpers.root('dist'), - publicPath: 'http://localhost:3000/', filename: '[name].js', chunkFilename: '[id].chunk.js' }, @@ -60,6 +59,9 @@ module.exports = webpackMerge(commonConfig, { ], devServer: { + host: '0.0.0.0', + port: 3000, + inline: true, historyApiFallback: true, stats: 'minimal' } diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index 8e35ae6db4..fae7633dcb 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -5,7 +5,7 @@ "author": "Alfresco Software, Ltd.", "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings dist", - "start": "npm run server-versions && webpack-dev-server --inline --progress --port 3000 --max_old_space_size=4096 --max_new_space_size=4096", + "start": "npm run server-versions && webpack-dev-server --progress --max_old_space_size=4096 --max_new_space_size=4096", "start:dist": "wsrv -s dist/ -p 3000 -a 0.0.0.0", "clean-build": "rimraf 'app/{,**/}**.js' 'app/{,**/}**.js.map' 'app/{,**/}**.d.ts'", "test": "karma start", From 9655e51943bebf2c3c01cee3b1f25e67bc812331 Mon Sep 17 00:00:00 2001 From: Mario Romano <dnamario@hotmail.com> Date: Mon, 16 Jan 2017 11:49:43 +0000 Subject: [PATCH 068/108] #1471 rollback className change (#1472) --- demo-shell-ng2/app/app.component.ts | 8 ++--- .../app/components/files/files.component.ts | 4 +-- .../components/search/search-bar.component.ts | 4 +-- .../components/setting/setting.component.ts | 4 +-- .../ng2-activiti-analytics/demo/src/main.ts | 6 ++-- ...nalytics-report-heat-map.component.spec.ts | 4 +-- .../analytics-report-heat-map.component.ts | 4 +-- .../analytics-report-list.component.spec.ts | 4 +-- ...lytics-report-parameters.component.spec.ts | 4 +-- .../analytics-report-parameters.component.ts | 4 +-- .../components/analytics.component.spec.ts | 4 +-- .../src/components/analytics.component.ts | 4 +-- .../ng2-activiti-diagrams/demo/src/main.ts | 6 ++-- .../src/components/diagram.component.spec.ts | 4 +-- .../src/components/diagram.component.ts | 4 +-- .../src/services/diagrams.service.ts | 6 ++-- .../ng2-activiti-form/demo/src/main.ts | 6 ++-- .../activiti-start-form.component.spec.ts | 4 +-- .../activiti-start-form.component.ts | 4 +-- .../ng2-activiti-processlist/demo/src/main.ts | 6 ++-- .../components/activiti-filters.component.ts | 4 +-- ...ctiviti-process-comments.component.spec.ts | 4 +-- .../activiti-process-comments.component.ts | 4 +-- ...process-instance-details.component.spec.ts | 4 +-- ...viti-process-instance-details.component.ts | 4 +-- ...-process-instance-header.component.spec.ts | 4 +-- ...iviti-process-instance-header.component.ts | 4 +-- ...i-process-instance-tasks.component.spec.ts | 4 +-- ...tiviti-process-instance-tasks.component.ts | 4 +-- ...ocess-instance-variables.component.spec.ts | 4 +-- ...ti-process-instance-variables.component.ts | 4 +-- .../activiti-processlist.component.spec.ts | 4 +-- .../activiti-processlist.component.ts | 4 +-- .../activiti-start-process.component.spec.ts | 4 +-- .../activiti-start-process.component.ts | 4 +-- .../ng2-activiti-tasklist/demo/src/main.ts | 6 ++-- .../activiti-apps.component.spec.ts | 4 +-- .../src/components/activiti-apps.component.ts | 4 +-- .../activiti-checklist.component.spec.ts | 4 +-- .../activiti-checklist.component.ts | 4 +-- .../activiti-comments.component.spec.ts | 4 +-- .../components/activiti-comments.component.ts | 4 +-- .../components/activiti-filters.component.ts | 4 +-- .../activiti-people-search.component.spec.ts | 4 +-- .../activiti-people-search.component.ts | 4 +-- .../activiti-people.component.spec.ts | 4 +-- .../components/activiti-people.component.ts | 4 +-- .../activiti-start-task.component.spec.ts | 4 +-- .../activiti-start-task.component.ts | 4 +-- .../activiti-task-details.component.spec.ts | 4 +-- .../activiti-task-details.component.ts | 4 +-- .../activiti-task-header.component.spec.ts | 4 +-- .../activiti-task-header.component.ts | 4 +-- .../activiti-tasklist.component.spec.ts | 4 +-- .../components/activiti-tasklist.component.ts | 4 +-- ng2-components/ng2-alfresco-core/index.ts | 30 ++++++----------- .../AlfrescoAuthentication.service.ts | 33 ------------------- .../src/services/AlfrescoContent.service.ts | 32 ------------------ .../src/services/AlfrescoSettings.service.ts | 28 ---------------- .../services/AlfrescoTranslation.service.ts | 31 ----------------- .../src/services/alfresco-api.service.ts | 4 +-- ...> alfresco-authentication.service.spec.ts} | 18 +++++----- ....ts => alfresco-authentication.service.ts} | 6 ++-- ...ec.ts => alfresco-content.service.spec.ts} | 26 +++++++-------- ...service.ts => alfresco-content.service.ts} | 6 ++-- ...c.ts => alfresco-settings.service.spec.ts} | 12 +++---- ...ervice.ts => alfresco-settings.service.ts} | 10 +++--- ...s => alfresco-translate-loader.service.ts} | 0 ...c.ts => alfresco-translate-loader.spec.ts} | 10 +++--- ...s => alfresco-translation.service.spec.ts} | 16 ++++----- ...ice.ts => alfresco-translation.service.ts} | 4 +-- .../src/services/auth-guard-bpm.service.ts | 4 +-- .../src/services/auth-guard-ecm.service.ts | 4 +-- .../src/services/auth-guard.service.ts | 4 +-- .../ng2-alfresco-core/src/services/index.ts | 14 +++----- .../src/services/renditions.service.spec.ts | 4 +-- .../demo/src/main.ts | 8 ++--- .../src/assets/document-list.service.mock.ts | 12 +++---- .../src/components/document-list.component.ts | 4 +-- .../document-menu-action.component.ts | 4 +-- .../services/document-actions.service.spec.ts | 6 ++-- .../src/services/document-actions.service.ts | 4 +-- .../services/document-list.service.spec.ts | 16 ++++----- .../src/services/document-list.service.ts | 6 ++-- .../ng2-alfresco-login/demo/src/main.ts | 6 ++-- .../alfresco-login.component.spec.ts | 8 ++--- .../components/alfresco-login.component.ts | 8 ++--- .../ng2-alfresco-search/demo/src/main.ts | 12 +++---- ...esco-search-autocomplete.component.spec.ts | 18 +++++----- .../alfresco-search-autocomplete.component.ts | 4 +-- .../alfresco-search-control.component.spec.ts | 18 +++++----- .../alfresco-search-control.component.ts | 4 +-- .../alfresco-search.component.spec.ts | 14 ++++---- .../components/alfresco-search.component.ts | 4 +-- .../services/alfresco-search.service.spec.ts | 6 ++-- .../src/services/alfresco-search.service.ts | 4 +-- .../alfresco-thumbnail.service.spec.ts | 8 ++--- .../services/alfresco-thumbnail.service.ts | 4 +-- .../ng2-alfresco-tag/demo/src/main.ts | 6 ++-- .../src/services/tag.service.spec.ts | 8 ++--- .../ng2-alfresco-upload/demo/src/main.ts | 6 ++-- .../file-uploading-dialog.component.ts | 4 +-- .../upload-button.component.spec.ts | 4 +-- .../src/components/upload-button.component.ts | 4 +-- .../upload-drag-area.component.spec.ts | 4 +-- .../components/upload-drag-area.component.ts | 4 +-- .../ng2-alfresco-userinfo/demo/src/main.ts | 6 ++-- .../components/user-info.component.spec.ts | 16 ++++----- .../src/components/user-info.component.ts | 6 ++-- .../src/services/bpm-user.service.spec.ts | 6 ++-- .../src/services/ecm-user.service.spec.ts | 10 +++--- .../src/services/ecm-user.service.ts | 4 +-- .../ng2-alfresco-viewer/demo/src/main.ts | 6 ++-- .../src/componets/imgViewer.component.spec.ts | 8 ++--- .../componets/mediaPlayer.component.spec.ts | 8 ++--- .../notSupportedFormat.component.spec.ts | 8 ++--- .../src/componets/pdfViewer.component.spec.ts | 8 ++--- .../src/componets/viewer.component.spec.ts | 8 ++--- .../ng2-alfresco-webscript/demo/src/main.ts | 6 ++-- 119 files changed, 356 insertions(+), 494 deletions(-) delete mode 100644 ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts delete mode 100644 ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts delete mode 100644 ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts delete mode 100644 ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts rename ng2-components/ng2-alfresco-core/src/services/{auth.service.spec.ts => alfresco-authentication.service.spec.ts} (96%) rename ng2-components/ng2-alfresco-core/src/services/{auth.service.ts => alfresco-authentication.service.ts} (96%) rename ng2-components/ng2-alfresco-core/src/services/{content.service.spec.ts => alfresco-content.service.spec.ts} (79%) rename ng2-components/ng2-alfresco-core/src/services/{content.service.ts => alfresco-content.service.ts} (88%) rename ng2-components/ng2-alfresco-core/src/services/{settings.service.spec.ts => alfresco-settings.service.spec.ts} (77%) rename ng2-components/ng2-alfresco-core/src/services/{settings.service.ts => alfresco-settings.service.ts} (86%) rename ng2-components/ng2-alfresco-core/src/services/{translate-loader.service.ts => alfresco-translate-loader.service.ts} (100%) rename ng2-components/ng2-alfresco-core/src/services/{translate-loader.service.spec.ts => alfresco-translate-loader.spec.ts} (91%) rename ng2-components/ng2-alfresco-core/src/services/{translate.service.spec.ts => alfresco-translation.service.spec.ts} (87%) rename ng2-components/ng2-alfresco-core/src/services/{translate.service.ts => alfresco-translation.service.ts} (93%) diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts index cf2ab3ed96..fc0ae476ea 100644 --- a/demo-shell-ng2/app/app.component.ts +++ b/demo-shell-ng2/app/app.component.ts @@ -17,7 +17,7 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { AlfrescoTranslateService, AuthService, SettingsService, StorageService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoSettingsService, StorageService, LogService } from 'ng2-alfresco-core'; declare var document: any; @@ -32,10 +32,10 @@ export class AppComponent { ecmHost: string = 'http://' + window.location.hostname + ':8080'; bpmHost: string = 'http://' + window.location.hostname + ':9999'; - constructor(private authService: AuthService, + constructor(private authService: AlfrescoAuthenticationService, private router: Router, - private settingsService: SettingsService, - private translateService: AlfrescoTranslateService, + private settingsService: AlfrescoSettingsService, + private translateService: AlfrescoTranslationService, private storage: StorageService, private logService: LogService) { this.setEcmHost(); diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts index 65053fcf2e..9d72242168 100644 --- a/demo-shell-ng2/app/components/files/files.component.ts +++ b/demo-shell-ng2/app/components/files/files.component.ts @@ -17,7 +17,7 @@ import { Component, OnInit, Optional, ViewChild } from '@angular/core'; import { ActivatedRoute, Params, Router } from '@angular/router'; -import { AuthService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, LogService } from 'ng2-alfresco-core'; import { DocumentActionsService, DocumentListComponent, ContentActionHandler, DocumentActionModel, FolderActionModel } from 'ng2-alfresco-documentlist'; import { FormService } from 'ng2-activiti-form'; @@ -43,7 +43,7 @@ export class FilesComponent implements OnInit { documentList: DocumentListComponent; constructor(private documentActions: DocumentActionsService, - private authService: AuthService, + private authService: AlfrescoAuthenticationService, private formService: FormService, private logService: LogService, private router: Router, diff --git a/demo-shell-ng2/app/components/search/search-bar.component.ts b/demo-shell-ng2/app/components/search/search-bar.component.ts index a4e897c57e..357303d4bd 100644 --- a/demo-shell-ng2/app/components/search/search-bar.component.ts +++ b/demo-shell-ng2/app/components/search/search-bar.component.ts @@ -17,7 +17,7 @@ import { Component, EventEmitter, Output } from '@angular/core'; import { Router } from '@angular/router'; -import { AuthService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { MinimalNodeEntity } from 'alfresco-js-api'; @Component({ @@ -34,7 +34,7 @@ export class SearchBarComponent { expand = new EventEmitter(); constructor(public router: Router, - public authService: AuthService) { + public authService: AlfrescoAuthenticationService) { } isLoggedIn(): boolean { diff --git a/demo-shell-ng2/app/components/setting/setting.component.ts b/demo-shell-ng2/app/components/setting/setting.component.ts index bd0644c378..b0d7d17a53 100644 --- a/demo-shell-ng2/app/components/setting/setting.component.ts +++ b/demo-shell-ng2/app/components/setting/setting.component.ts @@ -16,7 +16,7 @@ */ import { Component } from '@angular/core'; -import { SettingsService, StorageService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoSettingsService, StorageService, LogService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-setting-demo', @@ -28,7 +28,7 @@ export class SettingComponent { ecmHost: string; bpmHost: string; - constructor(private settingsService: SettingsService, + constructor(private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { this.ecmHost = this.settingsService.ecmHost; diff --git a/ng2-components/ng2-activiti-analytics/demo/src/main.ts b/ng2-components/ng2-activiti-analytics/demo/src/main.ts index e38c634a64..5127ffd5d7 100644 --- a/ng2-components/ng2-activiti-analytics/demo/src/main.ts +++ b/ng2-components/ng2-activiti-analytics/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core'; import { AnalyticsModule } from 'ng2-activiti-analytics'; @Component({ @@ -57,8 +57,8 @@ export class AnalyticsDemoComponent implements OnInit { host: string = 'http://localhost:9999'; ticket: string; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { settingsService.bpmHost = this.host; diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts index bac86e50bd..b5baa073f8 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts @@ -18,7 +18,7 @@ import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { DiagramsModule } from 'ng2-activiti-diagrams'; import { AnalyticsReportHeatMapComponent } from '../components/analytics-report-heat-map.component'; import { WIDGET_DIRECTIVES } from '../components/widgets/index'; @@ -57,7 +57,7 @@ describe('AnalyticsReportHeatMapComponent', () => { ] }).compileComponents(); - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts index a2fb1faeb9..df9c81455a 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts @@ -16,7 +16,7 @@ */ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; import { FormGroup, FormBuilder, FormControl } from '@angular/forms'; @@ -43,7 +43,7 @@ export class AnalyticsReportHeatMapComponent implements OnInit { currentMetricColors: string; metricType: string; - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private analyticsService: AnalyticsService, private formBuilder: FormBuilder) { if (translateService) { diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts index e2d61e9a69..c437ab7342 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts @@ -18,7 +18,7 @@ import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AnalyticsReportListComponent } from '../components/analytics-report-list.component'; import { AnalyticsService } from '../services/analytics.service'; @@ -54,7 +54,7 @@ describe('AnalyticsReportListComponent', () => { ] }).compileComponents(); - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts index f00f81874b..08bf8b21a0 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { DebugElement, SimpleChange } from '@angular/core'; import { Observable } from 'rxjs/Rx'; import * as moment from 'moment'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component'; import { WIDGET_DIRECTIVES } from '../components/widgets/index'; @@ -53,7 +53,7 @@ describe('AnalyticsReportParametersComponent', () => { ] }).compileComponents(); - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts index 9cb535115a..1aea402527 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts @@ -18,7 +18,7 @@ import { Component, EventEmitter, OnInit, OnChanges, Input, Output, SimpleChanges, OnDestroy, AfterViewChecked } from '@angular/core'; import { FormGroup, FormBuilder, FormControl } from '@angular/forms'; import * as moment from 'moment'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; import { ReportParametersModel, ReportQuery, ParameterValueModel, ReportParameterDetailsModel } from '../models/report.model'; @@ -70,7 +70,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On private paramOpts; private isEditable: boolean = false; - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private analyticsService: AnalyticsService, private formBuilder: FormBuilder, private logService: LogService) { diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts index 09413f5013..0faa996efc 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { DebugElement, SimpleChange } from '@angular/core'; import { Observable } from 'rxjs/Rx'; import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { DiagramsModule } from 'ng2-activiti-diagrams'; import { AnalyticsReportListComponent } from '../components/analytics-report-list.component'; @@ -70,7 +70,7 @@ describe('AnalyticsComponent', () => { ] }).compileComponents(); - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts index 9e5328101e..3bfbc50fcf 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, OnChanges, Input, Output, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; import { ReportQuery } from '../models/report.model'; import { Chart } from '../models/chart.model'; @@ -70,7 +70,7 @@ export class AnalyticsComponent implements OnChanges { } }; - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private analyticsService: AnalyticsService, private logService: LogService) { logService.info('AnalyticsComponent'); diff --git a/ng2-components/ng2-activiti-diagrams/demo/src/main.ts b/ng2-components/ng2-activiti-diagrams/demo/src/main.ts index b51b86ac6b..d188b528d4 100644 --- a/ng2-components/ng2-activiti-diagrams/demo/src/main.ts +++ b/ng2-components/ng2-activiti-diagrams/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core'; import { DiagramsModule } from 'ng2-activiti-diagrams'; @Component({ @@ -48,8 +48,8 @@ export class DiagramDemoComponent { host: string = 'http://localhost:9999'; ticket: string; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { settingsService.bpmHost = this.host; diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts index ee42da77e4..c46b8765f9 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { DIAGRAM_DIRECTIVES, DIAGRAM_PROVIDERS } from './index'; import { RAPHAEL_DIRECTIVES, RAPHAEL_PROVIDERS } from './raphael/index'; @@ -56,7 +56,7 @@ describe('Test ng2-activiti-diagrams ', () => { providers: [ ...DIAGRAM_PROVIDERS, ...RAPHAEL_PROVIDERS, - {provide: AlfrescoTranslateService, useClass: TranslationMock} + {provide: AlfrescoTranslationService, useClass: TranslationMock} ] }).compileComponents(); })); diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts index 58a31157d4..9c64a9bcd1 100644 --- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts +++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts @@ -16,7 +16,7 @@ */ import { Component, ElementRef, Input, Output, EventEmitter, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { DiagramsService } from '../services/diagrams.service'; import { DiagramColorService } from '../services/diagram-color.service'; import { RaphaelService } from './raphael/raphael.service'; @@ -59,7 +59,7 @@ export class DiagramComponent { private diagram: DiagramModel; constructor(private elementRef: ElementRef, - private translateService: AlfrescoTranslateService, + private translateService: AlfrescoTranslationService, private diagramColorService: DiagramColorService, private raphaelService: RaphaelService, private diagramsService: DiagramsService, diff --git a/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts b/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts index abe8cd5349..de67d44b59 100644 --- a/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts +++ b/ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts @@ -18,14 +18,14 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; import { Response, Http, Headers, RequestOptions } from '@angular/http'; -import { AuthService, SettingsService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, AlfrescoSettingsService, LogService } from 'ng2-alfresco-core'; @Injectable() export class DiagramsService { - constructor(private authService: AuthService, + constructor(private authService: AlfrescoAuthenticationService, private http: Http, - private settingsService: SettingsService, + private settingsService: AlfrescoSettingsService, private logService: LogService) { } diff --git a/ng2-components/ng2-activiti-form/demo/src/main.ts b/ng2-components/ng2-activiti-form/demo/src/main.ts index e8d54ab833..71a6c79b84 100644 --- a/ng2-components/ng2-activiti-form/demo/src/main.ts +++ b/ng2-components/ng2-activiti-form/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core'; import { ActivitiFormModule } from 'ng2-activiti-form'; @Component({ @@ -47,8 +47,8 @@ export class FormDemoComponent implements OnInit { host: string = 'http://localhost:9999'; ticket: string; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { settingsService.bpmHost = this.host; diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts index 71621e21ac..7fff2105c5 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts @@ -25,7 +25,7 @@ import { WIDGET_DIRECTIVES } from './widgets/index'; import { FormService } from './../services/form.service'; import { EcmModelService } from './../services/ecm-model.service'; import { WidgetVisibilityService } from './../services/widget-visibility.service'; -import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { TranslationMock } from './../assets/translation.service.mock'; describe('ActivitiStartForm', () => { @@ -48,7 +48,7 @@ describe('ActivitiStartForm', () => { ...WIDGET_DIRECTIVES ], providers: [ - { provide: AlfrescoTranslateService, useClass: TranslationMock }, + { provide: AlfrescoTranslationService, useClass: TranslationMock }, EcmModelService, FormService, WidgetVisibilityService diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index 6800e87fc1..003d788ba8 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -26,7 +26,7 @@ import { Output, EventEmitter } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { ActivitiForm } from './activiti-form.component'; import { FormService } from './../services/form.service'; import { WidgetVisibilityService } from './../services/widget-visibility.service'; @@ -75,7 +75,7 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, @ViewChild('outcomesContainer', {}) outcomesContainer: ElementRef = null; - constructor(private translate: AlfrescoTranslateService, + constructor(private translate: AlfrescoTranslationService, formService: FormService, visibilityService: WidgetVisibilityService, logService: LogService) { diff --git a/ng2-components/ng2-activiti-processlist/demo/src/main.ts b/ng2-components/ng2-activiti-processlist/demo/src/main.ts index a732101e37..643924cbd8 100644 --- a/ng2-components/ng2-activiti-processlist/demo/src/main.ts +++ b/ng2-components/ng2-activiti-processlist/demo/src/main.ts @@ -28,7 +28,7 @@ import { ActivitiStartProcessInstance, ProcessInstance } from 'ng2-activiti-processlist'; -import { AuthService, SettingsService, StorageService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; const currentProcessIdNew = '__NEW__'; @@ -160,8 +160,8 @@ class MyDemoApp implements OnInit { dataProcesses: ObjectDataTableAdapter; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { settingsService.bpmHost = this.host; diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts index e19d68ebb1..d26c12f8d2 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts @@ -17,7 +17,7 @@ import { Component, Output, EventEmitter, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core'; import { Observable, Observer } from 'rxjs/Rx'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { FilterProcessRepresentationModel } from './../models/filter-process.model'; import { ActivitiProcessService } from './../services/activiti-process.service'; @@ -53,7 +53,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { filters: FilterProcessRepresentationModel [] = []; - constructor(private translate: AlfrescoTranslateService, + constructor(private translate: AlfrescoTranslationService, private activiti: ActivitiProcessService, private logService: LogService) { this.filter$ = new Observable<FilterProcessRepresentationModel>(observer => this.filterObserver = observer).share(); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts index 258d464489..c1bd2a1b35 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { ActivitiFormModule } from 'ng2-activiti-form'; import { ActivitiProcessComments } from './activiti-process-comments.component'; @@ -46,7 +46,7 @@ describe('ActivitiProcessInstanceComments', () => { ActivitiProcessComments ], providers: [ - { provide: AlfrescoTranslateService, useClass: TranslationMock }, + { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiProcessService ] }).compileComponents(); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts index e49bf2ba20..a62fbd2b2c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { Comment } from 'ng2-activiti-tasklist'; import { Observer } from 'rxjs/Observer'; @@ -56,7 +56,7 @@ export class ActivitiProcessComments implements OnChanges { * @param translate Translation service * @param activitiProcess Process service */ - constructor(private translate: AlfrescoTranslateService, + constructor(private translate: AlfrescoTranslationService, private activitiProcess: ActivitiProcessService) { if (translate) { diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts index db8369d0e9..ba4ff24006 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { ActivitiFormModule, FormService } from 'ng2-activiti-form'; import { ActivitiTaskListModule } from 'ng2-activiti-tasklist'; @@ -50,7 +50,7 @@ describe('ActivitiProcessInstanceDetails', () => { ActivitiProcessInstanceDetails ], providers: [ - { provide: AlfrescoTranslateService, useClass: TranslationMock }, + { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiProcessService ], schemas: [ NO_ERRORS_SCHEMA ] diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts index 5c309cdc03..b4edb2d997 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, ViewChild, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { TaskDetailsEvent } from 'ng2-activiti-tasklist'; import { ActivitiProcessService } from './../services/activiti-process.service'; @@ -60,7 +60,7 @@ export class ActivitiProcessInstanceDetails implements OnChanges { * @param translate Translation service * @param activitiProcess Process service */ - constructor(private translate: AlfrescoTranslateService, + constructor(private translate: AlfrescoTranslationService, private activitiProcess: ActivitiProcessService, private logService: LogService) { diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts index 5a067ca978..08407533d8 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component'; import { TranslationMock } from './../assets/translation.service.mock'; import { exampleProcess } from './../assets/activiti-process.model.mock'; @@ -42,7 +42,7 @@ describe('ActivitiProcessInstanceHeader', () => { ], providers: [ ActivitiProcessService, - {provide: AlfrescoTranslateService, useClass: TranslationMock} + {provide: AlfrescoTranslationService, useClass: TranslationMock} ] }).compileComponents(); })); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts index 101099b02c..b1ecf3f1ce 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { ProcessInstance } from '../models/process-instance.model'; import { DatePipe } from '@angular/common'; @@ -36,7 +36,7 @@ export class ActivitiProcessInstanceHeader { @Output() onError: EventEmitter<any> = new EventEmitter<any>(); - constructor(private translate: AlfrescoTranslateService, + constructor(private translate: AlfrescoTranslationService, private logService: LogService) { if (translate) { diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts index d07ba28e64..8b1109340d 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { TaskDetailsModel } from 'ng2-activiti-tasklist'; import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.component'; @@ -49,7 +49,7 @@ describe('ActivitiProcessInstanceTasks', () => { ActivitiProcessInstanceTasks ], providers: [ - { provide: AlfrescoTranslateService, useClass: TranslationMock }, + { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiProcessService ], schemas: [NO_ERRORS_SCHEMA] diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts index dc41b6eb8b..26a86ce222 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts @@ -18,7 +18,7 @@ import { Component, Input, OnInit, ViewChild, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; import { DatePipe } from '@angular/common'; import { Observable, Observer } from 'rxjs/Rx'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { TaskDetailsModel, TaskDetailsEvent } from 'ng2-activiti-tasklist'; import { ProcessInstance } from '../models/process-instance.model'; @@ -64,7 +64,7 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges { @Output() taskClick: EventEmitter<TaskDetailsEvent> = new EventEmitter<TaskDetailsEvent>(); - constructor(private translate: AlfrescoTranslateService, + constructor(private translate: AlfrescoTranslationService, private activitiProcess: ActivitiProcessService, private logService: LogService) { if (translate) { diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts index ef082702f4..f41d16a74d 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { DataTableModule, ObjectDataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ActivitiProcessInstanceVariables } from './activiti-process-instance-variables.component'; @@ -47,7 +47,7 @@ describe('ActivitiProcessInstanceVariables', () => { ActivitiProcessInstanceVariables ], providers: [ - { provide: AlfrescoTranslateService, useClass: TranslationMock }, + { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiProcessService ] }).compileComponents(); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts index 38a2e76c88..bbfda20f43 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts @@ -17,7 +17,7 @@ import { Component, DebugElement, EventEmitter, Input, Output, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ProcessInstanceVariable } from './../models/process-instance-variable.model'; import { ActivitiProcessService } from './../services/activiti-process.service'; @@ -67,7 +67,7 @@ export class ActivitiProcessInstanceVariables implements OnInit, OnChanges { * @param translate Translation service * @param activitiProcess Process service */ - constructor(private translate: AlfrescoTranslateService, + constructor(private translate: AlfrescoTranslationService, private activitiProcess: ActivitiProcessService) { if (translate) { diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts index 67b80eacd0..f4b548b15c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core import { Observable } from 'rxjs/Rx'; import { ActivitiProcessInstanceListComponent } from './activiti-processlist.component'; -import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { DataTableModule, ObjectDataRow, DataRowEvent, ObjectDataTableAdapter, DataSorting } from 'ng2-alfresco-datatable'; import { TranslationMock } from './../assets/translation.service.mock'; @@ -65,7 +65,7 @@ describe('ActivitiProcessInstanceListComponent', () => { declarations: [ ActivitiProcessInstanceListComponent ], providers: [ ActivitiProcessService, - {provide: AlfrescoTranslateService, useClass: TranslationMock} + {provide: AlfrescoTranslationService, useClass: TranslationMock} ] }).compileComponents().then(() => { fixture = TestBed.createComponent(ActivitiProcessInstanceListComponent); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts index 2c7db1ee28..d40af83976 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow, DataSorting } from 'ng2-alfresco-datatable'; import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model'; import { ProcessInstance } from '../models/process-instance.model'; @@ -69,7 +69,7 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { ]; constructor(private processService: ActivitiProcessService, - private translate: AlfrescoTranslateService) { + private translate: AlfrescoTranslationService) { if (translate !== null) { translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src'); } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts index f1f56a05e1..e5a41662c3 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { DebugElement, SimpleChange } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { ActivitiFormModule, FormService } from 'ng2-activiti-form'; import { TranslationMock } from './../assets/translation.service.mock'; @@ -49,7 +49,7 @@ describe('ActivitiStartProcessInstance', () => { ActivitiStartProcessInstance ], providers: [ - { provide: AlfrescoTranslateService, useClass: TranslationMock }, + { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiProcessService, FormService ] diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts index 7fcd903f68..04f600864c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiStartForm } from 'ng2-activiti-form'; import { ProcessInstance } from './../models/process-instance.model'; import { ProcessDefinitionRepresentation } from './../models/process-definition.model'; @@ -53,7 +53,7 @@ export class ActivitiStartProcessInstance implements OnChanges { errorMessageId: string = ''; - constructor(private translate: AlfrescoTranslateService, + constructor(private translate: AlfrescoTranslationService, private activitiProcess: ActivitiProcessService) { if (translate) { diff --git a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts index 087074e13b..b6b8bee8db 100644 --- a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts +++ b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts @@ -26,7 +26,7 @@ import { ActivitiTaskList } from 'ng2-activiti-tasklist'; import { CoreModule, LogService } from 'ng2-alfresco-core'; -import { AuthService, SettingsService, StorageService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; @Component({ @@ -144,8 +144,8 @@ class MyDemoApp implements OnInit { dataTasks: ObjectDataTableAdapter; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { settingsService.bpmHost = this.host; diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts index 39c39a67b2..dcaac27e5a 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts @@ -19,7 +19,7 @@ import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiApps } from './activiti-apps.component'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; @@ -47,7 +47,7 @@ describe('ActivitiApps', () => { ] }).compileComponents(); - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts index 73ecca5293..82bd16a2be 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts @@ -16,7 +16,7 @@ */ import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { AppDefinitionRepresentationModel } from '../models/filter.model'; import { IconModel } from '../models/icon.model'; @@ -65,7 +65,7 @@ export class ActivitiApps implements OnInit { * @param translate Translate service * @param activitiTaskList Task service */ - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private activitiTaskList: ActivitiTaskListService) { if (translateService) { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts index 6e4de16d10..49e3e23f28 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts @@ -18,7 +18,7 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from '../services/activiti-tasklist.service'; import { ActivitiChecklist } from './activiti-checklist.component'; import { TaskDetailsModel } from '../models/task-details.model'; @@ -49,7 +49,7 @@ describe('ActivitiChecklist', () => { ActivitiTaskListService ] }).compileComponents().then(() => { - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts index 2b8db59108..b507f87373 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, OnInit, ViewChild, OnChanges, SimpleChanges, EventEmitter, Output } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { TaskDetailsModel } from '../models/task-details.model'; import { Observer, Observable } from 'rxjs/Rx'; @@ -59,7 +59,7 @@ export class ActivitiChecklist implements OnInit, OnChanges { * @param auth * @param translate */ - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private activitiTaskList: ActivitiTaskListService, private logService: LogService) { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts index d7ad10d697..18fe3371a2 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiFormModule } from 'ng2-activiti-form'; import { ActivitiComments } from './activiti-comments.component'; @@ -49,7 +49,7 @@ describe('ActivitiComments', () => { ] }).compileComponents(); - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts index a77f07cc23..4380c3ad82 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, ViewChild, OnChanges, SimpleChanges, EventEmitter } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { Comment } from '../models/comment.model'; import { Observer, Observable } from 'rxjs/Rx'; @@ -56,7 +56,7 @@ export class ActivitiComments implements OnChanges { * @param translate Translation service * @param activitiTaskList Task service */ - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private activitiTaskList: ActivitiTaskListService) { if (translateService) { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts index 230ce72b91..38ae8a34c7 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts @@ -17,7 +17,7 @@ import { Component, Output, EventEmitter, OnInit, Input, SimpleChanges, OnChanges } from '@angular/core'; import { Observer, Observable } from 'rxjs/Rx'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { FilterRepresentationModel } from '../models/filter.model'; @@ -54,7 +54,7 @@ export class ActivitiFilters implements OnInit, OnChanges { filters: FilterRepresentationModel [] = []; - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private activiti: ActivitiTaskListService, private logService: LogService) { this.filter$ = new Observable<FilterRepresentationModel>(observer => this.filterObserver = observer).share(); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts index f477c9588a..144604d799 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Observable'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiPeopleSearch } from './activiti-people-search.component'; import { User } from '../models/user.model'; @@ -56,7 +56,7 @@ describe('ActivitiPeopleSearch', () => { ] }).compileComponents().then(() => { - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts index 7a6b9c6f1a..687a74c1f8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts @@ -19,7 +19,7 @@ import { Component, Input, Output, EventEmitter, OnInit, AfterViewInit } from '@ import { FormControl } from '@angular/forms'; import { User } from '../models/user.model'; import { Observable } from 'rxjs/Observable'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; declare let componentHandler: any; @@ -45,7 +45,7 @@ export class ActivitiPeopleSearch implements OnInit, AfterViewInit { userList: User[] = []; - constructor(private translateService: AlfrescoTranslateService) { + constructor(private translateService: AlfrescoTranslationService) { if (translateService) { translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts index 7756e8570c..ee2e95fb3c 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; -import { CoreModule, AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { ActivitiPeopleService } from '../services/activiti-people.service'; import { ActivitiPeople } from './activiti-people.component'; import { ActivitiPeopleSearch } from './activiti-people-search.component'; @@ -62,7 +62,7 @@ describe('ActivitiPeople', () => { }).compileComponents().then(() => { logService = TestBed.get(LogService); - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts index 29b834210f..e4213f2d24 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts @@ -17,7 +17,7 @@ import { Component, Input, ViewChild } from '@angular/core'; import { Observer, Observable } from 'rxjs/Rx'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { User } from '../models/user.model'; import { ActivitiPeopleService } from '../services/activiti-people.service'; @@ -51,7 +51,7 @@ export class ActivitiPeople { * @param translate * @param people service */ - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private peopleService: ActivitiPeopleService, private logService: LogService) { if (translateService) { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts index 10cc787bb7..60dcedfb92 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from '../services/activiti-tasklist.service'; import { ActivitiStartTaskButton } from './activiti-start-task.component'; @@ -43,7 +43,7 @@ describe('ActivitiStartTaskButton', () => { ActivitiTaskListService ] }).compileComponents().then(() => { - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts index 9b7c4e24f1..2efb8e8839 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { Form } from '../models/form.model'; @@ -54,7 +54,7 @@ export class ActivitiStartTaskButton { * @param translate * @param taskService */ - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private taskService: ActivitiTaskListService, private logService: LogService) { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts index ef67877cdf..3102052bc5 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiFormModule, FormModel, FormOutcomeEvent, FormOutcomeModel, FormService } from 'ng2-activiti-form'; import { ActivitiTaskDetails } from './activiti-task-details.component'; @@ -57,7 +57,7 @@ describe('ActivitiTaskDetails', () => { schemas: [ NO_ERRORS_SCHEMA ] }).compileComponents(); - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts index 3ccc99870c..ee5574ce03 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, OnInit, ViewChild, Output, EventEmitter, TemplateRef, OnChanges, SimpleChanges, DebugElement} from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { TaskDetailsModel } from '../models/task-details.model'; import { User } from '../models/user.model'; @@ -93,7 +93,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { * @param activitiForm Form service * @param activitiTaskList Task service */ - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private activitiForm: FormService, private activitiTaskList: ActivitiTaskListService, private logService: LogService) { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts index ae4b9fc060..5f169934b0 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts @@ -18,7 +18,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiTaskHeader } from './activiti-task-header.component'; import { taskDetailsMock } from './../assets/task-details.mock'; @@ -45,7 +45,7 @@ describe('ActivitiTaskHeader', () => { ] }).compileComponents(); - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts index bb4ab2deb6..0c4af57dd0 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; @@ -37,7 +37,7 @@ export class ActivitiTaskHeader { @Output() claim: EventEmitter<any> = new EventEmitter<any>(); - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private activitiTaskService: ActivitiTaskListService, private logService: LogService) { if (translateService) { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts index fc4b02eb59..066d699d0d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts @@ -17,7 +17,7 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; import { ActivitiTaskList } from './activiti-tasklist.component'; import { Observable } from 'rxjs/Rx'; @@ -73,7 +73,7 @@ describe('ActivitiTaskList', () => { ] }).compileComponents(); - let translateService = TestBed.get(AlfrescoTranslateService); + let translateService = TestBed.get(AlfrescoTranslationService); spyOn(translateService, 'addTranslationFolder').and.stub(); spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); })); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts index be457cac5d..5cc9519415 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { TaskQueryRequestRepresentationModel } from '../models/filter.model'; @@ -75,7 +75,7 @@ export class ActivitiTaskList implements OnInit, OnChanges { {type: 'text', key: 'created', title: 'Created', sortable: true} ]; - constructor(private translateService: AlfrescoTranslateService, + constructor(private translateService: AlfrescoTranslationService, private taskListService: ActivitiTaskListService, private logService: LogService) { if (translateService) { diff --git a/ng2-components/ng2-alfresco-core/index.ts b/ng2-components/ng2-alfresco-core/index.ts index 6e5f1e6498..390f67ab68 100644 --- a/ng2-components/ng2-alfresco-core/index.ts +++ b/ng2-components/ng2-alfresco-core/index.ts @@ -22,23 +22,18 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule, TranslateLoader } from 'ng2-translate/ng2-translate'; import { - AuthService, - ContentService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoContentService, + AlfrescoSettingsService, StorageService, AlfrescoApiService, AlfrescoTranslateLoader, - AlfrescoTranslateService, + AlfrescoTranslationService, RenditionsService, AuthGuard, AuthGuardEcm, AuthGuardBpm, - LogService, LogServiceMock, - - /** @deprecated */ AlfrescoSettingsService, - /** @deprecated */ AlfrescoTranslationService, - /** @deprecated */ AlfrescoAuthenticationService, - /** @deprecated */ AlfrescoContentService + LogService, LogServiceMock } from './src/services/index'; import { MATERIAL_DESIGN_DIRECTIVES } from './src/components/material/index'; @@ -50,23 +45,18 @@ export * from './src/utils/index'; export const ALFRESCO_CORE_PROVIDERS: any[] = [ LogService, LogServiceMock, - AuthService, - ContentService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoContentService, + AlfrescoSettingsService, StorageService, AlfrescoApiService, AlfrescoTranslateLoader, - AlfrescoTranslateService, + AlfrescoTranslationService, RenditionsService, AuthGuard, AuthGuardEcm, AuthGuardBpm, - ...CONTEXT_MENU_PROVIDERS, - - /** @deprecated */ AlfrescoAuthenticationService, - /** @deprecated */ AlfrescoContentService, - /** @deprecated */ AlfrescoSettingsService, - /** @deprecated */ AlfrescoTranslationService + ...CONTEXT_MENU_PROVIDERS ]; export function createTranslateLoader(http: Http, logService: LogService) { diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts deleted file mode 100644 index 8f35837506..0000000000 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts +++ /dev/null @@ -1,33 +0,0 @@ -/*! - * @license - * Copyright 2016 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Injectable } from '@angular/core'; -import { LogService } from './log.service'; -import { SettingsService } from './settings.service'; -import { StorageService } from './storage.service'; -import { AlfrescoApiService } from './alfresco-api.service'; - -/** @deprecated AlfrescoAuthenticationService is deprecated. Use AuthService instead */ -@Injectable() -export class AlfrescoAuthenticationService { - constructor(settingsService: SettingsService, - apiService: AlfrescoApiService, - storage: StorageService, - logService: LogService) { - logService.error('ERROR: AlfrescoAuthenticationService is deprecated. Use AuthService instead.'); - } -} diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts deleted file mode 100644 index 39e58e193a..0000000000 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts +++ /dev/null @@ -1,32 +0,0 @@ -/*! - * @license - * Copyright 2016 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Injectable } from '@angular/core'; -import { LogService } from './log.service'; -import { AuthService } from './auth.service'; -import { AlfrescoApiService } from './alfresco-api.service'; - -/** @deprecated AlfrescoContentService is deprecated. Use ContentService instead */ -@Injectable() -export class AlfrescoContentService { - - constructor(authService: AuthService, - apiService: AlfrescoApiService, - logService: LogService) { - logService.error('ERROR: AlfrescoContentService is deprecated. Use ContentService instead.'); - } -} diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts deleted file mode 100644 index 8a970868d4..0000000000 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts +++ /dev/null @@ -1,28 +0,0 @@ -/*! - * @license - * Copyright 2016 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Injectable } from '@angular/core'; -import { LogService } from './log.service'; - -/** @deprecated AlfrescoSettingsService is deprecated. Use SettingsService instead */ -@Injectable() -export class AlfrescoSettingsService { - - constructor(logService: LogService) { - logService.error('ERROR: AlfrescoSettingsService is deprecated. Use SettingsService instead.'); - } -} diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts deleted file mode 100644 index 85a0db9d6d..0000000000 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts +++ /dev/null @@ -1,31 +0,0 @@ -/*! - * @license - * Copyright 2016 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Injectable } from '@angular/core'; -import { TranslateService } from 'ng2-translate/ng2-translate'; -import { LogService } from './log.service'; - -/** @deprecated AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead */ -@Injectable() -export class AlfrescoTranslationService { - - constructor(translate: TranslateService, - logService: LogService) { - logService.error('ERROR: AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead.'); - } - -} diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts index 17e497d04f..20e5d18ff0 100644 --- a/ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { AlfrescoApi } from 'alfresco-js-api'; import * as alfrescoApi from 'alfresco-js-api'; -import { SettingsService } from './settings.service'; +import { AlfrescoSettingsService } from './alfresco-settings.service'; import { StorageService } from './storage.service'; @Injectable() @@ -44,7 +44,7 @@ export class AlfrescoApiService { return this.alfrescoApi; } - constructor(private settingsService: SettingsService, + constructor(private settingsService: AlfrescoSettingsService, private storage: StorageService) { this.provider = this.settingsService.getProviders(); diff --git a/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.spec.ts similarity index 96% rename from ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.spec.ts index 38a40e2af5..25182bd052 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.spec.ts @@ -16,31 +16,31 @@ */ import { ReflectiveInjector } from '@angular/core'; -import { SettingsService } from './settings.service'; -import { AuthService } from './auth.service'; +import { AlfrescoSettingsService } from './alfresco-settings.service'; +import { AlfrescoAuthenticationService } from './alfresco-authentication.service'; import { AlfrescoApiService } from './alfresco-api.service'; import { StorageService } from './storage.service'; import { LogService } from './log.service'; declare let jasmine: any; -describe('AuthService', () => { +describe('AlfrescoAuthenticationService', () => { let injector; - let authService: AuthService; - let settingsService: SettingsService; + let authService: AlfrescoAuthenticationService; + let settingsService: AlfrescoSettingsService; let storage: StorageService; beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ - SettingsService, + AlfrescoSettingsService, AlfrescoApiService, - AuthService, + AlfrescoAuthenticationService, StorageService, LogService ]); - authService = injector.get(AuthService); - settingsService = injector.get(SettingsService); + authService = injector.get(AlfrescoAuthenticationService); + settingsService = injector.get(AlfrescoSettingsService); storage = injector.get(StorageService); storage.clear(); diff --git a/ng2-components/ng2-alfresco-core/src/services/auth.service.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.ts similarity index 96% rename from ng2-components/ng2-alfresco-core/src/services/auth.service.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.ts index 0c350238a3..0bf11793aa 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.ts @@ -17,17 +17,17 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs/Rx'; -import { SettingsService } from './settings.service'; +import { AlfrescoSettingsService } from './alfresco-settings.service'; import { StorageService } from './storage.service'; import { LogService } from './log.service'; import { AlfrescoApiService } from './alfresco-api.service'; @Injectable() -export class AuthService { +export class AlfrescoAuthenticationService { loginSubject: Subject<any> = new Subject<any>(); logoutSubject: Subject<any> = new Subject<any>(); - constructor(private settingsService: SettingsService, + constructor(private settingsService: AlfrescoSettingsService, public alfrescoApi: AlfrescoApiService, private storage: StorageService, private logService: LogService) { diff --git a/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts similarity index 79% rename from ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts index fc9c6fd9fc..81806e372d 100644 --- a/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts @@ -16,20 +16,20 @@ */ import { ReflectiveInjector } from '@angular/core'; -import { SettingsService } from './settings.service'; -import { AuthService } from './auth.service'; -import { ContentService } from './content.service'; +import { AlfrescoSettingsService } from './alfresco-settings.service'; +import { AlfrescoAuthenticationService } from './alfresco-authentication.service'; +import { AlfrescoContentService } from './alfresco-content.service'; import { AlfrescoApiService } from './alfresco-api.service'; import { StorageService } from './storage.service'; import { LogService } from './log.service'; declare let jasmine: any; -describe('ContentService', () => { +describe('AlfrescoContentService', () => { - let injector, contentService: ContentService; - let authService: AuthService; - let settingsService: SettingsService; + let injector, contentService: AlfrescoContentService; + let authService: AlfrescoAuthenticationService; + let settingsService: AlfrescoSettingsService; let storage: StorageService; let node: any; @@ -38,16 +38,16 @@ describe('ContentService', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoApiService, - ContentService, - AuthService, - SettingsService, + AlfrescoContentService, + AlfrescoAuthenticationService, + AlfrescoSettingsService, StorageService, LogService ]); - authService = injector.get(AuthService); - settingsService = injector.get(SettingsService); - contentService = injector.get(ContentService); + authService = injector.get(AlfrescoAuthenticationService); + settingsService = injector.get(AlfrescoSettingsService); + contentService = injector.get(AlfrescoContentService); storage = injector.get(StorageService); storage.clear(); diff --git a/ng2-components/ng2-alfresco-core/src/services/content.service.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.ts similarity index 88% rename from ng2-components/ng2-alfresco-core/src/services/content.service.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.ts index 42d427b9d2..ae46746cd7 100644 --- a/ng2-components/ng2-alfresco-core/src/services/content.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.ts @@ -17,13 +17,13 @@ import { Injectable } from '@angular/core'; -import { AuthService } from './auth.service'; +import { AlfrescoAuthenticationService } from './alfresco-authentication.service'; import { AlfrescoApiService } from './alfresco-api.service'; @Injectable() -export class ContentService { +export class AlfrescoContentService { - constructor(public authService: AuthService, + constructor(public authService: AlfrescoAuthenticationService, public apiService: AlfrescoApiService) { } diff --git a/ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts similarity index 77% rename from ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts index ec5b7452c8..64595150c4 100644 --- a/ng2-components/ng2-alfresco-core/src/services/settings.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts @@ -15,18 +15,18 @@ * limitations under the License. */ -import { SettingsService } from './settings.service'; +import { AlfrescoSettingsService } from './alfresco-settings.service'; -describe('SettingsService', () => { +describe('AlfrescoSettingsService', () => { - let service: SettingsService; + let service: AlfrescoSettingsService; beforeEach(() => { - service = new SettingsService(); + service = new AlfrescoSettingsService(); }); it('should have default ECM host', () => { - expect(service.ecmHost).toBe(SettingsService.DEFAULT_ECM_ADDRESS); + expect(service.ecmHost).toBe(AlfrescoSettingsService.DEFAULT_ECM_ADDRESS); }); it('should change host ECM', () => { @@ -37,7 +37,7 @@ describe('SettingsService', () => { }); it('should have default BPM host', () => { - expect(service.bpmHost).toBe(SettingsService.DEFAULT_BPM_ADDRESS); + expect(service.bpmHost).toBe(AlfrescoSettingsService.DEFAULT_BPM_ADDRESS); }); it('should change host BPM', () => { diff --git a/ng2-components/ng2-alfresco-core/src/services/settings.service.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.ts similarity index 86% rename from ng2-components/ng2-alfresco-core/src/services/settings.service.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.ts index f6c2d3d0cb..55a46de707 100644 --- a/ng2-components/ng2-alfresco-core/src/services/settings.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { Subject } from 'rxjs/Subject'; @Injectable() -export class SettingsService { +export class AlfrescoSettingsService { static DEFAULT_ECM_ADDRESS: string = 'http://' + window.location.hostname + ':8080'; static DEFAULT_BPM_ADDRESS: string = 'http://' + window.location.hostname + ':9999'; @@ -27,11 +27,11 @@ export class SettingsService { static DEFAULT_BPM_CONTEXT_PATH: string = '/activiti-app'; - private _ecmHost: string = SettingsService.DEFAULT_ECM_ADDRESS; - private _bpmHost: string = SettingsService.DEFAULT_BPM_ADDRESS; - private _csrfDisabled: boolean = SettingsService.DEFAULT_CSRF_CONFIG; + private _ecmHost: string = AlfrescoSettingsService.DEFAULT_ECM_ADDRESS; + private _bpmHost: string = AlfrescoSettingsService.DEFAULT_BPM_ADDRESS; + private _csrfDisabled: boolean = AlfrescoSettingsService.DEFAULT_CSRF_CONFIG; - private _bpmContextPath = SettingsService.DEFAULT_BPM_CONTEXT_PATH; + private _bpmContextPath = AlfrescoSettingsService.DEFAULT_BPM_CONTEXT_PATH; private providers: string = 'ALL'; // ECM, BPM , ALL diff --git a/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.service.ts similarity index 100% rename from ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.service.ts diff --git a/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.spec.ts similarity index 91% rename from ng2-components/ng2-alfresco-core/src/services/translate-loader.service.spec.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.spec.ts index af5e41ca3d..893970a224 100644 --- a/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.spec.ts @@ -21,8 +21,8 @@ import { ResponseOptions, Response, XHRBackend, HttpModule } from '@angular/http import { MockBackend, MockConnection } from '@angular/http/testing'; import {getTestBed, TestBed} from '@angular/core/testing'; -import { AlfrescoTranslateLoader } from './translate-loader.service'; -import { AlfrescoTranslateService } from './translate.service'; +import { AlfrescoTranslateLoader } from './alfresco-translate-loader.service'; +import { AlfrescoTranslationService } from './alfresco-translation.service'; import { LogService } from './log.service'; let componentJson1 = ' {"TEST": "This is a test", "TEST2": "This is another test"} ' ; @@ -34,7 +34,7 @@ const mockBackendResponse = (connection: MockConnection, response: string) => { describe('TranslateLoader', () => { let injector: Injector; let backend: MockBackend; - let alfrescoTranslationService: AlfrescoTranslateService; + let alfrescoTranslationService: AlfrescoTranslationService; let connection: MockConnection; // this will be set when a new connection is emitted from the backend. let customLoader; @@ -48,14 +48,14 @@ describe('TranslateLoader', () => { }) ], providers: [ - AlfrescoTranslateService, + AlfrescoTranslationService, LogService, {provide: XHRBackend, useClass: MockBackend} ] }); injector = getTestBed(); backend = injector.get(XHRBackend); - alfrescoTranslationService = injector.get(AlfrescoTranslateService); + alfrescoTranslationService = injector.get(AlfrescoTranslationService); backend.connections.subscribe((c: MockConnection) => connection = c); customLoader = alfrescoTranslationService.translate.currentLoader; }); diff --git a/ng2-components/ng2-alfresco-core/src/services/translate.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.spec.ts similarity index 87% rename from ng2-components/ng2-alfresco-core/src/services/translate.service.spec.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.spec.ts index 2c8ef20e36..3217849255 100644 --- a/ng2-components/ng2-alfresco-core/src/services/translate.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.spec.ts @@ -21,18 +21,18 @@ import { ResponseOptions, Response, XHRBackend, HttpModule } from '@angular/http import { MockBackend, MockConnection } from '@angular/http/testing'; import { getTestBed, TestBed } from '@angular/core/testing'; -import { AlfrescoTranslateService } from './translate.service'; -import { AlfrescoTranslateLoader } from './translate-loader.service'; +import { AlfrescoTranslationService } from './alfresco-translation.service'; +import { AlfrescoTranslateLoader } from './alfresco-translate-loader.service'; import { LogService } from './log.service'; const mockBackendResponse = (connection: MockConnection, response: string) => { connection.mockRespond(new Response(new ResponseOptions({body: response}))); }; -describe('AlfrescoTranslateService', () => { +describe('AlfrescoTranslationService', () => { let injector: Injector; let backend: MockBackend; - let alfrescoTranslationService: AlfrescoTranslateService; + let alfrescoTranslationService: AlfrescoTranslationService; let connection: MockConnection; // this will be set when a new connection is emitted from the backend. beforeEach(() => { @@ -45,21 +45,21 @@ describe('AlfrescoTranslateService', () => { }) ], providers: [ - AlfrescoTranslateService, + AlfrescoTranslationService, LogService, {provide: XHRBackend, useClass: MockBackend} ] }); injector = getTestBed(); backend = injector.get(XHRBackend); - alfrescoTranslationService = injector.get(AlfrescoTranslateService); + alfrescoTranslationService = injector.get(AlfrescoTranslationService); backend.connections.subscribe((c: MockConnection) => connection = c); alfrescoTranslationService.addTranslationFolder('fake-name', 'fake-path'); }); it('is defined', () => { - expect(AlfrescoTranslateService).toBeDefined(); - expect(alfrescoTranslationService instanceof AlfrescoTranslateService).toBeTruthy(); + expect(AlfrescoTranslationService).toBeDefined(); + expect(alfrescoTranslationService instanceof AlfrescoTranslationService).toBeTruthy(); }); it('should be able to get translations of the KEY: TEST', () => { diff --git a/ng2-components/ng2-alfresco-core/src/services/translate.service.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.ts similarity index 93% rename from ng2-components/ng2-alfresco-core/src/services/translate.service.ts rename to ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.ts index 28c7c9ece1..cd7bc76022 100644 --- a/ng2-components/ng2-alfresco-core/src/services/translate.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.ts @@ -18,10 +18,10 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; import { TranslateService } from 'ng2-translate/ng2-translate'; -import { AlfrescoTranslateLoader } from './translate-loader.service'; +import { AlfrescoTranslateLoader } from './alfresco-translate-loader.service'; @Injectable() -export class AlfrescoTranslateService { +export class AlfrescoTranslationService { userLang: string = 'en'; customLoader: AlfrescoTranslateLoader; diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts index 95679f671e..f2b8d5e354 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts @@ -22,11 +22,11 @@ import { RouterStateSnapshot } from '@angular/router'; -import { AuthService } from './auth.service'; +import { AlfrescoAuthenticationService } from './alfresco-authentication.service'; @Injectable() export class AuthGuardBpm implements CanActivate, CanActivateChild { - constructor(private authService: AuthService, private router: Router) {} + constructor(private authService: AlfrescoAuthenticationService, private router: Router) {} canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { let url: string = state.url; diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts index c447ffa223..ec9319bef7 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts @@ -22,11 +22,11 @@ import { RouterStateSnapshot } from '@angular/router'; -import { AuthService } from './auth.service'; +import { AlfrescoAuthenticationService } from './alfresco-authentication.service'; @Injectable() export class AuthGuardEcm implements CanActivate, CanActivateChild { - constructor(private authService: AuthService, private router: Router) {} + constructor(private authService: AlfrescoAuthenticationService, private router: Router) {} canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { let url: string = state.url; diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts index 45caf9e903..3b9156ec9d 100644 --- a/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts @@ -22,11 +22,11 @@ import { RouterStateSnapshot } from '@angular/router'; -import { AuthService } from './auth.service'; +import { AlfrescoAuthenticationService } from './alfresco-authentication.service'; @Injectable() export class AuthGuard implements CanActivate, CanActivateChild { - constructor(private authService: AuthService, private router: Router) {} + constructor(private authService: AlfrescoAuthenticationService, private router: Router) {} canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { let url: string = state.url; diff --git a/ng2-components/ng2-alfresco-core/src/services/index.ts b/ng2-components/ng2-alfresco-core/src/services/index.ts index 54f2d29e14..bb984b7d80 100644 --- a/ng2-components/ng2-alfresco-core/src/services/index.ts +++ b/ng2-components/ng2-alfresco-core/src/services/index.ts @@ -17,18 +17,14 @@ export * from './storage.service'; export * from './alfresco-api.service'; -export * from './AlfrescoSettings.service'; -export * from './AlfrescoTranslation.service'; -export * from './AlfrescoAuthentication.service'; -export * from './AlfrescoContent.service'; +export * from './alfresco-settings.service'; +export * from './alfresco-content.service'; export * from './renditions.service'; export * from './auth-guard.service'; export * from './auth-guard-ecm.service'; export * from './auth-guard-bpm.service'; export * from './log.service'; -export * from './auth.service'; -export * from './content.service'; -export * from './settings.service'; -export * from './translate.service'; -export * from './translate-loader.service'; +export * from './alfresco-authentication.service'; +export * from './alfresco-translation.service'; +export * from './alfresco-translate-loader.service'; diff --git a/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts index d674751faa..9f1db7b36b 100644 --- a/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts @@ -18,7 +18,7 @@ import { ReflectiveInjector } from '@angular/core'; import { AlfrescoApiService } from './alfresco-api.service'; import { RenditionsService } from './renditions.service'; -import { SettingsService } from './settings.service'; +import { AlfrescoSettingsService } from './alfresco-settings.service'; import { StorageService } from './storage.service'; import { LogService } from './log.service'; import { fakeRedition, fakeReditionCreated, fakeReditionsList } from '../assets/renditionsService.mock'; @@ -33,7 +33,7 @@ describe('RenditionsService', () => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoApiService, RenditionsService, - SettingsService, + AlfrescoSettingsService, StorageService, LogService ]); diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts index c8b5fd69b8..3df12c579c 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { DocumentListModule, DocumentListComponent, DocumentActionsService } from 'ng2-alfresco-documentlist'; -import { CoreModule, StorageService, SettingsService, AuthService, AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, StorageService, AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; @Component({ selector: 'alfresco-app-demo', @@ -127,9 +127,9 @@ class DocumentListDemo implements OnInit { @ViewChild(DocumentListComponent) documentList: DocumentListComponent; - constructor(private authService: AuthService, - private settingsService: SettingsService, - private translateService: AlfrescoTranslateService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, + private translateService: AlfrescoTranslationService, private documentActions: DocumentActionsService, private storage: StorageService, private logService: LogService) { diff --git a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts index 043a48e9a9..6a16887303 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts @@ -20,9 +20,9 @@ import { NodePaging } from './../models/document-library.model'; import { PageNode } from './document-library.model.mock'; import { DocumentListService } from './../services/document-list.service'; import { - SettingsService, - AuthService, - ContentService, + AlfrescoSettingsService, + AlfrescoAuthenticationService, + AlfrescoContentService, AlfrescoApiService, LogService } from 'ng2-alfresco-core'; @@ -34,9 +34,9 @@ export class DocumentListServiceMock extends DocumentListService { getFolderRejectError: string = 'Error'; constructor( - settings?: SettingsService, - authService?: AuthService, - contentService?: ContentService, + settings?: AlfrescoSettingsService, + authService?: AlfrescoAuthenticationService, + contentService?: AlfrescoContentService, apiService?: AlfrescoApiService, logService?: LogService, ) { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts index dac60616f0..13c863d15e 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts @@ -18,7 +18,7 @@ import { Component, OnInit, Input, OnChanges, Output, SimpleChanges, EventEmitter, AfterContentInit, TemplateRef, NgZone, ViewChild, HostListener } from '@angular/core'; import { Subject } from 'rxjs/Rx'; import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { DataRowEvent, DataTableComponent, ObjectDataColumn } from 'ng2-alfresco-datatable'; import { DocumentListService } from './../services/document-list.service'; import { ContentActionModel } from './../models/content-action.model'; @@ -118,7 +118,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni constructor( private documentListService: DocumentListService, private ngZone: NgZone, - private translateService: AlfrescoTranslateService) { + private translateService: AlfrescoTranslationService) { this.data = new ShareDataTableAdapter(this.documentListService, './', []); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts index e9e7172189..9d97b4bc9b 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, Output, EventEmitter, ViewChild } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { MinimalNodeEntity } from 'alfresco-js-api'; import { DocumentListService } from './../services/document-list.service'; @@ -53,7 +53,7 @@ export class DocumentMenuActionComponent { folderName: string = ''; constructor(private documentListService: DocumentListService, - private translateService: AlfrescoTranslateService, + private translateService: AlfrescoTranslationService, private logService: LogService) { if (translateService) { diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts index c1355849bc..041f03c471 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentService } from 'ng2-alfresco-core'; +import { AlfrescoContentService } from 'ng2-alfresco-core'; import { ContentActionHandler } from '../models/content-action.model'; import { DocumentActionsService } from './document-actions.service'; import { DocumentListServiceMock } from '../assets/document-list.service.mock'; @@ -26,11 +26,11 @@ describe('DocumentActionsService', () => { let service: DocumentActionsService; let documentListService: DocumentListService; - let contentService: ContentService; + let contentService: AlfrescoContentService; beforeEach(() => { documentListService = new DocumentListServiceMock(); - contentService = new ContentService(null, null); + contentService = new AlfrescoContentService(null, null); service = new DocumentActionsService(documentListService, contentService); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts index f903359f21..dc324195d9 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts @@ -18,14 +18,14 @@ import { Injectable } from '@angular/core'; import { ContentActionHandler } from '../models/content-action.model'; import { DocumentListService } from './document-list.service'; -import { ContentService } from 'ng2-alfresco-core'; +import { AlfrescoContentService } from 'ng2-alfresco-core'; @Injectable() export class DocumentActionsService { private handlers: { [id: string]: ContentActionHandler; } = {}; constructor(private documentListService?: DocumentListService, - private contentService?: ContentService) { + private contentService?: AlfrescoContentService) { this.setupActionHandlers(); } diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts index d2940e8608..9171956d8d 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { SettingsService, AuthService, AlfrescoApiService, StorageService, ContentService, LogService, LogServiceMock } from 'ng2-alfresco-core'; +import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoApiService, StorageService, AlfrescoContentService, LogService, LogServiceMock } from 'ng2-alfresco-core'; import { FileNode } from '../assets/document-library.model.mock'; import { ReflectiveInjector } from '@angular/core'; import { DocumentListService } from './document-list.service'; @@ -26,8 +26,8 @@ describe('DocumentListService', () => { let injector; let service: DocumentListService; - let settingsService: SettingsService; - let authService: AuthService; + let settingsService: AlfrescoSettingsService; + let authService: AlfrescoAuthenticationService; let alfrescoApiService: AlfrescoApiService; let fakeEntryNode = { @@ -94,17 +94,17 @@ describe('DocumentListService', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoApiService, - AuthService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoSettingsService, AlfrescoApiService, - ContentService, + AlfrescoContentService, DocumentListService, StorageService, { provide: LogService, useClass: LogServiceMock } ]); - settingsService = injector.get(SettingsService); - authService = injector.get(AuthService); + settingsService = injector.get(AlfrescoSettingsService); + authService = injector.get(AlfrescoAuthenticationService); alfrescoApiService = injector.get(AlfrescoApiService); service = injector.get(DocumentListService); jasmine.Ajax.install(); diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts index 336ce1be70..f2b4254184 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; import { NodePaging, MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; -import { AuthService, ContentService, AlfrescoApiService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoApiService, LogService } from 'ng2-alfresco-core'; @Injectable() export class DocumentListService { @@ -57,8 +57,8 @@ export class DocumentListService { 'application/vnd.apple.numbers': 'ft_ic_spreadsheet.svg' }; - constructor(private authService: AuthService, - private contentService: ContentService, + constructor(private authService: AlfrescoAuthenticationService, + private contentService: AlfrescoContentService, private apiService: AlfrescoApiService, private logService: LogService) { } diff --git a/ng2-components/ng2-alfresco-login/demo/src/main.ts b/ng2-components/ng2-alfresco-login/demo/src/main.ts index c408d1301a..997eae02cc 100644 --- a/ng2-components/ng2-alfresco-login/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core'; import { LoginModule } from 'ng2-alfresco-login'; @Component({ @@ -70,8 +70,8 @@ export class AppComponent implements OnInit { isECM: boolean = true; isBPM: boolean = false; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts index 18c4da91f3..a30a2b863c 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts @@ -17,8 +17,8 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { DebugElement } from '@angular/core'; -import { AuthService, CoreModule } from 'ng2-alfresco-core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, CoreModule } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AlfrescoLoginComponent } from './alfresco-login.component'; import { AuthenticationMock } from './../assets/authentication.service.mock'; import { TranslationMock } from './../assets/translation.service.mock'; @@ -38,8 +38,8 @@ describe('AlfrescoLogin', () => { ], declarations: [AlfrescoLoginComponent], providers: [ - {provide: AuthService, useClass: AuthenticationMock}, - {provide: AlfrescoTranslateService, useClass: TranslationMock} + {provide: AlfrescoAuthenticationService, useClass: AuthenticationMock}, + {provide: AlfrescoTranslationService, useClass: TranslationMock} ] }).compileComponents(); })); diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index ff6ee77ed5..407dcdbe3c 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -17,7 +17,7 @@ import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { AlfrescoTranslateService, AuthService, SettingsService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoSettingsService, LogService } from 'ng2-alfresco-core'; import { FormSubmitEvent } from '../models/form-submit-event.model'; declare let componentHandler: any; @@ -75,9 +75,9 @@ export class AlfrescoLoginComponent implements OnInit { * @param translate */ constructor(private _fb: FormBuilder, - private authService: AuthService, - private settingsService: SettingsService, - private translateService: AlfrescoTranslateService, + private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, + private translateService: AlfrescoTranslationService, private logService: LogService) { if (translateService) { diff --git a/ng2-components/ng2-alfresco-search/demo/src/main.ts b/ng2-components/ng2-alfresco-search/demo/src/main.ts index 1f6ee3650d..508e1d75d2 100644 --- a/ng2-components/ng2-alfresco-search/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-search/demo/src/main.ts @@ -23,9 +23,9 @@ import { CoreModule, LogService } from 'ng2-alfresco-core'; import { SearchModule } from 'ng2-alfresco-search'; import { - SettingsService, - AuthService, - AlfrescoTranslateService + AlfrescoSettingsService, + AlfrescoAuthenticationService, + AlfrescoTranslationService } from 'ng2-alfresco-core'; @Component({ @@ -54,9 +54,9 @@ class SearchDemo implements OnInit { ecmHost: string = 'http://localhost:8080'; ticket: string; - constructor(private authService: AuthService, - private settingsService: SettingsService, - translation: AlfrescoTranslateService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, + translation: AlfrescoTranslationService, private logService: LogService) { settingsService.ecmHost = this.ecmHost; diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts index 6dd37a3ed3..0e23802ce3 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts @@ -23,10 +23,10 @@ import { result, results, folderResult, noResult, errorJson } from './../assets/ import { AlfrescoSearchService } from '../services/alfresco-search.service'; import { AlfrescoApiService, - SettingsService, - AuthService, - ContentService, - AlfrescoTranslateService, + AlfrescoSettingsService, + AlfrescoAuthenticationService, + AlfrescoContentService, + AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; @@ -48,12 +48,12 @@ describe('AlfrescoSearchAutocompleteComponent', () => { ], declarations: [ AlfrescoSearchAutocompleteComponent ], // declare the test component providers: [ - {provide: AlfrescoTranslateService, useClass: TranslationMock}, + {provide: AlfrescoTranslationService, useClass: TranslationMock}, AlfrescoThumbnailService, - SettingsService, + AlfrescoSettingsService, AlfrescoApiService, - AuthService, - ContentService, + AlfrescoAuthenticationService, + AlfrescoContentService, AlfrescoSearchService ] }).compileComponents().then(() => { @@ -64,7 +64,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => { })); it('should setup i18n folder', () => { - let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService); + let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService); spyOn(translationService, 'addTranslationFolder'); fixture.detectChanges(); expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts index 2e5d97fbb0..f4b5e50e13 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts @@ -16,7 +16,7 @@ */ import { Component, ElementRef, EventEmitter, Input, OnInit, OnChanges, Output, ViewChild } from '@angular/core'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { MinimalNodeEntity } from 'alfresco-js-api'; import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service'; import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service'; @@ -71,7 +71,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges { baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', ''); constructor(private searchService: AlfrescoSearchService, - private translateService: AlfrescoTranslateService, + private translateService: AlfrescoTranslationService, private thumbnailService: AlfrescoThumbnailService) { } diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts index cddf0971fd..b7315e18ab 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts @@ -22,11 +22,11 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi import { TranslationMock } from './../assets/translation.service.mock'; import { result } from './../assets/alfresco-search.component.mock'; import { - SettingsService, + AlfrescoSettingsService, AlfrescoApiService, - AuthService, - ContentService, - AlfrescoTranslateService, + AlfrescoAuthenticationService, + AlfrescoContentService, + AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { AlfrescoSearchService } from '../services/alfresco-search.service'; @@ -49,12 +49,12 @@ describe('AlfrescoSearchControlComponent', () => { AlfrescoSearchAutocompleteComponent ], providers: [ - {provide: AlfrescoTranslateService, useClass: TranslationMock}, + {provide: AlfrescoTranslationService, useClass: TranslationMock}, AlfrescoThumbnailService, - SettingsService, + AlfrescoSettingsService, AlfrescoApiService, - AuthService, - ContentService, + AlfrescoAuthenticationService, + AlfrescoContentService, AlfrescoSearchService ] }).compileComponents().then(() => { @@ -65,7 +65,7 @@ describe('AlfrescoSearchControlComponent', () => { })); it('should setup i18n folder', () => { - let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService); + let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService); spyOn(translationService, 'addTranslationFolder'); fixture.detectChanges(); expect(translationService.addTranslationFolder) diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts index 9377a9c72b..5c74e3be11 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts @@ -18,7 +18,7 @@ import { FormControl, Validators } from '@angular/forms'; import { Component, Input, Output, OnInit, OnDestroy, ElementRef, EventEmitter, ViewChild } from '@angular/core'; import { Observable, Subject } from 'rxjs/Rx'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component'; import { SearchTermValidator } from './../forms/search-term-validator'; @@ -86,7 +86,7 @@ export class AlfrescoSearchControlComponent implements OnInit, OnDestroy { private focusSubject = new Subject<FocusEvent>(); - constructor(private translateService: AlfrescoTranslateService) { + constructor(private translateService: AlfrescoTranslationService) { this.searchControl = new FormControl( this.searchTerm, diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts index 4deea3c6f2..61186eda3d 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts @@ -25,10 +25,10 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi import { TranslationMock } from './../assets/translation.service.mock'; import { AlfrescoSearchService } from '../services/alfresco-search.service'; import { - SettingsService, + AlfrescoSettingsService, AlfrescoApiService, - AuthService, - AlfrescoTranslateService, + AlfrescoAuthenticationService, + AlfrescoTranslationService, CoreModule, StorageService, LogService @@ -107,7 +107,7 @@ describe('AlfrescoSearchComponent', () => { declarations: [ AlfrescoSearchComponent ], // declare the test component providers: [ AlfrescoSearchService, - {provide: AlfrescoTranslateService, useClass: TranslationMock}, + {provide: AlfrescoTranslationService, useClass: TranslationMock}, AlfrescoThumbnailService ] }).compileComponents().then(() => { @@ -133,8 +133,8 @@ describe('AlfrescoSearchComponent', () => { it('should have a null search term if no query param provided via RouteParams', () => { let injector = ReflectiveInjector.resolveAndCreate([ AlfrescoSearchService, - AuthService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoSettingsService, AlfrescoApiService, StorageService, LogService, @@ -146,7 +146,7 @@ describe('AlfrescoSearchComponent', () => { }); it('should setup i18n folder', () => { - let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService); + let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService); spyOn(translationService, 'addTranslationFolder'); fixture.detectChanges(); expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts index ae04512f75..711f057d03 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts @@ -19,7 +19,7 @@ import { Component, EventEmitter, Input, Output, Optional, OnChanges, SimpleChan import { ActivatedRoute, Params } from '@angular/router'; import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service'; import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { MinimalNodeEntity } from 'alfresco-js-api'; @Component({ @@ -66,7 +66,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', ''); constructor(private searchService: AlfrescoSearchService, - private translateService: AlfrescoTranslateService, + private translateService: AlfrescoTranslationService, private thumbnailService: AlfrescoThumbnailService, @Optional() private route: ActivatedRoute) { } diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts index bf23dd64c6..9b8f991139 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts @@ -17,7 +17,7 @@ import { ReflectiveInjector } from '@angular/core'; import { AlfrescoSearchService } from './alfresco-search.service'; -import { AuthService, SettingsService, AlfrescoApiService, StorageService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService, StorageService, LogService } from 'ng2-alfresco-core'; import { fakeApi, fakeSearch, fakeError } from '../assets/alfresco-search.service.mock'; declare let jasmine: any; @@ -31,9 +31,9 @@ describe('AlfrescoSearchService', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoSearchService, - SettingsService, + AlfrescoSettingsService, AlfrescoApiService, - AuthService, + AlfrescoAuthenticationService, StorageService, LogService ]); diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts index 6690c8fbbf..7de189c7da 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; -import { AuthService, AlfrescoApiService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; /** * Internal service used by Document List component. @@ -25,7 +25,7 @@ import { AuthService, AlfrescoApiService } from 'ng2-alfresco-core'; @Injectable() export class AlfrescoSearchService { - constructor(public authService: AuthService, + constructor(public authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) { } diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts index 86f4f2809d..69bffb4364 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts @@ -17,7 +17,7 @@ import { ReflectiveInjector } from '@angular/core'; import { AlfrescoThumbnailService } from './alfresco-thumbnail.service'; -import { AlfrescoApiService, AuthService, ContentService, SettingsService, StorageService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoApiService, AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoSettingsService, StorageService, LogService } from 'ng2-alfresco-core'; describe('AlfrescoThumbnailService', () => { @@ -27,9 +27,9 @@ describe('AlfrescoThumbnailService', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ AlfrescoApiService, - AuthService, - ContentService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoContentService, + AlfrescoSettingsService, AlfrescoThumbnailService, StorageService, LogService diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts index 102bc2f276..6cec75e9e4 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { ContentService } from 'ng2-alfresco-core'; +import { AlfrescoContentService } from 'ng2-alfresco-core'; @Injectable() export class AlfrescoThumbnailService { @@ -50,7 +50,7 @@ export class AlfrescoThumbnailService { 'application/vnd.apple.numbers': 'ft_ic_spreadsheet' }; - constructor(public contentService: ContentService) { + constructor(public contentService: AlfrescoContentService) { } /** diff --git a/ng2-components/ng2-alfresco-tag/demo/src/main.ts b/ng2-components/ng2-alfresco-tag/demo/src/main.ts index 503f8587e2..254108b4c7 100644 --- a/ng2-components/ng2-alfresco-tag/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-tag/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, Input, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core'; import { TagModule } from 'ng2-alfresco-tag'; @Component({ @@ -57,8 +57,8 @@ class TagDemo implements OnInit { ecmHost: string = 'http://127.0.0.1:8080'; ticket: string; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { diff --git a/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts b/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts index d1209827da..d60dfcd73a 100644 --- a/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts +++ b/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts @@ -17,8 +17,8 @@ import { ReflectiveInjector } from '@angular/core'; import { - AuthService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoSettingsService, AlfrescoApiService, StorageService, LogService @@ -33,9 +33,9 @@ describe('Tag service', () => { beforeEach(() => { injector = ReflectiveInjector.resolveAndCreate([ - SettingsService, + AlfrescoSettingsService, AlfrescoApiService, - AuthService, + AlfrescoAuthenticationService, TagService, StorageService, LogService diff --git a/ng2-components/ng2-alfresco-upload/demo/src/main.ts b/ng2-components/ng2-alfresco-upload/demo/src/main.ts index bded6b561b..a8c702b244 100644 --- a/ng2-components/ng2-alfresco-upload/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-upload/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core'; import { UploadModule } from 'ng2-alfresco-upload'; @Component({ @@ -111,8 +111,8 @@ export class MyDemoApp implements OnInit { versioning: boolean = false; ticket: string; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { settingsService.ecmHost = this.ecmHost; diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts index 2f52e516c9..f2ce0642a7 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts @@ -17,7 +17,7 @@ import { Component, ChangeDetectorRef, OnInit, OnDestroy } from '@angular/core'; import { FileModel } from '../models/file.model'; -import { AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; /** @@ -52,7 +52,7 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy { private counterSubscription: any; constructor(private cd: ChangeDetectorRef, - translateService: AlfrescoTranslateService, + translateService: AlfrescoTranslationService, private uploadService: UploadService) { if (translateService) { translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts index ecfa093563..bdd037fb9f 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts @@ -18,7 +18,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { UploadButtonComponent } from './upload-button.component'; import { DebugElement } from '@angular/core'; -import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { TranslationMock } from '../assets/translation.service.mock'; import { UploadService } from '../services/upload.service'; @@ -73,7 +73,7 @@ describe('UploadButtonComponent', () => { ], providers: [ UploadService, - { provide: AlfrescoTranslateService, useClass: TranslationMock } + { provide: AlfrescoTranslationService, useClass: TranslationMock } ] }).compileComponents(); })); diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts index 83acb906dc..ab1a491470 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts @@ -17,7 +17,7 @@ import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from '@angular/core'; import 'rxjs/Rx'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; import { FileModel } from '../models/file.model'; @@ -90,7 +90,7 @@ export class UploadButtonComponent { constructor(private el: ElementRef, private uploadService: UploadService, - private translateService: AlfrescoTranslateService, + private translateService: AlfrescoTranslationService, private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts index 20312b5c07..6a513d19ed 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { EventEmitter, DebugElement } from '@angular/core'; -import { AlfrescoTranslateService, CoreModule, LogService, LogServiceMock } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, CoreModule, LogService, LogServiceMock } from 'ng2-alfresco-core'; import { UploadDragAreaComponent } from './upload-drag-area.component'; import { TranslationMock } from '../assets/translation.service.mock'; @@ -42,7 +42,7 @@ describe('UploadDragAreaComponent', () => { ], providers: [ UploadService, - { provide: AlfrescoTranslateService, useClass: TranslationMock }, + { provide: AlfrescoTranslationService, useClass: TranslationMock }, { provide: LogService, useClass: LogServiceMock } ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts index 7eca1e0b17..799f851247 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts @@ -16,7 +16,7 @@ */ import { Component, ViewChild, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; import { FileModel } from '../models/file.model'; @@ -62,7 +62,7 @@ export class UploadDragAreaComponent { onSuccess = new EventEmitter(); constructor(private uploadService: UploadService, - private translateService: AlfrescoTranslateService, + private translateService: AlfrescoTranslationService, private logService: LogService) { if (translateService) { translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); diff --git a/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts b/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts index f55e2ce70f..4bc89f84d5 100644 --- a/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-userinfo/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { UserInfoComponentModule } from 'ng2-alfresco-userinfo'; -import { CoreModule, AuthService, SettingsService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoAuthenticationService, AlfrescoSettingsService, LogService } from 'ng2-alfresco-core'; import { LoginModule } from 'ng2-alfresco-login'; @Component({ @@ -87,8 +87,8 @@ class UserInfoDemo implements OnInit { isECM: boolean = true; isBPM: boolean = false; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private logService: LogService) { settingsService.ecmHost = this.ecmHost; settingsService.bpmHost = this.bpmHost; diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts index e09969d146..69313b9f20 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts @@ -22,9 +22,9 @@ import { BpmUserModel } from '../models/bpm-user.model'; import { TranslationMock } from '../assets/translation.service.mock'; import { CoreModule, - AuthService, - ContentService, - AlfrescoTranslateService + AlfrescoAuthenticationService, + AlfrescoContentService, + AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; @@ -73,8 +73,8 @@ describe('User info component', () => { let userInfoComp: UserInfoComponent; let fixture: ComponentFixture<UserInfoComponent>; let element: HTMLElement; - let stubAuthService: AuthService; - let stubContent: ContentService; + let stubAuthService: AlfrescoAuthenticationService; + let stubContent: AlfrescoContentService; let componentHandler; beforeEach(async(() => { @@ -90,15 +90,15 @@ describe('User info component', () => { providers: [ EcmUserService, BpmUserService, - {provide: AlfrescoTranslateService, useClass: TranslationMock} + {provide: AlfrescoTranslationService, useClass: TranslationMock} ] }).compileComponents().then(() => { fixture = TestBed.createComponent(UserInfoComponent); userInfoComp = fixture.componentInstance; element = fixture.nativeElement; - stubAuthService = TestBed.get(AuthService); - stubContent = TestBed.get(ContentService); + stubAuthService = TestBed.get(AlfrescoAuthenticationService); + stubContent = TestBed.get(AlfrescoContentService); }); })); diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts index 11cc37483f..0098ef6949 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts @@ -16,7 +16,7 @@ */ import { Component, OnInit, Input } from '@angular/core'; -import { AlfrescoTranslateService, AuthService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { EcmUserModel } from './../models/ecm-user.model'; import { BpmUserModel } from './../models/bpm-user.model'; import { EcmUserService } from './../services/ecm-user.service'; @@ -58,8 +58,8 @@ export class UserInfoComponent implements OnInit { constructor(private ecmUserService: EcmUserService, private bpmUserService: BpmUserService, - private authService: AuthService, - private translateService: AlfrescoTranslateService) { + private authService: AlfrescoAuthenticationService, + private translateService: AlfrescoTranslationService) { if (translateService) { translateService.addTranslationFolder('ng2-alfresco-userinfo', 'node_modules/ng2-alfresco-userinfo/src'); } diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts index b21f4c8445..55f956b7f4 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { CoreModule, AuthService, AlfrescoApiService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; import { BpmUserService } from '../services/bpm-user.service'; // import { fakeBpmUser } from '../assets/fake-bpm-user.service.mock'; @@ -25,7 +25,7 @@ declare let jasmine: any; describe('BpmUserService', () => { let service: BpmUserService; - let authService: AuthService; + let authService: AlfrescoAuthenticationService; let apiService: AlfrescoApiService; beforeEach(() => { @@ -38,7 +38,7 @@ describe('BpmUserService', () => { ] }); service = TestBed.get(BpmUserService); - authService = TestBed.get(AuthService); + authService = TestBed.get(AlfrescoAuthenticationService); apiService = TestBed.get(AlfrescoApiService); jasmine.Ajax.install(); }); diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts index 1fc7c1c071..bae903ba4a 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { CoreModule, AuthService, ContentService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoAuthenticationService, AlfrescoContentService } from 'ng2-alfresco-core'; import { EcmUserService } from '../services/ecm-user.service'; import { fakeEcmUser } from '../assets/fake-ecm-user.service.mock'; @@ -25,8 +25,8 @@ declare let jasmine: any; describe('EcmUserService', () => { let service: EcmUserService; - let authService: AuthService; - let contentService: ContentService; + let authService: AlfrescoAuthenticationService; + let contentService: AlfrescoContentService; beforeEach(() => { TestBed.configureTestingModule({ @@ -38,8 +38,8 @@ describe('EcmUserService', () => { ] }); service = TestBed.get(EcmUserService); - authService = TestBed.get(AuthService); - contentService = TestBed.get(ContentService); + authService = TestBed.get(AlfrescoAuthenticationService); + contentService = TestBed.get(AlfrescoContentService); }); describe('when user is logged in', () => { diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts index 5531a43f41..2e743efcf0 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; -import { ContentService, AlfrescoApiService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoContentService, AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { EcmUserModel } from '../models/ecm-user.model'; /** * @@ -30,7 +30,7 @@ import { EcmUserModel } from '../models/ecm-user.model'; export class EcmUserService { constructor(private apiService: AlfrescoApiService, - private contentService: ContentService, + private contentService: AlfrescoContentService, private logService: LogService) { } diff --git a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts index 7e8e66e7bb..622f014e93 100644 --- a/ng2-components/ng2-alfresco-viewer/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts @@ -18,7 +18,7 @@ import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core'; import { ViewerModule } from 'ng2-alfresco-viewer'; @Component({ @@ -51,8 +51,8 @@ class MyDemoApp { ecmHost: string = 'http://127.0.0.1:8080'; ticket: string; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { settingsService.ecmHost = this.ecmHost; diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts index 9d42031043..f7fc9c562f 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/imgViewer.component.spec.ts @@ -19,8 +19,8 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { ImgViewerComponent } from './imgViewer.component'; import { DebugElement } from '@angular/core'; import { - AuthService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoSettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -39,8 +39,8 @@ describe('Test ng2-alfresco-viewer Img viewer component ', () => { ], declarations: [ImgViewerComponent], providers: [ - SettingsService, - AuthService, + AlfrescoSettingsService, + AlfrescoAuthenticationService, AlfrescoApiService ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts index b996cd6ae0..7f9600dda9 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.spec.ts @@ -19,8 +19,8 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { MediaPlayerComponent } from './mediaPlayer.component'; import { DebugElement } from '@angular/core'; import { - AuthService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoSettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -39,8 +39,8 @@ describe('Test ng2-alfresco-viewer Media player component ', () => { ], declarations: [MediaPlayerComponent], providers: [ - SettingsService, - AuthService, + AlfrescoSettingsService, + AlfrescoAuthenticationService, AlfrescoApiService ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts index 090002d5ca..4e87868bd8 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.spec.ts @@ -19,8 +19,8 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { NotSupportedFormat } from './notSupportedFormat.component'; import { DebugElement } from '@angular/core'; import { - AuthService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoSettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -39,8 +39,8 @@ describe('Test ng2-alfresco-viewer Not Supported Format View component', () => { ], declarations: [NotSupportedFormat], providers: [ - SettingsService, - AuthService, + AlfrescoSettingsService, + AlfrescoAuthenticationService, AlfrescoApiService ] }).compileComponents(); diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts index c501cb8120..c99b5e9532 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/pdfViewer.component.spec.ts @@ -21,8 +21,8 @@ import { PdfViewerComponent } from './pdfViewer.component'; import { EventMock } from '../assets/event.mock'; import { DebugElement } from '@angular/core'; import { - AuthService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoSettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -41,8 +41,8 @@ describe('Test ng2-alfresco-viewer PdfViewer component', () => { ], declarations: [PdfViewerComponent], providers: [ - SettingsService, - AuthService, + AlfrescoSettingsService, + AlfrescoAuthenticationService, AlfrescoApiService, RenderingQueueServices ] diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts index 0dbbec350c..e610f0b329 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.spec.ts @@ -25,8 +25,8 @@ import { ViewerComponent } from './viewer.component'; import { EventMock } from '../assets/event.mock'; import { DebugElement } from '@angular/core'; import { - AuthService, - SettingsService, + AlfrescoAuthenticationService, + AlfrescoSettingsService, AlfrescoApiService, CoreModule } from 'ng2-alfresco-core'; @@ -53,8 +53,8 @@ describe('Test ng2-alfresco-viewer ViewerComponent', () => { ImgViewerComponent ], providers: [ - SettingsService, - AuthService, + AlfrescoSettingsService, + AlfrescoAuthenticationService, AlfrescoApiService, RenderingQueueServices ] diff --git a/ng2-components/ng2-alfresco-webscript/demo/src/main.ts b/ng2-components/ng2-alfresco-webscript/demo/src/main.ts index d092d9ce0a..5f60df5cc0 100644 --- a/ng2-components/ng2-alfresco-webscript/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-webscript/demo/src/main.ts @@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; import { WebScriptModule } from 'ng2-alfresco-webscript'; @@ -62,8 +62,8 @@ class WebscriptDemo implements OnInit { scriptArgs: string = ''; ticket: string; - constructor(private authService: AuthService, - private settingsService: SettingsService, + constructor(private authService: AlfrescoAuthenticationService, + private settingsService: AlfrescoSettingsService, private storage: StorageService, private logService: LogService) { From f5d2269c2e44e995ebbfb4798d1c9fe1a2551bde Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Mon, 16 Jan 2017 11:50:14 +0000 Subject: [PATCH 069/108] #1112 Use the mdl-chip (#1466) * #1112 Use the mdl-chip * fix unit test --- .../ng2-activiti-tasklist/README.md | 1 + .../src/assets/images/user.jpg | Bin 0 -> 6961 bytes .../activiti-people-search.component.css | 18 ++++++++++++++++++ .../activiti-people-search.component.html | 9 ++++----- .../activiti-people-search.component.spec.ts | 10 ++++++---- .../activiti-people-search.component.ts | 6 ++++++ .../components/activiti-people.component.html | 14 ++++++-------- .../components/activiti-people.component.ts | 5 +++++ .../activiti-task-details.component.html | 2 +- .../activiti-task-details.component.ts | 3 +++ 10 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 ng2-components/ng2-activiti-tasklist/src/assets/images/user.jpg diff --git a/ng2-components/ng2-activiti-tasklist/README.md b/ng2-components/ng2-activiti-tasklist/README.md index 11aacfe5cf..a972fff803 100644 --- a/ng2-components/ng2-activiti-tasklist/README.md +++ b/ng2-components/ng2-activiti-tasklist/README.md @@ -267,6 +267,7 @@ The component shows the details of the task id passed in input | `showFormRefreshButton` | {boolean} | optional | Toggle rendering of the `Refresh` button. | | `showFormSaveButton` | {boolean} | optional | Toggle rendering of the `Save` outcome button. | | `showFormCompleteButton` | {boolean} | optional | Toggle rendering of the Form `Complete` outcome button | +| `peopleIconImageUrl` | {string} | optional | Define a custom people icon image | ### Custom 'empty Activiti Task Details' template diff --git a/ng2-components/ng2-activiti-tasklist/src/assets/images/user.jpg b/ng2-components/ng2-activiti-tasklist/src/assets/images/user.jpg new file mode 100644 index 0000000000000000000000000000000000000000..930ab14f0b20c224bad94fee8df1f9839854c8e9 GIT binary patch literal 6961 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 literal 0 HcmV?d00001 diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.css b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.css index 11c70fd077..2bbb854137 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.css +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.css @@ -16,3 +16,21 @@ padding-bottom: 0px; padding-left: 0px; } + +.mdl-chip-search-people{ + margin: auto; + min-width: 60%; +} + +.mdl-chip-search-people:hover{ + background-color: #c1c1c1; + cursor: pointer; +} + +.mdl-chip-search-people img{ + margin-left: -30px; +} + +.mdl-chip-search-people__text{ + padding-left: 10px; +} \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html index b6e13ddeb3..94a6dc7075 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html @@ -5,11 +5,10 @@ </div> <ul class='mdl-list'> <li class="mdl-list__item fix-element-user-list" *ngFor="let user of userList"> - <span class="mdl-list__item-primary-content mdl-button mdl-js-button mdl-js-ripple-effect" - (click)="onRowClick(user)" id="user-{{user.id}}"> - <i class="material-icons md-light people-search__icon">face</i> - {{getDisplayUser(user)}} - </span> + <button (click)="onRowClick(user)" id="user-{{user.id}}" class="mdl-chip mdl-chip--contact mdl-chip-search-people"> + <img class="mdl-chip__contact" [src]="iconImageUrl || baseComponentPath + '/../assets/images/user.jpg'" /> + <span class="mdl-chip__text mdl-chip-search-people__text">{{getDisplayUser(user)}}</span> + </button> </li> <div *ngIf="userList?.length === 0" id="no-user-found"> No user found to involve diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts index 144604d799..ab0e57f66e 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts @@ -109,10 +109,11 @@ describe('ActivitiPeopleSearch', () => { searchInput.dispatchEvent(new Event('input')); }); - it('should send an event when an user is clicked', async(() => { + it('should send an event when an user is clicked', (done) => { activitiPeopleSearchComponent.onRowClicked.subscribe((user) => { expect(user).toBeDefined(); expect(user.firstName).toBe('fake-name'); + done(); }); activitiPeopleSearchComponent.results = Observable.of(userArray); activitiPeopleSearchComponent.ngOnInit(); @@ -122,9 +123,9 @@ describe('ActivitiPeopleSearch', () => { let userToSelect = <HTMLElement> element.querySelector('#user-1'); userToSelect.click(); }); - })); + }); - it('should remove clicked user', async(() => { + it('should remove clicked user', (done) => { activitiPeopleSearchComponent.results = Observable.of(userArray); activitiPeopleSearchComponent.ngOnInit(); fixture.detectChanges(); @@ -135,6 +136,7 @@ describe('ActivitiPeopleSearch', () => { fixture.whenStable() .then(() => { expect(element.querySelector('#user-1')).toBeNull(); + done(); }); - })); + }); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts index 687a74c1f8..a06b06cb55 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts @@ -32,6 +32,11 @@ declare let componentHandler: any; export class ActivitiPeopleSearch implements OnInit, AfterViewInit { + baseComponentPath = module.id.replace('/activiti-people-search.component.js', ''); + + @Input() + iconImageUrl: string; + @Input() results: Observable<User[]>; @@ -81,6 +86,7 @@ export class ActivitiPeopleSearch implements OnInit, AfterViewInit { onRowClick(userClicked: User) { this.onRowClicked.emit(userClicked); this.userList = this.userList.filter((user) => { + this.searchUser.reset(); return user.id !== userClicked.id; }); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html index 7e5cdbf1a1..e11aa7d557 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html @@ -7,14 +7,11 @@ <div class="menu-container" *ngIf="people?.length > 0"> <ul class='mdl-list'> <li class="mdl-list__item" *ngFor="let user of people"> - <span class="mdl-list__item-primary-content"> - <i class="material-icons mdl-list__item-icon">face</i> - <span id="user-{{user.id}}">{{getDisplayUser(user)}}</span> + <span class="mdl-chip mdl-chip--contact mdl-chip--deletable"> + <img class="mdl-chip__contact" [src]="iconImageUrl || baseComponentPath + '/../assets/images/user.jpg'" /> + <span id="user-{{user.id}}" class="mdl-chip__text">{{getDisplayUser(user)}}</span> + <a *ngIf="!readOnly" class="mdl-chip__action"><i id="remove-{{user.id}}" (click)="removeInvolvedUser(user)" class="material-icons people__icon">cancel</i></a> </span> - <a *ngIf="!readOnly" class="mdl-list__item-secondary-action"> - <i id="remove" class="material-icons people__icon" - (click)="removeInvolvedUser(user)">delete</i> - </a> </li> </ul> </div> @@ -27,7 +24,8 @@ <div class="mdl-dialog__content add-people-dialog__content"> <activiti-people-search (onSearch)="searchUser($event)" (onRowClicked)="involveUser($event)" - [results]="peopleSearch$"> + [results]="peopleSearch$" + [iconImageUrl]="iconImageUrl"> </activiti-people-search> </div> <div class="mdl-dialog__actions"> diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts index e4213f2d24..cc4733429e 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts @@ -31,6 +31,11 @@ declare let dialogPolyfill: any; }) export class ActivitiPeople { + baseComponentPath = module.id.replace('/activiti-people.component.js', ''); + + @Input() + iconImageUrl: string; + @Input() people: User [] = []; diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html index 7d1d86a2b3..46be6220d5 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html @@ -15,7 +15,7 @@ (claim)="onClaimTask($event)"></activiti-task-header> <div class="mdl-grid"> <div class="mdl-cell mdl-cell--4-col"> - <activiti-people [people]="taskPeople" [readOnly]="readOnlyForm" + <activiti-people [iconImageUrl]="peopleIconImageUrl" [people]="taskPeople" [readOnly]="readOnlyForm" [taskId]="taskDetails.id"></activiti-people> </div> <div class="mdl-cell mdl-cell--4-col"> diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts index ee5574ce03..1abb7e4ab8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts @@ -61,6 +61,9 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { @Input() showFormRefreshButton: boolean = true; + @Input() + peopleIconImageUrl: string; + @Output() formSaved: EventEmitter<FormModel> = new EventEmitter<FormModel>(); From aba4c8ef3e97d2d4b16e4fac8cca4435cd7a34aa Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Mon, 16 Jan 2017 11:50:23 +0000 Subject: [PATCH 070/108] Wrong grammar with single file uploaded (#1468) #1449 Wrong grammar with single file upload --- .../src/components/file-uploading-dialog.component.html | 2 +- .../src/components/file-uploading-dialog.component.ts | 5 +++++ ng2-components/ng2-alfresco-upload/src/i18n/en.json | 1 + ng2-components/ng2-alfresco-upload/src/i18n/it.json | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html index 907ab94964..9f3fad5f45 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html @@ -1,7 +1,7 @@ <div class="file-dialog" [ngClass]="{show: isDialogActive}"> <div class="header"> <div class="title"> - <span id="total-upload-completed">{{totalCompleted}}</span> {{'FILE_UPLOAD.MESSAGES.COMPLETED' | translate}} + <span id="total-upload-completed">{{totalCompleted}}</span> {{ totalCompletedMsg | translate}} </div> <div class="buttons"> <div class="minimize-button" [ngClass]="{active: _isDialogMinimized}" (keyup.enter)="toggleDialogMinimize()" (click)="toggleDialogMinimize()" tabindex="0"> diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts index f2ce0642a7..85bdcb16c4 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts @@ -46,6 +46,8 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy { totalCompleted: number = 0; + totalCompletedMsg: string = 'FILE_UPLOAD.MESSAGES.SINGLE_COMPLETED'; + private _isDialogMinimized: boolean = false; private listSubscription: any; @@ -72,6 +74,9 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy { if (this.uploadService.totalCompleted$) { this.counterSubscription = this.uploadService.totalCompleted$.subscribe((total: number) => { this.totalCompleted = total; + if (this.totalCompleted > 1) { + this.totalCompletedMsg = 'FILE_UPLOAD.MESSAGES.COMPLETED'; + } this.cd.detectChanges(); }); } diff --git a/ng2-components/ng2-alfresco-upload/src/i18n/en.json b/ng2-components/ng2-alfresco-upload/src/i18n/en.json index 9400e18911..54ec8a33ee 100644 --- a/ng2-components/ng2-alfresco-upload/src/i18n/en.json +++ b/ng2-components/ng2-alfresco-upload/src/i18n/en.json @@ -6,6 +6,7 @@ "CANCEL": "CANCEL" }, "MESSAGES": { + "SINGLE_COMPLETED": "upload complete", "COMPLETED": "uploads complete", "PROGRESS": "Upload in progress...", "FOLDER_ALREADY_EXIST": "The folder {0} already exist", diff --git a/ng2-components/ng2-alfresco-upload/src/i18n/it.json b/ng2-components/ng2-alfresco-upload/src/i18n/it.json index 0208da3079..53ed5ac488 100644 --- a/ng2-components/ng2-alfresco-upload/src/i18n/it.json +++ b/ng2-components/ng2-alfresco-upload/src/i18n/it.json @@ -6,6 +6,7 @@ "CANCEL": "CANCELLA" }, "MESSAGES": { + "SINGLE_COMPLETED": "caricamento completato", "COMPLETED": "caricamenti completati", "PROGRESS": "caricamento in corso...", "FOLDER_ALREADY_EXIST": "Cartella {0} già presente", From 4b017bd0622af37f143dd1f27aacc10b4e2b53bd Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Mon, 16 Jan 2017 11:50:38 +0000 Subject: [PATCH 071/108] #1439 Fix version inside demoshell (#1475) --- demo-shell-ng2/package.json | 2 +- ng2-components/ng2-activiti-diagrams/package.json | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index fae7633dcb..f8360b8ee7 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -73,7 +73,7 @@ "pdfjs-dist": "1.5.404", "flag-icon-css": "2.3.0", "moment": "2.15.1", - "chart.js": "^2.1.4", + "chart.js": "2.3.0", "ng2-charts": "1.1.0", "raphael": "^2.2.6", "md-date-time-picker": "^2.2.0", diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json index 6abc9de701..60d1fcf6fe 100644 --- a/ng2-components/ng2-activiti-diagrams/package.json +++ b/ng2-components/ng2-activiti-diagrams/package.json @@ -53,8 +53,6 @@ "systemjs": "0.19.27", "zone.js": "^0.6.23", "raphael": "^2.2.6", - "chart.js": "^2.1.4", - "ng2-charts": "1.1.0", "ng2-translate": "2.5.0", "alfresco-js-api": "^1.0.0", "ng2-alfresco-core": "1.0.0" From c6126b6be1798695ced24a8fb3579cbd27843b4b Mon Sep 17 00:00:00 2001 From: Will Abson <will.abson@gmail.com> Date: Mon, 16 Jan 2017 11:53:18 +0000 Subject: [PATCH 072/108] Hide the process list when starting and after started new process (#1470) - Ensures that the newly-started process is *always* shown - No need to reload the list any more as not shown - Filter component shows no selected filter when starting process - User can exit Start Process by clicking a filter again Refs #1332, #1307 --- .../components/activiti/activiti-demo.component.html | 10 ++++++---- .../app/components/activiti/activiti-demo.component.ts | 6 +++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html index f7b4a74c04..4f00688632 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html @@ -68,7 +68,7 @@ (filterClick)="onProcessFilterClick($event)" (onSuccess)="onSuccessProcessFilterList($event)"></activiti-process-instance-filters> </div> - <div class="mdl-cell mdl-cell--3-col task-column list-column mdl-shadow--2dp"> + <div class="mdl-cell mdl-cell--3-col task-column list-column mdl-shadow--2dp" *ngIf="processFilter && !isStartProcessMode()"> <span><h5>Process List</h5></span> <hr> <activiti-process-instance-list *ngIf="processFilter?.hasFilter()" [appId]="processFilter.appId" @@ -80,7 +80,9 @@ (rowClick)="onProcessRowClick($event)" (onSuccess)="onSuccessProcessList($event)"></activiti-process-instance-list> </div> - <div class="mdl-cell mdl-cell--7-col task-column mdl-shadow--2dp" *ngIf="!isStartProcessMode()"> + <div class="mdl-cell task-column mdl-shadow--2dp" *ngIf="!isStartProcessMode()" + [class.mdl-cell--7-col]="processFilter && !isStartProcessMode()" + [class.mdl-cell--10-col]="!processFilter || isStartProcessMode()"> <span><h5>Process Details</h5></span> <hr> <activiti-process-instance-details @@ -89,8 +91,8 @@ (taskClick)="onProcessDetailsTaskClick($event)"> </activiti-process-instance-details> </div> - <div class="mdl-cell mdl-cell--7-col task-column" *ngIf="isStartProcessMode()"> - <span>Start Process</span> + <div class="mdl-cell mdl-cell--10-col task-column mdl-shadow--2dp" *ngIf="isStartProcessMode()"> + <span><h5>Start Process</h5></span> <hr> <activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process> </div> diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index 949d63b147..b5ebeddcde 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -166,6 +166,7 @@ export class ActivitiDemoComponent implements AfterViewInit { } onProcessFilterClick(event: FilterProcessRepresentationModel) { + this.currentProcessInstanceId = null; this.processFilter = event; } @@ -190,13 +191,16 @@ export class ActivitiDemoComponent implements AfterViewInit { } navigateStartProcess() { + this.processFilter = null; + this.activitiprocessfilter.selectFilter(null); this.currentProcessInstanceId = currentProcessIdNew; } onStartProcessInstance(instance: ProcessInstance) { this.currentProcessInstanceId = instance.id; this.activitiStartProcess.reset(); - this.activitiprocesslist.reload(); + this.processFilter = null; + this.activitiprocessfilter.selectFilter(null); } isStartProcessMode() { From 399b716d8281a66168fbcad3d4065f15c45f8f42 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Tue, 17 Jan 2017 13:37:30 +0000 Subject: [PATCH 073/108] #1467 customs outcome (#1483) --- .../components/activiti-form.component.html | 2 +- .../activiti-form.component.spec.ts | 50 ++++++++++++++++--- .../src/components/activiti-form.component.ts | 5 +- .../activiti-start-form.component.html | 2 +- .../activiti-start-form.component.ts | 4 +- .../widgets/core/form-outcome.model.ts | 2 + .../src/components/widgets/core/form.model.ts | 2 + 7 files changed, 56 insertions(+), 11 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html index b1af9c278b..e6cbc5d8e9 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html @@ -24,7 +24,7 @@ alfresco-mdl-button [disabled]="!isOutcomeButtonEnabled(outcome)" [class.mdl-button--colored]="!outcome.isSystem" - [class.activiti-form-hide-button]="!isOutcomeButtonVisible(outcome)" + [class.activiti-form-hide-button]="!isOutcomeButtonVisible(outcome, form.readOnly)" (click)="onOutcomeClicked(outcome, $event)"> {{outcome.name}} </button> diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts index a10895e55d..79b6d1e18e 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts @@ -101,35 +101,73 @@ describe('ActivitiForm', () => { }); it('should not enable outcome button when model missing', () => { - expect(formComponent.isOutcomeButtonVisible(null)).toBeFalsy(); + expect(formComponent.isOutcomeButtonVisible(null, false)).toBeFalsy(); }); it('should enable custom outcome buttons', () => { let formModel = new FormModel(); + formComponent.form = formModel; let outcome = new FormOutcomeModel(formModel, {id: 'action1', name: 'Action 1'}); - expect(formComponent.isOutcomeButtonVisible(outcome)).toBeTruthy(); + expect(formComponent.isOutcomeButtonVisible(outcome, formComponent.form.readOnly)).toBeTruthy(); }); it('should allow controlling [complete] button visibility', () => { let formModel = new FormModel(); + formComponent.form = formModel; let outcome = new FormOutcomeModel(formModel, {id: '$save', name: FormOutcomeModel.SAVE_ACTION}); formComponent.showSaveButton = true; - expect(formComponent.isOutcomeButtonVisible(outcome)).toBeTruthy(); + expect(formComponent.isOutcomeButtonVisible(outcome, formComponent.form.readOnly)).toBeTruthy(); formComponent.showSaveButton = false; - expect(formComponent.isOutcomeButtonVisible(outcome)).toBeFalsy(); + expect(formComponent.isOutcomeButtonVisible(outcome, formComponent.form.readOnly)).toBeFalsy(); + }); + + it('should show only [complete] button with readOnly form ', () => { + let formModel = new FormModel(); + formModel.readOnly = true; + formComponent.form = formModel; + let outcome = new FormOutcomeModel(formModel, {id: '$complete', name: FormOutcomeModel.COMPLETE_ACTION}); + + formComponent.showCompleteButton = true; + expect(formComponent.isOutcomeButtonVisible(outcome, formComponent.form.readOnly)).toBeTruthy(); + }); + + it('should not show [save] button with readOnly form ', () => { + let formModel = new FormModel(); + formModel.readOnly = true; + formComponent.form = formModel; + let outcome = new FormOutcomeModel(formModel, {id: '$save', name: FormOutcomeModel.SAVE_ACTION}); + + formComponent.showSaveButton = true; + expect(formComponent.isOutcomeButtonVisible(outcome, formComponent.form.readOnly)).toBeFalsy(); + }); + + it('should show [custom-outcome] button with readOnly form and selected custom-outcome', () => { + let formModel = new FormModel({selectedOutcome: 'custom-outcome'}); + formModel.readOnly = true; + formComponent.form = formModel; + let outcome = new FormOutcomeModel(formModel, {id: '$customoutome', name: 'custom-outcome'}); + + formComponent.showCompleteButton = true; + formComponent.showSaveButton = true; + expect(formComponent.isOutcomeButtonVisible(outcome, formComponent.form.readOnly)).toBeTruthy(); + + outcome = new FormOutcomeModel(formModel, {id: '$customoutome2', name: 'custom-outcome2'}); + expect(formComponent.isOutcomeButtonVisible(outcome, formComponent.form.readOnly)).toBeFalsy(); }); it('should allow controlling [save] button visibility', () => { let formModel = new FormModel(); + formModel.readOnly = false; + formComponent.form = formModel; let outcome = new FormOutcomeModel(formModel, {id: '$save', name: FormOutcomeModel.COMPLETE_ACTION}); formComponent.showCompleteButton = true; - expect(formComponent.isOutcomeButtonVisible(outcome)).toBeTruthy(); + expect(formComponent.isOutcomeButtonVisible(outcome, formComponent.form.readOnly)).toBeTruthy(); formComponent.showCompleteButton = false; - expect(formComponent.isOutcomeButtonVisible(outcome)).toBeFalsy(); + expect(formComponent.isOutcomeButtonVisible(outcome, formComponent.form.readOnly)).toBeFalsy(); }); it('should load form on refresh', () => { diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts index 278c534234..396f30b5d0 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts @@ -190,11 +190,14 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { return false; } - isOutcomeButtonVisible(outcome: FormOutcomeModel): boolean { + isOutcomeButtonVisible(outcome: FormOutcomeModel, isFormReadOnly: boolean): boolean { if (outcome && outcome.name) { if (outcome.name === FormOutcomeModel.COMPLETE_ACTION) { return this.showCompleteButton; } + if (isFormReadOnly) { + return outcome.isSelected ; + } if (outcome.name === FormOutcomeModel.SAVE_ACTION) { return this.showSaveButton; } diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.html b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.html index 5914fefde0..04c6311f78 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.html +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.html @@ -21,7 +21,7 @@ alfresco-mdl-button [disabled]="!isOutcomeButtonEnabled(outcome)" [class.mdl-button--colored]="!outcome.isSystem" - [class.activiti-form-hide-button]="!isOutcomeButtonVisible(outcome)" + [class.activiti-form-hide-button]="!isOutcomeButtonVisible(outcome, form.readOnly)" (click)="onOutcomeClicked(outcome, $event)"> {{outcome.name}} </button> diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index 003d788ba8..232e1551e8 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -133,14 +133,14 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, } /** @override */ - isOutcomeButtonVisible(outcome: FormOutcomeModel): boolean { + isOutcomeButtonVisible(outcome: FormOutcomeModel, isFormReadOnly: boolean): boolean { if (outcome && outcome.isSystem && ( outcome.name === FormOutcomeModel.SAVE_ACTION || outcome.name === FormOutcomeModel.COMPLETE_ACTION )) { return false; } else if (outcome && outcome.name === FormOutcomeModel.START_PROCESS_ACTION) { return true; } - return super.isOutcomeButtonVisible(outcome); + return super.isOutcomeButtonVisible(outcome, isFormReadOnly); } /** @override */ diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.ts index 2e0baed29b..0d364cdb18 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.ts @@ -25,12 +25,14 @@ export class FormOutcomeModel extends FormWidgetModel { static START_PROCESS_ACTION: string = 'Start Process'; // Activiti 'Start Process' action name isSystem: boolean = false; + isSelected: boolean = false; constructor(form: FormModel, json?: any) { super(form, json); if (json) { this.isSystem = json.isSystem ? true : false; + this.isSelected = form && json.name === form.selectedOutcome ? true : false; } } } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts index d28fcc7e3d..cc31cf1101 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts @@ -48,6 +48,7 @@ export class FormModel { fields: FormWidgetModel[] = []; outcomes: FormOutcomeModel[] = []; customFieldTemplates: FormFieldTemplates = {}; + readonly selectedOutcome: string; values: FormValues = {}; @@ -77,6 +78,7 @@ export class FormModel { this.taskName = json.taskName || json.name || FormModel.UNSET_TASK_NAME; this.processDefinitionId = json.processDefinitionId; this.customFieldTemplates = json.customFieldTemplates || {}; + this.selectedOutcome = json.selectedOutcome || {}; let tabCache: FormWidgetModelCache<TabModel> = {}; From 10a76cc0f659be8581ed7ff94c416d11e3c9557d Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Tue, 17 Jan 2017 13:38:51 +0000 Subject: [PATCH 074/108] Login - change required username characters (#1487) * #1480 Change required username characters * Fix unit test error --- demo-shell-ng2/app/components/login/login-demo.component.ts | 2 +- .../src/components/alfresco-login.component.spec.ts | 4 ++-- .../src/components/alfresco-login.component.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 2014686652..380f81b946 100644 --- a/demo-shell-ng2/app/components/login/login-demo.component.ts +++ b/demo-shell-ng2/app/components/login/login-demo.component.ts @@ -42,7 +42,7 @@ export class LoginDemoComponent implements OnInit { private storage: StorageService, private logService: LogService) { this.customValidation = { - username: ['', Validators.compose([Validators.required, Validators.minLength(4)])], + username: ['', Validators.compose([Validators.required, Validators.minLength(2)])], password: ['', Validators.required] }; } diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts index a30a2b863c..6d2b7682c9 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts @@ -98,8 +98,8 @@ describe('AlfrescoLogin', () => { expect(element.querySelector('#username-error').innerText).toEqual('LOGIN.MESSAGES.USERNAME-MIN'); }); - it('should render validation min-length error when the username is lower than 4 characters', () => { - usernameInput.value = '123'; + it('should render validation min-length error when the username is lower than 2 characters', () => { + usernameInput.value = '1'; usernameInput.dispatchEvent(new Event('input')); fixture.detectChanges(); diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index 407dcdbe3c..17095592ce 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -262,7 +262,7 @@ export class AlfrescoLoginComponent implements OnInit { private initFormFieldsDefault() { this.form = this._fb.group({ - username: ['', Validators.compose([Validators.required, Validators.minLength(4)])], + username: ['', Validators.compose([Validators.required, Validators.minLength(2)])], password: ['', Validators.required] }); } From 14d399968c136f0edb286fec1ab67d9fe2764258 Mon Sep 17 00:00:00 2001 From: Mario Romano <dnamario@hotmail.com> Date: Tue, 17 Jan 2017 13:44:39 +0000 Subject: [PATCH 075/108] #1406 improve CSRF and CORS errors reporting (#1488) --- .../alfresco-login/i18n/en.json | 48 ++++++++++--------- .../alfresco-login/i18n/it.json | 48 ++++++++++--------- .../src/assets/authentication.service.mock.ts | 18 ++++++- .../alfresco-login.component.spec.ts | 46 ++++++++++++++++++ .../components/alfresco-login.component.ts | 20 +++++++- .../ng2-alfresco-login/src/i18n/en.json | 48 ++++++++++--------- .../ng2-alfresco-login/src/i18n/it.json | 48 ++++++++++--------- 7 files changed, 181 insertions(+), 95 deletions(-) diff --git a/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json b/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json index 7c1ef10cd9..e7e1d8223f 100644 --- a/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json +++ b/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json @@ -1,26 +1,28 @@ { - "LOGIN": { - "LOGO": "Alfresco", - "LABEL": { - "LOGIN": "Login", - "USERNAME": "Username", - "PASSWORD": "Password", - "REMEMBER": "Remember" - }, - "MESSAGES": { - "USERNAME-REQUIRED": "Required", - "USERNAME-MIN": "Your username needs to be at least 4 characters.", - "PASSWORD-REQUIRED": "Enter your password to sign in", - "LOGIN-ERROR-CREDENTIALS": "You have entered an invalid username or password", - "LOGIN-ERROR-PROVIDERS": "Providers cannot be undefined", - "LOGIN-SUCCESS": "Login successful" - }, - "BUTTON": { - "LOGIN": "SIGN IN" - }, - "ACTION": { - "HELP": "NEED HELP?", - "REGISTER": "REGISTER" + "LOGIN": { + "LOGO": "Alfresco", + "LABEL": { + "LOGIN": "Login", + "USERNAME": "Username", + "PASSWORD": "Password", + "REMEMBER": "Remember" + }, + "MESSAGES": { + "USERNAME-REQUIRED": "Required", + "USERNAME-MIN": "Your username needs to be at least 4 characters.", + "PASSWORD-REQUIRED": "Enter your password to sign in", + "LOGIN-ERROR-CREDENTIALS": "You have entered an invalid username or password", + "LOGIN-ERROR-PROVIDERS": "Providers cannot be undefined", + "LOGIN-SUCCESS": "Login successful", + "LOGIN-ERROR-CORS": "CORS exception, check your server configuration", + "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component" + }, + "BUTTON": { + "LOGIN": "SIGN IN" + }, + "ACTION": { + "HELP": "NEED HELP?", + "REGISTER": "REGISTER" + } } - } } diff --git a/demo-shell-ng2/custom-translation/alfresco-login/i18n/it.json b/demo-shell-ng2/custom-translation/alfresco-login/i18n/it.json index c274b00912..5588ae39dd 100644 --- a/demo-shell-ng2/custom-translation/alfresco-login/i18n/it.json +++ b/demo-shell-ng2/custom-translation/alfresco-login/i18n/it.json @@ -1,25 +1,27 @@ { - "LOGIN": { - "LABEL": { - "LOGIN": "Autenticazione", - "USERNAME": "Nome utente", - "PASSWORD": "Password", - "REMEMBER": "Ricordami" - }, - "MESSAGES": { - "USERNAME-REQUIRED": "Campo obbligatorio", - "USERNAME-MIN": "Inserire un nome utente di minimo 4 caratteri.", - "PASSWORD-REQUIRED": "Campo obbligatorio", - "LOGIN-ERROR-CREDENTIALS": "Nome utente o password non validi", - "LOGIN-ERROR-PROVIDERS": "Providers non può essere nullo", - "LOGIN-SUCCESS": "Login effettuata con successo" - }, - "BUTTON": { - "LOGIN": "Accedi" - }, - "ACTION": { - "HELP": "BISOGNO DI AIUTO?", - "REGISTER": "REGISTRATI" + "LOGIN": { + "LABEL": { + "LOGIN": "Autenticazione", + "USERNAME": "Nome utente", + "PASSWORD": "Password", + "REMEMBER": "Ricordami" + }, + "MESSAGES": { + "USERNAME-REQUIRED": "Campo obbligatorio", + "USERNAME-MIN": "Inserire un nome utente di minimo 4 caratteri.", + "PASSWORD-REQUIRED": "Campo obbligatorio", + "LOGIN-ERROR-CREDENTIALS": "Nome utente o password non validi", + "LOGIN-ERROR-PROVIDERS": "Providers non può essere nullo", + "LOGIN-SUCCESS": "Login effettuata con successo", + "LOGIN-ERROR-CORS": "CORS exception, controlla le configurazioni del tuo server", + "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component" + }, + "BUTTON": { + "LOGIN": "Accedi" + }, + "ACTION": { + "HELP": "BISOGNO DI AIUTO?", + "REGISTER": "REGISTRATI" + } } - } -} \ No newline at end of file +} diff --git a/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts b/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts index 6be706a7a9..e51df930fc 100644 --- a/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts +++ b/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts @@ -24,8 +24,22 @@ export class AuthenticationMock /*extends AlfrescoAuthenticationService*/ { login(username: string, password: string): Observable<boolean> { if (username === 'fake-username' && password === 'fake-password') { return Observable.of(true); - } else { - return Observable.throw('Fake server error'); } + + if (username === 'fake-username-CORS-error' && password === 'fake-password') { + return Observable.throw({ + error: { + crossDomain: true, + message: 'ERROR: the network is offline, Origin is not allowed by Access-Control-Allow-Origin' + } + }); + } + + if (username === 'fake-username-CSRF-error' && password === 'fake-password') { + return Observable.throw({message: 'ERROR: Invalid CSRF-token', status: 403}); + } + + return Observable.throw('Fake server error'); + } } diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts index 6d2b7682c9..b36d04eb0e 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts @@ -264,6 +264,52 @@ describe('AlfrescoLogin', () => { expect(element.querySelector('#login-error').innerText).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'); }); + it('should return CORS error when server CORS error occurs', () => { + component.providers = 'ECM'; + expect(component.success).toBe(false); + expect(component.error).toBe(false); + + usernameInput.value = 'fake-username-CORS-error'; + passwordInput.value = 'fake-password'; + + usernameInput.dispatchEvent(new Event('input')); + passwordInput.dispatchEvent(new Event('input')); + + fixture.detectChanges(); + + element.querySelector('button').click(); + + fixture.detectChanges(); + + expect(component.error).toBe(true); + expect(component.success).toBe(false); + expect(element.querySelector('#login-error')).toBeDefined(); + expect(element.querySelector('#login-error').innerText).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CORS'); + }); + + it('should return CSRF error when server CSRF error occurs', () => { + component.providers = 'ECM'; + expect(component.success).toBe(false); + expect(component.error).toBe(false); + + usernameInput.value = 'fake-username-CSRF-error'; + passwordInput.value = 'fake-password'; + + usernameInput.dispatchEvent(new Event('input')); + passwordInput.dispatchEvent(new Event('input')); + + fixture.detectChanges(); + + element.querySelector('button').click(); + + fixture.detectChanges(); + + expect(component.error).toBe(true); + expect(component.success).toBe(false); + expect(element.querySelector('#login-error')).toBeDefined(); + expect(element.querySelector('#login-error').innerText).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CSRF'); + }); + it('should emit onSuccess event after the login has succeeded', () => { spyOn(component.onSuccess, 'emit'); component.providers = 'ECM'; diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index 17095592ce..05e2755115 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -157,8 +157,8 @@ export class AlfrescoLoginComponent implements OnInit { this.onSuccess.emit({token: token, username: values.username, password: values.password}); }, (err: any) => { + this.displayErrorMessage(err); this.enableError(); - this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'; this.onError.emit(err); this.logService.error(err); }, @@ -166,6 +166,24 @@ export class AlfrescoLoginComponent implements OnInit { ); } + /** + * Check and display the right error message in the UI + */ + private displayErrorMessage(err: any): void { + if (err.error && err.error.crossDomain && err.error.message.indexOf('the network is offline, Origin is not allowed by' + + ' Access-Control-Allow-Origin') > 0) { + this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-CORS'; + return; + } + + if (err.status === 403 && err.message.indexOf('Invalid CSRF-token') > 0) { + this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-CSRF'; + return; + } + + this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'; + } + /** * Check the require parameter * @returns {boolean} diff --git a/ng2-components/ng2-alfresco-login/src/i18n/en.json b/ng2-components/ng2-alfresco-login/src/i18n/en.json index 7c1ef10cd9..e7e1d8223f 100644 --- a/ng2-components/ng2-alfresco-login/src/i18n/en.json +++ b/ng2-components/ng2-alfresco-login/src/i18n/en.json @@ -1,26 +1,28 @@ { - "LOGIN": { - "LOGO": "Alfresco", - "LABEL": { - "LOGIN": "Login", - "USERNAME": "Username", - "PASSWORD": "Password", - "REMEMBER": "Remember" - }, - "MESSAGES": { - "USERNAME-REQUIRED": "Required", - "USERNAME-MIN": "Your username needs to be at least 4 characters.", - "PASSWORD-REQUIRED": "Enter your password to sign in", - "LOGIN-ERROR-CREDENTIALS": "You have entered an invalid username or password", - "LOGIN-ERROR-PROVIDERS": "Providers cannot be undefined", - "LOGIN-SUCCESS": "Login successful" - }, - "BUTTON": { - "LOGIN": "SIGN IN" - }, - "ACTION": { - "HELP": "NEED HELP?", - "REGISTER": "REGISTER" + "LOGIN": { + "LOGO": "Alfresco", + "LABEL": { + "LOGIN": "Login", + "USERNAME": "Username", + "PASSWORD": "Password", + "REMEMBER": "Remember" + }, + "MESSAGES": { + "USERNAME-REQUIRED": "Required", + "USERNAME-MIN": "Your username needs to be at least 4 characters.", + "PASSWORD-REQUIRED": "Enter your password to sign in", + "LOGIN-ERROR-CREDENTIALS": "You have entered an invalid username or password", + "LOGIN-ERROR-PROVIDERS": "Providers cannot be undefined", + "LOGIN-SUCCESS": "Login successful", + "LOGIN-ERROR-CORS": "CORS exception, check your server configuration", + "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component" + }, + "BUTTON": { + "LOGIN": "SIGN IN" + }, + "ACTION": { + "HELP": "NEED HELP?", + "REGISTER": "REGISTER" + } } - } } diff --git a/ng2-components/ng2-alfresco-login/src/i18n/it.json b/ng2-components/ng2-alfresco-login/src/i18n/it.json index c274b00912..5588ae39dd 100644 --- a/ng2-components/ng2-alfresco-login/src/i18n/it.json +++ b/ng2-components/ng2-alfresco-login/src/i18n/it.json @@ -1,25 +1,27 @@ { - "LOGIN": { - "LABEL": { - "LOGIN": "Autenticazione", - "USERNAME": "Nome utente", - "PASSWORD": "Password", - "REMEMBER": "Ricordami" - }, - "MESSAGES": { - "USERNAME-REQUIRED": "Campo obbligatorio", - "USERNAME-MIN": "Inserire un nome utente di minimo 4 caratteri.", - "PASSWORD-REQUIRED": "Campo obbligatorio", - "LOGIN-ERROR-CREDENTIALS": "Nome utente o password non validi", - "LOGIN-ERROR-PROVIDERS": "Providers non può essere nullo", - "LOGIN-SUCCESS": "Login effettuata con successo" - }, - "BUTTON": { - "LOGIN": "Accedi" - }, - "ACTION": { - "HELP": "BISOGNO DI AIUTO?", - "REGISTER": "REGISTRATI" + "LOGIN": { + "LABEL": { + "LOGIN": "Autenticazione", + "USERNAME": "Nome utente", + "PASSWORD": "Password", + "REMEMBER": "Ricordami" + }, + "MESSAGES": { + "USERNAME-REQUIRED": "Campo obbligatorio", + "USERNAME-MIN": "Inserire un nome utente di minimo 4 caratteri.", + "PASSWORD-REQUIRED": "Campo obbligatorio", + "LOGIN-ERROR-CREDENTIALS": "Nome utente o password non validi", + "LOGIN-ERROR-PROVIDERS": "Providers non può essere nullo", + "LOGIN-SUCCESS": "Login effettuata con successo", + "LOGIN-ERROR-CORS": "CORS exception, controlla le configurazioni del tuo server", + "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component" + }, + "BUTTON": { + "LOGIN": "Accedi" + }, + "ACTION": { + "HELP": "BISOGNO DI AIUTO?", + "REGISTER": "REGISTRATI" + } } - } -} \ No newline at end of file +} From 0fd45a2f88f5c7b7dfd455928c94f071b6d7075d Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Tue, 17 Jan 2017 07:00:37 -0800 Subject: [PATCH 076/108] #1431 - fix tasklist on click process task detail (#1492) * #1431 - fix tasklist on click process task detail * Update form-viewer.component.html #1431 - removed wrong change on form-viewer --- .../activiti/activiti-demo.component.ts | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index b5ebeddcde..ac7f8f5bb2 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -36,6 +36,7 @@ import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Rx'; import { ObjectDataTableAdapter, + ObjectDataRow, DataSorting } from 'ng2-alfresco-datatable'; import { AlfrescoApiService } from 'ng2-alfresco-core'; @@ -144,7 +145,9 @@ export class ActivitiDemoComponent implements AfterViewInit { } onTaskFilterClick(event: FilterRepresentationModel) { - this.taskFilter = event; + if(event){ + this.taskFilter = event; + } } onReportClick(event: any) { @@ -191,16 +194,14 @@ export class ActivitiDemoComponent implements AfterViewInit { } navigateStartProcess() { - this.processFilter = null; - this.activitiprocessfilter.selectFilter(null); + this.cleanProcessFilters(); this.currentProcessInstanceId = currentProcessIdNew; } onStartProcessInstance(instance: ProcessInstance) { this.currentProcessInstanceId = instance.id; this.activitiStartProcess.reset(); - this.processFilter = null; - this.activitiprocessfilter.selectFilter(null); + this.cleanProcessFilters(); } isStartProcessMode() { @@ -248,9 +249,21 @@ export class ActivitiDemoComponent implements AfterViewInit { onProcessDetailsTaskClick(event: TaskDetailsEvent) { event.preventDefault(); - this.currentTaskId = event.value.id; - this.activititasklist.reload(); this.activeTab = 'tasks'; + let processTaskDataRow = new ObjectDataRow({ + id: event.value.id, + name: event.value.name || 'No name', + created: event.value.created + }) + this.activitifilter.selectFilter(null); + this.dataTasks.setRows([processTaskDataRow]); + this.activititasklist.selectTask(event.value.id); + this.currentTaskId = event.value.id; + } + + private cleanProcessFilters(){ + this.processFilter = null; + this.activitiprocessfilter.selectFilter(null); } } From 7ef954139c19f32bbaf3fc4079f9382a85243d8a Mon Sep 17 00:00:00 2001 From: Mario Romano <dnamario@hotmail.com> Date: Tue, 17 Jan 2017 16:19:25 +0000 Subject: [PATCH 077/108] #1443 improve license error - login component (#1494) --- .../alfresco-login/i18n/en.json | 3 ++- .../alfresco-login/i18n/it.json | 3 ++- .../src/assets/authentication.service.mock.ts | 5 +++- .../alfresco-login.component.spec.ts | 23 +++++++++++++++++++ .../components/alfresco-login.component.ts | 9 ++++++-- .../ng2-alfresco-login/src/i18n/en.json | 3 ++- .../ng2-alfresco-login/src/i18n/it.json | 3 ++- 7 files changed, 42 insertions(+), 7 deletions(-) diff --git a/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json b/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json index e7e1d8223f..5982c16a33 100644 --- a/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json +++ b/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json @@ -15,7 +15,8 @@ "LOGIN-ERROR-PROVIDERS": "Providers cannot be undefined", "LOGIN-SUCCESS": "Login successful", "LOGIN-ERROR-CORS": "CORS exception, check your server configuration", - "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component" + "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component", + "LOGIN-ECM-LICENSE": "The ECM is in read-only mode" }, "BUTTON": { "LOGIN": "SIGN IN" diff --git a/demo-shell-ng2/custom-translation/alfresco-login/i18n/it.json b/demo-shell-ng2/custom-translation/alfresco-login/i18n/it.json index 5588ae39dd..b1c50a86bf 100644 --- a/demo-shell-ng2/custom-translation/alfresco-login/i18n/it.json +++ b/demo-shell-ng2/custom-translation/alfresco-login/i18n/it.json @@ -14,7 +14,8 @@ "LOGIN-ERROR-PROVIDERS": "Providers non può essere nullo", "LOGIN-SUCCESS": "Login effettuata con successo", "LOGIN-ERROR-CORS": "CORS exception, controlla le configurazioni del tuo server", - "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component" + "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component", + "LOGIN-ECM-LICENSE": "l'ECM e' in read-only mode" }, "BUTTON": { "LOGIN": "Accedi" diff --git a/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts b/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts index e51df930fc..97271742ce 100644 --- a/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts +++ b/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts @@ -39,7 +39,10 @@ export class AuthenticationMock /*extends AlfrescoAuthenticationService*/ { return Observable.throw({message: 'ERROR: Invalid CSRF-token', status: 403}); } - return Observable.throw('Fake server error'); + if (username === 'fake-username-ECM-access-error' && password === 'fake-password') { + return Observable.throw({message: 'ERROR: 00170728 Access Denied. The system is currently in read-only mode', status: 403}); + } + return Observable.throw('Fake server error'); } } diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts index b36d04eb0e..88742f8c12 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts @@ -310,6 +310,29 @@ describe('AlfrescoLogin', () => { expect(element.querySelector('#login-error').innerText).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CSRF'); }); + it('should return ECOM read-oly error when error occurs', () => { + component.providers = 'ECM'; + expect(component.success).toBe(false); + expect(component.error).toBe(false); + + usernameInput.value = 'fake-username-ECM-access-error'; + passwordInput.value = 'fake-password'; + + usernameInput.dispatchEvent(new Event('input')); + passwordInput.dispatchEvent(new Event('input')); + + fixture.detectChanges(); + + element.querySelector('button').click(); + + fixture.detectChanges(); + + expect(component.error).toBe(true); + expect(component.success).toBe(false); + expect(element.querySelector('#login-error')).toBeDefined(); + expect(element.querySelector('#login-error').innerText).toEqual('LOGIN.MESSAGES.LOGIN-ECM-LICENSE'); + }); + it('should emit onSuccess event after the login has succeeded', () => { spyOn(component.onSuccess, 'emit'); component.providers = 'ECM'; diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index 05e2755115..789b4e794d 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -171,16 +171,21 @@ export class AlfrescoLoginComponent implements OnInit { */ private displayErrorMessage(err: any): void { if (err.error && err.error.crossDomain && err.error.message.indexOf('the network is offline, Origin is not allowed by' + - ' Access-Control-Allow-Origin') > 0) { + ' Access-Control-Allow-Origin') !== -1) { this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-CORS'; return; } - if (err.status === 403 && err.message.indexOf('Invalid CSRF-token') > 0) { + if (err.status === 403 && err.message.indexOf('Invalid CSRF-token') !== -1) { this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-CSRF'; return; } + if (err.status === 403 && err.message.indexOf('The system is currently in read-only mode') !== -1) { + this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ECM-LICENSE'; + return; + } + this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-CREDENTIALS'; } diff --git a/ng2-components/ng2-alfresco-login/src/i18n/en.json b/ng2-components/ng2-alfresco-login/src/i18n/en.json index e7e1d8223f..5982c16a33 100644 --- a/ng2-components/ng2-alfresco-login/src/i18n/en.json +++ b/ng2-components/ng2-alfresco-login/src/i18n/en.json @@ -15,7 +15,8 @@ "LOGIN-ERROR-PROVIDERS": "Providers cannot be undefined", "LOGIN-SUCCESS": "Login successful", "LOGIN-ERROR-CORS": "CORS exception, check your server configuration", - "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component" + "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component", + "LOGIN-ECM-LICENSE": "The ECM is in read-only mode" }, "BUTTON": { "LOGIN": "SIGN IN" diff --git a/ng2-components/ng2-alfresco-login/src/i18n/it.json b/ng2-components/ng2-alfresco-login/src/i18n/it.json index 5588ae39dd..b1c50a86bf 100644 --- a/ng2-components/ng2-alfresco-login/src/i18n/it.json +++ b/ng2-components/ng2-alfresco-login/src/i18n/it.json @@ -14,7 +14,8 @@ "LOGIN-ERROR-PROVIDERS": "Providers non può essere nullo", "LOGIN-SUCCESS": "Login effettuata con successo", "LOGIN-ERROR-CORS": "CORS exception, controlla le configurazioni del tuo server", - "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component" + "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component", + "LOGIN-ECM-LICENSE": "l'ECM e' in read-only mode" }, "BUTTON": { "LOGIN": "Accedi" From 4b3c77799e3e4327074f7eebd1e30f8d1c1e886d Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Wed, 18 Jan 2017 10:43:31 +0000 Subject: [PATCH 078/108] Set default select option (#1496) * #1479 default select option * #1479 Fix task dropdown default value --- .../src/components/widgets/dropdown/dropdown.widget.html | 2 +- .../src/components/activiti-start-process.component.html | 2 +- .../src/components/activiti-start-task.component.html | 2 +- .../src/components/activiti-start-task.component.ts | 2 +- ng2-components/ng2-activiti-tasklist/src/i18n/en.json | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.html index 8ab003b892..25d819965c 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.html +++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/dropdown/dropdown.widget.html @@ -2,7 +2,7 @@ <label class="dropdown-widget__label" [attr.for]="field.id">{{field.nameKey | translate}}</label> <select [formControlName]="controllerName" [attr.id]="'select-' + field.id" class="dropdown-widget__select" [(ngModel)]="field.value" (ngModelChange)="changeValue($event)"> - <option *ngIf="showDefaultOption" value="">{{defaultOptionText}}</option> + <option *ngIf="showDefaultOption" value="null">{{defaultOptionText}}</option> <option *ngFor="let opt of field.options" [value]="opt.id">{{opt.label}}</option> </select> </div> \ No newline at end of file diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html index b9fbc31b7d..4cca3b761e 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html @@ -5,7 +5,7 @@ </div> <div class="mdl-textfield mdl-js-textfield alf-mdl-selectfield"> <select name="processDefinition" [(ngModel)]="currentProcessDef.id" (ngModelChange)="onProcessDefChange($event)" id="processDefinition" required> - <option value="" selected="selected">{{'START_PROCESS.DIALOG.TYPE_PLACEHOLDER'|translate}}</option> + <option value="null">{{'START_PROCESS.DIALOG.TYPE_PLACEHOLDER'|translate}}</option> <option *ngFor="let processDef of processDefinitions" [value]="processDef.id"> {{processDef.name}} </option> diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.html index e6a6352ae7..549a40cd18 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.html @@ -20,7 +20,7 @@ </div> <div class="mdl-textfield mdl-js-textfield alf-mdl-selectfield"> <select name="taskForm" [(ngModel)]="formId" > - <option value="" selected="selected" selected>None</option> + <option value="null">{{'START_TASK.DIALOG.LABEL.NONE'|translate}}</option> <option *ngFor="let form of forms" [value]="form.id"> {{form.name}} </option> diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts index 2efb8e8839..91d57f4941 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts @@ -43,7 +43,7 @@ export class ActivitiStartTaskButton { forms: Form []; - formId: string; + formId: string = null; name: string; description: string; diff --git a/ng2-components/ng2-activiti-tasklist/src/i18n/en.json b/ng2-components/ng2-activiti-tasklist/src/i18n/en.json index 9ffa608eab..0d265fbafc 100644 --- a/ng2-components/ng2-activiti-tasklist/src/i18n/en.json +++ b/ng2-components/ng2-activiti-tasklist/src/i18n/en.json @@ -66,6 +66,7 @@ "DIALOG": { "TITLE": "Start Task", "LABEL": { + "NONE": "None", "NAME": "Name", "DESCRIPTION": "Description", "ATTACHFORM" : "Attach a Form" From 9c0604a6c2500540141ccb2a370ccf7755ebcbaa Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Wed, 18 Jan 2017 13:20:34 +0000 Subject: [PATCH 079/108] #1429 fix unsupported files margin (#1497) --- .../src/componets/notSupportedFormat.component.css | 3 ++- .../src/componets/notSupportedFormat.component.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.css b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.css index 540d4cc8fa..4dd06b5211 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.css +++ b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.css @@ -1,6 +1,7 @@ .viewer-download-text { text-align: center; + word-wrap: break-word; } .viewer-margin-cloud-download{ @@ -18,5 +19,5 @@ } .full_width{ - width :100% !important; + width :95% !important; } diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.html b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.html index 10436b9257..a0171264fe 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.html +++ b/ng2-components/ng2-alfresco-viewer/src/componets/notSupportedFormat.component.html @@ -1,6 +1,6 @@ <section class="section--center mdl-grid mdl-grid--no-spacing"> <div class="viewer-margin mdl-card mdl-cell mdl-cell--9-col-desktop mdl-cell--6-col-tablet mdl-cell--4-col-phone mdl-shadow--2dp"> - <div class="viewer-download-text mdl-card__supporting-text full_width"> + <div class="viewer-download-text mdl-card__supporting-text viewer-margin"> <h4>File '<span>{{nameFile}}</span>' is of an unsupported format</h4> </div> <div class="center-element mdl-card__actions"> From a0ccd6c8b3418b11c6c6aa12c012130155612484 Mon Sep 17 00:00:00 2001 From: Eugenio Romano <eromano@users.noreply.github.com> Date: Wed, 18 Jan 2017 14:42:28 +0000 Subject: [PATCH 080/108] Update alfresco tag with the material chips #1499 (#1500) * Update alfresco tag with the material chips #1499 * remove unused css --- .../ng2-alfresco-tag/docs/assets/tag1.png | Bin 18355 -> 23111 bytes .../components/tag-node-list.component.css | 57 ------------------ .../components/tag-node-list.component.html | 9 ++- 3 files changed, 7 insertions(+), 59 deletions(-) diff --git a/ng2-components/ng2-alfresco-tag/docs/assets/tag1.png b/ng2-components/ng2-alfresco-tag/docs/assets/tag1.png index 697f86a5e7d039be47cfe485b08daf8fd616b07f..e6568ebe258870e1f750b0422dab3f428c0e186b 100644 GIT binary patch literal 23111 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 E07;q!qyPW_ literal 18355 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 VJ$h9o?4wyYg}16Q)l%l6{|`pgN@V~5 diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.css b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.css index 51eea7ab8d..b19a3cb29f 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.css +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.css @@ -6,60 +6,3 @@ .tags li { display: inline; } - -.tag-name { - cursor: default; - float:left; - max-height: 22px; - max-width: 100px; - background-color: #8EC44B; - -webkit-border-radius: 4px 0px 0px 4px; - -moz-border-radius: 4px 0px 0px 4px; - border-radius: 4px 0px 0px 4px; - position: relative; - color: #fff; - display: inline-block; - text-decoration: none; - font-family: arial, helvetica, sans-serif; - font-size: 14px; - zoom: 1; - line-height: 22px; - padding: 0 0px 0 10px; - margin: 4px 0px 4px 8px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.tag-delete { - cursor: pointer; - float:left; - max-height: 22px; - max-width: 30px; - background-color: #8EC44B; - -webkit-border-radius: 0px 4px 4px 0px; - -moz-border-radius: 0px 4px 4px 0px; - border-radius: 0px 4px 4px 0px; - position: relative; - color: #fff; - display: inline-block; - text-decoration: none; - font-family: arial, helvetica, sans-serif; - font-size: 14px; - zoom: 1; - line-height: 22px; - padding: 0 4px 0 6px; - margin: 4px 4px 4px 0px; - white-space: nowrap; - overflow: hidden; -} - - -.tag-delete:hover{ - color: lightgray; -} - - -.delete-icon{ - font-size: 22px!important; -} diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.html b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.html index 127fba1c97..2633f7c20a 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.html +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.html @@ -1,8 +1,13 @@ <div class="tag-list-container"> <ul class="tags"> <li *ngFor="let currentEntry of tagsEntries; let idx = index"> - <div id="tag_name_{{idx}}" class="tag-name">{{currentEntry.entry.tag}}</div> - <div id="tag_delete_{{idx}}" class="tag-delete" (click)="removeTag(currentEntry.entry.id)" ><i class="material-icons delete-icon">close</i></div> + <span class="mdl-chip mdl-chip--deletable"> + <span id="tag_name_{{idx}}" class="mdl-chip__text">{{currentEntry.entry.tag}}</span> + <button id="tag_delete_{{idx}}" type="button" class="mdl-chip__action" + (click)="removeTag(currentEntry.entry.id)"> + <i class="material-icons">cancel</i> + </button> + </span> </li> </ul> </div> From 4653b9ad23dcafcc262e7dbf61533f8ffc5ee7db Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Wed, 18 Jan 2017 06:56:11 -0800 Subject: [PATCH 081/108] #1485 - add clean input search on close (#1498) --- .../src/components/activiti-people-search.component.ts | 10 ++++++++-- .../src/components/activiti-people.component.html | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts index a06b06cb55..0305aef787 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts @@ -59,7 +59,9 @@ export class ActivitiPeopleSearch implements OnInit, AfterViewInit { .valueChanges .debounceTime(200) .subscribe((event) => { - this.onSearch.emit(event); + if (event) { + this.onSearch.emit(event); + } }); } @@ -93,7 +95,11 @@ export class ActivitiPeopleSearch implements OnInit, AfterViewInit { getDisplayUser(user: User): string { let firstName = user.firstName && user.firstName !== 'null' ? user.firstName : 'N/A'; - let lastName = user.lastName && user.lastName !== 'null' ? user.lastName : 'N/A'; + let lastName = user.lastName && user.lastName !== 'null' ? user.lastName : 'N/A'; return firstName + ' - ' + lastName; } + + cleanSearch() { + this.searchUser.reset(); + } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html index e11aa7d557..1796ca2643 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html @@ -25,11 +25,11 @@ <activiti-people-search (onSearch)="searchUser($event)" (onRowClicked)="involveUser($event)" [results]="peopleSearch$" - [iconImageUrl]="iconImageUrl"> + [iconImageUrl]="iconImageUrl" #activitipeoplesearch> </activiti-people-search> </div> <div class="mdl-dialog__actions"> - <button type="button" id="close-people-dialog" (click)="cancel()" class="mdl-button close"> + <button type="button" id="close-people-dialog" (click)="activitipeoplesearch.cleanSearch();cancel()" class="mdl-button close"> {{'PEOPLE.DIALOG_CLOSE' | translate }} </button> </div> From dcee6abc358d4558fdfc93e24c3ae6e5aa1409ce Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Thu, 19 Jan 2017 03:52:06 -0800 Subject: [PATCH 082/108] #1484 - clean search result when nothing is typed in the search input (#1502) --- .../activiti-people-search.component.html | 2 +- .../activiti-people-search.component.spec.ts | 2 +- .../activiti-people-search.component.ts | 10 ++++------ .../components/activiti-people.component.html | 2 +- .../components/activiti-people.component.spec.ts | 16 +++++++++++++++- .../src/components/activiti-people.component.ts | 6 +++++- .../ng2-activiti-tasklist/src/i18n/en.json | 5 ++++- .../ng2-activiti-tasklist/src/i18n/it.json | 5 ++++- 8 files changed, 35 insertions(+), 13 deletions(-) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html index 94a6dc7075..279df098d6 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html @@ -11,6 +11,6 @@ </button> </li> <div *ngIf="userList?.length === 0" id="no-user-found"> - No user found to involve + {{'PEOPLE.SEARCH.NO_USERS' | translate }} </div> </ul> diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts index ab0e57f66e..d9de39445a 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts @@ -83,7 +83,7 @@ describe('ActivitiPeopleSearch', () => { fixture.whenStable() .then(() => { expect(element.querySelector('#no-user-found')).not.toBeNull(); - expect(element.querySelector('#no-user-found').textContent).toContain('No user found to involve'); + expect(element.querySelector('#no-user-found').textContent).toContain('PEOPLE.SEARCH.NO_USERS'); }); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts index 0305aef787..faa5dd69a4 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts @@ -58,9 +58,11 @@ export class ActivitiPeopleSearch implements OnInit, AfterViewInit { this.searchUser .valueChanges .debounceTime(200) - .subscribe((event) => { - if (event) { + .subscribe((event: string) => { + if (event && event.trim()) { this.onSearch.emit(event); + } else { + this.userList = []; } }); } @@ -98,8 +100,4 @@ export class ActivitiPeopleSearch implements OnInit, AfterViewInit { let lastName = user.lastName && user.lastName !== 'null' ? user.lastName : 'N/A'; return firstName + ' - ' + lastName; } - - cleanSearch() { - this.searchUser.reset(); - } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html index 1796ca2643..f8352a46b1 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html @@ -29,7 +29,7 @@ </activiti-people-search> </div> <div class="mdl-dialog__actions"> - <button type="button" id="close-people-dialog" (click)="activitipeoplesearch.cleanSearch();cancel()" class="mdl-button close"> + <button type="button" id="close-people-dialog" (click)="closeDialog()" class="mdl-button close"> {{'PEOPLE.DIALOG_CLOSE' | translate }} </button> </div> diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts index ee2e95fb3c..3eb39487a1 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts @@ -111,10 +111,24 @@ describe('ActivitiPeople', () => { it('should close dialog when clicked on cancel', () => { activitiPeopleComponent.showDialog(); expect(element.querySelector('#addPeople')).not.toBeNull(); - activitiPeopleComponent.cancel(); + activitiPeopleComponent.closeDialog(); let dialogWindow = <HTMLElement> element.querySelector('#add-people-dialog'); expect(dialogWindow.getAttribute('open')).toBeNull(); }); + + it('should reset search input when the dialog is closed', () => { + let userInputSearch: HTMLInputElement; + activitiPeopleComponent.showDialog(); + expect(element.querySelector('#addPeople')).not.toBeNull(); + userInputSearch = <HTMLInputElement> element.querySelector('#userSearchText'); + userInputSearch.value = 'fake-search-value'; + activitiPeopleComponent.closeDialog(); + activitiPeopleComponent.showDialog(); + userInputSearch = <HTMLInputElement> element.querySelector('#userSearchText'); + + expect(userInputSearch).not.toBeNull(); + expect(userInputSearch.value).toBeFalsy(); + }); }); describe('when there are involved people', () => { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts index cc4733429e..99bd8cd213 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts @@ -48,6 +48,9 @@ export class ActivitiPeople { @ViewChild('dialog') dialog: any; + @ViewChild('activitipeoplesearch') + activitipeoplesearch: any; + private peopleSearchObserver: Observer<User[]>; peopleSearch$: Observable<User[]>; @@ -74,10 +77,11 @@ export class ActivitiPeople { } } - public cancel() { + public closeDialog() { if (this.dialog) { this.dialog.nativeElement.close(); this.peopleSearchObserver.next([]); + this.activitipeoplesearch.searchUser.reset(); } } diff --git a/ng2-components/ng2-activiti-tasklist/src/i18n/en.json b/ng2-components/ng2-activiti-tasklist/src/i18n/en.json index 0d265fbafc..7268426c3e 100644 --- a/ng2-components/ng2-activiti-tasklist/src/i18n/en.json +++ b/ng2-components/ng2-activiti-tasklist/src/i18n/en.json @@ -78,6 +78,9 @@ } }, "PEOPLE": { - "DIALOG_CLOSE": "CLOSE" + "DIALOG_CLOSE": "CLOSE", + "SEARCH": { + "NO_USERS": "No user found to involve" + } } } diff --git a/ng2-components/ng2-activiti-tasklist/src/i18n/it.json b/ng2-components/ng2-activiti-tasklist/src/i18n/it.json index 8d2e557e10..2965bcdb39 100644 --- a/ng2-components/ng2-activiti-tasklist/src/i18n/it.json +++ b/ng2-components/ng2-activiti-tasklist/src/i18n/it.json @@ -34,6 +34,9 @@ } }, "PEOPLE": { - "DIALOG_CLOSE": "CHIUDI" + "DIALOG_CLOSE": "CHIUDI", + "SEARCH": { + "NO_USERS": "Nessun utente trovato" + } } } From e3a94fc2d269e5686978a1c83f42dcd4fc058925 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Thu, 19 Jan 2017 15:29:01 +0000 Subject: [PATCH 083/108] improved focus outline for datatable rows (#1503) --- .../src/components/datatable/datatable.component.css | 5 ++++- .../src/components/datatable/datatable.component.html | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css index d258331abc..16b994b908 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.css @@ -110,11 +110,14 @@ } } -.mdl-data-table-fix-firefox{ +.mdl-data-table-fix-firefox { border-collapse: unset; border-spacing: 0; } +.alfresco-datatable__row:focus { + outline-offset: -4px; +} .alfresco-datatable__row--selected { color: rgb(68,138,255); diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html index 11be56699a..6417f7db92 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html @@ -32,6 +32,7 @@ <tbody> <tr *ngFor="let row of data.getRows(); let idx = index" tabindex="0" + class="alfresco-datatable__row" [class.alfresco-datatable__row--selected]="selectedRow === row"> <td *ngIf="multiselect"> <label From be578c607bedf416573e9eb629bad8e40ac3db0c Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Fri, 20 Jan 2017 11:21:28 +0000 Subject: [PATCH 084/108] readme updates --- .../ng2-alfresco-documentlist/README.md | 53 +++++++++++++++++- .../docs/assets/documentLibrary.png | Bin 0 -> 41911 bytes 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 ng2-components/ng2-alfresco-documentlist/docs/assets/documentLibrary.png diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 2225a8b07f..77cada0dba 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -121,7 +121,7 @@ import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfr template: ` <alfresco-document-list #documentList - [currentFolderPath]="'-my-'" + [currentFolderId]="'-my-'" [contextMenuActions]="true" [contentActions]="true" [creationMenuActions]="true"> @@ -180,6 +180,55 @@ platformBrowserDynamic().bootstrapModule(AppModule); | `rowFilter` | `RowFilter` | | Custom row filter, [see more](#custom-row-filter). | `imageResolver` | `ImageResolver` | | Custom image resolver, [see more](#custom-image-resolver). + +#### Setting default folder + +You can set current folder path by assigning a value for `currentFolderId` property. +It can be either one of the well-known locations as **-root-**, **-shared-** or **-my-** or a node ID (guid). + +There may be scenarios when it is needed to set default path based on relative string value rather than node ID. +For example when folder name or path is static but it's underlying ID is not (i.e. created manually by admin). +In this case you can use `alfresco-js-api` to get node details based on it's relative path. + +Let's try setting default folder to `/Sites/swsdp/documentLibrary` without knowing it's ID beforehand. +For the sake of simplicity example below shows only main points you may need paying attention to: + +```ts +import { ChangeDetectorRef } from '@angular/core'; +import { AlfrescoApiService } from 'ng2-alfresco-core'; + +export class FilesComponent implements OnInit { + + currentFolderId: string = '-my-'; + + constructor(private apiService: AlfrescoApiService, + private changeDetector: ChangeDetectorRef) { + // ... + } + + ngOnInit() { + let nodes: any = this.apiService.getInstance().nodes; + nodes.getNodeInfo('-root-', { + includeSource: true, + include: ['path', 'properties'], + relativePath: '/Sites/swsdp/documentLibrary' + }) + .then(node => { + console.log(node); + this.currentFolderId = node.id; + this.changeDetector.detectChanges(); + }); + } +} +``` + +We've added `console.log(node)` for the `getNodeInfo` callback just for study and debug purposes. +It helps examining other valuable information you can have access to if needed: + +![documentLibrary](docs/assets/documentLibrary.png) + +**Important note**: for this particular scenario you must also trigger `changeDetector.detectChanges()` as in the example above. + ### Events | Name | Description | @@ -219,7 +268,7 @@ DocumentList provides simple creation menu actions that provide the action to cr ```html <alfresco-document-menu-action - [currentFolderPath]="currentFolderPath"> + [folderId]="folderId"> </alfresco-document-menu-action> ``` diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/documentLibrary.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/documentLibrary.png new file mode 100644 index 0000000000000000000000000000000000000000..ee5be8b84779ea91baea8b684694cc3f87f6182a GIT binary patch literal 41911 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 literal 0 HcmV?d00001 From bf5482bf7ba96c501a0caa71002c8e1e5323e9f9 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Fri, 20 Jan 2017 14:06:35 +0000 Subject: [PATCH 085/108] documentation updates for DocumentList --- .../ng2-alfresco-documentlist/README.md | 90 +++++++++++++++--- .../docs/assets/viewchild.png | Bin 0 -> 139107 bytes 2 files changed, 79 insertions(+), 11 deletions(-) create mode 100644 ng2-components/ng2-alfresco-documentlist/docs/assets/viewchild.png diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 77cada0dba..1951c4de2a 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -180,8 +180,20 @@ platformBrowserDynamic().bootstrapModule(AppModule); | `rowFilter` | `RowFilter` | | Custom row filter, [see more](#custom-row-filter). | `imageResolver` | `ImageResolver` | | Custom image resolver, [see more](#custom-image-resolver). +### Events -#### Setting default folder +| Name | Description | +| --- | --- | +| `nodeClick` | Emitted when user clicks the node | +| `nodeDblClick` | Emitted when user double-clicks the node | +| `folderChange` | Emitted upon display folder changed | +| `preview` | Emitted when document preview is requested either with single or double click | + +_For a complete example source code please refer to +[DocumentList Demo](https://github.com/Alfresco/alfresco-ng2-components/tree/master/ng2-components/ng2-alfresco-documentlist/demo) +repository._ + +### Setting default folder You can set current folder path by assigning a value for `currentFolderId` property. It can be either one of the well-known locations as **-root-**, **-shared-** or **-my-** or a node ID (guid). @@ -229,18 +241,74 @@ It helps examining other valuable information you can have access to if needed: **Important note**: for this particular scenario you must also trigger `changeDetector.detectChanges()` as in the example above. -### Events +### Calling DocumentList api directly -| Name | Description | -| --- | --- | -| `nodeClick` | Emitted when user clicks the node | -| `nodeDblClick` | Emitted when user double-clicks the node | -| `folderChange` | Emitted upon display folder changed | -| `preview` | Emitted when document preview is requested either with single or double click | +Typically you will be binding DocumentList properties to your application/component class properties: -_For a complete example source code please refer to -[DocumentList Demo](https://github.com/Alfresco/alfresco-ng2-components/tree/master/ng2-components/ng2-alfresco-documentlist/demo) -repository._ +```html +<alfresco-document-list [currentFolderId]="myStartFolder"></alfresco-document-list> +``` + +with the underlying class being implemented similar to the following one: + +```ts +@Component(...) +export class MyAppComponent { + + myStartFolder: string = '-my-'; + +} +``` + +However there may scenarios that require you direct access to DocumentList apis. +You can get reference to the DocumentList instance by means of Angular **Component Interaction** API. +See more details in [Parent calls a ViewChild](https://angular.io/docs/ts/latest/cookbook/component-communication.html#!#parent-to-view-child) +section of the official docs. + +Here's an example of getting reference: + +```html +<alfresco-document-list + #documentList + [currentFolderId]="myStartFolder"> +</alfresco-document-list> +``` + +Note the `#documentList` ID we've just added to be able referencing this component later on. + +```ts +import { ViewChild, AfterViewInit } from '@angular/core'; +import { DocumentListComponent } from 'ng2-alfresco-documentlist'; + +@Component(...) +export class MyAppComponent implements AfterViewInit { + + myStartFolder: string = '-my-'; + + @ViewChild(DocumentListComponent) + documentList: DocumentListComponent; + + ngAfterViewInit() { + console.log(this.documentList); + } +} +``` + +Example above should produce the following browser console output: + +![view-child](docs/assets/viewchild.png) + +Now you are able accessing DocumentList properties or calling methods directly. + +```ts +// print currently displayed folder node object to console +console.log(documentList.folderNode); +``` + +**Important note**: +It is important accessing child components at least at the `AfterViewInit` state. +Any UI click (buttons, links, etc.) event handlers are absolutely fine. This cannot be `ngOnInit` event though. +You can get more details in [Component lifecycle hooks](https://angular.io/docs/ts/latest/guide/lifecycle-hooks.html) article. ### Breadcrumb Component diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/viewchild.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/viewchild.png new file mode 100644 index 0000000000000000000000000000000000000000..c9c258dd5287581ecaac7e301bbaf3e247da4ae5 GIT binary patch literal 139107 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 OKPfSJ(NYmZ|Njps6j^Zq literal 0 HcmV?d00001 From eacdfd7f6aeecc93ba24e0526bf57451fe06a9b3 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Mon, 23 Jan 2017 10:28:57 +0000 Subject: [PATCH 086/108] Support for column (cell) templates (#1513) support for column (cell) templates readme updates and test fixes --- .../app/components/files/files.component.html | 6 ++++ .../datatable/datatable.component.html | 36 ++++++++++--------- .../src/data/datatable-adapter.ts | 3 ++ .../ng2-alfresco-documentlist/README.md | 19 +++++++++- .../content-column.component.spec.ts | 4 +-- .../content-column.component.ts | 9 +++-- 6 files changed, 56 insertions(+), 21 deletions(-) diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html index 9e24b25e3f..9c03991ed6 100644 --- a/demo-shell-ng2/app/components/files/files.component.html +++ b/demo-shell-ng2/app/components/files/files.component.html @@ -28,6 +28,12 @@ key="name" sortable="true" class="full-width ellipsis-cell"> + <!-- Example of using custom column template --> + <!-- + <template let-entry="$implicit"> + <span>Hi! {{entry.data.getValue(entry.row, entry.col)}}</span> + </template> + --> </content-column> <content-column title="{{'DOCUMENT_LIST.COLUMNS.CREATED_BY' | translate}}" diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html index 6417f7db92..28bd176f42 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html @@ -47,24 +47,28 @@ (click)="onRowClick(row, $event)" (dblclick)="onRowDblClick(row, $event)" [context-menu]="getContextMenuActions(row, col)"> - <div *ngSwitchCase="'image'" class="cell-value"> - <i *ngIf="isIconValue(row, col)" class="material-icons icon-cell">{{asIconValue(row, col)}}</i> - <img *ngIf="!isIconValue(row, col)" - class="image-cell" - alt="{{iconAltTextKey(data.getValue(row, col))|translate}}" - src="{{data.getValue(row, col)}}" - (error)="onImageLoadingError($event)"> + <div *ngIf="!col.template"> + <div *ngSwitchCase="'image'" class="cell-value"> + <i *ngIf="isIconValue(row, col)" class="material-icons icon-cell">{{asIconValue(row, col)}}</i> + <img *ngIf="!isIconValue(row, col)" + class="image-cell" + alt="{{iconAltTextKey(data.getValue(row, col))|translate}}" + src="{{data.getValue(row, col)}}" + (error)="onImageLoadingError($event)"> + </div> + <div *ngSwitchCase="'date'" class="cell-value" [attr.data-automation-id]="'date_' + data.getValue(row, col)"> + {{data.getValue(row, col)}} + </div> + <div *ngSwitchCase="'text'" class="cell-value" [attr.data-automation-id]="'text_' + data.getValue(row, col)"> + {{data.getValue(row, col)}} + </div> + <span *ngSwitchDefault class="cell-value"> + <!-- empty cell for unknown column type --> + </span> </div> - <div *ngSwitchCase="'date'" class="cell-value" [attr.data-automation-id]="'date_' + data.getValue(row, col)"> - {{data.getValue(row, col)}} + <div *ngIf="col.template"> + <template ngFor [ngForOf]="[{ data: data, row: row, col: col }]" [ngForTemplate]="col.template"></template> </div> - <div *ngSwitchCase="'text'" class="cell-value" [attr.data-automation-id]="'text_' + data.getValue(row, col)"> - {{data.getValue(row, col)}} - </div> - <span *ngSwitchDefault class="cell-value"> - <!-- empty cell for unknown column type --> - </span> - </td> <td *ngIf="actions"> diff --git a/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts b/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts index 7883aebbb1..704fa02875 100644 --- a/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts @@ -15,6 +15,8 @@ * limitations under the License. */ +import { TemplateRef } from '@angular/core'; + export interface DataTableAdapter { selectedRow: DataRow; getRows(): Array<DataRow>; @@ -41,6 +43,7 @@ export interface DataColumn { title?: string; srTitle?: string; cssClass?: string; + template?: TemplateRef<any>; } export class DataSorting { diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 1951c4de2a..c4167bb1b2 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -414,7 +414,7 @@ the binding value for the Site column to display location site will be `location ### Column definition -HTML attributes: +Properties: | Name | Type | Default | Description | --- | --- | --- | --- | @@ -425,10 +425,27 @@ HTML attributes: | `class` | string | | CSS class list, example: `full-width ellipsis-cell` | | `type` | string | text | Column type, text\|date\|number | | `format` | string | | Value format pattern | +| `template` | `TemplateRef<any>` | | Column template | For `date` column type the [DatePipe](https://angular.io/docs/ts/latest/api/common/DatePipe-class.html) formatting is used. For a full list of available `format` values please refer to [DatePipe](https://angular.io/docs/ts/latest/api/common/DatePipe-class.html) documentation. +#### Column Template + +It is possible providing custom column/cell template that may contain other Angular components or HTML elmements: + +```html +<content-column + title="{{'DOCUMENT_LIST.COLUMNS.DISPLAY_NAME' | translate}}" + key="name" + sortable="true" + class="full-width ellipsis-cell"> + <template let-entry="$implicit"> + <span>Hi! {{entry.data.getValue(entry.row, entry.col)}}</span> + </template> +</content-column> +``` + ### Actions DocumentList supports declarative actions for Documents and Folders. diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts index 1400641d35..eec2eb9202 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts @@ -35,7 +35,7 @@ describe('ContentColumn', () => { spyOn(columnList, 'registerColumn').and.callThrough(); let column = new ContentColumnComponent(columnList); - column.ngOnInit(); + column.ngAfterContentInit(); expect(columnList.registerColumn).toHaveBeenCalled(); @@ -56,7 +56,7 @@ describe('ContentColumn', () => { let column = new ContentColumnComponent(columnList); spyOn(column, 'register').and.callThrough(); - column.ngOnInit(); + column.ngAfterContentInit(); expect(column.register).toHaveBeenCalled(); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts index 5adcb351a8..13a85464ac 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, OnInit, Input, ContentChild, TemplateRef, AfterContentInit } from '@angular/core'; import { DataColumn } from 'ng2-alfresco-datatable'; import { ContentColumnListComponent } from './content-column-list.component'; @@ -24,7 +24,7 @@ import { ContentColumnListComponent } from './content-column-list.component'; selector: 'content-column', template: '' }) -export class ContentColumnComponent implements OnInit, DataColumn { +export class ContentColumnComponent implements OnInit, AfterContentInit, DataColumn { @Input() key: string; @@ -41,6 +41,9 @@ export class ContentColumnComponent implements OnInit, DataColumn { @Input() title: string = ''; + @ContentChild(TemplateRef) + template: any; + /** * Title to be used for screen readers. */ @@ -56,7 +59,9 @@ export class ContentColumnComponent implements OnInit, DataColumn { if (!this.srTitle && this.key === '$thumbnail') { this.srTitle = 'Thumbnail'; } + } + ngAfterContentInit() { this.register(); } From 32558da0a7aa0c54d822673d3cbd3ca1255ebb28 Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Mon, 23 Jan 2017 16:51:25 -0800 Subject: [PATCH 087/108] #1454 - Align element in form (#1524) --- .../widgets/container/container.widget.css | 4 ++++ .../widgets/container/container.widget.html | 4 ++-- .../components/widgets/date/date.widget.css | 19 ++++++++++++++++++- .../components/widgets/date/date.widget.html | 6 +++--- .../widgets/dropdown/dropdown.widget.css | 4 ++++ 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.css b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.css index 92502b7c0a..c90b97272c 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.css +++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.css @@ -18,3 +18,7 @@ .container-widget__header-text.collapsible { cursor: pointer; } + +.container-widget__mdl-grid { + align-items: center; +} diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html index b876e645c2..a0c807b12f 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html @@ -11,9 +11,9 @@ <span (click)="onExpanderClicked()" id="container-header-label">{{content.name}}</span> </h4> </div> - <div class="mdl-grid" [ngClass]="{'hidden':!(content?.isVisible && content?.isExpanded)}"> + <div class="mdl-grid container-widget__mdl-grid" [ngClass]="{'hidden':!(content?.isVisible && content?.isExpanded)}"> <div *ngFor="let col of content.columns" class="mdl-cell mdl-cell--{{col.size}}-col"> - <div class="mdl-grid" *ngIf="col.hasFields()"> + <div class="mdl-grid container-widget__mdl-grid" *ngIf="col.hasFields()"> <div *ngFor="let field of col.fields" class="mdl-cell mdl-cell--12-col"> <form-field [field]="field"></form-field> </div> diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.css b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.css index c8d5774494..a30807d5d2 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.css +++ b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.css @@ -1,9 +1,21 @@ .date-widget { width: 100%; + padding-top: 10px; + padding-bottom: 10px; } .date-widget--button { - margin-top: 15px; + margin-top: 10px; +} + +.mdl-date__input{ + padding-top: 5px; + padding-bottom: 5px; +} + +.mdl-grid__date-widget{ + align-items:center; + padding: 0px; } .date-widget__invalid .mdl-textfield__input { @@ -21,3 +33,8 @@ .date-widget__invalid .mdl-textfield__error { visibility: visible !important; } + +.date-widget-button__cell{ + margin-top: 0px; + margin-bottom: 0px; +} diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html index 3a8652288a..047eaef114 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html @@ -1,9 +1,9 @@ -<div class="mdl-grid" *ngIf="field?.isVisible" id="data-widget"> +<div class="mdl-grid mdl-grid__date-widget" *ngIf="field?.isVisible" id="data-widget"> <div class="mdl-cell mdl-cell--11-col"> <div class="mdl-textfield mdl-js-textfield date-widget" [class.date-widget__invalid]="!field.isValid"> <label [attr.for]="field.id">{{field.name}}</label> - <input class="mdl-textfield__input" + <input class="mdl-textfield__input mdl-date__input" type="text" [attr.id]="field.id" [attr.required]="isRequired()" @@ -17,7 +17,7 @@ </div> <div class="mdl-cell mdl-cell--1-col"> <button - class="mdl-button mdl-js-button mdl-button--icon date-widget--button" + class="mdl-button mdl-js-button mdl-button--icon" (click)="datePicker.toggle()"> <i class="material-icons">date_range</i> </button> diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.css b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.css index ae995ca854..ba9a5ba21d 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.css +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.css @@ -1,9 +1,13 @@ .dropdown-widget { width: 100%; + padding-top: 20px; + padding-bottom: 20px; } .dropdown-widget__select { width: 100%; + margin-top: 5px; + margin-bottom: 5px; } .dropdown-widget__invalid .dropdown-widget__select { From 82603bbfefde7bab825e8d5e1623a92265a6b88a Mon Sep 17 00:00:00 2001 From: Will Abson <will.abson@gmail.com> Date: Tue, 24 Jan 2017 00:53:25 +0000 Subject: [PATCH 088/108] Display process instance details after Start Process (#1525) Refs #1332 --- .../components/activiti/activiti-demo.component.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index ac7f8f5bb2..8b05745aca 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -194,14 +194,15 @@ export class ActivitiDemoComponent implements AfterViewInit { } navigateStartProcess() { - this.cleanProcessFilters(); + this.resetProcessFilters(); + this.reloadProcessFilters(); this.currentProcessInstanceId = currentProcessIdNew; } onStartProcessInstance(instance: ProcessInstance) { this.currentProcessInstanceId = instance.id; this.activitiStartProcess.reset(); - this.cleanProcessFilters(); + this.resetProcessFilters(); } isStartProcessMode() { @@ -254,15 +255,18 @@ export class ActivitiDemoComponent implements AfterViewInit { id: event.value.id, name: event.value.name || 'No name', created: event.value.created - }) + }); this.activitifilter.selectFilter(null); this.dataTasks.setRows([processTaskDataRow]); this.activititasklist.selectTask(event.value.id); this.currentTaskId = event.value.id; } - private cleanProcessFilters(){ + private resetProcessFilters() { this.processFilter = null; + } + + private reloadProcessFilters() { this.activitiprocessfilter.selectFilter(null); } From e846a15aa8df9a2829aa78fd981681397eb8c01c Mon Sep 17 00:00:00 2001 From: Will Abson <will.abson@gmail.com> Date: Tue, 24 Jan 2017 00:56:23 +0000 Subject: [PATCH 089/108] Display name and date for process instances if no name present (#1515) * Display name and date for process instances if no name present Refs #1461 * Re-work tests for processlist and process details to reflect changes Refs #1461 --- .../activiti-process-instances-list.mock.ts | 74 +++++++++ .../src/assets/activiti-process.model.mock.ts | 13 ++ ...ti-process-instance-details.component.html | 2 +- ...process-instance-details.component.spec.ts | 14 +- ...viti-process-instance-details.component.ts | 19 +++ .../activiti-processlist.component.spec.ts | 145 +++++++++++++----- .../activiti-processlist.component.ts | 24 ++- 7 files changed, 248 insertions(+), 43 deletions(-) create mode 100644 ng2-components/ng2-activiti-processlist/src/assets/activiti-process-instances-list.mock.ts diff --git a/ng2-components/ng2-activiti-processlist/src/assets/activiti-process-instances-list.mock.ts b/ng2-components/ng2-activiti-processlist/src/assets/activiti-process-instances-list.mock.ts new file mode 100644 index 0000000000..1181b9df2d --- /dev/null +++ b/ng2-components/ng2-activiti-processlist/src/assets/activiti-process-instances-list.mock.ts @@ -0,0 +1,74 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { ProcessInstance } from '../models/process-instance.model'; + +export var fakeProcessInstances = [ + new ProcessInstance({ + id: 1, + name: 'Process 773443333', + processDefinitionId: 'fakeprocess:5:7507', + processDefinitionKey: 'fakeprocess', + processDefinitionName: 'Fake Process Name', + description: null, category: null, + started: '2015-11-09T12:36:14.184+0000', + startedBy: { + id: 3, firstName: 'tenant2', lastName: 'tenantLastname', email: 'tenant2@tenant' + } + }), + new ProcessInstance({ + id: 2, + name: 'Process 382927392', + processDefinitionId: 'fakeprocess:5:7507', + processDefinitionKey: 'fakeprocess', + processDefinitionName: 'Fake Process Name', + description: null, + category: null, + started: '2017-11-09T12:37:25.184+0000', + startedBy: { + id: 3, firstName: 'tenant2', lastName: 'tenantLastname', email: 'tenant2@tenant' + } + }) +]; + +export var fakeProcessInstancesWithNoName = [ + new ProcessInstance({ + id: 1, + name: null, + processDefinitionId: 'fakeprocess:5:7507', + processDefinitionKey: 'fakeprocess', + processDefinitionName: 'Fake Process Name', + description: null, category: null, + started: '2017-11-09T12:36:14.184+0000', + startedBy: { + id: 3, firstName: 'tenant2', lastName: 'tenantLastname', email: 'tenant2@tenant' + } + }), + new ProcessInstance({ + id: 2, + name: '', + processDefinitionId: 'fakeprocess:5:7507', + processDefinitionKey: 'fakeprocess', + processDefinitionName: 'Fake Process Name', + description: null, + category: null, + started: '2017-11-09T12:37:25.184+0000', + startedBy: { + id: 3, firstName: 'tenant2', lastName: 'tenantLastname', email: 'tenant2@tenant' + } + }) +]; diff --git a/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.model.mock.ts b/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.model.mock.ts index 202b62cf69..bbcf650f15 100644 --- a/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.model.mock.ts +++ b/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.model.mock.ts @@ -50,3 +50,16 @@ export var exampleProcess = new ProcessInstance({ email: 'bob@app.activiti.com' } }); + +export var exampleProcessNoName = new ProcessInstance({ + id: '123', + name: null, + started: '2016-11-10T03:37:30.010+0000', + startedBy: { + id: 1001, + firstName: 'Bob', + lastName: 'Jones', + email: 'bob@app.activiti.com' + }, + processDefinitionName: 'My Process' +}); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html index 67fb465d4a..18ca467cf2 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html @@ -1,6 +1,6 @@ <div *ngIf="!processInstanceDetails">{{ 'DETAILS.MESSAGES.NONE'|translate }}</div> <div *ngIf="processInstanceDetails"> - <h2 class="mdl-card__title-text">{{processInstanceDetails.name}}</h2> + <h2 class="mdl-card__title-text">{{ getProcessNameOrDescription('medium') }}</h2> <activiti-process-instance-header [processInstance]="processInstanceDetails"></activiti-process-instance-header> <div class="mdl-card mdl-shadow--2dp activiti-process-container"> <div class="mdl-cell mdl-cell--12-col"> diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts index ba4ff24006..f7e3016d46 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts @@ -27,7 +27,7 @@ import { ActivitiTaskListModule } from 'ng2-activiti-tasklist'; import { ActivitiProcessInstanceDetails } from './activiti-process-instance-details.component'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { TranslationMock } from './../assets/translation.service.mock'; -import { exampleProcess } from './../assets/activiti-process.model.mock'; +import { exampleProcess, exampleProcessNoName } from './../assets/activiti-process.model.mock'; import { ProcessInstance } from '../models/process-instance.model'; describe('ActivitiProcessInstanceDetails', () => { @@ -94,6 +94,18 @@ describe('ActivitiProcessInstanceDetails', () => { }); })); + it('should display default details when the process instance has no name', async(() => { + getProcessSpy = getProcessSpy.and.returnValue(Observable.of(exampleProcessNoName)); + fixture.detectChanges(); + component.ngOnChanges({ 'processInstanceId': new SimpleChange(null, '123') }); + fixture.whenStable().then(() => { + fixture.detectChanges(); + let headerEl: DebugElement = fixture.debugElement.query(By.css('h2')); + expect(headerEl).not.toBeNull(); + expect(headerEl.nativeElement.innerText).toBe('My Process - Nov 10, 2016, 3:37:30 AM'); + }); + })); + describe('change detection', () => { let change = new SimpleChange('123', '456'); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts index b4edb2d997..b39ae9ca56 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts @@ -15,6 +15,7 @@ * limitations under the License. */ +import { DatePipe } from '@angular/common'; import { Component, Input, ViewChild, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core'; import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { TaskDetailsEvent } from 'ng2-activiti-tasklist'; @@ -115,4 +116,22 @@ export class ActivitiProcessInstanceDetails implements OnChanges { onTaskClicked(event: TaskDetailsEvent) { this.taskClick.emit(event); } + + getProcessNameOrDescription(dateFormat): string { + let name = ''; + if (this.processInstanceDetails) { + name = this.processInstanceDetails.name || + this.processInstanceDetails.processDefinitionName + ' - ' + this.getFormatDate(this.processInstanceDetails.started, dateFormat); + } + return name; + } + + getFormatDate(value, format: string) { + let datePipe = new DatePipe('en-US'); + try { + return datePipe.transform(value, format); + } catch (err) { + this.logService.error(`ProcessListInstanceHeader: error parsing date ${value} to format ${format}`); + } + } } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts index f4b548b15c..a6f71829f0 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts @@ -23,33 +23,12 @@ import { ActivitiProcessInstanceListComponent } from './activiti-processlist.com import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { DataTableModule, ObjectDataRow, DataRowEvent, ObjectDataTableAdapter, DataSorting } from 'ng2-alfresco-datatable'; +import { fakeProcessInstances, fakeProcessInstancesWithNoName } from '../assets/activiti-process-instances-list.mock'; import { TranslationMock } from './../assets/translation.service.mock'; -import { ProcessInstance } from '../models/process-instance.model'; import { ActivitiProcessService } from '../services/activiti-process.service'; describe('ActivitiProcessInstanceListComponent', () => { - let fakeGlobalProcesses = [ - new ProcessInstance({ - id: 1, name: 'process-name', - processDefinitionId: 'fakeprocess:5:7507', - processDefinitionKey: 'fakeprocess', - processDefinitionName: 'Fake Process Name', - description: null, category: null, - started: '2017-11-09T12:37:25.184+0000', - startedBy: { - id: 3, firstName: 'tenant2', lastName: 'tenantLastname', email: 'tenant2@tenant' - } - }), - new ProcessInstance({ - id: 2, name: '', description: null, category: null, - started: '2015-11-09T12:37:25.184+0000', - startedBy: { - id: 3, firstName: 'tenant2', lastName: 'tenantLastname', email: 'tenant2@tenant' - } - }) - ]; - let componentHandler: any; let fixture: ComponentFixture<ActivitiProcessInstanceListComponent>; let component: ActivitiProcessInstanceListComponent; @@ -72,7 +51,7 @@ describe('ActivitiProcessInstanceListComponent', () => { component = fixture.componentInstance; service = fixture.debugElement.injector.get(ActivitiProcessService); - getProcessInstancesSpy = spyOn(service, 'getProcessInstances').and.returnValue(Observable.of(fakeGlobalProcesses)); + getProcessInstancesSpy = spyOn(service, 'getProcessInstances').and.returnValue(Observable.of(fakeProcessInstances)); componentHandler = jasmine.createSpyObj('componentHandler', [ 'upgradeAllRegistered', @@ -114,34 +93,122 @@ describe('ActivitiProcessInstanceListComponent', () => { component.processDefinitionKey = null; fixture.detectChanges(); tick(); - expect(emitSpy).toHaveBeenCalledWith(fakeGlobalProcesses); + expect(emitSpy).toHaveBeenCalledWith(fakeProcessInstances); })); - it('should return the process instances list', (done) => { + it('should return the process instances list in original order when datalist passed non-existent columns', (done) => { + component.data = new ObjectDataTableAdapter( + [], + [ + {type: 'text', key: 'fake-id', title: 'Name'} + ] + ); component.appId = '1'; component.state = 'open'; component.processDefinitionKey = null; - component.onSuccess.subscribe( (res) => { + component.onSuccess.subscribe((res) => { expect(res).toBeDefined(); expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); expect(component.data.getRows().length).toEqual(2); - expect(component.data.getRows()[0].getValue('name')).toEqual('No name'); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333'); + expect(component.data.getRows()[1].getValue('name')).toEqual('Process 382927392'); + done(); + }); + fixture.detectChanges(); + }); + + it('should order the process instances by name column when no sort passed', (done) => { + component.appId = '1'; + component.state = 'open'; + component.processDefinitionKey = null; + component.onSuccess.subscribe((res) => { + expect(res).toBeDefined(); + expect(component.data).toBeDefined(); + expect(component.isListEmpty()).not.toBeTruthy(); + expect(component.data.getRows().length).toEqual(2); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 382927392'); + expect(component.data.getRows()[1].getValue('name')).toEqual('Process 773443333'); + done(); + }); + fixture.detectChanges(); + }); + + it('should order the process instances by descending column when specified', (done) => { + component.appId = '1'; + component.state = 'open'; + component.processDefinitionKey = null; + component.sort = 'name-desc'; + component.onSuccess.subscribe((res) => { + expect(res).toBeDefined(); + expect(component.data).toBeDefined(); + expect(component.isListEmpty()).not.toBeTruthy(); + expect(component.data.getRows().length).toEqual(2); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333'); + expect(component.data.getRows()[1].getValue('name')).toEqual('Process 382927392'); + done(); + }); + fixture.detectChanges(); + }); + + it('should order the process instances by ascending column when specified', (done) => { + component.appId = '1'; + component.state = 'open'; + component.processDefinitionKey = null; + component.sort = 'started-asc'; + component.onSuccess.subscribe((res) => { + expect(res).toBeDefined(); + expect(component.data).toBeDefined(); + expect(component.isListEmpty()).not.toBeTruthy(); + expect(component.data.getRows().length).toEqual(2); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333'); + expect(component.data.getRows()[1].getValue('name')).toEqual('Process 382927392'); + done(); + }); + fixture.detectChanges(); + }); + + it('should order the process instances by descending start date when specified', (done) => { + component.appId = '1'; + component.state = 'open'; + component.processDefinitionKey = null; + component.sort = 'started-desc'; + component.onSuccess.subscribe((res) => { + expect(res).toBeDefined(); + expect(component.data).toBeDefined(); + expect(component.isListEmpty()).not.toBeTruthy(); + expect(component.data.getRows().length).toEqual(2); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 382927392'); + expect(component.data.getRows()[1].getValue('name')).toEqual('Process 773443333'); done(); }); fixture.detectChanges(); }); it('should return the process instances list filtered by processDefinitionKey', (done) => { + let key = 'fakeprocess'; + component.appId = '1'; + component.state = 'open'; + component.processDefinitionKey = key; + component.onSuccess.subscribe((res) => { + let lastCall = getProcessInstancesSpy.calls.mostRecent(); + expect(lastCall).toBeDefined(); + let lastCallArgs = lastCall.args; + expect(lastCallArgs[0]).toBeDefined(); + expect(lastCallArgs[0].processDefinitionKey).toEqual(key); + done(); + }); + fixture.detectChanges(); + }); + + it('should return a default name if no name is specified on the process', (done) => { + getProcessInstancesSpy = getProcessInstancesSpy.and.returnValue(Observable.of(fakeProcessInstancesWithNoName)); component.appId = '1'; component.state = 'open'; component.processDefinitionKey = 'fakeprocess'; component.onSuccess.subscribe( (res) => { - expect(res).toBeDefined(); - expect(component.data).toBeDefined(); - expect(component.isListEmpty()).not.toBeTruthy(); - expect(component.data.getRows().length).toEqual(2); - expect(component.data.getRows()[0].getValue('name')).toEqual('No name'); + expect(component.data.getRows()[0].getValue('name')).toEqual('Fake Process Name - Nov 9, 2017, 12:36:14 PM'); + expect(component.data.getRows()[1].getValue('name')).toEqual('Fake Process Name - Nov 9, 2017, 12:37:25 PM'); done(); }); fixture.detectChanges(); @@ -172,7 +239,7 @@ describe('ActivitiProcessInstanceListComponent', () => { let emitSpy = spyOn(component.onSuccess, 'emit'); component.reload(); tick(); - expect(emitSpy).toHaveBeenCalledWith(fakeGlobalProcesses); + expect(emitSpy).toHaveBeenCalledWith(fakeProcessInstances); })); it('should reload processes when reload() is called', (done) => { @@ -188,7 +255,7 @@ describe('ActivitiProcessInstanceListComponent', () => { expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); expect(component.data.getRows().length).toEqual(2); - expect(component.data.getRows()[1].getValue('name')).toEqual('No name'); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333'); done(); }); component.reload(); @@ -235,7 +302,7 @@ describe('ActivitiProcessInstanceListComponent', () => { expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); expect(component.data.getRows().length).toEqual(2); - expect(component.data.getRows()[1].getValue('name')).toEqual('No name'); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333'); done(); }); @@ -251,7 +318,7 @@ describe('ActivitiProcessInstanceListComponent', () => { expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); expect(component.data.getRows().length).toEqual(2); - expect(component.data.getRows()[1].getValue('name')).toEqual('No name'); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333'); done(); }); @@ -267,7 +334,7 @@ describe('ActivitiProcessInstanceListComponent', () => { expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); expect(component.data.getRows().length).toEqual(2); - expect(component.data.getRows()[1].getValue('name')).toEqual('No name'); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333'); done(); }); @@ -283,7 +350,7 @@ describe('ActivitiProcessInstanceListComponent', () => { expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); expect(component.data.getRows().length).toEqual(2); - expect(component.data.getRows()[1].getValue('name')).toEqual('No name'); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333'); done(); }); @@ -314,7 +381,7 @@ describe('ActivitiProcessInstanceListComponent', () => { expect(component.data).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); expect(component.data.getRows().length).toEqual(2); - expect(component.data.getRows()[1].getValue('name')).toEqual('No name'); + expect(component.data.getRows()[0].getValue('name')).toEqual('Process 773443333'); done(); }); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts index d40af83976..426b1aca24 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts @@ -15,6 +15,7 @@ * limitations under the License. */ +import { DatePipe } from '@angular/common'; import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow, DataSorting } from 'ng2-alfresco-datatable'; @@ -154,7 +155,8 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { instancesRows.push(new ObjectDataRow({ id: row.id, name: row.name, - started: row.started + started: row.started, + processDefinitionName: row.processDefinitionName })); }); return instancesRows; @@ -236,12 +238,30 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { */ private optimizeNames(instances: any[]) { instances = instances.map(t => { - t.obj.name = t.obj.name || 'No name'; + t.obj.name = this.getProcessNameOrDescription(t.obj, 'medium'); return t; }); return instances; } + getProcessNameOrDescription(processInstance, dateFormat): string { + let name = ''; + if (processInstance) { + name = processInstance.name || + processInstance.processDefinitionName + ' - ' + this.getFormatDate(processInstance.started, dateFormat); + } + return name; + } + + getFormatDate(value, format: string) { + let datePipe = new DatePipe('en-US'); + try { + return datePipe.transform(value, format); + } catch (err) { + return ''; + } + } + private createRequestNode() { let requestNode = { appDefinitionId: this.appId, From 89bcdbef246b5ab2a77a4ff59bb8d3eaaf35f154 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Tue, 24 Jan 2017 10:20:20 +0000 Subject: [PATCH 090/108] Fix dynamic value inside the min length error message (#1523) --- .../components/login/login-demo.component.ts | 5 +++-- .../alfresco-login/i18n/en.json | 2 +- .../components/alfresco-login.component.ts | 21 ++++++++++++++----- .../ng2-alfresco-login/src/i18n/en.json | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) 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 380f81b946..2026b9044e 100644 --- a/demo-shell-ng2/app/components/login/login-demo.component.ts +++ b/demo-shell-ng2/app/components/login/login-demo.component.ts @@ -37,19 +37,20 @@ export class LoginDemoComponent implements OnInit { disableCsrf: boolean = false; isECM: boolean = true; isBPM: boolean = false; + customMinLenght: number = 2; constructor(private router: Router, private storage: StorageService, private logService: LogService) { this.customValidation = { - username: ['', Validators.compose([Validators.required, Validators.minLength(2)])], + username: ['', Validators.compose([Validators.required, Validators.minLength(this.customMinLenght)])], password: ['', Validators.required] }; } ngOnInit() { this.alfrescologin.addCustomValidationError('username', 'required', 'LOGIN.MESSAGES.USERNAME-REQUIRED'); - this.alfrescologin.addCustomValidationError('username', 'minlength', 'LOGIN.MESSAGES.USERNAME-MIN'); + this.alfrescologin.addCustomValidationError('username', 'minlength', 'LOGIN.MESSAGES.USERNAME-MIN', {customMinLenght: this.customMinLenght}); this.alfrescologin.addCustomValidationError('password', 'required', 'LOGIN.MESSAGES.PASSWORD-REQUIRED'); if (this.storage.hasItem('providers')) { diff --git a/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json b/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json index 5982c16a33..d7e59007bd 100644 --- a/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json +++ b/demo-shell-ng2/custom-translation/alfresco-login/i18n/en.json @@ -9,7 +9,7 @@ }, "MESSAGES": { "USERNAME-REQUIRED": "Required", - "USERNAME-MIN": "Your username needs to be at least 4 characters.", + "USERNAME-MIN": "Your username needs to be at least {{customMinLenght}} characters.", "PASSWORD-REQUIRED": "Enter your password to sign in", "LOGIN-ERROR-CREDENTIALS": "You have entered an invalid username or password", "LOGIN-ERROR-PROVIDERS": "Providers cannot be undefined", diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index 789b4e794d..d7b6fd97b8 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -65,6 +65,8 @@ export class AlfrescoLoginComponent implements OnInit { formError: { [id: string]: string }; + minLenght: number = 2; + private _message: { [id: string]: { [id: string]: string } }; /** @@ -220,8 +222,14 @@ export class AlfrescoLoginComponent implements OnInit { * @param ruleId - i.e. required | minlength | maxlength * @param msg */ - public addCustomValidationError(field: string, ruleId: string, msg: string) { - this._message[field][ruleId] = msg; + public addCustomValidationError(field: string, ruleId: string, msg: string, params?: any) { + if (params) { + this.translateService.get(msg, params).subscribe((res: string) => { + this._message[field][ruleId] = res; + }); + } else { + this._message[field][ruleId] = msg; + } } /** @@ -274,18 +282,21 @@ export class AlfrescoLoginComponent implements OnInit { private initFormFieldsMessagesDefault() { this._message = { 'username': { - 'required': 'LOGIN.MESSAGES.USERNAME-REQUIRED', - 'minlength': 'LOGIN.MESSAGES.USERNAME-MIN' + 'required': 'LOGIN.MESSAGES.USERNAME-REQUIRED' }, 'password': { 'required': 'LOGIN.MESSAGES.PASSWORD-REQUIRED' } }; + + this.translateService.get('LOGIN.MESSAGES.USERNAME-MIN', {minLenght: this.minLenght}).subscribe((res: string) => { + this._message['username']['minlength'] = res; + }); } private initFormFieldsDefault() { this.form = this._fb.group({ - username: ['', Validators.compose([Validators.required, Validators.minLength(2)])], + username: ['', Validators.compose([Validators.required, Validators.minLength(this.minLenght)])], password: ['', Validators.required] }); } diff --git a/ng2-components/ng2-alfresco-login/src/i18n/en.json b/ng2-components/ng2-alfresco-login/src/i18n/en.json index 5982c16a33..6abc552965 100644 --- a/ng2-components/ng2-alfresco-login/src/i18n/en.json +++ b/ng2-components/ng2-alfresco-login/src/i18n/en.json @@ -9,7 +9,7 @@ }, "MESSAGES": { "USERNAME-REQUIRED": "Required", - "USERNAME-MIN": "Your username needs to be at least 4 characters.", + "USERNAME-MIN": "Your username needs to be at least {{minLenght}} characters.", "PASSWORD-REQUIRED": "Enter your password to sign in", "LOGIN-ERROR-CREDENTIALS": "You have entered an invalid username or password", "LOGIN-ERROR-PROVIDERS": "Providers cannot be undefined", From d8c433c0556a1c29544a9a1ee4a0c61fbc8e2299 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale <maurizio.vitale@alfresco.com> Date: Tue, 24 Jan 2017 14:08:52 +0000 Subject: [PATCH 091/108] Filter start form outcomes (#1529) * #1467 customs outcome * #1467 Filter the start form outcomes --- .../src/components/activiti-start-form.component.ts | 5 +++++ .../activiti-process-instance-tasks.component.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts index 232e1551e8..f20ee6c257 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts @@ -69,6 +69,9 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, @Input() showRefreshButton: boolean = true; + @Input() + readOnlyForm: boolean = false; + @Output() outcomeClick: EventEmitter<any> = new EventEmitter<any>(); @@ -112,6 +115,7 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, this.formName = form.name; form.processDefinitionId = this.processDefinitionId; this.form = this.parseForm(form); + this.form.readOnly = this.readOnlyForm; // this.form.processDefinitionId = this.processDefinitionId; this.formLoaded.emit(this.form); }, @@ -126,6 +130,7 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked, form => { this.formName = form.processDefinitionName; this.form = this.parseForm(form); + this.form.readOnly = this.readOnlyForm; this.formLoaded.emit(this.form); }, error => this.handleError(error) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html index 0946965608..ff9c962bb5 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html @@ -75,7 +75,7 @@ <h4 class="mdl-dialog__title">{{ 'DETAILS.LABELS.START_FORM'|translate }}</h4> <div class="mdl-dialog__content form__size"> <activiti-start-form [processId]="processId" [processDefinitionId]="processInstanceDetails?.processDefinitionId" - [showOutcomeButtons]="false" [showRefreshButton]="false"> + [showRefreshButton]="false" [readOnlyForm]="true" > </activiti-start-form> </div> <div class="mdl-dialog__actions"> From 1c21875607ca09cccc44cd621b48acfe52a8f3b5 Mon Sep 17 00:00:00 2001 From: Mario Romano <dnamario@hotmail.com> Date: Tue, 24 Jan 2017 17:09:13 +0000 Subject: [PATCH 092/108] #537 snackbar notification system (#1527) * #537 snackbar notification system * #537 add test dependencies * #537 add export material module * #537 fix demo project --- demo-shell-ng2/app/app.module.ts | 1 - demo-shell-ng2/app/vendor.ts | 4 ++ demo-shell-ng2/index.html | 19 +-------- demo-shell-ng2/package.json | 1 + demo-shell-ng2/public/css/app.css | 41 +++++++++++++++---- .../ng2-activiti-analytics/README.md | 3 ++ .../ng2-activiti-analytics/demo/package.json | 1 + .../ng2-activiti-analytics/karma-test-shim.js | 2 + .../ng2-activiti-analytics/package.json | 1 + .../ng2-activiti-diagrams/README.md | 3 ++ .../ng2-activiti-diagrams/demo/package.json | 1 + .../ng2-activiti-diagrams/karma-test-shim.js | 2 + .../ng2-activiti-diagrams/package.json | 1 + ng2-components/ng2-activiti-form/README.md | 3 ++ .../ng2-activiti-form/demo/package.json | 1 + .../ng2-activiti-form/karma-test-shim.js | 2 + ng2-components/ng2-activiti-form/package.json | 1 + .../ng2-activiti-processlist/README.md | 3 ++ .../demo/package.json | 2 +- .../karma-test-shim.js | 2 + .../ng2-activiti-processlist/package.json | 1 + .../ng2-activiti-tasklist/README.md | 35 ++-------------- .../ng2-activiti-tasklist/demo/package.json | 1 + .../ng2-activiti-tasklist/karma-test-shim.js | 2 + .../ng2-activiti-tasklist/package.json | 1 + ng2-components/ng2-alfresco-core/README.md | 38 +++++++++++++++++ ng2-components/ng2-alfresco-core/index.ts | 11 ++++- .../ng2-alfresco-core/karma-test-shim.js | 2 + ng2-components/ng2-alfresco-core/package.json | 1 + .../ng2-alfresco-core/src/services/index.ts | 2 +- .../src/services/notification.service.ts | 40 ++++++++++++++++++ .../ng2-alfresco-datatable/README.md | 3 ++ .../ng2-alfresco-datatable/demo/package.json | 1 + .../ng2-alfresco-datatable/karma-test-shim.js | 2 + .../ng2-alfresco-datatable/package.json | 1 + .../ng2-alfresco-documentlist/README.md | 3 ++ .../demo/package.json | 1 + .../karma-test-shim.js | 2 + .../ng2-alfresco-documentlist/package.json | 1 + ng2-components/ng2-alfresco-login/README.md | 3 ++ .../ng2-alfresco-login/demo/package.json | 1 + .../ng2-alfresco-login/karma-test-shim.js | 2 + .../ng2-alfresco-login/package.json | 1 + ng2-components/ng2-alfresco-search/README.md | 3 ++ .../ng2-alfresco-search/demo/package.json | 1 + .../ng2-alfresco-search/karma-test-shim.js | 2 + .../ng2-alfresco-search/package.json | 1 + ng2-components/ng2-alfresco-tag/README.md | 3 ++ .../ng2-alfresco-tag/demo/package.json | 1 + .../ng2-alfresco-tag/karma-test-shim.js | 2 + ng2-components/ng2-alfresco-tag/package.json | 1 + ng2-components/ng2-alfresco-upload/README.md | 3 ++ .../ng2-alfresco-upload/demo/index.html | 3 ++ .../ng2-alfresco-upload/demo/package.json | 1 + .../demo/systemjs.config.js | 2 + .../ng2-alfresco-upload/karma-test-shim.js | 2 + .../ng2-alfresco-upload/package.json | 1 + .../components/upload-button.component.html | 7 ---- .../upload-button.component.spec.ts | 5 ++- .../src/components/upload-button.component.ts | 40 ++++-------------- .../upload-drag-area.component.html | 7 ---- .../upload-drag-area.component.spec.ts | 3 +- .../components/upload-drag-area.component.ts | 38 +++++------------ .../ng2-alfresco-userinfo/README.md | 3 ++ .../ng2-alfresco-userinfo/demo/package.json | 1 + .../ng2-alfresco-userinfo/karma-test-shim.js | 2 + .../ng2-alfresco-userinfo/package.json | 1 + ng2-components/ng2-alfresco-viewer/README.md | 3 ++ .../ng2-alfresco-viewer/demo/package.json | 1 + .../ng2-alfresco-viewer/karma-test-shim.js | 2 + .../ng2-alfresco-viewer/package.json | 1 + .../ng2-alfresco-webscript/README.md | 3 ++ .../ng2-alfresco-webscript/demo/package.json | 1 + .../ng2-alfresco-webscript/karma-test-shim.js | 2 + .../ng2-alfresco-webscript/package.json | 1 + 75 files changed, 256 insertions(+), 140 deletions(-) create mode 100644 ng2-components/ng2-alfresco-core/src/services/notification.service.ts diff --git a/demo-shell-ng2/app/app.module.ts b/demo-shell-ng2/app/app.module.ts index 560e10aaac..cd3eddb146 100644 --- a/demo-shell-ng2/app/app.module.ts +++ b/demo-shell-ng2/app/app.module.ts @@ -32,7 +32,6 @@ import { ActivitiTaskListModule } from 'ng2-activiti-tasklist'; import { ActivitiProcessListModule } from 'ng2-activiti-processlist'; import { UserInfoComponentModule } from 'ng2-alfresco-userinfo'; import { AnalyticsModule } from 'ng2-activiti-analytics'; - import { AppComponent } from './app.component'; import { routing } from './app.routes'; import { CustomEditorsModule } from './components/activiti/custom-editor/custom-editor.component'; diff --git a/demo-shell-ng2/app/vendor.ts b/demo-shell-ng2/app/vendor.ts index f5333ae066..f8900561ae 100644 --- a/demo-shell-ng2/app/vendor.ts +++ b/demo-shell-ng2/app/vendor.ts @@ -32,9 +32,13 @@ import 'dialog-polyfill/dialog-polyfill.css'; // Flags import 'flag-icon-css/css/flag-icon.min.css'; + import '../public/css/app.css'; import '../public/css/muli-font.css'; +// Load the Angular Material 2 stylesheet +import '@angular/material/core/theming/prebuilt/deeppurple-amber.css' + import 'ng2-activiti-form/stencils/runtime.ng1'; import 'ng2-activiti-form/stencils/runtime.adf'; diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html index 5253f85ead..0e8d01209c 100644 --- a/demo-shell-ng2/index.html +++ b/demo-shell-ng2/index.html @@ -13,7 +13,7 @@ <!-- IE/FF --> <script src=js/element.scrollintoviewifneeded-polyfill.js></script> - + <!--[if IE]> <script src=js/shim.min.js></script> <script src=//cdnjs.cloudflare.com/ajax/libs/dom4/1.8.3/dom4.js></script> @@ -33,24 +33,7 @@ <script src="js/material.min.js"></script> <link href="css/iconfont/material-icons.css" rel="stylesheet"> - <style> - .main_header_adf .mdl-layout__drawer-button { - right: 0 !important; - left: initial !important; - left: auto; - - } - - .mdl-layout__header { - color: rgb(255, 255, 255); - background-color: rgb(31, 188, 210); - } - - .mdl-layout__header-row .mdl-navigation__link { - color: rgb(255, 255, 255); - } - .loader-container { display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index f8360b8ee7..5a6af3d26e 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -62,6 +62,7 @@ "@angular/platform-browser-dynamic": "2.2.2", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", + "@angular/material": "2.0.0-beta.1", "systemjs": "0.19.27", "core-js": "^2.4.1", "reflect-metadata": "^0.1.8", diff --git a/demo-shell-ng2/public/css/app.css b/demo-shell-ng2/public/css/app.css index 3656efa93b..7119266e91 100644 --- a/demo-shell-ng2/public/css/app.css +++ b/demo-shell-ng2/public/css/app.css @@ -3,7 +3,6 @@ body, html { height: 100%; } - .p-10 { padding: 10px; } @@ -13,24 +12,24 @@ body, html { } .loader-container { - display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ - display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ - display: -webkit-flex; /* NEW - Chrome */ - display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */ + display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ + display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ + display: -webkit-flex; /* NEW - Chrome */ + display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */ -webkit-box-flex-direction: row; -moz-box-flex-direction: row; -webkit-flex-direction: row; flex-direction: row; - height:100%; + height: 100%; } .loader-item { margin: auto; - max-height:100px; - max-width:300px; + max-height: 100px; + max-width: 300px; } -.loader-text{ +.loader-text { white-space: nowrap; text-align: center; position: relative; @@ -39,3 +38,27 @@ body, html { ._dialog_overlay { position: static !important; } + +.main_header_adf .mdl-layout__drawer-button { + right: 0 !important; + left: initial !important; + left: auto; +} + +.mdl-layout__header { + color: rgb(255, 255, 255); + background-color: rgb(31, 188, 210); +} + +.mdl-layout__header .material-icons { + color: rgb(255, 255, 255); +} + +.mdl-layout__header-row .mdl-navigation__link { + color: rgb(255, 255, 255); +} + +.md-simple-snackbar-action { + border: 0px; + cursor: pointer; +} diff --git a/ng2-components/ng2-activiti-analytics/README.md b/ng2-components/ng2-activiti-analytics/README.md index 166bf6e17c..108952f702 100644 --- a/ng2-components/ng2-activiti-analytics/README.md +++ b/ng2-components/ng2-activiti-analytics/README.md @@ -69,6 +69,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-activiti-analytics/demo/package.json b/ng2-components/ng2-activiti-analytics/demo/package.json index 17a7b119eb..9fba5aaea5 100644 --- a/ng2-components/ng2-activiti-analytics/demo/package.json +++ b/ng2-components/ng2-activiti-analytics/demo/package.json @@ -39,6 +39,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-activiti-analytics/karma-test-shim.js b/ng2-components/ng2-activiti-analytics/karma-test-shim.js index db50eb931e..d346348361 100644 --- a/ng2-components/ng2-activiti-analytics/karma-test-shim.js +++ b/ng2-components/ng2-activiti-analytics/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index 6055b3bbca..c818b06ccd 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -51,6 +51,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-activiti-diagrams/README.md b/ng2-components/ng2-activiti-diagrams/README.md index 5192d5647a..7b7586e3c8 100644 --- a/ng2-components/ng2-activiti-diagrams/README.md +++ b/ng2-components/ng2-activiti-diagrams/README.md @@ -62,6 +62,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-activiti-diagrams/demo/package.json b/ng2-components/ng2-activiti-diagrams/demo/package.json index d00651baa9..ac2ad6c1ab 100644 --- a/ng2-components/ng2-activiti-diagrams/demo/package.json +++ b/ng2-components/ng2-activiti-diagrams/demo/package.json @@ -39,6 +39,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "alfresco-js-api": "^1.0.0", diff --git a/ng2-components/ng2-activiti-diagrams/karma-test-shim.js b/ng2-components/ng2-activiti-diagrams/karma-test-shim.js index 680be8a9a1..04a45e501c 100644 --- a/ng2-components/ng2-activiti-diagrams/karma-test-shim.js +++ b/ng2-components/ng2-activiti-diagrams/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json index 60d1fcf6fe..2838bcf146 100644 --- a/ng2-components/ng2-activiti-diagrams/package.json +++ b/ng2-components/ng2-activiti-diagrams/package.json @@ -47,6 +47,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-activiti-form/README.md b/ng2-components/ng2-activiti-form/README.md index 2fa4585432..894a5d102d 100644 --- a/ng2-components/ng2-activiti-form/README.md +++ b/ng2-components/ng2-activiti-form/README.md @@ -65,6 +65,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-activiti-form/demo/package.json b/ng2-components/ng2-activiti-form/demo/package.json index c907bf29b1..c73807a4d7 100644 --- a/ng2-components/ng2-activiti-form/demo/package.json +++ b/ng2-components/ng2-activiti-form/demo/package.json @@ -39,6 +39,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-activiti-form/karma-test-shim.js b/ng2-components/ng2-activiti-form/karma-test-shim.js index 5445bda93f..ac2dd6fcfb 100644 --- a/ng2-components/ng2-activiti-form/karma-test-shim.js +++ b/ng2-components/ng2-activiti-form/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index 0363a7fcbc..c6a7fe2639 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -54,6 +54,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-activiti-processlist/README.md b/ng2-components/ng2-activiti-processlist/README.md index c8f9875c4f..26c13a1830 100644 --- a/ng2-components/ng2-activiti-processlist/README.md +++ b/ng2-components/ng2-activiti-processlist/README.md @@ -68,6 +68,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-activiti-processlist/demo/package.json b/ng2-components/ng2-activiti-processlist/demo/package.json index 2541196076..04c75f6c01 100644 --- a/ng2-components/ng2-activiti-processlist/demo/package.json +++ b/ng2-components/ng2-activiti-processlist/demo/package.json @@ -32,7 +32,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", - "@angular/router": "3.0.0", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-activiti-processlist/karma-test-shim.js b/ng2-components/ng2-activiti-processlist/karma-test-shim.js index b216586a6e..8ab8026459 100644 --- a/ng2-components/ng2-activiti-processlist/karma-test-shim.js +++ b/ng2-components/ng2-activiti-processlist/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index 1a783193d8..8fb1cd8bbd 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -53,6 +53,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-activiti-tasklist/README.md b/ng2-components/ng2-activiti-tasklist/README.md index a972fff803..8153a8cce0 100644 --- a/ng2-components/ng2-activiti-tasklist/README.md +++ b/ng2-components/ng2-activiti-tasklist/README.md @@ -31,38 +31,6 @@ </a> </p> -<p> - <a title='Build Status Travis' href="https://travis-ci.org/Alfresco/alfresco-ng2-components"> - <img src='https://travis-ci.org/Alfresco/alfresco-ng2-components.svg?branch=master' alt='travis - Status' /> - </a> - <a title='Build Status AppVeyor' href="https://ci.appveyor.com/project/alfresco/alfresco-ng2-components"> - <img src='https://ci.appveyor.com/api/projects/status/github/Alfresco/alfresco-ng2-components' alt='travis - Status' /> - </a> - <a href='https://codecov.io/gh/Alfresco/alfresco-ng2-components'> - <img src='https://img.shields.io/codecov/c/github/Alfresco/alfresco-ng2-components/master.svg?maxAge=2592000' alt='Coverage Status' /> - </a> - <a href='https://www.npmjs.com/package/ng2-activiti-tasklist'> - <img src='https://img.shields.io/npm/dt/ng2-activiti-tasklist.svg' alt='npm downloads' /> - </a> - <a href='https://github.com/Alfresco/alfresco-ng2-components/blob/master/LICENSE'> - <img src='https://img.shields.io/hexpm/l/plug.svg' alt='license' /> - </a> - <a href='https://www.alfresco.com/'> - <img src='https://img.shields.io/badge/style-component-green.svg?label=alfresco' alt='alfresco component' /> - </a> - <a href='https://angular.io/'> - <img src='https://img.shields.io/badge/style-2-red.svg?label=angular' alt='angular 2' /> - </a> - <a href='https://www.typescriptlang.org/docs/tutorial.html'> - <img src='https://img.shields.io/badge/style-lang-blue.svg?label=typescript' alt='typescript' /> - </a> - <a href='https://www.alfresco.com/'> - <img src='https://img.shields.io/badge/style-%3E5.0.0-blue.svg?label=node%20version' alt='node version' /> - </a> -</p> - Displays lists of process instances both active and completed, using any defined process filter, and render details of any chosen instance. @@ -100,6 +68,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-activiti-tasklist/demo/package.json b/ng2-components/ng2-activiti-tasklist/demo/package.json index f7a2e764d0..5b6f86c590 100644 --- a/ng2-components/ng2-activiti-tasklist/demo/package.json +++ b/ng2-components/ng2-activiti-tasklist/demo/package.json @@ -26,6 +26,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-activiti-tasklist/karma-test-shim.js b/ng2-components/ng2-activiti-tasklist/karma-test-shim.js index 3fe29f7e8e..a66c8eb6a9 100644 --- a/ng2-components/ng2-activiti-tasklist/karma-test-shim.js +++ b/ng2-components/ng2-activiti-tasklist/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index 2133f10eeb..b72059a693 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -58,6 +58,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-alfresco-core/README.md b/ng2-components/ng2-alfresco-core/README.md index 1e4098830f..e4b893d2d1 100644 --- a/ng2-components/ng2-alfresco-core/README.md +++ b/ng2-components/ng2-alfresco-core/README.md @@ -57,6 +57,7 @@ npm install --save ng2-alfresco-core ### Services - **LogService**, log service implementation +- **NotificationService**, Notification service implementation - **AlfrescoApiService**, provides access to Alfresco JS API instance - **AlfrescoAuthenticationService**, main authentication APIs - **AlfrescoTranslationService**, various i18n-related APIs @@ -95,6 +96,43 @@ let apiService: any = this.authService.getAlfrescoApi(); apiService.nodes.addNode('-root-', body, {}); ``` +#### Notification Service + +The Notification Service is implemented on top of the Angular 2 Material Design snackbar. +Use this service to show a notification message, and optionaly get feedback from it. + +```ts +import { NotificationService } from 'ng2-alfresco-core'; + +export class MyComponent implements OnInit { + + constructor(private notificationService: NotificationService) { + } + + ngOnInit() { + this.notificationService.openSnackMessage('test', 200000).afterDismissed().subscribe(() => { + console.log('The snack-bar was dismissed'); + }); + } +} +``` + +```ts +import { NotificationService } from 'ng2-alfresco-core'; + +export class MyComponent implements OnInit { + + constructor(private notificationService: NotificationService) { + } + + ngOnInit() { + this.notificationService.openSnackMessageAction('Do you want to report this issue?', 'send', 200000).afterDismissed().subscribe(() => { + console.log('The snack-bar was dismissed'); + }); + } +} +``` + #### Context Menu directive _See **Demo Shell** or **DocumentList** implementation for more details and use cases._ diff --git a/ng2-components/ng2-alfresco-core/index.ts b/ng2-components/ng2-alfresco-core/index.ts index 390f67ab68..444b971424 100644 --- a/ng2-components/ng2-alfresco-core/index.ts +++ b/ng2-components/ng2-alfresco-core/index.ts @@ -20,6 +20,7 @@ import { HttpModule, Http } from '@angular/http'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule, TranslateLoader } from 'ng2-translate/ng2-translate'; +import { MaterialModule } from '@angular/material'; import { AlfrescoAuthenticationService, @@ -33,7 +34,9 @@ import { AuthGuard, AuthGuardEcm, AuthGuardBpm, - LogService, LogServiceMock + LogService, + LogServiceMock, + NotificationService } from './src/services/index'; import { MATERIAL_DESIGN_DIRECTIVES } from './src/components/material/index'; @@ -44,7 +47,9 @@ export * from './src/components/index'; export * from './src/utils/index'; export const ALFRESCO_CORE_PROVIDERS: any[] = [ - LogService, LogServiceMock, + NotificationService, + LogService, + LogServiceMock, AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoSettingsService, @@ -69,6 +74,7 @@ export function createTranslateLoader(http: Http, logService: LogService) { FormsModule, ReactiveFormsModule, HttpModule, + MaterialModule.forRoot(), TranslateModule.forRoot({ provide: TranslateLoader, useFactory: (createTranslateLoader), @@ -85,6 +91,7 @@ export function createTranslateLoader(http: Http, logService: LogService) { exports: [ CommonModule, FormsModule, + MaterialModule, ReactiveFormsModule, HttpModule, TranslateModule, diff --git a/ng2-components/ng2-alfresco-core/karma-test-shim.js b/ng2-components/ng2-alfresco-core/karma-test-shim.js index 9560f22e39..c6de4c47e5 100644 --- a/ng2-components/ng2-alfresco-core/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-core/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 29958c0bdd..32e87074a3 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -62,6 +62,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "alfresco-js-api": "^1.0.0", diff --git a/ng2-components/ng2-alfresco-core/src/services/index.ts b/ng2-components/ng2-alfresco-core/src/services/index.ts index bb984b7d80..56390bea87 100644 --- a/ng2-components/ng2-alfresco-core/src/services/index.ts +++ b/ng2-components/ng2-alfresco-core/src/services/index.ts @@ -23,7 +23,7 @@ export * from './renditions.service'; export * from './auth-guard.service'; export * from './auth-guard-ecm.service'; export * from './auth-guard-bpm.service'; - +export * from './notification.service'; export * from './log.service'; export * from './alfresco-authentication.service'; export * from './alfresco-translation.service'; diff --git a/ng2-components/ng2-alfresco-core/src/services/notification.service.ts b/ng2-components/ng2-alfresco-core/src/services/notification.service.ts new file mode 100644 index 0000000000..78e2bb5c40 --- /dev/null +++ b/ng2-components/ng2-alfresco-core/src/services/notification.service.ts @@ -0,0 +1,40 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Injectable } from '@angular/core'; +import { MdSnackBar, MdSnackBarRef } from '@angular/material'; + +@Injectable() +export class NotificationService { + + static DEFAULT_DURATION_MESSAGE: number = 5000; + + constructor(public snackbar: MdSnackBar) { + } + + public openSnackMessage(message: string, millisecondsDuration?: number): MdSnackBarRef<any> { + return this.snackbar.open(message, null, { + duration: millisecondsDuration || NotificationService.DEFAULT_DURATION_MESSAGE + }); + } + + public openSnackMessageAction(message: string, action: string, millisecondsDuration?: number): MdSnackBarRef<any> { + return this.snackbar.open(message, action, { + duration: millisecondsDuration || NotificationService.DEFAULT_DURATION_MESSAGE + }); + } +} diff --git a/ng2-components/ng2-alfresco-datatable/README.md b/ng2-components/ng2-alfresco-datatable/README.md index a988c43703..137445e01e 100644 --- a/ng2-components/ng2-alfresco-datatable/README.md +++ b/ng2-components/ng2-alfresco-datatable/README.md @@ -60,6 +60,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-alfresco-datatable/demo/package.json b/ng2-components/ng2-alfresco-datatable/demo/package.json index 46bb5d35a9..83f187f35c 100644 --- a/ng2-components/ng2-alfresco-datatable/demo/package.json +++ b/ng2-components/ng2-alfresco-datatable/demo/package.json @@ -32,6 +32,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-alfresco-datatable/karma-test-shim.js b/ng2-components/ng2-alfresco-datatable/karma-test-shim.js index 146cc85001..b922a90bce 100644 --- a/ng2-components/ng2-alfresco-datatable/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-datatable/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index 6bc1d2a0ab..5541ede94a 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -54,6 +54,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index c4167bb1b2..2e27715d9e 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -58,6 +58,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json index 17925edf9d..87b3dcee53 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/package.json +++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json @@ -26,6 +26,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js index 49ec0cf63a..dcfa63a5ae 100644 --- a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 042ebc90d3..25d24fcf22 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -62,6 +62,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-alfresco-login/README.md b/ng2-components/ng2-alfresco-login/README.md index 5943ec791b..f1787f3979 100644 --- a/ng2-components/ng2-alfresco-login/README.md +++ b/ng2-components/ng2-alfresco-login/README.md @@ -58,6 +58,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json index 5183270c57..d24a59ee35 100644 --- a/ng2-components/ng2-alfresco-login/demo/package.json +++ b/ng2-components/ng2-alfresco-login/demo/package.json @@ -54,6 +54,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-alfresco-login/karma-test-shim.js b/ng2-components/ng2-alfresco-login/karma-test-shim.js index 146cc85001..b922a90bce 100644 --- a/ng2-components/ng2-alfresco-login/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-login/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 39c14ae50f..93b80120ca 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -65,6 +65,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.0.0", "alfresco-js-api": "^1.0.0", "ng2-alfresco-core": "1.0.0", diff --git a/ng2-components/ng2-alfresco-search/README.md b/ng2-components/ng2-alfresco-search/README.md index c19bc899eb..b35fec0c29 100644 --- a/ng2-components/ng2-alfresco-search/README.md +++ b/ng2-components/ng2-alfresco-search/README.md @@ -58,6 +58,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json index 53777a69db..8ceb942c6a 100644 --- a/ng2-components/ng2-alfresco-search/demo/package.json +++ b/ng2-components/ng2-alfresco-search/demo/package.json @@ -54,6 +54,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-alfresco-search/karma-test-shim.js b/ng2-components/ng2-alfresco-search/karma-test-shim.js index 146cc85001..b922a90bce 100644 --- a/ng2-components/ng2-alfresco-search/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-search/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 6b5fabd693..30bdac0c8b 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -62,6 +62,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-alfresco-tag/README.md b/ng2-components/ng2-alfresco-tag/README.md index 2e989d0983..f46fb22670 100644 --- a/ng2-components/ng2-alfresco-tag/README.md +++ b/ng2-components/ng2-alfresco-tag/README.md @@ -58,6 +58,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-alfresco-tag/demo/package.json b/ng2-components/ng2-alfresco-tag/demo/package.json index 6eb6e76e31..493c0d8115 100644 --- a/ng2-components/ng2-alfresco-tag/demo/package.json +++ b/ng2-components/ng2-alfresco-tag/demo/package.json @@ -26,6 +26,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-alfresco-tag/karma-test-shim.js b/ng2-components/ng2-alfresco-tag/karma-test-shim.js index 146cc85001..b922a90bce 100644 --- a/ng2-components/ng2-alfresco-tag/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-tag/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index 541cfc6058..6fc08287c6 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -41,6 +41,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-alfresco-upload/README.md b/ng2-components/ng2-alfresco-upload/README.md index a5f3ea9cef..1e288e215b 100644 --- a/ng2-components/ng2-alfresco-upload/README.md +++ b/ng2-components/ng2-alfresco-upload/README.md @@ -58,6 +58,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-alfresco-upload/demo/index.html b/ng2-components/ng2-alfresco-upload/demo/index.html index d788c42269..0809dc80d6 100644 --- a/ng2-components/ng2-alfresco-upload/demo/index.html +++ b/ng2-components/ng2-alfresco-upload/demo/index.html @@ -31,6 +31,9 @@ <script src="node_modules/reflect-metadata/Reflect.js"></script> <script src="node_modules/systemjs/dist/system.src.js"></script> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <script src="systemjs.config.js"></script> <script> System.import('app').catch(function(err){ console.error(err); }); diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json index d1138629f9..5e674eac69 100644 --- a/ng2-components/ng2-alfresco-upload/demo/package.json +++ b/ng2-components/ng2-alfresco-upload/demo/package.json @@ -54,6 +54,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js b/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js index cf2504d7b3..a383112368 100644 --- a/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js +++ b/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js @@ -21,6 +21,8 @@ '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // other libraries 'rxjs': 'npm:rxjs', 'ng2-translate': 'npm:ng2-translate', diff --git a/ng2-components/ng2-alfresco-upload/karma-test-shim.js b/ng2-components/ng2-alfresco-upload/karma-test-shim.js index 146cc85001..b922a90bce 100644 --- a/ng2-components/ng2-alfresco-upload/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-upload/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 9c185b4ea6..2aced2d6e3 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -63,6 +63,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html index 45a3cde5c9..eb22f1ab52 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html @@ -35,10 +35,3 @@ multiple #uploadFolders> </div> </form> - -<!--Notification bar--> -<div id="undo-notification-bar" class="mdl-js-snackbar mdl-snackbar" - #undoNotificationBar> - <div class="mdl-snackbar__text"></div> - <button data-automation-id="undo_upload_button" class="mdl-snackbar__action" type="button">{{'FILE_UPLOAD.ACTION.UNDO' | translate}}</button> -</div> diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts index bdd037fb9f..c5a7e86fea 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts @@ -18,7 +18,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { UploadButtonComponent } from './upload-button.component'; import { DebugElement } from '@angular/core'; -import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { CoreModule, AlfrescoTranslationService, NotificationService } from 'ng2-alfresco-core'; import { TranslationMock } from '../assets/translation.service.mock'; import { UploadService } from '../services/upload.service'; @@ -73,7 +73,8 @@ describe('UploadButtonComponent', () => { ], providers: [ UploadService, - { provide: AlfrescoTranslationService, useClass: TranslationMock } + NotificationService, + {provide: AlfrescoTranslationService, useClass: TranslationMock} ] }).compileComponents(); })); diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts index ab1a491470..b052a047d3 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from '@angular/core'; +import { Component, ElementRef, Input, Output, EventEmitter } from '@angular/core'; import 'rxjs/Rx'; -import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, LogService, NotificationService } from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; import { FileModel } from '../models/file.model'; @@ -55,9 +55,6 @@ export class UploadButtonComponent { private static DEFAULT_ROOT_ID: string = '-root-'; - @ViewChild('undoNotificationBar') - undoNotificationBar: any; - @Input() showUdoNotificationBar: boolean = true; @@ -91,7 +88,8 @@ export class UploadButtonComponent { constructor(private el: ElementRef, private uploadService: UploadService, private translateService: AlfrescoTranslationService, - private logService: LogService) { + private logService: LogService, + private notificationService: NotificationService) { if (translateService) { translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); } @@ -217,26 +215,15 @@ export class UploadButtonComponent { * @param {FileModel[]} latestFilesAdded - files in the upload queue enriched with status flag and xhr object. */ private _showUndoNotificationBar(latestFilesAdded: FileModel[]) { - if (componentHandler) { - componentHandler.upgradeAllRegistered(); - } - let messageTranslate: any, actionTranslate: any; messageTranslate = this.translateService.get('FILE_UPLOAD.MESSAGES.PROGRESS'); actionTranslate = this.translateService.get('FILE_UPLOAD.ACTION.UNDO'); - if (this.undoNotificationBar.nativeElement.MaterialSnackbar) { - this.undoNotificationBar.nativeElement.MaterialSnackbar.showSnackbar({ - message: messageTranslate.value, - timeout: 3000, - actionHandler: function () { - latestFilesAdded.forEach((uploadingFileModel: FileModel) => { - uploadingFileModel.emitAbort(); - }); - }, - actionText: actionTranslate.value + this.notificationService.openSnackMessageAction(messageTranslate.value, actionTranslate.value, 3000).afterDismissed().subscribe(() => { + latestFilesAdded.forEach((uploadingFileModel: FileModel) => { + uploadingFileModel.emitAbort(); }); - } + }); } /** @@ -258,16 +245,7 @@ export class UploadButtonComponent { * @private */ private _showErrorNotificationBar(errorMessage: string) { - if (componentHandler) { - componentHandler.upgradeAllRegistered(); - } - - if (this.undoNotificationBar.nativeElement.MaterialSnackbar) { - this.undoNotificationBar.nativeElement.MaterialSnackbar.showSnackbar({ - message: errorMessage, - timeout: 3000 - }); - } + this.notificationService.openSnackMessage(errorMessage, 3000); } /** diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.html b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.html index 2ccae1203f..8140a1fec3 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.html +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.html @@ -5,10 +5,3 @@ dropzone="" webkitdropzone="*" #droparea> <ng-content></ng-content> </div> - -<!--Notification bar--> -<div id="undo-notification-bar" class="mdl-js-snackbar mdl-snackbar" - #undoNotificationBar> - <div class="mdl-snackbar__text"></div> - <button data-automation-id="undo_upload_button" class="mdl-snackbar__action" type="button">{{'FILE_UPLOAD.ACTION.UNDO' | translate}}</button> -</div> \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts index 6a513d19ed..19030eccf0 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { EventEmitter, DebugElement } from '@angular/core'; -import { AlfrescoTranslationService, CoreModule, LogService, LogServiceMock } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService, CoreModule, LogService, LogServiceMock, NotificationService } from 'ng2-alfresco-core'; import { UploadDragAreaComponent } from './upload-drag-area.component'; import { TranslationMock } from '../assets/translation.service.mock'; @@ -42,6 +42,7 @@ describe('UploadDragAreaComponent', () => { ], providers: [ UploadService, + NotificationService, { provide: AlfrescoTranslationService, useClass: TranslationMock }, { provide: LogService, useClass: LogServiceMock } ] diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts index 799f851247..a530a0cfe7 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { Component, ViewChild, Input, Output, EventEmitter } from '@angular/core'; -import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; +import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { AlfrescoTranslationService, LogService, NotificationService } from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; import { FileModel } from '../models/file.model'; @@ -43,9 +43,6 @@ export class UploadDragAreaComponent { private static DEFAULT_ROOT_ID: string = '-root-'; - @ViewChild('undoNotificationBar') - undoNotificationBar: any; - @Input() showUdoNotificationBar: boolean = true; @@ -63,7 +60,8 @@ export class UploadDragAreaComponent { constructor(private uploadService: UploadService, private translateService: AlfrescoTranslationService, - private logService: LogService) { + private logService: LogService, + private notificationService: NotificationService) { if (translateService) { translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src'); } @@ -117,7 +115,7 @@ export class UploadDragAreaComponent { * @param item - FileEntity */ onFilesEntityDropped(item: any): void { - item.file( (file: any) => { + item.file((file: any) => { this.uploadService.addToQueue([file]); let path = item.fullPath.replace(item.name, ''); let filePath = this.currentFolderPath + path; @@ -186,23 +184,14 @@ export class UploadDragAreaComponent { * @param {FileModel[]} latestFilesAdded - files in the upload queue enriched with status flag and xhr object. */ showUndoNotificationBar(latestFilesAdded: FileModel[]) { - if (componentHandler) { - componentHandler.upgradeAllRegistered(); - } - let messageTranslate: any, actionTranslate: any; messageTranslate = this.translateService.get('FILE_UPLOAD.MESSAGES.PROGRESS'); actionTranslate = this.translateService.get('FILE_UPLOAD.ACTION.UNDO'); - this.undoNotificationBar.nativeElement.MaterialSnackbar.showSnackbar({ - message: messageTranslate.value, - timeout: 3000, - actionHandler: function () { - latestFilesAdded.forEach((uploadingFileModel: FileModel) => { - uploadingFileModel.emitAbort(); - }); - }, - actionText: actionTranslate.value + this.notificationService.openSnackMessageAction(messageTranslate.value, actionTranslate.value, 3000).afterDismissed().subscribe(() => { + latestFilesAdded.forEach((uploadingFileModel: FileModel) => { + uploadingFileModel.emitAbort(); + }); }); } @@ -212,14 +201,7 @@ export class UploadDragAreaComponent { * @private */ showErrorNotificationBar(errorMessage: string) { - if (componentHandler) { - componentHandler.upgradeAllRegistered(); - } - - this.undoNotificationBar.nativeElement.MaterialSnackbar.showSnackbar({ - message: errorMessage, - timeout: 3000 - }); + this.notificationService.openSnackMessage(errorMessage, 3000); } /** diff --git a/ng2-components/ng2-alfresco-userinfo/README.md b/ng2-components/ng2-alfresco-userinfo/README.md index 373bbd8ab7..7ee340242a 100644 --- a/ng2-components/ng2-alfresco-userinfo/README.md +++ b/ng2-components/ng2-alfresco-userinfo/README.md @@ -58,6 +58,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-alfresco-userinfo/demo/package.json b/ng2-components/ng2-alfresco-userinfo/demo/package.json index a27a8c1b86..2df2b9d199 100644 --- a/ng2-components/ng2-alfresco-userinfo/demo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/demo/package.json @@ -26,6 +26,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js b/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js index 146cc85001..b922a90bce 100644 --- a/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json index ba1818b01b..8d1b259bfc 100644 --- a/ng2-components/ng2-alfresco-userinfo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/package.json @@ -41,6 +41,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-alfresco-viewer/README.md b/ng2-components/ng2-alfresco-viewer/README.md index f13e79a148..3151588b35 100644 --- a/ng2-components/ng2-alfresco-viewer/README.md +++ b/ng2-components/ng2-alfresco-viewer/README.md @@ -60,6 +60,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json index e1bbf9e8d5..e958fc2b43 100644 --- a/ng2-components/ng2-alfresco-viewer/demo/package.json +++ b/ng2-components/ng2-alfresco-viewer/demo/package.json @@ -26,6 +26,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-alfresco-viewer/karma-test-shim.js b/ng2-components/ng2-alfresco-viewer/karma-test-shim.js index 146cc85001..b922a90bce 100644 --- a/ng2-components/ng2-alfresco-viewer/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-viewer/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index dcdcc3a085..f7f6c69d60 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -56,6 +56,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", diff --git a/ng2-components/ng2-alfresco-webscript/README.md b/ng2-components/ng2-alfresco-webscript/README.md index 4f86f12016..b348028004 100644 --- a/ng2-components/ng2-alfresco-webscript/README.md +++ b/ng2-components/ng2-alfresco-webscript/README.md @@ -58,6 +58,9 @@ Follow the 3 steps below: <script src="node_modules/material-design-lite/material.min.js"></script> <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css"> + <!-- Load the Angular Material 2 stylesheet --> + <link href="node_modules/@angular/material/core/theming/prebuilt/deeppurple-amber.css" rel="stylesheet"> + <!-- Polyfill(s) for Safari (pre-10.x) --> <script src="node_modules/intl/dist/Intl.min.js"></script> <script src="node_modules/intl/locale-data/jsonp/en.js"></script> diff --git a/ng2-components/ng2-alfresco-webscript/demo/package.json b/ng2-components/ng2-alfresco-webscript/demo/package.json index 5c65503cdf..9ed0b6724a 100644 --- a/ng2-components/ng2-alfresco-webscript/demo/package.json +++ b/ng2-components/ng2-alfresco-webscript/demo/package.json @@ -26,6 +26,7 @@ "@angular/http": "2.2.2", "@angular/platform-browser": "2.2.2", "@angular/platform-browser-dynamic": "2.2.2", + "@angular/material": "2.0.0-beta.1", "@angular/router": "3.2.2", "@angular/upgrade": "2.2.2", "core-js": "^2.4.1", diff --git a/ng2-components/ng2-alfresco-webscript/karma-test-shim.js b/ng2-components/ng2-alfresco-webscript/karma-test-shim.js index 49ec0cf63a..dcfa63a5ae 100644 --- a/ng2-components/ng2-alfresco-webscript/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-webscript/karma-test-shim.js @@ -39,6 +39,8 @@ var map = { '@angular/http': 'npm:@angular/http/bundles/http.umd.js', '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', + '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + // testing '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index 3c99269101..8c7110f97c 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -41,6 +41,7 @@ "@angular/http": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@angular/material": "2.0.0-beta.1", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", From dd753ba8900eaf97c6f7ad412027aaea09c2a1bb Mon Sep 17 00:00:00 2001 From: Vito <vito.albano@alfresco.com> Date: Tue, 24 Jan 2017 10:48:47 -0800 Subject: [PATCH 093/108] #1495 - Added no process definition message on start process (#1532) --- .../activiti-start-process.component.html | 9 ++++++++- .../activiti-start-process.component.spec.ts | 13 +++++++++++++ .../ng2-activiti-processlist/src/i18n/en.json | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html index 4cca3b761e..2e0bb7ab10 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html @@ -1,4 +1,4 @@ -<div class="mdl-card mdl-shadow--2dp"> +<div *ngIf="processDefinitions.length > 0 || errorMessageId" class="mdl-card mdl-shadow--2dp"> <div class="mdl-card__supporting-text"> <div class="mdl-card mdl-shadow--2dp error-message" *ngIf="errorMessageId"> <div class="mdl-card__supporting-text">{{errorMessageId|translate}}</div> @@ -25,3 +25,10 @@ <button type="button" [disabled]="!validateForm()" (click)="startProcess()" class="mdl-button" data-automation-id="btn-start">{{'START_PROCESS.DIALOG.ACTION.START'|translate}}</button> </div> </div> +<div *ngIf="processDefinitions.length === 0 && !errorMessageId" class="mdl-card mdl-shadow--2dp"> + <div class="mdl-card__supporting-text"> + <div class="mdl-textfield mdl-js-textfield alf-mdl-selectfield"> + <span id="no-process-message">{{'START_PROCESS.NO_PROCESS_DEFINITIONS' | translate}}</span> + </div> + </div> +</div> diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts index e5a41662c3..c9a8558bc5 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts @@ -127,6 +127,19 @@ describe('ActivitiStartProcessInstance', () => { }); })); + it('should show no process available message when no process definition is loaded', async(() => { + getDefinitionsSpy = getDefinitionsSpy.and.returnValue(Observable.of([])); + let change = new SimpleChange(null, '123'); + component.ngOnChanges({ 'appId': change }); + fixture.detectChanges(); + + fixture.whenStable().then(() => { + let noprocessElement: DebugElement = debugElement.query(By.css('#no-process-message')); + expect(noprocessElement).not.toBeNull('Expected no available process message to be present'); + expect(noprocessElement.nativeElement.innerText.trim()).toBe('START_PROCESS.NO_PROCESS_DEFINITIONS'); + }); + })); + }); describe('input changes', () => { diff --git a/ng2-components/ng2-activiti-processlist/src/i18n/en.json b/ng2-components/ng2-activiti-processlist/src/i18n/en.json index dad6152f8e..efab383901 100644 --- a/ng2-components/ng2-activiti-processlist/src/i18n/en.json +++ b/ng2-components/ng2-activiti-processlist/src/i18n/en.json @@ -83,6 +83,7 @@ }, "START_PROCESS": { "BUTTON": "Start Process", + "NO_PROCESS_DEFINITIONS": "You cannot start a process as there are no process definitions available", "DIALOG": { "TITLE": "Start Process", "LABEL": { From bd485c730fd951727e277473ea6b6fbc69b81eb0 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Wed, 25 Jan 2017 10:44:41 +0000 Subject: [PATCH 094/108] basic form events hooks and readme updates (#1528) * basic form events hooks FormService now exposes the following events: - formLoaded (formRendered alternative) - formFieldValueChanged - taskCompleted - taskCompletedError - taskSaved - taskSavedError * readme updates --- .../activiti/activiti-demo.component.ts | 13 ++- ng2-components/ng2-activiti-form/README.md | 93 ++++++++++++++++++- ng2-components/ng2-activiti-form/index.ts | 1 + .../src/components/activiti-form.component.ts | 63 ++++++++----- .../src/components/widgets/core/form.model.ts | 7 +- .../src/events/form-error.event.ts | 30 ++++++ .../src/events/form-field.event.ts | 30 ++++++ .../src/events/form.event.ts | 27 ++++++ .../ng2-activiti-form/src/events/index.ts | 20 ++++ .../src/services/form.service.ts | 17 +++- 10 files changed, 263 insertions(+), 38 deletions(-) create mode 100644 ng2-components/ng2-activiti-form/src/events/form-error.event.ts create mode 100644 ng2-components/ng2-activiti-form/src/events/form-field.event.ts create mode 100644 ng2-components/ng2-activiti-form/src/events/form.event.ts create mode 100644 ng2-components/ng2-activiti-form/src/events/index.ts diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index 8b05745aca..0fee1a1127 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -40,7 +40,7 @@ import { DataSorting } from 'ng2-alfresco-datatable'; import { AlfrescoApiService } from 'ng2-alfresco-core'; -import { FormRenderingService } from 'ng2-activiti-form'; +import { FormService, FormRenderingService, FormEvent, FormFieldEvent } from 'ng2-activiti-form'; import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custom-editor.component'; declare var componentHandler; @@ -99,7 +99,8 @@ export class ActivitiDemoComponent implements AfterViewInit { constructor(private elementRef: ElementRef, private route: ActivatedRoute, private apiService: AlfrescoApiService, - private formRenderingService: FormRenderingService) { + private formRenderingService: FormRenderingService, + private formService: FormService) { this.dataTasks = new ObjectDataTableAdapter( [], [ @@ -123,6 +124,14 @@ export class ActivitiDemoComponent implements AfterViewInit { // Uncomment this line to map 'custom_stencil_01' to local editor component formRenderingService.setComponentTypeResolver('custom_stencil_01', () => CustomStencil01, true); + + formService.formLoaded.subscribe((e: FormEvent) => { + console.log(`Form loaded: ${e.form.id}`); + }); + + formService.formFieldValueChanged.subscribe((e: FormFieldEvent) => { + console.log(`Field value changed. Form: ${e.form.id}, Field: ${e.field.id}, Value: ${e.field.value}`); + }); } ngOnInit() { diff --git a/ng2-components/ng2-activiti-form/README.md b/ng2-components/ng2-activiti-form/README.md index 894a5d102d..4e246cde16 100644 --- a/ng2-components/ng2-activiti-form/README.md +++ b/ng2-components/ng2-activiti-form/README.md @@ -31,6 +31,22 @@ </a> </p> +## Library Contents + +### Components + +- [ActivitiForm](#activitiform-component) +- ActivitiStartForm + +### Services + +- [FormService](#formservice) +- ActivitiAlfrescoContentService +- EcmModelService +- FormRenderingService +- NodeService +- WidgetVisibilityService + ## Prerequisites Before you start using this development framework, make sure you have installed all required software and done all the @@ -101,7 +117,9 @@ Follow the 3 steps below: Please refer to the following example file: [systemjs.config.js](demo/systemjs .config.js) . -## Basic usage examples +## ActivitiForm Component + +### Basic usage The component shows a Form from Activiti @@ -112,6 +130,7 @@ The component shows a Form from Activiti Usage example of this component : **main.ts** + ```ts import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; @@ -223,9 +242,9 @@ and store the form field as metadata. The param nameNode is optional. </activiti-form> ``` -## Configuration +### Configuration -### Properties +#### Properties The recommended set of properties can be found in the following table: @@ -246,7 +265,7 @@ The recommended set of properties can be found in the following table: | `path` | string | | Path of the folder where to store the metadata. | | `nameNode` (optional) | string | true | Name to assign to the new node where the metadata are stored. | -#### Advanced properties +##### Advanced properties The following properties are for complex customisation purposes: @@ -255,7 +274,7 @@ The recommended set of properties can be found in the following table: | `form` | FormModel | | Underlying form model instance. | | `debugMode` | boolean | false | Toggle debug mode, allows displaying additional data for development and debugging purposes. | -### Events +#### Events | Name | Description | | --- | --- | @@ -332,6 +351,70 @@ There are two additional functions that can be of a great value when controlling **Please note that if `event.preventDefault()` is not called then default outcome behaviour will also be executed after your custom code.** +## FormService + +```ts +import { Component } from '@angular/core'; +import { FormService, FormEvent, FormFieldEvent } from 'ng2-activiti-form'; + +@Component(...) +class MyComponent { + + constructor(private formService: FormService) { + + formService.formLoaded.subscribe((e: FormEvent) => { + console.log(`Form loaded: ${e.form.id}`); + }); + + formService.formFieldValueChanged.subscribe((e: FormFieldEvent) => { + console.log(`Field value changed. Form: ${e.form.id}, Field: ${e.field.id}, Value: ${e.field.value}`); + }); + + } + +} +``` + +### Events + +| Name | Args Type | Description | +| --- | --- | --- | +| formLoaded | FormEvent | Raised when form has been loaded or reloaded | +| formFieldValueChanged | FormFieldEvent | Raised when input values change | +| taskCompleted | FormEvent | Raised when a task is completed successfully | +| taskCompletedError | FormErrorEvent | Raised when a task is completed unsuccessfully | +| taskSaved | FormEvent | Raised when a task is saved successfully | +| taskSavedError | FormErrorEvent | Raised when a task is saved unsuccessfully | + +### Methods + +| Name | Params | Returns | Description | +| --- | --- | --- | --- | +| createFormFromANode | (formName: string) | Observable<any\> | Create a Form with a fields for each metadata properties | +| createForm | (formName: string) | Observable<any\> | Create a Form | +| addFieldsToAForm | (formId: string, formModel: FormDefinitionModel) | Observable<any\> | Add Fileds to A form | +| searchFrom | (name: string) | Observable<any\> | Search For A Form by name | +| getForms | n/a | Observable<any\> | Get All the forms | +| getProcessDefinitions | n/a | Observable<any\> | Get Process Definitions | +| getTasks | n/a | Observable<any\> | Get All the Tasks | +| getTask | (taskId: string) | Observable<any\> | Get Task | +| saveTaskForm | (taskId: string, formValues: FormValues) | Observable<any\> | Save Task Form | +| completeTaskForm | (taskId: string, formValues: FormValues, outcome?: string) | Observable<any\> | Complete Task Form | +| getTaskForm | (taskId: string) | Observable<any\> | Get Form related to a taskId | +| getFormDefinitionById | (formId: string) | Observable<any\> | Get Form Definition | +| getFormDefinitionByName | (name: string) | Observable<any\> | Returns form definition by a given name. | +| getStartFormInstance | (processId: string) | Observable<any\> | Get start form instance for a given processId | +| getStartFormDefinition | (processId: string) | Observable<any\> | Get start form definition for a given process | +| createTemporaryRawRelatedContent | (file: any) | Observable<any\> | Save File | +| getRestFieldValues | (taskId: string, field: string) | Observable<any\> | | +| getRestFieldValuesByProcessId | (processDefinitionId: string, field: string) | Observable<any\> | | +| getRestFieldValuesColumnByProcessId | (processDefinitionId: string, field: string, column?: string) | Observable<any\> | | +| getRestFieldValuesColumn | (taskId: string, field: string, column?: string) | Observable<any\> | | +| getWorkflowGroups\* | (filter: string, groupId?: string) | Observable<GroupModel[]\> | | +| getWorkflowUsers\* | (filter: string, groupId?: string) | Observable<GroupUserModel[]\> | | + +\* _Uses private Activiti WebApp api_ + ## See also - [Form Stencils with Angular 2](docs/stencils.md) diff --git a/ng2-components/ng2-activiti-form/index.ts b/ng2-components/ng2-activiti-form/index.ts index 98e9d2970c..110d843dfc 100644 --- a/ng2-components/ng2-activiti-form/index.ts +++ b/ng2-components/ng2-activiti-form/index.ts @@ -37,6 +37,7 @@ export * from './src/components/widgets/index'; export * from './src/services/ecm-model.service'; export * from './src/services/node.service'; export * from './src/services/form-rendering.service'; +export * from './src/events/index'; export const ACTIVITI_FORM_DIRECTIVES: any[] = [ ActivitiForm, diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts index 396f30b5d0..45a3837244 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts @@ -15,21 +15,13 @@ * limitations under the License. */ -import { - Component, - OnInit, - AfterViewChecked, - OnChanges, - SimpleChanges, - Input, - Output, - EventEmitter -} from '@angular/core'; +import { Component, OnInit, AfterViewChecked, OnChanges, SimpleChanges, Input, Output, EventEmitter } from '@angular/core'; import { LogService } from 'ng2-alfresco-core'; import { EcmModelService } from './../services/ecm-model.service'; import { FormService } from './../services/form.service'; import { NodeService } from './../services/node.service'; import { FormModel, FormOutcomeModel, FormValues, FormFieldModel, FormOutcomeEvent } from './widgets/core/index'; +import { FormEvent, FormErrorEvent } from './../events/index'; import { WidgetVisibilityService } from './../services/widget-visibility.service'; @@ -272,14 +264,14 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { } if (outcome.id === ActivitiForm.CUSTOM_OUTCOME_ID) { - this.formSaved.emit(this.form); + this.onTaskSaved(this.form); this.storeFormAsMetadata(); return true; } } else { // Note: Activiti is using NAME field rather than ID for outcomes if (outcome.name) { - this.formSaved.emit(this.form); + this.onTaskSaved(this.form); this.completeTaskForm(outcome.name); return true; } @@ -345,8 +337,8 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { .getTaskForm(taskId) .subscribe( form => { - this.form = new FormModel(form, data, this.readOnly); - this.formLoaded.emit(this.form); + this.form = new FormModel(form, data, this.readOnly, this.formService); + this.onFormLoaded(this.form); }, (error) => { this.handleError(error); @@ -361,7 +353,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { form => { this.formName = form.name; this.form = this.parseForm(form); - this.formLoaded.emit(this.form); + this.onFormLoaded(this.form); }, (error) => { this.handleError(error); @@ -377,7 +369,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { this.formService.getFormDefinitionById(id).subscribe( form => { this.form = this.parseForm(form); - this.formLoaded.emit(this.form); + this.onFormLoaded(this.form); }, (error) => { this.handleError(error); @@ -396,12 +388,10 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { .saveTaskForm(this.form.taskId, this.form.values) .subscribe( () => { - this.formSaved.emit(this.form); + this.onTaskSaved(this.form); this.storeFormAsMetadata(); }, - (error) => { - this.handleError(error); - } + error => this.onTaskSavedError(this.form, error) ); } } @@ -412,12 +402,10 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { .completeTaskForm(this.form.taskId, this.form.values, outcome) .subscribe( () => { - this.formCompleted.emit(this.form); + this.onTaskCompleted(this.form); this.storeFormAsMetadata(); }, - (error) => { - this.handleError(error); - } + error => this.onTaskCompletedError(this.form, error) ); } } @@ -429,7 +417,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { parseForm(json: any): FormModel { if (json) { - let form = new FormModel(json, this.data, this.readOnly); + let form = new FormModel(json, this.data, this.readOnly, this.formService); if (!json.fields) { form.outcomes = this.getFormDefinitionOutcomes(form); } @@ -496,4 +484,29 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { ); } } + + protected onFormLoaded(form: FormModel) { + this.formLoaded.emit(form); + this.formService.formLoaded.next(new FormEvent(form)); + } + + protected onTaskSaved(form: FormModel) { + this.formSaved.emit(form); + this.formService.taskSaved.next(new FormEvent(form)); + } + + protected onTaskSavedError(form: FormModel, error: any) { + this.handleError(error); + this.formService.taskSavedError.next(new FormErrorEvent(form, error)); + } + + protected onTaskCompleted(form: FormModel) { + this.formCompleted.emit(form); + this.formService.taskCompleted.next(new FormEvent(form)); + } + + protected onTaskCompletedError(form: FormModel, error: any) { + this.handleError(error); + this.formService.taskCompletedError.next(new FormErrorEvent(form, error)); + } } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts index cc31cf1101..8741224b54 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts @@ -23,6 +23,8 @@ import { FormOutcomeModel } from './form-outcome.model'; import { FormFieldModel } from './form-field.model'; import { FormFieldTypes } from './form-field-types'; import { FormFieldTemplates } from './form-field-templates'; +import { FormService } from './../../../services/form.service'; +import { FormFieldEvent } from './../../../events/index'; export class FormModel { @@ -66,7 +68,7 @@ export class FormModel { return this.outcomes && this.outcomes.length > 0; } - constructor(json?: any, data?: FormValues, readOnly: boolean = false) { + constructor(json?: any, data?: FormValues, readOnly: boolean = false, protected formService?: FormService) { this.readOnly = readOnly; if (json) { @@ -120,6 +122,9 @@ export class FormModel { onFormFieldChanged(field: FormFieldModel) { this.validateField(field); + if (this.formService) { + this.formService.formFieldValueChanged.next(new FormFieldEvent(this, field)); + } } // TODO: consider evaluating and caching once the form is loaded diff --git a/ng2-components/ng2-activiti-form/src/events/form-error.event.ts b/ng2-components/ng2-activiti-form/src/events/form-error.event.ts new file mode 100644 index 0000000000..1e4ad50c31 --- /dev/null +++ b/ng2-components/ng2-activiti-form/src/events/form-error.event.ts @@ -0,0 +1,30 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { FormEvent } from './form.event'; +import { FormModel } from './../components/widgets/core/index'; + +export class FormErrorEvent extends FormEvent { + + readonly error: any; + + constructor(form: FormModel, error: any) { + super(form); + this.error = error; + } + +} diff --git a/ng2-components/ng2-activiti-form/src/events/form-field.event.ts b/ng2-components/ng2-activiti-form/src/events/form-field.event.ts new file mode 100644 index 0000000000..1189e33a64 --- /dev/null +++ b/ng2-components/ng2-activiti-form/src/events/form-field.event.ts @@ -0,0 +1,30 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { FormEvent } from './form.event'; +import { FormModel, FormFieldModel } from './../components/widgets/core/index'; + +export class FormFieldEvent extends FormEvent { + + readonly field: FormFieldModel; + + constructor(form: FormModel, field: FormFieldModel) { + super(form); + this.field = field; + } + +} diff --git a/ng2-components/ng2-activiti-form/src/events/form.event.ts b/ng2-components/ng2-activiti-form/src/events/form.event.ts new file mode 100644 index 0000000000..841a12dd66 --- /dev/null +++ b/ng2-components/ng2-activiti-form/src/events/form.event.ts @@ -0,0 +1,27 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { FormModel } from './../components/widgets/core/index'; + +export class FormEvent { + + readonly form: FormModel; + + constructor(form: FormModel) { + this.form = form; + } +} diff --git a/ng2-components/ng2-activiti-form/src/events/index.ts b/ng2-components/ng2-activiti-form/src/events/index.ts new file mode 100644 index 0000000000..39a1671687 --- /dev/null +++ b/ng2-components/ng2-activiti-form/src/events/index.ts @@ -0,0 +1,20 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './form.event'; +export * from './form-error.event'; +export * from './form-field.event'; diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.ts b/ng2-components/ng2-activiti-form/src/services/form.service.ts index 85f77dc42a..0ffc0156d3 100644 --- a/ng2-components/ng2-activiti-form/src/services/form.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/form.service.ts @@ -16,13 +16,14 @@ */ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Rx'; +import { Observable, Subject } from 'rxjs/Rx'; import { AlfrescoApiService, LogService } from 'ng2-alfresco-core'; import { FormValues } from './../components/widgets/core/index'; import { FormDefinitionModel } from '../models/form-definition.model'; import { EcmModelService } from './ecm-model.service'; import { GroupModel } from './../components/widgets/core/group.model'; import { GroupUserModel } from './../components/widgets/core/group-user.model'; +import { FormEvent, FormErrorEvent, FormFieldEvent } from './../events/index'; @Injectable() export class FormService { @@ -30,6 +31,13 @@ export class FormService { static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error'; static GENERIC_ERROR_MESSAGE: string = 'Server error'; + formLoaded: Subject<FormEvent> = new Subject<FormEvent>(); + formFieldValueChanged: Subject<FormFieldEvent> = new Subject<FormFieldEvent>(); + taskCompleted: Subject<FormEvent> = new Subject<FormEvent>(); + taskCompletedError: Subject<FormErrorEvent> = new Subject<FormErrorEvent>(); + taskSaved: Subject<FormEvent> = new Subject<FormEvent>(); + taskSavedError: Subject<FormErrorEvent> = new Subject<FormErrorEvent>(); + constructor(private ecmModelService: EcmModelService, private apiService: AlfrescoApiService, private logService: LogService) { @@ -111,7 +119,7 @@ export class FormService { } /** - * Get Process Definition + * Get Process Definitions * @returns {Observable<any>} */ getProcessDefinitions(): Observable<any> { @@ -122,7 +130,6 @@ export class FormService { /** * Get All the Tasks - * @param taskId Task Id * @returns {Observable<any>} */ getTasks(): Observable<any> { @@ -196,7 +203,7 @@ export class FormService { } /** - * Returns form definition ID by a given name. + * Returns form definition by a given name. * @param name * @returns {Promise<T>|Promise<ErrorObservable>} */ @@ -328,7 +335,7 @@ export class FormService { }); } - getFormId(res: any) { + getFormId(res: any): string { let result = null; if (res && res.data && res.data.length > 0) { From ab73cc66eec3bf39785ef46b5ea4c6b4f694f8bb Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Wed, 25 Jan 2017 10:59:14 +0000 Subject: [PATCH 095/108] fix special chars in readme --- ng2-components/ng2-activiti-form/README.md | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/ng2-components/ng2-activiti-form/README.md b/ng2-components/ng2-activiti-form/README.md index 4e246cde16..0a75888091 100644 --- a/ng2-components/ng2-activiti-form/README.md +++ b/ng2-components/ng2-activiti-form/README.md @@ -390,28 +390,28 @@ class MyComponent { | Name | Params | Returns | Description | | --- | --- | --- | --- | -| createFormFromANode | (formName: string) | Observable<any\> | Create a Form with a fields for each metadata properties | -| createForm | (formName: string) | Observable<any\> | Create a Form | -| addFieldsToAForm | (formId: string, formModel: FormDefinitionModel) | Observable<any\> | Add Fileds to A form | -| searchFrom | (name: string) | Observable<any\> | Search For A Form by name | -| getForms | n/a | Observable<any\> | Get All the forms | -| getProcessDefinitions | n/a | Observable<any\> | Get Process Definitions | -| getTasks | n/a | Observable<any\> | Get All the Tasks | -| getTask | (taskId: string) | Observable<any\> | Get Task | -| saveTaskForm | (taskId: string, formValues: FormValues) | Observable<any\> | Save Task Form | -| completeTaskForm | (taskId: string, formValues: FormValues, outcome?: string) | Observable<any\> | Complete Task Form | -| getTaskForm | (taskId: string) | Observable<any\> | Get Form related to a taskId | -| getFormDefinitionById | (formId: string) | Observable<any\> | Get Form Definition | -| getFormDefinitionByName | (name: string) | Observable<any\> | Returns form definition by a given name. | -| getStartFormInstance | (processId: string) | Observable<any\> | Get start form instance for a given processId | -| getStartFormDefinition | (processId: string) | Observable<any\> | Get start form definition for a given process | -| createTemporaryRawRelatedContent | (file: any) | Observable<any\> | Save File | -| getRestFieldValues | (taskId: string, field: string) | Observable<any\> | | -| getRestFieldValuesByProcessId | (processDefinitionId: string, field: string) | Observable<any\> | | -| getRestFieldValuesColumnByProcessId | (processDefinitionId: string, field: string, column?: string) | Observable<any\> | | -| getRestFieldValuesColumn | (taskId: string, field: string, column?: string) | Observable<any\> | | -| getWorkflowGroups\* | (filter: string, groupId?: string) | Observable<GroupModel[]\> | | -| getWorkflowUsers\* | (filter: string, groupId?: string) | Observable<GroupUserModel[]\> | | +| createFormFromANode | (formName: string) | Observable\<any\> | Create a Form with a fields for each metadata properties | +| createForm | (formName: string) | Observable\<any\> | Create a Form | +| addFieldsToAForm | (formId: string, formModel: FormDefinitionModel) | Observable\<any\> | Add Fileds to A form | +| searchFrom | (name: string) | Observable\<any\> | Search For A Form by name | +| getForms | n/a | Observable\<any\> | Get All the forms | +| getProcessDefinitions | n/a | Observable\<any\> | Get Process Definitions | +| getTasks | n/a | Observable\<any\> | Get All the Tasks | +| getTask | (taskId: string) | Observable\<any\> | Get Task | +| saveTaskForm | (taskId: string, formValues: FormValues) | Observable\<any\> | Save Task Form | +| completeTaskForm | (taskId: string, formValues: FormValues, outcome?: string) | Observable\<any\> | Complete Task Form | +| getTaskForm | (taskId: string) | Observable\<any\> | Get Form related to a taskId | +| getFormDefinitionById | (formId: string) | Observable\<any\> | Get Form Definition | +| getFormDefinitionByName | (name: string) | Observable\<any\> | Returns form definition by a given name. | +| getStartFormInstance | (processId: string) | Observable\<any\> | Get start form instance for a given processId | +| getStartFormDefinition | (processId: string) | Observable\<any\> | Get start form definition for a given process | +| createTemporaryRawRelatedContent | (file: any) | Observable\<any\> | Save File | +| getRestFieldValues | (taskId: string, field: string) | Observable\<any\> | | +| getRestFieldValuesByProcessId | (processDefinitionId: string, field: string) | Observable\<any\> | | +| getRestFieldValuesColumnByProcessId | (processDefinitionId: string, field: string, column?: string) | Observable\<any\> | | +| getRestFieldValuesColumn | (taskId: string, field: string, column?: string) | Observable\<any\> | | +| getWorkflowGroups\* | (filter: string, groupId?: string) | Observable\<GroupModel[]\> | | +| getWorkflowUsers\* | (filter: string, groupId?: string) | Observable\<GroupUserModel[]\> | | \* _Uses private Activiti WebApp api_ From 63a7585922fd3704f42319a5a4f50e2a47548a49 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Thu, 26 Jan 2017 22:04:27 +0000 Subject: [PATCH 096/108] fix 'change detection crash' when using router multiple times (#1550) --- demo-shell-ng2/app/components/files/files.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts index 9d72242168..077260db55 100644 --- a/demo-shell-ng2/app/components/files/files.component.ts +++ b/demo-shell-ng2/app/components/files/files.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, OnInit, Optional, ViewChild } from '@angular/core'; +import { Component, OnInit, Optional, ViewChild, ChangeDetectorRef } from '@angular/core'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { AlfrescoAuthenticationService, LogService } from 'ng2-alfresco-core'; import { DocumentActionsService, DocumentListComponent, ContentActionHandler, DocumentActionModel, FolderActionModel } from 'ng2-alfresco-documentlist'; @@ -46,6 +46,7 @@ export class FilesComponent implements OnInit { private authService: AlfrescoAuthenticationService, private formService: FormService, private logService: LogService, + private changeDetector: ChangeDetectorRef, private router: Router, @Optional() private route: ActivatedRoute) { documentActions.setHandler('my-handler', this.myDocumentActionHandler.bind(this)); @@ -98,6 +99,7 @@ export class FilesComponent implements OnInit { this.route.params.forEach((params: Params) => { if (params['id']) { this.currentFolderId = params['id']; + this.changeDetector.detectChanges(); } }); } From 9e00b1d4f129cab60746cf5845d9f561fded4713 Mon Sep 17 00:00:00 2001 From: Denys Vuika <denis.vuyka@gmail.com> Date: Fri, 27 Jan 2017 09:50:35 +0000 Subject: [PATCH 097/108] documentation updates (#1549) * documentation updates refs #1357 refs #400 * Update README.md --- .../ng2-alfresco-datatable/README.md | 1 + .../ng2-alfresco-documentlist/README.md | 106 ++++++++++++++---- 2 files changed, 85 insertions(+), 22 deletions(-) diff --git a/ng2-components/ng2-alfresco-datatable/README.md b/ng2-components/ng2-alfresco-datatable/README.md index 137445e01e..4ae455c08d 100644 --- a/ng2-components/ng2-alfresco-datatable/README.md +++ b/ng2-components/ng2-alfresco-datatable/README.md @@ -375,6 +375,7 @@ interface DataColumn { title?: string; srTitle?: string; cssClass?: string; + template?: TemplateRef<any>; } ``` diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 2e27715d9e..2df200747f 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -110,8 +110,8 @@ Follow the 3 steps below: Usage example of this component : **main.ts** -```ts +```ts import { NgModule, Component, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; @@ -387,30 +387,45 @@ A custom set of columns can look like the following: ![Custom columns](docs/assets/custom-columns.png) +DocumentList component assigns an instance of `MinimalNode` type (`alfresco-js-api`) as a data context of each row. -Binding to nested properties is also supported. Assuming you have the node structure similar to following: - -```json -{ - "nodeRef": "workspace://SpacesStore/8bb36efb-c26d-4d2b-9199-ab6922f53c28", - "nodeType": "cm:folder", - "type": "folder", - "location": { - "repositoryId": "552ca13e-458b-4566-9f3e-d0f9c92facff", - "site": "swsdp", - "siteTitle": "Sample: Web Site Design Project" - } +```js +export interface MinimalNode { + id: string; + parentId: string; + name: string; + nodeType: string; + isFolder: boolean; + isFile: boolean; + modifiedAt: Date; + modifiedByUser: UserInfo; + createdAt: Date; + createdByUser: UserInfo; + content: ContentInfo; + path: PathInfoEntity; + properties: NodeProperties; } ``` -the binding value for the Site column to display location site will be `location.site`: +_See more details in [alfresco-js-api](https://github.com/Alfresco/alfresco-js-api/blob/master/index.d.ts) repository._ + +Binding to nested properties is also supported. You can define a column key as a property path similar to the following: + +```text +createdByUser.displayName +``` + +Here's a short example: ```html <alfresco-document-list ...> <content-columns> <content-column key="$thumbnail" type="image"></content-column> - <content-column title="Name" key="displayName" class="full-width ellipsis-cell"></content-column> - <content-column title="Site" key="location.site"></content-column> + <content-column title="Name" key="name" class="full-width ellipsis-cell"></content-column> + <content-column + title="Created By" + key="createdByUser.displayName"> + </content-column> </content-columns> </alfresco-document-list> ``` @@ -437,18 +452,65 @@ For a full list of available `format` values please refer to [DatePipe](https:// It is possible providing custom column/cell template that may contain other Angular components or HTML elmements: +Every cell in the DataTable component is bound to the dynamic data context containing the following properties: + +| Name | Type | Description | +| --- | --- | --- | +| data | [DataTableAdapter](https://github.com/Alfresco/alfresco-ng2-components/tree/master/ng2-components/ng2-alfresco-datatable#data-sources) | Data adapter instance. | +| row | [DataRow](https://github.com/Alfresco/alfresco-ng2-components/tree/master/ng2-components/ng2-alfresco-datatable#data-sources) | Current data row instance. | +| col | [DataColumn](https://github.com/Alfresco/alfresco-ng2-components/tree/master/ng2-components/ng2-alfresco-datatable#data-sources) | Current data column instance. | + +You can use all three properties to gain full access to underlying data from within your custom templates. +In order to wire HTML templates with the data context you will need defining a variable that is bound to `$implicit` like shown below: + ```html -<content-column - title="{{'DOCUMENT_LIST.COLUMNS.DISPLAY_NAME' | translate}}" - key="name" - sortable="true" - class="full-width ellipsis-cell"> +<template let-context="$implicit"> + <!-- template body --> +</template> +``` + +The format of naming is `let-VARIABLE_NAME="$implicit"` where `VARIABLE_NAME` is the name of the variable you want binding template data context to. + +Getting a cell value from the underlying DataTableAdapter: + +```ts +context.data.getValue(entry.row, entry.col); +``` + +You can retrieve all property values for underlying node, including nested properties (via property paths): + +```ts +context.row.getValue('name') +context.row.getValue('createdByUser.displayName') +``` + +_You may want using **row** api to get raw value access. + +```html +<content-column title="Name" key="name" sortable="true" class="full-width ellipsis-cell"> + <template let-context="$implicit"> + <span>Hi! {{context.row.getValue('createdByUser.displayName')}}</span> + <span>Hi! {{context.row.getValue('name')}}</span> + </template> +</content-column> +``` + +Use **data** api to get values with post-processing, like datetime/icon conversion._ + +Final example, we'll name the context as `entry`: + +```html +<content-column title="Name" key="name" sortable="true" class="full-width ellipsis-cell"> <template let-entry="$implicit"> <span>Hi! {{entry.data.getValue(entry.row, entry.col)}}</span> </template> </content-column> ``` +Example above will prepend `Hi!` to each file and folder name in the list. + + + ### Actions DocumentList supports declarative actions for Documents and Folders. @@ -937,4 +999,4 @@ npm start ## License -[Apache Version 2.0](https://github.com/Alfresco/alfresco-ng2-components/blob/master/LICENSE) \ No newline at end of file +[Apache Version 2.0](https://github.com/Alfresco/alfresco-ng2-components/blob/master/LICENSE) From b05247dadec8e6ec9c994a469895bf9bc294db91 Mon Sep 17 00:00:00 2001 From: Mario Romano <dnamario@hotmail.com> Date: Fri, 27 Jan 2017 12:22:25 +0000 Subject: [PATCH 098/108] #1014 use document list to display search results (#1548) * #1014 use document list to diplay search results * #1014 refactor pagination * #1014 documentation and scripts update * fix random erros on tests executrion * #1014 fix travis scripts and raise timeout jasmine * #1014 fix appveyor script * #1014 type nodeId --- .travis.yml | 7 + appveyor.yml | 27 +-- .../app/components/files/files.component.html | 4 - .../components/search/search.component.html | 12 +- .../app/components/search/search.component.ts | 12 +- .../ng2-activiti-analytics/karma-test-shim.js | 9 +- .../ng2-activiti-diagrams/karma-test-shim.js | 9 +- .../ng2-activiti-form/karma-test-shim.js | 9 +- .../karma-test-shim.js | 9 +- .../ng2-activiti-tasklist/karma-test-shim.js | 9 +- .../ng2-alfresco-core/karma-test-shim.js | 9 +- .../ng2-alfresco-datatable/README.md | 25 +++ .../docs/assets/pagination-demo.png | Bin 0 -> 12462 bytes .../ng2-alfresco-datatable/karma-test-shim.js | 9 +- .../src/components/pagination/index.ts | 1 - .../pagination/pagination.component.html | 8 +- .../pagination/pagination.component.spec.ts | 76 ++++--- .../pagination/pagination.component.ts | 86 +++++--- .../pagination.data.ts} | 25 +-- .../ng2-alfresco-documentlist/README.md | 4 + .../karma-test-shim.js | 9 +- .../components/document-list.component.html | 7 + .../document-list.component.spec.ts | 41 +++- .../src/components/document-list.component.ts | 151 ++++++++++--- .../src/data/share-datatable-adapter.ts | 99 +-------- .../src/services/document-list.service.ts | 1 - .../ng2-alfresco-login/karma-test-shim.js | 9 +- ng2-components/ng2-alfresco-search/README.md | 5 +- .../ng2-alfresco-search/demo/i18n/en.json | 4 - .../ng2-alfresco-search/demo/package.json | 2 + .../demo/systemjs.config.js | 4 + ng2-components/ng2-alfresco-search/index.ts | 3 +- .../ng2-alfresco-search/karma-test-shim.js | 17 +- .../ng2-alfresco-search/karma.conf.js | 6 + .../ng2-alfresco-search/package.json | 6 +- .../images/document-list.empty-folder.png | Bin 207036 -> 0 bytes .../src/assets/images/empty_doc_lib.svg | 208 ++++++++++++++++++ .../alfresco-search-autocomplete.component.ts | 9 +- .../components/alfresco-search.component.css | 22 ++ .../components/alfresco-search.component.html | 113 +++++++--- .../alfresco-search.component.spec.ts | 80 +++---- .../components/alfresco-search.component.ts | 84 +++---- .../ng2-alfresco-search/src/i18n/en.json | 18 +- .../src/services/alfresco-search.service.ts | 7 +- .../ng2-alfresco-tag/karma-test-shim.js | 9 +- .../ng2-alfresco-upload/karma-test-shim.js | 9 +- .../ng2-alfresco-userinfo/karma-test-shim.js | 9 +- .../ng2-alfresco-viewer/karma-test-shim.js | 9 +- .../ng2-alfresco-webscript/karma-test-shim.js | 9 +- scripts/npm-build-bundle-all.sh | 10 +- scripts/npm-link-all-components-demo.sh | 11 +- scripts/npm-link-demo-shell.sh | 10 +- 52 files changed, 917 insertions(+), 414 deletions(-) create mode 100644 ng2-components/ng2-alfresco-datatable/docs/assets/pagination-demo.png rename ng2-components/ng2-alfresco-datatable/src/{components/pagination/paginationProvider.interface.ts => models/pagination.data.ts} (78%) delete mode 100644 ng2-components/ng2-alfresco-search/demo/i18n/en.json delete mode 100644 ng2-components/ng2-alfresco-search/src/assets/images/document-list.empty-folder.png create mode 100644 ng2-components/ng2-alfresco-search/src/assets/images/empty_doc_lib.svg diff --git a/.travis.yml b/.travis.yml index 5be48fb0ff..e15bf35b9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,14 +38,21 @@ before_script: (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); fi - if ([ "$MODULE" == "ng2-activiti-tasklist" ] || [ "$MODULE" == "ng2-activiti-processlist" ]); then + (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); (cd ng2-components/ng2-activiti-form; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); fi - if ([ "$MODULE" == "ng2-activiti-processlist" ]); then + (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); + (cd ng2-components/ng2-activiti-form; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); (cd ng2-components/ng2-activiti-tasklist; npm link ng2-alfresco-core; npm link ng2-alfresco-datatable; npm link ng2-activiti-form; if [ ! -d "bundles" ]; then npm link; fi); fi - if ([ "$MODULE" == "ng2-activiti-analytics" ]); then (cd ng2-components/ng2-activiti-diagrams; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); fi + - if ([ "$MODULE" == "ng2-alfresco-search" ]); then + (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); + (cd ng2-components/ng2-alfresco-documentlist; npm link ng2-alfresco-core; npm link ng2-alfresco-datatable; if [ ! -d "bundles" ]; then npm link; fi); + fi - cd ng2-components/$MODULE; - npm run travis; #npm insall run install, build and tests diff --git a/appveyor.yml b/appveyor.yml index ef6eab1287..e333bfdeee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,22 +30,19 @@ 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 ../../) - - IF %COMPONENT_NAME% EQU ng2-activiti-processlist (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm install && npm link && cd ../../) - - IF %COMPONENT_NAME% EQU ng2-activiti-processlist (cd ng2-components/ng2-activiti-form && npm link ng2-alfresco-core && npm install && npm link && cd ../../) - - IF %COMPONENT_NAME% EQU ng2-activiti-processlist (cd ng2-components/ng2-activiti-tasklist && npm link ng2-alfresco-core && npm link ng2-alfresco-datatable && npm link ng2-activiti-form && npm install && npm link && cd ../../) - - IF %COMPONENT_NAME% EQU ng2-activiti-tasklist (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm install && npm link && cd ../../) - - IF %COMPONENT_NAME% EQU ng2-activiti-tasklist (cd ng2-components/ng2-activiti-form && npm link ng2-alfresco-core && npm install && npm link && cd ../../) - - IF %COMPONENT_NAME% EQU ng2-alfresco-webscript (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm install && npm link && cd ../../) - - IF %COMPONENT_NAME% EQU ng2-activiti-analytics (cd ng2-components/ng2-activiti-diagrams && npm link link ng2-alfresco-core && npm install && npm link && cd ../../) + - IF %COMPONENT_NAME% NEQ ng2-alfresco-core (cd ng2-components/ng2-alfresco-core && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-alfresco-documentlist (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-alfresco-search (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-alfresco-search (cd ng2-components/ng2-alfresco-documentlist && npm link ng2-alfresco-core && npm link ng2-alfresco-datatable && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-activiti-processlist (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-activiti-processlist (cd ng2-components/ng2-activiti-form && npm link ng2-alfresco-core && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-activiti-processlist (cd ng2-components/ng2-activiti-tasklist && npm link ng2-alfresco-core && npm link ng2-alfresco-datatable && npm link ng2-activiti-form && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-activiti-tasklist (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-activiti-tasklist (cd ng2-components/ng2-activiti-form && npm link ng2-alfresco-core && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-alfresco-webscript (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-activiti-analytics (cd ng2-components/ng2-activiti-diagrams && npm link link ng2-alfresco-core && 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) - - IF %COMPONENT_NAME% EQU ng2-activiti-processlist (npm link ng2-alfresco-datatable && npm link ng2-activiti-form && npm link ng2-activiti-tasklist) - - IF %COMPONENT_NAME% EQU ng2-activiti-tasklist (npm link ng2-alfresco-datatable && npm link ng2-activiti-form) - - IF %COMPONENT_NAME% EQU ng2-alfresco-webscript (npm link ng2-alfresco-datatable) - - IF %COMPONENT_NAME% EQU ng2-activiti-analytics (npm link ng2-activiti-diagrams) + - npm run travis # Post-install test scripts. test_script: diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html index 9c03991ed6..f8b6e7e7ab 100644 --- a/demo-shell-ng2/app/components/files/files.component.html +++ b/demo-shell-ng2/app/components/files/files.component.html @@ -96,10 +96,6 @@ </content-action> </content-actions> </alfresco-document-list> - <alfresco-pagination - [provider]="documentList.data" - [supportedPageSizes]="[5, 10, 15, 20]"> - </alfresco-pagination> </alfresco-upload-drag-area> </div> diff --git a/demo-shell-ng2/app/components/search/search.component.html b/demo-shell-ng2/app/components/search/search.component.html index 8e5f7d755c..bdd4757b17 100644 --- a/demo-shell-ng2/app/components/search/search.component.html +++ b/demo-shell-ng2/app/components/search/search.component.html @@ -1,8 +1,12 @@ <div class="search-results-container"> <h1>Search results</h1> - <alfresco-search (navigate)="onNavigateItem($event)"></alfresco-search> + <alfresco-search (preview)="showFile($event)"></alfresco-search> </div> -<alfresco-viewer *ngIf="fileShowed" [(showViewer)]="fileShowed" [fileNodeId]="fileNodeId" [overlayMode]="true"> - <div class="mdl-spinner mdl-js-spinner is-active"></div> -</alfresco-viewer> +<div *ngIf="fileShowed"> + <alfresco-viewer [(showViewer)]="fileShowed" + [fileNodeId]="fileNodeId" + [overlayMode]="true"> + <div class="mdl-spinner mdl-js-spinner is-active"></div> + </alfresco-viewer> +</div> diff --git a/demo-shell-ng2/app/components/search/search.component.ts b/demo-shell-ng2/app/components/search/search.component.ts index 6351a0b5b2..9882609249 100644 --- a/demo-shell-ng2/app/components/search/search.component.ts +++ b/demo-shell-ng2/app/components/search/search.component.ts @@ -47,18 +47,18 @@ import { MinimalNodeEntity } from 'alfresco-js-api'; }) export class SearchComponent { - fileShowed: boolean = false; fileNodeId: string; + fileShowed: boolean = false; constructor(public router: Router) { } - onNavigateItem(event: MinimalNodeEntity) { - if (event.entry.isFile) { - this.fileNodeId = event.entry.id; + showFile(event) { + if (event.value.entry.isFile) { + this.fileNodeId = event.value.entry.id; this.fileShowed = true; - } else if (event.entry.isFolder) { - this.router.navigate(['/files', event.entry.id]); + } else { + this.fileShowed = false; } } } diff --git a/ng2-components/ng2-activiti-analytics/karma-test-shim.js b/ng2-components/ng2-activiti-analytics/karma-test-shim.js index d346348361..50673b05cb 100644 --- a/ng2-components/ng2-activiti-analytics/karma-test-shim.js +++ b/ng2-components/ng2-activiti-analytics/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-activiti-diagrams/karma-test-shim.js b/ng2-components/ng2-activiti-diagrams/karma-test-shim.js index 04a45e501c..085bf02f56 100644 --- a/ng2-components/ng2-activiti-diagrams/karma-test-shim.js +++ b/ng2-components/ng2-activiti-diagrams/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-activiti-form/karma-test-shim.js b/ng2-components/ng2-activiti-form/karma-test-shim.js index ac2dd6fcfb..1751adb04e 100644 --- a/ng2-components/ng2-activiti-form/karma-test-shim.js +++ b/ng2-components/ng2-activiti-form/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-activiti-processlist/karma-test-shim.js b/ng2-components/ng2-activiti-processlist/karma-test-shim.js index 8ab8026459..b3f275d74f 100644 --- a/ng2-components/ng2-activiti-processlist/karma-test-shim.js +++ b/ng2-components/ng2-activiti-processlist/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-activiti-tasklist/karma-test-shim.js b/ng2-components/ng2-activiti-tasklist/karma-test-shim.js index a66c8eb6a9..9f594e357b 100644 --- a/ng2-components/ng2-activiti-tasklist/karma-test-shim.js +++ b/ng2-components/ng2-activiti-tasklist/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-core/karma-test-shim.js b/ng2-components/ng2-alfresco-core/karma-test-shim.js index c6de4c47e5..23ec0d86d4 100644 --- a/ng2-components/ng2-alfresco-core/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-core/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-datatable/README.md b/ng2-components/ng2-alfresco-datatable/README.md index 4ae455c08d..733717418b 100644 --- a/ng2-components/ng2-alfresco-datatable/README.md +++ b/ng2-components/ng2-alfresco-datatable/README.md @@ -441,6 +441,31 @@ let schema = ObjectDataTableAdapter.generateSchema(data); ``` +# Pagination Component + +The pagination object is a generic component to paginate component. The Alfresco API are paginated and returns a Pagination object. You can use the pagination object to feed the pagination component and then listen to the event which return the current pagination and query again the API with the options choose by the user. + +![DataTable demo](docs/assets/pagination-demo.png) + + +### Properties + +| Name | Type | Default | Description +| --- | --- | --- | --- | +| `supportedPageSizes` | numer[] | [5, 10, 20, 50, 100] | This array describe the set of options showed in the pick list | +| `maxItems` | boolean | false | Max number of element showed per page. If you pick another size from the pick list this option will be overwritten | +| `pagination` | Pagination | {count: 0, totalItems: 0, skipCount: 0, maxItems: 20 , hasMoreItems: true} | The Alfresco Api return a pagination object, you can use it to feed the pagination component, or create your own. | + +### Events + +| Name | Description +| --- | --- | +| `changePageSize` | Emitted when user picks one of the options from the pick list | +| `nextPage` | Emitted when user clicks next page button | +| `prevPage` | Emitted when user clicks prev page button | + +All the events carry with them the current pagination object. + ## Build from sources Alternatively you can build component from sources with the following commands: diff --git a/ng2-components/ng2-alfresco-datatable/docs/assets/pagination-demo.png b/ng2-components/ng2-alfresco-datatable/docs/assets/pagination-demo.png new file mode 100644 index 0000000000000000000000000000000000000000..bd78a014403cfc4486b30d31a9658ceeab9ec9f4 GIT binary patch literal 12462 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 Ka;cJu|NjAFF2Do; literal 0 HcmV?d00001 diff --git a/ng2-components/ng2-alfresco-datatable/karma-test-shim.js b/ng2-components/ng2-alfresco-datatable/karma-test-shim.js index b922a90bce..6aa9dd62c7 100644 --- a/ng2-components/ng2-alfresco-datatable/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-datatable/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-datatable/src/components/pagination/index.ts b/ng2-components/ng2-alfresco-datatable/src/components/pagination/index.ts index 1b1e7e47b6..4f9699a18c 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/pagination/index.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/pagination/index.ts @@ -15,5 +15,4 @@ * limitations under the License. */ -export * from './paginationProvider.interface'; export * from './pagination.component'; diff --git a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.html b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.html index 297974de9a..5598cc3b73 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.html +++ b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.html @@ -1,7 +1,7 @@ -<div *ngIf="provider" class="mdl-paging"> +<div class="mdl-paging"> <span class="mdl-paging__per-page"> <span class="mdl-paging__per-page-label">Rows per page:</span> - <span class="mdl-paging__per-page-value" [attr.data-automation-id]="'rows_per_page_' + pageSize">{{pageSize}}</span> + <span class="mdl-paging__per-page-value" [attr.data-automation-id]="'rows_per_page_' + pageSize">{{pagination.maxItems}}</span> <button alfresco-mdl-button id="pageSizePicker" class="mdl-button--icon mdl-paging__per-page-dropdown"> <i class="material-icons">arrow_drop_down</i> </button> @@ -15,12 +15,12 @@ </span> <span class="mdl-paging__count">{{summary}}</span> <button (click)="showPrevPage()" - [disabled]="!prevPageAvail" + [disabled]="!prevPageAvail()" alfresco-mdl-button class="mdl-button--icon mdl-paging__prev" [attr.data-automation-id]="prev_page"> <i class="material-icons">keyboard_arrow_left</i> </button> <button (click)="showNextPage()" - [disabled]="!nextPageAvail" + [disabled]="!nextPageAvail()" alfresco-mdl-button class="mdl-button--icon mdl-paging__next" [attr.data-automation-id]="next_page"> <i class="material-icons">keyboard_arrow_right</i> </button> diff --git a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.spec.ts b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.spec.ts index 6266faa761..e69a226dcd 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.spec.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.spec.ts @@ -16,17 +16,9 @@ */ import { PaginationComponent } from '../pagination/pagination.component'; -import { PaginationProvider, DataLoadedEventEmitter} from '../pagination/paginationProvider.interface'; -import { Injector } from '@angular/core'; -import { getTestBed, TestBed} from '@angular/core/testing'; - -class CustomPaginationProvider implements PaginationProvider { - skipCount: number = 0; - dataLoaded: DataLoadedEventEmitter; - count: number = 200; - hasMoreItems: boolean = false; - maxItems: number = 20; -} +import { PaginationData } from '../../models/pagination.data'; +import { Injector, SimpleChange } from '@angular/core'; +import { getTestBed, TestBed } from '@angular/core/testing'; describe('PaginationComponent', () => { let injector: Injector; @@ -40,7 +32,13 @@ describe('PaginationComponent', () => { }); injector = getTestBed(); paginationComponent = injector.get(PaginationComponent); - paginationComponent.provider = new CustomPaginationProvider(); + paginationComponent.pagination = new PaginationData(0, 0, 0, 20, true); + }); + + it('should create Pagination object on init if no object pagination is passed', () => { + paginationComponent.pagination = null; + paginationComponent.ngOnInit(); + expect(paginationComponent.pagination).not.toBe(null); }); it('is defined', () => { @@ -48,35 +46,63 @@ describe('PaginationComponent', () => { }); it('page size', () => { - expect(paginationComponent.pageSize).toBe(20); + expect(paginationComponent.pagination.maxItems).toBe(20); }); it('set page size', () => { - paginationComponent.pageSize = 100; - expect(paginationComponent.pageSize).toBe(100); + paginationComponent.pagination.maxItems = 100; + expect(paginationComponent.pagination.maxItems).toBe(100); }); - it('prevPageAvail', () => { - expect(paginationComponent.prevPageAvail).toBe(false); + it('prevPageAvail dafault false', () => { + expect(paginationComponent.prevPageAvail()).toBe(false); }); - it('nextPageAvail', () => { - expect(paginationComponent.nextPageAvail).toBe(false); + it('nextPageAvail default true', () => { + expect(paginationComponent.nextPageAvail()).toBe(true); }); it('showNextPage', () => { - expect(paginationComponent.provider.skipCount).toBe(0); + expect(paginationComponent.pagination.skipCount).toBe(0); paginationComponent.showNextPage(); - expect(paginationComponent.provider.skipCount).toBe(20); + expect(paginationComponent.pagination.skipCount).toBe(20); }); it('showPrevPage', () => { - paginationComponent.provider.skipCount = 100; + paginationComponent.pagination.skipCount = 100; paginationComponent.showPrevPage(); - expect(paginationComponent.provider.skipCount).toBe(80); + expect(paginationComponent.pagination.skipCount).toBe(80); }); - it('PaginationProvider', () => { - expect(paginationComponent.provider instanceof CustomPaginationProvider).toBeTruthy(); + it('should update the summary on nextpage click', () => { + spyOn(paginationComponent, 'updateSummary'); + + paginationComponent.showNextPage(); + + expect(paginationComponent.updateSummary).toHaveBeenCalled(); + }); + + it('should update the summary on prevpage click', () => { + spyOn(paginationComponent, 'updateSummary'); + + paginationComponent.showPrevPage(); + + expect(paginationComponent.updateSummary).toHaveBeenCalled(); + }); + + it('should update the summary on chage page size click', () => { + spyOn(paginationComponent, 'updateSummary'); + + paginationComponent.setPageSize(100); + + expect(paginationComponent.updateSummary).toHaveBeenCalled(); + }); + + it('should update the summary on input pagination parameter change', () => { + spyOn(paginationComponent, 'updateSummary'); + + paginationComponent.ngOnChanges({pagination: new SimpleChange(null, new PaginationData(0, 0, 0, 20, true))}); + + expect(paginationComponent.updateSummary).toHaveBeenCalled(); }); }); diff --git a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts index fdc0d233c6..c689de3ae9 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts @@ -15,8 +15,9 @@ * limitations under the License. */ -import { Component, Input, OnInit } from '@angular/core'; -import { PaginationProvider } from './paginationProvider.interface'; +import { SimpleChanges, OnChanges, EventEmitter, Output, Component, Input, OnInit } from '@angular/core'; +import { PaginationData } from '../../models/pagination.data'; +import { Pagination } from 'alfresco-js-api'; @Component({ moduleId: module.id, @@ -24,68 +25,81 @@ import { PaginationProvider } from './paginationProvider.interface'; templateUrl: './pagination.component.html', styleUrls: ['./pagination.component.css'] }) -export class PaginationComponent implements OnInit { +export class PaginationComponent implements OnInit, OnChanges { - DEFAULT_PAGE_SIZE: number = 20; + static DEFAULT_PAGE_SIZE: number = 20; - private _summary: string = ''; + private summary: string = ''; @Input() supportedPageSizes: number[] = [5, 10, 20, 50, 100]; @Input() - provider: PaginationProvider; + maxItems: number = PaginationComponent.DEFAULT_PAGE_SIZE; - get pageSize(): number { - if (this.provider) { - return this.provider.maxItems; - } - return this.DEFAULT_PAGE_SIZE; + @Input() + pagination: Pagination; + + @Output() + changePageSize: EventEmitter<Pagination> = new EventEmitter(); + + @Output() + nextPage: EventEmitter<Pagination> = new EventEmitter(); + + @Output() + prevPage: EventEmitter<Pagination> = new EventEmitter(); + + constructor() { } - set pageSize(value: number) { - if (this.provider) { - this.provider.maxItems = value; + ngOnInit() { + if (!this.pagination) { + this.pagination = new PaginationData(0, 0, 0, this.maxItems, true); + } + } + + ngOnChanges(changes: SimpleChanges) { + if (changes['pagination']) { + if (changes['pagination'].currentValue) { + this.pagination = changes['pagination'].currentValue; + this.updateSummary(); + } } } setPageSize(value: number) { - this.pageSize = value; + this.pagination.maxItems = value; + this.updateSummary(); + this.changePageSize.emit(this.pagination); } - get summary(): string { - return this._summary; + nextPageAvail(): boolean { + return this.pagination.hasMoreItems; } - get nextPageAvail(): boolean { - return this.provider.hasMoreItems; - } - - get prevPageAvail(): boolean { - return this.provider.skipCount > 0; + prevPageAvail(): boolean { + return this.pagination.skipCount > 0; } showNextPage() { - this.provider.skipCount += this.provider.maxItems; + this.pagination.skipCount += this.pagination.maxItems; + this.updateSummary(); + this.nextPage.emit(this.pagination); } showPrevPage() { - this.provider.skipCount -= this.provider.maxItems; + this.pagination.skipCount -= this.pagination.maxItems; + this.updateSummary(); + this.prevPage.emit(this.pagination); } - ngOnInit() { - this.provider.dataLoaded.subscribe(() => { - this.updateSummary(); - }); - } - - private updateSummary() { - let from = this.provider.skipCount; + updateSummary() { + let from = this.pagination.skipCount; if (from === 0) { from = 1; } - let to = this.provider.skipCount + this.provider.count; - let of = this.provider.totalItems; - this._summary = `${from}-${to} of ${of}`; + let to = this.pagination.skipCount + this.pagination.count; + let of = this.pagination.totalItems; + this.summary = `${from}-${to} of ${of}`; } } diff --git a/ng2-components/ng2-alfresco-datatable/src/components/pagination/paginationProvider.interface.ts b/ng2-components/ng2-alfresco-datatable/src/models/pagination.data.ts similarity index 78% rename from ng2-components/ng2-alfresco-datatable/src/components/pagination/paginationProvider.interface.ts rename to ng2-components/ng2-alfresco-datatable/src/models/pagination.data.ts index fb445a0364..94fbe0d19e 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/pagination/paginationProvider.interface.ts +++ b/ng2-components/ng2-alfresco-datatable/src/models/pagination.data.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { Subject } from 'rxjs/Rx'; +import { Pagination } from 'alfresco-js-api'; -export interface PaginationProvider { +export class PaginationData implements Pagination { /** * The number of objects in the collection. @@ -34,7 +34,7 @@ export interface PaginationProvider { * An integer describing the total number of entities in the collection. * The API might not be able to determine this value, in which case this property will not be present. */ - totalItems?: number; + totalItems: number; /** * An integer describing how many entities exist in the collection before those included in this list. @@ -47,18 +47,11 @@ export interface PaginationProvider { */ maxItems: number; - /** - * An event that is emitted every time data is loaded. - */ - dataLoaded: DataLoadedEventEmitter; -} - -export class DataLoadedEventEmitter extends Subject<any> { - constructor() { - super(); - } - - emit(value) { - super.next(value); + constructor(count: number, totalItems: number, skipCount: number, maxItems: number, hasMoreItems: boolean) { + this.count = count; + this.hasMoreItems = hasMoreItems; + this.totalItems = totalItems; + this.skipCount = skipCount; + this.maxItems = maxItems; } } diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md index 2df200747f..ea4be1c6d1 100644 --- a/ng2-components/ng2-alfresco-documentlist/README.md +++ b/ng2-components/ng2-alfresco-documentlist/README.md @@ -168,10 +168,13 @@ platformBrowserDynamic().bootstrapModule(AppModule); ### Properties +The properties currentFolderId, folderNode and node are the entry initialization properties of the document list. They can not be used together, choose the one that suites more your use case. + | Name | Type | Default | Description | | --- | --- | --- | --- | | `currentFolderId` | string | null | Initial node ID of displayed folder. Can be `-root-`, `-shared-`, `-my-`, or a fixed node ID | | `folderNode` | `MinimalNodeEntryEntity` | null | Currently displayed folder node | +| `node` | `NodePaging` | null | Document list will show all the node contained in the NodePaging entity | | `navigate` | boolean | true | Toggles navigation to folder content or file preview | | `navigationMode` | string (click\|dblclick) | dblclick | User interaction for folder navigation or file preview | | `thumbnails` | boolean | false | Show document thumbnails rather than icons | @@ -179,6 +182,7 @@ platformBrowserDynamic().bootstrapModule(AppModule); | `multiselect` | boolean | false | Toggles multiselect mode | | `contentActions` | boolean | false | Toggles content actions for each row | | `contextMenuActions` | boolean | false | Toggles context menus for each row | +| `enablePagination` | boolean | true | Shows pagination | | `creationMenuActions` | boolean | true | Toggles the creation menu actions| | `rowFilter` | `RowFilter` | | Custom row filter, [see more](#custom-row-filter). | `imageResolver` | `ImageResolver` | | Custom image resolver, [see more](#custom-image-resolver). diff --git a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js index dcfa63a5ae..53e4408aa1 100644 --- a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html index 2d582847bb..bb164fbc3c 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html @@ -27,4 +27,11 @@ </no-content-template> </div> </alfresco-datatable> +<alfresco-pagination *ngIf="enablePagination" + (changePageSize)="onChangePageSize($event)" + (nextPage)="onNextPage($event)" + (prevPage)="onPrevPage($event)" + [pagination]="pagination" + [supportedPageSizes]="[5, 10, 15, 20]"> +</alfresco-pagination> diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts index c2cc0459cb..80fc2da6e1 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts @@ -22,7 +22,7 @@ import { DocumentListComponent } from './document-list.component'; import { DocumentListServiceMock } from './../assets/document-list.service.mock'; import { ContentActionModel } from '../models/content-action.model'; import { FileNode, FolderNode } from '../assets/document-library.model.mock'; -import { NodeMinimalEntry } from '../models/document-library.model'; +import { NodeMinimalEntry, NodeMinimal, NodePaging } from '../models/document-library.model'; import { ShareDataRow, RowFilter, ImageResolver } from './../data/share-datatable-adapter'; describe('DocumentList', () => { @@ -291,10 +291,10 @@ describe('DocumentList', () => { }); /* - it('should not get node path for null node', () => { - expect(documentList.getNodePath(null)).toBeNull(); - }); - */ + it('should not get node path for null node', () => { + expect(documentList.getNodePath(null)).toBeNull(); + }); + */ it('should require valid node for file preview', () => { let file = new FileNode(); @@ -326,12 +326,30 @@ describe('DocumentList', () => { expect(documentList.performNavigation).not.toHaveBeenCalled(); }); - it('should display folder content on reload', () => { + it('should display folder content from loadFolder on reload if folderNode defined', () => { + documentList.folderNode = new NodeMinimal(); + spyOn(documentList, 'loadFolder').and.callThrough(); documentList.reload(); expect(documentList.loadFolder).toHaveBeenCalled(); }); + it('should display folder content from loadFolderByNodeId on reload if currentFolderId defined', () => { + documentList.currentFolderId = 'id-folder'; + spyOn(documentListService, 'getFolderNode').and.returnValue(Promise.reject(false)); + spyOn(documentList, 'loadFolderByNodeId').and.callThrough(); + documentList.reload(); + expect(documentList.loadFolderByNodeId).toHaveBeenCalled(); + }); + + it('should display folder content from loadFolderByNodeId on reload if node defined', () => { + documentList.node = new NodePaging(); + + spyOn(documentList.data, 'loadPage').and.callThrough(); + documentList.reload(); + expect(documentList.data.loadPage).toHaveBeenCalled(); + }); + it('should require node to resolve context menu actions', () => { expect(documentList.getContextActions(null)).toBeNull(); @@ -428,6 +446,7 @@ describe('DocumentList', () => { it('should set row filter for underlying adapter', () => { let filter = <RowFilter> {}; + documentList.currentFolderId = 'id'; spyOn(documentList.data, 'setFilter').and.callThrough(); documentList.rowFilter = filter; @@ -445,7 +464,7 @@ describe('DocumentList', () => { it('should emit [nodeClick] event on row click', () => { let node = new NodeMinimalEntry(); let row = new ShareDataRow(node); - let event = <DataRowEvent> { value: row }; + let event = <DataRowEvent> {value: row}; spyOn(documentList, 'onNodeClick').and.callThrough(); documentList.onRowClick(event); @@ -455,7 +474,7 @@ describe('DocumentList', () => { it('should emit [nodeDblClick] event on row double-click', () => { let node = new NodeMinimalEntry(); let row = new ShareDataRow(node); - let event = <DataRowEvent> { value: row }; + let event = <DataRowEvent> {value: row}; spyOn(documentList, 'onNodeDblClick').and.callThrough(); documentList.onRowDblClick(event); @@ -464,8 +483,8 @@ describe('DocumentList', () => { it('should load folder by ID on init', () => { documentList.currentFolderId = '1d26e465-dea3-42f3-b415-faa8364b9692'; - spyOn(documentList.data, 'loadById').and.returnValue(Promise.resolve()); - documentList.ngOnInit(); - expect(documentList.data.loadById).toHaveBeenCalled(); + spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve()); + documentList.ngOnChanges({folderNode: new SimpleChange(null, documentList.currentFolderId)}); + expect(documentList.loadFolderNodesByFolderNodeId).toHaveBeenCalled(); }); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts index 13c863d15e..f2a7ebb66d 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts @@ -15,9 +15,22 @@ * limitations under the License. */ -import { Component, OnInit, Input, OnChanges, Output, SimpleChanges, EventEmitter, AfterContentInit, TemplateRef, NgZone, ViewChild, HostListener } from '@angular/core'; +import { + Component, + OnInit, + Input, + OnChanges, + Output, + SimpleChanges, + EventEmitter, + AfterContentInit, + TemplateRef, + NgZone, + ViewChild, + HostListener +} from '@angular/core'; import { Subject } from 'rxjs/Rx'; -import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; +import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging, Pagination } from 'alfresco-js-api'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { DataRowEvent, DataTableComponent, ObjectDataColumn } from 'ng2-alfresco-datatable'; import { DocumentListService } from './../services/document-list.service'; @@ -55,6 +68,9 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni @Input() multiselect: boolean = false; + @Input() + enablePagination: boolean = true; + @Input() contentActions: boolean = false; @@ -67,10 +83,15 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni @Input() pageSize: number = DocumentListComponent.DEFAULT_PAGE_SIZE; + skipCount: number = 0; + + pagination: Pagination; + @Input() set rowFilter(value: RowFilter) { - if (this.data) { + if (this.data && value && this.currentFolderId) { this.data.setFilter(value); + this.loadFolderNodesByFolderNodeId(this.currentFolderId, this.pageSize, this.skipCount); } }; @@ -81,6 +102,16 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni } } + // The identifier of a node. You can also use one of these well-known aliases: -my- | -shared- | -root- + @Input() + currentFolderId: string = null; + + @Input() + folderNode: MinimalNodeEntryEntity = null; + + @Input() + node: NodePaging = null; + @Output() nodeClick: EventEmitter<any> = new EventEmitter(); @@ -102,25 +133,17 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni @ViewChild(DataTableComponent) dataTable: DataTableComponent; - // The identifier of a node. You can also use one of these well-known aliases: -my- | -shared- | -root- - @Input() - currentFolderId: string = null; - - @Input() - folderNode: MinimalNodeEntryEntity = null; - errorMessage; actions: ContentActionModel[] = []; emptyFolderTemplate: TemplateRef<any>; contextActionHandler: Subject<any> = new Subject(); data: ShareDataTableAdapter; - constructor( - private documentListService: DocumentListService, - private ngZone: NgZone, - private translateService: AlfrescoTranslationService) { + constructor(private documentListService: DocumentListService, + private ngZone: NgZone, + private translateService: AlfrescoTranslationService) { - this.data = new ShareDataTableAdapter(this.documentListService, './', []); + this.data = new ShareDataTableAdapter(this.documentListService, this.baseComponentPath, []); if (translateService) { translateService.addTranslationFolder('ng2-alfresco-documentlist', 'node_modules/ng2-alfresco-documentlist/src'); @@ -151,15 +174,15 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni ngOnInit() { this.data.thumbnails = this.thumbnails; - this.data.maxItems = this.pageSize; this.contextActionHandler.subscribe(val => this.contextActionCallback(val)); - // Automatically enforce single-click navigation for mobile browsers + this.enforceSingleClickNavigationForMobile(); + } + + private enforceSingleClickNavigationForMobile(): void { if (this.isMobile()) { this.navigationMode = DocumentListComponent.SINGLE_CLICK_NAVIGATION; } - - this.loadFolder(); } ngAfterContentInit() { @@ -172,9 +195,37 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni ngOnChanges(changes: SimpleChanges) { if (changes['folderNode'] && changes['folderNode'].currentValue) { this.loadFolder(); - } else if (changes['currentFolderId'] && changes['currentFolderId'].currentValue) { - this.loadFolderByNodeId(changes['currentFolderId'].currentValue); + return; } + + if (changes['currentFolderId'] && changes['currentFolderId'].currentValue) { + this.loadFolderByNodeId(changes['currentFolderId'].currentValue); + return; + } + + if (changes['node'] && changes['node'].currentValue) { + this.data.loadPage(changes['node'].currentValue); + return; + } + } + + reload() { + this.ngZone.run(() => { + if (this.folderNode) { + this.loadFolder(); + return; + } + + if (this.currentFolderId) { + this.loadFolderByNodeId(this.currentFolderId); + return; + } + + if (this.node) { + this.data.loadPage(this.node); + return; + } + }); } isEmptyTemplateDefined() { @@ -229,7 +280,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni this.folderNode = node.entry; this.loadFolder(); - this.folderChange.emit({ node: node.entry }); + this.folderChange.emit({node: node.entry}); return true; } return false; @@ -246,21 +297,10 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni } } - loadFolderById(id: string): Promise<any> { - return this.data.loadById(id); - } - - reload() { - this.ngZone.run(() => { - this.loadFolder(); - }); - } - loadFolder() { let nodeId = this.folderNode ? this.folderNode.id : this.currentFolderId; if (nodeId) { - this.loadFolderById(nodeId) - .catch(err => this.error.emit(err)); + this.loadFolderNodesByFolderNodeId(nodeId, this.pageSize, this.skipCount).catch(err => this.error.emit(err)); } } @@ -269,9 +309,33 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni this.documentListService.getFolderNode(nodeId).then(node => { this.folderNode = node; this.currentFolderId = node.id; - this.data.loadById(node.id).catch(err => this.error.emit(err)); + this.loadFolderNodesByFolderNodeId(node.id, this.pageSize, this.skipCount).catch(err => this.error.emit(err)); }) - .catch(err => this.error.emit(err)); + .catch(err => this.error.emit(err)); + } + + loadFolderNodesByFolderNodeId(id: string, maxItems: number, skipCount: number): Promise<any> { + return new Promise((resolve, reject) => { + if (id && this.documentListService) { + this.documentListService + .getFolder(null, { + maxItems: maxItems, + skipCount: skipCount, + rootFolderId: id + }) + .subscribe(val => { + this.data.loadPage(<NodePaging>val); + this.pagination = val.list.pagination; + resolve(true); + }, + error => { + reject(error); + }); + } else { + resolve(false); + } + }); + } /** @@ -387,4 +451,19 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni this.reload(); this.success.emit(event); } + + public onChangePageSize(event: Pagination): void { + this.pageSize = event.maxItems; + this.reload(); + } + + public onNextPage(event: Pagination): void { + this.skipCount = event.skipCount; + this.reload(); + } + + public onPrevPage(event: Pagination): void { + this.skipCount = event.skipCount; + this.reload(); + } } diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts index ab112fc0bb..23fd57f915 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts @@ -17,80 +17,34 @@ import { DatePipe } from '@angular/common'; import { ObjectUtils } from 'ng2-alfresco-core'; -import { PaginationProvider, DataLoadedEventEmitter, DataTableAdapter, DataRow, DataColumn, DataSorting } from 'ng2-alfresco-datatable'; +import { DataTableAdapter, DataRow, DataColumn, DataSorting } from 'ng2-alfresco-datatable'; import { NodePaging, NodeMinimalEntry } from './../models/document-library.model'; import { DocumentListService } from './../services/document-list.service'; -export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvider { +export class ShareDataTableAdapter implements DataTableAdapter { ERR_ROW_NOT_FOUND: string = 'Row not found'; ERR_COL_NOT_FOUND: string = 'Column not found'; DEFAULT_DATE_FORMAT: string = 'medium'; - DEFAULT_PAGE_SIZE: number = 20; - MIN_PAGE_SIZE: number = 5; private sorting: DataSorting; private rows: DataRow[]; private columns: DataColumn[]; private page: NodePaging; - private folderNodeId: string; private filter: RowFilter; private imageResolver: ImageResolver; - private _count: number = 0; - private _hasMoreItems: boolean = false; - private _totalItems: number = 0; - private _skipCount: number = 0; - private _maxItems: number = this.DEFAULT_PAGE_SIZE; - thumbnails: boolean = false; - dataLoaded: DataLoadedEventEmitter; selectedRow: DataRow; constructor(private documentListService: DocumentListService, private basePath: string, schema: DataColumn[]) { - this.dataLoaded = new DataLoadedEventEmitter(); this.rows = []; this.columns = schema || []; - this.resetPagination(); - } - - get count(): number { - return this._count; - } - - get hasMoreItems(): boolean { - return this._hasMoreItems; - } - - get totalItems(): number { - return this._totalItems; - } - - get skipCount(): number { - return this._skipCount; - } - - set skipCount(value: number) { - if (value !== this._skipCount) { - this._skipCount = value > 0 ? value : 0; - this.loadById(this.folderNodeId); - } - } - - get maxItems(): number { - return this._maxItems; - } - - set maxItems(value: number) { - if (value !== this._maxItems) { - this._maxItems = value > this.MIN_PAGE_SIZE ? value : this.MIN_PAGE_SIZE; - this.loadById(this.folderNodeId); - } } getRows(): Array<DataRow> { @@ -198,37 +152,8 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid this.setSorting(sorting); } - loadById(id: string): Promise<any> { - return new Promise((resolve, reject) => { - if (id && this.documentListService) { - this.documentListService - .getFolder(null, { - maxItems: this._maxItems, - skipCount: this._skipCount, - rootFolderId: id - }) - .subscribe(val => { - this.folderNodeId = id; - this.loadPage(<NodePaging>val); - this.dataLoaded.emit(null); - resolve(true); - }, - error => { - reject(error); - }); - } else { - resolve(false); - } - }); - - } - setFilter(filter: RowFilter) { this.filter = filter; - - if (this.filter && this.folderNodeId) { - this.loadById(this.folderNodeId); - } } setImageResolver(resolver: ImageResolver) { @@ -263,9 +188,8 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid } } - private loadPage(page: NodePaging) { + public loadPage(page: NodePaging) { this.page = page; - this.resetPagination(); let rows = []; @@ -293,15 +217,6 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid } } } - - let pagination = page.list.pagination; - if (pagination) { - this._count = pagination.count; - this._hasMoreItems = pagination.hasMoreItems; - this._maxItems = pagination.maxItems; - this._skipCount = pagination.skipCount; - this._totalItems = pagination.totalItems; - } } this.rows = rows; @@ -310,14 +225,6 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid getImagePath(id: string): any { return `${this.basePath}/assets/images/${id}`; } - - private resetPagination() { - this._count = 0; - this._hasMoreItems = false; - this._totalItems = 0; - this._skipCount = 0; - this._maxItems = this.DEFAULT_PAGE_SIZE; - } } export class ShareDataRow implements DataRow { diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts index f2b4254184..04841f8345 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts @@ -124,7 +124,6 @@ export class DocumentListService { include: ['path', 'properties'] }; - // see https://github.com/Alfresco/alfresco-js-api/issues/140 let nodes: any = this.apiService.getInstance().nodes; return nodes.getNodeInfo(nodeId, opts); } diff --git a/ng2-components/ng2-alfresco-login/karma-test-shim.js b/ng2-components/ng2-alfresco-login/karma-test-shim.js index b922a90bce..6aa9dd62c7 100644 --- a/ng2-components/ng2-alfresco-login/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-login/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-search/README.md b/ng2-components/ng2-alfresco-search/README.md index b35fec0c29..7023fc91c0 100644 --- a/ng2-components/ng2-alfresco-search/README.md +++ b/ng2-components/ng2-alfresco-search/README.md @@ -89,6 +89,7 @@ Follow the 3 steps below: - ng2-alfresco-core - alfresco-js-api - ng2-alfresco-search + - ng2-alfresco-documentlist Please refer to the following example file: [systemjs.config.js](demo/systemjs .config.js) . @@ -165,7 +166,7 @@ platformBrowserDynamic().bootstrapModule(AppModule); | `searchTerm` | {string} | (optional) | "" | Search term to pre-populate the field with | | `inputType` | {string} | (optional) | "text" | Type of the input field to render, e.g. "search" or "text" (default) | | `expandable` | {boolean} | (optional) | true | Whether to use an expanding search control, if false then a regular input is used. | -| `autocomplet` | {boolean} | (optional) | true | Whether the browser should offer field auto-completion for the input field to the user. | +| `autocomplete` | {boolean} | (optional) | true | Whether the browser should offer field auto-completion for the input field to the user. | | `liveSearchEnabled` | {boolean} | (optional) | true | Whether find-as-you-type suggestions should be offered for matching content items. Set to false to disable. | | `liveSearchRoot` | {boolean} | (optional) | "-root-" | NodeRef or node name where the search should start. | | `liveSearchResultType` | {boolean} | (optional) | (none) | Node type to filter live search results by, e.g. 'cm:content'. | @@ -228,7 +229,7 @@ platformBrowserDynamic().bootstrapModule(AppModule); | Name | Description | | --- | --- | -| `navigate` | Emitted when a search result is clicked or double-clicked | +| `preview` | emitted when user acts upon files with either single or double click (depends on `navigation-mode`), recommended for Viewer components integration | | `resultsLoad` | Emitted when search results have fully loaded | #### Options diff --git a/ng2-components/ng2-alfresco-search/demo/i18n/en.json b/ng2-components/ng2-alfresco-search/demo/i18n/en.json deleted file mode 100644 index ff2576b3d3..0000000000 --- a/ng2-components/ng2-alfresco-search/demo/i18n/en.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "SEARCH": { - } -} diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json index 8ceb942c6a..833d2a7347 100644 --- a/ng2-components/ng2-alfresco-search/demo/package.json +++ b/ng2-components/ng2-alfresco-search/demo/package.json @@ -70,6 +70,8 @@ "ng2-translate": "2.5.0", "alfresco-js-api": "^1.0.0", "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0", + "ng2-alfresco-documentlist": "1.0.0", "ng2-alfresco-search": "^1.0.0" }, "devDependencies": { diff --git a/ng2-components/ng2-alfresco-search/demo/systemjs.config.js b/ng2-components/ng2-alfresco-search/demo/systemjs.config.js index a5ad11779e..13871f886d 100644 --- a/ng2-components/ng2-alfresco-search/demo/systemjs.config.js +++ b/ng2-components/ng2-alfresco-search/demo/systemjs.config.js @@ -26,6 +26,8 @@ 'ng2-translate': 'npm:ng2-translate', 'alfresco-js-api': 'npm:alfresco-js-api/dist', 'ng2-alfresco-core': 'npm:ng2-alfresco-core', + 'ng2-alfresco-documentlist': 'npm:ng2-alfresco-documentlist', + 'ng2-alfresco-datatable': 'npm:ng2-alfresco-datatable', 'ng2-alfresco-search': 'npm:ng2-alfresco-search' }, // packages tells the System loader how to load when no filename and/or no extension @@ -40,6 +42,8 @@ 'ng2-translate': { defaultExtension: 'js' }, 'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'}, 'ng2-alfresco-core': { main: './index.js', defaultExtension: 'js'}, + 'ng2-alfresco-documentlist': { main: './index.js', defaultExtension: 'js'}, + 'ng2-alfresco-datatable': { main: './index.js', defaultExtension: 'js'}, 'ng2-alfresco-search': { main: './index.js', defaultExtension: 'js'} } }); diff --git a/ng2-components/ng2-alfresco-search/index.ts b/ng2-components/ng2-alfresco-search/index.ts index c2ce45856f..6ac815eb1d 100644 --- a/ng2-components/ng2-alfresco-search/index.ts +++ b/ng2-components/ng2-alfresco-search/index.ts @@ -18,12 +18,12 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CoreModule } from 'ng2-alfresco-core'; - import { AlfrescoSearchService } from './src/services/alfresco-search.service'; import { AlfrescoThumbnailService } from './src/services/alfresco-thumbnail.service'; import { AlfrescoSearchComponent } from './src/components/alfresco-search.component'; import { AlfrescoSearchControlComponent } from './src/components/alfresco-search-control.component'; import { AlfrescoSearchAutocompleteComponent } from './src/components/alfresco-search-autocomplete.component'; +import { DocumentListModule } from 'ng2-alfresco-documentlist'; // services export * from './src/services/alfresco-search.service'; @@ -45,6 +45,7 @@ export const ALFRESCO_SEARCH_PROVIDERS: [any] = [ @NgModule({ imports: [ + DocumentListModule.forRoot(), CoreModule, FormsModule, ReactiveFormsModule diff --git a/ng2-components/ng2-alfresco-search/karma-test-shim.js b/ng2-components/ng2-alfresco-search/karma-test-shim.js index b922a90bce..b48288e490 100644 --- a/ng2-components/ng2-alfresco-search/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-search/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; @@ -56,7 +63,9 @@ var map = { 'ng2-translate': 'npm:ng2-translate', 'alfresco-js-api': 'npm:alfresco-js-api/dist', - 'ng2-alfresco-core': 'npm:ng2-alfresco-core' + 'ng2-alfresco-core': 'npm:ng2-alfresco-core', + 'ng2-alfresco-datatable': 'npm:ng2-alfresco-datatable', + 'ng2-alfresco-documentlist': 'npm:ng2-alfresco-documentlist' }; var packages = { @@ -65,7 +74,9 @@ var packages = { 'ng2-translate': { defaultExtension: 'js' }, 'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'}, - 'ng2-alfresco-core': { main: './index.js', defaultExtension: 'js'} + 'ng2-alfresco-core': { main: './index.js', defaultExtension: 'js'}, + 'ng2-alfresco-datatable': { main: './index.js', defaultExtension: 'js'}, + 'ng2-alfresco-documentlist': { main: './index.js', defaultExtension: 'js'} }; var config = { diff --git a/ng2-components/ng2-alfresco-search/karma.conf.js b/ng2-components/ng2-alfresco-search/karma.conf.js index 02c4b6c5d0..68345649f6 100644 --- a/ng2-components/ng2-alfresco-search/karma.conf.js +++ b/ng2-components/ng2-alfresco-search/karma.conf.js @@ -50,6 +50,12 @@ module.exports = function (config) { { pattern: 'node_modules/ng2-alfresco-core/src/**/*.js', included: false, served: true, watched: false }, { pattern: 'node_modules/ng2-alfresco-core/index.js', included: false, served: true, watched: false }, + { pattern: 'node_modules/ng2-alfresco-datatable/src/**/*.js', included: false, served: true, watched: false }, + { pattern: 'node_modules/ng2-alfresco-datatable/index.js', included: false, served: true, watched: false }, + + { pattern: 'node_modules/ng2-alfresco-documentlist/src/**/*.js', included: false, served: true, watched: false }, + { pattern: 'node_modules/ng2-alfresco-documentlist/index.js', included: false, served: true, watched: false }, + // paths to support debugging with source maps in dev tools {pattern: 'src/**/*.ts', included: false, watched: false}, {pattern: 'src/**/*.js.map', included: false, watched: false} diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 30bdac0c8b..af3f60daa0 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -17,7 +17,7 @@ "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 test", - "travis": "npm link ng2-alfresco-core", + "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-alfresco-documentlist", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", "reinstall": "npm cache clean && npm install" @@ -70,7 +70,9 @@ "zone.js": "^0.6.23", "ng2-translate": "2.5.0", "alfresco-js-api": "^1.0.0", - "ng2-alfresco-core": "1.0.0" + "ng2-alfresco-core": "1.0.0", + "ng2-alfresco-datatable": "1.0.0", + "ng2-alfresco-documentlist": "1.0.0" }, "devDependencies": { "@types/jasmine": "^2.2.33", diff --git a/ng2-components/ng2-alfresco-search/src/assets/images/document-list.empty-folder.png b/ng2-components/ng2-alfresco-search/src/assets/images/document-list.empty-folder.png deleted file mode 100644 index 7a23727b20404f7828a3d7cb109d9004ead9349c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207036 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 g2&^ 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%0Do9iH-x{P5? zPiFzp5nm!@O>N5g6p8o2I#yU^QD^MDsa&HzQ&xe>&fCZ=TGX{6mqq+FEK9$8lzY!| zSb9>GqQYQ<@GlfpG6a<~^^Wnc`yRDHPEoEaBfV|!q?7Ti_!}177)=EpbMH(?8Tg%| z<ros2IwF8d>7}*qiFFOni_5xuzcJZo6O!3LC%B63%Na-6#$>b{3EfqTEh4XT%gK_R za~M{~yW<?1yErigZmU7F`(lR_!98U9ct~=5<e~-$Rp$p~&E0T)loc-;ckKyRsnI^4 zHvIY?A>{M?{43`U$lFh1u7{IO4h8B&)7MHzn_$}dB`~=;+G&0>lOqiYx4eo;vb<ug zj4dI<p(#7P4OUw?0l%jWiSG$l7i(P+Ew3$gIM{YpdVHS(nOuv}Kh>NEZaqLHg4-`A zNS5GET#2APMwz!k_BJa=L+4f>)fMwq>zb^S86*mcan$%-=!g6=Dm-jyjo==>9rAzK zqqgPDSmY@J48_cmMxaPu!WS|RC$2ReYT08Xc{gR>57l|Ap0`HbF{zmmZC<UQeecHx z1RbENLE+ZR%<FYp1Ifc8C(gCO&Ue3iR*sPSf;UIXzl{wH6mf8H&bt!#vl|j9MrqBi z)9;4NrX)-F5DMFdDgu9;CPcNee($AfvP>CtO*}sWgg<l?RK#B{_QX8kMSTzWq(s=% zbrxfOqvl!I{4nspYTiYIHGY1ujqDRN{3~TFMDl>pJar`Bm9()+F;CU1%T?;y(-Uj@ zcN6ocQ3m@WgO#7z86-M7p6m{K_H(V(`xj@Ny5boxD6W+lB{1Iqs=DACSJ15y3*v2U zX-lhk!HTaR%vL8zV8;d4&asyo8y`3knndzM%1}DuBcCNKtTWUW)C?mHrH=IQ#o{g3 z@|bH28dhnJQF$XY_~AY@uCr4Oz7mAwt~LEH(DA5^k=gHWSwi@HpH4EB#^)#xFKtrn z+Juwzpo0*t!U$Aq=tVOG$SfzRg)1vso+BrOB^03Zl&-9B?QC~f!(f$Zh1=Fy5wEV3 zec{UJN@sNLPA8dNwd_FcT4*IBFvc~u<LJJ4&33Qn<Ll$TQXMU7CzthV%Lej`#yxw1 z5%+hQ{5<xB$>;pzf`s#1+PKLv={^#?{Kndzt2WV`AK#z$%Vmh`&v(YOT#P>f(A<X~ zX5+*lsP~2<Zep%~ImBb;tR`RqI-@kdFo`;czLkK^y07Od;@}zD=0L>53d=Fccay3S z-kK1>$KU(sWobxe_a7fM6m%-*@mx(vkNg;X6tc?^ZQ3<|0|A!P_>ycGn3<TU#>U3Z z-FqLHjaCVtc&Hm3lGzR+yK6kWP%3pvL{l?^DgdGx1%2D?82B;nBW$usy8y3lEQ>2t z=98Hhe7z-AO=WBOa+HEC(=y5aBioGTf@p+Ey05N-8<n02t8Lc)1rD<KBb$QssurPL zL5psk_~2o-9Qhe49)>tD4>uB8DW698pXlXGYCXlI%ufg4@UO4#|5L(<Vf;{d54L%h ztAtc-fa`3Hrc5n1G1hV9g0=ik-YB{DPCvd9S;S4N)$sT5_E`MUe4vMf6DDUm@g9d9 zejHsUcoXSPH{vvc3ys{YL0Prc*)<1hP^8k&j_aYU!0mUxJpHu-rSUQLEP+PgQ$H=B z5v^YxYe$hoTo?g)Tz912v&VeDt`$0k(9L7}o(A+U!B%r&r*Dtk@BmqEuXcMj*k>_T z2z)Vv$wDyec<ZNkAh(g3Jnh=tc8m(VW+uIC3HkX=f!M^b;sonWIK(TZkeFKZV!4l- z85k!|lPdn0OAUF8*Od383~%G1?=TiXz;SnIPkTQuf@C+h^gSa|g_#RAug;lcX9Fj- z6fY+=6CWmU*|J<|mp#f;BJJ{iOJMh$q)(Qazc3FLHJ2SZ!W)l=hc)wTV&qD6%j0P& zCJm1EcTiN6u>dych)PACP}mm-T{Yc`JH~x2Qxq=Iwe<`5+0@jOAALgbGbtsDxM@J% zmA|fpjAd@5w!Bq}-pb0U5@U{~ide!z)!Dg!6YI%%%1B+JEajEC1vHvBSoBi7`=Fqb z{Fb8kwe5phT6K2hhad<f(V+b+<cr5k&11$<%GoD|(FSawbqz<R2?T?`TtfTq_V$pd zC1b$_nWxNiihnl33@(~8FDl*OZxjIwV-ht(QrY1<M7B0Wy__W4>&V|2$!I%*IbT?M z`W@WV(wh!}ON@Cl{<5ujYc{Xzjj`bBO(xYl{3X-C$u4D>Z-jNFB_)DA+xQuojRm*5 za*9FyUX61!Z!Uo??NpJy97fI#Um%}jXl19fwD9EY)FY+RX$e^qurz;2_Yo#|>Dw_2 zK^q<V?D0@rjUSDrz&H;FP3VI*dX-HwTPXF>5B&B3C&e(NP&|*Tj&I9QUW{nikz<?? zIL2%Jl&W)5`B65Yb-SWdY04`qT$?PEdt9VA;@jr<1y5`^F-mvgK8KB+X2Vy0v$MGQ zFeK7B=acHk=aahuizS1onGQnR(W}DOAMJp3D>XOvoH(T>4VQR%i4hJX2XR`WrI8(N zLfwzqs<JQJBZohTJECL<pUgac&~iIw{7%kZ(%`&~p56w3|Fmjb5dHI}Y}H6SIHk<C zCOf<;wE<lDjMQ?rJzCH*j-a?Bl~itp22Mga;(PU|w?u6ee@7&%c-rFuRAmzMW>}=e z$=e#oIXgDh)$uTUa}ZK^@oM&>QS#Y-Q6f%4_bT<%&cgk}J>#wN)Gt`v2qN^ePI{x| zqrfKyA%b9Gn_QnsY`WL+gLnx<G@P?ZKC{gUUNSkpOb5KE*$9gG{NA>{)iys<lIYjh zqD<_Qt&oy)hij{2;PrcW458g>%+QHkX}<T$!?Cra<LlM7sS`|aR1;kt8<@QmbdY}9 z)txQ=90-#<dK2t@PGa9XeWUYjrFB_Jm*kUaVfhG;@^ya~e{b5{E;007^VIqKjZIeS zx195$vP(7K&iD}4$#^X%ujl{TCt;xL(Y`G-Nqqf^yy8EU>(4D%9`+zt!HM{+cNDtI zJ*f!rTvjk#9f7LfsWRjj?AW`a6jswxCHRjC$=BsjF^#@y1O%{-@|;fEN0|GG%Iv&y zNvsMyjyw}BY(%O!V~cO+sT)$A49m*1fk*cte8`Z;!Fd<4Aoj-F!86pPEs(y?$Kxa; zv7gj-OQwwg_xkoD0roghoFwsUOKiJ_95R1bT)+%NaTtp}%p*U+L-m^Fh!O2ZEww$I z+x8}hi%)1P*T-Ie1kf%$0FRLjJA&ywem--AXP?t=R?QuGP4iu(*iL_?Kk9b$+$?A9 z^Gz(Ez|+iw;Qh5ARUqgTTm-PxnJ`X`!r~F+DK{(eOCMpF)JlN8Ksy;XyJu7mM#^TG z{tT2O4sdvwlgMf2Nb8^j8}g$wf-dGMhJoM6FWQ!tRWnExC!7%!>djFTAg9M%EbZy| zbop35^;F3nCH7!y+MAV#=AGU=-g(;-g#{rC3r`b+pMXX7EQb4L3q3w#=wT_D$I%D~ zdAKd(p0BMp+7}TfKf(hHfm#brXIxs1Ws<*O@g_nV=Ec>5o3Eg!&~%u+f#aRTVQ}W1 z#Zm6*#Bt~QMJTx|@A(SoL-$6N)1nY3o;OYPuU_9<=xOe3qU<LF^?Uc<!hyl39LT8! zj#Z%})9o@L$<1Q5tVF4sr{%d^7JQC+RGB@y+OT4SdCt+lV6BBebkD*%b=iM{07=@n z${0T+-=*S#hm(UtWQ7NKdnU;*c6S9o*s;T3@2Sh?B#Qzs;#>O0ci=1gX;05jX43OC zbmoW6>0Vj$K4+f}kUYZ3y3!m}F+y*9^j)8OdK-fr3J8lN%NFjFfo@iB<L+d3ZB^cU z77dWjRJHjG>O=%>{AfUUpseY(P~&@OQZ!N2!#_GjAa}+h<=a^GI^cFi3$g0u&aY16 zLT#8i;uhfsx5l-zpeO`rP5C%0yb$CH_#R8OzD<V1*DgR(mcF6>jBUTGhr`z5=bFT> z!y22&#Bn|MaLaI?1L>hV!vn>!1i*>a5T8x8&*>xAZQCI_cBi2Rc)++0sMvBy$Skuy zdu52z(Lu~K>DF0x!q{Mnoc(SZ`(yN|Cv;!@_~Y`Y4^1B*dKWZY$c}^jvV(&BDx=e( z;`Fo_i28@(vGhnOp6l#Y+q(mp!S(E814FZI6EK3Na`-uZAP4=n36XlQP)PY?prCA4 zy^c1Ahidx>Z+E^l@QJ!}oYg?<)KD4QI_)byA_SX}5u4~2McZw;v$_giW;bfT>(c5m z5q|6SD^z0S>6%o5cvaI{Q~=VTqHeW<fS7jr!&#dmj%g$cIDQN*{+i_VelDG?EYLo5 zLEXf@WlRarlbk?cj~d)d*-h^~S%GJ77}9qVJDUjUHN6KQXNO_%t#9%fM?HZ40JeC* z8nr7^%QR&TwO~U7)$%(24g!DRiFL!*4CrH&RFs0y`)*}86Q22+raXQw<voHAf@A;b zYVT*AeX$Vl$>hOUclF2inZXc6qtfh(13tt7FgVa%hbc1eF=y~sG{l}L*Y=6RUvkU~ zjF1JSlArp61e?G2BTC_9ju;V0`Z0yFAN#s=K;*bL!*KvqeyyTJb1PGtmBIf|0t}_O zN69qr=+s?%)ZuRGHu;PIbD9FNw^om8QtG5q4CDvnZp&4;>Lk)76`AoeWKvj1_!fO+ zpmE`9l*;>F7HC!<<G-rDeP!CQ<Whc(L~TWZH+|Sfci%qaJaS2qHx?levGBRR6}hhe zo=>J*_&wcgB2R<R>y733dSIFPzBW0@(>tcJ5>z6KMH8{3<PaeipBydsvl!x7UX%G* zzUz)I-2^|Wf{<SxtQ(I+WrznzAip;zKHsKg?o@QSuFKVlc;-J||6q<PbaRLDkk3s_ zJJO&{`4xHZp2eE;o&JcHCXEbTp?=3uswX%FSOzdf_U?VBXn}L%BauR-u+>Z+kt?EZ zSO7<JW}@DcO$`&S6K)vF0s<$MpnAS+f~YD=fwvo_-kTWVIi+9LPkj(*^3W<0Bd7lw zuV?GJF)D0c{Uqz6u)3nwV8$}VIZt;r?1-2WQM=_cOgANHZ;|IoK5G^RpAuG+QCP`j zEy+)P7!d_mIimilY+=g2#^a*RcNjhpy7W9`$E+df)#kXZ+`Ik&=x$d~TZW6yb`EEz zS*gH^Sa!l5c`}UO+Ak;#H|G7D?KFAF$%%5Z*B!E?P#G~H50~|4r~`AB`(}q4Co8hB z90qt?3LorT?+qzP7eK9~S|&vu>ndO;I5sKnJUh#bdNhf5;~tz_@7-#b8NqG*f5G?y ze_;GIBuVRE^-j{f77Jy^5ZxRTP7tQb)B;Z8=eRlDsueujeE8)>;K<`-8%1&}+OAso z<%BoufppOu-D;D!Enqf<a;y*=JYH3~g5*dtR925JlhyV8f<Kr=(f#!jQL>?J#-YQC zDj#F+_Rm1qh=s)<<7TAg1-_5j-1*?B0KW*OyTYVfxo4(YK4CKb`RzK8C)qSvSlh-# zn+`2%FeG;C!SX}FprbSZByQ1{_dDIihntYsN6^Zhxa%Vh^n!<2V-pFTOPd>C#<O_7 z^tWZwq{$TMQD%7JS5G=-#%83eDH{{|ZnoC3S%D7~;$psx6O;-FJ$4oWS{q-<a%_w_ zEgzq;WJi(LY+I$uAy6DfO9hmVTb6t`(_KF%y$mzfGG5erX+-*|vx?Nfn}-t-;d#}@ z_k7gW3Y158?&L;hLLCGn88E9+4e)Q0Tvp^*4*+{4Os1lfOrc=EO>5;Pi5t1AYf^Q2 z>ZZSZB3P?@C*(G@+r{I>USPRG?hMI|=rxNcn#H+rA!7T~B}eJP7XUV&bTB=Vb@XEy zMS*kl;Alz2ssn@Lr|eH3xPjKa?v&GA$?zUQ=FNmw()_?|!=)eJ3w(y_yJp*^YvxD2 z^ejCaPZkp9?Q;1zE`A^=?FcIHpBairmB{XU%^fx#Bqj1jF9oDFQp@h2%T}%|uPM9o z_?Blc`W242VqckToIIPRrVO4wY%1d9;?g=zEvtaL>Pe9J?v|WhZI-AQe<$k<&ahg9 zv(Qg<5r^#VuViK`NRx3KeF}mFJb&zKqXfQZO19#Hp0<z6AZ>P1Pro`AR;UwGZ+mdK zYMcdi{C+9s=&XR4DCZ*R7wmM0{A50(lT=%bm?N_qOw@d+njz1VEh<gaUw*pHZ5sH2 z_TxWI1gd*5`V)KZGClD`<L~DiDKk17ae6KZ^Hf@_%3vCd$FmWH1>7wdXP+1a^vm~7 z>HRds5w&X;l*4vNUH!m)%ox9s{Zjgl?11~(CP*^%w5mK*pdiA=xLv{Tl_ezxdZ1jN z#{;^+q#nJ5;EQki`aRUY*Fjwl9!yND^RJKh^sai`nGi@HVL<(RY$m%Bq4^iN;<9P& z_boLvh2kPP49>5uoki$Dl(l2M)2h?b*oCJ_5W#UZBy(yE%4xhRB(kfcFbO5hZ-D>I zJU<g!&yjt)-86fZ7KG4Xa4hisvY^=D<zrg?%2#?G{E=0-(`Ebe2mFbLAu!Y~L(!r~ z`g-uQwAMJA=@F9<TVguD_n!Wd0F-K{1~9VCRj5ZkufE@f3Pl-FN*rbGjsB)N+EQ5` zF2sVxzqS3-?9eEvo|Xo_Q6K$)+zy4$IzBKTt3CYiT$2oC##+?BU)ENzpD)gFvo3-+ z^no1gA0=i<i3cc|1I#`T+0Djc1n=Y~0UO}eLT07%NZS0|oEH{58rR^9;FKWLtG|#< zblfWEN>O!~?`vh3gkb<1Lc<7tZ*cF?)8nymqgF>iwd<>0I>uz*(yu+!AoJtuwSD)M ziuGEdsjzIphQs`g=E2?IoPb|R(l6I;&TbR1s%FvDI2?4D+MfPvT8{VCW7Dp%8-XwL zVseVR<S&RdT>k>G;w5jD{3uct{`Esg^_%PYvPH|av<dPL@rp@AK)x0R&tQQA2KJ?( zHIbfFr^&QjyRBZ<hm+?!o2!Cb!MNTshZyM8_owX#2M1k!xEq#guktS6WwnRM+PDTJ zNi6RWKF~{awp7)>9?SG<%_}gXd|EPDqo}`ab7CW{Y=f6IQgf6^M>}(E^z~k-+w03q zx2{j-g{WZCr{|g#SJFzk_i38@tp&Cw=&H;EpW)?Q2e2mPOWO!e-o{GEXQ^IbXE;d~ z9OqQ6M7c=g_OhippU|+NNnP*|H7D-kVw$rho}t^WYVhTH&y%6`5$tug`yx@uIl-!q z-nOaWse`H-l*a8_2~|1dnx38mc&S*b{=Vbb#ZQf4<!a2abN+op)OzR{<p@W%V2Kef zUAfw)kW=@(dM{lV3Ox{S5S^@W+boriTdMO@roO02nSzPK?k?wKlc$K#S|;Di6n!^6 zu6{^@vWhz0=Y~pZDF`-I-V{q?0Phibu&rcl-?7)2^20($;^9HTr>+wkd<~v$g{_~9 zVj={O2n)hEQdoOaw=EuBSxF%faVW*THB`YYy6<Fd`35-0(M+#7_T1sEe;XO067|oV z3)mdQ|HSO5JB6&OyCqmZd3|!v`!F+n+aO7?{Dz0*tO|=axc#IG3qVs**w7U`YOHM_ zw*6uc6@1k*F3es^MrGMCx>KOzYA|fQ$&q+v_lY-ox9n=Scrn(##=ggiELpn#L~Qw@ z3s;`eQ2Sr30!3_n==-^<Ib3v1_m>Abs`~U@VSWCv-OxDl{T<BN^Q#>voIScfFgRFZ zOCo`}W%ZfhGt}0J3+5NlHx4>eioK$rW@BeB`}XY{KtiH025>5WJ3g*5ImWla5%mD) zBF?!BwqUWL*ATVkx42`-9cS!!XoUv|coF1Z_y)#M1{{<#Ffz2IeR2>~C`_bT^=YC_ zZ4S58bzs2<DyQ|3ZR%}vZ!)&P;^u(~fH|)=q?`+FRs?ZXbx3j80E1Ca7>v9e+r$aH zds%kBQ9-m&3cbIfk%#Z=CE3k*wDf12;MM2-@>pS`bnvl>Y9h{+sRndu%cKj<W+w8& zABD#9ebXj4Ys$#tC}tuuAL_}@uL6Lw9)#^?S1Go<&<@WOhL<z$<q>!#RnYI}iLa^d zKl6VDcLlGRA~p_^gW?!b`5cqi^;iJS-YmYUN(S$Vto)Q`cmPM71=|-26>7t1SaBB~ z$6l)p64F>8?5zyIlqiWW=GrrhOpwe$qZ`M%?;YfYN2;B!fpV|@9T$?tzToN#asxm9 zrDRC#YjctZ<2nNddHQh&_WWk-wsS6%IJ!-mJ2QQd4HK1LIn^2G7t8O=yt}(g<N@x2 zV%3{sN|{uI3O35mOwoY5jVi2SX=b_s@<aJyB})5nvP=^Zve4-kE-C5B#hG^l?`M76 zj5|Lmn<_|bU-0#M^tsK*)GL3aTKEsaGFSK`>{XDI=lf62gfhO8!|2Ky+U2NUUXPC0 z*;v-#0yVe6{JHXSN;15uLfqq;`?|ie9FVT`{BZfIRWmEh49=3YtOGpF7U`l@_1#b- z;K~Re&PlRdrak_Y0LeTnR1jq5?undZ)~sL%jVZGKxxe#kIlsdv-^oj87q?;wm?zAP zJiZjS#REX7izjMk(lWALI%n3GKRk7c!BiFuKgpY?-abA9O=t_lri4);Sz!~rBLKbk z)`hgD=Oh=?uZe}Ge%TpsNS{AeW<_p>Db?V}q(+V9pUTZSoiE1M#$ej<w1j?!ywoDJ z;vti@?>Zy^n;x@XS+a9SL}sdlZs^~oMUqDIl*a07Wt;9%lQ3tV_)_VWr)e*U{9KM2 z4f<xoj0)r0s+THpdD)b=xU{IApKr7G>x-tmN`sn_O#j0&nxFaji9{l`$+It5^Rm_A zud-+Kv+4rA4G6EkJE{uVy{sJ_MVf*0rX*8~&uFgmZ_EM@5se5rA72c=c#k0P2Tw&x z%q<OJ1zx*Cp*hLa!p0OhZezkydc>iE$5`433j(t1E`hXy+h3pUf#9xl;>t98g1Iun zC3#!?HR4URm2rh^-I=BbuCe3I1*<J(a;h8>&CkhM_H3VS<d7{;o8}vi<TwU3o>*M_ z+jm{z5PDNjuvIMJ{Cb9pLDs!1h~}kHm}{^#D|3}$?odF)S9hoIn)1?vC4am@jDKp` ziPOBn#gnXWlE~=Qd$()`Czjv+hj3k2qenpvBECi?8h`Jj)5mDUiCuk)(SzYQ1+vTm zZT$@EkHin7Na!A$InEGZX=4>dpn&N(|BE+R05;*H!@bwuLXd2Ht^<s0%tRaVaj~l` z(G4|*w=O??6U6c@Kg$=Ww+UGK2g?*qyBO_&7bk=xSzVRA6DfNmkQ|BW^~<OWsZ2JM z|N8~xB`^++us#AC-8ZrUe1oVh@13#*E%dYaFg}~Ojfy|*@BV)3gm@Xq@J+nITiCvV ziAf@g9ul3|_gYmpD0%J!2lsGzW;VROoV3g~2>mS&h;a83`zmrvWr%Pabj)*K^*()C zEV78GezC9AEIlx`eTpL6o0wsQcP}XlJP++JEG!%3EUXxGHLEDm%Y`e1=gde!wY_U& zzRhOkDiV!BND*#KszJZGRD*6SPZD)CEj28=-dS4L@ybKQJs8;m=_qOii@ymoM;66V z)snvJZtmu-It(6n4WfqNgU;K1aE?@BxPiZSknWURC=KwZZq^CTT!^GrvL~YXJkR^- zOEw3&pym3H1SexVC=AM)2d-B`Q<g|VZPTo%$5-~1Q4<>@XP$oQ)@w_mTE6`?>!FZm ziH@^wcpBd<68h}|8ho*C3(usVGEc#ln$Q_x#nEbp1Rw;(96z=+_ojb2znHZ5r5h<L z5&eB?oE}pt4;ew&*~lIr|44Z^zU8du^!#WuGm@L<ziz+pEg@;**Ysk3p;!NZ7`+V( zjhMgtgUW~;CXNytS7S^9|3`iE4y<pv`JBfUjGVuLuD{!W`tK)0hYCgFA8Z9%SZrLr zR=rTYreh=z?#9Mqla&6{FI{BMp9{hu2Qxg)mZn5mRyKheq}_PStrf0|C_R@lJridC zKdRm`EXwx#0(}VyB}G9x!~y9T7`nR!lm-O`7*e`Hq@}x?0coWh1*LN+>7Jp79-1@n zb<Xej{y#q-o-g;c_u6Z(y_SFfX?8jhEyO0?BlR)&@RaT_)<zomonaAUV{k)N{>Up| z!Td<}Uq!XAH1jNk;yf1I?W+qkzWo!o8+b^5Rew)|kUZpIF3&;R5zx&}OUXK)cdkiT z?8jBm6yX_K7w5n9b$$ZFMX|tcP?e!*?mk!n{z}Sn06UW|)12*qFGj7hp#9^W;t&6? z`#NH(LhzPP^c7cMHA(WF;Wj$hX?jLGM{`+jN9R#)mk7kps%ion-L@|$Do{aubvi5g zB7NjzAxhARUnjS`K~}q2X^^K6Yr()PT|+Lp$~7@68`iG6SKNexIbt>0YBV&U5NE)6 zB}Z{s^}xKt^;GAAA;H}!lK)I}S#$A0jCgsbF-H6F6peJEiU8v@&MW7R-~7iD8`E;? zzjtL_Ko3Syov};KzHXSVawM8`qg<u*k!L5MiaaQKL8_9jAwxalPE(x7!UsK@xb-Jh zx73Cp-EHZ<*p#lU2$`BOjH&Hi#p0y(xw7x@PopYQG+`@CH)8(i;c4V(AK9t78O3#M z{iY;Y!o-i6P;769cwuFW-NmFE*K_*hME-Z41^^Qs^%f&kPaK%wk-dHrB-fJW6<|gN zQ;56CYV>5lR4n*gZFt=N&5?KOFY5kZQTi8CI}&4>s+mhi%4^u=1xfYbc%w^@7T5YT z#WjwZFS-Kdzx{wVyBwqE<_pG$9LCv;@PfYK#k>p=3XWvCu0fC{*)hx{Q`x4gDs)69 zKB8Zz|JJh+O`N_y#4D+kFz929V%Tf*ncLM=g#G#yPT-oG6(9E8e<B-h*=Frh&<fWo zi9b2l7Ik5EAX0oxjNibU(`Fm`;Qf1f*OhN59$((zNz6Lv<9UF=MGo~d(PUM`dHIRk z+mh^5HZl#rh80>LlNdgeDxUQLOG5s~EOMDaAPXp+Ea@3-Wk^5>s_qwc##vL_mD;$~ z!L^6&!(`gdYLi*XUEq~MafaSp$mB%zu+TtA(hJkfL!dOTct*RtpV^px1V|kcn3S3s z9C-JxB-?6o^M)99#x1Eb*>%mK{;>X%)M<Xl##htOJ{^_5-Fj*~fJG*Zf1wZ9?0=Rl zax41hMg!EcADrEy?z*^>8jW}p$&HMnxyd1^UHnS3nPEbz%P?v`;AgIb#3Ru?1I*|Y zi)AwV%8u!&vG}v9^FJKi<yj`F=M76f-2n@8s(nfER#)tZw>i}0el^%rJk`WBVNbu~ zufVmz%J(>gLP<3J%e5V;X8^iv`$Gy_h`hsGD0G)uPKjZ4q387+=0pb-N`2WKEm-PS zMZy^cA!4WchBj~p@wh)NW=uF1%Se&pJ{q3&EVAkU-y*}}6M6veT?K^T{e3=Y4L&vI zR$&4~vi|Csg0M4rS~nq1kjom;?Lo(QA0Ub13g@MCG8JAngOpkD(fWw`=(ppbmm_8l zz5%SV>zhCMoj%h3%4`jzf(dJyTu694j6GitlH3yVSP;wg7u&YdCU*JbYEOw{f`Sf( z1Cx}w)gfw9QPGX>|7aZ^+PS}%=@(!a%ZGpuomJSoo+iKxBKSz0TCu4dVxdHEt;Po7 zs*&A`z2wXqXimX=eBpt`TI<+UU2bKnwq}S0fzQAJVJBLh)%iIud6r^l*7=MWHQ<xi zqTyZCj6=v5wT>4;&5gZ#H!$|}Iy>*V1;3!vKePuyJ+Ppu6Tg=S5625r_cafx7xMYS zmy@15+cEH0jr)`{!}3d4UlRuS0gZ0>X-pH$z&}cDYPt8i7i*}@p>e^N-D=jpAllAk zeAfCuQrcPuZ-vV-gg2>d>N3#y=g~+8(`tSsz&MoH|C<EjkswI+lZ1ou&lzM?@#%6n z{g%*5S_=R;)^6(r6-RT*Q*AiRsR}W=@Z*<DTzq?=q?r<m$s5?y)1fWm$(5BG=j)x5 z$@<h0fC<vTF8SwYk$0sOeA4jH&2r$zzGV#Pl&N(w&qOWni}7h_KYy3O9kV|p<>6Sr z;~L>&{c_QaF3T@+;EL8m>~aE8EZfP6I+FDA*vS|;&VZI}#1;9wYvyJ(-rzJba}oYs z@$yPB1iX&<sg6hb7c(=Eys*aB7dr_PbSBTbJzo_X@?QX-nsXlT+!q@>(X#oc^}zG; zqF?jDA}Lrxk^YRAF;@6z7Sow#-(CSl`NaFsm8GST**b$SrG8{~l?6Bs0>w*EdHb<~ zRh`iq%4o(1X>zBhmjOfuA$1i!n~4JBx@;Cch)|lsm<k}O01p_*z962*P9H+uKFF|n zeFu7daQ_-wwX%CA`9(|ifu9rVIZ>osCD`i3mDS6FwoaJ$X{%<>lTUsl+3DEgY{Kvl z<{68aD`~E9f^eSo=${eg*%okp4W~}HS(jSX!$A||f&M<5s55Z@Kx)D>t*b6=zpQ=v z3jPu-HVW;Z(BMCaig0C3(sD>}8GrA384MSBEH?Uw(~yI9SU|nsZSq$+e3)S@yR`_7 zQ;=RPEviV`QYw)`tT<<xE>ujW)FhgM!G(Bx&&;cF{*IbBCs#@L&CJRi#ZE$xNDOz@ z|KErtPO6bw3ZHytXmq_fj(J*#X7EPt-(7FaG<`gB3H0M@V$)HVROvFf61vkzpYM-W zZMELK;k?W7@T)&!@Lw_3G&_*cG@>1O^X=w()dp+congn4Oyf)3-~{fSZ>YxxCCYO> zgP%>SX!(ErVwH%Ar?n|X6weCy`Y+Rr8PxV!%6}r=f*atA0Ti6T@ob8bED*oUivLka zA2qt>81^GbaF)3K{qhV&>dm}msir30DTH%(R6Sxi$SUe%3o-0r+jaT!2#4j!3v22w zDc*1EJ4Ja8+(ITBRLM$ls!3v_f*c{|{wOM0(5K3^O@52P-9$ep-bB<&n_K7KH8_4c zoDXguJlK))O8{gL&0F%}hpE#fsg{ovt3?M%1*fL$_|E5CNf|zuI5be75ertxf_t`l zDcr$}D|0CbUQeK)1s-mePYd~SKH0|ywwfMm#Cn1ck7E30%ZS%vhu%DBGhTBWPid5; z$9FCFn$B@Yr1_T^`C<qCXdq?1A#={9&RtOK_#SYe@SFnvroADJsLLng0_u+LH1~`L z4~KRc=JU!q{v%FQtue~I$YUF>YObQ+jRB)RiCwPwh^qQO@0ZIMUA2T@<1;C$hoi(9 z!K~5LlT70gV!<qQ)iU|}QRm*=Jgvf*bSu%$qFrNGUe7-4eU!{n?$&*J?1y|J9Z%gy zMv<f*C!czCH5k5w-lwVtHeGmM>s!S&m#oCDFd)a4RP#8+H0YHk)pbf(kji@_W2q}? zy;<~7Go?KO=49c4DegXW5EtvN-}0gocj!Qgn$g=s9|vH-+-8cF@l)RITs8G7wXwJ} z5V_0rO3$5d_ePglvx4y77V*)SG~z94!51lW^1mnZFT@B#=L0Km$*?@hH+@E(NrHSY zZ~BY>Vl@^dy+#{S?4&L+9(H^9LDa#<`BL2%<e)<RyE6jlN9(OwJ}x=leSQ`qxYe^Y zf{|pc|FOg@Q%iQyHRz^P7N(wF7H--M*iQ*`s^P1_x}Ayv6<9esa`jDU$Y$cRHtoD? z86gRKu_APYIVLT-`&#_mJC@RINsrx(+F?ct%e(j*=jMQkA>2}(y>`--?oIK_T5_u# zqN~DICdUqwKVP-$l|hWPL;L>jUJY1v_~|*_x6g{{N$(N`$6dbOcml}DB`q+6!d~Uw zpOw{)5ftUMz9wBZ!Cs6@M@K_!v_y;}oH#LS(LoM(KDKvhfoca2dvQCfL-eqMVNR&* zh&91bz%Z(XU<7}7FWpOI>`iI?s9L1~mOA>iH*bdzyRKcweOmFxqnr&u?gXmqv6Gq) zx}r~dxN7l^O=IaWz6Ypx5lWc(aogoyH2{C)D}%LMr;72u4f#-fk~@vsinHX}mA*b+ zC!6M$iGlIV0r~$S<cca!5-~+@8g8nb@(-;}w789{69u8fPsuH9UEgj})-MikH|IYx zg?{ba1ZUrP;`t}6kZ!<OZeTxH|8o&}{TU4pt}!j1J^c@9|6@t+$CCjLlG<inM_u2Z z4Gnvj=(z)S3d_iin7T;3PLKuQTK@|cua%}HB_4l>D9q-&|M)YA6*rm93_7*#&x)$z zd@-V;U-SI@m6^{|`V`r>w*^WPHUq-Rh(GhrT4ZCh-@uZT#o1FE$C?j4DgLm&Gi4_! zQq*_EV;Ns=<2K1WceU2NaQn|r4Thy^;s$~;z4)Ec)<J#San6jz4p7f|hF?&7nh!h5 z{8s&ZT-7kCI+iVd-?AW_Ob(;h^am5p|Go+Z38YHi1SZ~VMbY{88Jvsn3R(OoM7%An z+`CV7RLj1fO-`lzW`lYrNl!Y}^LOfJq4Ee{hg2u<YyUC7zzmkBSvvOB(#0)5#W`;P z$39(@OlohYY31_wH4nQEU5AyM=G-slcaDCC0Z08(=3x?b4>vWiiRyX?_#_&BC(*zi z7uf6NX^LAXraIH-pZkEm6^WVto$POuFFgHwk$wr6Hh1tDZko)Gjk)xvC!LBy8c6CY zBJ9i<wL%E`0PM#wCFgM9vLhREbKz#>O!hRUTO9H!gY-B+#O`y@Crv*O?P8~8RmWAY zSj~ukZa!MQ^8bFFP!Fby{By$kp&S1In1o0Ob<*MnOXirU(yQ!^WCq}lY^Sd<bmn<? zw#Zy{Ix0A{NY-W3eHB0Lwl|kLF?$C@DF!4-jUzz8eQiBMsn4(eB7xPze`$|4U#BAQ z-!g%g787ESC+Q!Z6|y|4``*#jl?SRd@Olgq!j6_Kz{d@)IB-lMcx|O>nc;L{T3UlL zh1Oh{mLTho?%Erw&pImIaXzaXQPEj7d>x{IR%SoA?Q~3F6cC0rlAm}M`<okC(kn?i zIEWoR+P^!T&8jnu&aHHcCsZ=O&cT1J`}1=hE#gS1uj9Rj&6of<+v2)bcKuakuXFdw zyoZr~f0{c}R>Nd|O7Ajc)Gnisu~^+>xS}YYl=3Kd0l#mkAXJ`u)TTiBxpPI6A9~20 zBMe+FiH3hRCI?&j0y<Qw1K8vk2Ey>mryrOfLSq|ri;j~PViv!E`h%@94_2U~s0TZh z8#Irif=b20>gNZHx2LS_;ume_>80^iH^<-|86O$TNw%^36V|DqEzuw71C?;iy0#Oo zfhBEYLj^1BbdzeY(LWBdGI!wZ3+L+NEIX<`>v8_nMzis&>g`9GWnnK=;PkQz_d-@# zXbFh$X_#`FLeiSWc7B74MIg&v!0FzZS{EZ4Jj&IY^=H1P8>zH%Rf$8qbGfwf5at}J zv;@?_pH@Fuzm>b^wyef4BM0B(B@$s@OAD*bR+pQkm;114Qa7C&?R@f#vlAwD0&|hI zT=}2tV^ggcd4TgQD{sWJ&tBXVb&9?T{NLJ!M*=VUz6$L34Nv*+>-hJhEuI%?B*~b9 zK<)@pKfeTk0Q3So+P|e4_nzY<6wPE98fyJCg=9gXOTq8vpJHsu+o__n5v@HK$J+<Z zVmrspuX6F&yeV4^IcN0}>aONXwc|$9zTSDndo%3q+c8S`uAguWBkk6fA)Juh{!L2K zK)xV&evTni`mlyZY2WqrSx?IiEb)}5N`vFf=vVI61ny3t*R{z`%coP1UrV5&c;UkK z*ybDO93|OSe4x9zI@+^J2skN~j;2ydhehXpC2g_Dk<+Kuwh;zD9=d2F+U4$;#3j{^ z<E<Gor^I=KbRQZvv<3$7N8-frw&dlUHQ0jmp{Gy~AiMrU3e}{w9xmylBqgsw>Q%th zoXj)pSj3Sn7gBAoa`2X=?EB>t@UC?98ceMu!78)tcV!CN8?~~G2E`+a2h3!z^)v*H zy~VnYyb0?u^+%L%DcpNfU|bVd?<>Z(#nGa+jPP{Atzq{cMEuaV2oGoUkO%bqTQr+B zAEejXyYXXQVGgnO=rGzEk|R7JMW)&f4#e)PC4P#!3R-G9J)Gl|uwE2v#P_awSuZHP z+@r9?P|U+TAAXa;Q2VlqFP*)7#hSh-bc;ki)rUI}fGH7jA)mqA3Tk84#>37`Ia9ii zRAM2KA7B1llH#3VCHImr)1=me$|QW}RhsXcn}Hjxkn9h_z@FhjS(0n1E`iS6j<n7R zWHKiZHDL12ap;M6nC~c(;@i*Qp06~ut9S<xogL*aTT#X7+^?X&2oxtu>ei5oqw@{g zu=H<7^2Eg8=J@_+AT2oFS|9I~Ww6NNd(wXbzp+?;7%L9?IpcGq;$+L19eUt&=Dw}h z#$DH&fy}I#+`I6YpD0Ad;t8ZX%Ya3TQ&fVZc%~(3o^0Acf0{km4J|i2uf#jag01sL z6yBB;2@-kK;+GLZ9ccHh3>Yz_*QFgqOR{5`*Q3eT^q@iTS@yh=hpPdn6TQL?yS>12 ze3s;Wc|@J<ad(~U$xW+IzcBn6nJ7blyg~#^heqbHaH+4@rI(W?Ah7kxdOVnQ1v{%n z*#GCkw6-i2f)inIu%jn(AoH$$>$Le0Eo*z-ci`@oVW*IYTZ{Lv3*4#D!FPEM2es#D z2b4_L5r7sQAc2e3=~)capg$L1%G!a=mWCEWrV6NH6B~W1I}189p6Ol6kjt*)5`US~ zseSPl1%{zrjM4HR|46>wyM4e`?7m@wb*!Mr<eFy<>}S_QJW;22hKK{H3yaUNiR|-Q zBS|WoVt*V?piL3J=XFk)#J2TI|H<PYJ3e@y7-La%0ibm+mW`&3uX*%TWd=9QhBlY# z@yNR?V7+auHXYtg{1I^`Q(C>}<ZK%^AFrjU9BDt(kj|5x<za0f<{0*PJGDyhub06) zP_^=b_t86fzsu&%GKS|QoT^Jf=(DV{6&6s&PX-b&A<*{WtHAg;%My1`7tN`KkEl%L zUmW^^6!X{)BKJeF;lG_|5eIuP)MA~(qjqhW>8pPWo;&rt8#VZBovwi5e%XD|;3zD< zw&Kw~ZRg{+cyHjo3D%vdEdVtE|B85vskpj7F&oql6>szQ9UHTxbT}haZ=(7I4`S7D zcc>8J6)WGiiROCeEn)?RH-QPmcy*Py5JhTKyrtj;3f3CIM{Vea@X|5!aNOOS<#dP! zO_Ntk19p^^Clj5u&4OLp%T8CC1YyardzbT#GdD+dvnGww*JZ}^#iwGc@vVaaN{jwy zOu~!dCSj*-VuJ4?vTS7VcuVMJlz|dfrhExub{~h0?$=wUZE5YkGR9o1!~ntVD_NrT zLoT1Owx~hjy%t)G=bxgEOXz0Rh2Cjcu-ioioymwft>|vN5EiA~e7iDqCC4@wn4*1Z z2UV4gQqUAcgb0%33DVHp_p6f00rI7$)_nw3pGW_2CjLn2i9hiv`g6OrFr-8!Tr_3& zR(GkU^@uHr?`+E#FyV%1uKUui<})Wr<N3f?x!J6yoWMfzHJ5f(>w<AiIiRn7#J_yf z{@;B7R5rnyD6gut$YDgCX-rLx@Iu)C&C1{@;l^7k8-RRn#<R$<%eKQGzwgHGMo+VQ zJZX#e>go5R*%{FrX}XPeUrOX&a^R$0Gcq3T?J21h5vH_bP?_5!{<x{~HtfgMHC9KR zZ1J&Ew4b&CT<*OISrB|}*aa~D{wY2tK0KF>&0oGGWBeB%?pl}@-TFv$?p$y{=@_5s zk+n3Hu%wA!`pDA#&}frS-m1f%<-H)C_46bIwZ>!X>I&dEhc!V&+~C&D%t2H?&ll9u zn+EaS|Ij5BFVT3Y!h&4yFM}e*aHPTX!<_Pox~aW6WAe!EhJ3B()08!VR^v*)S>Eva zTCVj0;%mMWRZ?(gvO$T{R$i2G?JJkZ*e`%1z=pMUmPA6L+j1~+*QrLd^p%@`j8C#M zhjC!O`ff&Xo?2^Tn#D2g`Y0ge#XxX4ULA(8f^+zS!HqgUcdhL3-0V7M)J6QKT6~sg zeRc`n+Hx;+J69%W%T#q-4SI&lJI%N3)X6WqoH~>P7q7WGY#mCt&l}jWGl?x7Z6QCf zGiwh(JK>#;bTALtVhukz({4%@cd_$6knD|+;D=sFh)o}pTR^o_le~s@YYxce^65O? z0dPh;SS@vWc9B^Q2d-vWXgpR5dVShD%k+d!ueZi%`F%AzaNH*P%!4XRaX#PCHW(Lk z@Mmg0+oGQFybZvrLaQXfl3LljGpQpi%>?st2o24PGrE<lGoE`XFKLgMQ&;c=O*{`I zWyCNi6jxr0+#yYJ=-HIOynJ5h`>-P7jh!B}I(v`l$Kpn(9OW6epCn>wZ_s0Dk71bR z_IP1m)Z`?Z%57==+Lv~cmdfTGm`j5>lVMzUOtOpppT@wAMYzPD6%E%q*sg`&6jB0g z$1q~q>JvcGy8L2`t>dTFBb{mLw{Nk!bOh%`A)1-oX4_2zY8$=@V4f{t5_$0w_$?rj zPDxZ9Fq02efE!F`pGp}5(x^`<5>Z1Q1WZIh@T4o;ow@GT`W*&hfbp0&Qb-Z6M6&-r zz1fG^RkvtLs^>He_3?q6Rr!<`KGqWH%=W*w=cV|s(T1qcM$z1VtDNz34D!^Y<;9~C z#g;3oC`~>2bC;`_j$;9Mh)}6nb^SuhlSCC&IkE`0Hr(m7ToN7A`bJn2-`LsKVTH;< z^tw}V5RL=)YImWB?2}I6;i!dQK5Z7af1bS~A7<&$HIM{?PGq=Q)2OT%etr|ukQf$! zYY3Lhmo8EhoWKq$;d|8Zvc-t$n1RAE@BT&N|GWSUEh*{;hn3JN8023|&mT2+$(WEp z!fLej<T4E=KA+E@6~<Dy+?Nas-wn-xw8<W{soXPRm36tf$`ZOiWg98O*l#|};qosd z>`CZ0eDN6vj4tffhlS6t#U6x!-eDVwQX6MJHYfC1U>oT7NR|lTh!sDXt^N9dT$)S4 zQkH$14a}K*{u53AHebw+a|xq-G|P01O4yUEa$dB_aG#q%uM$irjRwUItc!S&BrsNQ zHYD*YvDQ}2#_uhfWK3cjuV1nG7>Ks#9cC!o-`LYk5or(B@Eo?})MFYIsGUi#6Oh>) zVTXL*wZtU+gBPdJ0uJ97QP?AJ2$yn|B?KN)gOxbxJkN^I=Spu$j+%>zCj!N+$(j^+ z5G^V#8;MPI>~&mb5@~@6B5j#jwL2w~uCqMg^A{tNBgM;+R;4-?-Vy@j)&k<#7({-z z0a9J;c?Y?uFz>EILzCV#=UDa?e}$!Y0gOiyu?oo$QvHb(7e3Qb`noNew_9QZnv|D~ z!@teHxa%NkgsTeYm3oFlmLCu>EK-$PgCcvlGL@}dp|t48zcPuCr!L?TVB$y@S$tEa zuhxqbBd~gxWbF*i0DeZGBGTONpHFQ{I2#c-BajBHr$k#5hfzRZqH^`*DC71AemDdR zd2TwpdRgc}sNKja`oFh|zCb1pVi=EJ5yy}G?@aK*2wPwOWW6->44}jzLYZ(MW;)Ie zLY84H9!spO81@wb$we5;+HIU7S%XV5(wO4gRmKeWn1=Qvlxnk-1=<WIqlW?CUdL{8 ze12+NL}?s+LAkrZu1twee#^SEaNwKUOjP1S-wyTFr%<T#9aNW<*w-qr)EDyNytX=< z-YUf7iU;dUnLd}cdK<M7!T~^7{7$R?8OP?S+f*l&+p%j+db9mCsS(_3rRUCNlSHfY zwkBkNJ#<Q(qwnrx;LAh8gn$_Tw2gQV(o!xst&DGP@E%H^Rn{pY0sh;il=S5MHNu$A z`^eXq$=+=bN+jrpHq^BF`ZKBbszPYDHkxkCSkq??UXkp*)ZSB#G;}#>sKa|XmxtP_ z>ouKEgS_<L$pM1U3!)66!jTU$zA+p2-I07_>`24z<xM7FZ~vzD43(>C9wzay!GLu+ z{btHFM<4H2L6D;9Mk#&ly}8+i#lObFXhW&1c;O78)7!7=ZN^QUoz;`cX#3Qe$soT{ zaEx_FZ+XoNZC3jUiOF<|??iD|B@!dVvbH~elsijW#ugEW?a^b3y&OCi=ej%zAcB;@ zE?BF$edt%73!lfMA|+aP@rO@!;tmf_Tlpv!RL0~(R>s?g^vJkjl}hKgIO(%ak1ShR zm<Z8cZYrm&WcI~S1?K>MsS@wKi50~RlV=-2E1dLWl4>hsHKjGhS1u2Dm?yuH&sT>k zaeHm1+qre#x%%|AT&m1Uq<`CwYY$IDt_PR#s{E(ZE=2z;B0XJtGWUN(q)#!InNM*H zTUIyKAuu8O>Oj0tZM-a&Ym~@GQr~b<ZR-rdQt3fIKKEvDLJYm@%pjky*vM?q41|24 z_uO)F2Ec!->Xrj`BJlFzqeLeW;IPZa>uTcy#Wzr&r23mcS3Z00IixftlAkldV?1_) zTc5Fg*rvcMz!3h4p;PItDBF12S;MO*<2H$FPc)_)t%)<N!hpb0sc#?Z+M1>~8o8ek z>*iUk<GYMf4_p}j$)~i|uilS3`w63N+v|79u*(UL_i_H^Ka7*U<-C|BNF#c9RjyH9 zMxPW{OKJ8h5@$UcA6V?G_SDDJE%W==p|^vkjX{?@*;|ZmcRl4dDhEYQvM=7OC|VFK zXlBsBI5+jJ`gy`zA0kI=9S$w^&JzxUxTc+Zo6_0CLQvlc&Xt<z^#)o|21&8?@9G2M zEA1WY5>)lCM%O$9-%JZnwKH?-8wAG))@o!*XF*D<?G}x()H?#3YvK<Ht^a*x6--iH z-%+<}l*45<_abx)dYoP%SEu^#>E`XAMdt@@^%!NENLCgsH)fc3v_^zj5_x@42Q&Jv ztN_1Isgr(n!xJZWDHoyOQg<i?J#-4`O+~$4574AKPyffta=d1yzS0v(3`drh`qoT> zuKmAPq3&)|KL$G+IpqcBXw_&9#6hw?h1MtKEv`ZXlYEwC<JVBqf=FiAu!Y^%1VH)? zOb!316&<0#Ant^uUD<>aQS8Jej2o9o^_uo{u6x6t4+S0WlesKgyh2vcLi&nK{Nz5B zm4_$Ne%7MR3K;O2bJ-3*jB6owo8?mAoCR;i`TcFYJjVZS+>P6d8vl+V=#9HL<}!^{ zQE(`$VD7?!$FeTmxcMjJ`+b9bT+dsRpETNdR&kw<gUpko6_pO~8#r}_tszAM7?rM% z^%Ey$+nd+)$#0Ie+WrONG>Vb8B=g{arYrYr5T{xlc6P(ycEwbCGiMABiREQsqP)Et zXAX(QI1k#0j^}s%56mX=o-52rDsaikcY)!L8rU)I(g7Y%Y__r^_~V`RS;N^rm3?)G ztWu({l9`LUyic>`ZPtSU&fXu|=wP_}@jv@Qyx^=((FRuG{ifF<L17jMC<k0fj7a!s zdA}hnv!$g4otOCSr?<U}xceJ`bKXY#LNZzS87`%b(GG`RhTyfA-o|6*%u44izNfqt zpPU^ugq8^^pk^igA2x#+>L1vk2P<C)m<yxp``l_3GKG(=EkA$ZZj#SdzG3=9<A_IO z*SP&EJGW;>Dp)X+TIf3T2IsDU=HXnzE!cJ)=J^6+tnQ2xt}AwIgaDQnq9r4$)az|9 zmuahLTP`Yhqx75fr=@_&U%Q3vaI${jS}Z9mLRfM|@z`F1e49w_$CO1Diaxf_+3%F@ zVe)tBj=P<am3|Yf1dpjF)4#mwd4RXgrxVi*fwpZ>I9@F^tafe+nPUypwkRa9q}()_ zM#kYXO{M+HWMTR$r5$tx8|#dET{cER2Nn+KI(N9gdvkZvYRs|)8cJ#z)Sb?*-;WM1 zGK10IX#}g$pvan>ZLItMc1KK*;(M`WQ^)04*8kWup*!XKPk3H$B1xR82<-7Tc*DB^ zF3tB$T764@>c$a--kmd@4zb+aS=WPgFu_R}McxVQ`b5SI6wttO5?w!n*3pF9mqXaI zw9J2!tMiu(kz{Req@}(Ji}!An*AjjPd33-##P7=VLw9$Y@%MYjflNz=!AgyHfQ)xm zt(H{P1GY0aXRfL-)2ZfwF)c~6^uio#onM6??D9YCPomoYQ8%MWc75nlyV`8vAZm&A z+UY2e&0LVyk8|C>8bJubedv9A(s=uCXYB>!(3L9ax%bzhSw=EQzmX3td`*QTB2Feu zwP}*dhQ}aTV4P>yw^@ukIXQ#><h<D}S^0fl&LLJvx`q*U=18DM*_GNCYc$S`BFHQQ zuwkmt^iBq(Qu(g11@f=7)lN@y2~#`6^s%lKs3F1uBMOF{wQ)j+$FeWDNSfI&&%OKa z`l&Myef2m!ldnYi8t{Tj>K0)7@4i~&ZD#CtfZY-WUKFW4;hO_y-~*$CB}5{7E8w-< zJ^`*mrisf$5V6!4cBHCTthxwY>2XX+{}@HyCJGYZdemmAX!wDRzw$lNPw3vW*Rk0? zP#&{DV}`A@R{Y1&Mn=q;srB|At%m2Z<MpM^(H=u!2-*~bOf#+(kjpS8Mp^(bh@EvK zQctn*EsFq6e$ktUFr1h@_r>Euj#NR3p-|kqI-BG*P&V?^U~9|cE4VHZYf{H+y~rhX zmeFNu<+rfsJ70xYo>Tu3I~U34YqGZ%Imk`@H>p*MfrsW_u!V!0)wBHUqW9!uu@}hh z^><thbSre>J!)j=!8}J@m!H@rfEk8KPEuY0B6&vY*<J9gvNPv(tqR@&Lk_P`)YGcD z6(SB+UqeC-QZmmp;q)bD)qd#`nSuH8J6H8zxg{sCd-U=VkmNPv88%mEcfCPgsE>hA z-t1?|7mg|xV?n?Tf}s@u_y9$E8eGI9q|f&6k8z|jV@CZkw_dQ0pFQ94`9h+3Wo}OX z9Iy~}wY6nYtd#Yb8Oj!aS9l~-KS`2kojjV(5bR7173<hjz>2BAU*)a}D)Cg_$SF5K z97+Akn1%7Y9C=O_|Au$rSG%GlBNuTb9$x}b6N)v=nthxj=3Ny8Fk9)GX{#9zTzt6E z^GQDAVqBHj6i#ovxjT8c{-dt=brnC;#P)A_bykmoz5;3f!nNfjoXm#b<5D_p^jpSo z;p)^^L^VO5`h<|0tAlOCNV(`!XXhtAr4Ra>@v;eTm$zFUqb<z%*1lZn2RLuOsgw+U zI6oF-nkMKrgQ)HV@O)C%!;`qF3bwbpsK`MumGt}B14eX<A8?sw^JC!0(ZiCj{WR|j zhFO>L42J2k+D#_sUf<GnV{^ib8Mcp(|1lKdzFDx)=rW4ONF=t*ek0P`($|_N5W)*r z^wujp{9hA#-~R8A=(Um;&-I^b6ZBmw-`JRG^fMXtk7YFg2gtHdW?Pg&j@C2wzyRCw zjZe0-qF`s?Vp3y<2_)kulBRyL;;!m!=`c$z_sSLtzJ5pDH)cdF!ZL~5iqmJ_(6yLL z12b>in*n8d^Ik`Gw%(o(vg{y+kaidbfQ))6e;spz5C-zx37RBz*)1)@>}N2mPO6+) z9FeHCbWb+gUo_;kSLWoEN9lEiYQVGPJ7{~gne(9aqVImN-j2yw{#LVwc>m^&>SAB? zOW52W#<TBzdg5o<vr$?-!Y4%uQNoFQ4$Ejqm{KF0aL38~o|6Dl&$|!{#8gcZJi5|b z-dQ<IUhGv_$&+&#=mP&2HoXz%C9K{)=QAOAazaR7`ksVT?2c5}WUuaY>fuG(XpSwe zKd4DAaHZ9H$pezRo!^2}bLnohcY?pyxv%&VgPX169B({4T``0I*yGSsqEnzCb6j{_ zNaB6<t}UOJU36@|fOo)zE<>F<Aq0J4F>lkI!?1c)nT^mGRoG`kbEW^T^jwC0ivmSs zCtr+VCq!PUB|pS0qoDjMmRECUF%fr0O!X&izmaqCdK$T7(@D+0O6U*D)82@8-P!9M z3}^Z1{rO#5f+xx1gl9bD6z<D3E=KYJK&B^G7}S2EL}g1i%wc_yPGX=jEK^XRVE9bl zO}Y)dB)yoC(p4JwcwFXmWVxfh%QwA|NPaV=VkpXQiHuJ<<wOxTjxWesc=k;W&Ar*? ziKqx4>ZB))&GtX>q0axhwr&K3%XI$lmHkV__mW_c=c2jyGkD)|;oOTs-!!>a^=5h- zolAFL7XMj4oec12jyjY`hrJU#6oSVv1MI;R;NrG@_x;xMS)l$s_zhL}pe(1*24mfs zp>gLIze@HZ;jkLeEL7Y|7LYFJ;-}cx))HG<XXnjGUj?c#oZ>by-R=`h2Cj)Um0zh9 z3ilg2S9iTNopJHV_Qk^g6(Zc*4pJHIv^}$qr`97@wh&8krEvCb8gZp50Qvcn+W5u# z2?<93cv8hrVpHiKCL$hNHsrDug>xI;dIZiYs|^r)&&#DJhPDsOXAG#GTs8kB4cb{o zChac<j=F;iG&G_imGS&dkLC`(xN7*Y%efMk<ZX_@v`=RQtXaIogu>&N#&XaR+8+(D zw`GUZ;t7v)MY(<N{=hBTO|2q`>M;6yo-tvL{M!8t9Pek&USC^Q_%YVkG$uEQrU*pC zR&tsf{g5px20epqV&W_@N%WSmfw9zO)xc%{-1~3m{@2=FM!7rwzN*N5MW(8V!&1fo zzR{JE2?E7+Tm91lX@PbVJ8E?ihk9>8=-jFLwZ-f$$FEFp(%>1nkTnn?6__r{GHHZ; zr0R=XU3#i~>(=tQOZ*oJGq3Di5a_JUkv*$@H>a+Z%J>owv#xGRvEw`r(`TChD=?S$ z)?>{(_*C>Ve>ckI@5r_4$UxGSdD!b8{qDb%Cl3(2{l|U{e%YU>;t&Z*V9;{H7Zu~5 zElZ9Fb*J@>RU&3w=5&=wHBmAP!3)p&qxJ%Bax;Xy4Vrl`724SxLl?};uuexyMvoVU zx?J6lg~zvH&nC8{=3RMaf6Zo4h&X6XFimw?_}HpO&BlWnNDVgBbTYjfp+5dPX#D{& zi|@BgGnW{{IEUIuF+F!@TBJx^{c1Z~6$lzUUdM(x@<q&&@~DJv*i>Czm0dTkMsaA* ziOQ4Sa&0ba8@zoo03tf%bBPZZOdfSGk9Ex+KQ*RAQB-k^`jVylZDOztek0F>WhZ^- z*rQcww<kU~h#h(_Kyalo%}5|h#qWiY*<}T9N4`4*Ur(l6%3kK8-N#?rY;{j107Xd6 zua!51AUb7}bDD&MLpyI5UOR18i<*|dIlcJfExN@K85;d@(9rrsK_9(ds$5J{=e~*9 zINUfZ{fOTEt*p2#H>*)aB+n-IozcPvt#q&rGdk=V480vg?YC>4UKSD_Sc0seTk<7| z5r{?}8pXwQF}Vy$s5`(eF9Dxr9ofo$Q<@i;yMnhw;eTk-x5st>YK(SWe{a*>-MlVb z<>?QsuN+ikqtanWuT<xTqKcijTGWQkVGup!eETd2>_U2w*&e*XSasAU9W%mnWndb6 z7tqkg(RY5i`~sD_?0QKU3=~%91@5Ws%6<ah1@xmAx>jg@6_EQ5ybMu3NC{IVJ-b>8 z4$G`8Q|JoB<E6d1T2DHwZOFL)c4u;3@LglaDTZvf=YtFR2?6{g<DJ>Ar*5YUPhfl$ z%Ke)8#fhVa{`Jo(n*X>u{BTe}*Qchd!_fV|;~84f`VR(qf&NEx-YGiX_LhBl7-@uu zbp^JQ=*KXzy1Kd~5PWuK#?RK0k?%lh<SOby;W};!o&0^uB%QjZD&Nm%V=O&6oLjH_ z?K1mqY=yF4fzptMA*dEWqc;rW4nYU*8pTs%4u@(`NaK7Kt1JC|hCH7}ARB(%jx19r zSYE&cEh$MYD<9|n_811e5iH3vG>l%EH5W6psr@+eS<rhowg#kEN`8tdxjTbOu{LpW z?6)xeQvabDePM#0)PJAy`7dsC%x^UE<V^tlC`;APe3f`ZmRXr%``+M0op}j{)0SpC zJNFA|oMiXPV?{Z~_jOb9KN_eb);7G+tbKlzdoqX(E4Y1AcfwQ&?V-IoNS=4nw(Zo; z{w|<VH@fp~<r0sH*0N9nlK*<k+3bT@b6y(aWk3_jk-t^IsTiU;4u8l?m_npxh<7cX zWSxKxguZ|iaC<Xa<*vi`rj92KKrV0rM4Z0k5j-U*%n!11c<rksfoyfnbIY@EJZ<|2 zK@&LZ-0FBE&Q0>!ArieQr|ESknb4EFOgHsP#uo^5zl>BmKB%wqywZd1pA<Hv1lTy1 zAYjFjI|e}8&Ue?j0az1GA8)IGJ-S`aF6;3R%~k;t<siiTRZMM>XJK$^{Zs_W89mup zMI1Jtv=tyL!h|dV2a_}tvOI)MttM3kUwJ`45Hjhy_W8BJ$HC$P!?v$!E3&t#-o<;z zzxsZ*Xr3$|N(d9VgcAIHHawkp(S1h4m+NGSkN(SB;ypu;Wpi28_IP!8p%${(W8J#V zduT2FuJ0*Y;9xbmoZJ5*i!Z3YA%&cr+~xY*uI)OdA9n|fuYVLH)5>rubSvjf_KA)< z)40;s)$C(4<q=OE1aZC1(8)mvxp9X>jI9&*k*Ud-pT=v1Nh(+)0fOJpjLnP+<->vX za4EN-TTGnyKlLj7Os=HN%4I%&2)b@il6`1La|3rXo=oFFeu*rmiTaR7TOVnqw9HKH zFACdac70#g=_Q+a8lWLFtkU*4Q^;FTmn)ZB1@|CYGu5beGPcz-S9%B*cf$R$;*<n_ zQ}PAhfB3UlA5jeMNdhi1)F-_7$}g7SIBv_;hLUrVL|(X!Z7riI|Kx>5_A$6gaFrpf zAB>qRQ!ln12b55{86M=;F}!t_&kd5Ags3d2rOCN|Lt9csC3|$KDa$p+;#oI;hqyX& zb5;wk)P5|zce@#KraF+2U}b8}tp$RB07M;2fR5e;Y2Q*HUQY};#!B$D`0F_CLD?sR zw=}+W69p@>ernsE&q}Y-YqJ%$Ez+d>ZwM^kXSG-a&}8xA|D)&TEs>d{5%YU)N<Tht zqU~eT!83vV#;aTeilcsGSiN-MW(eXU0381)`J?Y{;?z)_*{peparIuohPd;WIuqT+ zi{|XjQdh=}`eC|b$1ZJ~Ai0;XkZ^9fRBr$#Vb_z~y&?=??U4~~w?8yT!4Oi6Q8GQP zg+)oH-8ldVa6>p7=q?f4?}C$^h_3Er;`U?*YJ)XLZhI4uDdtH&dQw9KR2FQQF-kzD zE-`7H7(5_Kt}^IrT%%ewMqaGMi}wM2Er%Mx=zWx01x@wypc39|cMQvmIy{4&q>$9M z=I5mU;XtKUU!WOw8d=hW|DrO?pdqGJc@{yjKez7_o}Cb6F&2O4d49Ny_w5I6>K_}_ z>|DC=kwTKJ63~mLnRvk=>e&e*hhk?13W2jHfXACpRLsDRbo)xbTa*M$)cH9%Y3e!* z6TqW?PH7vD(kkN~y;tH6T)Z-UvSt$rDdlwNcd|M5Dl&oif54zgK?Z(51K!<r&_hx1 znc_x2z6y;8TNJttUZ66xdcpz$i(e1LJotP|eg%UM*@!J)pc9KtN)ELmJNaH>jzr@D zzXWriynp;ydyFTCBBz6Oq`Av()S)uGelE5p)*}3uzr@O(c~C$$Pi=NTP{V~%PmSl* z$jkYH4>s9rK*xIJq!Ky0tdxt47EPD?LARvpQi5u9h{E+dEXQ}uRH0RA*2$njODY4W zuTAsWha0Dx%yGG0G1X|(9TFSktQ-EmLrDpWH5+sVd~Xr&iQCPmL6z&*F)G?sQ-;`R zcH3mn8Jm?I%g{ii3n#XOjq|;s0~|776@`YmHqEPl!44tMoZbR{uT4k$XU&KT#mtQ_ zu<R$P2^LUVuLl9gD+f1o>bF8f86zho`%Z+th8&-6&?3D<S6FCHKZG^}EY<>OqeP+B zuQwBg6V!P8&ytE*=KRP?40zM(3s4u8DGHe&#%{8}5}|oWBYJCu<5j9ip_V36^kFWB zc9ypi&j~+;IdjEZ@j&;r1F8A)zSB-mgw?e)+yikYYT;pPXqlc-&%rk#?$7$ei7~+Q zh#K2GK37Qmm!oABf4udN$7EU?tGBl&zT6wR_dAGbq5c<qe^K2JuYY}Jk6Y;()&Hx* zv51js>EC>0Ehwg+Y+jHoUp8mppdBVkfx*p{Mr~N^Oc47j2uC|n9FZM<Yx)&HxIc8` zTKx}5tmRc=AF{Da{bA)g&0vARb{KR9wrZ=(qX<zw;NuuFbp1tGL3_E?Tca(Ni`H~` zX0520+=S^iBUO{s<ns;E!YGFU1FV{Wk$i7>R0=Ww8@v&o`ao2EN@IP0bRC@bTmKWd z+-7-|^1aM#LLvd@x0)x4gHC&U)2;um@oDVx=Ok?3hR`j=nNr#9&Z72SWbf|;LqTD8 z<#x}ujG=^^&^w`U_Y4zL@k#`B@As{9@r^$LFV4-%W7RSfAQTxNY}2KZ8b)-nN=5yE z>2mWhiV27cb$8NG8E*ru?sD{JxnpcE8RGnvTjzaqd~O=StBE^k!3Z>VetaB|Vio1M z^aulwAW?}Ve$xi`7lW|>wu$gkkE2}BiA-h!PUilNT)s2C^Y;CQpxdK}RT^xS;phc< z$TNi4xz`oZ$7RvbG18e8;X&75Wff{g8i&H8*jV(U`zfQsT}dQOr8K)oqEGrrY{)4Z zc*Q}UZTP^JoNl`SLG{k2R6t%ObhHU~M`_GD`*;vn_7ZEf89&3(He#6nSju&?7O11F zs?nSjfTwYoch2*%RSa`g-=|lIt}mRN#3oD}hl~3T>>^m3p{oWhbU#VfS@4wO@J<*J z`7mDw(+W<_)T?s1GyOB#MSn><Are2^7NFXdhQ~Nm)N-<|wDDHQL0|!H_L$}E=GpGB z^7^!S%dbMb*(B8o3>1;@e7Ir;a}pA&@vcilE+Qj)6uXeJLr3ZlLJT~GEUS4bS(113 zOL41KtX_Q#)OIa2=CC7y$Y%LJCvQ?{C^$j<e_A(ob?84&wCv+A?aY<v@8^#UA9cQ@ z_^ySkF~hS#l1T8vCpgMaDE$6&lDw2)_L04ivzj-D7V+Mm1F-m31Mubk!^R4@SJ~=C zJ*(eWbrUlAc5FW*r`JzLI0z<31DCHwzQ3=m`rU5hm+#R?+^}60vk!6bJADNRVY2&_ z0V}z`{bg^Mo;ecL>sK&<>2}^=9jb&Hg=4MH?FH1u#|lyox_M7OpEipSshGDhOR^?i zxdNqhUAHz2i~kX_$m>*mIO}%vXY~K}G`iERsfjMuv^MJ1QG2)lueh|ylB|CIInMzm z@vUH~qVK61q?$gP#nCSl=4v6Owz4&f)uhaC`K2?T&Vi40c=74JoE2X1pxW+2`0i3g zPHq-XU?oM~JH~0wJGS}4fX!^*-=Qo^X1kP2sJ$I$KPrr))4H51Sk_Q1SuO?Ys+MMO zHQm*tQ<G@u%!dk*-Ro~jx7sX0|8X?ej)tX@J`E9}^DaXnU{}gxSuaAiRRN0-$$#GJ z`lxAN)8Yd_-T#)AHsF+xwsTnpqUx$iQL!c%dQ$`<-n?23$n<*%>KBhc>kj(Ie{ADR z0HRZ+^~Qt2T^u`_eS^mM%KvlMlZ`eOCaM)zlWsh~JIUNYeMsqq)5~EI>CV8H=6-@V z%%_?e?_Zv3a$jCbA(1xUgkioa@-A!0ofQJ{J(~CCuN2=($FdJPiAg+O#lj#=sPryr zx}dbm(U=iAwXEjD2nA%l5teki&F1L4{%ZNf=Rafa1q1ptCVe6JjS|&g2_hOaj?3p8 z>t2-LWik9R$UX@hZ6nfe;UNZWne+9LpgC2k-0zJUiDFo}tAjH1A9h|-cN5IY79R6@ zhpojQNSVDZtj>P4W^WrYt=pn3=!pDO6eAQN&28ks`ADx?1-$Y5SwYya$N_j#W9A>M zNIdtgsB0N_)2y`xMPEZNiNPo9WK2Kuap;ICaboz={bZ5|`+ng|ntJ8itt@Y2t~^S3 zlnOxb3FB&yS<QSQqq1pjvSAIn>C<A{lYKQzD%1^|jD?{J%I}|HtUaoY>eYZcK<Du! zOoW29T<Nf>)cAAwQEq2Y5ZGPUN)Vac*Q9v5qaE(Oc>_x~o&ums(dtzT|MhxiQsyjt zARjco7{Yb~N6kk+<jfZUM_w;2s2uLQcz=bGauG%dkwlIDg!;}wF;U*Av|4(T@=r#I zWy{qkf1ESdg+6%uy<0>oZna5?k05-YI>b9fccveN{mlIG;)~Qo*>gMzMupGZ&n-%4 zhs5^&T$#k4rko@xh%$^z<*xaM-8L-=q{3lS2qd%zvA452CRtoWL2auofTBv1ZX}Ja z)A{pb$Zc{eF4t;B|Cs@|F-2|?qTr^q=hOBs-Y44X?7l?`%GsXl7#H_}8`nojM0*p$ z6P4Nh95^E77C1AlmZUC*whisg1f_dD#Shezn@b&*Zjc*gk({?>*pr>F`8cINT9^rQ zVQTs=sodgIX{yjcZn@eM)OzaPIqQ?ZO%d~LToIcXyzZeM!Za)%GssBMmEk?ZV0V{c zd8PQu?7vk0Mhx1w#Jra}?f=rZQmaq#lB3>mXn+4mRc$CGD2<b-RyXH2M36*5P5b$k zp_Tq(k5N&yEP0-CpFuF;te12ANa+V*B|3K4=UTpwbiszp1-m!y`n3d|bg2n*@h30= zfp^rp9QLQ+oyPj!_W=WrhA0TwN20<TF$8NQcVcPjn*U>}ef<Tf@ri!kvOjIZ(9$%g zY_vnNDRnt%{<KvV^IP6*S~UmStEQ1*{OkSy+ec6T+$G=lb=TiGOYTL~UPt|d>R*24 zYf4$8jxDaJM)i|<B17XP6FR;~N+)J)+2A!g=iQGBX(@&pl^oU`;A14yJ<ThwKMTdV z4E}P78HpFyE?oWb24#NUp;C6fs54IaxiCYK%Eq#K@N|ZfvL@U3BB|}79c2tBd=D2u z4=!U-H?5{0{1>m%zqy@noX|Lrx)OVFv(iGKh(+(dE#dWH#Cg4G-?`tpkDt2uQeQu@ zM0?LF1JUW>XVi_Rgmct`8plX!Szc!z(QMP?X5d|u+vWKa1Jj<f`ES(F$LE1E@T`)6 zW9Q7&JpBn{vcne`aZN4+G<nhe4J53Ht{)AbNjOt&N;1fP;v^|>CRprGthW@zk(%x{ zP4WK3(b3|gy(w=<X_UVekN0L7$-aKxEvA|At9MeGIg`}e)1b@sGNz7!56LQ7eRLXT zO?2lhw&LA)Y8s~dcS0orWEcL|^$m^27XQKEj;$>-NBq_qT|<_;isE;)DD;08d*c2o zC`^c2euht$j{JD^<P{`L=+b9mY%57&iKcD&!w2!D^uef~9C#r4)vtI!Poyd0p54!& z63(sqhv+BOzHrP1noWz>zkSZewg`IXaf&H~(E8BHPz6*yd43h~drN-ptCn2xTk<Sx zxx$I#LM04-rokx_Ivthlw+2HnnP5tmPQ#^NA-c=<HD<i&7MuB!=xe~e=S1({c+dKz z^>r<HQOg`Y8AX*6_;dH|n7VHd%>!jD)Btgt2qobz-J);kOn}1v;(9jAS|wy#5P6td z|3FDR161o>s4|j0ENNcKC|a<0{MlrB0IR$R(i0!pFgD9clrGgMec`8Bfv840xf3(W z*c^`2<QyM2_~X4^S^nMPNKgEd<A(b@$J72QyHqa#&P!9^f2CGa>b!p{fr$5sAQRCv z09~daRj2kW!l(VG4%m<2#^N1%_oi2aF1yaVEF-fy?#nwATdv+j{<M9)7=B8KISfdc zCruY3K48JbLIG({oLWa&T1FqGbZX8|dw;~{?jg6Tb0e|@AhLZzlbyj7Z{cFFnW0Ii zdNb_Hx8^1(01s2Fr$gOr-z#kg?4pDJ=vl5@0+Xa(<=(4z`>hFEWLwfTa-3CAiYIwn zo6R_Vf(21$a+o!N*OiMi=!>E7&|%RJhxnL;o0+s7Z9r%a&PpnIdSwpa0UmGl98yGf z+0t)oD=c1jW~b5dl?D||30d82TI<O8Z9hm3dtjw?Ij$_wyaqM(we-9hq;UWL&&7j& zc)k31U6*p4Dp34?Z7W{zW9$2wJ5OyA{jw-{j0`R3C2Qec_mUoE&d}~5fLJ?Ze^=hD zsf?s9;&Ves)X)f#t$)pG2Crs=_OD^hs?W3``DOLcc5`R6t*q!_{^%#~bImLrTPJX} zve~HJ2bzYxks^<GE2Da8U4~bzb_vp|gb2NQ8}$3*O`2bX+v)0N7A1s{)D91Pk9bRw zZo<gTOw+k<JiC6KIt&5p7|OQdo(W&SzVmx_=cF{!t~32HPo*zA=oClK+i}xbFvPw) zLa6PhcvsWRB9=FR%x2VRUW;<>S)#g3OnayaMl(x2VGJ*<@TK-*3m}b;3ueh!XzEmY zk{%}@dDdHjdaI{=Fm0Ajv3Iw}1~z@g?LOgo7tJZVp6zLvG3K0C6Q0d765HG{iRTLy z&LN?Re&lMo6qGk6>QrNq=bF(uS}>OPTqLhXlKuao>Z{|Le%JREQ9z_sq#J|o8V%B* zqS7VZAQGb{(o)hf7$7a(%}|gUV}x|)=mDb!41V)_&gY!-`*Y9hwSV5v{oHZg_kCTs zvobT}r*P^l?+!usSRt?VOO_|g&(E|aBJPmsjSeneiF?kBiXK86N0$pXm@*{XeR=o& zTDN*LjyO}ONB>Y~=Wi|go5tI2;HIbP-R1*a2bb<!X%0ViCneCEZGA0>E=C$E^oXp| zm35uGyoIAk=9QH$C8Ihvy*d2VH4u_mr}tsNUW1l%L>tWt1|`_gQaD1?6yX{SuDh;C zWEPVN##!N&<*xmCMCr@;FD&P>5EHeyeEab8Vg}1u>?jnPCmVZFp@jX%Np<eYn;*Lh zH4>D56aL>Oq+CwaE#f!aa?{{j3X+EJ_kV?{HgCS?C6pq4U6^X?(MR0N&FFWVMl)KM z#+w!sk(yg6Hq`05y8{l*Cxgjf6$=*)+ENncCk&8)`n||;ijPaAYBul9-hObf*Jg3f z9_17<OIV?<+rlOmoYmZ;feG@7?BSRe)OD=C+N)!b`4)J1B<snsd@AM5VQxnGx2Y`7 zagCh9jH6$Y;FVCJYr9$?ZnetqLef*mtnecbepaNR^zVXz$WhWWqn=x&gVEqFU%$&Y zz=t2L@tepxo*M7^Df@0!8XtV-?ZX8nmlC#7jXTc5&9d3iSq?uEcMWvm6`Hit8urLD z!Ni)}wwc_CCw)@mv5kSR7=c6Hr{mW@%8YkE&$zi%&u<AXQq>KsF5JV<=%JZm`54Ud zs9smavMn!0Z3gK+M8S)KIchs-I;0mNViYH8Di54iB*G&VHt;kLzS$sUda74Lj1@PJ zeK*@|3p}Jdv=a`icMhu2m$cd5`Zz%?C(FlgKm)=nUMI&#KrP6TKeh>=*OL`jqk2}2 z7N75xK^<RIqa}97Uk+hfq7;zr&&+tMF2g0=LwxvqU#DcVrSN4p-2ur7Q|Vu?bbYFu z)C^yQs@Yd&#Wr}2#V=6Mls(#girun--!n?iktK=g?WyT&VUpDr0%7xnv86h-FEe}o zY@J1b$GuxCz05x8pURH9S(`!U%Nfd!dtmx09z3gbqYCE0Yw4x-08{<L+1!2Rk+v|o zJZ~%#4lhf`y-%Eziy3V!2ue5u4gR*NeZ`7yBrUl6Zc=^;fi5ph-{-!0TwQ2(7Pc64 zd^@nwpWmDB5{NyeDd4(fcaQT>h;_$0+&r75`Cr$z^j8&WsVXMnzsWvM3KmURb+D$z z_E?Ptr+06mo3%Q-t*>u65`UUw5~iilMkG{6fx0U`qejo&7QY$863z)1XRkygi%af* ztBG7K={j-av1ZN_%kPtVKoAtd$8nhK>(Vb4{Z-`^0e%KSEo>`w^cnhaE?6_);OAVz z+ayJo{uk5A6+rRYq)5S;iHQJvt1s~>2@;f%8&*PpwB#OLrV!%MUAEfiwSy-Ll<&RU z+qsx|+x%{!=5Y?H2=SP)KqTGk1;cq|-!7G*U7ZPp8a|>>>oKez#X7EOg(nYG2CeRc zk7du)6r|4HF{y}~5}reVrpq$1sZ{p&NQ7BOtlr(XB~pR3yDCRhMB1RZXo^jf!|pmy z$-T5#wNaoo;mpt7aN{bN2kDex6%M~1c)pKkQw!frv`(I*#kxxM30<0KYWGYVVLnRK zfwf9a*V{aQ*Hdot`9Ok<jEvF;Yuef}ZES7hvULH82b?wJD?n3;81#PB$(4*=VdCW0 z<GD$yi7Z6&)-jMC8G#0z3gq^Npp$#84W%p5hsIuQOu0Mmg!{<;W&e|wtbMObz*bL% zDKFB^wm{F84+QaTIxFCs)h%2M^|5r3bPP;)3CN5!wIh84TD-~HDA5DILtm7W-1Bf_ zT^CK+sGTlMU-aiB5tmidmAz!v;&$MD;LVA*?jtUwn<-9xyGINnF$0a;*w{F7mEZV{ z6L7p0lYC}PYX6#+J6pX}1HEY<h(wCvuK@!U0f-rU(NPckLU~1!-by1W`%5=5a7uwq zAk6N|H>N?9i2BBL9u0czcleer*2^Gm#l-5EwAn2h-Fh`hBR$F@{|}nxcJ|j6=Ua<L zzW*<tdoT90*xTYhVg&cM8oPmek<>Z_ynQ6Ngd|hZb+?(s=~O;rOBv!ms}<o+NNSzA z+G2aV^0;R>7bZGHI&W;I(L!C`F1HB?e!xZY3`aR2t^k+}2!A5Xk-}gf@tGgDN=`Of znIbELBTB-N(7()ROjF#oAo5og(h9iU5?EEPyzgb&z2P_<kZxx0AVgmSD^%qJ&s-tc zGq5(Iy>;$YY*ad9TU{7}Un15*uN=38gL-gF6&%#GF6X14bj@;I7=*{lI<EgT%rm>* z9Htd9tqjQ6?QREn<=`nVQ?tH;s?dAH?ecM(N6@^03-ZL9tc?ij(pmKeXkcabT-DKo z+65Lb>BJtn_vDJk2%zvWR%W!!Nz^35y_00sTGsELT86x(VCDDtCNi8U<RZm-O<(__ zT*_`(eqPgiNI6o=i*s0xbpUKVe=LK)|1>1p4`R=mmhtcoFbN$9Nnt^}Jv!uG$L4(6 z2d|w8HEDWC<Wuw-#MaQmHi7-f%zeiJ%c5q@@DqS-!6f>%H%`zdbA8)$VX_%g8pd1O zHsn63Lm0L$093_6!&39Tq*-U*(I@`v0%!3%_F@4grVZ$Y4e}Vi7>@RvfCFau)jAT- z(7EvDdgpA*&Qhf?OPKU%sl4aoKF55=M~l`_lMcsgMR6Wo{ZiKPz^i9kH?&8Caeph< z{QgS~>c?li);WvKHzO!tj5kpnxZ%-N^wTL{(jwy?QE2%7%6Z3gm(+H~U7Hi|Ev+;) z)K$S9*NAgIL!7WS#}HsAtTL$w70H0*m5ahnW}j<~QXYo+OlapxY^ho={U~}HW1Lu2 zxUFg6N~3a5U5;&`uCMjXHg!}5O@`y4=}ZT)C8vi!ITJsV3eK)RIh0X~|Ni5@hT0U0 zV^Z9Byii9j@xKw@UE%ZZXO9bar`auo2czDvvO7MHqV_E}>0t?>nfY8qVv3s;(I;<E z|2U(WDeRYMD~=Sl)D7$VB~W2JtjIgL#c%rqdnm&00q18hv>pEX<#CF=C<s+N=9PNU zX)z&)j;}*pS#7DsDw@j^Yq}OWeqvCf>A=IzPc&|U+w~0l!j@{lk-V*j!(mEY3a1@} zcm#&soU)v0GwNmuHZ+4$(n%Y1k6U&~uk@al-?qcef)5)9BO!y?9ER;VGK^ycdx)LJ zfHJ|aEv$HRsUItzt?F?*R85bc)!w5O9%RP}ZMxbzt+?G!AeroQl6Tnc7rG_fsKDCq zZvBCNxnE3F+xZJ&mvO>6K(Wdap!96O=Ue4uX6303Yb>GC9oFFk&DG|0t=Evm*4B(k zQDv)bnQ(g6f^2Yie`{l7s+fLrhyQ!up=Xurw6a2e1(z9u><c?nTS+Q&xnq^ItVWfN zyz0<hAd*YbQm!3WyANlZZsjLW8rYbPmC|Q>0A(t0DP<*6h1BojuKWI-fbAdF<1j|# zYNRzq4CvYd7abaS1`8vTL;qZd%NFI??$Gwo_CjV_&Q3<1mkkSVD?AdcZb>VIo-5ga zWh#Xc{-^9kCM|8=>}=TB>+mz51OJ0qIsR`pDNSF>drwW67Vq3fCxniIMnWV+q~iCt z=9$X*rlS)Bjds5_k(FG-uNwws-euS`Pm+UJ&^q8z|LKX=-|_y1@M3Ohp5w}w-<#!9 z9Pa<n6q|=-2r*ghrJoh0w$Q5cJu{ap+6pdHUXt!0Vt~RBnYZO>fB%P855<n>?OlJF z)s{7~`Cog)5t9VV1uREe@+J6M%+PV1v~|T-{V3?j+2Lc0ufAekC``xg9QOdNWTTiB z{SFuK+4t{S@{Q6Ye*8J)ZY3m29m-*29KK3xW?KgHSQo*@GCAUO)be5$f0*v!0ojTd zADO;_%xX2<&)RnNobLZnb=Z>Agr`@`pLJEhsg&AYCfI)Qk?NO5Yu;~zQ2(D2B{2sD z{mo9kL_GXWp6ON>$a2?Flqj@6!-l^$q%f`UaRb?>Jqk{0L8tNdvY8PImW@~JY3au; z?a4dEFuyOLg4=`!FL*@#>_Pi=k<l0RSQ*j6K2zVKv(}DhC|^Q1*|anNIB~{VKYZLj zm7V|&0o9q&Te=^|P@mZmQER^yC8hc+?=+Vp?u>f|pU)<1oyk3<h-?E(`hg~p7baBN z-|Pi%7iyHrUq%aWe&Uz+{G-iKk@z^nA5-n~B5~*09S|c6@;n2kyeYKL7qVU(X9-Cr zf5p=GZF1<We=<W(QC7)_WC%GhjOY`DAJ$e#aLrFje3Fp`?`&1fV*ESwR2hwdL%m`o zF+c<DNaxB=YtP2e@`uRpXyu8Hmpo#*(g9&jmkHK8j=wG6=qqMe(2}K`@b>#mG-Ztl zmMu_|-CP9=k2n?O?G^TbG&1U#&$6Pk8yAYc>NeZ!vIfK9`9$eX8Tv-*iP<u0V<3*B z!Ae=RG1<#!j(IdxggxpHE*P)~)OmZ)l|GR_amZoQsnk8z;8HA)-LLXT?r%`{i3L%0 z-+VyNGB=1LE_OmAi`1pGthepk+p`*!tK=0qH*(IU@04Ua4m%J<W?v3uzLhq3cFF!y z(pH4HfCjq(<VL@dO)ebbv)Vt6T=AI4={}0w58rL`@X17%9qOM6`91uoob^wEB**O5 z`ZwC|wV1Iu|C0dx^_!NFx1wIJE0j>{s_<|}HFM`wH%~gL$J8q%TD4WZ=OKTeKv~4& zwBIbvAs=?P>7tr?J#&%x6DcfIaz(rd)AXbLVwS5s5K?1OiJ(D8Rd`>6L+r8)l2aZ6 zGW7M8cv9cFzB$#ZP$uQuh9v2#c~fEZt**yT$qZjr^a-~L@^pO{#!uJ6NdTna1~GJ~ zal7r;*E(Ya=reR`D)&oJ^CbXlaXI^m&|bspv%0e{2h|G%iE*Q?RW-}b+l{PKL3w08 z&pYl_J`y>*+ZnI3=aMFHKC%xl*EVek8*|<3lV>LBoc2-4BvmCR6U_@6=l5`6Yi9dD zp`pux`b?Fpra^6_@b?q$g2@|>f~-Xc8UEX0uQ-c2`KNP4=?65&7od8%Ph%Rt?mFbi z6T{Pi3oV=KMA6O=SpWe`>JS{ht|dB3b7{SJ1XywuN6-glXJx?=1_M7Qvs0-VbT@#I zmnV{_PpK%&@Qw|^-nE|?+Qux)qSR#rq=yamc_mwA+zv8ew+e#TBIT1r`3FCUzpc|c zM-b7<7ZV&E>?CU~mLFh4Th2c!Cv-Bh`stu@5hp2pEx32H)%xii4*N4b2WMRi#51iI z$Q+yJ^YKgrYbBy~Oje(wif|=*O5wwg0E{_@$YV$FR<O$)&kN{oa0Hh3xLtk`axrCN zoa(WgvlDmZ$DAYa;U#o@AI@EPm*OaUsGQNUqdT7p>NsJ&LWI_tcojUMd9`y|I284# z2y-th11LIxsHYMnf%^Hhevc&>1)zoEZLfP(psG+)jQD)E=`PE#TcXcU5>r=`4yoSP zVxIp7X_voh!OeT#{A>S<Dw>B7uH6k7N34`k7ZJK&|MD27+vZMSAvghA_P9SrXr`6m zf_1o}Y2t^rc%+uJ6`wRPVAp5bYo!43Xp_udT)~Pb4jrj+eOPbJ&@=0doLV=lnc}jA znE?hSu%myBGsai8tj-{**yVvx(`CHLRSi3wKm@P(jGfH~Nmz)ncwLWhL48mqw-#?R zAyf9*y@`~%o-5M~D~RLkbU|%GVb*fH+lGyAtx|rs^<C+eW?Nk;vu#cAiELk9`~sA! zA=EGcGiR^bHRa81P36aZwANO!L~kAt&v&5SL6YjP%e3JzV_m&FF@$0`rrCKX$^pzh zhA)ZIf+-76NDafD-5e1norR0LaHFUUZI#|=FaScT9JsB67B9va3T$m8(A`EHBwRn! zkWx9aS=gAQhQQR(edtaQzWqz^;xrD3w9Au6YhJ!{P&JCFl#NeKSnC(NMIu}gM~=Yt z+S!$KAyVR_K7|))!pNs<&G^grR2U<~zS&)sop_YCZIm@-18uYT#!BK=VPPE&gV}r& zOt^q<E$JRt;@c7zurP`1_3nFgoQj6mg^JF2+yGTprvkQk>(9#k#?wZPf(E%o@&)cC zz}8li%Q$RSmK`LoE|evG+c~s^ok=|Hhb7HP|4b=pFvQA4H;W|;2yn%Sq6P1If+TR1 zyv$lR$HBtb9i6c?6&&$);Ya{eDQ`5?6MxhDSYF{GD?r+eK0EH#`7+_2bVYg|%`EB{ zt_fH$0twBRolP5nM!xwH?YA<_f9Lg0vhavp4sasLhBn>jiyT@V>UpjeUq7}vpT~nv z^KHqtE3kNxu%9kL;ej*t0<x2lPHNU6IS9t;T7E*^<IR}ehhw!K3CP)lv);|byk@4? zj{i7IH>1B}?#}HVEZ+Yd{h$8~`3o?m`Hm!oawY0bv0E-XkjMJ!SB0|cI;2%g5V>vw z-6sW;z+R^M9uZ|eOs!fWbz@O(E_~LMI9Y)T#*M^zSzJYGBBJf*mh#hQ%+&RbY5id7 znynON%|M%~FnXpc>yiE4QI&=6c6E8NLE`&;f(3V1tmA<bg{h;#(;Ov~W@>TA%Iw75 zi=vZbjeeCii<C44t@D8;8T}fVG*jHTR-?TQGQFW>9QoEobea7fG6Zvt68k7q*E<yi z8(s6~q}_`ocbig_()1=~O|*+Z%9IyuE2eua5s##755LzDWC^b+`m^|+d06!hxf$sD zxDC~>7}3eI@g9qo8ZyDhG-As=)VC1~DOG{H$MIpbW?QOjG;O{hkxG6_T;}{lXQob_ z#6Dd@bUxo!U3C3VfR`ZBk&O#nKT!LIfq1#A-ma>j*6xSx8|g`{IAEZ_1`TpwO6GK< zWQVy@8t9|FIyG#l|LrGHJKaIs5&cSANRuEp!i2LuFaYS(4EreV>izyg85xj;9`C9h z%1$<gUN<lWOD(M3ol%tiHAb*NBUa+hLLxwJ%BfVGem!1PQd^%IyMUvH!1eCPS>Y+F zjjf}%Zl}LY!_|`>V=XQftV3<yd|G|nZ!Hb1=v5_3iPPV*F)z|QaUFeiCV!E&xP`kT zW25#~TD_YvU%icnS)UsW`3D2TeH*1dMaw~3;y4_g?8Vfr6&dJr(}Cz+;&^-0h6bVO zduVODv9(85%Ft%W(7XmyB!BP({LHFhE2vMHsxADjtkX-<s7p&s>`$R*7wdhlT7>^` znsc=HA3V_$b3e%cKYa60u`}vbh|goKL#KTCjZRHUI;(t>N#IzhpuvMKzq}#ODNWqW z2>HiY|CFe^!lDk`mNZY{y{51D6bF{3_PFC<zr{y)dMBN|D|enT=?z%4#YpTuse_$3 z-hITw7iFkql9r(*HCprGC~Un=m9+2KN$7;byhwKcZ1<zk(3fbagY1)4P8`!s$+2ok zI&Nbr{|vcb6wW&2cBQJ6p=BRy@4#|S5N~%>-`oP@gS0R>C;y~Qe^=hTt)AfWrP$J5 z&nlGxc+^5B=MuE}r4S-&MMq&-GuIMlH`s6JK{y_3&%`zKOVs|aK**2DQd*ts8ae6G z>n7$SO8mmG*hW(D#fML>o3wTSUc04taM(Xw0JYf2d<wd!`2L_dS?Rdw#At)Ze>;F4 zIK2bf%W+I%d;~D)g%$|i_U-A{7d$s7W%9nSU&dQ*zDBIR)zoEvV4aaE3e$lLN&;kL z?8A{9L+>l12tw$DhvmMrEIie#j9WcQAENK{fY_49UWa<zu(FdOIAvQ|hI2y0gb^&( zfo5i5v5APoD21~V!R&Qd=w=+uqa}_(a#0zX#rLa`;#TYE7+Di4kg3!X>qX@Klq1fn zZY1I=fw^;7m?V9uK~q#_kvzVTAn4_4zJP3Eq?iGEFtPs6x988=@jVy6?vu&{yQoc* zZFv_keVX?!@kfMnKp=}Wvye&D8!*by=sYXPOw-r4SVD8SV{VZWc#je{`F9a;JD2H~ z3@J~V4iXiqRGT8JzZ4u~DfUaR+!v};_%WL5DVasn|5h}-3g!o;JJf3A$p1wv|8M7% zTM76xiA3OWk-lnZH{SAkOYFy{1$-J|*dHwc;LnLDn?Iodr%i*)7%}?+a)|)Vz}|V% z#>nA?y@P7SqSpN*A9D9eM+1!yBU%R?Kgzh<Dm3|2FJTJTA1R!<4Kvyt1bQ*K@bhhd z*-+_<j=}zW4>8QebCc9@P<;$PR)-9fjw2{0vFBb>*vB+xAr0<gxOngsoto1<%99iT z1Xplc`(gfCzu|!s1Iq`7zA4r=M0?_Nmr^x7uXtv(9X$Nx%>orF3`Q{TESgv!)V`-- zklG6fnD0-`vUQFhnczqcn*Na$>}9%CA$;4q`rdVTU|*BPgBG%sRktNPrMr4BbJ}F* zpogD)ZE)%vT6-_D&#ufLZ(h(Jgo{4fb2wI|L%j4ZsM+m{LAy&sbSAFtxMaYe6Skgq z;Gt?g7IPPUJpOom?v;I)f)Phu8Q*D6M&qP?2AQl4)_5w50HeFSl4cv;3r816ZLm-J zh<~?g2p3;=PL1eXwH;g%2XrDAJB}FCa-;ZEx!_}dxMCtxvX?Vc_(tH7c?VHVw0}lC zCvDvbIhi*P{$@DDw&I<f@u&MZ4Q!#$-vk);z1TWYQ3PYK(KkYsaa8+}nU!SvYv`tt zPu&E!(1OdtMT<;hqj-|qq%^R@JzKccO(snd_+ia|#`7BSgARRR%^W$QY5%P;{<^D2 zc<Ub?x<4+_7Y`M;B;j9YoiJ#MFPhVL&y0E8MkMUiF%6)yUw^5o79oG{(sZj&&9}KY z?8;ctF0Rdb?kI7?L!0j9rmu-uZ(Y!En#ny>VE@;Nq;bt#={j^53hs@q1}3>4UOZ0) zzto?G)=g^|jHO=*CKIucn=`k!P3twkc|IgkIQi)<nV-5)%SI567Lj#)Ro3i+IiTfy zv+2zs_v_P?j*PjfRQtTxL9uu@l3q{a=M*2?uiz&Nl^tkoW$RzQ8fUIzCI1Pt^H zZxFW+gD`U(C4F2lG8Jt9G(zx^y$wsE-T8MaL9KNzxJc57t_xB3cM<EVh<3Ik(!#<S zho|}{Z5y=CvM9>!197ze;8~>KU40X=2L{G^A?*~;P*IlzXV%;(lKk}8Iz&X$dkQ=4 zxY-}BB_ORzJ2s5;-WoSob}U9v62t&M@re~-j6Hp02~rGC3z5|7+l-kY*Yz0tahm0_ zzLkgOV6B`f#qdX_rK$;cU+xZcD9m9aY`<Mnzk7d%T$|q7@p&olv<_f_V7d_eNc73$ z#VwgrV9~#_IniGu%$@Bee(Z-*Q+D~Zm4+<c!noxwRVtS%!X`dJ*`&a#`i1gQ=|;gy zIvoX&_)koFdis?S42XJ+=iMqYSKHjbwX2)ZP-e8U8GJ4MrEmT6uJhLp9}O3)i2o>p zM-$=FeVRl%iVy!W9-PIvQInhJ-v98mpNBiYCe0Iq{!-d6;K?Jzxzh9?wYSGe?Tf(c zo?Nk0*f3bcTD95qEtlf<p#oSD#?Q<05$IlJ%uk=<Z>L`(T*R$Ta=yc*2W#M4qZuSG z*WxR@9MjlZ-mSU%+Tm}kURfZqaTADk-71|=HE?bs60RT=yw3^lBgXWQ9u1}pK5wTe zv0XKPx)*8u-Pt7GyrSm$-l%qX-?w#hsA)jRf^=?W*NAWM10Lt8yhs~gUqPP8IlO9Q zP~DoaG9<U09JgvR7;*LG%I+|Tu)Cg<0{)D|3G)jLu)U%VU2K{8O7y%>N_9N00iq{{ z+ypJ$LN?8*E{o5dvn*k#`kO%Ohv%wXf_<-Bj~=}%=cLWk2HGe?fJe~$o>9aPOF}`F zQ9~T<cY<0i>0wt^(rJgfJ(lUwjXWmpj*ARg@izev2VA*;i)(@pgxqL=*Hhz{3E5y$ zEH@|9Byj&gXmDK|8n=V1HWBKTW=y?#@}Dn<gzymUUoS;6F3Ia5FPSfv?Ew`YYt>qP zuA+g6L#Zlu^?O5;@}d>ZFYo|no54O8nTsOdZ%iKb_c8r<6ph)fW`N%3e=qd!+ZR*% zeD{TG0!8?r5hn*K-661*shxFv6xxTcDMLvy;%OGTsWw93<P&ZSF3N_q{o70Zp7?Of zIc19>VNQ^5{hcy9M3pg4ilx4A(Dq10`DyMcTCA97b#N`IuAI9NH{m^M8x=P;Hto0d zvrJW32-jWsbktTK52viRrrid5D6%K12P;j;<=K2_*$g5Sv&)r#ELGR}m+&09hwJFA zzsh*VAFO27^tCqA_|AfV43Pz44Bt1sd?|TBIj{5-wZimc%&6ZMWXAI7tH>|_Vl-qw zeu8$Tu;kwh38Nq6%k{MNFvBvzX?~=7<-%<!Mz!QA6*z}-gYHqiUYn;<BRJC5Wv3;S zCil9x)!A)HQntO|>1T`)|Fz8a3MvMX?KxWD50}pw5r1E_El@NvE5ccnA7rzIEU7;A zmK5B&cNFc<iFgK>8t$@{EZ75SW!apypo@x(PhVXR4{3VmHK;cv`btNg<K_=I^AepT z3LT$opyi8l`F<D7fAx{p+xyPNbh^!z4>aXLYTV~TU(y33sV)r7K-NJkU#eero@G|; z2cTdwf)g=B%Q)f)Yf!$xar@|{|8YNf-XU-nb4CXxh*Zp%Ks8Ro9imI`1X1BX={1!y z=N=<~xihX_;+IDJcS)u5_g@75Lo}<({}x0+og5VA7GL4~kIVGAt(QM}cnIz7@7ugv z$h5R574Elk7BOw}QcdP=85$be5ZqCsnUs(4ZVx$4DKZA+8S~|gk4e}f0Wyre<TUnN zEKw8Z7Ltx~29HWY#OWIJrt3l@j+TFQ9fOnO#&F^mBR7bJ*1*Z?OmANjO1%VTGQ>M1 zy_%)kL?7d<P`~<nK}-@K=9{dvqac?fB_Cpn7FNS;FzK;;m$`x+EmMDZCn`Wx?sMnD z)GbKDeb;xMo}MRT<9DleyccLYpw|{u`OMMs+(%U*EC|wpM5S_)8=SUnJ-?~9|EJ{1 za#BXSi1sG@+x;kYH%0b&9%(Z|GSiROEf*JEF>&GHrS;f1Ja0j-jChxC+mv^UfH^o7 z&J`IC2j;*0e5_Y#R@rD<XKd~L@_R}b<(X6R=K9uh)N=n%FK4lO-IU{~hPt5!ZL>02 z#_OwV+ph3&FQx<2F~F^NOyo!ON#|i+kn#80aj8HuTdtg3KH#J(djAx~w_1bH?R68u z??KaG+^5Hnod(`b2bT1FjM9}J{v$DdL+fw7llaoF=*9dIM@q9F^d6gY($aoagZB&% zLdbjS@!j|VpiS}f0I=Ff{H=}h28!<d%4*klX$e8{4Q?6O*6c%}hSgXBf@5g*W8d8v zDc9>!LM!@V^FUXtUE>*LCsn*6a`Oipt_gvR-v_IG?l%e1e=)l;MKkG;KVMyRbwbv4 zbSzwJ^+I<NHWpoLWbc@lW=7sZeZ&{Wh;}{^R+Yn}{Pr22ojK@?CFk=-Krt{D_v1Fv z|DAUl;U67JFy&+HeiP`*d^j-@bbo^{9N~Cm_WWa@OwDPE7x{?!rE1n%A|t3x%j|-z zR?TwE_9E%y=;ZTZl+ylFchj?Bz;KcremtRl1*q_3tAXDbTYj_5aL=N@mxC1ZarMwh z;fepiRV$oNL%de%$^og<)kt8}WdXFeh~gaj4I5D5q9PM^T!(YsCKHCvUN+zh>kK$* z5!o#z1*0tJCM8kwM81IynBNCtU|D*`$_2-j<jBu9^+vma9=C^rVGBFK8)``9$j{`1 zOZFQ%yQU}3MF8ij`9EWng8;5W;?w^4h<nxWqIHY#iwHXz|FKURF_<w<Jo=U3*7{ch zNonR`EGRAR)PX0_dvWk8E>SEg9+0tmFH1Z_cENr7iVPhHwYr2-jtDdKTO9^>Q0?=B z{<K!VMZL%RjLC)wcjvi7Lz*@`fi=ywhVVc1om<|V&TSI**ClhkZ%!PG_mC;%SIqv) zf!ho&?ww%$$j>i$S@1t_y=Xh?+=%D`dzbE)z}xG|fwp-W={`B><5}&^`_mPleF~Yp zGwX*}QBIB4<=*6d;_%vD8}4IJV|yMAna0u^!sAsw4}Dp(g55W~UQx6}iVOB1t}O}3 z4^XlI%Qr*NbuTZk1<Fz8A6qvuslXu6V!ZZjBVkdauRI<QfiX#}-V|?PeyfxE*EDVu z&3(Xg?GRl2K)BHIKi08MzQp!U=JV0(x<!b+pWo#<Q~}xbI4CaPe`!F1;`gyAlb-HV zrgtTYJL{`YdI{Hxrr-M<vw2?B?4%8~n<+0Iem*L0%U<HJwytX*w#Q2NN;>-$n7Lpr zn#_p%Wm|6gs|*w}<21;--m8S19KAy0-grjUnrk+;u;G*M`;~8dw0f6X<hAc7m3+|4 z+t|hsvDW(GXrGNULOcCW9p>i!S-+j|rOZ;ktv{`we`xf=9h->qt9cbSg~ah5EJI~( zCYL9r%*0qo7(YN#^=(Q+gjzlM{MI=L;s-6pt+|S@hHmD>MJGpAwV`6^hE_#G;%?4u zH{^$%U8g#PZV}lNqWb6u*voDLr>+l_OVeuxzj;k{G?d<;6tTa=DZ8V6BUB4}{G#A& z<C{J;5wF$#CmTMow)5x0pJ@SvoUWao?B7^DnULW-)QGejfK50y<oIeqDF&0~FIV~7 z&Wmb5FYdlTPuHDA89d@uVYJg;{dkw2HFIf{#(RiL?|`{tGXeXZ)1+_FhlW`14-cPT z6e0gTjF{RrHXfuQeveOv@CYSzE!_*9KH$G&JAjGfRHdRACeM}y1zw@VhU8VdBn~x$ zy=ey`WU`}Vvu7t1Zeo$GayN}A=hbDb`oA5+!8QKF;Wk+*MAE-Z;jd#5XB`GDvBOtX zW%4&xpEFg|ny18-SO0;3QFryo6rADEVV92m6k0QNZD}wt`;+e2a`3aC_JeSPh5hb3 z>O|t|N@IXwX2+6xleVr*FD!rzpUKApgQN!0UN08i2s$O1uepkXUj0f6KaYAszUlN{ zsqTn+9TUnE8`yDDsrBiL&zfnZz9@`qu)V?h4e-&*_usc(4=|lUNI^58i5WBBfVChS zL4e`n&=DKf$&_h3L~mS_mAWC+*Yn)L=e_luB4B_y<)>5+_UQUZ4H(-T9v*ogF~Bwm z3b+O@qtx+3d<u!|)YrbKWCYAOC<M_$uPTQSet2Z;7K^*Gu9NmLp0YiRcBV=CcC0zm z_KYqqKZLYSSNT`@PSch({mfTUtly9nvxq#Dq_<1&4)#T;D!T5=S^7p$fqF)7x~~{# zt@<N=1X~RoBOEh!F$I_smRFB_mGOBald7}sC0}l|Z6|l6`NqiwbypSv=rwDGY^A@m z*va;9r33Vji|F&p-O(Yw(%tEUizT&rl)RP-6{YJ!c}pcn_sbK%nvLj!f|-i@uA;=0 zf*Vy><HN!m;?dWw?j`s~{+GyX=pD3}*|za^sIw-XE+IcD4M?fSB#_`ua+{_5{W{&R zOKOBt*I8jcoF8an4<TsRPMKd!sJuUUB#=AE6IR*~VTxh5Xi24t5u<FHBogvX5F&)o zl4F%hgP~V*(~jfcu|u5r_FZAyTq}luMUwxEFhW#Is}GsV&)qV}3^7#$DsKk}F@zbR zNo(k!B!Ix)I=z$3XA7$5D8=n#Yq959m!y?*t}>>`b8b{KFy}c+$VX0MnhMr0U0fuU z)KEZVd5um4{Rlmh>aul=3yYg%d~lN9rk%;{!#0dzV#0zcyO^UfUgut*RwbdG`hwAy z==+NBkPCKMC+Hkq2k!{cuf$-=rYe1Sv0~0qN03k>%yN*g0Y;}3N}C05g(tGb@#(<w z9w=mt8~(Z3!Xm<Muz66Y1&^kuN`g0USaU(o4t3DNV{Pz13fep4bV0Y~{l>Zq8s>HJ z#hgq;NVzz8KM+4>y&{{!`@w1?uT?55b5nDKc?M5oo5z<Q_vu-)HtF@^)y~NVrJGT6 zEeRC1RSJ`FM|&^K^c~_zgh8c?>m)yZH&~CUdB6Tn320(|N%JB=m^kyT-~PIjfalrI z17BRmK^9(+tTO()1(nyNl&!Y<&SnRiqWlnT6Lzi*qJVebftMI}cx((3ANfTROYjZS zpZzjnhEfZXrum)EBC4z0;<jIUKU<A+Z}frQR6M=7!lrslf-DbQ6N7_;8@q)lMi1y& zZ3ZxZI9!~a>w!V1N3Oj-MKpfJ%S|4AC-h>e^E=nx51fSpDH+&OwPsKMojWv!f5yw0 zMVGbf{^$Prh45D6bk{Id>EGgV{Q0%|!g*pj=8a}l2PK+^)I?8QTHpl8gP*@*kNlJN zF^I3d^M?8BEk0kSpDh!z#_Fwyh6a)!Woows?tpj*QAzw^doheD%p103GOk7n)ptiO zj=F<kFM%I1wSG*g%r=haH<0TeZDqSDJ~jb9`bIL<p06u{?eGr=8`n!VfJ8=KFWTRl z$ajB?|90BwAeENwifxGWuybu}Ljt7d7$LiC#_2u*29=>$z4}e8Y`{TY|9QFZaHk`Q zktj>fbGgigST@!lN-!ODqnf~^M(_`q1OgUJf)pbYdnb!EsJQ%fhiq=?vv+3EyHuaf zUzeE*ez7VjE<{J%)=p;2inTWLH{>^4MTi9J`qNC&#g$XMKUY7c+D}LLo%|OTl23jA zOu5WTvPhM#DmtHtaxYeT7i~j^VUull_{@@eQ;xRZpmY*f=uKAlbhRBU-t3%jj`&@i zHX{-BHV3R@fSx%n-7|`14H0ku_Pjzf)Z~PgPwn<b%=HiFj&*&<%5G5(UgNi9!pF%1 zsZ)#LTVNGtG>Iq({Ou(m*fugW1LVROh$?35Y*K6rT1UM{=8z8gvG<~QfeVg!{^(e? zjOF<_IA9nF<m|UZXWB(Ubyu?P!A`XgUv<%s-q0m{I+8KloQHHi8JHTVWtyE;?2=0U zcK}(cA$*q8%$?A{_U|+kcRnnm85|V%9!uaLW48gl8a(XKHuJvv85Q>-X}vAwpw|e0 zNhL&pDLZlvN#P?HA-13TZ8ea{-i!1sW0)<FZD^EWqK-^G`Y3$<Y1a*Qk1xYJ_2&E> z5srw%7k1_<Du`M3+hKYj%ZuW@bV_~;8zfW_PpQ(2S_4f5%&>mXq?KGWh}ND*PZ{nz z?=jn8!jU&K`>ANNiMyl@rRmtz`WRiF2@j^$-*`VYP`B^t2!PiMkQT}f`jTZHJwYB6 za82&#{x*Nm{+J&PzB7&#u98~(pFZgk29r}eGXhtBUJli6voYFnLc9(0JTUQxy_Xr@ zS!WAX`uKv`HbeSl3nO4!p;9K&t_>(xkS3A5>E1ZZtuFaB(bNGanpTI4i|H+QJbXmd zUKbU7_P|w?&@LmV4AlDZo{;{)b2^yb8&nO?<j+Ly`PHnLvAcXCm1H8>^*mV_PqPv) zM(b5(i61`k?hd)q)-m<-AX=M7p5Y-NzdcvluC<$+KegAQ$@}!zGOrhDk@j6JV?-gg z3y#;<ic4RLS#CsszFhkpW5>CUInx;Wc{ErhCB?zMSPpf~mUcwMp0bTbhG)dY9H|@3 z%2GVq)B<UX)h7u&j8lnL?je}?r;hlH&#NGJ8?L+wtoWbw(Fp${?p;3SAksSC>S{TI zN+Kog%7EL`#p5##%WjoF_h7h<i~{=5hc~yS<_+<TQ;`zjnLz*YD2%PYe@nVApsxCL z)KrAVwGq+VDaaN99TO>-Yp2T>*kDj`ss|hERw)Iq=Wf83T_WE$46JI*wnY3s&a2X6 z&0IuDGX(0fW@M?0sjFCWdoJ`AW?yocTR0Yr!8%VK{E(jr1(!4N!5kkzT*=W(6dNuk zOfqDSU=Af=pFRtXr+BQ)ZGFsmD~u)KQ(;ZUXRu};3}&QVCnGicx@GT5GO%dq=MKqA zL2I%N___Gd>>ZL-z9<H4>w?Q4COw7ENVz`rrn9WKu^O__q^`$f&+_dJpT%Go^aYu4 z_Be69k!ilVk_S5^-KqEO%D0&dJNs1?YnUI5D0cx8DQ;bWFF_|;+>p*?I&P$AO#WwS zybv%WJbRS<GDiU@6{dVH-+o^OFx%m=2Hc9%a`b$2FoDQZH<?~*=C@x8aBd$oEYP87 z8y3SC7AYF31WXD`q-UR-3}D|I`E05o-)!CAQ(NUlZ$I*aYv3f0Z+6vc`}$E|3D4>8 z2nF5}1!?9mMPX60y-Nb$Jvg*idRpNE3myyJO1%2lT3_~l3-s%X#!^h0_n!1oH9g+z zRV2X!=QlI<3ND%_YBM1`yWX4H;k7N&C<4qN^(c&jtf17>f4PCC$GAk(II7p`=|4Hd zx6Tue&hRpP88?cf<r8-BMZkQ=;4vK@e~7y{+9I87$O2oqvHONljyz(CBCI@7+cSZ` zfG&|^qhN;89(2ApB-WMZu!Ee<ZrF?L;AVjbuScqeo!(q5pM|TG(sfmuX*T$Om@UR{ zkhqxNZ{+w69Blwx?2mdnn0Bwk*a*hfs?JYfOVt3K^b;Sv8yppsJW%@%voqTijCKyN zlFHNU2Iq=x4!f1~6GK36@Pl5)<n@JSgw6BP^WQV!U1VZ14!<%Y`7#?Xp~epmT!O`D zyQOqsceGHqk$W?#**m@Fk5zbYUNoF{;9rDx4H9EB4?FfuuYo76-@DDJ5Q216%bHZR zN>hRqt#xND_%>bhe(ME=fRW6H2m3WWqOUv|J<p&&QtR5L{zwV7?K^RSeH!geO%Ht0 z_kXJY-uTV=1)O(wEh7B{&YQQJukp~PA}7D{?RtbwY@>@W+VA5>mz&zh#2RgrAE?mB zd-UV0XHM`g&%8%P^e8acBLl-i3`ytOn7hm89g3gk;d9;n8v?2zPe_Fj2L(P5q^9AG zlS3p5qa<0wrm9fRqZBgVbZBRz?A|cSYYi0y0OH6S8yn-4sf_6awD3iouzy@{9tQnh zr>H6@<?KvjK60W)yUvwzuATgI-Qs*fVrF23U*UgF{sI&HxLQLF&N9Hd-?yT+z0T&C zjR4Lh5`|EUsGbQhrFUJdz2`*{LUhUfnNQDGT>|)J4TT|`r)gf}b7bG+u#`7fUT5HC zT+!Il{nXLf@fo)UgO4Gmt-;-}y%kXQE@Q_fDLf-&-Y4hzZIT5$!&YuDvr$R4Rby&J z0#Sp<h^)fsn-^Xsk$O{Jk<R%O>T?QEs6GgAb$osH0@MgZ7?jt<c!4N}A3`aI{9h?N z5ocBX^4!!*)R7AuL%Fh4U}N~X%O>kiQRS&Om^!1~&<*r1Y7Y>6kma>+oirlDR2FG) zV1C81L0h}8QjwQM-beopNe&y~=H>n)RN@|T%WBKT*<Pv5T>pdL(>BDPR?#xR3;99x zSE;TyvyXpJ4IeK!lMlJkA8Kka5$QR&;7XqY8+-QclAHZz&d<J+;@2rEbQ{6_)%}m( zBqNQ#?qEAD2X~Gd>fchh3hOF@owjE<de{V^!U)Oo$bRlm1WumUlz16qfN9P4&Rt@m z{i^8JXo({=L<hC$@(aSXY1?YB%)ua4<#!!Z^eLq|fKu=}6T~a?SlhC%8iIp0v<KVB z>6R6pt{D_Ns7Ld!*y-F!dYeyuqKceQA;tH|M6P587Aw?{u6a?3)uBL2bME!C2M8IE zW2UGKa$2^M;~(hhgdGP*`O1j-@%$%CsJI*C-$XmxftHv^O_z}k!i5L|I~mR)uB!Fn zyrY8yH%uTp;SG!m<!PT1X7Ip<`1{S#TJ~&;(jp(3u+x0VK?qOG)ace~0f83x7sR~= zUiD5iv5`17x5157`gL>XGWH_Tt7taTr;z8CTdr67OhpO4kauZiD~CDob<_cwgZq^{ zk$K?7QZ41LGLoC+b+S@14Xr00P<%d|f`~^=0F}`@Yr3Zcdbqu|<w1KC(Fw(zTbAse zto<(rd;mfHCPJV>3?{dzUu=H(-HbdP`6P24JD=1bBxV)#%%exE8H$=C`2G-pV9qxP z)W=Ju?4pk}&-l8oPbj3kHX18Zph4tPRnOd;`K2*~El#A;Z0{|ttH_ktdZOTw$~t_N z<YZ;Ka6qF^DCwEYD3p?TWU?fvLm-vmgd%8gbR;uHq61h{q9Y|@#{K=X&9<|Fk0arM zA2TsH-OmLM_sb(z`wTVEz63k4NCm(pA9YlJ$`(f7M$28l?`HjA5zD-WO45(bW>3on zeBbNP4iT<X!3+&)M;Xg{yn>!k{mSquj-1TsSgf<u_s64A1oqIl%D{euyiQ;J3t_A( z#`$;d?Zj%ce*uoTYh9wHI<OqSVq|1WUCvU4#6?U2Ln8??`n?qMXX_UgYe)8TyBU4r zEVv49I!;=bq0%?bL^}H<xa;JNu>KZY#Y4I9p0H2<pze$Q+Vt|!0sI<Gx#W~eoz|sc z#!RH!HsF+Eez%f;4)u}8Tx>)m((K>`I`1-DbcAd@#3u*X_7QqQjgs(5&CPP3stokt zBdDK(1~iEQekN*Wy(8@h`w+%I_zsrQJlAQ6cyU7-vxx3GQqm<p18eMXsAnAK$sz^E zX#7@{DSSd{Ci5T`f%r>V&CCc^1RG-ar7TrX!0&|mN5@fqb@r?&gf<zIwD^KPrO%Cw z6nGf?YUH1Ju;<7F6fZ<hUUb+v77yUGG0yw>%L3m9lwE82sib!S!w+(5FWl#UrFt@n zEH<*d{gRRK^uP|CarR>))B+=4-}Rtb-(qGeFPtVSYTU@r<24?z0_&lZfeBlr67yYX zekO;2zQx1(3^sLfZurESZ2xw(u(VxHlbnKpj#i;YeN+@((awC|mvI1u)^<KaMWh`8 zpYZfb$(gny4IY?Kz?V;C$Sg{v7?`32amHIMj-!9-`hRHg|Gh~h$H8gpBpTuz@Sh^@ zZ^pMYKy+a7jjRnL*Vp?C7#2y8G~-p=z--7H_mr9>;)ChLuY>FX@F3{olxa3#{$`U; z%2mi!CL}?!xCNmBK=1v0Kg(zj#TPGQt^E|39uz3=RlAR_WV|*%|JkFWV#LkD_=1d| z10p|#u4>R#;0~VRU^FMMS#mFwE;ZziYvRPNrnC6qQtreqYHRPXr<b!l*qSyS=0OX( z;%w>jwr+{~R||J5f(UX{ID~&W!sR1fAfqppyQPxgY*tq>mCBg5-nAyOMu}`Br61V9 zcyr;9(j$B?MSb|=Ss+y<^N)0=`L|JGhc3G4*UznD<5EZ0H=nGl7)iel7oCtPt??$D z8}J)CI9MDPee1c$xg?)dtH<cB-lXgC5}Z7B<WR08>b>Bz)-v2~y3!B4$-2W!u`S~8 z6$$yR)q_Voe2-`_>egx{Q*isOFCRgCLpy4k6;unBuv*onMWKF6s&o}q6+)^gxkBp6 zW7dp(ONsCndk<Gv*Qv!triO-w8T|;md+u6FB8S?+1#LHH?=Q;QY4HHP03+XT$kanm zk@lk>|GdAshj?gAg0HR}km;YJzv!MmKb}APuBFU<OXQ=4zj3j*njixmr57vf^L}y* zi>8df^51FX$TVOItU0tN(whLw-Tm1IKG={{Uh(0|?`nv^7EV~_)6P0XTwh_ZC=!q^ zD{VJ7Q`v&+N;1JZ3+`JM-fgh?RZDtSr)wm|@aKb+0yVd(tyk%T+wern;U%>q>ftK6 z>*9vqnOVRy9e|U)2<7k}5vF820t&J#dny)EXaA-nuX+1`RyzZTQICb}y+rM-C{q|3 zp>k{A;M0o18qLU8#F{_1(H>i+Xn{?$6>xzlz#`BLlk?UO^sb^zhG+Q!#O1&$ScR@_ zZfU;IMxz@@2NFG0@KDgzdzUGZ!vw;LxBUnN&QFssNl;xNWwa3+0}U^NP?YAo%Es|P zTPLVr3P-Be5&-1-sxez-lNdwjD44AzmuO25Mlx93#dLQ>qx&t%NJ(RF-mmx?JML!P zlP9sJ7-62sVHEg9QigLDJ{!QoXfPoBnjzcFwJqVF(nu@@hn;{=mD-v9`>cYDRB~?Y zd>)A{0&<eh63NKjj1wBEtOPDANy92nAtcb5>(zrZ6@?7h*0a|ps|!Yrkz&+szx>-; zB>Y=Wi}88L!fY@3!mu;<wqn{g%5@i{x<;2S=98DBVtSoR3wu2giRGCC^L_zsSeK<} zHHq&jP`~TSF6gem32Qp#KvL)3)_1c!dw;yNT0Nmoi`|7<5ss&3+W4aU*s6V^_`&_s z89bYZDLdzR<1sBLKWD$E_!5NfO^kbRA^yii{(o#<|N0#Q9F@fw0?58Ew@?)SZdz9< zn7K3nW@27@cA%X+*0yX)v;^K&w!I>O#o@H;(XB7g-3s0lLnbeRxZm4ST)m-d6d=k} zVE*!TP`2pp$?zkpK2%sWe37r+n%BaV#T@Oe4H2_eQ;`dfS^8jTFqF#^3-vktFg4GU zyZw48W3@b6R8%y!ecX*Z03k6mO|b+#1Vmo>v3=mo{<)hrTl25aza&cWO3nieX*hfF zpS*+JEsyXZC^ar5Alf`A?rS$acs*v-^Dc_tY55Pn@bQ)>mO39EH;9ooS?fZ=C_(gp z2%JKg%}}l))%`zrP`u=e&u_zL=B2uxI+BG$=dNmiZa9PiTJ8bSxp2#;Q*A{d@Z1R% zLJWH<I#}LL^De`*fhjD~hc9$*3b>4#-!_>s+RK;(OaUgo*@8=;e7E6?GB;Y0ww!p> zZSb~dI+U%rxzPIlN1TWU6!&dOIKCR#?}6T(b$Rw!tlTbcaFaZet2J48ejuZmuY-O- z<7&_s(Jp=oT=)%deGgHTwVi8gZL{$H(``41s`sQaQZX6(R;_X-B-?E|W>hm<MBZnN zSY!fR%2YAKy`FQcQ`JoMFY?e(NkC;0b@&UZw=BQ8Pu@t+#fkLJUM959p@-1)#o%TR zgdo(m3I>Di0c}Zt**rK-ITn8zEx@Y-Y28;A_Q{`~o(5{jbsct_{)q?ff9#*%pYT}# z2tfo84Er=x)s5h9-hBVQf==bXh!LSQ;vWd<Z*QXW3;B{F3zKamzRc;-YXK&A+i5L) z?lT8s3ME{>kYwFu9qoQ8SP^BLn(RQ8tIhK?dy3tN4qF)qngRUu_p6d7H#0eUuWgJ~ zcFsM5QJakiER<iGY&B@kFhW+e3L7k0ua1A(cHJBvnlTaEk<TmzY(QPH72CTa0uR2Y z8_tx>tV6Eter6hF&T&M=X>?gcnm4H1Ddt~`)BD|e!6#Sxn<*YXcI2d(`5xqdZM{Jg zjxS?FMfBW}24pM|1oIcGyt3KttY=&DciUr}4wcG;YNYucY#hMF79Y&w05gEtQa#J; zcX1is=-GRcc+t&Q(h1Ob8p|Z93CUNJ?CG|m4WDEY$-;;X+swWvo4pD>_&4ua8G;_9 z>}4jziQfUY)ae-c`T6k(rn)<`-fV0)1{#`~F-1&YN3Mp!*oI|w&yn8nb(5bd|MYvC z;J6HJZleg*uJP~Y4=$V=<M2Li_O&i&nS~8YekOn9p#Vh?EQ>O+EHw?E1!vadNAw<U z+@@->i2Go&?}_~JFy;XZzvBMKuh(nZW7(oh5X)M23gr<#fuC*?Io&Wt)SwqA{?;yB zzoua?zSv_SF!~aVZq&FsiZg<`LfpxT8HnGjSD|-v@P$=oxf%XEescpOkd<%=yROk1 z^8#i9Uqc)hj>N}K_`I{J%qH49p1meL3tsniGWsn|wb|7!RoWHYdJ^B!kh&s?__5z6 zJ=__77`9GxDzN)eX9h#@L^d3djXCM$nzzB_Mr`vcJ)FQUI7_Dx$C?CMDhRijm;%)} znEL#b_VEt`rydVET&tWR0d4oxTI~!2RveN_zZ+x^y%7|(b(fyaB)JWlHn`&{M7E9* zx?zur`CO=@B1|<KWphz;y{Mlg6jvZ!!647<VT8ld|29qrfrFOm)Iy6{CycIs(h#~_ zP@$XFp!?Ci|2X@Dj=vo@J_$tPzX8*KSvy4^!PNCCFOwtkQHsW9jlryVb@JF4WdMEK z+8v}m>Bo+RgF}xzC5dcT0AokvwcXUSc+!>hEXwc9ua@av7(H=La>FMRiE!?~m9G>P ze}3NV>|~S8ayTs0Z7aEa?AST0$2^E4Ct!iey4+N>^<R~&Z;=^susF#-^w7sh4g-2# zr3?dpCy{Ty27a9e8F<3Z2F2+EC}j$JMD;0%Svr8%2|U@S>fE(n+&Q^sbtJ(tGotqe z#@?SC8US-7HY;R1CajUb_cXzE@LvitI1!_IC)6%}O{d$bP}%b!7ze*;_eV`r-bH0+ z9w-^>Hw%h%Tf`Tks4?7b`Qnx&vZ{DcBJzqMQM5)}3(~S$eUf#Lr|AU$$XoULrTgIA z|6}hx!<x#vuwg+I5Ro<_2ogFnM!FOUp@<^VETe!_L7H?BA#?;GNC^niNl+0~lrEr# zUP6xoQlt}-2uMrlp}dEA9yQK0Gq3Nz@A@u(8O+H!Yp=b^z1luQ0`Yb{ZJ7^j4@y}~ zdK;i}^y#E3fxP8Tjvy9&mX9YyZ~BJPxn}o<yQbBsz8u)IN8pLH-eA>EP5ycLhxKoQ zR_tyyT=)iq#^`7d*z51HF8b<}cfaAxRD-fxVWdH~DTt_&Do_|W{RGd+s^c`6?JjjQ z_Li1)jg4r#!;lw{-#@hA9#ZsDLi-*Llj=z5GFjitwDGf~Nssx?PYa=bh?%v@5Iy9= zALQh8i!$Gxw`9G%sImP52Ly&X`|=cs0`~_7g95=G4$i$S4UnM|e3s^hcLOJ4!Z!*9 zJS177E)AN$V2o}J)y-_IoVaTHCQRyt&awqg!6XW9qjYU&c6$NmhmvPe#RZnzS=@t1 z%q1T=TIQ~Cle}q}%jnm%Z1*r11opQr5@0$ELzcYFpGE3s1?|tKz$PY3Ac7%nLUGdP zqf-534@u7dURHXXjuhRE0`rzAMl0;6wSn8ijc*fH&vByGRUUA$={YsXO+G(k!fl|9 zxvYPBeM#HTkKyJv_s%vCqI>Ynr0vL*G16|@lA9$gnh8v1DKl6lU+G$3y(*bC)xFN6 zXtOocWD2}103l~YXk@V8fW^E`#bwlw@Re_QPMlv`aH6cO7!$tQsJNPSz!xZiBps=2 z)Okw*#)aBA7Wg_mg{92@W`?2KQV9Is+H$5H{_f;fe)MFxxe&v;kF)36&Dl$gXL?`U z7Hk}ll$0Eub7iRpvq<d}lb08K-ZY##F*Ezt)V)$uVKmPZ2=x8x3(PmOoc)&aK6No7 zz@_fy>e!`s=OvX+I~4KN3VSWl@XbqNFErd$NYN5WGk#8~Rc7&LZIe?s$Sl3g_UL^m zzD4CC@x!gNb5R=|jveP<z3Y~1i(A+WnkBwp0&?bgW^u#eID-NG=>w4W3yZ2zOvcfl zDfSz;7?#L;JnyORy1AE(lk@DHA;$dr$bFMO_MeYDrQDkV$DOm6ojc)d<IdeSk2E(; zfY@kGE3U?fk8DD)km?;P*KISu2y0r{Dy9s?(azRl9oa6lZX&;vf4^h&ZKaJl&PTNx zuQ=--U07b;Cum;rnPcY;Zo_(Bj;&uR0zc}F^LrNqGdh>`Ti{l82sy)5h-cpTYo}0~ z5RjT78GZVOSa+2pKWq=^0LS{CHm$Qz3DO5n<pQb2!pn6m4T5;*d$SRu<Ni!51<9gz zg1@gj&4#kq`(GU7(BmAnN6bE07$eObv0w>W-R!H!<fYeFpDbz@vtf%LE5Zjl+caF$ z-`W1a5;5FIsb6UuzLASAMuR2gZjh=#Mm#gq^!8%jYXp7q`n}8{uQJM}-)e4@m=78R zm<y($AZw+a0jD6(mu^MI%D0AgR-PUytN#5CgA??4RPg>JL@VXc$_+-R1*y=B4%Zoi z!W2gnBQlQQGjpB2uHF?&8G7z6)3)bG6UaR%sM_p6Z{(X5iU)T6Qwc}25mwgTdey#4 z(eFfWV$C|^lC`AWDh><d|HCEen5rRZ6DaT5#wRq6fq%C){-bmBL`yC>X))3BxR8OL z1In?mUnSNwN+uR@#HfTnGjJK!day5DEpWck7VT!3$mZY4TpzRLjwI>~M@Jde+}v!C z*|~YB)&C<_PaAXYbG*N+Qc_t3r{`64cY~}RDRoc=vFv%&rd)ghJW(4>+|ML9)iBsl z@AnlhS;_+*r9C|F)z_wu-7wv9j&999WnY&6Sf-s=zss{o=!HEpY_PGX_^o>1NL#2R z+d&PkE=Hd_Fy95MH6TG=UyWY7)&IMsWVM8W+^9*AoPTMtG3b&Q=)r&lBaL3bG+*F5 zvNQQQfHf@-=>&ViZU`bBK)r08g`!s!0?O$$A&BAW8GUE`Z6m=XzqY*B%-v!l`>%5c z`tAT-4R6DwSHnBlf%juqguhA_HBrz5473xmK^om#c<-Y&&9+Zot)rgvE$J^G%dTQ) z0tY%7S)kr83`!1i2SwL{<t&*EwSw(5nmzeZ#d$Li4XaMl$;?%Z4wlt;n;;jpS6fQ3 z{s~GE(lvr&OwGIq{QTiA<MRZg?Qm@v$=FSQ*r@Y{`a|G+odge!{LFjTIG+gR*RDu2 z70qe}4RO(OBNPbX=y)BWxOFS1RMq2ckh?a4mLmc;%^&-J@;^5qN5gEB+V(5~7AueQ za<sFHaC!&ryBVvYn*gs7of?!c8|MogQug2EdBS`o=+E9dz_+_a0^4FLsGI(P+R<NS zZ>I0@|AG&7fo^m@u~-cD_!5$nzXLsx);m8fWg-pqm0RK5IWi~tCPD~#q+-&|AV<aH zkD67Tw(hLCE!P%qTfWZJGSd`8y;1=ewXTL&!`A9Wh1VN<=iB@`db6JkIn$#%IqDKu zK#4~C<`p@{0W|kUw?WbeyRIOTw0?Veyzp)5Wv-;wy&WDL>kzQ33}tySnS8^m8uC6` zNuXjt@)1^jU^ton^|5Y!=k-58BnRT$<Xb2Aj}eSJK=0j~1{sQ$$$5dtk6gAC)&iDw z3?i(Znk<|oQgAJfc3S*jtZzu}3@n!673hHe6mC!MpqA?A&eJ(;&9bpJ?y}Yb4w~S^ zvveGTh)nQBjP0XT|E{9vp--7xJr7oyCO2E1kmftqWR(VP$_Z>bxegsBx_%<Rn_KNh z<UvY`D(6=1cO><LrQLhg%$g1hSU(5ZZTa_N)p2ibfuC^`WnCLRGG=U$_qEdCc7<?9 znF5>Gw#|pI>6fdpW7GGPoyO}biK(U$+k;wP0a-qMNO^UIIRZMU^Yy>}^hTBkXrRYe zK&<3P-WNWm{w5$;`{aNL>q$hzF=8eEAip!OGi>RsvsY;#F@`>ED>*{sE=(Hoyjflw zC<1i^!8Y>PlU_1g<g4&Oulp_Z;-L~ZI(AmZQGIm-QV>U?vx1hi>($d*`?1pg8g_Zv zK<dhBZMz9mkNfDScQBM5saJOWcUM`TyX%&C^){iT8%!c)mY<#ll9-Xs4@Hr_Z=(#? zT^R3Hl;?`1)pqOa^d((ou<Cz2O(vD@f{sIuuWhb^j_$mBy>(?dWaiRNi@+@UI983P zF}FYkC1))aU*wRY8WPAi#$A|V6;}gcxH(=}eNB~*;?b>uQVXQFls!}k4qSnC1t8ru zvtJr$@g`VLQch3ep7J|4*}D6>x)y}YQ_j(lg_%l>Gdd=`oPhAPI+CfUFF<Yu7i_1q zq-3_5>+7`z!m_k<3pE|a#RS_xt@Q<Oy0oJ2bqsaqVg%FLO^mEYx98^O)V^Tk`b^Et zR94Q1dhceMD{{O(@84oDS>s@In?`jozcq6``_(_4;0OHEfh<35>g{U3y9dO~;ecX^ zjGVOFy5#<X{-|kQ#wCS#mIfUWuyJ0+pS^~{B=txS-$&Yz_nK<;N%~Isr5hiCv#I8j zQ}BTt<@|yIg#jNB^FgPb`mUX;9@?-T?ERchGA%KILEdI0>sVi(9Z|luTG0BgBiAv# zUQ470R(iQlBL1Mc6_D|=)aWnX@+fznEw$jYtpLr1RP@Epo*LH$I%@6VJ@tbfSovzM zz>397*4-A??Wm0ePw(*1*KI>(FRG^pr=qK+I@Y2(wC2jOG72YX$N89cAWw|Vy6=eW zp=mPZtZ23yvT@03ck^V-SjkXoTI07&K<L4o2n9tkmZErWS0k(Hi+aaM;`7d^96p#v zgKT?xHl_LTZ4%gg)zh)7Xz0k)qzP_2MLY!JiiE9MGxlfOePZOPUZLxh(SKI&Bh)}Z z!}p4d$&^Q1t4hZ6ML8VT$=v30_|$qTHG%a5s}M4>{3zjf0;>ILQEGC2TWD)#xY$;> z7f6Y7yANOWCHE_mj?%W=FdT0Dl2=J>_JZm3`D-wB+c^6dcp)4FDk{%%96v=TDVM#T z;eT#c_w69q{96A}M)iZpE4{58dM7EMKJ{RdGovLOu5X@n@#ecS@r~Vz?<kbw#gV$% z7>XTC($5I9-#6Z}+Na99O~j~jFSw9V)j+&IRcbO@6=YN(Uu`(z9(Wt|Dos8;mwO}D zF15RkOahZfkvn(Ryp~tBVM*%8$uH5LogN0bR~YiyucSAJJ7<i*9dEHcg9hT33EQOW z9HY?%AJ+PkE;=#2zP^b9_4XQwpdUGx-A%J=_Oaev3_&55#nbIn(Y;}Nupx1<Iy>p{ z3G4v-=Oe4Uo+UN`X4kQbKFJ*!UTHR$Dpd8;Qrsi-vLR9Ll}3n^+oR_`K@=6a;JBKA zo6<*hP`>VZq(rtYGeuFwbbq7(HZ5*ZK0R+>+F2}a@o?LkkmY*0F(DqBS=@f9sQqm2 z*)ZA4I8mbeZ2J{uWo1mz{4)7+*r~;fq5a|HuKAe-UeD?&$Bm%OIe~z_uh^ilAMi@x z6>^dHw`d3mKz+n$pml(;(<a9!#j(TyD&)>K&M;!$U&rvFZTJcFy=vXNe3Y-Fh(;~B zJ=YPDW+Z$!(eSkyhl%{S_I|e3sN%#&JxV?SivE?W{%h}u)eZq`*`0PwPv40MkG~ah zba38YCa|O_;t}r*2G`$7vRnxE9NEX&0P*_pRx%%<c+WZ6oDc1?#gAx?xWhJ6Gg<P) zFQlH#P62Y!tFH={Qk|1n-{_*dzA!V`U8gLUKpj0VFnK4>9WrTqHw*R73n=V;bu1#1 z{%F~Q-)XLV%=F0u$^q=}6PxYLX+|QA`QZV5Tq%Yi*EX-ZcSMw(rwNx2%J59EG-e(I z7QjhZlWzIquNK^|Ig3;#+Vb8=K;V(b4RoP6Nqozy{1k(IVUGb4r@e}~e9mk`{pO?7 zQ6CxXHn=V^W7hq^K?&|7io--D7e!SXqz=*<i2!4<A7u5#+>)dpo;GR{5g?ya)u-Gh zBpWq(NTxmV&zPTa1LIIL(z#OfMax&JKXUNh68thl%xSk-QrgPR%sV7?fMY`jdE&_P z0>h5hnXjRcn>!G-N_4*G{1z<%z@m_qZmsbASg2q;1av9VpFh(}?Muj!#297A4jhwU zS|l++ySme3tMB!-QgdQJ(YDVT8vX9&sIdx^dGTN!H@fUgq7OktBjE*>#LjmM!0Ke; z&gr27au84l9Zz^2QBUaFDAM9Wzu#OK(W=*n`K&K@_SN4R813mbDAhheG|Tw}Q*y9- z^=TMfbja!`x<#%)hQX>e{a_suHAHb*Q&pv`)+3TtomXX)=JUpPb8OB<fP(TS)$FTf z#(vQ^k(%-CM$TN0bT>Z*ocb<EcbX%<Bi*;Hk?+I%C!aR%&*oX~lr|_ew0PPlquLOG z2T4Wg_cZH2vRRrI6~+-gyi^uj%Om$N`7{KwNmS>$aL~^$Z!z9fUlJZH&p4eZ-DyPE zWZNz>JP4M#a_)3g$@2v14ANwYS|-_AiA9o?S1j8gks~FvL@_2NBF$*~n$Dz8r>htR zXG%xXtusv`*4g28_~WD%%2HV>GzsEesop6pGJ!>rsS$<k(k)`c$qAi{rBT7*=d%p9 zc*9b{x#odL_wiC?=Iut+v6@PD@+$aF{Dw~>9F6{JBa_e96r?0GbmvfSq}yRS(l~2+ zv(^WH2>uKXLU(ZXlgOFc(Dp5ohG#+9(NEC+lZ#D*Oxj}7FKqHRd?1Nywl-_Ph{b}9 z^P8~GA~Yc_-Jc$OPT!g>>tI_>ezD#4AxRs4p=u-ux;fp53a>6W`9MAvQtgzOMX-r9 zU>!rhU~&S@v9#eI-8-3*=AB-a|M6(+Q~lTDF>!cQ*^UuyMrE%-gN)Au*yRAt(&DRl z3O;pzNPE!cg4k@mBC#u?a@r9x^`*~!Qkf&rRR{L@`i!~p9B5t+9#PgB)u9h`PrRep zwjD2faXpWv#f>=PKsNs9cm3`Ym|s>4{j7iK{1GPodo#6691JtafG+3gV;vkvs^XZ> zkNrl=?b#nV6fb{%%#3ctJ7W^kbWEU3avozFYfafV<DLn&#Ms_Q`wwu;+&p;>8F$ZO zTfdD~KIq9=O^!C8SAG7ExzH5<*j%((4JgJBd85DKz7}nXXpNDwW0r*VL)P@$O~6Z! z4otP5+8XMLvOf+2-ZQ(bl(Y_?ktL3$hI7&Ap}XB)qM{x&A&JmIX7dI5RU~EN(-hNG z1Cx1O_t&PDxEg7o5gKz`_bcfCvqI|2(Tu4FKby36gqC*B%q8hGEV|h|f!Pe4h^HSh zm?kfzN>*Pox2poP$XU4fOAXD?$uYQB{l3_4DDq$cLuo(0@Fvamy@g@s&eE(Z^C&Rk zfWdF!)fq1=oGvlbINSgRiVw`y;w*C56-UP>;<M3dTlz^e{Q9X3_S;gMwyWvv6S~mg zZa%BS;JbW~HuP~eCX=&8nO6c_B<7{O2jz8q?hi=Rc5Hj+vwmo2D|u@PeXOvk_xfJk zXXD7*P@}gNpg6HXuMY<U(iu|ZTX}#tfcFY`#C|;s;O?1WcuJ1xbXOGVk}@vV{rnCy zStL$6v_nIi5Wc?BkT-mdmOFHP__m3X&uEEQ4cE*WQW4I2J+sGz)0*PnBuRYGIr;}~ zY0dlCdexzIuu*P@Q7qf)%F6X4-J?bXC(gnWc;;<%Ps3&X;f%h~d1pOJImS7F)JLo$ zSH+$r@3k?aO<EVXPFq!(YF997mC3afl5deF;fmYO`g97;efh$R6*4V3(z|4S>%1o< z07dV$k>=NufkE4SFK(9rAkvoe59cfYMU{V+B0PoP2cd=a+BGf!lMg~)Aa7q^9x>y4 z7#zM<+5nbx<LDL^>n;c!QrIxRI&dF8i&~H(UyU?NY7K2|V}HE)JWMvIdU<f%!rb5N zabo2i6foK3%Gr6o(&vrxCaDp00aC0CxJNXk_+?UgQe-gU?7$Ix?LD|RFP(%+^^}VL zJGo`Hr~W2<w&ozT(#UGq$xOJ<BXy@xOo|`g%+AIEwq}Vp=lHPcKCjKu%P;jJw-+)o zc9=f=1ippdK*=fUERux3uUfU^z_G8EsQl=(8igTcVWi#*^|9<S+;{De1>BBrtX|8@ z3VNHkcMCY-%RCI%u6(;qg0)G-vunZDJZ1GR=4Ac+EFarv4CrihwWfeJ(9LT)xynFX zA={9OmWotI5L3{O`8QD1J!hxttW46TIqzVPo(eeRo)y8FFrUrV85gSu+g`!(J&4sa zCcRqZ*%ZQtQRZ;WRW`1(X{?qI<f)6vMY_!}?m?rG05JJ1;SeDyFi@M1hlbfJVGbeI zA)T*9f!nk8Hk@Ie;O=TyUH3!5o*H<%Z20y11sGOtLmiYo2W%{eW?KstUoC2R=x#&$ zVn!uZ3>RXenYHsQh2;?$9S{a$X?u5oO}gFq%vO2#Ebhc*_A<T=;%vd-H9e<$rB@%P z0R4Wa7TaCDs~k+YPMLKkHVwR(GKQJeQabv)4%H=;ZC!e3J<$2w7|Lh3E%*q^0?Oo* zZcArB6n6$)Cx5|dru1#;K$x@-N_|pebm8|iMuan`1}#3W=&-Q$%Y`$<i(2u}X|p6N zgk$?uxdJ_QO78HgcPR2#jBir#Fk(yXHO9!+HoeFI!eOo;<1e_h^(<_JYrQ{1Mrlfo z)!q;MAu!glOfg%?Y5Mliw|$CCA<-?~1JMKBfVRAmSY{``V@Yq8-j+}nSA{0YcZu=| zuB^7DkIc=Pl(z&-u1X|9mnYID#oHcx&uzU5cd;kP56>_Mgq4%ZWLz-vWSXR4e5G9# z|ILwRNN7hjy|s8$u&6wyF!5=?v|yG1G-w;WrB8HifjjzQ<(y~^7o3{%p6L<U%8~@e zD#@!(q~zO->G9vv96*KpDE-~9d$Wr(U08R6>3GEb^?t>IK_@=@3!97f_&{<7sp-mv z2GMT6t_`!h9O#@)D+-Hq-czE;HossN?E2ub024lkvRFESp7}E*S4cH)nRD!AqTXzL zvrUiwbaflScUh!-9r4_t-|NC6q2WTY4ade&Iyr3K&Jc#a@!rWKsEME4=I0SHXTMy8 zp~7I9zT<1JkLM!I`G(9~C(<IDZ3VN}vl?U(*Tkke@XMe094lXwS2A^dA&Yx%7kqql zvj8$yc<;B7JGT-daE)KIXWModlNnBN1>sUo@R4;wRxUHt940W1qtMrA$^3Ed5jMJ_ zqN)g}4>MylBcM3?s^zx4t4WUW0GJF4eF|A05$&iu<p5qzFfewC#Vf9(t-;w^n)S5a zAfXrIip%78r>9CkB<DJ{d$5t+7`&Y}_|kEc%<M*g(AsgMdRly9J7DP1L=hQRVcX90 z+ro<nm*J)AnLTG}FmDoN4Wx4UQzGG_BMuXfL_HY;1dpXxA@SU9Cu#fi#x|jsi4f<U zW3RsLi((|8GzrZ{6928k?(ScR<Aq=rxPP|rg1R(_kLab`vG)LN+Wl<f9L1T-`zDeL zR*}p**aVBxS8!Go|0X{lTCi7Z=*1Q9<<7xW(*#scKzFFZb8mU~*aHcCizSQDx09Jd zEYbkt*8!J|mOZv|d<t^%??Gez-z@t07=ywFx~9}&$pg<$BKxbRJ9_n&E#g7W<2_DK zmBNW>4ins`bt|<#a>mPz+__`%F{sFV(LD0@T<?0xp>@knuO{obMWuOZr5Q@)q1k!} zlOWiVOIXSgm~kv=J~cBlP(^2ZmY=CaY+(EC^E2G@YSk&3GOd)9eGaYX?c$Zaj?c6u z*j-Yd%1HNIxK{73vC&X8Idw#uHXZI*7^##*9&BOS7FtD7bVtPvd~026=d{Ok>12@B z<Us3nWyrh+%C_n}i~yW^vCbncPi9(g7t2V%mDayjIydy`g|jzeo4IwU4${TsxS-F$ za*EfWdep1LR4m}B%XUnNiX+eb+i=WxAdv!WhBO<QIx4Fm(5<DUq#&~YY@GY8jPG|E zt;kcKUK?C`wFFXSdyhWOBIlDaRX@2@E+VuAbN%>=V$ck0vB+V*Qufm7U3Lt6?#pXw zezr3&u39l#1r~09SXlo=Uth`I$^Yz8CkAMFPclBn`kp^rUF{6d37sPpv7^B2yiKiN z<;VCl(f|l9OCbN`CHcWPB757%4fpeJRpkdqhB|v?<=^-jaTqVuY(b+~!IrG1{`Op( z(tCj-c65ET`b%}%zQ`I%>_A4cH-DLA?n{K50G4-nuu7jZ-a55U8xz}>kQ)Q`y>bp3 z^&WoHSAcmP?jV>2bfI?xD#2GUp|m>G#o`1icx+*Qg*I86-<nb?e}%ryPrZheZ%s*2 z5+I*fH55L^A~#8qn-vDtGTYGQ9|lnO_DXcbQ36-29p8nc>8r0#T~@Vc!79LSD>f+w zR1P^#JAP-j4QoYz-$2{v5NB%Orbe5r&kquIPz1?HZV8IX!F}i!bs<?97iW7WBL5J5 zj52Pu)Sqp7PCsQ9aMz_S88x&sval7y5`nnJm&ip39Nww?6z)(NtEV^?V^>0&!JF-8 z>)3kdc+yPA!s$hirUHY5#BbAkWlc^wgXWki_~*o{_$gdlu@g>n(ifOD)tZGN>R}^9 zL5mYn%wQ-aXxqPkc-Wcg`Rd%mh-XjsMQ<yeBvtm8&u9lP;<?@-v7P29M2$~|7-+Ek zoN=J!O47Y?sKHyTU6JxcO3~A~ifDh%I#2Mdm8TPsuk(`Lis`uPMR%$azseAW6K|`# z6I4LHKs2w=qTM3!d4R~%5q<GBK!Vx_WHQ21C#S<bFEy_}A_QJ%u$D1c5<D6!2E011 zwd>G?^Y)7W$`@n5BdJ0aoaA$K^1w(y>Xk0<4IN5`0R`R7i+$JO9{SDDr0fGga!J;$ z^dE#<gVz6cd&Jo;{~FzFlP#?l<J)9qKKp*?^Qr;;N#0xw)c_OSmiEEYqup;$K-z%t zQ>@;?IWTC=YAbXc_pw7XYrs^3rek<{VrvC9IhUB6R<d#TM%(XY`L_m*Upv2Sedt?O zT340t{OSeoVta2}<~YkcY`8_$TK58GEB95#Nfhg;%(B^TZ$F<!cBG9Jkitfi8w;$M ztZAhVjV@sC+75lWLa)w@S8B>o|BTgx&Msj_t|sALT?!fk`ZbEeqVM%5I*PafLzZQu z3T`eV$?c<+PlvY^r`&JWruFyf7`qz7^`TQmc%N2#1Vo@((n=_$wm2)(Kb9DPA-Hyp zhz=jE&IT<h1k4wV=1NXomKO@SCsd=T>X_xCYB33Eg`=@XBS9ncf#%K1;hCI5*{P!F z7XLbm!MldQbg?e++(RLESl_?5+jv-Q5>P<yDgDac_Pc;BF~0a(k2*tY$`<0UJNd-A zTCtX1$0`<E><2%^mxMViILI@+RCvwY=1*5?9BE%=8sv}mI?UU-c+&6poO<?Vw9gw= zh?0*q#MwP}z>eOACGU%yozJxu<70l8kU(GGoPOi%r~Of6)={S<g)9vIuw4my{CzHL z9~3P+0?dFKoVLkkE)m(|NC*kM!NIcE00ng>(|BqiuMoo9kAW|;7A7{XIJ7q51GpVf zt4^pzFZ)dCq`1W-z^Rs}su3{W1L!lk#<9zo1S|v?aK*qlYo4c{b&p-0;>9UF?SM;n z&qL0T){oV0qDEDUjJXh*jq?l}%_`ZFIA~76b;hA<v@o%zB<~0rFio5CCoDIt`Z6bt z9wBDZk4?|wTxEuiNvcj6FwQV)oX=fwEjzMZ0Pc8R7Lz?+zRc}A`i-r~nvR_`6~A!v z-OBAZw8Nwx%o6W^@rw|MTO5ngfkHY@k4=TWx<7XkI1n12xsR<QkKN-vOI^(R=Qn?> zUfGeHsP`BqHw^=6eAq>#oj#MB8kgsnv-=BVFnl(x-MV<CDnoNS)&{3zbB7FA+jtr6 z1#@86Cb(k-lGNqM#hrPW(XvpD9<oEEFK{3NXqzz3l3ru?1lf46Jo5Bx(>ctBd$Y>w zVpDX;2Ng+;GCQ3#rQmz?oI=G}wLvXW^hY@*isL@07J!32RI_s%!B!1~j2=DMs7qI= z&gna*NdM{ggbJ6~*L$~(6lrm*l|ebY<n@z7LM3NBh27#8v2W04!WQ54Bqz*~Q)jLq z{aq6XuIIXpro~jswu*Y5TC4}u%+pv&W(mXu?{AZy6RTD@F9vEWO0+g$S`rJuz8>}J zbeM(d(kevOz()2>lb~!52$_#xBH9@PCb!y@;T@xy;;Jo|C1)2pwQfe7RZLjF3%#kI z<+_B2tTrlr@1t?!1hQeB8ZD=(wt~Il93AO~EEBtb++@9QeDQkN(;KhCWLF28o`uON z<B#D*1dskErU2&mQ6C~@qwBsHZkXMuZji>N)2BurNwuRSc%rH@fQ(0L(JjPm%2-pc zF2$+)ws7%45Uii%^ujF{>Q(?gne3gqJg)A1WO<=^uw5*VC1U=SDsa5X;tl5$%Qv2? za@}H_HZyy-gyRm4Zt>?L;>vfsLHC0p{8=p;dtnW-#{FXh!WYE^rXcSUQ8!EA@#JPP zTQIuK_CtcN@$tx~qe`e^)A{Ueqbe>snf;tk6jn57`;yfN=%UO!TF>jH2{#G4P6T4M zUz;h)pRkp<ybg}bb;`ghl|CGm^-<M99T$tswa_H2LRXkRvkgsd-XVR~+Q_V$Ty1n9 zMyE-gpke$i1T9;nCeWeWG-?U!D+F2u=fm3Ri+EMFrOv<z;Z^#dS~F@!^9Lp(<?u_7 z=1tyJsD4XU)rfEaO_VKa&id49V0e}v#8DLKZ{JR@3;m;*K^k$<Op*PLQ(~dDwc_y) znDNW7^KWR`FfZr4r@V%5!X7CdcW+Yw4g=Yp>_;W{B`aTzezyNn`;CE6lCbQel&6uo zP5%Rjf-=+7pYA?~Jych#zoRP|PQ+gdhij!)8gk6@H=AF(HS_c%yD(ed47XKZD~{RR zW-Q8$@PV{Npdl`{0)FCk2kG<`!L-*b;q)SwFJgOBQVvH>&C2ZO4)W)kS1mIraGtVZ zYlf)#Z9!_@86W{Y;lwa;ZpmIqyBD49N69Dg=CWiY2WoDzr*AjpK$wKZ2720HZ~BZ{ zDNCggn@HT-=c7j#F@9{p0$3z#XVLt}EHUjdP7a?@C2=C&EPA$0d`2jx#f}eK1U2xz zKDl}TZw<8WJsed@jK}(S&WjNIt$>;P&W6j$Rm6<!ZoBQyr)IR6jpo<QJOCP>qU$6D zW*<uOzOQzA9o@$(L>LBP8B^&6A3rjm&h~EKi>A!X%(yyFCC=Pn{-y|)*LE8M?!TP< zn)LrOD|Md%!1Pf}MjB9Ef;AEHw#@V~BBE{ecbCNDlV`oG_zW}2r=|xN0~v2tjf@@* zETMEP)V5ZR53+ZU#SjMH+M(O{qhZ%*Q;E)PPcwmz?Or9XL&WhSQCc2Idty(vb4jVY zxASg^x*<<@(eDph?oWX|jU6P#(BSadV#^q@GzRB|?Rt6r8IfWKP>R@S1@S;GC<2F= z@SJTvS;;l;i==Vj6l~_uw!5^qZLyuXzY2`;O~(}}CHXs9bXt#nqHDG0<`KKsqdMy| z7kSpOt8$j8-esK8D2h6rSSzybZAQt48t(=(V?g&5v0&1gvVEx++rle^&FKHrToL_r zHq4}%h|iPn6e%@vhK4OE$dlzgPsKNSS;cxD+R6cYD%ngaH~`3HA&`!QjB(xx%#?G@ zkTaOfBq};MX^hy65JxBn=gYo3fcCUqU&~SU!;nOKq#D%TL#ZpEJ)&h>i1_l|>*Cwx zjH;|bo9+diR<UKSFOVG@z#B(Y(W|ZRI#I2Zc2$>?EEJL0TIGX$Hfe^b>|Kz8S1DzK z*K|1wWFULPB-(Vm(?0KuZzE(bi~7{&wO6uZA>c>twv2X#2-f$Btc<Y<@Z40t`mGn` z*B+<Jj-zQO7shc4(mVIWSCJ_Zzs0sVN=B$*fzXqQ#kje-1deajw#KY)b4|G`<NT*f zj?28NbXd-Ph~F$tb}T>CivTAQwjUt$l&s^6`@6d`WMfSwZ35DY-Kz>PUK_ZRo@auV zuy5?*ZW|51A6zXHc6&-EK?-!ATiX&*l_2gHR~3&Xx{+`x_ehCAs0+qCAY7khTz@A> zn-+LOr7o@K(R}3W&D~ZBqG*ls?OwMo|61h%z%j3i<5aN9$kmJ)ysO;E%%XC~B6%rl zgUaml?V9~FZEwFxJ5au=u%%mDYo>47K7&WQ(8M#;v1syVV{?{L4Cf_?r{N*}x29I# z8C;MmQQ5Qt>Pa`yZMtR7zE?K~?mEEwD@sm7Bno7FVqvA%ty0RCy8!t`w>e1^B=@C! zyzx3r8rTA#r04L6RMEG!y+K}PHVkf^!pJunCMw=1qLrb(LdX^^&n5wf`c1|K2s?&} zJHVCX4^)hxSP9q{?f8|PV>+-=&gG`{jC4|e6<TtJf^xi=e3pAc(amE1z>P-U(<kfV zP8*Na%8Xn|#%bFvimjKJ?wD<vEa4XB&mhe#Y_9`j8wY7q6Gm*v=BP$OCZZ!FMla1e zH5Z7Xyf$u6hjRry<qNWovqd&uIjcIFlYfntJw+uXfxt3irs2BI6S<lk=Z(TWKch6e z9HbDhpJkq(Eb~1PP@%h9SW3uo*8biYeBM%>VX|HjbR-fuzr(}a?2F3#I2X{_(MlJU zf;qFb)9Y?+y*l)-gG23Yjkv@8L=s`ZcqHV5+_)~I)m*YY;RY=3hH@T3Z$FJ5$B|=r zotq7d^!TfULv<-UtTHQWV;v<R%#f9$Xh9_}ZFj}x-jVvZnojvi8{(MQ86p=kZqE9X zcIHUV$Qs%mx@;wD7eC*P+gvm11PvxkKZPWb8HQBd(ZOesjUbJ#O1&+(z15Xi=6Tc5 zvYe*|CwR)^A<kx38Q%3Tsjj@(z<Y`C1G60!%^9_CVA!G-jK`@~jsy_4WRm0gV6ISB zEx`zY=#J9Wf@!rJ%xrATHoP-J%YZ$t!E=nM>{blsWd!E!2=M;Whj*?>0{iHD{TsBF zVgi_FtNu~`TXeZwmD@wN_CDoo7;wyPiHVOc41Rucu9Bc<gX}{RU*Cc~bJkz3ZQUAI zg={F)Bjy4=m0fRL(Q#@iy<=x%RH?kk%YgvEplvLqwPq#<Zs)tbML+KjgFarx=h&U$ z$KG(l7`81gmZ&d%NESJke&+$uh1}I*eWgiBsTYK$omumlzO0|=fbn#h)-S=GZb3M2 z^hn5UNSim{-TGr*1d8cY!tH%8btoPiXO?%EURsA{%2#{VDjf+EO2(UGTWvarmpp*g z`>{7G2RxWf*E`mlawWAyMl#o&5S_RR>x$$xNb>~Ju!41|aJ!8+ah@B{$uxi^mQ{2l zzSxtMS>XAg*j(=xOpYmlHU1l7+iC-c1c0YLm3@l~cl!$AdqCWj6vP7{#i0NUUNhxd zv&h-)6#Pc~h>bGOEqZls;WXJ5<S)I+BJy~>u<TZvPl|EDtMt~BdMb!PPSPV~Tp=h_ zJGax>S{6&G1UJEAr~C*H`c1{wdw7yPGm3lCZN+(#yGKe%Rpzk>=O78pM&m#?>3K3a z!GO}@37O)Z89WAJ;s8gr^n=%|F!84Y2DH~pKbEWNqeKicHRoO#B&eQr8>OeGKlz|D zATu|n`_pO)(B0)l=Ytp(n}iVPG{6qA@gPhO4;J+t<E}wyYL7~Fv=V#0DGv149}Yq9 z*u4qd8L>q+uNT=lV7}wkvB$d&Vu@MAuLa&e`}Wis7amD7F&Tb13v?R4cohjXI!U7k zGk((&BJ$|<TZ}=kd<1Zmd^u&L;++gQ+3nf22p7^T)YJ&+Lpov{94;-v+!v~b9IhxA zM|3Q@2by+rW$AOCvjW7nKM|7yxnru2v<}cUb_#lFK=k2sN-)Sw6jLq3;Q%S=e6j`2 z=AD;saOWy{3VkFwzwboqP7zz*k~~u<5Pz{@`W*IM33Myi9Xs$)+)BOtQ4nyp;T)fd zqAsV_`?pub+cJ7h2q-94sU?Acc8IqI?Dp6OD;Jgtx4Ha=!|&_RO^qJETS>LmXqecf z3UvZzEQ8L-NYOz$q*2c*7F9Ckc~uKiY;11KC*gW9PbBAg)FGV$$B=AipCwxXylISt zCBDzgVxO0qsAp~$LqzXD@l<$Jc<07(ncl+a4(MfDBVF1OUwN_D=_GJ;Q;xr`gFj@w zM+lW7<J4;98NIpYLn=}dyJO1tNH-Rh1OnkQ5-anDd-S$US(pl>X7<Uk6))Mab!LCb z_HU(>C3L>FT7;IAlyuMCoBhMXY_0{^uc1S<sVpNz7p3Gk(Q!)7X_>uu@|DZFr>~3B zFoO4opbMft@c0RQ(*aRn#}(PXA!)!;xP>w<T#|`;G9=2B9}y8zPa=^P1!rEm>~wZz zj*kq#7JaO)>rsC4e*5$-!_m3zy!!E$?UjYu+B@%vuWN%`@Xw|8m-Hh<)@mWQUCNIk zLMN>a9?L?J{+#AYfWzid;!C$~!RVjJRf!e5EVf+44IJo2#1KVBQG>}b-464@I$Ng7 zQ`g*<LW@V<b;v=LK*~^k=v^+Suv6kQSanEAS=pU0>*2c_sYaX2)|}ya&F{JiANA}4 zun1tLVe>JiY7$~V9T6~H$g=R^*Sq;hHY%6Fz8QOZEC#O+dsNHQc8<}ZckbmOxUPA1 zl`-uB|LNZ*$H$i2*s*9X<R6<OpPm@wD&=SG4q9=C24uIpDKoau3?K^X*MKf19}?^+ z&Lj3pl5aQIrn{9gqo<4{H^~#9`hzpLlM!U4oouoq(pu?=&Oj+is&)k^Atkc0+2!Zw zm*EmuF%`%^yRK8z2ubd5U|&tse>cQX9k5VWFRrFhV~Z3a8uVV)MF{KS!4Vpx{tPXn z{F5>A$@5o-xR88RT!$=*gH?<hkeFqnS4_R3WQ1LWa(zi?=6F_DIM4yP-#EjL*NT}v zMI<DF^X3)4bZ9gg=g|cAlDT93RV7!lJ^r&f)|Yf*a|6Fr`1_krH^w3o40JO`x&mo+ z;b`2Ze(j8|pj8^0BDScf{N4NPnvDNC?Lvm#&Yrp}g)G$MS7_22KWncOO}f_shIg9O z6kayB=gW60U7Ns<xE0>M=xq{}pX`GryWDS_#JMFpnJ6BEW!3V;+|U4~BpE97ufvm* z=_Eqc2-R)&d9JwZJ6DiO0`m9(o@@*zLA8b8AFK8GL2(rzUdTV7fZTnWCF5jb^-kcf z51r6R1?pjHp+}CAD(R1YQjBDp<)Rk-ue8@(-Hj(d8q|F2botW|hSM3nY@ZNK+V>uO zw{xM`^;D&Y9n8mw4<LUCwA<EjP~ox($+utfLwiE#?0C!g9p|fFLawA&MBm<nxY&EQ z!%VnC!Pz{*ZkdcyNt8JMU6Y4Eh@rd%%Ty!e@bF7bm;^)zti}4xetGFx5l}j5+gmes zxvW4dZ3PFs3iud{osl5^JM{cY@2=LG?T)NT7_<id5Mlx5t4H@HTY{Wm_zALF2^u<d zvRXExLs<vb$US0i6q7C3*42VS4|jVzA~`;+zsNn~WxPooGW#9D1XOsf<_{t+2;ZKc zn-0cgDmQ+T5~!)L9!FJFSC1aRL@oYy8OtAXR!pkE{dCo#`GW%Tm;{z`cO{ItPNhRq zu>*c<dE>M=R%!ChIZZkAjCQW-^UzaYWrK=z;2t7C?fVicdW*V44>)A@^AQ<b2;o5* z^oneo_gqrN&Ek9A!|Wuqm3nz6*h29N7NKu5U0Z$tYfgUEJtCXXXw@LA;|22Rg<V{I z4fC#aHdt<%t{<mgh4Miyf*?SX5e%C*gznzBw+ya}z<0benLkf^MCd(}{zlSez%Jo7 zD>A%ePQ!@boD-l4`SDz}1nmGFp1+rI`&}9T#8IUBgN)y#HSTFBW=QjCNmeRSY7n+a zd^Rb`=MUvYL%6C;cM2Kpfg-&QXd+0sI0fip&CSh4#dp0W-#Ja2vdXx%4rVPFH9kqx zu~BF&n5K1tryhr=2c|jGXU!E_IRH)IkNRB19aJ=)2y{4$xTQ0+-`Yg=xU|Ap7>mR~ zB_NOiv`iIo8<qRYJ#eV%uSVrhLjPVjQv_%@6)F2Vz&@P|4_r?L1i`%4TDA-#5Qd<G zJLBUl5t)V&vui%;r;3xzpJ_BQm^am>i8QG37Bqh1?5Yv=-jr<|RoX#oq~+6W+$P#H z<sNo|4H%nU=j)x5P`D98n`XT!Cdw7Toi28bv@5jF>0*g(Pp%~(RHm$OxPXz>HQ`%H z)ZpX4mc(s%SGrvc+PD8I-Jf+Qdl-%sh6M_g9yTShl%3vi^Lje5R|1NT9m9V<%~p{? zDbCEo4-tLqOc`%(+Pqx0j+5gHI0%5rFAS5z>5YeN2Ufrvjz3fazNS*gglPkxLL#H_ zKkO|Hol(DLhTH1gaJl9IHmP<T=O}wKKjC@Q%3>uY?%c>b8iNdl5O8U=@A55v_RI3~ zRX!@;Y$CPX|7j^zfJ%f4bN3HVP^V*U;n)9c4GGY!QOg{NC>NG1sm?GoI#0W$7#)1# zj)1aL?%&xhfTjE)CT9Vk@yd5-<mGo*TjMOu8h>ztTTmlBS<>PV;MSd$a|fFn{Hl%u zoiWkcO_oiBkHGt<skuuPc>y1N&H#7i;ry{d><I&ZqQDYTwZB!I_UOKY3e)bAn;lYf zf@AlIsr~on(Z{IH@chct|J>FE0xVl$o6RqjYT@OX!06-RHVp!3mOLRAN=G=G1qzK; zp_7X?_+GmC@jk$M^F)E}>lditzW<&b`=^DeiDuAL>>l*lqptRZK8-u1eBe19SA>t6 z)xjomyPWd!O(yE#=*LZI-z|J{?=Aa5Z@>p==nk^IAKThX6QfQ`7Od$vF*kP+JevP} z^$9F~^*e_Ck!^7`#tdN8(+6HZY*)yPUe>C{nWI?HfCkZbG_|r?f(~FB{n3qKpc5_N zBKAjusBNa@2;GvJtm}mN55UGylb?3K1ZceOuvcT-$Yol%9h{ENv=Xi}-hT4fZzDeh zI8>Byh6VH4b55%FGgHfFd)gk_dksK~DR4AIs2ZJ2k!cAiBAa4O{+!VFSMGmz_N=tN zS&WR|LwMjy7n+cfz3_=tlZBefv(!(ZUJ$@9MGin1?CNfcP+wyjMC-GvrWPs^TNz}! zqr7w|pDARqUuXO6(&!H^?gxG=Ab_n)U)8M?qP~@Xgqo)8qS_hc!t}>H&gFCDV>db5 z;d`t*+!cf><iE#*RGiuUh*k)}uR^;yevp(9NA*3m8gz0+3=YSG)=4%|-t!}soU2x1 z1;8tQjp$^#9f4S+eti7KyLjGeb8j2hAAbFvUHl>G=K+n<^M5gt@Lf-X>2g@%Mgr#c z3$%CRLe8hE?^c`ZQh}o}L*Q<N#;7BhiPVoDKenMWe#ngczytOQR)C#H>WD2=s>KeR zku#7lK4Mqslc7EqY{*I{cjCl}s34&gHvtAsuFyS>*WXH7`=3=S0erir+)%^D#)iq` zSJ55!D%6#~M+<-9(9i`S)8K-)Ud^FerHc@a=7B{h2SRpHBlL4Ee@F={{P=$LgA*sf zg4|t|Px)|B=bP8+$-1hC#1;M`2~^@$aSOP2{syDZk9o`#HOY(o!&(i@499?s@|pnH zjSQhQFqi`sy9crS`yc5x$Sg`E_{ZLOZeWQPNHGSK6lqteiRNdcELPN{d`Y8bHuZAc z>KOqSGtSaKNF7Sl$k8$!WtGsB3Q?;AQ2)Xgp<s1Z;H)$@43Lv+kdEfokSx@$I`#}y zsTf{#j_*VJr%%_ToVd?Hk@g-)Am>H3AnK1bS9ec+xH?%$bv_}GdI;Y0IAR1xzus`- zb8K=3TL`4voZsv6Q3L79V9~l%2HWObeRQj4@WZ0t1aw;|{ta>rw*6I%Y|NZ&dh;RS zP!9X<e>EHc!_q7IepudN4z(=SaoWfCe13Z~;R0LN5sb4tD$p*6kf}6GH8<iIXEuw> z65*sd`1nYj+#_Adw5jezXefTO0Wi@J59WKa%&)$eVRqdQwS=D#1T6FY8b4!dWi;If zhzD@6g`i+$9$-))JT%Bll6SasDL9||kwA|ZpN-(NNJH+<wv;R}w(5)Lj*jcJ3ZgFr zrggx!q#I;1biQ<Nd1(Ws2&yOj@X_=zApVADM`oy<+1P!CCEAD+(|40q#Aq}n*cvtW zgvN-aj$B4GE8&`L#D$~|^<NMdOp1=`H{WySv_@M0;^HJ_<(W=Zc~9G^>sp)tr~~IM zX#i|u92{YJgqkKP7Fq@|U-vUzrphC_8^y4tDR~Q_3C{k6Ip?lKp>P2Zi_GHj?kHQ2 zgFK76NRhH5uQd0Zfpu*yGThKF*@7vRSL+AOc6UL7Vpq#-{_W|V0RC*}u1Nl2TLoF+ z{WObv1!$Se`XaM#ux-E+D8Y(3M`{~N+Ku=*+z(>m@1vX_xYAG4*Kt~Do?t6qvPywl zY)IEEW~9FbQZJYsXA<sw&~fD`=ZF9D^s)Q9N;5$}hNm(B!cvm7m01FJ=`}ePJ?>r% zMUQVW*2vH%`^4Ak>)^z5j=W!*g4<d>*Wrq~CU^%JhlFS$-AUbF))a{sC5Z$daGzKv zq)bu>TiLx|e!a@P)zjRu=7$r5s8tCVlMe=r{yrauJKt*{fLSqA=YM>lftwBc^5x6p zkKfePs~zXq<v9lv4u12zUEWi;BWv=K01QprD9egHsD1%CEXPBmODEkuot;_rD!VB1 zd2-;>49FC8(&&q}*M_I=-{8{!3Zc<&fUV-hYxlEIOL}{X8XXIpq9vPg!<h?o$7JW4 zUOPf*lSft@!X#Ac8SH&|3}lK_W+2H$??p6H+}E{XpT><k(?zpdN^;Hf)5#nD(~ala z>+5G`;;}_QSOs9#zi8MuxzFD{{kjjYJzzjhfT>^zgOFf0e2=gdTnF9r+T{Qr+)OZB zeNU)X>SPgHqovTxaWs@xz)8sCQS@yvHf&Sz90P|k5Hs)Siq8zT6&dAgZ@iTE8f1I| z%00$&_0&JQ%JY^t06{SB*Rsa^paeX$Y?myBO4WqB{LZF!JUsH`BZG<HovFq%I2jUK zOSE(KDUJ#5HMX3^d!BSsyauN?i|itIg+C~E>vita?&{tTPe47PjPe-FdR3JJ_1b=P z918Kfet+$cN-^qdGD6hoco@V41(oU@`l=30#F-!D5YUCRE%Dh*Tn$erpc$MVutekW zc<W0CAwn*U)=mwQN=SdFX~LS~XmSFQbBYCTSM;ju10o}#*d2=h+W_!CBB1bamw=6% zm6Fs1phMLpYt(ojti^V7lH4R+BAZ1XXYuO5%5G}#hQ{R}7KJ%Nn2D^cB}-^Q7eEo< zH=ZT?$F2&d^3JzCOZN1HB+Vq~^9?4)6ZstWru$n+;*|<cjr|~GKk|WHaTg48-D9Mt zVn~9P?W(4|`u5xXn$m0y!0IoD>$P9I%GNVkWqo502fEcVlC92?Lnydqu?k|9lDJ&v znn21xk)SAIy!DhxYXa8YskO;#1N|>M!0wX{aG)HP@`D|EB_PFV#?P-!r_sP=xKH>` z;orD`>}RrR;<IVivgBCQ4GOBP5OJ7OnerZRA7*g$Fppi8@5?=eZ%LTL8TBOi_VdnQ zbBF%X+5_t+iUDihY=@kocDH@VJ&&0hc-Z_V!v(V<j|<_+WlMXDbR@$g?NSpPpB$9e zIJ%MQ2d@#9U)4F*Rdhq$c)Gy@9PQ!n^gKav1(HDedD&N^o!=b*Jr)cBe^W>xE=fPP zM_rrlSP@)<f$eczwNuEsu#={txAPy~c4}p7Z72bpsWuFlvv6j3bHr%_5wj<pluf|_ z4KU^hyHUxWl$oVIWRm{QbuC2TMTB3|u1xkRd_SC$TF?H&of6=f1lv1K&R@?>_>&kW zy*)+yY1A2L*+>J^_BJ;7E{Z;dt$IvP^l?f*gOwFq7ptP=<MheFkc}cV+8=yh9nS8q zBMFaO69IBjdc(X1Q0HZQcJA4YGwa4qdAFB@h}ljV25<fu+XU0u>Hx^rY5fz`yE_0Y z9jm5!v|qD9m<`Kssh;AI^ghZ&&?AyQ^-q0xyv1ODUh9u;5Rq3y(&|xxwYv^!Daap! zvGN4cs4Z`l_}Z4W#SpV?&7O!-gkDuaGAX0)=t9Jgh=Yp#K(d=Rq$J?5MTN_t0JS!p z2Z|i5zN|vP`_%4jPESv#rXfD>XFK>f1#aDStwDNHD0^z3JTB@zs6jcPx@jwVPfo!Z zlsFcc=D^|ZY~YrJU``sHEsKd_D4dd*JWxXgTJHW?IxUNK!NE)74Oi;@lJcajd=@Gv zZEnPh=64f7D27}6T+-%^vJ^~=#BTz=QK)#lX~R*gqT2-MaFo`yNV4vChfQNVAkxd- z5tE(}e2Zr_V<KKr9@B(>_23^77{HIQ>+As1JPAtAOrmlgHF!4o@qOwHkCTUohiwh7 zU5hOjyU!)cS*wd~<$ocdd6OeV8$3Jl!4`bI#R~(#KcXf>!e#}ZSC=i&UF9RVC8ScO zq;EmNX_s>VqlC)xFK+#tK;$#-x~EC?fgk$++V85-3A5$7#lWr4d-8?=vwsl4B>>(R zZdm9540jKtiDSgu+*>cl9%HiI@Wsst2R+aOQfEEDpNi*Tt|m?Y0t$rPPVA<P4kHHA zsgn>jEp&qB>SK5Nxas78Kn-IB{5$YA@)|4ZqCy>Km>6JY6#@U}G~JkUjFg>=zrv>z zbRN}Mc0o(kL%;R^ve{#ISOH!uBTKx2I@>qH9P*q_P*c4}<7VDdpS1BXxZU|xjU$~p z+h+1!m^yCKn?Oxjqq+*TB#ujvZ@MW#*J(P2ocJ&J7Pzt4ZuG#;-9{~VZaNH_V|NXK z^(@MV*4#Up-pp}XQofFRdU+yc(VY}vjN&UFl(>ES<TTL!nP8Bf`*8{@{cq-kT`>l* z=-r=vbgAvCLW<h_(|yth1-Z)HE-2jvMjIv>EA2%lQZxDn-7C!}H7d8)Duzu@;43?d zfE@h4uj2@i_a!{0Q?a0aLLU&~T>$#O)w1rs-zUvHsI=@Q7#PW#Qx4QrjXrk~uSAq# z@M7b-l?kyX)Pn+4EdS3(9}57LjU;CfshbGK(m3G!B7#W(%1?WhUYyBMe)L0|vD5S_ zTv4)b8j%Ys+ESv9W~tToKWa|i9n|7WtPH2NJ^3^t4A!4-(aB}|0bSrix0Ukn8DSZo zm;V(s069nqBlsg`p^uEt>Z8tm1LiWSW(`F*Nh!`23aq`{YcgklJ+Nr5XXKk${m*g% zaF_#>Eo3vJo>BwFic@rgaY|F+o)BQPVmhV`YZB!D_bK78R;&gMXin-8hXShiC4Bvk z%7*;-u`rHq4t%rVOCmK_{+D^wlmP@2GyzYMq2|Z^U0wceT|e9>q!Bo&*;X1A^_O}6 zA1?ZzyQJ*qm^^7`ZT|hT9}zZZ0-ynn{t_z}s0H*dYxwI8E%kRJGRD&6@8d`RmtO$s z8=x)>L=faR{U`okIH3gC0a>y4=I8!j$dleh>g`0Ug1-{}pDfb$&dS`FX1*}|@$uQ{ zAx9;l^&F3!KY~tZf<Xv)H-Cx%y$r5lbjeMfj)9e5EqD(N?Y9pCG&Fh)pH6-I`(Hj} z($c1NR{9*K`t?6ut#)2bjpObe=AXGVH#j)QQ_}qG4`luQjak`Q--l(Ho%xAN-;48S zO$|jEvi)Vfe|O_BIyyN4`@X-j=I<`OeSpFK^y<Xbzx(d5zyHNrI)-1YW##`RwQ9k? z3<6+ue;I`D2BEAr`TU+e++o_9>VN!%iT-7GS^0mtG{BDhLJKsszknDW!!LvI|4oB% zVPBQ%yzj%RjuPrn<30bvX6Mr8++@Vp*u%1@rjJ4{@qs>}Lg-RVkR72l%qB`vgepp@ zfzebeXYSDL`7gj8+(#!jsNe+s9>n}38V|WtV=*pAQWU1T-B$|!8btI<@MjHF-5^uZ z^N+uZ2122DjKEKXH#K)?XgXGy(-HslSSsgd`5Wu|XviVPzXlS2v%E4U2KzGCe*eGu zikk0#F5pRUu<fM#`M<80>cL;XDl}75D+#D42>s*2zmvuV?1B*D%+GAXEWoW<9(mBu zu<JN~7B`HS{cni-D@{&ESl>I17Owx#djEze=YUOU#>M^29=rp%MG5cF`pT2PKK45Y z_@#hg@El*n-#qVsX!?JWSv57;Un2WUWPge5FDv`Y%Koyl{A#~|L2%9gZ-D_am_Q*D zUk6<LDdfqzrZwhZ8yHwQI<JZfT3f_E3Zll!|A=th)W??T<mQ<Y(&GQ|8Y-w$vqOih zu4`fW3COl5qy(_jC3y;pKXGx55P#O<F)9p2^~@jX%HU*upJ84-{xfKpPOj=Fp1mie z8z8iMMgj5@7Y7G7Df}aCRP?)DS5x!!-3k}`iHlj^ukHUIWcWAeQ6B*J`URs4fAiJ< z{G9ga=#PA(qK%5A8V3LYPc8Exf8t^_H5|`R;BQvNll)mqm4WpfKXEaGz5m{ySxznx zRpj=$`us##K|>Sc`V$~sZLBmnn6R|LZ158o1H#Gt_YC}zZ@+}|mvH{OIQ<gN|C<W` zvYbC<IU)aNjAyx-iKws`8W%IIS6}e+>rdrHmcLjfW}}u^*h;m62vAevKP$tw1B=<7 RpG;u@0#8>zmvv4FO#t8t!vz2U diff --git a/ng2-components/ng2-alfresco-search/src/assets/images/empty_doc_lib.svg b/ng2-components/ng2-alfresco-search/src/assets/images/empty_doc_lib.svg new file mode 100644 index 0000000000..866acd527b --- /dev/null +++ b/ng2-components/ng2-alfresco-search/src/assets/images/empty_doc_lib.svg @@ -0,0 +1,208 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg width="566px" height="165px" viewBox="0 0 566 165" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch --> + <title>empty_doc_lib + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts index f4b5e50e13..f3a066f4ba 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts @@ -68,7 +68,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges { @ViewChild('resultsTableBody', {}) resultsTableBody: ElementRef; - baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', ''); + baseComponentPath: string = module.id.replace('/components/alfresco-search-autocomplete.component.js', ''); constructor(private searchService: AlfrescoSearchService, private translateService: AlfrescoTranslationService, @@ -128,13 +128,14 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges { if (node.entry.content && node.entry.content.mimeType) { let icon = this.thumbnailService.getMimeTypeIcon(node.entry.content.mimeType); return this.resolveIconPath(icon); - } else if (node.entry.isFolder) { - return `${this.baseComponentPath}/../assets/images/ft_ic_folder.svg`; + } + if (node.entry.isFolder) { + return `${this.baseComponentPath}/assets/images/ft_ic_folder.svg`; } } resolveIconPath(icon: string): string { - return `${this.baseComponentPath}/../assets/images/${icon}`; + return `${this.baseComponentPath}/assets/images/${icon}`; } /** diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.css b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.css index 5f087e32c3..46d9a98066 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.css +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.css @@ -13,3 +13,25 @@ overflow: hidden; text-overflow: ellipsis; } +.no-result-message { + height: 32px; + opacity: 0.26; + font-family: Muli, Helvetica, Arial, sans-serif; + font-size: 24px; + line-height: 1.33; + letter-spacing: -1px; + color: #000000; +} + +.no-result__empty_doc_lib { + width: 565px; + height: 161px; + object-fit: contain; + margin-top: 17px; +} + +.empty_template { + text-align: center; + margin-top: 20px; + margin-bottom: 20px; +} diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html index 4b023fbfbe..a38feaaf40 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html @@ -1,38 +1,79 @@ - - - - - - - - - - - +
+

{{ 'SEARCH.RESULTS.ERROR' | translate:{errorMessage: errorMessage} }}

+
+ + + + + -
- - - - - + + + + + + + + + - -
{{ 'SEARCH.RESULTS.SUMMARY' | translate:{numResults: results.length, searchTerm: searchTerm} }}
- {{'SEARCH.RESULTS.COLUMNS.NAME' | translate}} - - {{'SEARCH.RESULTS.COLUMNS.MODIFIED_BY' | translate}} - - {{'SEARCH.RESULTS.COLUMNS.MODIFIED_AT' | translate}} -
{{getMimeTypeKey(result)|translate}}{{result.entry.name}}{{result.entry.modifiedByUser.displayName}}{{result.entry.modifiedAt | date}}
- - - - - - -
{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm: searchTerm} }}
-

{{ 'SEARCH.RESULTS.ERROR' | translate:{errorMessage: errorMessage} }}

+ + + + + + + + + + + + + +
+
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts index 61186eda3d..b14a95d503 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts @@ -16,12 +16,10 @@ */ import { DebugElement, ReflectiveInjector, SimpleChange } from '@angular/core'; -import { By } from '@angular/platform-browser'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Rx'; import { AlfrescoSearchComponent } from './alfresco-search.component'; -import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service'; import { TranslationMock } from './../assets/translation.service.mock'; import { AlfrescoSearchService } from '../services/alfresco-search.service'; import { @@ -33,6 +31,7 @@ import { StorageService, LogService } from 'ng2-alfresco-core'; +import { DocumentListModule } from 'ng2-alfresco-documentlist'; describe('AlfrescoSearchComponent', () => { @@ -69,8 +68,8 @@ describe('AlfrescoSearchComponent', () => { entry: { id: '123', name: 'MyFolder', - isFile : false, - isFolder : true, + isFile: false, + isFolder: true, createdByUser: { displayName: 'John Doe' }, @@ -102,13 +101,13 @@ describe('AlfrescoSearchComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - CoreModule.forRoot() + CoreModule.forRoot(), + DocumentListModule.forRoot() ], - declarations: [ AlfrescoSearchComponent ], // declare the test component + declarations: [AlfrescoSearchComponent], // declare the test component providers: [ AlfrescoSearchService, - {provide: AlfrescoTranslationService, useClass: TranslationMock}, - AlfrescoThumbnailService + {provide: AlfrescoTranslationService, useClass: TranslationMock} ] }).compileComponents().then(() => { fixture = TestBed.createComponent(AlfrescoSearchComponent); @@ -123,9 +122,9 @@ describe('AlfrescoSearchComponent', () => { it('should take the provided search term from query param provided via RouteParams', () => { let injector = ReflectiveInjector.resolveAndCreate([ - { provide: ActivatedRoute, useValue: { params: Observable.from([{ q: 'exampleTerm692' }]) } } + {provide: ActivatedRoute, useValue: {params: Observable.from([{q: 'exampleTerm692'}])}} ]); - let search = new AlfrescoSearchComponent(null, null, null, injector.get(ActivatedRoute)); + let search = new AlfrescoSearchComponent(null, null, injector.get(ActivatedRoute)); search.ngOnInit(); expect(search.searchTerm).toBe('exampleTerm692'); }); @@ -138,9 +137,9 @@ describe('AlfrescoSearchComponent', () => { AlfrescoApiService, StorageService, LogService, - { provide: ActivatedRoute, useValue: { params: Observable.from([{}]) } } + {provide: ActivatedRoute, useValue: {params: Observable.from([{}])}} ]); - let search = new AlfrescoSearchComponent(injector.get(AlfrescoSearchService), null, null, injector.get(ActivatedRoute)); + let search = new AlfrescoSearchComponent(injector.get(AlfrescoSearchService), null, injector.get(ActivatedRoute)); search.ngOnInit(); expect(search.searchTerm).toBeNull(); }); @@ -157,6 +156,7 @@ describe('AlfrescoSearchComponent', () => { it('should call search service with the correct parameters', (done) => { let searchTerm = 'searchTerm63688', options = { include: ['path'], + skipCount: 0, rootNodeId: '-my-', nodeType: 'my:type', maxItems: 20, @@ -186,9 +186,9 @@ describe('AlfrescoSearchComponent', () => { component.resultsLoad.subscribe(() => { fixture.detectChanges(); expect(searchService.getQueryNodesPromise).toHaveBeenCalled(); - expect(element.querySelector('#result_user_0')).not.toBeNull(); - expect(element.querySelector('#result_user_0').innerHTML).toBe('John Doe'); - expect(element.querySelector('#result_name_0').innerHTML).toBe('MyDoc'); + let resultsEl = element.querySelector('[data-automation-id="text_MyDoc"]'); + expect(resultsEl).not.toBeNull(); + expect(resultsEl.innerHTML.trim()).toBe('MyDoc'); done(); }); @@ -204,7 +204,7 @@ describe('AlfrescoSearchComponent', () => { component.resultsLoad.subscribe(() => { fixture.detectChanges(); - expect(element.querySelector('#search_no_result')).not.toBeNull(); + expect(element.querySelector('.no-result-message')).not.toBeNull(); done(); }); @@ -218,11 +218,10 @@ describe('AlfrescoSearchComponent', () => { spyOn(searchService, 'getQueryNodesPromise') .and.returnValue(Promise.reject(errorJson)); - component.resultsLoad.subscribe(() => {}, () => { + component.resultsLoad.subscribe(() => { + }, () => { fixture.detectChanges(); - let resultsEl = element.querySelector('[data-automation-id="search_result_table"]'); let errorEl = element.querySelector('[data-automation-id="search_error_message"]'); - expect(resultsEl).toBeNull(); expect(errorEl).not.toBeNull(); expect((errorEl).innerText).toBe('SEARCH.RESULTS.ERROR'); done(); @@ -240,10 +239,10 @@ describe('AlfrescoSearchComponent', () => { component.resultsLoad.subscribe(() => { fixture.detectChanges(); - expect(searchService.getQueryNodesPromise.calls.mostRecent().args[0]).toBe('searchTerm2'); - expect(element.querySelector('#result_user_0')).not.toBeNull(); - expect(element.querySelector('#result_user_0').innerHTML).toBe('John Doe'); - expect(element.querySelector('#result_name_0').innerHTML).toBe('MyDoc'); + expect(searchService.getQueryNodesPromise).toHaveBeenCalled(); + let resultsEl = element.querySelector('[data-automation-id="text_MyDoc"]'); + expect(resultsEl).not.toBeNull(); + expect(resultsEl.innerHTML.trim()).toBe('MyDoc'); done(); }); @@ -257,13 +256,12 @@ describe('AlfrescoSearchComponent', () => { let searchService: AlfrescoSearchService; let querySpy: jasmine.Spy; let emitSpy: jasmine.Spy; - const rowSelector = '[data-automation-id="search_result_table"] tbody tr'; beforeEach(() => { debugElement = fixture.debugElement; searchService = fixture.debugElement.injector.get(AlfrescoSearchService); querySpy = spyOn(searchService, 'getQueryNodesPromise').and.returnValue(Promise.resolve(result)); - emitSpy = spyOn(component.navigate, 'emit'); + emitSpy = spyOn(component.preview, 'emit'); }); describe('click results', () => { @@ -272,12 +270,14 @@ describe('AlfrescoSearchComponent', () => { component.navigationMode = AlfrescoSearchComponent.SINGLE_CLICK_NAVIGATION; }); - it('should emit navigation event when file item clicked', (done) => { + it('should emit preview event when file item clicked', (done) => { component.resultsLoad.subscribe(() => { fixture.detectChanges(); - debugElement.query(By.css(rowSelector)).triggerEventHandler('click', {}); - expect(emitSpy).toHaveBeenCalled(); + + let resultsEl = element.querySelector('[data-automation-id="text_MyDoc"]'); + resultsEl.dispatchEvent(new Event('click')); + done(); }); @@ -285,14 +285,16 @@ describe('AlfrescoSearchComponent', () => { component.ngOnInit(); }); - it('should emit navigation event when non-file item is clicked', (done) => { + it('should emit preview event when non-file item is clicked', (done) => { querySpy.and.returnValue(Promise.resolve(folderResult)); component.resultsLoad.subscribe(() => { fixture.detectChanges(); - debugElement.query(By.css(rowSelector)).triggerEventHandler('click', {}); - expect(emitSpy).toHaveBeenCalled(); + + let resultsEl = element.querySelector('[data-automation-id="text_MyFolder"]'); + resultsEl.dispatchEvent(new Event('click')); + done(); }); @@ -307,12 +309,14 @@ describe('AlfrescoSearchComponent', () => { component.navigationMode = AlfrescoSearchComponent.DOUBLE_CLICK_NAVIGATION; }); - it('should emit navigation event when file item clicked', (done) => { + it('should emit preview event when file item clicked', (done) => { component.resultsLoad.subscribe(() => { fixture.detectChanges(); - debugElement.query(By.css(rowSelector)).triggerEventHandler('dblclick', {}); - expect(emitSpy).toHaveBeenCalled(); + + let resultsEl = element.querySelector('[data-automation-id="text_MyDoc"]'); + resultsEl.dispatchEvent(new Event('dblclick')); + done(); }); @@ -320,14 +324,16 @@ describe('AlfrescoSearchComponent', () => { component.ngOnInit(); }); - it('should emit navigation event when non-file item is clicked', (done) => { + it('should emit preview event when non-file item is clicked', (done) => { querySpy.and.returnValue(Promise.resolve(folderResult)); component.resultsLoad.subscribe(() => { fixture.detectChanges(); - debugElement.query(By.css(rowSelector)).triggerEventHandler('dblclick', {}); - expect(emitSpy).toHaveBeenCalled(); + + let resultsEl = element.querySelector('[data-automation-id="text_MyFolder"]'); + resultsEl.dispatchEvent(new Event('dblclick')); + done(); }); diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts index 711f057d03..0a6cbc00b9 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts @@ -18,9 +18,8 @@ import { Component, EventEmitter, Input, Output, Optional, OnChanges, SimpleChanges, OnInit } from '@angular/core'; import { ActivatedRoute, Params } from '@angular/router'; import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service'; -import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; -import { MinimalNodeEntity } from 'alfresco-js-api'; +import { NodePaging, Pagination } from 'alfresco-js-api'; @Component({ moduleId: module.id, @@ -51,23 +50,28 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { @Input() navigationMode: string = AlfrescoSearchComponent.DOUBLE_CLICK_NAVIGATION; // click|dblclick - @Output() - navigate: EventEmitter = new EventEmitter(); - @Output() resultsLoad = new EventEmitter(); + @Output() + preview: EventEmitter = new EventEmitter(); + results: any = null; + pagination: Pagination; + errorMessage; queryParamName = 'q'; + skipCount: number = 0; + + nodeResults: NodePaging; + baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', ''); constructor(private searchService: AlfrescoSearchService, private translateService: AlfrescoTranslationService, - private thumbnailService: AlfrescoThumbnailService, @Optional() private route: ActivatedRoute) { } @@ -75,6 +79,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { if (this.translateService !== null) { this.translateService.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src'); } + if (this.route) { this.route.params.forEach((params: Params) => { this.searchTerm = params.hasOwnProperty(this.queryParamName) ? params[this.queryParamName] : null; @@ -88,38 +93,16 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { ngOnChanges(changes: SimpleChanges) { if (changes['searchTerm']) { this.searchTerm = changes['searchTerm'].currentValue; + this.skipCount = 0; this.displaySearchResults(this.searchTerm); } } - /** - * Gets thumbnail URL for the given document node. - * @param node Node to get URL for. - * @returns {string} URL address. - */ - getMimeTypeIcon(node: any): string { - if (node.entry.content && node.entry.content.mimeType) { - let icon = this.thumbnailService.getMimeTypeIcon(node.entry.content.mimeType); - return this.resolveIconPath(icon); - } else if (node.entry.isFolder) { - return `${this.baseComponentPath}/../assets/images/ft_ic_folder.svg`; - } - } - - private resolveIconPath(icon: string): string { - return `${this.baseComponentPath}/../assets/images/${icon}`; - } - - /** - * Gets thumbnail message key for the given document node, which can be used to look up alt text - * @param node Node to get URL for. - * @returns {string} URL address. - */ - getMimeTypeKey(node: any): string { - if (node.entry.content && node.entry.content.mimeType) { - return 'SEARCH.ICONS.' + this.thumbnailService.getMimeTypeKey(node.entry.content.mimeType); - } else { - return ''; + onPreviewFile(event: any) { + if (event.value) { + this.preview.emit({ + value: event.value + }); } } @@ -131,6 +114,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { if (searchTerm && this.searchService) { let searchOpts: SearchOptions = { include: ['path'], + skipCount: this.skipCount, rootNodeId: this.rootNodeId, nodeType: this.resultType, maxItems: this.maxResults, @@ -140,33 +124,35 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit { .getNodeQueryResults(searchTerm, searchOpts) .subscribe( results => { + this.nodeResults = results; this.results = results.list.entries; + this.pagination = results.list.pagination; this.resultsLoad.emit(this.results); this.errorMessage = null; }, error => { - this.results = null; - this.errorMessage = error; - this.resultsLoad.error(error); + if (error.status !== 400) { + this.results = null; + this.errorMessage = error; + this.resultsLoad.error(error); + } } ); } } - onItemClick(node, event?: Event) { - if (this.navigate && this.navigationMode === AlfrescoSearchComponent.SINGLE_CLICK_NAVIGATION) { - if (node && node.entry) { - this.navigate.emit(node); - } - } + public onChangePageSize(event: Pagination): void { + this.maxResults = event.maxItems; + this.displaySearchResults(this.searchTerm); } - onItemDblClick(node: MinimalNodeEntity) { - if (this.navigate && this.navigationMode === AlfrescoSearchComponent.DOUBLE_CLICK_NAVIGATION) { - if (node && node.entry) { - this.navigate.emit(node); - } - } + public onNextPage(event: Pagination): void { + this.skipCount = event.skipCount; + this.displaySearchResults(this.searchTerm); } + public onPrevPage(event: Pagination): void { + this.skipCount = event.skipCount; + this.displaySearchResults(this.searchTerm); + } } diff --git a/ng2-components/ng2-alfresco-search/src/i18n/en.json b/ng2-components/ng2-alfresco-search/src/i18n/en.json index 8f8042c28b..bfee68b4c5 100644 --- a/ng2-components/ng2-alfresco-search/src/i18n/en.json +++ b/ng2-components/ng2-alfresco-search/src/i18n/en.json @@ -5,7 +5,7 @@ }, "RESULTS": { "SUMMARY": "Found {{numResults}} results for {{searchTerm}}", - "NONE": "No results found for {{searchTerm}}", + "NONE": "No results found searching for {{searchTerm}}", "ERROR": "An error occurred while running the search", "COLUMNS": { "NAME": "Display name", @@ -25,6 +25,22 @@ "ft_ic_archive": "Acrchive file", "ft_ic_presentation": "Presentation file", "ft_ic_spreadsheet": "Spreadsheet file" + }, + "DOCUMENT_LIST": { + "COLUMNS": { + "DISPLAY_NAME": "Display name", + "CREATED_BY": "Created by", + "CREATED_ON": "Created on" + }, + "ACTIONS": { + "FOLDER": { + "DELETE": "Delete" + }, + "DOCUMENT": { + "DOWNLOAD": "Download", + "DELETE": "Delete" + } + } } } } diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts index 7de189c7da..f9fc563d48 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts @@ -18,6 +18,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; +import { NodePaging } from 'alfresco-js-api'; /** * Internal service used by Document List component. @@ -36,13 +37,13 @@ export class AlfrescoSearchService { * @param options Additional options passed to the search * @returns {Observable} Search results */ - public getNodeQueryResults(term: string, options?: SearchOptions): Observable { + public getNodeQueryResults(term: string, options?: SearchOptions): Observable { return Observable.fromPromise(this.getQueryNodesPromise(term, options)) - .map(res => res) + .map(res => res) .catch(err => this.handleError(err)); } - private getQueryNodesPromise(term: string, opts: SearchOptions) { + private getQueryNodesPromise(term: string, opts: SearchOptions): Promise { return this.apiService.getInstance().core.queriesApi.findNodes(term, opts); } diff --git a/ng2-components/ng2-alfresco-tag/karma-test-shim.js b/ng2-components/ng2-alfresco-tag/karma-test-shim.js index b922a90bce..6aa9dd62c7 100644 --- a/ng2-components/ng2-alfresco-tag/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-tag/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-upload/karma-test-shim.js b/ng2-components/ng2-alfresco-upload/karma-test-shim.js index b922a90bce..6aa9dd62c7 100644 --- a/ng2-components/ng2-alfresco-upload/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-upload/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js b/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js index b922a90bce..6aa9dd62c7 100644 --- a/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-userinfo/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-viewer/karma-test-shim.js b/ng2-components/ng2-alfresco-viewer/karma-test-shim.js index b922a90bce..6aa9dd62c7 100644 --- a/ng2-components/ng2-alfresco-viewer/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-viewer/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/ng2-components/ng2-alfresco-webscript/karma-test-shim.js b/ng2-components/ng2-alfresco-webscript/karma-test-shim.js index dcfa63a5ae..53e4408aa1 100644 --- a/ng2-components/ng2-alfresco-webscript/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-webscript/karma-test-shim.js @@ -1,7 +1,14 @@ // Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -// jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; + +window.componentHandler = { + upgradeAllRegistered: function () { + }, + upgradeElement: function () { + } +}; __karma__.loaded = function() {}; diff --git a/scripts/npm-build-bundle-all.sh b/scripts/npm-build-bundle-all.sh index 5433de9890..bb67f0931a 100755 --- a/scripts/npm-build-bundle-all.sh +++ b/scripts/npm-build-bundle-all.sh @@ -72,10 +72,18 @@ npm link ng2-activiti-diagrams npm link npm run build +#LINK SEARCH +echo "====== linking component: ng2-alfresco-search =====" +cd "$DIR/../ng2-components/ng2-alfresco-search" +npm link ng2-alfresco-core +npm link ng2-alfresco-datatable +npm link ng2-alfresco-documentlist +npm link +npm run build + #LINK ALL THE OTHERS COMPONENTS for PACKAGE in \ ng2-alfresco-login \ - ng2-alfresco-search \ ng2-alfresco-userinfo \ ng2-alfresco-upload \ ng2-alfresco-tag \ diff --git a/scripts/npm-link-all-components-demo.sh b/scripts/npm-link-all-components-demo.sh index 7d2ee6a75e..bd09e0c988 100755 --- a/scripts/npm-link-all-components-demo.sh +++ b/scripts/npm-link-all-components-demo.sh @@ -71,10 +71,19 @@ npm link ng2-alfresco-core npm link ng2-activiti-diagrams npm install +#LINK SEARCH +echo "====== linking component: ng2-alfresco-search =====" +cd "$DIR/../ng2-components/ng2-alfresco-search/demo" +npm link ng2-alfresco-core +npm link ng2-alfresco-datatable +npm link ng2-alfresco-documentlist +npm link ng2-alfresco-search +npm link +npm run build + #LINK ALL THE OTHERS COMPONENTS for PACKAGE in \ ng2-alfresco-login \ - ng2-alfresco-search \ ng2-alfresco-userinfo \ ng2-alfresco-upload \ ng2-alfresco-tag \ diff --git a/scripts/npm-link-demo-shell.sh b/scripts/npm-link-demo-shell.sh index 5433de9890..bb67f0931a 100755 --- a/scripts/npm-link-demo-shell.sh +++ b/scripts/npm-link-demo-shell.sh @@ -72,10 +72,18 @@ npm link ng2-activiti-diagrams npm link npm run build +#LINK SEARCH +echo "====== linking component: ng2-alfresco-search =====" +cd "$DIR/../ng2-components/ng2-alfresco-search" +npm link ng2-alfresco-core +npm link ng2-alfresco-datatable +npm link ng2-alfresco-documentlist +npm link +npm run build + #LINK ALL THE OTHERS COMPONENTS for PACKAGE in \ ng2-alfresco-login \ - ng2-alfresco-search \ ng2-alfresco-userinfo \ ng2-alfresco-upload \ ng2-alfresco-tag \ From 537be1e0585d098cd7d3201e6942fad58457f252 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Fri, 27 Jan 2017 14:35:28 +0000 Subject: [PATCH 099/108] #1175 Separate analytics generator and hide analytics parameters (#1546) * #1175 Separate analytics generator and hide analytics parameters * Remove unused code fix unit test * Rollback mandatory field (appId) * fix the onChanges problem * #1175 - rebased branch --- .../ng2-activiti-analytics/index.ts | 3 + .../analytics-generator.component.css | 5 + .../analytics-generator.component.html | 92 +++++++ .../analytics-generator.component.spec.ts | 230 ++++++++++++++++++ .../analytics-generator.component.ts | 119 +++++++++ .../analytics-report-parameters.component.css | 15 ++ ...analytics-report-parameters.component.html | 148 +++++------ ...lytics-report-parameters.component.spec.ts | 8 +- .../analytics-report-parameters.component.ts | 28 ++- .../src/components/analytics.component.css | 28 --- .../src/components/analytics.component.html | 98 +------- .../components/analytics.component.spec.ts | 138 +---------- .../src/components/analytics.component.ts | 72 +----- .../ng2-activiti-analytics/src/i18n/en.json | 3 +- .../ng2-activiti-analytics/src/i18n/it.json | 13 +- 15 files changed, 598 insertions(+), 402 deletions(-) create mode 100644 ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.css create mode 100644 ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html create mode 100644 ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts create mode 100644 ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts diff --git a/ng2-components/ng2-activiti-analytics/index.ts b/ng2-components/ng2-activiti-analytics/index.ts index c56527241d..bdc34240d0 100644 --- a/ng2-components/ng2-activiti-analytics/index.ts +++ b/ng2-components/ng2-activiti-analytics/index.ts @@ -22,6 +22,7 @@ import { DiagramsModule } from 'ng2-activiti-diagrams'; import { AnalyticsReportListComponent } from './src/components/analytics-report-list.component'; import { AnalyticsReportParametersComponent } from './src/components/analytics-report-parameters.component'; import { AnalyticsComponent } from './src/components/analytics.component'; +import { AnalyticsGeneratorComponent } from './src/components/analytics-generator.component'; import { AnalyticsReportHeatMapComponent } from './src/components/analytics-report-heat-map.component'; import { AnalyticsService } from './src/services/analytics.service'; import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts'; @@ -29,6 +30,7 @@ import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts'; import { WIDGET_DIRECTIVES } from './src/components/widgets/index'; export * from './src/components/analytics.component'; +export * from './src/components/analytics-generator.component'; export * from './src/components/analytics-report-list.component'; export * from './src/components/analytics-report-parameters.component'; export * from './src/services/analytics.service'; @@ -38,6 +40,7 @@ export const ANALYTICS_DIRECTIVES: any[] = [ AnalyticsComponent, AnalyticsReportListComponent, AnalyticsReportParametersComponent, + AnalyticsGeneratorComponent, AnalyticsReportHeatMapComponent, WIDGET_DIRECTIVES ]; diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.css b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.css new file mode 100644 index 0000000000..e0c64c5d75 --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.css @@ -0,0 +1,5 @@ +.chart {display: block; width: 100%;} + +.analytics-row__entry { + cursor: pointer; +} diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html new file mode 100644 index 0000000000..633e2d7c66 --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html @@ -0,0 +1,92 @@ +
+
+

{{report.title}}

+
+
+
+
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
+
+
{{'ANALYTICS.MESSAGES.ZERO-DATA-FOUND' | translate}}
+ +
+
+
+
+
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
+
+ + + + + + + +
{{label | translate}}
{{row | translate }}
+
+
+
+
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
+
+ + + + + + + +
{{label | translate}}
{{row | translate }}
+
+
+ + + + + + + +
{{label | translate}}
{{row | translate }}
+
+
+
+
+
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
+ +
+
+
+
+
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
+
+ + +
+
+
+
+ +
+
+ {{'ANALYTICS.MESSAGES.UNKNOWN-WIDGET-TYPE' | translate}}: {{report.type}} +
+
+
+
+


+
{{'ANALYTICS.MESSAGES.FILL-PARAMETER' | translate}}
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts new file mode 100644 index 0000000000..77313de50d --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.spec.ts @@ -0,0 +1,230 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { DebugElement } from '@angular/core'; +import { Observable } from 'rxjs/Rx'; +import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts'; +import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { DiagramsModule } from 'ng2-activiti-diagrams'; + +import { AnalyticsReportListComponent } from '../components/analytics-report-list.component'; +import { AnalyticsGeneratorComponent } from '../components/analytics-generator.component'; +import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component'; +import { AnalyticsReportHeatMapComponent } from '../components/analytics-report-heat-map.component'; +import { WIDGET_DIRECTIVES } from '../components/widgets/index'; +import { Chart } from '../models/chart.model'; +import { AnalyticsService } from '../services/analytics.service'; +import { ReportQuery } from '../models/report.model'; +import * as analyticMock from '../assets/analyticsComponent.mock'; + +export const ANALYTICS_DIRECTIVES: any[] = [ + AnalyticsGeneratorComponent, + AnalyticsReportParametersComponent, + AnalyticsReportListComponent, + AnalyticsReportHeatMapComponent, + WIDGET_DIRECTIVES +]; +export const ANALYTICS_PROVIDERS: any[] = [ + AnalyticsService +]; + +declare let jasmine: any; +declare let mdDateTimePicker: any; + +describe('AnalyticsGeneratorComponent', () => { + + let component: any; + let fixture: ComponentFixture; + let debug: DebugElement; + let element: HTMLElement; + + let componentHandler: any; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot(), + DiagramsModule.forRoot() + ], + declarations: [ + ...ANALYTICS_DIRECTIVES, + ...CHART_DIRECTIVES + ], + providers: [ + ...ANALYTICS_PROVIDERS + ] + }).compileComponents(); + + let translateService = TestBed.get(AlfrescoTranslationService); + spyOn(translateService, 'addTranslationFolder').and.stub(); + spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); }); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AnalyticsGeneratorComponent); + component = fixture.componentInstance; + debug = fixture.debugElement; + element = fixture.nativeElement; + fixture.detectChanges(); + componentHandler = jasmine.createSpyObj('componentHandler', [ + 'upgradeAllRegistered' + ]); + window['componentHandler'] = componentHandler; + }); + + describe('Rendering tests', () => { + beforeEach(() => { + jasmine.Ajax.install(); + }); + + afterEach(() => { + jasmine.Ajax.uninstall(); + }); + + it('Should render the Process definition overview report ', (done) => { + component.onSuccess.subscribe((res) => { + expect(res).toBeDefined(); + expect(res.length).toEqual(3); + + expect(res[0]).toBeDefined(); + expect(res[0].type).toEqual('table'); + expect(res[0].datasets).toBeDefined(); + expect(res[0].datasets.length).toEqual(4); + expect(res[0].datasets[0][0]).toEqual('__KEY_REPORTING.DEFAULT-REPORTS.PROCESS-DEFINITION-OVERVIEW.GENERAL-TABLE-TOTAL-PROCESS-DEFINITIONS'); + expect(res[0].datasets[0][1]).toEqual('9'); + expect(res[0].datasets[1][0]).toEqual('__KEY_REPORTING.DEFAULT-REPORTS.PROCESS-DEFINITION-OVERVIEW.GENERAL-TABLE-TOTAL-PROCESS-INSTANCES'); + expect(res[0].datasets[1][1]).toEqual('41'); + expect(res[0].datasets[2][0]).toEqual('__KEY_REPORTING.DEFAULT-REPORTS.PROCESS-DEFINITION-OVERVIEW.GENERAL-TABLE-ACTIVE-PROCESS-INSTANCES'); + expect(res[0].datasets[2][1]).toEqual('3'); + expect(res[0].datasets[3][0]).toEqual('__KEY_REPORTING.DEFAULT-REPORTS.PROCESS-DEFINITION-OVERVIEW.GENERAL-TABLE-COMPLETED-PROCESS-INSTANCES'); + expect(res[0].datasets[3][1]).toEqual('38'); + + expect(res[1]).toBeDefined(); + expect(res[1].type).toEqual('pie'); + + expect(res[2]).toBeDefined(); + expect(res[2].type).toEqual('table'); + + done(); + }); + + let reportId = 1001; + let reportParamQuery = new ReportQuery({status: 'All'}); + + component.generateReport(reportId, reportParamQuery); + + jasmine.Ajax.requests.mostRecent().respondWith({ + status: 200, + contentType: 'json', + responseText: analyticMock.chartProcessDefOverview + }); + }); + + it('Should render the Task overview report ', (done) => { + component.onSuccess.subscribe((res) => { + expect(res).toBeDefined(); + expect(res.length).toEqual(3); + + expect(res[0]).toBeDefined(); + expect(res[0].type).toEqual('bar'); + expect(res[0].labels).toBeDefined(); + expect(res[0].labels.length).toEqual(2); + expect(res[0].labels[0]).toEqual('2016-09-30T00:00:00.000+0000'); + expect(res[0].labels[1]).toEqual('2016-10-04T00:00:00.000+0000'); + expect(res[0].datasets[0].label).toEqual('series1'); + expect(res[0].datasets[0].data[0]).toEqual(3); + expect(res[0].datasets[0].data[1]).toEqual(1); + + expect(res[1]).toBeDefined(); + expect(res[1].type).toEqual('masterDetailTable'); + expect(res[1].datasets).toBeDefined(); + expect(res[1].datasets.length).toEqual(2); + expect(res[1].datasets[0][0]).toEqual('fake 1 user task'); + expect(res[1].datasets[0][1]).toEqual('1'); + expect(res[1].datasets[0][2]).toEqual('2.0'); + expect(res[1].datasets[0][3]).toEqual('3.0'); + expect(res[1].datasets[0][4]).toEqual('4.0'); + expect(res[1].datasets[0][5]).toEqual('5.0'); + expect(res[1].datasets[0][6]).toEqual('6.0'); + expect(res[1].datasets[1][0]).toEqual('fake 2 user task'); + expect(res[1].datasets[1][1]).toEqual('1'); + expect(res[1].datasets[1][2]).toEqual('2.0'); + expect(res[1].datasets[1][3]).toEqual('3.0'); + expect(res[1].datasets[1][4]).toEqual('4.0'); + expect(res[1].datasets[1][5]).toEqual('5.0'); + expect(res[1].datasets[1][6]).toEqual('6.0'); + + expect(res[2]).toBeDefined(); + expect(res[2].type).toEqual('multiBar'); + expect(res[2].labels).toBeDefined(); + expect(res[2].labels.length).toEqual(3); + expect(res[2].labels[0]).toEqual(1); + expect(res[2].labels[1]).toEqual(2); + expect(res[2].labels[2]).toEqual(3); + expect(res[2].datasets[0].label).toEqual('averages'); + expect(res[2].datasets[0].data[0]).toEqual(0); + expect(res[2].datasets[0].data[1]).toEqual(5); + expect(res[2].datasets[0].data[2]).toEqual(2); + expect(res[2].datasets[1].label).toEqual('minima'); + expect(res[2].datasets[1].data[0]).toEqual(0); + expect(res[2].datasets[1].data[1]).toEqual(0); + expect(res[2].datasets[1].data[2]).toEqual(0); + expect(res[2].datasets[2].label).toEqual('maxima'); + expect(res[2].datasets[2].data[0]).toEqual(0); + expect(res[2].datasets[2].data[1]).toEqual(29); + expect(res[2].datasets[2].data[2]).toEqual(29); + + done(); + }); + + let reportParamQuery = new ReportQuery({status: 'All'}); + component.reportId = 1; + component.generateReport(reportParamQuery); + + jasmine.Ajax.requests.mostRecent().respondWith({ + status: 200, + contentType: 'json', + responseText: analyticMock.chartTaskOverview + }); + }); + + it('Should reset the reports when the onChanged is call', () => { + component.reports = [ new Chart({id: 'fake', type: 'fake-type'})]; + component.reportId = 1; + component.ngOnChanges(); + expect(component.reports).toBeUndefined(); + }); + + it('Should emit onError event with a 404 response ', (done) => { + component.onError.subscribe((err) => { + expect(err).toBeDefined(); + done(); + }); + + let reportParamQuery = new ReportQuery({status: 'All'}); + component.reportId = 1; + component.generateReport(reportParamQuery); + + jasmine.Ajax.requests.mostRecent().respondWith({ + status: 404, + contentType: 'json', + responseText: [] + }); + }); + }); +}); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts new file mode 100644 index 0000000000..09097365c8 --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.ts @@ -0,0 +1,119 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Component, EventEmitter, OnChanges, Input, Output, SimpleChanges } from '@angular/core'; +import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; +import { AnalyticsService } from '../services/analytics.service'; +import { ReportQuery } from '../models/report.model'; +import { Chart } from '../models/chart.model'; + +@Component({ + moduleId: module.id, + selector: 'activiti-analytics-generator', + templateUrl: './analytics-generator.component.html', + styleUrls: ['./analytics-generator.component.css'] +}) +export class AnalyticsGeneratorComponent implements OnChanges { + + @Input() + reportId: number; + + @Input() + reportParamQuery: ReportQuery = undefined; + + @Output() + onSuccess = new EventEmitter(); + + @Output() + onError = new EventEmitter(); + + reports: Chart[]; + + showDetails: boolean = false; + + public barChartOptions: any = { + responsive: true, + scales: { + yAxes: [{ + ticks: { + beginAtZero: true, + stepSize: 1 + } + }], + xAxes: [{ + ticks: { + }, + stacked: true + }] + } + }; + + constructor(private translateService: AlfrescoTranslationService, + private analyticsService: AnalyticsService, + private logService: LogService) { + logService.info('AnalyticsGeneratorComponent'); + if (translateService) { + translateService.addTranslationFolder('ng2-activiti-analytics', 'node_modules/ng2-activiti-analytics/src'); + } + } + + ngOnChanges(changes: SimpleChanges) { + if (this.reportId && this.reportParamQuery) { + this.generateReport(this.reportId, this.reportParamQuery); + } else { + this.reset(); + } + } + + public generateReport(reportId, reportParamQuery) { + this.analyticsService.getReportsByParams(reportId, reportParamQuery).subscribe( + (res: Chart[]) => { + this.reports = res; + this.onSuccess.emit(res); + }, + (err: any) => { + this.onError.emit(err); + this.logService.error(err); + } + ); + } + + public reset() { + if (this.reports) { + this.reports = undefined; + } + } + + public refresh(report): void { + /** + * (My guess), for Angular to recognize the change in the dataset + * it has to change the dataset variable directly, + * so one way around it, is to clone the data, change it and then + * assign it; + */ + let clone = JSON.parse(JSON.stringify(report)); + report.datasets = clone.datasets; + } + + toggleDetailsTable() { + this.showDetails = !this.showDetails; + } + + isShowDetails(): boolean { + return this.showDetails; + } +} diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css index 344b6e0525..07f935cbb9 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css @@ -48,3 +48,18 @@ .icon-small:hover .material-icons { display: block; } + +.is-hide { + height: 0px; + overflow: hidden; + transition: height 0.5s; +} + +.report-container { + border: solid 1px rgb(212, 212, 212); + padding: 10px 10px 10px 10px; +} + +.report-container-setting { + padding-left: 10px; +} diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html index 7c277338bb..98939ea442 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html @@ -1,75 +1,83 @@ -
-
-
-
- -
-
- - mode_edit -

{{reportParameters.name}}

- -
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
- {{'ANALYTICS.MESSAGES.UNKNOWN-WIDGET-TYPE' | translate}}: {{field.type}} +
+ + + {{'ANALYTICS.MESSAGES.SETTING-TITLE' | translate}} + +
+
+ +
+ +
+
+ + mode_edit +

{{reportParameters.name}}

+ +
+
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+ {{'ANALYTICS.MESSAGES.UNKNOWN-WIDGET-TYPE' | translate}}: {{field.type}} +
+
+

ReportForm valid : {{ reportForm.valid }}

+

ReportForm status : {{ reportForm.errors | json }}

+

ReportForm FormGroup valid : {{reportForm && reportForm.controls.dateRange.valid | json }}

+
+
-
-

ReportForm valid : {{ reportForm.valid }}

-

ReportForm status : {{ reportForm.errors | json }}

-

ReportForm FormGroup valid : {{reportForm && reportForm.controls.dateRange.valid | json }}

-
-
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts index 08bf8b21a0..4354d1bb25 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts @@ -395,10 +395,10 @@ describe('AnalyticsReportParametersComponent', () => { responseText: [] }); }); - }); - it('Should convert a string in number', () => { - let numberConvert = component.convertNumber('2'); - expect(numberConvert).toEqual(2); + it('Should convert a string in number', () => { + let numberConvert = component.convertNumber('2'); + expect(numberConvert).toEqual(2); + }); }); }); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts index 1aea402527..b1e3297328 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts @@ -15,12 +15,27 @@ * limitations under the License. */ -import { Component, EventEmitter, OnInit, OnChanges, Input, Output, SimpleChanges, OnDestroy, AfterViewChecked } from '@angular/core'; +import { + Component, + EventEmitter, + OnInit, + OnChanges, + Input, + Output, + SimpleChanges, + OnDestroy, + AfterViewChecked +} from '@angular/core'; import { FormGroup, FormBuilder, FormControl } from '@angular/forms'; import * as moment from 'moment'; import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; -import { ReportParametersModel, ReportQuery, ParameterValueModel, ReportParameterDetailsModel } from '../models/report.model'; +import { + ReportParametersModel, + ReportQuery, + ParameterValueModel, + ReportParameterDetailsModel +} from '../models/report.model'; declare var componentHandler; @@ -69,6 +84,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On private reportParamsSub; private paramOpts; private isEditable: boolean = false; + private hideParameters: boolean = true; constructor(private translateService: AlfrescoTranslationService, private analyticsService: AnalyticsService, @@ -246,4 +262,12 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On componentHandler.upgradeAllRegistered(); } } + + toggleParameters() { + this.hideParameters = !this.hideParameters; + } + + isParametersHide() { + return this.hideParameters; + } } diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.css b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.css index 1cc89bc0ef..552ee0cc18 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.css +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.css @@ -1,29 +1 @@ .chart {display: block; width: 100%;} - -.dropdown-widget { - width: 100%; -} - -.dropdown-widget__select { - width: 100%; -} - -.dropdown-widget__invalid .dropdown-widget__select { - border-color: #d50000; -} - -.dropdown-widget__invalid .dropdown-widget__label { - color: #d50000; -} - -.dropdown-widget__invalid .dropdown-widget__label:after { - background-color: #d50000; -} - -.dropdown-widget__invalid .mdl-textfield__error { - visibility: visible !important; -} - -.analytics-row__entry { - cursor: pointer; -} \ No newline at end of file diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html index 19ada1ae97..0cfae9ccdc 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.html @@ -5,96 +5,8 @@ (onEdit)="onEditReport($event)"> -
-
-

{{report.title}}

-
-
-
-
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
-
-
{{'ANALYTICS.MESSAGES.ZERO-DATA-FOUND' | translate}}
- -
-
-
-
-
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
-
- - - - - - - -
{{label | translate}}
{{row | translate }}
-
-
-
-
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
-
- - - - - - - -
{{label | translate}}
{{row | translate }}
-
-
- - - - - - - -
{{label | translate}}
{{row | translate }}
-
-
-
-
-
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
- -
-
-
-
-
{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
-
- - -
-
-
-
- -
-
- {{'ANALYTICS.MESSAGES.UNKNOWN-WIDGET-TYPE' | translate}}: {{report.type}} -
-
-
-
-


-
{{'ANALYTICS.MESSAGES.FILL-PARAMETER' | translate}}
-
\ No newline at end of file + + +
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts index 0faa996efc..a61ec1074a 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { DebugElement, SimpleChange } from '@angular/core'; +import { DebugElement } from '@angular/core'; import { Observable } from 'rxjs/Rx'; import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts'; import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core'; @@ -24,16 +24,15 @@ import { DiagramsModule } from 'ng2-activiti-diagrams'; import { AnalyticsReportListComponent } from '../components/analytics-report-list.component'; import { AnalyticsComponent } from '../components/analytics.component'; +import { AnalyticsGeneratorComponent } from '../components/analytics-generator.component'; import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component'; import { AnalyticsReportHeatMapComponent } from '../components/analytics-report-heat-map.component'; import { WIDGET_DIRECTIVES } from '../components/widgets/index'; -import { Chart } from '../models/chart.model'; import { AnalyticsService } from '../services/analytics.service'; -import { ReportQuery } from '../models/report.model'; -import * as analyticMock from '../assets/analyticsComponent.mock'; export const ANALYTICS_DIRECTIVES: any[] = [ AnalyticsComponent, + AnalyticsGeneratorComponent, AnalyticsReportParametersComponent, AnalyticsReportListComponent, AnalyticsReportHeatMapComponent, @@ -96,136 +95,5 @@ describe('AnalyticsComponent', () => { jasmine.Ajax.uninstall(); }); - it('Should render the Process definition overview report ', (done) => { - component.onSuccess.subscribe((res) => { - expect(res).toBeDefined(); - expect(res.length).toEqual(3); - - expect(res[0]).toBeDefined(); - expect(res[0].type).toEqual('table'); - expect(res[0].datasets).toBeDefined(); - expect(res[0].datasets.length).toEqual(4); - expect(res[0].datasets[0][0]).toEqual('__KEY_REPORTING.DEFAULT-REPORTS.PROCESS-DEFINITION-OVERVIEW.GENERAL-TABLE-TOTAL-PROCESS-DEFINITIONS'); - expect(res[0].datasets[0][1]).toEqual('9'); - expect(res[0].datasets[1][0]).toEqual('__KEY_REPORTING.DEFAULT-REPORTS.PROCESS-DEFINITION-OVERVIEW.GENERAL-TABLE-TOTAL-PROCESS-INSTANCES'); - expect(res[0].datasets[1][1]).toEqual('41'); - expect(res[0].datasets[2][0]).toEqual('__KEY_REPORTING.DEFAULT-REPORTS.PROCESS-DEFINITION-OVERVIEW.GENERAL-TABLE-ACTIVE-PROCESS-INSTANCES'); - expect(res[0].datasets[2][1]).toEqual('3'); - expect(res[0].datasets[3][0]).toEqual('__KEY_REPORTING.DEFAULT-REPORTS.PROCESS-DEFINITION-OVERVIEW.GENERAL-TABLE-COMPLETED-PROCESS-INSTANCES'); - expect(res[0].datasets[3][1]).toEqual('38'); - - expect(res[1]).toBeDefined(); - expect(res[1].type).toEqual('pie'); - - expect(res[2]).toBeDefined(); - expect(res[2].type).toEqual('table'); - - done(); - }); - - let reportParamQuery = new ReportQuery({status: 'All'}); - component.appId = 1; - component.reportId = 1001; - component.showReport(reportParamQuery); - - jasmine.Ajax.requests.mostRecent().respondWith({ - status: 200, - contentType: 'json', - responseText: analyticMock.chartProcessDefOverview - }); - }); - - it('Should render the Task overview report ', (done) => { - component.onSuccess.subscribe((res) => { - expect(res).toBeDefined(); - expect(res.length).toEqual(3); - - expect(res[0]).toBeDefined(); - expect(res[0].type).toEqual('bar'); - expect(res[0].labels).toBeDefined(); - expect(res[0].labels.length).toEqual(2); - expect(res[0].labels[0]).toEqual('2016-09-30T00:00:00.000+0000'); - expect(res[0].labels[1]).toEqual('2016-10-04T00:00:00.000+0000'); - expect(res[0].datasets[0].label).toEqual('series1'); - expect(res[0].datasets[0].data[0]).toEqual(3); - expect(res[0].datasets[0].data[1]).toEqual(1); - - expect(res[1]).toBeDefined(); - expect(res[1].type).toEqual('masterDetailTable'); - expect(res[1].datasets).toBeDefined(); - expect(res[1].datasets.length).toEqual(2); - expect(res[1].datasets[0][0]).toEqual('fake 1 user task'); - expect(res[1].datasets[0][1]).toEqual('1'); - expect(res[1].datasets[0][2]).toEqual('2.0'); - expect(res[1].datasets[0][3]).toEqual('3.0'); - expect(res[1].datasets[0][4]).toEqual('4.0'); - expect(res[1].datasets[0][5]).toEqual('5.0'); - expect(res[1].datasets[0][6]).toEqual('6.0'); - expect(res[1].datasets[1][0]).toEqual('fake 2 user task'); - expect(res[1].datasets[1][1]).toEqual('1'); - expect(res[1].datasets[1][2]).toEqual('2.0'); - expect(res[1].datasets[1][3]).toEqual('3.0'); - expect(res[1].datasets[1][4]).toEqual('4.0'); - expect(res[1].datasets[1][5]).toEqual('5.0'); - expect(res[1].datasets[1][6]).toEqual('6.0'); - - expect(res[2]).toBeDefined(); - expect(res[2].type).toEqual('multiBar'); - expect(res[2].labels).toBeDefined(); - expect(res[2].labels.length).toEqual(3); - expect(res[2].labels[0]).toEqual(1); - expect(res[2].labels[1]).toEqual(2); - expect(res[2].labels[2]).toEqual(3); - expect(res[2].datasets[0].label).toEqual('averages'); - expect(res[2].datasets[0].data[0]).toEqual(0); - expect(res[2].datasets[0].data[1]).toEqual(5); - expect(res[2].datasets[0].data[2]).toEqual(2); - expect(res[2].datasets[1].label).toEqual('minima'); - expect(res[2].datasets[1].data[0]).toEqual(0); - expect(res[2].datasets[1].data[1]).toEqual(0); - expect(res[2].datasets[1].data[2]).toEqual(0); - expect(res[2].datasets[2].label).toEqual('maxima'); - expect(res[2].datasets[2].data[0]).toEqual(0); - expect(res[2].datasets[2].data[1]).toEqual(29); - expect(res[2].datasets[2].data[2]).toEqual(29); - - done(); - }); - - let reportParamQuery = new ReportQuery({status: 'All'}); - component.reportId = 1; - component.showReport(reportParamQuery); - - jasmine.Ajax.requests.mostRecent().respondWith({ - status: 200, - contentType: 'json', - responseText: analyticMock.chartTaskOverview - }); - }); - - it('Should reset the reports when the onChanged is call', () => { - let reportId = 1; - component.reports = [ new Chart({id: 'fake', type: 'fake-type'})]; - let change = new SimpleChange(null, reportId); - component.ngOnChanges({ 'reportId': change }); - expect(component.reports).toBeUndefined(); - }); - - it('Should emit onError event with a 404 response ', (done) => { - component.onError.subscribe((err) => { - expect(err).toBeDefined(); - done(); - }); - - let reportParamQuery = new ReportQuery({status: 'All'}); - component.reportId = 1; - component.showReport(reportParamQuery); - - jasmine.Ajax.requests.mostRecent().respondWith({ - status: 404, - contentType: 'json', - responseText: [] - }); - }); }); }); diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts index 3bfbc50fcf..21572dd43e 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { Component, EventEmitter, OnChanges, Input, Output, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, OnChanges, Input, Output, SimpleChanges, ViewChild } from '@angular/core'; import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core'; import { AnalyticsService } from '../services/analytics.service'; import { ReportQuery } from '../models/report.model'; -import { Chart } from '../models/chart.model'; +import { AnalyticsGeneratorComponent } from './analytics-generator.component'; @Component({ moduleId: module.id, @@ -30,7 +30,7 @@ import { Chart } from '../models/chart.model'; export class AnalyticsComponent implements OnChanges { @Input() - appId: string; + appId: number; @Input() reportId: number; @@ -38,37 +38,13 @@ export class AnalyticsComponent implements OnChanges { @Input() debug: boolean = false; - @Output() - onSuccess = new EventEmitter(); - @Output() editReport = new EventEmitter(); - @Output() - onError = new EventEmitter(); + @ViewChild('analyticsgenerator') + analyticsgenerator: AnalyticsGeneratorComponent; - reportParamQuery = new ReportQuery(); - - reports: Chart[]; - - showDetails: boolean = false; - - public barChartOptions: any = { - responsive: true, - scales: { - yAxes: [{ - ticks: { - beginAtZero: true, - stepSize: 1 - } - }], - xAxes: [{ - ticks: { - }, - stacked: true - }] - } - }; + reportParamQuery: ReportQuery; constructor(private translateService: AlfrescoTranslationService, private analyticsService: AnalyticsService, @@ -80,49 +56,19 @@ export class AnalyticsComponent implements OnChanges { } ngOnChanges(changes: SimpleChanges) { - this.reset(); + this.analyticsgenerator.reset(); } public showReport($event) { - this.reportParamQuery = $event; - this.analyticsService.getReportsByParams(this.reportId, this.reportParamQuery).subscribe( - (res: Chart[]) => { - this.reports = res; - this.onSuccess.emit(res); - }, - (err: any) => { - this.onError.emit(err); - this.logService.error(err); - } - ); + this.analyticsgenerator.generateReport(this.reportId, $event); } public reset() { - if (this.reports) { - this.reports = undefined; - } - } - - public refresh(report): void { - /** - * (My guess), for Angular to recognize the change in the dataset - * it has to change the dataset variable directly, - * so one way around it, is to clone the data, change it and then - * assign it; - */ - let clone = JSON.parse(JSON.stringify(report)); - report.datasets = clone.datasets; + this.analyticsgenerator.reset(); } public onEditReport(name: string) { this.editReport.emit(name); } - toggleDetailsTable() { - this.showDetails = !this.showDetails; - } - - isShowDetails(): boolean { - return this.showDetails; - } } diff --git a/ng2-components/ng2-activiti-analytics/src/i18n/en.json b/ng2-components/ng2-activiti-analytics/src/i18n/en.json index 64191cd18c..008eb48aff 100644 --- a/ng2-components/ng2-activiti-analytics/src/i18n/en.json +++ b/ng2-components/ng2-activiti-analytics/src/i18n/en.json @@ -5,7 +5,8 @@ "UNKNOWN-WIDGET-TYPE": "UNKNOWN WIDGET TYPE", "FILL-PARAMETER": "Fill in the parameters to generate your report", "NO-DATA-FOUND": "No data found", - "ZERO-DATA-FOUND": "There are only zero values" + "ZERO-DATA-FOUND": "There are only zero values", + "SETTING-TITLE": "Change report setting" } }, "__KEY_REPORTING": { diff --git a/ng2-components/ng2-activiti-analytics/src/i18n/it.json b/ng2-components/ng2-activiti-analytics/src/i18n/it.json index 20e7de1ba1..8caf96732f 100644 --- a/ng2-components/ng2-activiti-analytics/src/i18n/it.json +++ b/ng2-components/ng2-activiti-analytics/src/i18n/it.json @@ -5,7 +5,8 @@ "UNKNOWN-WIDGET-TYPE": "TIPO WIDGET SCONOSCIUTO", "FILL-PARAMETER": "Riempi tutti i campi per generare il report", "NO-DATA-FOUND": "Nessun valore trovato", - "ZERO-DATA-FOUND": "Ci sono solo valori che valgono zero" + "ZERO-DATA-FOUND": "Ci sono solo valori che valgono zero", + "SETTING-TITLE": "Modifica i parametri del report" } }, "__KEY_REPORTING": { @@ -24,23 +25,23 @@ "TYPE-FILTERING": "Include tutti gli steps (Deselezionandolo, rimuoverai gli step come start events, gateways, etc.)?" }, "PROCESS-INSTANCES-OVERVIEW": { - "PROCESS-DEFINITION": "Process definition", + "PROCESS-DEFINITION": "Definizione del processo", "DATE-RANGE": "Intervallo di Date", "SLOW-PROC-INST-NUMBER": "Quanti process instances lenti vuoi mostrare?" }, "TASK-OVERVIEW": { - "PROCESS-DEFINITION": "Process definition", + "PROCESS-DEFINITION": "Definizione del processo", "DATE-RANGE": "Intervallo di Date", "DATE-RANGE-INTERVAL": "Aggrega date per" }, "TASK-SLA": { "TASK": "Task", - "PROCESS-DEFINITION": "Process definition", + "PROCESS-DEFINITION": "Definizione del processo", "DATE-RANGE": "Intervallo di Date", "SLA-DURATION": "Qual' é il tempo che questo task necessita per essere completato per rimanere nella SLA?" } }, - "PROCESS-STATUS": "Process stato", - "TASK-STATUS": "Task stato" + "PROCESS-STATUS": "Stato del processo", + "TASK-STATUS": "Stato del task" } } From 9d77346aabcc7b572299ca0285efebc9c25dbea2 Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Fri, 27 Jan 2017 15:55:55 +0000 Subject: [PATCH 100/108] fix type issue --- .../src/components/pagination/pagination.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts index c689de3ae9..3643ac9c65 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts @@ -41,13 +41,13 @@ export class PaginationComponent implements OnInit, OnChanges { pagination: Pagination; @Output() - changePageSize: EventEmitter = new EventEmitter(); + changePageSize: EventEmitter = new EventEmitter(); @Output() - nextPage: EventEmitter = new EventEmitter(); + nextPage: EventEmitter = new EventEmitter(); @Output() - prevPage: EventEmitter = new EventEmitter(); + prevPage: EventEmitter = new EventEmitter(); constructor() { } From 0ddd245f8325dcab583bb92cd92c9bbf9195f1c6 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Fri, 27 Jan 2017 16:20:59 +0000 Subject: [PATCH 101/108] Fix build errors when using latest JS-API (#1555) Refs #1554 --- .../src/models/document-library.model.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng2-components/ng2-alfresco-documentlist/src/models/document-library.model.ts b/ng2-components/ng2-alfresco-documentlist/src/models/document-library.model.ts index c90ec1e724..b1ab7253b6 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/models/document-library.model.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/models/document-library.model.ts @@ -69,7 +69,7 @@ export class ContentInfo { } export class PathInfoEntity { - elements: PathElementEntity; + elements: PathElementEntity[]; isComplete: boolean; name: string; } From 251f05e421342acaa7572f90ce9300238d4d0415 Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Fri, 27 Jan 2017 18:34:47 +0000 Subject: [PATCH 102/108] #1212 add cutom header and footer option, plus custom footer links (#1553) --- ng2-components/ng2-alfresco-login/README.md | 32 ++++++++++++- .../assets/custom-footer.png | Bin 0 -> 63819 bytes .../assets/custom-header.png | Bin 0 -> 50183 bytes .../ng2-alfresco-login/demo/src/main.ts | 5 +- ng2-components/ng2-alfresco-login/index.ts | 9 +++- .../components/alfresco-login.component.html | 35 ++++++++++++-- .../components/alfresco-login.component.ts | 12 ++++- .../directives/login-footer.directive.spec.ts | 43 ++++++++++++++++++ .../src/directives/login-footer.directive.ts | 41 +++++++++++++++++ .../directives/login-header.directive.spec.ts | 43 ++++++++++++++++++ .../src/directives/login-header.directive.ts | 41 +++++++++++++++++ 11 files changed, 253 insertions(+), 8 deletions(-) create mode 100644 ng2-components/ng2-alfresco-login/assets/custom-footer.png create mode 100644 ng2-components/ng2-alfresco-login/assets/custom-header.png create mode 100644 ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.spec.ts create mode 100644 ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.ts create mode 100644 ng2-components/ng2-alfresco-login/src/directives/login-header.directive.spec.ts create mode 100644 ng2-components/ng2-alfresco-login/src/directives/login-header.directive.ts diff --git a/ng2-components/ng2-alfresco-login/README.md b/ng2-components/ng2-alfresco-login/README.md index f1787f3979..86dd38ea25 100644 --- a/ng2-components/ng2-alfresco-login/README.md +++ b/ng2-components/ng2-alfresco-login/README.md @@ -160,6 +160,7 @@ platformBrowserDynamic().bootstrapModule(AppModule); | --- | --- | | `onSuccess` | The event is emitted when the login is done | | `onError` | The event is emitted when the login fails | +| `executeSubmit` | The event is emitted when the form is submitted | #### Options @@ -167,8 +168,37 @@ platformBrowserDynamic().bootstrapModule(AppModule); | --- | --- | --- | --- | --- | `providers` | *string* | ECM | Possible valid value are ECM, BPM or ALL. The default behaviour of this component will logged in only in the ECM . If you want log in in both system the correct value to use is ALL | | `disableCsrf` | *boolean* | false | To prevent the CSRF Token from been submitted. Only for Activiti call | +| `needHelpLink` | *string* | '' | It will change the url of the NEED HELP link in the footer | +| `registerLink` | *string* | '' | It will change the url of the REGISTER link in the footer | +| `logoImageUrl` | *string* | Alfresco logo image | To change the logo image with a customised image | +| `backgroundImageUrl` | *string* | Alfresco background image | To change the background image with a customised image | +| `fieldsValidation` | *map* { [key: string]: any; }, extra?: { [key: string]: any; } | null | Use it to customise the validation rules of the login form | +## Change footer content + + + +You can replace the entire content in the footer of the login component with your custom content. + +```html + + +` +``` + +## Change header content + + + +You can replace the entire content in the header of the login component with your custom content. + +```html + + +` +``` + ## Extra content You can put additional html content between `alfresco-login` tags to get it rendered as part of the login dialog. @@ -212,7 +242,7 @@ Alternatively you can bind to your component properties and provide values dynam #### Customize Validation rules -If needed it is possible customize the validation rules of the login +If needed it is possible customise the validation rules of the login form. You can add/modify the default rules of the login form. **MyCustomLogin.component.html** diff --git a/ng2-components/ng2-alfresco-login/assets/custom-footer.png b/ng2-components/ng2-alfresco-login/assets/custom-footer.png new file mode 100644 index 0000000000000000000000000000000000000000..7a791c8fbd4090ba4b9501371f32d07a5b20797e GIT binary patch literal 63819 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 OM@vmtwM@k-{Qm&vQPAuF literal 0 HcmV?d00001 diff --git a/ng2-components/ng2-alfresco-login/demo/src/main.ts b/ng2-components/ng2-alfresco-login/demo/src/main.ts index 997eae02cc..b9790fb2c2 100644 --- a/ng2-components/ng2-alfresco-login/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts @@ -56,8 +56,11 @@ import { LoginModule } from 'ng2-alfresco-login'; ` + (onError)="myErrorMethod($event)"> + ` }) export class AppComponent implements OnInit { diff --git a/ng2-components/ng2-alfresco-login/index.ts b/ng2-components/ng2-alfresco-login/index.ts index bdf0ea8b4e..5dd029984f 100644 --- a/ng2-components/ng2-alfresco-login/index.ts +++ b/ng2-components/ng2-alfresco-login/index.ts @@ -18,12 +18,19 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { CoreModule } from 'ng2-alfresco-core'; +import { LoginHeaderDirective } from './src/directives/login-header.directive'; +import { LoginFooterDirective } from './src/directives/login-footer.directive'; + import { AlfrescoLoginComponent } from './src/components/alfresco-login.component'; +export * from './src/directives/login-header.directive'; +export * from './src/directives/login-footer.directive'; export * from './src/components/alfresco-login.component'; export const ALFRESCO_LOGIN_DIRECTIVES: any[] = [ - AlfrescoLoginComponent + AlfrescoLoginComponent, + LoginFooterDirective, + LoginHeaderDirective ]; @NgModule({ diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html index d08632e0a5..b4cb6d52b5 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html @@ -3,15 +3,28 @@