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

[ADF-3299] and [ADF-3300] upgrade to Angular and Material 6 (#3579)

Browse Source 
* upgrade to HttpClient

* upgrade to Renderer2

* upgrade Document reference

* remove useless test with deprecated ReflectiveInjector

* upgrade to latest typescript

* upgrade libs

* upgrade package scripts

* remove rxjs blacklists and duplicate rules

* add rxjs compat to help with migration

* fix breaking changes

* fix breaking changes in material

* fix breaking changes (material 6)

* upgrade rxjs, ngx-translate and flex layout

* update unit tests

* restore providers

* upgrade deprecated Observable.error

* rebase
fix first configuration problems

* fix style issues commented

* fix core build

* fix lib template errors

* move lib test execution in angular.json

* ignore

* karma conf files

* fix import statement test

* single run option

* update packages reporter

* restore report

* increase timeout

* improve karma conf test configuration

* fix test issues about lint

* fix test analytics

* fix process service test

* content service fix test

* fix logout directive test

* fix core test

* fix build

* update node-sass to latest

* update angular cli dependencies

* improve build script

create directorites and move files only if previous command succeded

* upgrade individual libs to 6.0

* remove old webpack files

* revert sass change

* fix type issues
fix style issues

* fix tslint demo shell issue

* fix peerdependencies

* fix test e2e BC

* package upate

* fix style import issue

* extract-text-webpack-plugin beta

* fix test dist build command

* remove alpha js-api

* fix tslint issue
add banner tslint rule

* upload service fix

* change BC script

* fix test dist script

* increase demo shell timeout test

* verbose copy

* path absolute

* fix script bc

* fix copy part

* fix path warning
fix monaco editor

* remove duplicate header

* remove unused import

* fix align and check ago tests

* add missing import

* fix notification button selector

* [ANGULAR6] fixed core tests

* fix CS test

* fix cs test step 2

* increase travis_wait for dist

* fix attachment PS

* fix checklist test

* use pdf min
This commit is contained in:
Denys Vuika
2018-08-07 11:58:16 +01:00
committed by Eugenio Romano
parent c510ec864d
commit 6b24bfb1d4
371 changed files with 16287 additions and 24504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

227
.angular-cli.json
View File

@@ -1,227 +0,0 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "myapp"
},
"apps": [
{
"name": "dist",
"root": "demo-shell/src",
"outDir": "demo-shell/dist",
"assets": [
"assets",
"favicon.ico",
"app.config.json",
"versions.json",
{
"glob": "**/*",
"input": "../resources",
"output": "./resources"
},
{
"glob": "**/*",
"input": "./app/components/lazy-loading/i18n",
"output": "./resources/lazy-loading/i18n"
},
{
"glob": "**/*",
"input": "../../node_modules/@alfresco/adf-core/prebuilt-themes",
"output": "./assets/prebuilt-themes"
},
{
"glob": "**/*",
"input": "../../node_modules/@alfresco/adf-core/bundles/assets",
"output": "./assets/"
},
{
"glob": "**/*",
"input": "../../node_modules/@alfresco/adf-insights/bundles/assets",
"output": "./assets/"
},
{
"glob": "**/*",
"input": "../../node_modules/@alfresco/adf-process-services/bundles/assets",
"output": "./assets/"
},
{
"glob": "**/*",
"input": "../../node_modules/@alfresco/adf-content-services/bundles/assets",
"output": "./assets/"
},
{
"glob": "pdf.worker.js",
"input": "../../node_modules/pdfjs-dist/build",
"output": "./"
},
{
"glob": "**/*",
"input": "../../node_modules/ngx-monaco-editor/assets/monaco",
"output": "./assets/monaco/"
}
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"styles.scss",
"custom-style.scss"
],
"stylePreprocessorOptions": {
"includePaths": [
"./node_modules/"
]
},
"scripts": [
"../../node_modules/pdfjs-dist/build/pdf.js",
"../../node_modules/pdfjs-dist/web/pdf_viewer.js",
"../../node_modules/raphael/raphael.min.js",
"../../node_modules/moment/min/moment.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
},
{
"name": "dev",
"root": "demo-shell/src",
"outDir": "demo-shell/dist",
"assets": [
"assets",
"app.config.json",
"versions.json",
{
"glob": "**/*",
"input": "./assets",
"output": "./assets"
},
{
"glob": "app.config.json",
"input": "./",
"output": "./"
},
{
"glob": "versions.json",
"input": "./",
"output": "./"
},
{
"glob": "**/*",
"input": "../resources",
"output": "./resources"
},
{
"glob": "**/*",
"input": "./app/components/lazy-loading/i18n",
"output": "./resources/lazy-loading/i18n"
},
{
"glob": "**/*",
"input": "../../lib/dist/core/prebuilt-themes",
"output": "./assets/prebuilt-themes"
},
{
"glob": "**/*",
"input": "../../lib/core/assets",
"output": "./assets"
},
{
"glob": "**/*",
"input": "../../lib/process-services/assets",
"output": "./assets"
},
{
"glob": "**/*",
"input": "../../lib/content-services/assets",
"output": "./assets"
},
{
"glob": "**/*",
"input": "../../lib/core/i18n",
"output": "./assets/adf-core/i18n"
},
{
"glob": "**/*",
"input": "../../lib/content-services/i18n",
"output": "./assets/adf-content-services/i18n"
},
{
"glob": "**/*",
"input": "../../lib/process-services/i18n",
"output": "./assets/adf-process-services/i18n"
},
{
"glob": "**/*",
"input": "../../lib/insights/i18n",
"output": "./assets/adf-insights/i18n"
},
{
"glob": "pdf.worker.js",
"input": "../../node_modules/pdfjs-dist/build",
"output": "./"
},
{
"glob": "**/*",
"input": "../../node_modules/ngx-monaco-editor/assets/monaco",
"output": "./assets/monaco/"
}
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.dev.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app-dev",
"styles": [
"styles.scss",
"custom-style-dev.scss"
],
"stylePreprocessorOptions": {
"includePaths": [
"../../lib/"
]
},
"scripts": [
"../../node_modules/pdfjs-dist/build/pdf.js",
"../../node_modules/pdfjs-dist/web/pdf_viewer.js",
"../../node_modules/raphael/raphael.min.js",
"../../node_modules/moment/min/moment.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "./demo-shell/src/tsconfig.app.json",
"exclude": "**/node_modules/**/*"
}
],
"test": {
"karma": {
"config": "./demo-shell/karma.conf.js"
}
},
"defaults": {
"styleExt": "scss",
"component": {
},
"serve": {
"port": 3000
}
}
}

2
.travis.yml
View File

@@ -66,7 +66,7 @@ script:
jobs:
include:
- stage: Demo shell prod && Demo shell e2e && Check ADF exports
script: ./scripts/test-dist.sh -n $TRAVIS_BUILD_NUMBER && (./scripts/pr-publish.sh -n $TRAVIS_BUILD_NUMBER -r $REPO_DOCKER -u $USERNAME_DOCKER -p $PASSWORD_DOCKER || exit 1)
script: travis_wait 30 ./scripts/test-dist.sh -n $TRAVIS_BUILD_NUMBER && (./scripts/pr-publish.sh -n $TRAVIS_BUILD_NUMBER -r $REPO_DOCKER -u $USERNAME_DOCKER -p $PASSWORD_DOCKER || exit 1)
- # Test Update version 2.0.0
script: ./scripts/test-e2e-bc.sh
- # Test expors

696
angular.json Normal file
View File

@@ -0,0 +1,696 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"dist": {
"root": "demo-shell",
"sourceRoot": "demo-shell/src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "demo-shell/dist",
"index": "demo-shell/src/index.html",
"main": "demo-shell/src/main.ts",
"tsConfig": "demo-shell/src/tsconfig.app.json",
"polyfills": "demo-shell/src/polyfills.ts",
"stylePreprocessorOptions": {
"includePaths": [
"demo-shell/src/node_modules"
]
},
"assets": [
"demo-shell/src/assets",
"demo-shell/src/favicon.ico",
"demo-shell/src/app.config.json",
"demo-shell/src/versions.json",
{
"glob": "**/*",
"input": "demo-shell/resources",
"output": "/resources"
},
{
"glob": "**/*",
"input": "demo-shell/src/app/components/lazy-loading/i18n",
"output": "/resources/lazy-loading/i18n"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-core/prebuilt-themes",
"output": "/assets/prebuilt-themes"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-core/bundles/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-insights/bundles/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-process-services/bundles/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-content-services/bundles/assets",
"output": "/assets"
},
{
"glob": "pdf.worker.min.js",
"input": "node_modules/pdfjs-dist/build",
"output": "/"
},
{
"glob": "**/*",
"input": "node_modules/ngx-monaco-editor/assets/monaco",
"output": "/assets/monaco/"
}
],
"styles": [
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style.scss"
],
"scripts": [
"node_modules/pdfjs-dist/build/pdf.js",
"node_modules/pdfjs-dist/web/pdf_viewer.js",
"node_modules/raphael/raphael.min.js",
"node_modules/moment/min/moment.min.js"
]
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "demo-shell/src/environments/environment.ts",
"with": "demo-shell/src/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "dist:build",
"port": 3000
},
"configurations": {
"production": {
"browserTarget": "dist:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "dist:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "demo-shell/src/test.ts",
"karmaConfig": "./demo-shell/karma.conf.js",
"polyfills": "demo-shell/src/polyfills.ts",
"tsConfig": "demo-shell/src/tsconfig.spec.json",
"scripts": [
"node_modules/pdfjs-dist/build/pdf.js",
"node_modules/pdfjs-dist/web/pdf_viewer.js",
"node_modules/raphael/raphael.min.js",
"node_modules/moment/min/moment.min.js"
],
"styles": [
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style.scss"
],
"assets": [
"demo-shell/src/assets",
"demo-shell/src/favicon.ico",
"demo-shell/src/app.config.json",
"demo-shell/src/versions.json",
{
"glob": "**/*",
"input": "demo-shell/resources",
"output": "/resources"
},
{
"glob": "**/*",
"input": "demo-shell/src/app/components/lazy-loading/i18n",
"output": "/resources/lazy-loading/i18n"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-core/prebuilt-themes",
"output": "/assets/prebuilt-themes"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-core/bundles/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-insights/bundles/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-process-services/bundles/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "node_modules/@alfresco/adf-content-services/bundles/assets",
"output": "/assets"
},
{
"glob": "pdf.worker.min.js",
"input": "node_modules/pdfjs-dist/build",
"output": "/"
},
{
"glob": "**/*",
"input": ".node_modules/ngx-monaco-editor/assets/monaco",
"output": "/assets/monaco/"
}
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"./demo-shell/src/tsconfig.app.json"
],
"exclude": [
"**/node_modules/**/*"
]
}
}
}
},
"dev": {
"root": "demo-shell",
"sourceRoot": "demo-shell/src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "demo-shell/dist",
"index": "demo-shell/src/index.html",
"main": "demo-shell/src/main.ts",
"tsConfig": "demo-shell/src/tsconfig.dev.json",
"polyfills": "demo-shell/src/polyfills.ts",
"stylePreprocessorOptions": {
"includePaths": [
"lib"
]
},
"assets": [
"demo-shell/src/assets",
"demo-shell/src/app.config.json",
"demo-shell/src/versions.json",
{
"glob": "**/*",
"input": "demo-shell/src/assets",
"output": "/assets"
},
{
"glob": "app.config.json",
"input": "demo-shell/src",
"output": "/"
},
{
"glob": "versions.json",
"input": "demo-shell/src",
"output": "/"
},
{
"glob": "**/*",
"input": "demo-shell/resources",
"output": "/resources"
},
{
"glob": "**/*",
"input": "demo-shell/src/app/components/lazy-loading/i18n",
"output": "/resources/lazy-loading/i18n"
},
{
"glob": "**/*",
"input": "lib/dist/core/prebuilt-themes",
"output": "/assets/prebuilt-themes"
},
{
"glob": "**/*",
"input": "lib/core/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "lib/process-services/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "lib/content-services/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "lib/core/i18n",
"output": "/assets/adf-core/i18n"
},
{
"glob": "**/*",
"input": "lib/content-services/i18n",
"output": "/assets/adf-content-services/i18n"
},
{
"glob": "**/*",
"input": "lib/process-services/i18n",
"output": "/assets/adf-process-services/i18n"
},
{
"glob": "**/*",
"input": "lib/insights/i18n",
"output": "/assets/adf-insights/i18n"
},
{
"glob": "pdf.worker.min.js",
"input": "node_modules/pdfjs-dist/build",
"output": "/"
},
{
"glob": "**/*",
"input": "node_modules/ngx-monaco-editor/assets/monaco",
"output": "/assets/monaco/"
}
],
"styles": [
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss"
],
"scripts": [
"node_modules/pdfjs-dist/build/pdf.js",
"node_modules/pdfjs-dist/web/pdf_viewer.js",
"node_modules/raphael/raphael.min.js",
"node_modules/moment/min/moment.min.js"
]
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "demo-shell/src/environments/environment.ts",
"with": "demo-shell/src/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "dev:build",
"port": 3000
},
"configurations": {
"production": {
"browserTarget": "dev:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "dev:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "demo-shell/src/test.ts",
"karmaConfig": "./demo-shell/karma.conf.js",
"polyfills": "demo-shell/src/polyfills.ts",
"tsConfig": "demo-shell/src/tsconfig.spec.json",
"scripts": [
"node_modules/pdfjs-dist/build/pdf.js",
"node_modules/pdfjs-dist/web/pdf_viewer.js",
"node_modules/raphael/raphael.min.js",
"node_modules/moment/min/moment.min.js"
],
"styles": [
"demo-shell/src/styles.scss",
"demo-shell/src/custom-style-dev.scss"
],
"assets": [
"demo-shell/src/assets",
"demo-shell/src/app.config.json",
"demo-shell/src/versions.json",
{
"glob": "**/*",
"input": "demo-shell/src/assets",
"output": "/assets"
},
{
"glob": "app.config.json",
"input": "demo-shell/src",
"output": "/"
},
{
"glob": "versions.json",
"input": "demo-shell/src",
"output": "/"
},
{
"glob": "**/*",
"input": "demo-shell/resources",
"output": "/resources"
},
{
"glob": "**/*",
"input": "demo-shell/src/app/components/lazy-loading/i18n",
"output": "/resources/lazy-loading/i18n"
},
{
"glob": "**/*",
"input": "lib/dist/core/prebuilt-themes",
"output": "/assets/prebuilt-themes"
},
{
"glob": "**/*",
"input": "lib/core/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "lib/process-services/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "lib/content-services/assets",
"output": "/assets"
},
{
"glob": "**/*",
"input": "lib/core/i18n",
"output": "/assets/adf-core/i18n"
},
{
"glob": "**/*",
"input": "lib/content-services/i18n",
"output": "/assets/adf-content-services/i18n"
},
{
"glob": "**/*",
"input": "lib/process-services/i18n",
"output": "/assets/adf-process-services/i18n"
},
{
"glob": "**/*",
"input": "lib/insights/i18n",
"output": "/assets/adf-insights/i18n"
},
{
"glob": "pdf.worker.min.js",
"input": "node_modules/pdfjs-dist/build",
"output": "/"
},
{
"glob": "**/*",
"input": "/node_modules/ngx-monaco-editor/assets/monaco",
"output": "/assets/monaco/"
}
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"./demo-shell/src/tsconfig.app.json"
],
"exclude": [
"**/node_modules/**/*"
]
}
}
}
},
"demo-shell-e2e": {
"root": "demo-shell",
"sourceRoot": "demo-shell/e2e",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "dist:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [],
"exclude": [
"**/node_modules/**/*"
]
}
}
}
},
"lib-e2e": {
"root": "demo-shell",
"sourceRoot": "./demo-shell",
"projectType": "application",
"architect": {
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"proxyConfig": "./e2e/proxy.conf.js",
"browserTarget": "dev:build",
"port": 3000
},
"configurations": {
"production": {
"browserTarget": "dev:build:production"
}
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "lib-e2e:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [],
"exclude": [
"**/node_modules/**/*"
]
}
}
}
},
"core": {
"root": "lib/core",
"sourceRoot": "lib/core/src",
"projectType": "library",
"prefix": "adf",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "lib/core/tsconfig.json",
"project": "lib/core/ng-package.json"
},
"configurations": {
"production": {
"project": "lib/core/ng-package.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "lib/core/test.ts",
"tsConfig": "lib/core/tsconfig.json",
"karmaConfig": "lib/core/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"lib/core/tsconfig.json",
"lib/core/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"content-services": {
"root": "lib/content-services",
"sourceRoot": "lib/content-services/src",
"projectType": "library",
"prefix": "adf",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "lib/content-services/tsconfig.json",
"project": "lib/content-services/ng-package.json"
},
"configurations": {
"production": {
"project": "lib/content-services/ng-package.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "lib/content-services/test.ts",
"tsConfig": "lib/content-services/tsconfig.json",
"karmaConfig": "lib/content-services/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"lib/content-services/tsconfig.json",
"lib/content-services/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"process-services": {
"root": "lib/process-services",
"sourceRoot": "lib/process-services/src",
"projectType": "library",
"prefix": "adf",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "lib/process-services/tsconfig.json",
"project": "lib/process-services/ng-package.json"
},
"configurations": {
"production": {
"project": "lib/process-services/ng-package.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "lib/process-services/test.ts",
"tsConfig": "lib/process-services/tsconfig.json",
"karmaConfig": "lib/process-services/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"lib/process-services/tsconfig.json",
"lib/process-services/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"insights": {
"root": "lib/insights",
"sourceRoot": "lib/insights/src",
"projectType": "library",
"prefix": "adf",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "lib/insights/tsconfig.json",
"project": "lib/insights/ng-package.json"
},
"configurations": {
"production": {
"project": "lib/insights/ng-package.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "lib/insights/test.ts",
"tsConfig": "lib/insights/tsconfig.json",
"karmaConfig": "lib/insights/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"lib/insights/tsconfig.json",
"lib/insights/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "dist",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}

17
demo-shell/e2e/app.e2e-spec.ts
View File

@@ -1,3 +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.
*/
import { MyappPage } from './app.po';
describe('myapp App', () => {

17
demo-shell/e2e/app.po.ts
View File

@@ -1,3 +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.
*/
import { browser, element, by } from 'protractor';
export class MyappPage {

76
demo-shell/karma.conf.js
View File

@@ -2,43 +2,41 @@
// https://karma-runner.github.io/0.13/config/configuration-file.html
module.exports = function (config) {
config.set({
basePath: './',
frameworks: ['jasmine', '@angular/cli'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
],
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
files: [
{ pattern: './src/test.ts', watched: false }
],
preprocessors: {
'./src/test.ts': ['@angular/cli']
},
mime: {
'text/x-typescript': ['ts','tsx']
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev'
},
reporters: config.angularCli && config.angularCli.codeCoverage
? ['progress', 'coverage-istanbul']
: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
});
config.set({
basePath: './',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma')
],
client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
files: [],
preprocessors: {},
mime: {
'text/x-typescript': ['ts', 'tsx']
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, 'coverage'), reports: ['html', 'lcovonly'],
fixWebpackSourcePaths: true
},
browserDisconnectTimeout: 200000,
browserNoActivityTimeout: 2400000,
captureTimeout: 1200000,
reporters: config.angularCli && config.angularCli.codeCoverage
? ['progress', 'coverage-istanbul']
: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
});
};

42
demo-shell/proxy.conf.js
View File

@@ -1,25 +1,25 @@
module.exports = {
"/alfresco": {
"target": "http://localhost:8080",
"secure": false,
"pathRewrite": {
"^/alfresco/alfresco": ""
"/alfresco": {
"target": "http://localhost:8080",
"secure": false,
"pathRewrite": {
"^/alfresco/alfresco": ""
},
"changeOrigin": true,
// workaround for REPO-2260
onProxyRes: function (proxyRes, req, res) {
const header = proxyRes.headers['www-authenticate'];
if (header && header.startsWith('Basic')) {
proxyRes.headers['www-authenticate'] = 'x' + header;
}
}
},
"changeOrigin": true,
// workaround for REPO-2260
onProxyRes: function (proxyRes, req, res) {
const header = proxyRes.headers['www-authenticate'];
if (header && header.startsWith('Basic')) {
proxyRes.headers['www-authenticate'] = 'x' + header;
}
"/activiti-app": {
"target": "http://localhost:9999",
"secure": false,
"pathRewrite": {
"^/activiti-app/activiti-app": ""
},
"changeOrigin": true
}
},
"/activiti-app": {
"target": "http://localhost:9999",
"secure": false,
"pathRewrite": {
"^/activiti-app/activiti-app": ""
},
"changeOrigin": true
}
};

17
demo-shell/src/app/adf.module.ts
View File

@@ -1,3 +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.
*/
import { NgModule } from '@angular/core';
import { ContentModule } from '@alfresco/adf-content-services';

17
demo-shell/src/app/app.component.spec.ts
View File

@@ -1,3 +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.
*/
import { TestBed, async } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';

17
demo-shell/src/app/app.module.ts
View File

@@ -1,3 +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.
*/
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';

17
demo-shell/src/app/components/blob-preview/blob-preview.component.ts
View File

@@ -1,3 +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.
*/
import { Component } from '@angular/core';
import { PreviewService } from '../../services/preview.service';
import { Router } from '@angular/router';

2
demo-shell/src/app/components/card-view/card-view.component.ts
View File

@@ -29,7 +29,7 @@ import {
CardViewMapItemModel,
UpdateNotification
} from '@alfresco/adf-core';
import { of } from 'rxjs/observable/of';
import { of } from 'rxjs';
@Component({
templateUrl: './card-view.component.html',

7
demo-shell/src/app/components/files/files.component.ts
View File

@@ -42,8 +42,9 @@ import { SelectAppsDialogComponent } from '@alfresco/adf-process-services';
import { VersionManagerDialogAdapterComponent } from './version-manager-dialog-adapter.component';
import { MetadataDialogAdapterComponent } from './metadata-dialog-adapter.component';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
import { PreviewService } from '../../services/preview.service';
import { debounceTime } from 'rxjs/operators';
const DEFAULT_FOLDER_TO_SHOW = '-my-';
@@ -245,7 +246,9 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
}
// this.disableDragArea = false;
this.uploadService.fileUploadComplete.asObservable().debounceTime(300).subscribe(value => this.onFileUploadEvent(value));
this.uploadService.fileUploadComplete.asObservable()
.pipe(debounceTime(300))
.subscribe(value => this.onFileUploadEvent(value));
this.uploadService.fileUploadDeleted.subscribe((value) => this.onFileUploadEvent(value));
this.contentService.folderCreated.subscribe(value => this.onFolderCreated(value));
this.onCreateFolder = this.contentService.folderCreate.subscribe(value => this.onFolderAction(value));

17
demo-shell/src/app/components/form/demo-form.ts
View File

@@ -1,3 +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.
*/
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.

6
demo-shell/src/app/components/form/fake-form.service.ts
View File

@@ -15,12 +15,12 @@
* limitations under the License.
*/
import { Observable } from 'rxjs/Observable';
import { Observable, of } from 'rxjs';
import { Injectable } from '@angular/core';
import {
AppConfigService, AlfrescoApiService, EcmModelService, LogService, FormService, FormOutcomeEvent
} from '@alfresco/adf-core';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
@Injectable()
export class FakeFormService extends FormService {
@@ -36,7 +36,7 @@ export class FakeFormService extends FormService {
public getRestFieldValues(taskId: string, fieldId: string): Observable<any> {
if (fieldId === 'typeahedField') {
return Observable.of([
return of([
{ 'id': '1', 'name': 'Leanne Graham' },
{ 'id': '2', 'name': 'Ervin Howell' },
{ 'id': '3', 'name': 'Clementine Bauch' },

17
demo-shell/src/app/components/form/form.component.ts
View File

@@ -1,3 +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.
*/
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.

2
demo-shell/src/app/components/header-data/header-data.component.ts
View File

@@ -9,7 +9,7 @@
* 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,
* 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.

17
demo-shell/src/app/components/header-data/header-data.service.ts
View File

@@ -1,3 +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.
*/
import { Injectable, Output, EventEmitter } from '@angular/core';

17
demo-shell/src/app/components/lazy-loading/lazy-loading.component.ts
View File

@@ -1,3 +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.
*/
import { Component } from '@angular/core';
import { ObjectDataTableAdapter, AuthenticationService } from '@alfresco/adf-core';

17
demo-shell/src/app/components/lazy-loading/lazy-loading.module.ts
View File

@@ -1,3 +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.
*/
import { NgModule } from '@angular/core';
import { CoreModule, TranslationService } from '@alfresco/adf-core';

17
demo-shell/src/app/components/lazy-loading/lazy-loading.routes.ts
View File

@@ -1,3 +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.
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { LazyLoadingComponent } from './lazy-loading.component';

17
demo-shell/src/app/components/process-list-demo/process-list-demo.component.ts
View File

@@ -9,16 +9,16 @@
* 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
* distributed under the License is distributed on an "AS IS" BASIS,
* limitations under the License.
*/
import { Component, OnInit } from '@angular/core';
import { FormGroup, FormBuilder, Validators, FormControl, AbstractControl } from '@angular/forms';
import { ActivatedRoute, Params } from '@angular/router';
import { debounceTime } from 'rxjs/operators';
@Component({
templateUrl: './process-list-demo.component.html',
@@ -46,9 +46,9 @@ export class ProcessListDemoComponent implements OnInit {
presetColumn = 'default';
stateOptions = [
{value: 'all', title: 'All'},
{value: 'active', title: 'Active'},
{value: 'completed', title: 'Completed'}
{ value: 'all', title: 'All' },
{ value: 'active', title: 'Active' },
{ value: 'completed', title: 'Completed' }
];
sortOptions = [
@@ -57,7 +57,8 @@ export class ProcessListDemoComponent implements OnInit {
];
constructor(private route: ActivatedRoute,
private formBuilder: FormBuilder) {}
private formBuilder: FormBuilder) {
}
ngOnInit() {
if (this.route) {
@@ -79,7 +80,9 @@ export class ProcessListDemoComponent implements OnInit {
});
this.processListForm.valueChanges
.debounceTime(500)
.pipe(
debounceTime(500)
)
.subscribe(processFilter => {
if (this.isFormValid()) {
this.filterProcesses(processFilter);

2
demo-shell/src/app/components/process-service/form-node-viewer.component.ts
View File

@@ -17,7 +17,7 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
@Component({
selector: 'app-form-node-viewer',

2
demo-shell/src/app/components/process-service/form-viewer.component.ts
View File

@@ -17,7 +17,7 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
@Component({
selector: 'app-form-viewer',

2
demo-shell/src/app/components/process-service/process-attachments.component.ts
View File

@@ -22,7 +22,7 @@ import { UploadService } from '@alfresco/adf-core';
import { AlfrescoApiService } from '@alfresco/adf-core';
import { AppConfigService } from '@alfresco/adf-core';
import { PreviewService } from '../../services/preview.service';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
export function processUploadServiceFactory(api: AlfrescoApiService, config: AppConfigService) {
return new ProcessUploadService(api, config);

2
demo-shell/src/app/components/process-service/process-service.component.ts
View File

@@ -54,7 +54,7 @@ import {
} from '@alfresco/adf-process-services';
import { LogService } from '@alfresco/adf-core';
import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custom-editor.component';
import { DemoFieldValidator } from './demo-field-validator';
import { PreviewService } from '../../services/preview.service';

4
demo-shell/src/app/components/process-service/task-attachments.component.ts
View File

@@ -19,7 +19,7 @@ import { Component, Input, OnChanges, OnInit, ViewChild, OnDestroy } from '@angu
import { TaskListService, TaskAttachmentListComponent, TaskDetailsModel, TaskUploadService } from '@alfresco/adf-process-services';
import { UploadService, AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
import { PreviewService } from '../../services/preview.service';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
export function taskUploadServiceFactory(api: AlfrescoApiService, config: AppConfigService) {
return new TaskUploadService(api, config);
@@ -65,7 +65,7 @@ export class TaskAttachmentsComponent implements OnInit, OnChanges, OnDestroy {
ngOnChanges() {
if (this.taskId) {
this.activitiTaskList.getTaskDetails(this.taskId).map((res) => res)
this.activitiTaskList.getTaskDetails(this.taskId)
.subscribe((taskDetails: TaskDetailsModel) => {
this.taskDetails = taskDetails;
});

2
demo-shell/src/app/components/search/search-result.component.ts
View File

@@ -20,7 +20,7 @@ import { Router, ActivatedRoute, Params } from '@angular/router';
import { NodePaging, Pagination } from 'alfresco-js-api';
import { SearchComponent, SearchQueryBuilderService } from '@alfresco/adf-content-services';
import { UserPreferencesService, SearchService, SearchConfigurationService } from '@alfresco/adf-core';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
@Component({
selector: 'app-search-result-component',

17
demo-shell/src/app/components/shared-link-view/shared-link-view.component.ts
View File

@@ -1,3 +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.
*/
import { Component, ViewEncapsulation, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';

22
demo-shell/src/app/components/task-list-demo/task-list-demo.component.ts
View File

@@ -1,3 +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.
*/
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
@@ -19,6 +36,7 @@ import { Component, OnInit } from '@angular/core';
import { FormGroup, FormBuilder, Validators, FormControl, AbstractControl } from '@angular/forms';
import { ActivatedRoute, Params } from '@angular/router';
import { NotificationService } from '@alfresco/adf-core';
import { debounceTime } from 'rxjs/operators';
@Component({
templateUrl: './task-list-demo.component.html',
@@ -113,7 +131,9 @@ export class TaskListDemoComponent implements OnInit {
});
this.taskListForm.valueChanges
.debounceTime(500)
.pipe(
debounceTime(500)
)
.subscribe(taskFilter => {
if (this.isFormValid()) {
this.filterTasks(taskFilter);

17
demo-shell/src/app/components/theme-picker/style-manager/style-manager.ts
View File

@@ -1,3 +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.
*/
import { Injectable } from '@angular/core';
/**

17
demo-shell/src/app/components/theme-picker/theme-picker.ts
View File

@@ -1,3 +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.
*/
import { CommonModule } from '@angular/common';
import { ChangeDetectionStrategy, Component, NgModule } from '@angular/core';
import {

17
demo-shell/src/app/components/theme-picker/theme-storage/theme-storage.ts
View File

@@ -1,3 +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.
*/
import { EventEmitter, Injectable } from '@angular/core';
export interface DocsSiteTheme {

28
demo-shell/src/app/components/trashcan/trashcan.component.ts
View File

@@ -1,26 +1,18 @@
/*!
* @license
* Alfresco Example Content Application
* Copyright 2016 Alfresco Software, Ltd.
*
* Copyright (C) 2005 - 2017 Alfresco Software Limited
* 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
*
* This file is part of the Alfresco Example Content Application.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
* http://www.apache.org/licenses/LICENSE-2.0
*
* The Alfresco Example Content Application is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The Alfresco Example Content Application is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* 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, ViewChild } from '@angular/core';

3
demo-shell/src/app/services/in-memory-form.service.ts
View File

@@ -19,8 +19,7 @@ import { Injectable } from '@angular/core';
import { AppConfigService, AlfrescoApiService, EcmModelService, LogService,
FormFieldOption, FormService, FormValues, FormModel,
FormOutcomeModel, FormOutcomeEvent } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Observable, Subject } from 'rxjs';
interface ProcessServiceData {
rest: {

17
demo-shell/src/environments/environment.prod.ts
View File

@@ -1,3 +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 const environment = {
production: true
};

17
demo-shell/src/environments/environment.ts
View File

@@ -1,3 +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.
*/
// The file contents for the current environment will overwrite these during build.
// The build system defaults to the dev environment which uses `environment.ts`, but if you do
// `ng build --env=prod` then `environment.prod.ts` will be used instead.

28
demo-shell/src/main.ts
View File

@@ -1,17 +1,39 @@
/*!
* @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 { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
import { PDFJSStatic } from 'pdfjs-dist';
declare global {
const PDFJS: PDFJSStatic;
}
import 'hammerjs';
import 'chart.js';
import 'ng2-charts';
import * as pdfjsLib from 'pdfjs-dist';
pdfjsLib.PDFJS.workerSrc = 'pdf.worker.js';
PDFJS.workerSrc = 'pdf.worker.min.js';
if (environment.production) {
enableProdMode();
enableProdMode();
}
platformBrowserDynamic().bootstrapModule(AppModule);

17
demo-shell/src/polyfills.ts
View File

@@ -1,3 +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.
*/
/**
* This file includes polyfills needed by Angular and is loaded before the app.
* You can add your own extra polyfills to this file.

17
demo-shell/src/test.ts
View File

@@ -1,3 +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.
*/
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/dist/zone-testing';

6
demo-shell/tsconfig.json
View File

@@ -1,5 +1,4 @@
{
"extends": "../tsconfig.json",
"compileOnSave": false,
"compilerOptions": {
"outDir": "./dist/out-tsc",
@@ -23,5 +22,8 @@
},
"exclude": [
"node_modules"
]
],
"angularCompilerOptions": {
"preserveWhitespaces": false
}
}

9
demo-shell/tslint.json
View File

@@ -4,6 +4,10 @@
"../tools/tslint-rules/"
],
"rules": {
"adf-license-banner": [
true,
"**/*.ts"
],
"arrow-return-shorthand": true,
"callable-types": true,
"class-name": true,
@@ -14,11 +18,6 @@
"curly": true,
"eofline": true,
"forin": true,
"import-blacklist": [
true,
"rxjs",
"rxjs/Rx"
],
"import-spacing": true,
"indent": [
true,

8
e2e/content-services/comments/comment_component.e2e.ts
View File

@@ -108,7 +108,7 @@ describe('Comment Component', () => {
expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (1)');
expect(commentsPage.getMessage(0)).toEqual(comments.first);
expect(commentsPage.getUserName(0)).toEqual(userFullName);
expect(commentsPage.getTime(0)).toEqual('a few seconds ago');
expect(commentsPage.getTime(0)).toContain('ago');
});
it('[C280021] Should be able to add a multiline comment on a file', () => {
@@ -123,7 +123,7 @@ describe('Comment Component', () => {
expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (1)');
expect(commentsPage.getMessage(0)).toEqual(comments.multiline);
expect(commentsPage.getUserName(0)).toEqual(userFullName);
expect(commentsPage.getTime(0)).toEqual('a few seconds ago');
expect(commentsPage.getTime(0)).toContain('ago');
commentsPage.addComment(comments.second);
commentsPage.checkUserIconIsDisplayed(0);
@@ -131,7 +131,7 @@ describe('Comment Component', () => {
expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (2)');
expect(commentsPage.getMessage(0)).toEqual(comments.second);
expect(commentsPage.getUserName(0)).toEqual(userFullName);
expect(commentsPage.getTime(0)).toEqual('a few seconds ago');
expect(commentsPage.getTime(0)).toContain('ago');
});
it('[C280022] Should not be able to add an HTML or other code input into the comment input filed', () => {
@@ -146,6 +146,6 @@ describe('Comment Component', () => {
expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (1)');
expect(commentsPage.getMessage(0)).toEqual('First name: Last name:');
expect(commentsPage.getUserName(0)).toEqual(userFullName);
expect(commentsPage.getTime(0)).toEqual('a few seconds ago');
expect(commentsPage.getTime(0)).toContain('ago');
});
});

19
e2e/content-services/document_list_component.e2e.ts
View File

@@ -194,7 +194,7 @@ describe('Document List Component', () => {
loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.goToDocumentList();
let dateValue = contentServicesPage.getColumnValueForRow(timeAgoFileModel.name, 'Created');
expect(dateValue).toBe('a few seconds ago');
expect(dateValue).toContain('ago');
done();
});
@@ -614,7 +614,6 @@ describe('Document List Component', () => {
});
it('[C280069] - Gallery Card show details - attributes', () => {
let timeMessage = '';
contentServicesPage.checkDocumentCardPropertyIsShowed(folderName, cardProperties.DISPLAY_NAME);
contentServicesPage.checkDocumentCardPropertyIsShowed(folderName, cardProperties.SIZE);
contentServicesPage.checkDocumentCardPropertyIsShowed(folderName, cardProperties.CREATED_BY);
@@ -622,26 +621,26 @@ describe('Document List Component', () => {
expect(contentServicesPage.getAttributeValueForElement(folderName, cardProperties.DISPLAY_NAME)).toBe(folderName);
expect(contentServicesPage.getAttributeValueForElement(folderName, cardProperties.CREATED_BY)).toBe(`${funnyUser.entry.firstName} ${funnyUser.entry.lastName}`);
timeMessage = moment(folderNode.entry.createdAt).fromNow();
expect(contentServicesPage.getAttributeValueForElement(folderName, cardProperties.CREATED)).toBe(timeMessage);
expect(contentServicesPage.getAttributeValueForElement(folderName, cardProperties.CREATED)).toContain('ago');
expect(contentServicesPage.getAttributeValueForElement(pdfFile.name, cardProperties.DISPLAY_NAME)).toBe(pdfFile.name);
expect(contentServicesPage.getAttributeValueForElement(pdfFile.name, cardProperties.SIZE)).toBe(`702.76 KB`);
expect(contentServicesPage.getAttributeValueForElement(pdfFile.name, cardProperties.CREATED_BY)).toBe(`${funnyUser.entry.firstName} ${funnyUser.entry.lastName}`);
timeMessage = moment(filePdfNode.entry.createdAt).fromNow();
expect(contentServicesPage.getAttributeValueForElement(pdfFile.name, cardProperties.CREATED)).toBe(timeMessage);
expect(contentServicesPage.getAttributeValueForElement(pdfFile.name, cardProperties.CREATED)).toContain('ago');
expect(contentServicesPage.getAttributeValueForElement(docxFile.name, cardProperties.DISPLAY_NAME)).toBe(docxFile.name);
expect(contentServicesPage.getAttributeValueForElement(docxFile.name, cardProperties.SIZE)).toBe(`770.35 KB`);
expect(contentServicesPage.getAttributeValueForElement(docxFile.name, cardProperties.CREATED_BY)).toBe(`${funnyUser.entry.firstName} ${funnyUser.entry.lastName}`);
timeMessage = moment(fileDocxNode.entry.createdAt).fromNow();
expect(contentServicesPage.getAttributeValueForElement(docxFile.name, cardProperties.CREATED)).toBe(timeMessage);
expect(contentServicesPage.getAttributeValueForElement(docxFile.name, cardProperties.CREATED)).toContain('ago');
expect(contentServicesPage.getAttributeValueForElement(testFile.name, cardProperties.DISPLAY_NAME)).toBe(testFile.name);
expect(contentServicesPage.getAttributeValueForElement(testFile.name, cardProperties.SIZE)).toBe(`14 Bytes`);
expect(contentServicesPage.getAttributeValueForElement(testFile.name, cardProperties.CREATED_BY)).toBe(`${funnyUser.entry.firstName} ${funnyUser.entry.lastName}`);
timeMessage = moment(fileTestNode.entry.createdAt).fromNow();
expect(contentServicesPage.getAttributeValueForElement(testFile.name, cardProperties.CREATED)).toBe(timeMessage);
expect(contentServicesPage.getAttributeValueForElement(testFile.name, cardProperties.CREATED)).toContain('ago');
});
it('[C280129] - Gallery Card show details - subfolder gallery displayed', () => {

7
e2e/content-services/search_page_component.e2e.ts
View File

@@ -286,8 +286,13 @@ describe('Search component - Search Page', () => {
searchResultPage.checkContentIsDisplayed(search.no_permission.noPermFolder);
searchResultPage.deleteContent(search.no_permission.noPermFolder);
searchResultPage.checkContentIsDisplayed(search.no_permission.noPermFolder);
searchDialog.checkSearchBarIsNotVisible().checkSearchIconIsVisible().clickOnSearchIcon()
searchResultPage.closeActionButton();
searchDialog.checkSearchBarIsNotVisible()
.checkSearchIconIsVisible()
.clickOnSearchIcon()
.enterTextAndPressEnter(search.no_permission.noPermFolder);
searchResultPage.checkNoResultMessageIsNotDisplayed();
searchResultPage.checkContentIsDisplayed(search.no_permission.noPermFolder);
});

32
e2e/core/user_info_component.e2e.ts
View File

@@ -72,14 +72,13 @@ describe('User Info component', () => {
await this.alfrescoJsApi.core.peopleApi.addPerson(contentUserModel);
loginPage.goToLoginPage();
adfSettingsPage.setProviderEcmBpm();
loginPage.login(contentUserModel.id, contentUserModel.password);
done();
});
it('1. Enable Process Services and Content Services ', () => {
loginPage.goToLoginPage();
adfSettingsPage.setProviderEcmBpm();
loginPage.login(contentUserModel.id, contentUserModel.password);
navigationBarPage.clickUserProfile();
userInfoDialog.dialogIsDisplayed().contentServicesTabIsDisplayed().processServicesTabIsDisplayed();
expect(userInfoDialog.getContentHeaderTitle()).toEqual(contentUserModel.firstName + ' ' + contentUserModel.lastName);
@@ -108,9 +107,10 @@ describe('User Info component', () => {
});
it('2. Enable Content Services and disable Process Services ', () => {
navigationBarPage.clickLoginButton();
loginPage.goToLoginPage();
adfSettingsPage.setProviderEcm();
loginPage.login(contentUserModel.id, contentUserModel.password);
navigationBarPage.clickUserProfile();
userInfoDialog.dialogIsDisplayed().contentServicesTabIsNotDisplayed().processServicesTabIsNotDisplayed();
expect(userInfoDialog.getContentHeaderTitle()).toEqual(contentUserModel.firstName + ' ' + contentUserModel.lastName);
@@ -124,10 +124,8 @@ describe('User Info component', () => {
});
it('3. Enable Process Services and disable Content Services ', () => {
navigationBarPage.clickLoginButton();
loginPage.goToLoginPage();
adfSettingsPage.setProviderBpm();
loginPage.login(processUserModel.email, processUserModel.password);
navigationBarPage.clickUserProfile();
@@ -144,30 +142,28 @@ describe('User Info component', () => {
userInfoDialog.closeUserProfile();
});
it('4. Enable Process Services and Content Services ', () => {
let flow = protractor.promise.controlFlow();
flow.execute(() => {
PeopleAPI.updateAvatarViaAPI(contentUserModel, acsAvatarFileModel, '-me-');
PeopleAPI.getAvatarViaAPI(4, contentUserModel, '-me-', function (result) {
});
it('4. Enable Process Services and Content Services ', async(done) => {
browser.controlFlow().execute(async() => {
await PeopleAPI.updateAvatarViaAPI(contentUserModel, acsAvatarFileModel, '-me-');
await PeopleAPI.getAvatarViaAPI(4, contentUserModel, '-me-', function (result) {});
});
navigationBarPage.clickLoginButton();
loginPage.goToLoginPage();
adfSettingsPage.setProviderEcm();
loginPage.login(contentUserModel.id, contentUserModel.password);
navigationBarPage.clickUserProfile();
userInfoDialog.checkACSProfileImage();
userInfoDialog.APSProfileImageNotDisplayed();
userInfoDialog.closeUserProfile();
done();
});
it('5. The profile picture is changed from APS', async () => {
let users = new UsersActions();
navigationBarPage.clickLoginButton();
await this.alfrescoJsApi.login(contentUserModel.email, contentUserModel.password);
await users.changeProfilePictureAps(this.alfrescoJsApi, apsAvatarFileModel.getLocation());
loginPage.goToLoginPage();
adfSettingsPage.setProviderBpm();
loginPage.login(processUserModel.email, processUserModel.password);
navigationBarPage.clickUserProfile();
@@ -178,8 +174,8 @@ describe('User Info component', () => {
});
it('6. Delete the profile picture from ACS', () => {
navigationBarPage.clickLoginButton();
PeopleAPI.deleteAvatarViaAPI(contentUserModel, '-me-');
loginPage.goToLoginPage();
adfSettingsPage.setProviderEcm();
loginPage.login(contentUserModel.id, contentUserModel.password);
navigationBarPage.clickUserProfile();

2
e2e/pages/adf/configEditorPage.ts
View File

@@ -21,7 +21,7 @@ import Util = require('../../util/util');
export class ConfigEditorPage {
enterMetadataConfiguration(text) {
let textField = element(by.css('#adf-metadata-editor > div > div > div.overflow-guard > textarea'));
let textField = element(by.css('#adf-metadata-editor div.overflow-guard > textarea'));
browser.driver.sleep(1000);
Util.waitUntilElementIsVisible(textField);
textField.sendKeys('');

2
e2e/pages/adf/metadataViewPage.js
View File

@@ -136,7 +136,7 @@ var MetadataViewPage = function () {
};
this.clickOnPropertiesTab = function () {
var propertiesTab = element(by.cssContainingText("div[class='mat-tab-labels'] div", "Properties"));
var propertiesTab = element(by.cssContainingText(".adf-info-drawer-layout-content div.mat-tab-labels div", "Properties"));
Util.waitUntilElementIsVisible(propertiesTab);
propertiesTab.click();
return this;

2
e2e/pages/adf/notificationPage.js
View File

@@ -27,7 +27,7 @@ var NotificationPage = function () {
var actionToggle = element(by.css("mat-slide-toggle[data-automation-id='notification-action-toggle']"));
var notificationSnackBar = element.all(by.css("simple-snack-bar")).first();
var actionOutput = element(by.css("div[data-automation-id='notification-action-output']"));
var actionButton = element(by.css("simple-snack-bar > button"));
var actionButton = element(by.css("simple-snack-bar > div > button"));
var defaultNotificationButton = element(by.css("button[data-automation-id='notification-default-button']"));
var customNotificationButton = element(by.css("button[data-automation-id='notification-custom-config-button']"));
var selectionDropDown = element.all(by.css("div[class*='mat-select-content']")).first();

2
e2e/pages/adf/process_services/tasksPage.js
View File

@@ -35,7 +35,7 @@ var TasksPage = function () {
var completeButtonNoForm = element(by.id("adf-no-form-complete-button"));
var checklistDialog = element(by.id("checklist-dialog"));
var checklistNoMessage = element(by.id("checklist-none-message"));
var numberOfChecklists = element(by.css("mat-chip-list[id='checklist-label'] mat-chip"));
var numberOfChecklists = element(by.css("[data-automation-id='checklist-label'] mat-chip"));
this.createNewTask = function () {
this.createButtonIsDisplayed();

8
e2e/pages/adf/searchResultsPage.js
View File

@@ -29,6 +29,14 @@ var SearchResultsPage = function () {
var sortDropdownLocator = by.css("mat-option span");
var sortingArrow = element(by.css("adf-sorting-picker div[class='mat-select-arrow']"));
this.closeActionButton = function () {
let container = element(by.css('div.cdk-overlay-backdrop.cdk-overlay-transparent-backdrop.cdk-overlay-backdrop-showing'));
Util.waitUntilElementIsVisible(container);
container.click();
Util.waitUntilElementIsNotVisible(container);
return this;
}
this.checkContentIsDisplayed = function (content) {
contentList.checkContentIsDisplayed(content);
return this;

5
e2e/pages/adf/versionManagerPage.ts
View File

@@ -185,7 +185,10 @@ export class VersionManagePage {
}
closeActionButton() {
browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
let container = element(by.css('div.cdk-overlay-backdrop.cdk-overlay-transparent-backdrop.cdk-overlay-backdrop-showing'));
Util.waitUntilElementIsVisible(container);
container.click();
Util.waitUntilElementIsNotVisible(container);
return this;
}

4
e2e/process-services/comment_component_processes.e2e.ts
View File

@@ -102,7 +102,7 @@ describe('Comment component for Processes', () => {
expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (' + addedComment.total + ')');
expect(commentsPage.getMessage(0)).toEqual(addedComment.data[0].message);
expect(commentsPage.getUserName(0)).toEqual(addedComment.data[0].createdBy.firstName + ' ' + addedComment.data[0].createdBy.lastName);
expect(commentsPage.getTime(0)).toEqual('a few seconds ago');
expect(commentsPage.getTime(0)).toContain('ago');
});
});
@@ -152,7 +152,7 @@ describe('Comment component for Processes', () => {
expect(commentsPage.getTotalNumberOfComments()).toEqual('Comments (' + addedTaskComment.total + ')');
expect(commentsPage.getMessage(0)).toEqual(addedTaskComment.data[0].message);
expect(commentsPage.getUserName(0)).toEqual(addedTaskComment.data[0].createdBy.firstName + ' ' + addedTaskComment.data[0].createdBy.lastName);
expect(commentsPage.getTime(0)).toEqual('a few seconds ago');
expect(commentsPage.getTime(0)).toContain('ago');
});
});
});

10
e2e/process-services/comment_component_tasks.e2e.ts
View File

@@ -144,8 +144,8 @@ describe('Comment component for Processes', () => {
await expect(commentsPage.getUserName(0)).toEqual(totalComments.data[0].createdBy.firstName + ' ' + totalComments.data[0].createdBy.lastName);
await expect(commentsPage.getUserName(1)).toEqual(totalComments.data[1].createdBy.firstName + ' ' + totalComments.data[1].createdBy.lastName);
await expect(commentsPage.getTime(0)).toEqual('a few seconds ago');
await expect(commentsPage.getTime(1)).toEqual('a few seconds ago');
await expect(commentsPage.getTime(0)).toContain('ago');
await expect(commentsPage.getTime(1)).toContain('ago');
await loginPage.loginToProcessServicesUsingUserModel(secondUser);
@@ -175,9 +175,9 @@ describe('Comment component for Processes', () => {
await expect(commentsPage.getUserName(1)).toEqual(totalComments.data[1].createdBy.firstName + ' ' + totalComments.data[1].createdBy.lastName);
await expect(commentsPage.getUserName(2)).toEqual(totalComments.data[2].createdBy.firstName + ' ' + totalComments.data[2].createdBy.lastName);
await expect(commentsPage.getTime(0)).toEqual('a few seconds ago');
await expect(commentsPage.getTime(1)).toEqual('a few seconds ago');
await expect(commentsPage.getTime(2)).toEqual('a few seconds ago');
await expect(commentsPage.getTime(0)).toContain('ago');
await expect(commentsPage.getTime(1)).toContain('ago');
await expect(commentsPage.getTime(2)).toContain('ago');
});
});
});

2
e2e/restAPI/APIUtil.js
View File

@@ -27,7 +27,7 @@ var APIUtils = function () {
* @returns Basic authorization
*/
this.getAuthorization = function (user, password) {
return 'Basic ' + Buffer(user + ':' + password).toString('base64');
return 'Basic ' + Buffer.from(user + ':' + password).toString('base64');
};
/**


11916
integration/base_ver_2_app/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

44
integration/base_ver_2_app/package.json
View File

@@ -18,20 +18,23 @@
"@alfresco/adf-core": "2.0.0",
"@alfresco/adf-insights": "2.0.1",
"@alfresco/adf-process-services": "2.0.0",
"@angular/animations": "5.0.0",
"@angular/cdk": "5.0.0-rc0",
"@angular/common": "5.0.0",
"@angular/compiler": "5.0.0",
"@angular/core": "5.0.0",
"@angular/flex-layout": "2.0.0-beta.10",
"@angular/forms": "5.0.0",
"@angular/http": "5.0.0",
"@angular/material": "5.0.0-rc0",
"@angular/platform-browser": "5.0.0",
"@angular/platform-browser-dynamic": "5.0.0",
"@angular/router": "5.0.0",
"@ngx-translate/core": "8.0.0",
"alfresco-js-api": "2.0.0",
"@angular/animations": "5.1.1",
"@angular/cdk": "5.1.1",
"@angular/common": "5.1.1",
"@angular/compiler": "5.1.1",
"@angular/core": "5.1.1",
"@angular/flex-layout": "2.0.0-beta.12",
"@angular/forms": "5.1.1",
"@angular/http": "5.1.1",
"@angular/material": "5.1.1",
"@angular/material-moment-adapter": "5.1.1",
"@angular/platform-browser": "5.1.1",
"@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.1.1",
"@mat-datetimepicker/core": "^2.0.1",
"@mat-datetimepicker/moment": "^2.0.1",
"@ngx-translate/core": "10.0.2",
"alfresco-js-api": "^2.5.0-d5acbab9993711f37b66351a6aaedf6fc72d1ce2",
"chart.js": "2.5.0",
"classlist.js": "1.1.20150312",
"core-js": "2.4.1",
@@ -39,20 +42,21 @@
"hammerjs": "2.0.8",
"intl": "1.2.5",
"minimatch": "3.0.4",
"moment": "2.15.2",
"moment": "2.20.1",
"moment-es6": "1.0.0",
"ng2-charts": "1.6.0",
"pdfjs-dist": "1.5.404",
"raphael": "2.2.7",
"reflect-metadata": "0.1.10",
"rxjs": "5.5.2",
"rxjs": "6.0.0",
"rxjs-compat": "6.1.0",
"web-animations-js": "2.3.1",
"zone.js": "0.8.14"
},
"devDependencies": {
"@angular-devkit/core": "^0.2.0",
"@angular/cli": "1.5.0",
"@angular/compiler-cli": "5.0.0",
"@angular-devkit/core": "0.0.28",
"@angular/cli": "1.7.4",
"@angular/compiler-cli": "5.1.1",
"@angular/language-service": "5.0.0",
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
@@ -70,6 +74,6 @@
"rimraf": "^2.6.2",
"ts-node": "~3.2.0",
"tslint": "~5.7.0",
"typescript": "~2.4.2"
"typescript": "2.6.2"
}
}

10
integration/base_ver_2_app/src/main.ts
View File

@@ -3,11 +3,17 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
import { PDFJSStatic } from 'pdfjs-dist';
declare global {
const PDFJS: PDFJSStatic;
}
import 'hammerjs';
import 'chart.js';
import 'ng2-charts';
import pdfjsLib from 'pdfjs-dist';
pdfjsLib.PDFJS.workerSrc = 'pdf.worker.js';
PDFJS.workerSrc = 'pdf.worker.js';
if (environment.production) {
enableProdMode();

25
integration/base_ver_2_app/src/tsconfig.app.json
View File

@@ -6,30 +6,7 @@
"rootDir": "..",
"baseUrl": ".",
"skipLibCheck": false,
"types": [],
"paths": {
"alfresco-js-api": [
"../node_modules/alfresco-js-api/dist/alfresco-js-api.js"
],
"rxjs/*": [
"../node_modules/rxjs/*"
],
"@angular/*": [
"../node_modules/@angular/*"
],
"@alfresco/adf-core": [
"../../../lib/core"
],
"@alfresco/adf-content-services": [
"../../../lib/content-services"
],
"@alfresco/adf-process-services": [
"../../../lib/process-services"
],
"@alfresco/adf-insights": [
"../../../lib/insights"
]
}
"types": []
},
"exclude": [
"test.ts",

25
integration/base_ver_2_app/src/tsconfig.spec.json
View File

@@ -6,30 +6,7 @@
"rootDir": "..",
"baseUrl": ".",
"skipLibCheck": false,
"types": [],
"paths": {
"alfresco-js-api": [
"../node_modules/alfresco-js-api/dist/alfresco-js-api.js"
],
"rxjs/*": [
"../node_modules/rxjs/*"
],
"@angular/*": [
"../node_modules/@angular/*"
],
"@alfresco/adf-core": [
"../../../lib/core"
],
"@alfresco/adf-content-services": [
"../../../lib/content-services"
],
"@alfresco/adf-process-services": [
"../../../lib/process-services"
],
"@alfresco/adf-insights": [
"../../../lib/insights"
]
}
"types": []
},
"exclude": [
"test.ts",

8
lib/.gitignore vendored
View File

@@ -7,22 +7,22 @@ coverage
dist
content-services/**/*.js
!content-services/karma-test-shim.js
!content-services/karma.conf.js
content-services/**/*.js.map
content-services/**/*.d.ts
process-services/**/*.js
!process-services/karma-test-shim.js
!process-services/karma.conf.js
process-services/**/*.js.map
process-services/**/*.d.ts
core/**/*.js
!core/karma-test-shim.js
!core/karma.conf.js
core/**/*.js.map
core/**/*.d.ts
insights/**/*.js
!insights/karma-test-shim.js
!insights/karma.conf.js
insights/**/*.js.map
insights/**/*.d.ts

16
lib/config/assets/license_header.txt
View File

@@ -1,16 +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.
*/

14
lib/config/assets/license_header_add.txt
View File

@@ -1,14 +0,0 @@
@license
Copyright <%= moment().format('YYYY') %> 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.

6
lib/config/bundle-scss.js
View File

@@ -3,23 +3,17 @@ var writeFileSync = require('fs-extra').writeFileSync;
var mkdirpSync = require('fs-extra').mkdirpSync;
new Bundler().Bundle('./lib/core/styles/_index.scss', '**/*.scss').then(result => {
mkdirpSync('core');
writeFileSync('./lib/dist/core/_theming.scss', result.bundledContent);
});
new Bundler().Bundle('./lib/insights/styles/_index.scss', '**/*.scss').then(result => {
mkdirpSync('insights');
writeFileSync('./lib/dist/insights/_theming.scss', result.bundledContent);
});
new Bundler().Bundle('./lib/process-services/styles/_index.scss', '**/*.scss').then(result => {
mkdirpSync('process-services');
writeFileSync('./lib/dist/process-services/_theming.scss', result.bundledContent);
});
new Bundler().Bundle('./lib/content-services/styles/_index.scss', '**/*.scss').then(result => {
mkdirpSync('content-services');
writeFileSync('./lib/dist/content-services/_theming.scss', result.bundledContent);
});

155
lib/config/custom-loaders/generateListComponent.js
View File

@@ -1,155 +0,0 @@
var path = require('path');
var fs = require('fs');
var erase = true;
var readmeContent = null;
var readmeFilePath = '';
function isFileEmpty(fileContents) {
return fileContents.toString('utf8').trim() === '';
}
function writeFile(file, newValue) {
fs.writeFileSync(file, newValue, 'utf-8');
}
function readFile(file) {
return fs.readFileSync(file, 'utf8');
}
function eraseContentList() {
if (erase) {
erase = false;
var businessRegex = /(?:<!-- BUSINESS START-->)([\s\S]*?)(?:<!-- BUSINESS END-->)/;
var contentRegex = /(?:<!-- CONTENT START-->)([\s\S]*?)(?:<!-- CONTENT END-->)/;
var coreRegex = /(?:<!-- CORE START-->)([\s\S]*?)(?:<!-- CORE END-->)/;
var businessRegexDirective = /(?:<!-- BUSINESS DIRECTIVE START-->)([\s\S]*?)(?:<!-- BUSINESS DIRECTIVE END-->)/;
var contentRegexDirective = /(?:<!-- CONTENT DIRECTIVE START-->)([\s\S]*?)(?:<!-- CONTENT DIRECTIVE END-->)/;
var coreRegexDirective = /(?:<!-- CORE DIRECTIVE START-->)([\s\S]*?)(?:<!-- CORE DIRECTIVE END-->)/;
var servicessRegex = /(?:<!-- SERVICES START-->)([\s\S]*?)(?:<!-- SERVICES END-->)/;
readmeContent = readmeContent.replace(businessRegex, '<!-- BUSINESS START--><!-- BUSINESS END-->');
readmeContent = readmeContent.replace(contentRegex, '<!-- CONTENT START--><!-- CONTENT END-->');
readmeContent = readmeContent.replace(coreRegex, '<!-- CORE START--><!-- CORE END-->');
readmeContent = readmeContent.replace(businessRegexDirective, '<!-- BUSINESS DIRECTIVE START--><!-- BUSINESS DIRECTIVE END-->');
readmeContent = readmeContent.replace(contentRegexDirective, '<!-- CONTENT DIRECTIVE START--><!-- CONTENT DIRECTIVE END-->');
readmeContent = readmeContent.replace(coreRegexDirective, '<!-- CORE DIRECTIVE START--><!-- CORE DIRECTIVE END-->');
readmeContent = readmeContent.replace(servicessRegex, '<!-- SERVICES START--><!-- SERVICES END-->');
writeFile(readmeFilePath, readmeContent)
}
}
function generateListComponent(currentFileContent, webpackInstance) {
if (!isFileEmpty(currentFileContent)) {
var componentReg = /(@Component)(\s?)\((\s?){(\s?)((.|[\n\r])*)}(\s?)\)/gm;
var componentSection = componentReg.exec(currentFileContent);
if (componentSection) {
var selectorReg = /(adf)([a-zA-Z]|-)+((?!,)|(?! ))/g;
var selector = selectorReg.exec(componentSection[0]);
if (selector) {
var rawPath = webpackInstance.resourcePath.replace(/\\/g, "/");
var removeRoot = rawPath.substr(rawPath.indexOf('/ng2-components') + 16, rawPath.length);
var url = removeRoot.substr(0, removeRoot.indexOf('src')) + 'README.md';
var link = '- [' + selector[0] + '](' + url + ')';
if (webpackInstance.resourcePath.match('ng2-alfresco-core')) {
readmeContent = readmeContent.replace('<!-- CORE START-->', '<!-- CORE START-->\n' + link);
} else if (webpackInstance.resourcePath.match('ng2-alfresco-')) {
readmeContent = readmeContent.replace('<!-- CONTENT START-->', '<!-- CONTENT START-->\n' + link);
} else if (webpackInstance.resourcePath.match('ng2-activiti-')) {
readmeContent = readmeContent.replace('<!-- BUSINESS START-->', '<!-- BUSINESS START-->\n' + link);
}
}
}
var directiveReg = /(@Directive)(\s?)\((\s?){(\s?)((.|[\r\n])*)}(\s?)\)/gm;
var directiveSection = directiveReg.exec(currentFileContent);
if (directiveSection) {
var selectorReg = /(adf)([a-zA-Z]|-)+((?!,)|(?! ))/g;
var selector = selectorReg.exec(directiveSection[0]);
if (selector) {
var selector = selector[0].replace("selector: '[", "").replace("']", '').replace("]", '').replace("selector: '", "").replace("'", '');
var rawPath = webpackInstance.resourcePath.replace(/\\/g, "/");
var removeRoot = rawPath.substr(rawPath.indexOf('/ng2-components') + 16, rawPath.length);
var url = removeRoot.substr(0, removeRoot.indexOf('src')) + 'README.md';
var link = '- [' + selector + '](' + url + ')';
if (webpackInstance.resourcePath.match('ng2-alfresco-core')) {
readmeContent = readmeContent.replace('<!-- CORE DIRECTIVE START-->', '<!-- CORE DIRECTIVE START-->\n' + link);
}
//else if (webpackInstance.resourcePath.match('ng2-alfresco-')) {
// readmeContent = readmeContent.replace('<!-- CONTENT DIRECTIVE START-->', '<!-- CONTENT DIRECTIVE START-->\n' + link);
//}
//else if (webpackInstance.resourcePath.match('ng2-activiti-')) {
// readmeContent = readmeContent.replace('<!-- BUSINESS DIRECTIVE START-->', '<!-- BUSINESS DIRECTIVE START-->\n' + link);
//}
}
}
writeFile(readmeFilePath, readmeContent);
return true;
}
}
function generateListservices(currentFileContent, webpackInstance) {
if (!isFileEmpty(currentFileContent)) {
var servicesReg = /(@Injectable\(\))(([a-zA-Z ]|[\r\n])*)/gm;
var servicesSection = servicesReg.exec(currentFileContent);
if (servicesSection) {
var selectorReg = /([a-zA-Z])+Service/g;
var selector = selectorReg.exec(servicesSection[0]);
if (selector) {
var rawPath = webpackInstance.resourcePath.replace(/\\/g, "/");
var url = rawPath.substr(rawPath.indexOf('/ng2-components') + 16, rawPath.length);
var link = '- [' + selector[0] + '](' + url + ')';
readmeContent = readmeContent.replace('<!-- SERVICES START-->', '<!-- SERVICES START-->\n' + link);
}
}
writeFile(readmeFilePath, readmeContent);
return true;
}
}
module.exports = function (input, map) {
this.cacheable && this.cacheable();
var callback = this.async();
readmeFilePath = path.resolve(__dirname, '../../README.md');
if (!readmeContent) {
readmeContent = readFile(readmeFilePath);
}
if (readmeContent) {
eraseContentList();
generateListComponent(input, this);
generateListservices(input, this);
}
callback(null, input, map);
}

67
lib/config/custom-loaders/license-check.js
View File

@@ -1,67 +0,0 @@
var path = require('path');
var loaderUtils = require('loader-utils');
var fs = require('fs');
var licenseFileUtf8Store = undefined;
function readLicenseHeaderFile(licenseFilePath) {
if (licenseFileUtf8Store) {
return licenseFileUtf8Store;
}
if (fs.existsSync(licenseFilePath)) {
licenseFileUtf8Store = fs.readFileSync(licenseFilePath, 'utf8').split(/\r?\n/);
return licenseFileUtf8Store;
}
throw new Error('The license header file path is wrong ' + licenseFilePath);
}
function isFileEmpty(fileContents) {
return fileContents.toString('utf8').trim() === '';
}
function readCurrentFile(fileContent) {
return fileContent.toString('utf8').split(/\r?\n/);
}
function isLicenseHeaderPresent(currentFileContent, licenseFilePath) {
if (!isFileEmpty(currentFileContent)) {
var currentFileUtf8 = readCurrentFile(currentFileContent),
licenseFileUtf8 = readLicenseHeaderFile(licenseFilePath);
skipStrict = 0;
if(currentFileUtf8[0] === '"use strict";' ) {
skipStrict = 1;
}
for (var i = skipStrict; i < licenseFileUtf8.length; i++) {
if (currentFileUtf8[i + skipStrict] !== licenseFileUtf8[i]) {
return false;
}
}
}
return true;
}
function report(hasHeader, emitter, filename) {
if (hasHeader) return;
emitter('Missing license header file : ' + filename);
}
function licenseCheck(webpackInstance, input, options) {
var isLicensePresent = isLicenseHeaderPresent(input, options.licenseFile);
var emitter = options.emitErrors ? webpackInstance.emitError : webpackInstance.emitWarning;
report(isLicensePresent, emitter, webpackInstance.resourcePath);
}
module.exports = function(input, map) {
this.cacheable && this.cacheable();
var callback = this.async();
var options = loaderUtils.getOptions(this);
licenseCheck(this, input, options);
callback(null, input, map);
};

10
lib/config/helpers.js
View File

@@ -1,10 +0,0 @@
var path = require('path');
var _root = path.resolve(__dirname, '..');
function root(args) {
args = Array.prototype.slice.call(arguments, 0);
return path.join.apply(path, [_root].concat(args));
}
exports.root = root;

56
lib/config/karma-test-shim.js
View File

@@ -1,56 +0,0 @@
Error.stackTraceLimit = Infinity;
require('core-js/es6');
require('core-js/es7/reflect');
require('zone.js/dist/zone');
require('zone.js/dist/long-stack-trace-zone');
require('zone.js/dist/proxy');
require('zone.js/dist/sync-test');
require('zone.js/dist/jasmine-patch');
require('zone.js/dist/async-test');
require('zone.js/dist/fake-async-test');
jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000;
var appContext = require.context(".", true, /.spec.ts/);appContext.keys().forEach(appContext);
const TestBed = require('@angular/core/testing').TestBed;
const browser = require('@angular/platform-browser-dynamic/testing');
const NoopAnimationsModule = require('@angular/platform-browser/animations').NoopAnimationsModule;
const CoreModule = require('../core').CoreModule;
const AppConfigService = require('../core').AppConfigService;
const AppConfigServiceMock = require('../core').AppConfigServiceMock;
const TranslationService = require('../core').TranslationService;
const TranslationMock = require('../core').TranslationMock;
const TranslateModule = require('@ngx-translate/core').TranslateModule;
const CommonModule = require('@angular/common').CommonModule;
const FormsModule = require('@angular/forms').FormsModule;
const ReactiveFormsModule = require('@angular/forms').ReactiveFormsModule;
const AlfrescoApiService = require('../core').AlfrescoApiService;
const AlfrescoApiServiceMock = require('../core').AlfrescoApiServiceMock;
TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting());
beforeEach(() => {
TestBed.configureTestingModule({
imports: [
NoopAnimationsModule,
CoreModule,
TranslateModule,
CommonModule,
FormsModule,
ReactiveFormsModule
],
providers: [
{provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock},
{provide: AppConfigService, useClass: AppConfigServiceMock},
{provide: TranslationService, useClass: TranslationMock}
]
});
});
afterEach(() => {
TestBed.resetTestingModule();
});

151
lib/config/karma.conf-all.js
View File

@@ -1,151 +0,0 @@
const webpackCoverage = require('./webpack.coverage');
const webpackTest = require('./webpack.test');
module.exports = function (config) {
var _config = {
basePath: '../',
frameworks: ['jasmine-ajax', 'jasmine'],
files: [
{pattern: './node_modules/core-js/client/core.js', included: true, watched: false},
{pattern: './node_modules/tslib/tslib.js', included: true, watched: false},
{pattern: './node_modules/hammerjs/hammer.min.js', included: true, watched: false},
{pattern: './node_modules/hammerjs/hammer.min.js.map', included: false, watched: false},
// pdf-js
{pattern: './node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},
{pattern: './node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false},
{pattern: './node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},
{
pattern: './node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
included: true,
watched: false
},
//diagrams
{pattern: './node_modules/chart.js/dist/Chart.js', included: true, watched: false},
{pattern: './node_modules/alfresco-js-api/dist/alfresco-js-api.min.js', included: true, watched: false},
{pattern: './node_modules/raphael/raphael.min.js', included: true, watched: false},
{pattern: './node_modules/moment/min/moment.min.js', included: true, watched: false},
{
pattern: './node_modules/ng2-charts/bundles/ng2-charts.umd.js',
included: false,
served: true,
watched: false
},
{pattern: './lib/core/i18n/**/en.json', included: false, served: true, watched: false},
{pattern: './lib/content-services/i18n/**/en.json', included: false, served: true, watched: false},
{pattern: './lib/process-services/i18n/**/en.json', included: false, served: true, watched: false},
{pattern: './lib/**/*.ts', included: false, served: true, watched: false},
{pattern: './lib/config/app.config.json', included: false, served: true, watched: false},
{pattern: './lib/core/viewer/assets/fake-test-file.pdf', included: false, served: true, watched: false},
{pattern: './lib/core/viewer/assets/fake-test-file.txt', included: false, served: true, watched: false},
{
pattern: './lib/core/viewer/assets/fake-test-password-file.pdf',
included: false,
served: true,
watched: false
},
{pattern: './lib/' + config.component + '/karma-test-shim.js', watched: false}
],
webpack: (config.mode === 'coverage') ? webpackCoverage(config) : webpackTest(config),
webpackMiddleware: {
noInfo: true,
stats: {
chunks: false
}
},
port: 9876,
proxies: {
'/app.config.json': '/base/lib/config/app.config.json',
'/fake-test-file.pdf': '/base/lib/core/viewer/assets/fake-test-file.pdf',
'/fake-test-file.txt': '/base/lib/core/viewer/assets/fake-test-file.txt',
'/fake-test-password-file.pdf': '/base/lib/core/viewer/assets/fake-test-password-file.pdf'
},
// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_DISABLE,
colors: true,
autoWatch: false,
browserDisconnectTimeout: 200000,
browserNoActivityTimeout: 2400000,
captureTimeout: 1200000,
browsers: ['Chrome'],
// browsers: ['ChromeHeadless'],
customLaunchers: {
ChromeHeadless: {
base: 'Chrome',
flags: [
'--no-sandbox',
'--headless',
'--disable-gpu',
'--remote-debugging-port=9222'
]
}
},
// Karma plugins loaded
plugins: [
require('../../node_modules/karma-jasmine'),
require('../../node_modules/karma-coverage'),
require('../../node_modules/karma-sourcemap-loader'),
require('../../node_modules/karma-jasmine-ajax'),
require('../../node_modules/karma-chrome-launcher'),
require('../../node_modules/karma-webpack'),
require('../../node_modules/karma-jasmine-html-reporter'),
require('../../node_modules/karma-mocha-reporter')
],
webpackServer: {
noInfo: true
},
// Coverage reporter generates the coverage
reporters: ['mocha', 'coverage', 'kjhtml'],
mochaReporter: {
ignoreSkipped: true
},
preprocessors: {
'**/karma-test-shim.js': ['webpack'],
'(core|content-services|process-services)/**/!(*spec|index|*mock|*model|*event).js': 'coverage'
},
coverageReporter: {
includeAllSources: true,
dir: './lib/coverage/' + config.component + '/',
subdir: 'report',
reporters: [
{type: 'text'},
{type: 'text-summary'},
{type: 'json', file: 'coverage-final.json'},
{type: 'html'},
{type: 'lcov'}
]
}
// client: {
// jasmine: {
// random: true
// }
// }
};
config.set(_config);
};

1
lib/config/test-export.js
View File

@@ -1 +0,0 @@
console.log('Start');

60
lib/config/webpack.build.js
View File

@@ -1,60 +0,0 @@
const webpackMerge = require('webpack-merge');
const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
const commonConfig = require('./webpack.common.js');
const fs = require('fs');
const webpack = require('webpack');
const path = require('path');
module.exports = webpackMerge(commonConfig, {
// require those dependencies but don't bundle them
externals: [
/^\@angular\//,
/^rxjs\//,
/^\@ngx-translate\//,
'moment',
'minimatch',
'raphael',
'ng2-charts',
'alfresco-js-api',
/^\@alfresco\//,
'content-services',
'process-services',
'core'
],
output: {
filename: 'dist-webpack/[name]/bundles/adf-[name].js',
library: '[name]',
libraryTarget: 'umd',
chunkFilename: '[id].chunk.js'
},
entry: {
"core": "./core/index.ts",
"insights": "./insights/index.ts",
"content-services": "./content-services/index.ts",
"process-services": "./process-services/index.ts"
},
plugins: [
new UglifyJSPlugin({
sourceMap: true,
uglifyOptions: {
ie8: false,
ecma: 6,
output: {
comments: false,
beautify: false
},
warnings: false
}
}),
new webpack.BannerPlugin({
banner: fs.readFileSync(path.resolve(__dirname, './assets/license_header_add.txt'), 'utf8'),
entryOnly: true
})
]
});

10
lib/config/webpack.bundle-check.js
View File

@@ -1,10 +0,0 @@
const webpackMerge = require('webpack-merge');
const webpackBuild = require('./webpack.build.js');
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
module.exports = webpackMerge(webpackBuild, {
plugins: [
new BundleAnalyzerPlugin()
]
});

178
lib/config/webpack.common.js
View File

@@ -1,178 +0,0 @@
const webpack = require('webpack');
const helpers = require('./helpers');
const path = require('path');
const CopyWebpackPlugin = require('copy-webpack-plugin');
var HappyPack = require('happypack');
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const alfrescoLibs = [
'content-services',
'process-services',
'core',
'insights'
];
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
devtool: 'source-map',
resolveLoader: {
alias: {
"file-multi-loader": path.resolve(__dirname, "./custom-loaders/file-loader-multi"),
"license-check": path.resolve(__dirname, "./custom-loaders/license-check")
}
},
resolve: {
alias: {
"@alfresco/adf-content-services": path.resolve(__dirname, '../content-services/'),
"@alfresco/adf-content-services$": path.resolve(__dirname, '../content-services/index.ts'),
"@alfresco/adf-process-services": path.resolve(__dirname, '../process-services/'),
"@alfresco/adf-process-services$": path.resolve(__dirname, '../process-services/index.ts'),
"@alfresco/adf-core": path.resolve(__dirname, '../core/'),
"@alfresco/adf-core$": path.resolve(__dirname, '../core/index.ts'),
"@alfresco/adf-insights": path.resolve(__dirname, '../insights/'),
"@alfresco/adf-insights": path.resolve(__dirname, '../insights/index.ts')
},
extensions: ['.ts', '.js', '.scss'],
modules: [helpers.root('../node_modules')]
},
module: {
rules: [
{
enforce: 'pre',
test: /\.js$/,
loader: 'source-map-loader',
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
{
enforce: 'pre',
test: /\.ts$/,
use: 'source-map-loader',
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
{
enforce: 'pre',
test: /\.ts$/,
loader: 'tslint-loader',
options: {
configFile : helpers.root('tslint.json'),
emitErrors: true,
failOnHint: true,
fix: true
},
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
{
test: /\.ts$/,
loader: ['happypack/loader?id=ts', 'angular2-template-loader'],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
{
test: /\.html$/,
loader: 'html-loader',
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
{
test: /\.css$/,
loader: ['happypack/loader?id=css'],
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
},
{
test: /\.scss$/,
use: [{
loader: "to-string-loader"
}, {
loader: "raw-loader"
}, {
loader: "sass-loader"
}]
},
{
enforce: 'pre',
test: /\.ts$/,
loader: 'license-check',
options: {
emitErrors: true,
licenseFile: path.resolve(__dirname, './assets/license_header.txt')
},
exclude: [/node_modules/, /bundles/, /dist/, /demo/, /rendering-queue.services.ts/]
},
{
test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
loader: 'file-multi-loader',
query: {
name: '[name].[hash].[ext]',
outputPath: (url, resourcePath)=> {
return resourcePath.replace('assets/', 'bundles/assets/') + url;
},
publicPath: (url, resourcePath)=> {
var component = resourcePath.substring(0, resourcePath.indexOf('/'));
var path = resourcePath.replace(component, '');
return path + url;
}
}
}
]
},
plugins: [
new ForkTsCheckerWebpackPlugin(),
new HappyPack({
id: 'ts',
threads: 4,
loaders: [
{
path: 'ts-loader',
query: {
happyPackMode: true,
"compilerOptions": {
"outDir": "./",
"declaration": true,
"paths": {
}
}
}
}
]
}),
new HappyPack({
id: 'css',
threads: 4,
loaders: ['to-string-loader', 'css-loader' ]
}),
new CopyWebpackPlugin([
... alfrescoLibs.map(lib => {
return {
from: `lib/${lib}/i18n/`,
to: `lib/${lib}/bundles/assets/adf-${lib}/i18n/`
}
})
]),
new webpack.NoEmitOnErrorsPlugin(),
new webpack.ContextReplacementPlugin( /angular(\\|\/)core(\\|\/)/, path.resolve(__dirname, './src') ),
new webpack.DefinePlugin({
'process.env': {
'ENV': JSON.stringify(ENV)
}
}),
new webpack.LoaderOptionsPlugin({
htmlLoader: {
minimize: false // workaround for ng2
}
})
],
node: {
fs: 'empty',
module: false
}
};

36
lib/config/webpack.coverage.js
View File

@@ -1,36 +0,0 @@
const webpack = require('webpack');
const webpackMerge = require('webpack-merge');
const commonConfig = require('./webpack.common.js');
const helpers = require('./helpers');
module.exports = function (config) {
return webpackMerge(commonConfig, {
devtool: 'inline-source-map',
module: {
rules: [
{
test: /\.(txt|pdf)$/,
loader: 'file-loader',
query: {
name: '[path][name].[ext]',
outputPath: (url)=> {
return url.replace('src', 'dist');
}
}
},
{
enforce: 'post',
test: /^(?!(.*spec|index|.*mock|.*model|.*event)).*\.ts?$/,
loader: 'istanbul-instrumenter-loader',
include: [helpers.root(config.component)],
exclude: [
/node_modules/,
/test/
]
}
]
}
});
};

23
lib/config/webpack.doc.js
View File

@@ -1,23 +0,0 @@
const helpers = require('./helpers');
const webpackMerge = require('webpack-merge');
const webpackBuild = require('./webpack.build');
const path = require('path');
module.exports = webpackMerge(webpackBuild, {
resolveLoader: {
alias: {
"generate-list-component-loader": path.resolve(__dirname, "./custom-loaders/generateListComponent")
}
},
module: {
rules: [
{
test: /\.ts/,
loader: 'generate-list-component-loader',
exclude: [/node_modules/, /bundles/, /dist/, /demo/]
}
]
}
});

9
lib/config/webpack.style.js
View File

@@ -1,9 +1,12 @@
const ExtractTextPlugin = require("extract-text-webpack-plugin");
const extractScss = new ExtractTextPlugin('./lib/dist/core/prebuilt-themes/[name].css');
const extractScss = new ExtractTextPlugin('./core/prebuilt-themes/[name].css');
var path = require("path");
module.exports = {
mode: 'production',
entry: {
'adf-blue-orange': './lib/core/styles/prebuilt/adf-blue-orange.scss',
'adf-blue-purple': './lib/core/styles/prebuilt/adf-blue-purple.scss',
@@ -17,7 +20,9 @@ module.exports = {
},
output: {
filename: './dist/[name].js'
path: path.resolve(__dirname, '../dist/'),
filename: '[name].js',
publicPath: '/dist'
},
module: {

24
lib/config/webpack.test.js
View File

@@ -1,24 +0,0 @@
const webpackMerge = require('webpack-merge');
const commonConfig = require('./webpack.common.js');
module.exports = function (config) {
return webpackMerge(commonConfig, {
devtool: 'inline-source-map',
module: {
rules: [
{
test: /\.(txt|pdf)$/,
loader: 'file-loader',
query: {
name: '[path][name].[ext]',
outputPath: (url)=> {
return url.replace('src', 'dist');
}
}
}
]
}
});
};

17
lib/content-services/content-metadata/components/content-metadata/content-metadata.component.spec.ts
View File

@@ -24,8 +24,7 @@ import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { ContentMetadataComponent } from './content-metadata.component';
import { ContentMetadataService } from '../../services/content-metadata.service';
import { CardViewBaseItemModel, CardViewComponent, CardViewUpdateService, NodesApiService, LogService, setupTestBed } from '@alfresco/adf-core';
import { ErrorObservable } from 'rxjs/observable/ErrorObservable';
import { Observable } from 'rxjs/Observable';
import { throwError, of } from 'rxjs';
import { ContentTestingModule } from '../../../testing/content.testing.module';
describe('ContentMetadataComponent', () => {
@@ -104,7 +103,7 @@ describe('ContentMetadataComponent', () => {
const property = <CardViewBaseItemModel> { key: 'property-key', value: 'original-value' },
updateService: CardViewUpdateService = fixture.debugElement.injector.get(CardViewUpdateService),
nodesApiService: NodesApiService = TestBed.get(NodesApiService);
spyOn(nodesApiService, 'updateNode');
spyOn(nodesApiService, 'updateNode').and.callThrough();
updateService.update(property, 'updated-value');
@@ -120,7 +119,7 @@ describe('ContentMetadataComponent', () => {
expectedNode = Object.assign({}, node, { name: 'some-modified-value' });
spyOn(nodesApiService, 'updateNode').and.callFake(() => {
return Observable.of(expectedNode);
return of(expectedNode);
});
updateService.update(property, 'updated-value');
@@ -137,7 +136,7 @@ describe('ContentMetadataComponent', () => {
logService: LogService = TestBed.get(LogService);
spyOn(nodesApiService, 'updateNode').and.callFake(() => {
return ErrorObservable.create(new Error('My bad'));
return throwError(new Error('My bad'));
});
updateService.update(property, 'updated-value');
@@ -168,7 +167,7 @@ describe('ContentMetadataComponent', () => {
component.expanded = false;
fixture.detectChanges();
spyOn(contentMetadataService, 'getBasicProperties').and.callFake(() => {
return Observable.of(expectedProperties);
return of(expectedProperties);
});
component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
@@ -183,7 +182,7 @@ describe('ContentMetadataComponent', () => {
it('should pass through the displayEmpty to the card view of basic properties', async(() => {
component.displayEmpty = false;
fixture.detectChanges();
spyOn(contentMetadataService, 'getBasicProperties').and.returnValue(Observable.of([]));
spyOn(contentMetadataService, 'getBasicProperties').and.returnValue(of([]));
component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
@@ -207,7 +206,7 @@ describe('ContentMetadataComponent', () => {
component.expanded = true;
fixture.detectChanges();
spyOn(contentMetadataService, 'getGroupedProperties').and.callFake(() => {
return Observable.of([{ properties: expectedProperties }]);
return of([{ properties: expectedProperties }]);
});
component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
@@ -223,7 +222,7 @@ describe('ContentMetadataComponent', () => {
component.expanded = true;
component.displayEmpty = false;
fixture.detectChanges();
spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue(Observable.of([{ properties: [] }]));
spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue(of([{ properties: [] }]));
component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });

8
lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts
View File

@@ -17,11 +17,11 @@
import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable, Subscription } from 'rxjs';
import { CardViewItem, NodesApiService, LogService, CardViewUpdateService, AlfrescoApiService } from '@alfresco/adf-core';
import { ContentMetadataService } from '../../services/content-metadata.service';
import { CardViewGroup } from '../../interfaces/content-metadata.interfaces';
import { Subscription } from 'rxjs/Rx';
import { switchMap } from 'rxjs/operators';
@Component({
selector: 'adf-content-metadata',
@@ -71,7 +71,9 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
ngOnInit() {
this.disposableNodeUpdate = this.cardViewUpdateService.itemUpdated$
.switchMap(this.saveNode.bind(this))
.pipe(
switchMap(this.saveNode.bind(this))
)
.subscribe(
updatedNode => {
Object.assign(this.node, updatedNode);

14
lib/content-services/content-metadata/services/content-metadata.service.ts
View File

@@ -18,12 +18,13 @@
import { Injectable } from '@angular/core';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { BasicPropertiesService } from './basic-properties.service';
import { Observable } from 'rxjs/Observable';
import { Observable, of } from 'rxjs';
import { PropertyGroupTranslatorService } from './property-groups-translator.service';
import { CardViewItem } from '@alfresco/adf-core';
import { CardViewGroup } from '../interfaces/content-metadata.interfaces';
import { ContentMetadataConfigFactory } from './config/content-metadata-config.factory';
import { PropertyDescriptorsService } from './property-descriptors.service';
import { map } from 'rxjs/operators';
@Injectable()
export class ContentMetadataService {
@@ -35,11 +36,11 @@ export class ContentMetadataService {
}
getBasicProperties(node: MinimalNodeEntryEntity): Observable<CardViewItem[]> {
return Observable.of(this.basicPropertiesService.getProperties(node));
return of(this.basicPropertiesService.getProperties(node));
}
getGroupedProperties(node: MinimalNodeEntryEntity, presetName: string = 'default'): Observable<CardViewGroup[]> {
let groupedProperties = Observable.of([]);
let groupedProperties = of([]);
if (node.aspectNames) {
const config = this.contentMetadataConfigFactory.get(presetName),
@@ -48,9 +49,10 @@ export class ContentMetadataService {
.filter(groupName => config.isGroupAllowed(groupName));
if (groupNames.length > 0) {
groupedProperties = this.propertyDescriptorsService.load(groupNames)
.map(groups => config.reorganiseByConfig(groups))
.map(groups => this.propertyGroupTranslatorService.translateToCardViewGroups(groups, node.properties));
groupedProperties = this.propertyDescriptorsService.load(groupNames).pipe(
map(groups => config.reorganiseByConfig(groups)),
map(groups => this.propertyGroupTranslatorService.translateToCardViewGroups(groups, node.properties))
);
}
}

4
lib/content-services/content-metadata/services/property-descriptors.service.spec.ts
View File

@@ -18,7 +18,7 @@
import { TestBed } from '@angular/core/testing';
import { PropertyDescriptorsService } from './property-descriptors.service';
import { AlfrescoApiService, setupTestBed } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ClassesApi } from 'alfresco-js-api';
import { PropertyGroup } from '../interfaces/content-metadata.interfaces';
import { ContentTestingModule } from '../../testing/content.testing.module';
@@ -73,7 +73,7 @@ describe('PropertyDescriptorLoaderService', () => {
let counter = 0;
spyOn(classesApi, 'getClass').and.callFake(() => {
return Observable.of(apiResponses[counter++]);
return of(apiResponses[counter++]);
});
service.load(['exif:exif', 'cm:content'])

10
lib/content-services/content-metadata/services/property-descriptors.service.ts
View File

@@ -17,10 +17,9 @@
import { Injectable } from '@angular/core';
import { AlfrescoApiService } from '@alfresco/adf-core';
import { forkJoin } from 'rxjs/observable/forkJoin';
import { Observable } from 'rxjs/Observable';
import { defer } from 'rxjs/observable/defer';
import { Observable, defer, forkJoin } from 'rxjs';
import { PropertyGroup, PropertyGroupContainer } from '../interfaces/content-metadata.interfaces';
import { map } from 'rxjs/operators';
@Injectable()
export class PropertyDescriptorsService {
@@ -32,8 +31,9 @@ export class PropertyDescriptorsService {
.map(groupName => groupName.replace(':', '_'))
.map(groupName => defer( () => this.alfrescoApiService.classesApi.getClass(groupName)) );
return forkJoin(groupFetchStreams)
.map(this.convertToObject);
return forkJoin(groupFetchStreams).pipe(
map(this.convertToObject)
);
}
private convertToObject(propertyGroupsArray: PropertyGroup[]): PropertyGroupContainer {

15
lib/content-services/content-node-selector/content-node-dialog.service.spec.ts
View File

@@ -21,8 +21,7 @@ import { AppConfigService, SitesService, setupTestBed } from '@alfresco/adf-core
import { DocumentListService } from '../document-list/services/document-list.service';
import { ContentNodeDialogService } from './content-node-dialog.service';
import { MatDialog } from '@angular/material';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Subject, of } from 'rxjs';
import { ContentTestingModule } from '../testing/content.testing.module';
const fakeNode: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
@@ -75,7 +74,7 @@ describe('ContentNodeDialogService', () => {
afterOpenObservable = new Subject<any>();
spyOnDialogOpen = spyOn(materialDialog, 'open').and.returnValue({
afterOpen: () => afterOpenObservable,
afterClosed: () => Observable.of({}),
afterClosed: () => of({}),
componentInstance: {
error: new Subject<any>()
}
@@ -112,23 +111,23 @@ describe('ContentNodeDialogService', () => {
});
it('should be able to open the dialog using a folder id', fakeAsync(() => {
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNode));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
service.openFileBrowseDialogByFolderId('fake-folder-id').subscribe();
tick();
expect(spyOnDialogOpen).toHaveBeenCalled();
}));
it('should be able to open the dialog for files using the first user site', fakeAsync(() => {
spyOn(sitesService, 'getSites').and.returnValue(Observable.of(fakeSiteList));
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNode));
spyOn(sitesService, 'getSites').and.returnValue(of(fakeSiteList));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
service.openFileBrowseDialogBySite().subscribe();
tick();
expect(spyOnDialogOpen).toHaveBeenCalled();
}));
it('should be able to open the dialog for folder using the first user site', fakeAsync(() => {
spyOn(sitesService, 'getSites').and.returnValue(Observable.of(fakeSiteList));
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNode));
spyOn(sitesService, 'getSites').and.returnValue(of(fakeSiteList));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
service.openFolderBrowseDialogBySite().subscribe();
tick();
expect(spyOnDialogOpen).toHaveBeenCalled();

23
lib/content-services/content-node-selector/content-node-dialog.service.ts
View File

@@ -18,8 +18,7 @@
import { MatDialog } from '@angular/material';
import { EventEmitter, Injectable, Output } from '@angular/core';
import { ContentService } from '@alfresco/adf-core';
import { Subject } from 'rxjs/Subject';
import { Observable } from 'rxjs/Observable';
import { Subject, Observable, throwError } from 'rxjs';
import { ShareDataRow } from '../document-list/data/share-data-row.model';
import { MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
import { DataColumn, SitesService, TranslationService, PermissionsEnum } from '@alfresco/adf-core';
@@ -27,7 +26,7 @@ import { DocumentListService } from '../document-list/services/document-list.ser
import { ContentNodeSelectorComponent } from './content-node-selector.component';
import { ContentNodeSelectorComponentData } from './content-node-selector.component-data.interface';
import { NodeLockDialogComponent } from '../dialogs/node-lock.dialog';
import 'rxjs/operator/switchMap';
import { switchMap } from 'rxjs/operators';
@Injectable()
export class ContentNodeDialogService {
@@ -49,9 +48,9 @@ export class ContentNodeDialogService {
* @returns Information about the selected file(s)
*/
openFileBrowseDialogByFolderId(folderNodeId: string): Observable<MinimalNodeEntryEntity[]> {
return this.documentListService.getFolderNode(folderNodeId).switchMap((node: MinimalNodeEntryEntity) => {
return this.documentListService.getFolderNode(folderNodeId).pipe(switchMap((node: MinimalNodeEntryEntity) => {
return this.openUploadFileDialog('Choose', node);
});
}));
}
/**
@@ -85,9 +84,9 @@ export class ContentNodeDialogService {
* @returns Information about the selected file(s)
*/
openFileBrowseDialogBySite(): Observable<MinimalNodeEntryEntity[]> {
return this.siteService.getSites().switchMap((response: SitePaging) => {
return this.siteService.getSites().pipe(switchMap((response: SitePaging) => {
return this.openFileBrowseDialogByFolderId(response.list.entries[0].entry.guid);
});
}));
}
/**
@@ -95,9 +94,9 @@ export class ContentNodeDialogService {
* @returns Information about the selected folder(s)
*/
openFolderBrowseDialogBySite(): Observable<MinimalNodeEntryEntity[]> {
return this.siteService.getSites().switchMap((response: SitePaging) => {
return this.siteService.getSites().pipe(switchMap((response: SitePaging) => {
return this.openFolderBrowseDialogByFolderId(response.list.entries[0].entry.guid);
});
}));
}
/**
@@ -106,9 +105,9 @@ export class ContentNodeDialogService {
* @returns Information about the selected folder(s)
*/
openFolderBrowseDialogByFolderId(folderNodeId: string): Observable<MinimalNodeEntryEntity[]> {
return this.documentListService.getFolderNode(folderNodeId).switchMap((node: MinimalNodeEntryEntity) => {
return this.documentListService.getFolderNode(folderNodeId).pipe(switchMap((node: MinimalNodeEntryEntity) => {
return this.openUploadFolderDialog('Choose', node);
});
}));
}
/**
@@ -143,7 +142,7 @@ export class ContentNodeDialogService {
return select;
} else {
let errors = new Error(JSON.stringify({ error: { statusCode: 403 } }));
return Observable.throw(errors);
return throwError(errors);
}
}

2
lib/content-services/content-node-selector/content-node-selector-panel.component.scss
View File

@@ -31,7 +31,7 @@
}
}
.mat-input-underline .mat-input-ripple {
.mat-form-field-underline .mat-form-field-ripple {
height: 1px;
transition: none;
}

19
lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts
View File

@@ -20,8 +20,7 @@ import { async, fakeAsync, tick, ComponentFixture, TestBed } from '@angular/core
import { By } from '@angular/platform-browser';
import { MinimalNodeEntryEntity, SiteEntry, SitePaging } from 'alfresco-js-api';
import { SearchService, SitesService, setupTestBed } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { Observable, Observer, of, throwError } from 'rxjs';
import { DropdownBreadcrumbComponent } from '../breadcrumb';
import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component';
import { ContentNodeSelectorService } from './content-node-selector.service';
@@ -119,9 +118,9 @@ describe('ContentNodeSelectorComponent', () => {
expectedDefaultFolderNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
documentListService = TestBed.get(DocumentListService);
sitesService = TestBed.get(SitesService);
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(expectedDefaultFolderNode));
spyOn(documentListService, 'getFolder').and.returnValue(Observable.throw('No results for test'));
spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(expectedDefaultFolderNode));
spyOn(documentListService, 'getFolder').and.returnValue(throwError('No results for test'));
spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
spyOn(component.documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve());
component.currentFolderId = 'cat-girl-nuku-nuku';
fixture.detectChanges();
@@ -290,18 +289,18 @@ describe('ContentNodeSelectorComponent', () => {
const documentListService = TestBed.get(DocumentListService);
const expectedDefaultFolderNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(expectedDefaultFolderNode));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(expectedDefaultFolderNode));
spyOn(component.documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve());
const sitesService = TestBed.get(SitesService);
spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
getCorrespondingNodeIdsSpy = spyOn(component.documentList, 'getCorrespondingNodeIds').and
.callFake(id => {
if (id === '-sites-') {
return Observable.of(['123456testId', '09876543testId']);
return of(['123456testId', '09876543testId']);
}
return Observable.of([id]);
return of([id]);
});
component.currentFolderId = 'cat-girl-nuku-nuku';
@@ -659,7 +658,7 @@ describe('ContentNodeSelectorComponent', () => {
beforeEach(() => {
const sitesService = TestBed.get(SitesService);
spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
});
describe('in the case when isSelectionValid is a custom function for checking permissions,', () => {

2
lib/content-services/content-node-selector/content-node-selector-panel.component.ts
View File

@@ -27,7 +27,7 @@ import { RowFilter } from '../document-list/data/row-filter.model';
import { ImageResolver } from '../document-list/data/image-resolver.model';
import { ContentNodeSelectorService } from './content-node-selector.service';
import { debounceTime } from 'rxjs/operators';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { BehaviorSubject } from 'rxjs';
export type ValidationFunction = (entry: MinimalNodeEntryEntity) => boolean;

2
lib/content-services/content-node-selector/content-node-selector.component-data.interface.ts
View File

@@ -16,7 +16,7 @@
*/
import { MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
export interface ContentNodeSelectorComponentData {
title: string;

10
lib/content-services/content-node-selector/content-node-selector.component.spec.ts
View File

@@ -23,7 +23,7 @@ import { ContentNodeSelectorComponent } from './content-node-selector.component'
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { By } from '@angular/platform-browser';
import { setupTestBed, SitesService } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ContentTestingModule } from '../testing/content.testing.module';
import { DocumentListService } from '../document-list/services/document-list.service';
import { DocumentListComponent } from '../document-list/components/document-list.component';
@@ -53,9 +53,9 @@ describe('ContentNodeSelectorDialogComponent', () => {
beforeEach(() => {
const documentListService: DocumentListService = TestBed.get(DocumentListService);
const sitesService: SitesService = TestBed.get(SitesService);
spyOn(documentListService, 'getFolder').and.returnValue(Observable.of({ list: [] }));
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of({}));
spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
spyOn(documentListService, 'getFolder').and.returnValue(of({ list: [] }));
spyOn(documentListService, 'getFolderNode').and.returnValue(of({}));
spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
fixture = TestBed.createComponent(ContentNodeSelectorComponent);
component = fixture.componentInstance;
@@ -88,7 +88,7 @@ describe('ContentNodeSelectorDialogComponent', () => {
expect(documentList.componentInstance.currentFolderId).toBe('cat-girl-nuku-nuku');
});
it('should pass through the injected rowFilter to the documentlist', (done) => {
xit('should pass through the injected rowFilter to the documentlist', (done) => {
fixture.whenStable().then(() => {
let documentList = fixture.debugElement.query(By.directive(DocumentListComponent));
expect(documentList).not.toBeNull('Document list should be shown');

2
lib/content-services/content-node-selector/content-node-selector.service.ts
View File

@@ -18,7 +18,7 @@
import { SearchService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { NodePaging } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
/**
* Internal service used by ContentNodeSelector component.

8
lib/content-services/dialogs/folder.dialog.html
View File

@@ -4,7 +4,7 @@
<mat-dialog-content>
<form [formGroup]="form" (submit)="submit()">
<mat-input-container class="adf-full-width">
<mat-form-field class="adf-full-width">
<input
placeholder="{{ 'CORE.FOLDER_DIALOG.FOLDER_NAME.LABEL' | translate }}"
matInput
@@ -21,18 +21,18 @@
{{ form.controls['name'].errors?.message | translate }}
</span>
</mat-hint>
</mat-input-container>
</mat-form-field>
<br />
<br />
<mat-input-container class="adf-full-width">
<mat-form-field class="adf-full-width">
<textarea
matInput
placeholder="{{ 'CORE.FOLDER_DIALOG.FOLDER_DESCRIPTION.LABEL' | translate }}"
rows="4"
[formControl]="form.controls['description']"></textarea>
</mat-input-container>
</mat-form-field>
</form>
</mat-dialog-content>

22
lib/content-services/dialogs/folder.dialog.spec.ts
View File

@@ -20,7 +20,7 @@ import { async, ComponentFixture } from '@angular/core/testing';
import { MatDialogRef } from '@angular/material';
import { NodesApiService, setupTestBed } from '@alfresco/adf-core';
import { FolderDialogComponent } from './folder.dialog';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { ContentTestingModule } from '../testing/content.testing.module';
import { By } from '@angular/platform-browser';
@@ -86,7 +86,7 @@ describe('FolderDialogComponent', () => {
});
it('should submit updated values if form is valid', () => {
spyOn(nodesApi, 'updateNode').and.returnValue(Observable.of({}));
spyOn(nodesApi, 'updateNode').and.returnValue(of({}));
component.form.controls['name'].setValue('folder-name-update');
component.form.controls['description'].setValue('folder-description-update');
@@ -110,7 +110,7 @@ describe('FolderDialogComponent', () => {
data: 'folder-data'
};
spyOn(nodesApi, 'updateNode').and.returnValue(Observable.of(folder));
spyOn(nodesApi, 'updateNode').and.returnValue(of(folder));
component.submit();
@@ -121,7 +121,7 @@ describe('FolderDialogComponent', () => {
const folder = { data: 'folder-data' };
let expectedNode = null;
spyOn(nodesApi, 'updateNode').and.returnValue(Observable.of(folder));
spyOn(nodesApi, 'updateNode').and.returnValue(of(folder));
component.success.subscribe((node) => { expectedNode = node; });
component.submit();
@@ -144,7 +144,7 @@ describe('FolderDialogComponent', () => {
});
it('should not call dialog to close if submit fails', () => {
spyOn(nodesApi, 'updateNode').and.returnValue(Observable.throw('error'));
spyOn(nodesApi, 'updateNode').and.returnValue(throwError('error'));
spyOn(component, 'handleError').and.callFake(val => val);
component.submit();
@@ -183,7 +183,7 @@ describe('FolderDialogComponent', () => {
});
it('should submit updated values if form is valid', () => {
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.of({}));
spyOn(nodesApi, 'createFolder').and.returnValue(of({}));
component.form.controls['name'].setValue('folder-name-update');
component.form.controls['description'].setValue('folder-description-update');
@@ -204,7 +204,7 @@ describe('FolderDialogComponent', () => {
});
it('should submit updated values if form is valid (with custom nodeType)', () => {
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.of({}));
spyOn(nodesApi, 'createFolder').and.returnValue(of({}));
component.form.controls['name'].setValue('folder-name-update');
component.form.controls['description'].setValue('folder-description-update');
@@ -233,7 +233,7 @@ describe('FolderDialogComponent', () => {
component.form.controls['name'].setValue('name');
component.form.controls['description'].setValue('description');
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.of(folder));
spyOn(nodesApi, 'createFolder').and.returnValue(of(folder));
component.submit();
@@ -253,7 +253,7 @@ describe('FolderDialogComponent', () => {
});
it('should not call dialog to close if submit fails', () => {
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.throw('error'));
spyOn(nodesApi, 'createFolder').and.returnValue(throwError('error'));
spyOn(component, 'handleError').and.callFake(val => val);
component.form.controls['name'].setValue('name');
@@ -276,7 +276,7 @@ describe('FolderDialogComponent', () => {
done();
});
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.throw(error));
spyOn(nodesApi, 'createFolder').and.returnValue(throwError(error));
component.form.controls['name'].setValue('name');
component.form.controls['description'].setValue('description');
@@ -294,7 +294,7 @@ describe('FolderDialogComponent', () => {
done();
});
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.throw(error));
spyOn(nodesApi, 'createFolder').and.returnValue(throwError(error));
component.form.controls['name'].setValue('name');
component.form.controls['description'].setValue('description');

2
lib/content-services/dialogs/folder.dialog.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
import { Component, Inject, OnInit, Optional, EventEmitter, Output } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';

6
lib/content-services/dialogs/share.dialog.spec.ts
View File

@@ -18,7 +18,7 @@
import { async, TestBed } from '@angular/core/testing';
import { ComponentFixture } from '@angular/core/testing';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ShareDialogComponent } from './share.dialog';
import { ContentTestingModule } from '../testing/content.testing.module';
import { SharedLinksApiService, setupTestBed } from '@alfresco/adf-core';
@@ -54,8 +54,8 @@ describe('ShareDialogComponent', () => {
fixture.detectChanges();
spyCreate = spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(Observable.of({ entry: { id: 'test-sharedId' } }));
spyDelete = spyOn(sharedLinksApiService, 'deleteSharedLink').and.returnValue(Observable.of({}));
spyCreate = spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(of({ entry: { id: 'test-sharedId' } }));
spyDelete = spyOn(sharedLinksApiService, 'deleteSharedLink').and.returnValue(of({}));
});
it('should init the dialog with the file name and baseShareUrl', async(() => {

3
lib/content-services/directives/node-share.directive.spec.ts
View File

@@ -49,8 +49,7 @@ describe('NodeSharedDirective', () => {
TestComponent,
NodeSharedDirective
]
})
.compileComponents()
}).compileComponents()
.then(() => {
fixture = TestBed.createComponent(TestComponent);
component = fixture.componentInstance;

2
lib/content-services/directives/node-share.directive.ts
View File

@@ -44,7 +44,7 @@ export class NodeSharedDirective implements OnChanges {
}
shareNode(node: MinimalNodeEntity) {
if (node.entry && node.entry.isFile) {
if (node && node.entry && node.entry.isFile) {
this.dialog.open(ShareDialogComponent, {
width: '600px',
disableClose: true,

2
lib/content-services/document-list/components/content-action/content-action.component.ts
View File

@@ -24,7 +24,7 @@ import { DocumentActionsService } from '../../services/document-actions.service'
import { FolderActionsService } from '../../services/folder-actions.service';
import { ContentActionModel, ContentActionTarget } from './../../models/content-action.model';
import { ContentActionListComponent } from './content-action-list.component';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
@Component({
selector: 'content-action',

19
lib/content-services/document-list/components/document-list.component.spec.ts
View File

@@ -19,8 +19,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, TemplateRef, QueryList } from '@a
import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
import { AlfrescoApiService, DataColumnListComponent, DataColumnComponent } from '@alfresco/adf-core';
import { DataColumn, DataTableComponent } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Subject, of, throwError } from 'rxjs';
import { FileNode, FolderNode } from '../../mock';
import {
fakeNodeAnswerWithNOEntries,
@@ -249,7 +248,7 @@ describe('DocumentList', () => {
documentList.folderNode = new NodeMinimal();
documentList.folderNode.id = '1d26e465-dea3-42f3-b415-faa8364b9692';
spyOn(documentListService, 'getFolder').and.returnValue(Observable.of(fakeNodeAnswerWithNOEntries));
spyOn(documentListService, 'getFolder').and.returnValue(of(fakeNodeAnswerWithNOEntries));
let disposableReady = documentList.ready.subscribe(() => {
expect(element.querySelector('#adf-document-list-empty')).toBeDefined();
@@ -754,7 +753,7 @@ describe('DocumentList', () => {
it('should display folder content from loadFolder on reload if folderNode defined', () => {
documentList.folderNode = new NodeMinimal();
spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Observable.of(''));
spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve(''));
spyOn(documentList, 'loadFolder').and.callThrough();
documentList.reload();
expect(documentList.loadFolder).toHaveBeenCalled();
@@ -953,7 +952,7 @@ describe('DocumentList', () => {
it('should emit error when getFolderNode fails', (done) => {
const error = { message: '{ "error": { "statusCode": 501 } }' };
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.throw(error));
spyOn(documentListService, 'getFolderNode').and.returnValue(throwError(error));
let disposableError = documentList.error.subscribe(val => {
expect(val).toBe(error);
@@ -966,7 +965,7 @@ describe('DocumentList', () => {
it('should emit error when loadFolderNodesByFolderNodeId fails', (done) => {
const error = { message: '{ "error": { "statusCode": 501 } }' };
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNodeWithCreatePermission));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNodeWithCreatePermission));
spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.reject(error));
let disposableError = documentList.error.subscribe(val => {
@@ -980,7 +979,7 @@ describe('DocumentList', () => {
it('should set no permission when getFolderNode fails with 403', (done) => {
const error = { message: '{ "error": { "statusCode": 403 } }' };
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.throw(error));
spyOn(documentListService, 'getFolderNode').and.returnValue(throwError(error));
let disposableError = documentList.error.subscribe(val => {
expect(val).toBe(error);
@@ -1022,8 +1021,8 @@ describe('DocumentList', () => {
documentList.folderNode = new NodeMinimal();
documentList.folderNode.id = '1d26e465-dea3-42f3-b415-faa8364b9692';
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNodeWithNoPermission));
spyOn(documentListService, 'getFolder').and.returnValue(Observable.throw(error));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNodeWithNoPermission));
spyOn(documentListService, 'getFolder').and.returnValue(throwError(error));
documentList.loadFolder();
let clickedFolderNode = new FolderNode('fake-folder-node');
@@ -1226,7 +1225,7 @@ describe('DocumentList', () => {
});
xit('should emit error when fetch recent fails on search call', (done) => {
spyOn(customResourcesService, 'loadFolderByNodeId').and.returnValue(Observable.throw('error'));
spyOn(customResourcesService, 'loadFolderByNodeId').and.returnValue(throwError('error'));
let disposableError = documentList.error.subscribe(val => {
expect(val).toBe('error');

10
lib/content-services/document-list/components/document-list.component.ts
View File

@@ -27,15 +27,9 @@ import {
} from '@alfresco/adf-core';
import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { Subscription } from 'rxjs/Subscription';
import { Observable, Subject, BehaviorSubject, Subscription, of } from 'rxjs';
import { ShareDataRow } from './../data/share-data-row.model';
import { ShareDataTableAdapter } from './../data/share-datatable-adapter';
import { presetsDefaultModel } from '../models/preset.model';
import { ContentActionModel } from './../models/content-action.model';
import { PermissionStyleModel } from './../models/permissions-style.model';
@@ -559,7 +553,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
if (typeof action.handler === 'function') {
handlerSub = action.handler(node, this, action.permission);
} else {
handlerSub = Observable.of(true);
handlerSub = of(true);
}
if (typeof action.execute === 'function' && handlerSub) {

33
lib/content-services/document-list/services/custom-resources.service.ts
View File

@@ -29,7 +29,8 @@ import {
SearchRequest
} from 'alfresco-js-api';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, from, of, throwError } from 'rxjs';
import { catchError } from 'rxjs/operators';
@Injectable()
export class CustomResourcesService {
@@ -86,7 +87,7 @@ export class CustomResourcesService {
observer.error(err);
observer.complete();
});
}).catch(err => this.handleError(err));
}).pipe(catchError(err => this.handleError(err)));
}
/**
@@ -132,7 +133,7 @@ export class CustomResourcesService {
observer.error(err);
observer.complete();
});
}).catch(err => this.handleError(err));
}).pipe(catchError(err => this.handleError(err)));
}
/**
@@ -171,7 +172,7 @@ export class CustomResourcesService {
observer.error(err);
observer.complete();
});
}).catch(err => this.handleError(err));
}).pipe(catchError(err => this.handleError(err)));
}
/**
@@ -202,7 +203,7 @@ export class CustomResourcesService {
observer.error(err);
observer.complete();
});
}).catch(err => this.handleError(err));
}).pipe(catchError(err => this.handleError(err)));
}
/**
@@ -220,7 +221,8 @@ export class CustomResourcesService {
skipCount: pagination.skipCount
};
return Observable.fromPromise(this.apiService.nodesApi.getDeletedNodes(options)).catch(err => this.handleError(err));
return from(this.apiService.nodesApi.getDeletedNodes(options))
.pipe(catchError(err => this.handleError(err)));
}
@@ -239,7 +241,8 @@ export class CustomResourcesService {
skipCount: pagination.skipCount
};
return Observable.fromPromise(this.apiService.sharedLinksApi.findSharedLinks(options)).catch(err => this.handleError(err));
return from(this.apiService.sharedLinksApi.findSharedLinks(options))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -291,23 +294,23 @@ export class CustomResourcesService {
*/
getCorrespondingNodeIds(nodeId: string, pagination: PaginationModel): Observable<string[]> {
if (nodeId === '-trashcan-') {
return Observable.fromPromise(this.apiService.nodesApi.getDeletedNodes()
return from(this.apiService.nodesApi.getDeletedNodes()
.then(result => result.list.entries.map(node => node.entry.id)));
} else if (nodeId === '-sharedlinks-') {
return Observable.fromPromise(this.apiService.sharedLinksApi.findSharedLinks()
return from(this.apiService.sharedLinksApi.findSharedLinks()
.then(result => result.list.entries.map(node => node.entry.nodeId)));
} else if (nodeId === '-sites-') {
return Observable.fromPromise(this.apiService.sitesApi.getSites()
return from(this.apiService.sitesApi.getSites()
.then(result => result.list.entries.map(node => node.entry.guid)));
} else if (nodeId === '-mysites-') {
return Observable.fromPromise(this.apiService.peopleApi.getSiteMembership('-me-')
return from(this.apiService.peopleApi.getSiteMembership('-me-')
.then(result => result.list.entries.map(node => node.entry.guid)));
} else if (nodeId === '-favorites-') {
return Observable.fromPromise(this.apiService.favoritesApi.getFavorites('-me-')
return from(this.apiService.favoritesApi.getFavorites('-me-')
.then(result => result.list.entries.map(node => node.entry.targetGuid)));
} else if (nodeId === '-recent-') {
@@ -322,7 +325,7 @@ export class CustomResourcesService {
}
return Observable.of([]);
return of([]);
}
private getIncludesFields(includeFields: string[]): string[] {
@@ -331,9 +334,7 @@ export class CustomResourcesService {
}
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
this.logService.error(error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}

Some files were not shown because too many files have changed in this diff Show More